From 3371d3ad6d6741d4193183047192b68bbf411b98 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 20 Jun 2015 13:11:42 +0000
Subject: [PATCH 001/124] Add README

---
 README | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 000000000..2fec07667
--- /dev/null
+++ b/README
@@ -0,0 +1,3 @@
+This is a fork from arduino/ArduinoCore-samd on GitHub.
+This will be used to add Arduino support to the MattairTech
+MT-D21E and probably also the MT-D11.

From ff3470b5cf0f517747b19d4bdeaf7e377391f03f Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sun, 21 Jun 2015 18:01:16 +0000
Subject: [PATCH 002/124] Initial commit of MT-D21E variant directory files

---
 .../gcc/flash_with_bootloader.ld              | 211 ++++++++++++++++
 .../gcc/flash_without_bootloader.ld           | 212 ++++++++++++++++
 variants/MT_D21E/pins_arduino.h               |  21 ++
 variants/MT_D21E/variant.cpp                  | 160 +++++++++++++
 variants/MT_D21E/variant.h                    | 226 ++++++++++++++++++
 5 files changed, 830 insertions(+)
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_with_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_without_bootloader.ld
 create mode 100644 variants/MT_D21E/pins_arduino.h
 create mode 100644 variants/MT_D21E/variant.cpp
 create mode 100644 variants/MT_D21E/variant.h

diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_with_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_with_bootloader.ld
new file mode 100644
index 000000000..4475f9511
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_with_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00040000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_without_bootloader.ld
new file mode 100644
index 000000000..0162f0774
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/pins_arduino.h b/variants/MT_D21E/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/MT_D21E/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
new file mode 100644
index 000000000..9ab048009
--- /dev/null
+++ b/variants/MT_D21E/variant.cpp
@@ -0,0 +1,160 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+  Modified 21 June 2015 by Justin Mattair
+     for the MattairTech MT-D21E board (www.mattairtech.com)
+*/
+
+
+/*  Pins descriptions for the MattairTech MT-D21E
+ * 
+ * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (* is for default peripheral in use, () means unavailable)
+ * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
+ * | 0       | --                 | A0               |  PA00  | Xin32             | *Xin32
+ * | 1       | --                 | A1               |  PA01  | Xout32            | *Xout32
+ * | 2       | 2                  | A2               |  PA02  |                   | EIC/EXTINT[2] *ADC/AIN[0] PTC/Y[0] DAC/VOUT
+ * | 3       | 3                  | A3               |  PA03  | REFA              | EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFP *ADC/AIN[1] PTC/Y[1]
+ * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFP *ADC/AIN[4] AC/AIN[0] PTC/Y[2] (SERCOM0/PAD[0]) (TCC0/WO[0])
+ * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] *ADC/AIN[5] AC/AIN[1] PTC/Y[3] (SERCOM0/PAD[1]) (TCC0/WO[1])
+ * | 6       | 6                  | A6               |  PA06  |                   | EIC/EXTINT[6] *ADC/AIN[6] AC/AIN[2] PTC/Y[4] (SERCOM0/PAD[2]) (TCC1/WO[0])
+ * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | EIC/EXTINT[7] *ADC/AIN[7] AC/AIN[3] PTC/Y[5] (SERCOM0/PAD[3]) (TCC1/WO[1])
+ * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] (SERCOM0/PAD[0]) (SERCOM2/PAD[0]) *TCC0/WO[0] (TCC1/WO[2])
+ * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] (SERCOM0/PAD[1]) (SERCOM2/PAD[1]) *TCC0/WO[1] (TCC1/WO[3])
+ * | 10      | 10                 | A10              |  PA10  | TX                | EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] *SERCOM0/PAD[2] (SERCOM2/PAD[2]) (TCC1/WO[0]) TCC0/WO[2]
+ * | 11      | 11                 | A11              |  PA11  | RX                | EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] *SERCOM0/PAD[3] (SERCOM2/PAD[3]) (TCC1/WO[1]) TCC0/WO[3]
+ * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] (SERCOM4/PAD[2]) *TC3/WO[0] (TCC0/WO[4]) Xin, HOST_ENABLE
+ * | 13      | 15                 | A15              |  PA15  | Xout, ATN         | EIC/EXTINT[15] SERCOM2/PAD[3] (SERCOM4/PAD[3]) *TC3/WO[1] (TCC0/WO[5]) Xout, ATN
+ * | 14      | --                 | NC               |  ----  |                   | Not Connected
+ * | 15      | --                 | NC               |  ----  |                   | Not Connected
+ * | 16      | --                 | Vbus             |  ----  |                   | USB Vbus
+ * | 17      | --                 | A24-             |  PA24  | USB_NEGATIVE      | *USB/DM
+ * | 18      | --                 | A25+             |  PA25  | USB_POSITIVE      | *USB/DP
+ * | 19      | --                 | Gnd              |  ----  |                   | Ground
+ * | 20      | --                 | Gnd              |  ----  |                   | Ground
+ * | 21      | --                 | Vin              |  ----  |                   | Vin
+ * | 22      | --                 | Vcc              |  ----  |                   | Vcc
+ * | 23      | --                 | 3.3V             |  ----  |                   | 3.3V
+ * | 24      | --                 | NC               |  ----  |                   | Not Connected
+ * | 25      | --                 | NC               |  ----  |                   | Not Connected
+ * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] *SERCOM1/PAD[0] (SERCOM3/PAD[0]) TCC2/WO[0] (TCC0/WO[6])
+ * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] *SERCOM1/PAD[1] (SERCOM3/PAD[1]) TCC2/WO[1] (TCC0/WO[7])
+ * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] (SERCOM1/PAD[2]) *SERCOM3/PAD[2] (TC3/WO[0]) (TCC0/WO[2])
+ * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] (SERCOM1/PAD[3]) *SERCOM3/PAD[3] (TC3/WO[1]) (TCC0/WO[3])
+ * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] *SERCOM3/PAD[0] (SERCOM5/PAD[0]) TC4/WO[0] (TCC0/WO[4])
+ * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] *SERCOM3/PAD[1] (SERCOM5/PAD[1]) TC4/WO[1] (TCC0/WO[5])
+ * | 32      | 27                 | A27              |  PA27  | Button A          | EIC/EXTINT[15] *Button A
+ * | 33      | 28                 | A28              |  PA28  | LED               | EIC/EXTINT[8] *LED
+ * | 34      | --                 | NC               |  ----  |                   | Not Connected
+ * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] (SERCOM1/PAD[2]) *TCC1/WO[0] SWD CLK
+ * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] (SERCOM1/PAD[3]) *TCC1/WO[1] Button B SWD IO
+ * | 37      | --                 | NC               |  ----  |                   | Not Connected
+ * | 38      | --                 | NC               |  ----  |                   | Not Connected
+ * | 39      | --                 | RST              |  ----  |                   | Reset
+ * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
+ * 
+ * You may use Arduino pin numbers ranging from 0 to 31. The Arduino pin corresponds to the silkscreen (without the 'A').
+ * For example, use pinMode(28, OUTPUT) to set the LED pin (marked as A28) as an output.
+ * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 12, 13, 20, 21, 24, 25, 26, and 29.
+ * Note that pins 0 and 1 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
+ * Note also that pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+const PinDescription g_APinDescription[]=
+{
+	// 0..1 are unused (pins in use by 32.768KHz crystal, which in turn is used by the Arduino core)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 2..9 - Analog capable pins (DAC avalable on 2)
+	{ PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
+	{ PORTA,  3, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel1, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[1]
+	{ PORTA,  4, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
+	{ PORTA,  5, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
+	{ PORTA,  6, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL), ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[6]
+	{ PORTA,  7, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL), ADC_Channel7, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_TIMER, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_TIMER, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), ADC_Channel17, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
+	
+	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
+	{ PORTA, 10, PIO_SERCOM, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel18, PWM0_CH2, TCC0_CH2, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2], PIO_TIMER_ALT
+	{ PORTA, 11, PIO_SERCOM, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel19, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3], PIO_TIMER_ALT
+	
+	// 12..13 pins don't exist
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 14..15 - Digital functions
+	{ PORTA, 14, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM3_CH0, TC3_CH0, EXTERNAL_INT_14 }, // TC3/WO[0], HOST_ENABLE
+	{ PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // TC3/WO[1], ATN
+	
+	// 16..17 I2C pins (SDA/SCL) or Digital functions
+	{ PORTA, 16, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, // SDA: SERCOM1/PAD[0]
+	{ PORTA, 17, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_1 }, // SCL: SERCOM1/PAD[1]
+	
+	// 18..23 - SPI Pins or Digital functions (pins 20..21 do not exist)
+	{ PORTA, 18, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // SPI MOSI: SERCOM3/PAD[2], PIO_SERCOM_ALT
+	{ PORTA, 19, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // SPI SCK: SERCOM3/PAD[3], PIO_SERCOM_ALT
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+//	{ PORTA, 22, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM4_CH0, TC4_CH0, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
+//	{ PORTA, 23, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM4_CH1, TC4_CH1, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
+	{ PORTA, 22, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
+	
+	// 24..26 are unused (25 and 26 in use by USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist)
+	{ PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DM
+	{ PORTA, 25, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 27..29 Button A and LED (pin 29 does not exist)
+	{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15 }, // Button A
+	{ PORTA, 28, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // LED
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
+	{ PORTA, 30, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_10 }, // TCC1/WO[0] / SWD CLK
+	{ PORTA, 31, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_11 }, // TCC1/WO[1] / SWD IO
+	
+	// 32 - Alternate use of pin 2 (DAC output)
+	//{ PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VOUT
+} ;
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+SERCOM sercom3( SERCOM3 ) ;
+SERCOM sercom4( SERCOM4 ) ;
+SERCOM sercom5( SERCOM5 ) ;
+
+Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial1.IrqHandler();
+}
+
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
new file mode 100644
index 000000000..e3eb01e92
--- /dev/null
+++ b/variants/MT_D21E/variant.h
@@ -0,0 +1,226 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+  Modified 21 June 2015 by Justin Mattair
+     for the MattairTech MT-D21E board (www.mattairtech.com)
+*/
+
+#ifndef _VARIANT_MATTAIRTECH_MT_D21E_
+#define _VARIANT_MATTAIRTECH_MT_D21E_
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+/** Frequency of the board main oscillator */
+#define VARIANT_MAINOSC		(32768ul)
+
+/** Master clock frequency */
+#define VARIANT_MCK			  (48000000ul)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT           (32u)
+#define NUM_DIGITAL_PINS     (32u)
+#define NUM_ANALOG_INPUTS    (10u)
+#define NUM_ANALOG_OUTPUTS   (1u)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+// Interrupts
+#define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
+
+// LEDs
+// None of these defines are currently used by the core.
+// The MT-D21E onboard LED is on pin 28.
+// The RX and TX LEDs are not present.
+// You may optionally add them to any free pins.
+#define PIN_LED_13           (28u)
+#define PIN_LED_RXL          (30u)
+#define PIN_LED_TXL          (31u)
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+/*
+ * Analog pins
+ */
+#define PIN_A0               (2ul)
+#define PIN_A1               (3ul)
+#define PIN_A2               (4ul)
+#define PIN_A3               (5ul)
+#define PIN_A4               (6ul)
+#define PIN_A5               (7ul)
+#define PIN_A6               (8ul)
+#define PIN_A7               (9ul)
+#define PIN_A8               (10ul)
+#define PIN_A9               (11ul)
+
+static const uint8_t A0  = PIN_A0 ;
+static const uint8_t A1  = PIN_A1 ;
+static const uint8_t A2  = PIN_A2 ;
+static const uint8_t A3  = PIN_A3 ;
+static const uint8_t A4  = PIN_A4 ;
+static const uint8_t A5  = PIN_A5 ;
+static const uint8_t A6  = PIN_A6 ;
+static const uint8_t A7  = PIN_A7 ;
+static const uint8_t A8  = PIN_A8 ;
+static const uint8_t A9  = PIN_A9 ;
+
+#define ADC_RESOLUTION		12
+
+// Other pins
+#define PIN_ATN              (15ul)
+static const uint8_t ATN = PIN_ATN;
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#define PIN_SERIAL1_RX       (11ul)
+#define PIN_SERIAL1_TX       (10ul)
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI1_MISO         (22u)
+#define PIN_SPI1_MOSI         (18u)
+#define PIN_SPI1_SCK          (19u)
+#define PIN_SPI1_SS           (23u)
+#define PIN_SPI_MISO         PIN_SPI1_MISO
+#define PIN_SPI_MOSI         PIN_SPI1_MOSI
+#define PIN_SPI_SCK          PIN_SPI1_SCK
+#define PIN_SPI_SS           PIN_SPI1_SS
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE1_SDA         (16u)
+#define PIN_WIRE1_SCL         (17u)
+#define PIN_WIRE_SDA          PIN_WIRE1_SDA
+#define PIN_WIRE_SCL          PIN_WIRE1_SCL
+
+/*
+ * USB
+ */
+#define PIN_USB_HOST_ENABLE (14ul)
+#define PIN_USB_DM          (24ul)
+#define PIN_USB_DP          (25ul)
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+extern SERCOM sercom3;
+extern SERCOM sercom4;
+extern SERCOM sercom5;
+
+extern Uart Serial1;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#define SERIAL_PORT_MONITOR         SerialUSB
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+#define Serial	SerialUSB
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */
+

From 41a865127c17f29a215aee2419f4038a3f08a98e Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 27 Jun 2015 19:53:11 +0000
Subject: [PATCH 003/124] Modified boards.txt to support MT-D21E and other
 related changes in variants directory

---
 README                                        |   7 +-
 boards.txt                                    | 175 ++++++++++-----
 bootloaders/zero/Makefile                     |  15 +-
 bootloaders/zero/main.c                       |  10 +-
 bootloaders/zero/main.h                       |   3 +-
 bootloaders/zero/readme.txt                   |   9 +-
 bootloaders/zero/samd21_sam_ba.bin            | Bin 6328 -> 0 bytes
 bootloaders/zero/samd21j18a_flash.ld          | 157 -------------
 platform.txt                                  |   9 +-
 programmers.txt                               |   6 -
 variants/MT_D21E/debug_scripts/SAMD21E15A.gdb |  31 +++
 variants/MT_D21E/debug_scripts/SAMD21E16A.gdb |  31 +++
 variants/MT_D21E/debug_scripts/SAMD21E17A.gdb |  31 +++
 variants/MT_D21E/debug_scripts/SAMD21E18A.gdb |  31 +++
 .../gcc/flash_128KB_with_16KB_bootloader.ld   | 211 +++++++++++++++++
 .../gcc/flash_128KB_with_8KB_bootloader.ld    | 211 +++++++++++++++++
 .../gcc/flash_128KB_without_bootloader.ld     | 212 ++++++++++++++++++
 .../gcc/flash_256KB_with_16KB_bootloader.ld   | 211 +++++++++++++++++
 ....ld => flash_256KB_with_8KB_bootloader.ld} |   0
 ...r.ld => flash_256KB_without_bootloader.ld} |   0
 .../gcc/flash_32KB_with_16KB_bootloader.ld    | 211 +++++++++++++++++
 .../gcc/flash_32KB_with_8KB_bootloader.ld     | 211 +++++++++++++++++
 .../gcc/flash_32KB_without_bootloader.ld      | 212 ++++++++++++++++++
 .../gcc/flash_64KB_with_16KB_bootloader.ld    | 211 +++++++++++++++++
 .../gcc/flash_64KB_with_8KB_bootloader.ld     | 211 +++++++++++++++++
 .../gcc/flash_64KB_without_bootloader.ld      | 212 ++++++++++++++++++
 .../MT_D21E/openocd_scripts/SAMD21E15A.cfg    |  30 +++
 .../MT_D21E/openocd_scripts/SAMD21E16A.cfg    |  30 +++
 .../MT_D21E/openocd_scripts/SAMD21E17A.cfg    |  30 +++
 .../MT_D21E/openocd_scripts/SAMD21E18A.cfg    |  30 +++
 30 files changed, 2515 insertions(+), 233 deletions(-)
 delete mode 100644 bootloaders/zero/samd21_sam_ba.bin
 delete mode 100644 bootloaders/zero/samd21j18a_flash.ld
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E15A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E16A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E17A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E18A.gdb
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
 rename variants/MT_D21E/linker_scripts/gcc/{flash_with_bootloader.ld => flash_256KB_with_8KB_bootloader.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_without_bootloader.ld => flash_256KB_without_bootloader.ld} (100%)
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg

diff --git a/README b/README
index 2fec07667..b7ae2959c 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
 This is a fork from arduino/ArduinoCore-samd on GitHub.
-This will be used to add Arduino support to the MattairTech
-MT-D21E and probably also the MT-D11.
+This will be used to maintain Arduino support for the
+MattairTech MT-D21E and probably also the MT-D11.
+
+The resulting Arduino support package will be available
+at mattairtech.github.io
diff --git a/boards.txt b/boards.txt
index ad7d50242..402d45548 100644
--- a/boards.txt
+++ b/boards.txt
@@ -14,54 +14,129 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-arduino_zero_edbg.name=Arduino Zero (Programming Port)
-arduino_zero_edbg.vid.0=0x03eb
-arduino_zero_edbg.pid.0=0x2157
-arduino_zero_edbg.upload.tool=openocd
-arduino_zero_edbg.upload.protocol=sam-ba
-arduino_zero_edbg.upload.maximum_size=262144
-arduino_zero_edbg.upload.use_1200bps_touch=false
-arduino_zero_edbg.upload.wait_for_upload_port=false
-arduino_zero_edbg.upload.native_usb=false
-arduino_zero_edbg.build.mcu=cortex-m0plus
-arduino_zero_edbg.build.f_cpu=48000000L
-arduino_zero_edbg.build.usb_product="Arduino Zero"
-arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
-arduino_zero_edbg.build.board=SAMD_ZERO
-arduino_zero_edbg.build.core=arduino
-arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_edbg.build.variant=arduino_zero
-arduino_zero_edbg.build.variant_system_lib=
-arduino_zero_edbg.build.vid=0x2341
-arduino_zero_edbg.build.pid=0x804d
-arduino_zero_edbg.bootloader.tool=openocd
-arduino_zero_edbg.bootloader.file=zero/samd21_sam_ba.bin
+/*
+ * Modified 23 June 2015 by Justin Mattair
+ *   for the MattairTech MT-D21E board (www.mattairtech.com)
+ */
 
-arduino_zero_native.name=Arduino Zero (Native USB Port)
-arduino_zero_native.vid.0=0x2341
-arduino_zero_native.pid.0=0x804d
-arduino_zero_native.vid.1=0x2341
-arduino_zero_native.pid.1=0x004d
-arduino_zero_native.upload.tool=bossac
-arduino_zero_native.upload.protocol=sam-ba
-arduino_zero_native.upload.maximum_size=262144
-arduino_zero_native.upload.use_1200bps_touch=true
-arduino_zero_native.upload.wait_for_upload_port=true
-arduino_zero_native.upload.native_usb=true
-arduino_zero_native.build.mcu=cortex-m0plus
-arduino_zero_native.build.f_cpu=48000000L
-arduino_zero_native.build.usb_product="Arduino Zero"
-arduino_zero_native.build.usb_manufacturer="Arduino LLC"
-arduino_zero_native.build.board=SAMD_ZERO
-arduino_zero_native.build.core=arduino
-arduino_zero_native.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_native.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_native.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_native.build.variant=arduino_zero
-arduino_zero_native.build.variant_system_lib=
-arduino_zero_native.build.vid=0x2341
-arduino_zero_native.build.pid=0x804d
-arduino_zero_native.bootloader.tool=openocd
-arduino_zero_native.bootloader.file=zero/samd21_sam_ba.bin
+menu.cpu=Processor
+
+# MattairTech MT-D21E (default 8KB bootloader)
+mattairtech_mt_d21e.bl8k.name=MattairTech MT-D21E (SAM-BA bootloader)
+mattairtech_mt_d21e.bl8k.vid.0=0x16D0
+mattairtech_mt_d21e.bl8k.pid.0=0x0557
+mattairtech_mt_d21e.bl8k.vid.1=0x16D0
+mattairtech_mt_d21e.bl8k.pid.1=0x0856
+mattairtech_mt_d21e.bl8k.upload.tool=arduino:bossac
+mattairtech_mt_d21e.bl8k.upload.protocol=sam-ba
+mattairtech_mt_d21e.bl8k.upload.use_1200bps_touch=true
+mattairtech_mt_d21e.bl8k.upload.wait_for_upload_port=true
+mattairtech_mt_d21e.bl8k.upload.native_usb=true
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
+mattairtech_mt_d21e.bl8k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.bl8k.build.f_cpu=48000000L
+mattairtech_mt_d21e.bl8k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.bl8k.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e.bl8k.build.board=MT_D21E
+mattairtech_mt_d21e.bl8k.build.core=arduino
+mattairtech_mt_d21e.bl8k.build.variant=MT_D21E
+mattairtech_mt_d21e.bl8k.build.variant_system_lib=
+mattairtech_mt_d21e.bl8k.build.vid=0x16D0
+mattairtech_mt_d21e.bl8k.build.pid=0x0856
+mattairtech_mt_d21e.bl8k.bootloader.tool=arduino:openocd
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.bootloader.file=zero/samd21e18a_sam_ba.bin
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.bootloader.file=zero/samd21e17a_sam_ba.bin
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.bootloader.file=zero/samd21e16a_sam_ba.bin
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam_ba.bin
+
+
+# MattairTech MT-D21E (16KB bootloader), build only
+mattairtech_mt_d21e.bl16k.name=MattairTech MT-D21E (MSD bootloader)
+mattairtech_mt_d21e.bl16k.vid.0=0x16D0
+mattairtech_mt_d21e.bl16k.pid.0=0x0557
+mattairtech_mt_d21e.bl16k.vid.1=0x16D0
+mattairtech_mt_d21e.bl16k.pid.1=0x0856
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.upload.maximum_size=245760
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.upload.maximum_size=114688
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.upload.maximum_size=49152
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.upload.maximum_size=16384
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.bl16k.build.f_cpu=48000000L
+mattairtech_mt_d21e.bl16k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.bl16k.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e.bl16k.build.board=MT_D21E
+mattairtech_mt_d21e.bl16k.build.core=arduino
+mattairtech_mt_d21e.bl16k.build.variant=MT_D21E
+mattairtech_mt_d21e.bl16k.build.variant_system_lib=
+mattairtech_mt_d21e.bl16k.build.vid=0x16D0
+mattairtech_mt_d21e.bl16k.build.pid=0x0856
+
+
+# MattairTech MT-D21E (no bootloader)
+mattairtech_mt_d21e.bl0k.name=MattairTech MT-D21E (no bootloader)
+mattairtech_mt_d21e.bl0k.vid.0=0x16D0
+mattairtech_mt_d21e.bl0k.pid.0=0x0557
+mattairtech_mt_d21e.bl0k.vid.1=0x16D0
+mattairtech_mt_d21e.bl0k.pid.1=0x0856
+mattairtech_mt_d21e.bl0k.upload.tool=arduino:openocd
+mattairtech_mt_d21e.bl0k.upload.protocol=sam-ba
+mattairtech_mt_d21e.bl0k.upload.use_1200bps_touch=false
+mattairtech_mt_d21e.bl0k.upload.wait_for_upload_port=false
+mattairtech_mt_d21e.bl0k.upload.native_usb=false
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.upload.maximum_size=262144
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.upload.maximum_size=131072
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.upload.maximum_size=65536
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.upload.maximum_size=32768
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.bl0k.build.f_cpu=48000000L
+mattairtech_mt_d21e.bl0k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.bl0k.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e.bl0k.build.board=MT_D21E
+mattairtech_mt_d21e.bl0k.build.core=arduino
+mattairtech_mt_d21e.bl0k.build.variant=MT_D21E
+mattairtech_mt_d21e.bl0k.build.variant_system_lib=
+mattairtech_mt_d21e.bl0k.build.vid=0x16D0
+mattairtech_mt_d21e.bl0k.build.pid=0x0856
diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index d8fb2f349..d3758b86b 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -1,15 +1,15 @@
-IDE_PATH="../../../../.."
-ARM_GCC_PATH=$(IDE_PATH)/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin
+TOOLS_PATH="../../../arduino15/packages/arduino/tools"
+ARM_GCC_PATH=$(TOOLS_PATH)/arm-none-eabi-gcc/4.8.3-2014q1/bin
 CC=$(ARM_GCC_PATH)/arm-none-eabi-gcc
 CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -g -Os -w -std=gnu99 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
 LDFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols
-BLD_EXTA_FLAGS=-D__SAMD21G18A__
+BLD_EXTA_FLAGS=-D__SAMD21E18A__
 BUILD_PATH=build
-INCLUDES=-I$(IDE_PATH)/hardware/tools/CMSIS/CMSIS/Include/ -I$(IDE_PATH)/hardware/tools/CMSIS/Device/ATMEL/ -I./drivers/ -I./utils/ -I./utils/preprocessor/ -I./utils/interrupt 
+INCLUDES=-I$(TOOLS_PATH)/CMSIS/4.0.0-atmel/CMSIS/Include/ -I$(TOOLS_PATH)/CMSIS/4.0.0-atmel/Device/ATMEL/ -I./drivers/ -I./utils/ -I./utils/preprocessor/ -I./utils/interrupt 
 SOURCES=main.c sam_ba_monitor.c startup_samd21.c usart_sam_ba.c drivers/cdc_enumerate.c drivers/uart_driver.c utils/interrupt/interrupt_sam_nvic.c 
 OBJECTS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.o))
 
-NAME=samd21_sam_ba
+NAME=samd21e18a_sam_ba
 EXECUTABLE=$(NAME).bin
 
 SLASH=/
@@ -18,7 +18,7 @@ BSLASH=$(EMPTY)\$(EMPTY)
 all: $(SOURCES) $(EXECUTABLE)
 	
 $(EXECUTABLE): $(OBJECTS) 
-	$(CC) -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps  -Tsamd21j18a_flash.ld -Wl,-Map,$(BUILD_PATH)/$(NAME).map --specs=nano.specs --specs=nosys.specs -o $(BUILD_PATH)/$(NAME).elf $(OBJECTS) -Wl,--start-group -lm -Wl,--end-group
+	$(CC) -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps  -Tsamd21e18a_flash.ld -Wl,-Map,$(BUILD_PATH)/$(NAME).map --specs=nano.specs --specs=nosys.specs -o $(BUILD_PATH)/$(NAME).elf $(OBJECTS) -Wl,--start-group -lm -Wl,--end-group
 	$(ARM_GCC_PATH)/arm-none-eabi-objcopy -O binary $(BUILD_PATH)/$(NAME).elf $@
 
 $(BUILD_PATH)/%.o: %.c
@@ -26,4 +26,5 @@ $(BUILD_PATH)/%.o: %.c
 	$(CC) $(CFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@
 	
 clean:
-	del $(EXECUTABLE) $(subst /,\,$(OBJECTS)) $(subst /,\,$(BUILD_PATH)/$(NAME).*)
+#	del $(EXECUTABLE) $(subst /,\,$(OBJECTS)) $(subst /,\,$(BUILD_PATH)/$(NAME).*)
+	rm -f $(EXECUTABLE) $(OBJECTS) $(BUILD_PATH)/$(NAME).*
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 4ad7abd54..8232238ee 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -36,7 +36,7 @@
  * Supported communication interfaces :
  * --------------------
  *
- * SERCOM5 : RX:PB23 TX:PB22
+ * SERCOM5 : RX:PA11 TX:PA10
  * Baudrate : 115200 8N1
  *
  * USB : D-:PA24 D+:PA25
@@ -46,11 +46,11 @@
  * The following pins are used by the program :
  * PA25 : input/output
  * PA24 : input/output
- * PB23 : input
- * PB22 : output
- * PA15 : input
+ * PA11 : input
+ * PA10 : output
+ * PA27 : input
  *
- * The application board shall avoid driving the PA25,PA24,PB23,PB22 and PA15 signals
+ * The application board shall avoid driving the PA25,PA24,PA11,PA10 and PA27 signals
  * while the boot program is running (after a POR for example)
  *
  * Clock system
diff --git a/bootloaders/zero/main.h b/bootloaders/zero/main.h
index b8c58ec79..bcff3a546 100644
--- a/bootloaders/zero/main.h
+++ b/bootloaders/zero/main.h
@@ -42,8 +42,7 @@
  * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
  * pin is tied LOW.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+#define BOOT_LOAD_PIN                     PIN_PA27 // Pin 27
 #define BOOT_PIN_MASK                     (1U << (BOOT_LOAD_PIN & 0x1f))
 
 #define CPU_FREQUENCY                     8000000
diff --git a/bootloaders/zero/readme.txt b/bootloaders/zero/readme.txt
index 8c760449e..28ea8d431 100644
--- a/bootloaders/zero/readme.txt
+++ b/bootloaders/zero/readme.txt
@@ -1,6 +1,6 @@
 1- Prerequisites
 
-IAR Embedded Workbench for ARM 7.30
+gcc-arm-none-eabi-4.8.3-2014q1
 
 2- Selecting between USB and UART interface
 
@@ -12,10 +12,15 @@ SAM_BA_BOTH_INTERFACES for enabling both the interfaces
 SAM_BA_INTERFACE value should be modified in
 Project Options -> C/C++ Compiler -> Preprocessor -> Defined symbols
 Project Options -> Assembler -> Preprocessor -> Defined symbols
+The default value of SAM_BA_BOTH_INTERFACES is defined in sam_ba_monitor.h
+
+Additionally, you must select the cpu in the makefile (3 locations)
+as well as the TOOLS_PATH variable (and possibly other include paths).
+On Windows, change 'rm -f' to 'del' in the makefile (uncomment line 29, comment line 30).
 
 3- Start application check
 
 Bootloader checks for the state of BOOT_LOAD_PIN (configurable by the user from main.h). If BOOT_LOAD_PIN is pulled low, bootloader execution is resumed.
 Else, the first location of application is fetched and checked. If it is empty (0xFFFFFFFF), then bootloader execution is resumed. Else it jumps to application and starts execution from there.
 
-Currently, BOOT_LOAD_PIN is PA15 of SAMD21G18A, pin 5 of Arduino Zero board.
+BOOT_LOAD_PIN is PA27 of SAMD21ExxA, Arduino pin 27 of MT-D21E board.
diff --git a/bootloaders/zero/samd21_sam_ba.bin b/bootloaders/zero/samd21_sam_ba.bin
deleted file mode 100644
index 08f40f425437f8fc80c2462668f3d15bdf5453d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6328
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
B7V`iA

diff --git a/bootloaders/zero/samd21j18a_flash.ld b/bootloaders/zero/samd21j18a_flash.ld
deleted file mode 100644
index c9385c487..000000000
--- a/bootloaders/zero/samd21j18a_flash.ld
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * \file
- *
- * \brief Linker script for running in internal FLASH on the SAMD21J18A
- *
- * Copyright (c) 2013-2014 Atmel Corporation. All rights reserved.
- *
- * \asf_license_start
- *
- * \page License
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. The name of Atmel may not be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * 4. This software may only be redistributed and used in connection with an
- *    Atmel microcontroller product.
- *
- * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * \asf_license_stop
- *
- */
-
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-SEARCH_DIR(.)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00040000
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
-}
-
-/* The stack size used by the application. NOTE: you need to adjust according to your application. */
-STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
-
-/* Section Definitions */
-SECTIONS
-{
-    .text :
-    {
-        . = ALIGN(4);
-        _sfixed = .;
-        KEEP(*(.vectors .vectors.*))
-        *(.text .text.* .gnu.linkonce.t.*)
-        *(.glue_7t) *(.glue_7)
-        *(.rodata .rodata* .gnu.linkonce.r.*)
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-
-        /* Support C constructors, and C destructors in both user code
-           and the C library. This also provides support for C++ code. */
-        . = ALIGN(4);
-        KEEP(*(.init))
-        . = ALIGN(4);
-        __preinit_array_start = .;
-        KEEP (*(.preinit_array))
-        __preinit_array_end = .;
-
-        . = ALIGN(4);
-        __init_array_start = .;
-        KEEP (*(SORT(.init_array.*)))
-        KEEP (*(.init_array))
-        __init_array_end = .;
-
-        . = ALIGN(4);
-        KEEP (*crtbegin.o(.ctors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-        KEEP (*(SORT(.ctors.*)))
-        KEEP (*crtend.o(.ctors))
-
-        . = ALIGN(4);
-        KEEP(*(.fini))
-
-        . = ALIGN(4);
-        __fini_array_start = .;
-        KEEP (*(.fini_array))
-        KEEP (*(SORT(.fini_array.*)))
-        __fini_array_end = .;
-
-        KEEP (*crtbegin.o(.dtors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-        KEEP (*(SORT(.dtors.*)))
-        KEEP (*crtend.o(.dtors))
-
-        . = ALIGN(4);
-        _efixed = .;            /* End of text section */
-    } > rom
-
-    /* .ARM.exidx is sorted, so has to go in its own output section.  */
-    PROVIDE_HIDDEN (__exidx_start = .);
-    .ARM.exidx :
-    {
-      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    } > rom
-    PROVIDE_HIDDEN (__exidx_end = .);
-
-    . = ALIGN(4);
-    _etext = .;
-
-    .relocate : AT (_etext)
-    {
-        . = ALIGN(4);
-        _srelocate = .;
-        *(.ramfunc .ramfunc.*);
-        *(.data .data.*);
-        . = ALIGN(4);
-        _erelocate = .;
-    } > ram
-
-    /* .bss section which is used for uninitialized data */
-    .bss (NOLOAD) :
-    {
-        . = ALIGN(4);
-        _sbss = . ;
-        _szero = .;
-        *(.bss .bss.*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = . ;
-        _ezero = .;
-    } > ram
-
-    /* stack section */
-    .stack (NOLOAD):
-    {
-        . = ALIGN(8);
-        _sstack = .;
-        . = . + STACK_SIZE;
-        . = ALIGN(8);
-        _estack = .;
-    } > ram
-
-    . = ALIGN(4);
-    _end = . ;
-}
diff --git a/platform.txt b/platform.txt
index 2a130468c..8363ea9f9 100644
--- a/platform.txt
+++ b/platform.txt
@@ -14,13 +14,18 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+/*
+ * Modified 23 June 2015 by Justin Mattair
+ *   for the MattairTech MT-D21E board (www.mattairtech.com)
+ */
+
 # Arduino SAMD Core and platform.
 #
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
-name=Arduino SAMD (32-bits ARM Cortex-M0+) Boards
-version=1.6.0
+name=MattairTech SAMD Boards
+version=1.6.5-mt1
 
 # Compile variables
 # -----------------
diff --git a/programmers.txt b/programmers.txt
index fd7471b7d..93a928fc4 100644
--- a/programmers.txt
+++ b/programmers.txt
@@ -14,12 +14,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-edbg.name=Atmel EDBG
-edbg.communication=USB
-edbg.protocol=
-edbg.program.protocol=
-edbg.program.tool=openocd
-edbg.program.extra_params=
 
 atmel_ice.name=Atmel-ICE
 atmel_ice.communication=USB
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E15A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E15A.gdb
new file mode 100644
index 000000000..4ae3c04f0
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e15" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E16A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E16A.gdb
new file mode 100644
index 000000000..eb114b493
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e16" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E17A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E17A.gdb
new file mode 100644
index 000000000..cb1c7c44e
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e17" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E18A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E18A.gdb
new file mode 100644
index 000000000..13ee2a173
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e18" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..717073abe
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00020000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..61ad501ed
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00020000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
new file mode 100644
index 000000000..3a172e3ae
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..710c8664c
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00040000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_with_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_with_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_without_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..d4fa67a05
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00008000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..475b359e4
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00008000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
new file mode 100644
index 000000000..4155e0791
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..6a6cc4ab0
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00010000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..a692b2ce1
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00010000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
new file mode 100644
index 000000000..5ed72842d
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg
new file mode 100644
index 000000000..0355cc401
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg
new file mode 100644
index 000000000..4eaf7acfc
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg
new file mode 100644
index 000000000..6b5641483
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg
new file mode 100644
index 000000000..b99d610ef
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]

From c1fc711c08af4cb57ad4ae9620ea00b046fc944f Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 27 Jun 2015 19:56:37 +0000
Subject: [PATCH 004/124] Modified bootloader to support MT-D21E (continued
 from last commit)

---
 bootloaders/zero/samd21e15a_flash.ld   | 157 +++++++++++++++++++++++++
 bootloaders/zero/samd21e15a_sam_ba.bin | Bin 0 -> 6360 bytes
 bootloaders/zero/samd21e16a_flash.ld   | 157 +++++++++++++++++++++++++
 bootloaders/zero/samd21e16a_sam_ba.bin | Bin 0 -> 6360 bytes
 bootloaders/zero/samd21e17a_flash.ld   | 157 +++++++++++++++++++++++++
 bootloaders/zero/samd21e17a_sam_ba.bin | Bin 0 -> 6360 bytes
 bootloaders/zero/samd21e18a_flash.ld   | 157 +++++++++++++++++++++++++
 bootloaders/zero/samd21e18a_sam_ba.bin | Bin 0 -> 6360 bytes
 8 files changed, 628 insertions(+)
 create mode 100644 bootloaders/zero/samd21e15a_flash.ld
 create mode 100755 bootloaders/zero/samd21e15a_sam_ba.bin
 create mode 100644 bootloaders/zero/samd21e16a_flash.ld
 create mode 100755 bootloaders/zero/samd21e16a_sam_ba.bin
 create mode 100644 bootloaders/zero/samd21e17a_flash.ld
 create mode 100755 bootloaders/zero/samd21e17a_sam_ba.bin
 create mode 100644 bootloaders/zero/samd21e18a_flash.ld
 create mode 100755 bootloaders/zero/samd21e18a_sam_ba.bin

diff --git a/bootloaders/zero/samd21e15a_flash.ld b/bootloaders/zero/samd21e15a_flash.ld
new file mode 100644
index 000000000..43d77e4f8
--- /dev/null
+++ b/bootloaders/zero/samd21e15a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E15A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e15a_sam_ba.bin b/bootloaders/zero/samd21e15a_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..98598dd28166dda8b565047946ec6293b18e85ab
GIT binary patch
literal 6360
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/samd21e16a_flash.ld b/bootloaders/zero/samd21e16a_flash.ld
new file mode 100644
index 000000000..d33d2d948
--- /dev/null
+++ b/bootloaders/zero/samd21e16a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E16A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x800;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e16a_sam_ba.bin b/bootloaders/zero/samd21e16a_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1226419b41e3bdd43368c38fd6fd3f54cf3f5173
GIT binary patch
literal 6360
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/samd21e17a_flash.ld b/bootloaders/zero/samd21e17a_flash.ld
new file mode 100644
index 000000000..5167be9b1
--- /dev/null
+++ b/bootloaders/zero/samd21e17a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E17A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x1000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e17a_sam_ba.bin b/bootloaders/zero/samd21e17a_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1c3d0ba58e90b82c5235c900570a1018d51081bc
GIT binary patch
literal 6360
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/samd21e18a_flash.ld b/bootloaders/zero/samd21e18a_flash.ld
new file mode 100644
index 000000000..d90abac6d
--- /dev/null
+++ b/bootloaders/zero/samd21e18a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E18A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e18a_sam_ba.bin b/bootloaders/zero/samd21e18a_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..864d191cfd9cb51244a8b251e9216686899fc9fc
GIT binary patch
literal 6360
zcmcgQdwdkt)%VWqE4vBVO?YfJLzvwOVUtDNJb;k!7<Mq(-3b9P)g(N+L24&RVUw!e
zP?Zgly1X<bK9b-IqD87G#;(+AN)Y%I(Ygbr1%mCY)<$d9_))q+LgqU+0qfWP`u+Ls
z?|0_hd+xdC+;i@^=bpPA9AcXd2;FxL(EsrxJlB8M`TxJMIjXDRLdd0;wIXs+F^v}~
z=rHEEpt*M`LM&Nd#EOt1YJhP%ruQ0rghTJ8CDPXc6~#Kr4ZVG3*Lka89+^Xa?&u9-
zmc3R=Ww!~G-6-VwY6Hf#d15+mTAeG_N}Gk+Ky7H6cUce0`=)=9)Z$o1IRp>T2<1w@
z-EWq{;}$rPJcXU&XDiaAHf>wVUJsJ9{9(#0Y}*me-YaZ-;5})){}bJnGZ{X4^)9;)
zwXWXvKy74!eVb4lu8D*lr?3%PunwSLSO?LX<QvoKl~Vka;Qv;qo7lpmg~)(-by!tV
zGUBrXVdMl*X@pdaQ1}fnPLI*-XrTzwwOxVQx_rNtv4pV0!n;M}K)FVlk!JWG@nAV4
zkfYcF)BU&v<qgZWfJ@AfM23mw!Q8xxG_7uGZD4A!t1ffx+OkaCpL)9CbQ5wV$HH8{
zwxur2y})NmEf)<D7Wmt6SHMuNCYGs_MeMKz4`2NL!>eCIgGE>H;N~F>(=D+~NBJZX
zIdP1P+d?Q$8-tx3oHm38-}q*DAQSfca~Tajeg!!PVi-njF!B<N^p%Adp@qd7#1C&m
z?9ApL>%E_1q+!8Upf3kNUm&Fd_IDisc4{GNbbebvCt8CV1vx2M<Hw>c5G=nJBlf)s
z2;B{Q)`=tzY~q%KM00LTlZ$0a(kK+c5u{KdAJRN8SWTrXY~3DHER{9$Nlxmld#Y1F
z%51kan3jY~zaGHPyE!@-;)I~lAy~VDDUS0&t*FV*l(0gJnNq*hQLa7c?!60i68(*@
z5#K<Bf)~EJXlT*+(*yLV9|g%;9xNwzgn>^V)pMy1inlN*$(^5+hd$KjuPy7W!lf5a
z(V|qADH-fUwjSbw$Q_KnU-AB8PU7vE^$#9&g11llPWs;y4FSYX2v`FrD&O`MNJ-K*
z4?2A*etb!>M1|BmB>yGO<)K(_{H?_<@Pj7CNk_c>5@qiw?-Mgax47oXufsfp)auDP
zcSytqnNmR@gNcebKO^ufakDK`>hhp-Hs&?)&|<5U7r=u%hF+?4NwcJ4sVn2f%7VaK
z){?+0{`BB}-@YYD(!NR)vp~Y7g@ID0yOQ92{{5mw$_#DyXiqt$XT2wENNTHZE$=I1
z<I7w+`58YanWZQF%j+%D#P|}IR^Bak`7@<7$renFd!hfh_}ExKtdHLY{dTc!tRGO7
z4K7-KSj2X#q*o-DLEa&5_hy29nGrgmCPqfSRDJ?F9u&6#Rb$VT=)lE+a@QoeS+q)O
z!l|~v9+D{E{GGTCgJ&Sa$T5YJbZjQ<!bzpdMah_R1#eX<T}FA-mog`<zvfE>Bd;sB
zx+;K%Vc#0O9p#)vLu&)HHo(3)nSK}{)D)nu8y&w+tEsGAEO`;<4!8mZOfHiyeV>^W
zm=Z!a(lL{S3r&Gb1DupQ8f%=i0(25dE4?=c+yTEoU8-R$0kUFE%q!X?Twntm|H*&T
z=o;&loBY+T339r$6tde={{-m(YVjnUs`S?w<hn|qC2YCx1O4!s<r!qI2y>PwHLe0V
zO)3_>K9onvnUX1xqZlNQZ?Ysx;ha~6HiH;Ic}#4fXbPL|`y<Ro+?>i;(rboSJ=E!W
zmE*!XrQP#Q>?!nM4K957=D~q+_a%VqDRdwsoN>ygfTkkQWK(KgHaSb2Bu$o3&Q}?|
z9$m~C%4g8v-phEVj`;`h5wGTf*W8Sns2c%)!aN$hFizYECv6-#Z-FG(w|38uAjS!|
z9k_p}kh4<^zyPoSZUAytlOaE3L;C@M5I_XL3J?Y$XO!fSPa&6BfbXw>iva%(@DP9#
zc!~f>zNVg2RSaW6;9mr74S*K<NdP8*Q~(R(p7T!6Br(aUIct?DY!Na7HpRj$oTJU9
z&t^%pOY*S}`gPFPoSh=wRx$@}4udj1kCu&ot7HyfCCO(D5*rQIc36K6Q-9GP9E2Qk
z-40?Cv5_S>YVmJ9cxPGuyZJ{6Sl+c9P4U;4wM)zC<*B>T@@kXM6ljx-zP6rQ1Y;n{
zha4vGBJm{gs+u@<mE`9a!DeDBv3WWGv7h*i=o%RS`@CsBb2Q??F~niTEb0|=#k<zM
zp3A3>Rci{z2NDA*{*1|*(smDhir8R+9Zm8ZMHTMFt^gXGH=-sU9Ud9Dc7L<vE+=(B
z2R&8`ko;d9<@`81o$(iDgeH{Qg_^sqp;UWBum-Im3UanJC>EGQnTuJ$47ZPyvG5sy
zS-5p=K{WXM)d^xVV_Um}A1^Sg)5Qgj>PT9?g>MxMLiKm<>SGQklj3Wm(cr$T$s)>T
zf+q3bp_ts&<X$o$4}yD(+|`=n2<-rWq*I993AhztJhUwUhUk$V%8LeHxQf})ng!-j
zqV;}W-<KMMJV@jiqH5xjikw$sg!753*ZBzjGZk?i9&Job{7t19uC&&3%R(z-=nY0S
zObSzG{iR0}V?%1<q>77%2AoW=*9;?S;*81$F>CHM8LN3(<WXO366NK?Jw&Gm;xZ9M
z*;*!*$zk5~upqrxwTOK^nIYVY;5_Dogpbq|QODRKC{H6N`z@h72IcBwxN|L&8w}q_
z$r%wmCnJoDp6!{yTo`aONWtt#FR}R{us;p(V06nt`b8~+cd-m*R};roCldyIL``3;
zV@Mvg%4#C4>M1pGpL)2*6<T0D+=E>yu|pn%%!P1QyGJAU3#&u@JzZd@l~ohBsfeW&
z9kiCInAMKPKhZfDonN`-Aac;H$xK0TuDA=TAnd?Oi7z>93vS{Vh|qA+6M~xXs)eDx
z9;iTLXzEOebAGh{f@hX2IO$k}^Oo2I=jV{`Q9A}LQ&iNUCKwfUhNr$G^!2ETi7LGt
zO{3bg{pk_pnk?IWxIHO^a;-83PQ5yZAy`oHJUxSMfV#&>W?dN>g6|MSy8-kemoYXo
zI7Oj4acNR0JxuM!yKo`Z{^3AhkIt!=(QdjE7xwpr^HF<vF1-s)|COwP)trU-pN?om
zJe3JTRXo+n5DyUhiNA^8hoanK#OWDVu#<QI&Lr!%gjxTZ?DU`j5)O@IRjP^Kj36g1
zqZxDz&rb{hmhoIP{Y!bOf^!JZ^bnd3CptS->Fa^2E2eRdmx<3iM$AevL!!f?lKsQ6
z=|Pi%K^C6%kDl;sWdJ$<2sIhv(t|jgWrqG&JfNA$XegRhIe{q*X`q@<lNpim+t$>s
zYcsXcwQH)^+58k=yJj!99DTHcXDQ*MD$ErIz0=g$AFae(I&X`miomUDOa6t2I<<1$
z0nLGA1Cz&?d}wg~@JB0Y&c>5!JHE10Ffr-E$KOLRA1RX=C#+=$<ds%{v*0Ur0UAt1
z$1_Oc{HyR}2Di3nRM$^qc*LjDZgb(=ye^i?gdH_fnvPWONy?4PPqUt0XcZ4*)mqFr
z;D*u;kN5A<JeD!LuCab=GO@uZG}blLoBf8FM!vBQKYb^@Vm;SHLxoPUSUB6%Do~73
zINwmy6m~50fZT>Lp8lpT{pB+(Gtx`eXNBBH)>j-Y7FqlG`cxL?)Xjn_B_jm)N3clD
z2sHy{LOOf0zy$LvriLa6Q=!lDBqs*4S;&buhzqi-BhLs}s0mj`Hrr2N(sIIFk{7!|
zvVQn?IbKS-*)#>#w+mi4TDyhcfhX^@`*L}^kg-K0?MXKBQ=pQZ>|l0Iu^agvf<v%v
zp(MTiREm*@dQ+wyM&7#9LQjC51G!r=LYsg>UI7}r#Y;3*ueNPXhHP(Zwr$0u7}>)P
zG`Qi)XfA~uS`GPhE<g>*tB_C8QnZk~e-;d>s`{|15}zQBZV(!DA`Y|!v?Ap=3SYX;
z6iOFNL6XxJry?{j1)*1x5lR+ScWpgoAC0OyY9omXqkuP##RT2Bxhc#o_oNFg4fMt?
zs7c6tq9YO2NLr?QyMd*7mQmg0?EpQyN$75|IKo_aqbJBaHp4m&hzBZGNqzPleyetz
zuqv>sz6d;4Q@7uj5df%LAwBQ2^Wp4gDWC>wq^+i{bWH$po(5M#JdQV-9TxE21!z4{
zX%wi&r<N3ip7NCh8$%sSjKN=ro~YbWRuH}%Du^UeMxh{F($wKIhK-S?rpJ~LN=f*k
zCBJTZWJyVQPGpB4?~<Ev*BG6*uP$5IU<qyYCsAn-Ej#>=lx_9b-Gt<>ICCL9Z4-JO
zG=HrmU1-ila)+`RzFkT<7sVcm?^2rK<aNThC63N-j`wl9M|<a$a6G~y+zcZ>Rgy0}
z!}SAwT`V?=#n@dU%!#d!cPc+7E%^uWnHO5QOiZY^#|tAY<7!Y7Md~vg?SPYAwNhN=
zuU^+@H-q=!4qj8ns%}0fr>e&5&f(qGHLWa<a;mED<foZ=EVQvTxAQ1$w^yz3T5mrH
zW7DdtH$a~FVGpb}UNt9v+o;y8_^qSs$ctAjDUICO;D{GQV4qPJ+$E)vG)KD!pDl^B
z^*EWuKJ)0<ZWu$cw0LPm_|9m#565Bm6BkBC=R=(I_jEVv;<=NZ40ilo;eAfV6s8<s
zDf4`$@WjYcE{mTlW(6ljQgi0>6M;g{Sa_Dy<hodT#89{#|JmBzv|FcD{@Lr-^{1M`
zPKI)vR4kEAT&Lg?PxNF2&5=|)<}Km;2!b6s4r74jBY^2#bgow+QVk&0Z6|U+w$?Un
z6Ii<*B!8D;h74HSuvckmay!}u)<Giu=gL@&lM~ee`R{s;`3c1RP5?8hS;)N&fZ;y}
z3c$`HR1LXkj~&_$c#@C($HG1Y{PzHit$hB!t-M|)>%JpKR(<=ZC$g`3;$v%P6U9Yz
zRc9;_ca9<7hwH3{rh@{T;}#4Jz|W4+PBi(FFrVS!K}O&j-#fs^=Wy4&NF-tIx4Iku
zMUweHNXq;dNkrp24QUZW!7{wpn%-biN+X7EqreDzj5sy%<*-p9vGDt=Iz=t&{??z}
z4bG;KUgCpA0OqJx)K+i-HIZ|bW$f^_d>*j5m*lY!jO(LNiL~PVls6q@9UI2%xL!g}
zkFG1z7ug}ID6g7m9A-lkN9pFMzJh2ybd_ch+XB^}L-KNJVQdBFti1Ue56vXQEtJ8~
zUJNVk93~q3%81-x)KH;gSf~%7w!S)6KeBLZ=RtqLFwIz@N+f(k(c}s(@Qnj{Gw@Ag
zikJ?MF@~n=W4R!^80gc6vu!t6FAWsJtf6c2H${zNeOd5i@JOb#w#)>1trOi`9f1lB
z7iwHXGGdWpWi$taz+Y`e$Q(Ud{{-ANv_xfh3v}REJ%)PhimZ`1=+V*z7`sk8R)2wK
zJP8@zIsz3qT3-uekcTKC(A@m36o_a#VD8nx%Y?rFJY;aZC0GtIdq3uG)?Yc}*>3ab
zWzY8Wyv;)cZZp_CRE!>d<)fW_qc!kEi1T1{oH%YV%KpN3z?{Xr2<z`g7pptUNhOU2
ze|Fg*CjE!eVDDXE*L4Vu+K4!K<HX)uajXg#ULG*_(#&RSJLt^_;=*qR$odQjd;tK*
z3NAT>!T<;ZPyk@eo+N~h14IEX1Ed?_Eop)`7Tjs~z%2jW>)C?YY=Jv}Cd!{vQV4Iy
znW);Bf@%P25eMJ-D1Syi5&K*^LcIWI04@Ve7(a&R0bahaan0TJ>o=5C*VL{AUc1@D
z-tK;Ye{Si21qOnK=G<NWJ$Jsc<H!N|xACvO&QCK_KQ372h%S4?lW6??>N)M!mY=>_
z+ueKmiKFVpKYqMATPR{Rc>G`1ynWZRi?&p)eNK!zw<JCK<tHCpdhz(qGq=oY%&|;#
z>;7=hKkj(+)?bz_KeTaQ#^c2g{wXms@Z=xfeEXR9lj@&I`$D{-&PqAC;`dH`aqgkd
zUcT(zTHk5h?|S`G?eF}DHa@nt!M4;`Sdx}^wg1A&!&jdAylHp!_R=?OFZ_JngZKWq
z;`j>3bb4+ec_H)C7Y|?k+xzc-n0LU`EA8|>`S|^>tv|Es@0IEE3ufG$6&&}p`kSvl
z{L}CUnTJbWu6a82aAep1=67HDd{44`!;#9bH^jr{J?Jg>$E;@QRK6_u!@%n;9qm`T
z&%ZkFD06z#$Ez;BLbaw{bet-f=^4N5C#!F5{A={&bI(7zb<6roOFo%?Cgu1?MMtxr
z8Q-kA<F4{G*;U#_{rkQ-)cN4A9{>Kp{fWtM&;7&cod2G+OLuVMZFk&r&xEp~TPx1}
z=)}0oH-7d`=Vx2Dz5c@fMb$s>>O#|`K5N{txwzYT-^msI3qH@fa(VmN-EX|m^~T-)
zs@mCWCvN=O7_+^a*H$v)YU&s3K3x3%FM78h`1HvWJ9F;UuUoU?ri#6DTc#__k>n{~
z%~w}`aPOaXzx?aN=N=w<deZt?_kXYQu2t<bdgjaH2D1=K!)6R2$S;Ja1Ka~+F-hLH
z$pB`6@yIh2?JFC4)9~g~Wx?`u!1CSxE6`7(1Vmxfhms(WF$LnZ*&s}lO+iD4uonI>
hz<O;9Z9r<01|te$8|k&p6i*OE5JGPe<%ZEC@jvp_AJPB-

literal 0
HcmV?d00001


From ff0dd2995d0b0e0f3d255c13c5e5473fde0dcbb5 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 27 Jun 2015 20:49:05 +0000
Subject: [PATCH 005/124] Re-added all changes that git undid/deleted, maybe I
 should try CVS

---
 README                                        |   7 +-
 boards.txt                                    | 175 ++++++++++----
 bootloaders/zero/Makefile                     |  15 +-
 bootloaders/zero/main.c                       |  10 +-
 bootloaders/zero/main.h                       |   3 +-
 bootloaders/zero/readme.txt                   |   9 +-
 bootloaders/zero/samd21e15a_flash.ld          | 157 ++++++++++++
 bootloaders/zero/samd21e16a_flash.ld          | 157 ++++++++++++
 bootloaders/zero/samd21e17a_flash.ld          | 157 ++++++++++++
 bootloaders/zero/samd21e18a_flash.ld          | 157 ++++++++++++
 platform.txt                                  |   9 +-
 programmers.txt                               |   6 -
 variants/MT_D21E/debug_scripts/SAMD21E15A.gdb |  31 +++
 variants/MT_D21E/debug_scripts/SAMD21E16A.gdb |  31 +++
 variants/MT_D21E/debug_scripts/SAMD21E17A.gdb |  31 +++
 variants/MT_D21E/debug_scripts/SAMD21E18A.gdb |  31 +++
 .../gcc/flash_128KB_with_16KB_bootloader.ld   | 211 ++++++++++++++++
 .../gcc/flash_128KB_with_8KB_bootloader.ld    | 211 ++++++++++++++++
 .../gcc/flash_128KB_without_bootloader.ld     | 212 ++++++++++++++++
 .../gcc/flash_256KB_with_16KB_bootloader.ld   | 211 ++++++++++++++++
 .../gcc/flash_256KB_with_8KB_bootloader.ld    | 211 ++++++++++++++++
 .../gcc/flash_256KB_without_bootloader.ld     | 212 ++++++++++++++++
 .../gcc/flash_32KB_with_16KB_bootloader.ld    | 211 ++++++++++++++++
 .../gcc/flash_32KB_with_8KB_bootloader.ld     | 211 ++++++++++++++++
 .../gcc/flash_32KB_without_bootloader.ld      | 212 ++++++++++++++++
 .../gcc/flash_64KB_with_16KB_bootloader.ld    | 211 ++++++++++++++++
 .../gcc/flash_64KB_with_8KB_bootloader.ld     | 211 ++++++++++++++++
 .../gcc/flash_64KB_without_bootloader.ld      | 212 ++++++++++++++++
 .../MT_D21E/openocd_scripts/SAMD21E15A.cfg    |  30 +++
 .../MT_D21E/openocd_scripts/SAMD21E16A.cfg    |  30 +++
 .../MT_D21E/openocd_scripts/SAMD21E17A.cfg    |  30 +++
 .../MT_D21E/openocd_scripts/SAMD21E18A.cfg    |  30 +++
 variants/MT_D21E/pins_arduino.h               |  21 ++
 variants/MT_D21E/variant.cpp                  | 160 +++++++++++++
 variants/MT_D21E/variant.h                    | 226 ++++++++++++++++++
 35 files changed, 3973 insertions(+), 76 deletions(-)
 create mode 100644 bootloaders/zero/samd21e15a_flash.ld
 create mode 100644 bootloaders/zero/samd21e16a_flash.ld
 create mode 100644 bootloaders/zero/samd21e17a_flash.ld
 create mode 100644 bootloaders/zero/samd21e18a_flash.ld
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E15A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E16A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E17A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMD21E18A.gdb
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
 create mode 100644 variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg
 create mode 100644 variants/MT_D21E/pins_arduino.h
 create mode 100644 variants/MT_D21E/variant.cpp
 create mode 100644 variants/MT_D21E/variant.h

diff --git a/README b/README
index 2fec07667..b7ae2959c 100644
--- a/README
+++ b/README
@@ -1,3 +1,6 @@
 This is a fork from arduino/ArduinoCore-samd on GitHub.
-This will be used to add Arduino support to the MattairTech
-MT-D21E and probably also the MT-D11.
+This will be used to maintain Arduino support for the
+MattairTech MT-D21E and probably also the MT-D11.
+
+The resulting Arduino support package will be available
+at mattairtech.github.io
diff --git a/boards.txt b/boards.txt
index ad7d50242..402d45548 100644
--- a/boards.txt
+++ b/boards.txt
@@ -14,54 +14,129 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-arduino_zero_edbg.name=Arduino Zero (Programming Port)
-arduino_zero_edbg.vid.0=0x03eb
-arduino_zero_edbg.pid.0=0x2157
-arduino_zero_edbg.upload.tool=openocd
-arduino_zero_edbg.upload.protocol=sam-ba
-arduino_zero_edbg.upload.maximum_size=262144
-arduino_zero_edbg.upload.use_1200bps_touch=false
-arduino_zero_edbg.upload.wait_for_upload_port=false
-arduino_zero_edbg.upload.native_usb=false
-arduino_zero_edbg.build.mcu=cortex-m0plus
-arduino_zero_edbg.build.f_cpu=48000000L
-arduino_zero_edbg.build.usb_product="Arduino Zero"
-arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
-arduino_zero_edbg.build.board=SAMD_ZERO
-arduino_zero_edbg.build.core=arduino
-arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_edbg.build.variant=arduino_zero
-arduino_zero_edbg.build.variant_system_lib=
-arduino_zero_edbg.build.vid=0x2341
-arduino_zero_edbg.build.pid=0x804d
-arduino_zero_edbg.bootloader.tool=openocd
-arduino_zero_edbg.bootloader.file=zero/samd21_sam_ba.bin
+/*
+ * Modified 23 June 2015 by Justin Mattair
+ *   for the MattairTech MT-D21E board (www.mattairtech.com)
+ */
 
-arduino_zero_native.name=Arduino Zero (Native USB Port)
-arduino_zero_native.vid.0=0x2341
-arduino_zero_native.pid.0=0x804d
-arduino_zero_native.vid.1=0x2341
-arduino_zero_native.pid.1=0x004d
-arduino_zero_native.upload.tool=bossac
-arduino_zero_native.upload.protocol=sam-ba
-arduino_zero_native.upload.maximum_size=262144
-arduino_zero_native.upload.use_1200bps_touch=true
-arduino_zero_native.upload.wait_for_upload_port=true
-arduino_zero_native.upload.native_usb=true
-arduino_zero_native.build.mcu=cortex-m0plus
-arduino_zero_native.build.f_cpu=48000000L
-arduino_zero_native.build.usb_product="Arduino Zero"
-arduino_zero_native.build.usb_manufacturer="Arduino LLC"
-arduino_zero_native.build.board=SAMD_ZERO
-arduino_zero_native.build.core=arduino
-arduino_zero_native.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-arduino_zero_native.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_native.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_native.build.variant=arduino_zero
-arduino_zero_native.build.variant_system_lib=
-arduino_zero_native.build.vid=0x2341
-arduino_zero_native.build.pid=0x804d
-arduino_zero_native.bootloader.tool=openocd
-arduino_zero_native.bootloader.file=zero/samd21_sam_ba.bin
+menu.cpu=Processor
+
+# MattairTech MT-D21E (default 8KB bootloader)
+mattairtech_mt_d21e.bl8k.name=MattairTech MT-D21E (SAM-BA bootloader)
+mattairtech_mt_d21e.bl8k.vid.0=0x16D0
+mattairtech_mt_d21e.bl8k.pid.0=0x0557
+mattairtech_mt_d21e.bl8k.vid.1=0x16D0
+mattairtech_mt_d21e.bl8k.pid.1=0x0856
+mattairtech_mt_d21e.bl8k.upload.tool=arduino:bossac
+mattairtech_mt_d21e.bl8k.upload.protocol=sam-ba
+mattairtech_mt_d21e.bl8k.upload.use_1200bps_touch=true
+mattairtech_mt_d21e.bl8k.upload.wait_for_upload_port=true
+mattairtech_mt_d21e.bl8k.upload.native_usb=true
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
+mattairtech_mt_d21e.bl8k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.bl8k.build.f_cpu=48000000L
+mattairtech_mt_d21e.bl8k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.bl8k.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e.bl8k.build.board=MT_D21E
+mattairtech_mt_d21e.bl8k.build.core=arduino
+mattairtech_mt_d21e.bl8k.build.variant=MT_D21E
+mattairtech_mt_d21e.bl8k.build.variant_system_lib=
+mattairtech_mt_d21e.bl8k.build.vid=0x16D0
+mattairtech_mt_d21e.bl8k.build.pid=0x0856
+mattairtech_mt_d21e.bl8k.bootloader.tool=arduino:openocd
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.bootloader.file=zero/samd21e18a_sam_ba.bin
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.bootloader.file=zero/samd21e17a_sam_ba.bin
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.bootloader.file=zero/samd21e16a_sam_ba.bin
+mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam_ba.bin
+
+
+# MattairTech MT-D21E (16KB bootloader), build only
+mattairtech_mt_d21e.bl16k.name=MattairTech MT-D21E (MSD bootloader)
+mattairtech_mt_d21e.bl16k.vid.0=0x16D0
+mattairtech_mt_d21e.bl16k.pid.0=0x0557
+mattairtech_mt_d21e.bl16k.vid.1=0x16D0
+mattairtech_mt_d21e.bl16k.pid.1=0x0856
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.upload.maximum_size=245760
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.upload.maximum_size=114688
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.upload.maximum_size=49152
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.upload.maximum_size=16384
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
+mattairtech_mt_d21e.bl16k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.bl16k.build.f_cpu=48000000L
+mattairtech_mt_d21e.bl16k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.bl16k.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e.bl16k.build.board=MT_D21E
+mattairtech_mt_d21e.bl16k.build.core=arduino
+mattairtech_mt_d21e.bl16k.build.variant=MT_D21E
+mattairtech_mt_d21e.bl16k.build.variant_system_lib=
+mattairtech_mt_d21e.bl16k.build.vid=0x16D0
+mattairtech_mt_d21e.bl16k.build.pid=0x0856
+
+
+# MattairTech MT-D21E (no bootloader)
+mattairtech_mt_d21e.bl0k.name=MattairTech MT-D21E (no bootloader)
+mattairtech_mt_d21e.bl0k.vid.0=0x16D0
+mattairtech_mt_d21e.bl0k.pid.0=0x0557
+mattairtech_mt_d21e.bl0k.vid.1=0x16D0
+mattairtech_mt_d21e.bl0k.pid.1=0x0856
+mattairtech_mt_d21e.bl0k.upload.tool=arduino:openocd
+mattairtech_mt_d21e.bl0k.upload.protocol=sam-ba
+mattairtech_mt_d21e.bl0k.upload.use_1200bps_touch=false
+mattairtech_mt_d21e.bl0k.upload.wait_for_upload_port=false
+mattairtech_mt_d21e.bl0k.upload.native_usb=false
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.upload.maximum_size=262144
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.upload.maximum_size=131072
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.upload.maximum_size=65536
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.upload.maximum_size=32768
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_without_bootloader.ld
+mattairtech_mt_d21e.bl0k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.bl0k.build.f_cpu=48000000L
+mattairtech_mt_d21e.bl0k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.bl0k.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e.bl0k.build.board=MT_D21E
+mattairtech_mt_d21e.bl0k.build.core=arduino
+mattairtech_mt_d21e.bl0k.build.variant=MT_D21E
+mattairtech_mt_d21e.bl0k.build.variant_system_lib=
+mattairtech_mt_d21e.bl0k.build.vid=0x16D0
+mattairtech_mt_d21e.bl0k.build.pid=0x0856
diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index d8fb2f349..d3758b86b 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -1,15 +1,15 @@
-IDE_PATH="../../../../.."
-ARM_GCC_PATH=$(IDE_PATH)/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin
+TOOLS_PATH="../../../arduino15/packages/arduino/tools"
+ARM_GCC_PATH=$(TOOLS_PATH)/arm-none-eabi-gcc/4.8.3-2014q1/bin
 CC=$(ARM_GCC_PATH)/arm-none-eabi-gcc
 CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -g -Os -w -std=gnu99 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
 LDFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols
-BLD_EXTA_FLAGS=-D__SAMD21G18A__
+BLD_EXTA_FLAGS=-D__SAMD21E18A__
 BUILD_PATH=build
-INCLUDES=-I$(IDE_PATH)/hardware/tools/CMSIS/CMSIS/Include/ -I$(IDE_PATH)/hardware/tools/CMSIS/Device/ATMEL/ -I./drivers/ -I./utils/ -I./utils/preprocessor/ -I./utils/interrupt 
+INCLUDES=-I$(TOOLS_PATH)/CMSIS/4.0.0-atmel/CMSIS/Include/ -I$(TOOLS_PATH)/CMSIS/4.0.0-atmel/Device/ATMEL/ -I./drivers/ -I./utils/ -I./utils/preprocessor/ -I./utils/interrupt 
 SOURCES=main.c sam_ba_monitor.c startup_samd21.c usart_sam_ba.c drivers/cdc_enumerate.c drivers/uart_driver.c utils/interrupt/interrupt_sam_nvic.c 
 OBJECTS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.o))
 
-NAME=samd21_sam_ba
+NAME=samd21e18a_sam_ba
 EXECUTABLE=$(NAME).bin
 
 SLASH=/
@@ -18,7 +18,7 @@ BSLASH=$(EMPTY)\$(EMPTY)
 all: $(SOURCES) $(EXECUTABLE)
 	
 $(EXECUTABLE): $(OBJECTS) 
-	$(CC) -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps  -Tsamd21j18a_flash.ld -Wl,-Map,$(BUILD_PATH)/$(NAME).map --specs=nano.specs --specs=nosys.specs -o $(BUILD_PATH)/$(NAME).elf $(OBJECTS) -Wl,--start-group -lm -Wl,--end-group
+	$(CC) -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps  -Tsamd21e18a_flash.ld -Wl,-Map,$(BUILD_PATH)/$(NAME).map --specs=nano.specs --specs=nosys.specs -o $(BUILD_PATH)/$(NAME).elf $(OBJECTS) -Wl,--start-group -lm -Wl,--end-group
 	$(ARM_GCC_PATH)/arm-none-eabi-objcopy -O binary $(BUILD_PATH)/$(NAME).elf $@
 
 $(BUILD_PATH)/%.o: %.c
@@ -26,4 +26,5 @@ $(BUILD_PATH)/%.o: %.c
 	$(CC) $(CFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@
 	
 clean:
-	del $(EXECUTABLE) $(subst /,\,$(OBJECTS)) $(subst /,\,$(BUILD_PATH)/$(NAME).*)
+#	del $(EXECUTABLE) $(subst /,\,$(OBJECTS)) $(subst /,\,$(BUILD_PATH)/$(NAME).*)
+	rm -f $(EXECUTABLE) $(OBJECTS) $(BUILD_PATH)/$(NAME).*
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 4ad7abd54..8232238ee 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -36,7 +36,7 @@
  * Supported communication interfaces :
  * --------------------
  *
- * SERCOM5 : RX:PB23 TX:PB22
+ * SERCOM5 : RX:PA11 TX:PA10
  * Baudrate : 115200 8N1
  *
  * USB : D-:PA24 D+:PA25
@@ -46,11 +46,11 @@
  * The following pins are used by the program :
  * PA25 : input/output
  * PA24 : input/output
- * PB23 : input
- * PB22 : output
- * PA15 : input
+ * PA11 : input
+ * PA10 : output
+ * PA27 : input
  *
- * The application board shall avoid driving the PA25,PA24,PB23,PB22 and PA15 signals
+ * The application board shall avoid driving the PA25,PA24,PA11,PA10 and PA27 signals
  * while the boot program is running (after a POR for example)
  *
  * Clock system
diff --git a/bootloaders/zero/main.h b/bootloaders/zero/main.h
index b8c58ec79..bcff3a546 100644
--- a/bootloaders/zero/main.h
+++ b/bootloaders/zero/main.h
@@ -42,8 +42,7 @@
  * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
  * pin is tied LOW.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+#define BOOT_LOAD_PIN                     PIN_PA27 // Pin 27
 #define BOOT_PIN_MASK                     (1U << (BOOT_LOAD_PIN & 0x1f))
 
 #define CPU_FREQUENCY                     8000000
diff --git a/bootloaders/zero/readme.txt b/bootloaders/zero/readme.txt
index 8c760449e..28ea8d431 100644
--- a/bootloaders/zero/readme.txt
+++ b/bootloaders/zero/readme.txt
@@ -1,6 +1,6 @@
 1- Prerequisites
 
-IAR Embedded Workbench for ARM 7.30
+gcc-arm-none-eabi-4.8.3-2014q1
 
 2- Selecting between USB and UART interface
 
@@ -12,10 +12,15 @@ SAM_BA_BOTH_INTERFACES for enabling both the interfaces
 SAM_BA_INTERFACE value should be modified in
 Project Options -> C/C++ Compiler -> Preprocessor -> Defined symbols
 Project Options -> Assembler -> Preprocessor -> Defined symbols
+The default value of SAM_BA_BOTH_INTERFACES is defined in sam_ba_monitor.h
+
+Additionally, you must select the cpu in the makefile (3 locations)
+as well as the TOOLS_PATH variable (and possibly other include paths).
+On Windows, change 'rm -f' to 'del' in the makefile (uncomment line 29, comment line 30).
 
 3- Start application check
 
 Bootloader checks for the state of BOOT_LOAD_PIN (configurable by the user from main.h). If BOOT_LOAD_PIN is pulled low, bootloader execution is resumed.
 Else, the first location of application is fetched and checked. If it is empty (0xFFFFFFFF), then bootloader execution is resumed. Else it jumps to application and starts execution from there.
 
-Currently, BOOT_LOAD_PIN is PA15 of SAMD21G18A, pin 5 of Arduino Zero board.
+BOOT_LOAD_PIN is PA27 of SAMD21ExxA, Arduino pin 27 of MT-D21E board.
diff --git a/bootloaders/zero/samd21e15a_flash.ld b/bootloaders/zero/samd21e15a_flash.ld
new file mode 100644
index 000000000..43d77e4f8
--- /dev/null
+++ b/bootloaders/zero/samd21e15a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E15A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e16a_flash.ld b/bootloaders/zero/samd21e16a_flash.ld
new file mode 100644
index 000000000..d33d2d948
--- /dev/null
+++ b/bootloaders/zero/samd21e16a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E16A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x800;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e17a_flash.ld b/bootloaders/zero/samd21e17a_flash.ld
new file mode 100644
index 000000000..5167be9b1
--- /dev/null
+++ b/bootloaders/zero/samd21e17a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E17A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x1000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e18a_flash.ld b/bootloaders/zero/samd21e18a_flash.ld
new file mode 100644
index 000000000..d90abac6d
--- /dev/null
+++ b/bootloaders/zero/samd21e18a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21E18A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/platform.txt b/platform.txt
index 2a130468c..8363ea9f9 100644
--- a/platform.txt
+++ b/platform.txt
@@ -14,13 +14,18 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+/*
+ * Modified 23 June 2015 by Justin Mattair
+ *   for the MattairTech MT-D21E board (www.mattairtech.com)
+ */
+
 # Arduino SAMD Core and platform.
 #
 # For more info:
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
-name=Arduino SAMD (32-bits ARM Cortex-M0+) Boards
-version=1.6.0
+name=MattairTech SAMD Boards
+version=1.6.5-mt1
 
 # Compile variables
 # -----------------
diff --git a/programmers.txt b/programmers.txt
index fd7471b7d..93a928fc4 100644
--- a/programmers.txt
+++ b/programmers.txt
@@ -14,12 +14,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-edbg.name=Atmel EDBG
-edbg.communication=USB
-edbg.protocol=
-edbg.program.protocol=
-edbg.program.tool=openocd
-edbg.program.extra_params=
 
 atmel_ice.name=Atmel-ICE
 atmel_ice.communication=USB
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E15A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E15A.gdb
new file mode 100644
index 000000000..4ae3c04f0
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e15" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E16A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E16A.gdb
new file mode 100644
index 000000000..eb114b493
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e16" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E17A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E17A.gdb
new file mode 100644
index 000000000..cb1c7c44e
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e17" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMD21E18A.gdb b/variants/MT_D21E/debug_scripts/SAMD21E18A.gdb
new file mode 100644
index 000000000..13ee2a173
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMD21E18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e18" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..717073abe
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00020000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..61ad501ed
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00020000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
new file mode 100644
index 000000000..3a172e3ae
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..710c8664c
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00040000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..4475f9511
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00040000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
new file mode 100644
index 000000000..0162f0774
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..d4fa67a05
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00008000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..475b359e4
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00008000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
new file mode 100644
index 000000000..4155e0791
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
new file mode 100644
index 000000000..6a6cc4ab0
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00010000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
new file mode 100644
index 000000000..a692b2ce1
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
@@ -0,0 +1,211 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00010000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
new file mode 100644
index 000000000..5ed72842d
--- /dev/null
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg
new file mode 100644
index 000000000..0355cc401
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg
new file mode 100644
index 000000000..4eaf7acfc
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg
new file mode 100644
index 000000000..6b5641483
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg b/variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg
new file mode 100644
index 000000000..b99d610ef
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMD21E18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E/pins_arduino.h b/variants/MT_D21E/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/MT_D21E/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
new file mode 100644
index 000000000..9ab048009
--- /dev/null
+++ b/variants/MT_D21E/variant.cpp
@@ -0,0 +1,160 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+  Modified 21 June 2015 by Justin Mattair
+     for the MattairTech MT-D21E board (www.mattairtech.com)
+*/
+
+
+/*  Pins descriptions for the MattairTech MT-D21E
+ * 
+ * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (* is for default peripheral in use, () means unavailable)
+ * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
+ * | 0       | --                 | A0               |  PA00  | Xin32             | *Xin32
+ * | 1       | --                 | A1               |  PA01  | Xout32            | *Xout32
+ * | 2       | 2                  | A2               |  PA02  |                   | EIC/EXTINT[2] *ADC/AIN[0] PTC/Y[0] DAC/VOUT
+ * | 3       | 3                  | A3               |  PA03  | REFA              | EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFP *ADC/AIN[1] PTC/Y[1]
+ * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFP *ADC/AIN[4] AC/AIN[0] PTC/Y[2] (SERCOM0/PAD[0]) (TCC0/WO[0])
+ * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] *ADC/AIN[5] AC/AIN[1] PTC/Y[3] (SERCOM0/PAD[1]) (TCC0/WO[1])
+ * | 6       | 6                  | A6               |  PA06  |                   | EIC/EXTINT[6] *ADC/AIN[6] AC/AIN[2] PTC/Y[4] (SERCOM0/PAD[2]) (TCC1/WO[0])
+ * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | EIC/EXTINT[7] *ADC/AIN[7] AC/AIN[3] PTC/Y[5] (SERCOM0/PAD[3]) (TCC1/WO[1])
+ * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] (SERCOM0/PAD[0]) (SERCOM2/PAD[0]) *TCC0/WO[0] (TCC1/WO[2])
+ * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] (SERCOM0/PAD[1]) (SERCOM2/PAD[1]) *TCC0/WO[1] (TCC1/WO[3])
+ * | 10      | 10                 | A10              |  PA10  | TX                | EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] *SERCOM0/PAD[2] (SERCOM2/PAD[2]) (TCC1/WO[0]) TCC0/WO[2]
+ * | 11      | 11                 | A11              |  PA11  | RX                | EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] *SERCOM0/PAD[3] (SERCOM2/PAD[3]) (TCC1/WO[1]) TCC0/WO[3]
+ * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] (SERCOM4/PAD[2]) *TC3/WO[0] (TCC0/WO[4]) Xin, HOST_ENABLE
+ * | 13      | 15                 | A15              |  PA15  | Xout, ATN         | EIC/EXTINT[15] SERCOM2/PAD[3] (SERCOM4/PAD[3]) *TC3/WO[1] (TCC0/WO[5]) Xout, ATN
+ * | 14      | --                 | NC               |  ----  |                   | Not Connected
+ * | 15      | --                 | NC               |  ----  |                   | Not Connected
+ * | 16      | --                 | Vbus             |  ----  |                   | USB Vbus
+ * | 17      | --                 | A24-             |  PA24  | USB_NEGATIVE      | *USB/DM
+ * | 18      | --                 | A25+             |  PA25  | USB_POSITIVE      | *USB/DP
+ * | 19      | --                 | Gnd              |  ----  |                   | Ground
+ * | 20      | --                 | Gnd              |  ----  |                   | Ground
+ * | 21      | --                 | Vin              |  ----  |                   | Vin
+ * | 22      | --                 | Vcc              |  ----  |                   | Vcc
+ * | 23      | --                 | 3.3V             |  ----  |                   | 3.3V
+ * | 24      | --                 | NC               |  ----  |                   | Not Connected
+ * | 25      | --                 | NC               |  ----  |                   | Not Connected
+ * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] *SERCOM1/PAD[0] (SERCOM3/PAD[0]) TCC2/WO[0] (TCC0/WO[6])
+ * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] *SERCOM1/PAD[1] (SERCOM3/PAD[1]) TCC2/WO[1] (TCC0/WO[7])
+ * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] (SERCOM1/PAD[2]) *SERCOM3/PAD[2] (TC3/WO[0]) (TCC0/WO[2])
+ * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] (SERCOM1/PAD[3]) *SERCOM3/PAD[3] (TC3/WO[1]) (TCC0/WO[3])
+ * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] *SERCOM3/PAD[0] (SERCOM5/PAD[0]) TC4/WO[0] (TCC0/WO[4])
+ * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] *SERCOM3/PAD[1] (SERCOM5/PAD[1]) TC4/WO[1] (TCC0/WO[5])
+ * | 32      | 27                 | A27              |  PA27  | Button A          | EIC/EXTINT[15] *Button A
+ * | 33      | 28                 | A28              |  PA28  | LED               | EIC/EXTINT[8] *LED
+ * | 34      | --                 | NC               |  ----  |                   | Not Connected
+ * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] (SERCOM1/PAD[2]) *TCC1/WO[0] SWD CLK
+ * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] (SERCOM1/PAD[3]) *TCC1/WO[1] Button B SWD IO
+ * | 37      | --                 | NC               |  ----  |                   | Not Connected
+ * | 38      | --                 | NC               |  ----  |                   | Not Connected
+ * | 39      | --                 | RST              |  ----  |                   | Reset
+ * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
+ * 
+ * You may use Arduino pin numbers ranging from 0 to 31. The Arduino pin corresponds to the silkscreen (without the 'A').
+ * For example, use pinMode(28, OUTPUT) to set the LED pin (marked as A28) as an output.
+ * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 12, 13, 20, 21, 24, 25, 26, and 29.
+ * Note that pins 0 and 1 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
+ * Note also that pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+const PinDescription g_APinDescription[]=
+{
+	// 0..1 are unused (pins in use by 32.768KHz crystal, which in turn is used by the Arduino core)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 2..9 - Analog capable pins (DAC avalable on 2)
+	{ PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
+	{ PORTA,  3, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel1, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[1]
+	{ PORTA,  4, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
+	{ PORTA,  5, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
+	{ PORTA,  6, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL), ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[6]
+	{ PORTA,  7, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL), ADC_Channel7, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_TIMER, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_TIMER, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), ADC_Channel17, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
+	
+	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
+	{ PORTA, 10, PIO_SERCOM, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel18, PWM0_CH2, TCC0_CH2, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2], PIO_TIMER_ALT
+	{ PORTA, 11, PIO_SERCOM, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel19, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3], PIO_TIMER_ALT
+	
+	// 12..13 pins don't exist
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 14..15 - Digital functions
+	{ PORTA, 14, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM3_CH0, TC3_CH0, EXTERNAL_INT_14 }, // TC3/WO[0], HOST_ENABLE
+	{ PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // TC3/WO[1], ATN
+	
+	// 16..17 I2C pins (SDA/SCL) or Digital functions
+	{ PORTA, 16, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, // SDA: SERCOM1/PAD[0]
+	{ PORTA, 17, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_1 }, // SCL: SERCOM1/PAD[1]
+	
+	// 18..23 - SPI Pins or Digital functions (pins 20..21 do not exist)
+	{ PORTA, 18, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // SPI MOSI: SERCOM3/PAD[2], PIO_SERCOM_ALT
+	{ PORTA, 19, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // SPI SCK: SERCOM3/PAD[3], PIO_SERCOM_ALT
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+//	{ PORTA, 22, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM4_CH0, TC4_CH0, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
+//	{ PORTA, 23, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM4_CH1, TC4_CH1, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
+	{ PORTA, 22, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
+	
+	// 24..26 are unused (25 and 26 in use by USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist)
+	{ PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DM
+	{ PORTA, 25, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 27..29 Button A and LED (pin 29 does not exist)
+	{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15 }, // Button A
+	{ PORTA, 28, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // LED
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	
+	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
+	{ PORTA, 30, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_10 }, // TCC1/WO[0] / SWD CLK
+	{ PORTA, 31, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_11 }, // TCC1/WO[1] / SWD IO
+	
+	// 32 - Alternate use of pin 2 (DAC output)
+	//{ PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VOUT
+} ;
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+SERCOM sercom3( SERCOM3 ) ;
+SERCOM sercom4( SERCOM4 ) ;
+SERCOM sercom5( SERCOM5 ) ;
+
+Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial1.IrqHandler();
+}
+
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
new file mode 100644
index 000000000..e3eb01e92
--- /dev/null
+++ b/variants/MT_D21E/variant.h
@@ -0,0 +1,226 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+  Modified 21 June 2015 by Justin Mattair
+     for the MattairTech MT-D21E board (www.mattairtech.com)
+*/
+
+#ifndef _VARIANT_MATTAIRTECH_MT_D21E_
+#define _VARIANT_MATTAIRTECH_MT_D21E_
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+/** Frequency of the board main oscillator */
+#define VARIANT_MAINOSC		(32768ul)
+
+/** Master clock frequency */
+#define VARIANT_MCK			  (48000000ul)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT           (32u)
+#define NUM_DIGITAL_PINS     (32u)
+#define NUM_ANALOG_INPUTS    (10u)
+#define NUM_ANALOG_OUTPUTS   (1u)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+// Interrupts
+#define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
+
+// LEDs
+// None of these defines are currently used by the core.
+// The MT-D21E onboard LED is on pin 28.
+// The RX and TX LEDs are not present.
+// You may optionally add them to any free pins.
+#define PIN_LED_13           (28u)
+#define PIN_LED_RXL          (30u)
+#define PIN_LED_TXL          (31u)
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+/*
+ * Analog pins
+ */
+#define PIN_A0               (2ul)
+#define PIN_A1               (3ul)
+#define PIN_A2               (4ul)
+#define PIN_A3               (5ul)
+#define PIN_A4               (6ul)
+#define PIN_A5               (7ul)
+#define PIN_A6               (8ul)
+#define PIN_A7               (9ul)
+#define PIN_A8               (10ul)
+#define PIN_A9               (11ul)
+
+static const uint8_t A0  = PIN_A0 ;
+static const uint8_t A1  = PIN_A1 ;
+static const uint8_t A2  = PIN_A2 ;
+static const uint8_t A3  = PIN_A3 ;
+static const uint8_t A4  = PIN_A4 ;
+static const uint8_t A5  = PIN_A5 ;
+static const uint8_t A6  = PIN_A6 ;
+static const uint8_t A7  = PIN_A7 ;
+static const uint8_t A8  = PIN_A8 ;
+static const uint8_t A9  = PIN_A9 ;
+
+#define ADC_RESOLUTION		12
+
+// Other pins
+#define PIN_ATN              (15ul)
+static const uint8_t ATN = PIN_ATN;
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#define PIN_SERIAL1_RX       (11ul)
+#define PIN_SERIAL1_TX       (10ul)
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI1_MISO         (22u)
+#define PIN_SPI1_MOSI         (18u)
+#define PIN_SPI1_SCK          (19u)
+#define PIN_SPI1_SS           (23u)
+#define PIN_SPI_MISO         PIN_SPI1_MISO
+#define PIN_SPI_MOSI         PIN_SPI1_MOSI
+#define PIN_SPI_SCK          PIN_SPI1_SCK
+#define PIN_SPI_SS           PIN_SPI1_SS
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE1_SDA         (16u)
+#define PIN_WIRE1_SCL         (17u)
+#define PIN_WIRE_SDA          PIN_WIRE1_SDA
+#define PIN_WIRE_SCL          PIN_WIRE1_SCL
+
+/*
+ * USB
+ */
+#define PIN_USB_HOST_ENABLE (14ul)
+#define PIN_USB_DM          (24ul)
+#define PIN_USB_DP          (25ul)
+
+#ifdef __cplusplus
+}
+#endif
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+extern SERCOM sercom3;
+extern SERCOM sercom4;
+extern SERCOM sercom5;
+
+extern Uart Serial1;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#define SERIAL_PORT_MONITOR         SerialUSB
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+#define Serial	SerialUSB
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */
+

From 862489d4dcfa0ab962bdcbef8e5d3644513f1339 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 27 Jun 2015 20:52:54 +0000
Subject: [PATCH 006/124] delete stock bootloader binary and linker script

---
 bootloaders/zero/samd21_sam_ba.bin   | Bin 6328 -> 0 bytes
 bootloaders/zero/samd21j18a_flash.ld | 157 ---------------------------
 2 files changed, 157 deletions(-)
 delete mode 100644 bootloaders/zero/samd21_sam_ba.bin
 delete mode 100644 bootloaders/zero/samd21j18a_flash.ld

diff --git a/bootloaders/zero/samd21_sam_ba.bin b/bootloaders/zero/samd21_sam_ba.bin
deleted file mode 100644
index 08f40f425437f8fc80c2462668f3d15bdf5453d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6328
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
B7V`iA

diff --git a/bootloaders/zero/samd21j18a_flash.ld b/bootloaders/zero/samd21j18a_flash.ld
deleted file mode 100644
index c9385c487..000000000
--- a/bootloaders/zero/samd21j18a_flash.ld
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * \file
- *
- * \brief Linker script for running in internal FLASH on the SAMD21J18A
- *
- * Copyright (c) 2013-2014 Atmel Corporation. All rights reserved.
- *
- * \asf_license_start
- *
- * \page License
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * 3. The name of Atmel may not be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * 4. This software may only be redistributed and used in connection with an
- *    Atmel microcontroller product.
- *
- * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * \asf_license_stop
- *
- */
-
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-SEARCH_DIR(.)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-  rom (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00040000
-  ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
-}
-
-/* The stack size used by the application. NOTE: you need to adjust according to your application. */
-STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
-
-/* Section Definitions */
-SECTIONS
-{
-    .text :
-    {
-        . = ALIGN(4);
-        _sfixed = .;
-        KEEP(*(.vectors .vectors.*))
-        *(.text .text.* .gnu.linkonce.t.*)
-        *(.glue_7t) *(.glue_7)
-        *(.rodata .rodata* .gnu.linkonce.r.*)
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-
-        /* Support C constructors, and C destructors in both user code
-           and the C library. This also provides support for C++ code. */
-        . = ALIGN(4);
-        KEEP(*(.init))
-        . = ALIGN(4);
-        __preinit_array_start = .;
-        KEEP (*(.preinit_array))
-        __preinit_array_end = .;
-
-        . = ALIGN(4);
-        __init_array_start = .;
-        KEEP (*(SORT(.init_array.*)))
-        KEEP (*(.init_array))
-        __init_array_end = .;
-
-        . = ALIGN(4);
-        KEEP (*crtbegin.o(.ctors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-        KEEP (*(SORT(.ctors.*)))
-        KEEP (*crtend.o(.ctors))
-
-        . = ALIGN(4);
-        KEEP(*(.fini))
-
-        . = ALIGN(4);
-        __fini_array_start = .;
-        KEEP (*(.fini_array))
-        KEEP (*(SORT(.fini_array.*)))
-        __fini_array_end = .;
-
-        KEEP (*crtbegin.o(.dtors))
-        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-        KEEP (*(SORT(.dtors.*)))
-        KEEP (*crtend.o(.dtors))
-
-        . = ALIGN(4);
-        _efixed = .;            /* End of text section */
-    } > rom
-
-    /* .ARM.exidx is sorted, so has to go in its own output section.  */
-    PROVIDE_HIDDEN (__exidx_start = .);
-    .ARM.exidx :
-    {
-      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-    } > rom
-    PROVIDE_HIDDEN (__exidx_end = .);
-
-    . = ALIGN(4);
-    _etext = .;
-
-    .relocate : AT (_etext)
-    {
-        . = ALIGN(4);
-        _srelocate = .;
-        *(.ramfunc .ramfunc.*);
-        *(.data .data.*);
-        . = ALIGN(4);
-        _erelocate = .;
-    } > ram
-
-    /* .bss section which is used for uninitialized data */
-    .bss (NOLOAD) :
-    {
-        . = ALIGN(4);
-        _sbss = . ;
-        _szero = .;
-        *(.bss .bss.*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = . ;
-        _ezero = .;
-    } > ram
-
-    /* stack section */
-    .stack (NOLOAD):
-    {
-        . = ALIGN(8);
-        _sstack = .;
-        . = . + STACK_SIZE;
-        . = ALIGN(8);
-        _estack = .;
-    } > ram
-
-    . = ALIGN(4);
-    _end = . ;
-}

From 6bf52720110135e1681622f27f7c24ab0aeed845 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 20 Jul 2015 12:15:53 +0000
Subject: [PATCH 007/124] New pinDescriptions table format

---
 README                                        |   6 -
 README.md                                     | 341 ++++++
 boards.txt                                    | 230 ++---
 bootloaders/zero/Makefile                     |  24 +-
 bootloaders/zero/drivers/cdc_enumerate.c      |   8 +-
 bootloaders/zero/drivers/cdc_enumerate.h      |   5 +
 .../zero/linker_scripts/samd11c14a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd11d14am_flash.ld  | 157 +++
 .../zero/linker_scripts/samd11d14as_flash.ld  | 157 +++
 .../{ => linker_scripts}/samd21e15a_flash.ld  |   0
 .../{ => linker_scripts}/samd21e16a_flash.ld  |   0
 .../{ => linker_scripts}/samd21e17a_flash.ld  |   0
 .../{ => linker_scripts}/samd21e18a_flash.ld  |   0
 .../zero/linker_scripts/samd21g15a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21g16a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21g17a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21g18a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21j15a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21j16a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21j17a_flash.ld   | 157 +++
 .../zero/linker_scripts/samd21j18a_flash.ld   | 157 +++
 bootloaders/zero/main.c                       |  43 +-
 bootloaders/zero/main.h                       |  23 +-
 bootloaders/zero/readme.txt                   |  79 +-
 bootloaders/zero/sam_ba_monitor.c             |  22 +-
 bootloaders/zero/sam_ba_monitor.h             |   3 +
 bootloaders/zero/samd21e15a_sam_ba.bin        | Bin 6360 -> 6384 bytes
 bootloaders/zero/samd21e16a_sam_ba.bin        | Bin 6360 -> 6384 bytes
 bootloaders/zero/samd21e17a_sam_ba.bin        | Bin 6360 -> 6384 bytes
 bootloaders/zero/samd21e18a_sam_ba.bin        | Bin 6360 -> 6384 bytes
 bootloaders/zero/startup_samd11.c             | 201 ++++
 bootloaders/zero/startup_samd21.c             |  74 +-
 cores/arduino/Reset.cpp                       |  14 +-
 cores/arduino/SERCOM.cpp                      |  15 +-
 cores/arduino/SERCOM.h                        |   2 +
 cores/arduino/Tone.cpp                        |   3 +-
 cores/arduino/USB/samd21_device.c             |  14 +-
 cores/arduino/USB/samd21_host.c               | 970 +++++++++---------
 cores/arduino/Uart.cpp                        |  26 +-
 cores/arduino/WInterrupts.c                   |  14 +-
 cores/arduino/WVariant.h                      | 199 ++--
 cores/arduino/cortex_handlers.c               | 178 ++++
 cores/arduino/delay.c                         |   4 +-
 cores/arduino/startup.c                       | 173 ----
 cores/arduino/wiring.c                        |  11 +-
 cores/arduino/wiring_analog.c                 | 156 ++-
 cores/arduino/wiring_digital.c                |  55 +-
 cores/arduino/wiring_private.c                | 154 ++-
 cores/arduino/wiring_private.h                |   4 +-
 libraries/SPI/SPI.cpp                         |  12 +-
 libraries/SPI/SPI.h                           |   1 +
 libraries/USBHost/src/Usb.cpp                 |   8 +-
 libraries/Wire/Wire.cpp                       |  14 +-
 libraries/Wire/Wire.h                         |   4 +
 platform.txt                                  |   9 +-
 programmers.txt                               |  30 -
 variants/MT_D21E/variant.cpp                  | 215 ++--
 variants/MT_D21E/variant.h                    | 128 ++-
 58 files changed, 3941 insertions(+), 1258 deletions(-)
 delete mode 100644 README
 create mode 100644 README.md
 create mode 100644 bootloaders/zero/linker_scripts/samd11c14a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd11d14am_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd11d14as_flash.ld
 rename bootloaders/zero/{ => linker_scripts}/samd21e15a_flash.ld (100%)
 rename bootloaders/zero/{ => linker_scripts}/samd21e16a_flash.ld (100%)
 rename bootloaders/zero/{ => linker_scripts}/samd21e17a_flash.ld (100%)
 rename bootloaders/zero/{ => linker_scripts}/samd21e18a_flash.ld (100%)
 create mode 100644 bootloaders/zero/linker_scripts/samd21g15a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21g16a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21g17a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21g18a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21j15a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21j16a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21j17a_flash.ld
 create mode 100644 bootloaders/zero/linker_scripts/samd21j18a_flash.ld
 create mode 100644 bootloaders/zero/startup_samd11.c
 create mode 100644 cores/arduino/cortex_handlers.c
 delete mode 100644 programmers.txt

diff --git a/README b/README
deleted file mode 100644
index b7ae2959c..000000000
--- a/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a fork from arduino/ArduinoCore-samd on GitHub.
-This will be used to maintain Arduino support for the
-MattairTech MT-D21E and probably also the MT-D11.
-
-The resulting Arduino support package will be available
-at mattairtech.github.io
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..0bad69d63
--- /dev/null
+++ b/README.md
@@ -0,0 +1,341 @@
+# MattairTech Arduino SAMD Core
+
+This is a fork from arduino/ArduinoCore-samd on GitHub. This will be used to maintain Arduino support
+for SAMD boards including the MattairTech MT-D21E and the MT-D11 (see https://www.mattairtech.com/).
+It primarily adds support for new devices as well as a more flexible pin configuration / mapping system.
+This core is intended to be installed using the Boards Manager (see below).
+
+
+## Summary
+Feature                 |	Value
+------------------------|------------------------------------------------------------------------------
+Microcontroller		|	ATSAMD21ExxA, 32-Bit ARM Cortex M0+
+Clock Speed		|	48 MHz
+Flash Memory		|	256 KB (D21E18A) / 128 KB (D21E17A) / 64 KB (D21E16A) / 32 KB (D21E15A)
+SRAM			|	32 KB (D21E18A) / 16 KB (D21E17A) / 8 KB (D21E16A) / 4 KB (D21E15A)
+EEPROM			|	None (emulation may be available in the future)
+Digital Pins		|	22
+Analog Input Pins	|	10, 12-bit ADC channels
+Analog Output Pins	|	1, 10-bit DAC
+PWM Output Pins		|	12
+External Interrupts	|	15 (1 NMI)
+UART (Serial)		|	2
+SPI			|	1
+I2C (TWI)		|	1
+Operating Voltage	|	3.3V (Do not connect voltages higher than 3.3V!)
+DC Current per I/O Pin	|	7 mA
+
+
+## Pin Configurations
+
+Most pins have multiple configurations available (even analog pins). For example, pin A10 can be an analog input, a
+PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the pin number printed on the board but
+without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
+
+```
+============================================ MattairTech MT-D21E (ATsamd21eXXa) =======================================
+Comm/Other INT      PWM    Digital    Analog                               Digital   PWM       INT    Comm/other
+=======================================================================================================================
+                                                  -----------------------
+Xin32                                            |   A0            RST   |                            Reset
+Xout32                                           |   A1            NC    |
+                             2     2 (ADC0, DAC) |   A2            NC    |
+                             3     3 (ADC1, REF) |   A3            A31   |   31   TCC1/WO[1]  INT11   Button B / SWD IO
+          INT4               4     4 (ADC4)      |   A4            A30   |   30   TCC1/WO[0]  INT10   SWD CLK
+          INT5               5     5 (ADC5)      |   A5            NC    |
+                             6     6 (ADC6)      |   A6            A28   |   28               INT8    LED
+VDIV                         7     7 (ADC7)      |   A7            A27   |   27               INT15   Button A
+          INTNMI TCC0/WO[0]  8     8 (ADC16)     |   A8            A23   |   23   TC4/WO[1]   INT7    SPI SS
+          INT9   TCC0/WO[1]  9     9 (ADC17)     |   A9            A22   |   22   TC4/WO[0]   INT6    SPI MISO
+TX (1)           TCC0/WO[2]  10    10 (ADC18)    |   A10           A19   |   19               INT3    SPI SCK
+RX (1)           TCC0/WO[3]  11    11 (ADC19)    |   A11           A18   |   18               INT2    SPI MOSI
+TX (2)    INT14  TC3/WO[0]   14                  |   A14           A17   |   17   TCC2/WO[1]  INT1    I2C/SCL
+RX (2)           TC3/WO[1]   15                  |   A15           A16   |   16   TCC2/WO[0]  INT0    I2C/SDA
+                                                 |   NC            NC    |
+                                                 |   NC            NC    |
+                                                 |   Vbus          3.3V  |
+USB D-                                           |   A24-  _____   Vcc   |
+USB D+                                           |   A25+ |     |  Vin   |
+                                                 |   Gnd  | USB |  Gnd   |
+                                                  -----------------------
+```
+
+#### All pins operate at 3.3 volts. DO NOT connect voltages higher than 3.3V!
+
+* Digital: All 22 pins can be used for general purpose I/O (INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN).
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+* Analog Inputs: 10 pins can be configured as ADC analog inputs.
+  * These are available on pins 2 through 11 using the analogRead() function.
+  * These pins can be used for GPIO and other digital functions (ie. pwm and serial) as well.
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * Each pin measures from ground to 3.3 volts.
+  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+* DAC: One analog output is available on pin 2.
+  * Provides a 10-bit voltage output with the analogWrite() function.
+* PWM: 12 pins can be configured as PWM outputs.
+  * Available on pins 8, 9, 10, 11, 14, 15, 16, 17, 22, 23, 30, and 31 using the analogWrite() function.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+* External Interrupts: 15 pins can be configured with external interrupts.
+  * Available on all the pins except pins 2, 3, 6, 7, 10, 11, and 15 using the attachInterrupt() function.
+* Serial: 2 pairs of pins can be configured for TTL serial I/O.
+  * Serial1: pin 11 (RX) and pin 10 (TX).
+  * Serial2: pin 15 (RX) and pin 14 (TX).
+* SPI: 3 or 4 pins can be configured for SPI I/O.
+  * Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+  * SPI communication using the SPI library.
+* TWI (I2C): 2 pins can be configured for TWI I/O.
+  * Pin 16 (SDA) and pin 17 (SCL).
+  * TWI communication using the Wire library.
+* LED: One pin can be configured to light the onboard LED.
+  * Pin 28 (LED_BUILTIN). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+* Button: One pin can be configured to read the onboard Button A.
+  * Pin 27 (BUTTON_BUILTIN). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+* AREF: One pin can be configured as an AREF analog input.
+  * The upper end of the analog measurement range can be changed using the analogReference() function.
+* Reset: Bring this line LOW to reset the microcontroller.
+
+#### MT-D21E Board Configuration
+
+* The 32.768KHz crystal is used by the Arduino core, so it MUST be connected via the solder jumpers.
+* Note that the sketch may still run without the crystal attached, but the clock speed will be very inaccurate.
+* The 16MHz crystal is not used. It should be disconnected via the solder jumpers.
+* The I2C (TWI) pullup resistors should be enabled via the solder jumpers.
+* The LED should be enabled via the solder jumper.
+* Button A should be connected via the solder jumper. The debouncing capacitor should also be connected.
+* Button B is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
+* A reference voltage can be connected to AREF. In this case, the capacitors should be enabled via the solder jumper.
+
+
+## Serial Monitor
+
+To print to the Serial Monitor over USB, use 'Serial'. Serial points to SerialUSB (Serial1 and Serial2 are UARTS).
+Unlike most Arduino boards (ie. Uno), SAMD boards do not automatically reset when the serial monitor is opened.
+To see what your sketch outputs to the serial monitor from the beginning, the sketch must wait for the SerialUSB
+port to open first. Add the following to setup():
+
+```
+while (!Serial) ;
+```
+
+Remember that if the sketch needs to run without SerialUSB connected, another approach must be used.
+
+You can also reset the board manually with the Reset button if you wish to restart your sketch. However, pressing
+the Reset button will reset the SAMD chip, which in turn will reset USB communication. This interruption means
+that if the serial monitor is open, it will be necessary to close and re-open it to restart communication.
+
+
+
+## Installation
+
+### Driver Installation
+
+#### Windows
+
+There are two "drivers", a CDC only driver for the bootloader, and a CDC-HID driver for Arduino sketches (optional).
+The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP3), Vista, 7, and 8.
+
+1. If you do not already have the SAM-BA bootloader installed, see below.
+2. Download https://www.mattairtech.com/software/MattairTech_CDC_Driver_Signed.zip and unzip into any folder.
+3. Plug in the board while holding down button A to enter the bootloader. The LED should light.
+4. Windows will detect the board. Point the installer to the folder from above to install the bootloader driver.
+5. If you don't intend on using Arduino, you can skip the rest of this list. See Using Bossac Standalone below.
+6. If you do not already have the test firmware installed, see Using Bossac Standalone below.
+7. Press the reset button to run the test firmware (blink sketch with CDC-HID).
+8. Windows will detect the board. Point the installer to the folder from above to install the sketch driver.
+9. Continue with SAMD Core Installation below.
+
+#### Linux
+
+0. No driver installation is needed.
+1. On some distros, you may need to add your user to the same group as the port (ie: dialout) and/or set udev rules.
+2. You MAY have to install and use Arduino as the root user in order to get reliable access to the serial port.
+   * This is true even when group permissions are set correctly, and it may fail after previously working.
+   * You can also create/modify a udev rule to set permissions on the port so *everyone* can read / write.
+3. Continue with SAMD Core Installation below.
+
+#### OS X
+
+1. As of this writing, only the 256 KB chip variants work with the OS X version of the upload tool, bossac.
+2. First, you will need to open boards.txt and change mattairtech_mt_d21e_bl8k.upload.tool to equal arduino:bossac.
+3. No driver installation is needed. You may get a dialog box asking if you wish to open the “Network Preferences�:
+   * Click the "Network Preferences..." button, then click "Apply".
+   * The board will show up as “Not Configured�, but it will work fine.
+4. Continue with SAMD Core Installation below.
+
+### SAMD Core Installation
+
+1. The MattairTech SAMD Core requires Arduino 1.6.5+.
+2. In the Arduino IDE 1.6.5+, click File->Preferences.
+3. Click the button next to Additional Boards Manager URLs.
+4. Add https://www.mattairtech.com/software/arduino/package_MattairTech_index.json.
+5. Save preferences, then open the Boards Manager.
+6. Install the Arduino SAMD Boards package.
+7. Install the MattairTech SAMD Boards package.
+8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E.
+9. Select the processor with the now visible Tools->Processor menu.
+10. If you do not already have the bootloader or blink sketch installed, see SAM-BA USB CDC Bootloader below.
+11. Plug in the board. The blink sketch should be running.
+12. Click Tools->Port and choose the COM port.
+13. You can now upload your own sketch.
+
+
+
+## SAM-BA USB CDC Bootloader (Arduino Zero compatible)
+
+The SAM-BA bootloader has both a CDC USB interface, and a UART interface (TX: pin 10, RX: pin 11). It is
+compatible with the Arduino IDE (Zero compatible), or it can be used with the Bossac tool standalone. Under
+Arduino, auto-reset is supported (automatically runs the bootloader while the sketch is running) as well as
+automatic return freom reset. The SAM-BA bootloader described here adds to the Arduino version, which in
+turn is based on the bootloader from Atmel. The Arduino version added several features, including three
+new commands (Arduino Extended Capabilities) that increase upload speed. The bootloader normally requires
+8 KB FLASH, however, a 4 KB version can be used for the D11 chips.
+
+Bossac is a command line utility for uploading firmware to SAM-BA bootloaders. It runs on Windows. Linux, and OS X.
+It is used by Arduino to upload firmware to SAM and SAMD boards. The version Bossac described here adds to the
+Arduino version (https://github.com/shumatech/BOSSA, Arduino branch), which in turn is a fork from the original
+Bossa (http://www.shumatech.com/web/products/bossa). It adds support for more SAMD chips (both D21 and D11).
+
+Note that only the Arduino or Mattairtech versions of bossac are currently supported for SAMD chips.
+Neither the stock bossac (or Bossa) nor the Atmel SAM-BA upload tool will work.
+
+Arduino Extended Capabilities:
+
+   * X: Erase the flash memory starting from ADDR to the end of flash.
+   * Y: Write the content of a buffer in SRAM into flash memory.
+   * Z: Calculate the CRC for a given area of memory.
+
+The bootloader can be started by:
+
+   * Tapping reset twice in quick succession (BOOT_DOUBLE_TAP).
+   * Holding down button A (BOOT_LOAD_PIN) while powering up.
+   * Clicking 'Upload Sketch' in the Arduino IDE, which will automatically start the bootloader.
+   * If the application (sketch) area is blank, the bootloader will run.
+
+Otherwise, it jumps to application and starts execution from there. The LED will light during bootloader execution.
+Note that the 4KB bootloader does not support the Arduino Extended Capabilities or BOOT_DOUBLE_TAP.
+
+When the Arduino IDE initiates the bootloader, the following procedure is used:
+
+1. The IDE opens and closes the USB serial port at a baud rate of 1200bps. This triggers a “soft erase� procedure.
+2. The flash memory is erased by the MCU. If it is interrupted for any reason, the erase procedure will likely fail.
+3. The board is reset. The bootloader (which always runs first) detects a blank FLASH, so bootloader operation resumes.
+4. Opening and closing the port at a baud rate other than 1200bps will not erase or reset the SAMD.
+
+### Bootloader Firmware Installation
+
+#### Bootloader Installation Using the Arduino IDE
+
+1. If you do not already have the MattairTech SAMD core installed, see SAMD Core Installation above.
+2. Plug an Atmel ICE into USB, then connect it to the powered SAMD board. A green LED should light on the Atmel ICE.
+3. Click Tools->Programmer->Atmel ICE.
+4. Click Tools->Board->MattairTech MT-D21E.
+5. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
+6. Continue with driver installation above.
+
+#### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
+
+1. Download the bootloader from https://www.mattairtech.com/software/arduino/SAM-BA-bootloaders-zero-mattairtech.zip.
+2. Unzip to any directory. Be sure that a bootloader is available for your particular chip.
+3. Follow the procedures for your upload tool to upload the firmware.
+   * Perform a chip erase first. Be sure no BOOTPROT bits are set.
+   * Install the binary file to 0x00000000 of the FLASH.
+   * You can optionally set the BOOTPROT bits to 8KB. The Arduino installation method does not set these.
+   * You can optionally set the EEPROM bits or anything else. The Arduino installation method uses factory defaults.
+4. Continue with driver installation above.
+
+### Using Bossac Standalone
+
+When using Bossac standalone, you will need to ensure that your application starts at 0x00002000 for 8 KB bootloaders,
+and 0x00001000 for 4 KB bootloaders. This is because the bootloader resides at 0x00000000. This can be accomplished
+by passing the following flag to the linker (typically LDFLAGS in your makefile; adjust for your bootloader size):
+
+```
+­Wl,­­section­start=.text=0x2000
+```
+
+You may also use a linker script. See the MattairTech SAMD package for examples.
+Be sure to generate and use a binary file. Many makefiles are set up to generate an elf, hex, and bin already.
+
+Download Bossac from:
+
+* https://www.mattairtech.com/software/arduino/bossac-1.5-arduino-mattairtech-1-mingw32.zip (Windows 32 bit and 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.5-arduino-mattairtech-1-x86_64-linux-gnu.tar.bz2 (Linux 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.5-arduino-mattairtech-1-i686-linux-gnu.tar.bz2 (Linux 32 bit)
+* Use the bossac command from the Arduino SAMD package for OS X support. Only the 256 KB chip versions are supported
+
+As an example, bossac will be used to upload the test firmware (blink sketch):
+
+1. Download firmware from https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip and unzip.
+2. If you have not already installed the bootloader driver, see Driver Installation above.
+3. Be sure there is a binary that matches your chip. On the command line (change the binary to match yours):
+4. On Linux --port might be /dev/ttyACM0. If the device is not found, remove the --port argument for auto-detection.
+
+```
+bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
+```
+5. See http://manpages.ubuntu.com/manpages/vivid/man1/bossac.1.html for details.
+6. Continue with the CDC-HID driver installation above (optional).
+
+
+
+## New PinDescription Table
+
+```
+/*   The PinDescription table describes how each of the pins can be used by the Arduino core. Each pin can have multiple
+ *   functions (ie: ADC input, digital output, PWM, communications, etc.), and the PinDescription table configures
+ *   which functions can be used for each pin. This table is mainly accessed by the pinPeripheral function in
+ *   wiring_private.c, which is used to attach a pin to a particular peripheral function. The communications drivers
+ *   (ie: SPI, I2C, and UART), analogRead(), analogWrite(), analogReference(), attachInterrupt(), and pinMode() all
+ *   call pinPeripheral() to verify that the pin can perform the function requested, and to configure the pin for
+ *   that function. Most of the contents of pinMode() are now in pinPeripheral().
+ * 
+ *   Explanation of PinDescription table:
+ * 
+ *   Port			This is the port (ie: PORTA).
+ *   Pin			This is the pin (bit) within the port. Valid values are 0 through 31.
+ *   PinType			This indicates what peripheral function the pin can be attached to. In most cases, this
+ *                              is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute field.
+ *                              It can also be set to a specific peripheral. In this case, any attempt to configure the
+ *                              pin (using pinPeripheral or pinMode) as anything else will fail (and pinPeripheral will
+ *                              return -1). This can be used to prevent accidental re-configuration of a pin that is
+ *                              configured for only one function (ie: USB D- and D+ pins). If a pin is not used or does
+ *                              not exist, PIO_NOT_A_PIN must be entered in this field. See WVariant.h for valid
+ *                              entries. These entries are also used as a parameter to pinPeripheral() with the
+ *                              exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function now calls pinPeripheral()
+ *                              with the desired mode. Note that this field is not used to select between the two
+ *                              peripherals possible with each of the SERCOM and TIMER functions. PeripheralAttribute
+ *                              is now used for this.
+ *   PeripheralAttribute	This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+ *                              used to select between the two peripherals possible with each of the SERCOM and TIMER
+ *                              functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+ *                              This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) uses
+ *                              PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD. Both TIMER and
+ *                              SERCOM can exist for each pin. This bitfield is also used to set the pin drive strength.
+ *                              In the future, other attributes (like input buffer configuration) may be added.
+ *                              See WVariant.h for valid entries.
+ *   PinAttribute		This is a 32-bit bitfield used to list all of the valid peripheral functions that a pin
+ *                              can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain attributes
+ *                              are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL includes all of
+ *                              the GPIO functions, while PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
+ *                              PIN_ATTR_TIMER_CAPTURE (capture is not used yet). PIN_ATTR_ANALOG is an alias to
+ *                              PIN_ATTR_ANALOG_ADC. There is only one DAC channel, so PIN_ATTR_DAC appears only once.
+ *                              This bitfield is useful for limiting a pin to only input related functions or output
+ *                              functions. This allows a pin to have a more flexible configuration, while restricting
+ *                              the direction (ie: to avoid contention). See WVariant.h for valid entries.
+ *   TCChannel			This is the TC(C) channel (if any) assigned to the pin. Some TC channels are available
+ *                              on multiple pins (ie: TCC0/WO[0] is available on pin A4 or pin A8). In general, only
+ *                              one pin should be configured (in the pinDescription table) per TC channel.
+ *                              See WVariant.h for valid entries. The tone library uses TC5.
+ *   ADCChannelNumber		This is the ADC channel (if any) assigned to the pin. See WVariant.h for valid entries.
+ *   ExtInt			This is the interrupt (if any) assigned to the pin. Some interrupt numbers are available
+ *                              on multiple pins (ie: EIC/EXTINT[2] is available on pin A2 or pin A18). In general, only
+ *                              one pin should be configured (in the pinDescription table) per interrupt number. Thus,
+ *                              if an interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18.
+ *                              See WVariant.h for valid entries.
+ */
+```
diff --git a/boards.txt b/boards.txt
index 402d45548..baf3dd41c 100644
--- a/boards.txt
+++ b/boards.txt
@@ -14,129 +14,125 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/*
- * Modified 23 June 2015 by Justin Mattair
- *   for the MattairTech MT-D21E board (www.mattairtech.com)
- */
-
 menu.cpu=Processor
 
 # MattairTech MT-D21E (default 8KB bootloader)
-mattairtech_mt_d21e.bl8k.name=MattairTech MT-D21E (SAM-BA bootloader)
-mattairtech_mt_d21e.bl8k.vid.0=0x16D0
-mattairtech_mt_d21e.bl8k.pid.0=0x0557
-mattairtech_mt_d21e.bl8k.vid.1=0x16D0
-mattairtech_mt_d21e.bl8k.pid.1=0x0856
-mattairtech_mt_d21e.bl8k.upload.tool=arduino:bossac
-mattairtech_mt_d21e.bl8k.upload.protocol=sam-ba
-mattairtech_mt_d21e.bl8k.upload.use_1200bps_touch=true
-mattairtech_mt_d21e.bl8k.upload.wait_for_upload_port=true
-mattairtech_mt_d21e.bl8k.upload.native_usb=true
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a=SAMD21E18A
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.upload.maximum_size=253952
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a=SAMD21E17A
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.upload.maximum_size=122880
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a=SAMD21E16A
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.upload.maximum_size=57344
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a=SAMD21E15A
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.upload.maximum_size=24576
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
-mattairtech_mt_d21e.bl8k.build.mcu=cortex-m0plus
-mattairtech_mt_d21e.bl8k.build.f_cpu=48000000L
-mattairtech_mt_d21e.bl8k.build.usb_product="MT-D21E"
-mattairtech_mt_d21e.bl8k.build.usb_manufacturer="MattairTech LLC"
-mattairtech_mt_d21e.bl8k.build.board=MT_D21E
-mattairtech_mt_d21e.bl8k.build.core=arduino
-mattairtech_mt_d21e.bl8k.build.variant=MT_D21E
-mattairtech_mt_d21e.bl8k.build.variant_system_lib=
-mattairtech_mt_d21e.bl8k.build.vid=0x16D0
-mattairtech_mt_d21e.bl8k.build.pid=0x0856
-mattairtech_mt_d21e.bl8k.bootloader.tool=arduino:openocd
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e18a.bootloader.file=zero/samd21e18a_sam_ba.bin
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e17a.bootloader.file=zero/samd21e17a_sam_ba.bin
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e16a.bootloader.file=zero/samd21e16a_sam_ba.bin
-mattairtech_mt_d21e.bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam_ba.bin
+mattairtech_mt_d21e_bl8k.name=MattairTech MT-D21E (SAM-BA bootloader)
+mattairtech_mt_d21e_bl8k.vid.0=0x16D0
+mattairtech_mt_d21e_bl8k.pid.0=0x0557
+mattairtech_mt_d21e_bl8k.vid.1=0x16D0
+mattairtech_mt_d21e_bl8k.pid.1=0x0856
+mattairtech_mt_d21e_bl8k.upload.tool=MattairTech_Arduino:bossac
+# mattairtech_mt_d21e_bl8k.upload.tool=arduino:bossac
+mattairtech_mt_d21e_bl8k.upload.protocol=sam-ba
+mattairtech_mt_d21e_bl8k.upload.use_1200bps_touch=true
+mattairtech_mt_d21e_bl8k.upload.wait_for_upload_port=true
+mattairtech_mt_d21e_bl8k.upload.native_usb=true
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
+mattairtech_mt_d21e_bl8k.build.mcu=cortex-m0plus
+mattairtech_mt_d21e_bl8k.build.f_cpu=48000000L
+mattairtech_mt_d21e_bl8k.build.usb_product="MT-D21E"
+mattairtech_mt_d21e_bl8k.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d21e_bl8k.build.board=MT_D21E
+mattairtech_mt_d21e_bl8k.build.core=arduino
+mattairtech_mt_d21e_bl8k.build.variant=MT_D21E
+mattairtech_mt_d21e_bl8k.build.variant_system_lib=
+mattairtech_mt_d21e_bl8k.build.vid=0x16D0
+mattairtech_mt_d21e_bl8k.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.bootloader.tool=arduino:openocd
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.bootloader.file=zero/samd21e18a_sam_ba.bin
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.bootloader.file=zero/samd21e17a_sam_ba.bin
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.bootloader.file=zero/samd21e16a_sam_ba.bin
+mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam_ba.bin
 
 
 # MattairTech MT-D21E (16KB bootloader), build only
-mattairtech_mt_d21e.bl16k.name=MattairTech MT-D21E (MSD bootloader)
-mattairtech_mt_d21e.bl16k.vid.0=0x16D0
-mattairtech_mt_d21e.bl16k.pid.0=0x0557
-mattairtech_mt_d21e.bl16k.vid.1=0x16D0
-mattairtech_mt_d21e.bl16k.pid.1=0x0856
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a=SAMD21E18A
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.upload.maximum_size=245760
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a=SAMD21E17A
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.upload.maximum_size=114688
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a=SAMD21E16A
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.upload.maximum_size=49152
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a=SAMD21E15A
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.upload.maximum_size=16384
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
-mattairtech_mt_d21e.bl16k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
-mattairtech_mt_d21e.bl16k.build.mcu=cortex-m0plus
-mattairtech_mt_d21e.bl16k.build.f_cpu=48000000L
-mattairtech_mt_d21e.bl16k.build.usb_product="MT-D21E"
-mattairtech_mt_d21e.bl16k.build.usb_manufacturer="MattairTech LLC"
-mattairtech_mt_d21e.bl16k.build.board=MT_D21E
-mattairtech_mt_d21e.bl16k.build.core=arduino
-mattairtech_mt_d21e.bl16k.build.variant=MT_D21E
-mattairtech_mt_d21e.bl16k.build.variant_system_lib=
-mattairtech_mt_d21e.bl16k.build.vid=0x16D0
-mattairtech_mt_d21e.bl16k.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.name=MattairTech MT-D21E (MSD bootloader)
+#mattairtech_mt_d21e_bl16k.vid.0=0x16D0
+#mattairtech_mt_d21e_bl16k.pid.0=0x0557
+#mattairtech_mt_d21e_bl16k.vid.1=0x16D0
+#mattairtech_mt_d21e_bl16k.pid.1=0x0856
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a=SAMD21E18A
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a.upload.maximum_size=245760
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a=SAMD21E17A
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a.upload.maximum_size=114688
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a=SAMD21E16A
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a.upload.maximum_size=49152
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a=SAMD21E15A
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a.upload.maximum_size=16384
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
+#mattairtech_mt_d21e_bl16k.build.mcu=cortex-m0plus
+#mattairtech_mt_d21e_bl16k.build.f_cpu=48000000L
+#mattairtech_mt_d21e_bl16k.build.usb_product="MT-D21E"
+#mattairtech_mt_d21e_bl16k.build.usb_manufacturer="MattairTech"
+#mattairtech_mt_d21e_bl16k.build.board=MT_D21E
+#mattairtech_mt_d21e_bl16k.build.core=arduino
+#mattairtech_mt_d21e_bl16k.build.variant=MT_D21E
+#mattairtech_mt_d21e_bl16k.build.variant_system_lib=
+#mattairtech_mt_d21e_bl16k.build.vid=0x16D0
+#mattairtech_mt_d21e_bl16k.build.pid=0x0856
 
 
 # MattairTech MT-D21E (no bootloader)
-mattairtech_mt_d21e.bl0k.name=MattairTech MT-D21E (no bootloader)
-mattairtech_mt_d21e.bl0k.vid.0=0x16D0
-mattairtech_mt_d21e.bl0k.pid.0=0x0557
-mattairtech_mt_d21e.bl0k.vid.1=0x16D0
-mattairtech_mt_d21e.bl0k.pid.1=0x0856
-mattairtech_mt_d21e.bl0k.upload.tool=arduino:openocd
-mattairtech_mt_d21e.bl0k.upload.protocol=sam-ba
-mattairtech_mt_d21e.bl0k.upload.use_1200bps_touch=false
-mattairtech_mt_d21e.bl0k.upload.wait_for_upload_port=false
-mattairtech_mt_d21e.bl0k.upload.native_usb=false
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a=SAMD21E18A
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.upload.maximum_size=262144
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_without_bootloader.ld
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a=SAMD21E17A
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.upload.maximum_size=131072
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_without_bootloader.ld
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a=SAMD21E16A
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.upload.maximum_size=65536
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_without_bootloader.ld
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a=SAMD21E15A
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.upload.maximum_size=32768
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
-mattairtech_mt_d21e.bl0k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_without_bootloader.ld
-mattairtech_mt_d21e.bl0k.build.mcu=cortex-m0plus
-mattairtech_mt_d21e.bl0k.build.f_cpu=48000000L
-mattairtech_mt_d21e.bl0k.build.usb_product="MT-D21E"
-mattairtech_mt_d21e.bl0k.build.usb_manufacturer="MattairTech LLC"
-mattairtech_mt_d21e.bl0k.build.board=MT_D21E
-mattairtech_mt_d21e.bl0k.build.core=arduino
-mattairtech_mt_d21e.bl0k.build.variant=MT_D21E
-mattairtech_mt_d21e.bl0k.build.variant_system_lib=
-mattairtech_mt_d21e.bl0k.build.vid=0x16D0
-mattairtech_mt_d21e.bl0k.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.name=MattairTech MT-D21E (no bootloader)
+#mattairtech_mt_d21e_bl0k.vid.0=0x16D0
+#mattairtech_mt_d21e_bl0k.pid.0=0x0557
+#mattairtech_mt_d21e_bl0k.vid.1=0x16D0
+#mattairtech_mt_d21e_bl0k.pid.1=0x0856
+#mattairtech_mt_d21e_bl0k.upload.tool=arduino:openocd
+#mattairtech_mt_d21e_bl0k.upload.protocol=sam-ba
+#mattairtech_mt_d21e_bl0k.upload.use_1200bps_touch=false
+#mattairtech_mt_d21e_bl0k.upload.wait_for_upload_port=false
+#mattairtech_mt_d21e_bl0k.upload.native_usb=false
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a=SAMD21E18A
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a.upload.maximum_size=262144
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ -D__NO_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_without_bootloader.ld
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a=SAMD21E17A
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a.upload.maximum_size=131072
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ -D__NO_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_without_bootloader.ld
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a=SAMD21E16A
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a.upload.maximum_size=65536
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ -D__NO_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_without_bootloader.ld
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a=SAMD21E15A
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a.upload.maximum_size=32768
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ -D__NO_BOOTLOADER__ {build.usb_flags}
+#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_without_bootloader.ld
+#mattairtech_mt_d21e_bl0k.build.mcu=cortex-m0plus
+#mattairtech_mt_d21e_bl0k.build.f_cpu=48000000L
+#mattairtech_mt_d21e_bl0k.build.usb_product="MT-D21E"
+#mattairtech_mt_d21e_bl0k.build.usb_manufacturer="MattairTech"
+#mattairtech_mt_d21e_bl0k.build.board=MT_D21E
+#mattairtech_mt_d21e_bl0k.build.core=arduino
+#mattairtech_mt_d21e_bl0k.build.variant=MT_D21E
+#mattairtech_mt_d21e_bl0k.build.variant_system_lib=
+#mattairtech_mt_d21e_bl0k.build.vid=0x16D0
+#mattairtech_mt_d21e_bl0k.build.pid=0x0856
diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index d3758b86b..53221a972 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -1,15 +1,29 @@
+# Begin Config
+# __SAMD21J18A__, __SAMD21G18A__, __SAMD21E18A__
+# __SAMD21J17A__, __SAMD21G17A__, __SAMD21E17A__
+# __SAMD21J16A__, __SAMD21G16A__, __SAMD21E16A__
+# __SAMD21J15A__, __SAMD21G15A__, __SAMD21E15A__
+# __SAMD11D14AM__, __SAMD11C14A__, __SAMD11D14AS__
+BLD_EXTA_FLAGS=-D__SAMD21E18A__
+NAME=samd21e18a_sam_ba
+LINKER_SCRIPT=samd21e18a_flash.ld
+
+STARTUP=startup_samd21.c
+# STARTUP=startup_samd11.c
+
 TOOLS_PATH="../../../arduino15/packages/arduino/tools"
 ARM_GCC_PATH=$(TOOLS_PATH)/arm-none-eabi-gcc/4.8.3-2014q1/bin
+# End Config
+
 CC=$(ARM_GCC_PATH)/arm-none-eabi-gcc
 CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -g -Os -w -std=gnu99 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500
 LDFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols
-BLD_EXTA_FLAGS=-D__SAMD21E18A__
+
 BUILD_PATH=build
 INCLUDES=-I$(TOOLS_PATH)/CMSIS/4.0.0-atmel/CMSIS/Include/ -I$(TOOLS_PATH)/CMSIS/4.0.0-atmel/Device/ATMEL/ -I./drivers/ -I./utils/ -I./utils/preprocessor/ -I./utils/interrupt 
-SOURCES=main.c sam_ba_monitor.c startup_samd21.c usart_sam_ba.c drivers/cdc_enumerate.c drivers/uart_driver.c utils/interrupt/interrupt_sam_nvic.c 
+SOURCES=main.c sam_ba_monitor.c $(STARTUP) usart_sam_ba.c drivers/cdc_enumerate.c drivers/uart_driver.c utils/interrupt/interrupt_sam_nvic.c 
 OBJECTS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.o))
 
-NAME=samd21e18a_sam_ba
 EXECUTABLE=$(NAME).bin
 
 SLASH=/
@@ -18,7 +32,7 @@ BSLASH=$(EMPTY)\$(EMPTY)
 all: $(SOURCES) $(EXECUTABLE)
 	
 $(EXECUTABLE): $(OBJECTS) 
-	$(CC) -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps  -Tsamd21e18a_flash.ld -Wl,-Map,$(BUILD_PATH)/$(NAME).map --specs=nano.specs --specs=nosys.specs -o $(BUILD_PATH)/$(NAME).elf $(OBJECTS) -Wl,--start-group -lm -Wl,--end-group
+	$(CC) -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps  -Tlinker_scripts/$(LINKER_SCRIPT) -Wl,-Map,$(BUILD_PATH)/$(NAME).map --specs=nano.specs --specs=nosys.specs -o $(BUILD_PATH)/$(NAME).elf $(OBJECTS) -Wl,--start-group -lm -Wl,--end-group
 	$(ARM_GCC_PATH)/arm-none-eabi-objcopy -O binary $(BUILD_PATH)/$(NAME).elf $@
 
 $(BUILD_PATH)/%.o: %.c
@@ -26,5 +40,7 @@ $(BUILD_PATH)/%.o: %.c
 	$(CC) $(CFLAGS) $(BLD_EXTA_FLAGS) $(INCLUDES) $< -o $@
 	
 clean:
+# Windows
 #	del $(EXECUTABLE) $(subst /,\,$(OBJECTS)) $(subst /,\,$(BUILD_PATH)/$(NAME).*)
+# Linux
 	rm -f $(EXECUTABLE) $(OBJECTS) $(BUILD_PATH)/$(NAME).*
diff --git a/bootloaders/zero/drivers/cdc_enumerate.c b/bootloaders/zero/drivers/cdc_enumerate.c
index bd3873eb2..e8ed1053c 100644
--- a/bootloaders/zero/drivers/cdc_enumerate.c
+++ b/bootloaders/zero/drivers/cdc_enumerate.c
@@ -50,10 +50,10 @@ const char devDescriptor[] = {
 	0x00,   // bDeviceSubclass: CDC class sub code
 	0x00,   // bDeviceProtocol: CDC Device protocol
 	0x40,   // bMaxPacketSize0
-	0x41,   // idVendorL
-	0x23,   //
-	0x4D,   // idProductL
-	0x00,   //
+	USB_VENDOR_ID_L,   // idVendorL
+	USB_VENDOR_ID_H,   //
+	USB_PRODUCT_ID_L,   // idProductL
+	USB_PRODUCT_ID_H,   //
 	0x10,   // bcdDeviceL
 	0x01,   //
 	0x00,   // iManufacturer    // 0x01
diff --git a/bootloaders/zero/drivers/cdc_enumerate.h b/bootloaders/zero/drivers/cdc_enumerate.h
index 41002626f..856f11d36 100644
--- a/bootloaders/zero/drivers/cdc_enumerate.h
+++ b/bootloaders/zero/drivers/cdc_enumerate.h
@@ -33,6 +33,11 @@
 #include "sam.h"
 #include "stdbool.h"
 
+#define USB_VENDOR_ID_H		0x16
+#define USB_VENDOR_ID_L		0xD0
+#define USB_PRODUCT_ID_H	0x05
+#define USB_PRODUCT_ID_L	0x57
+
 #define USB_EP_OUT              2
 #define USB_EP_OUT_SIZE         0x40
 #define USB_EP_IN               1
diff --git a/bootloaders/zero/linker_scripts/samd11c14a_flash.ld b/bootloaders/zero/linker_scripts/samd11c14a_flash.ld
new file mode 100644
index 000000000..eb059bb25
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd11c14a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD11C14A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd11d14am_flash.ld b/bootloaders/zero/linker_scripts/samd11d14am_flash.ld
new file mode 100644
index 000000000..f04de8e4b
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd11d14am_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD11D14AM
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd11d14as_flash.ld b/bootloaders/zero/linker_scripts/samd11d14as_flash.ld
new file mode 100644
index 000000000..ea5879ad1
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd11d14as_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD11D14AS
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/samd21e15a_flash.ld b/bootloaders/zero/linker_scripts/samd21e15a_flash.ld
similarity index 100%
rename from bootloaders/zero/samd21e15a_flash.ld
rename to bootloaders/zero/linker_scripts/samd21e15a_flash.ld
diff --git a/bootloaders/zero/samd21e16a_flash.ld b/bootloaders/zero/linker_scripts/samd21e16a_flash.ld
similarity index 100%
rename from bootloaders/zero/samd21e16a_flash.ld
rename to bootloaders/zero/linker_scripts/samd21e16a_flash.ld
diff --git a/bootloaders/zero/samd21e17a_flash.ld b/bootloaders/zero/linker_scripts/samd21e17a_flash.ld
similarity index 100%
rename from bootloaders/zero/samd21e17a_flash.ld
rename to bootloaders/zero/linker_scripts/samd21e17a_flash.ld
diff --git a/bootloaders/zero/samd21e18a_flash.ld b/bootloaders/zero/linker_scripts/samd21e18a_flash.ld
similarity index 100%
rename from bootloaders/zero/samd21e18a_flash.ld
rename to bootloaders/zero/linker_scripts/samd21e18a_flash.ld
diff --git a/bootloaders/zero/linker_scripts/samd21g15a_flash.ld b/bootloaders/zero/linker_scripts/samd21g15a_flash.ld
new file mode 100644
index 000000000..4e4379204
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21g15a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21G15A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21g16a_flash.ld b/bootloaders/zero/linker_scripts/samd21g16a_flash.ld
new file mode 100644
index 000000000..27ee71e1f
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21g16a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21G16A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x800;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21g17a_flash.ld b/bootloaders/zero/linker_scripts/samd21g17a_flash.ld
new file mode 100644
index 000000000..7dcc41420
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21g17a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21G17A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x1000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21g18a_flash.ld b/bootloaders/zero/linker_scripts/samd21g18a_flash.ld
new file mode 100644
index 000000000..35bf2bfcd
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21g18a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21G18A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21j15a_flash.ld b/bootloaders/zero/linker_scripts/samd21j15a_flash.ld
new file mode 100644
index 000000000..951d31cff
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21j15a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21J15A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x400;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21j16a_flash.ld b/bootloaders/zero/linker_scripts/samd21j16a_flash.ld
new file mode 100644
index 000000000..c7e651175
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21j16a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21J16A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x800;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21j17a_flash.ld b/bootloaders/zero/linker_scripts/samd21j17a_flash.ld
new file mode 100644
index 000000000..07e7c9f8b
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21j17a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21J17A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x1000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/linker_scripts/samd21j18a_flash.ld b/bootloaders/zero/linker_scripts/samd21j18a_flash.ld
new file mode 100644
index 000000000..d0168d78a
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/samd21j18a_flash.ld
@@ -0,0 +1,157 @@
+/**
+ * \file
+ *
+ * \brief Linker script for running in internal FLASH on the SAMD21J18A
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+SEARCH_DIR(.)
+
+/* Memory Spaces Definitions */
+MEMORY
+{
+  rom    (rx)  : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  ram    (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* The stack size used by the application. NOTE: you need to adjust according to your application. */
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x2000;
+
+/* Section Definitions */
+SECTIONS
+{
+    .text :
+    {
+        . = ALIGN(4);
+        _sfixed = .;
+        KEEP(*(.vectors .vectors.*))
+        *(.text .text.* .gnu.linkonce.t.*)
+        *(.glue_7t) *(.glue_7)
+        *(.rodata .rodata* .gnu.linkonce.r.*)
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+
+        /* Support C constructors, and C destructors in both user code
+           and the C library. This also provides support for C++ code. */
+        . = ALIGN(4);
+        KEEP(*(.init))
+        . = ALIGN(4);
+        __preinit_array_start = .;
+        KEEP (*(.preinit_array))
+        __preinit_array_end = .;
+
+        . = ALIGN(4);
+        __init_array_start = .;
+        KEEP (*(SORT(.init_array.*)))
+        KEEP (*(.init_array))
+        __init_array_end = .;
+
+        . = ALIGN(4);
+        KEEP (*crtbegin.o(.ctors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*crtend.o(.ctors))
+
+        . = ALIGN(4);
+        KEEP(*(.fini))
+
+        . = ALIGN(4);
+        __fini_array_start = .;
+        KEEP (*(.fini_array))
+        KEEP (*(SORT(.fini_array.*)))
+        __fini_array_end = .;
+
+        KEEP (*crtbegin.o(.dtors))
+        KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*crtend.o(.dtors))
+
+        . = ALIGN(4);
+        _efixed = .;            /* End of text section */
+    } > rom
+
+    /* .ARM.exidx is sorted, so has to go in its own output section.  */
+    PROVIDE_HIDDEN (__exidx_start = .);
+    .ARM.exidx :
+    {
+      *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > rom
+    PROVIDE_HIDDEN (__exidx_end = .);
+
+    . = ALIGN(4);
+    _etext = .;
+
+    .relocate : AT (_etext)
+    {
+        . = ALIGN(4);
+        _srelocate = .;
+        *(.ramfunc .ramfunc.*);
+        *(.data .data.*);
+        . = ALIGN(4);
+        _erelocate = .;
+    } > ram
+
+    /* .bss section which is used for uninitialized data */
+    .bss (NOLOAD) :
+    {
+        . = ALIGN(4);
+        _sbss = . ;
+        _szero = .;
+        *(.bss .bss.*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = . ;
+        _ezero = .;
+    } > ram
+
+    /* stack section */
+    .stack (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        . = . + STACK_SIZE;
+        . = ALIGN(8);
+        _estack = .;
+    } > ram
+
+    . = ALIGN(4);
+    _end = . ;
+}
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 8232238ee..94a8030d8 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -84,20 +84,36 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     64
 
 static void check_start_application(void);
+void portable_delay_cycles(unsigned long n);
 
 static volatile bool main_b_cdc_enable = false;
 
+// Delay loop is put to SRAM so that FWS will not affect delay time
+OPTIMIZE_HIGH
+RAMFUNC
+void portable_delay_cycles(unsigned long n)
+{
+	UNUSED(n);
+	
+	__asm (
+		"loop: DMB	\n"
+		#ifdef __ICCARM__
+		"SUBS r0, r0, #1 \n"
+		#else
+		"SUB r0, r0, #1 \n"
+		#endif
+		"CMP r0, #0  \n"
+		"BNE loop         "
+	);
+}
+
 /**
  * \brief Check the application startup condition
  *
  */
 static void check_start_application(void)
 {
-	volatile PortGroup *led_port = (volatile PortGroup *)&PORT->Group[1];
-	led_port->DIRSET.reg = (1<<30);
-	led_port->OUTCLR.reg = (1<<30);
-
-#if defined(BOOT_DOUBLE_TAP_ADDRESS)
+#if defined(BOOT_DOUBLE_TAP)
 	#define DOUBLE_TAP_MAGIC 0x07738135
 	if (PM->RCAUSE.bit.POR)
 	{
@@ -148,6 +164,10 @@ static void check_start_application(void)
 	boot_port->DIRCLR.reg = BOOT_PIN_MASK;
 	boot_port->PINCFG[BOOT_LOAD_PIN & 0x1F].reg = PORT_PINCFG_INEN | PORT_PINCFG_PULLEN;
 	boot_port->OUTSET.reg = BOOT_PIN_MASK;
+	
+	/* Allow time for debouncing capacitor to charge (6ms, 1MHz clock is default after reset) */
+	portable_delay_cycles(((uint64_t)6 * 1000000ul + (uint64_t)(7e3-1ul)) / (uint64_t)7e3);
+	
 	/* Read the BOOT_LOAD_PIN status */
 	boot_en = (boot_port->IN.reg) & BOOT_PIN_MASK;
 
@@ -158,8 +178,6 @@ static void check_start_application(void)
 	}
 #endif
 
-	led_port->OUTSET.reg = (1<<30);
-
 	/* Rebase the Stack Pointer */
 	__set_MSP(*(uint32_t *) APP_START_ADDRESS);
 
@@ -242,7 +260,6 @@ void system_init()
 #endif
 }
 
-
 #if DEBUG_ENABLE
 #	define DEBUG_PIN_HIGH 	port_pin_set_output_level(BOOT_LED, 1)
 #	define DEBUG_PIN_LOW 	port_pin_set_output_level(BOOT_LED, 0)
@@ -270,8 +287,14 @@ int main(void)
 	/* System initialization */
 	system_init();
 	cpu_irq_enable();
-
-	#if SAM_BA_INTERFACE == SAM_BA_UART_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
+	
+#if defined(LED_PIN)
+	volatile PortGroup *led_port = (volatile PortGroup *)(&(PORT->Group[LED_PIN / 32]));
+	led_port->DIRSET.reg = LED_PIN_MASK;
+	led_port->OUTSET.reg = LED_PIN_MASK;
+#endif
+	
+#if SAM_BA_INTERFACE == SAM_BA_UART_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
 	/* UART is enabled in all cases */
 	usart_open();
 #endif
diff --git a/bootloaders/zero/main.h b/bootloaders/zero/main.h
index bcff3a546..66871ee9e 100644
--- a/bootloaders/zero/main.h
+++ b/bootloaders/zero/main.h
@@ -30,12 +30,31 @@
 #pragma once
 
 /*
- * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
+ * If LED_PIN is defined, it will turn on during bootloader operation.
+ */
+#define	LED_PIN                           PIN_PA28 // Pin 28
+#define LED_PIN_MASK                      (1U << (LED_PIN & 0x1f))
+
+/*
+ * If BOOT_DOUBLE_TAP 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           0x20007FFC
+#define BOOT_DOUBLE_TAP	1
+
+#if defined(__SAMD21J18A__) || defined(__SAMD21G18A__) || defined(__SAMD21E18A__)
+	#define BOOT_DOUBLE_TAP_ADDRESS           0x20007FFC
+#elif defined(__SAMD21J17A__) || defined(__SAMD21G17A__) || defined(__SAMD21E17A__)
+	#define BOOT_DOUBLE_TAP_ADDRESS           0x20003FFC
+#elif defined(__SAMD21J16A__) || defined(__SAMD21G16A__) || defined(__SAMD21E16A__)
+	#define BOOT_DOUBLE_TAP_ADDRESS           0x20001FFC
+#elif defined(__SAMD21J15A__) || defined(__SAMD21G15A__) || defined(__SAMD21E15A__)
+	#define BOOT_DOUBLE_TAP_ADDRESS           0x20000FFC
+#elif defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+	#define BOOT_DOUBLE_TAP_ADDRESS           0x20000FFC
+#endif
+
 #define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
 
 /*
diff --git a/bootloaders/zero/readme.txt b/bootloaders/zero/readme.txt
index 28ea8d431..1c711a7ce 100644
--- a/bootloaders/zero/readme.txt
+++ b/bootloaders/zero/readme.txt
@@ -1,26 +1,57 @@
 1- Prerequisites
 
-gcc-arm-none-eabi-4.8.3-2014q1
-
-2- Selecting between USB and UART interface
-
-Set the define SAM_BA_INTERFACE to
-SAM_BA_UART_ONLY for only UART interface
-SAM_BA_USBCDC_ONLY for only USB CDC interface
-SAM_BA_BOTH_INTERFACES for enabling both the interfaces
-
-SAM_BA_INTERFACE value should be modified in
-Project Options -> C/C++ Compiler -> Preprocessor -> Defined symbols
-Project Options -> Assembler -> Preprocessor -> Defined symbols
-The default value of SAM_BA_BOTH_INTERFACES is defined in sam_ba_monitor.h
-
-Additionally, you must select the cpu in the makefile (3 locations)
-as well as the TOOLS_PATH variable (and possibly other include paths).
-On Windows, change 'rm -f' to 'del' in the makefile (uncomment line 29, comment line 30).
-
-3- Start application check
-
-Bootloader checks for the state of BOOT_LOAD_PIN (configurable by the user from main.h). If BOOT_LOAD_PIN is pulled low, bootloader execution is resumed.
-Else, the first location of application is fetched and checked. If it is empty (0xFFFFFFFF), then bootloader execution is resumed. Else it jumps to application and starts execution from there.
-
-BOOT_LOAD_PIN is PA27 of SAMD21ExxA, Arduino pin 27 of MT-D21E board.
+gcc-arm-none-eabi 4.8.3-2014q1 from Arduino samd package
+CMSIS 4.0.0-atmel from Arduino samd package
+bossac 1.5-arduino-mattairtech-1 from MattairTech SAMD package or:
+   * https://www.mattairtech.com/software/arduino/bossac-1.5-arduino-mattairtech-1-mingw32.zip (Windows 32 bit and 64 bit)
+   * https://www.mattairtech.com/software/arduino/bossac-1.5-arduino-mattairtech-1-x86_64-linux-gnu.tar.bz2 (Linux 64 bit)
+   * https://www.mattairtech.com/software/arduino/bossac-1.5-arduino-mattairtech-1-i686-linux-gnu.tar.bz2 (Linux 32 bit)
+   * Use the bossac command from the Arduino SAMD package for OS X support. Only the 256 KB chip versions are supported
+
+2- Selecting bootloader options
+
+Set the define SAM_BA_INTERFACE in sam_ba_monitor.h to:
+   * SAM_BA_UART_ONLY for only UART interface
+   * SAM_BA_USBCDC_ONLY for only USB CDC interface
+   * SAM_BA_BOTH_INTERFACES for enabling both the interfaces
+
+All of these options will build an 8KB bootloader.
+If you want to build a 4KB bootloader, you will need to:
+   * Choose only one interface from above
+   * Disable ARDUINO_EXTENDED_CAPABILITIES (sam_ba_monitor.h)
+   * Disable BOOT_DOUBLE_TAP (main.h)
+
+3- Makefile configuration
+
+In the makefile, you must modify BLD_EXTA_FLAGS, NAME,
+LINKER_SCRIPT, and STARTUP to match your cpu, as well as
+the TOOLS_PATH variable (and possibly other include paths).
+On Windows, you may need to change 'rm -f' to 'del' at the bottom of the makefile.
+
+4- Boot Process
+
+First, if BOOT_DOUBLE_TAP is defined, the bootloader checks if the reset button was pressed
+twice in quick succession. If so, bootloader execution is resumed Second, the bootloader
+checks the state of BOOT_LOAD_PIN (configurable by the user from main.h). If BOOT_LOAD_PIN
+is pulled low, bootloader execution is resumed. Finally, the first location of application
+is fetched and checked. If it is empty (0xFFFFFFFF), then bootloader execution is resumed.
+Otherwise, it jumps to application and starts execution from there. The LED will light
+during bootloader execution.
+
+BOOT_LOAD_PIN is PA27 of SAMD21ExxA (arduino pin 27), which corresponds to Button A on the
+MT-D21E board. LED_PIN is PA28 of SAMD21ExxA (arduino pin 28), which corresponds to the LED
+on the MT-D21E board. It will turn on during bootloader operation (after the boot process).
+If BOOT_DOUBLE_TAP is defined (default), the bootloader can be 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.
+
+5- Useful Info
+
+When modifying this bootloader, pay close attention to SRAM usage. On the 4KB SRAM versions,
+DATA + BSS must be less than 1KB, so avoid increasing buffers and watch stack usage. This
+bootloader places the stack (grows down) in the middle of the SRAM (normally, the stack
+starts at the end of SRAM). This is so that an applet can be placed immediately after the top
+of the system stack. The applet in this case is a very simple word copy function. However,
+1KB is reserved for the applet, and there are two 64 byte data buffers placed after it. The
+applet has its own stack at the top of RAM, but the word copy applet uses little/none of this.
+The bossac tool is responsible for loading the applet. See Devices.h from the Bossa source.
diff --git a/bootloaders/zero/sam_ba_monitor.c b/bootloaders/zero/sam_ba_monitor.c
index 29c9d8566..3924e487f 100644
--- a/bootloaders/zero/sam_ba_monitor.c
+++ b/bootloaders/zero/sam_ba_monitor.c
@@ -36,7 +36,9 @@
 #include "cdc_enumerate.h"
 
 const char RomBOOT_Version[] = SAM_BA_VERSION;
+#if defined ARDUINO_EXTENDED_CAPABILITIES
 const char RomBOOT_ExtendedCapabilities[] = "[Arduino:XYZ]";
+#endif
 
 /* Provides one common interface to handle both USART and USB-CDC */
 typedef struct
@@ -167,6 +169,7 @@ uint8_t command, *ptr_data, *ptr, data[SIZEBUFMAX];
 uint8_t j;
 uint32_t u32tmp;
 
+#if defined ARDUINO_EXTENDED_CAPABILITIES
 uint32_t PAGE_SIZE, PAGES, MAX_FLASH;
 
 /**
@@ -185,6 +188,16 @@ void sam_ba_monitor_run(void)
 		sam_ba_monitor_loop();
 	}
 }
+#else
+void sam_ba_monitor_run(void)
+{
+	ptr_data = NULL;
+	command = 'z';
+	while (1) {
+		sam_ba_monitor_loop();
+	}
+}
+#endif
 
 // Prints a 32-bit integer in hex.
 void put_uint32(uint32_t n) {
@@ -295,10 +308,12 @@ void sam_ba_monitor_loop(void)
 			{
 				ptr_monitor_if->putdata("v", 1);
 				ptr_monitor_if->putdata((uint8_t *) RomBOOT_Version,
-						strlen(RomBOOT_Version));
+							strlen(RomBOOT_Version));
+#if defined ARDUINO_EXTENDED_CAPABILITIES
 				ptr_monitor_if->putdata(" ", 1);
 				ptr_monitor_if->putdata((uint8_t *) RomBOOT_ExtendedCapabilities,
-						strlen(RomBOOT_ExtendedCapabilities));
+					strlen(RomBOOT_ExtendedCapabilities));
+#endif
 				ptr_monitor_if->putdata(" ", 1);
 				ptr = (uint8_t*) &(__DATE__);
 				i = 0;
@@ -313,6 +328,7 @@ void sam_ba_monitor_loop(void)
 				ptr_monitor_if->putdata((uint8_t *) &(__TIME__), i);
 				ptr_monitor_if->putdata("\n\r", 2);
 			}
+#if defined ARDUINO_EXTENDED_CAPABILITIES
 			else if (command == 'X')
 			{
 				// Syntax: X[ADDR]#
@@ -412,7 +428,7 @@ void sam_ba_monitor_loop(void)
 				put_uint32(crc);
 				ptr_monitor_if->putdata("#\n\r", 3);
 			}
-
+#endif
 			command = 'z';
 			current_number = 0;
 
diff --git a/bootloaders/zero/sam_ba_monitor.h b/bootloaders/zero/sam_ba_monitor.h
index c70ddb187..e1b5e2f53 100644
--- a/bootloaders/zero/sam_ba_monitor.h
+++ b/bootloaders/zero/sam_ba_monitor.h
@@ -41,6 +41,9 @@
 #define SAM_BA_INTERFACE    SAM_BA_BOTH_INTERFACES
 #endif
 
+/* disable for 4KB bootloaders */
+#define ARDUINO_EXTENDED_CAPABILITIES		1
+
 /* Selects USART as the communication interface of the monitor */
 #define SAM_BA_INTERFACE_USART      1
 /* Selects USB as the communication interface of the monitor */
diff --git a/bootloaders/zero/samd21e15a_sam_ba.bin b/bootloaders/zero/samd21e15a_sam_ba.bin
index 1a6726c9501d85fa425c21f25924dbe0188d704f..7d832e5b2feae14366a2b5d59fd01ad5b1733439 100755
GIT binary patch
delta 1116
zcmZvbUr1Yb6vxl+Uhk5tNz*icnwUhdH+B`3HPJ}bjnxj(Xj+g`XqkiF{(;$9m~L%R
z*idT*85FAiWY$z4q#bk*wn*ASOU3rBkET%Q_T*SsTgD(@#i7}5zduFTgBL#coZmU$
zd(QcBxG$r*=&suq(!RG6^=~rj44kK}1I*^LmDm>SY=v+q-ByL2bNyB{V>EiFME!zD
z6Vma~7gg%GkH|n^oU82ZKuv;le;*6`n<9zAtgkE5KJppM`i=cd#l}bNtdT17*<zzQ
z5$fs=h8C-iRJRX?1Ih<wXN}6Zv*+e%mfN?Xf7RWxhdp=v)@!K^^ih?%I2gXc0$sx^
z)|8$Y)W=xbsAx6UPMW0&rWf}ttem=b=7A5HV>Tsiq)$_>c7x@H_<$5jeE1LL9<Aq>
zMWMg4l>2FeDwY?SMmaw+v&hsJP*dJPTHVmMmiQY+1sbl_Oouzc=Q8}iY3U>`*vH>W
zrS=pf?U{#Y2oX2;$X_di@KXFoIjjiPRX!&lV5!XS^2hRk5I2JgPz^o-LT>dEMc|Ks
zBp3(f;3^PBMDbT>Vu$WEYy|cV>^l&HrU_6J9hQDJ&3_U54*F*J1%N@T0E?F-D&o_Y
zFP+<ML`yM3HTPH({@eIa6cNShfha77iST}F!ZVToZ&|Dsk7fX|^IQB^>s`-vXi6p0
zCSj+520z57)d}_~uPf|SLpY}qFX5Ag-7LhFB6BlVBI4X`<Ns6qVjEVkqw*AZ#p~=h
z6ycR;Uf3OsP4Pc>h1E6(QG=ammOC8>*;J;@@rQI&s7%wmb_+GjW%!3EH;mXM2#T3R
zf55Om36yC>=b)P@gRkS-xS0*wG`N!K-y<{S3fvAp<SJ!JKI7W!PvY#lf1$+^D+@AR
zikoZS<h4HUe3EBf;gHDgzAp!DK|SaX%5fGp*Cz8?aQFO^mLzw&_oGUK`yk%E?gQ*N
zpK(txoi}(6*?Z7>n~VGhPit&iC3*_xz$$PQVuMB4J|?`3MYmtNphau7nn<*cB9X@0
z`o?H%%<J>dxQHHtELa6j_m*wQM7;s2V9|R*;T^u1#_mb+WD9$2w9*2@+;iBe_-9x>
NRjg-wT6xOX@g8E-24?^O

delta 1091
zcmchU+e=hY6vo#+XC~+9Ow(~LopGi-&U96)8Jj^f!V6~NC`9xi_0ZT$QdV}+CQux+
zU>@?;F1$pL4?cAxhI$F9m);7TLI@%-BJ2tiJ)|{s`gSGs7j)pa*V=1+XRWnanb3=n
zZ7hfMJ_}KgU}U7QS2#=G@8DAM|5zE5jND$W>?YF17|D^@5+$h-?L{ET752V&Yc%11
zW}b-cYYjDOJ~ht#YIQJ5e%hFu_O)$pyj;uDp4hs%f>>!ItEA#=x*%2(^|VEOzL{eD
zTildyUbc2$Y;DIxtM~BXdM|rve}3ZmSt_y4BmytZ{jG_>jcRXO|5r;=hyD_qh*@?S
z-}V@*qRd~gyyM~5149SzQzra_WzO*)X;t(31<E}5o}Kr`spMmtGNV6e!~6`>DN}&V
zZDbzRC+euC!bH{CUeY6dr*azJF*1oaBEBEcXPRrmBis2~snFKVNPprY>O@52s(jph
z8eTWQAP3AsmEgDJEv!5BO5QH_3ULMS0UZQ^kXzkEYv7*;agYQWNB~hp6n}>%Ds&%U
z!?2%V7r+K+!hou&Mw&7VhFk~qb?{BVjJpEz+$52mkLMgxm)eMyVg#M5mZ;|@iiskk
zSSb*N#V~7lrzPsTlKnX^){9RUD;9en<Fl4Ku8Yt(B+>_9hk+Bm%Ey&aR?9=V`xO=U
zLB#X<mE0pt<t)$m9m^MSu2}g$iYaTqauJn>!3!R;T{R0&OQmgg#)kRp<pHJHPPD^D
zbeG%g<!m^$)BZ+k7AnIqhQ?4+li^oU<_uy3V1<}T^ao5Pl0cD8)B@dP5qv*Z`}bvo
z(08Re^JQl4f?LOX9EB{-uQ^tF;<!8Rwb$o_i+s#4H5lJcX7#vxI?kUu0?>SMcyZdC
z>v2Y$<v5Qzx3Cs|%{j{4JmRXdoko)-;=IqbD?F(XJqGu{B5>qlS9#d8m8c6VZR|Xz
zmzC>f!BB+CLY2WtWpEqMx-`#}gJ>Gef<@qR{;@k!o7`T>R1;_>-lT<1cd;&hUEBQ&
D3{(1&

diff --git a/bootloaders/zero/samd21e16a_sam_ba.bin b/bootloaders/zero/samd21e16a_sam_ba.bin
index 7dd3244d063f65e6906b2afe386675d5f109ba2f..a9c7610117b2caf78e80caa0472d7d9393197db1 100755
GIT binary patch
delta 1116
zcmZvbUuaWz6vxl+-d>a2CdQaQCQZ`Z-c&8N=#6QysiIX%8yg2@43s(8bsMa+g7q&g
zC~a+o2!hsMu{O33MFo9uqeKP8((P@JjUc!^IdrQcLcmFfjoy8KEd?KX;d9UVo%6lt
zoF9k#EMAPSzFk4uSvyhRBE#;`PqcJ^S$vif%Yv1y5U!+Ks<3jd&yHq{hJUV7zai3u
zbY%ExojMXAG7%WzDtq0(HBEZ3m&JlDM!LKZ=rTGk?_q_Yx$$|Wxw(Ti)233P(yUKM
zy1K)W*}8r89RsnDva0%fb5qLQbK?*zu3yj(cekx&Ph5W<vn4{kRHx1k#ICbY*U&qA
zR!<M;S6I%hZMWtRSkW}oD|=?%eS7J<2LWWhbSOD9cZiCK1y&s7{Zb^o;Xf)q`cRq^
zh29jXcy)nl=VqBk#UL_wk!dQUmQs|o#=#S|)GJ118m`t#yAOh|W%zID`2k$8m%o;x
z&MYJCcOTIpB3|y3k17N3viyP^Q-tawpOUw*Z2m8KyWB6tt)LdvgB?J~?S3Ky{$-E>
zBcKLc1fqy2{t```(ES5zz`lb07c@ZA0;q*{OSdfRBVuQuZ-rk57_<to`AMP*K4JUO
zz1&8$6eHAgpFJJCjSoc;QLG7w!eSVM_u13F(bA_mv06Nu3B=BC@;~gq_^v?{l}H<d
z9S0ix2%k_#*-qYAeo&3zoI|{dkCk_`2v;hs#aNYybEkuUrnuu6Qm>)%IC#k$o!1rN
z)#RT#U5t(MzgNf9y)L4pljtsYySB0M{9e}!=?kH<EbG!u)U1)=@1o)mVq+jIW)l4Y
z!~P^ttr7hI-DEX<9oNRq9MI;#xqRPRnJMSscJe__lx6s&XI(IZv*-SiHd{k=nCVi=
znm=CBdi~QGUhu>sBD?0k9Cn2Da4;;VSj?IqD{0|1)4#T5xZArCRg&Iqcpvj_VPEk{
z?<muG(znamgVxKO<mY|u4HGKSZ(s_%2d;8#umao1gr~9Sj#EdpctYE1#2d*lniI)p
zBXPwa2u^y49)bdR58U1*o6N`kA*pQEzhB{<fd-A;lTw*B_SkHv8HTy1uv78RuqLYg
LQ0Qsr*+A$2qumC2

delta 1091
zcmchU&r4KM6vxkfZzkvIjMH;|^u`(UIg@2t>DZWIL>gw|C`7anTQs&w?3b0=1d3x8
z%py&@g=Pq~a8(&H)Fz}h?FyVi5F#)l>?cgLuyW}2y_L{k(1XuC=brO@=bXz)1?Pjd
zu`JU2EkwP7k&*m9;jDbWgDc7ZV`WS-GPPFON2H4};v;h<N?ap4fIyrp?0w(XaLoVQ
zJRWIj4K`>#HOl;Iby=AFv@tX3YunOrbvH|TBI_4&Bbypn6&0tGxsj5vr!DOB%@*U|
z;>H~Fs=}5?VaIr@x4pg2%U;@FoO*GNO02W7z)SN$Yb<cP+S@kp)e_gCzrw~Nmc7Q(
zej_i;{JGg3kG>wdeE0#SLdz_5p7%<5O&h*Z>fw*{qBlw<ACr_CU8bVNS*BAe7nvz!
z9@oWcsb;&0s?&X>SM;CBsDH=EB;JVlK|r5rp%ITf#@|Z$wjM_MQx{PeA{tlaljcr%
zJ^Z2^Fbh?T-<3;QPvVulL+%se?Z5|gPzHqD>LywT{{o1DIM6^0h$5o+J2X+D`v4n)
z{RI0B6hRXLR82L~q+u}RI-swGZvtlA6_Dj7iR}D(#u0U;jc6%G(79>}d+wl^C?bk&
z0-~@OW*zUcgk9ItKNrP%@#$j4V((*o&T`Ln2^xn)`XKBuaKcylb!C+8=E2N^ii-OX
z;yL_U=250{mSy~o<%l>}to$Fvq;){Kgv!HUo(F9=%)-+WNt>OqVg5QhpfuTucG`%h
zxy@e5h7)`2Z=@!nG7RJL7;0)V{9Tkfi`XDoEoKt^0h5U&P@oevLwBnHz8|ao`?4YE
zyAxeGGBbC>t>wLrd=}*sjy0Yr?vDG%>M}wFKIWI|jiu9RJ?fr`@@I|!G+!KEoHpkM
zoE6SWoX4G|teH<ZN12;fxOUk((PV`v?|1DD-BO62fcxM(aAaavS=h6cs2eM7=sKa7
zSL)?u!3ru5R+Vk5Di86rOY=-Rh-SbX_zqmoKXzwgv)e0~Y64Bf8?}&W8tdXWwSB(;
D9N_wt

diff --git a/bootloaders/zero/samd21e17a_sam_ba.bin b/bootloaders/zero/samd21e17a_sam_ba.bin
index 0ace0934673c2815607b1ce9f78c9c13554b7bc7..9e00514b8e5dd4a2c7ac291e4073f43c957caa13 100755
GIT binary patch
delta 1116
zcmZvbZAesU6vxkVueX`2GfmUHG~>+Z^^RMjQZv4gW04l3lT#oOY*f%~3)V8oUQyUZ
z%~_a*pzM*%Nk2#h^`Szhf|iZyTOXZ;V0S+iy;wvr;EIb*-Tsdv^uY_id(Lyt|DJOm
z4)^b9F1q@*i?m;@M7@g)IRnRN=>W6%EG3o&D_bF4Nw-vC<y@~7%@_^cD^U*;X+k<Y
z^s-7F_7NEf40Dxz?5jzT?(bn?e{&>JnDuo=+Ar^5S--L2Rk5+Loi$QrK3i;5CqkWF
z!O&FIuIl#wa6nmAcEqTRJG*ZjX1O00^y6KvYuR6pe@|Iz13grwPW6Ycvq0zIj5Vbv
z`t>U;ZB(?GbNkHF1k;PVpUxb*^wT3BGJ9-F+DIR!T<rqO4e&lGlvw{i<^Gt@Pm4mI
zvXr~JKo!$dOrxA1nY+j|6i{=%iM0BGGnV)VMg<zK)<WA4fc-N3&-7{^F4)6AN~QJ`
zBkhHUXaEs6_sA!eet0SVyBt=8>LQ<%H?dUawY){{6XF(70jj}PAmmmrQ3U>FkOae^
z99#sVh$#LRP3+LUhmF8~fc+2DLDLMVnYK%}O!Et3zd+vtzW^|36=3m_L`8hu^0RZf
zjc6%GsOBDP!hahdiXx&|0}zG9FcIEsO?XD~U#G=t@n{ARJHN^QvEKJwgQip>Z4`D4
zXz)XPTpeNCczxjkHH32-@e)2-*u_FzDKZyhB_hu4HvXOBj%`rAhRS2$Ew8s<SA<ud
zd1-erHpbtr4y!vIL@_(jUG8*jW@DM1jyKY7p)yVL(oNJXm*F>2ZV<6i5EL_s{(xbB
z5-8J%jzTw424BauaWfmVX>cLayH;k(1-Ko2z*WkUe8RQPpTybq@I<Snt}MuODQ?c4
z&TBp1CrO@lg+n5{=Aj(41@)jmD92gYoEyz+!8K2wwI;dKy#ZBX?#+0ga&KaL`Gk9f
z={)9XvUj8PGH3a3p0>JimFPK`1hc?Vhz%BD`<U=N7TtdCgchyUY9i5kibNV~V~sTp
zSG+#|gp24g$bwnmbT8RhCh84H1ykN172e^i)7S$ko@`}*8g2BHVeU!nRQxlnfhy*+
K-EBPO>-YvJ)dr~m

delta 1091
zcmchU%WD%+6voe;No=M~jMGWtq=|N#SRbvAq$ajhqz`H<O$#C}N?n+`vG}Zy)(9<4
ztwI)RTd&fG2zJqxFC^5Bh;G~|G)h4bp(0YB5OLuvIDS_x_!l_vyXV|<zB%VyPB#23
z>=@I?7_brb2}VYW`-QXc{SGc9|Bsb1$;i#+%61|{jFB3dEmu-H(M|+XTw!nfH^!2I
zC)SC0dq=og_p1pOP-{am3ecMTjK6bz^Tm3W@y1uq6~)&!vuY~KWs2hEF>hzg@1H5d
zzhy0j)<vc5@zSn|4&T0gjXw6=`Si%slT>b>Nd})=2Ro9%Yqh@4!Oymo0sRFw5w|s&
zUv`+wVk}U!xa<Ds-9vlsP&V>|Wl!-wX<6&4uav#}JvZ-5Q2F}|Wk-L|>iHRFP__t}
zo5(z9Og2zmm4#|^{bWQ3j^%B8!^k4ui1;o*A8D=yk37I%OT~^}M#dvIQ8ywwSLMUj
z<M4X<898VbswBT5Z(zOY7xHGgUx=%K9~dA6gxu~SS^@twNPra3K@x}}qWBv$QK5SW
z8-e`*`xUH)CIYCI>ZB>tWXN?v-vHkNthg(nz(W!_`FP%5b)k)DDMm23YKwWVqnIcn
zime5ruoz|q@3zI<mvTSn#d`4>V#Q+bV|><j%Y7CaO(NqQ>@aY_SNXUy%IbMIf0v@-
zejf2cekp%HQ#mUzf5!?%oGW(zk7CL`sGLRRVepKH9ha@b)6*G;ld)m`a&b^;brNlH
z5Z&euXC)g>Z*{(sT7}9q&7m>W)MfZJls$piIj}^`B>Dp;6G@=NAZmkdvIKqrtNr`3
z^U(LCy9;Gz?Sb3C`?O+~;8(Pz-URO2^nu2_NQs{Xq;2Mxqd6ntxtHLNwIDQ~G#^ff
zYZcC@s}koy*9O+cuee5;hezEtj^k*uK!Ojrn<A46(L*o|z5y*CyDGq*?L<9TX><1>
zqoUHN2!*3m5v~qxs*Z+u&aHc=G@^T87JLJ4*B`qjz0Tv4EOo(F;w^f_avSU7SM}|`
E06vxan*aa+

diff --git a/bootloaders/zero/samd21e18a_sam_ba.bin b/bootloaders/zero/samd21e18a_sam_ba.bin
index 64d284a95a0412d92d50171b85c480e4368b9399..b30c653d6e655aa41ee31382b04db68659931688 100755
GIT binary patch
delta 1116
zcmZvbU1$?o6vxk<>6lEL7-K$6nxvghsuo+;#5CAc(JG~ljY1JYSr;5XVCz<}e$v7&
zZEY5^AZWeC+Soo6U2q>%N>orR)i)m-L2&oUMb|1K1XQ}%==i@a1s^)_n{)0t|2gMe
z4)Z)(h%UboCha#XQO`Vs&cIPxIKa$53yDR+(pCtU(k)b2I@e=GGe(2AD%78dG$9=t
zd{(Ot`G^bzhPcY!_HIa#?(b${e^Vq?n)h`?+AeNqdB3stMY-`q8*8L>#eBI@mkM=s
z21C=eJL}r|!U1Jj)nQ{@(%E(GAS<k%(|_q~S;?L{{yAZZ1-hwLo$d=?Wr2=?57vyH
z>eDZ=tWncy&h9fSQ%o=Kn)-0y!l8RUWOmz>tdTuPh1eV`^z&XRlv?vY6&`#p&WJ+q
z@>IAyM>R9kOrwGynVZNolu%Q#m$Z2QDNFJVqY@2QYo=}c!H+Wh_w-^PF4)cAN|p8u
zBkhTYs2>qG_sGYUK6n}aha6Uf>O7y2*RxFSUwM<<E5yy92GoJgK*+6Lq6qwpAPt5<
zH8>AM5mEdVn%JRx4I6=d1N#xwL(>GPiMC09n&ub8eucgnehFaED!}3;iOTqx<!9$&
z8_`mXP{%#il>Y`k6h%a_1|SNHVIsW8n(_=6zs`u&;?WEsc7C1zZN2Te0!^hv+6e3@
z(BOyom^#e1@ObHdHH32(@d`dt+Q~v(DKqC|6(Y{<HvXOBFWZ261(ip^D;~FBRfJca
zduDeqHp>579#(fah!S?9o80Nx$VPKJ951C^LS>rfh3lwUEyLeRg#pAyKv2vi`U8gj
zNuWw2Is)Bz6?`4n#?5TdX2H2!&q|po=is*Uepe++^KsWIe;Q}k-D545`l=w)rKCA~
zvZ!@?C(}Id3Wr2?#a%gQ3+h3CP)@S2IXhC+f-5E;wWPVzy%tpx?u~e#aIa^3__%wR
z={(`tYVShpMNaeIJ+1X)D$!#w0X_joDK=P!?PJ2TSajQ&V_Gz(ZHPqU6p1v(5{>cL
zC9lsv?jpJm^57G2x)*FB7xf0Dl4<W=g}3|aHFifzrd!xUqm`x@=AOV##XrLusOEFN
KtCeSb?cV?`r3Uu^

delta 1068
zcmchU+e=hY6vo#+$H_T5({!9mXPhyQGnuAc92+wXQNt`81&JP_9vXW|>}HWRf#R42
z^I%@uiI))a!KZG>U@sN*(p!O32tfo!gk52x2Q`OI->!uIf;Rm2T6?YUthEj+8F&@2
zj`~UOF%xwOhK6#xg|m8o2UnB-$I6&w=<WukiAWb?#D?aIm6%3!5P=w1*vIZ2p{VbL
zX*_(mIZ&^8)d=&c)g>YF(dLYVw`E)X^*t=%4sV*z4sWSv6;zZ;WQU7G?v{|(J6nWr
ziyE>_Yw{0=^V`OoJ*};E9`@Sy^6bltRBV}z`d^!Ro1^|))t;8#@8*~e{WUfoHt#bQ
z4;VQi=F48&_W1kJfn)b68C+q>OT0_UDJ)o`<bxln1y6*EKPM<TvO<LmvrMOCHZpgS
zc~Tdxr5gTF@+$O|<{R)gC;59R*V@TQf951=M?~YQe8zMhUMIgI`%OX><#*)mtTX;b
z-Ys_v@h;#6Iw%1`ZgCN9gnt=CKn!Rg3Pcf6`~#Y((0zgp!hV5W0)@~70aa6tG-VhJ
zxi;u);imx;-U`Tckwi8=mVR7aZ6jKW5p=GaL+;xsCW?q+TYxAmhS|v5%^~M->gR&k
zBaSY1DHc4+=gjw<ebCq?(yzh}0tbARk0~Q;4-aG<QB=J95zpeo87G*^S*GzjmL=j`
zvG9KsQ<h$(50wYOD;}`kFbPkKC#*Kc2Kn2yex=byRB0ue=2lxd8;tL@y^|V+$}o(9
zQPk9A_*Im=fY?>APRu0w111wmAWtVc1l?pFd>>Km-#_bzz9ZhAB{Ne8+*;mc&t(xl
zVPEf#;BB8dS(hHn^D>{b-&j1C(j%@%5&qonhvu8zgWKvTz+L7j$9>ANogLy6juGbK
zWzH(=c{Eui!h4+if|Cl-Q!oRTfjtAe%EX>6L>*XZefw#>v|KMO36xQ3prWL_BCwOE
noSJ*ePV@-Ofo0%y{IQkstuBw0R^x9Z-k=53rm-%5Q)~JKWykgY

diff --git a/bootloaders/zero/startup_samd11.c b/bootloaders/zero/startup_samd11.c
new file mode 100644
index 000000000..2308ceb2b
--- /dev/null
+++ b/bootloaders/zero/startup_samd11.c
@@ -0,0 +1,201 @@
+/**
+ * \file
+ *
+ * \brief gcc starttup file for SAMD11
+ *
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
+ *
+ * \asf_license_start
+ *
+ * \page License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * 3. The name of Atmel may not be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 4. This software may only be redistributed and used in connection with an
+ *    Atmel microcontroller product.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
+ * EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \asf_license_stop
+ *
+ */
+
+#include "sam.h"
+
+/* Initialize segments */
+extern uint32_t _sfixed;
+extern uint32_t _efixed;
+extern uint32_t _etext;
+extern uint32_t _srelocate;
+extern uint32_t _erelocate;
+extern uint32_t _szero;
+extern uint32_t _ezero;
+extern uint32_t _sstack;
+extern uint32_t _estack;
+
+/** \cond DOXYGEN_SHOULD_SKIP_THIS */
+int main(void);
+/** \endcond */
+
+void __libc_init_array(void);
+
+/* Default empty handler */
+void Dummy_Handler(void);
+
+/* Cortex-M0+ core handlers */
+void NMI_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void HardFault_Handler       ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void SVC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void PendSV_Handler          ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void SysTick_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+
+/* Peripherals handlers */
+void PM_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void SYSCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void WDT_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void RTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void EIC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void NVMCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void DMAC_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#ifdef USB_IRQn
+void USB_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+void EVSYS_Handler           ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM0_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM1_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#ifdef SERCOM2_IRQn
+void SERCOM2_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+void TCC0_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC1_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC2_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void ADC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+void AC_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#ifdef DAC_IRQn
+void DAC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+void PTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+
+/* Exception Table */
+__attribute__ ((section(".vectors")))
+const DeviceVectors exception_table = {
+
+        /* Configure Initial Stack Pointer, using linker-generated symbols */
+        (void*) (&_estack),
+
+        (void*) Reset_Handler,
+        (void*) NMI_Handler,
+        (void*) HardFault_Handler,
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) SVC_Handler,
+        (void*) (0UL), /* Reserved */
+        (void*) (0UL), /* Reserved */
+        (void*) PendSV_Handler,
+        (void*) SysTick_Handler,
+
+        /* Configurable interrupts */
+        (void*) PM_Handler,             /*  0 Power Manager */
+        (void*) SYSCTRL_Handler,        /*  1 System Control */
+        (void*) WDT_Handler,            /*  2 Watchdog Timer */
+        (void*) RTC_Handler,            /*  3 Real-Time Counter */
+        (void*) EIC_Handler,            /*  4 External Interrupt Controller */
+        (void*) NVMCTRL_Handler,        /*  5 Non-Volatile Memory Controller */
+        (void*) DMAC_Handler,           /*  6 Direct Memory Access Controller */
+#ifdef USB_IRQn
+        (void*) USB_Handler,            /*  7 Universal Serial Bus */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+        (void*) EVSYS_Handler,          /*  8 Event System Interface */
+        (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
+        (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
+#ifdef SERCOM2_IRQn
+        (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+        (void*) TCC0_Handler,           /* 12 Timer Counter Control */
+        (void*) TC1_Handler,            /* 13 Basic Timer Counter 0 */
+        (void*) TC2_Handler,            /* 14 Basic Timer Counter 1 */
+        (void*) ADC_Handler,            /* 15 Analog Digital Converter */
+        (void*) AC_Handler,             /* 16 Analog Comparators */
+#ifdef DAC_IRQn
+        (void*) DAC_Handler,            /* 17 Digital Analog Converter */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+        (void*) PTC_Handler             /* 18 Peripheral Touch Controller */
+};
+
+/**
+ * \brief This is the code that gets called on processor reset.
+ * To initialize the device, and call the main() routine.
+ */
+void Reset_Handler(void)
+{
+        uint32_t *pSrc, *pDest;
+
+        /* Initialize the relocate segment */
+        pSrc = &_etext;
+        pDest = &_srelocate;
+
+        if (pSrc != pDest) {
+                for (; pDest < &_erelocate;) {
+                        *pDest++ = *pSrc++;
+                }
+        }
+
+        /* Clear the zero segment */
+        for (pDest = &_szero; pDest < &_ezero;) {
+                *pDest++ = 0;
+        }
+
+        /* Set the vector table base address */
+        pSrc = (uint32_t *) & _sfixed;
+        SCB->VTOR = ((uint32_t) pSrc & SCB_VTOR_TBLOFF_Msk);
+
+        /* Initialize the C library */
+        __libc_init_array();
+
+        /* Branch to main function */
+        main();
+
+        /* Infinite loop */
+        while (1);
+}
+
+/**
+ * \brief Default interrupt handler for unused IRQs.
+ */
+void Dummy_Handler(void)
+{
+        while (1) {
+        }
+}
diff --git a/bootloaders/zero/startup_samd21.c b/bootloaders/zero/startup_samd21.c
index 0f45ae3f9..6e04bee45 100644
--- a/bootloaders/zero/startup_samd21.c
+++ b/bootloaders/zero/startup_samd21.c
@@ -3,7 +3,7 @@
  *
  * \brief gcc starttup file for SAMD21
  *
- * Copyright (c) 2013-2014 Atmel Corporation. All rights reserved.
+ * Copyright (c) 2014 Atmel Corporation. All rights reserved.
  *
  * \asf_license_start
  *
@@ -78,27 +78,50 @@ void RTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler
 void EIC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void NVMCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void DMAC_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#ifdef USB_IRQn
 void USB_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
 void EVSYS_Handler           ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM0_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM1_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM2_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM3_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#ifdef SERCOM4_IRQn
 void SERCOM4_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef SERCOM5_IRQn
 void SERCOM5_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
 void TCC0_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC1_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC2_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC3_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC4_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC5_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#ifdef TC6_IRQn
 void TC6_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef TC7_IRQn
 void TC7_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef ADC_IRQn
 void ADC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef AC_IRQn
 void AC_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef DAC_IRQn
 void DAC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef PTC_IRQn
 void PTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef I2S_IRQn
 void I2S_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
+#ifdef AC1_IRQn
+void AC1_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
+#endif
 
 /* Exception Table */
 __attribute__ ((section(".vectors")))
@@ -131,27 +154,72 @@ const DeviceVectors exception_table = {
         (void*) EIC_Handler,            /*  4 External Interrupt Controller */
         (void*) NVMCTRL_Handler,        /*  5 Non-Volatile Memory Controller */
         (void*) DMAC_Handler,           /*  6 Direct Memory Access Controller */
+#ifdef USB_IRQn
         (void*) USB_Handler,            /*  7 Universal Serial Bus */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
         (void*) EVSYS_Handler,          /*  8 Event System Interface */
         (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
         (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
         (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
         (void*) SERCOM3_Handler,        /* 12 Serial Communication Interface 3 */
+#ifdef SERCOM4_IRQn
         (void*) SERCOM4_Handler,        /* 13 Serial Communication Interface 4 */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef SERCOM5_IRQn
         (void*) SERCOM5_Handler,        /* 14 Serial Communication Interface 5 */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
         (void*) TCC0_Handler,           /* 15 Timer Counter Control 0 */
         (void*) TCC1_Handler,           /* 16 Timer Counter Control 1 */
         (void*) TCC2_Handler,           /* 17 Timer Counter Control 2 */
         (void*) TC3_Handler,            /* 18 Basic Timer Counter 0 */
         (void*) TC4_Handler,            /* 19 Basic Timer Counter 1 */
         (void*) TC5_Handler,            /* 20 Basic Timer Counter 2 */
+#ifdef TC6_IRQn
         (void*) TC6_Handler,            /* 21 Basic Timer Counter 3 */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef TC7_IRQn
         (void*) TC7_Handler,            /* 22 Basic Timer Counter 4 */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef ADC_IRQn
         (void*) ADC_Handler,            /* 23 Analog Digital Converter */
-        (void*) AC_Handler,             /* 24 Analog Comparators */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef AC_IRQn
+        (void*) AC_Handler,             /* 24 Analog Comparators 0 */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef DAC_IRQn
         (void*) DAC_Handler,            /* 25 Digital Analog Converter */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef PTC_IRQn
         (void*) PTC_Handler,            /* 26 Peripheral Touch Controller */
-        (void*) I2S_Handler             /* 27 Inter-IC Sound Interface */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef I2S_IRQn
+        (void*) I2S_Handler,            /* 27 Inter-IC Sound Interface */
+#else
+        (void*) (0UL), /* Reserved */
+#endif
+#ifdef AC1_IRQn
+        (void*) AC1_Handler             /* 28 Analog Comparators 1 */
+#else
+        (void*) (0UL)  /* Reserved */
+#endif
 };
 
 /**
diff --git a/cores/arduino/Reset.cpp b/cores/arduino/Reset.cpp
index 8809907e8..1ea9f9716 100644
--- a/cores/arduino/Reset.cpp
+++ b/cores/arduino/Reset.cpp
@@ -24,7 +24,19 @@ extern "C" {
 #endif
 
 #define NVM_MEMORY ((volatile uint16_t *)0x000000)
-#define APP_START 0x00002004
+
+#if defined(__NO_BOOTLODAER__)
+	#define APP_START 0x00000004
+#elif defined(__4KB_BOOTLODAER__)
+	#define APP_START 0x00001004
+#elif defined(__8KB_BOOTLODAER__)
+	#define APP_START 0x00002004
+#elif defined(__16KB_BOOTLODAER__)
+	#define APP_START 0x00004004
+#else
+	// default of 8KB
+	#define APP_START 0x00002004
+#endif
 
 static inline bool nvmReady(void) {
         return NVMCTRL->INTFLAG.reg & NVMCTRL_INTFLAG_READY;
diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index d54c755a0..442370754 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -30,8 +30,8 @@ SERCOM::SERCOM(Sercom* s)
 */
 void SERCOM::initUART(SercomUartMode mode, SercomUartSampleRate sampleRate, uint32_t baudrate)
 {
-  resetUART();
   initClockNVIC();
+  resetUART();
 
   //Setting the CTRLA register
   sercom->USART.CTRLA.reg =	SERCOM_USART_CTRLA_MODE(mode) |
@@ -127,6 +127,16 @@ bool SERCOM::availableDataUART()
   return sercom->USART.INTFLAG.bit.RXC;
 }
 
+bool SERCOM::isUARTError()
+{
+	return sercom->USART.INTFLAG.bit.ERROR;
+}
+
+void SERCOM::acknowledgeUARTError()
+{
+	sercom->USART.INTFLAG.bit.ERROR = 1;
+}
+
 bool SERCOM::isBufferOverflowErrorUART()
 {
   //BUFOVF : Buffer Overflow
@@ -628,6 +638,8 @@ void SERCOM::initClockNVIC( void )
     clockId = GCM_SERCOM3_CORE;
     IdNvic = SERCOM3_IRQn;
   }
+#if defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
+  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   else if(sercom == SERCOM4)
   {
     clockId = GCM_SERCOM4_CORE;
@@ -638,6 +650,7 @@ void SERCOM::initClockNVIC( void )
     clockId = GCM_SERCOM5_CORE;
     IdNvic = SERCOM5_IRQn;
   }
+#endif
 
   if ( IdNvic == PendSV_IRQn )
   {
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
index d64214522..fbd27e624 100644
--- a/cores/arduino/SERCOM.h
+++ b/cores/arduino/SERCOM.h
@@ -162,6 +162,8 @@ class SERCOM
 		bool isDataRegisterEmptyUART( void ) ;
 		uint8_t readDataUART( void ) ;
 		int writeDataUART(uint8_t data) ;
+		bool isUARTError() ;
+		void acknowledgeUARTError() ;
 
 		/* ========== SPI ========== */
 		void initSPI(SercomSpiTXPad mosi, SercomRXPad miso, SercomSpiCharSize charSize, SercomDataOrder dataOrder) ;
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index 84b8bae10..1dff8ab37 100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
@@ -34,6 +34,7 @@ volatile bool toneIsActive = false;
 #define TONE_TC_IRQn    TC5_IRQn
 #define TONE_TC_TOP     0xFFFF
 #define TONE_TC_CHANNEL 0
+void TC5_Handler (void) __attribute__ ((weak, alias("Tone_Handler")));
 
 static inline void resetTC (Tc* TCx)
 {
@@ -183,8 +184,6 @@ void Tone_Handler (void)
   }
 }
 
-void TC5_Handler (void) __attribute__ ((weak, alias("Tone_Handler")));
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/cores/arduino/USB/samd21_device.c b/cores/arduino/USB/samd21_device.c
index 271243a3d..d28774915 100644
--- a/cores/arduino/USB/samd21_device.c
+++ b/cores/arduino/USB/samd21_device.c
@@ -79,12 +79,14 @@ void UDD_Init(void)
 	PM->APBBMASK.reg |= PM_APBBMASK_USB;
 
 	/* Set up the USB DP/DN pins */
-	PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
-	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg &= ~(0xF << (4 * (PIN_PA24G_USB_DM & 0x01u)));
-	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg |= MUX_PA24G_USB_DM << (4 * (PIN_PA24G_USB_DM & 0x01u));
-	PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PMUXEN = 1;
-	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg &= ~(0xF << (4 * (PIN_PA25G_USB_DP & 0x01u)));
-	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
+	pinPeripheral( PIN_USB_DM, PIO_COM );
+	pinPeripheral( PIN_USB_DP, PIO_COM );
+//	PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
+//	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg &= ~(0xF << (4 * (PIN_PA24G_USB_DM & 0x01u)));
+//	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg |= MUX_PA24G_USB_DM << (4 * (PIN_PA24G_USB_DM & 0x01u));
+//	PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PMUXEN = 1;
+//	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg &= ~(0xF << (4 * (PIN_PA25G_USB_DP & 0x01u)));
+//	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
 
 	/* ----------------------------------------------------------------------------------------------
 	 * Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index 0ad323134..9e302f2a8 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -15,64 +15,64 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "../Arduino.h"
-#include "../wiring_private.h"
-#include "USB_host.h"
-#include "samd21_host.h"
-
-#define HOST_DEFINED
-#ifdef HOST_DEFINED
-
-//#define TRACE_UOTGHS_HOST(x)	x
-#define TRACE_UOTGHS_HOST(x)
-
-//extern void (*gpf_isr)(void);
-
-// Handle UOTGHS Host driver state
-static uhd_vbus_state_t uhd_state = UHD_STATE_NO_VBUS;
-
-__attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table[USB_EPT_NUM];
-
-extern void (*gpf_isr)(void);
-
-void UHD_SetStack(void (*pf_isr)(void))
-{
-	gpf_isr = pf_isr;
-}
-
-// NVM Software Calibration Area Mapping
-// USB TRANSN calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRANSN_POS     45
-#define NVM_USB_PAD_TRANSN_SIZE    5
-// USB TRANSP calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRANSP_POS     50
-#define NVM_USB_PAD_TRANSP_SIZE    5
-// USB TRIM calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRIM_POS       55
-#define NVM_USB_PAD_TRIM_SIZE      3
-
-/**
- * \brief Initialize the SAMD21 host driver.
- */
-void UHD_Init(void)
-{
-	uint32_t pad_transn;
-	uint32_t pad_transp;
-	uint32_t pad_trim;
-	uint32_t i;
-
+
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "../Arduino.h"
+#include "../wiring_private.h"
+#include "USB_host.h"
+#include "samd21_host.h"
+
+#define HOST_DEFINED
+#ifdef HOST_DEFINED
+
+//#define TRACE_UOTGHS_HOST(x)	x
+#define TRACE_UOTGHS_HOST(x)
+
+//extern void (*gpf_isr)(void);
+
+// Handle UOTGHS Host driver state
+static uhd_vbus_state_t uhd_state = UHD_STATE_NO_VBUS;
+
+__attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table[USB_EPT_NUM];
+
+extern void (*gpf_isr)(void);
+
+void UHD_SetStack(void (*pf_isr)(void))
+{
+	gpf_isr = pf_isr;
+}
+
+// NVM Software Calibration Area Mapping
+// USB TRANSN calibration value. Should be written to the USB PADCAL register.
+#define NVM_USB_PAD_TRANSN_POS     45
+#define NVM_USB_PAD_TRANSN_SIZE    5
+// USB TRANSP calibration value. Should be written to the USB PADCAL register.
+#define NVM_USB_PAD_TRANSP_POS     50
+#define NVM_USB_PAD_TRANSP_SIZE    5
+// USB TRIM calibration value. Should be written to the USB PADCAL register.
+#define NVM_USB_PAD_TRIM_POS       55
+#define NVM_USB_PAD_TRIM_SIZE      3
+
+/**
+ * \brief Initialize the SAMD21 host driver.
+ */
+void UHD_Init(void)
+{
+	uint32_t pad_transn;
+	uint32_t pad_transp;
+	uint32_t pad_trim;
+	uint32_t i;
+
 	UHD_SetStack(&UHD_Handler);
-
-	/* Enable USB clock */
-	PM->APBBMASK.reg |= PM_APBBMASK_USB;
-
-	/* Set up the USB DP/DM pins */
+
+	/* Enable USB clock */
+	PM->APBBMASK.reg |= PM_APBBMASK_USB;
+
+	/* Set up the USB DP/DM pins */
 	pinPeripheral( PIN_USB_DM, PIO_COM );
 	pinPeripheral( PIN_USB_DP, PIO_COM );
 // 	PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
@@ -81,439 +81,439 @@ void UHD_Init(void)
 // 	PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PMUXEN = 1;
 // 	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg &= ~(0xF << (4 * (PIN_PA25G_USB_DP & 0x01u)));
 // 	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
-
-	/* ----------------------------------------------------------------------------------------------
-	* Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
-	*/
-	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(6) |        // Generic Clock Multiplexer 6
-						GCLK_CLKCTRL_GEN_GCLK0 |    // Generic Clock Generator 0 is source
-						GCLK_CLKCTRL_CLKEN;
-
-	while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
-	{
-		/* Wait for synchronization */
-	}
-
-	/* Reset */
-	USB->HOST.CTRLA.bit.SWRST = 1;
-	while (USB->HOST.SYNCBUSY.bit.SWRST)
-	{
-		/* Sync wait */
-	}
-
-	//  uhd_enable();
+
+	/* ----------------------------------------------------------------------------------------------
+	* Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
+	*/
+	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(6) |        // Generic Clock Multiplexer 6
+						GCLK_CLKCTRL_GEN_GCLK0 |    // Generic Clock Generator 0 is source
+						GCLK_CLKCTRL_CLKEN;
+
+	while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
+	{
+		/* Wait for synchronization */
+	}
+
+	/* Reset */
+	USB->HOST.CTRLA.bit.SWRST = 1;
+	while (USB->HOST.SYNCBUSY.bit.SWRST)
+	{
+		/* Sync wait */
+	}
+
+	//  uhd_enable();
 	USB->DEVICE.CTRLA.reg |= USB_CTRLA_ENABLE | USB_CTRLA_MODE;
-	uhd_force_host_mode();
+	uhd_force_host_mode();
 	while (USB->HOST.SYNCBUSY.reg == USB_SYNCBUSY_ENABLE);
-
-	/* Load Pad Calibration */
-	pad_transn = (*((uint32_t *)(NVMCTRL_OTP4)       // Non-Volatile Memory Controller
-					+ (NVM_USB_PAD_TRANSN_POS / 32))
-					>> (NVM_USB_PAD_TRANSN_POS % 32))
-				& ((1 << NVM_USB_PAD_TRANSN_SIZE) - 1);
-
-	if (pad_transn == 0x1F)         // maximum value (31)
-	{
-		pad_transn = 5;
-	}
-
-	USB->HOST.PADCAL.bit.TRANSN = pad_transn;
-
-	pad_transp = (*((uint32_t *)(NVMCTRL_OTP4)
-					+ (NVM_USB_PAD_TRANSP_POS / 32))
-					>> (NVM_USB_PAD_TRANSP_POS % 32))
-				& ((1 << NVM_USB_PAD_TRANSP_SIZE) - 1);
-
-	if (pad_transp == 0x1F)         // maximum value (31)
-	{
-		pad_transp = 29;
-	}
-
-	USB->HOST.PADCAL.bit.TRANSP = pad_transp;
-
-	pad_trim = (*((uint32_t *)(NVMCTRL_OTP4)
-					+ (NVM_USB_PAD_TRIM_POS / 32))
-				>> (NVM_USB_PAD_TRIM_POS % 32))
-				& ((1 << NVM_USB_PAD_TRIM_SIZE) - 1);
-
-	if (pad_trim == 0x7)         // maximum value (7)
-	{
-		pad_trim = 3;
-	}
-
-	USB->HOST.PADCAL.bit.TRIM = pad_trim;
-
-
-	/* Set the configuration */
-	uhd_run_in_standby();
-	// Set address of USB SRAM
-	USB->HOST.DESCADD.reg = (uint32_t)(&usb_pipe_table[0]);
-	// For USB_SPEED_FULL
-	uhd_force_full_speed();
-	for (i = 0; i < sizeof(usb_pipe_table); i++)
-	{
-		(*(uint32_t *)(&usb_pipe_table[0] + i)) = 0;
-	}
-
-	uhd_state = UHD_STATE_NO_VBUS;
-
-	// Put VBUS on USB port
-	pinMode( PIN_USB_HOST_ENABLE, OUTPUT );
-	digitalWrite( PIN_USB_HOST_ENABLE, HIGH );
-
-	uhd_enable_connection_int();
-
-	USB->HOST.INTENSET.reg = USB_HOST_INTENSET_DCONN;
-	USB->HOST.INTENSET.reg = USB_HOST_INTENSET_WAKEUP;
-	USB->HOST.INTENSET.reg = USB_HOST_INTENSET_DDISC;
-
-	USB->HOST.CTRLB.bit.VBUSOK = 1;
-
-	// Configure interrupts
-	NVIC_SetPriority((IRQn_Type)USB_IRQn, 0UL);
-	NVIC_EnableIRQ((IRQn_Type)USB_IRQn);
-}
-
-
-/**
- * \brief Interrupt sub routine for USB Host state machine management.
- */
-//static void UHD_ISR(void)
-void UHD_Handler(void)
-{
-   uint16_t flags;
-
+
+	/* Load Pad Calibration */
+	pad_transn = (*((uint32_t *)(NVMCTRL_OTP4)       // Non-Volatile Memory Controller
+					+ (NVM_USB_PAD_TRANSN_POS / 32))
+					>> (NVM_USB_PAD_TRANSN_POS % 32))
+				& ((1 << NVM_USB_PAD_TRANSN_SIZE) - 1);
+
+	if (pad_transn == 0x1F)         // maximum value (31)
+	{
+		pad_transn = 5;
+	}
+
+	USB->HOST.PADCAL.bit.TRANSN = pad_transn;
+
+	pad_transp = (*((uint32_t *)(NVMCTRL_OTP4)
+					+ (NVM_USB_PAD_TRANSP_POS / 32))
+					>> (NVM_USB_PAD_TRANSP_POS % 32))
+				& ((1 << NVM_USB_PAD_TRANSP_SIZE) - 1);
+
+	if (pad_transp == 0x1F)         // maximum value (31)
+	{
+		pad_transp = 29;
+	}
+
+	USB->HOST.PADCAL.bit.TRANSP = pad_transp;
+
+	pad_trim = (*((uint32_t *)(NVMCTRL_OTP4)
+					+ (NVM_USB_PAD_TRIM_POS / 32))
+				>> (NVM_USB_PAD_TRIM_POS % 32))
+				& ((1 << NVM_USB_PAD_TRIM_SIZE) - 1);
+
+	if (pad_trim == 0x7)         // maximum value (7)
+	{
+		pad_trim = 3;
+	}
+
+	USB->HOST.PADCAL.bit.TRIM = pad_trim;
+
+
+	/* Set the configuration */
+	uhd_run_in_standby();
+	// Set address of USB SRAM
+	USB->HOST.DESCADD.reg = (uint32_t)(&usb_pipe_table[0]);
+	// For USB_SPEED_FULL
+	uhd_force_full_speed();
+	for (i = 0; i < sizeof(usb_pipe_table); i++)
+	{
+		(*(uint32_t *)(&usb_pipe_table[0] + i)) = 0;
+	}
+
+	uhd_state = UHD_STATE_NO_VBUS;
+
+	// Put VBUS on USB port
+	pinMode( PIN_USB_HOST_ENABLE, OUTPUT );
+	digitalWrite( PIN_USB_HOST_ENABLE, PIN_USB_HOST_ENABLE_VALUE );
+
+	uhd_enable_connection_int();
+
+	USB->HOST.INTENSET.reg = USB_HOST_INTENSET_DCONN;
+	USB->HOST.INTENSET.reg = USB_HOST_INTENSET_WAKEUP;
+	USB->HOST.INTENSET.reg = USB_HOST_INTENSET_DDISC;
+
+	USB->HOST.CTRLB.bit.VBUSOK = 1;
+
+	// Configure interrupts
+	NVIC_SetPriority((IRQn_Type)USB_IRQn, 0UL);
+	NVIC_EnableIRQ((IRQn_Type)USB_IRQn);
+}
+
+
+/**
+ * \brief Interrupt sub routine for USB Host state machine management.
+ */
+//static void UHD_ISR(void)
+void UHD_Handler(void)
+{
+   uint16_t flags;
+
 	if (USB->HOST.CTRLA.bit.MODE) {
 		/*host mode ISR */
-
-		/* get interrupt flags */
-		flags = USB->HOST.INTFLAG.reg;
-
-		/* host SOF interrupt */
-		if (flags & USB_HOST_INTFLAG_HSOF)
-		{
-			/* clear the flag */
-			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_HSOF;
-			uhd_state             = UHD_STATE_CONNECTED;
-			return;
-		}
-
-		/* host reset interrupt */
-		if (flags & USB_HOST_INTFLAG_RST)
-		{
-			/* clear the flag */
-			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_RST;
-			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
-			return;
-		}
-
-		/* host upstream resume interrupts */
-		if (flags & USB_HOST_INTFLAG_UPRSM)
-		{
-			/* clear the flags */
-			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_UPRSM;
-			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
-			return;
-		}
-
-		/* host downstream resume interrupts */
-		if (flags & USB_HOST_INTFLAG_DNRSM)
-		{
-			/* clear the flags */
-			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_DNRSM;
-			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
-			return;
-		}
-
-		/* host wakeup interrupts */
-		if (flags & USB_HOST_INTFLAG_WAKEUP)
-		{
-			/* clear the flags */
-			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_WAKEUP;
-			uhd_state             = UHD_STATE_CONNECTED;    //UHD_STATE_ERROR;
-			return;
-		}
-
-		/* host ram access interrupt  */
-		if (flags & USB_HOST_INTFLAG_RAMACER)
-		{
-			/* clear the flag */
-			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_RAMACER;
-			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
-			return;
-		}
-
-		/* host connect interrupt */
-		if (flags & USB_HOST_INTFLAG_DCONN)
-		{
-			TRACE_UOTGHS_HOST(printf(">>> UHD_ISR : Connection INT\r\n");
-							)
-			/* clear the flag */
-			uhd_ack_connection();
-			uhd_disable_connection_int();
-			uhd_ack_disconnection();
-			uhd_enable_disconnection_int();
-			//uhd_enable_sof();
-			uhd_state = UHD_STATE_CONNECTED;
-			return;
-		}
-
-		/* host disconnect interrupt  */
-		if (flags & USB_HOST_INTFLAG_DDISC)
-		{
-			TRACE_UOTGHS_HOST(printf(">>> UHD_ISR : Disconnection INT\r\n");
-							)
-			/* clear the flag */
-			uhd_ack_disconnection();
-			uhd_disable_disconnection_int();
-			// Stop reset signal, in case of disconnection during reset
-			uhd_stop_reset();
-			// Disable wakeup/resumes interrupts,
-			// in case of disconnection during suspend mode
-			uhd_ack_connection();
-			uhd_enable_connection_int();
-			uhd_state = UHD_STATE_DISCONNECTED;
-			return;
-		}
-	}
-	else {
-		while(1);
-	}
-}
-
-
-
-/**
- * \brief Get VBUS state.
- *
- * \return VBUS status.
- */
-uhd_vbus_state_t UHD_GetVBUSState(void)
-{
-   return uhd_state;
-}
-
-
-/**
- * \brief Allocate FIFO for pipe 0.
- *
- * \param ul_add Address of remote device for pipe 0.
- * \param ul_ep_size Actual size of the FIFO in bytes.
- *
- * \retval 0 success.
- * \retval 1 error.
- */
-uint32_t UHD_Pipe0_Alloc(uint32_t ul_add, uint32_t ul_ep_size)
-{
+
+		/* get interrupt flags */
+		flags = USB->HOST.INTFLAG.reg;
+
+		/* host SOF interrupt */
+		if (flags & USB_HOST_INTFLAG_HSOF)
+		{
+			/* clear the flag */
+			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_HSOF;
+			uhd_state             = UHD_STATE_CONNECTED;
+			return;
+		}
+
+		/* host reset interrupt */
+		if (flags & USB_HOST_INTFLAG_RST)
+		{
+			/* clear the flag */
+			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_RST;
+			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
+			return;
+		}
+
+		/* host upstream resume interrupts */
+		if (flags & USB_HOST_INTFLAG_UPRSM)
+		{
+			/* clear the flags */
+			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_UPRSM;
+			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
+			return;
+		}
+
+		/* host downstream resume interrupts */
+		if (flags & USB_HOST_INTFLAG_DNRSM)
+		{
+			/* clear the flags */
+			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_DNRSM;
+			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
+			return;
+		}
+
+		/* host wakeup interrupts */
+		if (flags & USB_HOST_INTFLAG_WAKEUP)
+		{
+			/* clear the flags */
+			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_WAKEUP;
+			uhd_state             = UHD_STATE_CONNECTED;    //UHD_STATE_ERROR;
+			return;
+		}
+
+		/* host ram access interrupt  */
+		if (flags & USB_HOST_INTFLAG_RAMACER)
+		{
+			/* clear the flag */
+			USB->HOST.INTFLAG.reg = USB_HOST_INTFLAG_RAMACER;
+			uhd_state             = UHD_STATE_DISCONNECTED;    //UHD_STATE_ERROR;
+			return;
+		}
+
+		/* host connect interrupt */
+		if (flags & USB_HOST_INTFLAG_DCONN)
+		{
+			TRACE_UOTGHS_HOST(printf(">>> UHD_ISR : Connection INT\r\n");
+							)
+			/* clear the flag */
+			uhd_ack_connection();
+			uhd_disable_connection_int();
+			uhd_ack_disconnection();
+			uhd_enable_disconnection_int();
+			//uhd_enable_sof();
+			uhd_state = UHD_STATE_CONNECTED;
+			return;
+		}
+
+		/* host disconnect interrupt  */
+		if (flags & USB_HOST_INTFLAG_DDISC)
+		{
+			TRACE_UOTGHS_HOST(printf(">>> UHD_ISR : Disconnection INT\r\n");
+							)
+			/* clear the flag */
+			uhd_ack_disconnection();
+			uhd_disable_disconnection_int();
+			// Stop reset signal, in case of disconnection during reset
+			uhd_stop_reset();
+			// Disable wakeup/resumes interrupts,
+			// in case of disconnection during suspend mode
+			uhd_ack_connection();
+			uhd_enable_connection_int();
+			uhd_state = UHD_STATE_DISCONNECTED;
+			return;
+		}
+	}
+	else {
+		while(1);
+	}
+}
+
+
+
+/**
+ * \brief Get VBUS state.
+ *
+ * \return VBUS status.
+ */
+uhd_vbus_state_t UHD_GetVBUSState(void)
+{
+   return uhd_state;
+}
+
+
+/**
+ * \brief Allocate FIFO for pipe 0.
+ *
+ * \param ul_add Address of remote device for pipe 0.
+ * \param ul_ep_size Actual size of the FIFO in bytes.
+ *
+ * \retval 0 success.
+ * \retval 1 error.
+ */
+uint32_t UHD_Pipe0_Alloc(uint32_t ul_add, uint32_t ul_ep_size)
+{
 	if( USB->HOST.STATUS.reg & USB_HOST_STATUS_SPEED(1) )
-		ul_ep_size = USB_PCKSIZE_SIZE_8_BYTES;  // Low Speed
-	else
-		ul_ep_size = USB_PCKSIZE_SIZE_64_BYTES; // Full Speed
-
-	USB->HOST.HostPipe[0].PCFG.bit.PTYPE = 1; //USB_HOST_PCFG_PTYPE_CTRL;
-	usb_pipe_table[0].HostDescBank[0].CTRL_PIPE.bit.PEPNUM = 0;
-	usb_pipe_table[0].HostDescBank[0].PCKSIZE.bit.SIZE = ul_ep_size;
-
-	return 0;
-}
-
-
-/**
- * \brief Allocate a new pipe.
- *
- * \note UOTGHS maximum pipe number is limited to 10, meaning that only a limited
- * amount of devices can be connected. Unfortunately, using only one pipe shared accross
- * various endpoints and devices is not possible because the UOTGHS IP does not allow to
- * change the data toggle value through register interface.
- *
- * \param ul_dev_addr Address of remote device.
- * \param ul_dev_ep Targeted endpoint of remote device.
- * \param ul_type Pipe type.
- * \param ul_dir Pipe direction.
- * \param ul_maxsize Pipe size.
- * \param ul_interval Polling interval (if applicable to pipe type).
- * \param ul_nb_bank Number of banks associated with this pipe.
- *
- * \return 1.
- */
-uint32_t UHD_Pipe_Alloc(uint32_t ul_dev_addr, uint32_t ul_dev_ep, uint32_t ul_type, uint32_t ul_dir, uint32_t ul_maxsize, uint32_t ul_interval, uint32_t ul_nb_bank)
-{
-	/* set pipe config */
-	USB->HOST.HostPipe[ul_dev_ep].PCFG.bit.BK    = ul_nb_bank;
-	// PTYPE:
-	USB->HOST.HostPipe[ul_dev_ep].PCFG.reg &= ~USB_HOST_PCFG_MASK;  // USB->HOST.HostPipe[0].PCFG.bit.PTYPE = 1; //USB_HOST_PCFG_PTYPE_CTRL;
-	USB->HOST.HostPipe[ul_dev_ep].PCFG.reg |= ul_type;
-	USB->HOST.HostPipe[ul_dev_ep].BINTERVAL.reg  = ul_interval;
-
-   if (ul_dir & USB_EP_DIR_IN)
-   {
-      USB->HOST.HostPipe[ul_dev_ep].PCFG.bit.PTOKEN = USB_HOST_PCFG_PTOKEN_IN;
-      USB->HOST.HostPipe[ul_dev_ep].PSTATUSSET.reg  = USB_HOST_PSTATUSSET_BK0RDY;
-   }
-   else
-   {
-      USB->HOST.HostPipe[ul_dev_ep].PCFG.bit.PTOKEN = USB_HOST_PCFG_PTOKEN_OUT;
-      USB->HOST.HostPipe[ul_dev_ep].PSTATUSCLR.reg  = USB_HOST_PSTATUSCLR_BK0RDY;
-   }
-
+		ul_ep_size = USB_PCKSIZE_SIZE_8_BYTES;  // Low Speed
+	else
+		ul_ep_size = USB_PCKSIZE_SIZE_64_BYTES; // Full Speed
+
+	USB->HOST.HostPipe[0].PCFG.bit.PTYPE = 1; //USB_HOST_PCFG_PTYPE_CTRL;
+	usb_pipe_table[0].HostDescBank[0].CTRL_PIPE.bit.PEPNUM = 0;
+	usb_pipe_table[0].HostDescBank[0].PCKSIZE.bit.SIZE = ul_ep_size;
+
+	return 0;
+}
+
+
+/**
+ * \brief Allocate a new pipe.
+ *
+ * \note UOTGHS maximum pipe number is limited to 10, meaning that only a limited
+ * amount of devices can be connected. Unfortunately, using only one pipe shared accross
+ * various endpoints and devices is not possible because the UOTGHS IP does not allow to
+ * change the data toggle value through register interface.
+ *
+ * \param ul_dev_addr Address of remote device.
+ * \param ul_dev_ep Targeted endpoint of remote device.
+ * \param ul_type Pipe type.
+ * \param ul_dir Pipe direction.
+ * \param ul_maxsize Pipe size.
+ * \param ul_interval Polling interval (if applicable to pipe type).
+ * \param ul_nb_bank Number of banks associated with this pipe.
+ *
+ * \return 1.
+ */
+uint32_t UHD_Pipe_Alloc(uint32_t ul_dev_addr, uint32_t ul_dev_ep, uint32_t ul_type, uint32_t ul_dir, uint32_t ul_maxsize, uint32_t ul_interval, uint32_t ul_nb_bank)
+{
+	/* set pipe config */
+	USB->HOST.HostPipe[ul_dev_ep].PCFG.bit.BK    = ul_nb_bank;
+	// PTYPE:
+	USB->HOST.HostPipe[ul_dev_ep].PCFG.reg &= ~USB_HOST_PCFG_MASK;  // USB->HOST.HostPipe[0].PCFG.bit.PTYPE = 1; //USB_HOST_PCFG_PTYPE_CTRL;
+	USB->HOST.HostPipe[ul_dev_ep].PCFG.reg |= ul_type;
+	USB->HOST.HostPipe[ul_dev_ep].BINTERVAL.reg  = ul_interval;
+
+   if (ul_dir & USB_EP_DIR_IN)
+   {
+      USB->HOST.HostPipe[ul_dev_ep].PCFG.bit.PTOKEN = USB_HOST_PCFG_PTOKEN_IN;
+      USB->HOST.HostPipe[ul_dev_ep].PSTATUSSET.reg  = USB_HOST_PSTATUSSET_BK0RDY;
+   }
+   else
+   {
+      USB->HOST.HostPipe[ul_dev_ep].PCFG.bit.PTOKEN = USB_HOST_PCFG_PTOKEN_OUT;
+      USB->HOST.HostPipe[ul_dev_ep].PSTATUSCLR.reg  = USB_HOST_PSTATUSCLR_BK0RDY;
+   }
+
 	if( USB->HOST.STATUS.reg & USB_HOST_STATUS_SPEED(1) )
-	   ul_maxsize = USB_PCKSIZE_SIZE_8_BYTES;  // Low Speed
-	else
-	   ul_maxsize = USB_PCKSIZE_SIZE_64_BYTES; // Full Speed
-
-   memset((uint8_t *)&usb_pipe_table[ul_dev_ep], 0, sizeof(usb_pipe_table[ul_dev_ep]));
-
-   usb_pipe_table[ul_dev_ep].HostDescBank[0].CTRL_PIPE.bit.PDADDR = ul_dev_addr;
-   usb_pipe_table[ul_dev_ep].HostDescBank[0].CTRL_PIPE.bit.PEPNUM = ul_dev_ep;
-   usb_pipe_table[ul_dev_ep].HostDescBank[0].PCKSIZE.bit.SIZE     = ul_maxsize;
-
-   return 1;
-}
-
-
-void UHD_Pipe_CountZero(uint32_t ul_pipe)
-{
+	   ul_maxsize = USB_PCKSIZE_SIZE_8_BYTES;  // Low Speed
+	else
+	   ul_maxsize = USB_PCKSIZE_SIZE_64_BYTES; // Full Speed
+
+   memset((uint8_t *)&usb_pipe_table[ul_dev_ep], 0, sizeof(usb_pipe_table[ul_dev_ep]));
+
+   usb_pipe_table[ul_dev_ep].HostDescBank[0].CTRL_PIPE.bit.PDADDR = ul_dev_addr;
+   usb_pipe_table[ul_dev_ep].HostDescBank[0].CTRL_PIPE.bit.PEPNUM = ul_dev_ep;
+   usb_pipe_table[ul_dev_ep].HostDescBank[0].PCKSIZE.bit.SIZE     = ul_maxsize;
+
+   return 1;
+}
+
+
+void UHD_Pipe_CountZero(uint32_t ul_pipe)
+{
 	usb_pipe_table[ul_pipe].HostDescBank[0].PCKSIZE.bit.BYTE_COUNT = 0;
-}
-
-/**
- * \brief Free a pipe.
- *
- * \param ul_pipe Pipe number to free.
- */
-void UHD_Pipe_Free(uint32_t ul_pipe)
-{
-   // The Pipe is frozen and no additional requests will be sent to the device on this pipe address.
-   USB->HOST.HostPipe[ul_pipe].PSTATUSSET.reg = USB_HOST_PSTATUSSET_PFREEZE;
-}
-
-
-/**
- * \brief Read from a pipe.
- *
- * \param ul_pipe Pipe number.
- * \param ul_size Maximum number of data to read.
- * \param data Buffer to store the data.
- *
- * \return number of data read.
- */
-uint32_t UHD_Pipe_Read(uint32_t pipe_num, uint32_t buf_size, uint8_t *buf)
-{
-   if (USB->HOST.HostPipe[pipe_num].PCFG.bit.PTYPE == USB_HOST_PTYPE_DIS)
-   {
-      return 0;
-   }
-
-   /* get pipe config from setting register */
-   usb_pipe_table[pipe_num].HostDescBank[0].ADDR.reg = (uint32_t)buf;
-   usb_pipe_table[pipe_num].HostDescBank[0].PCKSIZE.bit.BYTE_COUNT        = 0;
-   usb_pipe_table[pipe_num].HostDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = buf_size;
-   USB->HOST.HostPipe[pipe_num].PCFG.bit.PTOKEN = USB_HOST_PCFG_PTOKEN_IN;
-
-   /* Start transfer */
-   USB->HOST.HostPipe[pipe_num].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_BK0RDY;
-
-   // Unfreeze pipe
-   USB->HOST.HostPipe[pipe_num].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_PFREEZE;
-
-   return buf_size;
-}
-
-
-/**
- * \brief Write into a pipe.
- *
- * \param ul_pipe Pipe number.
- * \param ul_size Maximum number of data to read.
- * \param data Buffer containing data to write.
- */
-void UHD_Pipe_Write(uint32_t ul_pipe, uint32_t ul_size, uint8_t *buf)
-{
-   /* get pipe config from setting register */
-   usb_pipe_table[ul_pipe].HostDescBank[0].ADDR.reg = (uint32_t)buf;
-   usb_pipe_table[ul_pipe].HostDescBank[0].PCKSIZE.bit.BYTE_COUNT = ul_size;
-   usb_pipe_table[ul_pipe].HostDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = 0;
-}
-
-/**
- * \brief Send a pipe content.
- *
- * \param ul_pipe Pipe number.
- * \param ul_token_type Token type.
- */
-void UHD_Pipe_Send(uint32_t ul_pipe, uint32_t ul_token_type)
-{
-	USB->HOST.HostPipe[ul_pipe].PCFG.bit.PTOKEN = ul_token_type;
-
-   /* Start transfer */
-	if(ul_token_type == USB_HOST_PCFG_PTOKEN_SETUP )
-	{
+}
+
+/**
+ * \brief Free a pipe.
+ *
+ * \param ul_pipe Pipe number to free.
+ */
+void UHD_Pipe_Free(uint32_t ul_pipe)
+{
+   // The Pipe is frozen and no additional requests will be sent to the device on this pipe address.
+   USB->HOST.HostPipe[ul_pipe].PSTATUSSET.reg = USB_HOST_PSTATUSSET_PFREEZE;
+}
+
+
+/**
+ * \brief Read from a pipe.
+ *
+ * \param ul_pipe Pipe number.
+ * \param ul_size Maximum number of data to read.
+ * \param data Buffer to store the data.
+ *
+ * \return number of data read.
+ */
+uint32_t UHD_Pipe_Read(uint32_t pipe_num, uint32_t buf_size, uint8_t *buf)
+{
+   if (USB->HOST.HostPipe[pipe_num].PCFG.bit.PTYPE == USB_HOST_PTYPE_DIS)
+   {
+      return 0;
+   }
+
+   /* get pipe config from setting register */
+   usb_pipe_table[pipe_num].HostDescBank[0].ADDR.reg = (uint32_t)buf;
+   usb_pipe_table[pipe_num].HostDescBank[0].PCKSIZE.bit.BYTE_COUNT        = 0;
+   usb_pipe_table[pipe_num].HostDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = buf_size;
+   USB->HOST.HostPipe[pipe_num].PCFG.bit.PTOKEN = USB_HOST_PCFG_PTOKEN_IN;
+
+   /* Start transfer */
+   USB->HOST.HostPipe[pipe_num].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_BK0RDY;
+
+   // Unfreeze pipe
+   USB->HOST.HostPipe[pipe_num].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_PFREEZE;
+
+   return buf_size;
+}
+
+
+/**
+ * \brief Write into a pipe.
+ *
+ * \param ul_pipe Pipe number.
+ * \param ul_size Maximum number of data to read.
+ * \param data Buffer containing data to write.
+ */
+void UHD_Pipe_Write(uint32_t ul_pipe, uint32_t ul_size, uint8_t *buf)
+{
+   /* get pipe config from setting register */
+   usb_pipe_table[ul_pipe].HostDescBank[0].ADDR.reg = (uint32_t)buf;
+   usb_pipe_table[ul_pipe].HostDescBank[0].PCKSIZE.bit.BYTE_COUNT = ul_size;
+   usb_pipe_table[ul_pipe].HostDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = 0;
+}
+
+/**
+ * \brief Send a pipe content.
+ *
+ * \param ul_pipe Pipe number.
+ * \param ul_token_type Token type.
+ */
+void UHD_Pipe_Send(uint32_t ul_pipe, uint32_t ul_token_type)
+{
+	USB->HOST.HostPipe[ul_pipe].PCFG.bit.PTOKEN = ul_token_type;
+
+   /* Start transfer */
+	if(ul_token_type == USB_HOST_PCFG_PTOKEN_SETUP )
+	{
 		USB->HOST.HostPipe[ul_pipe].PINTFLAG.reg = USB_HOST_PINTFLAG_TXSTP;
-		USB->HOST.HostPipe[ul_pipe].PSTATUSSET.reg = USB_HOST_PSTATUSSET_BK0RDY;
-	}
-	else if(ul_token_type == USB_HOST_PCFG_PTOKEN_IN )
-	{
-		USB->HOST.HostPipe[ul_pipe].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_BK0RDY;
-	}
-	else
-	{
-		USB->HOST.HostPipe[ul_pipe].PINTFLAG.reg = USB_HOST_PINTFLAG_TRCPT(1);  // Transfer Complete 0
-		USB->HOST.HostPipe[ul_pipe].PSTATUSSET.reg = USB_HOST_PSTATUSSET_BK0RDY;
-	}
-   
-	// Unfreeze pipe
-    uhd_unfreeze_pipe(ul_pipe);
-}
-
-#define USB_HOST_PINTFLAG_TRCPT_Pos 0            /**< \brief (USB_HOST_PINTFLAG) Transfer Complete 0/1 Interrupt Flag */
-#define USB_HOST_PINTFLAG_TRCPT_Msk (0x3u << USB_HOST_PINTFLAG_TRCPT_Pos)
-#define USB_HOST_PINTFLAG_TRCPT(value) ((USB_HOST_PINTFLAG_TRCPT_Msk & ((value) << USB_HOST_PINTFLAG_TRCPT_Pos)))
-
-/**
- * \brief Check for pipe transfer completion.
- *
- * \param ul_pipe Pipe number.
- * \param ul_token_type Token type.
- *
- * \retval 0 transfer is not complete.
- * \retval 1 transfer is complete.
- */
-uint32_t UHD_Pipe_Is_Transfer_Complete(uint32_t ul_pipe, uint32_t ul_token_type)
-{
-   // Check for transfer completion depending on token type
-   switch (ul_token_type)
-   {
-      case USB_HOST_PCFG_PTOKEN_SETUP:
-         if (Is_uhd_setup_ready(ul_pipe))
-         {
-            uhd_ack_setup_ready(ul_pipe);
-            uhd_freeze_pipe(ul_pipe);
-            return 1;
-         }
-		 break;
-
-      case USB_HOST_PCFG_PTOKEN_IN:
-         if (Is_uhd_in_received(ul_pipe))
-         {
-            // IN packet received
-            uhd_ack_in_received(ul_pipe);
-			// Freeze will stop after the transfer
-			uhd_freeze_pipe(ul_pipe);
-            return 1;
-         }
-		 break;
- 
-      case USB_HOST_PCFG_PTOKEN_OUT:
-         if (Is_uhd_out_ready(ul_pipe))
-         {
-            // OUT packet sent
-            uhd_ack_out_ready(ul_pipe);
-            uhd_freeze_pipe(ul_pipe);
-            return 1;
-         }
-		 break;
-   }
-
-   return 0;
-}
-#endif //  HOST_DEFINED
+		USB->HOST.HostPipe[ul_pipe].PSTATUSSET.reg = USB_HOST_PSTATUSSET_BK0RDY;
+	}
+	else if(ul_token_type == USB_HOST_PCFG_PTOKEN_IN )
+	{
+		USB->HOST.HostPipe[ul_pipe].PSTATUSCLR.reg = USB_HOST_PSTATUSCLR_BK0RDY;
+	}
+	else
+	{
+		USB->HOST.HostPipe[ul_pipe].PINTFLAG.reg = USB_HOST_PINTFLAG_TRCPT(1);  // Transfer Complete 0
+		USB->HOST.HostPipe[ul_pipe].PSTATUSSET.reg = USB_HOST_PSTATUSSET_BK0RDY;
+	}
+   
+	// Unfreeze pipe
+    uhd_unfreeze_pipe(ul_pipe);
+}
+
+#define USB_HOST_PINTFLAG_TRCPT_Pos 0            /**< \brief (USB_HOST_PINTFLAG) Transfer Complete 0/1 Interrupt Flag */
+#define USB_HOST_PINTFLAG_TRCPT_Msk (0x3u << USB_HOST_PINTFLAG_TRCPT_Pos)
+#define USB_HOST_PINTFLAG_TRCPT(value) ((USB_HOST_PINTFLAG_TRCPT_Msk & ((value) << USB_HOST_PINTFLAG_TRCPT_Pos)))
+
+/**
+ * \brief Check for pipe transfer completion.
+ *
+ * \param ul_pipe Pipe number.
+ * \param ul_token_type Token type.
+ *
+ * \retval 0 transfer is not complete.
+ * \retval 1 transfer is complete.
+ */
+uint32_t UHD_Pipe_Is_Transfer_Complete(uint32_t ul_pipe, uint32_t ul_token_type)
+{
+   // Check for transfer completion depending on token type
+   switch (ul_token_type)
+   {
+      case USB_HOST_PCFG_PTOKEN_SETUP:
+         if (Is_uhd_setup_ready(ul_pipe))
+         {
+            uhd_ack_setup_ready(ul_pipe);
+            uhd_freeze_pipe(ul_pipe);
+            return 1;
+         }
+		 break;
+
+      case USB_HOST_PCFG_PTOKEN_IN:
+         if (Is_uhd_in_received(ul_pipe))
+         {
+            // IN packet received
+            uhd_ack_in_received(ul_pipe);
+			// Freeze will stop after the transfer
+			uhd_freeze_pipe(ul_pipe);
+            return 1;
+         }
+		 break;
+ 
+      case USB_HOST_PCFG_PTOKEN_OUT:
+         if (Is_uhd_out_ready(ul_pipe))
+         {
+            // OUT packet sent
+            uhd_ack_out_ready(ul_pipe);
+            uhd_freeze_pipe(ul_pipe);
+            return 1;
+         }
+		 break;
+   }
+
+   return 0;
+}
+#endif //  HOST_DEFINED
diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
index 094fb71ba..fb5f69af4 100644
--- a/cores/arduino/Uart.cpp
+++ b/cores/arduino/Uart.cpp
@@ -36,8 +36,8 @@ void Uart::begin(unsigned long baudrate)
 
 void Uart::begin(unsigned long baudrate, uint8_t config)
 {
-  pinPeripheral(uc_pinRX, g_APinDescription[uc_pinRX].ulPinType);
-  pinPeripheral(uc_pinTX, g_APinDescription[uc_pinTX].ulPinType);
+  pinPeripheral(uc_pinRX, PIO_SERCOM);
+  pinPeripheral(uc_pinTX, PIO_SERCOM);
 
   sercom->initUART(UART_INT_CLOCK, SAMPLE_RATE_x16, baudrate);
   sercom->initFrame(extractCharSize(config), LSB_FIRST, extractParity(config), extractNbStopBit(config));
@@ -59,17 +59,17 @@ void Uart::flush()
 
 void Uart::IrqHandler()
 {
-  if(sercom->availableDataUART())
-  {
-    rxBuffer.store_char(sercom->readDataUART());
-  }
-
-  if(  sercom->isBufferOverflowErrorUART() ||
-    sercom->isFrameErrorUART() ||
-    sercom->isParityErrorUART())
-  {
-    sercom->clearStatusUART();
-  }
+	if (sercom->availableDataUART()) {
+		rxBuffer.store_char(sercom->readDataUART());
+	}
+	
+	if (sercom->isUARTError()) {
+		sercom->acknowledgeUARTError();
+		// TODO: if (sercom->isBufferOverflowErrorUART()) ....
+		// TODO: if (sercom->isFrameErrorUART()) ....
+		// TODO: if (sercom->isParityErrorUART()) ....
+		sercom->clearStatusUART();
+	}
 }
 
 int Uart::available()
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index a28b9df64..fdda0c81e 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -75,10 +75,11 @@ void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, uint32_t ulMode )
   static int enabled = 0 ;
   uint32_t ulConfig ;
   uint32_t ulPos ;
-
-  if ( digitalPinToInterrupt( ulPin ) == NOT_AN_INTERRUPT )
+  
+  // Assign pin to EIC
+  if ( pinPeripheral(ulPin, PIO_EXTINT) != RET_STATUS_OK )
   {
-    return ;
+	  return ;
   }
 
   if ( !enabled )
@@ -87,15 +88,12 @@ void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, uint32_t ulMode )
     enabled = 1 ;
   }
 
-  // Assign pin to EIC
-  pinPeripheral( ulPin, PIO_EXTINT ) ;
-
   // Assign callback to interrupt
   callbacksInt[digitalPinToInterrupt( ulPin )]._ulPin = ulPin ;
   callbacksInt[digitalPinToInterrupt( ulPin )]._callback = callback ;
 
   // Check if normal interrupt or NMI
-  if ( ulPin != 2 )
+  if ( digitalPinToInterrupt( ulPin ) != EXTERNAL_INT_NMI )
   {
     // Look for right CONFIG register to be addressed
     if ( digitalPinToInterrupt( ulPin ) > EXTERNAL_INT_7 )
@@ -139,7 +137,7 @@ void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, uint32_t ulMode )
     // Enable the interrupt
     EIC->INTENSET.reg = EIC_INTENSET_EXTINT( 1 << digitalPinToInterrupt( ulPin ) ) ;
   }
-  else // Handles NMI on pin 2
+  else // Handles NMI
   {
     // Configure the interrupt mode
     switch ( ulMode )
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index bce4575ab..ac605b385 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -26,6 +26,7 @@ extern "C" {
 #endif
 
 /* Definitions and types for pins */
+/* ADC channels 2, 3, and 10 not present in ATSAMD21ExxA */
 typedef enum _EAnalogChannel
 {
   No_ADC_Channel=-1,
@@ -59,13 +60,21 @@ typedef enum _ETCChannel
   TCC0_CH7 = (0<<8)|(3), // Channel 7 is 3!
   TCC1_CH0 = (1<<8)|(0),
   TCC1_CH1 = (1<<8)|(1),
+  TCC1_CH2 = (1<<8)|(0), // Channel 2 is 0!
+  TCC1_CH3 = (1<<8)|(1), // Channel 3 is 1!
   TCC2_CH0 = (2<<8)|(0),
   TCC2_CH1 = (2<<8)|(1),
+  TCC2_CH2 = (2<<8)|(0), // Channel 2 is 0!
+  TCC2_CH3 = (2<<8)|(1), // Channel 3 is 1!
   TC3_CH0  = (3<<8)|(0),
   TC3_CH1  = (3<<8)|(1),
+  TC4_CH0  = (4<<8)|(0),
+  TC4_CH1  = (4<<8)|(1),
   TC5_CH0  = (5<<8)|(0),
   TC5_CH1  = (5<<8)|(1),
-#if defined __SAMD21J18A__
+#if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+  TC6_CH0  = (6<<8)|(0),
+  TC6_CH1  = (6<<8)|(1),
   TC7_CH0  = (7<<8)|(0),
   TC7_CH1  = (7<<8)|(1)
 #endif // __SAMD21J18A__
@@ -77,32 +86,6 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
 #define GetTCChannelNumber( x ) ( (x) & 0xff )
 #define GetTC( x ) ( g_apTCInstances[(x) >> 8] )
 
-// Definitions for PWM channels
-typedef enum _EPWMChannel
-{
-  NOT_ON_PWM=-1,
-  PWM0_CH0=TCC0_CH0,
-  PWM0_CH1=TCC0_CH1,
-  PWM0_CH2=TCC0_CH2,
-  PWM0_CH3=TCC0_CH3,
-  PWM0_CH4=TCC0_CH4,
-  PWM0_CH5=TCC0_CH5,
-  PWM0_CH6=TCC0_CH6,
-  PWM0_CH7=TCC0_CH7,
-  PWM1_CH0=TCC1_CH0,
-  PWM1_CH1=TCC1_CH1,
-  PWM2_CH0=TCC2_CH0,
-  PWM2_CH1=TCC2_CH1,
-  PWM3_CH0=TC3_CH0,
-  PWM3_CH1=TC3_CH1,
-  PWM5_CH0=TC5_CH0,
-  PWM5_CH1=TC5_CH1,
-#if defined __SAMD21J18A__
-  PWM7_CH0=TC7_CH0,
-  PWM7_CH1=TC7_CH1
-#endif // __SAMD21J18A__
-} EPWMChannel ;
-
 typedef enum _EPortType
 {
   NOT_A_PORT=-1,
@@ -113,73 +96,131 @@ typedef enum _EPortType
 
 typedef enum _EExt_Interrupts
 {
-  EXTERNAL_INT_0 = 0, // Available on pin 11
-  EXTERNAL_INT_1, // Available on pin 13
-  EXTERNAL_INT_2, // Available on pins 10, A0, A5
-  EXTERNAL_INT_3, // Available on pin 12
-  EXTERNAL_INT_4, // Available on pin 6, 8, A3
-  EXTERNAL_INT_5, // Available on pin 7, 9, A4
-  EXTERNAL_INT_6, // Available on pin 16
-  EXTERNAL_INT_7, // Available on pin 17
-  EXTERNAL_INT_8, // Available on pin A1
-  EXTERNAL_INT_9, // Available on pin 3, A2
-  EXTERNAL_INT_10, // Available on pin 0, 21
-  EXTERNAL_INT_11, // Available on pin 1, 20
-  EXTERNAL_INT_12, // Available on pin 18
-  EXTERNAL_INT_13, // Available on pin EDBG_GPIO0 (43)
-  EXTERNAL_INT_14, // Available on pin 4
-  EXTERNAL_INT_15, // Available on pin 5
-  EXTERNAL_INT_NMI, // Available on pin 2
+  EXTERNAL_INT_0 = 0,
+  EXTERNAL_INT_1,
+  EXTERNAL_INT_2,
+  EXTERNAL_INT_3,
+  EXTERNAL_INT_4,
+  EXTERNAL_INT_5,
+  EXTERNAL_INT_6,
+  EXTERNAL_INT_7,
+  EXTERNAL_INT_8,
+  EXTERNAL_INT_9,
+  EXTERNAL_INT_10,
+  EXTERNAL_INT_11,
+  EXTERNAL_INT_12,
+  EXTERNAL_INT_13,
+  EXTERNAL_INT_14,
+  EXTERNAL_INT_15,
+  EXTERNAL_INT_NMI,
   EXTERNAL_NUM_INTERRUPTS,
   NOT_AN_INTERRUPT = -1,
   EXTERNAL_INT_NONE = NOT_AN_INTERRUPT,
 } EExt_Interrupts ;
 
-//A    B                 C       D          E      F   G   H
-//EIC REF ADC AC PTC DAC SERCOM SERCOM_ALT TC/TCC TCC COM AC/GCLK
 
+/* Copied from wiring_constants.h */
+#define INPUT           (0x0)
+#define OUTPUT          (0x1)
+#define INPUT_PULLUP    (0x2)
+#define INPUT_PULLDOWN  (0x3)
 typedef enum _EPioType
 {
-  PIO_NOT_A_PIN=-1,     /* Not under control of a peripheral. */
-  PIO_EXTINT=0,         /* The pin is controlled by the associated signal of peripheral A. */
-  PIO_ANALOG,           /* The pin is controlled by the associated signal of peripheral B. */
-  PIO_SERCOM,           /* The pin is controlled by the associated signal of peripheral C. */
-  PIO_SERCOM_ALT,       /* The pin is controlled by the associated signal of peripheral D. */
-  PIO_TIMER,            /* The pin is controlled by the associated signal of peripheral E. */
-  PIO_TIMER_ALT,        /* The pin is controlled by the associated signal of peripheral F. */
-  PIO_COM,              /* The pin is controlled by the associated signal of peripheral G. */
-  PIO_AC_CLK,           /* The pin is controlled by the associated signal of peripheral H. */
-  PIO_DIGITAL,          /* The pin is controlled by PORT. */
-  PIO_INPUT,            /* The pin is controlled by PORT and is an input. */
-  PIO_INPUT_PULLUP,     /* The pin is controlled by PORT and is an input with internal pull-up resistor enabled. */
-  PIO_OUTPUT,           /* The pin is controlled by PORT and is an output. */
-
-  PIO_PWM=PIO_TIMER,
-  PIO_PWM_ALT=PIO_TIMER_ALT,
+  PIO_NOT_A_PIN=-1,                   /* Not under control of a peripheral. */
+
+  PIO_INPUT=INPUT,                    /* The pin is controlled by PORT and is an input. */
+  PIO_OUTPUT=OUTPUT,                  /* The pin is controlled by PORT and is an output. */
+  PIO_INPUT_PULLUP=INPUT_PULLUP,      /* The pin is controlled by PORT and is an input with internal pull-up resistor enabled. */
+  PIO_INPUT_PULLDOWN=INPUT_PULLDOWN,  /* The pin is controlled by PORT and is an input with internal pull-down resistor enabled. */
+
+  PIO_EXTINT=4,                       /* The pin is controlled by the EXTINT peripheral and is an input with interrupt. */
+
+  PIO_ANALOG_ADC=5,                   /* The pin is controlled by the ANALOG peripheral and is an ADC input. */
+  PIO_ANALOG_DAC=6,                   /* The pin is controlled by the ANALOG peripheral and is a DAC output. */
+  PIO_ANALOG_REF=7,                   /* The pin is controlled by the ANALOG peripheral and is a voltage reference input (3.3V MAX). */
+
+  PIO_TIMER_PWM=8,                    /* The pin is controlled by a TIMER peripheral and is a PWM output. */
+  PIO_TIMER_CAPTURE=9,                /* The pin is controlled by a TIMER peripheral and is a capture input. */
+
+  PIO_SERCOM=10,                      /* The pin is controlled by a SERCOM peripheral (UART, SPI, or I2C). */
+  PIO_COM=11,                         /* The pin is controlled by the COM peripheral (USB or I2S). */
+  PIO_AC_GCLK=12,                     /* The pin is controlled by the AC_GCLK peripheral (output). */
+
+  PIO_MULTI,                          /* The pin can be configured to any type based on the attributes. */
 } EPioType ;
 
 /**
  * Pin Attributes to be OR-ed
  */
-#define PIN_ATTR_NONE          (0UL<<0)
-#define PIN_ATTR_COMBO         (1UL<<0)
-#define PIN_ATTR_ANALOG        (1UL<<1)
-#define PIN_ATTR_DIGITAL       (1UL<<2)
-#define PIN_ATTR_PWM           (1UL<<3)
-#define PIN_ATTR_TIMER         (1UL<<4)
-#define PIN_ATTR_EXTINT        (1UL<<5)
-
-/* Types used for the table below */
+#define PIN_ATTR_NONE              (0UL << 0)
+
+  #define PIN_ATTR_INPUT           (1UL << PIO_INPUT)
+  #define PIN_ATTR_OUTPUT          (1UL << PIO_OUTPUT)
+  #define PIN_ATTR_INPUT_PULLUP    (1UL << PIO_INPUT_PULLUP)
+  #define PIN_ATTR_INPUT_PULLDOWN  (1UL << PIO_INPUT_PULLDOWN)
+#define PIN_ATTR_DIGITAL           (PIN_ATTR_INPUT|PIN_ATTR_INPUT_PULLUP|PIN_ATTR_INPUT_PULLDOWN|PIN_ATTR_OUTPUT)
+
+#define PIN_ATTR_EXTINT            (1UL << PIO_EXTINT)
+
+#define PIN_ATTR_ADC               (1UL << PIO_ANALOG_ADC)
+#define PIN_ATTR_DAC               (1UL << PIO_ANALOG_DAC)
+#define PIN_ATTR_REF               (1UL << PIO_ANALOG_REF)
+  #define PIN_ATTR_ANALOG          PIN_ATTR_ADC
+
+  #define PIN_ATTR_TIMER_PWM       (1UL << PIO_TIMER_PWM)
+  #define PIN_ATTR_TIMER_CAPTURE   (1UL << PIO_TIMER_CAPTURE)
+#define PIN_ATTR_TIMER             (PIN_ATTR_TIMER_PWM|PIN_ATTR_TIMER_CAPTURE)
+
+#define PIN_ATTR_SERCOM            (1UL << PIO_SERCOM)
+#define PIN_ATTR_COM               (1UL << PIO_COM)
+#define PIN_ATTR_AC_CLK            (1UL << PIO_AC_GCLK)
+
+
+//A    B                 C       D          E      F   G   H
+//EIC REF ADC AC PTC DAC SERCOM SERCOM_ALT TC/TCC TCC COM AC/GCLK
+typedef enum _EPioPeripheral
+{
+	PER_PORT=-1,          /* The pin is controlled by PORT. */
+	PER_EXTINT=0,         /* The pin is controlled by the associated signal of peripheral A. */
+	PER_ANALOG=1,         /* The pin is controlled by the associated signal of peripheral B. */
+	PER_SERCOM=2,         /* The pin is controlled by the associated signal of peripheral C. */
+	PER_SERCOM_ALT=3,     /* The pin is controlled by the associated signal of peripheral D. */
+	PER_TIMER=4,          /* The pin is controlled by the associated signal of peripheral E. */
+	PER_TIMER_ALT=5,      /* The pin is controlled by the associated signal of peripheral F. */
+	PER_COM=6,            /* The pin is controlled by the associated signal of peripheral G. */
+	PER_AC_CLK=7,         /* The pin is controlled by the associated signal of peripheral H. */
+} EPioPeripheral ;
+
+/**
+ * Peripheral Attributes to be OR-ed
+ */
+#define PER_ATTR_NONE            (0UL<<0)
+
+#define PER_ATTR_SERCOM_STD      (0UL<<0)
+#define PER_ATTR_SERCOM_ALT      (1UL<<0)
+#define PER_ATTR_SERCOM_MASK     (1UL<<0)
+
+#define PER_ATTR_TIMER_STD       (0UL<<1)
+#define PER_ATTR_TIMER_ALT       (1UL<<1)
+#define PER_ATTR_TIMER_MASK      (1UL<<1)
+
+#define PER_ATTR_DRIVE_STD       (0UL<<2)
+#define PER_ATTR_DRIVE_STRONG    (1UL<<2)
+#define PER_ATTR_DRIVE_MASK      (1UL<<2)
+
+/* Types used for the table below
+ * This struct MUST be 12 bytes long (elements are ordered to prevent unaligned access).
+ */
 typedef struct _PinDescription
 {
-  EPortType       ulPort ;
-  uint32_t        ulPin ;
-  EPioType        ulPinType ;
-  uint32_t        ulPinAttribute ;
-  EAnalogChannel  ulADCChannelNumber ; /* ADC Channel number in the SAM device */
-  EPWMChannel     ulPWMChannel ;
-  ETCChannel      ulTCChannel ;
-  EExt_Interrupts ulExtInt ;
+  uint8_t         ulPort ;	                // Must be 8 bits
+  uint8_t         ulPin ;	                // Must be 8 bits
+  uint8_t         ulPinType ;	                // Must be 8 bits
+  uint8_t         ulPeripheralAttribute ;	// Must be 8 bit bitfield
+  uint32_t        ulPinAttribute ;	        // Must be 32 bit bitfield
+  uint16_t        ulTCChannel ;	                // Must be 16 bits
+  uint8_t         ulADCChannelNumber ;	        // Must be 8 bits
+  uint8_t         ulExtInt ;	                // Must be 8 bits
 } PinDescription ;
 
 /* Pins table to be instantiated into variant.cpp */
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
new file mode 100644
index 000000000..fed128c44
--- /dev/null
+++ b/cores/arduino/cortex_handlers.c
@@ -0,0 +1,178 @@
+/*
+  Copyright (c) 2015 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
+*/
+
+#include "sam.h"
+#include "variant.h"
+
+/* RTOS Hooks */
+extern void svcHook(void);
+extern void pendSVHook(void);
+extern int sysTickHook(void);
+
+/* Default empty handler */
+
+void Dummy_Handler(void)
+{
+#if defined DEBUG
+  __BKPT(3);
+#endif
+  for (;;) { }
+}
+
+/* Cortex-M0+ core handlers */
+void HardFault_Handler(void) __attribute__ ((weak, alias("Dummy_Handler")));
+void Reest_Handler    (void);
+void NMI_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SVC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void PendSV_Handler   (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SysTick_Handler  (void);
+
+/* Peripherals handlers */
+void PM_Handler       (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SYSCTRL_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void WDT_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void RTC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void EIC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void NVMCTRL_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void DMAC_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void USB_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void EVSYS_Handler    (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM0_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM1_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM2_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM3_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM4_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SERCOM5_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TCC0_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TCC1_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TCC2_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC3_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC4_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC5_Handler      (void) __attribute__ ((weak)); // Used in Tone.cpp
+void TC6_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC7_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void ADC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void AC_Handler       (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void DAC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void PTC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void I2S_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+
+/* Initialize segments */
+extern uint32_t __etext;
+extern uint32_t __data_start__;
+extern uint32_t __data_end__;
+extern uint32_t __bss_start__;
+extern uint32_t __bss_end__;
+extern uint32_t __StackTop;
+
+/* Exception Table */
+__attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
+{
+  /* Configure Initial Stack Pointer, using linker-generated symbols */
+  (void*) (&__StackTop),
+
+  (void*) Reset_Handler,
+  (void*) NMI_Handler,
+  (void*) HardFault_Handler,
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) SVC_Handler,
+  (void*) (0UL), /* Reserved */
+  (void*) (0UL), /* Reserved */
+  (void*) PendSV_Handler,
+  (void*) SysTick_Handler,
+
+  /* Configurable interrupts */
+  (void*) PM_Handler,             /*  0 Power Manager */
+  (void*) SYSCTRL_Handler,        /*  1 System Control */
+  (void*) WDT_Handler,            /*  2 Watchdog Timer */
+  (void*) RTC_Handler,            /*  3 Real-Time Counter */
+  (void*) EIC_Handler,            /*  4 External Interrupt Controller */
+  (void*) NVMCTRL_Handler,        /*  5 Non-Volatile Memory Controller */
+  (void*) DMAC_Handler,           /*  6 Direct Memory Access Controller */
+  (void*) USB_Handler,            /*  7 Universal Serial Bus */
+  (void*) EVSYS_Handler,          /*  8 Event System Interface */
+  (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
+  (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
+  (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
+  (void*) SERCOM3_Handler,        /* 12 Serial Communication Interface 3 */
+  (void*) SERCOM4_Handler,        /* 13 Serial Communication Interface 4 */
+  (void*) SERCOM5_Handler,        /* 14 Serial Communication Interface 5 */
+  (void*) TCC0_Handler,           /* 15 Timer Counter Control 0 */
+  (void*) TCC1_Handler,           /* 16 Timer Counter Control 1 */
+  (void*) TCC2_Handler,           /* 17 Timer Counter Control 2 */
+  (void*) TC3_Handler,            /* 18 Basic Timer Counter 0 */
+  (void*) TC4_Handler,            /* 19 Basic Timer Counter 1 */
+  (void*) TC5_Handler,            /* 20 Basic Timer Counter 2 */
+  (void*) TC6_Handler,            /* 21 Basic Timer Counter 3 */
+  (void*) TC7_Handler,            /* 22 Basic Timer Counter 4 */
+  (void*) ADC_Handler,            /* 23 Analog Digital Converter */
+  (void*) AC_Handler,             /* 24 Analog Comparators */
+  (void*) DAC_Handler,            /* 25 Digital Analog Converter */
+  (void*) PTC_Handler,            /* 26 Peripheral Touch Controller */
+  (void*) I2S_Handler             /* 27 Inter-IC Sound Interface */
+};
+
+extern int main(void);
+extern void __libc_init_array(void);
+
+/* This is called on processor reset to initialize the device and call main() */
+void Reset_Handler(void)
+{
+  uint32_t *pSrc, *pDest;
+
+  /* Initialize the initialized data section */
+  pSrc = &__etext;
+  pDest = &__data_start__;
+
+  if ((&__data_start__ != &__data_end__) && (pSrc != pDest)) {
+    for (; pDest < &__data_end__; pDest++, pSrc++)
+      *pDest = *pSrc;
+  }
+
+  /* Clear the zero section */
+  if ((&__data_start__ != &__data_end__) && (pSrc != pDest)) {
+    for (pDest = &__bss_start__; pDest < &__bss_end__; pDest++)
+      *pDest = 0;
+  }
+
+  /* Initialize the C library */
+  __libc_init_array();
+
+  SystemInit();
+
+  main();
+
+  while (1)
+    ;
+}
+
+/* Default Arduino systick handler */
+extern void SysTick_DefaultHandler(void);
+
+void SysTick_Handler(void)
+{
+  if (sysTickHook())
+    return;
+  SysTick_DefaultHandler();
+}
diff --git a/cores/arduino/delay.c b/cores/arduino/delay.c
index 98aa097ef..e43131f21 100644
--- a/cores/arduino/delay.c
+++ b/cores/arduino/delay.c
@@ -78,10 +78,10 @@ void delay( uint32_t ms )
 
 #include "Reset.h" // for tickReset()
 
-void SysTick_Handler( void )
+void SysTick_DefaultHandler(void)
 {
   // Increment tick count each ms
-  _ulTickCount++ ;
+  _ulTickCount++;
   tickReset();
 }
 
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index a62cb08ca..9a43b4a8e 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -19,123 +19,6 @@
 #include "sam.h"
 #include "variant.h"
 
-/* Initialize segments */
-extern uint32_t __etext ;
-extern uint32_t __data_start__ ;
-extern uint32_t __data_end__ ;
-extern uint32_t __bss_start__ ;
-extern uint32_t __bss_end__ ;
-extern uint32_t __StackTop;
-
-extern int main( void ) ;
-extern void __libc_init_array(void);
-
-/* Default empty handler */
-void Dummy_Handler(void);
-
-/* Cortex-M0+ core handlers */
-#if defined DEBUG
-void HardFault_Handler( void )
-{
-  __BKPT( 3 ) ;
-
-  while ( 1 )
-  {
-  }
-}
-#else
-void HardFault_Handler       ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif //DEBUG
-
-void NMI_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SVC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void PendSV_Handler          ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SysTick_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-
-/* Peripherals handlers */
-void PM_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SYSCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void WDT_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void RTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void EIC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void NVMCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void DMAC_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void USB_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void EVSYS_Handler           ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SERCOM0_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SERCOM1_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SERCOM2_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SERCOM3_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SERCOM4_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void SERCOM5_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TCC0_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TCC1_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TCC2_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TC3_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TC4_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TC5_Handler             ( void ) __attribute__ ((weak));
-void TC6_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void TC7_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void ADC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void AC_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void DAC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void PTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-void I2S_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-
-/* Exception Table */
-__attribute__ ((section(".isr_vector")))
-const DeviceVectors exception_table=
-{
-  /* Configure Initial Stack Pointer, using linker-generated symbols */
-  (void*) (&__StackTop),
-
-  (void*) Reset_Handler,
-  (void*) NMI_Handler,
-  (void*) HardFault_Handler,
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) SVC_Handler,
-  (void*) (0UL), /* Reserved */
-  (void*) (0UL), /* Reserved */
-  (void*) PendSV_Handler,
-  (void*) SysTick_Handler,
-
-  /* Configurable interrupts */
-  (void*) PM_Handler,             /*  0 Power Manager */
-  (void*) SYSCTRL_Handler,        /*  1 System Control */
-  (void*) WDT_Handler,            /*  2 Watchdog Timer */
-  (void*) RTC_Handler,            /*  3 Real-Time Counter */
-  (void*) EIC_Handler,            /*  4 External Interrupt Controller */
-  (void*) NVMCTRL_Handler,        /*  5 Non-Volatile Memory Controller */
-  (void*) DMAC_Handler,           /*  6 Direct Memory Access Controller */
-  (void*) USB_Handler,            /*  7 Universal Serial Bus */
-  (void*) EVSYS_Handler,          /*  8 Event System Interface */
-  (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
-  (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
-  (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
-  (void*) SERCOM3_Handler,        /* 12 Serial Communication Interface 3 */
-  (void*) SERCOM4_Handler,        /* 13 Serial Communication Interface 4 */
-  (void*) SERCOM5_Handler,        /* 14 Serial Communication Interface 5 */
-  (void*) TCC0_Handler,           /* 15 Timer Counter Control 0 */
-  (void*) TCC1_Handler,           /* 16 Timer Counter Control 1 */
-  (void*) TCC2_Handler,           /* 17 Timer Counter Control 2 */
-  (void*) TC3_Handler,            /* 18 Basic Timer Counter 0 */
-  (void*) TC4_Handler,            /* 19 Basic Timer Counter 1 */
-  (void*) TC5_Handler,            /* 20 Basic Timer Counter 2 */
-  (void*) TC6_Handler,            /* 21 Basic Timer Counter 3 */
-  (void*) TC7_Handler,            /* 22 Basic Timer Counter 4 */
-  (void*) ADC_Handler,            /* 23 Analog Digital Converter */
-  (void*) AC_Handler,             /* 24 Analog Comparators */
-  (void*) DAC_Handler,            /* 25 Digital Analog Converter */
-  (void*) PTC_Handler,            /* 26 Peripheral Touch Controller */
-  (void*) I2S_Handler             /* 27 Inter-IC Sound Interface */
-} ;
-
 /**
  * \brief SystemInit() configures the needed clocks and according Flash Read Wait States.
  * At reset:
@@ -340,59 +223,3 @@ void SystemInit( void )
   ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
 }
 
-/**
- * \brief This is the code that gets called on processor reset.
- * To initialize the device, and call the main() routine.
- */
-void Reset_Handler( void )
-{
-  uint32_t *pSrc, *pDest;
-
-  /* Initialize the initialized data section */
-  pSrc = &__etext;
-  pDest = &__data_start__;
-
-  if ( (&__data_start__ != &__data_end__) && (pSrc != pDest) )
-  {
-    for (; pDest < &__data_end__ ; pDest++, pSrc++ )
-    {
-      *pDest = *pSrc ;
-    }
-  }
-
-  /* Clear the zero section */
-  if ( (&__data_start__ != &__data_end__) && (pSrc != pDest) )
-  {
-    for ( pDest = &__bss_start__ ; pDest < &__bss_end__ ; pDest++ )
-    {
-      *pDest = 0 ;
-    }
-  }
-
-  /* Initialize the C library */
-  __libc_init_array();
-
-  SystemInit() ;
-
-  /* Branch to main function */
-  main() ;
-
-  /* Infinite loop */
-  while ( 1 )
-  {
-  }
-}
-
-/**
- * \brief Default interrupt handler for unused IRQs.
- */
-void Dummy_Handler( void )
-{
-#if defined DEBUG
-  __BKPT( 3 ) ;
-#endif // DEBUG
-
-  while ( 1 )
-  {
-  }
-}
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index 0a1395d75..145512081 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -73,10 +73,19 @@ void init( void )
 //	PM->APBAMASK.reg |= PM_APBAMASK_EIC ;
 
   // Clock SERCOM for Serial
+#if defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
+  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
+#else
+  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 ;
+#endif
 
   // Clock TC/TCC for Pulse and Analog
+#if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+  PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 | PM_APBCMASK_TC6 | PM_APBCMASK_TC7 ;
+#else
   PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 ;
+#endif
 
   // Clock ADC/DAC for Analog
   PM->APBCMASK.reg |= PM_APBCMASK_ADC | PM_APBCMASK_DAC ;
@@ -110,7 +119,7 @@ void init( void )
   ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 |    // 1 sample only (no oversampling nor averaging)
                      ADC_AVGCTRL_ADJRES(0x0ul);   // Adjusting result by 0
 
-  analogReference( AR_DEFAULT ) ; // Analog Reference is AREF pin (3.3v)
+  analogReference( VARIANT_AR_DEFAULT ) ;         // Use default reference from variant.h
 
   // Initialize DAC
   // Setting clock
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 37f1fa045..0eeb49c1a 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -97,7 +97,7 @@ static inline uint32_t mapResolution( uint32_t value, uint32_t from, uint32_t to
 }
 
 /*
- * Internal Reference is at 1.0v
+ * Default Internal Reference is at 1.65V (with ADC gain of 1/2)
  * External Reference should be between 1v and VDDANA-0.6v=2.7v
  *
  * Warning : On Arduino Zero board the input/output voltage for SAMD21G18 is 3.3 volts maximum
@@ -114,8 +114,11 @@ void analogReference( eAnalogReference ulMode )
       break;
 
     case AR_EXTERNAL:
-      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;      // Gain Factor Selection
-      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;
+      if ( pinPeripheral(REFA_PIN, PIO_ANALOG_REF) == RET_STATUS_OK )
+      {
+        ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;      // Gain Factor Selection
+        ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;
+      }
       break;
 
     case AR_INTERNAL1V0:
@@ -130,7 +133,7 @@ void analogReference( eAnalogReference ulMode )
 
     case AR_DEFAULT:
     default:
-      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;
+      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;    // This allows values up to VDDANA (3.3V) on the pin
       ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
       break;
   }
@@ -140,57 +143,56 @@ uint32_t analogRead( uint32_t ulPin )
 {
   uint32_t valueRead = 0;
 
-  if ( ulPin < A0 )
-  {
-    ulPin += A0 ;
-  }
-
-  pinPeripheral(ulPin, g_APinDescription[ulPin].ulPinType);
+  REMAP_ANALOG_PIN_ID ;
 
-  if (ulPin == A0) // Disable DAC, if analogWrite(A0,dval) used previously the DAC is enabled
+  if ( pinPeripheral(ulPin, PIO_ANALOG_ADC) == RET_STATUS_OK )
   {
-    syncDAC();
-    DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC
-    //DAC->CTRLB.bit.EOEN = 0x00; // The DAC output is turned off.
-    syncDAC();
-  }
-
-  syncADC();
-  ADC->INPUTCTRL.bit.MUXPOS = g_APinDescription[ulPin].ulADCChannelNumber; // Selection for the positive ADC input
-
-  // Control A
-  /*
-   * Bit 1 ENABLE: Enable
-   *   0: The ADC is disabled.
-   *   1: The ADC is enabled.
-   * Due to synchronization, there is a delay from writing CTRLA.ENABLE until the peripheral is enabled/disabled. The
-   * value written to CTRL.ENABLE will read back immediately and the Synchronization Busy bit in the Status register
-   * (STATUS.SYNCBUSY) will be set. STATUS.SYNCBUSY will be cleared when the operation is complete.
-   *
-   * Before enabling the ADC, the asynchronous clock source must be selected and enabled, and the ADC reference must be
-   * configured. The first conversion after the reference is changed must not be used.
-   */
-  syncADC();
-  ADC->CTRLA.bit.ENABLE = 0x01;             // Enable ADC
-
-  // Start conversion
-  syncADC();
-  ADC->SWTRIG.bit.START = 1;
-
-  // Clear the Data Ready flag
-  ADC->INTFLAG.bit.RESRDY = 1;
-
-  // Start conversion again, since The first conversion after the reference is changed must not be used.
-  syncADC();
-  ADC->SWTRIG.bit.START = 1;
-
-  // Store the value
-  while ( ADC->INTFLAG.bit.RESRDY == 0 );   // Waiting for conversion to complete
-  valueRead = ADC->RESULT.reg;
+    // Disable DAC, if analogWrite(A0,dval) used previously the DAC is enabled
+    if ( (g_APinDescription[ulPin].ulPinAttribute & PIN_ATTR_DAC) == PIN_ATTR_DAC )
+    {
+      syncDAC();
+      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC
+      //DAC->CTRLB.bit.EOEN = 0x00; // The DAC output is turned off.
+      syncDAC();
+    }
 
-  syncADC();
-  ADC->CTRLA.bit.ENABLE = 0x00;             // Disable ADC
-  syncADC();
+    syncADC();
+    ADC->INPUTCTRL.bit.MUXPOS = g_APinDescription[ulPin].ulADCChannelNumber; // Selection for the positive ADC input
+
+    // Control A
+    /*
+     * Bit 1 ENABLE: Enable
+     *   0: The ADC is disabled.
+     *   1: The ADC is enabled.
+     * Due to synchronization, there is a delay from writing CTRLA.ENABLE until the peripheral is enabled/disabled. The
+     * value written to CTRL.ENABLE will read back immediately and the Synchronization Busy bit in the Status register
+     * (STATUS.SYNCBUSY) will be set. STATUS.SYNCBUSY will be cleared when the operation is complete.
+     *
+     * Before enabling the ADC, the asynchronous clock source must be selected and enabled, and the ADC reference must be
+     * configured. The first conversion after the reference is changed must not be used.
+     */
+    syncADC();
+    ADC->CTRLA.bit.ENABLE = 0x01;             // Enable ADC
+
+    // Start conversion
+    syncADC();
+    ADC->SWTRIG.bit.START = 1;
+
+    // Clear the Data Ready flag
+    ADC->INTFLAG.bit.RESRDY = 1;
+
+    // Start conversion again, since The first conversion after the reference is changed must not be used.
+    syncADC();
+    ADC->SWTRIG.bit.START = 1;
+
+    // Store the value
+    while ( ADC->INTFLAG.bit.RESRDY == 0 );   // Waiting for conversion to complete
+    valueRead = ADC->RESULT.reg;
+
+    syncADC();
+    ADC->CTRLA.bit.ENABLE = 0x00;             // Disable ADC
+    syncADC();
+  }
 
   return mapResolution(valueRead, _ADCResolution, _readResolution);
 }
@@ -202,15 +204,8 @@ uint32_t analogRead( uint32_t ulPin )
 // to digital output.
 void analogWrite( uint32_t ulPin, uint32_t ulValue )
 {
-  uint32_t attr = g_APinDescription[ulPin].ulPinAttribute ;
-
-  if ( (attr & PIN_ATTR_ANALOG) == PIN_ATTR_ANALOG )
+  if ( pinPeripheral(ulPin, PIO_ANALOG_DAC) == RET_STATUS_OK )
   {
-    if ( ulPin != PIN_A0 )  // Only 1 DAC on A0 (PA02)
-    {
-      return;
-    }
-
     ulValue = mapResolution(ulValue, _writeResolution, 10);
 
     syncDAC();
@@ -220,28 +215,22 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
     syncDAC();
     return ;
   }
-
-  if ( (attr & PIN_ATTR_PWM) == PIN_ATTR_PWM )
+  else if ( pinPeripheral(ulPin, PIO_TIMER_PWM) == RET_STATUS_OK )
   {
-    if ( (g_APinDescription[ulPin].ulPinType == PIO_TIMER) || g_APinDescription[ulPin].ulPinType == PIO_TIMER_ALT )
-    {
-      pinPeripheral( ulPin, g_APinDescription[ulPin].ulPinType ) ;
-    }
-
     Tc*  TCx  = 0 ;
     Tcc* TCCx = 0 ;
-    uint8_t Channelx = GetTCChannelNumber( g_APinDescription[ulPin].ulPWMChannel ) ;
-    if ( GetTCNumber( g_APinDescription[ulPin].ulPWMChannel ) >= TCC_INST_NUM )
+    uint8_t Channelx = GetTCChannelNumber( g_APinDescription[ulPin].ulTCChannel ) ;
+    if ( GetTCNumber( g_APinDescription[ulPin].ulTCChannel ) >= TCC_INST_NUM )
     {
-      TCx = (Tc*) GetTC( g_APinDescription[ulPin].ulPWMChannel ) ;
+      TCx = (Tc*) GetTC( g_APinDescription[ulPin].ulTCChannel ) ;
     }
     else
     {
-      TCCx = (Tcc*) GetTC( g_APinDescription[ulPin].ulPWMChannel ) ;
+      TCCx = (Tcc*) GetTC( g_APinDescription[ulPin].ulTCChannel ) ;
     }
 
     // Enable clocks according to TCCx instance to use
-    switch ( GetTCNumber( g_APinDescription[ulPin].ulPWMChannel ) )
+    switch ( GetTCNumber( g_APinDescription[ulPin].ulTCChannel ) )
     {
       case 0: // TCC0
       case 1: // TCC1
@@ -261,11 +250,13 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
         GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC4_TC5 ));
       break ;
 
+#if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
       case 6: // TC6 (not available on Zero)
       case 7: // TC7 (not available on Zero)
         // Enable GCLK for TC6 and TC7 (timer counter input clock)
         GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC6_TC7 ));
       break ;
+#endif
     }
 
     while ( GCLK->STATUS.bit.SYNCBUSY == 1 ) ;
@@ -313,20 +304,19 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
       TCCx->CTRLA.reg |= TCC_CTRLA_ENABLE ;
       syncTCC(TCCx);
     }
-
-    return ;
   }
-
   // -- Defaults to digital write
-  pinMode( ulPin, OUTPUT ) ;
-  ulValue = mapResolution(ulValue, _writeResolution, 8);
-  if ( ulValue < 128 )
+  else if ( pinPeripheral(ulPin, PIO_OUTPUT) == RET_STATUS_OK )
   {
-    digitalWrite( ulPin, LOW ) ;
-  }
-  else
-  {
-    digitalWrite( ulPin, HIGH ) ;
+    ulValue = mapResolution(ulValue, _writeResolution, 8);
+    if ( ulValue < 128 )
+    {
+      digitalWrite( ulPin, LOW ) ;
+    }
+    else
+    {
+      digitalWrite( ulPin, HIGH ) ;
+    }
   }
 }
 
diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
index 59f9e4f1d..52b9f442d 100644
--- a/cores/arduino/wiring_digital.c
+++ b/cores/arduino/wiring_digital.c
@@ -24,49 +24,8 @@
 
 void pinMode( uint32_t ulPin, uint32_t ulMode )
 {
-  // Handle the case the pin isn't usable as PIO
-  if ( g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
-  {
-    return ;
-  }
-
   // Set pin mode according to chapter '22.6.3 I/O Pin Configuration'
-  switch ( ulMode )
-  {
-    case INPUT:
-      // Set pin to input mode
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-    break ;
-
-    case INPUT_PULLUP:
-      // Set pin to input mode with pull-up resistor enabled
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PULLEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-
-      // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.7 Data Output Value Set')
-      PORT->Group[g_APinDescription[ulPin].ulPort].OUTSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-    break ;
-
-    case INPUT_PULLDOWN:
-      // Set pin to input mode with pull-down resistor enabled
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PULLEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-
-      // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.6 Data Output Value Clear')
-      PORT->Group[g_APinDescription[ulPin].ulPort].OUTCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-    break ;
-
-    case OUTPUT:
-      // Set pin to output mode
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg&=~(uint8_t)(PORT_PINCFG_INEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-    break ;
-
-    default:
-      // do nothing
-    break ;
-  }
+  pinPeripheral(ulPin, ulMode);
 }
 
 void digitalWrite( uint32_t ulPin, uint32_t ulVal )
@@ -77,8 +36,16 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
     return ;
   }
 
-  // Enable pull-up resistor
-  PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_PULLEN) ;
+  // Enable pull resistor if pin attributes allow
+  uint32_t pinAttribute = g_APinDescription[ulPin].ulPinAttribute;
+  if ( (ulVal == HIGH && (pinAttribute & PIN_ATTR_INPUT_PULLUP)) || (ulVal == LOW && (pinAttribute & PIN_ATTR_INPUT_PULLDOWN)) )
+  {
+    PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= (uint8_t)(PORT_PINCFG_PULLEN) ;
+  }
+  else
+  {
+    PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg &= ~(uint8_t)(PORT_PINCFG_PULLEN) ;
+  }
 
   switch ( ulVal )
   {
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
index a5aaba42c..3b7b2c8cd 100644
--- a/cores/arduino/wiring_private.c
+++ b/cores/arduino/wiring_private.c
@@ -19,56 +19,142 @@
 #include "Arduino.h"
 #include "wiring_private.h"
 
-int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral )
+int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
 {
+  uint32_t pinAttribute = g_APinDescription[ulPin].ulPinAttribute;
+  uint8_t peripheralAttribute = g_APinDescription[ulPin].ulPeripheralAttribute;
+  EPioType pinType = g_APinDescription[ulPin].ulPinType;
+
   // Handle the case the pin isn't usable as PIO
-  if ( g_APinDescription[ulPin].ulPinType == PIO_NOT_A_PIN )
+  if ( pinType == PIO_NOT_A_PIN )
+  {
+    return -1 ;
+  }
+
+  // If pinType is not PIO_MULTI in the pinDescription table, then it must match ulPeripheral
+  if ( pinType != PIO_MULTI && pinType != ulPeripheral )
   {
     return -1 ;
   }
 
+  // Make sure ulPeripheral is listed in the attributes
+  if ( !(pinAttribute & (1UL << ulPeripheral)) )
+  {
+    return -1 ;
+  }
+
+  // Determine hardware peripheral to use
+  EPioPeripheral peripheral = PER_PORT;
   switch ( ulPeripheral )
   {
-    case PIO_DIGITAL:
-    case PIO_INPUT:
-    case PIO_INPUT_PULLUP:
-    case PIO_OUTPUT:
-      // Disable peripheral muxing, done in pinMode
-//			PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].bit.PMUXEN = 0 ;
+    case PIO_EXTINT:
+      if ( digitalPinToInterrupt( ulPin ) == NOT_AN_INTERRUPT )
+      {
+        return -1 ;
+      }
+      peripheral = PER_EXTINT;
+    break ;
+
+    case PIO_ANALOG_ADC:
+      if ( g_APinDescription[ulPin].ulADCChannelNumber == No_ADC_Channel )
+      {
+        return -1 ;
+      }
+      peripheral = PER_ANALOG;
+    break ;
+
+    case PIO_ANALOG_DAC:
+    case PIO_ANALOG_REF:
+      peripheral = PER_ANALOG;
+    break ;
 
-      // Configure pin mode, if requested
-      if ( ulPeripheral == PIO_INPUT )
+    case PIO_TIMER_PWM:
+    case PIO_TIMER_CAPTURE:
+      if ( g_APinDescription[ulPin].ulTCChannel == NOT_ON_TIMER )
       {
-        pinMode( ulPin, INPUT ) ;
+        return -1 ;
+      }
+
+      if ( (peripheralAttribute & PER_ATTR_TIMER_MASK) == PER_ATTR_TIMER_STD )
+      {
+        peripheral = PER_TIMER;
       }
       else
       {
-        if ( ulPeripheral == PIO_INPUT_PULLUP )
-        {
-          pinMode( ulPin, INPUT_PULLUP ) ;
-        }
-        else
-        {
-          if ( ulPeripheral == PIO_OUTPUT )
-          {
-            pinMode( ulPin, OUTPUT ) ;
-          }
-          else
-          {
-            // PIO_DIGITAL, do we have to do something as all cases are covered?
-          }
-        }
+        peripheral = PER_TIMER_ALT;
       }
     break ;
 
-    case PIO_ANALOG:
     case PIO_SERCOM:
-    case PIO_SERCOM_ALT:
-    case PIO_TIMER:
-    case PIO_TIMER_ALT:
+      if ( (peripheralAttribute & PER_ATTR_SERCOM_MASK) == PER_ATTR_SERCOM_STD )
+      {
+        peripheral = PER_SERCOM;
+      }
+      else
+      {
+        peripheral = PER_SERCOM_ALT;
+      }
+    break ;
+
+    case PIO_COM:
+      peripheral = PER_COM;
+    break ;
+
+    case PIO_AC_GCLK:
+      peripheral = PER_AC_CLK;
+    break ;
+
+    default:
+    break ;
+  }
+
+  switch ( ulPeripheral )
+  {
+    // Set pin mode according to chapter '22.6.3 I/O Pin Configuration'
+    case PIO_INPUT:
+      // Set pin to input mode, disable the port mux
+      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN) ;
+      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+    break ;
+
+    case PIO_OUTPUT:
+      // Set pin to output mode, set pin drive strength, disable the port mux
+      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg &= ~(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PMUXEN) ;
+      if ( (peripheralAttribute & PER_ATTR_DRIVE_MASK) == PER_ATTR_DRIVE_STRONG )
+      {
+        PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= (uint8_t)(PORT_PINCFG_DRVSTR) ;
+      }
+      PORT->Group[g_APinDescription[ulPin].ulPort].DIRSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+    break ;
+
+    case PIO_INPUT_PULLUP:
+      // Set pin to input mode with pull-up resistor enabled, disable the port mux
+      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PULLEN) ;
+      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+
+      // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.7 Data Output Value Set')
+      PORT->Group[g_APinDescription[ulPin].ulPort].OUTSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+    break ;
+
+    case PIO_INPUT_PULLDOWN:
+      // Set pin to input mode with pull-down resistor enabled, disable the port mux
+      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PULLEN) ;
+      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+
+      // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.6 Data Output Value Clear')
+      PORT->Group[g_APinDescription[ulPin].ulPort].OUTCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+    break ;
+
+
     case PIO_EXTINT:
+    case PIO_ANALOG_ADC:
+    case PIO_ANALOG_DAC:
+    case PIO_ANALOG_REF:
+    case PIO_TIMER_PWM:
+    case PIO_TIMER_CAPTURE:
+    case PIO_SERCOM:
     case PIO_COM:
-    case PIO_AC_CLK:
+    case PIO_AC_GCLK:
 #if 0
       // Is the pio pin in the lower 16 ones?
       // The WRCONFIG register allows update of only 16 pin max out of 32
@@ -93,7 +179,7 @@ int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral )
         // Get whole current setup for both odd and even pins and remove odd one
         temp = (PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg) & PORT_PMUX_PMUXE( 0xF ) ;
         // Set new muxing
-        PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXO( ulPeripheral ) ;
+	PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXO( peripheral ) ;
         // Enable port mux
         PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= PORT_PINCFG_PMUXEN ;
       }
@@ -102,13 +188,15 @@ int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral )
         uint32_t temp ;
 
         temp = (PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg) & PORT_PMUX_PMUXO( 0xF ) ;
-        PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXE( ulPeripheral ) ;
+	PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXE( peripheral ) ;
         PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= PORT_PINCFG_PMUXEN ; // Enable port mux
       }
 #endif
     break ;
 
     case PIO_NOT_A_PIN:
+    case PIO_MULTI:
+    default:
       return -1l ;
     break ;
   }
diff --git a/cores/arduino/wiring_private.h b/cores/arduino/wiring_private.h
index ce64e2def..fc1f4501e 100644
--- a/cores/arduino/wiring_private.h
+++ b/cores/arduino/wiring_private.h
@@ -31,7 +31,9 @@ extern "C" {
 
 #include "wiring_constants.h"
 
-int pinPeripheral( uint32_t ulPin, EPioType ulPeripheral );
+#define RET_STATUS_OK     0
+
+int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral );
 
 #ifdef __cplusplus
 } // extern "C"
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index e4af0464a..74714a476 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -44,10 +44,10 @@ void SPIClass::begin()
   init();
 
   // PIO init
-  pinPeripheral(_uc_pinMiso, g_APinDescription[_uc_pinMiso].ulPinType);
-  pinPeripheral(_uc_pinSCK, g_APinDescription[_uc_pinSCK].ulPinType);
-  pinPeripheral(_uc_pinMosi, g_APinDescription[_uc_pinMosi].ulPinType);
-
+  pinPeripheral(_uc_pinMiso, PIO_SERCOM);
+  pinPeripheral(_uc_pinSCK, PIO_SERCOM);
+  pinPeripheral(_uc_pinMosi, PIO_SERCOM);
+  
   config(DEFAULT_SPI_SETTINGS);
 }
 
@@ -197,4 +197,6 @@ void SPIClass::detachInterrupt() {
   // Should be disableInterrupt()
 }
 
-SPIClass SPI( &sercom4, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI );
+#if SPI_INTERFACES_COUNT > 0
+SPIClass SPI( SERCOM_INSTANCE_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI );
+#endif
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index 6259d2d76..e9ff8e4f3 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -21,6 +21,7 @@
 #define _SPI_H_INCLUDED
 
 #include <Arduino.h>
+#include <WVariant.h>
 
 // SPI_HAS_TRANSACTION means SPI has
 //   - beginTransaction()
diff --git a/libraries/USBHost/src/Usb.cpp b/libraries/USBHost/src/Usb.cpp
index 6c1570b82..70d1b754b 100644
--- a/libraries/USBHost/src/Usb.cpp
+++ b/libraries/USBHost/src/Usb.cpp
@@ -21,7 +21,7 @@ e-mail   :  support@circuitsathome.com
 #include "Usb.h"
 
 
-#ifdef ARDUINO_SAMD_ZERO
+#ifdef ARDUINO_ARCH_SAMD
 
 static uint32_t usb_error = 0;
 static uint32_t usb_task_state = USB_DETACHED_SUBSTATE_INITIALIZE;
@@ -143,7 +143,7 @@ uint32_t USBHost::ctrlReq(uint32_t addr, uint32_t ep, uint8_t bmReqType, uint8_t
 	if (rcode)
 	{
 		TRACE_USBHOST(printf("/!\\ USBHost::ctrlReq : EP0 allocation error: %lu\r\n", rcode);)
-		//USBTRACE2("\n\rUSBHost::ctrlReq : EP0 allocation error: ", rcode");
+		//USBTRACE2("\n\rUSBHost::ctrlReq : EP0 allocation error: ", rcode");
 		return rcode;
 	}
 
@@ -854,4 +854,6 @@ uint32_t USBHost::setConf(uint32_t addr, uint32_t ep, uint32_t conf_value) {
         return ( ctrlReq(addr, ep, bmREQ_SET, USB_REQUEST_SET_CONFIGURATION, conf_value, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL));
 }
 
-#endif //ARDUINO_SAMD_ZERO
+#else
+#error This library is only compatible with ARDUINO_ARCH_SAMD
+#endif //ARDUINO_ARCH_SAMD
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index 08f066695..a0d486da0 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -36,9 +36,13 @@ void TwoWire::begin(void) {
   //Master Mode
   sercom->initMasterWIRE(TWI_CLOCK);
   sercom->enableWIRE();
+  
+  pinPeripheral(PIN_WIRE_SDA, PIO_SERCOM);
+  pinPeripheral(PIN_WIRE_SCL, PIO_SERCOM);
+}
 
-  pinPeripheral(PIN_WIRE_SDA, g_APinDescription[PIN_WIRE_SDA].ulPinType);
-  pinPeripheral(PIN_WIRE_SCL, g_APinDescription[PIN_WIRE_SCL].ulPinType);
+void TwoWire::end(void) {
+	sercom->disableWIRE();
 }
 
 void TwoWire::begin(uint8_t address) {
@@ -342,10 +346,8 @@ void TwoWire::onService(void)
 }*/
 
 
-TwoWire Wire(&sercom3);
+TwoWire Wire(SERCOM_INSTANCE_WIRE);
 
-void SERCOM3_Handler(void) {
-  Wire.onService();
-}
+SERCOM_WIRE_HANDLER_MACRO
 
 #endif
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index d5c98cd30..9d30a2963 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -22,6 +22,7 @@
 
 #include "Stream.h"
 #include "variant.h"
+#include <WVariant.h>
 
 #include "SERCOM.h"
 #include "RingBuffer.h"
@@ -34,6 +35,7 @@ class TwoWire : public Stream
     TwoWire(SERCOM *s);
     void begin();
     void begin(uint8_t);
+    void end();
 
     void beginTransmission(uint8_t);
     uint8_t endTransmission(bool stopBit);
@@ -98,6 +100,8 @@ class TwoWire : public Stream
     //static const uint32_t XMIT_TIMEOUT = 100000;
 };
 
+#if WIRE_INTERFACES_COUNT > 0
 extern TwoWire Wire;
+#endif
 
 #endif
diff --git a/platform.txt b/platform.txt
index 59a4b6b9c..06d4dba9c 100644
--- a/platform.txt
+++ b/platform.txt
@@ -14,11 +14,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/*
- * Modified 23 June 2015 by Justin Mattair
- *   for the MattairTech MT-D21E board (www.mattairtech.com)
- */
-
 # Arduino SAMD Core and platform.
 #
 # For more info:
@@ -115,7 +110,7 @@ recipe.size.regex=\.text\s+([0-9]+).*
 #
 # BOSSA
 #
-tools.bossac.path={runtime.tools.bossac-1.5-arduino.path}
+tools.bossac.path={runtime.tools.bossac-1.5-arduino-mattairtech-1.path}
 tools.bossac.cmd=bossac
 tools.bossac.cmd.windows=bossac.exe
 
@@ -143,7 +138,7 @@ tools.openocd.erase.params.verbose=-d3
 tools.openocd.erase.params.quiet=-d0
 tools.openocd.erase.pattern=
 
-tools.openocd.bootloader.params.verbose=-d2
+tools.openocd.bootloader.params.verbose=-d3
 tools.openocd.bootloader.params.quiet=-d0
 tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
 
diff --git a/programmers.txt b/programmers.txt
deleted file mode 100644
index 93a928fc4..000000000
--- a/programmers.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2014-2015 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
-
-
-atmel_ice.name=Atmel-ICE
-atmel_ice.communication=USB
-atmel_ice.protocol=
-atmel_ice.program.protocol=
-atmel_ice.program.tool=openocd
-atmel_ice.program.extra_params=
-
-sam_ice.name=Atmel SAM-ICE
-sam_ice.communication=USB
-sam_ice.protocol=
-sam_ice.program.protocol=
-sam_ice.program.tool=openocd
-sam_ice.program.extra_params=
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index 9ab048009..887e79a86 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -17,29 +17,60 @@
 */
 
 /*
-  Modified 21 June 2015 by Justin Mattair
-     for the MattairTech MT-D21E board (www.mattairtech.com)
+  Modified 20 July 2015 by Justin Mattair
+     for MattairTech MT-D21E boards (www.mattairtech.com)
+*/
+
+/*
+============================================ MattairTech MT-D21E (ATsamd21eXXa) ========================================
+Comm/Other INT      PWM    Digital    Analog                               Digital    PWM       INT    Comm/other
+========================================================================================================================
+                                                  -----------------------
+Xin32                                            |   A0            RST   |                             Reset
+Xout32                                           |   A1            NC    |
+                             2     2 (ADC0, DAC) |   A2            NC    |
+                             3     3 (ADC1, REF) |   A3            A31   |   31    TCC1/WO[1]  INT11   Button B / SWD IO
+          INT4               4     4 (ADC4)      |   A4            A30   |   30    TCC1/WO[0]  INT10   SWD CLK
+          INT5               5     5 (ADC5)      |   A5            NC    |
+                             6     6 (ADC6)      |   A6            A28   |   28                INT8    LED
+VDIV                         7     7 (ADC7)      |   A7            A27   |   27                INT15   Button A
+          INTNMI TCC0/WO[0]  8     8 (ADC16)     |   A8            A23   |   23    TC4/WO[1]   INT7    SPI SS
+          INT9   TCC0/WO[1]  9     9 (ADC17)     |   A9            A22   |   22    TC4/WO[0]   INT6    SPI MISO
+TX (1)           TCC0/WO[2]  10    10 (ADC18)    |   A10           A19   |   19                INT3    SPI SCK
+RX (1)           TCC0/WO[3]  11    11 (ADC19)    |   A11           A18   |   18                INT2    SPI MOSI
+TX (2)    INT14  TC3/WO[0]   14                  |   A14           A17   |   17    TCC2/WO[1]  INT1    I2C/SCL
+RX (2)           TC3/WO[1]   15                  |   A15           A16   |   16    TCC2/WO[0]  INT0    I2C/SDA
+                                                 |   NC            NC    |
+                                                 |   NC            NC    |
+                                                 |   Vbus          3.3V  |
+USB D-                                           |   A24-  _____   Vcc   |
+USB D+                                           |   A25+ |     |  Vin   |
+                                                 |   Gnd  | USB |  Gnd   |
+                                                  -----------------------
+  Most pins have multiple configurations available (even analog pins). For example, pin A10 can be an analog input, a
+  PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the pin number printed on the board but
+  without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
 */
 
 
 /*  Pins descriptions for the MattairTech MT-D21E
  * 
- * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (* is for default peripheral in use, () means unavailable)
+ * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (* is for default peripheral in use, ! means unavailable with this variant)
  * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
  * | 0       | --                 | A0               |  PA00  | Xin32             | *Xin32
  * | 1       | --                 | A1               |  PA01  | Xout32            | *Xout32
- * | 2       | 2                  | A2               |  PA02  |                   | EIC/EXTINT[2] *ADC/AIN[0] PTC/Y[0] DAC/VOUT
- * | 3       | 3                  | A3               |  PA03  | REFA              | EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFP *ADC/AIN[1] PTC/Y[1]
- * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFP *ADC/AIN[4] AC/AIN[0] PTC/Y[2] (SERCOM0/PAD[0]) (TCC0/WO[0])
- * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] *ADC/AIN[5] AC/AIN[1] PTC/Y[3] (SERCOM0/PAD[1]) (TCC0/WO[1])
- * | 6       | 6                  | A6               |  PA06  |                   | EIC/EXTINT[6] *ADC/AIN[6] AC/AIN[2] PTC/Y[4] (SERCOM0/PAD[2]) (TCC1/WO[0])
- * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | EIC/EXTINT[7] *ADC/AIN[7] AC/AIN[3] PTC/Y[5] (SERCOM0/PAD[3]) (TCC1/WO[1])
- * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] (SERCOM0/PAD[0]) (SERCOM2/PAD[0]) *TCC0/WO[0] (TCC1/WO[2])
- * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] (SERCOM0/PAD[1]) (SERCOM2/PAD[1]) *TCC0/WO[1] (TCC1/WO[3])
- * | 10      | 10                 | A10              |  PA10  | TX                | EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] *SERCOM0/PAD[2] (SERCOM2/PAD[2]) (TCC1/WO[0]) TCC0/WO[2]
- * | 11      | 11                 | A11              |  PA11  | RX                | EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] *SERCOM0/PAD[3] (SERCOM2/PAD[3]) (TCC1/WO[1]) TCC0/WO[3]
- * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] (SERCOM4/PAD[2]) *TC3/WO[0] (TCC0/WO[4]) Xin, HOST_ENABLE
- * | 13      | 15                 | A15              |  PA15  | Xout, ATN         | EIC/EXTINT[15] SERCOM2/PAD[3] (SERCOM4/PAD[3]) *TC3/WO[1] (TCC0/WO[5]) Xout, ATN
+ * | 2       | 2                  | A2               |  PA02  |                   | !EIC/EXTINT[2] *ADC/AIN[0] PTC/Y[0] DAC/VOUT
+ * | 3       | 3                  | A3               |  PA03  | REFA              | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA *ADC/AIN[1] PTC/Y[1]
+ * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFB *ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[0] !TCC0/WO[0]
+ * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] *ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1]
+ * | 6       | 6                  | A6               |  PA06  |                   | !EIC/EXTINT[6] *ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0]
+ * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | !EIC/EXTINT[7] *ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
+ * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] *TCC0/WO[0] !TCC1/WO[2]
+ * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] *TCC0/WO[1] !TCC1/WO[3]
+ * | 10      | 10                 | A10              |  PA10  | TX                | !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] *SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
+ * | 11      | 11                 | A11              |  PA11  | RX                | !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] *SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
+ * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] *TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
+ * | 13      | 15                 | A15              |  PA15  | Xout              | !EIC/EXTINT[15] SERCOM2/PAD[3] *TC3/WO[1] !TCC0/WO[5] Xout
  * | 14      | --                 | NC               |  ----  |                   | Not Connected
  * | 15      | --                 | NC               |  ----  |                   | Not Connected
  * | 16      | --                 | Vbus             |  ----  |                   | USB Vbus
@@ -52,17 +83,17 @@
  * | 23      | --                 | 3.3V             |  ----  |                   | 3.3V
  * | 24      | --                 | NC               |  ----  |                   | Not Connected
  * | 25      | --                 | NC               |  ----  |                   | Not Connected
- * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] *SERCOM1/PAD[0] (SERCOM3/PAD[0]) TCC2/WO[0] (TCC0/WO[6])
- * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] *SERCOM1/PAD[1] (SERCOM3/PAD[1]) TCC2/WO[1] (TCC0/WO[7])
- * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] (SERCOM1/PAD[2]) *SERCOM3/PAD[2] (TC3/WO[0]) (TCC0/WO[2])
- * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] (SERCOM1/PAD[3]) *SERCOM3/PAD[3] (TC3/WO[1]) (TCC0/WO[3])
- * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] *SERCOM3/PAD[0] (SERCOM5/PAD[0]) TC4/WO[0] (TCC0/WO[4])
- * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] *SERCOM3/PAD[1] (SERCOM5/PAD[1]) TC4/WO[1] (TCC0/WO[5])
+ * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] *SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
+ * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] *SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
+ * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] *SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+ * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] *SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
+ * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] *SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
+ * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] *SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
  * | 32      | 27                 | A27              |  PA27  | Button A          | EIC/EXTINT[15] *Button A
  * | 33      | 28                 | A28              |  PA28  | LED               | EIC/EXTINT[8] *LED
  * | 34      | --                 | NC               |  ----  |                   | Not Connected
- * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] (SERCOM1/PAD[2]) *TCC1/WO[0] SWD CLK
- * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] (SERCOM1/PAD[3]) *TCC1/WO[1] Button B SWD IO
+ * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] !SERCOM1/PAD[2] *TCC1/WO[0] SWD CLK
+ * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] !SERCOM1/PAD[3] *TCC1/WO[1] Button B SWD IO
  * | 37      | --                 | NC               |  ----  |                   | Not Connected
  * | 38      | --                 | NC               |  ----  |                   | Not Connected
  * | 39      | --                 | RST              |  ----  |                   | Reset
@@ -71,11 +102,66 @@
  * You may use Arduino pin numbers ranging from 0 to 31. The Arduino pin corresponds to the silkscreen (without the 'A').
  * For example, use pinMode(28, OUTPUT) to set the LED pin (marked as A28) as an output.
  * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 12, 13, 20, 21, 24, 25, 26, and 29.
- * Note that pins 0 and 1 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
- * Note also that pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+ * Pins 0 and 1 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
+ * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+ * When using pins 22 and/or 23 as pwm outputs, it will use Timer TC4, which conflicts with the servo library.
+ * The tone library uses TC5.
  */
 
 
+/*   The PinDescription table describes how each of the pins can be used by the Arduino core. Each pin can have multiple
+ *   functions (ie: ADC input, digital output, PWM, communications, etc.), and the PinDescription table configures
+ *   which functions can be used for each pin. This table is mainly accessed by the pinPeripheral function in
+ *   wiring_private.c, which is used to attach a pin to a particular peripheral function. The communications drivers
+ *   (ie: SPI, I2C, and UART), analogRead(), analogWrite(), analogReference(), attachInterrupt(), and pinMode() all
+ *   call pinPeripheral() to verify that the pin can perform the function requested, and to configure the pin for
+ *   that function. Most of the contents of pinMode() are now in pinPeripheral().
+ * 
+ *   Explanation of PinDescription table:
+ * 
+ *   Port			This is the port (ie: PORTA).
+ *   Pin			This is the pin (bit) within the port. Valid values are 0 through 31.
+ *   PinType			This indicates what peripheral function the pin can be attached to. In most cases, this
+ *                              is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute field.
+ *                              It can also be set to a specific peripheral. In this case, any attempt to configure the
+ *                              pin (using pinPeripheral or pinMode) as anything else will fail (and pinPeripheral will
+ *                              return -1). This can be used to prevent accidental re-configuration of a pin that is
+ *                              configured for only one function (ie: USB D- and D+ pins). If a pin is not used or does
+ *                              not exist, PIO_NOT_A_PIN must be entered in this field. See WVariant.h for valid
+ *                              entries. These entries are also used as a parameter to pinPeripheral() with the
+ *                              exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function now calls pinPeripheral()
+ *                              with the desired mode. Note that this field is not used to select between the two
+ *                              peripherals possible with each of the SERCOM and TIMER functions. PeripheralAttribute
+ *                              is now used for this.
+ *   PeripheralAttribute	This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+ *                              used to select between the two peripherals possible with each of the SERCOM and TIMER
+ *                              functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+ *                              This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) uses
+ *                              PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD. Both TIMER and
+ *                              SERCOM can exist for each pin. This bitfield is also used to set the pin drive strength.
+ *                              In the future, other attributes (like input buffer configuration) may be added.
+ *                              See WVariant.h for valid entries.
+ *   PinAttribute		This is a 32-bit bitfield used to list all of the valid peripheral functions that a pin
+ *                              can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain attributes
+ *                              are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL includes all of
+ *                              the GPIO functions, while PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
+ *                              PIN_ATTR_TIMER_CAPTURE (capture is not used yet). PIN_ATTR_ANALOG is an alias to
+ *                              PIN_ATTR_ANALOG_ADC. There is only one DAC channel, so PIN_ATTR_DAC appears only once.
+ *                              This bitfield is useful for limiting a pin to only input related functions or output
+ *                              functions. This allows a pin to have a more flexible configuration, while restricting
+ *                              the direction (ie: to avoid contention). See WVariant.h for valid entries.
+ *   TCChannel			This is the TC(C) channel (if any) assigned to the pin. Some TC channels are available
+ *                              on multiple pins (ie: TCC0/WO[0] is available on pin A4 or pin A8). In general, only
+ *                              one pin should be configured (in the pinDescription table) per TC channel.
+ *                              See WVariant.h for valid entries. The tone library uses TC5.
+ *   ADCChannelNumber		This is the ADC channel (if any) assigned to the pin. See WVariant.h for valid entries.
+ *   ExtInt			This is the interrupt (if any) assigned to the pin. Some interrupt numbers are available
+ *                              on multiple pins (ie: EIC/EXTINT[2] is available on pin A2 or pin A18). In general, only
+ *                              one pin should be configured (in the pinDescription table) per interrupt number. Thus,
+ *                              if an interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18.
+ *                              See WVariant.h for valid entries.
+ */
+
 #include "variant.h"
 
 /*
@@ -84,61 +170,56 @@
 const PinDescription g_APinDescription[]=
 {
 	// 0..1 are unused (pins in use by 32.768KHz crystal, which in turn is used by the Arduino core)
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	
 	// 2..9 - Analog capable pins (DAC avalable on 2)
-	{ PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
-	{ PORTA,  3, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel1, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[1]
-	{ PORTA,  4, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
-	{ PORTA,  5, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
-	{ PORTA,  6, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL), ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[6]
-	{ PORTA,  7, PIO_ANALOG, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL), ADC_Channel7, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_TIMER, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_TIMER, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), ADC_Channel17, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // ADC/AIN[1]
+	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4 }, // ADC/AIN[4]
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5 }, // ADC/AIN[5]
+	{ PORTA,  6, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NONE }, // ADC/AIN[6]
+	{ PORTA,  7, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9 }, // TCC0/WO[1]
 	
 	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
-	{ PORTA, 10, PIO_SERCOM, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel18, PWM0_CH2, TCC0_CH2, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2], PIO_TIMER_ALT
-	{ PORTA, 11, PIO_SERCOM, (PIN_ATTR_ANALOG|PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel19, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3], PIO_TIMER_ALT
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2] (PIN_ATTR_TIMER_ALT)
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3] (PIN_ATTR_TIMER_ALT)
 	
 	// 12..13 pins don't exist
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	
 	// 14..15 - Digital functions
-	{ PORTA, 14, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM3_CH0, TC3_CH0, EXTERNAL_INT_14 }, // TC3/WO[0], HOST_ENABLE
-	{ PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_NONE }, // TC3/WO[1], ATN
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14 }, // TC3/WO[0], HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // TC3/WO[1], ATN
 	
 	// 16..17 I2C pins (SDA/SCL) or Digital functions
-	{ PORTA, 16, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, // SDA: SERCOM1/PAD[0]
-	{ PORTA, 17, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_1 }, // SCL: SERCOM1/PAD[1]
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // SDA: SERCOM1/PAD[0]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // SCL: SERCOM1/PAD[1]
 	
 	// 18..23 - SPI Pins or Digital functions (pins 20..21 do not exist)
-	{ PORTA, 18, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // SPI MOSI: SERCOM3/PAD[2], PIO_SERCOM_ALT
-	{ PORTA, 19, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 }, // SPI SCK: SERCOM3/PAD[3], PIO_SERCOM_ALT
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
-//	{ PORTA, 22, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM4_CH0, TC4_CH0, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
-//	{ PORTA, 23, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM4_CH1, TC4_CH1, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
-	{ PORTA, 22, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
-	{ PORTA, 23, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2 }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3 }, // SPI SCK: SERCOM3/PAD[3] (PIN_ATTR_SERCOM_ALT)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
 	
 	// 24..26 are unused (25 and 26 in use by USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist)
-	{ PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DM
-	{ PORTA, 25, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DP
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DM
+	{ PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	
 	// 27..29 Button A and LED (pin 29 does not exist)
-	{ PORTA, 27, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_15 }, // Button A
-	{ PORTA, 28, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // LED
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Unused
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_INPUT_PULLUP|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_15 }, // Button A
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_OUTPUT|PIN_ATTR_INPUT|PIN_ATTR_INPUT_PULLDOWN|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_8 }, // LED
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	
 	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_10 }, // TCC1/WO[0] / SWD CLK
-	{ PORTA, 31, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_11 }, // TCC1/WO[1] / SWD IO
-	
-	// 32 - Alternate use of pin 2 (DAC output)
-	//{ PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VOUT
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH0, No_ADC_Channel, EXTERNAL_INT_10 }, // TCC1/WO[0] / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH1, No_ADC_Channel, EXTERNAL_INT_11 }, // TCC1/WO[1] / SWD IO
 } ;
 
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
@@ -148,13 +229,17 @@ SERCOM sercom0( SERCOM0 ) ;
 SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 SERCOM sercom3( SERCOM3 ) ;
-SERCOM sercom4( SERCOM4 ) ;
-SERCOM sercom5( SERCOM5 ) ;
 
-Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
 void SERCOM0_Handler()
 {
   Serial1.IrqHandler();
 }
 
+void SERCOM2_Handler()
+{
+  Serial2.IrqHandler();
+}
+
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index e3eb01e92..2b2daa86a 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -17,8 +17,8 @@
 */
 
 /*
-  Modified 21 June 2015 by Justin Mattair
-     for the MattairTech MT-D21E board (www.mattairtech.com)
+  Modified 20 July 2015 by Justin Mattair
+     for MattairTech MT-D21E boards (www.mattairtech.com)
 */
 
 #ifndef _VARIANT_MATTAIRTECH_MT_D21E_
@@ -66,7 +66,7 @@ extern "C"
 #define portOutputRegister(port)   ( &(port->OUT.reg) )
 #define portInputRegister(port)    ( &(port->IN.reg) )
 #define portModeRegister(port)     ( &(port->DIR.reg) )
-#define digitalPinHasPWM(P)        ( g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
 
 /*
  * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
@@ -80,11 +80,13 @@ extern "C"
 // Interrupts
 #define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
 
-// LEDs
-// None of these defines are currently used by the core.
-// The MT-D21E onboard LED is on pin 28.
-// The RX and TX LEDs are not present.
-// You may optionally add them to any free pins.
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ * The MT-D21E onboard LED is on pin 28.
+ * The RX and TX LEDs are not present.
+ * You may optionally add them to any free pins.
+ */
 #define PIN_LED_13           (28u)
 #define PIN_LED_RXL          (30u)
 #define PIN_LED_TXL          (31u)
@@ -93,37 +95,61 @@ extern "C"
 #define PIN_LED3             PIN_LED_TXL
 #define LED_BUILTIN          PIN_LED_13
 
+/* Buttons
+ * Note that Button B is connected to Reset by default.
+ * A solder jumper can be changed to route Button B to pin 31 instead.
+ * If the debouncing capacitor is connected (default), delay reading the
+ * pin at least 6ms after turning on the pullup to allow the capacitor to charge.
+ */
+#define BUTTON_A             (27u)
+#define BUTTON_B             (31u)
+#define BUTTON_BUILTIN       BUTTON_A
+
+
 /*
  * Analog pins
  */
-#define PIN_A0               (2ul)
-#define PIN_A1               (3ul)
-#define PIN_A2               (4ul)
-#define PIN_A3               (5ul)
-#define PIN_A4               (6ul)
-#define PIN_A5               (7ul)
-#define PIN_A6               (8ul)
-#define PIN_A7               (9ul)
-#define PIN_A8               (10ul)
-#define PIN_A9               (11ul)
-
-static const uint8_t A0  = PIN_A0 ;
-static const uint8_t A1  = PIN_A1 ;
-static const uint8_t A2  = PIN_A2 ;
-static const uint8_t A3  = PIN_A3 ;
-static const uint8_t A4  = PIN_A4 ;
-static const uint8_t A5  = PIN_A5 ;
-static const uint8_t A6  = PIN_A6 ;
-static const uint8_t A7  = PIN_A7 ;
-static const uint8_t A8  = PIN_A8 ;
-static const uint8_t A9  = PIN_A9 ;
+#define PIN_A2               (2ul)
+#define PIN_A3               (3ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A6               (6ul)
+#define PIN_A7               (7ul)
+#define PIN_A8               (8ul)
+#define PIN_A9               (9ul)
+#define PIN_A10              (10ul)
+#define PIN_A11              (11ul)
+
+static const uint8_t A2   = PIN_A2 ;
+static const uint8_t A3   = PIN_A3 ;
+static const uint8_t A4   = PIN_A4 ;
+static const uint8_t A5   = PIN_A5 ;
+static const uint8_t A6   = PIN_A6 ;
+static const uint8_t A7   = PIN_A7 ;
+static const uint8_t A8   = PIN_A8 ;
+static const uint8_t A9   = PIN_A9 ;
+static const uint8_t A10  = PIN_A10 ;
+static const uint8_t A11  = PIN_A11 ;
 
 #define ADC_RESOLUTION		12
 
-// Other pins
+#define REMAP_ANALOG_PIN_ID	while(0)
+// #define REMAP_ANALOG_PIN_ID	if ( ulPin < A0 ) ulPin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#define REFA_PIN    (3ul)
+#define REFB_PIN    (4ul)
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
 #define PIN_ATN              (15ul)
 static const uint8_t ATN = PIN_ATN;
 
+
 /*
  * Serial interfaces
  */
@@ -133,6 +159,17 @@ static const uint8_t ATN = PIN_ATN;
 #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
 #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
 
+#define SERCOM_INSTANCE_SERIAL1       &sercom0
+
+// Serial2
+#define PIN_SERIAL2_RX       (15ul)
+#define PIN_SERIAL2_TX       (14ul)
+#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL2       &sercom2
+
+
 /*
  * SPI Interfaces
  */
@@ -152,6 +189,9 @@ static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
+#define SERCOM_INSTANCE_SPI           &sercom3
+
+
 /*
  * Wire Interfaces
  */
@@ -162,17 +202,27 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE_SDA          PIN_WIRE1_SDA
 #define PIN_WIRE_SCL          PIN_WIRE1_SCL
 
+#define SERCOM_INSTANCE_WIRE           &sercom1
+
+#define SERCOM_WIRE_HANDLER_MACRO \
+void SERCOM3_Handler(void) { \
+	Wire.onService(); \
+}
+
+
 /*
  * USB
  */
-#define PIN_USB_HOST_ENABLE (14ul)
-#define PIN_USB_DM          (24ul)
-#define PIN_USB_DP          (25ul)
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+#define PIN_USB_HOST_ENABLE             (14ul)
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
 
 #ifdef __cplusplus
 }
 #endif
 
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
@@ -187,10 +237,9 @@ extern SERCOM sercom0;
 extern SERCOM sercom1;
 extern SERCOM sercom2;
 extern SERCOM sercom3;
-extern SERCOM sercom4;
-extern SERCOM sercom5;
 
 extern Uart Serial1;
+extern Uart Serial2;
 
 #endif
 
@@ -210,7 +259,12 @@ extern Uart Serial1;
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
 #define SERIAL_PORT_USBVIRTUAL      SerialUSB
-#define SERIAL_PORT_MONITOR         SerialUSB
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#define SERIAL_PORT_MONITOR         Serial1
 // Serial has no physical pins broken out, so it's not listed as HARDWARE port
 #define SERIAL_PORT_HARDWARE        Serial1
 #define SERIAL_PORT_HARDWARE_OPEN   Serial1
@@ -220,7 +274,7 @@ extern Uart Serial1;
 // So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
 // Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
 // Remember to use while(!Serial); to wait for a connection before Serial printing.
-#define Serial	SerialUSB
+#define Serial                      SerialUSB
 
 #endif /* _VARIANT_ARDUINO_ZERO_ */
 

From d5ee5bacd242a848ad4cadef72985d18134c12ca Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 20 Jul 2015 13:07:42 +0000
Subject: [PATCH 008/124] Re-added PIN_ATTR_DIGITAL to A2 and A3

---
 variants/MT_D21E/variant.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index 887e79a86..5c8667d2f 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -174,8 +174,8 @@ const PinDescription g_APinDescription[]=
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	
 	// 2..9 - Analog capable pins (DAC avalable on 2)
-	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
-	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // ADC/AIN[1]
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // ADC/AIN[1]
 	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4 }, // ADC/AIN[4]
 	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5 }, // ADC/AIN[5]
 	{ PORTA,  6, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NONE }, // ADC/AIN[6]

From cee24bdded408a28de673529ceb0f60bf324823d Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 21 Jul 2015 05:48:47 +0000
Subject: [PATCH 009/124] Documentation formatting changes

---
 README.md                    | 189 +++++++++++++++++++----------------
 variants/MT_D21E/variant.cpp | 182 ++++++++++++++++++---------------
 2 files changed, 205 insertions(+), 166 deletions(-)

diff --git a/README.md b/README.md
index 0bad69d63..d739d7a2e 100644
--- a/README.md
+++ b/README.md
@@ -33,71 +33,72 @@ PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the
 without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
 
 ```
-============================================ MattairTech MT-D21E (ATsamd21eXXa) =======================================
-Comm/Other INT      PWM    Digital    Analog                               Digital   PWM       INT    Comm/other
-=======================================================================================================================
-                                                  -----------------------
-Xin32                                            |   A0            RST   |                            Reset
-Xout32                                           |   A1            NC    |
-                             2     2 (ADC0, DAC) |   A2            NC    |
-                             3     3 (ADC1, REF) |   A3            A31   |   31   TCC1/WO[1]  INT11   Button B / SWD IO
-          INT4               4     4 (ADC4)      |   A4            A30   |   30   TCC1/WO[0]  INT10   SWD CLK
-          INT5               5     5 (ADC5)      |   A5            NC    |
-                             6     6 (ADC6)      |   A6            A28   |   28               INT8    LED
-VDIV                         7     7 (ADC7)      |   A7            A27   |   27               INT15   Button A
-          INTNMI TCC0/WO[0]  8     8 (ADC16)     |   A8            A23   |   23   TC4/WO[1]   INT7    SPI SS
-          INT9   TCC0/WO[1]  9     9 (ADC17)     |   A9            A22   |   22   TC4/WO[0]   INT6    SPI MISO
-TX (1)           TCC0/WO[2]  10    10 (ADC18)    |   A10           A19   |   19               INT3    SPI SCK
-RX (1)           TCC0/WO[3]  11    11 (ADC19)    |   A11           A18   |   18               INT2    SPI MOSI
-TX (2)    INT14  TC3/WO[0]   14                  |   A14           A17   |   17   TCC2/WO[1]  INT1    I2C/SCL
-RX (2)           TC3/WO[1]   15                  |   A15           A16   |   16   TCC2/WO[0]  INT0    I2C/SDA
-                                                 |   NC            NC    |
-                                                 |   NC            NC    |
-                                                 |   Vbus          3.3V  |
-USB D-                                           |   A24-  _____   Vcc   |
-USB D+                                           |   A25+ |     |  Vin   |
-                                                 |   Gnd  | USB |  Gnd   |
-                                                  -----------------------
+============================= MattairTech MT-D21E (ATsamd21eXXa) ========================
+Other   INT    PWM   Digital  Analog                      Digital  PWM     INT    Other
+=========================================================================================
+                                       -------------------
+Xin32                                 | A0            RST |                      Reset
+Xout32                                | A1            NC  |
+DAC                    2    2 (ADC0)  | A2            NC  |
+REF                    3    3 (ADC1)  | A3            A31 |  31  TCC1[1]  INT11  SWD IO *
+       INT4            4    4 (ADC4)  | A4            A30 |  30  TCC1[0]  INT10  SWD CLK
+       INT5            5    5 (ADC5)  | A5            NC  |
+                       6    6 (ADC6)  | A6            A28 |  28           INT8   LED
+VDIV                   7    7 (ADC7)  | A7            A27 |  27           INT15  Button A
+       INTNMI TCC0[0]  8    8 (ADC16) | A8            A23 |  23  TC4[1]   INT7   SPI SS
+       INT9   TCC0[1]  9    9 (ADC17) | A9            A22 |  22  TC4[0]   INT6   SPI MISO
+TX (1)        TCC0[2]  10   10 (ADC18)| A10           A19 |  19           INT3   SPI SCK
+RX (1)        TCC0[3]  11   11 (ADC19)| A11           A18 |  18           INT2   SPI MOSI
+TX (2) INT14  TC3[0]   14             | A14           A17 |  17  TCC2[1]  INT1   I2C/SCL
+RX (2)        TC3[1]   15             | A15           A16 |  16  TCC2[0]  INT0   I2C/SDA
+                                      | NC            NC  |
+                                      | NC            NC  |
+                                      | Vbus          3.3V|   * Button B available on 31
+USB D-                                | A24-  _____   Vcc |
+USB D+                                | A25+ |     |  Vin |
+                                      | Gnd  | USB |  Gnd |
+                                       -------------------
 ```
 
 #### All pins operate at 3.3 volts. DO NOT connect voltages higher than 3.3V!
 
-* Digital: All 22 pins can be used for general purpose I/O (INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN).
+* **Digital: All 22 pins can be used for general purpose I/O** 
+  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
   * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
   * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
   * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* Analog Inputs: 10 pins can be configured as ADC analog inputs.
+* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
   * These are available on pins 2 through 11 using the analogRead() function.
   * These pins can be used for GPIO and other digital functions (ie. pwm and serial) as well.
   * Each pin provides 10 bits of resolution (1024 values) by default.
   * 12-bit resolution supported by using the analogReadResolution() function.
   * Each pin measures from ground to 3.3 volts.
   * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
-* DAC: One analog output is available on pin 2.
+* **DAC: One analog output is available on pin 2.**
   * Provides a 10-bit voltage output with the analogWrite() function.
-* PWM: 12 pins can be configured as PWM outputs.
+* **PWM: 12 pins can be configured as PWM outputs.**
   * Available on pins 8, 9, 10, 11, 14, 15, 16, 17, 22, 23, 30, and 31 using the analogWrite() function.
   * Each pin provides 8 bits of resolution (256 values) by default.
   * 12-bit resolution supported by using the analogWriteResolution() function.
-* External Interrupts: 15 pins can be configured with external interrupts.
+* **External Interrupts: 15 pins can be configured with external interrupts.**
   * Available on all the pins except pins 2, 3, 6, 7, 10, 11, and 15 using the attachInterrupt() function.
-* Serial: 2 pairs of pins can be configured for TTL serial I/O.
+* **Serial: 2 pairs of pins can be configured for TTL serial I/O.**
   * Serial1: pin 11 (RX) and pin 10 (TX).
   * Serial2: pin 15 (RX) and pin 14 (TX).
-* SPI: 3 or 4 pins can be configured for SPI I/O.
+* **SPI: 3 or 4 pins can be configured for SPI I/O.**
   * Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
   * SPI communication using the SPI library.
-* TWI (I2C): 2 pins can be configured for TWI I/O.
+* **TWI (I2C): 2 pins can be configured for TWI I/O.**
   * Pin 16 (SDA) and pin 17 (SCL).
   * TWI communication using the Wire library.
-* LED: One pin can be configured to light the onboard LED.
+* **LED: One pin can be configured to light the onboard LED.**
   * Pin 28 (LED_BUILTIN). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* Button: One pin can be configured to read the onboard Button A.
+* **Button: One pin can be configured to read the onboard Button A.**
   * Pin 27 (BUTTON_BUILTIN). Pressing the button will bring the pin LOW. The pullup must be enabled first.
   * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
-* AREF: One pin can be configured as an AREF analog input.
+* **AREF: One pin can be configured as an AREF analog input.**
   * The upper end of the analog measurement range can be changed using the analogReference() function.
-* Reset: Bring this line LOW to reset the microcontroller.
+* **Reset: Bring this line LOW to reset the microcontroller.**
 
 #### MT-D21E Board Configuration
 
@@ -255,7 +256,7 @@ and 0x00001000 for 4 KB bootloaders. This is because the bootloader resides at 0
 by passing the following flag to the linker (typically LDFLAGS in your makefile; adjust for your bootloader size):
 
 ```
-­Wl,­­section­start=.text=0x2000
+Wl,sectionstart=.text=0x2000
 ```
 
 You may also use a linker script. See the MattairTech SAMD package for examples.
@@ -286,56 +287,74 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 ## New PinDescription Table
 
 ```
-/*   The PinDescription table describes how each of the pins can be used by the Arduino core. Each pin can have multiple
- *   functions (ie: ADC input, digital output, PWM, communications, etc.), and the PinDescription table configures
- *   which functions can be used for each pin. This table is mainly accessed by the pinPeripheral function in
- *   wiring_private.c, which is used to attach a pin to a particular peripheral function. The communications drivers
- *   (ie: SPI, I2C, and UART), analogRead(), analogWrite(), analogReference(), attachInterrupt(), and pinMode() all
- *   call pinPeripheral() to verify that the pin can perform the function requested, and to configure the pin for
+/*   The PinDescription table describes how each of the pins can be used by the Arduino
+ *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+ *   communications, etc.), and the PinDescription table configures which functions can
+ *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
+ *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
+ *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+ *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+ *   verify that the pin can perform the function requested, and to configure the pin for
  *   that function. Most of the contents of pinMode() are now in pinPeripheral().
  * 
  *   Explanation of PinDescription table:
  * 
- *   Port			This is the port (ie: PORTA).
- *   Pin			This is the pin (bit) within the port. Valid values are 0 through 31.
- *   PinType			This indicates what peripheral function the pin can be attached to. In most cases, this
- *                              is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute field.
- *                              It can also be set to a specific peripheral. In this case, any attempt to configure the
- *                              pin (using pinPeripheral or pinMode) as anything else will fail (and pinPeripheral will
- *                              return -1). This can be used to prevent accidental re-configuration of a pin that is
- *                              configured for only one function (ie: USB D- and D+ pins). If a pin is not used or does
- *                              not exist, PIO_NOT_A_PIN must be entered in this field. See WVariant.h for valid
- *                              entries. These entries are also used as a parameter to pinPeripheral() with the
- *                              exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function now calls pinPeripheral()
- *                              with the desired mode. Note that this field is not used to select between the two
- *                              peripherals possible with each of the SERCOM and TIMER functions. PeripheralAttribute
- *                              is now used for this.
- *   PeripheralAttribute	This is an 8-bit bitfield used for various peripheral configuration. It is primarily
- *                              used to select between the two peripherals possible with each of the SERCOM and TIMER
- *                              functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
- *                              This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) uses
- *                              PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD. Both TIMER and
- *                              SERCOM can exist for each pin. This bitfield is also used to set the pin drive strength.
- *                              In the future, other attributes (like input buffer configuration) may be added.
- *                              See WVariant.h for valid entries.
- *   PinAttribute		This is a 32-bit bitfield used to list all of the valid peripheral functions that a pin
- *                              can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain attributes
- *                              are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL includes all of
- *                              the GPIO functions, while PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
- *                              PIN_ATTR_TIMER_CAPTURE (capture is not used yet). PIN_ATTR_ANALOG is an alias to
- *                              PIN_ATTR_ANALOG_ADC. There is only one DAC channel, so PIN_ATTR_DAC appears only once.
- *                              This bitfield is useful for limiting a pin to only input related functions or output
- *                              functions. This allows a pin to have a more flexible configuration, while restricting
- *                              the direction (ie: to avoid contention). See WVariant.h for valid entries.
- *   TCChannel			This is the TC(C) channel (if any) assigned to the pin. Some TC channels are available
- *                              on multiple pins (ie: TCC0/WO[0] is available on pin A4 or pin A8). In general, only
- *                              one pin should be configured (in the pinDescription table) per TC channel.
- *                              See WVariant.h for valid entries. The tone library uses TC5.
- *   ADCChannelNumber		This is the ADC channel (if any) assigned to the pin. See WVariant.h for valid entries.
- *   ExtInt			This is the interrupt (if any) assigned to the pin. Some interrupt numbers are available
- *                              on multiple pins (ie: EIC/EXTINT[2] is available on pin A2 or pin A18). In general, only
- *                              one pin should be configured (in the pinDescription table) per interrupt number. Thus,
- *                              if an interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18.
- *                              See WVariant.h for valid entries.
+ *   Port                  This is the port (ie: PORTA).
+ *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
+ *   PinType               This indicates what peripheral function the pin can be
+ *                         attached to. In most cases, this is PIO_MULTI, which means
+ *                         that the pin can be anything listed in the PinAttribute field.
+ *                         It can also be set to a specific peripheral. In this case, any
+ *                         attempt to configure the pin (using pinPeripheral or pinMode)
+ *                         as anything else will fail (and pinPeripheral will return -1).
+ *                         This can be used to prevent accidental re-configuration of a
+ *                         pin that is configured for only one function (ie: USB D- and
+ *                         D+ pins). If a pin is not used or does not exist,
+ *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
+ *                         for valid entries. These entries are also used as a parameter
+ *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
+ *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
+ *                         the desired mode. Note that this field is not used to select
+ *                         between the two peripherals possible with each of the SERCOM
+ *                         and TIMER functions. PeripheralAttribute is now used for this.
+ *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
+ *                         configuration. It is primarily used to select between the two
+ *                         peripherals possible with each of the SERCOM and TIMER
+ *                         functions. TIMER pins are individual, while SERCOM uses a
+ *                         group of two to four pins. This group of pins can span both
+ *                         peripherals. For example, pin 19 (SPI1 SCK) uses
+ *                         PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
+ *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
+ *                         pin. This bitfield is also used to set the pin drive strength.
+ *                         In the future, other attributes (like input buffer
+ *                         configuration) may be added. See WVariant.h for valid entries.
+ *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
+ *                         peripheral functions that a pin can attach to. This includes
+ *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
+ *                         shorthand for a combination of other attributes.
+ *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
+ *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
+ *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+ *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
+ *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
+ *                         bitfield is useful for limiting a pin to only input related
+ *                         functions or output functions. This allows a pin to have a
+ *                         more flexible configuration, while restricting the direction
+ *                         (ie: to avoid contention). See WVariant.h for valid entries.
+ *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
+ *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
+ *                         available on pin A4 or pin A8). In general, only one pin
+ *                         should be configured (in the pinDescription table) per TC
+ *                         channel. See WVariant.h for valid entries. The tone library
+ *                         uses TC5.
+ *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
+ *                         WVariant.h for valid entries.
+ *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
+ *                         interrupt numbers are available on multiple pins (ie:
+ *                         EIC/EXTINT[2] is available on pin A2 or pin A18). In general,
+ *                         only one pin should be configured (in the pinDescription
+ *                         table) per interrupt number. Thus, if an interrupt was needed
+ *                         on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See 
+ *                         WVariant.h for valid entries.
  */
 ```
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index 5c8667d2f..605e9f62d 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -22,37 +22,110 @@
 */
 
 /*
-============================================ MattairTech MT-D21E (ATsamd21eXXa) ========================================
-Comm/Other INT      PWM    Digital    Analog                               Digital    PWM       INT    Comm/other
-========================================================================================================================
-                                                  -----------------------
-Xin32                                            |   A0            RST   |                             Reset
-Xout32                                           |   A1            NC    |
-                             2     2 (ADC0, DAC) |   A2            NC    |
-                             3     3 (ADC1, REF) |   A3            A31   |   31    TCC1/WO[1]  INT11   Button B / SWD IO
-          INT4               4     4 (ADC4)      |   A4            A30   |   30    TCC1/WO[0]  INT10   SWD CLK
-          INT5               5     5 (ADC5)      |   A5            NC    |
-                             6     6 (ADC6)      |   A6            A28   |   28                INT8    LED
-VDIV                         7     7 (ADC7)      |   A7            A27   |   27                INT15   Button A
-          INTNMI TCC0/WO[0]  8     8 (ADC16)     |   A8            A23   |   23    TC4/WO[1]   INT7    SPI SS
-          INT9   TCC0/WO[1]  9     9 (ADC17)     |   A9            A22   |   22    TC4/WO[0]   INT6    SPI MISO
-TX (1)           TCC0/WO[2]  10    10 (ADC18)    |   A10           A19   |   19                INT3    SPI SCK
-RX (1)           TCC0/WO[3]  11    11 (ADC19)    |   A11           A18   |   18                INT2    SPI MOSI
-TX (2)    INT14  TC3/WO[0]   14                  |   A14           A17   |   17    TCC2/WO[1]  INT1    I2C/SCL
-RX (2)           TC3/WO[1]   15                  |   A15           A16   |   16    TCC2/WO[0]  INT0    I2C/SDA
-                                                 |   NC            NC    |
-                                                 |   NC            NC    |
-                                                 |   Vbus          3.3V  |
-USB D-                                           |   A24-  _____   Vcc   |
-USB D+                                           |   A25+ |     |  Vin   |
-                                                 |   Gnd  | USB |  Gnd   |
-                                                  -----------------------
-  Most pins have multiple configurations available (even analog pins). For example, pin A10 can be an analog input, a
-  PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the pin number printed on the board but
-  without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
+============================= MattairTech MT-D21E (ATsamd21eXXa) ========================
+Other   INT    PWM   Digital  Analog                      Digital  PWM     INT    Other
+=========================================================================================
+                                       -------------------
+Xin32                                 | A0            RST |                      Reset
+Xout32                                | A1            NC  |
+DAC                    2    2 (ADC0)  | A2            NC  |
+REF                    3    3 (ADC1)  | A3            A31 |  31  TCC1[1]  INT11  SWD IO *
+       INT4            4    4 (ADC4)  | A4            A30 |  30  TCC1[0]  INT10  SWD CLK
+       INT5            5    5 (ADC5)  | A5            NC  |
+                       6    6 (ADC6)  | A6            A28 |  28           INT8   LED
+VDIV                   7    7 (ADC7)  | A7            A27 |  27           INT15  Button A
+       INTNMI TCC0[0]  8    8 (ADC16) | A8            A23 |  23  TC4[1]   INT7   SPI SS
+       INT9   TCC0[1]  9    9 (ADC17) | A9            A22 |  22  TC4[0]   INT6   SPI MISO
+TX (1)        TCC0[2]  10   10 (ADC18)| A10           A19 |  19           INT3   SPI SCK
+RX (1)        TCC0[3]  11   11 (ADC19)| A11           A18 |  18           INT2   SPI MOSI
+TX (2) INT14  TC3[0]   14             | A14           A17 |  17  TCC2[1]  INT1   I2C/SCL
+RX (2)        TC3[1]   15             | A15           A16 |  16  TCC2[0]  INT0   I2C/SDA
+                                      | NC            NC  |
+                                      | NC            NC  |
+                                      | Vbus          3.3V|   * Button B available on 31
+USB D-                                | A24-  _____   Vcc |
+USB D+                                | A25+ |     |  Vin |
+                                      | Gnd  | USB |  Gnd |
+                                       -------------------
+Most pins have multiple configurations available (even analog pins). For example, pin
+10 can be an analog input, a PWM output, Digital I/O, or the TX pin of 'Serial1'. These
+always reference the pin number printed on the board but without the 'A' (with the
+usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
 */
 
 
+/*   The PinDescription table describes how each of the pins can be used by the Arduino
+ *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+ *   communications, etc.), and the PinDescription table configures which functions can
+ *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
+ *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
+ *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+ *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+ *   verify that the pin can perform the function requested, and to configure the pin for
+ *   that function. Most of the contents of pinMode() are now in pinPeripheral().
+ * 
+ *   Explanation of PinDescription table:
+ * 
+ *   Port                  This is the port (ie: PORTA).
+ *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
+ *   PinType               This indicates what peripheral function the pin can be
+ *                         attached to. In most cases, this is PIO_MULTI, which means
+ *                         that the pin can be anything listed in the PinAttribute field.
+ *                         It can also be set to a specific peripheral. In this case, any
+ *                         attempt to configure the pin (using pinPeripheral or pinMode)
+ *                         as anything else will fail (and pinPeripheral will return -1).
+ *                         This can be used to prevent accidental re-configuration of a
+ *                         pin that is configured for only one function (ie: USB D- and
+ *                         D+ pins). If a pin is not used or does not exist,
+ *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
+ *                         for valid entries. These entries are also used as a parameter
+ *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
+ *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
+ *                         the desired mode. Note that this field is not used to select
+ *                         between the two peripherals possible with each of the SERCOM
+ *                         and TIMER functions. PeripheralAttribute is now used for this.
+ *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
+ *                         configuration. It is primarily used to select between the two
+ *                         peripherals possible with each of the SERCOM and TIMER
+ *                         functions. TIMER pins are individual, while SERCOM uses a
+ *                         group of two to four pins. This group of pins can span both
+ *                         peripherals. For example, pin 19 (SPI1 SCK) uses
+ *                         PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
+ *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
+ *                         pin. This bitfield is also used to set the pin drive strength.
+ *                         In the future, other attributes (like input buffer
+ *                         configuration) may be added. See WVariant.h for valid entries.
+ *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
+ *                         peripheral functions that a pin can attach to. This includes
+ *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
+ *                         shorthand for a combination of other attributes.
+ *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
+ *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
+ *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+ *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
+ *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
+ *                         bitfield is useful for limiting a pin to only input related
+ *                         functions or output functions. This allows a pin to have a
+ *                         more flexible configuration, while restricting the direction
+ *                         (ie: to avoid contention). See WVariant.h for valid entries.
+ *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
+ *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
+ *                         available on pin A4 or pin A8). In general, only one pin
+ *                         should be configured (in the pinDescription table) per TC
+ *                         channel. See WVariant.h for valid entries. The tone library
+ *                         uses TC5.
+ *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
+ *                         WVariant.h for valid entries.
+ *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
+ *                         interrupt numbers are available on multiple pins (ie:
+ *                         EIC/EXTINT[2] is available on pin A2 or pin A18). In general,
+ *                         only one pin should be configured (in the pinDescription
+ *                         table) per interrupt number. Thus, if an interrupt was needed
+ *                         on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See 
+ *                         WVariant.h for valid entries.
+ */
+
+
 /*  Pins descriptions for the MattairTech MT-D21E
  * 
  * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (* is for default peripheral in use, ! means unavailable with this variant)
@@ -109,59 +182,6 @@ USB D+                                           |   A25+ |     |  Vin   |
  */
 
 
-/*   The PinDescription table describes how each of the pins can be used by the Arduino core. Each pin can have multiple
- *   functions (ie: ADC input, digital output, PWM, communications, etc.), and the PinDescription table configures
- *   which functions can be used for each pin. This table is mainly accessed by the pinPeripheral function in
- *   wiring_private.c, which is used to attach a pin to a particular peripheral function. The communications drivers
- *   (ie: SPI, I2C, and UART), analogRead(), analogWrite(), analogReference(), attachInterrupt(), and pinMode() all
- *   call pinPeripheral() to verify that the pin can perform the function requested, and to configure the pin for
- *   that function. Most of the contents of pinMode() are now in pinPeripheral().
- * 
- *   Explanation of PinDescription table:
- * 
- *   Port			This is the port (ie: PORTA).
- *   Pin			This is the pin (bit) within the port. Valid values are 0 through 31.
- *   PinType			This indicates what peripheral function the pin can be attached to. In most cases, this
- *                              is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute field.
- *                              It can also be set to a specific peripheral. In this case, any attempt to configure the
- *                              pin (using pinPeripheral or pinMode) as anything else will fail (and pinPeripheral will
- *                              return -1). This can be used to prevent accidental re-configuration of a pin that is
- *                              configured for only one function (ie: USB D- and D+ pins). If a pin is not used or does
- *                              not exist, PIO_NOT_A_PIN must be entered in this field. See WVariant.h for valid
- *                              entries. These entries are also used as a parameter to pinPeripheral() with the
- *                              exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function now calls pinPeripheral()
- *                              with the desired mode. Note that this field is not used to select between the two
- *                              peripherals possible with each of the SERCOM and TIMER functions. PeripheralAttribute
- *                              is now used for this.
- *   PeripheralAttribute	This is an 8-bit bitfield used for various peripheral configuration. It is primarily
- *                              used to select between the two peripherals possible with each of the SERCOM and TIMER
- *                              functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
- *                              This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) uses
- *                              PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD. Both TIMER and
- *                              SERCOM can exist for each pin. This bitfield is also used to set the pin drive strength.
- *                              In the future, other attributes (like input buffer configuration) may be added.
- *                              See WVariant.h for valid entries.
- *   PinAttribute		This is a 32-bit bitfield used to list all of the valid peripheral functions that a pin
- *                              can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain attributes
- *                              are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL includes all of
- *                              the GPIO functions, while PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
- *                              PIN_ATTR_TIMER_CAPTURE (capture is not used yet). PIN_ATTR_ANALOG is an alias to
- *                              PIN_ATTR_ANALOG_ADC. There is only one DAC channel, so PIN_ATTR_DAC appears only once.
- *                              This bitfield is useful for limiting a pin to only input related functions or output
- *                              functions. This allows a pin to have a more flexible configuration, while restricting
- *                              the direction (ie: to avoid contention). See WVariant.h for valid entries.
- *   TCChannel			This is the TC(C) channel (if any) assigned to the pin. Some TC channels are available
- *                              on multiple pins (ie: TCC0/WO[0] is available on pin A4 or pin A8). In general, only
- *                              one pin should be configured (in the pinDescription table) per TC channel.
- *                              See WVariant.h for valid entries. The tone library uses TC5.
- *   ADCChannelNumber		This is the ADC channel (if any) assigned to the pin. See WVariant.h for valid entries.
- *   ExtInt			This is the interrupt (if any) assigned to the pin. Some interrupt numbers are available
- *                              on multiple pins (ie: EIC/EXTINT[2] is available on pin A2 or pin A18). In general, only
- *                              one pin should be configured (in the pinDescription table) per interrupt number. Thus,
- *                              if an interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18.
- *                              See WVariant.h for valid entries.
- */
-
 #include "variant.h"
 
 /*

From 24abb334d210174cc7ee59502304c7dc2e5e28ba Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 10 Aug 2015 02:32:34 +0000
Subject: [PATCH 010/124] Added MT-D11 (ATSAMD11D14AM) support. Code size
 reduction. Other changes.

---
 README.md                                     | 299 +++++++++++++-----
 boards.txt                                    | 220 ++++++++++++-
 bootloaders/zero/main.h                       |  41 ++-
 bootloaders/zero/readme.txt                   |   2 +-
 bootloaders/zero/sam_ba_monitor.h             |   2 +-
 bootloaders/zero/samd11c14a_sam_ba.bin        | Bin 0 -> 4072 bytes
 bootloaders/zero/samd11d14am_sam_ba.bin       | Bin 0 -> 4080 bytes
 bootloaders/zero/samd11d14as_sam_ba.bin       | Bin 0 -> 4080 bytes
 bootloaders/zero/startup_samd11.c             |  18 --
 bootloaders/zero/startup_samd21.c             |  66 ----
 cores/arduino/Reset.cpp                       |  13 +-
 cores/arduino/SERCOM.cpp                      |  49 ++-
 cores/arduino/SERCOM.h                        |   2 +-
 cores/arduino/Tone.cpp                        |  14 +-
 cores/arduino/USB/HID.cpp                     |  12 +-
 cores/arduino/USB/USBDesc.h                   |  15 +-
 cores/arduino/USB/samd21_device.c             |   7 +-
 cores/arduino/USB/samd21_host.c               |   6 +-
 cores/arduino/Uart.cpp                        |  22 +-
 cores/arduino/WInterrupts.c                   |   4 +-
 cores/arduino/WString.cpp                     |   6 +-
 cores/arduino/WString.h                       |  16 +-
 cores/arduino/WVariant.h                      |  44 ++-
 cores/arduino/cortex_handlers.c               |  37 ++-
 cores/arduino/delay.c                         |   2 +-
 cores/arduino/main.cpp                        |   3 +
 cores/arduino/startup.c                       |  66 ++--
 cores/arduino/wiring.c                        |   6 +
 cores/arduino/wiring_analog.c                 |  36 ++-
 cores/arduino/wiring_digital.c                |  16 +-
 cores/arduino/wiring_private.c                |  87 ++---
 libraries/SPI/SPI.cpp                         |   8 +
 libraries/SPI/SPI.h                           |   8 +
 libraries/USBHost/library.properties          |   4 +-
 libraries/Wire/Wire.cpp                       |  15 +-
 libraries/Wire/Wire.h                         |   6 +-
 platform.txt                                  |  16 +-
 variants/MT_D11/debug_scripts/SAMD11C14A.gdb  |  31 ++
 variants/MT_D11/debug_scripts/SAMD11D14AM.gdb |  31 ++
 variants/MT_D11/debug_scripts/SAMD11D14AS.gdb |  31 ++
 .../gcc/SAMD11C14A_with_4KB_bootloader.ld     | 212 +++++++++++++
 .../gcc/SAMD11D14AM_with_4KB_bootloader.ld    | 212 +++++++++++++
 .../gcc/SAMD11D14AS_with_4KB_bootloader.ld    | 212 +++++++++++++
 .../MT_D11/openocd_scripts/SAMD11C14A.cfg     |  30 ++
 .../MT_D11/openocd_scripts/SAMD11D14AM.cfg    |  30 ++
 .../MT_D11/openocd_scripts/SAMD11D14AS.cfg    |  30 ++
 variants/MT_D11/pins_arduino.h                |  21 ++
 variants/MT_D11/variant.cpp                   | 279 ++++++++++++++++
 variants/MT_D11/variant.h                     | 280 ++++++++++++++++
 .../gcc/flash_128KB_with_16KB_bootloader.ld   |   1 +
 .../gcc/flash_128KB_with_8KB_bootloader.ld    |   1 +
 .../gcc/flash_128KB_without_bootloader.ld     |   1 +
 .../gcc/flash_256KB_with_16KB_bootloader.ld   |   1 +
 .../gcc/flash_256KB_with_8KB_bootloader.ld    |   1 +
 .../gcc/flash_256KB_without_bootloader.ld     |   1 +
 .../gcc/flash_32KB_with_16KB_bootloader.ld    |   1 +
 .../gcc/flash_32KB_with_8KB_bootloader.ld     |   1 +
 .../gcc/flash_32KB_without_bootloader.ld      |   1 +
 .../gcc/flash_64KB_with_16KB_bootloader.ld    |   1 +
 .../gcc/flash_64KB_with_8KB_bootloader.ld     |   1 +
 .../gcc/flash_64KB_without_bootloader.ld      |   1 +
 variants/MT_D21E/variant.cpp                  |  99 +++---
 variants/MT_D21E/variant.h                    |   4 +-
 .../gcc/flash_with_bootloader.ld              |   1 +
 .../gcc/flash_without_bootloader.ld           |   1 +
 variants/arduino_zero/variant.cpp             | 239 +++++++++-----
 variants/arduino_zero/variant.h               |  51 ++-
 67 files changed, 2492 insertions(+), 482 deletions(-)
 create mode 100755 bootloaders/zero/samd11c14a_sam_ba.bin
 create mode 100755 bootloaders/zero/samd11d14am_sam_ba.bin
 create mode 100755 bootloaders/zero/samd11d14as_sam_ba.bin
 create mode 100644 variants/MT_D11/debug_scripts/SAMD11C14A.gdb
 create mode 100644 variants/MT_D11/debug_scripts/SAMD11D14AM.gdb
 create mode 100644 variants/MT_D11/debug_scripts/SAMD11D14AS.gdb
 create mode 100644 variants/MT_D11/linker_scripts/gcc/SAMD11C14A_with_4KB_bootloader.ld
 create mode 100644 variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
 create mode 100644 variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld
 create mode 100644 variants/MT_D11/openocd_scripts/SAMD11C14A.cfg
 create mode 100644 variants/MT_D11/openocd_scripts/SAMD11D14AM.cfg
 create mode 100644 variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg
 create mode 100644 variants/MT_D11/pins_arduino.h
 create mode 100644 variants/MT_D11/variant.cpp
 create mode 100644 variants/MT_D11/variant.h

diff --git a/README.md b/README.md
index d739d7a2e..951924302 100644
--- a/README.md
+++ b/README.md
@@ -1,36 +1,56 @@
 # MattairTech Arduino SAMD Core
 
-This is a fork from arduino/ArduinoCore-samd on GitHub. This will be used to maintain Arduino support
-for SAMD boards including the MattairTech MT-D21E and the MT-D11 (see https://www.mattairtech.com/).
-It primarily adds support for new devices as well as a more flexible pin configuration / mapping system.
-This core is intended to be installed using the Boards Manager (see below).
+This is a fork from arduino/ArduinoCore-samd on GitHub. This will be used to maintain
+Arduino support for SAMD boards including the MattairTech MT-D21E and the MT-D11
+(see https://www.mattairtech.com/). It primarily adds support for new devices as well
+as a more flexible pin configuration / mapping system. It also adds some size
+optimizations, including the ability to select any combination of CDC, HID, or UART
+through the menu (~7.5KB for blink sketch with CDC+HID+UART, ~2.5KB without USB or UART).
+
+This core is intended to be installed using Boards Manager (see below). To update from a
+previous version, click on MattairTech SAMD Boards in Boards Manager, then click Update.
+
+
+## What's New
+
+* Added support for the MT-D11 (ATSAMD11D14AM).
+* Reduced code size (see 'Code Size and RAM Usage' below).
+* Any combination of CDC, HID, or UART can be used (or no combination), by using the Tools->Communication menu.
+* Note that switching between CDC and CDC+HID will require re-selecting the COM port.
+* More detailed memory usage at end of compilation (see below).
+* Merged in upstream updates. Fixed Wire interrupt.
+* Tested all ADC, DAC, external interrupts, PWM outputs, serial, SPI, and Wire instances/pins.
 
 
 ## Summary
-Feature                 |	Value
-------------------------|------------------------------------------------------------------------------
-Microcontroller		|	ATSAMD21ExxA, 32-Bit ARM Cortex M0+
-Clock Speed		|	48 MHz
-Flash Memory		|	256 KB (D21E18A) / 128 KB (D21E17A) / 64 KB (D21E16A) / 32 KB (D21E15A)
-SRAM			|	32 KB (D21E18A) / 16 KB (D21E17A) / 8 KB (D21E16A) / 4 KB (D21E15A)
-EEPROM			|	None (emulation may be available in the future)
-Digital Pins		|	22
-Analog Input Pins	|	10, 12-bit ADC channels
-Analog Output Pins	|	1, 10-bit DAC
-PWM Output Pins		|	12
-External Interrupts	|	15 (1 NMI)
-UART (Serial)		|	2
-SPI			|	1
-I2C (TWI)		|	1
-Operating Voltage	|	3.3V (Do not connect voltages higher than 3.3V!)
-DC Current per I/O Pin	|	7 mA
+
+Feature                 |	MT-D21E										|	MT-D11
+------------------------|---------------------------------------------------------------------------------------|------------------------------------------------------
+Microcontroller		|	ATSAMD21ExxA, 32-Bit ARM Cortex M0+						|	ATSAMD11D14AM, 32-Bit ARM Cortex M0+
+Clock Speed		|	48 MHz										|	48 MHz
+Flash Memory		|	256 KB (D21E18A) / 128 KB (D21E17A) / 64 KB (D21E16A) / 32 KB (D21E15A)		|	16 KB (4KB used by USB SAM-BA bootloader)
+SRAM			|	32 KB (D21E18A) / 16 KB (D21E17A) / 8 KB (D21E16A) / 4 KB (D21E15A)		|	4 KB
+EEPROM			|	None (emulation may be available in the future)					|	None (emulation may be available in the future)
+Digital Pins		|	22										|	17
+Analog Input Pins	|	10, 12-bit ADC channels								|	10, 12-bit ADC channels
+Analog Output Pins	|	1, 10-bit DAC									|	1, 10-bit DAC
+PWM Output Pins		|	12										|	8
+External Interrupts	|	15 (1 NMI)									|	9 (1 NMI)
+USB			|	Device and Host (CDC and HID)							|	Device and Host (CDC and HID)
+UART (Serial)		|	2										|	1
+SPI			|	1										|	1
+I2C (TWI)		|	1										|	1
+Operating Voltage	|	3.3V (Do not connect voltages higher than 3.3V!)				|	3.3V (Do not connect voltages higher than 3.3V!)
+DC Current per I/O Pin	|	7 mA										|	7 mA
 
 
 ## Pin Configurations
 
-Most pins have multiple configurations available (even analog pins). For example, pin A10 can be an analog input, a
-PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the pin number printed on the board but
-without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
+Most pins have multiple configurations available (even analog pins). For example, pin A10 on the MT-D21E can be an analog
+input, a PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the pin number printed on the board
+but without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
+
+### SAMD21 (MT-D21E)
 
 ```
 ============================= MattairTech MT-D21E (ATsamd21eXXa) ========================
@@ -60,47 +80,71 @@ USB D+                                | A25+ |     |  Vin |
                                        -------------------
 ```
 
+### SAMD11 (MT-D11)
+
+```
+============================= MattairTech MT-D11 (ATsamd11D14AM) ========================
+Other   INT    PWM   Digital  Analog                      Digital  PWM   INT    Other
+=========================================================================================
+                                       -------------------
+DAC                    2    2 (ADC0)  | A2   | USB |  Gnd |
+REF                    3    3 (ADC1)  | A3   |     |  Vcc |
+VDIV   INT4   TCC0[0]  4    4 (ADC2)  | A4    -----   A31 |  31  TC2[1]  INT3  RX / SWDIO
+       INT5   TCC0[1]  5    5 (ADC3)  | A5            A30 |  30  TC2[0]       TX / SWDCLK  
+              TCC0[2]  6    6 (ADC4)  | A6            A27 |  27          INT7
+              TCC0[3]  7    7 (ADC5)  | A7            A23 |  23                 I2C/SCL
+SPI MOSI  INT2         10   10 (ADC8) | A10           A22 |  22          INT6   I2C/SDA
+SPI SCK                11   11 (ADC9) | A11           A17 |  17  TC1[1]
+SPI MISO  INTNMI       14   14 (ADC6) | A14           A16 |  16  TC1[0]  INT0   LED
+Button    INT1         15   15 (ADC7) | A15           RST |                     Reset
+                                       -------------------
+```
+
 #### All pins operate at 3.3 volts. DO NOT connect voltages higher than 3.3V!
 
-* **Digital: All 22 pins can be used for general purpose I/O** 
-  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
-  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+### Pin Capabilities
+
+* **Digital: All pins can be used for general purpose I/O** 
+* Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+* Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+* Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+* Use the pinMode(), digitalWrite(), and digitalRead() functions.
 * **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-  * These are available on pins 2 through 11 using the analogRead() function.
-  * These pins can be used for GPIO and other digital functions (ie. pwm and serial) as well.
-  * Each pin provides 10 bits of resolution (1024 values) by default.
-  * 12-bit resolution supported by using the analogReadResolution() function.
-  * Each pin measures from ground to 3.3 volts.
-  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+* These are available using the analogRead() function.
+* All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+* Each pin provides 10 bits of resolution (1024 values) by default.
+* 12-bit resolution supported by using the analogReadResolution() function.
+* Each pin measures from ground to 3.3 volts.
+* The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
 * **DAC: One analog output is available on pin 2.**
-  * Provides a 10-bit voltage output with the analogWrite() function.
-* **PWM: 12 pins can be configured as PWM outputs.**
-  * Available on pins 8, 9, 10, 11, 14, 15, 16, 17, 22, 23, 30, and 31 using the analogWrite() function.
-  * Each pin provides 8 bits of resolution (256 values) by default.
-  * 12-bit resolution supported by using the analogWriteResolution() function.
-* **External Interrupts: 15 pins can be configured with external interrupts.**
-  * Available on all the pins except pins 2, 3, 6, 7, 10, 11, and 15 using the attachInterrupt() function.
-* **Serial: 2 pairs of pins can be configured for TTL serial I/O.**
-  * Serial1: pin 11 (RX) and pin 10 (TX).
-  * Serial2: pin 15 (RX) and pin 14 (TX).
-* **SPI: 3 or 4 pins can be configured for SPI I/O.**
-  * Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-  * SPI communication using the SPI library.
-* **TWI (I2C): 2 pins can be configured for TWI I/O.**
-  * Pin 16 (SDA) and pin 17 (SCL).
-  * TWI communication using the Wire library.
-* **LED: One pin can be configured to light the onboard LED.**
-  * Pin 28 (LED_BUILTIN). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* **Button: One pin can be configured to read the onboard Button A.**
-  * Pin 27 (BUTTON_BUILTIN). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+* Provides a 10-bit voltage output with the analogWrite() function.
+* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
+* Available using the analogWrite() function.
+* Each pin provides 8 bits of resolution (256 values) by default.
+* 12-bit resolution supported by using the analogWriteResolution() function.
+* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
+* Available using the attachInterrupt() function.
+* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
+* MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
+* MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
+* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
+* MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+* MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
+* SPI communication using the SPI library.
+* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
+* MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
+* MT-D11: Pin 22 (SDA) and pin 23 (SCL).
+* TWI communication using the Wire library.
+* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
+* Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
+* Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+* If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
 * **AREF: One pin can be configured as an AREF analog input.**
-  * The upper end of the analog measurement range can be changed using the analogReference() function.
+* The upper end of the analog measurement range can be changed using the analogReference() function.
 * **Reset: Bring this line LOW to reset the microcontroller.**
 
-#### MT-D21E Board Configuration
+### MT-D21E and MT-D11 Board Configuration
 
 * The 32.768KHz crystal is used by the Arduino core, so it MUST be connected via the solder jumpers.
 * Note that the sketch may still run without the crystal attached, but the clock speed will be very inaccurate.
@@ -108,13 +152,13 @@ USB D+                                | A25+ |     |  Vin |
 * The I2C (TWI) pullup resistors should be enabled via the solder jumpers.
 * The LED should be enabled via the solder jumper.
 * Button A should be connected via the solder jumper. The debouncing capacitor should also be connected.
-* Button B is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
+* Button B (MT-D21E only) is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
 * A reference voltage can be connected to AREF. In this case, the capacitors should be enabled via the solder jumper.
 
 
 ## Serial Monitor
 
-To print to the Serial Monitor over USB, use 'Serial'. Serial points to SerialUSB (Serial1 and Serial2 are UARTS).
+To print to the Serial Monitor over USB, use 'Serial'. Serial points to SerialUSB (Serial1 and Serial2 are UARTs).
 Unlike most Arduino boards (ie. Uno), SAMD boards do not automatically reset when the serial monitor is opened.
 To see what your sketch outputs to the serial monitor from the beginning, the sketch must wait for the SerialUSB
 port to open first. Add the following to setup():
@@ -130,6 +174,42 @@ the Reset button will reset the SAMD chip, which in turn will reset USB communic
 that if the serial monitor is open, it will be necessary to close and re-open it to restart communication.
 
 
+## Code Size and RAM Usage
+
+Sketch and Configuration    | MT-D21E (Code + RAM) | MT-D11 (Code + RAM)
+----------------------------|----------------------|-----------------------
+Blink (CDC + HID + UART)    |     7564 + 1524      |     7452 + 1424
+Blink (CDC + UART)          |     6588 + 1496      |     6484 + 1396
+Blink (CDC Only)            |     5248 + 1304      |     5192 + 1300
+Blink (UART Only)           |     3828 + 336       |     3716 + 236
+Blink (No USB or UART)      |     2472 + 144       |     2416 + 140
+Datalogger (No USB or UART) |     10340 + 948      |     10260 + 944
+
+* 180 bytes of flash can be saved on the MT-D11 by using PIN_MAP_COMPACT (see 'New PinDescription Table' below).
+* Datalogger compiled without USB or UART support, but with SPI and SD (with FAT filesystem) support. Serial output was disabled.
+* Note that USB CDC is required for auto-reset into the bootloader to work (otherwise, manually press reset twice in quick succession).
+* USB uses primarily 3 buffers totaling 1024 bytes. The UART uses a 96 byte buffer. The banzai() function (used for auto-reset) resides in RAM and uses 72 bytes.
+* Any combination of CDC, HID, or UART can be used (or no combination), by using the Tools->Communication menu.
+
+
+### Detailed Memory Usage Output After Compilation
+
+The flash used message at the end of compilation is not correct. The number shown
+represents the .text segment only. However, Flash usage = .text + .data segments
+(RAM usage = .data + .bss segments). In this release, two programs are run at the
+end of compilation to provide more detailed memory usage.
+
+Just above the normal flash usage message, is the output from the size utility.
+However, this output is also incorrect, as it shows .text+.data in the .text field,
+but 0 in the .data field. However, the .text field does show the total flash used.
+The .data field can be determined by subtracting the value from the normal flash
+usage message (.text) from the value in the .text field (.text+.data). The .bss
+field is correct.
+
+Above the size utility output is the output from the nm utility. The values on the
+left are in bytes. The letters stand for: T(t)=.text, D(d)=.data, B(b)=.bss, and
+everything else (ie: W) resides in flash (in most cases).
+
 
 ## Installation
 
@@ -163,13 +243,16 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 
 1. As of this writing, only the 256 KB chip variants work with the OS X version of the upload tool, bossac.
 2. First, you will need to open boards.txt and change mattairtech_mt_d21e_bl8k.upload.tool to equal arduino:bossac.
-3. No driver installation is needed. You may get a dialog box asking if you wish to open the “Network Preferences�:
+3. Open platform.txt and change tools.bossac.path to equal{runtime.tools.bossac-1.5-arduino.path}.
+4. No driver installation is needed. You may get a dialog box asking if you wish to open the “Network Preferences�:
    * Click the "Network Preferences..." button, then click "Apply".
    * The board will show up as “Not Configured�, but it will work fine.
-4. Continue with SAMD Core Installation below.
+5. Continue with SAMD Core Installation below.
 
 ### SAMD Core Installation
 
+* To update from a previous version, click on MattairTech SAMD Boards in Boards Manager, then click Update.
+
 1. The MattairTech SAMD Core requires Arduino 1.6.5+.
 2. In the Arduino IDE 1.6.5+, click File->Preferences.
 3. Click the button next to Additional Boards Manager URLs.
@@ -177,7 +260,7 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 5. Save preferences, then open the Boards Manager.
 6. Install the Arduino SAMD Boards package.
 7. Install the MattairTech SAMD Boards package.
-8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E.
+8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E (or MT-D11).
 9. Select the processor with the now visible Tools->Processor menu.
 10. If you do not already have the bootloader or blink sketch installed, see SAM-BA USB CDC Bootloader below.
 11. Plug in the board. The blink sketch should be running.
@@ -185,10 +268,9 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 13. You can now upload your own sketch.
 
 
-
 ## SAM-BA USB CDC Bootloader (Arduino Zero compatible)
 
-The SAM-BA bootloader has both a CDC USB interface, and a UART interface (TX: pin 10, RX: pin 11). It is
+The SAM-BA bootloader has both a CDC USB interface, and a UART interface (MT-D21E: TX: pin 10, RX: pin 11). It is
 compatible with the Arduino IDE (Zero compatible), or it can be used with the Bossac tool standalone. Under
 Arduino, auto-reset is supported (automatically runs the bootloader while the sketch is running) as well as
 automatic return freom reset. The SAM-BA bootloader described here adds to the Arduino version, which in
@@ -219,12 +301,13 @@ The bootloader can be started by:
 
 Otherwise, it jumps to application and starts execution from there. The LED will light during bootloader execution.
 Note that the 4KB bootloader does not support the Arduino Extended Capabilities or BOOT_DOUBLE_TAP.
+However, BOOT_DOUBLE_TAP does fit into the SAMD11 4KB bootloader.
 
 When the Arduino IDE initiates the bootloader, the following procedure is used:
 
 1. The IDE opens and closes the USB serial port at a baud rate of 1200bps. This triggers a “soft erase� procedure.
-2. The flash memory is erased by the MCU. If it is interrupted for any reason, the erase procedure will likely fail.
-3. The board is reset. The bootloader (which always runs first) detects a blank FLASH, so bootloader operation resumes.
+2. The first row of application section flash memory is erased by the MCU. If it is interrupted for any reason, the erase procedure will likely fail.
+3. The board is reset. The bootloader (which always runs first) detects the blank flah row, so bootloader operation resumes.
 4. Opening and closing the port at a baud rate other than 1200bps will not erase or reset the SAMD.
 
 ### Bootloader Firmware Installation
@@ -234,7 +317,7 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
 1. If you do not already have the MattairTech SAMD core installed, see SAMD Core Installation above.
 2. Plug an Atmel ICE into USB, then connect it to the powered SAMD board. A green LED should light on the Atmel ICE.
 3. Click Tools->Programmer->Atmel ICE.
-4. Click Tools->Board->MattairTech MT-D21E.
+4. Click Tools->Board->MattairTech MT-D21E (or MT-D11).
 5. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
 6. Continue with driver installation above.
 
@@ -245,7 +328,7 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
 3. Follow the procedures for your upload tool to upload the firmware.
    * Perform a chip erase first. Be sure no BOOTPROT bits are set.
    * Install the binary file to 0x00000000 of the FLASH.
-   * You can optionally set the BOOTPROT bits to 8KB. The Arduino installation method does not set these.
+   * You can optionally set the BOOTPROT bits to 8KB (or 4KB for the MT-D11). The Arduino installation method does not set these.
    * You can optionally set the EEPROM bits or anything else. The Arduino installation method uses factory defaults.
 4. Continue with driver installation above.
 
@@ -297,6 +380,14 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
  *   verify that the pin can perform the function requested, and to configure the pin for
  *   that function. Most of the contents of pinMode() are now in pinPeripheral().
  * 
+ *   There are two ways that pins can be mapped. The first is to map pins contiguously
+ *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
+ *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
+ *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
+ *   This only works when there is one port. Because not all port pins are available,
+ *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
+ *   For an example of both types, see variant.cpp from the MT-D11 variant.
+ * 
  *   Explanation of PinDescription table:
  * 
  *   Port                  This is the port (ie: PORTA).
@@ -322,8 +413,8 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
  *                         peripherals possible with each of the SERCOM and TIMER
  *                         functions. TIMER pins are individual, while SERCOM uses a
  *                         group of two to four pins. This group of pins can span both
- *                         peripherals. For example, pin 19 (SPI1 SCK) uses
- *                         PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
+ *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
+ *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
  *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
  *                         pin. This bitfield is also used to set the pin drive strength.
  *                         In the future, other attributes (like input buffer
@@ -343,18 +434,66 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
  *                         (ie: to avoid contention). See WVariant.h for valid entries.
  *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
  *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
- *                         available on pin A4 or pin A8). In general, only one pin
- *                         should be configured (in the pinDescription table) per TC
- *                         channel. See WVariant.h for valid entries. The tone library
- *                         uses TC5.
+ *                         available on pin A4 or pin A8 on the MT-D21E). In general,
+ *                         only one pin should be configured (in the pinDescription
+ *                         table) per TC channel. See WVariant.h for valid entries.
+ *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
  *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
  *                         WVariant.h for valid entries.
  *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
  *                         interrupt numbers are available on multiple pins (ie:
- *                         EIC/EXTINT[2] is available on pin A2 or pin A18). In general,
- *                         only one pin should be configured (in the pinDescription
- *                         table) per interrupt number. Thus, if an interrupt was needed
- *                         on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See 
- *                         WVariant.h for valid entries.
+ *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
+ *                         MT-D21E). In general, only one pin should be configured (in
+ *                         the pinDescription table) per interrupt number. Thus, if an
+ *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
+ *                         from pin 18. See WVariant.h for valid entries.
  */
 ```
+
+
+## Possible Future Additions
+
+* Port Servo library
+* Replace pulse with timer capture
+* MIDI USB Device Class
+* MSC (Mass Storage) USB Device Class
+* More detailed memory usage statistics
+* Some kind of stack overflow detection. Estimation on stack usage.
+* Analog calibration
+* Polyphonic tone
+* Better OS X support
+* Drivers for some hardware I plan on using (TFT LCD, motor controller, IR decoder, several I2C (Wire) sensor devices, I2S device, etc.)
+
+
+## ChangeLog
+
+* 1.6.5-mt2:
+  * See 'What's New' above.
+
+* 1.6.5-mt1:
+  * Initial release
+
+
+## License and credits
+
+This core has been developed by Arduino LLC in collaboration with Atmel.
+This fork developed by Justin Mattair of MattairTech LLC.
+
+```
+Copyright (c) 2015 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
+```
+
diff --git a/boards.txt b/boards.txt
index baf3dd41c..1362c6f08 100644
--- a/boards.txt
+++ b/boards.txt
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 menu.cpu=Processor
+menu.com=Communications
 
 # MattairTech MT-D21E (default 8KB bootloader)
 mattairtech_mt_d21e_bl8k.name=MattairTech MT-D21E (SAM-BA bootloader)
@@ -52,12 +53,35 @@ mattairtech_mt_d21e_bl8k.build.mcu=cortex-m0plus
 mattairtech_mt_d21e_bl8k.build.f_cpu=48000000L
 mattairtech_mt_d21e_bl8k.build.usb_product="MT-D21E"
 mattairtech_mt_d21e_bl8k.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d21e_bl8k.build.board=MT_D21E
+mattairtech_mt_d21e_bl8k.build.board=CDC_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart=CDC_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.menu.com.cdc_uart=CDC_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.board=CDC_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.pid=0x0557
+mattairtech_mt_d21e_bl8k.menu.com.hid_uart=HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.hid_uart.build.board=HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.hid_uart.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid=CDC_HID
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.board=CDC_HID
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.menu.com.cdc=CDC_ONLY
+mattairtech_mt_d21e_bl8k.menu.com.cdc.build.board=CDC_ONLY
+mattairtech_mt_d21e_bl8k.menu.com.cdc.build.pid=0x0557
+mattairtech_mt_d21e_bl8k.menu.com.hid=HID_ONLY
+mattairtech_mt_d21e_bl8k.menu.com.hid.build.board=HID_ONLY
+mattairtech_mt_d21e_bl8k.menu.com.hid.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.menu.com.uart=UART_ONLY
+mattairtech_mt_d21e_bl8k.menu.com.uart.build.board=UART_ONLY
+mattairtech_mt_d21e_bl8k.menu.com.uart.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.menu.com.none=USB_UART_DISABLED
+mattairtech_mt_d21e_bl8k.menu.com.none.build.board=USB_UART_DISABLED
+mattairtech_mt_d21e_bl8k.menu.com.none.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.build.core=arduino
 mattairtech_mt_d21e_bl8k.build.variant=MT_D21E
 mattairtech_mt_d21e_bl8k.build.variant_system_lib=
 mattairtech_mt_d21e_bl8k.build.vid=0x16D0
-mattairtech_mt_d21e_bl8k.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.bootloader.tool=arduino:openocd
 mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.bootloader.file=zero/samd21e18a_sam_ba.bin
 mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.bootloader.file=zero/samd21e17a_sam_ba.bin
@@ -91,7 +115,31 @@ mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam
 #mattairtech_mt_d21e_bl16k.build.f_cpu=48000000L
 #mattairtech_mt_d21e_bl16k.build.usb_product="MT-D21E"
 #mattairtech_mt_d21e_bl16k.build.usb_manufacturer="MattairTech"
-#mattairtech_mt_d21e_bl16k.build.board=MT_D21E
+#mattairtech_mt_d21e_bl16k.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart=CDC_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_uart=CDC_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.board=CDC_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.pid=0x0557
+#mattairtech_mt_d21e_bl16k.menu.com.hid_uart=HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.hid_uart.build.board=HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.hid_uart.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid=CDC_HID
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.board=CDC_HID
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.menu.com.cdc=CDC_ONLY
+#mattairtech_mt_d21e_bl16k.menu.com.cdc.build.board=CDC_ONLY
+#mattairtech_mt_d21e_bl16k.menu.com.cdc.build.pid=0x0557
+#mattairtech_mt_d21e_bl16k.menu.com.hid=HID_ONLY
+#mattairtech_mt_d21e_bl16k.menu.com.hid.build.board=HID_ONLY
+#mattairtech_mt_d21e_bl16k.menu.com.hid.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.menu.com.uart=UART_ONLY
+#mattairtech_mt_d21e_bl16k.menu.com.uart.build.board=UART_ONLY
+#mattairtech_mt_d21e_bl16k.menu.com.uart.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.menu.com.none=USB_UART_DISABLED
+#mattairtech_mt_d21e_bl16k.menu.com.none.build.board=USB_UART_DISABLED
+#mattairtech_mt_d21e_bl16k.menu.com.none.build.pid=0x0856
 #mattairtech_mt_d21e_bl16k.build.core=arduino
 #mattairtech_mt_d21e_bl16k.build.variant=MT_D21E
 #mattairtech_mt_d21e_bl16k.build.variant_system_lib=
@@ -130,9 +178,173 @@ mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam
 #mattairtech_mt_d21e_bl0k.build.f_cpu=48000000L
 #mattairtech_mt_d21e_bl0k.build.usb_product="MT-D21E"
 #mattairtech_mt_d21e_bl0k.build.usb_manufacturer="MattairTech"
-#mattairtech_mt_d21e_bl0k.build.board=MT_D21E
+#mattairtech_mt_d21e_bl0k.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_uart=CDC_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.board=CDC_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.pid=0x0557
+#mattairtech_mt_d21e_bl0k.menu.com.hid_uart=HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.hid_uart.build.board=HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.hid_uart.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid=CDC_HID
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.board=CDC_HID
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.menu.com.cdc=CDC_ONLY
+#mattairtech_mt_d21e_bl0k.menu.com.cdc.build.board=CDC_ONLY
+#mattairtech_mt_d21e_bl0k.menu.com.cdc.build.pid=0x0557
+#mattairtech_mt_d21e_bl0k.menu.com.hid=HID_ONLY
+#mattairtech_mt_d21e_bl0k.menu.com.hid.build.board=HID_ONLY
+#mattairtech_mt_d21e_bl0k.menu.com.hid.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.menu.com.uart=UART_ONLY
+#mattairtech_mt_d21e_bl0k.menu.com.uart.build.board=UART_ONLY
+#mattairtech_mt_d21e_bl0k.menu.com.uart.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.menu.com.none=USB_UART_DISABLED
+#mattairtech_mt_d21e_bl0k.menu.com.none.build.board=USB_UART_DISABLED
+#mattairtech_mt_d21e_bl0k.menu.com.none.build.pid=0x0856
 #mattairtech_mt_d21e_bl0k.build.core=arduino
 #mattairtech_mt_d21e_bl0k.build.variant=MT_D21E
 #mattairtech_mt_d21e_bl0k.build.variant_system_lib=
 #mattairtech_mt_d21e_bl0k.build.vid=0x16D0
 #mattairtech_mt_d21e_bl0k.build.pid=0x0856
+
+
+
+# MattairTech MT-D11 (4KB bootloader)
+mattairtech_mt_d11.name=MattairTech MT-D11 (SAM-BA bootloader)
+mattairtech_mt_d11.vid.0=0x16D0
+mattairtech_mt_d11.pid.0=0x0557
+mattairtech_mt_d11.vid.1=0x16D0
+mattairtech_mt_d11.pid.1=0x0856
+mattairtech_mt_d11.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d11.upload.protocol=sam-ba
+mattairtech_mt_d11.upload.use_1200bps_touch=true
+mattairtech_mt_d11.upload.wait_for_upload_port=true
+mattairtech_mt_d11.upload.native_usb=true
+mattairtech_mt_d11.upload.maximum_size=12288
+mattairtech_mt_d11.build.extra_flags=-D__SAMD11D14AM__ -D__4KB_BOOTLOADER__ {build.usb_flags}
+mattairtech_mt_d11.build.ldscript=linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
+mattairtech_mt_d11.build.openocdscript=openocd_scripts/SAMD11D14AM.cfg
+mattairtech_mt_d11.build.mcu=cortex-m0plus
+mattairtech_mt_d11.build.f_cpu=48000000L
+mattairtech_mt_d11.build.usb_product="MT-D11"
+mattairtech_mt_d11.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d11.build.board=CDC_HID_UART
+mattairtech_mt_d11.menu.com.cdc_hid_uart=CDC_HID_UART
+mattairtech_mt_d11.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+mattairtech_mt_d11.menu.com.cdc_hid_uart.build.pid=0x0856
+mattairtech_mt_d11.menu.com.cdc_uart=CDC_UART
+mattairtech_mt_d11.menu.com.cdc_uart.build.board=CDC_UART
+mattairtech_mt_d11.menu.com.cdc_uart.build.pid=0x0557
+mattairtech_mt_d11.menu.com.hid_uart=HID_UART
+mattairtech_mt_d11.menu.com.hid_uart.build.board=HID_UART
+mattairtech_mt_d11.menu.com.hid_uart.build.pid=0x0856
+mattairtech_mt_d11.menu.com.cdc_hid=CDC_HID
+mattairtech_mt_d11.menu.com.cdc_hid.build.board=CDC_HID
+mattairtech_mt_d11.menu.com.cdc_hid.build.pid=0x0856
+mattairtech_mt_d11.menu.com.cdc=CDC_ONLY
+mattairtech_mt_d11.menu.com.cdc.build.board=CDC_ONLY
+mattairtech_mt_d11.menu.com.cdc.build.pid=0x0557
+mattairtech_mt_d11.menu.com.hid=HID_ONLY
+mattairtech_mt_d11.menu.com.hid.build.board=HID_ONLY
+mattairtech_mt_d11.menu.com.hid.build.pid=0x0856
+mattairtech_mt_d11.menu.com.uart=UART_ONLY
+mattairtech_mt_d11.menu.com.uart.build.board=UART_ONLY
+mattairtech_mt_d11.menu.com.uart.build.pid=0x0856
+mattairtech_mt_d11.menu.com.none=USB_UART_DISABLED
+mattairtech_mt_d11.menu.com.none.build.board=USB_UART_DISABLED
+mattairtech_mt_d11.menu.com.none.build.pid=0x0856
+mattairtech_mt_d11.build.core=arduino
+mattairtech_mt_d11.build.variant=MT_D11
+mattairtech_mt_d11.build.variant_system_lib=
+mattairtech_mt_d11.build.vid=0x16D0
+mattairtech_mt_d11.build.pid=0x0856
+mattairtech_mt_d11.bootloader.tool=arduino:openocd
+mattairtech_mt_d11.bootloader.file=zero/samd11d14am_sam_ba.bin
+
+
+
+# MattairTech Core for Arduino Zero (8KB bootloader, Native USB Port)
+arduino_zero_native.name=Arduino Zero (Native USB Port)
+arduino_zero_native.vid.0=0x2341
+arduino_zero_native.pid.0=0x804d
+arduino_zero_native.vid.1=0x2341
+arduino_zero_native.pid.1=0x004d
+arduino_zero_native.upload.tool=MattairTech_Arduino:bossac
+arduino_zero_native.upload.protocol=sam-ba
+arduino_zero_native.upload.maximum_size=262144
+arduino_zero_native.upload.use_1200bps_touch=true
+arduino_zero_native.upload.wait_for_upload_port=true
+arduino_zero_native.upload.native_usb=true
+arduino_zero_native.build.mcu=cortex-m0plus
+arduino_zero_native.build.f_cpu=48000000L
+arduino_zero_native.build.usb_product="Arduino Zero"
+arduino_zero_native.build.usb_manufacturer="Arduino LLC"
+arduino_zero_native.build.board=SAMD_ZERO
+arduino_zero_native.menu.com.cdc_hid_uart=CDC_HID_UART
+arduino_zero_native.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+arduino_zero_native.menu.com.cdc_uart=CDC_UART
+arduino_zero_native.menu.com.cdc_uart.build.board=CDC_UART
+arduino_zero_native.menu.com.hid_uart=HID_UART
+arduino_zero_native.menu.com.hid_uart.build.board=HID_UART
+arduino_zero_native.menu.com.cdc_hid=CDC_HID
+arduino_zero_native.menu.com.cdc_hid.build.board=CDC_HID
+arduino_zero_native.menu.com.cdc=CDC_ONLY
+arduino_zero_native.menu.com.cdc.build.board=CDC_ONLY
+arduino_zero_native.menu.com.hid=HID_ONLY
+arduino_zero_native.menu.com.hid.build.board=HID_ONLY
+arduino_zero_native.menu.com.uart=UART_ONLY
+arduino_zero_native.menu.com.uart.build.board=UART_ONLY
+arduino_zero_native.menu.com.none=USB_UART_DISABLED
+arduino_zero_native.menu.com.none.build.board=USB_UART_DISABLED
+arduino_zero_native.build.core=arduino
+arduino_zero_native.build.extra_flags=-D__SAMD21G18A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
+arduino_zero_native.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+arduino_zero_native.build.openocdscript=openocd_scripts/arduino_zero.cfg
+arduino_zero_native.build.variant=arduino_zero
+arduino_zero_native.build.variant_system_lib=
+arduino_zero_native.build.vid=0x2341
+arduino_zero_native.build.pid=0x804d
+
+# MattairTech Core for Arduino Zero (8KB bootloader, Programming Port)
+#arduino_zero_edbg.name=Arduino Zero (Programming Port)
+#arduino_zero_edbg.vid.0=0x03eb
+#arduino_zero_edbg.pid.0=0x2157
+#arduino_zero_edbg.upload.tool=arduino:openocd
+#arduino_zero_edbg.upload.protocol=sam-ba
+#arduino_zero_edbg.upload.maximum_size=262144
+#arduino_zero_edbg.upload.use_1200bps_touch=false
+#arduino_zero_edbg.upload.wait_for_upload_port=false
+#arduino_zero_edbg.upload.native_usb=false
+#arduino_zero_edbg.build.mcu=cortex-m0plus
+#arduino_zero_edbg.build.f_cpu=48000000L
+#arduino_zero_edbg.build.usb_product="Arduino Zero"
+#arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
+#arduino_zero_edbg.build.board=SAMD_ZERO
+#arduino_zero_edbg.menu.com.cdc_hid_uart=CDC_HID_UART
+#arduino_zero_edbg.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+#arduino_zero_edbg.menu.com.cdc_uart=CDC_UART
+#arduino_zero_edbg.menu.com.cdc_uart.build.board=CDC_UART
+#arduino_zero_edbg.menu.com.hid_uart=HID_UART
+#arduino_zero_edbg.menu.com.hid_uart.build.board=HID_UART
+#arduino_zero_edbg.menu.com.cdc_hid=CDC_HID
+#arduino_zero_edbg.menu.com.cdc_hid.build.board=CDC_HID
+#arduino_zero_edbg.menu.com.cdc=CDC_ONLY
+#arduino_zero_edbg.menu.com.cdc.build.board=CDC_ONLY
+#arduino_zero_edbg.menu.com.hid=HID_ONLY
+#arduino_zero_edbg.menu.com.hid.build.board=HID_ONLY
+#arduino_zero_edbg.menu.com.uart=UART_ONLY
+#arduino_zero_edbg.menu.com.uart.build.board=UART_ONLY
+#arduino_zero_edbg.menu.com.none=USB_UART_DISABLED
+#arduino_zero_edbg.menu.com.none.build.board=USB_UART_DISABLED
+#arduino_zero_edbg.build.core=arduino
+#arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
+#arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+#arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
+#arduino_zero_edbg.build.variant=arduino_zero
+#arduino_zero_edbg.build.variant_system_lib=
+#arduino_zero_edbg.build.vid=0x2341
+#arduino_zero_edbg.build.pid=0x804d
+#arduino_zero_edbg.bootloader.tool=arduino:openocd
+#arduino_zero_edbg.bootloader.file=zero/samd21g18a_sam_ba.bin
diff --git a/bootloaders/zero/main.h b/bootloaders/zero/main.h
index 66871ee9e..33170b58e 100644
--- a/bootloaders/zero/main.h
+++ b/bootloaders/zero/main.h
@@ -29,10 +29,28 @@
 
 #pragma once
 
+
+/*
+ * Starting address for the application section.
+ * For example, with an 8KB bootloader, APP_START_ADDRESS = 0x00002000.
+ * SAMD11 devices should probably use a 4KB bootloader.
+ */
+#define APP_START_ADDRESS                 0x00002000
+//#define APP_START_ADDRESS                 0x00001000
+
+/*
+ * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
+ * pin is tied LOW.
+ */
+#define BOOT_LOAD_PIN                     PIN_PA27
+//#define BOOT_LOAD_PIN                     PIN_PA15
+#define BOOT_PIN_MASK                     (1U << (BOOT_LOAD_PIN & 0x1f))
+
 /*
  * If LED_PIN is defined, it will turn on during bootloader operation.
  */
-#define	LED_PIN                           PIN_PA28 // Pin 28
+#define	LED_PIN                           PIN_PA28
+//#define	LED_PIN                           PIN_PA16
 #define LED_PIN_MASK                      (1U << (LED_PIN & 0x1f))
 
 /*
@@ -53,28 +71,25 @@
 	#define BOOT_DOUBLE_TAP_ADDRESS           0x20000FFC
 #elif defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
 	#define BOOT_DOUBLE_TAP_ADDRESS           0x20000FFC
+#else
+	#error "main.h: Unsupported MCU"
 #endif
 
 #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.
+ * If bootloader UART support is compiled in (see sam_ba_monitor.h), configure it here.
  */
-#define BOOT_LOAD_PIN                     PIN_PA27 // Pin 27
-#define BOOT_PIN_MASK                     (1U << (BOOT_LOAD_PIN & 0x1f))
-
-#define CPU_FREQUENCY                     8000000
-#define APP_START_ADDRESS                 0x00002000
-#define FLASH_WAIT_STATES                 1
-
 #define BOOT_USART_MODULE                 SERCOM0
-//#define BOOT_USART_MODULE                 SERCOM5
 #define BOOT_USART_MUX_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_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
 #define BOOT_USART_PAD2                   PINMUX_PA10C_SERCOM0_PAD2
+//#define BOOT_USART_PAD3                   PINMUX_UNUSED
+//#define BOOT_USART_PAD2                   PINMUX_UNUSED
 #define BOOT_USART_PAD1                   PINMUX_UNUSED
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
+
+#define CPU_FREQUENCY                     8000000
+#define FLASH_WAIT_STATES                 1
+
diff --git a/bootloaders/zero/readme.txt b/bootloaders/zero/readme.txt
index 1c711a7ce..4f9f94912 100644
--- a/bootloaders/zero/readme.txt
+++ b/bootloaders/zero/readme.txt
@@ -19,7 +19,7 @@ All of these options will build an 8KB bootloader.
 If you want to build a 4KB bootloader, you will need to:
    * Choose only one interface from above
    * Disable ARDUINO_EXTENDED_CAPABILITIES (sam_ba_monitor.h)
-   * Disable BOOT_DOUBLE_TAP (main.h)
+   * Disable BOOT_DOUBLE_TAP (main.h) for SAMD21 only (there is enough room on the SAMD11)
 
 3- Makefile configuration
 
diff --git a/bootloaders/zero/sam_ba_monitor.h b/bootloaders/zero/sam_ba_monitor.h
index e1b5e2f53..101c20cff 100644
--- a/bootloaders/zero/sam_ba_monitor.h
+++ b/bootloaders/zero/sam_ba_monitor.h
@@ -41,7 +41,7 @@
 #define SAM_BA_INTERFACE    SAM_BA_BOTH_INTERFACES
 #endif
 
-/* disable for 4KB bootloaders */
+/* comment out for 4KB bootloaders */
 #define ARDUINO_EXTENDED_CAPABILITIES		1
 
 /* Selects USART as the communication interface of the monitor */
diff --git a/bootloaders/zero/samd11c14a_sam_ba.bin b/bootloaders/zero/samd11c14a_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..7318079abf1fecffd39d8be2469e4f6caf2c120f
GIT binary patch
literal 4072
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/samd11d14am_sam_ba.bin b/bootloaders/zero/samd11d14am_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..965cf77d00733b1d03b86b55dabc351a23ca6458
GIT binary patch
literal 4080
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
DZwJ1X

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/samd11d14as_sam_ba.bin b/bootloaders/zero/samd11d14as_sam_ba.bin
new file mode 100755
index 0000000000000000000000000000000000000000..2d42c92efd122efd532694b7b88553c5cc770480
GIT binary patch
literal 4080
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/startup_samd11.c b/bootloaders/zero/startup_samd11.c
index 2308ceb2b..d8f57bcd2 100644
--- a/bootloaders/zero/startup_samd11.c
+++ b/bootloaders/zero/startup_samd11.c
@@ -78,23 +78,17 @@ void RTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler
 void EIC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void NVMCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void DMAC_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#ifdef USB_IRQn
 void USB_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
 void EVSYS_Handler           ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM0_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM1_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#ifdef SERCOM2_IRQn
 void SERCOM2_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
 void TCC0_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC1_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC2_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void ADC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void AC_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#ifdef DAC_IRQn
 void DAC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
 void PTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 
 /* Exception Table */
@@ -128,29 +122,17 @@ const DeviceVectors exception_table = {
         (void*) EIC_Handler,            /*  4 External Interrupt Controller */
         (void*) NVMCTRL_Handler,        /*  5 Non-Volatile Memory Controller */
         (void*) DMAC_Handler,           /*  6 Direct Memory Access Controller */
-#ifdef USB_IRQn
         (void*) USB_Handler,            /*  7 Universal Serial Bus */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
         (void*) EVSYS_Handler,          /*  8 Event System Interface */
         (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
         (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
-#ifdef SERCOM2_IRQn
         (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
         (void*) TCC0_Handler,           /* 12 Timer Counter Control */
         (void*) TC1_Handler,            /* 13 Basic Timer Counter 0 */
         (void*) TC2_Handler,            /* 14 Basic Timer Counter 1 */
         (void*) ADC_Handler,            /* 15 Analog Digital Converter */
         (void*) AC_Handler,             /* 16 Analog Comparators */
-#ifdef DAC_IRQn
         (void*) DAC_Handler,            /* 17 Digital Analog Converter */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
         (void*) PTC_Handler             /* 18 Peripheral Touch Controller */
 };
 
diff --git a/bootloaders/zero/startup_samd21.c b/bootloaders/zero/startup_samd21.c
index 6e04bee45..92465844c 100644
--- a/bootloaders/zero/startup_samd21.c
+++ b/bootloaders/zero/startup_samd21.c
@@ -78,50 +78,28 @@ void RTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler
 void EIC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void NVMCTRL_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void DMAC_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#ifdef USB_IRQn
 void USB_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
 void EVSYS_Handler           ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM0_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM1_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM2_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM3_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#ifdef SERCOM4_IRQn
 void SERCOM4_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef SERCOM5_IRQn
 void SERCOM5_Handler         ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
 void TCC0_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC1_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC2_Handler            ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC3_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC4_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC5_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#ifdef TC6_IRQn
 void TC6_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef TC7_IRQn
 void TC7_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef ADC_IRQn
 void ADC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef AC_IRQn
 void AC_Handler              ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef DAC_IRQn
 void DAC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef PTC_IRQn
 void PTC_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef I2S_IRQn
 void I2S_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
-#ifdef AC1_IRQn
 void AC1_Handler             ( void ) __attribute__ ((weak, alias("Dummy_Handler")));
-#endif
 
 /* Exception Table */
 __attribute__ ((section(".vectors")))
@@ -154,72 +132,28 @@ const DeviceVectors exception_table = {
         (void*) EIC_Handler,            /*  4 External Interrupt Controller */
         (void*) NVMCTRL_Handler,        /*  5 Non-Volatile Memory Controller */
         (void*) DMAC_Handler,           /*  6 Direct Memory Access Controller */
-#ifdef USB_IRQn
         (void*) USB_Handler,            /*  7 Universal Serial Bus */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
         (void*) EVSYS_Handler,          /*  8 Event System Interface */
         (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
         (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
         (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
         (void*) SERCOM3_Handler,        /* 12 Serial Communication Interface 3 */
-#ifdef SERCOM4_IRQn
         (void*) SERCOM4_Handler,        /* 13 Serial Communication Interface 4 */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef SERCOM5_IRQn
         (void*) SERCOM5_Handler,        /* 14 Serial Communication Interface 5 */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
         (void*) TCC0_Handler,           /* 15 Timer Counter Control 0 */
         (void*) TCC1_Handler,           /* 16 Timer Counter Control 1 */
         (void*) TCC2_Handler,           /* 17 Timer Counter Control 2 */
         (void*) TC3_Handler,            /* 18 Basic Timer Counter 0 */
         (void*) TC4_Handler,            /* 19 Basic Timer Counter 1 */
         (void*) TC5_Handler,            /* 20 Basic Timer Counter 2 */
-#ifdef TC6_IRQn
         (void*) TC6_Handler,            /* 21 Basic Timer Counter 3 */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef TC7_IRQn
         (void*) TC7_Handler,            /* 22 Basic Timer Counter 4 */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef ADC_IRQn
         (void*) ADC_Handler,            /* 23 Analog Digital Converter */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef AC_IRQn
         (void*) AC_Handler,             /* 24 Analog Comparators 0 */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef DAC_IRQn
         (void*) DAC_Handler,            /* 25 Digital Analog Converter */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef PTC_IRQn
         (void*) PTC_Handler,            /* 26 Peripheral Touch Controller */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef I2S_IRQn
         (void*) I2S_Handler,            /* 27 Inter-IC Sound Interface */
-#else
-        (void*) (0UL), /* Reserved */
-#endif
-#ifdef AC1_IRQn
         (void*) AC1_Handler             /* 28 Analog Comparators 1 */
-#else
-        (void*) (0UL)  /* Reserved */
-#endif
 };
 
 /**
diff --git a/cores/arduino/Reset.cpp b/cores/arduino/Reset.cpp
index 1ea9f9716..42ebb1d1e 100644
--- a/cores/arduino/Reset.cpp
+++ b/cores/arduino/Reset.cpp
@@ -25,17 +25,16 @@ extern "C" {
 
 #define NVM_MEMORY ((volatile uint16_t *)0x000000)
 
-#if defined(__NO_BOOTLODAER__)
+#if defined(__NO_BOOTLOADER__)
 	#define APP_START 0x00000004
-#elif defined(__4KB_BOOTLODAER__)
+#elif defined(__4KB_BOOTLOADER__)
 	#define APP_START 0x00001004
-#elif defined(__8KB_BOOTLODAER__)
+#elif defined(__8KB_BOOTLOADER__)
 	#define APP_START 0x00002004
-#elif defined(__16KB_BOOTLODAER__)
+#elif defined(__16KB_BOOTLOADER__)
 	#define APP_START 0x00004004
 #else
-	// default of 8KB
-	#define APP_START 0x00002004
+	#error "Reset.cpp: You must define bootloader size in boards.txt build.extra_flags (ie: -D__8KB_BOOTLOADER__)"
 #endif
 
 static inline bool nvmReady(void) {
@@ -43,7 +42,7 @@ static inline bool nvmReady(void) {
 }
 
 __attribute__ ((long_call, section (".ramfunc")))
-static void banzai() {
+void banzai() {
 	// Disable all interrupts
 	__disable_irq();
 
diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index 442370754..77822e3ea 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -24,6 +24,29 @@ SERCOM::SERCOM(Sercom* s)
   sercom = s;
 }
 
+// From https://en.wikipedia.org/wiki/Division_algorithm
+static uint64_t divide64(uint64_t n, uint64_t d)
+{
+  uint64_t q = 0, r = 0;
+
+  for (int8_t i = 63; i >= 0; i--) {
+    r = r << 1;
+
+    // set the LSB of r equal to bit i of n
+    // because r was just shifted right by one, we don't need to explicitly set r to 0 if bit i of n is 0.
+    if (n & ((uint64_t)1 << i)) {
+      r |= 0x01;
+    }
+
+    if (r >= d) {
+      r = r - d;
+      q |= ((uint64_t)1 << i);
+    }
+  }
+
+  return q;
+}
+
 /* 	=========================
  *	===== Sercom UART
  *	=========================
@@ -64,7 +87,13 @@ void SERCOM::initUART(SercomUartMode mode, SercomUartSampleRate sampleRate, uint
     // Asynchronous arithmetic mode
     // 65535 * ( 1 - sampleRateValue * baudrate / SystemCoreClock);
     // 65535 - 65535 * (sampleRateValue * baudrate / SystemCoreClock));
-    sercom->USART.BAUD.reg = 65535.0f * ( 1.0f - (float)(sampleRateValue) * (float)(baudrate) / (float)(SystemCoreClock));
+    // sercom->USART.BAUD.reg = 65535.0f * ( 1.0f - (float)(sampleRateValue) * (float)(baudrate) / (float)(SystemCoreClock));  // this pulls in 3KB of floating point math code
+    // make numerator much larger than denominator so result is integer (avoid floating point).
+    uint64_t numerator = ((sampleRateValue * (uint64_t)baudrate) << 32); // 32 bits of shifting ensures no loss of precision.
+    uint64_t ratio = divide64(numerator, SystemCoreClock);
+    uint64_t scale = ((uint64_t)1 << 32) - ratio;
+    uint64_t baudValue = (65536 * scale) >> 32;
+    sercom->USART.BAUD.reg = baudValue;
   }
 }
 void SERCOM::initFrame(SercomUartCharSize charSize, SercomDataOrder dataOrder, SercomParityMode parityMode, SercomNumberStopBit nbStopBits)
@@ -129,12 +158,12 @@ bool SERCOM::availableDataUART()
 
 bool SERCOM::isUARTError()
 {
-	return sercom->USART.INTFLAG.bit.ERROR;
+  return sercom->USART.INTFLAG.bit.ERROR;
 }
 
 void SERCOM::acknowledgeUARTError()
 {
-	sercom->USART.INTFLAG.bit.ERROR = 1;
+  sercom->USART.INTFLAG.bit.ERROR = 1;
 }
 
 bool SERCOM::isBufferOverflowErrorUART()
@@ -271,7 +300,7 @@ void SERCOM::setBaudrateSPI(uint8_t divider)
   //Register enable-protected
   disableSPI();
 
-  sercom->SPI.BAUD.reg = calculateBaudrateSynchronous( SERCOM_FREQ_REF / divider );
+  sercom->SPI.BAUD.reg = calculateBaudrateSynchronous( SystemCoreClock / divider );
 
   enableSPI();
 }
@@ -346,9 +375,9 @@ bool SERCOM::isDataRegisterEmptySPI()
 //	return sercom->SPI.INTFLAG.bit.RXC;
 //}
 
-uint8_t SERCOM::calculateBaudrateSynchronous(uint32_t baudrate)
+uint32_t SERCOM::calculateBaudrateSynchronous(uint32_t baudrate)
 {
-  return SERCOM_FREQ_REF / (2 * baudrate) - 1;
+  return ((SystemCoreClock / (2 * baudrate)) - 1);
 }
 
 
@@ -445,7 +474,7 @@ void SERCOM::initMasterWIRE( uint32_t baudrate )
 //  sercom->I2CM.INTENSET.reg = SERCOM_I2CM_INTENSET_MB | SERCOM_I2CM_INTENSET_SB | SERCOM_I2CM_INTENSET_ERROR ;
 
   // Synchronous arithmetic baudrate
-  sercom->I2CM.BAUD.bit.BAUD = SystemCoreClock / ( 2 * baudrate) - 1 ;
+  sercom->I2CM.BAUD.bit.BAUD = calculateBaudrateSynchronous(baudrate) ;
 }
 
 void SERCOM::prepareNackBitWIRE( void )
@@ -628,18 +657,22 @@ void SERCOM::initClockNVIC( void )
     clockId = GCM_SERCOM1_CORE;
     IdNvic = SERCOM1_IRQn;
   }
+#if !defined(__SAMD11C14A__)
   else if(sercom == SERCOM2)
   {
     clockId = GCM_SERCOM2_CORE;
     IdNvic = SERCOM2_IRQn;
   }
+#endif
+#if !defined(__SAMD11D14AM__) && !defined(__SAMD11C14A__) && !defined(__SAMD11D14AS__)
   else if(sercom == SERCOM3)
   {
     clockId = GCM_SERCOM3_CORE;
     IdNvic = SERCOM3_IRQn;
   }
+#endif
 #if defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
-  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+    defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   else if(sercom == SERCOM4)
   {
     clockId = GCM_SERCOM4_CORE;
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
index fbd27e624..772715d09 100644
--- a/cores/arduino/SERCOM.h
+++ b/cores/arduino/SERCOM.h
@@ -209,7 +209,7 @@ class SERCOM
 
 	private:
 		Sercom* sercom;
-		uint8_t calculateBaudrateSynchronous(uint32_t baudrate) ;
+		uint32_t calculateBaudrateSynchronous(uint32_t baudrate) ;
 		uint32_t division(uint32_t dividend, uint32_t divisor) ;
 		void initClockNVIC( void ) ;
 };
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index 1dff8ab37..5d135e70b 100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
@@ -30,8 +30,15 @@ volatile uint32_t portBitMask;
 volatile int64_t toggleCount;
 volatile bool toneIsActive = false;
 
+/* TC5 does not exist on the D11. Using TC2 instead. It will conflict with the 2 TC2 PWM pins */
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+#define TONE_TC         TC2
+#define TONE_TC_IRQn    TC2_IRQn
+#else
 #define TONE_TC         TC5
 #define TONE_TC_IRQn    TC5_IRQn
+#endif
+
 #define TONE_TC_TOP     0xFFFF
 #define TONE_TC_CHANNEL 0
 void TC5_Handler (void) __attribute__ ((weak, alias("Tone_Handler")));
@@ -112,8 +119,13 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
 
   toggleCount = (duration > 0 ? frequency * duration * 2 / 1000UL : -1);
 
-  // Enable GCLK for TC4 and TC5 (timer counter input clock)
+  // Enable GCLK for timer used
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+  GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC1_TC2));
+#else
   GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC4_TC5));
+#endif
+
   while (GCLK->STATUS.bit.SYNCBUSY);
 
   resetTC(TONE_TC);
diff --git a/cores/arduino/USB/HID.cpp b/cores/arduino/USB/HID.cpp
index f5d561e0e..d8ce454b9 100644
--- a/cores/arduino/USB/HID.cpp
+++ b/cores/arduino/USB/HID.cpp
@@ -461,10 +461,14 @@ size_t Keyboard_::press(uint8_t k)
 
 	// Add k to the key report only if it's not already present
 	// and if there is an empty slot.
-	if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
-		_keyReport.keys[2] != k && _keyReport.keys[3] != k &&
-		_keyReport.keys[4] != k && _keyReport.keys[5] != k) {
-
+	uint8_t keyAlreadyPresent = 0;
+	for (i=0; i<6; i++) {
+		if (_keyReport.keys[i] == k) {
+			keyAlreadyPresent = 1;
+		}
+	}
+	
+	if (keyAlreadyPresent) {
 		for (i=0; i<6; i++) {
 			if (_keyReport.keys[i] == 0x00) {
 				_keyReport.keys[i] = k;
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index 9b1cdf8c1..2f34bbc2e 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -20,8 +20,19 @@
 #define __USBDESC_H__
 
 // CDC or HID can be enabled together.
-#define CDC_ENABLED
-#define HID_ENABLED
+// These are now controlled by the boards.txt menu system
+#if defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART)
+  #define CDC_ENABLED
+  #define HID_ENABLED
+#elif defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART)
+  #define CDC_ENABLED
+#elif defined(ARDUINO_HID_ONLY) || defined(ARDUINO_HID_UART)
+  #define HID_ENABLED
+#elif defined(ARDUINO_USB_UART_DISABLED) || defined(ARDUINO_UART_ONLY)
+  // do nothing
+#else
+  #error "USBDesc.h: CDC_ENABLED and HID_ENABLED are now controlled by the boards.txt menu system"
+#endif
 
 // CDC
 #define CDC_ACM_INTERFACE	0	// CDC ACM
diff --git a/cores/arduino/USB/samd21_device.c b/cores/arduino/USB/samd21_device.c
index d28774915..24f90d710 100644
--- a/cores/arduino/USB/samd21_device.c
+++ b/cores/arduino/USB/samd21_device.c
@@ -145,13 +145,12 @@ void UDD_Init(void)
 	/* Set the configuration */
 	udd_force_device_mode();
 	udd_device_run_in_standby();
-    // Set address of USB SRAM
+	// Set address of USB SRAM
 	USB->DEVICE.DESCADD.reg = (uint32_t)(&usb_endpoint_table[0]);
 	// For USB_SPEED_FULL
 	udd_force_full_speed();
- 	for (i = 0; i < sizeof(usb_endpoint_table); i++) {
- 		(*(uint32_t *)(&usb_endpoint_table[0]+i)) = 0;
- 	}
+	
+	memset(&usb_endpoint_table[0], 0, sizeof(usb_endpoint_table));
 
 	// Configure interrupts
 	NVIC_SetPriority((IRQn_Type) USB_IRQn, 0UL);
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index 9e302f2a8..b1aeccf82 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -150,10 +150,8 @@ void UHD_Init(void)
 	USB->HOST.DESCADD.reg = (uint32_t)(&usb_pipe_table[0]);
 	// For USB_SPEED_FULL
 	uhd_force_full_speed();
-	for (i = 0; i < sizeof(usb_pipe_table); i++)
-	{
-		(*(uint32_t *)(&usb_pipe_table[0] + i)) = 0;
-	}
+	
+	memset(&usb_pipe_table[0], 0, sizeof(usb_pipe_table));
 
 	uhd_state = UHD_STATE_NO_VBUS;
 
diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
index fb5f69af4..3bf278228 100644
--- a/cores/arduino/Uart.cpp
+++ b/cores/arduino/Uart.cpp
@@ -59,17 +59,17 @@ void Uart::flush()
 
 void Uart::IrqHandler()
 {
-	if (sercom->availableDataUART()) {
-		rxBuffer.store_char(sercom->readDataUART());
-	}
-	
-	if (sercom->isUARTError()) {
-		sercom->acknowledgeUARTError();
-		// TODO: if (sercom->isBufferOverflowErrorUART()) ....
-		// TODO: if (sercom->isFrameErrorUART()) ....
-		// TODO: if (sercom->isParityErrorUART()) ....
-		sercom->clearStatusUART();
-	}
+  if (sercom->availableDataUART()) {
+    rxBuffer.store_char(sercom->readDataUART());
+  }
+
+  if (sercom->isUARTError()) {
+    sercom->acknowledgeUARTError();
+    // TODO: if (sercom->isBufferOverflowErrorUART()) ....
+    // TODO: if (sercom->isFrameErrorUART()) ....
+    // TODO: if (sercom->isParityErrorUART()) ....
+    sercom->clearStatusUART();
+  }
 }
 
 int Uart::available()
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index fdda0c81e..9294fc780 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -193,8 +193,8 @@ void EIC_Handler( void )
 {
   uint32_t ul ;
 
-  // Test the 16 normal interrupts
-  for ( ul = EXTERNAL_INT_0 ; ul <= EXTERNAL_INT_15 ; ul++ )
+  // Test the normal interrupts
+  for ( ul = EXTERNAL_INT_0 ; ul < (EXTERNAL_NUM_INTERRUPTS - 1) ; ul++ )
   {
     if ( (EIC->INTFLAG.reg & ( 1 << ul ) ) != 0 )
     {
diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp
index 53f16cdc0..e1d60f471 100644
--- a/cores/arduino/WString.cpp
+++ b/cores/arduino/WString.cpp
@@ -45,7 +45,7 @@ String::String(const __FlashStringHelper *pstr)
 	*this = pstr;
 }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 String::String(String &&rval)
 {
 	init();
@@ -191,7 +191,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
 	return *this;
 }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 void String::move(String &rhs)
 {
 	if (buffer) {
@@ -223,7 +223,7 @@ String & String::operator = (const String &rhs)
 	return *this;
 }
 
-#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 String & String::operator = (String &&rval)
 {
 	if (this != &rval) move(rval);
diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h
index 6f3d09b80..ca692d45d 100644
--- a/cores/arduino/WString.h
+++ b/cores/arduino/WString.h
@@ -1,5 +1,9 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  WString.h - String library for Wiring & Arduino
+  ...mostly rewritten by Paul Stoffregen...
+  Copyright (c) 2009-10 Hernando Barragan.  All right reserved.
+  Copyright 2011, Paul Stoffregen, paul@pjrc.com
+
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -8,8 +12,8 @@
 
   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.
+  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
@@ -56,7 +60,7 @@ class String
 	String(const char *cstr = "");
 	String(const String &str);
 	String(const __FlashStringHelper *str);
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
+	#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 	String(String &&rval);
 	String(StringSumHelper &&rval);
 	#endif
@@ -83,7 +87,7 @@ class String
 	String & operator = (const String &rhs);
 	String & operator = (const char *cstr);
 	String & operator = (const __FlashStringHelper *str);
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
+	#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 	String & operator = (String &&rval);
 	String & operator = (StringSumHelper &&rval);
 	#endif
@@ -197,7 +201,7 @@ class String
 	// copy and move
 	String & copy(const char *cstr, unsigned int length);
 	String & copy(const __FlashStringHelper *pstr, unsigned int length);
-	#ifdef __GXX_EXPERIMENTAL_CXX0X__
+	#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
 	void move(String &rhs);
 	#endif
 };
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index ac605b385..84ad85c7b 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -26,7 +26,9 @@ extern "C" {
 #endif
 
 /* Definitions and types for pins */
-/* ADC channels 2, 3, and 10 not present in ATSAMD21ExxA */
+/* ADC channels for ATSAMD21GxxA and ATSAMD21JxxA: All but 8 and 9  */
+/* ADC channels for ATSAMD21ExxA: All but 2, 3, 8, 9, and 10 */
+/* ADC channels for ATSAMD11D14AM: 0 through 9 */
 typedef enum _EAnalogChannel
 {
   No_ADC_Channel=-1,
@@ -38,6 +40,8 @@ typedef enum _EAnalogChannel
   ADC_Channel5=5,
   ADC_Channel6=6,
   ADC_Channel7=7,
+  ADC_Channel8=8,
+  ADC_Channel9=9,
   ADC_Channel10=10,
   ADC_Channel16=16,
   ADC_Channel17=17,
@@ -66,6 +70,12 @@ typedef enum _ETCChannel
   TCC2_CH1 = (2<<8)|(1),
   TCC2_CH2 = (2<<8)|(0), // Channel 2 is 0!
   TCC2_CH3 = (2<<8)|(1), // Channel 3 is 1!
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+  TC1_CH0  = (1<<8)|(0),
+  TC1_CH1  = (1<<8)|(1),
+  TC2_CH0  = (2<<8)|(0),
+  TC2_CH1  = (2<<8)|(1),
+#endif
   TC3_CH0  = (3<<8)|(0),
   TC3_CH1  = (3<<8)|(1),
   TC4_CH0  = (4<<8)|(0),
@@ -77,7 +87,7 @@ typedef enum _ETCChannel
   TC6_CH1  = (6<<8)|(1),
   TC7_CH0  = (7<<8)|(0),
   TC7_CH1  = (7<<8)|(1)
-#endif // __SAMD21J18A__
+#endif
 } ETCChannel ;
 
 extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
@@ -86,6 +96,7 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
 #define GetTCChannelNumber( x ) ( (x) & 0xff )
 #define GetTC( x ) ( g_apTCInstances[(x) >> 8] )
 
+/* Only PORTA on D21E and D11 */
 typedef enum _EPortType
 {
   NOT_A_PORT=-1,
@@ -94,6 +105,7 @@ typedef enum _EPortType
   PORTC=2,
 } EPortType ;
 
+/* The D11 has only INT 0 though 7 (the SAMD11C14A lacks INT 0 as well */
 typedef enum _EExt_Interrupts
 {
   EXTERNAL_INT_0 = 0,
@@ -104,6 +116,7 @@ typedef enum _EExt_Interrupts
   EXTERNAL_INT_5,
   EXTERNAL_INT_6,
   EXTERNAL_INT_7,
+#if !defined(__SAMD11D14AM__) && !defined(__SAMD11C14A__) && !defined(__SAMD11D14AS__)
   EXTERNAL_INT_8,
   EXTERNAL_INT_9,
   EXTERNAL_INT_10,
@@ -112,6 +125,7 @@ typedef enum _EExt_Interrupts
   EXTERNAL_INT_13,
   EXTERNAL_INT_14,
   EXTERNAL_INT_15,
+#endif
   EXTERNAL_INT_NMI,
   EXTERNAL_NUM_INTERRUPTS,
   NOT_AN_INTERRUPT = -1,
@@ -208,6 +222,13 @@ typedef enum _EPioPeripheral
 #define PER_ATTR_DRIVE_STRONG    (1UL<<2)
 #define PER_ATTR_DRIVE_MASK      (1UL<<2)
 
+#define PER_ATTR_OUTPUT_TYPE_STD            (0UL<<3)
+#define PER_ATTR_OUTPUT_TYPE_OPEN_DRAIN     (1UL<<3)
+#define PER_ATTR_OUTPUT_TYPE_OPEN_SOURCE    (2UL<<3)
+#define PER_ATTR_OUTPUT_TYPE_BUSKEEPER      (3UL<<3)
+#define PER_ATTR_OUTPUT_TYPE_MASK           (3UL<<3)
+
+
 /* Types used for the table below
  * This struct MUST be 12 bytes long (elements are ordered to prevent unaligned access).
  */
@@ -240,6 +261,23 @@ extern const PinDescription g_APinDescription[] ;
 #define GCM_EVSYS_CHANNEL_3       (0x0AU)
 #define GCM_EVSYS_CHANNEL_4       (0x0BU)
 #define GCM_EVSYS_CHANNEL_5       (0x0CU)
+
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+
+#define GCM_SERCOMx_SLOW          (0x0DU)
+#define GCM_SERCOM0_CORE          (0x0EU)
+#define GCM_SERCOM1_CORE          (0x0FU)
+#define GCM_SERCOM2_CORE          (0x10U)
+#define GCM_TCC0                  (0x11U)
+#define GCM_TC1_TC2               (0x12U)
+#define GCM_ADC                   (0x13U)
+#define GCM_AC_DIG                (0x14U)
+#define GCM_AC_ANA                (0x15U)
+#define GCM_DAC                   (0x16U)
+#define GCM_PTC                   (0x17U)
+
+#else
+
 #define GCM_EVSYS_CHANNEL_6       (0x0DU)
 #define GCM_EVSYS_CHANNEL_7       (0x0EU)
 #define GCM_EVSYS_CHANNEL_8       (0x0FU)
@@ -265,6 +303,8 @@ extern const PinDescription g_APinDescription[] ;
 #define GCM_I2S_0                 (0x23U)
 #define GCM_I2S_1                 (0x24U)
 
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
index fed128c44..f602a2041 100644
--- a/cores/arduino/cortex_handlers.c
+++ b/cores/arduino/cortex_handlers.c
@@ -61,6 +61,8 @@ void SERCOM5_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC0_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC1_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC2_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC1_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC2_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC3_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC4_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC5_Handler      (void) __attribute__ ((weak)); // Used in Tone.cpp
@@ -115,22 +117,37 @@ __attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
   (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
   (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
   (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
+#if defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || \
+  defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
+  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   (void*) SERCOM3_Handler,        /* 12 Serial Communication Interface 3 */
   (void*) SERCOM4_Handler,        /* 13 Serial Communication Interface 4 */
   (void*) SERCOM5_Handler,        /* 14 Serial Communication Interface 5 */
-  (void*) TCC0_Handler,           /* 15 Timer Counter Control 0 */
+#endif
+  (void*) TCC0_Handler,           /* 15 / 12 Timer Counter Control 0 */
+#if defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || \
+  defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
+  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   (void*) TCC1_Handler,           /* 16 Timer Counter Control 1 */
   (void*) TCC2_Handler,           /* 17 Timer Counter Control 2 */
-  (void*) TC3_Handler,            /* 18 Basic Timer Counter 0 */
-  (void*) TC4_Handler,            /* 19 Basic Timer Counter 1 */
-  (void*) TC5_Handler,            /* 20 Basic Timer Counter 2 */
-  (void*) TC6_Handler,            /* 21 Basic Timer Counter 3 */
-  (void*) TC7_Handler,            /* 22 Basic Timer Counter 4 */
-  (void*) ADC_Handler,            /* 23 Analog Digital Converter */
-  (void*) AC_Handler,             /* 24 Analog Comparators */
-  (void*) DAC_Handler,            /* 25 Digital Analog Converter */
-  (void*) PTC_Handler,            /* 26 Peripheral Touch Controller */
+  (void*) TC3_Handler,            /* 18 Basic Timer Counter 3 */
+  (void*) TC4_Handler,            /* 19 Basic Timer Counter 4 */
+  (void*) TC5_Handler,            /* 20 Basic Timer Counter 5 */
+  (void*) TC6_Handler,            /* 21 Basic Timer Counter 6 */
+  (void*) TC7_Handler,            /* 22 Basic Timer Counter 7 */
+#else
+  (void*) TC1_Handler,            /* 13 Basic Timer Counter 1 */
+  (void*) TC2_Handler,            /* 14 Basic Timer Counter 2 */
+#endif
+  (void*) ADC_Handler,            /* 23 / 15 Analog Digital Converter */
+  (void*) AC_Handler,             /* 24 / 16 Analog Comparators */
+  (void*) DAC_Handler,            /* 25 / 17 Digital Analog Converter */
+  (void*) PTC_Handler,            /* 26 / 18 Peripheral Touch Controller */
+#if defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || \
+  defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
+  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   (void*) I2S_Handler             /* 27 Inter-IC Sound Interface */
+#endif
 };
 
 extern int main(void);
diff --git a/cores/arduino/delay.c b/cores/arduino/delay.c
index e43131f21..ea000abb0 100644
--- a/cores/arduino/delay.c
+++ b/cores/arduino/delay.c
@@ -73,7 +73,7 @@ void delay( uint32_t ms )
   do
   {
     yield() ;
-  } while ( _ulTickCount - start <= ms ) ;
+  } while ( _ulTickCount - start < ms ) ;
 }
 
 #include "Reset.h" // for tickReset()
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
index 8af01b573..c50254845 100644
--- a/cores/arduino/main.cpp
+++ b/cores/arduino/main.cpp
@@ -35,8 +35,10 @@ int main( void )
 
   delay(1);
 #if defined(USBCON)
+  #if !defined(ARDUINO_USB_UART_DISABLED) && !defined(ARDUINO_UART_ONLY)
   USBDevice.init();
   USBDevice.attach();
+  #endif
 #endif
 
   setup();
@@ -44,6 +46,7 @@ int main( void )
   for (;;)
   {
     loop();
+
     if (serialEventRun) serialEventRun();
   }
 
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index 9a43b4a8e..243aa9626 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -41,6 +41,22 @@
 // Constants for Clock multiplexers
 #define GENERIC_CLOCK_MULTIPLEXER_DFLL48M (0u)
 
+void waitForSync( void )
+{
+	while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
+	{
+		/* Wait for synchronization */
+	}
+}
+
+void waitForDFLL( void )
+{
+	while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 )
+	{
+		/* Wait for synchronization */
+	}
+}
+
 void SystemInit( void )
 {
   /* Set 1 Flash Wait State for 48MHz, cf tables 20.9 and 35.27 in SAMD21 Datasheet */
@@ -77,10 +93,7 @@ void SystemInit( void )
    */
   GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_XOSC32K ) ; // Generic Clock Generator 1
 
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+  waitForSync();
 
   /* Write Generic Clock Generator 1 configuration */
   GCLK->GENCTRL.reg = GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_XOSC32K ) | // Generic Clock Generator 1
@@ -88,10 +101,7 @@ void SystemInit( void )
 //                      GCLK_GENCTRL_OE | // Output clock to a pin for tests
                       GCLK_GENCTRL_GENEN ;
 
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+  waitForSync();
 
   /* ----------------------------------------------------------------------------------------------
    * 3) Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 0 (DFLL48M reference)
@@ -100,10 +110,7 @@ void SystemInit( void )
                       GCLK_CLKCTRL_GEN_GCLK1 | // Generic Clock Generator 1 is source
                       GCLK_CLKCTRL_CLKEN ;
 
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+  waitForSync();
 
   /* ----------------------------------------------------------------------------------------------
    * 4) Enable DFLL48M clock
@@ -114,29 +121,20 @@ void SystemInit( void )
   /* Remove the OnDemand mode, Bug http://avr32.icgroup.norway.atmel.com/bugzilla/show_bug.cgi?id=9905 */
   SYSCTRL->DFLLCTRL.bit.ONDEMAND = 0 ;
 
-  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 )
-  {
-    /* Wait for synchronization */
-  }
+  waitForDFLL();
 
   SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
                          SYSCTRL_DFLLMUL_FSTEP( 511 ) | // Fine step is 511, half of the max value
                          SYSCTRL_DFLLMUL_MUL( (VARIANT_MCK/VARIANT_MAINOSC) ) ; // External 32KHz is the reference
 
-  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 )
-  {
-    /* Wait for synchronization */
-  }
+  waitForDFLL();
 
   /* Write full configuration to DFLL control register */
   SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | /* Enable the closed loop mode */
                            SYSCTRL_DFLLCTRL_WAITLOCK |
                            SYSCTRL_DFLLCTRL_QLDIS ; /* Disable Quick lock */
 
-  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 )
-  {
-    /* Wait for synchronization */
-  }
+  waitForDFLL();
 
   /* Enable the DFLL */
   SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_ENABLE ;
@@ -147,20 +145,14 @@ void SystemInit( void )
     /* Wait for locks flags */
   }
 
-  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 )
-  {
-    /* Wait for synchronization */
-  }
+  waitForDFLL();
 
   /* ----------------------------------------------------------------------------------------------
    * 5) Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz.
    */
   GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) ; // Generic Clock Generator 0
 
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+  waitForSync();
 
   /* Write Generic Clock Generator 0 configuration */
   GCLK->GENCTRL.reg = GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | // Generic Clock Generator 0
@@ -169,10 +161,7 @@ void SystemInit( void )
                       GCLK_GENCTRL_IDC | // Set 50/50 duty cycle
                       GCLK_GENCTRL_GENEN ;
 
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+  waitForSync();
 
   /* ----------------------------------------------------------------------------------------------
    * 6) Modify PRESCaler value of OSC8M to have 8MHz
@@ -191,10 +180,7 @@ void SystemInit( void )
 //                      GCLK_GENCTRL_OE | // Output clock to a pin for tests
                       GCLK_GENCTRL_GENEN ;
 
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+  waitForSync();
 
   /*
    * Now that all system clocks are configured, we can set CPU and APBx BUS clocks.
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index 145512081..e8361f7fb 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -76,6 +76,10 @@ void init( void )
 #if defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
   defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
+#elif defined(__SAMD11D14AM__) || defined(__SAMD11D14AS__)
+  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 ;
+#elif defined(__SAMD11C14A__)
+  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 ;
 #else
   PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 ;
 #endif
@@ -83,6 +87,8 @@ void init( void )
   // Clock TC/TCC for Pulse and Analog
 #if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 | PM_APBCMASK_TC6 | PM_APBCMASK_TC7 ;
+#elif defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+  PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TC1 | PM_APBCMASK_TC2 ;
 #else
   PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 ;
 #endif
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 0eeb49c1a..d26ff08c1 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -104,39 +104,41 @@ static inline uint32_t mapResolution( uint32_t value, uint32_t from, uint32_t to
  */
 void analogReference( eAnalogReference ulMode )
 {
+  uint32_t gain = ADC_INPUTCTRL_GAIN_1X_Val;      // Default Gain Factor Selection
+  uint32_t refsel;
+
   syncADC();
   switch ( ulMode )
   {
     case AR_INTERNAL:
     case AR_INTERNAL2V23:
-      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;      // Gain Factor Selection
-      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC0_Val; // 1/1.48 VDDANA = 1/1.48* 3V3 = 2.2297
+      refsel = ADC_REFCTRL_REFSEL_INTVCC0_Val; // 1/1.48 VDDANA = 1/1.48* 3V3 = 2.2297
       break;
 
     case AR_EXTERNAL:
       if ( pinPeripheral(REFA_PIN, PIO_ANALOG_REF) == RET_STATUS_OK )
       {
-        ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;      // Gain Factor Selection
-        ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA_Val;
+        refsel = ADC_REFCTRL_REFSEL_AREFA_Val;
       }
       break;
 
     case AR_INTERNAL1V0:
-      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;      // Gain Factor Selection
-      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INT1V_Val;   // 1.0V voltage reference
+      refsel = ADC_REFCTRL_REFSEL_INT1V_Val;   // 1.0V voltage reference
       break;
 
     case AR_INTERNAL1V65:
-      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;      // Gain Factor Selection
-      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
+      refsel = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
       break;
 
     case AR_DEFAULT:
     default:
-      ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;    // This allows values up to VDDANA (3.3V) on the pin
-      ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
+      gain = ADC_INPUTCTRL_GAIN_DIV2_Val;    // This allows values up to VDDANA (3.3V) on the pin
+      refsel = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
       break;
   }
+
+  ADC->INPUTCTRL.bit.GAIN = gain;
+  ADC->REFCTRL.bit.REFSEL = refsel;
 }
 
 uint32_t analogRead( uint32_t ulPin )
@@ -232,6 +234,18 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
     // Enable clocks according to TCCx instance to use
     switch ( GetTCNumber( g_APinDescription[ulPin].ulTCChannel ) )
     {
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+      case 0: // TCC0
+        // Enable GCLK for TCC0 and TCC1 (timer counter input clock)
+        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TCC0 )) ;
+      break ;
+
+      case 1: // TC1
+      case 2: // TC2
+        // Enable GCLK for TCC2 and TC3 (timer counter input clock)
+        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC1_TC2 )) ;
+      break ;
+#else
       case 0: // TCC0
       case 1: // TCC1
         // Enable GCLK for TCC0 and TCC1 (timer counter input clock)
@@ -249,7 +263,7 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
         // Enable GCLK for TC4 and TC5 (timer counter input clock)
         GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC4_TC5 ));
       break ;
-
+#endif
 #if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
       case 6: // TC6 (not available on Zero)
       case 7: // TC7 (not available on Zero)
diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
index 52b9f442d..80d12b00d 100644
--- a/cores/arduino/wiring_digital.c
+++ b/cores/arduino/wiring_digital.c
@@ -36,25 +36,31 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
     return ;
   }
 
-  // Enable pull resistor if pin attributes allow
   uint32_t pinAttribute = g_APinDescription[ulPin].ulPinAttribute;
+  uint8_t pinPort = g_APinDescription[ulPin].ulPort;
+  uint8_t pinNum = g_APinDescription[ulPin].ulPin;
+  uint8_t pullConfig = PORT->Group[pinPort].PINCFG[pinNum].reg;
+  
+  // Enable pull resistor if pin attributes allow
   if ( (ulVal == HIGH && (pinAttribute & PIN_ATTR_INPUT_PULLUP)) || (ulVal == LOW && (pinAttribute & PIN_ATTR_INPUT_PULLDOWN)) )
   {
-    PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= (uint8_t)(PORT_PINCFG_PULLEN) ;
+    pullConfig |= (uint8_t)(PORT_PINCFG_PULLEN) ;
   }
   else
   {
-    PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg &= ~(uint8_t)(PORT_PINCFG_PULLEN) ;
+    pullConfig &= ~(uint8_t)(PORT_PINCFG_PULLEN) ;
   }
 
+  PORT->Group[pinPort].PINCFG[pinNum].reg = pullConfig ;
+
   switch ( ulVal )
   {
     case LOW:
-      PORT->Group[g_APinDescription[ulPin].ulPort].OUTCLR.reg = (1ul << g_APinDescription[ulPin].ulPin) ;
+      PORT->Group[pinPort].OUTCLR.reg = (1ul << pinNum) ;
     break ;
 
     case HIGH:
-      PORT->Group[g_APinDescription[ulPin].ulPort].OUTSET.reg = (1ul << g_APinDescription[ulPin].ulPin) ;
+      PORT->Group[pinPort].OUTSET.reg = (1ul << pinNum) ;
     break ;
 
     default:
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
index 3b7b2c8cd..9cae69ce8 100644
--- a/cores/arduino/wiring_private.c
+++ b/cores/arduino/wiring_private.c
@@ -21,9 +21,15 @@
 
 int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
 {
+  // Prevent out of bounds access
+  if (ulPin >= NUM_PIN_DESCRIPTION_ENTRIES)
+  {
+    return -1 ;
+  }
+
   uint32_t pinAttribute = g_APinDescription[ulPin].ulPinAttribute;
   uint8_t peripheralAttribute = g_APinDescription[ulPin].ulPeripheralAttribute;
-  EPioType pinType = g_APinDescription[ulPin].ulPinType;
+  uint8_t pinType = g_APinDescription[ulPin].ulPinType;
 
   // Handle the case the pin isn't usable as PIO
   if ( pinType == PIO_NOT_A_PIN )
@@ -104,45 +110,55 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
       peripheral = PER_AC_CLK;
     break ;
 
+    case PIO_NOT_A_PIN:
+    case PIO_MULTI:
+      return -1l ;
+    break ;
+
     default:
     break ;
   }
 
+  noInterrupts(); // Avoid possible invalid interim pin state
+
+  uint8_t pinPort = g_APinDescription[ulPin].ulPort;
+  uint8_t pinNum = g_APinDescription[ulPin].ulPin;
+  uint8_t pinCfg = PORT_PINCFG_INEN;
+
   switch ( ulPeripheral )
   {
     // Set pin mode according to chapter '22.6.3 I/O Pin Configuration'
     case PIO_INPUT:
-      // Set pin to input mode, disable the port mux
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+    case PIO_INPUT_PULLUP:
+    case PIO_INPUT_PULLDOWN:
+      if (ulPeripheral != PIO_INPUT)
+      {
+	pinCfg |= PORT_PINCFG_PULLEN;
+      }
+      // Set pin to input mode with pull-up resistor enabled, disable the port mux
+      PORT->Group[pinPort].PINCFG[pinNum].reg=(uint8_t)pinCfg ;
+      PORT->Group[pinPort].DIRCLR.reg = (uint32_t)(1<<pinNum) ;
+      if (ulPeripheral == PIO_INPUT_PULLUP)
+      {
+        // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.7 Data Output Value Set')
+        PORT->Group[pinPort].OUTSET.reg = (uint32_t)(1<<pinNum) ;
+      }
+      else
+      {
+        // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.6 Data Output Value Clear')
+        PORT->Group[pinPort].OUTCLR.reg = (uint32_t)(1<<pinNum) ;
+      }
     break ;
 
     case PIO_OUTPUT:
-      // Set pin to output mode, set pin drive strength, disable the port mux
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg &= ~(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PMUXEN) ;
+      pinCfg = 0;
       if ( (peripheralAttribute & PER_ATTR_DRIVE_MASK) == PER_ATTR_DRIVE_STRONG )
       {
-        PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= (uint8_t)(PORT_PINCFG_DRVSTR) ;
+        pinCfg |= PORT_PINCFG_DRVSTR;
       }
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-    break ;
-
-    case PIO_INPUT_PULLUP:
-      // Set pin to input mode with pull-up resistor enabled, disable the port mux
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PULLEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-
-      // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.7 Data Output Value Set')
-      PORT->Group[g_APinDescription[ulPin].ulPort].OUTSET.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-    break ;
-
-    case PIO_INPUT_PULLDOWN:
-      // Set pin to input mode with pull-down resistor enabled, disable the port mux
-      PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg=(uint8_t)(PORT_PINCFG_INEN|PORT_PINCFG_PULLEN) ;
-      PORT->Group[g_APinDescription[ulPin].ulPort].DIRCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
-
-      // Enable pull level (cf '22.6.3.2 Input Configuration' and '22.8.6 Data Output Value Clear')
-      PORT->Group[g_APinDescription[ulPin].ulPort].OUTCLR.reg = (uint32_t)(1<<g_APinDescription[ulPin].ulPin) ;
+      // Set pin to output mode, set pin drive strength, disable the port mux
+      PORT->Group[pinPort].PINCFG[pinNum].reg = (uint8_t)pinCfg ;
+      PORT->Group[pinPort].DIRSET.reg = (uint32_t)(1<<pinNum) ;
     break ;
 
 
@@ -172,35 +188,32 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
                                                                     PORT_WRCONFIG_PINMASK( g_APinDescription[ulPin].ulPin - 16 ) ;
       }
 #else
-      if ( g_APinDescription[ulPin].ulPin & 1 ) // is pin odd?
+      if ( pinNum & 1 ) // is pin odd?
       {
         uint32_t temp ;
 
         // Get whole current setup for both odd and even pins and remove odd one
-        temp = (PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg) & PORT_PMUX_PMUXE( 0xF ) ;
+	temp = (PORT->Group[pinPort].PMUX[pinNum >> 1].reg) & PORT_PMUX_PMUXE( 0xF ) ;
         // Set new muxing
-	PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXO( peripheral ) ;
+	PORT->Group[pinPort].PMUX[pinNum >> 1].reg = temp|PORT_PMUX_PMUXO( peripheral ) ;
         // Enable port mux
-        PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= PORT_PINCFG_PMUXEN ;
+	PORT->Group[pinPort].PINCFG[pinNum].reg |= PORT_PINCFG_PMUXEN ;
       }
       else // even pin
       {
         uint32_t temp ;
 
-        temp = (PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg) & PORT_PMUX_PMUXO( 0xF ) ;
-	PORT->Group[g_APinDescription[ulPin].ulPort].PMUX[g_APinDescription[ulPin].ulPin >> 1].reg = temp|PORT_PMUX_PMUXE( peripheral ) ;
-        PORT->Group[g_APinDescription[ulPin].ulPort].PINCFG[g_APinDescription[ulPin].ulPin].reg |= PORT_PINCFG_PMUXEN ; // Enable port mux
+	temp = (PORT->Group[pinPort].PMUX[pinNum >> 1].reg) & PORT_PMUX_PMUXO( 0xF ) ;
+	PORT->Group[pinPort].PMUX[pinNum >> 1].reg = temp|PORT_PMUX_PMUXE( peripheral ) ;
+	PORT->Group[pinPort].PINCFG[pinNum].reg |= PORT_PINCFG_PMUXEN ; // Enable port mux
       }
 #endif
     break ;
 
-    case PIO_NOT_A_PIN:
-    case PIO_MULTI:
     default:
-      return -1l ;
     break ;
   }
 
+  interrupts();
   return 0l ;
 }
-
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 74714a476..b419b0dad 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -200,3 +200,11 @@ void SPIClass::detachInterrupt() {
 #if SPI_INTERFACES_COUNT > 0
 SPIClass SPI( SERCOM_INSTANCE_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI );
 #endif
+
+#if SPI_INTERFACES_COUNT > 1
+SPIClass SPI1( SERCOM_INSTANCE_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI );
+#endif
+
+#if SPI_INTERFACES_COUNT > 2
+SPIClass SPI2( SERCOM_INSTANCE_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI );
+#endif
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index e9ff8e4f3..03fd02635 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -139,6 +139,14 @@ void SPIClass::transfer(void *buf, size_t count)
   extern SPIClass SPI;
 #endif
 
+#if SPI_INTERFACES_COUNT > 1
+  extern SPIClass SPI1;
+#endif
+
+#if SPI_INTERFACES_COUNT > 2
+  extern SPIClass SPI2;
+#endif
+
 // For compatibility with sketches designed for AVR @ 16 MHz
 // New programs should use SPI.beginTransaction to set the SPI clock
 #if F_CPU == 48000000
diff --git a/libraries/USBHost/library.properties b/libraries/USBHost/library.properties
index 72798950e..240f951e4 100644
--- a/libraries/USBHost/library.properties
+++ b/libraries/USBHost/library.properties
@@ -2,7 +2,7 @@ name=USBHost
 version=1.0
 author=Arduino
 maintainer=Arduino <info@arduino.cc>
-sentence=Allows the communication with USB peripherals like mice, keyboards, and thumbdrives. For Arduino DUE only.
-paragraph=The USBHost library allows an Arduino Due board to appear as a USB host, enabling it to communicate with peripherals like USB mice and keyboards. USBHost does not support devices that are connected through USB hubs. This includes some keyboards that have an internal hub.
+sentence=Allows the communication with USB peripherals like mice, keyboards, and thumbdrives. For Arduino Due and Zero.
+paragraph=The USBHost library allows the board to appear as a USB host, enabling it to communicate with peripherals like USB mice and keyboards. USBHost does not support devices that are connected through USB hubs. This includes some keyboards that have an internal hub.
 url=http://arduino.cc/en/Reference/USBHost
 architectures=samd
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index a0d486da0..1d6767042 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -41,15 +41,15 @@ void TwoWire::begin(void) {
   pinPeripheral(PIN_WIRE_SCL, PIO_SERCOM);
 }
 
-void TwoWire::end(void) {
-	sercom->disableWIRE();
-}
-
 void TwoWire::begin(uint8_t address) {
   //Slave mode
   sercom->initSlaveWIRE(address);
   sercom->enableWIRE();
 }
+ 
+void TwoWire::setClock(uint32_t frequency) {
+       // dummy funtion
+}
 
 uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
 {
@@ -351,3 +351,10 @@ TwoWire Wire(SERCOM_INSTANCE_WIRE);
 SERCOM_WIRE_HANDLER_MACRO
 
 #endif
+
+#if WIRE_INTERFACES_COUNT > 1
+TwoWire Wire1(SERCOM_INSTANCE_WIRE1);
+
+SERCOM_WIRE1_HANDLER_MACRO
+
+#endif
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index 9d30a2963..7d8df9d0e 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -35,7 +35,7 @@ class TwoWire : public Stream
     TwoWire(SERCOM *s);
     void begin();
     void begin(uint8_t);
-    void end();
+    void setClock(uint32_t); // dummy function
 
     void beginTransmission(uint8_t);
     uint8_t endTransmission(bool stopBit);
@@ -104,4 +104,8 @@ class TwoWire : public Stream
 extern TwoWire Wire;
 #endif
 
+#if WIRE_INTERFACES_COUNT > 1
+extern TwoWire Wire1;
+#endif
+
 #endif
diff --git a/platform.txt b/platform.txt
index 06d4dba9c..1aa1b7dcb 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=MattairTech SAMD Boards
-version=1.6.5-mt1
+version=1.6.5-mt2
 
 
 # Compile variables
@@ -34,13 +34,13 @@ compiler.warning_flags.all=-Wall -Wextra
 
 compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 compiler.c.cmd=arm-none-eabi-gcc
-compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
+compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
 compiler.c.elf.cmd=arm-none-eabi-gcc
 compiler.c.elf.flags=-Os -Wl,--gc-sections -save-temps
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-c -g -x assembler-with-cpp
 compiler.cpp.cmd=arm-none-eabi-g++
-compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -MMD
+compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -MMD
 compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs
 compiler.objcopy.cmd=arm-none-eabi-objcopy
@@ -49,6 +49,8 @@ compiler.elf2hex.flags=-O binary
 compiler.elf2hex.cmd=arm-none-eabi-objcopy
 compiler.ldflags=-mcpu={build.mcu} -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align
 compiler.size.cmd=arm-none-eabi-size
+compiler.nm.cmd=arm-none-eabi-nm
+compiler.nm.flags=-B --size-sort --demangle -t d
 compiler.define=-DARDUINO=
 
 # this can be overriden in boards.txt
@@ -95,6 +97,12 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}"
 ## Create output (bin file)
 recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
 
+## Display Detailed Object Size Info
+recipe.objcopy.nm.pattern="{compiler.path}{compiler.nm.cmd}" {compiler.nm.flags} "{build.path}/{build.project_name}.elf"
+
+## Compute size and memory use info (Flash usage = .text + .data segments)
+recipe.objcopy.size.pattern="{compiler.path}{compiler.size.cmd}" -B "{build.path}/{build.project_name}.elf"
+
 ## Save hex
 recipe.output.tmp_file={build.project_name}.bin
 recipe.output.save_file={build.project_name}.{build.variant}.bin
@@ -103,13 +111,13 @@ recipe.output.save_file={build.project_name}.{build.variant}.bin
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
 recipe.size.regex=\.text\s+([0-9]+).*
 
-
 # Uploader tools
 # --------------
 
 #
 # BOSSA
 #
+# tools.bossac.path={runtime.tools.bossac-1.5-arduino.path}
 tools.bossac.path={runtime.tools.bossac-1.5-arduino-mattairtech-1.path}
 tools.bossac.cmd=bossac
 tools.bossac.cmd.windows=bossac.exe
diff --git a/variants/MT_D11/debug_scripts/SAMD11C14A.gdb b/variants/MT_D11/debug_scripts/SAMD11C14A.gdb
new file mode 100644
index 000000000..ff7008e6e
--- /dev/null
+++ b/variants/MT_D11/debug_scripts/SAMD11C14A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11c14a" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D11/debug_scripts/SAMD11D14AM.gdb b/variants/MT_D11/debug_scripts/SAMD11D14AM.gdb
new file mode 100644
index 000000000..ebd381b55
--- /dev/null
+++ b/variants/MT_D11/debug_scripts/SAMD11D14AM.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11d14am" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D11/debug_scripts/SAMD11D14AS.gdb b/variants/MT_D11/debug_scripts/SAMD11D14AS.gdb
new file mode 100644
index 000000000..1daf3ccc2
--- /dev/null
+++ b/variants/MT_D11/debug_scripts/SAMD11D14AS.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11d14as" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_with_4KB_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_with_4KB_bootloader.ld
new file mode 100644
index 000000000..984eb4113
--- /dev/null
+++ b/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_with_4KB_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
new file mode 100644
index 000000000..984eb4113
--- /dev/null
+++ b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld
new file mode 100644
index 000000000..984eb4113
--- /dev/null
+++ b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/openocd_scripts/SAMD11C14A.cfg b/variants/MT_D11/openocd_scripts/SAMD11C14A.cfg
new file mode 100644
index 000000000..2e1525a73
--- /dev/null
+++ b/variants/MT_D11/openocd_scripts/SAMD11C14A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd11c14a
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D11/openocd_scripts/SAMD11D14AM.cfg b/variants/MT_D11/openocd_scripts/SAMD11D14AM.cfg
new file mode 100644
index 000000000..5cbf9770f
--- /dev/null
+++ b/variants/MT_D11/openocd_scripts/SAMD11D14AM.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd11d14am
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg b/variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg
new file mode 100644
index 000000000..2b1d4c72f
--- /dev/null
+++ b/variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd11d14as
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D11/pins_arduino.h b/variants/MT_D11/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/MT_D11/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/MT_D11/variant.cpp b/variants/MT_D11/variant.cpp
new file mode 100644
index 000000000..f69bc5810
--- /dev/null
+++ b/variants/MT_D11/variant.cpp
@@ -0,0 +1,279 @@
+/*
+  Copyright (c) 2014-2015 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
+  */
+
+/*
+ * Modified 8 August 2015 by Justin Mattair
+ *   for MattairTech MT-D11 boards (www.mattairtech.com)
+ */
+
+/*
+============================= MattairTech MT-D11 (ATsamd11D14AM) ========================
+Other   INT    PWM   Digital  Analog                      Digital  PWM   INT    Other
+=========================================================================================
+                                       -------------------
+DAC                    2    2 (ADC0)  | A2   | USB |  Gnd |
+REF                    3    3 (ADC1)  | A3   |     |  Vcc |
+VDIV   INT4   TCC0[0]  4    4 (ADC2)  | A4    -----   A31 |  31  TC2[1]  INT3  RX / SWDIO
+       INT5   TCC0[1]  5    5 (ADC3)  | A5            A30 |  30  TC2[0]       TX / SWDCLK  
+              TCC0[2]  6    6 (ADC4)  | A6            A27 |  27          INT7
+              TCC0[3]  7    7 (ADC5)  | A7            A23 |  23                 I2C/SCL
+SPI MOSI  INT2         10   10 (ADC8) | A10           A22 |  22          INT6   I2C/SDA
+SPI SCK                11   11 (ADC9) | A11           A17 |  17  TC1[1]
+SPI MISO  INTNMI       14   14 (ADC6) | A14           A16 |  16  TC1[0]  INT0   LED
+Button    INT1         15   15 (ADC7) | A15           RST |                     Reset
+                                       -------------------
+Most pins have multiple configurations available (even analog pins). For example, pin
+4 can be an analog input, a PWM output, Digital I/O, or interrupt input. These
+always reference the pin number printed on the board but without the 'A' (with the
+usable pins starting at 2). Tone available on TC2.
+DO NOT connect voltages higher than 3.3V!
+*/
+
+
+/*   The PinDescription table describes how each of the pins can be used by the Arduino
+ *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+ *   communications, etc.), and the PinDescription table configures which functions can
+ *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
+ *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
+ *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+ *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+ *   verify that the pin can perform the function requested, and to configure the pin for
+ *   that function. Most of the contents of pinMode() are now in pinPeripheral().
+ * 
+ *   There are two ways that pins can be mapped. The first is to map pins contiguously
+ *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
+ *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
+ *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
+ *   This only works when there is one port. Because not all port pins are available,
+ *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
+ *   For an example of both types, see variant.cpp from the MT-D11 variant.
+ * 
+ *   Explanation of PinDescription table:
+ * 
+ *   Port                  This is the port (ie: PORTA).
+ *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
+ *   PinType               This indicates what peripheral function the pin can be
+ *                         attached to. In most cases, this is PIO_MULTI, which means
+ *                         that the pin can be anything listed in the PinAttribute field.
+ *                         It can also be set to a specific peripheral. In this case, any
+ *                         attempt to configure the pin (using pinPeripheral or pinMode)
+ *                         as anything else will fail (and pinPeripheral will return -1).
+ *                         This can be used to prevent accidental re-configuration of a
+ *                         pin that is configured for only one function (ie: USB D- and
+ *                         D+ pins). If a pin is not used or does not exist,
+ *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
+ *                         for valid entries. These entries are also used as a parameter
+ *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
+ *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
+ *                         the desired mode. Note that this field is not used to select
+ *                         between the two peripherals possible with each of the SERCOM
+ *                         and TIMER functions. PeripheralAttribute is now used for this.
+ *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
+ *                         configuration. It is primarily used to select between the two
+ *                         peripherals possible with each of the SERCOM and TIMER
+ *                         functions. TIMER pins are individual, while SERCOM uses a
+ *                         group of two to four pins. This group of pins can span both
+ *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
+ *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
+ *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
+ *                         pin. This bitfield is also used to set the pin drive strength.
+ *                         In the future, other attributes (like input buffer
+ *                         configuration) may be added. See WVariant.h for valid entries.
+ *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
+ *                         peripheral functions that a pin can attach to. This includes
+ *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
+ *                         shorthand for a combination of other attributes.
+ *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
+ *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
+ *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+ *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
+ *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
+ *                         bitfield is useful for limiting a pin to only input related
+ *                         functions or output functions. This allows a pin to have a
+ *                         more flexible configuration, while restricting the direction
+ *                         (ie: to avoid contention). See WVariant.h for valid entries.
+ *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
+ *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
+ *                         available on pin A4 or pin A8 on the MT-D21E). In general,
+ *                         only one pin should be configured (in the pinDescription
+ *                         table) per TC channel. See WVariant.h for valid entries.
+ *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
+ *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
+ *                         WVariant.h for valid entries.
+ *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
+ *                         interrupt numbers are available on multiple pins (ie:
+ *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
+ *                         MT-D21E). In general, only one pin should be configured (in
+ *                         the pinDescription table) per interrupt number. Thus, if an
+ *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
+ *                         from pin 18. See WVariant.h for valid entries.
+ */
+
+
+/*  Pins descriptions for the MattairTech MT-D11
+ * 
+ * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (! means unavailable with this variant)
+ * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
+ * | 0       | 2                  | A2               |  PA02  | DAC               | !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+ * | 1       | 3                  | A3               |  PA03  | REFA              | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+ * | 2       | 4                  | A4               |  PA04  | REFB / VM         | EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[2] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+ * | 3       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+ * | 4       | 6                  | A6               |  PA06  |                   | !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+ * | 5       | 7                  | A7               |  PA07  |                   | !EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+ * | --      | --                 | --               |  PA08  | Xin32 / Xin       | Xin32
+ * | --      | --                 | --               |  PA09  | Xout32 / Xout     | Xout32
+ * | 6       | 10                 | A10              |  PA10  | SPI MOSI          | EIC/EXTINT[2] ADC/AIN[8] PTC/X[2] PTC/Y[8] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TC2/WO[0] !TCC0/WO[2]
+ * | 7       | 11                 | A11              |  PA11  | SPI SCK           | !EIC/EXTINT[3] ADC/AIN[9] PTC/X[3] PTC/Y[9] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TC2/WO[1] !TCC0/WO[3]
+ * | 8       | 14                 | A14              |  PA14  | SPI MISO          | EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+ * | 9       | 15                 | A15              |  PA15  | Button / SPI SS   | EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[1] Button
+ * | 10      | --                 | RST              |  PA28  | Reset             | Reset
+ * | 11      | 16                 | A16              |  PA16  | LED               | EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6] LED
+ * | 12      | 17                 | A17              |  PA17  | HOST_ENABLE       | !EIC/EXTINT[1] PTC/X[5] PTC/Y[11] !SERCOM1/PAD[3] !SERCOM2/PAD[3] TC1/WO[1] !TCC0/WO[7] HOST_ENABLE
+ * | 13      | 22                 | A22              |  PA22  | I2C/SDA w/pullup  | EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+ * | 14      | 23                 | A23              |  PA23  | I2C/SCL w/pullup  | !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[0] !TC1/WO[1] !TCC0/WO[5]
+ * | --      | --                 | ---              |  PA24  | USB_NEGATIVE      | USB/DM
+ * | --      | --                 | ---              |  PA25  | USB_POSITIVE      | USB/DP
+ * | 15      | 27                 | A27              |  PA27  |                   | EIC/EXTINT[7] PTC/X[10]
+ * | 16      | 30                 | A30              |  PA30  | TX / SWD CLK      | !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK
+ * | 17      | 31                 | A31              |  PA31  | RX / SWD IO       | EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+ * | 18      | --                 | Vcc              |  ----  |                   | Vcc
+ * | 19      | --                 | Gnd              |  ----  |                   | Ground
+ * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
+ * 
+ * You may use Arduino pin numbers ranging from 0 to 31. The Arduino pin corresponds to the silkscreen (without the 'A').
+ * For example, use pinMode(16, OUTPUT) to set the LED pin (marked as A16) as an output.
+ * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 8, 9, 12, 13, 18, 19, 20, 21, 24, 25, 26, 28, and 29.
+ * Pins 8 and 9 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
+ * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+ * The tone library uses TC2.
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+#if defined PIN_MAP_STANDARD
+const PinDescription g_APinDescription[]=
+{
+	// 0..1 pins don't exist
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	
+	// 2..7 - Analog capable pins (DAC available on 2)
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4 },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5 },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE },
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_NONE },
+	
+	// 8..9 are unused (pins in use by 32.768KHz crystal, which in turn is used by the Arduino core)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	
+	// 10..11 - SERCOM/SPI (SPI) or Analog or Digital functions
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_2 }, // SPI MOSI
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE }, // SPI SCK
+	
+	// 12..13 pins don't exist
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	
+	// 14..15 - SERCOM/SPI (SPI) or Analog or Digital functions (Button available on pin 15)
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI }, // SPI MISO
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_1 }, // Button / SPI SS (unused)
+	
+	// 16..17 Digital functions (LED available on pin 16)
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // LED
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE },
+	
+	// 18..21 pins don't exist
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	
+	// 22..23 SERCOM/I2C (Wire) or Digital functions
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCL
+	
+	// 24..26 are unused (25 and 26 in use by USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist)
+	{ PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DM
+	{ PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	
+	// 27..29 Digital functions (pin 28 is Reset and pin 29 does not exist)
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7 },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused (Reset)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	
+	// 30..31  SERCOM/UART (Serial1) or Digital functions or Debug interface (SWD CLK and SWD IO)
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // TX / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3 }, // RX / SWD IO
+} ;
+#elif defined PIN_MAP_COMPACT
+const PinDescription g_APinDescription[]=
+{
+	// 0..5 - Analog capable pins (DAC available on 0)
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4 },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5 },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE },
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_NONE },
+	
+	// 6..9 - SERCOM/SPI (SPI) or Analog or Digital functions (Button available on pin 9)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_2 }, // SPI MOSI
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE }, // SPI SCK
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI }, // SPI MISO
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_1 }, // Button / SPI SS (unused)
+	
+	// 10..11 Digital functions (LED available on pin 10)
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // LED
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE },
+	
+	// 12..13 SERCOM/I2C (Wire) or Digital functions
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCL
+	
+	// 14 Digital functions
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7 },
+	
+	// 15..16  SERCOM/UART (Serial1) or Digital functions or Debug interface (SWD CLK and SWD IO)
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // TX / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3 }, // RX / SWD IO
+} ;
+#endif
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TC1, TC2 } ;
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+
+#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
new file mode 100644
index 000000000..339c48077
--- /dev/null
+++ b/variants/MT_D11/variant.h
@@ -0,0 +1,280 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 4 August 2015 by Justin Mattair
+ *   for MattairTech MT-D11 boards (www.mattairtech.com)
+ */
+
+#ifndef _VARIANT_MATTAIRTECH_MT_D11_
+#define _VARIANT_MATTAIRTECH_MT_D11_
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+/** Frequency of the board main oscillator */
+#define VARIANT_MAINOSC		(32768ul)
+
+/** Master clock frequency */
+#define VARIANT_MCK			  (48000000ul)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define PIN_MAP_STANDARD
+//#define PIN_MAP_COMPACT
+
+#if defined PIN_MAP_STANDARD
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
+#elif defined PIN_MAP_COMPACT
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (17u)
+#else
+  #error "variant.h: You must set PIN_MAP_STANDARD or PIN_MAP_COMPACT"
+#endif
+
+#define PINS_COUNT           (32u)
+#define NUM_DIGITAL_PINS     (32u)
+#define NUM_ANALOG_INPUTS    (10u)
+#define NUM_ANALOG_OUTPUTS   (1u)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+// Interrupts
+#define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
+
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ * The MT-D11 onboard LED is on pin 16.
+ * The RX and TX LEDs are not present.
+ * You may optionally add them to any free pins.
+ */
+#define PIN_LED_13           (16u)
+#define PIN_LED_RXL          (10u)
+#define PIN_LED_TXL          (11u)
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+/* Buttons
+ * Note that Button A is connected to Reset by default.
+ * A solder jumper can be changed to route Button A to pin 15 instead.
+ * Thre is a debouncing capacitor connected, so delay reading the pin
+ * at least 6ms after turning on the pullup to allow the capacitor to charge.
+ */
+#define BUTTON               (15u)
+#define BUTTON_BUILTIN       BUTTON
+
+
+/*
+ * Analog pins
+ */
+#define PIN_A2               (2ul)
+#define PIN_A3               (3ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A6               (6ul)
+#define PIN_A7               (7ul)
+#define PIN_A10              (10ul)
+#define PIN_A11              (11ul)
+#define PIN_A14              (14ul)
+#define PIN_A15              (15ul)
+
+static const uint8_t A2   = PIN_A2 ;
+static const uint8_t A3   = PIN_A3 ;
+static const uint8_t A4   = PIN_A4 ;
+static const uint8_t A5   = PIN_A5 ;
+static const uint8_t A6   = PIN_A6 ;
+static const uint8_t A7   = PIN_A7 ;
+static const uint8_t A10  = PIN_A10 ;
+static const uint8_t A11  = PIN_A11 ;
+static const uint8_t A14  = PIN_A14 ;
+static const uint8_t A15  = PIN_A15 ;
+
+#define ADC_RESOLUTION		12
+
+#define REMAP_ANALOG_PIN_ID	while(0)
+// #define REMAP_ANALOG_PIN_ID	if ( ulPin < A0 ) ulPin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#define REFA_PIN    (3ul)
+#define REFB_PIN    (4ul)
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#define PIN_ATN              (15ul)
+static const uint8_t ATN = PIN_ATN;
+
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#define PIN_SERIAL1_RX       (31ul)
+#define PIN_SERIAL1_TX       (30ul)
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL1       &sercom1
+
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI1_MISO         (14u)
+#define PIN_SPI1_MOSI         (10u)
+#define PIN_SPI1_SCK          (11u)
+#define PIN_SPI1_SS           (15u)
+#define PIN_SPI_MISO         PIN_SPI1_MISO
+#define PIN_SPI_MOSI         PIN_SPI1_MOSI
+#define PIN_SPI_SCK          PIN_SPI1_SCK
+#define PIN_SPI_SS           PIN_SPI1_SS
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+#define SERCOM_INSTANCE_SPI           &sercom0
+
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE1_SDA         (22u)
+#define PIN_WIRE1_SCL         (23u)
+#define PIN_WIRE_SDA          PIN_WIRE1_SDA
+#define PIN_WIRE_SCL          PIN_WIRE1_SCL
+
+#define SERCOM_INSTANCE_WIRE           &sercom2
+
+#define SERCOM_WIRE_HANDLER_MACRO \
+void SERCOM2_Handler(void) { \
+	Wire.onService(); \
+}
+
+
+/*
+ * USB
+ */
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+#define PIN_USB_HOST_ENABLE             (17ul)
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+
+extern Uart Serial1;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#define SERIAL_PORT_MONITOR         Serial1
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+#define Serial                      SerialUSB
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */
+
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
index 717073abe..497c7d1ac 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
index 61ad501ed..234181a93 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
index 3a172e3ae..fc8be6591 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
@@ -143,6 +143,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
index 710c8664c..3bded2906 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
index 4475f9511..fa207ff27 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
index 0162f0774..ca391b2b1 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
@@ -143,6 +143,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
index d4fa67a05..9f4943b59 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
index 475b359e4..418992b15 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
index 4155e0791..8c0eea088 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
@@ -143,6 +143,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
index 6a6cc4ab0..c578a262e 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
index a692b2ce1..e0313532a 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
index 5ed72842d..6b0d2a661 100644
--- a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
+++ b/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
@@ -143,6 +143,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index 605e9f62d..fa835c7c5 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -17,7 +17,7 @@
 */
 
 /*
-  Modified 20 July 2015 by Justin Mattair
+  Modified 8 August 2015 by Justin Mattair
      for MattairTech MT-D21E boards (www.mattairtech.com)
 */
 
@@ -64,6 +64,14 @@ usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
  *   verify that the pin can perform the function requested, and to configure the pin for
  *   that function. Most of the contents of pinMode() are now in pinPeripheral().
  * 
+ *   There are two ways that pins can be mapped. The first is to map pins contiguously
+ *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
+ *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
+ *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
+ *   This only works when there is one port. Because not all port pins are available,
+ *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
+ *   For an example of both types, see variant.cpp from the MT-D11 variant.
+ * 
  *   Explanation of PinDescription table:
  * 
  *   Port                  This is the port (ie: PORTA).
@@ -89,8 +97,8 @@ usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
  *                         peripherals possible with each of the SERCOM and TIMER
  *                         functions. TIMER pins are individual, while SERCOM uses a
  *                         group of two to four pins. This group of pins can span both
- *                         peripherals. For example, pin 19 (SPI1 SCK) uses
- *                         PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
+ *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
+ *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
  *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
  *                         pin. This bitfield is also used to set the pin drive strength.
  *                         In the future, other attributes (like input buffer
@@ -110,45 +118,45 @@ usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
  *                         (ie: to avoid contention). See WVariant.h for valid entries.
  *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
  *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
- *                         available on pin A4 or pin A8). In general, only one pin
- *                         should be configured (in the pinDescription table) per TC
- *                         channel. See WVariant.h for valid entries. The tone library
- *                         uses TC5.
+ *                         available on pin A4 or pin A8 on the MT-D21E). In general,
+ *                         only one pin should be configured (in the pinDescription
+ *                         table) per TC channel. See WVariant.h for valid entries.
+ *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
  *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
  *                         WVariant.h for valid entries.
  *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
  *                         interrupt numbers are available on multiple pins (ie:
- *                         EIC/EXTINT[2] is available on pin A2 or pin A18). In general,
- *                         only one pin should be configured (in the pinDescription
- *                         table) per interrupt number. Thus, if an interrupt was needed
- *                         on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See 
- *                         WVariant.h for valid entries.
+ *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
+ *                         MT-D21E). In general, only one pin should be configured (in
+ *                         the pinDescription table) per interrupt number. Thus, if an
+ *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
+ *                         from pin 18. See WVariant.h for valid entries.
  */
 
 
 /*  Pins descriptions for the MattairTech MT-D21E
  * 
- * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (* is for default peripheral in use, ! means unavailable with this variant)
+ * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (! means unavailable with this variant)
  * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
- * | 0       | --                 | A0               |  PA00  | Xin32             | *Xin32
- * | 1       | --                 | A1               |  PA01  | Xout32            | *Xout32
- * | 2       | 2                  | A2               |  PA02  |                   | !EIC/EXTINT[2] *ADC/AIN[0] PTC/Y[0] DAC/VOUT
- * | 3       | 3                  | A3               |  PA03  | REFA              | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA *ADC/AIN[1] PTC/Y[1]
- * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFB *ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[0] !TCC0/WO[0]
- * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] *ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1]
- * | 6       | 6                  | A6               |  PA06  |                   | !EIC/EXTINT[6] *ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0]
- * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | !EIC/EXTINT[7] *ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
- * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] *TCC0/WO[0] !TCC1/WO[2]
- * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] *TCC0/WO[1] !TCC1/WO[3]
- * | 10      | 10                 | A10              |  PA10  | TX                | !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] *SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
- * | 11      | 11                 | A11              |  PA11  | RX                | !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] *SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
- * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] *TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
- * | 13      | 15                 | A15              |  PA15  | Xout              | !EIC/EXTINT[15] SERCOM2/PAD[3] *TC3/WO[1] !TCC0/WO[5] Xout
+ * | 0       | --                 | A0               |  PA00  | Xin32             | Xin32
+ * | 1       | --                 | A1               |  PA01  | Xout32            | Xout32
+ * | 2       | 2                  | A2               |  PA02  |                   | !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+ * | 3       | 3                  | A3               |  PA03  | REFA              | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+ * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[0] !TCC0/WO[0]
+ * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1]
+ * | 6       | 6                  | A6               |  PA06  |                   | !EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0]
+ * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | !EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
+ * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
+ * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
+ * | 10      | 10                 | A10              |  PA10  | TX                | !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
+ * | 11      | 11                 | A11              |  PA11  | RX                | !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
+ * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
+ * | 13      | 15                 | A15              |  PA15  | Xout              | !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
  * | 14      | --                 | NC               |  ----  |                   | Not Connected
  * | 15      | --                 | NC               |  ----  |                   | Not Connected
  * | 16      | --                 | Vbus             |  ----  |                   | USB Vbus
- * | 17      | --                 | A24-             |  PA24  | USB_NEGATIVE      | *USB/DM
- * | 18      | --                 | A25+             |  PA25  | USB_POSITIVE      | *USB/DP
+ * | 17      | --                 | A24-             |  PA24  | USB_NEGATIVE      | USB/DM
+ * | 18      | --                 | A25+             |  PA25  | USB_POSITIVE      | USB/DP
  * | 19      | --                 | Gnd              |  ----  |                   | Ground
  * | 20      | --                 | Gnd              |  ----  |                   | Ground
  * | 21      | --                 | Vin              |  ----  |                   | Vin
@@ -156,17 +164,17 @@ usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
  * | 23      | --                 | 3.3V             |  ----  |                   | 3.3V
  * | 24      | --                 | NC               |  ----  |                   | Not Connected
  * | 25      | --                 | NC               |  ----  |                   | Not Connected
- * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] *SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
- * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] *SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
- * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] *SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
- * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] *SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
- * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] *SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
- * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] *SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
- * | 32      | 27                 | A27              |  PA27  | Button A          | EIC/EXTINT[15] *Button A
- * | 33      | 28                 | A28              |  PA28  | LED               | EIC/EXTINT[8] *LED
+ * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
+ * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
+ * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+ * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
+ * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
+ * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
+ * | 32      | 27                 | A27              |  PA27  | Button A          | EIC/EXTINT[15] Button A
+ * | 33      | 28                 | A28              |  PA28  | LED               | EIC/EXTINT[8] LED
  * | 34      | --                 | NC               |  ----  |                   | Not Connected
- * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] !SERCOM1/PAD[2] *TCC1/WO[0] SWD CLK
- * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] !SERCOM1/PAD[3] *TCC1/WO[1] Button B SWD IO
+ * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] !SERCOM1/PAD[2] TCC1/WO[0] SWD CLK
+ * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] !SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
  * | 37      | --                 | NC               |  ----  |                   | Not Connected
  * | 38      | --                 | NC               |  ----  |                   | Not Connected
  * | 39      | --                 | RST              |  ----  |                   | Reset
@@ -177,7 +185,6 @@ usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
  * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 12, 13, 20, 21, 24, 25, 26, and 29.
  * Pins 0 and 1 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
  * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
- * When using pins 22 and/or 23 as pwm outputs, it will use Timer TC4, which conflicts with the servo library.
  * The tone library uses TC5.
  */
 
@@ -193,7 +200,7 @@ const PinDescription g_APinDescription[]=
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
 	
-	// 2..9 - Analog capable pins (DAC avalable on 2)
+	// 2..9 - Analog capable pins (DAC available on 2)
 	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
 	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // ADC/AIN[1]
 	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4 }, // ADC/AIN[4]
@@ -204,8 +211,8 @@ const PinDescription g_APinDescription[]=
 	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9 }, // TCC0/WO[1]
 	
 	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2] (PIN_ATTR_TIMER_ALT)
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3] (PIN_ATTR_TIMER_ALT)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2]
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3]
 	
 	// 12..13 pins don't exist
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
@@ -215,11 +222,11 @@ const PinDescription g_APinDescription[]=
 	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14 }, // TC3/WO[0], HOST_ENABLE
 	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // TC3/WO[1], ATN
 	
-	// 16..17 I2C pins (SDA/SCL) or Digital functions
+	// 16..17 SERCOM/I2C (Wire) or Digital functions
 	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // SDA: SERCOM1/PAD[0]
 	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // SCL: SERCOM1/PAD[1]
 	
-	// 18..23 - SPI Pins or Digital functions (pins 20..21 do not exist)
+	// 18..23 - SERCOM/SPI (SPI) or Digital functions (pins 20..21 do not exist)
 	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2 }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
 	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3 }, // SPI SCK: SERCOM3/PAD[3] (PIN_ATTR_SERCOM_ALT)
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
@@ -250,6 +257,7 @@ SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 SERCOM sercom3( SERCOM3 ) ;
 
+#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
@@ -262,4 +270,5 @@ void SERCOM2_Handler()
 {
   Serial2.IrqHandler();
 }
+#endif
 
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index 2b2daa86a..f81124c20 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -55,6 +55,8 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
+#define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
+
 #define PINS_COUNT           (32u)
 #define NUM_DIGITAL_PINS     (32u)
 #define NUM_ANALOG_INPUTS    (10u)
@@ -205,7 +207,7 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define SERCOM_INSTANCE_WIRE           &sercom1
 
 #define SERCOM_WIRE_HANDLER_MACRO \
-void SERCOM3_Handler(void) { \
+void SERCOM1_Handler(void) { \
 	Wire.onService(); \
 }
 
diff --git a/variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld
index 4475f9511..fa207ff27 100644
--- a/variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld
+++ b/variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld
@@ -142,6 +142,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld
index 0162f0774..ca391b2b1 100644
--- a/variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld
+++ b/variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld
@@ -143,6 +143,7 @@ SECTIONS
 	{
 		__data_start__ = .;
 		*(vtable)
+		*(.ramfunc*)
 		*(.data*)
 
 		. = ALIGN(4);
diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp
index 84df4033e..4377a2fbb 100644
--- a/variants/arduino_zero/variant.cpp
+++ b/variants/arduino_zero/variant.cpp
@@ -15,50 +15,130 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
+/*   The PinDescription table describes how each of the pins can be used by the Arduino
+ *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+ *   communications, etc.), and the PinDescription table configures which functions can
+ *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
+ *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
+ *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+ *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+ *   verify that the pin can perform the function requested, and to configure the pin for
+ *   that function. Most of the contents of pinMode() are now in pinPeripheral().
+ * 
+ *   There are two ways that pins can be mapped. The first is to map pins contiguously
+ *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
+ *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
+ *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
+ *   This only works when there is one port. Because not all port pins are available,
+ *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
+ *   For an example of both types, see variant.cpp from the MT-D11 variant.
+ * 
+ *   Explanation of PinDescription table:
+ * 
+ *   Port                  This is the port (ie: PORTA).
+ *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
+ *   PinType               This indicates what peripheral function the pin can be
+ *                         attached to. In most cases, this is PIO_MULTI, which means
+ *                         that the pin can be anything listed in the PinAttribute field.
+ *                         It can also be set to a specific peripheral. In this case, any
+ *                         attempt to configure the pin (using pinPeripheral or pinMode)
+ *                         as anything else will fail (and pinPeripheral will return -1).
+ *                         This can be used to prevent accidental re-configuration of a
+ *                         pin that is configured for only one function (ie: USB D- and
+ *                         D+ pins). If a pin is not used or does not exist,
+ *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
+ *                         for valid entries. These entries are also used as a parameter
+ *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
+ *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
+ *                         the desired mode. Note that this field is not used to select
+ *                         between the two peripherals possible with each of the SERCOM
+ *                         and TIMER functions. PeripheralAttribute is now used for this.
+ *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
+ *                         configuration. It is primarily used to select between the two
+ *                         peripherals possible with each of the SERCOM and TIMER
+ *                         functions. TIMER pins are individual, while SERCOM uses a
+ *                         group of two to four pins. This group of pins can span both
+ *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
+ *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
+ *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
+ *                         pin. This bitfield is also used to set the pin drive strength.
+ *                         In the future, other attributes (like input buffer
+ *                         configuration) may be added. See WVariant.h for valid entries.
+ *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
+ *                         peripheral functions that a pin can attach to. This includes
+ *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
+ *                         shorthand for a combination of other attributes.
+ *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
+ *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
+ *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+ *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
+ *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
+ *                         bitfield is useful for limiting a pin to only input related
+ *                         functions or output functions. This allows a pin to have a
+ *                         more flexible configuration, while restricting the direction
+ *                         (ie: to avoid contention). See WVariant.h for valid entries.
+ *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
+ *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
+ *                         available on pin A4 or pin A8 on the MT-D21E). In general,
+ *                         only one pin should be configured (in the pinDescription
+ *                         table) per TC channel. See WVariant.h for valid entries.
+ *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
+ *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
+ *                         WVariant.h for valid entries.
+ *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
+ *                         interrupt numbers are available on multiple pins (ie:
+ *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
+ *                         MT-D21E). In general, only one pin should be configured (in
+ *                         the pinDescription table) per interrupt number. Thus, if an
+ *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
+ *                         from pin 18. See WVariant.h for valid entries.
+ */
+
 /*
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * + Pin number +  ZERO Board pin  |  PIN   | Label/Name      | Comments (* is for default peripheral in use)
+ * + Pin number +  ZERO Board pin  |  PIN   | Label/Name      | Comments (* is for available peripherals with this configuration)
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            | Digital Low      |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 0          | 0 -> RX          |  PA11  |                 | EIC/EXTINT[11] ADC/AIN[19]           PTC/X[3] *SERCOM0/PAD[3]  SERCOM2/PAD[3]  TCC0/WO[3]  TCC1/WO[1]
- * | 1          | 1 <- TX          |  PA10  |                 | EIC/EXTINT[10] ADC/AIN[18]           PTC/X[2] *SERCOM0/PAD[2]                  TCC0/WO[2]  TCC1/WO[0]
- * | 2          | 2                |  PA14  |                 | EIC/EXTINT[14]                                 SERCOM2/PAD[2]  SERCOM4/PAD[2]  TC3/WO[0]   TCC0/WO[4]
- * | 3          | ~3               |  PA09  |                 | EIC/EXTINT[9]  ADC/AIN[17]           PTC/X[1]  SERCOM0/PAD[1]  SERCOM2/PAD[1] *TCC0/WO[1]  TCC1/WO[3]
- * | 4          | ~4               |  PA08  |                 | EIC/NMI        ADC/AIN[16]           PTC/X[0]  SERCOM0/PAD[0]  SERCOM2/PAD[0] *TCC0/WO[0]  TCC1/WO[2]
- * | 5          | ~5               |  PA15  |                 | EIC/EXTINT[15]                                 SERCOM2/PAD[3]  SERCOM4/PAD[3] *TC3/WO[1]   TCC0/WO[5]
- * | 6          | ~6               |  PA20  |                 | EIC/EXTINT[4]                        PTC/X[8]  SERCOM5/PAD[2]  SERCOM3/PAD[2]             *TCC0/WO[6]
- * | 7          | 7                |  PA21  |                 | EIC/EXTINT[5]                        PTC/X[9]  SERCOM5/PAD[3]  SERCOM3/PAD[3]              TCC0/WO[7]
+ * | 0          | 0 -> RX          |  PA11  |                 | *EIC/EXTINT[11] *ADC/AIN[19]           PTC/X[3] *SERCOM0/PAD[3]   SERCOM2/PAD[3]  TCC0/WO[3]  TCC1/WO[1]
+ * | 1          | 1 <- TX          |  PA10  |                 | *EIC/EXTINT[10] *ADC/AIN[18]           PTC/X[2] *SERCOM0/PAD[2]                   TCC0/WO[2]  TCC1/WO[0]
+ * | 2          | 2                |  PA14  |                 | *EIC/EXTINT[14]                                  SERCOM2/PAD[2]   SERCOM4/PAD[2]  TC3/WO[0]   TCC0/WO[4]
+ * | 3          | ~3               |  PA09  |                 | *EIC/EXTINT[9]  *ADC/AIN[17]           PTC/X[1]  SERCOM0/PAD[1]  *SERCOM2/PAD[1] *TCC0/WO[1]  TCC1/WO[3]
+ * | 4          | ~4               |  PA08  |                 | *EIC/NMI        *ADC/AIN[16]           PTC/X[0]  SERCOM0/PAD[0]  *SERCOM2/PAD[0] *TCC0/WO[0]  TCC1/WO[2]
+ * | 5          | ~5               |  PA15  |                 | *EIC/EXTINT[15]                                  SERCOM2/PAD[3]   SERCOM4/PAD[3] *TC3/WO[1]   TCC0/WO[5]
+ * | 6          | ~6               |  PA20  |                 | *EIC/EXTINT[4]                         PTC/X[8]  SERCOM5/PAD[2]   SERCOM3/PAD[2]             *TCC0/WO[6]
+ * | 7          | 7                |  PA21  |                 | *EIC/EXTINT[5]                         PTC/X[9]  SERCOM5/PAD[3]   SERCOM3/PAD[3]              TCC0/WO[7]
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            | Digital High     |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 8          | ~8               |  PA06  |                 | EIC/EXTINT[6]  ADC/AIN[6]  AC/AIN[2] PTC/Y[4]  SERCOM0/PAD[2]                 *TCC1/WO[0]
- * | 9          | ~9               |  PA07  |                 | EIC/EXTINT[7]  ADC/AIN[7]  AC/AIN[3] PTC/Y[5]  SERCOM0/PAD[3]                 *TCC1/WO[1]
- * | 10         | ~10              |  PA18  |                 | EIC/EXTINT[2]                        PTC/X[6] +SERCOM1/PAD[2]  SERCOM3/PAD[2] *TC3/WO[0]    TCC0/WO[2]
- * | 11         | ~11              |  PA16  |                 | EIC/EXTINT[0]                        PTC/X[4] +SERCOM1/PAD[0]  SERCOM3/PAD[0] *TCC2/WO[0]   TCC0/WO[6]
- * | 12         | ~12              |  PA19  |                 | EIC/EXTINT[3]                        PTC/X[7] +SERCOM1/PAD[3]  SERCOM3/PAD[3]  TC3/WO[1]   *TCC0/WO[3]
- * | 13         | ~13              |  PA17  | LED             | EIC/EXTINT[1]                        PTC/X[5] +SERCOM1/PAD[1]  SERCOM3/PAD[1] *TCC2/WO[1]   TCC0/WO[7]
+ * | 8          | ~8               |  PA06  |                 | EIC/EXTINT[6]  *ADC/AIN[6]  AC/AIN[2] PTC/Y[4]  SERCOM0/PAD[2]                 *TCC1/WO[0]
+ * | 9          | ~9               |  PA07  |                 | EIC/EXTINT[7]  *ADC/AIN[7]  AC/AIN[3] PTC/Y[5]  SERCOM0/PAD[3]                 *TCC1/WO[1]
+ * | 10         | ~10              |  PA18  |                 | *EIC/EXTINT[2]                        PTC/X[6] *SERCOM1/PAD[2]  SERCOM3/PAD[2] *TC3/WO[0]    TCC0/WO[2]
+ * | 11         | ~11              |  PA16  |                 | *EIC/EXTINT[0]                        PTC/X[4] *SERCOM1/PAD[0]  SERCOM3/PAD[0] *TCC2/WO[0]   TCC0/WO[6]
+ * | 12         | ~12              |  PA19  |                 | *EIC/EXTINT[3]                        PTC/X[7] *SERCOM1/PAD[3]  SERCOM3/PAD[3]  TC3/WO[1]   *TCC0/WO[3]
+ * | 13         | ~13              |  PA17  | LED             | *EIC/EXTINT[1]                        PTC/X[5] *SERCOM1/PAD[1]  SERCOM3/PAD[1] *TCC2/WO[1]   TCC0/WO[7]
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            | Analog Connector |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 14         | A0               |  PA02  | A0              | EIC/EXTINT[2] *ADC/AIN[0]  DAC/VOUT  PTC/Y[0]
- * | 15         | A1               |  PB08  | A1              | EIC/EXTINT[8] *ADC/AIN[2]            PTC/Y[14] SERCOM4/PAD[0]                  TC4/WO[0]
- * | 16         | A2               |  PB09  | A2              | EIC/EXTINT[9] *ADC/AIN[3]            PTC/Y[15] SERCOM4/PAD[1]                  TC4/WO[1]
- * | 17         | A3               |  PA04  | A3              | EIC/EXTINT[4] *ADC/AIN[4]  AC/AIN[0] PTC/Y[2]  SERCOM0/PAD[0]                  TCC0/WO[0]
- * | 18         | A4               |  PA05  | A4              | EIC/EXTINT[5] *ADC/AIN[5]  AC/AIN[1] PTC/Y[5]  SERCOM0/PAD[1]                  TCC0/WO[1]
- * | 19         | A5               |  PB02  | A5              | EIC/EXTINT[2] *ADC/AIN[10]           PTC/Y[8]  SERCOM5/PAD[0]
+ * | 14         | A0               |  PA02  | A0              | EIC/EXTINT[2]  *ADC/AIN[0]  *DAC/VOUT  PTC/Y[0]
+ * | 15         | A1               |  PB08  | A1              | *EIC/EXTINT[8] *ADC/AIN[2]            PTC/Y[14] SERCOM4/PAD[0]                  TC4/WO[0]
+ * | 16         | A2               |  PB09  | A2              | EIC/EXTINT[9]  *ADC/AIN[3]            PTC/Y[15] SERCOM4/PAD[1]                  TC4/WO[1]
+ * | 17         | A3               |  PA04  | A3              | EIC/EXTINT[4]  *ADC/AIN[4]  AC/AIN[0] PTC/Y[2]  SERCOM0/PAD[0]                  TCC0/WO[0]
+ * | 18         | A4               |  PA05  | A4              | EIC/EXTINT[5]  *ADC/AIN[5]  AC/AIN[1] PTC/Y[5]  SERCOM0/PAD[1]                  TCC0/WO[1]
+ * | 19         | A5               |  PB02  | A5              | EIC/EXTINT[2]  *ADC/AIN[10]           PTC/Y[8]  SERCOM5/PAD[0]
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            | Wire             |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 20         | SDA              |  PA22  | SDA             | EIC/EXTINT[6]                        PTC/X[10] *SERCOM3/PAD[0] SERCOM5/PAD[0] TC4/WO[0] TCC0/WO[4]
- * | 21         | SCL              |  PA23  | SCL             | EIC/EXTINT[7]                        PTC/X[11] *SERCOM3/PAD[1] SERCOM5/PAD[1] TC4/WO[1] TCC0/WO[5]
+ * | 20         | SDA              |  PA22  | SDA             | *EIC/EXTINT[6]                        PTC/X[10] *SERCOM3/PAD[0] SERCOM5/PAD[0] *TC4/WO[0] TCC0/WO[4]
+ * | 21         | SCL              |  PA23  | SCL             | *EIC/EXTINT[7]                        PTC/X[11] *SERCOM3/PAD[1] SERCOM5/PAD[1] *TC4/WO[1] TCC0/WO[5]
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            |SPI (Legacy ICSP) |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 22         | 1                |  PA12  | MISO            | EIC/EXTINT[12] SERCOM2/PAD[0] *SERCOM4/PAD[0] TCC2/WO[0] TCC0/WO[6]
+ * | 22         | 1                |  PA12  | MISO            | *EIC/EXTINT[12] SERCOM2/PAD[0] *SERCOM4/PAD[0] TCC2/WO[0] TCC0/WO[6]
  * |            | 2                |        | 5V0             |
- * | 23         | 4                |  PB10  | MOSI            | EIC/EXTINT[10]                *SERCOM4/PAD[2] TC5/WO[0]  TCC0/WO[4]
- * | 24         | 3                |  PB11  | SCK             | EIC/EXTINT[11]                *SERCOM4/PAD[3] TC5/WO[1]  TCC0/WO[5]
+ * | 23         | 4                |  PB10  | MOSI            | EIC/EXTINT[10]                *SERCOM4/PAD[2] *TC5/WO[0]  TCC0/WO[4]
+ * | 24         | 3                |  PB11  | SCK             | EIC/EXTINT[11]                *SERCOM4/PAD[3] *TC5/WO[1]  TCC0/WO[5]
  * |            | 5                |        | RESET           |
  * |            | 6                |        | GND             |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
@@ -86,7 +166,7 @@
  * | 36         |                  |  PA18  | EDBG_SS         | EIC/EXTINT[2] *SERCOM1/PAD[2] SERCOM3/PAD[2] TC3/WO[0]  TCC0/WO[2]
  * | 37         |                  |  PA17  | EDBG_SCK        | EIC/EXTINT[1] *SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] TCC0/WO[7]
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 38         | ATN              |  PA13  | EDBG_GPIO0      | EIC/EXTINT[13] SERCOM2/PAD[1] SERCOM4/PAD[1] *TCC2/WO[1] TCC0/WO[7]
+ * | 38         | ATN              |  PA13  | EDBG_GPIO0      | *EIC/EXTINT[13] SERCOM2/PAD[1] SERCOM4/PAD[1] TCC2/WO[1] TCC0/WO[7]
  * | 39         |                  |  PA21  | EDBG_GPIO1      | Pin 7
  * | 40         |                  |  PA06  | EDBG_GPIO2      | Pin 8
  * | 41         |                  |  PA07  | EDBG_GPIO3      | Pin 9
@@ -94,7 +174,7 @@
  * |            |                  |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            | GND              |        |                 |
- * | 42         | AREF             |  PA03  |                 | EIC/EXTINT[3] *[ADC|DAC]/VREFA ADC/AIN[1] PTC/Y[1]
+ * | 42         | AREF             |  PA03  |                 | EIC/EXTINT[3] *[ADC|DAC]/VREFA *ADC/AIN[1] PTC/Y[1]
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
  * |            |32.768KHz Crystal |        |                 |
  * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
@@ -114,87 +194,88 @@ const PinDescription g_APinDescription[]=
   // 0..13 - Digital pins
   // ----------------------
   // 0/1 - SERCOM/UART (Serial1)
-  { PORTA, 11, PIO_SERCOM, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // RX: SERCOM0/PAD[3]
-  { PORTA, 10, PIO_SERCOM, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 }, // TX: SERCOM0/PAD[2]
+  { PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel19, EXTERNAL_INT_11 }, // RX: SERCOM0/PAD[3]
+  { PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel18, EXTERNAL_INT_10 }, // TX: SERCOM0/PAD[2]
 
   // 2..12
   // Digital Low
-  { PORTA, 14, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_14 },
-  { PORTA,  9, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
-  { PORTA,  8, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI },  // TCC0/WO[0]
-  { PORTA, 15, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH1, TC3_CH1, EXTERNAL_INT_15 }, // TC3/WO[1]
-  { PORTA, 20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_4 }, // TCC0/WO[6]
-  { PORTA, 21, PIO_DIGITAL, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
+  { PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_14 },
+  { PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9 }, // TCC0/WO[1] SCL: SERCOM2/PAD[1]
+  { PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI }, // TCC0/WO[0] SDA: SERCOM2/PAD[0]
+  { PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_15 }, // TC3/WO[1]
+  { PORTA, 20, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH6, No_ADC_Channel, EXTERNAL_INT_4 }, // TCC0/WO[6]
+  { PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5 },
 
   // Digital High
-  { PORTA,  6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_4 }, // TCC1/WO[0]
-  { PORTA,  7, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_5 }, // TCC1/WO[1]
-  { PORTA, 18, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM3_CH0, TC3_CH0, EXTERNAL_INT_2 }, // TC3/WO[0]
-  { PORTA, 16, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, // TCC2/WO[0]
-  { PORTA, 19, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_3 }, // TCC0/WO[3]
+  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE }, // TCC1/WO[0] ADC/AIN[6]
+  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE }, // TCC1/WO[1] ADC/AIN[7]
+  { PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2 }, // TC3/WO[0] SS: SERCOM1/PAD[2]
+  { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // TCC2/WO[0] MOSI: SERCOM1/PAD[0]
+  { PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3 }, // TCC0/WO[3] MISO: SERCOM1/PAD[3]
 
   // 13 (LED)
-  { PORTA, 17, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM2_CH1, NOT_ON_TIMER, EXTERNAL_INT_1 }, // TCC2/WO[1]
+  { PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // TCC2/WO[1] SCK: SERCOM1/PAD[1]
 
   // 14..19 - Analog pins
   // --------------------
-  { PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[0]
-  { PORTB,  8, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // ADC/AIN[2]
-  { PORTB,  9, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel3, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // ADC/AIN[3]
-  { PORTA,  4, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
-  { PORTA,  5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
-  { PORTB,  2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[10]
+  { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
+  { PORTB,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel2, EXTERNAL_INT_8 }, // ADC/AIN[2]
+  { PORTB,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel3, EXTERNAL_INT_NONE }, // ADC/AIN[3]
+  { PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_NONE }, // ADC/AIN[4]
+  { PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_NONE }, // ADC/AIN[5]
+  { PORTB,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel10, EXTERNAL_INT_NONE }, // ADC/AIN[10]
 
   // 20..21 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
   // ----------------------
-  { PORTA, 22, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
-  { PORTA, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]
+  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
+  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]
 
   // 22..24 - SPI pins (ICSP:MISO,SCK,MOSI)
   // ----------------------
-  { PORTA, 12, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_12 }, // MISO: SERCOM4/PAD[0]
-  { PORTB, 10, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 }, // MOSI: SERCOM4/PAD[2]
-  { PORTB, 11, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // SCK: SERCOM4/PAD[3]
+  { PORTA, 12, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_12 }, // MISO: SERCOM4/PAD[0]
+  { PORTB, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[2]
+  { PORTB, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[3]
 
   // 25..26 - RX/TX LEDS (PB03/PA27)
   // --------------------
-  { PORTB,  3, PIO_OUTPUT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as output only
-  { PORTA, 27, PIO_OUTPUT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // used as output only
+  { PORTB,  3, PIO_OUTPUT, PER_ATTR_DRIVE_STRONG, PIN_ATTR_OUTPUT, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // used as output only
+  { PORTA, 27, PIO_OUTPUT, PER_ATTR_DRIVE_STRONG, PIN_ATTR_OUTPUT, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // used as output only
 
   // 27..29 - USB
   // --------------------
-  { PORTA, 28, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB Host enable
-  { PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DM
-  { PORTA, 25, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DP
+  { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB Host enable
+  { PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DM
+  { PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DP
 
   // 30..41 - EDBG
   // ----------------------
   // 30/31 - EDBG/UART
-  { PORTB, 22, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // TX: SERCOM5/PAD[2]
-  { PORTB, 23, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
+  { PORTB, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // TX: SERCOM5/PAD[2]
+  { PORTB, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
 
-  // 32/33 I2C (SDA/SCL and also EDBG:SDA/SCL)
-  { PORTA, 22, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SDA: SERCOM3/PAD[0]
-  { PORTA, 23, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCL: SERCOM3/PAD[1]
+	// 32/33 I2C (SDA/SCL and also EDBG:SDA/SCL). These are duplicate entries of pins 20 and 21
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]
 
-  // 34..37 - EDBG/SPI
-  { PORTA, 19, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MISO: SERCOM1/PAD[3]
-  { PORTA, 16, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // MOSI: SERCOM1/PAD[0]
-  { PORTA, 18, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SS: SERCOM1/PAD[2]
-  { PORTA, 17, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SCK: SERCOM1/PAD[1]
+	// 34..37 - EDBG/SPI. These are duplicate entries of pins 12, 11, 10, and 13.
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3 }, // MISO: SERCOM1/PAD[3]
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // MOSI: SERCOM1/PAD[0]
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2 }, // SS: SERCOM1/PAD[2]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // SCK: SERCOM1/PAD[1]
 
   // 38..41 - EDBG/Digital
-  { PORTA, 13, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM0_CH5, NOT_ON_TIMER, EXTERNAL_INT_13 }, // EIC/EXTINT[13] *TCC2/WO[1] TCC0/WO[7]
-  { PORTA, 21, PIO_PWM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM0_CH7, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Pin 7
-  { PORTA,  6, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH0, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Pin 8
-  { PORTA,  7, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH1, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // Pin 9
+  { PORTA, 13, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_13 }, // EIC/EXTINT[13] PIN_ATN
+
+	// 39..41 These are duplicate entries of pins 7, 8, and 9 so that AREF and DAC are still available on pins 42 and 43
+	{ PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5 },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE }, // TCC1/WO[0] ADC/AIN[6]
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE }, // TCC1/WO[1] ADC/AIN[7]
 
   // 42 (AREF)
-  { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VREFP
+  { PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // VREF ADC/AIN[1]
 
-  // ----------------------
-  // 43 - Alternate use of A0 (DAC output)
-  { PORTA,  2, PIO_ANALOG, PIN_ATTR_ANALOG, DAC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // DAC/VOUT
+	// 43 - Alternate use of A0 (DAC output). This is a duplicate entry of pin 
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
 } ;
 
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
@@ -207,8 +288,9 @@ SERCOM sercom3( SERCOM3 ) ;
 SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 
-Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
-Uart Serial( &sercom5, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;
+#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+Uart Serial( SERCOM_INSTANCE_SERIAL, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;
 void SERCOM0_Handler()
 {
   Serial1.IrqHandler();
@@ -218,4 +300,5 @@ void SERCOM5_Handler()
 {
   Serial.IrqHandler();
 }
+#endif
 
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index a1f1506e4..d09f51545 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -50,9 +50,11 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
+#define NUM_PIN_DESCRIPTION_ENTRIES     (44u)
+
 #define PINS_COUNT           (26u)
 #define NUM_DIGITAL_PINS     (14u)
-#define NUM_ANALOG_INPUTS    (6u)
+#define NUM_ANALOG_INPUTS    (13u)
 #define NUM_ANALOG_OUTPUTS   (1u)
 
 #define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
@@ -61,7 +63,7 @@ extern "C"
 #define portOutputRegister(port)   ( &(port->OUT.reg) )
 #define portInputRegister(port)    ( &(port->IN.reg) )
 #define portModeRegister(port)     ( &(port->DIR.reg) )
-#define digitalPinHasPWM(P)        ( g_APinDescription[P].ulPWMChannel != NOT_ON_PWM || g_APinDescription[P].ulTCChannel != NOT_ON_TIMER )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
 
 /*
  * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
@@ -102,6 +104,15 @@ static const uint8_t A4  = PIN_A4 ;
 static const uint8_t A5  = PIN_A5 ;
 #define ADC_RESOLUTION		12
 
+// #define REMAP_ANALOG_PIN_ID	while(0)
+#define REMAP_ANALOG_PIN_ID	if ( ulPin < A0 ) ulPin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#define REFA_PIN    (42ul)
+
 // Other pins
 #define PIN_ATN              (38ul)
 static const uint8_t ATN = PIN_ATN;
@@ -115,16 +126,20 @@ static const uint8_t ATN = PIN_ATN;
 #define PAD_SERIAL_TX       (UART_TX_PAD_2)
 #define PAD_SERIAL_RX       (SERCOM_RX_PAD_3)
 
+#define SERCOM_INSTANCE_SERIAL       &sercom5
+
 // Serial1
 #define PIN_SERIAL1_RX       (0ul)
 #define PIN_SERIAL1_TX       (1ul)
 #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
 #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
 
+#define SERCOM_INSTANCE_SERIAL1       &sercom0
+
 /*
  * SPI Interfaces
  */
-#define SPI_INTERFACES_COUNT 1
+#define SPI_INTERFACES_COUNT 2
 
 #define PIN_SPI_MISO         (22u)
 #define PIN_SPI_MOSI         (23u)
@@ -135,20 +150,46 @@ static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
+#define SERCOM_INSTANCE_SPI           &sercom4
+
+#define PIN_SPI1_MISO         (19u)
+#define PIN_SPI1_MOSI         (16u)
+#define PIN_SPI1_SCK          (17u)
+
+#define SERCOM_INSTANCE_SPI1          &sercom1
+
 /*
  * Wire Interfaces
  */
-#define WIRE_INTERFACES_COUNT 1
+#define WIRE_INTERFACES_COUNT 2
 
 #define PIN_WIRE_SDA         (20u)
 #define PIN_WIRE_SCL         (21u)
 
+#define SERCOM_INSTANCE_WIRE          &sercom3
+
+#define SERCOM_WIRE_HANDLER_MACRO \
+void SERCOM3_Handler(void) { \
+	Wire.onService(); \
+}
+
+#define PIN_WIRE_SDA1         (4u)
+#define PIN_WIRE_SCL1         (3u)
+
+#define SERCOM_INSTANCE_WIRE1         &sercom2
+
+#define SERCOM_WIRE1_HANDLER_MACRO \
+void SERCOM2_Handler(void) { \
+	Wire1.onService(); \
+}
+
 /*
  * USB
  */
-#define PIN_USB_HOST_ENABLE (27ul)
 #define PIN_USB_DM          (28ul)
 #define PIN_USB_DP          (29ul)
+#define PIN_USB_HOST_ENABLE (27ul)
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
 
 #ifdef __cplusplus
 }

From 11306d6d9a575561828cb899011b8c5f8925dd0e Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 11 Aug 2015 07:55:33 +0000
Subject: [PATCH 011/124] Minor documentation update

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 951924302..1577f0ee1 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ Other   INT    PWM   Digital  Analog                      Digital  PWM   INT
 DAC                    2    2 (ADC0)  | A2   | USB |  Gnd |
 REF                    3    3 (ADC1)  | A3   |     |  Vcc |
 VDIV   INT4   TCC0[0]  4    4 (ADC2)  | A4    -----   A31 |  31  TC2[1]  INT3  RX / SWDIO
-       INT5   TCC0[1]  5    5 (ADC3)  | A5            A30 |  30  TC2[0]       TX / SWDCLK  
+       INT5   TCC0[1]  5    5 (ADC3)  | A5            A30 |  30  TC2[0]       TX / SWDCLK
               TCC0[2]  6    6 (ADC4)  | A6            A27 |  27          INT7
               TCC0[3]  7    7 (ADC5)  | A7            A23 |  23                 I2C/SCL
 SPI MOSI  INT2         10   10 (ADC8) | A10           A22 |  22          INT6   I2C/SDA
@@ -168,7 +168,6 @@ while (!Serial) ;
 ```
 
 Remember that if the sketch needs to run without SerialUSB connected, another approach must be used.
-
 You can also reset the board manually with the Reset button if you wish to restart your sketch. However, pressing
 the Reset button will reset the SAMD chip, which in turn will reset USB communication. This interruption means
 that if the serial monitor is open, it will be necessary to close and re-open it to restart communication.
@@ -176,14 +175,14 @@ that if the serial monitor is open, it will be necessary to close and re-open it
 
 ## Code Size and RAM Usage
 
-Sketch and Configuration    | MT-D21E (Code + RAM) | MT-D11 (Code + RAM)
-----------------------------|----------------------|-----------------------
-Blink (CDC + HID + UART)    |     7564 + 1524      |     7452 + 1424
-Blink (CDC + UART)          |     6588 + 1496      |     6484 + 1396
-Blink (CDC Only)            |     5248 + 1304      |     5192 + 1300
-Blink (UART Only)           |     3828 + 336       |     3716 + 236
-Blink (No USB or UART)      |     2472 + 144       |     2416 + 140
-Datalogger (No USB or UART) |     10340 + 948      |     10260 + 944
+Sketch and Configuration    | MT-D21E (Flash + RAM) | MT-D11 (Flash + RAM)
+----------------------------|-----------------------|-----------------------
+Blink (CDC + HID + UART)    |     7564 + 1524       |     7452 + 1424
+Blink (CDC + UART)          |     6588 + 1496       |     6484 + 1396
+Blink (CDC Only)            |     5248 + 1304       |     5192 + 1300
+Blink (UART Only)           |     3828 + 336        |     3716 + 236
+Blink (No USB or UART)      |     2472 + 144        |     2416 + 140
+Datalogger (No USB or UART) |     10340 + 948       |     10260 + 944
 
 * 180 bytes of flash can be saved on the MT-D11 by using PIN_MAP_COMPACT (see 'New PinDescription Table' below).
 * Datalogger compiled without USB or UART support, but with SPI and SD (with FAT filesystem) support. Serial output was disabled.
@@ -273,7 +272,7 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 The SAM-BA bootloader has both a CDC USB interface, and a UART interface (MT-D21E: TX: pin 10, RX: pin 11). It is
 compatible with the Arduino IDE (Zero compatible), or it can be used with the Bossac tool standalone. Under
 Arduino, auto-reset is supported (automatically runs the bootloader while the sketch is running) as well as
-automatic return freom reset. The SAM-BA bootloader described here adds to the Arduino version, which in
+automatic return from reset. The SAM-BA bootloader described here adds to the Arduino version, which in
 turn is based on the bootloader from Atmel. The Arduino version added several features, including three
 new commands (Arduino Extended Capabilities) that increase upload speed. The bootloader normally requires
 8 KB FLASH, however, a 4 KB version can be used for the D11 chips.
@@ -454,6 +453,7 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 ## Possible Future Additions
 
 * Port Servo library
+* Features for lower power consumption
 * Replace pulse with timer capture
 * MIDI USB Device Class
 * MSC (Mass Storage) USB Device Class

From 5d04db2cdcd71e09831a217d0cfb3929b5f6f4c1 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 12 Nov 2015 04:08:36 +0000
Subject: [PATCH 012/124] Fix deprecated recipe.ar.pattern warning and minor
 documentation update.

---
 README.md    | 5 +++--
 platform.txt | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1577f0ee1..37ea5401d 100644
--- a/README.md
+++ b/README.md
@@ -196,7 +196,8 @@ Datalogger (No USB or UART) |     10340 + 948       |     10260 + 944
 The flash used message at the end of compilation is not correct. The number shown
 represents the .text segment only. However, Flash usage = .text + .data segments
 (RAM usage = .data + .bss segments). In this release, two programs are run at the
-end of compilation to provide more detailed memory usage.
+end of compilation to provide more detailed memory usage. To enable this output, go
+to File->Preferences and beside "Show verbose output during:", check "compilation".
 
 Just above the normal flash usage message, is the output from the size utility.
 However, this output is also incorrect, as it shows .text+.data in the .text field,
@@ -267,7 +268,7 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 13. You can now upload your own sketch.
 
 
-## SAM-BA USB CDC Bootloader (Arduino Zero compatible)
+## SAM-BA USB CDC Bootloader (Arduino compatible)
 
 The SAM-BA bootloader has both a CDC USB interface, and a UART interface (MT-D21E: TX: pin 10, RX: pin 11). It is
 compatible with the Arduino IDE (Zero compatible), or it can be used with the Bossac tool standalone. Under
diff --git a/platform.txt b/platform.txt
index 1aa1b7dcb..6ab1cdde2 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=MattairTech SAMD Boards
-version=1.6.5-mt2
+version=1.6.6-mt1
 
 
 # Compile variables
@@ -89,7 +89,7 @@ recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -D
 recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
 
 ## Create archives
-recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
+recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
 recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group -lm "{build.path}/{archive_file}" -Wl,--end-group
@@ -111,6 +111,7 @@ recipe.output.save_file={build.project_name}.{build.variant}.bin
 recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
 recipe.size.regex=\.text\s+([0-9]+).*
 
+
 # Uploader tools
 # --------------
 

From 8822a24903c5efa774d340816b5ed2cea8103224 Mon Sep 17 00:00:00 2001
From: Erin Tomson <erin@integerlabs.net>
Date: Fri, 24 Jul 2015 23:08:36 -0700
Subject: [PATCH 013/124] Fix two bugs that can cause deadlock conditions when
 i2c bus errors occur.

The first occurs when starting a read transaction from a slave that doesn't respond. The code would wait until the SB (slave on bus) bit is set in the INTFLAGS register, but when a nack occurs that never happens so we're stuck in an infinite loop. The fix is to also look for the MB flag to be set. If it is, issue a stop condition and return.

The second happens when a bus error (ie, an illegal stop condition) occurs while sending data as a master. In that case we are waiting for the MB (master on bus) flag to be set. When a bus error occurs that never happens, so again we end up in an infinite loop. The fix here is to also look for the BUSERR flag to be set. If it is, return an error condition.
---
 cores/arduino/SERCOM.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index 77822e3ea..c7a829284 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -522,6 +522,12 @@ bool SERCOM::startTransmissionWIRE(uint8_t address, SercomWireReadWriteFlag flag
   {
     while( !sercom->I2CM.INTFLAG.bit.SB )
     {
+        // If the slave NACKS the address, the MB bit will be set.
+        // In that case, send a stop condition and return false.
+        if (sercom->I2CM.INTFLAG.bit.MB) {
+            sercom->I2CM.CTRLB.bit.CMD = 3; // Stop condition
+            return false;
+        }
       // Wait transmission complete
     }
 
@@ -547,7 +553,14 @@ bool SERCOM::sendDataMasterWIRE(uint8_t data)
   sercom->I2CM.DATA.bit.DATA = data;
 
   //Wait transmission successful
-  while(!sercom->I2CM.INTFLAG.bit.MB);
+  while(!sercom->I2CM.INTFLAG.bit.MB) {
+
+    // If a bus error occurs, the MB bit may never be set.
+    // Check the bus error bit and bail if it's set.
+    if (sercom->I2CM.STATUS.bit.BUSERR) {
+      return false;
+    }
+  }
 
   //Problems on line? nack received?
   if(sercom->I2CM.STATUS.bit.RXNACK)

From d36b39e6a7117910f3f55e04d4d97371b1f9f6b9 Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Mon, 10 Aug 2015 13:36:31 +0200
Subject: [PATCH 014/124] [zero] prepare variant for SPI and Wire board
 parameters

---
 variants/arduino_zero/variant.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index d09f51545..cba41051f 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -144,6 +144,9 @@ static const uint8_t ATN = PIN_ATN;
 #define PIN_SPI_MISO         (22u)
 #define PIN_SPI_MOSI         (23u)
 #define PIN_SPI_SCK          (24u)
+#define PERIPH_SPI           sercom4
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
 
 static const uint8_t SS	  = PIN_A2 ;	// SERCOM4 last PAD is present on A2 but HW SS isn't used. Set here only for reference.
 static const uint8_t MOSI = PIN_SPI_MOSI ;
@@ -165,6 +168,8 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 
 #define PIN_WIRE_SDA         (20u)
 #define PIN_WIRE_SCL         (21u)
+#define PERIPH_WIRE          sercom3
+#define WIRE_IT_HANDLER      SERCOM3_Handler
 
 #define SERCOM_INSTANCE_WIRE          &sercom3
 

From 4273307910e811d5f1c107f9bafd8c73db40993f Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Mon, 10 Aug 2015 13:39:31 +0200
Subject: [PATCH 015/124] [zero] Bring more customization to SPI class

---
 libraries/SPI/SPI.cpp           | 21 +++++++++++++--------
 libraries/SPI/SPI.h             |  7 ++++++-
 variants/MT_D11/variant.h       |  5 +++--
 variants/MT_D21E/variant.h      |  5 +++--
 variants/arduino_zero/variant.h |  7 +++----
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index b419b0dad..89a28c6de 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -28,15 +28,20 @@
 
 const SPISettings DEFAULT_SPI_SETTINGS = SPISettings();
 
-SPIClass::SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI)
+SPIClass::SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, SercomSpiTXPad PadTx, SercomRXPad PadRx)
 {
   initialized = false;
   assert(p_sercom != NULL);
   _p_sercom = p_sercom;
 
+  // pins
   _uc_pinMiso = uc_pinMISO;
   _uc_pinSCK = uc_pinSCK;
   _uc_pinMosi = uc_pinMOSI;
+
+  // SERCOM pads
+  _padTx=PadTx;
+  _padRx=PadRx;
 }
 
 void SPIClass::begin()
@@ -65,7 +70,7 @@ void SPIClass::config(SPISettings settings)
 {
   _p_sercom->disableSPI();
 
-  _p_sercom->initSPI(SPI_PAD_2_SCK_3, SERCOM_RX_PAD_0, SPI_CHAR_SIZE_8_BITS, settings.bitOrder);
+  _p_sercom->initSPI(_padTx, _padRx, SPI_CHAR_SIZE_8_BITS, settings.bitOrder);
   _p_sercom->initSPIClock(settings.dataMode, settings.clockFreq);
 
   _p_sercom->enableSPI();
@@ -198,13 +203,13 @@ void SPIClass::detachInterrupt() {
 }
 
 #if SPI_INTERFACES_COUNT > 0
-SPIClass SPI( SERCOM_INSTANCE_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI );
-#endif
+SPIClass SPI( &PERIPH_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI, PAD_SPI_TX, PAD_SPI_RX );
+#endif // SPI_INTERFACES_COUNT > 0
 
 #if SPI_INTERFACES_COUNT > 1
-SPIClass SPI1( SERCOM_INSTANCE_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI );
-#endif
+SPIClass SPI1( &PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PAD_SPI_TX, PAD_SPI_RX );
+#endif // SPI_INTERFACES_COUNT > 1
 
 #if SPI_INTERFACES_COUNT > 2
-SPIClass SPI2( SERCOM_INSTANCE_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI );
-#endif
+SPIClass SPI2( &PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PAD_SPI_TX, PAD_SPI_RX );
+#endif // SPI_INTERFACES_COUNT > 2
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index 03fd02635..cca53db01 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -92,7 +92,8 @@ class SPISettings {
 
 class SPIClass {
   public:
-  SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI);
+  SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, SercomSpiTXPad, SercomRXPad);
+
 
   byte transfer(uint8_t data);
   inline void transfer(void *buf, size_t count);
@@ -121,6 +122,10 @@ class SPIClass {
   uint8_t _uc_pinMiso;
   uint8_t _uc_pinMosi;
   uint8_t _uc_pinSCK;
+
+  SercomSpiTXPad _padTx;
+  SercomRXPad _padRx;
+
   bool initialized;
   uint8_t interruptMode;
   char interruptSave;
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index 339c48077..150011c6f 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -185,14 +185,15 @@ static const uint8_t ATN = PIN_ATN;
 #define PIN_SPI_MOSI         PIN_SPI1_MOSI
 #define PIN_SPI_SCK          PIN_SPI1_SCK
 #define PIN_SPI_SS           PIN_SPI1_SS
+#define PERIPH_SPI           sercom0
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
 
 static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
 static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
-#define SERCOM_INSTANCE_SPI           &sercom0
-
 
 /*
  * Wire Interfaces
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index f81124c20..36fa41600 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -185,14 +185,15 @@ static const uint8_t ATN = PIN_ATN;
 #define PIN_SPI_MOSI         PIN_SPI1_MOSI
 #define PIN_SPI_SCK          PIN_SPI1_SCK
 #define PIN_SPI_SS           PIN_SPI1_SS
+#define PERIPH_SPI           sercom3
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
 
 static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
 static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
-#define SERCOM_INSTANCE_SPI           &sercom3
-
 
 /*
  * Wire Interfaces
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index cba41051f..94e1464b3 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -153,13 +153,12 @@ static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
-#define SERCOM_INSTANCE_SPI           &sercom4
-
 #define PIN_SPI1_MISO         (19u)
 #define PIN_SPI1_MOSI         (16u)
 #define PIN_SPI1_SCK          (17u)
-
-#define SERCOM_INSTANCE_SPI1          &sercom1
+#define PERIPH_SPI           sercom1
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
 
 /*
  * Wire Interfaces

From 8e1c95c4974d6792188604706042f5f8874dcaac Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Mon, 10 Aug 2015 13:39:47 +0200
Subject: [PATCH 016/124] [zero] Bring more customization to Wire class

---
 libraries/SPI/SPI.cpp           |  4 +-
 libraries/Wire/Wire.cpp         | 95 ++++++---------------------------
 libraries/Wire/Wire.h           |  5 +-
 variants/MT_D11/variant.h       |  9 +---
 variants/MT_D21E/variant.h      |  9 +---
 variants/arduino_zero/variant.h | 26 +++------
 6 files changed, 32 insertions(+), 116 deletions(-)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 89a28c6de..0cc2fb95b 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -207,9 +207,9 @@ SPIClass SPI( &PERIPH_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI, PAD_SPI_TX,
 #endif // SPI_INTERFACES_COUNT > 0
 
 #if SPI_INTERFACES_COUNT > 1
-SPIClass SPI1( &PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PAD_SPI_TX, PAD_SPI_RX );
+SPIClass SPI1( &PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PAD_SPI1_TX, PAD_SPI1_RX );
 #endif // SPI_INTERFACES_COUNT > 1
 
 #if SPI_INTERFACES_COUNT > 2
-SPIClass SPI2( &PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PAD_SPI_TX, PAD_SPI_RX );
+SPIClass SPI2( &PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PAD_SPI2_TX, PAD_SPI2_RX );
 #endif // SPI_INTERFACES_COUNT > 2
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index 1d6767042..99fcee84e 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -26,9 +26,11 @@ extern "C" {
 
 #include "Wire.h"
 
-TwoWire::TwoWire(SERCOM * s)
+TwoWire::TwoWire(SERCOM * s, uint8_t pinSDA, uint8_t pinSCL)
 {
   this->sercom = s;
+  this->_uc_pinSDA=pinSDA;
+  this->_uc_pinSCL=pinSCL;
   transmissionBegun = false;
 }
 
@@ -37,8 +39,8 @@ void TwoWire::begin(void) {
   sercom->initMasterWIRE(TWI_CLOCK);
   sercom->enableWIRE();
   
-  pinPeripheral(PIN_WIRE_SDA, PIO_SERCOM);
-  pinPeripheral(PIN_WIRE_SCL, PIO_SERCOM);
+  pinPeripheral(_uc_pinSDA, PIO_SERCOM);
+  pinPeripheral(_uc_pinSCL, PIO_SERCOM);
 }
 
 void TwoWire::begin(uint8_t address) {
@@ -254,77 +256,6 @@ void TwoWire::onService(void)
   }
 }
 
-/*
-void TwoWire::onService(void)
-{
-  // Retrieve interrupt status
-  uint32_t sr = TWI_GetStatus(twi);
-
-  if (status == SLAVE_IDLE && TWI_STATUS_SVACC(sr)) {
-    TWI_DisableIt(twi, TWI_IDR_SVACC);
-    TWI_EnableIt(twi, TWI_IER_RXRDY | TWI_IER_GACC | TWI_IER_NACK
-        | TWI_IER_EOSACC | TWI_IER_SCL_WS | TWI_IER_TXCOMP);
-
-    srvBufferLength = 0;
-    srvBufferIndex = 0;
-
-    // Detect if we should go into RECV or SEND status
-    // SVREAD==1 means *master* reading -> SLAVE_SEND
-    if (!TWI_STATUS_SVREAD(sr)) {
-      status = SLAVE_RECV;
-    } else {
-      status = SLAVE_SEND;
-
-      // Alert calling program to generate a response ASAP
-      if (onRequestCallback)
-        onRequestCallback();
-      else
-        // create a default 1-byte response
-        write((uint8_t) 0);
-    }
-  }
-
-  if (status != SLAVE_IDLE) {
-    if (TWI_STATUS_TXCOMP(sr) && TWI_STATUS_EOSACC(sr)) {
-      if (status == SLAVE_RECV && onReceiveCallback) {
-        // Copy data into rxBuffer
-        // (allows to receive another packet while the
-        // user program reads actual data)
-        for (uint8_t i = 0; i < srvBufferLength; ++i)
-          rxBuffer[i] = srvBuffer[i];
-        rxBufferIndex = 0;
-        rxBufferLength = srvBufferLength;
-
-        // Alert calling program
-        onReceiveCallback( rxBufferLength);
-      }
-
-      // Transfer completed
-      TWI_EnableIt(twi, TWI_SR_SVACC);
-      TWI_DisableIt(twi, TWI_IDR_RXRDY | TWI_IDR_GACC | TWI_IDR_NACK
-          | TWI_IDR_EOSACC | TWI_IDR_SCL_WS | TWI_IER_TXCOMP);
-      status = SLAVE_IDLE;
-    }
-  }
-
-  if (status == SLAVE_RECV) {
-    if (TWI_STATUS_RXRDY(sr)) {
-      if (srvBufferLength < BUFFER_LENGTH)
-        srvBuffer[srvBufferLength++] = TWI_ReadByte(twi);
-    }
-  }
-
-  if (status == SLAVE_SEND) {
-    if (TWI_STATUS_TXRDY(sr) && !TWI_STATUS_NACK(sr)) {
-      uint8_t c = 'x';
-      if (srvBufferIndex < srvBufferLength)
-        c = srvBuffer[srvBufferIndex++];
-      TWI_WriteByte(twi, c);
-    }
-  }
-}
-*/
-
 #if WIRE_INTERFACES_COUNT > 0
 /*static void Wire_Init(void) {
   pmc_enable_periph_clk(WIRE_INTERFACE_ID);
@@ -346,15 +277,19 @@ void TwoWire::onService(void)
 }*/
 
 
-TwoWire Wire(SERCOM_INSTANCE_WIRE);
+TwoWire Wire(&PERIPH_WIRE, PIN_WIRE_SDA, PIN_WIRE_SCL);
 
-SERCOM_WIRE_HANDLER_MACRO
+void WIRE_IT_HANDLER(void) {
+  Wire.onService();
+}
 
-#endif
+#endif // WIRE_INTERFACES_COUNT > 0
 
 #if WIRE_INTERFACES_COUNT > 1
-TwoWire Wire1(SERCOM_INSTANCE_WIRE1);
+TwoWire Wire(&PERIPH_WIRE1, PIN_WIRE1_SDA, PIN_WIRE1_SCL);
 
-SERCOM_WIRE1_HANDLER_MACRO
+void WIRE1_IT_HANDLER1(void) {
+  Wire.onService();
+}
 
-#endif
+#endif // WIRE_INTERFACES_COUNT > 1
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index 7d8df9d0e..ae7692c06 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -32,7 +32,7 @@
 class TwoWire : public Stream
 {
   public:
-    TwoWire(SERCOM *s);
+    TwoWire(SERCOM *s, uint8_t pinSDA, uint8_t pinSCL);
     void begin();
     void begin(uint8_t);
     void setClock(uint32_t); // dummy function
@@ -60,6 +60,9 @@ class TwoWire : public Stream
 
   private:
     SERCOM * sercom;
+    uint8_t _uc_pinSDA;
+    uint8_t _uc_pinSCL;
+
     bool transmissionBegun;
 
     // RX Buffer
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index 150011c6f..44b9e33fc 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -204,13 +204,8 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE1_SCL         (23u)
 #define PIN_WIRE_SDA          PIN_WIRE1_SDA
 #define PIN_WIRE_SCL          PIN_WIRE1_SCL
-
-#define SERCOM_INSTANCE_WIRE           &sercom2
-
-#define SERCOM_WIRE_HANDLER_MACRO \
-void SERCOM2_Handler(void) { \
-	Wire.onService(); \
-}
+#define PERIPH_WIRE          sercom2
+#define WIRE_IT_HANDLER      SERCOM2_Handler
 
 
 /*
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index 36fa41600..6e6bd5fc1 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -204,13 +204,8 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE1_SCL         (17u)
 #define PIN_WIRE_SDA          PIN_WIRE1_SDA
 #define PIN_WIRE_SCL          PIN_WIRE1_SCL
-
-#define SERCOM_INSTANCE_WIRE           &sercom1
-
-#define SERCOM_WIRE_HANDLER_MACRO \
-void SERCOM1_Handler(void) { \
-	Wire.onService(); \
-}
+#define PERIPH_WIRE          sercom1
+#define WIRE_IT_HANDLER      SERCOM1_Handler
 
 
 /*
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index 94e1464b3..67f11eacb 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -156,9 +156,9 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_SPI1_MISO         (19u)
 #define PIN_SPI1_MOSI         (16u)
 #define PIN_SPI1_SCK          (17u)
-#define PERIPH_SPI           sercom1
-#define PAD_SPI_TX           SPI_PAD_2_SCK_3
-#define PAD_SPI_RX           SERCOM_RX_PAD_0
+#define PERIPH_SPI1           sercom1
+#define PAD_SPI1_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI1_RX           SERCOM_RX_PAD_0
 
 /*
  * Wire Interfaces
@@ -170,22 +170,10 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PERIPH_WIRE          sercom3
 #define WIRE_IT_HANDLER      SERCOM3_Handler
 
-#define SERCOM_INSTANCE_WIRE          &sercom3
-
-#define SERCOM_WIRE_HANDLER_MACRO \
-void SERCOM3_Handler(void) { \
-	Wire.onService(); \
-}
-
-#define PIN_WIRE_SDA1         (4u)
-#define PIN_WIRE_SCL1         (3u)
-
-#define SERCOM_INSTANCE_WIRE1         &sercom2
-
-#define SERCOM_WIRE1_HANDLER_MACRO \
-void SERCOM2_Handler(void) { \
-	Wire1.onService(); \
-}
+#define PIN_WIRE1_SDA         (4u)
+#define PIN_WIRE1_SCL         (3u)
+#define PERIPH_WIRE1          sercom2
+#define WIRE1_IT_HANDLER      SERCOM2_Handler
 
 /*
  * USB

From 864fef8023ae05aca66428958eff38bca8f23afa Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Tue, 11 Aug 2015 09:42:26 +0200
Subject: [PATCH 017/124] [zero/SPI] adding missing library properties

---
 libraries/SPI/library.properties | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 libraries/SPI/library.properties

diff --git a/libraries/SPI/library.properties b/libraries/SPI/library.properties
new file mode 100644
index 000000000..3aaa770b8
--- /dev/null
+++ b/libraries/SPI/library.properties
@@ -0,0 +1,8 @@
+name=SPI
+version=1.0
+author=Jonathan BAUDIN, Thibaut VIARD, Arduino
+maintainer=Arduino <info@arduino.cc>
+sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. Specific implementation for Arduino Zero.
+paragraph=
+url=http://www.arduino.cc/en/Reference/SPI
+architectures=samd

From 5914e427c0954604c0b4cd5d0d1e7e485594246e Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Tue, 11 Aug 2015 09:42:44 +0200
Subject: [PATCH 018/124] [zero/Wire] adding missing library properties

---
 libraries/Wire/library.properties | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 libraries/Wire/library.properties

diff --git a/libraries/Wire/library.properties b/libraries/Wire/library.properties
new file mode 100644
index 000000000..eff193aa2
--- /dev/null
+++ b/libraries/Wire/library.properties
@@ -0,0 +1,9 @@
+name=Wire
+version=1.0
+author=Jonathan BAUDIN, Thibaut VIARD, Arduino
+maintainer=Arduino <info@arduino.cc>
+sentence=Allows the communication between devices or sensors connected via Two Wire Interface Bus. Specific implementation for Arduino Zero.
+paragraph=
+url=http://www.arduino.cc/en/Reference/Wire
+architectures=samd
+

From c60f4399295be47face93e38e39f71cf1077d4a7 Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Thu, 13 Aug 2015 12:05:14 +0200
Subject: [PATCH 019/124] [zero/SPI] Adding default values for SPI custom
 definitions

---
 libraries/SPI/SPI.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 0cc2fb95b..7e2735c8c 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -203,6 +203,22 @@ void SPIClass::detachInterrupt() {
 }
 
 #if SPI_INTERFACES_COUNT > 0
+
+/* In case new variant doesn't define these macros,
+ * we put here the ones for Arduino Zero.
+ *
+ * These values should be different on some variants!
+ *
+ * The SPI PAD values can be found in cores/arduino/SERCOM.h:
+ *   - SercomSpiTXPad
+ *   - SercomRXPad
+ */
+#ifndef PERIPH_SPI
+#define PERIPH_SPI           sercom4
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
+#endif // PERIPH_SPI
+
 SPIClass SPI( &PERIPH_SPI, PIN_SPI_MISO, PIN_SPI_SCK, PIN_SPI_MOSI, PAD_SPI_TX, PAD_SPI_RX );
 #endif // SPI_INTERFACES_COUNT > 0
 

From 32ea4079d97b019be444e6c7b38c13293ac6ad44 Mon Sep 17 00:00:00 2001
From: Thibaut VIARD <aethaniel@sam-geek.org>
Date: Thu, 13 Aug 2015 12:09:25 +0200
Subject: [PATCH 020/124] [zero/Wire] Adding default values for Wire custom
 definitions

---
 libraries/Wire/Wire.cpp | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index 99fcee84e..c8761cc46 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -257,25 +257,17 @@ void TwoWire::onService(void)
 }
 
 #if WIRE_INTERFACES_COUNT > 0
-/*static void Wire_Init(void) {
-  pmc_enable_periph_clk(WIRE_INTERFACE_ID);
-  PIO_Configure(
-      g_APinDescription[PIN_WIRE_SDA].pPort,
-      g_APinDescription[PIN_WIRE_SDA].ulPinType,
-      g_APinDescription[PIN_WIRE_SDA].ulPin,
-      g_APinDescription[PIN_WIRE_SDA].ulPinConfiguration);
-  PIO_Configure(
-      g_APinDescription[PIN_WIRE_SCL].pPort,
-      g_APinDescription[PIN_WIRE_SCL].ulPinType,
-      g_APinDescription[PIN_WIRE_SCL].ulPin,
-      g_APinDescription[PIN_WIRE_SCL].ulPinConfiguration);
-
-  NVIC_DisableIRQ(WIRE_ISR_ID);
-  NVIC_ClearPendingIRQ(WIRE_ISR_ID);
-  NVIC_SetPriority(WIRE_ISR_ID, 0);
-  NVIC_EnableIRQ(WIRE_ISR_ID);
-}*/
 
+/* In case new variant doesn't define these macros,
+ * we put here the ones for Arduino Zero.
+ *
+ * These values should be different on some variants!
+ */
+
+#ifndef PERIPH_WIRE
+#  define PERIPH_WIRE          sercom3
+#  define WIRE_IT_HANDLER      SERCOM3_Handler
+#endif // PERIPH_WIRE
 
 TwoWire Wire(&PERIPH_WIRE, PIN_WIRE_SDA, PIN_WIRE_SCL);
 

From 18cb10f2010327ad6dd6d41cb425a00b0e50d9a9 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 13 Aug 2015 18:02:03 +0200
Subject: [PATCH 021/124] delay.h is included outside __cplusplus guards

---
 cores/arduino/Arduino.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 05eac732f..1be6d7171 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -62,7 +62,7 @@ void loop( void ) ;
 
 #ifdef __cplusplus
 } // extern "C"
-#endif // __cplusplus
+#endif
 
 // The following headers are for C++ only compilation
 #ifdef __cplusplus
@@ -72,9 +72,11 @@ void loop( void ) ;
   #include "WMath.h"
   #include "HardwareSerial.h"
   #include "pulse.h"
-  #include "delay.h"
+#endif
+#include "delay.h"
+#ifdef __cplusplus
   #include "Uart.h"
-#endif // __cplusplus
+#endif
 
 // Include board variant
 #include "variant.h"

From 54a0c3de8dc5ae6cd5500f7fa41f530278406ee3 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 13 Aug 2015 18:07:53 +0200
Subject: [PATCH 022/124] [Wire] simplified coding unnecessarily complex
 (hfvogt)

In the wire library there are several functions where
an unnecessarily complex coding has been used:

  - endTransmission: the availability of data is already
    checked in while(...), therefore need not be checked
    again in the loop.
  - requestFrom: the for-loop has a predefined and fixed
    number of loops. Therefore a check whether the last
    element has been reached is unnecessary and does not
    add any benefit.

Fixes #20
---
 libraries/Wire/Wire.cpp | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index c8761cc46..419d6e802 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -68,22 +68,15 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
     rxBuffer.store_char(sercom->readDataWIRE());
 
     // Connected to slave
-    //while(toRead--)
-    for(byteRead = 0; byteRead < quantity; ++byteRead)
+    for (byteRead = 1; byteRead < quantity; ++byteRead)
     {
-      if( byteRead == quantity - 1)  // Stop transmission
-      {
-        sercom->prepareNackBitWIRE(); // Prepare NACK to stop slave transmission
-        //sercom->readDataWIRE(); // Clear data register to send NACK
-        sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_STOP); // Send Stop
-      }
-      else // Continue transmission
-      {
-        sercom->prepareAckBitWIRE();  // Prepare Acknowledge
-        sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_READ); // Prepare the ACK command for the slave
-        rxBuffer.store_char( sercom->readDataWIRE() );  // Read data and send the ACK
-      }
+      sercom->prepareAckBitWIRE();                          // Prepare Acknowledge
+      sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_READ); // Prepare the ACK command for the slave
+      rxBuffer.store_char(sercom->readDataWIRE());          // Read data and send the ACK
     }
+    sercom->prepareNackBitWIRE();                           // Prepare NACK to stop slave transmission
+    //sercom->readDataWIRE();                               // Clear data register to send NACK
+    sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);   // Send Stop
   }
 
   return byteRead;
@@ -134,12 +127,8 @@ uint8_t TwoWire::endTransmission(bool stopBit)
       sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);
       return 3 ;  // Nack or error
     }
-
-    if(txBuffer.available() == 0)
-    {
-      sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);
-    }
   }
+  sercom->prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);
 
   return 0;
 }

From 42d69ea5751c47d8ad5ebef56c54325c4fb01510 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 14 Aug 2015 10:35:57 +0200
Subject: [PATCH 023/124] relax digitalWrite parameter check

calling digitalWrite with any value different from 0 will end
in performing digitalWrite(HIGH)
---
 cores/arduino/wiring_digital.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
index 80d12b00d..d31c83592 100644
--- a/cores/arduino/wiring_digital.c
+++ b/cores/arduino/wiring_digital.c
@@ -59,11 +59,8 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
       PORT->Group[pinPort].OUTCLR.reg = (1ul << pinNum) ;
     break ;
 
-    case HIGH:
-      PORT->Group[pinPort].OUTSET.reg = (1ul << pinNum) ;
-    break ;
-
     default:
+      PORT->Group[pinPort].OUTSET.reg = (1ul << pinNum) ;
     break ;
   }
 

From 65f6d320b28d297b89dc94d1fc6c4fe57f8782da Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 24 Aug 2015 12:26:44 +0200
Subject: [PATCH 024/124] Updated IPAddress class to the latest version

---
 cores/arduino/IPAddress.cpp | 31 ++++++++++++++++---------------
 cores/arduino/IPAddress.h   | 24 +++++++++++++++---------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/cores/arduino/IPAddress.cpp b/cores/arduino/IPAddress.cpp
index 6803110ea..899cbd4ed 100644
--- a/cores/arduino/IPAddress.cpp
+++ b/cores/arduino/IPAddress.cpp
@@ -1,5 +1,6 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  IPAddress.cpp - Base class that provides IPAddress
+  Copyright (c) 2011 Adrian McEwen.  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
@@ -8,8 +9,8 @@
 
   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.
+  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
@@ -21,42 +22,42 @@
 
 IPAddress::IPAddress()
 {
-    memset(_address, 0, sizeof(_address));
+    _address.dword = 0;
 }
 
 IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
 {
-    _address[0] = first_octet;
-    _address[1] = second_octet;
-    _address[2] = third_octet;
-    _address[3] = fourth_octet;
+    _address.bytes[0] = first_octet;
+    _address.bytes[1] = second_octet;
+    _address.bytes[2] = third_octet;
+    _address.bytes[3] = fourth_octet;
 }
 
 IPAddress::IPAddress(uint32_t address)
 {
-    memcpy(_address, &address, sizeof(_address));
+    _address.dword = address;
 }
 
 IPAddress::IPAddress(const uint8_t *address)
 {
-    memcpy(_address, address, sizeof(_address));
+    memcpy(_address.bytes, address, sizeof(_address.bytes));
 }
 
 IPAddress& IPAddress::operator=(const uint8_t *address)
 {
-    memcpy(_address, address, sizeof(_address));
+    memcpy(_address.bytes, address, sizeof(_address.bytes));
     return *this;
 }
 
 IPAddress& IPAddress::operator=(uint32_t address)
 {
-    memcpy(_address, (const uint8_t *)&address, sizeof(_address));
+    _address.dword = address;
     return *this;
 }
 
 bool IPAddress::operator==(const uint8_t* addr) const
 {
-    return memcmp(addr, _address, sizeof(_address)) == 0;
+    return memcmp(addr, _address.bytes, sizeof(_address.bytes)) == 0;
 }
 
 size_t IPAddress::printTo(Print& p) const
@@ -64,10 +65,10 @@ size_t IPAddress::printTo(Print& p) const
     size_t n = 0;
     for (int i =0; i < 3; i++)
     {
-        n += p.print(_address[i], DEC);
+        n += p.print(_address.bytes[i], DEC);
         n += p.print('.');
     }
-    n += p.print(_address[3], DEC);
+    n += p.print(_address.bytes[3], DEC);
     return n;
 }
 
diff --git a/cores/arduino/IPAddress.h b/cores/arduino/IPAddress.h
index b6f454bba..94acdc456 100644
--- a/cores/arduino/IPAddress.h
+++ b/cores/arduino/IPAddress.h
@@ -1,5 +1,6 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  IPAddress.h - Base class that provides IPAddress
+  Copyright (c) 2011 Adrian McEwen.  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
@@ -8,8 +9,8 @@
 
   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.
+  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
@@ -19,18 +20,23 @@
 #ifndef IPAddress_h
 #define IPAddress_h
 
+#include <stdint.h>
 #include <Printable.h>
 
 // A class to make it easier to handle and pass around IP addresses
 
 class IPAddress : public Printable {
 private:
-    uint8_t _address[4];  // IPv4 address
+    union {
+	uint8_t bytes[4];  // IPv4 address
+	uint32_t dword;
+    } _address;
+
     // Access the raw byte array containing the address.  Because this returns a pointer
     // to the internal structure rather than a copy of the address this function should only
     // be used when you know that the usage of the returned uint8_t* will be transient and not
     // stored.
-    uint8_t* raw_address() { return _address; };
+    uint8_t* raw_address() { return _address.bytes; };
 
 public:
     // Constructors
@@ -41,13 +47,13 @@ class IPAddress : public Printable {
 
     // Overloaded cast operator to allow IPAddress objects to be used where a pointer
     // to a four-byte uint8_t array is expected
-    operator uint32_t() const { return *((uint32_t*)_address+0); };
-    bool operator==(const IPAddress& addr) const { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
+    operator uint32_t() const { return _address.dword; };
+    bool operator==(const IPAddress& addr) const { return _address.dword == addr._address.dword; };
     bool operator==(const uint8_t* addr) const;
 
     // Overloaded index operator to allow getting and setting individual octets of the address
-    uint8_t operator[](int index) const { return _address[index]; };
-    uint8_t& operator[](int index) { return _address[index]; };
+    uint8_t operator[](int index) const { return _address.bytes[index]; };
+    uint8_t& operator[](int index) { return _address.bytes[index]; };
 
     // Overloaded copy operators to allow initialisation of IPAddress objects from other types
     IPAddress& operator=(const uint8_t *address);

From 5b2615f14d82ae991ba0c89fcb59000444cac508 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Tue, 25 Aug 2015 10:48:54 -0400
Subject: [PATCH 025/124] implement Wire.end() for SAMD core

---
 libraries/Wire/Wire.cpp | 6 +++++-
 libraries/Wire/Wire.h   | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index 419d6e802..33266d9e0 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -48,7 +48,11 @@ void TwoWire::begin(uint8_t address) {
   sercom->initSlaveWIRE(address);
   sercom->enableWIRE();
 }
- 
+
+void TwoWire::end() {
+  sercom->disableWIRE();
+}
+
 void TwoWire::setClock(uint32_t frequency) {
        // dummy funtion
 }
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index ae7692c06..dfa1c1399 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -29,12 +29,16 @@
 
 #define BUFFER_LENGTH 32
 
+ // WIRE_HAS_END means Wire has end()
+#define WIRE_HAS_END 1
+
 class TwoWire : public Stream
 {
   public:
     TwoWire(SERCOM *s, uint8_t pinSDA, uint8_t pinSCL);
     void begin();
     void begin(uint8_t);
+    void end();
     void setClock(uint32_t); // dummy function
 
     void beginTransmission(uint8_t);

From 56b319cbe9fdd4b37585335aceb212ba912b808f Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 15:09:04 +0200
Subject: [PATCH 026/124] Fixed EXT_INT numbers in variant for pin 8 and 9

See #30
---
 variants/arduino_zero/variant.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp
index 4377a2fbb..b5f572de7 100644
--- a/variants/arduino_zero/variant.cpp
+++ b/variants/arduino_zero/variant.cpp
@@ -207,8 +207,8 @@ const PinDescription g_APinDescription[]=
   { PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5 },
 
   // Digital High
-  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE }, // TCC1/WO[0] ADC/AIN[6]
-  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE }, // TCC1/WO[1] ADC/AIN[7]
+  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_6 }, // TCC1/WO[0] ADC/AIN[6]
+  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_7 }, // TCC1/WO[1] ADC/AIN[7]
   { PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2 }, // TC3/WO[0] SS: SERCOM1/PAD[2]
   { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // TCC2/WO[0] MOSI: SERCOM1/PAD[0]
   { PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3 }, // TCC0/WO[3] MISO: SERCOM1/PAD[3]
@@ -227,8 +227,8 @@ const PinDescription g_APinDescription[]=
 
   // 20..21 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
   // ----------------------
-  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
-  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]
+  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // SDA: SERCOM3/PAD[0]
+  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCL: SERCOM3/PAD[1]
 
   // 22..24 - SPI pins (ICSP:MISO,SCK,MOSI)
   // ----------------------

From 39cb1c16ac41ed0b5b45108a9e64f788825ad464 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 15:17:30 +0200
Subject: [PATCH 027/124] WInterrupts.c cosmetic fix

---
 cores/arduino/WInterrupts.c | 92 ++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 9294fc780..63e44ec97 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -68,99 +68,87 @@ static void __initialize()
  * \brief Specifies a named Interrupt Service Routine (ISR) to call when an interrupt occurs.
  *        Replaces any previous function that was attached to the interrupt.
  */
-//void attachInterrupt( uint32_t ulPin, void (*callback)(void), EExt_IntMode mode )
-//void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, EExt_IntMode mode )
-void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, uint32_t ulMode )
+void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
 {
-  static int enabled = 0 ;
-  uint32_t ulConfig ;
-  uint32_t ulPos ;
+  static int enabled = 0;
+  uint32_t config;
+  uint32_t pos;
   
   // Assign pin to EIC
-  if ( pinPeripheral(ulPin, PIO_EXTINT) != RET_STATUS_OK )
-  {
-	  return ;
-  }
+  if ( pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK )
+    return;
 
-  if ( !enabled )
-  {
-    __initialize() ;
-    enabled = 1 ;
+  if (!enabled) {
+    __initialize();
+    enabled = 1;
   }
 
   // Assign callback to interrupt
-  callbacksInt[digitalPinToInterrupt( ulPin )]._ulPin = ulPin ;
-  callbacksInt[digitalPinToInterrupt( ulPin )]._callback = callback ;
+  callbacksInt[digitalPinToInterrupt(pin)]._ulPin = pin;
+  callbacksInt[digitalPinToInterrupt(pin)]._callback = callback;
 
   // Check if normal interrupt or NMI
-  if ( digitalPinToInterrupt( ulPin ) != EXTERNAL_INT_NMI )
+if ( digitalPinToInterrupt( pin ) != EXTERNAL_INT_NMI )
   {
     // Look for right CONFIG register to be addressed
-    if ( digitalPinToInterrupt( ulPin ) > EXTERNAL_INT_7 )
-    {
-      ulConfig = 1 ;
-    }
-    else
-    {
-      ulConfig = 0 ;
+    if (digitalPinToInterrupt(pin) > EXTERNAL_INT_7) {
+      config = 1;
+    } else {
+      config = 0;
     }
 
     // Configure the interrupt mode
-    ulPos = ((digitalPinToInterrupt( ulPin ) - (8*ulConfig) ) << 2) ;
-    switch ( ulMode )
+    pos = ((digitalPinToInterrupt(pin) - (8 * config)) << 2);
+    switch (mode)
     {
       case LOW:
-        EIC->CONFIG[ulConfig].reg |= EIC_CONFIG_SENSE0_LOW_Val << ulPos ;
-      break ;
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_LOW_Val << pos;
+        break;
 
       case HIGH:
-        // EIC->CONFIG[ulConfig].reg = EIC_CONFIG_SENSE0_HIGH_Val << ((digitalPinToInterrupt( ulPin ) >> ulConfig ) << ulPos) ;
-        EIC->CONFIG[ulConfig].reg |= EIC_CONFIG_SENSE0_HIGH_Val << ulPos ;
-      break ;
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_HIGH_Val << pos;
+        break;
 
       case CHANGE:
-        // EIC->CONFIG[ulConfig].reg = EIC_CONFIG_SENSE0_BOTH_Val << ((digitalPinToInterrupt( ulPin ) >> ulConfig ) << ulPos) ;
-        EIC->CONFIG[ulConfig].reg |= EIC_CONFIG_SENSE0_BOTH_Val << ulPos ;
-      break ;
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_BOTH_Val << pos;
+        break;
 
       case FALLING:
-        // EIC->CONFIG[ulConfig].reg = EIC_CONFIG_SENSE0_FALL_Val << ((digitalPinToInterrupt( ulPin ) >> ulConfig ) << ulPos) ;
-        EIC->CONFIG[ulConfig].reg |= EIC_CONFIG_SENSE0_FALL_Val << ulPos ;
-      break ;
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_FALL_Val << pos;
+        break;
 
       case RISING:
-        // EIC->CONFIG[ulConfig].reg = EIC_CONFIG_SENSE0_RISE_Val << ((digitalPinToInterrupt( ulPin ) >> ulConfig ) << ulPos) ;
-        EIC->CONFIG[ulConfig].reg |= EIC_CONFIG_SENSE0_RISE_Val << ulPos ;
-      break ;
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_RISE_Val << pos;
+        break;
     }
 
     // Enable the interrupt
-    EIC->INTENSET.reg = EIC_INTENSET_EXTINT( 1 << digitalPinToInterrupt( ulPin ) ) ;
+    EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << digitalPinToInterrupt(pin));
   }
   else // Handles NMI
   {
     // Configure the interrupt mode
-    switch ( ulMode )
+    switch (mode)
     {
       case LOW:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_LOW ;
-      break ;
+        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_LOW;
+        break;
 
       case HIGH:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_HIGH ;
-      break ;
+        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_HIGH;
+        break;
 
       case CHANGE:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_BOTH ;
-      break ;
+        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_BOTH;
+        break;
 
       case FALLING:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_FALL ;
-      break ;
+        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_FALL;
+        break;
 
       case RISING:
-        EIC->NMICTRL.reg= EIC_NMICTRL_NMISENSE_RISE ;
-      break ;
+        EIC->NMICTRL.reg= EIC_NMICTRL_NMISENSE_RISE;
+        break;
     }
   }
 }

From efe46322d482d10f37e8dfe75f779dc5f9c608c4 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 15:20:26 +0200
Subject: [PATCH 028/124] NMI interrupts are now correctly ignored by
 attach/detachInterrupt

Fixes #30
---
 cores/arduino/WInterrupts.c | 123 +++++++++++-------------------------
 1 file changed, 36 insertions(+), 87 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 63e44ec97..c427a0231 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -75,7 +75,9 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   uint32_t pos;
   
   // Assign pin to EIC
-  if ( pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK )
+  if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
+    return;
+  if (digitalPinToInterrupt(pin) == EXTERNAL_INT_NMI)
     return;
 
   if (!enabled) {
@@ -87,91 +89,53 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   callbacksInt[digitalPinToInterrupt(pin)]._ulPin = pin;
   callbacksInt[digitalPinToInterrupt(pin)]._callback = callback;
 
-  // Check if normal interrupt or NMI
-if ( digitalPinToInterrupt( pin ) != EXTERNAL_INT_NMI )
-  {
-    // Look for right CONFIG register to be addressed
-    if (digitalPinToInterrupt(pin) > EXTERNAL_INT_7) {
-      config = 1;
-    } else {
-      config = 0;
-    }
-
-    // Configure the interrupt mode
-    pos = ((digitalPinToInterrupt(pin) - (8 * config)) << 2);
-    switch (mode)
-    {
-      case LOW:
-        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_LOW_Val << pos;
-        break;
-
-      case HIGH:
-        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_HIGH_Val << pos;
-        break;
-
-      case CHANGE:
-        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_BOTH_Val << pos;
-        break;
-
-      case FALLING:
-        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_FALL_Val << pos;
-        break;
-
-      case RISING:
-        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_RISE_Val << pos;
-        break;
-    }
-
-    // Enable the interrupt
-    EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << digitalPinToInterrupt(pin));
+  // Look for right CONFIG register to be addressed
+  if (digitalPinToInterrupt(pin) > EXTERNAL_INT_7) {
+    config = 1;
+  } else {
+    config = 0;
   }
-  else // Handles NMI
+
+  // Configure the interrupt mode
+  pos = ((digitalPinToInterrupt(pin) - (8 * config)) << 2);
+  switch (mode)
   {
-    // Configure the interrupt mode
-    switch (mode)
-    {
-      case LOW:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_LOW;
-        break;
+    case LOW:
+      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_LOW_Val << pos;
+      break;
 
-      case HIGH:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_HIGH;
-        break;
+    case HIGH:
+      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_HIGH_Val << pos;
+      break;
 
-      case CHANGE:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_BOTH;
-        break;
+    case CHANGE:
+      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_BOTH_Val << pos;
+      break;
 
-      case FALLING:
-        EIC->NMICTRL.reg = EIC_NMICTRL_NMISENSE_FALL;
-        break;
+    case FALLING:
+      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_FALL_Val << pos;
+      break;
 
-      case RISING:
-        EIC->NMICTRL.reg= EIC_NMICTRL_NMISENSE_RISE;
-        break;
-    }
+    case RISING:
+      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_RISE_Val << pos;
+      break;
   }
+
+  // Enable the interrupt
+  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << digitalPinToInterrupt(pin));
 }
 
 /*
  * \brief Turns off the given interrupt.
  */
-void detachInterrupt( uint32_t ulPin )
+void detachInterrupt(uint32_t pin)
 {
-/*
-  // Retrieve pin information
-  Pio *pio = g_APinDescription[pin].pPort;
-  uint32_t mask = g_APinDescription[pin].ulPin;
-
-  // Disable interrupt
-  pio->PIO_IDR = mask;
-*/
-  if ( digitalPinToInterrupt( ulPin ) == NOT_AN_INTERRUPT )
-  {
-    return ;
-  }
+  if (digitalPinToInterrupt(pin) == NOT_AN_INTERRUPT)
+    return;
+  if (digitalPinToInterrupt(pin) == EXTERNAL_INT_NMI)
+    return;
 
-  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT( 1 << digitalPinToInterrupt( ulPin ) ) ;
+  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << digitalPinToInterrupt(pin));
 }
 
 /*
@@ -198,21 +162,6 @@ void EIC_Handler( void )
   }
 }
 
-/*
- * External Non-Maskable Interrupt Controller NVIC Interrupt Handler
- */
-void NMI_Handler( void )
-{
-  // Call the callback function if assigned
-  if ( callbacksInt[EXTERNAL_INT_NMI]._callback != NULL )
-  {
-    callbacksInt[EXTERNAL_INT_NMI]._callback() ;
-  }
-
-  // Clear the interrupt
-  EIC->NMIFLAG.reg = EIC_NMIFLAG_NMI ;
-}
-
 #ifdef __cplusplus
 }
 #endif

From 54884205ad7846039362f9956e30ef00853018bb Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 15:35:38 +0200
Subject: [PATCH 029/124] Simplified "callbacksInt" structure in WInterrupts.c

---
 cores/arduino/WInterrupts.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index c427a0231..33ed009e9 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -25,16 +25,12 @@
 extern "C" {
 #endif
 
-static struct
-{
-  uint32_t _ulPin ;
-  voidFuncPtr _callback ;
-} callbacksInt[EXTERNAL_NUM_INTERRUPTS] ;
+static voidFuncPtr callbacksInt[EXTERNAL_NUM_INTERRUPTS];
 
 /* Configure I/O interrupt sources */
 static void __initialize()
 {
-  memset( callbacksInt, 0, sizeof( callbacksInt ) ) ;
+  memset(callbacksInt, 0, sizeof(callbacksInt));
 
   NVIC_DisableIRQ( EIC_IRQn ) ;
   NVIC_ClearPendingIRQ( EIC_IRQn ) ;
@@ -86,8 +82,7 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   }
 
   // Assign callback to interrupt
-  callbacksInt[digitalPinToInterrupt(pin)]._ulPin = pin;
-  callbacksInt[digitalPinToInterrupt(pin)]._callback = callback;
+  callbacksInt[digitalPinToInterrupt(pin)] = callback;
 
   // Look for right CONFIG register to be addressed
   if (digitalPinToInterrupt(pin) > EXTERNAL_INT_7) {
@@ -151,9 +146,8 @@ void EIC_Handler( void )
     if ( (EIC->INTFLAG.reg & ( 1 << ul ) ) != 0 )
     {
       // Call the callback function if assigned
-      if ( callbacksInt[ul]._callback != NULL )
-      {
-        callbacksInt[ul]._callback() ;
+      if (callbacksInt[ul]) {
+        callbacksInt[ul]();
       }
 
       // Clear the interrupt

From ebad10abffa73b8ce874939e97429595a77640ab Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 17:16:21 +0200
Subject: [PATCH 030/124] Cosmetic changes in WInterrupt.*

---
 cores/arduino/WInterrupts.c | 39 +++++++++++++------------------------
 cores/arduino/WInterrupts.h | 35 +++++----------------------------
 cores/arduino/WVariant.h    |  2 +-
 3 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 33ed009e9..2bb9ef418 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -32,32 +32,23 @@ static void __initialize()
 {
   memset(callbacksInt, 0, sizeof(callbacksInt));
 
-  NVIC_DisableIRQ( EIC_IRQn ) ;
-  NVIC_ClearPendingIRQ( EIC_IRQn ) ;
-  NVIC_SetPriority( EIC_IRQn, 0 ) ;
-  NVIC_EnableIRQ( EIC_IRQn ) ;
+  NVIC_DisableIRQ(EIC_IRQn);
+  NVIC_ClearPendingIRQ(EIC_IRQn);
+  NVIC_SetPriority(EIC_IRQn, 0);
+  NVIC_EnableIRQ(EIC_IRQn);
 
   // Enable GCLK for IEC (External Interrupt Controller)
-  GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_EIC )) ;
+  GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_EIC));
 
 /* Shall we do that?
   // Do a software reset on EIC
   EIC->CTRL.SWRST.bit = 1 ;
-
-  while ( (EIC->CTRL.SWRST.bit == 1) && (EIC->STATUS.SYNCBUSY.bit == 1) )
-  {
-    // Waiting for synchronisation
-  }
+  while ((EIC->CTRL.SWRST.bit == 1) && (EIC->STATUS.SYNCBUSY.bit == 1)) { }
 */
 
   // Enable EIC
-  EIC->CTRL.bit.ENABLE = 1 ;
-
-  while ( EIC->STATUS.bit.SYNCBUSY == 1 )
-  {
-    // Waiting for synchronisation
-  }
-
+  EIC->CTRL.bit.ENABLE = 1;
+  while (EIC->STATUS.bit.SYNCBUSY == 1) { }
 }
 
 /*
@@ -136,22 +127,20 @@ void detachInterrupt(uint32_t pin)
 /*
  * External Interrupt Controller NVIC Interrupt Handler
  */
-void EIC_Handler( void )
+void EIC_Handler(void)
 {
-  uint32_t ul ;
-
   // Test the normal interrupts
-  for ( ul = EXTERNAL_INT_0 ; ul < (EXTERNAL_NUM_INTERRUPTS - 1) ; ul++ )
+  for (uint32_t i=EXTERNAL_INT_0; i<=EXTERNAL_NUM_INTERRUPTS; i++)
   {
-    if ( (EIC->INTFLAG.reg & ( 1 << ul ) ) != 0 )
+    if ((EIC->INTFLAG.reg & (1 << i)) != 0)
     {
       // Call the callback function if assigned
-      if (callbacksInt[ul]) {
-        callbacksInt[ul]();
+      if (callbacksInt[i]) {
+        callbacksInt[i]();
       }
 
       // Clear the interrupt
-      EIC->INTFLAG.reg = 1 << ul ;
+      EIC->INTFLAG.reg = 1 << i;
     }
   }
 }
diff --git a/cores/arduino/WInterrupts.h b/cores/arduino/WInterrupts.h
index 8314dff24..5d2b24a0d 100644
--- a/cores/arduino/WInterrupts.h
+++ b/cores/arduino/WInterrupts.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 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
@@ -31,49 +31,24 @@ extern "C" {
 #define FALLING 3
 #define RISING 4
 
-///*
- //* Interrupt modes
- //*   The two first values are conflicting with the ones used by Digital API, so we use another name for each.
- //*/
-//typedef enum _EExt_IntMode
-//{
-  //IM_LOW = 0,
-  //IM_HIGH = 1,
-  //CHANGE = 2,
-  //FALLING = 3,
-  //RISING = 4,
-  //IM_CHANGE = 2,
-  //IM_FALLING = 3,
-  //IM_RISING = 4,
-//} EExt_IntMode ;
-
 #define DEFAULT 1
 #define EXTERNAL 0
 
-typedef void (*voidFuncPtr)( void ) ;
+typedef void (*voidFuncPtr)(void);
 
 /*
  * \brief Specifies a named Interrupt Service Routine (ISR) to call when an interrupt occurs.
  *        Replaces any previous function that was attached to the interrupt.
  */
-//void attachInterrupt( uint32_t ulPin, void (*callback)(void), EExt_IntMode mode ) ;
-//void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, EExt_IntMode mode ) ;
-void attachInterrupt( uint32_t ulPin, voidFuncPtr callback, uint32_t mode ) ;
+void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode);
 
 /*
  * \brief Turns off the given interrupt.
  */
-void detachInterrupt( uint32_t ulPin ) ;
+void detachInterrupt(uint32_t pin);
 
 #ifdef __cplusplus
 }
 #endif
 
-//#ifdef __cplusplus
-//inline operator ::EExt_IntMode( uint32_t ul )
-//{
-  //return (EExt_IntMode)ul ;
-//}
-//#endif
-
-#endif /* _WIRING_INTERRUPTS_ */
+#endif
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index 84ad85c7b..ddeec4e71 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -106,7 +106,7 @@ typedef enum _EPortType
 } EPortType ;
 
 /* The D11 has only INT 0 though 7 (the SAMD11C14A lacks INT 0 as well */
-typedef enum _EExt_Interrupts
+typedef enum
 {
   EXTERNAL_INT_0 = 0,
   EXTERNAL_INT_1,

From 03aa3ce15f0dbd96c3f32ee214a3b3fa5439e27a Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 17:17:22 +0200
Subject: [PATCH 031/124] Removed redundant #ifdef __cplusplus in WInterrupts.c

---
 cores/arduino/WInterrupts.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 2bb9ef418..427cfc312 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -21,10 +21,6 @@
 
 #include <string.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 static voidFuncPtr callbacksInt[EXTERNAL_NUM_INTERRUPTS];
 
 /* Configure I/O interrupt sources */
@@ -144,7 +140,3 @@ void EIC_Handler(void)
     }
   }
 }
-
-#ifdef __cplusplus
-}
-#endif

From 9405f1aff7ab9d5cd84ef1bbc9558f0d67a2304b Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 4 Sep 2015 17:21:19 +0200
Subject: [PATCH 032/124] WInterrupts: optimized use of digitalPinToInterrupt()

---
 cores/arduino/WInterrupts.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 427cfc312..7fa70c61f 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -60,7 +60,9 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   // Assign pin to EIC
   if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
     return;
-  if (digitalPinToInterrupt(pin) == EXTERNAL_INT_NMI)
+  
+  EExt_Interrupts in = digitalPinToInterrupt(pin);
+  if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
   if (!enabled) {
@@ -69,17 +71,17 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   }
 
   // Assign callback to interrupt
-  callbacksInt[digitalPinToInterrupt(pin)] = callback;
+  callbacksInt[in] = callback;
 
   // Look for right CONFIG register to be addressed
-  if (digitalPinToInterrupt(pin) > EXTERNAL_INT_7) {
+  if (in > EXTERNAL_INT_7) {
     config = 1;
   } else {
     config = 0;
   }
 
   // Configure the interrupt mode
-  pos = ((digitalPinToInterrupt(pin) - (8 * config)) << 2);
+  pos = (in - (8 * config)) << 2;
   switch (mode)
   {
     case LOW:
@@ -104,7 +106,7 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   }
 
   // Enable the interrupt
-  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << digitalPinToInterrupt(pin));
+  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << in);
 }
 
 /*
@@ -112,12 +114,11 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
  */
 void detachInterrupt(uint32_t pin)
 {
-  if (digitalPinToInterrupt(pin) == NOT_AN_INTERRUPT)
-    return;
-  if (digitalPinToInterrupt(pin) == EXTERNAL_INT_NMI)
+  EExt_Interrupts in = digitalPinToInterrupt(pin);
+  if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
-  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << digitalPinToInterrupt(pin));
+  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
 }
 
 /*

From 8972f1e0476fe157ee86cc0af1016797df07177b Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 25 Jun 2015 19:13:16 +0200
Subject: [PATCH 033/124] USB device refactoring (WIP)

---
 cores/arduino/USB/CDC.cpp            |  141 ++--
 cores/arduino/USB/HID.cpp            |   31 +-
 cores/arduino/USB/SAMD21_USBDevice.h |  197 +++++
 cores/arduino/USB/USBAPI.h           |  134 +--
 cores/arduino/USB/USBCore.cpp        | 1125 ++++++++++++++------------
 cores/arduino/USB/USBCore.h          |   12 +-
 cores/arduino/USB/USBDesc.h          |    2 +-
 cores/arduino/USB/USB_device.h       |   63 --
 cores/arduino/USB/USB_host.h         |    2 +-
 cores/arduino/USB/USB_interrupt.c    |   23 -
 cores/arduino/USB/samd21_device.h    |  108 ---
 cores/arduino/USB/samd21_host.c      |    7 +-
 cores/arduino/USB/samd21_host.h      |   24 +-
 13 files changed, 997 insertions(+), 872 deletions(-)
 create mode 100644 cores/arduino/USB/SAMD21_USBDevice.h
 delete mode 100644 cores/arduino/USB/USB_device.h
 delete mode 100644 cores/arduino/USB/USB_interrupt.c
 delete mode 100644 cores/arduino/USB/samd21_device.h

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index 33c7b7e86..c0e61a893 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 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
@@ -16,22 +16,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <Arduino.h>
+#include <Reset.h> // Needed for auto-reset with 1200bps port touch
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 
-// Include Atmel headers
-#include "Arduino.h"
-#include "sam.h"
-#include "wiring_constants.h"
-#include "USBCore.h"
-#include "USB/USB_device.h"
-#include "USBDesc.h"
-#include "USBAPI.h"
-
-#include "Reset.h"
-
-
 #ifdef CDC_ENABLED
 
 #define CDC_SERIAL_BUFFER_SIZE	64
@@ -42,96 +33,93 @@
 
 #define CDC_LINESTATE_READY		(CDC_LINESTATE_RTS | CDC_LINESTATE_DTR)
 
-struct ring_buffer
-{
+struct ring_buffer {
 	uint8_t buffer[CDC_SERIAL_BUFFER_SIZE];
 	volatile uint32_t head;
 	volatile uint32_t tail;
 };
-
 ring_buffer cdc_rx_buffer = { { 0 }, 0, 0};
 
-typedef struct
-{
-	uint32_t	dwDTERate;
-	uint8_t		bCharFormat;
-	uint8_t 	bParityType;
-	uint8_t 	bDataBits;
-	uint8_t		lineState;
+typedef struct {
+	uint32_t dwDTERate;
+	uint8_t bCharFormat;
+	uint8_t bParityType;
+	uint8_t bDataBits;
+	uint8_t lineState;
 } LineInfo;
 
 _Pragma("pack(1)")
 static volatile LineInfo _usbLineInfo = {
-   115200, // dWDTERate
-    0x00,  // bCharFormat
-    0x00,  // bParityType
-    0x08,  // bDataBits
-    0x00   // lineState
+	115200, // dWDTERate
+	0x00,   // bCharFormat
+	0x00,   // bParityType
+	0x08,   // bDataBits
+	0x00    // lineState
 };
 
-static const CDCDescriptor _cdcInterface =
-{
-#if (defined CDC_ENABLED) && defined(HID_ENABLED)
+static const CDCDescriptor _cdcInterface = {
+	#if (defined CDC_ENABLED) && defined(HID_ENABLED)
 	D_IAD(0, 2, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
-#endif
-	//	CDC communication interface
-	D_INTERFACE(CDC_ACM_INTERFACE,1,CDC_COMMUNICATION_INTERFACE_CLASS,CDC_ABSTRACT_CONTROL_MODEL,0),
-	D_CDCCS( CDC_HEADER, CDC_V1_10 & 0xFF, (CDC_V1_10>>8) & 0x0FF ),	// Header (1.10 bcd)
-
-	D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT,6),				// SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
-	D_CDCCS(CDC_UNION,CDC_ACM_INTERFACE,CDC_DATA_INTERFACE),	// Communication interface is master, data interface is slave 0
-	D_CDCCS(CDC_CALL_MANAGEMENT,1,1),							// Device handles call management (not)
-	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_ACM),USB_ENDPOINT_TYPE_INTERRUPT,0x10, 0x10),
-
-	//	CDC data interface
-	D_INTERFACE(CDC_DATA_INTERFACE,2,CDC_DATA_INTERFACE_CLASS,0,0),
-	D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT),USB_ENDPOINT_TYPE_BULK,EPX_SIZE,0),
-	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ),USB_ENDPOINT_TYPE_BULK,EPX_SIZE,0)
+	#endif
+
+	// CDC communication interface
+	D_INTERFACE(CDC_ACM_INTERFACE, 1, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
+	D_CDCCS(CDC_HEADER, CDC_V1_10 & 0xFF, (CDC_V1_10>>8) & 0x0FF), // Header (1.10 bcd)
+
+	D_CDCCS4(CDC_ABSTRACT_CONTROL_MANAGEMENT, 6), // SET_LINE_CODING, GET_LINE_CODING, SET_CONTROL_LINE_STATE supported
+	D_CDCCS(CDC_UNION, CDC_ACM_INTERFACE, CDC_DATA_INTERFACE), // Communication interface is master, data interface is slave 0
+	D_CDCCS(CDC_CALL_MANAGEMENT, 1, 1), // Device handles call management (not)
+	D_ENDPOINT(USB_ENDPOINT_IN(CDC_ENDPOINT_ACM), USB_ENDPOINT_TYPE_INTERRUPT, 0x10, 0x10),
+
+	// CDC data interface
+	D_INTERFACE(CDC_DATA_INTERFACE, 2, CDC_DATA_INTERFACE_CLASS, 0, 0),
+	D_ENDPOINT(USB_ENDPOINT_OUT(CDC_ENDPOINT_OUT), USB_ENDPOINT_TYPE_BULK, EPX_SIZE, 0),
+	D_ENDPOINT(USB_ENDPOINT_IN (CDC_ENDPOINT_IN ), USB_ENDPOINT_TYPE_BULK, EPX_SIZE, 0)
 };
 _Pragma("pack()")
 
-const void* WEAK CDC_GetInterface(void)
+const void* CDC_GetInterface(void)
 {
-	return  &_cdcInterface;
+	return &_cdcInterface;
 }
 
-uint32_t WEAK CDC_GetInterfaceLength(void)
+uint32_t CDC_GetInterfaceLength(void)
 {
-    return sizeof( _cdcInterface );
+	return sizeof(_cdcInterface);
 }
 
-bool WEAK CDC_Setup(Setup& setup)
+bool CDC_Setup(Setup& setup)
 {
-	uint8_t r = setup.bRequest;
 	uint8_t requestType = setup.bmRequestType;
+	uint8_t r = setup.bRequest;
 
-	if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
+	if (requestType == REQUEST_DEVICETOHOST_CLASS_INTERFACE)
 	{
-		if (CDC_GET_LINE_CODING == r)
+		if (r == CDC_GET_LINE_CODING)
 		{
-			USBD_SendControl(0,(void*)&_usbLineInfo,7);
+			USBDevice.sendControl((void*)&_usbLineInfo, 7);
 			return true;
 		}
 	}
 
-	if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
+	if (requestType == REQUEST_HOSTTODEVICE_CLASS_INTERFACE)
 	{
-		if (CDC_SET_LINE_CODING == r)
+		if (r == CDC_SET_LINE_CODING)
 		{
-			USBD_RecvControl((void*)&_usbLineInfo,7);
+			USBDevice.recvControl((void*)&_usbLineInfo, 7);
 		}
 
-		if (CDC_SET_CONTROL_LINE_STATE == r)
+		if (r == CDC_SET_CONTROL_LINE_STATE)
 		{
 			_usbLineInfo.lineState = setup.wValueL;
 		}
 
-		if (CDC_SET_LINE_CODING == r || CDC_SET_CONTROL_LINE_STATE == r)
+		if (r == CDC_SET_LINE_CODING || r == CDC_SET_CONTROL_LINE_STATE)
 		{
 			// auto-reset into the bootloader is triggered when the port, already
 			// open at 1200 bps, is closed. We check DTR state to determine if host 
 			// port is open (bit 0 of lineState).
-			if (1200 == _usbLineInfo.dwDTERate && (_usbLineInfo.lineState & 0x01) == 0)
+			if (_usbLineInfo.dwDTERate == 1200 && (_usbLineInfo.lineState & 0x01) == 0)
 			{
 				initiateReset(250);
 			}
@@ -161,7 +149,7 @@ void Serial_::end(void)
 void Serial_::accept(void)
 {
 	uint8_t buffer[CDC_SERIAL_BUFFER_SIZE];
-	uint32_t len = USBD_Recv(CDC_ENDPOINT_OUT, (void*)&buffer, CDC_SERIAL_BUFFER_SIZE);
+	uint32_t len = usb.recv(CDC_ENDPOINT_OUT, &buffer, CDC_SERIAL_BUFFER_SIZE);
 
 	noInterrupts();
 	ring_buffer *ringBuffer = &cdc_rx_buffer;
@@ -173,7 +161,7 @@ void Serial_::accept(void)
 	// and so we don't write the character or advance the head.
 	uint32_t k = 0;
 	i = (i + 1) % CDC_SERIAL_BUFFER_SIZE;
-	while (i != ringBuffer->tail && len>0) {
+	while ((i != ringBuffer->tail) && (len > 0)) {
 		len--;
 		ringBuffer->buffer[ringBuffer->head] = buffer[k++];
 		ringBuffer->head = i;
@@ -185,6 +173,9 @@ void Serial_::accept(void)
 int Serial_::available(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
+	if (buffer->head == buffer->tail) {
+		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
+	}
 	return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;
 }
 
@@ -202,12 +193,22 @@ int Serial_::peek(void)
 	}
 }
 
+
+// if the ringBuffer is empty: try to fill it
+// if it's still empty: return -1
+// else return the last char
+// so the buffer is filled only when needed
 int Serial_::read(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
 
 	// if the head isn't ahead of the tail, we don't have any characters
 	if (buffer->head == buffer->tail)
+	{
+		if (usb.available(CDC_ENDPOINT_OUT))
+			accept();
+	}
+	if (buffer->head == buffer->tail)
 	{
 		return -1;
 	}
@@ -215,15 +216,15 @@ int Serial_::read(void)
 	{
 		unsigned char c = buffer->buffer[buffer->tail];
 		buffer->tail = (uint32_t)(buffer->tail + 1) % CDC_SERIAL_BUFFER_SIZE;
-		if (USBD_Available(CDC_ENDPOINT_OUT))
-			accept();
+// 		if (usb.available(CDC_ENDPOINT_OUT))
+// 			accept();
 		return c;
 	}
 }
 
 void Serial_::flush(void)
 {
-	USBD_Flush(CDC_ENDPOINT_IN);
+	usb.flush(CDC_ENDPOINT_IN);
 }
 
 size_t Serial_::write(const uint8_t *buffer, size_t size)
@@ -239,13 +240,11 @@ size_t Serial_::write(const uint8_t *buffer, size_t size)
 	// or locks up, or host virtual serial port hangs)
 //	if (_usbLineInfo.lineState > 0)  // Problem with Windows(R)
 	{
-		uint32_t r = USBD_Send(CDC_ENDPOINT_IN, buffer, size);
+		uint32_t r = usb.send(CDC_ENDPOINT_IN, buffer, size);
 
-		if (r > 0)
-		{
+		if (r > 0) {
 			return r;
-		} else
-		{
+		} else {
 			setWriteError();
 			return 0;
 		}
@@ -282,6 +281,6 @@ Serial_::operator bool()
 	return result;
 }
 
-Serial_ SerialUSB;
+Serial_ SerialUSB(USBDevice);
 
 #endif
diff --git a/cores/arduino/USB/HID.cpp b/cores/arduino/USB/HID.cpp
index d8ce454b9..09b6402a7 100644
--- a/cores/arduino/USB/HID.cpp
+++ b/cores/arduino/USB/HID.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2014 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
@@ -16,13 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "USBAPI.h"
-#include "Reset.h"
-#include "USBCore.h"
-#include "USBDesc.h"
-#include "sam.h"
-#include "USB/USB_device.h"
-
+#include <Arduino.h>
 
 #ifdef HID_ENABLED
 
@@ -143,14 +137,12 @@ _Pragma("pack()")
 uint8_t _hid_protocol = 1;
 uint8_t _hid_idle = 1;
 
-#define WEAK __attribute__ ((weak))
-
-const void* WEAK HID_GetInterface(void)
+const void* HID_GetInterface(void)
 {
 	return  &_hidInterface;
 }
 
-uint32_t WEAK HID_GetInterfaceLength(void)
+uint32_t HID_GetInterfaceLength(void)
 {
     return sizeof( _hidInterface );
 }
@@ -160,12 +152,12 @@ uint32_t HID_SizeReportDescriptor(void)
 	return sizeof(_hidReportDescriptor);
 }
 
-uint32_t WEAK HID_GetDescriptor(void)
+uint32_t HID_GetDescriptor(void)
 {
-	return USBD_SendControl(0,_hidReportDescriptor,sizeof(_hidReportDescriptor));
+	return USBDevice.sendControl(_hidReportDescriptor, sizeof(_hidReportDescriptor));
 }
 
-void WEAK HID_SendReport(uint8_t id, const void* data, uint32_t len)
+void HID_SendReport(uint8_t id, const void* data, uint32_t len)
 {
 	uint8_t p[8];
 	const uint8_t *d = reinterpret_cast<const uint8_t *>(data);
@@ -175,10 +167,10 @@ void WEAK HID_SendReport(uint8_t id, const void* data, uint32_t len)
 	{
 		p[i+1] = d[i];
 	}
-	USBD_Send(HID_ENDPOINT_INT, p, len+1);
+	USBDevice.send(HID_ENDPOINT_INT, p, len+1);
 }
 
-bool WEAK HID_Setup(Setup& setup)
+bool HID_Setup(Setup& setup)
 {
 	uint8_t r = setup.bRequest;
 	uint8_t requestType = setup.bmRequestType;
@@ -197,8 +189,9 @@ bool WEAK HID_Setup(Setup& setup)
 		}
 		if (HID_GET_IDLE == r)
 		{
-			UDD_Send(0, &_hid_idle, 1);
-			UDD_ClearIN();
+			USBDevice.armSend(0, &_hid_idle, 1);
+			// RAM buffer is full, we can send data (IN)
+			USB->DEVICE.DeviceEndpoint[0].EPSTATUSSET.bit.BK1RDY = 1;
 			return true;
 		}
 	}
diff --git a/cores/arduino/USB/SAMD21_USBDevice.h b/cores/arduino/USB/SAMD21_USBDevice.h
new file mode 100644
index 000000000..203a1c787
--- /dev/null
+++ b/cores/arduino/USB/SAMD21_USBDevice.h
@@ -0,0 +1,197 @@
+/*
+  Copyright (c) 2015 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
+*/
+
+#pragma once
+
+#include <Arduino.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+
+typedef uint8_t ep_t;
+
+class USBDevice_SAMD21G18x {
+public:
+	USBDevice_SAMD21G18x() : usb(USB->DEVICE) {
+		// Empty
+	}
+
+	// USB Device function mapping
+	// ---------------------------
+
+	// Reset USB Device
+	void reset();
+
+	// Enable
+	inline void enable()  { usb.CTRLA.bit.ENABLE = 1; }
+	inline void disable() { usb.CTRLA.bit.ENABLE = 0; }
+
+	// USB mode (device/host)
+	inline void setUSBDeviceMode() { usb.CTRLA.bit.MODE = USB_CTRLA_MODE_DEVICE_Val; }
+	inline void setUSBHostMode()   { usb.CTRLA.bit.MODE = USB_CTRLA_MODE_HOST_Val;   }
+
+	inline void runInStandby()   { usb.CTRLA.bit.RUNSTDBY = 1; }
+	inline void noRunInStandby() { usb.CTRLA.bit.RUNSTDBY = 0; }
+
+	// USB speed
+	inline void setFullSpeed()       { usb.CTRLB.bit.SPDCONF = USB_DEVICE_CTRLB_SPDCONF_FS_Val;   }
+	inline void setLowSpeed()        { usb.CTRLB.bit.SPDCONF = USB_DEVICE_CTRLB_SPDCONF_LS_Val;   }
+	inline void setHiSpeed()         { usb.CTRLB.bit.SPDCONF = USB_DEVICE_CTRLB_SPDCONF_HS_Val;   }
+	inline void setHiSpeedTestMode() { usb.CTRLB.bit.SPDCONF = USB_DEVICE_CTRLB_SPDCONF_HSTM_Val; }
+
+	// Authorize attach if Vbus is present
+	inline void attach() { usb.CTRLB.bit.DETACH = 0; }
+	inline void detach() { usb.CTRLB.bit.DETACH = 1; }
+
+	// USB Interrupts
+	inline bool isEndOfResetInterrupt()        { return usb.INTFLAG.bit.EORST; }
+	inline void ackEndOfResetInterrupt()       { usb.INTFLAG.reg = USB_DEVICE_INTFLAG_EORST; }
+	inline void enableEndOfResetInterrupt()    { usb.INTENSET.bit.EORST = 1; } 
+	inline void disableEndOfResetInterrupt()   { usb.INTENCLR.bit.EORST = 1; } 
+
+	inline bool isStartOfFrameInterrupt()      { return usb.INTFLAG.bit.SOF; }
+	inline void ackStartOfFrameInterrupt()     { usb.INTFLAG.reg = USB_DEVICE_INTFLAG_SOF; }
+	inline void enableStartOfFrameInterrupt()  { usb.INTENSET.bit.SOF = 1; }
+	inline void disableStartOfFrameInterrupt() { usb.INTENCLR.bit.SOF = 1; }
+
+	// USB Address
+	inline void setAddress(uint32_t addr)   { usb.DADD.bit.DADD = addr; usb.DADD.bit.ADDEN = 1; }
+	inline void unsetAddress()              { usb.DADD.bit.DADD = 0;    usb.DADD.bit.ADDEN = 0; }
+
+	// Frame number
+	inline uint16_t frameNumber() { return usb.FNUM.bit.FNUM; }
+
+	// Load calibration values
+	void calibrate();
+
+	// USB Device Endpoints function mapping
+	// -------------------------------------
+
+	// Config
+	inline void epBank0SetType(ep_t ep, uint8_t type) { usb.DeviceEndpoint[ep].EPCFG.bit.EPTYPE0 = type; }
+	inline void epBank1SetType(ep_t ep, uint8_t type) { usb.DeviceEndpoint[ep].EPCFG.bit.EPTYPE1 = type; }
+
+	// Interrupts
+	inline uint16_t epInterruptSummary() { return usb.EPINTSMRY.reg; }
+
+	inline bool epBank0IsSetupReceived(ep_t ep)     { return usb.DeviceEndpoint[ep].EPINTFLAG.bit.RXSTP; }
+	inline bool epBank0IsStalled(ep_t ep)           { return usb.DeviceEndpoint[ep].EPINTFLAG.bit.STALL & 1; }
+	inline bool epBank1IsStalled(ep_t ep)           { return usb.DeviceEndpoint[ep].EPINTFLAG.bit.STALL & 2; }
+	inline bool epBank0IsTransferComplete(ep_t ep)  { return usb.DeviceEndpoint[ep].EPINTFLAG.bit.TRCPT & 1; }
+	inline bool epBank1IsTransferComplete(ep_t ep)  { return usb.DeviceEndpoint[ep].EPINTFLAG.bit.TRCPT & 2; }
+
+	inline void epBank0AckSetupReceived(ep_t ep)    { usb.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_RXSTP; }
+	inline void epBank0AckStalled(ep_t ep)          { usb.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL(1); }
+	inline void epBank1AckStalled(ep_t ep)          { usb.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL(2); }
+	inline void epBank0AckTransferComplete(ep_t ep) { usb.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_TRCPT(1); }
+	inline void epBank1AckTransferComplete(ep_t ep) { usb.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_TRCPT(2); }
+
+	inline void epBank0EnableSetupReceived(ep_t ep)    { usb.DeviceEndpoint[ep].EPINTENSET.bit.RXSTP = 1; }
+	inline void epBank0EnableStalled(ep_t ep)          { usb.DeviceEndpoint[ep].EPINTENSET.bit.STALL = 1; }
+	inline void epBank1EnableStalled(ep_t ep)          { usb.DeviceEndpoint[ep].EPINTENSET.bit.STALL = 2; }
+	inline void epBank0EnableTransferComplete(ep_t ep) { usb.DeviceEndpoint[ep].EPINTENSET.bit.TRCPT = 1; }
+	inline void epBank1EnableTransferComplete(ep_t ep) { usb.DeviceEndpoint[ep].EPINTENSET.bit.TRCPT = 2; }
+
+	inline void epBank0DisableSetupReceived(ep_t ep)    { usb.DeviceEndpoint[ep].EPINTENCLR.bit.RXSTP = 1; }
+	inline void epBank0DisableStalled(ep_t ep)          { usb.DeviceEndpoint[ep].EPINTENCLR.bit.STALL = 1; }
+	inline void epBank1DisableStalled(ep_t ep)          { usb.DeviceEndpoint[ep].EPINTENCLR.bit.STALL = 2; }
+	inline void epBank0DisableTransferComplete(ep_t ep) { usb.DeviceEndpoint[ep].EPINTENCLR.bit.TRCPT = 1; }
+	inline void epBank1DisableTransferComplete(ep_t ep) { usb.DeviceEndpoint[ep].EPINTENCLR.bit.TRCPT = 2; }
+
+	// Status
+	inline bool epBank0IsReady(ep_t ep)    { return usb.DeviceEndpoint[ep].EPSTATUS.bit.BK0RDY; }
+	inline bool epBank1IsReady(ep_t ep)    { return usb.DeviceEndpoint[ep].EPSTATUS.bit.BK1RDY; }
+	inline void epBank0SetReady(ep_t ep)   { usb.DeviceEndpoint[ep].EPSTATUSSET.bit.BK0RDY = 1; }
+	inline void epBank1SetReady(ep_t ep)   { usb.DeviceEndpoint[ep].EPSTATUSSET.bit.BK1RDY = 1; }
+	inline void epBank0ResetReady(ep_t ep) { usb.DeviceEndpoint[ep].EPSTATUSCLR.bit.BK0RDY = 1; }
+	inline void epBank1ResetReady(ep_t ep) { usb.DeviceEndpoint[ep].EPSTATUSCLR.bit.BK1RDY = 1; }
+
+	inline void epBank0SetStallReq(ep_t ep)   { usb.DeviceEndpoint[ep].EPSTATUSSET.bit.STALLRQ = 1; }
+	inline void epBank1SetStallReq(ep_t ep)   { usb.DeviceEndpoint[ep].EPSTATUSSET.bit.STALLRQ = 2; }
+	inline void epBank0ResetStallReq(ep_t ep) { usb.DeviceEndpoint[ep].EPSTATUSCLR.bit.STALLRQ = 1; }
+	inline void epBank1ResetStallReq(ep_t ep) { usb.DeviceEndpoint[ep].EPSTATUSCLR.bit.STALLRQ = 2; }
+
+	// Packet
+	inline uint16_t epBank0ByteCount(ep_t ep) { return EP[ep].DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT; }
+	inline uint16_t epBank1ByteCount(ep_t ep) { return EP[ep].DeviceDescBank[1].PCKSIZE.bit.BYTE_COUNT; }
+	inline void epBank0SetByteCount(ep_t ep, uint16_t bc) { EP[ep].DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT = bc; }
+	inline void epBank1SetByteCount(ep_t ep, uint16_t bc) { EP[ep].DeviceDescBank[1].PCKSIZE.bit.BYTE_COUNT = bc; }
+	inline void epBank0SetMultiPacketSize(ep_t ep, uint16_t s) { EP[ep].DeviceDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = s; }
+	inline void epBank1SetMultiPacketSize(ep_t ep, uint16_t s) { EP[ep].DeviceDescBank[1].PCKSIZE.bit.MULTI_PACKET_SIZE = s; }
+
+	inline void epBank0SetAddress(ep_t ep, void *addr) { EP[ep].DeviceDescBank[0].ADDR.reg = (uint32_t)addr; }
+	inline void epBank1SetAddress(ep_t ep, void *addr) { EP[ep].DeviceDescBank[1].ADDR.reg = (uint32_t)addr; }
+	inline void epBank0SetSize(ep_t ep, uint16_t size) { EP[ep].DeviceDescBank[0].PCKSIZE.bit.SIZE = EP_PCKSIZE_SIZE(size); }
+	inline void epBank1SetSize(ep_t ep, uint16_t size) { EP[ep].DeviceDescBank[1].PCKSIZE.bit.SIZE = EP_PCKSIZE_SIZE(size); }
+	inline uint8_t EP_PCKSIZE_SIZE(uint16_t size) {
+		switch (size) {
+		case 8:    return 0;
+		case 16:   return 1;
+		case 32:   return 2;
+		case 64:   return 3;
+		case 128:  return 4;
+		case 256:  return 5;
+		case 512:  return 6;
+		case 1023: return 7;
+		default:   return 0;
+		}
+	}
+
+	inline void epBank0DisableAutoZLP(ep_t ep) { EP[ep].DeviceDescBank[0].PCKSIZE.bit.AUTO_ZLP = 0; }
+	inline void epBank1DisableAutoZLP(ep_t ep) { EP[ep].DeviceDescBank[1].PCKSIZE.bit.AUTO_ZLP = 0; }
+	inline void epBank0EnableAutoZLP(ep_t ep)  { EP[ep].DeviceDescBank[0].PCKSIZE.bit.AUTO_ZLP = 1; }
+	inline void epBank1EnableAutoZLP(ep_t ep)  { EP[ep].DeviceDescBank[1].PCKSIZE.bit.AUTO_ZLP = 1; }
+
+private:
+	// USB Device registers
+	UsbDevice &usb;
+
+	// Endpoints descriptors table
+	__attribute__((__aligned__(4)))	UsbDeviceDescriptor EP[USB_EPT_NUM];
+};
+
+void USBDevice_SAMD21G18x::reset() {
+	usb.CTRLA.bit.SWRST = 1;
+	memset(EP, 0, sizeof(EP));
+	while (usb.SYNCBUSY.bit.SWRST) {}
+	usb.DESCADD.reg = (uint32_t)(&EP);
+}
+
+void USBDevice_SAMD21G18x::calibrate() {
+	// Load Pad Calibration data from non-volatile memory
+	uint32_t *pad_transn_p = (uint32_t *) USB_FUSES_TRANSN_ADDR;
+	uint32_t *pad_transp_p = (uint32_t *) USB_FUSES_TRANSP_ADDR;
+	uint32_t *pad_trim_p   = (uint32_t *) USB_FUSES_TRIM_ADDR;
+
+	uint32_t pad_transn = (*pad_transn_p & USB_FUSES_TRANSN_Msk) >> USB_FUSES_TRANSN_Pos;
+	uint32_t pad_transp = (*pad_transp_p & USB_FUSES_TRANSP_Msk) >> USB_FUSES_TRANSP_Pos;
+	uint32_t pad_trim   = (*pad_trim_p   & USB_FUSES_TRIM_Msk  ) >> USB_FUSES_TRIM_Pos;
+
+	if (pad_transn == 0x1F)  // maximum value (31)
+		pad_transn = 5;
+	if (pad_transp == 0x1F)  // maximum value (31)
+		pad_transp = 29;
+	if (pad_trim == 0x7)     // maximum value (7)
+		pad_trim = 3;
+
+	usb.PADCAL.bit.TRANSN = pad_transn;
+	usb.PADCAL.bit.TRANSP = pad_transp;
+	usb.PADCAL.bit.TRIM   = pad_trim;
+}
+
diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h
index 1229c3b71..b2d9d510b 100644
--- a/cores/arduino/USB/USBAPI.h
+++ b/cores/arduino/USB/USBAPI.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 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
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef __USBAPI__
-#define __USBAPI__
+#pragma once
 
 #define HSTPIPCFG_PTYPE_BLK 1
 #define HSTPIPCFG_PTOKEN_IN 2
@@ -25,17 +24,8 @@
 #define HSTPIPCFG_PBK_1_BANK 4
 #define HSTPIPCFG_PTYPE_INTRPT 5
 
-
-
-/* Define attribute */
-#if defined   ( __CC_ARM   ) /* Keil uVision 4 */
-    #define WEAK (__attribute__ ((weak)))
-#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
-    #define WEAK __weak
-#elif defined (  __GNUC__  ) /* GCC CS */
-    #define WEAK __attribute__ ((weak))
-#endif
-
+#define EP0      0
+#define EPX_SIZE 64 // 64 for Full Speed, EPT size max is 1024
 
 #if defined __cplusplus
 
@@ -43,31 +33,81 @@
 #include "RingBuffer.h"
 
 //================================================================================
-//================================================================================
-//	USB
+// USB
 
-class USBDevice_
-{
+// Low level API
+typedef struct {
+	union {
+		uint8_t bmRequestType;
+		struct {
+			uint8_t direction : 5;
+			uint8_t type : 2;
+			uint8_t transferDirection : 1;
+		};
+	};
+	uint8_t bRequest;
+	uint8_t wValueL;
+	uint8_t wValueH;
+	uint16_t wIndex;
+	uint16_t wLength;
+} Setup;
+
+class USBDeviceClass {
 public:
-	USBDevice_();
-	bool configured();
+	USBDeviceClass() {};
 
-	bool attach();
-	bool detach();	// Serial port goes down too...
-	void poll();
+	// USB Device API
 	void init();
+	bool attach();
+	bool detach();
+	void setAddress(uint32_t addr);
+
+	bool configured();
+	bool connected();
+
+	// Setup API
+	bool handleClassInterfaceSetup(Setup &setup);
+	bool handleStandardSetup(Setup &setup);
+	bool sendDescriptor(Setup &setup);
+
+	// Control EndPoint API
+	uint32_t sendControl(const void *data, uint32_t len);
+	uint32_t recvControl(void *data, uint32_t len);
+	bool sendConfiguration(uint32_t maxlen);
+	bool sendStringDescriptor(const uint8_t *string, uint8_t maxlen);
+
+	// Generic EndPoint API
+	void initEP(uint32_t ep, uint32_t type);
+	void handleEndpoint(uint8_t ep);
+
+	uint32_t send(uint32_t ep, const void *data, uint32_t len);
+	void sendZlp(uint32_t ep);
+	uint32_t recv(uint32_t ep, void *data, uint32_t len);
+	uint32_t recv(uint32_t ep);
+	uint32_t available(uint32_t ep);
+	void flush(uint32_t ep);
+	void stall(uint32_t ep);
+
+	// private?
+	uint32_t armSend(uint32_t ep, const void *data, uint32_t len);
+	uint8_t armRecv(uint32_t ep, uint32_t len);
+	uint8_t armRecvCtrlOUT(uint32_t ep, uint32_t len);
+
+	void ISRHandler();
+
+private:
+	bool initialized;
 };
-extern USBDevice_ USBDevice;
 
-//================================================================================
+extern USBDeviceClass USBDevice;
+
 //================================================================================
 //	Serial over CDC (Serial1 is the physical port)
 
 class Serial_ : public Stream
 {
-private:
-	RingBuffer *_cdc_rx_buffer;
 public:
+	Serial_(USBDeviceClass &_usb) : usb(_usb) { }
 	void begin(uint32_t baud_count);
 	void begin(unsigned long, uint8_t);
 	void end(void);
@@ -81,6 +121,9 @@ class Serial_ : public Stream
 	virtual size_t write(const uint8_t *buffer, size_t size);
 	using Print::write; // pull in write(str) from Print
 	operator bool();
+private:
+	USBDeviceClass &usb;
+	RingBuffer *_cdc_rx_buffer;
 };
 extern Serial_ SerialUSB;
 
@@ -175,26 +218,12 @@ class Keyboard_ : public Print
 };
 extern Keyboard_ Keyboard;
 
-//================================================================================
-//================================================================================
-//	Low level API
-
-typedef struct
-{
-	uint8_t bmRequestType;
-	uint8_t bRequest;
-	uint8_t wValueL;
-	uint8_t wValueH;
-	uint16_t wIndex;
-	uint16_t wLength;
-} Setup;
-
 //================================================================================
 //================================================================================
 //	HID 'Driver'
 
-const void* WEAK HID_GetInterface(void);
-uint32_t WEAK HID_GetInterfaceLength(void);
+const void* HID_GetInterface(void);
+uint32_t HID_GetInterfaceLength(void);
 uint32_t HID_SizeReportDescriptor(void);
 
 uint32_t		HID_GetDescriptor(void);
@@ -215,26 +244,9 @@ bool	MSC_Data(uint8_t rx,uint8_t tx);
 //	CDC 'Driver'
 
 const void* CDC_GetInterface(/*uint8_t* interfaceNum*/);
-uint32_t WEAK CDC_GetInterfaceLength(void);
+uint32_t CDC_GetInterfaceLength(void);
 uint32_t		CDC_GetOtherInterface(uint8_t* interfaceNum);
 uint32_t		CDC_GetDescriptor(uint32_t i);
 bool	CDC_Setup(Setup& setup);
 
-//================================================================================
-//================================================================================
-
-uint32_t USBD_SendControl(uint8_t flags, const void* d, uint32_t len);
-uint32_t USBD_RecvControl(void* d, uint32_t len);
-uint32_t USBD_SendInterfaces(void);
-bool USBD_ClassInterfaceRequest(Setup& setup);
-
-uint32_t USBD_Available(uint32_t ep);
-uint32_t USBD_SendSpace(uint32_t ep);
-uint32_t USBD_Send(uint32_t ep, const void* d, uint32_t len);
-uint32_t USBD_Recv(uint32_t ep, void* data, uint32_t len);		// non-blocking
-uint32_t USBD_Recv(uint32_t ep);							// non-blocking
-void USBD_Flush(uint32_t ep);
-uint32_t USBD_Connected(void);
-
 #endif  // __cplusplus
-#endif  // __USBAPI__
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 31b8380af..cfcf101aa 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2015 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
@@ -16,14 +16,15 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "../Arduino.h"
-#include "USBCore.h"
-#include "USB/USB_device.h"   // needed for USB PID define
-#include "USBDesc.h"
-#include "USBAPI.h"
+#include <Arduino.h>
 
-//#define TRACE_CORE(x)	x
-#define TRACE_CORE(x)
+#include "SAMD21_USBDevice.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdint.h>
+
+USBDevice_SAMD21G18x usbd;
 
 static char isRemoteWakeUpEnabled = 0;
 static char isEndpointHalt = 0;
@@ -50,184 +51,56 @@ const uint8_t STRING_PRODUCT[] = USB_PRODUCT;
 #  define USB_MANUFACTURER "Unknown"
 #endif
 
-const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER;
+const uint8_t STRING_MANUFACTURER[] = USB_MANUFACTURER;
 
 
 //	DEVICE DESCRIPTOR
 #if (defined CDC_ENABLED) && defined(HID_ENABLED)
-const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0xEF,0x02,0x01,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
 #elif defined(CDC_ENABLED)  // CDC only
-const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0x02,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x02, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
 #else // HID only
-const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
+const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
 #endif
 
 //==================================================================
 
 volatile uint32_t _usbConfiguration = 0;
-volatile uint32_t _usbInitialized = 0;
 volatile uint32_t _usbSetInterface = 0;
 
-//==================================================================
-
-
-//	Number of bytes, assumes a rx endpoint
-uint32_t USBD_Available(uint32_t ep)
-{
-	return UDD_FifoByteCount(ep);
-}
-
-//	Non Blocking receive
-//	Return number of bytes read
-uint32_t USBD_Recv(uint32_t ep, void* d, uint32_t len)
-{
-	if (!_usbConfiguration)
-		return -1;
-
-	uint8_t *buffer;
-	uint8_t *data = (uint8_t *)d;
-
-	len = min(UDD_FifoByteCount(ep), len);
-
-	UDD_Recv_data(ep, len);
-	UDD_Recv(ep, &buffer);
-	for (uint32_t i=0; i<len; i++) {
-		data[i] = buffer[i];
-	}
-
-	if (len && !UDD_FifoByteCount(ep)) // release empty buffer
-		UDD_ReleaseRX(ep);
-
-	return len;
-}
+static __attribute__((__aligned__(4))) /*__attribute__((__section__(".bss_hram0")))*/
+uint8_t udd_ep_out_cache_buffer[4][64];
 
-//	Recv 1 byte if ready
-uint32_t USBD_Recv(uint32_t ep)
-{
-	uint8_t c;
-	if (USBD_Recv(ep, &c, 1) != 1)
-		return -1;
-	else
-		return c;
-}
+static __attribute__((__aligned__(4))) /*__attribute__((__section__(".bss_hram0")))*/
+uint8_t udd_ep_in_cache_buffer[4][128];
 
-//	Blocking Send of data to an endpoint
-uint32_t USBD_Send(uint32_t ep, const void* d, uint32_t len)
-{
-	int r = len;
-	const uint8_t* data = (const uint8_t*)d;
-
-    if (!_usbConfiguration)
-    {
-    	TRACE_CORE(printf("pb conf\n\r");)
-		return -1;
-    }
-	UDD_Send(ep, data, len);
-
-	/* Clear the transfer complete flag  */
-	udd_clear_IN_transf_cplt(ep);
-	/* Set the bank as ready */
-	udd_IN_transfer_allowed(ep);
-
-	/* Wait for transfer to complete */
-	while (! udd_is_IN_transf_cplt(ep));  // need fire exit.
-	return r;
-}
-
-uint32_t USBD_SendControl(uint8_t flags, const void* d, uint32_t len)
-{
-	const uint8_t* data = (const uint8_t*)d;
-	uint32_t length = len;
-	uint32_t sent = 0;
-	uint32_t pos = 0;
-
-	TRACE_CORE(printf("=> USBD_SendControl TOTAL len=%lu\r\n", len);)
-
- 		while (len > 0)
- 		{
-			sent = UDD_Send(EP0, data + pos, len);
-			TRACE_CORE(printf("=> USBD_SendControl sent=%lu\r\n", sent);)
-			pos += sent;
-			len -= sent;
- 		}
-
-	return length;
-}
+//==================================================================
 
 // Send a USB descriptor string. The string is stored as a
 // plain ASCII string but is sent out as UTF-16 with the
 // correct 2-byte prefix
-static bool USB_SendStringDescriptor(const uint8_t *string, int wLength)
+bool USBDeviceClass::sendStringDescriptor(const uint8_t *string, uint8_t maxlen)
 {
-	uint16_t buff[64];
+	if (maxlen < 2)
+		return false;
+
+	uint16_t buff[maxlen/2];
 	int l = 1;
 
-	wLength -= 2;
-	while (*string && wLength>0)
+	maxlen -= 2;
+	while (*string && maxlen>0)
 	{
 		buff[l++] = (uint8_t)(*string++);
-		wLength -= 2;
+		maxlen -= 2;
 	}
 	buff[0] = (3<<8) | (l*2);
 
-	return USBD_SendControl(0, (uint8_t*)buff, l*2);
+	return USBDevice.sendControl((uint8_t*)buff, l*2);
 }
 
-uint32_t USBD_RecvControl(void* d, uint32_t len)
-{
-	uint8_t *buffer;
-	uint8_t *data = (uint8_t *)d;
-	uint32_t read = UDD_Recv_data(EP0, len);
-	if (read > len)
-		read = len;
-	UDD_Recv(EP0, &buffer);
-	while (!udd_is_OUT_transf_cplt(EP0));
-	for (uint32_t i=0; i<read; i++) {
-		data[i] = buffer[i];
-	}
-	udd_OUT_transfer_allowed(EP0);
-	return read;
-}
-
-//	Handle CLASS_INTERFACE requests
-bool USBD_ClassInterfaceRequest(Setup& setup)
-{
-	uint8_t i = setup.wIndex;
-
-	TRACE_CORE(printf("=> USBD_ClassInterfaceRequest\r\n");)
-
-#ifdef CDC_ENABLED
-	if (CDC_ACM_INTERFACE == i)
-	{
-		if( CDC_Setup(setup) == false )
-		{
-			send_zlp();
-		}
-		return true;
-	}
-#endif
-
-#ifdef HID_ENABLED
-	if (HID_INTERFACE == i)
-	{
-		if( HID_Setup(setup) == true )
-		{
-			send_zlp();
-		}
-		return true;
-	}
-#endif
-
-	return false;
-}
-
-//	Construct a dynamic configuration descriptor
-//	This really needs dynamic endpoint allocation etc
-//	TODO
-static bool USBD_SendConfiguration(uint32_t maxlen)
+// Construct a dynamic configuration descriptor
+// This really needs dynamic endpoint allocation etc
+bool USBDeviceClass::sendConfiguration(uint32_t maxlen)
 {
 	uint8_t cache_buffer[128];
 	uint8_t i;
@@ -238,494 +111,728 @@ static bool USBD_SendConfiguration(uint32_t maxlen)
 
 	num_interfaces[0] = 0;
 
-#if (defined CDC_ENABLED) && defined(HID_ENABLED)
-    num_interfaces[0] += 3;
-    interfaces = (const uint8_t*) CDC_GetInterface();
-    interfaces_length = CDC_GetInterfaceLength() + HID_GetInterfaceLength();
-    if( maxlen > CDC_GetInterfaceLength() + HID_GetInterfaceLength() + sizeof(ConfigDescriptor) )
-    {
-	    maxlen = CDC_GetInterfaceLength() + HID_GetInterfaceLength() + sizeof(ConfigDescriptor);
-    }
-
-#else
-#ifdef CDC_ENABLED
-    num_interfaces[0] += 2;
+#if defined(CDC_ENABLED) && defined(HID_ENABLED)
+	num_interfaces[0] += 3;
+	interfaces = (const uint8_t*) CDC_GetInterface();
+	interfaces_length = CDC_GetInterfaceLength() + HID_GetInterfaceLength();
+	if (maxlen > CDC_GetInterfaceLength() + HID_GetInterfaceLength() + sizeof(ConfigDescriptor))
+	{
+		maxlen = CDC_GetInterfaceLength() + HID_GetInterfaceLength() + sizeof(ConfigDescriptor);
+	}
+#elif defined(CDC_ENABLED)
+	num_interfaces[0] += 2;
 	interfaces = (const uint8_t*) CDC_GetInterface();
 	interfaces_length += CDC_GetInterfaceLength();
-	if( maxlen > CDC_GetInterfaceLength()+ sizeof(ConfigDescriptor) )
+	if (maxlen > CDC_GetInterfaceLength() + sizeof(ConfigDescriptor))
 	{
-		maxlen = CDC_GetInterfaceLength()+ sizeof(ConfigDescriptor);
+		maxlen = CDC_GetInterfaceLength() + sizeof(ConfigDescriptor);
 	}
-#endif
-
-#ifdef HID_ENABLED
-    num_interfaces[0] += 1;
+#elif defined(HID_ENABLED)
+	num_interfaces[0] += 1;
 	interfaces = (const uint8_t*) HID_GetInterface();
 	interfaces_length += HID_GetInterfaceLength();
-	if( maxlen > HID_GetInterfaceLength()+ sizeof(ConfigDescriptor) )
+	if (maxlen > HID_GetInterfaceLength() + sizeof(ConfigDescriptor))
 	{
-		maxlen = HID_GetInterfaceLength()+ sizeof(ConfigDescriptor);
+		maxlen = HID_GetInterfaceLength() + sizeof(ConfigDescriptor);
 	}
 #endif
-#endif
 
 _Pragma("pack(1)")
-	ConfigDescriptor config = D_CONFIG((uint16_t)(interfaces_length + sizeof(ConfigDescriptor)),num_interfaces[0]);
+	ConfigDescriptor config = D_CONFIG((uint16_t)(interfaces_length + sizeof(ConfigDescriptor)), num_interfaces[0]);
 _Pragma("pack()")
 
-	memcpy( cache_buffer, &config, sizeof(ConfigDescriptor) );
+	memcpy(cache_buffer, &config, sizeof(ConfigDescriptor));
 
-#if (defined CDC_ENABLED) && defined(HID_ENABLED)
-	for ( i=0; i<CDC_GetInterfaceLength(); i++)
-	{
-		cache_buffer[i+sizeof(ConfigDescriptor)] = interfaces[i];
+#if defined(CDC_ENABLED) && defined(HID_ENABLED)
+	for (i=0; i<CDC_GetInterfaceLength(); i++) {
+		cache_buffer[i + sizeof(ConfigDescriptor)] = interfaces[i];
 	}
 	interfaces = (const uint8_t*) HID_GetInterface();
-	for ( i=0; i<HID_GetInterfaceLength(); i++)
-	{
-		cache_buffer[i+sizeof(ConfigDescriptor)+CDC_GetInterfaceLength()] = interfaces[i];
+	for (i=0; i<HID_GetInterfaceLength(); i++) {
+		cache_buffer[i + sizeof(ConfigDescriptor) + CDC_GetInterfaceLength()] = interfaces[i];
 	}
-#else
-#ifdef HID_ENABLED
-	for ( i=0; i<interfaces_length; i++)
-	{
-		cache_buffer[i+sizeof(ConfigDescriptor)] = interfaces[i];
+#elif defined(HID_ENABLED)
+	for (i=0; i<interfaces_length; i++) {
+		cache_buffer[i + sizeof(ConfigDescriptor)] = interfaces[i];
 	}
-#endif
-
-#ifdef CDC_ENABLED
-	for ( i=0; i<interfaces_length; i++)
-	{
-		cache_buffer[i+sizeof(ConfigDescriptor)] = interfaces[i];
+#elif defined(CDC_ENABLED)
+	for (i=0; i<interfaces_length; i++) {
+		cache_buffer[i + sizeof(ConfigDescriptor)] = interfaces[i];
 	}
-#endif
 #endif
 
-	if (maxlen > sizeof(cache_buffer))
-	{
+	if (maxlen > sizeof(cache_buffer)) {
 		 maxlen = sizeof(cache_buffer);
 	}
-	USBD_SendControl(0,cache_buffer, maxlen );
-	return true;
+	return sendControl(cache_buffer, maxlen);
 }
 
-static bool USBD_SendDescriptor(Setup* pSetup)
+bool USBDeviceClass::sendDescriptor(Setup &setup)
 {
-	uint8_t t = pSetup->wValueH;
+	uint8_t t = setup.wValueH;
 	uint8_t desc_length = 0;
-	const uint8_t* desc_addr = 0;
+	const uint8_t *desc_addr = 0;
 
-	if (USB_CONFIGURATION_DESCRIPTOR_TYPE == t)
+	if (t == USB_CONFIGURATION_DESCRIPTOR_TYPE)
 	{
-		TRACE_CORE(printf("=> USBD_SendDescriptor : USB_CONFIGURATION_DESCRIPTOR_TYPE length=%d\r\n", setup.wLength);)
-		return USBD_SendConfiguration(pSetup->wLength);
+		return USBDevice.sendConfiguration(setup.wLength);
 	}
 
-#ifdef HID_ENABLED
-	if (HID_REPORT_DESCRIPTOR_TYPE == t)
+#if defined(HID_ENABLED)
+	if (t == HID_REPORT_DESCRIPTOR_TYPE)
 	{
-		TRACE_CORE(puts("=> USBD_SendDescriptor : HID_REPORT_DESCRIPTOR_TYPE\r\n");)
 		return HID_GetDescriptor();
 	}
-	if (HID_HID_DESCRIPTOR_TYPE == t)
+
+	if (t == HID_HID_DESCRIPTOR_TYPE)
 	{
 		uint8_t tab[9] = D_HIDREPORT((uint8_t)HID_SizeReportDescriptor());
-
-		TRACE_CORE(puts("=> USBD_SendDescriptor : HID_HID_DESCRIPTOR_TYPE\r\n");)
-
-		return USBD_SendControl(0, tab, sizeof(tab));
+		return USBDevice.sendControl(tab, sizeof(tab));
 	}
 #endif
 
-	if (USB_DEVICE_DESCRIPTOR_TYPE == t)
+	if (t == USB_DEVICE_DESCRIPTOR_TYPE)
 	{
-		TRACE_CORE(puts("=> USBD_SendDescriptor : USB_DEVICE_DESCRIPTOR_TYPE\r\n");)
 		desc_addr = (const uint8_t*)&USB_DeviceDescriptor;
-        if( *desc_addr > pSetup->wLength ) {
-            desc_length = pSetup->wLength;
-        }
+		if (*desc_addr > setup.wLength) {
+			desc_length = setup.wLength;
+		}
 	}
 	else if (USB_STRING_DESCRIPTOR_TYPE == t)
 	{
-		TRACE_CORE(puts("=> USBD_SendDescriptor : USB_STRING_DESCRIPTOR_TYPE\r\n");)
-		if (pSetup->wValueL == 0) {
+		if (setup.wValueL == 0) {
 			desc_addr = (const uint8_t*)&STRING_LANGUAGE;
 		}
-		else if (pSetup->wValueL == IPRODUCT) {
-			return USB_SendStringDescriptor(STRING_PRODUCT, pSetup->wLength);
+		else if (setup.wValueL == IPRODUCT) {
+			return sendStringDescriptor(STRING_PRODUCT, setup.wLength);
 		}
-		else if (pSetup->wValueL == IMANUFACTURER) {
-			return USB_SendStringDescriptor(STRING_MANUFACTURER, pSetup->wLength);
+		else if (setup.wValueL == IMANUFACTURER) {
+			return sendStringDescriptor(STRING_MANUFACTURER, setup.wLength);
 		}
 		else {
 			return false;
 		}
-		if( *desc_addr > pSetup->wLength ) {
-			desc_length = pSetup->wLength;
+		if (*desc_addr > setup.wLength) {
+			desc_length = setup.wLength;
 		}
 	}
-    else
-    {
-        TRACE_CORE(printf("Device ERROR");)
-    }
-
-	if (desc_addr == 0)
+	else
 	{
+	}
+
+	if (desc_addr == 0) {
 		return false;
 	}
 
-	if (desc_length == 0)
-	{
+	if (desc_length == 0) {
 		desc_length = *desc_addr;
 	}
 
-	TRACE_CORE(printf("=> USBD_SendDescriptor : desc_addr=%p desc_length=%d\r\n", desc_addr, desc_length);)
-	USBD_SendControl(0, desc_addr, desc_length);
+	sendControl(desc_addr, desc_length);
 
 	return true;
 }
 
 
-void EndpointHandler(uint8_t bEndpoint)
+void USBDeviceClass::handleEndpoint(uint8_t ep)
 {
-#ifdef CDC_ENABLED
-	if( bEndpoint == CDC_ENDPOINT_OUT )
+#if defined(CDC_ENABLED)
+	if (ep == CDC_ENDPOINT_OUT)
 	{
-		udd_OUT_transfer_allowed(CDC_ENDPOINT_OUT);
+		// The RAM Buffer is empty: we can receive data
+		//usbd.epBank0ResetReady(CDC_ENDPOINT_OUT);
 
 		// Handle received bytes
-		if (USBD_Available(CDC_ENDPOINT_OUT))
-		{
+		if (available(CDC_ENDPOINT_OUT))
 			SerialUSB.accept();
-		}
 	}
-	if( bEndpoint == CDC_ENDPOINT_IN )
+	if (ep == CDC_ENDPOINT_IN)
 	{
-		udd_IN_stop_transfer(CDC_ENDPOINT_IN);
-		/* Clear the transfer complete flag  */
-		udd_clear_IN_transf_cplt(CDC_ENDPOINT_IN);
-
+		// NAK on endpoint IN, the bank is not yet filled in.
+		usbd.epBank1ResetReady(CDC_ENDPOINT_IN);
+		usbd.epBank1AckTransferComplete(CDC_ENDPOINT_IN);
 	}
-	if( bEndpoint == CDC_ENDPOINT_ACM )
+	if (ep == CDC_ENDPOINT_ACM)
 	{
-		udd_IN_stop_transfer(CDC_ENDPOINT_ACM);
-		/* Clear the transfer complete flag  */
-		udd_clear_IN_transf_cplt(CDC_ENDPOINT_ACM);
+		// NAK on endpoint IN, the bank is not yet filled in.
+		usbd.epBank1ResetReady(CDC_ENDPOINT_ACM);
+		usbd.epBank1AckTransferComplete(CDC_ENDPOINT_ACM);
 	}
 #endif
 
-#ifdef HID_ENABLED
-	/* Nothing to do in our example */
+#if defined(HID_ENABLED)
+	// Empty
 #endif
 }
 
+void USBDeviceClass::init()
+{
+	// Enable USB clock
+	PM->APBBMASK.reg |= PM_APBBMASK_USB;
+
+	// Set up the USB DP/DN pins
+	PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
+	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg &= ~(0xF << (4 * (PIN_PA24G_USB_DM & 0x01u)));
+	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg |= MUX_PA24G_USB_DM << (4 * (PIN_PA24G_USB_DM & 0x01u));
+	PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PMUXEN = 1;
+	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg &= ~(0xF << (4 * (PIN_PA25G_USB_DP & 0x01u)));
+	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
+
+	// Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
+	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(6)     | // Generic Clock Multiplexer 6
+	                    GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
+	                    GCLK_CLKCTRL_CLKEN;
+	while (GCLK->STATUS.bit.SYNCBUSY)
+		;
+
+	// Reset USB Device
+	usbd.reset();
+
+	usbd.calibrate();
+	usbd.setUSBDeviceMode();
+	usbd.runInStandby();
+	usbd.setFullSpeed();
+
+	// Configure interrupts
+	NVIC_SetPriority((IRQn_Type) USB_IRQn, 0UL);
+	NVIC_EnableIRQ((IRQn_Type) USB_IRQn);
+
+	usbd.enable();
+
+	initialized = true;
+}
 
-void USB_ISR(void)
+bool USBDeviceClass::attach()
 {
-	uint16_t flags;
-	uint8_t i;
-	uint8_t ept_int;
+	if (!initialized)
+		return false;
 
-	ept_int = udd_endpoint_interrupt();
+	usbd.attach();
+	usbd.enableEndOfResetInterrupt();
+	usbd.enableStartOfFrameInterrupt();
 
-	/* Not endpoint interrupt */
-	if (0 == ept_int)
-	{
-		udd_clear_wakeup_interrupt();
-		udd_clear_eorsm_interrupt();
-		udd_clear_suspend_interrupt();
+	_usbConfiguration = 0;
+	return true;
+}
 
-		// End of bus reset
-		if (Is_udd_reset())
-		{
-			TRACE_CORE(printf(">>> End of Reset\r\n");)
-			// Reset USB address to 0
-			udd_configure_address(0);
-
-			// Configure EP 0
-			UDD_InitEP(0, USB_ENDPOINT_TYPE_CONTROL);
-			udd_enable_setup_received_interrupt(0);
-			_usbConfiguration = 0;
-			udd_ack_reset();
+void USBDeviceClass::setAddress(uint32_t addr)
+{
+	usbd.epBank1SetByteCount(0, 0);
+	usbd.epBank1AckTransferComplete(0);
+
+	// RAM buffer is full, we can send data (IN)
+	usbd.epBank1SetReady(0);
+
+	// Wait for transfer to complete
+	while (!usbd.epBank1IsTransferComplete(0)) {}
+
+	// Set USB address to addr
+	USB->DEVICE.DADD.bit.DADD = addr; // Address
+	USB->DEVICE.DADD.bit.ADDEN = 1; // Enable
+}
+
+bool USBDeviceClass::detach()
+{
+	if (!initialized)
+		return false;
+	usbd.detach();
+	return true;
+}
+
+bool USBDeviceClass::configured()
+{
+	return _usbConfiguration != 0;
+}
+
+bool USBDeviceClass::handleClassInterfaceSetup(Setup& setup)
+{
+	uint8_t i = setup.wIndex;
+
+	#if defined(CDC_ENABLED)
+	if (CDC_ACM_INTERFACE == i)
+	{
+		if (CDC_Setup(setup) == false) {
+			sendZlp(0);
 		}
+		return true;
+	}
+	#endif
 
-		if (Is_udd_sof())
-		{
-			udd_ack_sof();
+	#if defined(HID_ENABLED)
+	if (HID_INTERFACE == i)
+	{
+		if (HID_Setup(setup) == true) {
+			sendZlp(0);
 		}
+		return true;
+	}
+	#endif
 
+	return false;
+}
+
+void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
+{
+	if (config == (USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0)))
+	{
+		usbd.epBank1SetSize(ep, 8);
+		usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
+		usbd.epBank1SetType(ep, 4); // INTERRUPT IN
 	}
-	else
+	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_OUT(0)))
 	{
-		// Endpoint interrupt
-		flags = udd_read_endpoint_flag(0);
+		usbd.epBank0SetSize(ep, 64);
+		usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
+		usbd.epBank0SetType(ep, 3); // BULK OUT
+
+		// Release OUT EP
+		usbd.epBank0SetMultiPacketSize(ep, 64);
+		usbd.epBank0SetByteCount(ep, 0);
+		
+		// The RAM Buffer is empty: we can receive data
+		//usbd.epBank0ResetReady(ep);
+	}
+	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0)))
+	{
+		usbd.epBank1SetSize(ep, 64);
+		usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
 
-		// endpoint received setup interrupt
-		if (flags & USB_DEVICE_EPINTFLAG_RXSTP)
-		{
-			Setup *pSetupData;
+		// NAK on endpoint IN, the bank is not yet filled in.
+		usbd.epBank1ResetReady(ep);
 
-			/* Clear the Received Setup flag */
-			udd_read_endpoint_flag(0) = USB_DEVICE_EPINTFLAG_RXSTP;
+		usbd.epBank1SetType(ep, 3); // BULK IN
+	}
+	else if (config == USB_ENDPOINT_TYPE_CONTROL)
+	{
+		// XXX: Needed?
+		usbd.epBank0DisableAutoZLP(ep);
+		usbd.epBank1DisableAutoZLP(ep);
+
+		// Setup Control OUT
+		usbd.epBank0SetSize(ep, 64);
+		usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[0]);
+		usbd.epBank0SetType(ep, 1); // CONTROL OUT / SETUP
+
+		// Setup Control IN
+		usbd.epBank1SetSize(ep, 64);
+		usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[0]);
+		usbd.epBank1SetType(ep, 1); // CONTROL IN
+
+		// Release OUT EP
+		usbd.epBank0SetMultiPacketSize(ep, 64);
+		usbd.epBank0SetByteCount(ep, 0);
+
+		// NAK on endpoint OUT, the bank is full.
+		usbd.epBank0SetReady(ep);
+		// NAK on endpoint IN, the bank is not yet filled in.
+		//usbd.epBank1ResetReady(ep);
+	}
+}
 
-			UDD_Recv(EP0, (uint8_t**)&pSetupData);
+void USBDeviceClass::flush(uint32_t ep)
+{
+	if (available(ep)) {
+		// RAM buffer is full, we can send data (IN)
+		usbd.epBank1SetReady(ep);
 
-			/* Clear the Bank 0 ready flag on Control OUT */
-			udd_OUT_transfer_allowed(0);
+	 	// Clear the transfer complete flag
+		usbd.epBank1AckTransferComplete(ep);
+	}
+}
 
-			bool ok = true;
-			if (REQUEST_STANDARD == (pSetupData->bmRequestType & REQUEST_TYPE))
-			{
-				unsigned char data_to_be_send[2];
-
-				// Standard Requests
-				uint8_t r = pSetupData->bRequest;
-				if (GET_STATUS == r)
-				{
-					if( pSetupData->bmRequestType == 0 )  // device
-					{
-						// Send the device status
-     					TRACE_CORE(puts(">>> EP0 Int: GET_STATUS\r\n");)
-						// Check current configuration for power mode (if device is configured)
-						// TODO
-						// Check if remote wake-up is enabled
-						// TODO
-						data_to_be_send[0]=0;
-						data_to_be_send[1]=0;
-						UDD_Send(0, data_to_be_send, 2);
-					}
-					// if( pSetupData->bmRequestType == 2 ) // Endpoint:
-					else
-					{
-						// Send the endpoint status
-						// Check if the endpoint if currently halted
- 						if( isEndpointHalt == 1 )
-							data_to_be_send[0]=1;
- 						else
-							data_to_be_send[0]=0;
-						data_to_be_send[1]=0;
-						UDD_Send(0, data_to_be_send, 2);
-					}
-				}
-				else if (CLEAR_FEATURE == r)
-				{
-				   // Check which is the selected feature
-					if( pSetupData->wValueL == 1) // DEVICEREMOTEWAKEUP
-					{
-						// Enable remote wake-up and send a ZLP
-						if( isRemoteWakeUpEnabled == 1 )
-							data_to_be_send[0]=1;
-						else
-							data_to_be_send[0]=0;
-						data_to_be_send[1]=0;
-						UDD_Send(0, data_to_be_send, 2);
-					}
-					else // if( pSetupData->wValueL == 0) // ENDPOINTHALT
-					{
-						isEndpointHalt = 0;
-						send_zlp();
-					}
- 				}
-				else if (SET_FEATURE == r)
-				{
-					// Check which is the selected feature
-					if( pSetupData->wValueL == 1) // DEVICEREMOTEWAKEUP
-					{
-						// Enable remote wake-up and send a ZLP
-						isRemoteWakeUpEnabled = 1;
-	    				data_to_be_send[0] = 0;
-						UDD_Send(0, data_to_be_send, 1);
-					}
-					if( pSetupData->wValueL == 0) // ENDPOINTHALT
-					{
-						// Halt endpoint
-						isEndpointHalt = 1;
-						send_zlp();
-					}
-				}
-				else if (SET_ADDRESS == r)
-				{
-					TRACE_CORE(puts(">>> EP0 Int: SET_ADDRESS\r\n");)
-					UDD_SetAddress(pSetupData->wValueL);
-				}
-				else if (GET_DESCRIPTOR == r)
-				{
-					TRACE_CORE(puts(">>> EP0 Int: GET_DESCRIPTOR\r\n");)
-					ok = USBD_SendDescriptor(pSetupData);
-				}
-				else if (SET_DESCRIPTOR == r)
-				{
-					TRACE_CORE(puts(">>> EP0 Int: SET_DESCRIPTOR\r\n");)
-					ok = false;
-				}
-				else if (GET_CONFIGURATION == r)
-				{
-					TRACE_CORE(puts(">>> EP0 Int: GET_CONFIGURATION\r\n");)
-					UDD_Send(0, (void*)&_usbConfiguration, 1);
-				}
-				else if (SET_CONFIGURATION == r)
-				{
-					if (REQUEST_DEVICE == (pSetupData->bmRequestType & REQUEST_RECIPIENT))
-					{
-						TRACE_CORE(printf(">>> EP0 Int: SET_CONFIGURATION REQUEST_DEVICE %d\r\n", pSetupData->wValueL);)
-#ifdef HID_ENABLED
-						UDD_InitEP( HID_ENDPOINT_INT, USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
-#endif
+void USBDeviceClass::stall(uint32_t ep)
+{
+	// TODO: test
+	// TODO: use .bit. notation
 
-#ifdef CDC_ENABLED
-						UDD_InitEP( CDC_ENDPOINT_ACM, USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0));
-						UDD_InitEP( CDC_ENDPOINT_OUT, USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_OUT(0));
-						UDD_InitEP( CDC_ENDPOINT_IN, USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
-#endif
-						_usbConfiguration = pSetupData->wValueL;
+	// Stall endpoint
+	USB->DEVICE.DeviceEndpoint[ep].EPSTATUSSET.reg = USB_DEVICE_EPSTATUSSET_STALLRQ(2);
+}
 
-#ifdef CDC_ENABLED
-						// Enable interrupt for CDC reception from host (OUT packet)
-						udd_ept_enable_it_IN_transf_cplt(CDC_ENDPOINT_ACM);
-						udd_ept_enable_it_OUT_transf_cplt(CDC_ENDPOINT_OUT);
-#endif
-						send_zlp();
-					}
-					else
-					{
-						TRACE_CORE(puts(">>> EP0 Int: SET_CONFIGURATION failed!\r\n");)
-						ok = false;
-					}
-				}
-				else if (GET_INTERFACE == r)
-				{
-					TRACE_CORE(puts(">>> EP0 Int: GET_INTERFACE\r\n");)
-					UDD_Send(0, (void*)&_usbSetInterface, 1);
-				}
-				else if (SET_INTERFACE == r)
-				{
-					_usbSetInterface = pSetupData->wValueL;
-					TRACE_CORE(puts(">>> EP0 Int: SET_INTERFACE\r\n");)
-					send_zlp();
-				}
-			}
-			else
-			{
-				TRACE_CORE(puts(">>> EP0 Int: ClassInterfaceRequest\r\n");)
-				ok =  USBD_ClassInterfaceRequest(*pSetupData);
-			}
+bool USBDeviceClass::connected()
+{
+	// Count frame numbers
+	uint8_t f = USB->DEVICE.FNUM.bit.FNUM;
+	//delay(3);
+	return f != USB->DEVICE.FNUM.bit.FNUM;
+}
 
-			if (ok)
-			{
-				TRACE_CORE(puts(">>> EP0 Int: Send packet\r\n");)
-				UDD_ClearIN();
-			}
-			else
-			{
-				TRACE_CORE(puts(">>> EP0 Int: Stall\r\n");)
-				UDD_Stall(0);
-			}
 
-			if( flags & USB_DEVICE_EPINTFLAG_STALL(2) )
-			{
-				/* Clear the stall flag */
-				udd_clear_stall_request(0);
+uint32_t USBDeviceClass::recvControl(void *_data, uint32_t len)
+{
+	uint8_t *data = reinterpret_cast<uint8_t *>(_data);
+// NO RXOUT ???????
 
-				// Remove stall request
-				udd_remove_stall_request(0);
-			}
-		}  // end if USB_DEVICE_EPINTFLAG_RXSTP
+	// The RAM Buffer is empty: we can receive data
+	usbd.epBank0ResetReady(0);
 
-		i=0;
-		ept_int &= 0xFE;  // Remove endpoint number 0 (setup)
-		while (ept_int != 0)
-		{
-            // Check if endpoint has a pending interrupt
-            if ((ept_int & (1 << i)) != 0)
-			{
-				if( (udd_read_endpoint_flag(i) & USB_DEVICE_EPINTFLAG_TRCPT_Msk ) != 0 )
+	//usbd.epBank0AckSetupReceived(0);
+	uint32_t read = armRecvCtrlOUT(0, len);
+	if (read > len)
+		read = len;
+	//while (!usbd.epBank0AckTransferComplete(0)) {}
+	uint8_t *buffer = udd_ep_out_cache_buffer[0];
+	for (uint32_t i=0; i<len; i++) {
+		data[i] = buffer[i];
+	}
+
+	return read;
+}
+
+// Number of bytes, assumes a rx endpoint
+uint32_t USBDeviceClass::available(uint32_t ep)
+{
+	return usbd.epBank0ByteCount(ep);
+}
+
+// Non Blocking receive
+// Return number of bytes read
+uint32_t USBDeviceClass::recv(uint32_t ep, void *_data, uint32_t len)
+{
+	if (!_usbConfiguration)
+		return -1;
+
+	if (available(ep) < len)
+		len = available(ep);
+
+	armRecv(ep, len);
 
-				{
-					EndpointHandler(i);
-				}
-                ept_int &= ~(1 << i);
+	usbd.epBank0DisableTransferComplete(ep);
 
-                if (ept_int != 0)
-				{
+	// NAK on endpoint OUT, the bank is full.
+	//usbd.epBank0SetReady(CDC_ENDPOINT_OUT);
 
-                    TRACE_CORE("\n\r  - ");
-                }
-            }
-            i++;
-			if( i> USB_EPT_NUM) break;  // fire exit
-        }
+	uint8_t *buffer = udd_ep_out_cache_buffer[ep];
+	uint8_t *data = reinterpret_cast<uint8_t *>(_data);
+	for (uint32_t i=0; i<len; i++) {
+		data[i] = buffer[i];
 	}
+
+	// release empty buffer
+	if (len && !available(ep)) {
+		// The RAM Buffer is empty: we can receive data
+		usbd.epBank0ResetReady(ep);
+		
+		// Clear Transfer complete 0 flag
+		usbd.epBank0AckTransferComplete(ep);
+	}
+
+	return len;
 }
 
+//	Recv 1 byte if ready
+uint32_t USBDeviceClass::recv(uint32_t ep)
+{
+	uint8_t c;
+	if (recv(ep, &c, 1) != 1) {
+		return -1;
+	} else {
+		return c;
+	}
+}
 
+uint8_t USBDeviceClass::armRecvCtrlOUT(uint32_t ep, uint32_t len)
+{
+	/* get endpoint configuration from setting register */
+	usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
+	usbd.epBank0SetMultiPacketSize(ep, 8);
+	usbd.epBank0SetByteCount(ep, 0);
+	//usbd.epBank0ResetReady(0);
+	//while (!usbd.epBank0IsTransferComplete(ep)) {}
+	//while (usbd.epBank0IsReady(ep)) {}
+
+	//usbd.epBank0SetByteCount(0, 0);
+	//usbd.epBank0SetMultiPacketSize(0, 8);
+	usbd.epBank0ResetReady(ep);
+
+	// Wait OUT
+	while (!usbd.epBank0IsReady(ep)) {}
+	while (!usbd.epBank0IsTransferComplete(ep)) {} // XXX: while(USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.bit.TRCPT == 0);
+	return usbd.epBank0ByteCount(ep);
+}
 
-void USBD_Flush(uint32_t ep)
+uint8_t USBDeviceClass::armRecv(uint32_t ep, uint32_t len)
 {
-	if (UDD_FifoByteCount(ep))
-	{
-		UDD_ReleaseTX(ep);
+	usbd.epBank0SetSize(ep, 64);
+	usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
+	usbd.epBank0SetMultiPacketSize(ep, 64); // XXX: Should be "len"?
+	uint16_t count = usbd.epBank0ByteCount(ep);
+	if (count >= 64) {
+		usbd.epBank0SetByteCount(ep, count - 64);
+	} else {
+		usbd.epBank0SetByteCount(ep, 0);
 	}
+	// The RAM Buffer is empty: we can receive data
+	//usbd.epBank0ResetReady(ep);
+
+	// Wait for transfer to complete
+	//while (!usbd.epBank0IsTransferComplete(ep)) {}
+	//while (usbd.epBank0IsReady(ep)) {}
+	// NAK on endpoint OUT, the bank is full.
+	//usbd.epBank0ResetReady(ep);
+
+	return usbd.epBank0ByteCount(ep);
 }
 
-//	Counting frames
-uint32_t USBD_Connected(void)
+//	Blocking Send of data to an endpoint
+uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 {
-	uint8_t f = UDD_GetFrameNumber();
+	if (!_usbConfiguration)
+		return -1;
+
+	armSend(ep, data, len);
+
+	// Clear the transfer complete flag
+	usbd.epBank1AckTransferComplete(ep);
 
-    //delay(3);
+	// RAM buffer is full, we can send data (IN)
+	usbd.epBank1SetReady(ep);
 
-	return f != UDD_GetFrameNumber();
+	// Wait for transfer to complete
+	while (!usbd.epBank1IsTransferComplete(ep)) {
+		;  // need fire exit.
+	}
+	return len;
 }
 
+uint32_t USBDeviceClass::armSend(uint32_t ep, const void* data, uint32_t len)
+{
+	memcpy(&udd_ep_in_cache_buffer[ep], data, len);
 
-//=======================================================================
-//=======================================================================
+	// Get endpoint configuration from setting register
+	usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
+	usbd.epBank1SetMultiPacketSize(ep, 0);
+	usbd.epBank1SetByteCount(ep, len);
 
-USBDevice_ USBDevice;
+	return len;
+}
 
-USBDevice_::USBDevice_()
+uint32_t USBDeviceClass::sendControl(const void* _data, uint32_t len)
 {
-	UDD_SetStack(&USB_ISR);
+	const uint8_t *data = reinterpret_cast<const uint8_t *>(_data);
+	uint32_t length = len;
+	uint32_t sent = 0;
+	uint32_t pos = 0;
+
+ 	while (len > 0)
+ 	{
+		sent = armSend(EP0, data + pos, len);
+		pos += sent;
+		len -= sent;
+ 	}
+
+	return length;
 }
 
-bool USBDevice_::attach()
+void USBDeviceClass::sendZlp(uint32_t ep)
 {
-  if (_usbInitialized != 0UL)
-  {
-    UDD_Attach();
-	_usbConfiguration = 0;
-	return true;
-  }
-  else
-  {
-    return false;
-  }
+	// Set the byte count as zero
+	usbd.epBank1SetByteCount(ep, 0);
 }
 
-bool USBDevice_::detach()
+bool USBDeviceClass::handleStandardSetup(Setup &setup)
 {
-	if (_usbInitialized != 0UL)
-	{
-		UDD_Detach();
+	switch (setup.bRequest) {
+	case GET_STATUS:
+		if (setup.bmRequestType == 0)  // device
+		{
+			// Send the device status
+			// TODO: Check current configuration for power mode (if device is configured)
+			// TODO: Check if remote wake-up is enabled
+			uint8_t buff[] = { 0, 0 };
+			armSend(0, buff, 2);
+			return true;
+		}
+		// if( setup.bmRequestType == 2 ) // Endpoint:
+		else
+		{
+			// Send the endpoint status
+			// Check if the endpoint if currently halted
+			uint8_t buff[] = { 0, 0 };
+			if (isEndpointHalt == 1)
+				buff[0] = 1;
+			armSend(0, buff, 2);
+			return true;
+		}
+
+	case CLEAR_FEATURE:
+		// Check which is the selected feature
+		if (setup.wValueL == 1) // DEVICEREMOTEWAKEUP
+		{
+			// Enable remote wake-up and send a ZLP
+			uint8_t buff[] = { 0, 0 };
+			if (isRemoteWakeUpEnabled == 1)
+				buff[0] = 1;
+			armSend(0, buff, 2);
+			return true;
+		}
+		else // if( setup.wValueL == 0) // ENDPOINTHALT
+		{
+			isEndpointHalt = 0;
+			sendZlp(0);
+			return true;
+		}
+
+	case SET_FEATURE:
+		// Check which is the selected feature
+		if (setup.wValueL == 1) // DEVICEREMOTEWAKEUP
+		{
+			// Enable remote wake-up and send a ZLP
+			isRemoteWakeUpEnabled = 1;
+			uint8_t buff[] = { 0 };
+			armSend(0, buff, 1);
+			return true;
+		}
+		if (setup.wValueL == 0) // ENDPOINTHALT
+		{
+			// Halt endpoint
+			isEndpointHalt = 1;
+			sendZlp(0);
+			return true;
+		}
+
+	case SET_ADDRESS:
+		setAddress(setup.wValueL);
 		return true;
-	}
-	else
-	{
+
+	case GET_DESCRIPTOR:
+		return sendDescriptor(setup);
+
+	case SET_DESCRIPTOR:
 		return false;
+
+	case GET_CONFIGURATION:
+		armSend(0, (void*)&_usbConfiguration, 1);
+		return true;
+
+	case SET_CONFIGURATION:
+		if (REQUEST_DEVICE == (setup.bmRequestType & REQUEST_RECIPIENT)) {
+			#if defined(HID_ENABLED)
+			initEP(HID_ENDPOINT_INT, USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
+			#endif
+
+			#if defined(CDC_ENABLED)
+			initEP(CDC_ENDPOINT_ACM, USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_IN(0));
+			initEP(CDC_ENDPOINT_OUT, USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_OUT(0));
+			initEP(CDC_ENDPOINT_IN,  USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
+			#endif
+			_usbConfiguration = setup.wValueL;
+
+			#if defined(CDC_ENABLED)
+			// Enable interrupt for CDC reception from host (OUT packet)
+			usbd.epBank1EnableTransferComplete(CDC_ENDPOINT_ACM);
+			usbd.epBank0EnableTransferComplete(CDC_ENDPOINT_OUT);
+			#endif
+
+			sendZlp(0);
+			return true;
+		} else {
+			return false;
+		}
+
+	case GET_INTERFACE:
+		armSend(0, (void*)&_usbSetInterface, 1);
+		return true;
+
+	case SET_INTERFACE:
+		_usbSetInterface = setup.wValueL;
+		sendZlp(0);
+		return true;
+
+	default:
+		return true;
 	}
 }
 
-bool USBDevice_::configured()
+void USBDeviceClass::ISRHandler()
 {
-	return _usbConfiguration;
-}
+	// End-Of-Reset
+	if (usbd.isEndOfResetInterrupt())
+	{
+		// Configure EP 0
+		initEP(0, USB_ENDPOINT_TYPE_CONTROL);
 
-void USBDevice_::poll()
-{
+		// Enable Setup-Received interrupt
+		usbd.epBank0EnableSetupReceived(0);
+
+		_usbConfiguration = 0;
+
+		usbd.ackEndOfResetInterrupt();
+	}
+
+	// Start-Of-Frame
+	if (usbd.isStartOfFrameInterrupt())
+	{
+		usbd.ackStartOfFrameInterrupt();
+	}
+
+	// Endpoint 0 Received Setup interrupt
+	if (usbd.epBank0IsSetupReceived(0))
+	{
+		usbd.epBank0AckSetupReceived(0);
+
+		Setup *setup = reinterpret_cast<Setup *>(udd_ep_out_cache_buffer[0]);
+
+		/* Clear the Bank 0 ready flag on Control OUT */
+		// The RAM Buffer is empty: we can receive data
+		usbd.epBank0ResetReady(0);
+
+		bool ok;
+		if (REQUEST_STANDARD == (setup->bmRequestType & REQUEST_TYPE)) {
+			// Standard Requests
+			ok = handleStandardSetup(*setup);
+		} else {
+			// Class Interface Requests
+			ok = handleClassInterfaceSetup(*setup);
+		}
+
+		if (ok) {
+			usbd.epBank1SetReady(0);
+		} else {
+			stall(0);
+		}
+
+		// XXX: Should be really cleared?
+		if (usbd.epBank1IsStalled(0)) // XXX:(USB->DEVICE.DeviceEndpoint[0].EPINTFLAG.bit.STALL)
+		{
+			usbd.epBank1AckStalled(0);
+
+			// Remove stall request
+			usbd.epBank1DisableStalled(0);
+		}
+
+	} // end Received Setup handler
+
+	uint8_t i=0;
+	uint8_t ept_int = usbd.epInterruptSummary() & 0xFE; // Remove endpoint number 0 (setup)
+	while (ept_int != 0)
+	{
+		// Check if endpoint has a pending interrupt
+		if ((ept_int & (1 << i)) != 0)
+		{
+			// Endpoint Transfer Complete (0/1) Interrupt
+			if (usbd.epBank0IsTransferComplete(i) ||
+			    usbd.epBank1IsTransferComplete(i))
+			{
+				handleEndpoint(i);
+			}
+			ept_int &= ~(1 << i);
+		}
+		i++;
+		if (i > USB_EPT_NUM)
+			break;  // fire exit
+	}
 }
 
-void USBDevice_::init()
-{
-	UDD_Init();
-	_usbInitialized=1UL;
+/*
+ * USB Device instance
+ * -------------------
+ */
+
+// USBDevice class instance
+USBDeviceClass USBDevice;
+
+// USB_Handler ISR
+extern "C" void USB_Handler(void) {
+	USBDevice.ISRHandler();
 }
diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index 1441a6492..d584fdfc9 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2014 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
@@ -31,6 +31,16 @@
 #define GET_INTERFACE				10
 #define SET_INTERFACE				11
 
+// bEndpointAddress in Endpoint Descriptor
+#define USB_ENDPOINT_DIRECTION_MASK            0x80
+#define USB_ENDPOINT_OUT(addr)                 ((addr) | 0x00)
+#define USB_ENDPOINT_IN(addr)                  ((addr) | 0x80)
+
+#define USB_ENDPOINT_TYPE_MASK                 0x03
+#define USB_ENDPOINT_TYPE_CONTROL              0x00
+#define USB_ENDPOINT_TYPE_ISOCHRONOUS          0x01
+#define USB_ENDPOINT_TYPE_BULK                 0x02
+#define USB_ENDPOINT_TYPE_INTERRUPT            0x03
 
 // bmRequestType
 #define REQUEST_HOSTTODEVICE		0x00
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index 2f34bbc2e..b12d707b1 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2014 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
diff --git a/cores/arduino/USB/USB_device.h b/cores/arduino/USB/USB_device.h
deleted file mode 100644
index 6353f9770..000000000
--- a/cores/arduino/USB/USB_device.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-  Copyright (c) 2014 Arduino.  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 USB_DEVICE_H_INCLUDED
-#define USB_DEVICE_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include "USB/samd21_device.h"
-
-
-// bEndpointAddress in Endpoint Descriptor
-#define USB_ENDPOINT_DIRECTION_MASK            0x80
-#define USB_ENDPOINT_OUT(addr)                 ((addr) | 0x00)
-#define USB_ENDPOINT_IN(addr)                  ((addr) | 0x80)
-
-#define USB_ENDPOINT_TYPE_MASK                 0x03
-#define USB_ENDPOINT_TYPE_CONTROL              0x00
-#define USB_ENDPOINT_TYPE_ISOCHRONOUS          0x01
-#define USB_ENDPOINT_TYPE_BULK                 0x02
-#define USB_ENDPOINT_TYPE_INTERRUPT            0x03
-
-
-extern void UDD_ClearIN(void);
-extern uint32_t UDD_FifoByteCount(uint32_t ep);
-extern void UDD_ReleaseRX(uint32_t ep);
-extern void UDD_ReleaseTX(uint32_t ep);
-extern uint32_t UDD_Send(uint32_t ep, const void* data, uint32_t len);
-extern uint8_t UDD_Recv_data(uint32_t ep, uint32_t len);
-extern void UDD_Recv(uint32_t ep, uint8_t** data);
-extern void UDD_Init(void);
-extern void UDD_InitEP( uint32_t ul_ep, uint32_t ul_ep_cfg );
-extern void send_zlp (void);
-extern void UDD_Attach(void);
-extern void UDD_Detach(void);
-extern void UDD_SetAddress(uint32_t addr);
-extern void UDD_Stall(uint32_t ep);
-extern uint32_t UDD_GetFrameNumber(void);
-extern void UDD_SetStack(void (*pf_isr)(void)); 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* USB_DEVICE_H_INCLUDED */
diff --git a/cores/arduino/USB/USB_host.h b/cores/arduino/USB/USB_host.h
index e20738e85..390e3dd1e 100644
--- a/cores/arduino/USB/USB_host.h
+++ b/cores/arduino/USB/USB_host.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2014 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
diff --git a/cores/arduino/USB/USB_interrupt.c b/cores/arduino/USB/USB_interrupt.c
deleted file mode 100644
index 3f1f05f6c..000000000
--- a/cores/arduino/USB/USB_interrupt.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-** Permission to use, copy, modify, and/or distribute this software for
-** any purpose with or without fee is hereby granted, provided that the
-** above copyright notice and this permission notice appear in all copies.
-**
-** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
-** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
-** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-** SOFTWARE.
-*/
-
-void (*gpf_isr)(void) = (0UL);
-
-void USB_Handler( void )
-{
-	if (gpf_isr)
-	gpf_isr();
-}
-
diff --git a/cores/arduino/USB/samd21_device.h b/cores/arduino/USB/samd21_device.h
deleted file mode 100644
index deded25b4..000000000
--- a/cores/arduino/USB/samd21_device.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-  Copyright (c) 2014 Arduino.  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 SAMD21_DEVICE_H_INCLUDED
-#define SAMD21_DEVICE_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EP0				0
-#define EPX_SIZE		64// 64 for Full Speed, EPT size max is 1024
-
-// Force device low speed mode
-#define udd_force_low_speed()               USB->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_SPDCONF_Msk; USB->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_SPDCONF_1_Val
-// Force full speed mode
-#define udd_force_full_speed()              USB->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_SPDCONF_Msk
-
-// Attaches to USB bus
-#define udd_attach_device()                  USB->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_DETACH
-#define udd_detach_device()                  USB->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_DETACH
-
-// Manage reset event
-// Set when a USB "End of Reset" has been detected
-#define udd_enable_reset_interrupt()              USB->DEVICE.INTENSET.reg = USB_DEVICE_INTENSET_EORST
-#define udd_ack_reset()                           USB->DEVICE.INTFLAG.reg = USB_DEVICE_INTFLAG_EORST
-#define Is_udd_reset()                            (USB->DEVICE.INTFLAG.reg & USB_DEVICE_INTFLAG_EORST)
-
-// Manage start of frame (SOF) event
-#define udd_enable_sof_interrupt()                USB->DEVICE.INTENSET.reg = USB_DEVICE_INTENSET_SOF
-#define udd_ack_sof()                             USB->DEVICE.INTFLAG.reg = USB_DEVICE_INTFLAG_SOF
-#define Is_udd_sof()                              (USB->DEVICE.INTENSET.reg & USB_DEVICE_INTENSET_SOF)
-#define udd_frame_number()                        ((USB->DEVICE.FNUM.reg & USB_DEVICE_FNUM_FNUM_Msk) >> USB_DEVICE_FNUM_FNUM_Pos)
-
-// configures the USB device address and enable it.
-#define udd_configure_address(address)            USB->DEVICE.DADD.reg = USB_DEVICE_DADD_ADDEN | address
-
-// Clear BK0RDY for know that the BANK0 ram buffer (udd_g_ep_table[ep].DeviceDescBank[0]) is empty and can receive data 
-#define udd_OUT_transfer_allowed(ep)              USB->DEVICE.DeviceEndpoint[ep].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_BK0RDY
-// Set BK1RDY for know that the BANK1 ram buffer (udd_g_ep_table[ep].DeviceDescBank[1]) is full and can send data
-#define udd_IN_transfer_allowed(ep)               USB->DEVICE.DeviceEndpoint[ep].EPSTATUSSET.reg = USB_DEVICE_EPSTATUSSET_BK1RDY
-
-// Stop OUT transfer
-#define udd_OUT_stop_transfer(ep)                 USB->DEVICE.DeviceEndpoint[ep].EPSTATUSSET.reg = USB_DEVICE_EPSTATUSSET_BK0RDY
-// Stop IN transfer
-#define udd_IN_stop_transfer(ep)                  USB->DEVICE.DeviceEndpoint[ep].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_BK1RDY
-
-#define udd_read_endpoint_flag(ep)                USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.reg
-// Is transfer completed ?
-#define udd_is_IN_transf_cplt(ep)                 (USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.reg & USB_DEVICE_EPINTFLAG_TRCPT(2))
-#define udd_is_OUT_transf_cplt(ep)                (USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.reg & USB_DEVICE_EPINTFLAG_TRCPT(1))
-// Clear the transfer complete flag
-#define udd_clear_IN_transf_cplt(ep)              USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_TRCPT(2)
-#define udd_clear_OUT_transf_cplt(ep)             USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_TRCPT(1)
-// Enable interrupt transfer complete
-#define udd_ept_enable_it_IN_transf_cplt(ep)      USB->DEVICE.DeviceEndpoint[ep].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRCPT(2)
-#define udd_ept_enable_it_OUT_transf_cplt(ep)     USB->DEVICE.DeviceEndpoint[ep].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRCPT(1)
-
-// Enables SETUP received interrupt
-#define udd_enable_setup_received_interrupt(ep)   USB->DEVICE.DeviceEndpoint[ep].EPINTENSET.reg = USB_DEVICE_EPINTFLAG_RXSTP
-// Clear the stall flag
-#define udd_clear_stall_request(ep)			      USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.reg = USB_DEVICE_EPINTFLAG_STALL(2)
-// Remove stall
-#define udd_remove_stall_request(ep)		      USB->DEVICE.DeviceEndpoint[ep].EPSTATUSCLR.reg = USB_DEVICE_EPSTATUSCLR_STALLRQ(2)
-
-// Endpoint Interrupt Summary
-#define udd_endpoint_interrupt()            USB->DEVICE.EPINTSMRY.reg
-
-#define udd_clear_wakeup_interrupt()        USB->DEVICE.INTENCLR.reg = USB_DEVICE_INTENCLR_WAKEUP
-#define udd_clear_eorsm_interrupt()         USB->DEVICE.INTENCLR.reg = USB_DEVICE_INTENCLR_EORSM
-#define udd_clear_suspend_interrupt()       USB->DEVICE.INTENCLR.reg = USB_DEVICE_INTENCLR_SUSPEND
-
-
-
-// Force device mode
-#define udd_force_device_mode()             USB->DEVICE.CTRLA.reg &= ~USB_CTRLA_MODE
-// Run in Standby
-#define udd_device_run_in_standby()         USB->DEVICE.CTRLA.reg |= USB_CTRLA_RUNSTDBY
-// Force host mode
-#define udd_force_host_mode()               USB->DEVICE.CTRLA.reg |= USB_CTRLA_MODE
-
-
-// Enable USB macro
-#define udd_enable()                        USB->DEVICE.CTRLA.reg |= USB_CTRLA_ENABLE
-// Disable USB macro
-#define udd_disable()                       USB->DEVICE.CTRLA.reg &= ~USB_CTRLA_ENABLE
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SAMD21_DEVICE_H_INCLUDED */
-
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index b1aeccf82..d1bf3558a 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2014 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
@@ -22,9 +22,11 @@
 #include <string.h>
 
 #include "../Arduino.h"
-#include "../wiring_private.h"
+#include "variant.h"
 #include "USB_host.h"
 #include "samd21_host.h"
+#include "sam.h"
+#include "wiring_digital.h"
 
 #define HOST_DEFINED
 #ifdef HOST_DEFINED
@@ -150,7 +152,6 @@ void UHD_Init(void)
 	USB->HOST.DESCADD.reg = (uint32_t)(&usb_pipe_table[0]);
 	// For USB_SPEED_FULL
 	uhd_force_full_speed();
-	
 	memset(&usb_pipe_table[0], 0, sizeof(usb_pipe_table));
 
 	uhd_state = UHD_STATE_NO_VBUS;
diff --git a/cores/arduino/USB/samd21_host.h b/cores/arduino/USB/samd21_host.h
index 5e2e2c897..d2d9c9e09 100644
--- a/cores/arduino/USB/samd21_host.h
+++ b/cores/arduino/USB/samd21_host.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2014 Arduino.  All right reserved.
+  Copyright (c) 2014 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
@@ -28,18 +28,18 @@ extern __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table
 #define  USB_EP_DIR_IN        0x80  // USB_SETUP_DEVICE_TO_HOST
 #define  USB_EP_DIR_OUT       0x00  // USB_SETUP_HOST_TO_DEVICE
 
-#define USB_HOST_PTYPE_DIS     USB_HOST_PCFG_PTYPE(0x0) // Pipe is disabled
-#define USB_HOST_PTYPE_CTRL    USB_HOST_PCFG_PTYPE(0x1) // Pipe is enabled and configured as CONTROL
-#define USB_HOST_PTYPE_ISO     USB_HOST_PCFG_PTYPE(0x2) // Pipe is enabled and configured as ISO
-#define USB_HOST_PTYPE_BULK    USB_HOST_PCFG_PTYPE(0x3) // Pipe is enabled and configured as BULK
-#define USB_HOST_PTYPE_INT     USB_HOST_PCFG_PTYPE(0x4) // Pipe is enabled and configured as INTERRUPT
-#define USB_HOST_PTYPE_EXT     USB_HOST_PCFG_PTYPE(0x5) // Pipe is enabled and configured as EXTENDED
+#define USB_HOST_PTYPE_DIS     USB_HOST_PCFG_PTYPE(0x0) // Pipe is disabled
+#define USB_HOST_PTYPE_CTRL    USB_HOST_PCFG_PTYPE(0x1) // Pipe is enabled and configured as CONTROL
+#define USB_HOST_PTYPE_ISO     USB_HOST_PCFG_PTYPE(0x2) // Pipe is enabled and configured as ISO
+#define USB_HOST_PTYPE_BULK    USB_HOST_PCFG_PTYPE(0x3) // Pipe is enabled and configured as BULK
+#define USB_HOST_PTYPE_INT     USB_HOST_PCFG_PTYPE(0x4) // Pipe is enabled and configured as INTERRUPT
+#define USB_HOST_PTYPE_EXT     USB_HOST_PCFG_PTYPE(0x5) // Pipe is enabled and configured as EXTENDED
 
 #define USB_HOST_NB_BK_1		1
 
-#define USB_HOST_PCFG_PTOKEN_SETUP  USB_HOST_PCFG_PTOKEN(0x0)
-#define USB_HOST_PCFG_PTOKEN_IN     USB_HOST_PCFG_PTOKEN(0x1)
-#define USB_HOST_PCFG_PTOKEN_OUT    USB_HOST_PCFG_PTOKEN(0x2)
+#define USB_HOST_PCFG_PTOKEN_SETUP  USB_HOST_PCFG_PTOKEN(0x0)
+#define USB_HOST_PCFG_PTOKEN_IN     USB_HOST_PCFG_PTOKEN(0x1)
+#define USB_HOST_PCFG_PTOKEN_OUT    USB_HOST_PCFG_PTOKEN(0x2)
 
 #define USB_ERRORFLOW	      USB_HOST_STATUS_BK_ERRORFLOW
 #define USB_ERRORTIMEOUT      USB_HOST_STATUS_PIPE_TOUTER
@@ -84,7 +84,7 @@ extern __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table
 #define Is_uhd_sof()                                 (USB->HOST.INTFLAG.reg & USB_HOST_INTFLAG_HSOF)
 
 // USB address of pipes
-#define uhd_configure_address(pipe_num, addr) usb_pipe_table[pipe_num].HostDescBank[0].CTRL_PIPE.bit.PDADDR = addr
+#define uhd_configure_address(pipe_num, addr) usb_pipe_table[pipe_num].HostDescBank[0].CTRL_PIPE.bit.PDADDR = addr
 #define uhd_get_configured_address(pipe_num)  usb_pipe_table[pipe_num].HostDescBank[0].CTRL_PIPE.bit.PDADDR
 
 // Pipes
@@ -104,7 +104,7 @@ extern __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table
 #define uhd_ack_out_ready(p)                     USB->HOST.HostPipe[p].PINTFLAG.reg = USB_HOST_PINTFLAG_TRCPT(1)
 #define Is_uhd_out_ready(p)                      ((USB->HOST.HostPipe[p].PINTFLAG.reg&USB_HOST_PINTFLAG_TRCPT(1)) == USB_HOST_PINTFLAG_TRCPT(1))
 #define uhd_ack_nak_received(p)                  usb_pipe_table[p].HostDescBank[1].STATUS_BK.reg &= ~USB_HOST_STATUS_BK_ERRORFLOW
-#define Is_uhd_nak_received(p)                   (usb_pipe_table[p].HostDescBank[1].STATUS_BK.reg & USB_HOST_STATUS_BK_ERRORFLOW)
+#define Is_uhd_nak_received(p)                   (usb_pipe_table[p].HostDescBank[1].STATUS_BK.reg & USB_HOST_STATUS_BK_ERRORFLOW)
 
 // Endpoint Interrupt Summary
 #define uhd_endpoint_interrupt()            USB->HOST.PINTSMRY.reg

From 383d87c99c4981b49834dd1c135b117a64594f7c Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 29 Jun 2015 16:52:49 +0200
Subject: [PATCH 034/124] USBDevice: added 'full' flag to USB buffer

This way all the 64 bytes available can be filled up
---
 cores/arduino/USB/CDC.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index c0e61a893..d68bd8c49 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -37,8 +37,9 @@ struct ring_buffer {
 	uint8_t buffer[CDC_SERIAL_BUFFER_SIZE];
 	volatile uint32_t head;
 	volatile uint32_t tail;
+	volatile bool full;
 };
-ring_buffer cdc_rx_buffer = { { 0 }, 0, 0};
+ring_buffer cdc_rx_buffer = {{0}, 0, 0, false};
 
 typedef struct {
 	uint32_t dwDTERate;
@@ -160,19 +161,22 @@ void Serial_::accept(void)
 	// current location of the tail), we're about to overflow the buffer
 	// and so we don't write the character or advance the head.
 	uint32_t k = 0;
-	i = (i + 1) % CDC_SERIAL_BUFFER_SIZE;
-	while ((i != ringBuffer->tail) && (len > 0)) {
+	while (len > 0 && !ringBuffer->full) {
 		len--;
-		ringBuffer->buffer[ringBuffer->head] = buffer[k++];
-		ringBuffer->head = i;
-		i = (i + 1) % CDC_SERIAL_BUFFER_SIZE;
+		ringBuffer->buffer[i++] = buffer[k++];
+		i %= CDC_SERIAL_BUFFER_SIZE;
+		if (i == ringBuffer->tail)
+			ringBuffer->full = true;
 	}
+	ringBuffer->head = i;
 	interrupts();
 }
 
 int Serial_::available(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
+	if (buffer->full)
+		return CDC_SERIAL_BUFFER_SIZE;
 	if (buffer->head == buffer->tail) {
 		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
 	}
@@ -182,13 +186,9 @@ int Serial_::available(void)
 int Serial_::peek(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
-
-	if (buffer->head == buffer->tail)
-	{
+	if (buffer->head == buffer->tail && !buffer->full) {
 		return -1;
-	}
-	else
-	{
+	} else {
 		return buffer->buffer[buffer->tail];
 	}
 }
@@ -203,12 +203,12 @@ int Serial_::read(void)
 	ring_buffer *buffer = &cdc_rx_buffer;
 
 	// if the head isn't ahead of the tail, we don't have any characters
-	if (buffer->head == buffer->tail)
+	if (buffer->head == buffer->tail && !buffer->full)
 	{
 		if (usb.available(CDC_ENDPOINT_OUT))
 			accept();
 	}
-	if (buffer->head == buffer->tail)
+	if (buffer->head == buffer->tail && !buffer->full)
 	{
 		return -1;
 	}
@@ -216,6 +216,7 @@ int Serial_::read(void)
 	{
 		unsigned char c = buffer->buffer[buffer->tail];
 		buffer->tail = (uint32_t)(buffer->tail + 1) % CDC_SERIAL_BUFFER_SIZE;
+		buffer->full = false;
 // 		if (usb.available(CDC_ENDPOINT_OUT))
 // 			accept();
 		return c;

From 4fb7c1572b8f119b6eaf305ad69220b59281ab05 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 30 Jun 2015 18:08:49 +0200
Subject: [PATCH 035/124] USB: fix CDC endpoints

* fix in_endpoint buffer size (was too big)
* use the same EP for CDC_ENDPOINT_OUT and CDC_ENDPOINT_IN (different buffers)
* fix CDC_ENDPOINT_IN ep type
---
 cores/arduino/USB/USBCore.cpp | 20 +++++++++++++-------
 cores/arduino/USB/USBDesc.h   |  4 ++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index cfcf101aa..472efc421 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -68,11 +68,11 @@ const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB
 volatile uint32_t _usbConfiguration = 0;
 volatile uint32_t _usbSetInterface = 0;
 
-static __attribute__((__aligned__(4))) /*__attribute__((__section__(".bss_hram0")))*/
+static __attribute__((__aligned__(8))) //__attribute__((__section__(".bss_hram0")))
 uint8_t udd_ep_out_cache_buffer[4][64];
 
-static __attribute__((__aligned__(4))) /*__attribute__((__section__(".bss_hram0")))*/
-uint8_t udd_ep_in_cache_buffer[4][128];
+static __attribute__((__aligned__(8))) //__attribute__((__section__(".bss_hram0")))
+uint8_t udd_ep_in_cache_buffer[4][64];
 
 //==================================================================
 
@@ -375,7 +375,7 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 {
 	if (config == (USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0)))
 	{
-		usbd.epBank1SetSize(ep, 8);
+		usbd.epBank1SetSize(ep, 64);
 		usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
 		usbd.epBank1SetType(ep, 4); // INTERRUPT IN
 	}
@@ -580,7 +580,13 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 	if (!_usbConfiguration)
 		return -1;
 
-	armSend(ep, data, len);
+	//armSend(ep, data, len);
+
+	/* memcopy could be safer in multithreaded environment */
+	memcpy(&udd_ep_in_cache_buffer[ep], data, len);
+
+	usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
+	usbd.epBank1SetByteCount(ep, len);
 
 	// Clear the transfer complete flag
 	usbd.epBank1AckTransferComplete(ep);
@@ -712,9 +718,9 @@ bool USBDeviceClass::handleStandardSetup(Setup &setup)
 			#endif
 
 			#if defined(CDC_ENABLED)
-			initEP(CDC_ENDPOINT_ACM, USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_IN(0));
+			initEP(CDC_ENDPOINT_ACM, USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
 			initEP(CDC_ENDPOINT_OUT, USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_OUT(0));
-			initEP(CDC_ENDPOINT_IN,  USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
+			initEP(CDC_ENDPOINT_IN,  USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0));
 			#endif
 			_usbConfiguration = setup.wValueL;
 
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index b12d707b1..ae7f57423 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -39,11 +39,11 @@
 #define CDC_DATA_INTERFACE	1	// CDC Data
 #define CDC_ENDPOINT_ACM	1
 #define CDC_ENDPOINT_OUT	2
-#define CDC_ENDPOINT_IN		3
+#define CDC_ENDPOINT_IN		2
 
 // HID
 #define HID_INTERFACE		2   // HID
-#define HID_ENDPOINT_INT	4
+#define HID_ENDPOINT_INT	3
 
 // Defined string description
 #define IMANUFACTURER	1

From e2a8367e79d0ef84e4ba4656f7809d073ba16134 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 2 Jul 2015 15:43:40 +0200
Subject: [PATCH 036/124] fix back-to-back SerialUSB test

---
 cores/arduino/USB/CDC.cpp     |  7 +++++--
 cores/arduino/USB/USBCore.cpp | 24 +++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index d68bd8c49..0ecee14a0 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -25,7 +25,7 @@
 
 #ifdef CDC_ENABLED
 
-#define CDC_SERIAL_BUFFER_SIZE	64
+#define CDC_SERIAL_BUFFER_SIZE	256
 
 /* For information purpose only since RTS is not always handled by the terminal application */
 #define CDC_LINESTATE_DTR		0x01 // Data Terminal Ready
@@ -175,9 +175,12 @@ void Serial_::accept(void)
 int Serial_::available(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
-	if (buffer->full)
+	if (buffer->full) {
+		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = ~USB_DEVICE_EPINTENCLR_RXSTP;
 		return CDC_SERIAL_BUFFER_SIZE;
+	}
 	if (buffer->head == buffer->tail) {
+		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_RXSTP;
 		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
 	}
 	return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 472efc421..3852e30fb 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -68,10 +68,10 @@ const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB
 volatile uint32_t _usbConfiguration = 0;
 volatile uint32_t _usbSetInterface = 0;
 
-static __attribute__((__aligned__(8))) //__attribute__((__section__(".bss_hram0")))
+static __attribute__((__aligned__(4))) //__attribute__((__section__(".bss_hram0")))
 uint8_t udd_ep_out_cache_buffer[4][64];
 
-static __attribute__((__aligned__(8))) //__attribute__((__section__(".bss_hram0")))
+static __attribute__((__aligned__(4))) //__attribute__((__section__(".bss_hram0")))
 uint8_t udd_ep_in_cache_buffer[4][64];
 
 //==================================================================
@@ -502,17 +502,19 @@ uint32_t USBDeviceClass::recv(uint32_t ep, void *_data, uint32_t len)
 	// NAK on endpoint OUT, the bank is full.
 	//usbd.epBank0SetReady(CDC_ENDPOINT_OUT);
 
-	uint8_t *buffer = udd_ep_out_cache_buffer[ep];
-	uint8_t *data = reinterpret_cast<uint8_t *>(_data);
-	for (uint32_t i=0; i<len; i++) {
-		data[i] = buffer[i];
-	}
+	memcpy(_data, udd_ep_out_cache_buffer[ep], len);
+
+	// uint8_t *buffer = udd_ep_out_cache_buffer[ep];
+	// uint8_t *data = reinterpret_cast<uint8_t *>(_data);
+	// for (uint32_t i=0; i<len; i++) {
+	// 	data[i] = buffer[i];
+	// }
 
 	// release empty buffer
 	if (len && !available(ep)) {
 		// The RAM Buffer is empty: we can receive data
 		usbd.epBank0ResetReady(ep);
-		
+
 		// Clear Transfer complete 0 flag
 		usbd.epBank0AckTransferComplete(ep);
 	}
@@ -553,9 +555,9 @@ uint8_t USBDeviceClass::armRecvCtrlOUT(uint32_t ep, uint32_t len)
 
 uint8_t USBDeviceClass::armRecv(uint32_t ep, uint32_t len)
 {
-	usbd.epBank0SetSize(ep, 64);
-	usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
-	usbd.epBank0SetMultiPacketSize(ep, 64); // XXX: Should be "len"?
+	//usbd.epBank0SetSize(ep, 64);
+	//usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
+	//usbd.epBank0SetMultiPacketSize(ep, 64); // XXX: Should be "len"?
 	uint16_t count = usbd.epBank0ByteCount(ep);
 	if (count >= 64) {
 		usbd.epBank0SetByteCount(ep, count - 64);

From 85825a3d35db9a38e052748638a5200a89eb7880 Mon Sep 17 00:00:00 2001
From: Jean-Christophe BUDA <jean-christophe.buda@atmel.com>
Date: Fri, 3 Jul 2015 12:12:46 +0200
Subject: [PATCH 037/124] Fix to USBDevice blocking-send

---
 cores/arduino/USB/CDC.cpp     |  4 +--
 cores/arduino/USB/USBCore.cpp | 61 ++++++++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index 0ecee14a0..f3e4cd70b 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -242,11 +242,11 @@ size_t Serial_::write(const uint8_t *buffer, size_t size)
 	// TODO - ZE - check behavior on different OSes and test what happens if an
 	// open connection isn't broken cleanly (cable is yanked out, host dies
 	// or locks up, or host virtual serial port hangs)
-//	if (_usbLineInfo.lineState > 0)  // Problem with Windows(R)
+	if (_usbLineInfo.lineState > 0)  // Problem with Windows(R)
 	{
 		uint32_t r = usb.send(CDC_ENDPOINT_IN, buffer, size);
 
-		if (r > 0) {
+		if (r == 0) {
 			return r;
 		} else {
 			setWriteError();
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 3852e30fb..3792c85cd 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -579,27 +579,64 @@ uint8_t USBDeviceClass::armRecv(uint32_t ep, uint32_t len)
 //	Blocking Send of data to an endpoint
 uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 {
+	uint32_t length = 0;
+
 	if (!_usbConfiguration)
 		return -1;
+	if (len > 16384)
+		return -1;
 
-	//armSend(ep, data, len);
+	if ((unsigned int)data > 0x20000000)
+	{
+		// Buffer in RAM
+		usbd.epBank1SetAddress(ep, (void *)data);
+		usbd.epBank1SetMultiPacketSize(ep, 0);
 
-	/* memcopy could be safer in multithreaded environment */
-	memcpy(&udd_ep_in_cache_buffer[ep], data, len);
+		usbd.epBank1SetByteCount(ep, len);
 
-	usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
-	usbd.epBank1SetByteCount(ep, len);
+		// Clear the transfer complete flag
+		usbd.epBank1AckTransferComplete(ep);
 
-	// Clear the transfer complete flag
-	usbd.epBank1AckTransferComplete(ep);
+		// RAM buffer is full, we can send data (IN)
+		usbd.epBank1SetReady(ep);
 
-	// RAM buffer is full, we can send data (IN)
-	usbd.epBank1SetReady(ep);
+		// Wait for transfer to complete
+		while (!usbd.epBank1IsTransferComplete(ep)) {
+			;  // need fire exit.
+		}
+		len = 0;
+	}
+	else
+	{
+		// Flash area
+		while (len != 0)
+		{
+			if (len >= 64) {
+				length = 64;
+			} else {
+				length = len;
+			}
 
-	// Wait for transfer to complete
-	while (!usbd.epBank1IsTransferComplete(ep)) {
-		;  // need fire exit.
+			/* memcopy could be safer in multi threaded environment */
+			memcpy(&udd_ep_in_cache_buffer[ep], data, length);
+
+			usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
+			usbd.epBank1SetByteCount(ep, length);
+
+			// Clear the transfer complete flag
+			usbd.epBank1AckTransferComplete(ep);
+
+			// RAM buffer is full, we can send data (IN)
+			usbd.epBank1SetReady(ep);
+
+			// Wait for transfer to complete
+			while (!usbd.epBank1IsTransferComplete(ep)) {
+				;  // need fire exit.
+			}
+			len -= length;
+		}
 	}
+
 	return len;
 }
 

From 9487fbeb43ad4bfd79ba79cdb385f42e5cf9b353 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 3 Jul 2015 15:54:26 +0200
Subject: [PATCH 038/124] use different EP for CDC IN and OUT

---
 cores/arduino/USB/CDC.cpp   | 2 --
 cores/arduino/USB/USBDesc.h | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index f3e4cd70b..944073336 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -176,11 +176,9 @@ int Serial_::available(void)
 {
 	ring_buffer *buffer = &cdc_rx_buffer;
 	if (buffer->full) {
-		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = ~USB_DEVICE_EPINTENCLR_RXSTP;
 		return CDC_SERIAL_BUFFER_SIZE;
 	}
 	if (buffer->head == buffer->tail) {
-		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_RXSTP;
 		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
 	}
 	return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index ae7f57423..b12d707b1 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -39,11 +39,11 @@
 #define CDC_DATA_INTERFACE	1	// CDC Data
 #define CDC_ENDPOINT_ACM	1
 #define CDC_ENDPOINT_OUT	2
-#define CDC_ENDPOINT_IN		2
+#define CDC_ENDPOINT_IN		3
 
 // HID
 #define HID_INTERFACE		2   // HID
-#define HID_ENDPOINT_INT	3
+#define HID_ENDPOINT_INT	4
 
 // Defined string description
 #define IMANUFACTURER	1

From 84a761e2468b46534a643c4be965bbfdba3b70bd Mon Sep 17 00:00:00 2001
From: Jean-Christophe BUDA <jean-christophe.buda@atmel.com>
Date: Fri, 3 Jul 2015 16:29:56 +0200
Subject: [PATCH 039/124] HID class fixes

---
 cores/arduino/USB/HID.cpp     | 4 +---
 cores/arduino/USB/USBCore.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cores/arduino/USB/HID.cpp b/cores/arduino/USB/HID.cpp
index 09b6402a7..1d214e1a1 100644
--- a/cores/arduino/USB/HID.cpp
+++ b/cores/arduino/USB/HID.cpp
@@ -190,8 +190,6 @@ bool HID_Setup(Setup& setup)
 		if (HID_GET_IDLE == r)
 		{
 			USBDevice.armSend(0, &_hid_idle, 1);
-			// RAM buffer is full, we can send data (IN)
-			USB->DEVICE.DeviceEndpoint[0].EPSTATUSSET.bit.BK1RDY = 1;
 			return true;
 		}
 	}
@@ -207,7 +205,7 @@ bool HID_Setup(Setup& setup)
 		if (HID_SET_IDLE == r)
 		{
 			_hid_idle = setup.wValueH;
-			return true;
+			return false;
 		}
 	}
 	return false;
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 3792c85cd..3baf7cc50 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -361,7 +361,7 @@ bool USBDeviceClass::handleClassInterfaceSetup(Setup& setup)
 	#if defined(HID_ENABLED)
 	if (HID_INTERFACE == i)
 	{
-		if (HID_Setup(setup) == true) {
+		if (HID_Setup(setup) == false) {
 			sendZlp(0);
 		}
 		return true;

From c719f6e62a2f83b5a76858088c8b81780362b4cb Mon Sep 17 00:00:00 2001
From: Jean-Christophe BUDA <jean-christophe.buda@atmel.com>
Date: Wed, 8 Jul 2015 16:41:58 +0200
Subject: [PATCH 040/124] Update for host and Device USB

---
 cores/arduino/USB/USBCore.cpp     |  60 ++---
 cores/arduino/USB/USB_interrupt.c |  30 +++
 cores/arduino/USB/samd21_device.c | 352 ------------------------------
 cores/arduino/USB/samd21_host.c   |  16 +-
 libraries/USBHost/src/Usb.cpp     |   6 +-
 5 files changed, 60 insertions(+), 404 deletions(-)
 create mode 100644 cores/arduino/USB/USB_interrupt.c
 delete mode 100644 cores/arduino/USB/samd21_device.c

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 3baf7cc50..b9ba77e4e 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -29,6 +29,15 @@ USBDevice_SAMD21G18x usbd;
 static char isRemoteWakeUpEnabled = 0;
 static char isEndpointHalt = 0;
 
+extern void (*gpf_isr)(void);
+
+// USB_Handler ISR
+extern "C" void UDD_Handler(void) {
+	USBDevice.ISRHandler();
+}
+
+
+
 const uint16_t STRING_LANGUAGE[2] = {
 	(3<<8) | (2+2),
 	0x0409	// English
@@ -285,6 +294,8 @@ void USBDeviceClass::init()
 	while (GCLK->STATUS.bit.SYNCBUSY)
 		;
 
+	UHD_SetStack(&UDD_Handler);	
+
 	// Reset USB Device
 	usbd.reset();
 
@@ -388,9 +399,6 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 		// Release OUT EP
 		usbd.epBank0SetMultiPacketSize(ep, 64);
 		usbd.epBank0SetByteCount(ep, 0);
-		
-		// The RAM Buffer is empty: we can receive data
-		//usbd.epBank0ResetReady(ep);
 	}
 	else if (config == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0)))
 	{
@@ -405,12 +413,12 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 	else if (config == USB_ENDPOINT_TYPE_CONTROL)
 	{
 		// XXX: Needed?
-		usbd.epBank0DisableAutoZLP(ep);
-		usbd.epBank1DisableAutoZLP(ep);
+// 		usbd.epBank0DisableAutoZLP(ep);
+// 		usbd.epBank1DisableAutoZLP(ep);
 
 		// Setup Control OUT
 		usbd.epBank0SetSize(ep, 64);
-		usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[0]);
+		usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
 		usbd.epBank0SetType(ep, 1); // CONTROL OUT / SETUP
 
 		// Setup Control IN
@@ -424,8 +432,6 @@ void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 
 		// NAK on endpoint OUT, the bank is full.
 		usbd.epBank0SetReady(ep);
-		// NAK on endpoint IN, the bank is not yet filled in.
-		//usbd.epBank1ResetReady(ep);
 	}
 }
 
@@ -461,7 +467,6 @@ bool USBDeviceClass::connected()
 uint32_t USBDeviceClass::recvControl(void *_data, uint32_t len)
 {
 	uint8_t *data = reinterpret_cast<uint8_t *>(_data);
-// NO RXOUT ???????
 
 	// The RAM Buffer is empty: we can receive data
 	usbd.epBank0ResetReady(0);
@@ -499,17 +504,8 @@ uint32_t USBDeviceClass::recv(uint32_t ep, void *_data, uint32_t len)
 
 	usbd.epBank0DisableTransferComplete(ep);
 
-	// NAK on endpoint OUT, the bank is full.
-	//usbd.epBank0SetReady(CDC_ENDPOINT_OUT);
-
 	memcpy(_data, udd_ep_out_cache_buffer[ep], len);
 
-	// uint8_t *buffer = udd_ep_out_cache_buffer[ep];
-	// uint8_t *data = reinterpret_cast<uint8_t *>(_data);
-	// for (uint32_t i=0; i<len; i++) {
-	// 	data[i] = buffer[i];
-	// }
-
 	// release empty buffer
 	if (len && !available(ep)) {
 		// The RAM Buffer is empty: we can receive data
@@ -539,40 +535,23 @@ uint8_t USBDeviceClass::armRecvCtrlOUT(uint32_t ep, uint32_t len)
 	usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
 	usbd.epBank0SetMultiPacketSize(ep, 8);
 	usbd.epBank0SetByteCount(ep, 0);
-	//usbd.epBank0ResetReady(0);
-	//while (!usbd.epBank0IsTransferComplete(ep)) {}
-	//while (usbd.epBank0IsReady(ep)) {}
 
-	//usbd.epBank0SetByteCount(0, 0);
-	//usbd.epBank0SetMultiPacketSize(0, 8);
 	usbd.epBank0ResetReady(ep);
 
 	// Wait OUT
 	while (!usbd.epBank0IsReady(ep)) {}
-	while (!usbd.epBank0IsTransferComplete(ep)) {} // XXX: while(USB->DEVICE.DeviceEndpoint[ep].EPINTFLAG.bit.TRCPT == 0);
+	while (!usbd.epBank0IsTransferComplete(ep)) {}
 	return usbd.epBank0ByteCount(ep);
 }
 
 uint8_t USBDeviceClass::armRecv(uint32_t ep, uint32_t len)
 {
-	//usbd.epBank0SetSize(ep, 64);
-	//usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
-	//usbd.epBank0SetMultiPacketSize(ep, 64); // XXX: Should be "len"?
 	uint16_t count = usbd.epBank0ByteCount(ep);
 	if (count >= 64) {
 		usbd.epBank0SetByteCount(ep, count - 64);
 	} else {
 		usbd.epBank0SetByteCount(ep, 0);
 	}
-	// The RAM Buffer is empty: we can receive data
-	//usbd.epBank0ResetReady(ep);
-
-	// Wait for transfer to complete
-	//while (!usbd.epBank0IsTransferComplete(ep)) {}
-	//while (usbd.epBank0IsReady(ep)) {}
-	// NAK on endpoint OUT, the bank is full.
-	//usbd.epBank0ResetReady(ep);
-
 	return usbd.epBank0ByteCount(ep);
 }
 
@@ -837,8 +816,7 @@ void USBDeviceClass::ISRHandler()
 			stall(0);
 		}
 
-		// XXX: Should be really cleared?
-		if (usbd.epBank1IsStalled(0)) // XXX:(USB->DEVICE.DeviceEndpoint[0].EPINTFLAG.bit.STALL)
+		if (usbd.epBank1IsStalled(0))
 		{
 			usbd.epBank1AckStalled(0);
 
@@ -878,6 +856,6 @@ void USBDeviceClass::ISRHandler()
 USBDeviceClass USBDevice;
 
 // USB_Handler ISR
-extern "C" void USB_Handler(void) {
-	USBDevice.ISRHandler();
-}
+// extern "C" void USB_Handler(void) {
+// 	USBDevice.ISRHandler();
+// }
diff --git a/cores/arduino/USB/USB_interrupt.c b/cores/arduino/USB/USB_interrupt.c
new file mode 100644
index 000000000..09f7a81a8
--- /dev/null
+++ b/cores/arduino/USB/USB_interrupt.c
@@ -0,0 +1,30 @@
+/*
+  Copyright (c) 2014 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
+*/
+
+void (*gpf_isr)(void) = (0UL);
+
+void USB_Handler( void )
+{
+	if (gpf_isr)
+	gpf_isr();
+}
+
+void UHD_SetStack(void (*pf_isr)(void))
+{
+	gpf_isr = pf_isr;
+}
diff --git a/cores/arduino/USB/samd21_device.c b/cores/arduino/USB/samd21_device.c
deleted file mode 100644
index 24f90d710..000000000
--- a/cores/arduino/USB/samd21_device.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-  Copyright (c) 2014 Arduino.  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
-*/
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "variant.h"
-#include "USB/USB_device.h"
-#include "USB/samd21_device.h"
-#include "sam.h"
-
-#ifdef __cplusplus
-extern "C"{
-#endif // __cplusplus
-
-#ifdef SAMD_SERIES
-
-//#define TRACE_DEVICE(x)	x
-#define TRACE_DEVICE(x)
-
-__attribute__((__aligned__(4))) /*__attribute__((__section__(".bss_hram0")))*/ uint8_t udd_ep_out_cache_buffer[4][64];
-__attribute__((__aligned__(4))) /*__attribute__((__section__(".bss_hram0")))*/ uint8_t udd_ep_in_cache_buffer[4][128];
-
-/**
- * USB SRAM data containing pipe descriptor table
- * The content of the USB SRAM can be :
- * - modified by USB hardware interface to update pipe status.
- *   Thereby, it is read by software.
- * - modified by USB software to control pipe.
- *   Thereby, it is read by hardware.
- * This data section is volatile.
- */
- __attribute__((__aligned__(4))) UsbDeviceDescriptor usb_endpoint_table[USB_EPT_NUM];
-
-
-extern void (*gpf_isr)(void);
-
-
-void UDD_SetStack(void (*pf_isr)(void))
-{
-	gpf_isr = pf_isr;
-}
-
-// NVM Software Calibration Area Mapping
-// USB TRANSN calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRANSN_POS  45
-#define NVM_USB_PAD_TRANSN_SIZE 5
-// USB TRANSP calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRANSP_POS  50
-#define NVM_USB_PAD_TRANSP_SIZE 5
-// USB TRIM calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRIM_POS  55
-#define NVM_USB_PAD_TRIM_SIZE 3
-
-void UDD_Init(void)
-{
-	uint32_t pad_transn;
-    uint32_t pad_transp;
-    uint32_t pad_trim;
-	uint32_t i;
-
-	/* Enable USB clock */
-	PM->APBBMASK.reg |= PM_APBBMASK_USB;
-
-	/* Set up the USB DP/DN pins */
-	pinPeripheral( PIN_USB_DM, PIO_COM );
-	pinPeripheral( PIN_USB_DP, PIO_COM );
-//	PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
-//	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg &= ~(0xF << (4 * (PIN_PA24G_USB_DM & 0x01u)));
-//	PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg |= MUX_PA24G_USB_DM << (4 * (PIN_PA24G_USB_DM & 0x01u));
-//	PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PMUXEN = 1;
-//	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg &= ~(0xF << (4 * (PIN_PA25G_USB_DP & 0x01u)));
-//	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
-
-	/* ----------------------------------------------------------------------------------------------
-	 * Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
-	 */
-	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( 6 ) | // Generic Clock Multiplexer 6
-					GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
-					GCLK_CLKCTRL_CLKEN ;
-
-	while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-	{
-	/* Wait for synchronization */
-	}
-
-	/* Reset */
-	USB->DEVICE.CTRLA.bit.SWRST = 1;
-	while (USB->DEVICE.SYNCBUSY.bit.SWRST) {
-		/* Sync wait */
-	}
-
-	udd_enable();
-
-	/* Load Pad Calibration */
-	pad_transn =( *((uint32_t *)(NVMCTRL_OTP4)  // Non-Volatile Memory Controller
-	+ (NVM_USB_PAD_TRANSN_POS / 32))
-	>> (NVM_USB_PAD_TRANSN_POS % 32))
-	& ((1 << NVM_USB_PAD_TRANSN_SIZE) - 1);
-
-	if (pad_transn == 0x1F) {  // maximum value (31)
-		pad_transn = 5;
-	}
-
-	USB->DEVICE.PADCAL.bit.TRANSN = pad_transn;
-
-	pad_transp =( *((uint32_t *)(NVMCTRL_OTP4)
-	+ (NVM_USB_PAD_TRANSP_POS / 32))
-	>> (NVM_USB_PAD_TRANSP_POS % 32))
-	& ((1 << NVM_USB_PAD_TRANSP_SIZE) - 1);
-
-	if (pad_transp == 0x1F) {  // maximum value (31)
-		pad_transp = 29;
-	}
-
-	USB->DEVICE.PADCAL.bit.TRANSP = pad_transp;
-
-	pad_trim =( *((uint32_t *)(NVMCTRL_OTP4)
-	+ (NVM_USB_PAD_TRIM_POS / 32))
-	>> (NVM_USB_PAD_TRIM_POS % 32))
-	& ((1 << NVM_USB_PAD_TRIM_SIZE) - 1);
-
-	if (pad_trim == 0x7) {  // maximum value (7)
-		pad_trim = 3;
-	}
-
-	USB->DEVICE.PADCAL.bit.TRIM = pad_trim;
-
-	/* Set the configuration */
-	udd_force_device_mode();
-	udd_device_run_in_standby();
-	// Set address of USB SRAM
-	USB->DEVICE.DESCADD.reg = (uint32_t)(&usb_endpoint_table[0]);
-	// For USB_SPEED_FULL
-	udd_force_full_speed();
-	
-	memset(&usb_endpoint_table[0], 0, sizeof(usb_endpoint_table));
-
-	// Configure interrupts
-	NVIC_SetPriority((IRQn_Type) USB_IRQn, 0UL);
-	NVIC_EnableIRQ((IRQn_Type) USB_IRQn);
-}
-
-void UDD_Attach(void)
-{
-	TRACE_DEVICE(printf("=> UDD_Attach\r\n");)
-
-    // Authorize attach if Vbus is present
-	udd_attach_device();
-
-	// Enable USB line events
-	udd_enable_reset_interrupt();
-
-    // usefull for debug
-    udd_enable_sof_interrupt();
-}
-
-void UDD_Detach(void)
-{
-	TRACE_DEVICE(printf("=> UDD_Detach\r\n");)
-    udd_detach_device();
-}
-
-void send_zlp(void)
-{
-	/* Set the byte count as zero */
-	usb_endpoint_table[0].DeviceDescBank[1].PCKSIZE.bit.BYTE_COUNT = 0;
-}
-
-
-void UDD_InitEP( uint32_t ul_ep_nb, uint32_t ul_ep_cfg )
-{
-	TRACE_DEVICE(printf("=> UDD_InitEP : init EP %lu\r\n", (unsigned long)ul_ep_nb);)
-
-	if( ul_ep_cfg == (USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0)) )
-	{
-		USB->DEVICE.DeviceEndpoint[ul_ep_nb].EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE1(4);
-		/* Set maximum packet size as 8 bytes */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[1].PCKSIZE.bit.SIZE = 0;  // 8 bytes
-		/* Configure the data buffer */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[1].ADDR.reg = (uint32_t)&udd_ep_in_cache_buffer[ul_ep_nb];
-	}
-	else if( ul_ep_cfg == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_OUT(0)) )
-	{
-		/* Configure BULK OUT endpoint for CDC Data interface*/
-		USB->DEVICE.DeviceEndpoint[ul_ep_nb].EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE0(3);
-		/* Set maximum packet size as 64 bytes */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.bit.SIZE = 0x3;  // for 64 bytes
-		/* Configure the data buffer */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].ADDR.reg = (uint32_t)&udd_ep_out_cache_buffer[ul_ep_nb];
-
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = 64;
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT = 0;
-		// NACK if not ready
-		udd_OUT_transfer_allowed(ul_ep_nb);
-	}
-	else if( ul_ep_cfg == (USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0)) )
-	{
-		/* Configure BULK IN endpoint for CDC Data interface */
-		USB->DEVICE.DeviceEndpoint[ul_ep_nb].EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE1(3);
-		/* Set maximum packet size as 64 bytes */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[1].PCKSIZE.bit.SIZE = 0x3;  // for 64 bytes
-		/* Configure the data buffer */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[1].ADDR.reg = (uint32_t)&udd_ep_in_cache_buffer[ul_ep_nb];
-		// NACK if not ready
-		udd_IN_stop_transfer(ul_ep_nb);
-	}
-	else if( ul_ep_cfg == USB_ENDPOINT_TYPE_CONTROL )
-	{
-		/* Configure CONTROL endpoint */
-		USB->DEVICE.DeviceEndpoint[ul_ep_nb].EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE0(1) | USB_DEVICE_EPCFG_EPTYPE1(1);
-		udd_OUT_stop_transfer(ul_ep_nb);
-		udd_IN_stop_transfer(ul_ep_nb);
-
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.reg &= ~USB_DEVICE_PCKSIZE_AUTO_ZLP;
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[1].PCKSIZE.reg &= ~USB_DEVICE_PCKSIZE_AUTO_ZLP;
-
-		/* Set maximum packet size as 64 bytes */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.bit.SIZE = 0x3;  // for 64 bytes
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[1].PCKSIZE.bit.SIZE = 0x3;  // for 64 bytes
-
-		/* get endpoint configuration from setting register */
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].ADDR.reg = (uint32_t)&udd_ep_out_cache_buffer[0];
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = 8;
-		usb_endpoint_table[ul_ep_nb].DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT = 0;
-
-		// NACK if not ready
-		udd_OUT_stop_transfer(ul_ep_nb);
-		udd_IN_stop_transfer(ul_ep_nb);
-	}
-}
-
-
-// Send packet.
-void UDD_ClearIN(void)
-{
-	udd_IN_transfer_allowed(EP0);
-}
-
-
-
-uint32_t UDD_Send(uint32_t ep, const void* data, uint32_t len)
-{
-	memcpy(&udd_ep_in_cache_buffer[ep], data, len);
-
-	/* Get endpoint configuration from setting register */
-	usb_endpoint_table[ep].DeviceDescBank[1].ADDR.reg = (uint32_t)&udd_ep_in_cache_buffer[ep];
-	usb_endpoint_table[ep].DeviceDescBank[1].PCKSIZE.bit.MULTI_PACKET_SIZE = 0;
-	usb_endpoint_table[ep].DeviceDescBank[1].PCKSIZE.bit.BYTE_COUNT = len;
-
-	return len;
-}
-
-uint8_t UDD_Recv_data(uint32_t ep, uint32_t len)
-{
-	TRACE_DEVICE(printf("=> UDD_Recvdata : ep=%d\r\n", (char)ep);)
-
-	if (len>64) len=64;
-	usb_endpoint_table[ep].DeviceDescBank[0].ADDR.reg = (uint32_t)&udd_ep_out_cache_buffer[ep];
-	usb_endpoint_table[ep].DeviceDescBank[0].PCKSIZE.bit.MULTI_PACKET_SIZE = len;
-	usb_endpoint_table[ep].DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT = 0;
-	udd_OUT_transfer_allowed(ep);
-	TRACE_DEVICE(printf("=> UDD_Recv_data : data=%lu\r\n", (unsigned long)data);)
-
-	/* Wait for transfer to complete */
-	while (!udd_is_OUT_transf_cplt(ep));
-	/* Clear Transfer complete 0 flag */
-	udd_clear_OUT_transf_cplt(ep);
-
-	return udd_ep_out_cache_buffer[ep][0];
-}
-
-void UDD_Recv(uint32_t ep, uint8_t** ppData)
-{
-	*ppData = udd_ep_out_cache_buffer[ep];
-}
-
-void UDD_Stall(uint32_t ep)
-{
-	uint8_t ep_num = ep;
-
-	// Stall endpoint
-	USB->DEVICE.DeviceEndpoint[ep_num].EPSTATUSSET.reg = USB_DEVICE_EPSTATUSSET_STALLRQ(2);
-}
-
-uint32_t UDD_FifoByteCount(uint32_t ep)
-{
-	return ((uint16_t)(usb_endpoint_table[ep].DeviceDescBank[0].PCKSIZE.bit.BYTE_COUNT));
-}
-
-void UDD_ReleaseRX(uint32_t ep)
-{
-	TRACE_DEVICE(puts("=> UDD_ReleaseRX\r\n");)
-	// The RAM Buffer is empty: we can receive data
-	udd_OUT_transfer_allowed(ep);
-	/* Clear Transfer complete 0 flag */
-	udd_clear_OUT_transf_cplt(ep);
-}
-
-void UDD_ReleaseTX(uint32_t ep)
-{
-	TRACE_DEVICE(printf("=> UDD_ReleaseTX ep=%lu\r\n", (unsigned long)ep);)
-	// The RAM Buffer is full: we can send data
-    udd_IN_transfer_allowed(ep);
- 	/* Clear the transfer complete flag  */
-    udd_clear_IN_transf_cplt(ep);
-}
-
-void UDD_SetAddress(uint32_t addr)
-{
-	TRACE_DEVICE(printf("=> UDD_SetAddress : setting address to %lu\r\n", (unsigned long)addr);)
-
-	/* Set the byte count as zero */
-	usb_endpoint_table[0].DeviceDescBank[1].PCKSIZE.bit.BYTE_COUNT = 0;
- 	/* Clear the transfer complete flag  */
-    udd_clear_IN_transf_cplt(0);
-	/* Set the bank as ready */
-	udd_IN_transfer_allowed(0);
-
-	/* Wait for transfer to complete */
-	while (!udd_is_IN_transf_cplt(EP0)) {}
-
-	udd_configure_address(addr);
-}
-
-uint32_t UDD_GetFrameNumber(void)
-{
-	return udd_frame_number();
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SAMD_SERIES */
-
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index d1bf3558a..09cbe478a 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -34,8 +34,6 @@
 //#define TRACE_UOTGHS_HOST(x)	x
 #define TRACE_UOTGHS_HOST(x)
 
-//extern void (*gpf_isr)(void);
-
 // Handle UOTGHS Host driver state
 static uhd_vbus_state_t uhd_state = UHD_STATE_NO_VBUS;
 
@@ -43,10 +41,6 @@ __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table[USB_EP
 
 extern void (*gpf_isr)(void);
 
-void UHD_SetStack(void (*pf_isr)(void))
-{
-	gpf_isr = pf_isr;
-}
 
 // NVM Software Calibration Area Mapping
 // USB TRANSN calibration value. Should be written to the USB PADCAL register.
@@ -177,7 +171,6 @@ void UHD_Init(void)
 /**
  * \brief Interrupt sub routine for USB Host state machine management.
  */
-//static void UHD_ISR(void)
 void UHD_Handler(void)
 {
    uint16_t flags;
@@ -515,4 +508,13 @@ uint32_t UHD_Pipe_Is_Transfer_Complete(uint32_t ul_pipe, uint32_t ul_token_type)
 
    return 0;
 }
+
+
+
+
+// USB_Handler ISR
+// void USB_Handler(void) {
+// 	UHD_Handler();
+// }
+
 #endif //  HOST_DEFINED
diff --git a/libraries/USBHost/src/Usb.cpp b/libraries/USBHost/src/Usb.cpp
index 70d1b754b..167365d7d 100644
--- a/libraries/USBHost/src/Usb.cpp
+++ b/libraries/USBHost/src/Usb.cpp
@@ -21,7 +21,7 @@ e-mail   :  support@circuitsathome.com
 #include "Usb.h"
 
 
-#ifdef ARDUINO_ARCH_SAMD
+//#ifdef ARDUINO_SAMD_ZERO
 
 static uint32_t usb_error = 0;
 static uint32_t usb_task_state = USB_DETACHED_SUBSTATE_INITIALIZE;
@@ -854,6 +854,4 @@ uint32_t USBHost::setConf(uint32_t addr, uint32_t ep, uint32_t conf_value) {
         return ( ctrlReq(addr, ep, bmREQ_SET, USB_REQUEST_SET_CONFIGURATION, conf_value, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL));
 }
 
-#else
-#error This library is only compatible with ARDUINO_ARCH_SAMD
-#endif //ARDUINO_ARCH_SAMD
+//#endif //ARDUINO_SAMD_ZERO

From 65b67a961453a070aca307f13fff71c9f0a30d65 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Wed, 8 Jul 2015 17:31:43 +0200
Subject: [PATCH 041/124] Moved USB ISR handler in startup.c

---
 cores/arduino/USB/USBCore.cpp     |  2 +-
 cores/arduino/USB/USB_host.h      |  2 +-
 cores/arduino/USB/USB_interrupt.c | 30 ------------------------------
 cores/arduino/USB/samd21_host.c   |  2 +-
 cores/arduino/cortex_handlers.c   | 21 +++++++++++++++++----
 cores/arduino/startup.c           |  3 ++-
 6 files changed, 22 insertions(+), 38 deletions(-)
 delete mode 100644 cores/arduino/USB/USB_interrupt.c

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index b9ba77e4e..557210c3e 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -294,7 +294,7 @@ void USBDeviceClass::init()
 	while (GCLK->STATUS.bit.SYNCBUSY)
 		;
 
-	UHD_SetStack(&UDD_Handler);	
+	USB_SetHandler(&UDD_Handler);
 
 	// Reset USB Device
 	usbd.reset();
diff --git a/cores/arduino/USB/USB_host.h b/cores/arduino/USB/USB_host.h
index 390e3dd1e..319dffea5 100644
--- a/cores/arduino/USB/USB_host.h
+++ b/cores/arduino/USB/USB_host.h
@@ -48,7 +48,7 @@ typedef enum {
 
 extern void UHD_Init(void);
 extern void UHD_Handler(void);
-extern void UHD_SetStack(void (*pf_isr)(void)); 
+extern void USB_SetHandler(void (*pf_isr)(void));
 extern uhd_vbus_state_t UHD_GetVBUSState(void);
 extern uint32_t UHD_Pipe0_Alloc(uint32_t ul_add, uint32_t ul_ep_size);
 extern uint32_t UHD_Pipe_Alloc(uint32_t ul_dev_addr, uint32_t ul_dev_ep, uint32_t ul_type, uint32_t ul_dir, uint32_t ul_maxsize, uint32_t ul_interval, uint32_t ul_nb_bank);
diff --git a/cores/arduino/USB/USB_interrupt.c b/cores/arduino/USB/USB_interrupt.c
deleted file mode 100644
index 09f7a81a8..000000000
--- a/cores/arduino/USB/USB_interrupt.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (c) 2014 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
-*/
-
-void (*gpf_isr)(void) = (0UL);
-
-void USB_Handler( void )
-{
-	if (gpf_isr)
-	gpf_isr();
-}
-
-void UHD_SetStack(void (*pf_isr)(void))
-{
-	gpf_isr = pf_isr;
-}
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index 09cbe478a..e08400314 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -63,7 +63,7 @@ void UHD_Init(void)
 	uint32_t pad_trim;
 	uint32_t i;
 
-	UHD_SetStack(&UHD_Handler);
+	USB_SetHandler(&UHD_Handler);
 
 	/* Enable USB clock */
 	PM->APBBMASK.reg |= PM_APBBMASK_USB;
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
index f602a2041..5a848d148 100644
--- a/cores/arduino/cortex_handlers.c
+++ b/cores/arduino/cortex_handlers.c
@@ -16,8 +16,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "sam.h"
-#include "variant.h"
+#include <sam.h>
+#include <variant.h>
+#include <stdio.h>
 
 /* RTOS Hooks */
 extern void svcHook(void);
@@ -25,7 +26,6 @@ extern void pendSVHook(void);
 extern int sysTickHook(void);
 
 /* Default empty handler */
-
 void Dummy_Handler(void)
 {
 #if defined DEBUG
@@ -50,7 +50,7 @@ void RTC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void EIC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void NVMCTRL_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void DMAC_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
-void USB_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void USB_Handler      (void) __attribute__ ((weak));
 void EVSYS_Handler    (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM0_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM1_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
@@ -193,3 +193,16 @@ void SysTick_Handler(void)
     return;
   SysTick_DefaultHandler();
 }
+
+static void (*usb_isr)(void) = NULL;
+
+void USB_Handler(void)
+{
+  if (usb_isr)
+    usb_isr();
+}
+
+void USB_SetHandler(void (*new_usb_isr)(void))
+{
+  usb_isr = new_usb_isr;
+}
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index 243aa9626..c1ac65f36 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -19,6 +19,8 @@
 #include "sam.h"
 #include "variant.h"
 
+#include <stdio.h>
+
 /**
  * \brief SystemInit() configures the needed clocks and according Flash Read Wait States.
  * At reset:
@@ -208,4 +210,3 @@ void SystemInit( void )
 
   ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
 }
-

From 4dffbb5029a17a56bec3fc25deb56691d5396e2e Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 17 Jul 2015 11:01:26 +0200
Subject: [PATCH 042/124] Fixed a lot of warnings in USBHost

---
 cores/arduino/USB/CDC.cpp                    |  6 ++-
 cores/arduino/USB/samd21_host.c              |  5 ++-
 libraries/USBHost/src/MouseController.cpp    | 42 ++++++++++----------
 libraries/USBHost/src/Usb.cpp                |  2 +-
 libraries/USBHost/src/Usb.h                  |  2 -
 libraries/USBHost/src/UsbCore.h              | 10 ++---
 libraries/USBHost/src/adk.cpp                |  2 +-
 libraries/USBHost/src/confdescparser.h       |  2 +-
 libraries/USBHost/src/hidboot.cpp            |  4 +-
 libraries/USBHost/src/hidboot.h              | 22 +++++-----
 libraries/USBHost/src/hidescriptorparser.cpp |  4 +-
 libraries/USBHost/src/hiduniversal.h         |  2 +-
 libraries/USBHost/src/message.h              | 14 +++++--
 libraries/USBHost/src/printhex.h             | 13 ++++--
 libraries/USBHost/src/sink_parser.h          |  2 +-
 libraries/USBHost/src/usbhub.cpp             |  2 +-
 16 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index 944073336..daca74cc6 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -135,12 +135,14 @@ bool CDC_Setup(Setup& setup)
 }
 
 uint32_t _serialPeek = -1;
-void Serial_::begin(uint32_t baud_count)
+void Serial_::begin(uint32_t /* baud_count */)
 {
+	// uart config is ignored in USB-CDC
 }
 
-void Serial_::begin(uint32_t baud_count, uint8_t config)
+void Serial_::begin(uint32_t /* baud_count */, uint8_t /* config */)
 {
+	// uart config is ignored in USB-CDC
 }
 
 void Serial_::end(void)
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index e08400314..c798a4d6d 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -27,6 +27,7 @@
 #include "samd21_host.h"
 #include "sam.h"
 #include "wiring_digital.h"
+#include "wiring_private.h"
 
 #define HOST_DEFINED
 #ifdef HOST_DEFINED
@@ -295,8 +296,10 @@ uhd_vbus_state_t UHD_GetVBUSState(void)
  * \retval 0 success.
  * \retval 1 error.
  */
-uint32_t UHD_Pipe0_Alloc(uint32_t ul_add, uint32_t ul_ep_size)
+uint32_t UHD_Pipe0_Alloc(uint32_t ul_add , uint32_t ul_ep_size)
 {
+	(void)(ul_add); // Unused argument
+
 	if( USB->HOST.STATUS.reg & USB_HOST_STATUS_SPEED(1) )
 		ul_ep_size = USB_PCKSIZE_SIZE_8_BYTES;  // Low Speed
 	else
diff --git a/libraries/USBHost/src/MouseController.cpp b/libraries/USBHost/src/MouseController.cpp
index 3d528bc37..0912a0374 100644
--- a/libraries/USBHost/src/MouseController.cpp
+++ b/libraries/USBHost/src/MouseController.cpp
@@ -1,19 +1,19 @@
 /*
- Copyright (c) 2012 Arduino.  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
+ * Copyright (c) 2015 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
  */
 
 #include <MouseController.h>
@@ -49,35 +49,35 @@ void MouseController::OnMouseMove(MOUSEINFO *mi) {
 		mouseMoved();
 }
 
-void MouseController::OnLeftButtonUp(MOUSEINFO *mi) {
+void MouseController::OnLeftButtonUp(MOUSEINFO * /* mi */) {
 	buttons &= ~LEFT_BUTTON;
 	mouseReleased();
 	mouseClicked();
 }
 
-void MouseController::OnLeftButtonDown(MOUSEINFO *mi) {
+void MouseController::OnLeftButtonDown(MOUSEINFO * /* mi */) {
 	buttons |= LEFT_BUTTON;
 	mousePressed();
 }
 
-void MouseController::OnMiddleButtonUp(MOUSEINFO *mi) {
+void MouseController::OnMiddleButtonUp(MOUSEINFO * /* mi */) {
 	buttons &= ~MIDDLE_BUTTON;
 	mouseReleased();
 	mouseClicked();
 }
 
-void MouseController::OnMiddleButtonDown(MOUSEINFO *mi) {
+void MouseController::OnMiddleButtonDown(MOUSEINFO * /* mi */) {
 	buttons |= MIDDLE_BUTTON;
 	mousePressed();
 }
 
-void MouseController::OnRightButtonUp(MOUSEINFO *mi) {
+void MouseController::OnRightButtonUp(MOUSEINFO * /* mi */) {
 	buttons &= ~RIGHT_BUTTON;
 	mouseReleased();
 	mouseClicked();
 }
 
-void MouseController::OnRightButtonDown(MOUSEINFO *mi) {
+void MouseController::OnRightButtonDown(MOUSEINFO * /* mi */) {
 	buttons |= RIGHT_BUTTON;
 	mousePressed();
 }
diff --git a/libraries/USBHost/src/Usb.cpp b/libraries/USBHost/src/Usb.cpp
index 167365d7d..30b0816f9 100644
--- a/libraries/USBHost/src/Usb.cpp
+++ b/libraries/USBHost/src/Usb.cpp
@@ -340,7 +340,7 @@ uint32_t USBHost::OutTransfer(EpInfo *pep, uint32_t nak_limit, uint32_t nbytes,
 	for( i=0; i<nbytes; i++) {
 		buf[i] = data[i];
 	}
-	unsigned long timeout = millis() + USB_XFER_TIMEOUT;
+	//unsigned long timeout = millis() + USB_XFER_TIMEOUT;
 
 	//set toggle value
 	if(pep->bmSndToggle)
diff --git a/libraries/USBHost/src/Usb.h b/libraries/USBHost/src/Usb.h
index 40bed77ed..919b83523 100644
--- a/libraries/USBHost/src/Usb.h
+++ b/libraries/USBHost/src/Usb.h
@@ -22,8 +22,6 @@ e-mail   :  support@circuitsathome.com
 
 #include <stdint.h>
 
-#define ARDUINO   101
-
 //#include "Arduino.h"
 #include "macros.h"
 // None of these should ever be included by a driver, or a user's sketch.
diff --git a/libraries/USBHost/src/UsbCore.h b/libraries/USBHost/src/UsbCore.h
index fdb14c1c1..6382e8dc9 100644
--- a/libraries/USBHost/src/UsbCore.h
+++ b/libraries/USBHost/src/UsbCore.h
@@ -119,11 +119,11 @@ typedef MAX3421e<P20, P19> MAX3421E; // Balanduino
 class USBDeviceConfig {
 public:
 
-        virtual uint32_t Init(uint32_t parent, uint32_t port, uint32_t lowspeed) {
+        virtual uint32_t Init(uint32_t /* parent */, uint32_t /* port */, uint32_t /* lowspeed */) {
                 return 0;
         }
 
-        virtual uint32_t ConfigureDevice(uint32_t parent, uint32_t port, uint32_t lowspeed) {
+        virtual uint32_t ConfigureDevice(uint32_t /* parent */, uint32_t /* port */, uint32_t /* lowspeed */) {
                 return 0;
         }
 
@@ -139,15 +139,15 @@ class USBDeviceConfig {
                 return 0;
         }
 
-        virtual void ResetHubPort(uint32_t port) {
+        virtual void ResetHubPort(uint32_t /* port */) {
                 return;
         } // Note used for hubs only!
 
-        virtual uint32_t VIDPIDOK(uint32_t vid, uint32_t pid) {
+        virtual uint32_t VIDPIDOK(uint32_t /* vid */, uint32_t /* pid */) {
                 return false;
         }
 
-        virtual uint32_t DEVCLASSOK(uint32_t klass) {
+        virtual uint32_t DEVCLASSOK(uint32_t /* klass */) {
                 return false;
         }
 };
diff --git a/libraries/USBHost/src/adk.cpp b/libraries/USBHost/src/adk.cpp
index e271cb4a4..165f50c3d 100644
--- a/libraries/USBHost/src/adk.cpp
+++ b/libraries/USBHost/src/adk.cpp
@@ -347,7 +347,7 @@ uint32_t ADK::Init(uint32_t parent, uint32_t port, uint32_t lowspeed) {
 }
 
 /* Extracts bulk-IN and bulk-OUT endpoint information from config descriptor */
-void ADK::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t alt, uint32_t proto, const USB_ENDPOINT_DESCRIPTOR *pep) {
+void ADK::EndpointXtract(uint32_t conf, uint32_t /* iface */, uint32_t /* alt */, uint32_t /* proto */, const USB_ENDPOINT_DESCRIPTOR *pep) {
         //ErrorMessage<uint8_t>(PSTR("Conf.Val"), conf);
         //ErrorMessage<uint8_t>(PSTR("Iface Num"), iface);
         //ErrorMessage<uint8_t>(PSTR("Alt.Set"), alt);
diff --git a/libraries/USBHost/src/confdescparser.h b/libraries/USBHost/src/confdescparser.h
index 6ee6a1eef..4b2b41b4f 100644
--- a/libraries/USBHost/src/confdescparser.h
+++ b/libraries/USBHost/src/confdescparser.h
@@ -85,7 +85,7 @@ UseOr(false) {
 };
 
 template <const uint8_t CLASS_ID, const uint8_t SUBCLASS_ID, const uint8_t PROTOCOL_ID, const uint8_t MASK>
-void ConfigDescParser<CLASS_ID, SUBCLASS_ID, PROTOCOL_ID, MASK>::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t &offset) {
+void ConfigDescParser<CLASS_ID, SUBCLASS_ID, PROTOCOL_ID, MASK>::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t & /* offset */) {
 	uint32_t	cntdn = len;
 	uint8_t		*p = (uint8_t*)pbuf;
 
diff --git a/libraries/USBHost/src/hidboot.cpp b/libraries/USBHost/src/hidboot.cpp
index 9f6b8743a..ea59f39fb 100644
--- a/libraries/USBHost/src/hidboot.cpp
+++ b/libraries/USBHost/src/hidboot.cpp
@@ -16,7 +16,7 @@ e-mail   :  support@circuitsathome.com
 */
 #include "hidboot.h"
 
-void MouseReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_t *buf) {
+void MouseReportParser::Parse(HID * /* hid */, uint32_t /* is_rpt_id */, uint32_t /* len */, uint8_t *buf) {
 	MOUSEINFO *pmi = (MOUSEINFO*)buf;
         // Future:
         // bool event;
@@ -124,7 +124,7 @@ void MouseReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_
 
 };
 
-void KeyboardReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_t *buf) {
+void KeyboardReportParser::Parse(HID *hid, uint32_t /* is_rpt_id */, uint32_t /* len */, uint8_t *buf) {
 	// On error - return
 	if (buf[2] == 1)
 		return;
diff --git a/libraries/USBHost/src/hidboot.h b/libraries/USBHost/src/hidboot.h
index 621ce57ac..1aa98e1af 100644
--- a/libraries/USBHost/src/hidboot.h
+++ b/libraries/USBHost/src/hidboot.h
@@ -64,25 +64,25 @@ class MouseReportParser : public HIDReportParser {
 
 protected:
 
-        virtual void OnMouseMove(MOUSEINFO *mi) {
+        virtual void OnMouseMove(MOUSEINFO *) {
         };
 
-        virtual void OnLeftButtonUp(MOUSEINFO *mi) {
+        virtual void OnLeftButtonUp(MOUSEINFO *) {
         };
 
-        virtual void OnLeftButtonDown(MOUSEINFO *mi) {
+        virtual void OnLeftButtonDown(MOUSEINFO *) {
         };
 
-        virtual void OnRightButtonUp(MOUSEINFO *mi) {
+        virtual void OnRightButtonUp(MOUSEINFO *) {
         };
 
-        virtual void OnRightButtonDown(MOUSEINFO *mi) {
+        virtual void OnRightButtonDown(MOUSEINFO *) {
         };
 
-        virtual void OnMiddleButtonUp(MOUSEINFO *mi) {
+        virtual void OnMiddleButtonUp(MOUSEINFO *) {
         };
 
-        virtual void OnMiddleButtonDown(MOUSEINFO *mi) {
+        virtual void OnMiddleButtonDown(MOUSEINFO *) {
         };
 };
 
@@ -153,13 +153,13 @@ class KeyboardReportParser : public HIDReportParser {
 protected:
 	virtual uint8_t HandleLockingKeys(HID* hid, uint8_t key);
 
-        virtual void OnControlKeysChanged(uint8_t before, uint8_t after) {
+        virtual void OnControlKeysChanged(uint8_t /* before */, uint8_t /* after */) {
         };
 
-        virtual void OnKeyDown(uint8_t mod, uint8_t key) {
+        virtual void OnKeyDown(uint8_t /* mod */, uint8_t /* key */) {
         };
 
-        virtual void OnKeyUp(uint8_t mod, uint8_t key) {
+        virtual void OnKeyUp(uint8_t /* mod */, uint8_t /* key */) {
         };
 
         virtual const uint8_t *getNumKeys() {
@@ -520,7 +520,7 @@ uint32_t HIDBoot<BOOT_PROTOCOL>::Init(uint32_t parent, uint32_t port, uint32_t l
 }
 
 template <const uint8_t BOOT_PROTOCOL>
-void HIDBoot<BOOT_PROTOCOL>::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t alt, uint32_t proto, const USB_ENDPOINT_DESCRIPTOR *pep) {
+void HIDBoot<BOOT_PROTOCOL>::EndpointXtract(uint32_t conf, uint32_t iface, uint32_t /* alt */, uint32_t /* proto */, const USB_ENDPOINT_DESCRIPTOR *pep) {
 	// If the first configuration satisfies, the others are not considered.
         //if(bNumEP > 1 && conf != bConfNum)
         if(bNumEP == totalEndpoints(BOOT_PROTOCOL))
diff --git a/libraries/USBHost/src/hidescriptorparser.cpp b/libraries/USBHost/src/hidescriptorparser.cpp
index 1e30d08eb..353874300 100644
--- a/libraries/USBHost/src/hidescriptorparser.cpp
+++ b/libraries/USBHost/src/hidescriptorparser.cpp
@@ -990,7 +990,7 @@ const char * const ReportDescParserBase::medInstrTitles4[] PROGMEM = {
         pstrUsageSoftControlAdjust
 };
 
-void ReportDescParserBase::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t &offset) {
+void ReportDescParserBase::Parse(const uint32_t len, const uint8_t *pbuf, const uint32_t & /* offset */) {
         uint32_t cntdn = (uint32_t)len;
         uint8_t *p = (uint8_t*)pbuf;
 
@@ -1589,7 +1589,7 @@ void ReportDescParser2::OnInputItem(uint8_t itm) {
         E_Notify(PSTR("\r\n"), 0x80);
 }
 
-void UniversalReportParser::Parse(HID *hid, uint32_t is_rpt_id, uint32_t len, uint8_t *buf) {
+void UniversalReportParser::Parse(HID *hid, uint32_t /* is_rpt_id */, uint32_t len, uint8_t *buf) {
         ReportDescParser2 prs(len, buf);
 
         uint8_t ret = hid->GetReportDescr(0, &prs);
diff --git a/libraries/USBHost/src/hiduniversal.h b/libraries/USBHost/src/hiduniversal.h
index b0e7958a6..3387619e9 100644
--- a/libraries/USBHost/src/hiduniversal.h
+++ b/libraries/USBHost/src/hiduniversal.h
@@ -75,7 +75,7 @@ class HIDUniversal : public HID {
                 return 0;
         };
 
-        virtual void ParseHIDData(HID *hid, bool is_rpt_id, uint8_t len, uint8_t *buf) {
+        virtual void ParseHIDData(HID * /* hid */, bool /* is_rpt_id */, uint8_t /* len */, uint8_t * /* buf */) {
                 return;
         };
 
diff --git a/libraries/USBHost/src/message.h b/libraries/USBHost/src/message.h
index 41f526de2..6144b56de 100644
--- a/libraries/USBHost/src/message.h
+++ b/libraries/USBHost/src/message.h
@@ -55,24 +55,30 @@ void NotifyFail(uint8_t rcode);
 #define NotifyFail(...) ((void)0)
 #endif
 
+#ifdef DEBUG_USB_HOST
 template <class ERROR_TYPE>
 void ErrorMessage(uint8_t level, char const * msg, ERROR_TYPE rcode = 0) {
-#ifdef DEBUG_USB_HOST
         Notify(msg, level);
         Notify(PSTR(": "), level);
         D_PrintHex<ERROR_TYPE > (rcode, level);
         Notify(PSTR("\r\n"), level);
-#endif
 }
 
 template <class ERROR_TYPE>
 void ErrorMessage(char const * msg, ERROR_TYPE rcode = 0) {
-#ifdef DEBUG_USB_HOST
         Notify(msg, 0x80);
         Notify(PSTR(": "), 0x80);
         D_PrintHex<ERROR_TYPE > (rcode, 0x80);
         Notify(PSTR("\r\n"), 0x80);
-#endif
 }
+#else
+template <class ERROR_TYPE>
+void ErrorMessage(uint8_t, char const *, ERROR_TYPE = 0) {
+}
+
+template <class ERROR_TYPE>
+void ErrorMessage(char const *, ERROR_TYPE = 0) {
+}
+#endif
 
 #endif // __MESSAGE_H__
diff --git a/libraries/USBHost/src/printhex.h b/libraries/USBHost/src/printhex.h
index 369d7e1f7..98c1ae602 100644
--- a/libraries/USBHost/src/printhex.h
+++ b/libraries/USBHost/src/printhex.h
@@ -66,18 +66,23 @@ void PrintHex2(Print *prn, T val) {
         prn->print((T)val, HEX);
 }
 
-template <class T> void D_PrintHex(T val, int lvl) {
 #ifdef DEBUG_USB_HOST
+template <class T> void D_PrintHex(T val, int lvl) {
         PrintHex<T > (val, lvl);
-#endif
 }
 
 template <class T>
 void D_PrintBin(T val, int lvl) {
-#ifdef DEBUG_USB_HOST
         PrintBin<T > (val, lvl);
-#endif
 }
+#else
+template <class T> void D_PrintHex(T, int) {
+}
+
+template <class T>
+void D_PrintBin(T, int) {
+}
+#endif
 
 
 
diff --git a/libraries/USBHost/src/sink_parser.h b/libraries/USBHost/src/sink_parser.h
index a23637d2b..f1c7386a3 100644
--- a/libraries/USBHost/src/sink_parser.h
+++ b/libraries/USBHost/src/sink_parser.h
@@ -33,7 +33,7 @@ class SinkParser : public BASE_CLASS {
         void Initialize() {
         };
 
-        void Parse(const LEN_TYPE len, const uint8_t *pbuf, const OFFSET_TYPE &offset) {
+        void Parse(const LEN_TYPE /* len */, const uint8_t * /* pbuf */, const OFFSET_TYPE & /* offset */) {
         };
 };
 
diff --git a/libraries/USBHost/src/usbhub.cpp b/libraries/USBHost/src/usbhub.cpp
index a6aebd973..1f6aa712b 100644
--- a/libraries/USBHost/src/usbhub.cpp
+++ b/libraries/USBHost/src/usbhub.cpp
@@ -374,7 +374,7 @@ uint32_t USBHub::PortStatusChange(uint32_t port, HubEvent &evt) {
         return 0;
 }
 
-void PrintHubPortStatus(USBHub *hubptr, uint32_t addr, uint32_t port, uint32_t print_changes) {
+void PrintHubPortStatus(USBHub *hubptr, uint32_t /* addr */, uint32_t port, uint32_t print_changes) {
         uint8_t rcode = 0;
         HubEvent evt;
 

From e7c311699df791790cd0268f5dd9e771a22389ef Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 17 Jul 2015 11:26:46 +0200
Subject: [PATCH 043/124] Removed some unused warning in USB-Core

---
 cores/arduino/USB/USBAPI.h    |  4 ++--
 cores/arduino/USB/USBCore.cpp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h
index b2d9d510b..bbb0a3e03 100644
--- a/cores/arduino/USB/USBAPI.h
+++ b/cores/arduino/USB/USBAPI.h
@@ -90,8 +90,8 @@ class USBDeviceClass {
 
 	// private?
 	uint32_t armSend(uint32_t ep, const void *data, uint32_t len);
-	uint8_t armRecv(uint32_t ep, uint32_t len);
-	uint8_t armRecvCtrlOUT(uint32_t ep, uint32_t len);
+	uint8_t armRecv(uint32_t ep);
+	uint8_t armRecvCtrlOUT(uint32_t ep);
 
 	void ISRHandler();
 
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 557210c3e..99009e835 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -472,7 +472,7 @@ uint32_t USBDeviceClass::recvControl(void *_data, uint32_t len)
 	usbd.epBank0ResetReady(0);
 
 	//usbd.epBank0AckSetupReceived(0);
-	uint32_t read = armRecvCtrlOUT(0, len);
+	uint32_t read = armRecvCtrlOUT(0);
 	if (read > len)
 		read = len;
 	//while (!usbd.epBank0AckTransferComplete(0)) {}
@@ -500,7 +500,7 @@ uint32_t USBDeviceClass::recv(uint32_t ep, void *_data, uint32_t len)
 	if (available(ep) < len)
 		len = available(ep);
 
-	armRecv(ep, len);
+	armRecv(ep);
 
 	usbd.epBank0DisableTransferComplete(ep);
 
@@ -518,7 +518,7 @@ uint32_t USBDeviceClass::recv(uint32_t ep, void *_data, uint32_t len)
 	return len;
 }
 
-//	Recv 1 byte if ready
+// Recv 1 byte if ready
 uint32_t USBDeviceClass::recv(uint32_t ep)
 {
 	uint8_t c;
@@ -529,9 +529,9 @@ uint32_t USBDeviceClass::recv(uint32_t ep)
 	}
 }
 
-uint8_t USBDeviceClass::armRecvCtrlOUT(uint32_t ep, uint32_t len)
+uint8_t USBDeviceClass::armRecvCtrlOUT(uint32_t ep)
 {
-	/* get endpoint configuration from setting register */
+	// Get endpoint configuration from setting register
 	usbd.epBank0SetAddress(ep, &udd_ep_out_cache_buffer[ep]);
 	usbd.epBank0SetMultiPacketSize(ep, 8);
 	usbd.epBank0SetByteCount(ep, 0);
@@ -544,7 +544,7 @@ uint8_t USBDeviceClass::armRecvCtrlOUT(uint32_t ep, uint32_t len)
 	return usbd.epBank0ByteCount(ep);
 }
 
-uint8_t USBDeviceClass::armRecv(uint32_t ep, uint32_t len)
+uint8_t USBDeviceClass::armRecv(uint32_t ep)
 {
 	uint16_t count = usbd.epBank0ByteCount(ep);
 	if (count >= 64) {
@@ -555,7 +555,7 @@ uint8_t USBDeviceClass::armRecv(uint32_t ep, uint32_t len)
 	return usbd.epBank0ByteCount(ep);
 }
 
-//	Blocking Send of data to an endpoint
+// Blocking Send of data to an endpoint
 uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 {
 	uint32_t length = 0;

From c9207f950bf7d491db5faccfd29bef489e1a2fa8 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 10 Sep 2015 16:08:32 +0200
Subject: [PATCH 044/124] Disabled SRAM shortcut when in USBCore::send

The shortcut has some issues:

- sometimes it fails when sending an odd number of bytes (may be
  due to memory alignment?)
- the data pointer should point to "stable" data (and this is not
  guaranteed by caller, it may be some sort of temporary buffer)
- the SRAM is not guaranteed to start at 0x20000000

All the above problems must be properly fixed before reenabling
this part
---
 cores/arduino/USB/USBCore.cpp | 57 ++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 99009e835..d40662f08 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -565,6 +565,17 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 	if (len > 16384)
 		return -1;
 
+#if 0
+// This shortcut has some issues:
+// - sometimes it fails when sending an odd number of bytes (may be
+//   due to memory alignment?)
+// - the data pointer should point to "stable" data (and this is not
+//   guaranteed by caller, it may be some sort of temporary buffer)
+// - the SRAM is not guaranteed to start at 0x20000000
+
+// All the above problems must be properly fixed before reenabling
+// this part
+
 	if ((unsigned int)data > 0x20000000)
 	{
 		// Buffer in RAM
@@ -583,39 +594,37 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 		while (!usbd.epBank1IsTransferComplete(ep)) {
 			;  // need fire exit.
 		}
-		len = 0;
+		return 0;
 	}
-	else
+#endif
+
+	// Flash area
+	while (len != 0)
 	{
-		// Flash area
-		while (len != 0)
-		{
-			if (len >= 64) {
-				length = 64;
-			} else {
-				length = len;
-			}
+		if (len >= 64) {
+			length = 64;
+		} else {
+			length = len;
+		}
 
-			/* memcopy could be safer in multi threaded environment */
-			memcpy(&udd_ep_in_cache_buffer[ep], data, length);
+		/* memcopy could be safer in multi threaded environment */
+		memcpy(&udd_ep_in_cache_buffer[ep], data, length);
 
-			usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
-			usbd.epBank1SetByteCount(ep, length);
+		usbd.epBank1SetAddress(ep, &udd_ep_in_cache_buffer[ep]);
+		usbd.epBank1SetByteCount(ep, length);
 
-			// Clear the transfer complete flag
-			usbd.epBank1AckTransferComplete(ep);
+		// Clear the transfer complete flag
+		usbd.epBank1AckTransferComplete(ep);
 
-			// RAM buffer is full, we can send data (IN)
-			usbd.epBank1SetReady(ep);
+		// RAM buffer is full, we can send data (IN)
+		usbd.epBank1SetReady(ep);
 
-			// Wait for transfer to complete
-			while (!usbd.epBank1IsTransferComplete(ep)) {
-				;  // need fire exit.
-			}
-			len -= length;
+		// Wait for transfer to complete
+		while (!usbd.epBank1IsTransferComplete(ep)) {
+			;  // need fire exit.
 		}
+		len -= length;
 	}
-
 	return len;
 }
 

From 223968776eefbe2c31893a2b6ed77cf0c18e3c2a Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Thu, 10 Sep 2015 16:40:33 +0200
Subject: [PATCH 045/124] Wire: allow scanning bus via
 beginTransmission-endTransmission

---
 libraries/Wire/Wire.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index 33266d9e0..b38abfe68 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -109,12 +109,6 @@ uint8_t TwoWire::endTransmission(bool stopBit)
 {
   transmissionBegun = false ;
 
-  // Check if there are data to send
-  if ( txBuffer.available() == 0)
-  {
-    return 4 ;
-  }
-
   // Start I2C transmission
   if ( !sercom->startTransmissionWIRE( txAddress, WIRE_WRITE_FLAG ) )
   {

From a4afec787b041ab856161c08611e7325f60b9bd3 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 10 Sep 2015 18:46:28 +0200
Subject: [PATCH 046/124] Fixed bug in USBCore::send... (yikes!)

---
 cores/arduino/USB/USBCore.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index d40662f08..d32dd4cb2 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -624,6 +624,7 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 			;  // need fire exit.
 		}
 		len -= length;
+		data += length;
 	}
 	return len;
 }

From a615df318d52cc62b23fe7d26f3f949f35450697 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 17 Jul 2015 17:43:25 +0200
Subject: [PATCH 047/124] adapt USB core to PluggableUSB

---
 cores/arduino/USB/CDC.cpp          |  18 +-
 cores/arduino/USB/HID.cpp          | 534 -----------------------------
 cores/arduino/USB/PluggableUSB.cpp |  98 ++++++
 cores/arduino/USB/PluggableUSB.h   |  63 ++++
 cores/arduino/USB/USBAPI.h         | 128 +------
 cores/arduino/USB/USBCore.cpp      | 207 ++++++-----
 cores/arduino/USB/USBCore.h        |  37 --
 cores/arduino/USB/USBDesc.h        |  15 +-
 libraries/HID/HID.cpp              | 176 ++++++++++
 libraries/HID/HID.h                |  93 +++++
 libraries/HID/keywords.txt         |  21 ++
 libraries/HID/library.properties   |   8 +
 12 files changed, 611 insertions(+), 787 deletions(-)
 delete mode 100644 cores/arduino/USB/HID.cpp
 create mode 100644 cores/arduino/USB/PluggableUSB.cpp
 create mode 100644 cores/arduino/USB/PluggableUSB.h
 create mode 100644 libraries/HID/HID.cpp
 create mode 100644 libraries/HID/HID.h
 create mode 100644 libraries/HID/keywords.txt
 create mode 100644 libraries/HID/library.properties

diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index daca74cc6..0f1016848 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -58,10 +58,8 @@ static volatile LineInfo _usbLineInfo = {
 	0x00    // lineState
 };
 
-static const CDCDescriptor _cdcInterface = {
-	#if (defined CDC_ENABLED) && defined(HID_ENABLED)
+static CDCDescriptor _cdcInterface = {
 	D_IAD(0, 2, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
-	#endif
 
 	// CDC communication interface
 	D_INTERFACE(CDC_ACM_INTERFACE, 1, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
@@ -79,17 +77,23 @@ static const CDCDescriptor _cdcInterface = {
 };
 _Pragma("pack()")
 
-const void* CDC_GetInterface(void)
+const void* _CDC_GetInterface(void)
 {
 	return &_cdcInterface;
 }
 
-uint32_t CDC_GetInterfaceLength(void)
+uint32_t _CDC_GetInterfaceLength(void)
 {
 	return sizeof(_cdcInterface);
 }
 
-bool CDC_Setup(Setup& setup)
+int CDC_GetInterface(uint8_t* interfaceNum)
+{
+	interfaceNum[0] += 2;	// uses 2
+	return USBDevice.sendControl(&_cdcInterface,sizeof(_cdcInterface));
+}
+
+bool CDC_Setup(USBSetup& setup)
 {
 	uint8_t requestType = setup.bmRequestType;
 	uint8_t r = setup.bRequest;
@@ -181,7 +185,7 @@ int Serial_::available(void)
 		return CDC_SERIAL_BUFFER_SIZE;
 	}
 	if (buffer->head == buffer->tail) {
-		USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
+		USB->DEVICE.DeviceEndpoint[CDC_ENDPOINT_OUT].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
 	}
 	return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;
 }
diff --git a/cores/arduino/USB/HID.cpp b/cores/arduino/USB/HID.cpp
deleted file mode 100644
index 1d214e1a1..000000000
--- a/cores/arduino/USB/HID.cpp
+++ /dev/null
@@ -1,534 +0,0 @@
-/*
-  Copyright (c) 2014 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
-*/
-
-#include <Arduino.h>
-
-#ifdef HID_ENABLED
-
-//#define RAWHID_ENABLED
-
-// Singletons for mouse and keyboard
-Mouse_ Mouse;
-Keyboard_ Keyboard;
-
-//================================================================================
-//================================================================================
-
-#define LSB(_x) ((_x) & 0xFF)
-#define MSB(_x) ((_x) >> 8)
-
-#define RAWHID_USAGE_PAGE	0xFFC0
-#define RAWHID_USAGE		0x0C00
-#define RAWHID_TX_SIZE 64
-#define RAWHID_RX_SIZE 64
-
-//	HID report descriptor
-_Pragma("pack(1)")
-extern const uint8_t _hidReportDescriptor[] = {
-	//	Mouse
-    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)	// 54
-    0x09, 0x02,                    // USAGE (Mouse)
-    0xa1, 0x01,                    // COLLECTION (Application)
-    0x09, 0x01,                    //   USAGE (Pointer)
-    0xa1, 0x00,                    //   COLLECTION (Physical)
-    0x85, 0x01,                    //     REPORT_ID (1)
-    0x05, 0x09,                    //     USAGE_PAGE (Button)
-    0x19, 0x01,                    //     USAGE_MINIMUM (Button 1)
-    0x29, 0x03,                    //     USAGE_MAXIMUM (Button 3)
-    0x15, 0x00,                    //     LOGICAL_MINIMUM (0)
-    0x25, 0x01,                    //     LOGICAL_MAXIMUM (1)
-    0x95, 0x03,                    //     REPORT_COUNT (3)
-    0x75, 0x01,                    //     REPORT_SIZE (1)
-    0x81, 0x02,                    //     INPUT (Data,Var,Abs)
-    0x95, 0x01,                    //     REPORT_COUNT (1)
-    0x75, 0x05,                    //     REPORT_SIZE (5)
-    0x81, 0x03,                    //     INPUT (Cnst,Var,Abs)
-    0x05, 0x01,                    //     USAGE_PAGE (Generic Desktop)
-    0x09, 0x30,                    //     USAGE (X)
-    0x09, 0x31,                    //     USAGE (Y)
-    0x09, 0x38,                    //     USAGE (Wheel)
-    0x15, 0x81,                    //     LOGICAL_MINIMUM (-127)
-    0x25, 0x7f,                    //     LOGICAL_MAXIMUM (127)
-    0x75, 0x08,                    //     REPORT_SIZE (8)
-    0x95, 0x03,                    //     REPORT_COUNT (3)
-    0x81, 0x06,                    //     INPUT (Data,Var,Rel)
-    0xc0,                          //   END_COLLECTION
-    0xc0,                          // END_COLLECTION
-
-	//	Keyboard
-    0x05, 0x01,                    // USAGE_PAGE (Generic Desktop)	// 47
-    0x09, 0x06,                    // USAGE (Keyboard)
-    0xa1, 0x01,                    // COLLECTION (Application)
-    0x85, 0x02,                    //   REPORT_ID (2)
-    0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
-
-	0x19, 0xe0,                    //   USAGE_MINIMUM (Keyboard LeftControl)
-    0x29, 0xe7,                    //   USAGE_MAXIMUM (Keyboard Right GUI)
-    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
-    0x25, 0x01,                    //   LOGICAL_MAXIMUM (1)
-    0x75, 0x01,                    //   REPORT_SIZE (1)
-
-	0x95, 0x08,                    //   REPORT_COUNT (8)
-    0x81, 0x02,                    //   INPUT (Data,Var,Abs)
-    0x95, 0x01,                    //   REPORT_COUNT (1)
-    0x75, 0x08,                    //   REPORT_SIZE (8)
-    0x81, 0x03,                    //   INPUT (Cnst,Var,Abs)
-
-	0x95, 0x06,                    //   REPORT_COUNT (6)
-    0x75, 0x08,                    //   REPORT_SIZE (8)
-    0x15, 0x00,                    //   LOGICAL_MINIMUM (0)
-    0x25, 0x65,                    //   LOGICAL_MAXIMUM (101)
-    0x05, 0x07,                    //   USAGE_PAGE (Keyboard)
-
-	0x19, 0x00,                    //   USAGE_MINIMUM (Reserved (no event indicated))
-    0x29, 0x65,                    //   USAGE_MAXIMUM (Keyboard Application)
-    0x81, 0x00,                    //   INPUT (Data,Ary,Abs)
-    0xc0,                          // END_COLLECTION
-
-#ifdef RAWHID_ENABLED
-	//	RAW HID
-	0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE),	// 30
-	0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
-
-	0xA1, 0x01,				// Collection 0x01
-    0x85, 0x03,             // REPORT_ID (3)
-	0x75, 0x08,				// report size = 8 bits
-	0x15, 0x00,				// logical minimum = 0
-	0x26, 0xFF, 0x00,		// logical maximum = 255
-
-	0x95, 64,				// report count TX
-	0x09, 0x01,				// usage
-	0x81, 0x02,				// Input (array)
-
-	0x95, 64,				// report count RX
-	0x09, 0x02,				// usage
-	0x91, 0x02,				// Output (array)
-	0xC0					// end collection
-#endif
-};
-
-extern const HIDDescriptor _hidInterface =
-{
-	D_INTERFACE(HID_INTERFACE,1,3,0,0),
-	D_HIDREPORT(sizeof(_hidReportDescriptor)),
-	D_ENDPOINT(USB_ENDPOINT_IN(HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
-};
-_Pragma("pack()")
-
-//================================================================================
-//================================================================================
-//	Driver
-
-uint8_t _hid_protocol = 1;
-uint8_t _hid_idle = 1;
-
-const void* HID_GetInterface(void)
-{
-	return  &_hidInterface;
-}
-
-uint32_t HID_GetInterfaceLength(void)
-{
-    return sizeof( _hidInterface );
-}
-
-uint32_t HID_SizeReportDescriptor(void)
-{
-	return sizeof(_hidReportDescriptor);
-}
-
-uint32_t HID_GetDescriptor(void)
-{
-	return USBDevice.sendControl(_hidReportDescriptor, sizeof(_hidReportDescriptor));
-}
-
-void HID_SendReport(uint8_t id, const void* data, uint32_t len)
-{
-	uint8_t p[8];
-	const uint8_t *d = reinterpret_cast<const uint8_t *>(data);
-
-	p[0] = id;
-	for (uint32_t i=0; i<len; i++)
-	{
-		p[i+1] = d[i];
-	}
-	USBDevice.send(HID_ENDPOINT_INT, p, len+1);
-}
-
-bool HID_Setup(Setup& setup)
-{
-	uint8_t r = setup.bRequest;
-	uint8_t requestType = setup.bmRequestType;
-
-	if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
-	{
-		if (HID_GET_REPORT == r)
-		{
-			//HID_GetReport();
-			return true;
-		}
-		if (HID_GET_PROTOCOL == r)
-		{
-			//Send8(_hid_protocol);	// TODO
-			return true;
-		}
-		if (HID_GET_IDLE == r)
-		{
-			USBDevice.armSend(0, &_hid_idle, 1);
-			return true;
-		}
-	}
-
-	if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
-	{
-		if (HID_SET_PROTOCOL == r)
-		{
-			_hid_protocol = setup.wValueL;
-			return true;
-		}
-
-		if (HID_SET_IDLE == r)
-		{
-			_hid_idle = setup.wValueH;
-			return false;
-		}
-	}
-	return false;
-}
-
-//================================================================================
-//================================================================================
-//	Mouse
-
-Mouse_::Mouse_(void) : _buttons(0)
-{
-}
-
-void Mouse_::begin(void)
-{
-}
-
-void Mouse_::end(void)
-{
-}
-
-void Mouse_::click(uint8_t b)
-{
-	_buttons = b;
-	move(0,0,0);
-	_buttons = 0;
-	move(0,0,0);
-}
-
-void Mouse_::move(signed char x, signed char y, signed char wheel)
-{
-	uint8_t m[4];
-	m[0] = _buttons;
-	m[1] = x;
-	m[2] = y;
-	m[3] = wheel;
-	HID_SendReport(1,m,4);
-}
-
-void Mouse_::buttons(uint8_t b)
-{
-	if (b != _buttons)
-	{
-		_buttons = b;
-		move(0,0,0);
-	}
-}
-
-void Mouse_::press(uint8_t b)
-{
-	buttons(_buttons | b);
-}
-
-void Mouse_::release(uint8_t b)
-{
-	buttons(_buttons & ~b);
-}
-
-bool Mouse_::isPressed(uint8_t b)
-{
-	if ((b & _buttons) > 0)
-		return true;
-	return false;
-}
-
-//================================================================================
-//================================================================================
-//	Keyboard
-
-Keyboard_::Keyboard_(void)
-{
-}
-
-void Keyboard_::begin(void)
-{
-}
-
-void Keyboard_::end(void)
-{
-}
-
-void Keyboard_::sendReport(KeyReport* keys)
-{
-	HID_SendReport(2,keys,sizeof(KeyReport));
-}
-
-#define SHIFT 0x80
-extern const uint8_t _asciimap[128] =
-{
-	0x00,             // NUL
-	0x00,             // SOH
-	0x00,             // STX
-	0x00,             // ETX
-	0x00,             // EOT
-	0x00,             // ENQ
-	0x00,             // ACK
-	0x00,             // BEL
-	0x2a,             // BS	Backspace
-	0x2b,             // TAB	Tab
-	0x28,             // LF	Enter
-	0x00,             // VT
-	0x00,             // FF
-	0x00,             // CR
-	0x00,             // SO
-	0x00,             // SI
-	0x00,             // DEL
-	0x00,             // DC1
-	0x00,             // DC2
-	0x00,             // DC3
-	0x00,             // DC4
-	0x00,             // NAK
-	0x00,             // SYN
-	0x00,             // ETB
-	0x00,             // CAN
-	0x00,             // EM
-	0x00,             // SUB
-	0x00,             // ESC
-	0x00,             // FS
-	0x00,             // GS
-	0x00,             // RS
-	0x00,             // US
-
-	0x2c,		   //  ' '
-	0x1e|SHIFT,	   // !
-	0x34|SHIFT,	   // "
-	0x20|SHIFT,    // #
-	0x21|SHIFT,    // $
-	0x22|SHIFT,    // %
-	0x24|SHIFT,    // &
-	0x34,          // '
-	0x26|SHIFT,    // (
-	0x27|SHIFT,    // )
-	0x25|SHIFT,    // *
-	0x2e|SHIFT,    // +
-	0x36,          // ,
-	0x2d,          // -
-	0x37,          // .
-	0x38,          // /
-	0x27,          // 0
-	0x1e,          // 1
-	0x1f,          // 2
-	0x20,          // 3
-	0x21,          // 4
-	0x22,          // 5
-	0x23,          // 6
-	0x24,          // 7
-	0x25,          // 8
-	0x26,          // 9
-	0x33|SHIFT,      // :
-	0x33,          // ;
-	0x36|SHIFT,      // <
-	0x2e,          // =
-	0x37|SHIFT,      // >
-	0x38|SHIFT,      // ?
-	0x1f|SHIFT,      // @
-	0x04|SHIFT,      // A
-	0x05|SHIFT,      // B
-	0x06|SHIFT,      // C
-	0x07|SHIFT,      // D
-	0x08|SHIFT,      // E
-	0x09|SHIFT,      // F
-	0x0a|SHIFT,      // G
-	0x0b|SHIFT,      // H
-	0x0c|SHIFT,      // I
-	0x0d|SHIFT,      // J
-	0x0e|SHIFT,      // K
-	0x0f|SHIFT,      // L
-	0x10|SHIFT,      // M
-	0x11|SHIFT,      // N
-	0x12|SHIFT,      // O
-	0x13|SHIFT,      // P
-	0x14|SHIFT,      // Q
-	0x15|SHIFT,      // R
-	0x16|SHIFT,      // S
-	0x17|SHIFT,      // T
-	0x18|SHIFT,      // U
-	0x19|SHIFT,      // V
-	0x1a|SHIFT,      // W
-	0x1b|SHIFT,      // X
-	0x1c|SHIFT,      // Y
-	0x1d|SHIFT,      // Z
-	0x2f,          // [
-	0x31,          // bslash
-	0x30,          // ]
-	0x23|SHIFT,    // ^
-	0x2d|SHIFT,    // _
-	0x35,          // `
-	0x04,          // a
-	0x05,          // b
-	0x06,          // c
-	0x07,          // d
-	0x08,          // e
-	0x09,          // f
-	0x0a,          // g
-	0x0b,          // h
-	0x0c,          // i
-	0x0d,          // j
-	0x0e,          // k
-	0x0f,          // l
-	0x10,          // m
-	0x11,          // n
-	0x12,          // o
-	0x13,          // p
-	0x14,          // q
-	0x15,          // r
-	0x16,          // s
-	0x17,          // t
-	0x18,          // u
-	0x19,          // v
-	0x1a,          // w
-	0x1b,          // x
-	0x1c,          // y
-	0x1d,          // z
-	0x2f|SHIFT,    //
-	0x31|SHIFT,    // |
-	0x30|SHIFT,    // }
-	0x35|SHIFT,    // ~
-	0				// DEL
-};
-
-// press() adds the specified key (printing, non-printing, or modifier)
-// to the persistent key report and sends the report.  Because of the way
-// USB HID works, the host acts like the key remains pressed until we
-// call release(), releaseAll(), or otherwise clear the report and resend.
-size_t Keyboard_::press(uint8_t k)
-{
-	uint8_t i;
-	if (k >= 136) {			// it's a non-printing key (not a modifier)
-		k = k - 136;
-	} else if (k >= 128) {	// it's a modifier key
-		_keyReport.modifiers |= (1<<(k-128));
-		k = 0;
-	} else {				// it's a printing key
-		k = _asciimap[k];
-		if (!k) {
-			setWriteError();
-			return 0;
-		}
-		if (k & 0x80) {						// it's a capital letter or other character reached with shift
-			_keyReport.modifiers |= 0x02;	// the left shift modifier
-			k &= 0x7F;
-		}
-	}
-
-	// Add k to the key report only if it's not already present
-	// and if there is an empty slot.
-	uint8_t keyAlreadyPresent = 0;
-	for (i=0; i<6; i++) {
-		if (_keyReport.keys[i] == k) {
-			keyAlreadyPresent = 1;
-		}
-	}
-	
-	if (keyAlreadyPresent) {
-		for (i=0; i<6; i++) {
-			if (_keyReport.keys[i] == 0x00) {
-				_keyReport.keys[i] = k;
-				break;
-			}
-		}
-		if (i == 6) {
-			setWriteError();
-			return 0;
-		}
-	}
-	sendReport(&_keyReport);
-	return 1;
-}
-
-// release() takes the specified key out of the persistent key report and
-// sends the report.  This tells the OS the key is no longer pressed and that
-// it shouldn't be repeated any more.
-size_t Keyboard_::release(uint8_t k)
-{
-	uint8_t i;
-	if (k >= 136) {			// it's a non-printing key (not a modifier)
-		k = k - 136;
-	} else if (k >= 128) {	// it's a modifier key
-		_keyReport.modifiers &= ~(1<<(k-128));
-		k = 0;
-	} else {				// it's a printing key
-		k = _asciimap[k];
-		if (!k) {
-			return 0;
-		}
-		if (k & 0x80) {							// it's a capital letter or other character reached with shift
-			_keyReport.modifiers &= ~(0x02);	// the left shift modifier
-			k &= 0x7F;
-		}
-	}
-
-	// Test the key report to see if k is present.  Clear it if it exists.
-	// Check all positions in case the key is present more than once (which it shouldn't be)
-	for (i=0; i<6; i++) {
-		if (0 != k && _keyReport.keys[i] == k) {
-			_keyReport.keys[i] = 0x00;
-		}
-	}
-
-	sendReport(&_keyReport);
-	return 1;
-}
-
-void Keyboard_::releaseAll(void)
-{
-	_keyReport.keys[0] = 0;
-	_keyReport.keys[1] = 0;
-	_keyReport.keys[2] = 0;
-	_keyReport.keys[3] = 0;
-	_keyReport.keys[4] = 0;
-	_keyReport.keys[5] = 0;
-	_keyReport.modifiers = 0;
-	sendReport(&_keyReport);
-}
-
-size_t Keyboard_::write(uint8_t c)
-{
-	uint8_t p = 0;
-
-	p = press(c);	// Keydown
-	release(c);		// Keyup
-
-	return (p);		// Just return the result of press() since release() almost always returns 1
-}
-
-#endif
diff --git a/cores/arduino/USB/PluggableUSB.cpp b/cores/arduino/USB/PluggableUSB.cpp
new file mode 100644
index 000000000..84d781d81
--- /dev/null
+++ b/cores/arduino/USB/PluggableUSB.cpp
@@ -0,0 +1,98 @@
+/*
+  PluggableUSB.cpp
+  Copyright (c) 2015 Arduino LLC
+
+  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
+*/
+
+#include "USBAPI.h"
+#include "USBDesc.h"
+#include "PluggableUSB.h"
+
+#ifdef PLUGGABLE_USB_ENABLED
+
+#define MAX_MODULES	6
+
+static uint8_t lastIf = CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT;
+static uint8_t lastEp = CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT;
+
+extern uint32_t EndPoints[];
+
+//PUSBCallbacks cbs[MAX_MODULES];
+static uint8_t modules_count = 0;
+
+static PUSBListNode* rootNode = NULL;
+
+int PUSB_GetInterface(uint8_t* interfaceNum)
+{
+	int ret = 0;
+	PUSBListNode* node = rootNode;
+	for (uint8_t i=0; i<modules_count; i++) {
+		ret = node->cb->getInterface(interfaceNum);
+		node = node->next;
+	}
+	return ret;
+}
+
+int PUSB_GetDescriptor(int8_t t)
+{
+	int ret = 0;
+	PUSBListNode* node = rootNode;
+	for (uint8_t i=0; i<modules_count && ret == 0; i++) {
+		ret = node->cb->getDescriptor(t);
+		node = node->next;
+	}
+	return ret;
+}
+
+bool PUSB_Setup(USBSetup& setup, uint8_t j)
+{
+	bool ret = false;
+	PUSBListNode* node = rootNode;
+	for (uint8_t i=0; i<modules_count && ret == false; i++) {
+		ret = node->cb->setup(setup, j);
+		node = node->next;
+	}
+	return ret;
+}
+
+int8_t PUSB_AddFunction(PUSBListNode *node, uint8_t* interface)
+{
+	if (modules_count >= MAX_MODULES) {
+		return 0;
+	}
+
+	if (modules_count == 0) {
+		rootNode = node;
+	} else {
+		PUSBListNode *current = rootNode;
+		while(current->next != NULL) {
+			current = current->next;
+		}
+		current->next = node;
+	}
+
+	*interface = lastIf;
+	lastIf += node->cb->numInterfaces;
+	for ( uint8_t i = 0; i< node->cb->numEndpoints; i++) {
+		EndPoints[lastEp] = node->cb->endpointType[i];
+		lastEp++;
+	}
+	modules_count++;
+	return lastEp - node->cb->numEndpoints;
+	// restart USB layer???
+}
+
+#endif
\ No newline at end of file
diff --git a/cores/arduino/USB/PluggableUSB.h b/cores/arduino/USB/PluggableUSB.h
new file mode 100644
index 000000000..205900550
--- /dev/null
+++ b/cores/arduino/USB/PluggableUSB.h
@@ -0,0 +1,63 @@
+/*
+  PluggableUSB.h
+  Copyright (c) 2015 Arduino LLC
+
+  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 PUSB_h
+#define PUSB_h
+
+#include "USBAPI.h"
+#include <cstddef>
+
+#if defined(USBCON)
+
+typedef struct __attribute__((packed))
+{
+  bool (*setup)(USBSetup& setup, uint8_t i);
+  int (*getInterface)(uint8_t* interfaceNum);
+  int (*getDescriptor)(int8_t t);
+  int8_t numEndpoints;
+  int8_t numInterfaces;
+  uint8_t *endpointType;
+} PUSBCallbacks;
+
+typedef struct
+{
+  uint8_t interface;
+  uint8_t firstEndpoint;
+} PUSBReturn;
+
+class PUSBListNode {
+public:
+  PUSBListNode *next = NULL;
+  PUSBCallbacks *cb;
+  PUSBListNode(PUSBCallbacks *ncb) {cb = ncb;}
+};
+
+int8_t PUSB_AddFunction(PUSBListNode *node, uint8_t *interface);
+
+int PUSB_GetInterface(uint8_t* interfaceNum);
+
+int PUSB_GetDescriptor(int8_t t);
+
+bool PUSB_Setup(USBSetup& setup, uint8_t i);
+
+void PUSB_Begin();
+
+#endif
+
+#endif
diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h
index bbb0a3e03..23d0ae242 100644
--- a/cores/arduino/USB/USBAPI.h
+++ b/cores/arduino/USB/USBAPI.h
@@ -50,7 +50,7 @@ typedef struct {
 	uint8_t wValueH;
 	uint16_t wIndex;
 	uint16_t wLength;
-} Setup;
+} USBSetup;
 
 class USBDeviceClass {
 public:
@@ -66,17 +66,21 @@ class USBDeviceClass {
 	bool connected();
 
 	// Setup API
-	bool handleClassInterfaceSetup(Setup &setup);
-	bool handleStandardSetup(Setup &setup);
-	bool sendDescriptor(Setup &setup);
+	bool handleClassInterfaceSetup(USBSetup &setup);
+	bool handleStandardSetup(USBSetup &setup);
+	bool sendDescriptor(USBSetup &setup);
 
 	// Control EndPoint API
 	uint32_t sendControl(const void *data, uint32_t len);
+	uint32_t sendControl(int /* ep */, const void *data, uint32_t len) { return sendControl(data, len); }
 	uint32_t recvControl(void *data, uint32_t len);
-	bool sendConfiguration(uint32_t maxlen);
+	uint32_t sendConfiguration(uint32_t maxlen);
 	bool sendStringDescriptor(const uint8_t *string, uint8_t maxlen);
+	void initControl(int end);
+	uint8_t SendInterfaces(uint32_t* total);
 
 	// Generic EndPoint API
+	void initEndpoints(void);
 	void initEP(uint32_t ep, uint32_t type);
 	void handleEndpoint(uint8_t ep);
 
@@ -96,6 +100,8 @@ class USBDeviceClass {
 	void ISRHandler();
 
 private:
+	void packMessages(bool val);
+
 	bool initialized;
 };
 
@@ -127,126 +133,24 @@ class Serial_ : public Stream
 };
 extern Serial_ SerialUSB;
 
-//================================================================================
-//================================================================================
-//	Mouse
-
-#define MOUSE_LEFT 1
-#define MOUSE_RIGHT 2
-#define MOUSE_MIDDLE 4
-#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
-
-class Mouse_
-{
-private:
-	uint8_t _buttons;
-	void buttons(uint8_t b);
-public:
-	Mouse_(void);
-	void begin(void);
-	void end(void);
-	void click(uint8_t b = MOUSE_LEFT);
-	void move(signed char x, signed char y, signed char wheel = 0);
-	void press(uint8_t b = MOUSE_LEFT);		// press LEFT by default
-	void release(uint8_t b = MOUSE_LEFT);	// release LEFT by default
-	bool isPressed(uint8_t b = MOUSE_ALL);	// check all buttons by default
-};
-extern Mouse_ Mouse;
-
-//================================================================================
-//================================================================================
-//	Keyboard
-
-#define KEY_LEFT_CTRL		0x80
-#define KEY_LEFT_SHIFT		0x81
-#define KEY_LEFT_ALT		0x82
-#define KEY_LEFT_GUI		0x83
-#define KEY_RIGHT_CTRL		0x84
-#define KEY_RIGHT_SHIFT		0x85
-#define KEY_RIGHT_ALT		0x86
-#define KEY_RIGHT_GUI		0x87
-
-#define KEY_UP_ARROW		0xDA
-#define KEY_DOWN_ARROW		0xD9
-#define KEY_LEFT_ARROW		0xD8
-#define KEY_RIGHT_ARROW		0xD7
-#define KEY_BACKSPACE		0xB2
-#define KEY_TAB				0xB3
-#define KEY_RETURN			0xB0
-#define KEY_ESC				0xB1
-#define KEY_INSERT			0xD1
-#define KEY_DELETE			0xD4
-#define KEY_PAGE_UP			0xD3
-#define KEY_PAGE_DOWN		0xD6
-#define KEY_HOME			0xD2
-#define KEY_END				0xD5
-#define KEY_CAPS_LOCK		0xC1
-#define KEY_F1				0xC2
-#define KEY_F2				0xC3
-#define KEY_F3				0xC4
-#define KEY_F4				0xC5
-#define KEY_F5				0xC6
-#define KEY_F6				0xC7
-#define KEY_F7				0xC8
-#define KEY_F8				0xC9
-#define KEY_F9				0xCA
-#define KEY_F10				0xCB
-#define KEY_F11				0xCC
-#define KEY_F12				0xCD
-
-//	Low level key report: up to 6 keys and shift, ctrl etc at once
-typedef struct
-{
-	uint8_t modifiers;
-	uint8_t reserved;
-	uint8_t keys[6];
-} KeyReport;
-
-class Keyboard_ : public Print
-{
-private:
-	KeyReport _keyReport;
-	void sendReport(KeyReport* keys);
-public:
-	Keyboard_(void);
-	void begin(void);
-	void end(void);
-	virtual size_t write(uint8_t k);
-	virtual size_t press(uint8_t k);
-	virtual size_t release(uint8_t k);
-	virtual void releaseAll(void);
-};
-extern Keyboard_ Keyboard;
-
-//================================================================================
-//================================================================================
-//	HID 'Driver'
-
-const void* HID_GetInterface(void);
-uint32_t HID_GetInterfaceLength(void);
-uint32_t HID_SizeReportDescriptor(void);
-
-uint32_t		HID_GetDescriptor(void);
-bool	HID_Setup(Setup& setup);
-void	HID_SendReport(uint8_t id, const void* data, uint32_t len);
-
 //================================================================================
 //================================================================================
 //	MSC 'Driver'
 
 uint32_t		MSC_GetInterface(uint8_t* interfaceNum);
 uint32_t		MSC_GetDescriptor(uint32_t i);
-bool	MSC_Setup(Setup& setup);
+bool	MSC_Setup(USBSetup& setup);
 bool	MSC_Data(uint8_t rx,uint8_t tx);
 
 //================================================================================
 //================================================================================
 //	CDC 'Driver'
 
-const void* CDC_GetInterface(/*uint8_t* interfaceNum*/);
-uint32_t CDC_GetInterfaceLength(void);
+int CDC_GetInterface(uint8_t* interfaceNum);
+const void* _CDC_GetInterface(void);
+uint32_t _CDC_GetInterfaceLength(void);
 uint32_t		CDC_GetOtherInterface(uint8_t* interfaceNum);
 uint32_t		CDC_GetDescriptor(uint32_t i);
-bool	CDC_Setup(Setup& setup);
+bool	CDC_Setup(USBSetup& setup);
 
 #endif  // __cplusplus
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index d32dd4cb2..26f3ced61 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -19,10 +19,12 @@
 #include <Arduino.h>
 
 #include "SAMD21_USBDevice.h"
+#include "PluggableUSB.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <limits.h>
 
 USBDevice_SAMD21G18x usbd;
 
@@ -64,13 +66,8 @@ const uint8_t STRING_MANUFACTURER[] = USB_MANUFACTURER;
 
 
 //	DEVICE DESCRIPTOR
-#if (defined CDC_ENABLED) && defined(HID_ENABLED)
-const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
-#elif defined(CDC_ENABLED)  // CDC only
-const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x02, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
-#else // HID only
+const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
 const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
-#endif
 
 //==================================================================
 
@@ -107,79 +104,72 @@ bool USBDeviceClass::sendStringDescriptor(const uint8_t *string, uint8_t maxlen)
 	return USBDevice.sendControl((uint8_t*)buff, l*2);
 }
 
-// Construct a dynamic configuration descriptor
-// This really needs dynamic endpoint allocation etc
-bool USBDeviceClass::sendConfiguration(uint32_t maxlen)
+bool _dry_run = false;
+bool _pack_message = false;
+uint16_t _pack_size = 0;
+uint8_t _pack_buffer[256];
+
+void USBDeviceClass::packMessages(bool val)
 {
-	uint8_t cache_buffer[128];
-	uint8_t i;
+	if (val) {
+		_pack_message = true;
+		_pack_size = 0;
+	} else {
+		_pack_message = false;
+		sendControl(_pack_buffer, _pack_size);
+	}
+}
 
-	const uint8_t* interfaces;
-	uint32_t interfaces_length = 0;
-	uint8_t num_interfaces[1];
+uint8_t USBDeviceClass::SendInterfaces(uint32_t* total)
+{
+	uint8_t interfaces = 0;
 
-	num_interfaces[0] = 0;
+#if defined(CDC_ENABLED)
+	total[0] += CDC_GetInterface(&interfaces);
+#endif
 
-#if defined(CDC_ENABLED) && defined(HID_ENABLED)
-	num_interfaces[0] += 3;
-	interfaces = (const uint8_t*) CDC_GetInterface();
-	interfaces_length = CDC_GetInterfaceLength() + HID_GetInterfaceLength();
-	if (maxlen > CDC_GetInterfaceLength() + HID_GetInterfaceLength() + sizeof(ConfigDescriptor))
-	{
-		maxlen = CDC_GetInterfaceLength() + HID_GetInterfaceLength() + sizeof(ConfigDescriptor);
-	}
-#elif defined(CDC_ENABLED)
-	num_interfaces[0] += 2;
-	interfaces = (const uint8_t*) CDC_GetInterface();
-	interfaces_length += CDC_GetInterfaceLength();
-	if (maxlen > CDC_GetInterfaceLength() + sizeof(ConfigDescriptor))
-	{
-		maxlen = CDC_GetInterfaceLength() + sizeof(ConfigDescriptor);
-	}
-#elif defined(HID_ENABLED)
-	num_interfaces[0] += 1;
-	interfaces = (const uint8_t*) HID_GetInterface();
-	interfaces_length += HID_GetInterfaceLength();
-	if (maxlen > HID_GetInterfaceLength() + sizeof(ConfigDescriptor))
-	{
-		maxlen = HID_GetInterfaceLength() + sizeof(ConfigDescriptor);
-	}
+#ifdef PLUGGABLE_USB_ENABLED
+	total[0] += PUSB_GetInterface(&interfaces);
 #endif
 
-_Pragma("pack(1)")
-	ConfigDescriptor config = D_CONFIG((uint16_t)(interfaces_length + sizeof(ConfigDescriptor)), num_interfaces[0]);
-_Pragma("pack()")
+	return interfaces;
+}
 
-	memcpy(cache_buffer, &config, sizeof(ConfigDescriptor));
+// Construct a dynamic configuration descriptor
+// This really needs dynamic endpoint allocation etc
+uint32_t USBDeviceClass::sendConfiguration(uint32_t maxlen)
+{
+	uint32_t total = 0;
+	// Count and measure interfaces
+	_dry_run = true;
+	uint8_t interfaces = SendInterfaces(&total);
 
-#if defined(CDC_ENABLED) && defined(HID_ENABLED)
-	for (i=0; i<CDC_GetInterfaceLength(); i++) {
-		cache_buffer[i + sizeof(ConfigDescriptor)] = interfaces[i];
-	}
-	interfaces = (const uint8_t*) HID_GetInterface();
-	for (i=0; i<HID_GetInterfaceLength(); i++) {
-		cache_buffer[i + sizeof(ConfigDescriptor) + CDC_GetInterfaceLength()] = interfaces[i];
-	}
-#elif defined(HID_ENABLED)
-	for (i=0; i<interfaces_length; i++) {
-		cache_buffer[i + sizeof(ConfigDescriptor)] = interfaces[i];
-	}
-#elif defined(CDC_ENABLED)
-	for (i=0; i<interfaces_length; i++) {
-		cache_buffer[i + sizeof(ConfigDescriptor)] = interfaces[i];
-	}
-#endif
+	_Pragma("pack(1)")
+	ConfigDescriptor config = D_CONFIG((uint16_t)(total + sizeof(ConfigDescriptor)), interfaces);
+	_Pragma("pack()")
 
-	if (maxlen > sizeof(cache_buffer)) {
-		 maxlen = sizeof(cache_buffer);
+	//	Now send them
+	_dry_run = false;
+
+	if (maxlen == sizeof(ConfigDescriptor)) {
+		sendControl(&config, sizeof(ConfigDescriptor));
+		return true;
 	}
-	return sendControl(cache_buffer, maxlen);
+
+	packMessages(true);
+	sendControl(&config, sizeof(ConfigDescriptor));
+	SendInterfaces(&total);
+	packMessages(false);
+
+	return true;
 }
 
-bool USBDeviceClass::sendDescriptor(Setup &setup)
+bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 {
 	uint8_t t = setup.wValueH;
 	uint8_t desc_length = 0;
+	bool _cdcComposite;
+	int ret;
 	const uint8_t *desc_addr = 0;
 
 	if (t == USB_CONFIGURATION_DESCRIPTOR_TYPE)
@@ -187,22 +177,20 @@ bool USBDeviceClass::sendDescriptor(Setup &setup)
 		return USBDevice.sendConfiguration(setup.wLength);
 	}
 
-#if defined(HID_ENABLED)
-	if (t == HID_REPORT_DESCRIPTOR_TYPE)
-	{
-		return HID_GetDescriptor();
-	}
-
-	if (t == HID_HID_DESCRIPTOR_TYPE)
-	{
-		uint8_t tab[9] = D_HIDREPORT((uint8_t)HID_SizeReportDescriptor());
-		return USBDevice.sendControl(tab, sizeof(tab));
+#ifdef PLUGGABLE_USB_ENABLED
+	ret = PUSB_GetDescriptor(t);
+	if (ret != 0) {
+		return (ret > 0 ? true : false);
 	}
 #endif
 
 	if (t == USB_DEVICE_DESCRIPTOR_TYPE)
 	{
-		desc_addr = (const uint8_t*)&USB_DeviceDescriptor;
+		if (setup.wLength == 8)
+			_cdcComposite = 1;
+
+		desc_addr = _cdcComposite ?  (const uint8_t*)&USB_DeviceDescriptorB : (const uint8_t*)&USB_DeviceDescriptor;
+
 		if (*desc_addr > setup.wLength) {
 			desc_length = setup.wLength;
 		}
@@ -269,7 +257,7 @@ void USBDeviceClass::handleEndpoint(uint8_t ep)
 	}
 #endif
 
-#if defined(HID_ENABLED)
+#if defined(PLUGGABLE_USB_ENABLED)
 	// Empty
 #endif
 }
@@ -355,7 +343,7 @@ bool USBDeviceClass::configured()
 	return _usbConfiguration != 0;
 }
 
-bool USBDeviceClass::handleClassInterfaceSetup(Setup& setup)
+bool USBDeviceClass::handleClassInterfaceSetup(USBSetup& setup)
 {
 	uint8_t i = setup.wIndex;
 
@@ -369,19 +357,44 @@ bool USBDeviceClass::handleClassInterfaceSetup(Setup& setup)
 	}
 	#endif
 
-	#if defined(HID_ENABLED)
-	if (HID_INTERFACE == i)
-	{
-		if (HID_Setup(setup) == false) {
-			sendZlp(0);
-		}
-		return true;
+	#if defined(PLUGGABLE_USB_ENABLED)
+	bool ret = PUSB_Setup(setup, i);
+	if ( ret == false) {
+		sendZlp(0);
 	}
+	return ret;
 	#endif
 
 	return false;
 }
 
+uint32_t EndPoints[] =
+{
+	USB_ENDPOINT_TYPE_CONTROL,
+
+#ifdef CDC_ENABLED
+	USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0),           // CDC_ENDPOINT_ACM
+	USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_OUT(0),               // CDC_ENDPOINT_OUT
+	USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0),                // CDC_ENDPOINT_IN
+#endif
+
+#ifdef PLUGGABLE_USB_ENABLED
+	//allocate 6 endpoints and remove const so they can be changed by the user
+	0,
+	0,
+	0,
+	0,
+	0,
+	0,
+#endif
+};
+
+void USBDeviceClass::initEndpoints() {
+	for (uint8_t i = 1; i < sizeof(EndPoints) && EndPoints[i] != 0; i++) {
+		initEP(i, EndPoints[i]);
+	}
+}
+
 void USBDeviceClass::initEP(uint32_t ep, uint32_t config)
 {
 	if (config == (USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0)))
@@ -648,6 +661,15 @@ uint32_t USBDeviceClass::sendControl(const void* _data, uint32_t len)
 	uint32_t sent = 0;
 	uint32_t pos = 0;
 
+	if (_dry_run == true)
+		return length;
+
+	if (_pack_message == true) {
+		memcpy(&_pack_buffer[_pack_size], data, len);
+		_pack_size += len;
+		return length;
+	}
+
  	while (len > 0)
  	{
 		sent = armSend(EP0, data + pos, len);
@@ -664,7 +686,7 @@ void USBDeviceClass::sendZlp(uint32_t ep)
 	usbd.epBank1SetByteCount(ep, 0);
 }
 
-bool USBDeviceClass::handleStandardSetup(Setup &setup)
+bool USBDeviceClass::handleStandardSetup(USBSetup &setup)
 {
 	switch (setup.bRequest) {
 	case GET_STATUS:
@@ -741,15 +763,8 @@ bool USBDeviceClass::handleStandardSetup(Setup &setup)
 
 	case SET_CONFIGURATION:
 		if (REQUEST_DEVICE == (setup.bmRequestType & REQUEST_RECIPIENT)) {
-			#if defined(HID_ENABLED)
-			initEP(HID_ENDPOINT_INT, USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
-			#endif
 
-			#if defined(CDC_ENABLED)
-			initEP(CDC_ENDPOINT_ACM, USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0));
-			initEP(CDC_ENDPOINT_OUT, USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_OUT(0));
-			initEP(CDC_ENDPOINT_IN,  USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0));
-			#endif
+			initEndpoints();
 			_usbConfiguration = setup.wValueL;
 
 			#if defined(CDC_ENABLED)
@@ -780,6 +795,10 @@ bool USBDeviceClass::handleStandardSetup(Setup &setup)
 
 void USBDeviceClass::ISRHandler()
 {
+
+	if (_pack_message == true) {
+		return;
+	}
 	// End-Of-Reset
 	if (usbd.isEndOfResetInterrupt())
 	{
@@ -805,7 +824,7 @@ void USBDeviceClass::ISRHandler()
 	{
 		usbd.epBank0AckSetupReceived(0);
 
-		Setup *setup = reinterpret_cast<Setup *>(udd_ep_out_cache_buffer[0]);
+		USBSetup *setup = reinterpret_cast<USBSetup *>(udd_ep_out_cache_buffer[0]);
 
 		/* Clear the Bank 0 ready flag on Control OUT */
 		// The RAM Buffer is empty: we can receive data
diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index d584fdfc9..0d2dc7854 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -70,13 +70,6 @@
 #define MSC_RESET					0xFF
 #define MSC_GET_MAX_LUN				0xFE
 
-#define HID_GET_REPORT				0x01
-#define HID_GET_IDLE				0x02
-#define HID_GET_PROTOCOL			0x03
-#define HID_SET_REPORT				0x09
-#define HID_SET_IDLE				0x0A
-#define HID_SET_PROTOCOL			0x0B
-
 //	Descriptors
 
 // #define USB_DEVICE_DESC_SIZE			18
@@ -120,10 +113,6 @@
 #define MSC_SUBCLASS_SCSI						0x06
 #define MSC_PROTOCOL_BULK_ONLY					0x50
 
-#define HID_HID_DESCRIPTOR_TYPE					0x21
-#define HID_REPORT_DESCRIPTOR_TYPE				0x22
-#define HID_PHYSICAL_DESCRIPTOR_TYPE			0x23
-
 _Pragma("pack(1)")
 
 //	Device
@@ -234,10 +223,8 @@ typedef struct
 
 typedef struct
 {
-#if (defined CDC_ENABLED) && defined(HID_ENABLED)
 	//	IAD
 	IADDescriptor				iad;	// Only needed on compound device
-#endif
 	//	Control
 	InterfaceDescriptor			cif;
 	CDCCSInterfaceDescriptor	header;
@@ -259,26 +246,6 @@ typedef struct
 	EndpointDescriptor			out;
 } MSCDescriptor;
 
-typedef struct
-{
-	uint8_t len;			// 9
-	uint8_t dtype;			// 0x21
-	uint8_t addr;
-	uint8_t	versionL;		// 0x101
-	uint8_t	versionH;		// 0x101
-	uint8_t	country;
-	uint8_t	desctype;		// 0x22 report
-	uint8_t	descLenL;
-	uint8_t	descLenH;
-} HIDDescDescriptor;
-
-typedef struct
-{
-	InterfaceDescriptor		hid;
-	HIDDescDescriptor		desc;
-	EndpointDescriptor		in;
-} HIDDescriptor;
-
 _Pragma("pack()")
 
 #define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
@@ -308,10 +275,6 @@ _Pragma("pack()")
 	{ 8, 11, _firstInterface, _count, _class, _subClass, _protocol, 0 }
 /* iadclasscode_r10.pdf, Table 9–Z. Standard Interface Association Descriptor
  * bLength, bDescriptorType, bFirstInterface, bInterfaceCount, bFunctionClass, bFunctionSubClass, bFunctionProtocol, iFunction */
-#define D_HIDREPORT(_descriptorLength) \
-	{ 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
-/* HID1_11.pdf  E.8 HID Descriptor (Mouse)
- * bLength, bDescriptorType, bcdHID, bCountryCode, bNumDescriptors, bDescriptorType, wItemLength */
 
 // Functional Descriptor General Format
 #define D_CDCCS(_subtype,_d0,_d1)	{ 5, 0x24, _subtype, _d0, _d1 }
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index b12d707b1..033011ffb 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -20,6 +20,8 @@
 #define __USBDESC_H__
 
 // CDC or HID can be enabled together.
+#define PLUGGABLE_USB_ENABLED
+
 // These are now controlled by the boards.txt menu system
 #if defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART)
   #define CDC_ENABLED
@@ -34,16 +36,23 @@
   #error "USBDesc.h: CDC_ENABLED and HID_ENABLED are now controlled by the boards.txt menu system"
 #endif
 
+#ifdef CDC_ENABLED
+#define CDC_INTERFACE_COUNT 2
+#define CDC_ENPOINT_COUNT 3
+#endif
+
 // CDC
 #define CDC_ACM_INTERFACE	0	// CDC ACM
 #define CDC_DATA_INTERFACE	1	// CDC Data
+#define CDC_FIRST_ENDPOINT  1
 #define CDC_ENDPOINT_ACM	1
 #define CDC_ENDPOINT_OUT	2
 #define CDC_ENDPOINT_IN		3
 
-// HID
-#define HID_INTERFACE		2   // HID
-#define HID_ENDPOINT_INT	4
+#ifdef CDC_ENABLED
+#define CDC_RX CDC_ENDPOINT_OUT
+#define CDC_TX CDC_ENDPOINT_IN
+#endif
 
 // Defined string description
 #define IMANUFACTURER	1
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
new file mode 100644
index 000000000..2679faa54
--- /dev/null
+++ b/libraries/HID/HID.cpp
@@ -0,0 +1,176 @@
+/* Copyright (c) 2015, Arduino LLC
+**
+** Original code (pre-library): Copyright (c) 2011, Peter Barrett
+**
+** Permission to use, copy, modify, and/or distribute this software for  
+** any purpose with or without fee is hereby granted, provided that the  
+** above copyright notice and this permission notice appear in all copies.  
+** 
+** THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL  
+** WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED  
+** WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR  
+** BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES  
+** OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,  
+** WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,  
+** ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS  
+** SOFTWARE.  
+*/
+
+#include "USB/PluggableUSB.h"
+#include "HID.h"
+
+HID_ HID;
+
+static uint8_t HID_ENDPOINT_INT;
+
+//================================================================================
+//================================================================================
+
+//	HID report descriptor
+
+#define LSB(_x) ((_x) & 0xFF)
+#define MSB(_x) ((_x) >> 8)
+
+#define RAWHID_USAGE_PAGE	0xFFC0
+#define RAWHID_USAGE		0x0C00
+#define RAWHID_TX_SIZE 64
+#define RAWHID_RX_SIZE 64
+
+static uint8_t HID_INTERFACE;
+
+HIDDescriptor _hidInterface;
+
+static HIDDescriptorListNode* rootNode = NULL;
+static uint8_t sizeof_hidReportDescriptor = 0;
+static uint8_t modules_count = 0;
+//================================================================================
+//================================================================================
+//	Driver
+
+uint8_t _hid_protocol = 1;
+uint8_t _hid_idle = 1;
+
+int HID_GetInterface(uint8_t* interfaceNum)
+{
+	interfaceNum[0] += 1;	// uses 1
+	_hidInterface =
+	{
+		D_INTERFACE(HID_INTERFACE,1,3,0,0),
+		D_HIDREPORT(sizeof_hidReportDescriptor),
+		D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
+	};
+	return USBDevice.sendControl(&_hidInterface,sizeof(_hidInterface));
+}
+
+int HID_GetDescriptor(int8_t t)
+{
+	if (HID_REPORT_DESCRIPTOR_TYPE == t) {
+		HIDDescriptorListNode* current = rootNode;
+		int total = 0;
+		while(current != NULL) {
+			total += USBDevice.sendControl(current->cb->descriptor,current->cb->length);
+			current = current->next;
+		}
+		return total;
+	} else {
+		return 0;
+	}
+}
+
+void HID_::AppendDescriptor(HIDDescriptorListNode *node)
+{
+	if (modules_count == 0) {
+		rootNode = node;
+	} else {
+		HIDDescriptorListNode *current = rootNode;
+		while(current->next != NULL) {
+			current = current->next;
+		}
+		current->next = node;
+	}
+	modules_count++;
+	sizeof_hidReportDescriptor += node->cb->length;
+}
+
+void HID_::SendReport(uint8_t id, const void* data, int len)
+{
+	uint8_t p[8];
+	const uint8_t *d = reinterpret_cast<const uint8_t *>(data);
+
+	p[0] = id;
+	for (uint32_t i=0; i<len; i++)
+	{
+		p[i+1] = d[i];
+	}
+	USBDevice.send(HID_ENDPOINT_INT, p, len+1);
+}
+
+bool HID_Setup(USBSetup& setup, uint8_t i)
+{
+	if (HID_INTERFACE != i) {
+		return false;
+	} else {
+		uint8_t r = setup.bRequest;
+		uint8_t requestType = setup.bmRequestType;
+
+		if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
+		{
+			if (HID_GET_REPORT == r)
+			{
+				//HID_GetReport();
+				return true;
+			}
+			if (HID_GET_PROTOCOL == r)
+			{
+				//Send8(_hid_protocol);	// TODO
+				return true;
+			}
+			if (HID_GET_IDLE == r)
+			{
+				USBDevice.armSend(0, &_hid_idle, 1);
+				return true;
+			}
+		}
+
+		if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
+		{
+			if (HID_SET_PROTOCOL == r)
+			{
+				_hid_protocol = setup.wValueL;
+				return true;
+			}
+
+			if (HID_SET_IDLE == r)
+			{
+				_hid_idle = setup.wValueH;
+				return false;
+			}
+		}
+		return false;
+	}
+}
+
+HID_::HID_(void)
+{
+	static uint8_t endpointType[1];
+
+	endpointType[0] = USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0);
+
+	static PUSBCallbacks cb = {
+		.setup = &HID_Setup,
+		.getInterface = &HID_GetInterface,
+		.getDescriptor = &HID_GetDescriptor,
+		.numEndpoints = 1,
+		.numInterfaces = 1,
+		.endpointType = endpointType,
+	};
+
+	static PUSBListNode node(&cb);
+
+	HID_ENDPOINT_INT = PUSB_AddFunction(&node, &HID_INTERFACE);
+}
+
+int HID_::begin(void)
+{
+	return 0;
+}
\ No newline at end of file
diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
new file mode 100644
index 000000000..7288552d8
--- /dev/null
+++ b/libraries/HID/HID.h
@@ -0,0 +1,93 @@
+/*
+  HID.h
+
+  Copyright (c) 2015, Arduino LLC
+  Original code (pre-library): Copyright (c) 2011, Peter Barrett
+
+  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 HID_h
+#define HID_h
+
+#include <stdint.h>
+#include <Arduino.h>
+
+#define _USING_HID
+
+//================================================================================
+//================================================================================
+//  HID 'Driver'
+
+#define HID_GET_REPORT        0x01
+#define HID_GET_IDLE          0x02
+#define HID_GET_PROTOCOL      0x03
+#define HID_SET_REPORT        0x09
+#define HID_SET_IDLE          0x0A
+#define HID_SET_PROTOCOL      0x0B
+
+#define HID_HID_DESCRIPTOR_TYPE         0x21
+#define HID_REPORT_DESCRIPTOR_TYPE      0x22
+#define HID_PHYSICAL_DESCRIPTOR_TYPE    0x23
+
+typedef struct __attribute__((packed)) {
+  uint8_t length;
+  const void* descriptor;
+} HID_Descriptor;
+
+class HIDDescriptorListNode {
+public:
+  HIDDescriptorListNode *next = NULL;
+  const HID_Descriptor * cb;
+  HIDDescriptorListNode(const HID_Descriptor *ncb) {cb = ncb;}
+};
+
+class HID_
+{
+public:
+  HID_(void);
+  int begin(void);
+  void SendReport(uint8_t id, const void* data, int len);
+  void AppendDescriptor(HIDDescriptorListNode* node);
+};
+
+typedef struct
+{
+  uint8_t len;     // 9
+  uint8_t dtype;   // 0x21
+  uint8_t addr;
+  uint8_t  versionL; // 0x101
+  uint8_t  versionH; // 0x101
+  uint8_t  country;
+  uint8_t  desctype; // 0x22 report
+  uint8_t  descLenL;
+  uint8_t  descLenH;
+} HIDDescDescriptor;
+
+typedef struct
+{
+  InterfaceDescriptor     hid;
+  HIDDescDescriptor     desc;
+  EndpointDescriptor      in;
+} HIDDescriptor;
+
+#define HID_TX HID_ENDPOINT_INT
+
+#define D_HIDREPORT(_descriptorLength) \
+  { 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
+
+#define WEAK __attribute__ ((weak))
+
+#endif
\ No newline at end of file
diff --git a/libraries/HID/keywords.txt b/libraries/HID/keywords.txt
new file mode 100644
index 000000000..32a9ba5f2
--- /dev/null
+++ b/libraries/HID/keywords.txt
@@ -0,0 +1,21 @@
+#######################################
+# Syntax Coloring Map HID
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+HID	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+begin	KEYWORD2
+SendReport	KEYWORD2
+AppendDescriptor	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################
+HID_TX	LITERAL1
\ No newline at end of file
diff --git a/libraries/HID/library.properties b/libraries/HID/library.properties
new file mode 100644
index 000000000..b175b1ede
--- /dev/null
+++ b/libraries/HID/library.properties
@@ -0,0 +1,8 @@
+name=HID
+version=1.0
+author=Arduino
+maintainer=Arduino <info@arduino.cc>
+sentence=Module for PluggableUSB infrastructure. Exposes an API for devices like Keyboards, Mice and Gamepads
+paragraph=
+url=http://www.arduino.cc/en/Reference/HID
+architectures=samd
\ No newline at end of file

From aea34792db7cf3a9c45d22d83739979350ce563f Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 7 Sep 2015 15:29:11 +0200
Subject: [PATCH 048/124] fix pluggableUSB OUT packets

---
 cores/arduino/USB/PluggableUSB.h | 2 +-
 cores/arduino/USB/USBCore.cpp    | 4 ++--
 libraries/HID/HID.cpp            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cores/arduino/USB/PluggableUSB.h b/cores/arduino/USB/PluggableUSB.h
index 205900550..502da9ebc 100644
--- a/cores/arduino/USB/PluggableUSB.h
+++ b/cores/arduino/USB/PluggableUSB.h
@@ -32,7 +32,7 @@ typedef struct __attribute__((packed))
   int (*getDescriptor)(int8_t t);
   int8_t numEndpoints;
   int8_t numInterfaces;
-  uint8_t *endpointType;
+  uint32_t *endpointType;
 } PUSBCallbacks;
 
 typedef struct
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 26f3ced61..171fe389f 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -75,10 +75,10 @@ volatile uint32_t _usbConfiguration = 0;
 volatile uint32_t _usbSetInterface = 0;
 
 static __attribute__((__aligned__(4))) //__attribute__((__section__(".bss_hram0")))
-uint8_t udd_ep_out_cache_buffer[4][64];
+uint8_t udd_ep_out_cache_buffer[6][64];
 
 static __attribute__((__aligned__(4))) //__attribute__((__section__(".bss_hram0")))
-uint8_t udd_ep_in_cache_buffer[4][64];
+uint8_t udd_ep_in_cache_buffer[6][64];
 
 //==================================================================
 
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index 2679faa54..c4bbd5cd8 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -152,7 +152,7 @@ bool HID_Setup(USBSetup& setup, uint8_t i)
 
 HID_::HID_(void)
 {
-	static uint8_t endpointType[1];
+	static uint32_t endpointType[1];
 
 	endpointType[0] = USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0);
 

From a22b3122bda5c199e23a06aacf1582dcbe07ad26 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 16 Sep 2015 14:56:21 +0200
Subject: [PATCH 049/124] fix PUSB_getInterface return value

---
 cores/arduino/USB/PluggableUSB.cpp | 2 +-
 cores/arduino/USB/USBCore.cpp      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cores/arduino/USB/PluggableUSB.cpp b/cores/arduino/USB/PluggableUSB.cpp
index 84d781d81..1a15dfa46 100644
--- a/cores/arduino/USB/PluggableUSB.cpp
+++ b/cores/arduino/USB/PluggableUSB.cpp
@@ -40,7 +40,7 @@ int PUSB_GetInterface(uint8_t* interfaceNum)
 	int ret = 0;
 	PUSBListNode* node = rootNode;
 	for (uint8_t i=0; i<modules_count; i++) {
-		ret = node->cb->getInterface(interfaceNum);
+		ret += node->cb->getInterface(interfaceNum);
 		node = node->next;
 	}
 	return ret;
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 171fe389f..ddc20146b 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -156,6 +156,8 @@ uint32_t USBDeviceClass::sendConfiguration(uint32_t maxlen)
 		return true;
 	}
 
+	total = 0;
+
 	packMessages(true);
 	sendControl(&config, sizeof(ConfigDescriptor));
 	SendInterfaces(&total);

From 30ada3e56eaf963bc74042b13ee0f79072c55632 Mon Sep 17 00:00:00 2001
From: Paolo Paolucci <p.paolucci@tiscali.it>
Date: Wed, 23 Sep 2015 10:24:39 +0200
Subject: [PATCH 050/124] Add function setClock on Wire library

---
 libraries/Wire/Wire.cpp | 8 +++++---
 libraries/Wire/Wire.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index b38abfe68..76e0a1313 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -49,12 +49,14 @@ void TwoWire::begin(uint8_t address) {
   sercom->enableWIRE();
 }
 
-void TwoWire::end() {
+void TwoWire::setClock(uint32_t baudrate) {
   sercom->disableWIRE();
+  sercom->initMasterWIRE(baudrate);
+  sercom->enableWIRE();
 }
 
-void TwoWire::setClock(uint32_t frequency) {
-       // dummy funtion
+void TwoWire::end() {
+  sercom->disableWIRE();
 }
 
 uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index dfa1c1399..1dd6ec0be 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -39,7 +39,7 @@ class TwoWire : public Stream
     void begin();
     void begin(uint8_t);
     void end();
-    void setClock(uint32_t); // dummy function
+    void setClock(uint32_t);
 
     void beginTransmission(uint8_t);
     uint8_t endTransmission(bool stopBit);

From 126a8c725310fe19e823e48d1fb604573ead3e5d Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Thu, 24 Sep 2015 16:06:15 +0200
Subject: [PATCH 051/124] Updated IPAddress to the latest version

---
 cores/arduino/IPAddress.cpp | 42 +++++++++++++++++++++++++++++++++++++
 cores/arduino/IPAddress.h   |  7 +++++--
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/cores/arduino/IPAddress.cpp b/cores/arduino/IPAddress.cpp
index 899cbd4ed..76aefa8b2 100644
--- a/cores/arduino/IPAddress.cpp
+++ b/cores/arduino/IPAddress.cpp
@@ -43,6 +43,48 @@ IPAddress::IPAddress(const uint8_t *address)
     memcpy(_address.bytes, address, sizeof(_address.bytes));
 }
 
+bool IPAddress::fromString(const char *address)
+{
+    // TODO: add support for "a", "a.b", "a.b.c" formats
+
+    uint16_t acc = 0; // Accumulator
+    uint8_t dots = 0;
+
+    while (*address)
+    {
+        char c = *address++;
+        if (c >= '0' && c <= '9')
+        {
+            acc = acc * 10 + (c - '0');
+            if (acc > 255) {
+                // Value out of [0..255] range
+                return false;
+            }
+        }
+        else if (c == '.')
+        {
+            if (dots == 3) {
+                // Too much dots (there must be 3 dots)
+                return false;
+            }
+            _address.bytes[dots++] = acc;
+            acc = 0;
+        }
+        else
+        {
+            // Invalid char
+            return false;
+        }
+    }
+
+    if (dots != 3) {
+        // Too few dots (there must be 3 dots)
+        return false;
+    }
+    _address.bytes[3] = acc;
+    return true;
+}
+
 IPAddress& IPAddress::operator=(const uint8_t *address)
 {
     memcpy(_address.bytes, address, sizeof(_address.bytes));
diff --git a/cores/arduino/IPAddress.h b/cores/arduino/IPAddress.h
index 94acdc456..d762f2c02 100644
--- a/cores/arduino/IPAddress.h
+++ b/cores/arduino/IPAddress.h
@@ -21,7 +21,8 @@
 #define IPAddress_h
 
 #include <stdint.h>
-#include <Printable.h>
+#include "Printable.h"
+#include "WString.h"
 
 // A class to make it easier to handle and pass around IP addresses
 
@@ -45,6 +46,9 @@ class IPAddress : public Printable {
     IPAddress(uint32_t address);
     IPAddress(const uint8_t *address);
 
+    bool fromString(const char *address);
+    bool fromString(const String &address) { return fromString(address.c_str()); }
+
     // Overloaded cast operator to allow IPAddress objects to be used where a pointer
     // to a four-byte uint8_t array is expected
     operator uint32_t() const { return _address.dword; };
@@ -71,5 +75,4 @@ class IPAddress : public Printable {
 
 const IPAddress INADDR_NONE(0,0,0,0);
 
-
 #endif

From 623091314a78a5ce023617ea130f5bf44baa6718 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 5 Oct 2015 18:27:43 +0200
Subject: [PATCH 052/124] [PluggableUSB] port to stable API

---
 cores/arduino/USB/PluggableUSB.cpp |  95 ++++++++------
 cores/arduino/USB/PluggableUSB.h   |  61 +++++----
 cores/arduino/USB/USBAPI.h         |   3 +-
 cores/arduino/USB/USBCore.cpp      |  10 +-
 cores/arduino/USB/USBCore.h        |   8 +-
 libraries/HID/HID.cpp              | 204 +++++++++++++----------------
 libraries/HID/HID.h                | 132 +++++++++++--------
 7 files changed, 266 insertions(+), 247 deletions(-)

diff --git a/cores/arduino/USB/PluggableUSB.cpp b/cores/arduino/USB/PluggableUSB.cpp
index 1a15dfa46..0f2d08c0d 100644
--- a/cores/arduino/USB/PluggableUSB.cpp
+++ b/cores/arduino/USB/PluggableUSB.cpp
@@ -19,80 +19,89 @@
 
 #include "USBAPI.h"
 #include "USBDesc.h"
+#include "USBCore.h"
 #include "PluggableUSB.h"
 
+#if defined(USBCON)
 #ifdef PLUGGABLE_USB_ENABLED
 
-#define MAX_MODULES	6
-
-static uint8_t lastIf = CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT;
-static uint8_t lastEp = CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT;
-
 extern uint32_t EndPoints[];
 
-//PUSBCallbacks cbs[MAX_MODULES];
-static uint8_t modules_count = 0;
-
-static PUSBListNode* rootNode = NULL;
-
-int PUSB_GetInterface(uint8_t* interfaceNum)
+int PluggableUSB_::getInterface(uint8_t* interfaceCount)
 {
-	int ret = 0;
-	PUSBListNode* node = rootNode;
-	for (uint8_t i=0; i<modules_count; i++) {
-		ret += node->cb->getInterface(interfaceNum);
-		node = node->next;
+	int sent = 0;
+	PluggableUSBModule* node;
+	for (node = rootNode; node; node = node->next) {
+		int res = node->getInterface(interfaceCount);
+		if (res < 0)
+			return -1;
+		sent += res;
 	}
-	return ret;
+	return sent;
 }
 
-int PUSB_GetDescriptor(int8_t t)
+int PluggableUSB_::getDescriptor(USBSetup& setup)
 {
-	int ret = 0;
-	PUSBListNode* node = rootNode;
-	for (uint8_t i=0; i<modules_count && ret == 0; i++) {
-		ret = node->cb->getDescriptor(t);
-		node = node->next;
+	PluggableUSBModule* node;
+	for (node = rootNode; node; node = node->next) {
+		int ret = node->getDescriptor(setup);
+		// ret!=0 -> request has been processed
+		if (ret)
+			return ret;
 	}
-	return ret;
+	return 0;
 }
 
-bool PUSB_Setup(USBSetup& setup, uint8_t j)
+bool PluggableUSB_::setup(USBSetup& setup)
 {
-	bool ret = false;
-	PUSBListNode* node = rootNode;
-	for (uint8_t i=0; i<modules_count && ret == false; i++) {
-		ret = node->cb->setup(setup, j);
-		node = node->next;
+	PluggableUSBModule* node;
+	for (node = rootNode; node; node = node->next) {
+		if (node->setup(setup)) {
+			return true;
+		}
 	}
-	return ret;
+	return false;
 }
 
-int8_t PUSB_AddFunction(PUSBListNode *node, uint8_t* interface)
+bool PluggableUSB_::plug(PluggableUSBModule *node)
 {
-	if (modules_count >= MAX_MODULES) {
-		return 0;
+	if ((lastEp + node->numEndpoints) > USB_ENDPOINTS) {
+		return false;
 	}
 
-	if (modules_count == 0) {
+	if (!rootNode) {
 		rootNode = node;
 	} else {
-		PUSBListNode *current = rootNode;
-		while(current->next != NULL) {
+		PluggableUSBModule *current = rootNode;
+		while (current->next) {
 			current = current->next;
 		}
 		current->next = node;
 	}
 
-	*interface = lastIf;
-	lastIf += node->cb->numInterfaces;
-	for ( uint8_t i = 0; i< node->cb->numEndpoints; i++) {
-		EndPoints[lastEp] = node->cb->endpointType[i];
+	node->pluggedInterface = lastIf;
+	node->pluggedEndpoint = lastEp;
+	lastIf += node->numInterfaces;
+	for (uint8_t i = 0; i < node->numEndpoints; i++) {
+		EndPoints[lastEp] = node->endpointType[i];
 		lastEp++;
 	}
-	modules_count++;
-	return lastEp - node->cb->numEndpoints;
+	return true;
 	// restart USB layer???
 }
 
+PluggableUSB_& PluggableUSB()
+{
+	static PluggableUSB_ obj;
+	return obj;
+}
+
+PluggableUSB_::PluggableUSB_() : lastIf(CDC_ACM_INTERFACE + CDC_INTERFACE_COUNT),
+                                 lastEp(CDC_FIRST_ENDPOINT + CDC_ENPOINT_COUNT),
+                                 rootNode(NULL)
+{
+	// Empty
+}
+
+#endif
 #endif
\ No newline at end of file
diff --git a/cores/arduino/USB/PluggableUSB.h b/cores/arduino/USB/PluggableUSB.h
index 502da9ebc..eb18ca253 100644
--- a/cores/arduino/USB/PluggableUSB.h
+++ b/cores/arduino/USB/PluggableUSB.h
@@ -25,38 +25,47 @@
 
 #if defined(USBCON)
 
-typedef struct __attribute__((packed))
-{
-  bool (*setup)(USBSetup& setup, uint8_t i);
-  int (*getInterface)(uint8_t* interfaceNum);
-  int (*getDescriptor)(int8_t t);
-  int8_t numEndpoints;
-  int8_t numInterfaces;
-  uint32_t *endpointType;
-} PUSBCallbacks;
-
-typedef struct
-{
-  uint8_t interface;
-  uint8_t firstEndpoint;
-} PUSBReturn;
-
-class PUSBListNode {
+class PluggableUSBModule {
 public:
-  PUSBListNode *next = NULL;
-  PUSBCallbacks *cb;
-  PUSBListNode(PUSBCallbacks *ncb) {cb = ncb;}
-};
+  PluggableUSBModule(uint8_t numEps, uint8_t numIfs, uint32_t *epType) :
+    numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
+  { }
+
+protected:
+  virtual bool setup(USBSetup& setup) = 0;
+  virtual int getInterface(uint8_t* interfaceCount) = 0;
+  virtual int getDescriptor(USBSetup& setup) = 0;
+
+  uint8_t pluggedInterface;
+  uint8_t pluggedEndpoint;
 
-int8_t PUSB_AddFunction(PUSBListNode *node, uint8_t *interface);
+  const uint8_t numEndpoints;
+  const uint8_t numInterfaces;
+  const uint32_t *endpointType;
 
-int PUSB_GetInterface(uint8_t* interfaceNum);
+  PluggableUSBModule *next = NULL;
 
-int PUSB_GetDescriptor(int8_t t);
+  friend class PluggableUSB_;
+};
 
-bool PUSB_Setup(USBSetup& setup, uint8_t i);
+class PluggableUSB_ {
+public:
+  PluggableUSB_();
+  bool plug(PluggableUSBModule *node);
+  int getInterface(uint8_t* interfaceCount);
+  int getDescriptor(USBSetup& setup);
+  bool setup(USBSetup& setup);
+
+private:
+  uint8_t lastIf;
+  uint8_t lastEp;
+  PluggableUSBModule* rootNode;
+};
 
-void PUSB_Begin();
+// Replacement for global singleton.
+// This function prevents static-initialization-order-fiasco
+// https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use
+PluggableUSB_& PluggableUSB();
 
 #endif
 
diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h
index 23d0ae242..f4a0babf8 100644
--- a/cores/arduino/USB/USBAPI.h
+++ b/cores/arduino/USB/USBAPI.h
@@ -78,6 +78,7 @@ class USBDeviceClass {
 	bool sendStringDescriptor(const uint8_t *string, uint8_t maxlen);
 	void initControl(int end);
 	uint8_t SendInterfaces(uint32_t* total);
+	void packMessages(bool val);
 
 	// Generic EndPoint API
 	void initEndpoints(void);
@@ -100,8 +101,6 @@ class USBDeviceClass {
 	void ISRHandler();
 
 private:
-	void packMessages(bool val);
-
 	bool initialized;
 };
 
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index ddc20146b..a584a638e 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -75,10 +75,10 @@ volatile uint32_t _usbConfiguration = 0;
 volatile uint32_t _usbSetInterface = 0;
 
 static __attribute__((__aligned__(4))) //__attribute__((__section__(".bss_hram0")))
-uint8_t udd_ep_out_cache_buffer[6][64];
+uint8_t udd_ep_out_cache_buffer[7][64];
 
 static __attribute__((__aligned__(4))) //__attribute__((__section__(".bss_hram0")))
-uint8_t udd_ep_in_cache_buffer[6][64];
+uint8_t udd_ep_in_cache_buffer[7][64];
 
 //==================================================================
 
@@ -129,7 +129,7 @@ uint8_t USBDeviceClass::SendInterfaces(uint32_t* total)
 #endif
 
 #ifdef PLUGGABLE_USB_ENABLED
-	total[0] += PUSB_GetInterface(&interfaces);
+	total[0] += PluggableUSB().getInterface(&interfaces);
 #endif
 
 	return interfaces;
@@ -180,7 +180,7 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 	}
 
 #ifdef PLUGGABLE_USB_ENABLED
-	ret = PUSB_GetDescriptor(t);
+	ret = PluggableUSB().getDescriptor(setup);
 	if (ret != 0) {
 		return (ret > 0 ? true : false);
 	}
@@ -360,7 +360,7 @@ bool USBDeviceClass::handleClassInterfaceSetup(USBSetup& setup)
 	#endif
 
 	#if defined(PLUGGABLE_USB_ENABLED)
-	bool ret = PUSB_Setup(setup, i);
+	bool ret = PluggableUSB().setup(setup);
 	if ( ret == false) {
 		sendZlp(0);
 	}
diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index 0d2dc7854..853f305ae 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -36,6 +36,8 @@
 #define USB_ENDPOINT_OUT(addr)                 ((addr) | 0x00)
 #define USB_ENDPOINT_IN(addr)                  ((addr) | 0x80)
 
+#define USB_ENDPOINTS                          7
+
 #define USB_ENDPOINT_TYPE_MASK                 0x03
 #define USB_ENDPOINT_TYPE_CONTROL              0x00
 #define USB_ENDPOINT_TYPE_ISOCHRONOUS          0x01
@@ -58,9 +60,9 @@
 #define REQUEST_OTHER				0x03
 #define REQUEST_RECIPIENT			0x1F
 
-#define REQUEST_DEVICETOHOST_CLASS_INTERFACE  (REQUEST_DEVICETOHOST + REQUEST_CLASS + REQUEST_INTERFACE)
-#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE  (REQUEST_HOSTTODEVICE + REQUEST_CLASS + REQUEST_INTERFACE)
-
+#define REQUEST_DEVICETOHOST_CLASS_INTERFACE    (REQUEST_DEVICETOHOST | REQUEST_CLASS | REQUEST_INTERFACE)
+#define REQUEST_HOSTTODEVICE_CLASS_INTERFACE    (REQUEST_HOSTTODEVICE | REQUEST_CLASS | REQUEST_INTERFACE)
+#define REQUEST_DEVICETOHOST_STANDARD_INTERFACE (REQUEST_DEVICETOHOST | REQUEST_STANDARD | REQUEST_INTERFACE)
 //	Class requests
 
 #define CDC_SET_LINE_CODING			0x20
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index c4bbd5cd8..94bf9f598 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -19,158 +19,132 @@
 #include "USB/PluggableUSB.h"
 #include "HID.h"
 
-HID_ HID;
+#if defined(USBCON)
 
-static uint8_t HID_ENDPOINT_INT;
-
-//================================================================================
-//================================================================================
-
-//	HID report descriptor
-
-#define LSB(_x) ((_x) & 0xFF)
-#define MSB(_x) ((_x) >> 8)
-
-#define RAWHID_USAGE_PAGE	0xFFC0
-#define RAWHID_USAGE		0x0C00
-#define RAWHID_TX_SIZE 64
-#define RAWHID_RX_SIZE 64
-
-static uint8_t HID_INTERFACE;
-
-HIDDescriptor _hidInterface;
-
-static HIDDescriptorListNode* rootNode = NULL;
-static uint8_t sizeof_hidReportDescriptor = 0;
-static uint8_t modules_count = 0;
-//================================================================================
-//================================================================================
-//	Driver
-
-uint8_t _hid_protocol = 1;
-uint8_t _hid_idle = 1;
+HID_& HID()
+{
+	static HID_ obj;
+	return obj;
+}
 
-int HID_GetInterface(uint8_t* interfaceNum)
+int HID_::getInterface(uint8_t* interfaceCount)
 {
-	interfaceNum[0] += 1;	// uses 1
-	_hidInterface =
-	{
-		D_INTERFACE(HID_INTERFACE,1,3,0,0),
-		D_HIDREPORT(sizeof_hidReportDescriptor),
-		D_ENDPOINT(USB_ENDPOINT_IN (HID_ENDPOINT_INT),USB_ENDPOINT_TYPE_INTERRUPT,0x40,0x01)
+	*interfaceCount += 1; // uses 1
+	HIDDescriptor hidInterface = {
+		D_INTERFACE(pluggedInterface, 1, USB_DEVICE_CLASS_HUMAN_INTERFACE, HID_SUBCLASS_NONE, HID_PROTOCOL_NONE),
+		D_HIDREPORT(descriptorSize),
+		D_ENDPOINT(USB_ENDPOINT_IN(pluggedEndpoint), USB_ENDPOINT_TYPE_INTERRUPT, 0x40, 0x01)
 	};
-	return USBDevice.sendControl(&_hidInterface,sizeof(_hidInterface));
+	return USBDevice.sendControl(&hidInterface, sizeof(hidInterface));
 }
 
-int HID_GetDescriptor(int8_t t)
+int HID_::getDescriptor(USBSetup& setup)
 {
-	if (HID_REPORT_DESCRIPTOR_TYPE == t) {
-		HIDDescriptorListNode* current = rootNode;
-		int total = 0;
-		while(current != NULL) {
-			total += USBDevice.sendControl(current->cb->descriptor,current->cb->length);
-			current = current->next;
-		}
-		return total;
-	} else {
-		return 0;
+	// Check if this is a HID Class Descriptor request
+	if (setup.bmRequestType != REQUEST_DEVICETOHOST_STANDARD_INTERFACE) { return 0; }
+	if (setup.wValueH != HID_REPORT_DESCRIPTOR_TYPE) { return 0; }
+
+	// In a HID Class Descriptor wIndex cointains the interface number
+	if (setup.wIndex != pluggedInterface) { return 0; }
+
+	int total = 0;
+	HIDSubDescriptor* node;
+	USBDevice.packMessages(true);
+	for (node = rootNode; node; node = node->next) {
+		int res = USBDevice.sendControl(node->data, node->length);
+		if (res == -1)
+			return -1;
+		total += res;
 	}
+	USBDevice.packMessages(false);
+	return total;
 }
 
-void HID_::AppendDescriptor(HIDDescriptorListNode *node)
+void HID_::AppendDescriptor(HIDSubDescriptor *node)
 {
-	if (modules_count == 0) {
+	if (!rootNode) {
 		rootNode = node;
 	} else {
-		HIDDescriptorListNode *current = rootNode;
-		while(current->next != NULL) {
+		HIDSubDescriptor *current = rootNode;
+		while (current->next) {
 			current = current->next;
 		}
 		current->next = node;
 	}
-	modules_count++;
-	sizeof_hidReportDescriptor += node->cb->length;
+	descriptorSize += node->length;
 }
 
 void HID_::SendReport(uint8_t id, const void* data, int len)
 {
-	uint8_t p[8];
-	const uint8_t *d = reinterpret_cast<const uint8_t *>(data);
-
+	uint8_t p[64];
 	p[0] = id;
-	for (uint32_t i=0; i<len; i++)
-	{
-		p[i+1] = d[i];
-	}
-	USBDevice.send(HID_ENDPOINT_INT, p, len+1);
+	memcpy(&p[1], data, len);
+	USBDevice.send(pluggedEndpoint, p, len+1);
 }
 
-bool HID_Setup(USBSetup& setup, uint8_t i)
+bool HID_::setup(USBSetup& setup)
 {
-	if (HID_INTERFACE != i) {
+	if (pluggedInterface != setup.wIndex) {
 		return false;
-	} else {
-		uint8_t r = setup.bRequest;
-		uint8_t requestType = setup.bmRequestType;
+	}
 
-		if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
-		{
-			if (HID_GET_REPORT == r)
-			{
-				//HID_GetReport();
-				return true;
-			}
-			if (HID_GET_PROTOCOL == r)
-			{
-				//Send8(_hid_protocol);	// TODO
-				return true;
-			}
-			if (HID_GET_IDLE == r)
-			{
-				USBDevice.armSend(0, &_hid_idle, 1);
-				return true;
-			}
+	uint8_t request = setup.bRequest;
+	uint8_t requestType = setup.bmRequestType;
+
+	if (requestType == REQUEST_DEVICETOHOST_CLASS_INTERFACE)
+	{
+		if (request == HID_GET_REPORT) {
+			// TODO: HID_GetReport();
+			return true;
+		}
+		if (request == HID_GET_PROTOCOL) {
+			// TODO: Send8(protocol);
+			return true;
+		}
+		if (request == HID_GET_IDLE) {
+			USBDevice.armSend(0, &idle, 1);
+			return true;
 		}
+	}
 
-		if (REQUEST_HOSTTODEVICE_CLASS_INTERFACE == requestType)
+	if (requestType == REQUEST_HOSTTODEVICE_CLASS_INTERFACE)
+	{
+		if (request == HID_SET_PROTOCOL) {
+			// The USB Host tells us if we are in boot or report mode.
+			// This only works with a real boot compatible device.
+			protocol = setup.wValueL;
+			return true;
+		}
+		if (request == HID_SET_IDLE) {
+			idle = setup.wValueL;
+			return true;
+		}
+		if (request == HID_SET_REPORT)
 		{
-			if (HID_SET_PROTOCOL == r)
-			{
-				_hid_protocol = setup.wValueL;
-				return true;
-			}
-
-			if (HID_SET_IDLE == r)
-			{
-				_hid_idle = setup.wValueH;
-				return false;
-			}
+			//uint8_t reportID = setup.wValueL;
+			//uint16_t length = setup.wLength;
+			//uint8_t data[length];
+			// Make sure to not read more data than USB_EP_SIZE.
+			// You can read multiple times through a loop.
+			// The first byte (may!) contain the reportID on a multreport.
+			//USB_RecvControl(data, length);
 		}
-		return false;
 	}
+
+	return false;
 }
 
-HID_::HID_(void)
+HID_::HID_(void) : PluggableUSBModule(1, 1, epType),
+                   rootNode(NULL), descriptorSize(0),
+                   protocol(1), idle(1)
 {
-	static uint32_t endpointType[1];
-
-	endpointType[0] = USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0);
-
-	static PUSBCallbacks cb = {
-		.setup = &HID_Setup,
-		.getInterface = &HID_GetInterface,
-		.getDescriptor = &HID_GetDescriptor,
-		.numEndpoints = 1,
-		.numInterfaces = 1,
-		.endpointType = endpointType,
-	};
-
-	static PUSBListNode node(&cb);
-
-	HID_ENDPOINT_INT = PUSB_AddFunction(&node, &HID_INTERFACE);
+	epType[0] = USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0);;
+	PluggableUSB().plug(this);
 }
 
 int HID_::begin(void)
 {
 	return 0;
-}
\ No newline at end of file
+}
+
+#endif /* if defined(USBCON) */
diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index 7288552d8..e5dfa3395 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -1,36 +1,34 @@
 /*
-  HID.h
-
   Copyright (c) 2015, Arduino LLC
   Original code (pre-library): Copyright (c) 2011, Peter Barrett
 
-  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.
+  Permission to use, copy, modify, and/or distribute this software for
+  any purpose with or without fee is hereby granted, provided that the
+  above copyright notice and this permission notice appear in all copies.
 
-  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
-*/
+  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+  WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR
+  BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+  OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+  SOFTWARE.
+ */
 
 #ifndef HID_h
 #define HID_h
 
 #include <stdint.h>
 #include <Arduino.h>
+#include "USB/PluggableUSB.h"
 
-#define _USING_HID
+#if defined(USBCON)
 
-//================================================================================
-//================================================================================
-//  HID 'Driver'
+#define _USING_HID
 
+// HID 'Driver'
+// ------------
 #define HID_GET_REPORT        0x01
 #define HID_GET_IDLE          0x02
 #define HID_GET_PROTOCOL      0x03
@@ -42,52 +40,80 @@
 #define HID_REPORT_DESCRIPTOR_TYPE      0x22
 #define HID_PHYSICAL_DESCRIPTOR_TYPE    0x23
 
-typedef struct __attribute__((packed)) {
-  uint8_t length;
-  const void* descriptor;
-} HID_Descriptor;
+// HID subclass HID1.11 Page 8 4.2 Subclass
+#define HID_SUBCLASS_NONE 0
+#define HID_SUBCLASS_BOOT_INTERFACE 1
+
+// HID Keyboard/Mouse bios compatible protocols HID1.11 Page 9 4.3 Protocols
+#define HID_PROTOCOL_NONE 0
+#define HID_PROTOCOL_KEYBOARD 1
+#define HID_PROTOCOL_MOUSE 2
+
+// Normal or bios protocol (Keyboard/Mouse) HID1.11 Page 54 7.2.5 Get_Protocol Request
+// "protocol" variable is used for this purpose.
+#define HID_BOOT_PROTOCOL	0
+#define HID_REPORT_PROTOCOL	1
+
+typedef struct
+{
+  uint8_t len;      // 9
+  uint8_t dtype;    // 0x21
+  uint8_t addr;
+  uint8_t versionL; // 0x101
+  uint8_t versionH; // 0x101
+  uint8_t country;
+  uint8_t desctype; // 0x22 report
+  uint8_t descLenL;
+  uint8_t descLenH;
+} HIDDescDescriptor;
+
+typedef struct 
+{
+  InterfaceDescriptor hid;
+  HIDDescDescriptor   desc;
+  EndpointDescriptor  in;
+} HIDDescriptor;
 
-class HIDDescriptorListNode {
+class HIDSubDescriptor {
 public:
-  HIDDescriptorListNode *next = NULL;
-  const HID_Descriptor * cb;
-  HIDDescriptorListNode(const HID_Descriptor *ncb) {cb = ncb;}
+  HIDSubDescriptor *next = NULL;
+  HIDSubDescriptor(const void *d, const uint16_t l) : data(d), length(l) { }
+
+  const void* data;
+  const uint16_t length;
 };
 
-class HID_
+class HID_ : public PluggableUSBModule
 {
 public:
   HID_(void);
   int begin(void);
   void SendReport(uint8_t id, const void* data, int len);
-  void AppendDescriptor(HIDDescriptorListNode* node);
-};
+  void AppendDescriptor(HIDSubDescriptor* node);
 
-typedef struct
-{
-  uint8_t len;     // 9
-  uint8_t dtype;   // 0x21
-  uint8_t addr;
-  uint8_t  versionL; // 0x101
-  uint8_t  versionH; // 0x101
-  uint8_t  country;
-  uint8_t  desctype; // 0x22 report
-  uint8_t  descLenL;
-  uint8_t  descLenH;
-} HIDDescDescriptor;
+protected:
+  // Implementation of the PluggableUSBModule
+  int getInterface(uint8_t* interfaceCount);
+  int getDescriptor(USBSetup& setup);
+  bool setup(USBSetup& setup);
 
-typedef struct
-{
-  InterfaceDescriptor     hid;
-  HIDDescDescriptor     desc;
-  EndpointDescriptor      in;
-} HIDDescriptor;
+private:
+  uint32_t epType[1];
+
+  HIDSubDescriptor* rootNode;
+  uint16_t descriptorSize;
+
+  uint8_t protocol;
+  uint8_t idle;
+};
 
-#define HID_TX HID_ENDPOINT_INT
+// Replacement for global singleton.
+// This function prevents static-initialization-order-fiasco
+// https://isocpp.org/wiki/faq/ctors#static-init-order-on-first-use
+HID_& HID();
 
-#define D_HIDREPORT(_descriptorLength) \
-  { 9, 0x21, 0x1, 0x1, 0, 1, 0x22, _descriptorLength, 0 }
+#define D_HIDREPORT(length) { 9, 0x21, 0x01, 0x01, 0, 1, 0x22, lowByte(length), highByte(length) }
 
-#define WEAK __attribute__ ((weak))
+#endif
 
-#endif
\ No newline at end of file
+#endif

From 304b76e844d1e78f3f69bb6ed184adb784dcfe0e Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Wed, 21 Oct 2015 16:45:55 +0200
Subject: [PATCH 053/124] PUSB: add iSerial USB field

---
 cores/arduino/USB/PluggableUSB.cpp |  9 +++++++++
 cores/arduino/USB/PluggableUSB.h   |  2 ++
 cores/arduino/USB/USBCore.cpp      | 11 +++++++++--
 cores/arduino/USB/USBDesc.h        |  5 ++++-
 libraries/HID/HID.cpp              | 10 ++++++++++
 libraries/HID/HID.h                |  1 +
 6 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/cores/arduino/USB/PluggableUSB.cpp b/cores/arduino/USB/PluggableUSB.cpp
index 0f2d08c0d..4c52c1fad 100644
--- a/cores/arduino/USB/PluggableUSB.cpp
+++ b/cores/arduino/USB/PluggableUSB.cpp
@@ -52,6 +52,15 @@ int PluggableUSB_::getDescriptor(USBSetup& setup)
 	return 0;
 }
 
+void PluggableUSB_::getShortName(char *iSerialNum)
+{
+       PluggableUSBModule* node;
+       for (node = rootNode; node; node = node->next) {
+               iSerialNum += node->getShortName(iSerialNum);
+       }
+       *iSerialNum = 0;
+}
+
 bool PluggableUSB_::setup(USBSetup& setup)
 {
 	PluggableUSBModule* node;
diff --git a/cores/arduino/USB/PluggableUSB.h b/cores/arduino/USB/PluggableUSB.h
index eb18ca253..4e08e5dfc 100644
--- a/cores/arduino/USB/PluggableUSB.h
+++ b/cores/arduino/USB/PluggableUSB.h
@@ -35,6 +35,7 @@ class PluggableUSBModule {
   virtual bool setup(USBSetup& setup) = 0;
   virtual int getInterface(uint8_t* interfaceCount) = 0;
   virtual int getDescriptor(USBSetup& setup) = 0;
+  virtual uint8_t getShortName(char *name) { name[0] = 'A'+pluggedInterface; return 1; }
 
   uint8_t pluggedInterface;
   uint8_t pluggedEndpoint;
@@ -55,6 +56,7 @@ class PluggableUSB_ {
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
+  void getShortName(char *iSerialNum);
 
 private:
   uint8_t lastIf;
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index a584a638e..9642c2aad 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -66,8 +66,8 @@ const uint8_t STRING_MANUFACTURER[] = USB_MANUFACTURER;
 
 
 //	DEVICE DESCRIPTOR
-const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
-const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, 0, 1);
+const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
+const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
 
 //==================================================================
 
@@ -208,6 +208,13 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 		else if (setup.wValueL == IMANUFACTURER) {
 			return sendStringDescriptor(STRING_MANUFACTURER, setup.wLength);
 		}
+		else if (setup.wValueL == ISERIAL) {
+#ifdef PLUGGABLE_USB_ENABLED
+			char name[ISERIAL_MAX_LEN];
+			PluggableUSB().getShortName(name);
+			return sendStringDescriptor((uint8_t*)name, setup.wLength);
+#endif
+		}
 		else {
 			return false;
 		}
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index 033011ffb..645704941 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -54,8 +54,11 @@
 #define CDC_TX CDC_ENDPOINT_IN
 #endif
 
+#define ISERIAL_MAX_LEN        20
+
 // Defined string description
 #define IMANUFACTURER	1
-#define IPRODUCT		2
+#define IPRODUCT    2
+#define ISERIAL    3
 
 #endif /* __USBDESC_H__ */
diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index 94bf9f598..34995fe67 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -60,6 +60,16 @@ int HID_::getDescriptor(USBSetup& setup)
 	return total;
 }
 
+uint8_t HID_::getShortName(char *name)
+{
+       name[0] = 'H';
+       name[1] = 'I';
+       name[2] = 'D';
+       name[3] = 'A' + (descriptorSize & 0x0F);
+       name[4] = 'A' + ((descriptorSize >> 4) & 0x0F);
+       return 5;
+}
+
 void HID_::AppendDescriptor(HIDSubDescriptor *node)
 {
 	if (!rootNode) {
diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index e5dfa3395..9499b726c 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -96,6 +96,7 @@ class HID_ : public PluggableUSBModule
   int getInterface(uint8_t* interfaceCount);
   int getDescriptor(USBSetup& setup);
   bool setup(USBSetup& setup);
+  uint8_t getShortName(char* name);
 
 private:
   uint32_t epType[1];

From 23dbf1190276871fe1382159584d30c0c4c9be53 Mon Sep 17 00:00:00 2001
From: agdl <a.guadalupi@arduino.cc>
Date: Thu, 22 Oct 2015 14:20:49 +0200
Subject: [PATCH 054/124] Tone fix for #59 and optimizations

This fixes issue #59 and optimize the way the prescaler is found.
Furthermore non needed instructions are not repeated.
---
 cores/arduino/Tone.cpp | 131 ++++++++++++++++++++---------------------
 1 file changed, 64 insertions(+), 67 deletions(-)

diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index 5d135e70b..99e7fa173 100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
@@ -29,6 +29,7 @@ volatile uint32_t *portClearRegister;
 volatile uint32_t portBitMask;
 volatile int64_t toggleCount;
 volatile bool toneIsActive = false;
+volatile bool firstTimeRunning = false;
 
 /* TC5 does not exist on the D11. Using TC2 instead. It will conflict with the 2 TC2 PWM pins */
 #if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
@@ -41,6 +42,7 @@ volatile bool toneIsActive = false;
 
 #define TONE_TC_TOP     0xFFFF
 #define TONE_TC_CHANNEL 0
+
 void TC5_Handler (void) __attribute__ ((weak, alias("Tone_Handler")));
 
 static inline void resetTC (Tc* TCx)
@@ -62,6 +64,25 @@ void toneAccurateClock (uint32_t accurateSystemCoreClockFrequency)
 
 void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
 {
+  // Configure interrupt request
+  NVIC_DisableIRQ(TONE_TC_IRQn);
+  NVIC_ClearPendingIRQ(TONE_TC_IRQn);
+  
+  if(!firstTimeRunning)
+  {
+    firstTimeRunning = true;
+    
+    NVIC_SetPriority(TONE_TC_IRQn, 0);
+      
+    // Enable GCLK for timer used
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+    GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC1_TC2));
+#else
+    GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC4_TC5));
+#endif
+    while (GCLK->STATUS.bit.SYNCBUSY);
+  }
+  
   if (toneIsActive && (outputPin != lastOutputPin))
     noTone(lastOutputPin);
 
@@ -74,94 +95,70 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
 
   ccValue = toneMaxFrequency / frequency - 1;
   prescalerConfigBits = TC_CTRLA_PRESCALER_DIV1;
-
-  if (ccValue > TONE_TC_TOP)
+  
+  uint8_t i = 0;
+  
+  while(ccValue > TONE_TC_TOP)
+  {
+    ccValue = toneMaxFrequency / frequency / (2<<i) - 1;
+    i++;
+    if(i == 4 || i == 6 || i == 8) //DIV32 DIV128 and DIV512 are not available
+     i++;
+  }
+  
+  switch(i-1)
   {
-    ccValue = toneMaxFrequency / frequency / 2 - 1;
-    prescalerConfigBits = TC_CTRLA_PRESCALER_DIV2;
-
-    if (ccValue > TONE_TC_TOP)
-    {
-      ccValue = toneMaxFrequency / frequency / 4 - 1;
-      prescalerConfigBits = TC_CTRLA_PRESCALER_DIV4;
-
-      if (ccValue > TONE_TC_TOP)
-      {
-        ccValue = toneMaxFrequency / frequency / 8 - 1;
-        prescalerConfigBits = TC_CTRLA_PRESCALER_DIV8;
-
-        if (ccValue > TONE_TC_TOP)
-        {
-          ccValue = toneMaxFrequency / frequency / 16 - 1;
-          prescalerConfigBits = TC_CTRLA_PRESCALER_DIV16;
-
-          if (ccValue > TONE_TC_TOP)
-          {
-            ccValue = toneMaxFrequency / frequency / 64 - 1;
-            prescalerConfigBits = TC_CTRLA_PRESCALER_DIV64;
-
-            if (ccValue > TONE_TC_TOP)
-            {
-              ccValue = toneMaxFrequency / frequency / 256 - 1;
-              prescalerConfigBits = TC_CTRLA_PRESCALER_DIV256;
-
-              if (ccValue > TONE_TC_TOP)
-              {
-                ccValue = toneMaxFrequency / frequency / 1024 - 1;
-                prescalerConfigBits = TC_CTRLA_PRESCALER_DIV1024;
-              }
-            }
-          }
-        }
-      }
-    }
+    case 0: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV2; break;
+    
+    case 1: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV4; break;
+    
+    case 2: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV8; break;
+    
+    case 3: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV16; break;
+    
+    case 5: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV64; break;
+      
+    case 7: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV256; break;
+    
+    case 9: prescalerConfigBits = TC_CTRLA_PRESCALER_DIV1024; break;
+    
+    default: break;
   }
 
   toggleCount = (duration > 0 ? frequency * duration * 2 / 1000UL : -1);
 
-  // Enable GCLK for timer used
-#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
-  GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC1_TC2));
-#else
-  GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC4_TC5));
-#endif
-
-  while (GCLK->STATUS.bit.SYNCBUSY);
-
   resetTC(TONE_TC);
 
-  // Set Timer counter Mode to 16 bits
-  TONE_TC->COUNT16.CTRLA.reg |= TC_CTRLA_MODE_COUNT16;
-
-  // Set TONE_TC mode as match frequency
-  TONE_TC->COUNT16.CTRLA.reg |= TC_CTRLA_WAVEGEN_MFRQ;
-
-  TONE_TC->COUNT16.CTRLA.reg |= prescalerConfigBits;
+  uint16_t tmpReg = 0;
+  tmpReg |= TC_CTRLA_MODE_COUNT16;  // Set Timer counter Mode to 16 bits
+  tmpReg |= TC_CTRLA_WAVEGEN_MFRQ;  // Set TONE_TC mode as match frequency
+  tmpReg |= prescalerConfigBits;
+  TONE_TC->COUNT16.CTRLA.reg |= tmpReg;
+  WAIT_TC16_REGS_SYNC(TONE_TC)
 
   TONE_TC->COUNT16.CC[TONE_TC_CHANNEL].reg = (uint16_t) ccValue;
   WAIT_TC16_REGS_SYNC(TONE_TC)
 
-  // Configure interrupt request
-  NVIC_DisableIRQ(TONE_TC_IRQn);
-  NVIC_ClearPendingIRQ(TONE_TC_IRQn);
-  NVIC_SetPriority(TONE_TC_IRQn, 0);
-  NVIC_EnableIRQ(TONE_TC_IRQn);
-
   portToggleRegister = &(PORT->Group[g_APinDescription[outputPin].ulPort].OUTTGL.reg);
   portClearRegister = &(PORT->Group[g_APinDescription[outputPin].ulPort].OUTCLR.reg);
   portBitMask = (1ul << g_APinDescription[outputPin].ulPin);
 
   // Enable the TONE_TC interrupt request
   TONE_TC->COUNT16.INTENSET.bit.MC0 = 1;
-
-  lastOutputPin = outputPin;
-  digitalWrite(outputPin, LOW);
-  pinMode(outputPin, OUTPUT);
-  toneIsActive = true;
+  
+  if (outputPin != lastOutputPin)
+  {
+    lastOutputPin = outputPin;
+    digitalWrite(outputPin, LOW);
+    pinMode(outputPin, OUTPUT);
+    toneIsActive = true;
+  }
 
   // Enable TONE_TC
   TONE_TC->COUNT16.CTRLA.reg |= TC_CTRLA_ENABLE;
   WAIT_TC16_REGS_SYNC(TONE_TC)
+  
+  NVIC_EnableIRQ(TONE_TC_IRQn);
 }
 
 void noTone (uint32_t outputPin)

From 0c7945b8c3469fa067c154d5ea133ecfa8240564 Mon Sep 17 00:00:00 2001
From: Paolo Paolucci <p.paolucci@tiscali.it>
Date: Sat, 31 Oct 2015 17:20:08 +0100
Subject: [PATCH 055/124] Add category on library.properties files

---
 libraries/HID/library.properties                   | 3 ++-
 libraries/SAMD_AnalogCorrection/library.properties | 1 +
 libraries/SPI/library.properties                   | 1 +
 libraries/USBHost/library.properties               | 1 +
 libraries/Wire/library.properties                  | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/HID/library.properties b/libraries/HID/library.properties
index b175b1ede..ff9377bc4 100644
--- a/libraries/HID/library.properties
+++ b/libraries/HID/library.properties
@@ -4,5 +4,6 @@ author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Module for PluggableUSB infrastructure. Exposes an API for devices like Keyboards, Mice and Gamepads
 paragraph=
+category=Other
 url=http://www.arduino.cc/en/Reference/HID
-architectures=samd
\ No newline at end of file
+architectures=samd
diff --git a/libraries/SAMD_AnalogCorrection/library.properties b/libraries/SAMD_AnalogCorrection/library.properties
index e12ada2d1..b8ba59a45 100644
--- a/libraries/SAMD_AnalogCorrection/library.properties
+++ b/libraries/SAMD_AnalogCorrection/library.properties
@@ -4,5 +4,6 @@ author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Sets and enables the digital correction logic of the SAMD ADC.
 paragraph=Useful to correct the values returned by the ADC.
+category=Other
 url=
 architectures=samd
diff --git a/libraries/SPI/library.properties b/libraries/SPI/library.properties
index 3aaa770b8..6940f1458 100644
--- a/libraries/SPI/library.properties
+++ b/libraries/SPI/library.properties
@@ -4,5 +4,6 @@ author=Jonathan BAUDIN, Thibaut VIARD, Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. Specific implementation for Arduino Zero.
 paragraph=
+category=Communication
 url=http://www.arduino.cc/en/Reference/SPI
 architectures=samd
diff --git a/libraries/USBHost/library.properties b/libraries/USBHost/library.properties
index 240f951e4..48f542e2c 100644
--- a/libraries/USBHost/library.properties
+++ b/libraries/USBHost/library.properties
@@ -4,5 +4,6 @@ author=Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Allows the communication with USB peripherals like mice, keyboards, and thumbdrives. For Arduino Due and Zero.
 paragraph=The USBHost library allows the board to appear as a USB host, enabling it to communicate with peripherals like USB mice and keyboards. USBHost does not support devices that are connected through USB hubs. This includes some keyboards that have an internal hub.
+category=Other
 url=http://arduino.cc/en/Reference/USBHost
 architectures=samd
diff --git a/libraries/Wire/library.properties b/libraries/Wire/library.properties
index eff193aa2..d5b44eaf1 100644
--- a/libraries/Wire/library.properties
+++ b/libraries/Wire/library.properties
@@ -4,6 +4,6 @@ author=Jonathan BAUDIN, Thibaut VIARD, Arduino
 maintainer=Arduino <info@arduino.cc>
 sentence=Allows the communication between devices or sensors connected via Two Wire Interface Bus. Specific implementation for Arduino Zero.
 paragraph=
+category=Communication
 url=http://www.arduino.cc/en/Reference/Wire
 architectures=samd
-

From 2e951a5e2f83beecba55270226d038dd96ceeabf Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 3 Nov 2015 15:21:58 +0100
Subject: [PATCH 056/124] Update HID API

---
 libraries/HID/HID.cpp | 4 ++--
 libraries/HID/HID.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/HID/HID.cpp b/libraries/HID/HID.cpp
index 34995fe67..a2f1382b2 100644
--- a/libraries/HID/HID.cpp
+++ b/libraries/HID/HID.cpp
@@ -84,12 +84,12 @@ void HID_::AppendDescriptor(HIDSubDescriptor *node)
 	descriptorSize += node->length;
 }
 
-void HID_::SendReport(uint8_t id, const void* data, int len)
+int HID_::SendReport(uint8_t id, const void* data, int len)
 {
 	uint8_t p[64];
 	p[0] = id;
 	memcpy(&p[1], data, len);
-	USBDevice.send(pluggedEndpoint, p, len+1);
+	return USBDevice.send(pluggedEndpoint, p, len+1);
 }
 
 bool HID_::setup(USBSetup& setup)
diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index 9499b726c..d086593b6 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -88,7 +88,7 @@ class HID_ : public PluggableUSBModule
 public:
   HID_(void);
   int begin(void);
-  void SendReport(uint8_t id, const void* data, int len);
+  int SendReport(uint8_t id, const void* data, int len);
   void AppendDescriptor(HIDSubDescriptor* node);
 
 protected:

From f1f0297ca90ccc8e815222c5879c61a503d12a77 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Wed, 4 Nov 2015 15:05:18 -0500
Subject: [PATCH 057/124] Add getDataOrderSPI API to Sercom

---
 cores/arduino/SERCOM.cpp | 5 +++++
 cores/arduino/SERCOM.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index c7a829284..ffbf37de2 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -291,6 +291,11 @@ void SERCOM::setDataOrderSPI(SercomDataOrder dataOrder)
   enableSPI();
 }
 
+SercomDataOrder SERCOM::getDataOrderSPI()
+{
+  return (sercom->SPI.CTRLA.bit.DORD ? LSB_FIRST : MSB_FIRST);
+}
+
 void SERCOM::setBaudrateSPI(uint8_t divider)
 {
   //Can't divide by 0
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
index 772715d09..661d12006 100644
--- a/cores/arduino/SERCOM.h
+++ b/cores/arduino/SERCOM.h
@@ -173,6 +173,7 @@ class SERCOM
 		void enableSPI( void ) ;
 		void disableSPI( void ) ;
 		void setDataOrderSPI(SercomDataOrder dataOrder) ;
+		SercomDataOrder getDataOrderSPI( void ) ;
 		void setBaudrateSPI(uint8_t divider) ;
 		void setClockModeSPI(SercomSpiClockMode clockMode) ;
 		void writeDataSPI(uint8_t data) ;

From b7e750e10469f77455e3ce08fddf51a69e4dba01 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Wed, 4 Nov 2015 15:06:02 -0500
Subject: [PATCH 058/124] Add SPI. transfer16(...) API

---
 libraries/SPI/SPI.cpp | 16 ++++++++++++++++
 libraries/SPI/SPI.h   |  1 +
 2 files changed, 17 insertions(+)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 7e2735c8c..b004a9acd 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -194,6 +194,22 @@ byte SPIClass::transfer(uint8_t data)
   return _p_sercom->readDataSPI() & 0xFF;
 }
 
+uint16_t SPIClass::transfer16(uint16_t data) {
+  union { uint16_t val; struct { uint8_t lsb; uint8_t msb; }; } t;
+
+  t.val = data;
+
+  if (_p_sercom->getDataOrderSPI() == LSB_FIRST) {
+    t.lsb = transfer(t.lsb);
+    t.msb = transfer(t.msb);
+  } else {
+    t.msb = transfer(t.msb);
+    t.lsb = transfer(t.lsb);
+  }
+
+  return t.val;
+}
+
 void SPIClass::attachInterrupt() {
   // Should be enableInterrupt()
 }
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index cca53db01..e4fc948c9 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -96,6 +96,7 @@ class SPIClass {
 
 
   byte transfer(uint8_t data);
+  uint16_t transfer16(uint16_t data);
   inline void transfer(void *buf, size_t count);
 
   // Transaction Functions

From 0405f03dba437196b32ac833b1f32e1a847706d9 Mon Sep 17 00:00:00 2001
From: tuxedo0801 <alex@root1.de>
Date: Fri, 6 Nov 2015 14:51:58 +0100
Subject: [PATCH 059/124] Added missing begin() variant with 2nd argument for
 configuring serial port (parity etc..)

---
 cores/arduino/HardwareSerial.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h
index 62cd90078..7c3a76ad2 100644
--- a/cores/arduino/HardwareSerial.h
+++ b/cores/arduino/HardwareSerial.h
@@ -68,6 +68,7 @@ class HardwareSerial : public Stream
 {
   public:
     virtual void begin(unsigned long);
+    virtual void begin(unsigned long baudrate, uint8_t config);
     virtual void end();
     virtual int available(void) = 0;
     virtual int peek(void) = 0;

From be488e54a2a19fb7e4b249f961df4f7e3d6122e4 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 13 Nov 2015 18:27:44 +0000
Subject: [PATCH 060/124] Print not aborting on write failure, changelog update

---
 README.md               | 17 +++++++++++++++++
 cores/arduino/Print.cpp |  7 +++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 37ea5401d..6c1707d8c 100644
--- a/README.md
+++ b/README.md
@@ -468,6 +468,23 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 
 ## ChangeLog
 
+* 1.6.6-mt1:
+
+  * Merged in changes from upstream SAMD CORE 1.6.3
+    * Added SPI.transfer16(..) method
+    * Bugfix: added missing Serial.begin(baud, config) method. Thanks @tuxedo0801
+    
+  * Merged in changes from upstream SAMD CORE 1.6.2 2015.11.03
+    * Fixed bug in delay calculations
+    * Fixed deadlock conditions in Wire. Thanks Erin Tomson
+    * Print not aborting on write() failure. Thanks @stickbreaker
+    * SPI can now be configured in variants. Thanks @aethaniel
+    * Implemented Wire.end
+    * Implemented Wire.setClock. Thanks @PaoloP74
+    * Wire: allow scanning bus via beginTransmission-endTransmission
+    * USB Device: big refactoring and bug fix
+    * USB Device: added PluggableUSB interface
+
 * 1.6.5-mt2:
   * See 'What's New' above.
 
diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index b40e91947..98eb4fd6e 100644
--- a/cores/arduino/Print.cpp
+++ b/cores/arduino/Print.cpp
@@ -31,7 +31,8 @@ size_t Print::write(const uint8_t *buffer, size_t size)
 {
   size_t n = 0;
   while (size--) {
-    n += write(*buffer++);
+    if (write(*buffer++)) n++;
+    else break;
   }
   return n;
 }
@@ -112,9 +113,7 @@ size_t Print::print(const Printable& x)
 
 size_t Print::println(void)
 {
-  size_t n = print('\r');
-  n += print('\n');
-  return n;
+  return write("\r\n");
 }
 
 size_t Print::println(const String &s)

From 3f1a0ff3be04aee8cee8205ee0550894769a1413 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 16 Nov 2015 04:36:27 +0000
Subject: [PATCH 061/124] Send a ZLP if data size is multiple of EPX_SIZE for
 USB sends, arduino/ArduinoCore-samd#63

---
 cores/arduino/USB/USBCore.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 9642c2aad..aad0fd38e 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -581,7 +581,10 @@ uint8_t USBDeviceClass::armRecv(uint32_t ep)
 uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 {
 	uint32_t length = 0;
-
+	// if len is a multiple of EPX_SIZE an ZLP needs to be sent
+	// to indicate end of transfer
+	bool sendZlp = (len % EPX_SIZE) == 0;
+	
 	if (!_usbConfiguration)
 		return -1;
 	if (len > 16384)
@@ -621,10 +624,10 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 #endif
 
 	// Flash area
-	while (len != 0)
+	while (len != 0 || sendZlp)
 	{
-		if (len >= 64) {
-			length = 64;
+		if (len >= EPX_SIZE) {
+			length = EPX_SIZE;
 		} else {
 			length = len;
 		}
@@ -646,6 +649,12 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 			;  // need fire exit.
 		}
 		len -= length;
+		
+		if (len == 0 && sendZlp) {
+			// empty transfer sent
+			sendZlp = false;
+		}
+
 		data += length;
 	}
 	return len;
@@ -679,12 +688,12 @@ uint32_t USBDeviceClass::sendControl(const void* _data, uint32_t len)
 		return length;
 	}
 
- 	while (len > 0)
- 	{
+	while (len > 0)
+	{
 		sent = armSend(EP0, data + pos, len);
 		pos += sent;
 		len -= sent;
- 	}
+	}
 
 	return length;
 }

From 7b881bbd5a1780eb821a07086a8790cf054d41c6 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 16 Nov 2015 04:38:28 +0000
Subject: [PATCH 062/124] HardwareSerial BUG Rx pin floating input,
 arduino/ArduinoCore-samd#48

---
 cores/arduino/Uart.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
index 3bf278228..914338b67 100644
--- a/cores/arduino/Uart.cpp
+++ b/cores/arduino/Uart.cpp
@@ -36,6 +36,7 @@ void Uart::begin(unsigned long baudrate)
 
 void Uart::begin(unsigned long baudrate, uint8_t config)
 {
+  pinMode(uc_pinRX,INPUT_PULLUP);//Rx pin set INPUT_PULLUP mode
   pinPeripheral(uc_pinRX, PIO_SERCOM);
   pinPeripheral(uc_pinTX, PIO_SERCOM);
 

From 4ad6141a4ebb8525cd85e09f909c0918096dbaed Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 16 Nov 2015 04:40:46 +0000
Subject: [PATCH 063/124] the pin mode is changed to INPUT mode,
 arduino/ArduinoCore-samd#28

---
 cores/arduino/wiring.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index e8361f7fb..adf8a6408 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -97,10 +97,10 @@ void init( void )
   PM->APBCMASK.reg |= PM_APBCMASK_ADC | PM_APBCMASK_DAC ;
 
   // Setup all pins (digital and analog) in INPUT mode (default is nothing)
-  for ( ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
-  {
-	  pinMode( ul, INPUT ) ;
-  }
+  // for ( ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
+  // {
+  //	  pinMode( ul, INPUT ) ;
+  // }
 
   // Initialize Analog Controller
   // Setting clock

From 911852046d07ec565ab0bcdb26dc6955eebd0fb9 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 24 Nov 2015 08:29:00 +0000
Subject: [PATCH 064/124] Fix warnings about deprecated recipe.ar.pattern and
 std=gnu11

---
 platform.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.txt b/platform.txt
index 6ab1cdde2..581dcf4d6 100644
--- a/platform.txt
+++ b/platform.txt
@@ -40,7 +40,7 @@ compiler.c.elf.flags=-Os -Wl,--gc-sections -save-temps
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-c -g -x assembler-with-cpp
 compiler.cpp.cmd=arm-none-eabi-g++
-compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -MMD
+compiler.cpp.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu++11 -ffunction-sections -fdata-sections -fno-threadsafe-statics -nostdlib --param max-inline-insns-single=500 -fno-rtti -fno-exceptions -MMD
 compiler.ar.cmd=arm-none-eabi-ar
 compiler.ar.flags=rcs
 compiler.objcopy.cmd=arm-none-eabi-objcopy

From 8c273eaab823a1e78cc74beafc730793a2d1e895 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 24 Nov 2015 08:34:45 +0000
Subject: [PATCH 065/124] Update Tools->Communications menu to work with
 PluggabeUSB

---
 boards.txt                    | 104 ++++++++++++++++++++++------------
 cores/arduino/USB/CDC.cpp     |   3 +
 cores/arduino/USB/USBCore.cpp |  25 +++++---
 cores/arduino/USB/USBDesc.h   |  42 +++++++++-----
 libraries/HID/HID.h           |   3 +
 5 files changed, 120 insertions(+), 57 deletions(-)

diff --git a/boards.txt b/boards.txt
index 1362c6f08..ce64f4437 100644
--- a/boards.txt
+++ b/boards.txt
@@ -53,25 +53,31 @@ mattairtech_mt_d21e_bl8k.build.mcu=cortex-m0plus
 mattairtech_mt_d21e_bl8k.build.f_cpu=48000000L
 mattairtech_mt_d21e_bl8k.build.usb_product="MT-D21E"
 mattairtech_mt_d21e_bl8k.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d21e_bl8k.build.board=CDC_HID_UART
+mattairtech_mt_d21e_bl8k.build.board=CDC_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart=CDC_HID_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.menu.com.cdc_uart=CDC_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.board=CDC_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.pid=0x0557
-mattairtech_mt_d21e_bl8k.menu.com.hid_uart=HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.hid_uart.build.board=HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.hid_uart.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid=CDC_HID
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.board=CDC_HID
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.menu.com.cdc=CDC_ONLY
 mattairtech_mt_d21e_bl8k.menu.com.cdc.build.board=CDC_ONLY
 mattairtech_mt_d21e_bl8k.menu.com.cdc.build.pid=0x0557
-mattairtech_mt_d21e_bl8k.menu.com.hid=HID_ONLY
-mattairtech_mt_d21e_bl8k.menu.com.hid.build.board=HID_ONLY
-mattairtech_mt_d21e_bl8k.menu.com.hid.build.pid=0x0856
+mattairtech_mt_d21e_bl8k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
+# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
+# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
+# mattairtech_mt_d21e_bl8k.menu.com.msd_uart=MSD_UART
+# mattairtech_mt_d21e_bl8k.menu.com.msd_uart.build.board=MSD_UART
+# mattairtech_mt_d21e_bl8k.menu.com.msd_uart.build.pid=0x0A0C
 mattairtech_mt_d21e_bl8k.menu.com.uart=UART_ONLY
 mattairtech_mt_d21e_bl8k.menu.com.uart.build.board=UART_ONLY
 mattairtech_mt_d21e_bl8k.menu.com.uart.build.pid=0x0856
@@ -115,25 +121,31 @@ mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam
 #mattairtech_mt_d21e_bl16k.build.f_cpu=48000000L
 #mattairtech_mt_d21e_bl16k.build.usb_product="MT-D21E"
 #mattairtech_mt_d21e_bl16k.build.usb_manufacturer="MattairTech"
-#mattairtech_mt_d21e_bl16k.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl16k.build.board=CDC_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart=CDC_HID_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_uart=CDC_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.board=CDC_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.pid=0x0557
-#mattairtech_mt_d21e_bl16k.menu.com.hid_uart=HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.hid_uart.build.board=HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid=CDC_HID
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.board=CDC_HID
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.pid=0x0856
 #mattairtech_mt_d21e_bl16k.menu.com.cdc=CDC_ONLY
 #mattairtech_mt_d21e_bl16k.menu.com.cdc.build.board=CDC_ONLY
 #mattairtech_mt_d21e_bl16k.menu.com.cdc.build.pid=0x0557
-#mattairtech_mt_d21e_bl16k.menu.com.hid=HID_ONLY
-#mattairtech_mt_d21e_bl16k.menu.com.hid.build.board=HID_ONLY
-#mattairtech_mt_d21e_bl16k.menu.com.hid.build.pid=0x0856
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
+# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
+# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
+# mattairtech_mt_d21e_bl16k.menu.com.msd_uart=MSD_UART
+# mattairtech_mt_d21e_bl16k.menu.com.msd_uart.build.board=MSD_UART
+# mattairtech_mt_d21e_bl16k.menu.com.msd_uart.build.pid=0x0A0C
 #mattairtech_mt_d21e_bl16k.menu.com.uart=UART_ONLY
 #mattairtech_mt_d21e_bl16k.menu.com.uart.build.board=UART_ONLY
 #mattairtech_mt_d21e_bl16k.menu.com.uart.build.pid=0x0856
@@ -178,25 +190,31 @@ mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam
 #mattairtech_mt_d21e_bl0k.build.f_cpu=48000000L
 #mattairtech_mt_d21e_bl0k.build.usb_product="MT-D21E"
 #mattairtech_mt_d21e_bl0k.build.usb_manufacturer="MattairTech"
-#mattairtech_mt_d21e_bl0k.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl0k.build.board=CDC_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_uart=CDC_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.board=CDC_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.pid=0x0557
-#mattairtech_mt_d21e_bl0k.menu.com.hid_uart=HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.hid_uart.build.board=HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid=CDC_HID
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.board=CDC_HID
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.pid=0x0856
 #mattairtech_mt_d21e_bl0k.menu.com.cdc=CDC_ONLY
 #mattairtech_mt_d21e_bl0k.menu.com.cdc.build.board=CDC_ONLY
 #mattairtech_mt_d21e_bl0k.menu.com.cdc.build.pid=0x0557
-#mattairtech_mt_d21e_bl0k.menu.com.hid=HID_ONLY
-#mattairtech_mt_d21e_bl0k.menu.com.hid.build.board=HID_ONLY
-#mattairtech_mt_d21e_bl0k.menu.com.hid.build.pid=0x0856
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
+# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
+# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
+# mattairtech_mt_d21e_bl0k.menu.com.msd_uart=MSD_UART
+# mattairtech_mt_d21e_bl0k.menu.com.msd_uart.build.board=MSD_UART
+# mattairtech_mt_d21e_bl0k.menu.com.msd_uart.build.pid=0x0A0C
 #mattairtech_mt_d21e_bl0k.menu.com.uart=UART_ONLY
 #mattairtech_mt_d21e_bl0k.menu.com.uart.build.board=UART_ONLY
 #mattairtech_mt_d21e_bl0k.menu.com.uart.build.pid=0x0856
@@ -230,25 +248,31 @@ mattairtech_mt_d11.build.mcu=cortex-m0plus
 mattairtech_mt_d11.build.f_cpu=48000000L
 mattairtech_mt_d11.build.usb_product="MT-D11"
 mattairtech_mt_d11.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d11.build.board=CDC_HID_UART
+mattairtech_mt_d11.build.board=CDC_UART
 mattairtech_mt_d11.menu.com.cdc_hid_uart=CDC_HID_UART
 mattairtech_mt_d11.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 mattairtech_mt_d11.menu.com.cdc_hid_uart.build.pid=0x0856
 mattairtech_mt_d11.menu.com.cdc_uart=CDC_UART
 mattairtech_mt_d11.menu.com.cdc_uart.build.board=CDC_UART
 mattairtech_mt_d11.menu.com.cdc_uart.build.pid=0x0557
-mattairtech_mt_d11.menu.com.hid_uart=HID_UART
-mattairtech_mt_d11.menu.com.hid_uart.build.board=HID_UART
-mattairtech_mt_d11.menu.com.hid_uart.build.pid=0x0856
 mattairtech_mt_d11.menu.com.cdc_hid=CDC_HID
 mattairtech_mt_d11.menu.com.cdc_hid.build.board=CDC_HID
 mattairtech_mt_d11.menu.com.cdc_hid.build.pid=0x0856
 mattairtech_mt_d11.menu.com.cdc=CDC_ONLY
 mattairtech_mt_d11.menu.com.cdc.build.board=CDC_ONLY
 mattairtech_mt_d11.menu.com.cdc.build.pid=0x0557
-mattairtech_mt_d11.menu.com.hid=HID_ONLY
-mattairtech_mt_d11.menu.com.hid.build.board=HID_ONLY
-mattairtech_mt_d11.menu.com.hid.build.pid=0x0856
+mattairtech_mt_d11.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+mattairtech_mt_d11.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+mattairtech_mt_d11.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
+# mattairtech_mt_d11.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# mattairtech_mt_d11.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# mattairtech_mt_d11.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
+# mattairtech_mt_d11.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d11.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d11.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
+# mattairtech_mt_d11.menu.com.msd_uart=MSD_UART
+# mattairtech_mt_d11.menu.com.msd_uart.build.board=MSD_UART
+# mattairtech_mt_d11.menu.com.msd_uart.build.pid=0x0A0C
 mattairtech_mt_d11.menu.com.uart=UART_ONLY
 mattairtech_mt_d11.menu.com.uart.build.board=UART_ONLY
 mattairtech_mt_d11.menu.com.uart.build.pid=0x0856
@@ -286,14 +310,18 @@ arduino_zero_native.menu.com.cdc_hid_uart=CDC_HID_UART
 arduino_zero_native.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 arduino_zero_native.menu.com.cdc_uart=CDC_UART
 arduino_zero_native.menu.com.cdc_uart.build.board=CDC_UART
-arduino_zero_native.menu.com.hid_uart=HID_UART
-arduino_zero_native.menu.com.hid_uart.build.board=HID_UART
 arduino_zero_native.menu.com.cdc_hid=CDC_HID
 arduino_zero_native.menu.com.cdc_hid.build.board=CDC_HID
 arduino_zero_native.menu.com.cdc=CDC_ONLY
 arduino_zero_native.menu.com.cdc.build.board=CDC_ONLY
-arduino_zero_native.menu.com.hid=HID_ONLY
-arduino_zero_native.menu.com.hid.build.board=HID_ONLY
+arduino_zero_native.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+arduino_zero_native.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+# arduino_zero_native.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# arduino_zero_native.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# arduino_zero_native.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# arduino_zero_native.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# arduino_zero_native.menu.com.msd_uart=MSD_UART
+# arduino_zero_native.menu.com.msd_uart.build.board=MSD_UART
 arduino_zero_native.menu.com.uart=UART_ONLY
 arduino_zero_native.menu.com.uart.build.board=UART_ONLY
 arduino_zero_native.menu.com.none=USB_UART_DISABLED
@@ -326,14 +354,18 @@ arduino_zero_native.build.pid=0x804d
 #arduino_zero_edbg.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 #arduino_zero_edbg.menu.com.cdc_uart=CDC_UART
 #arduino_zero_edbg.menu.com.cdc_uart.build.board=CDC_UART
-#arduino_zero_edbg.menu.com.hid_uart=HID_UART
-#arduino_zero_edbg.menu.com.hid_uart.build.board=HID_UART
 #arduino_zero_edbg.menu.com.cdc_hid=CDC_HID
 #arduino_zero_edbg.menu.com.cdc_hid.build.board=CDC_HID
 #arduino_zero_edbg.menu.com.cdc=CDC_ONLY
 #arduino_zero_edbg.menu.com.cdc.build.board=CDC_ONLY
-#arduino_zero_edbg.menu.com.hid=HID_ONLY
-#arduino_zero_edbg.menu.com.hid.build.board=HID_ONLY
+#arduino_zero_edbg.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+#arduino_zero_edbg.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+# arduino_zero_edbg.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# arduino_zero_edbg.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# arduino_zero_edbg.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# arduino_zero_edbg.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# arduino_zero_edbg.menu.com.msd_uart=MSD_UART
+# arduino_zero_edbg.menu.com.msd_uart.build.board=MSD_UART
 #arduino_zero_edbg.menu.com.uart=UART_ONLY
 #arduino_zero_edbg.menu.com.uart.build.board=UART_ONLY
 #arduino_zero_edbg.menu.com.none=USB_UART_DISABLED
diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index 0f1016848..14dd2e31b 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -18,6 +18,7 @@
 
 #include <Arduino.h>
 #include <Reset.h> // Needed for auto-reset with 1200bps port touch
+#include "USBDesc.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -59,7 +60,9 @@ static volatile LineInfo _usbLineInfo = {
 };
 
 static CDCDescriptor _cdcInterface = {
+#if !defined(CDC_ONLY)
 	D_IAD(0, 2, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
+#endif
 
 	// CDC communication interface
 	D_INTERFACE(CDC_ACM_INTERFACE, 1, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index aad0fd38e..cbecacd1f 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -20,6 +20,7 @@
 
 #include "SAMD21_USBDevice.h"
 #include "PluggableUSB.h"
+#include "USBDesc.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -66,8 +67,9 @@ const uint8_t STRING_MANUFACTURER[] = USB_MANUFACTURER;
 
 
 //	DEVICE DESCRIPTOR
-const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
 const DeviceDescriptor USB_DeviceDescriptor = D_DEVICE(0x00, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
+const DeviceDescriptor USB_DeviceDescriptorB = D_DEVICE(0xEF, 0x02, 0x01, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
+const DeviceDescriptor USB_DeviceDescriptorC = D_DEVICE(0x02, 0x00, 0x00, 64, USB_VID, USB_PID, 0x100, IMANUFACTURER, IPRODUCT, ISERIAL, 1);
 
 //==================================================================
 
@@ -170,7 +172,7 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 {
 	uint8_t t = setup.wValueH;
 	uint8_t desc_length = 0;
-	bool _cdcComposite;
+	//bool _cdcComposite;
 	int ret;
 	const uint8_t *desc_addr = 0;
 
@@ -188,10 +190,17 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 
 	if (t == USB_DEVICE_DESCRIPTOR_TYPE)
 	{
-		if (setup.wLength == 8)
-			_cdcComposite = 1;
-
-		desc_addr = _cdcComposite ?  (const uint8_t*)&USB_DeviceDescriptorB : (const uint8_t*)&USB_DeviceDescriptor;
+		//if (setup.wLength == 8)
+		//	_cdcComposite = 1;
+
+		//desc_addr = _cdcComposite ?  (const uint8_t*)&USB_DeviceDescriptorB : (const uint8_t*)&USB_DeviceDescriptor;
+#if defined(IAD_PRESENT)
+		desc_addr = (const uint8_t*)&USB_DeviceDescriptorB;
+#elif defined(CDC_ONLY)
+		desc_addr = (const uint8_t*)&USB_DeviceDescriptorC;
+#else
+		desc_addr = (const uint8_t*)&USB_DeviceDescriptor;
+#endif
 
 		if (*desc_addr > setup.wLength) {
 			desc_length = setup.wLength;
@@ -785,11 +794,11 @@ bool USBDeviceClass::handleStandardSetup(USBSetup &setup)
 			initEndpoints();
 			_usbConfiguration = setup.wValueL;
 
-			#if defined(CDC_ENABLED)
+#if defined(CDC_ENABLED)
 			// Enable interrupt for CDC reception from host (OUT packet)
 			usbd.epBank1EnableTransferComplete(CDC_ENDPOINT_ACM);
 			usbd.epBank0EnableTransferComplete(CDC_ENDPOINT_OUT);
-			#endif
+#endif
 
 			sendZlp(0);
 			return true;
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index 645704941..2dd9bc6bd 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -19,32 +19,48 @@
 #ifndef __USBDESC_H__
 #define __USBDESC_H__
 
-// CDC or HID can be enabled together.
+#if !defined(ARDUINO_USB_UART_DISABLED) && !defined(ARDUINO_UART_ONLY)
 #define PLUGGABLE_USB_ENABLED
+#endif
 
-// These are now controlled by the boards.txt menu system
-#if defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART)
-  #define CDC_ENABLED
-  #define HID_ENABLED
-#elif defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART)
-  #define CDC_ENABLED
-#elif defined(ARDUINO_HID_ONLY) || defined(ARDUINO_HID_UART)
-  #define HID_ENABLED
-#elif defined(ARDUINO_USB_UART_DISABLED) || defined(ARDUINO_UART_ONLY)
-  // do nothing
+// These are controlled by the boards.txt menu system.
+// Now that there is Pluggable USB, these will be eliminated
+// once an alternate method for USB PID allocation is found.
+#if defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
+#define CDC_ENABLED
+#if defined(ARDUINO_CDC_ONLY)
+#define CDC_ONLY
 #else
-  #error "USBDesc.h: CDC_ENABLED and HID_ENABLED are now controlled by the boards.txt menu system"
+#define IAD_PRESENT
+#endif
+#endif
+
+#if defined(ARDUINO_HID_ONLY) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
+#define HID_ENABLED
+#endif
+
+#if defined(ARDUINO_MIDI_ONLY) || defined(ARDUINO_MIDI_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
+#define MIDI_ENABLED
+#define IAD_PRESENT
+#endif
+
+#if defined(ARDUINO_MSD_ONLY) || defined(ARDUINO_MSD_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
+#define MSD_ENABLED
 #endif
 
+
 #ifdef CDC_ENABLED
 #define CDC_INTERFACE_COUNT 2
 #define CDC_ENPOINT_COUNT 3
+#else
+#define CDC_INTERFACE_COUNT	0
+#define CDC_ENPOINT_COUNT	0
 #endif
 
 // CDC
 #define CDC_ACM_INTERFACE	0	// CDC ACM
 #define CDC_DATA_INTERFACE	1	// CDC Data
-#define CDC_FIRST_ENDPOINT  1
+#define CDC_FIRST_ENDPOINT	1
 #define CDC_ENDPOINT_ACM	1
 #define CDC_ENDPOINT_OUT	2
 #define CDC_ENDPOINT_IN		3
diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index d086593b6..f0c6ad9ae 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -22,6 +22,9 @@
 #include <stdint.h>
 #include <Arduino.h>
 #include "USB/PluggableUSB.h"
+#if !defined(HID_ENABLED)
+#error Please select an appropriate option that includes HID in the Tools->Communications menu.
+#endif
 
 #if defined(USBCON)
 

From 778e0ef84b581974b0fa012bac4812ef1ea44150 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 24 Nov 2015 08:36:10 +0000
Subject: [PATCH 066/124] Update documentation for release 1.6.6-mt1

---
 README.md                         | 209 +++++++++++++++++++-----------
 variants/MT_D11/variant.cpp       |  30 ++---
 variants/MT_D21E/variant.cpp      |  48 +++----
 variants/arduino_zero/variant.cpp |   2 +-
 4 files changed, 170 insertions(+), 119 deletions(-)

diff --git a/README.md b/README.md
index 6c1707d8c..e94ca21e6 100644
--- a/README.md
+++ b/README.md
@@ -11,15 +11,32 @@ This core is intended to be installed using Boards Manager (see below). To updat
 previous version, click on MattairTech SAMD Boards in Boards Manager, then click Update.
 
 
-## What's New
-
-* Added support for the MT-D11 (ATSAMD11D14AM).
-* Reduced code size (see 'Code Size and RAM Usage' below).
-* Any combination of CDC, HID, or UART can be used (or no combination), by using the Tools->Communication menu.
-* Note that switching between CDC and CDC+HID will require re-selecting the COM port.
-* More detailed memory usage at end of compilation (see below).
-* Merged in upstream updates. Fixed Wire interrupt.
-* Tested all ADC, DAC, external interrupts, PWM outputs, serial, SPI, and Wire instances/pins.
+## What's New (1.6.6-mt1, November 24, 2015)
+
+* New documentation section 'Special Notes'. Please read!
+* Updated ASCII pinouts to be more readable and less ambiguous.
+* Updated the Signed driver for Windows (extras directory).
+  * adds CDC/MIDI/HID, CDC/MSD/HID, and CDC/MSD/MIDI/HID composite USB devices.
+  * Of the above, currently only CDC/MIDI/HID is usable (see MIDIUSB library).
+* Merged in changes from upstream past SAMD CORE 1.6.2 release
+  * Added SPI.transfer16(..) method
+  * Bugfix: added missing Serial.begin(baud, config) method. Thanks @tuxedo0801
+  * the pin mode is changed to INPUT mode, arduino/ArduinoCore-samd#28
+  * HardwareSerial BUG Rx pin floating input, arduino/ArduinoCore-samd#48
+  * Send a ZLP if data size is multiple of EPX_SIZE for USB sends, arduino/ArduinoCore-samd#63
+  * Print not aborting on write failure, changelog update
+  * Tone fix for arduino/ArduinoCore-samd#59 and optimizations
+  * Fix warnings about deprecated recipe.ar.pattern
+* Merged in changes from upstream SAMD CORE 1.6.2 2015.11.03
+  * Fixed bug in delay calculations
+  * Fixed deadlock conditions in Wire. Thanks Erin Tomson
+  * Print not aborting on write() failure. Thanks @stickbreaker
+  * SPI can now be configured in variants. Thanks @aethaniel
+  * Implemented Wire.end
+  * Implemented Wire.setClock. Thanks @PaoloP74
+  * Wire: allow scanning bus via beginTransmission-endTransmission
+  * USB Device: big refactoring and bug fix
+  * USB Device: added PluggableUSB interface
 
 
 ## Summary
@@ -44,6 +61,33 @@ Operating Voltage	|	3.3V (Do not connect voltages higher than 3.3V!)				|	3.3V (
 DC Current per I/O Pin	|	7 mA										|	7 mA
 
 
+## Special Notes
+
+* Boards Manager may require opening twice (with possibly a delay in between) to see some updates.
+
+* Errors when compiling, uploading, or burning the bootloader
+  Be sure to install the Arduino samd core before installing the MattairTech samd core. If you have problems upgrading
+  the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
+  Use Arduino core 1.6.2 or above.
+
+* Tools->Communications menu
+  Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
+  must match the included libraries. For example, when including the HID and Keyboard libraries, you must select an
+  option that includes HID (ie: CDC_HID_UART). This menu is currently needed to select the USB PID that matches the
+  USB device configuration (needed for Windows). This may become automatic in a future release.
+
+  * Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
+  * Different combinations of USB devices will result in different COM port assingments in Windows.
+
+* Incude platform specific libraries
+  You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
+
+* Differences from Arduino in versioning
+  The MattairTech ArduinoCore-samd version currently tracks the IDE version. In some cases, it may indicate the
+  minimum IDE version. This is the case for both 1.6.5-mtX and 1.6.6-mtX (which corresponds to SAMD CORE 1.6.2).
+  1.6.6-mt1 corresponds to Arduino SAMD CORE 1.6.2 plus some pull requests.
+
+
 ## Pin Configurations
 
 Most pins have multiple configurations available (even analog pins). For example, pin A10 on the MT-D21E can be an analog
@@ -54,50 +98,50 @@ but without the 'A' (with the usable pins starting at 2). DO NOT connect voltage
 
 ```
 ============================= MattairTech MT-D21E (ATsamd21eXXa) ========================
-Other   INT    PWM   Digital  Analog                      Digital  PWM     INT    Other
+Other  INT     PWM   Digital  Analog                     Digital  PWM      INT      Other
 =========================================================================================
-                                       -------------------
-Xin32                                 | A0            RST |                      Reset
-Xout32                                | A1            NC  |
-DAC                    2    2 (ADC0)  | A2            NC  |
-REF                    3    3 (ADC1)  | A3            A31 |  31  TCC1[1]  INT11  SWD IO *
-       INT4            4    4 (ADC4)  | A4            A30 |  30  TCC1[0]  INT10  SWD CLK
-       INT5            5    5 (ADC5)  | A5            NC  |
-                       6    6 (ADC6)  | A6            A28 |  28           INT8   LED
-VDIV                   7    7 (ADC7)  | A7            A27 |  27           INT15  Button A
-       INTNMI TCC0[0]  8    8 (ADC16) | A8            A23 |  23  TC4[1]   INT7   SPI SS
-       INT9   TCC0[1]  9    9 (ADC17) | A9            A22 |  22  TC4[0]   INT6   SPI MISO
-TX (1)        TCC0[2]  10   10 (ADC18)| A10           A19 |  19           INT3   SPI SCK
-RX (1)        TCC0[3]  11   11 (ADC19)| A11           A18 |  18           INT2   SPI MOSI
-TX (2) INT14  TC3[0]   14             | A14           A17 |  17  TCC2[1]  INT1   I2C/SCL
-RX (2)        TC3[1]   15             | A15           A16 |  16  TCC2[0]  INT0   I2C/SDA
-                                      | NC            NC  |
-                                      | NC            NC  |
-                                      | Vbus          3.3V|   * Button B available on 31
-USB D-                                | A24-  _____   Vcc |
-USB D+                                | A25+ |     |  Vin |
-                                      | Gnd  | USB |  Gnd |
-                                       -------------------
+                                      -------------------
+Xin32                                | A0            RST |                          Reset
+Xout32                               | A1            NC  |
+DAC                     2   2(ADC0)  | A2            NC  |
+REF                     3   3(ADC1)  | A3            A31 | 31  31(TCC11) 31(INT11) SWDIO*
+     4(INT4)            4   4(ADC4)  | A4            A30 | 30  30(TCC10) 30(INT10) SWDCLK
+     5(INT5)            5   5(ADC5)  | A5            NC  |
+                        6   6(ADC6)  | A6            A28 | 28            28(INT8)   LED
+VDIV                    7   7(ADC7)  | A7            A27 | 27            27(INT15)  BTNA
+    8(INTNMI) 8(TCC00)  8   8(ADC16) | A8            A23 | 23  23(TC41)  23(INT7)   SS
+    9(INT9)   9(TCC01)  9   9(ADC17) | A9            A22 | 22  22(TC40)  22(INT6)   MISO
+TX1          10(TCC02)  10  10(ADC18)| A10           A19 | 19            19(INT3)   SCK
+RX1          11(TCC03)  11  11(ADC19)| A11           A18 | 18            18(INT2)   MOSI
+TX2 14(INT14) 14(TC30)  14           | A14           A17 | 17  17(TCC21)  17(INT1)  SCL
+RX2           15(TC31)  15           | A15           A16 | 16  16(TCC20)  16(INT0)  SDA
+                                     | NC            NC  |
+                                     | NC            NC  |
+                                     | Vbus          3.3V|   * Button B available on 31
+USB D-                               | A24-  _____   Vcc |
+USB D+                               | A25+ |     |  Vin |
+                                     | Gnd  | USB |  Gnd |
+                                      -------------------
 ```
 
 ### SAMD11 (MT-D11)
 
 ```
-============================= MattairTech MT-D11 (ATsamd11D14AM) ========================
-Other   INT    PWM   Digital  Analog                      Digital  PWM   INT    Other
+=========================== MattairTech MT-D11 (ATsamd11D14AM) ==========================
+Other  INT   PWM   Digital  Analog                    Digital   PWM      INT     Other
 =========================================================================================
-                                       -------------------
-DAC                    2    2 (ADC0)  | A2   | USB |  Gnd |
-REF                    3    3 (ADC1)  | A3   |     |  Vcc |
-VDIV   INT4   TCC0[0]  4    4 (ADC2)  | A4    -----   A31 |  31  TC2[1]  INT3  RX / SWDIO
-       INT5   TCC0[1]  5    5 (ADC3)  | A5            A30 |  30  TC2[0]       TX / SWDCLK
-              TCC0[2]  6    6 (ADC4)  | A6            A27 |  27          INT7
-              TCC0[3]  7    7 (ADC5)  | A7            A23 |  23                 I2C/SCL
-SPI MOSI  INT2         10   10 (ADC8) | A10           A22 |  22          INT6   I2C/SDA
-SPI SCK                11   11 (ADC9) | A11           A17 |  17  TC1[1]
-SPI MISO  INTNMI       14   14 (ADC6) | A14           A16 |  16  TC1[0]  INT0   LED
-Button    INT1         15   15 (ADC7) | A15           RST |                     Reset
-                                       -------------------
+                                    -------------------
+DAC                   2   2(ADC0)  | A2   | USB |  Gnd |
+REF                   3   3(ADC1)  | A3   |     |  Vcc |
+   4(INT4)  4(TCC00)  4   4(ADC2)  | A4    -----   A31 | 31  31(TC21)  31(INT3)  RX/SWDIO
+   5(INT5)  5(TCC01)  5   5(ADC3)  | A5            A30 | 30  30(TC20)           TX/SWDCLK
+            6(TCC02)  6   6(ADC4)  | A6            A27 | 27            27(INT7)
+            7(TCC03)  7   7(ADC5)  | A7            A23 | 23                      SCL
+MOSI  10(INT2)        10  10(ADC8) | A10           A22 | 22            22(INT6)  SDA
+SCK                   11  11(ADC9) | A11           A17 | 17  17(TC11)
+MISO  14(INTNMI)      14  14(ADC6) | A14           A16 | 16  16(TC10)  16(INT0)  LED
+BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |                         Reset
+                                    -------------------
 ```
 
 #### All pins operate at 3.3 volts. DO NOT connect voltages higher than 3.3V!
@@ -131,6 +175,8 @@ Button    INT1         15   15 (ADC7) | A15           RST |
 * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
 * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
 * SPI communication using the SPI library.
+* Note that the SPI library will set SS as an output.
+* On the MT-D11, the button must be configured as reset (default) when using SPI.
 * **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
 * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
 * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
@@ -144,7 +190,7 @@ Button    INT1         15   15 (ADC7) | A15           RST |
 * The upper end of the analog measurement range can be changed using the analogReference() function.
 * **Reset: Bring this line LOW to reset the microcontroller.**
 
-### MT-D21E and MT-D11 Board Configuration
+### MT-D21E and MT-D11 Board Configuration Notes
 
 * The 32.768KHz crystal is used by the Arduino core, so it MUST be connected via the solder jumpers.
 * Note that the sketch may still run without the crystal attached, but the clock speed will be very inaccurate.
@@ -154,6 +200,7 @@ Button    INT1         15   15 (ADC7) | A15           RST |
 * Button A should be connected via the solder jumper. The debouncing capacitor should also be connected.
 * Button B (MT-D21E only) is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
 * A reference voltage can be connected to AREF. In this case, the capacitors should be enabled via the solder jumper.
+* On the MT-D11, BTN is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
 
 
 ## Serial Monitor
@@ -173,7 +220,7 @@ the Reset button will reset the SAMD chip, which in turn will reset USB communic
 that if the serial monitor is open, it will be necessary to close and re-open it to restart communication.
 
 
-## Code Size and RAM Usage
+## Code Size and RAM Usage (1.6.5-mt2)
 
 Sketch and Configuration    | MT-D21E (Flash + RAM) | MT-D11 (Flash + RAM)
 ----------------------------|-----------------------|-----------------------
@@ -217,15 +264,16 @@ everything else (ie: W) resides in flash (in most cases).
 
 #### Windows
 
-There are two "drivers", a CDC only driver for the bootloader, and a CDC-HID driver for Arduino sketches (optional).
-The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP3), Vista, 7, and 8.
+There are currently four USB composite device combinations that include CDC as well as a CDC only device.
+Drivers are required for each of these five devices. The CDC only driver is required by the bootloader.
+The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP3), Vista, 7, 8, and 10.
 
 1. If you do not already have the SAM-BA bootloader installed, see below.
 2. Download https://www.mattairtech.com/software/MattairTech_CDC_Driver_Signed.zip and unzip into any folder.
 3. Plug in the board while holding down button A to enter the bootloader. The LED should light.
 4. Windows will detect the board. Point the installer to the folder from above to install the bootloader driver.
 5. If you don't intend on using Arduino, you can skip the rest of this list. See Using Bossac Standalone below.
-6. If you do not already have the test firmware installed, see Using Bossac Standalone below.
+6. If you do not already have the test firmware installed (comes preinstalled), see Using Bossac Standalone below.
 7. Press the reset button to run the test firmware (blink sketch with CDC-HID).
 8. Windows will detect the board. Point the installer to the folder from above to install the sketch driver.
 9. Continue with SAMD Core Installation below.
@@ -243,7 +291,7 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 
 1. As of this writing, only the 256 KB chip variants work with the OS X version of the upload tool, bossac.
 2. First, you will need to open boards.txt and change mattairtech_mt_d21e_bl8k.upload.tool to equal arduino:bossac.
-3. Open platform.txt and change tools.bossac.path to equal{runtime.tools.bossac-1.5-arduino.path}.
+3. Open platform.txt and change tools.bossac.path to equal{runtime.tools.bossac-1.6.1-arduino.path}.
 4. No driver installation is needed. You may get a dialog box asking if you wish to open the “Network Preferences�:
    * Click the "Network Preferences..." button, then click "Apply".
    * The board will show up as “Not Configured�, but it will work fine.
@@ -252,14 +300,15 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 ### SAMD Core Installation
 
 * To update from a previous version, click on MattairTech SAMD Boards in Boards Manager, then click Update.
+* Boards Manager may require opening twice (with possibly a delay in between) to see some updates.
 
-1. The MattairTech SAMD Core requires Arduino 1.6.5+.
-2. In the Arduino IDE 1.6.5+, click File->Preferences.
+1. The MattairTech SAMD Core requires Arduino 1.6.6+ (1.6.5-mtX required IDE 1.6.5).
+2. In the Arduino IDE, click File->Preferences.
 3. Click the button next to Additional Boards Manager URLs.
 4. Add https://www.mattairtech.com/software/arduino/package_MattairTech_index.json.
 5. Save preferences, then open the Boards Manager.
-6. Install the Arduino SAMD Boards package.
-7. Install the MattairTech SAMD Boards package.
+6. Install the Arduino SAMD Boards package. Use version 1.6.2 or higher with 1.6.6-mtX.
+7. Install the MattairTech SAMD Boards package (1.6.6-mtX).
 8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E (or MT-D11).
 9. Select the processor with the now visible Tools->Processor menu.
 10. If you do not already have the bootloader or blink sketch installed, see SAM-BA USB CDC Bootloader below.
@@ -453,40 +502,42 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 
 ## Possible Future Additions
 
-* Port Servo library
-* Features for lower power consumption
+* USB Host mode CDC ACM
+* Features for lower power consumption (library?)
+* Enhanced SD card library
+* Optional use of single on-board LED as USB activity LED
 * Replace pulse with timer capture
-* MIDI USB Device Class
 * MSC (Mass Storage) USB Device Class
-* More detailed memory usage statistics
-* Some kind of stack overflow detection. Estimation on stack usage.
-* Analog calibration
 * Polyphonic tone
 * Better OS X support
-* Drivers for some hardware I plan on using (TFT LCD, motor controller, IR decoder, several I2C (Wire) sensor devices, I2S device, etc.)
+* Libraries for some hardware I plan on using:
+  TFT LCD
+  Motor controller
+  IR decoder
+  I2S DAC/AMP and I2S MEMS microphone
+  Battery management IC
+  XBee/Xbee Pro devices
+  RS485
+  Several I2C (Wire) sensor devices: 
+    Accelerometer/gyro/magnetometer
+    Barometer/altimeter
+    Humidity/temperature
+    Light/color sensor
 
 
 ## ChangeLog
 
 * 1.6.6-mt1:
-
-  * Merged in changes from upstream SAMD CORE 1.6.3
-    * Added SPI.transfer16(..) method
-    * Bugfix: added missing Serial.begin(baud, config) method. Thanks @tuxedo0801
-    
-  * Merged in changes from upstream SAMD CORE 1.6.2 2015.11.03
-    * Fixed bug in delay calculations
-    * Fixed deadlock conditions in Wire. Thanks Erin Tomson
-    * Print not aborting on write() failure. Thanks @stickbreaker
-    * SPI can now be configured in variants. Thanks @aethaniel
-    * Implemented Wire.end
-    * Implemented Wire.setClock. Thanks @PaoloP74
-    * Wire: allow scanning bus via beginTransmission-endTransmission
-    * USB Device: big refactoring and bug fix
-    * USB Device: added PluggableUSB interface
+  * See 'What's New' above.
 
 * 1.6.5-mt2:
-  * See 'What's New' above.
+  * Added support for the MT-D11 (ATSAMD11D14AM).
+  * Reduced code size (see 'Code Size and RAM Usage' below).
+  * Any combination of CDC, HID, or UART can be used (or no combination), by using the Tools->Communication menu.
+  * Note that switching between CDC and CDC+HID will require re-selecting the COM port.
+  * More detailed memory usage at end of compilation (see below).
+  * Merged in upstream updates. Fixed Wire interrupt.
+  * Tested all ADC, DAC, external interrupts, PWM outputs, serial, SPI, and Wire instances/pins.
 
 * 1.6.5-mt1:
   * Initial release
diff --git a/variants/MT_D11/variant.cpp b/variants/MT_D11/variant.cpp
index f69bc5810..d0cd1a7d5 100644
--- a/variants/MT_D11/variant.cpp
+++ b/variants/MT_D11/variant.cpp
@@ -22,21 +22,21 @@
  */
 
 /*
-============================= MattairTech MT-D11 (ATsamd11D14AM) ========================
-Other   INT    PWM   Digital  Analog                      Digital  PWM   INT    Other
+=========================== MattairTech MT-D11 (ATsamd11D14AM) ==========================
+Other  INT   PWM   Digital  Analog                    Digital   PWM      INT     Other
 =========================================================================================
-                                       -------------------
-DAC                    2    2 (ADC0)  | A2   | USB |  Gnd |
-REF                    3    3 (ADC1)  | A3   |     |  Vcc |
-VDIV   INT4   TCC0[0]  4    4 (ADC2)  | A4    -----   A31 |  31  TC2[1]  INT3  RX / SWDIO
-       INT5   TCC0[1]  5    5 (ADC3)  | A5            A30 |  30  TC2[0]       TX / SWDCLK  
-              TCC0[2]  6    6 (ADC4)  | A6            A27 |  27          INT7
-              TCC0[3]  7    7 (ADC5)  | A7            A23 |  23                 I2C/SCL
-SPI MOSI  INT2         10   10 (ADC8) | A10           A22 |  22          INT6   I2C/SDA
-SPI SCK                11   11 (ADC9) | A11           A17 |  17  TC1[1]
-SPI MISO  INTNMI       14   14 (ADC6) | A14           A16 |  16  TC1[0]  INT0   LED
-Button    INT1         15   15 (ADC7) | A15           RST |                     Reset
-                                       -------------------
+                                    -------------------
+DAC                   2   2(ADC0)  | A2   | USB |  Gnd |
+REF                   3   3(ADC1)  | A3   |     |  Vcc |
+   4(INT4)  4(TCC00)  4   4(ADC2)  | A4    -----   A31 | 31  31(TC21)  31(INT3)  RX/SWDIO
+   5(INT5)  5(TCC01)  5   5(ADC3)  | A5            A30 | 30  30(TC20)           TX/SWDCLK
+            6(TCC02)  6   6(ADC4)  | A6            A27 | 27            27(INT7)
+            7(TCC03)  7   7(ADC5)  | A7            A23 | 23                      SCL
+MOSI  10(INT2)        10  10(ADC8) | A10           A22 | 22            22(INT6)  SDA
+SCK                   11  11(ADC9) | A11           A17 | 17  17(TC11)
+MISO  14(INTNMI)      14  14(ADC6) | A14           A16 | 16  16(TC10)  16(INT0)  LED
+BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |                         Reset
+                                    -------------------
 Most pins have multiple configurations available (even analog pins). For example, pin
 4 can be an analog input, a PWM output, Digital I/O, or interrupt input. These
 always reference the pin number printed on the board but without the 'A' (with the
@@ -269,7 +269,7 @@ SERCOM sercom0( SERCOM0 ) ;
 SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 
-#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART)
+#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
 void SERCOM1_Handler()
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index fa835c7c5..841733b84 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -23,30 +23,30 @@
 
 /*
 ============================= MattairTech MT-D21E (ATsamd21eXXa) ========================
-Other   INT    PWM   Digital  Analog                      Digital  PWM     INT    Other
+Other  INT     PWM   Digital  Analog                     Digital  PWM      INT      Other
 =========================================================================================
-                                       -------------------
-Xin32                                 | A0            RST |                      Reset
-Xout32                                | A1            NC  |
-DAC                    2    2 (ADC0)  | A2            NC  |
-REF                    3    3 (ADC1)  | A3            A31 |  31  TCC1[1]  INT11  SWD IO *
-       INT4            4    4 (ADC4)  | A4            A30 |  30  TCC1[0]  INT10  SWD CLK
-       INT5            5    5 (ADC5)  | A5            NC  |
-                       6    6 (ADC6)  | A6            A28 |  28           INT8   LED
-VDIV                   7    7 (ADC7)  | A7            A27 |  27           INT15  Button A
-       INTNMI TCC0[0]  8    8 (ADC16) | A8            A23 |  23  TC4[1]   INT7   SPI SS
-       INT9   TCC0[1]  9    9 (ADC17) | A9            A22 |  22  TC4[0]   INT6   SPI MISO
-TX (1)        TCC0[2]  10   10 (ADC18)| A10           A19 |  19           INT3   SPI SCK
-RX (1)        TCC0[3]  11   11 (ADC19)| A11           A18 |  18           INT2   SPI MOSI
-TX (2) INT14  TC3[0]   14             | A14           A17 |  17  TCC2[1]  INT1   I2C/SCL
-RX (2)        TC3[1]   15             | A15           A16 |  16  TCC2[0]  INT0   I2C/SDA
-                                      | NC            NC  |
-                                      | NC            NC  |
-                                      | Vbus          3.3V|   * Button B available on 31
-USB D-                                | A24-  _____   Vcc |
-USB D+                                | A25+ |     |  Vin |
-                                      | Gnd  | USB |  Gnd |
-                                       -------------------
+                                      -------------------
+Xin32                                | A0            RST |                          Reset
+Xout32                               | A1            NC  |
+DAC                     2   2(ADC0)  | A2            NC  |
+REF                     3   3(ADC1)  | A3            A31 | 31  31(TCC11) 31(INT11) SWDIO*
+     4(INT4)            4   4(ADC4)  | A4            A30 | 30  30(TCC10) 30(INT10) SWDCLK
+     5(INT5)            5   5(ADC5)  | A5            NC  |
+                        6   6(ADC6)  | A6            A28 | 28            28(INT8)   LED
+VDIV                    7   7(ADC7)  | A7            A27 | 27            27(INT15)  BTNA
+    8(INTNMI) 8(TCC00)  8   8(ADC16) | A8            A23 | 23  23(TC41)  23(INT7)   SS
+    9(INT9)   9(TCC01)  9   9(ADC17) | A9            A22 | 22  22(TC40)  22(INT6)   MISO
+TX1          10(TCC02)  10  10(ADC18)| A10           A19 | 19            19(INT3)   SCK
+RX1          11(TCC03)  11  11(ADC19)| A11           A18 | 18            18(INT2)   MOSI
+TX2 14(INT14) 14(TC30)  14           | A14           A17 | 17  17(TCC21)  17(INT1)  SCL
+RX2           15(TC31)  15           | A15           A16 | 16  16(TCC20)  16(INT0)  SDA
+                                     | NC            NC  |
+                                     | NC            NC  |
+                                     | Vbus          3.3V|   * Button B available on 31
+USB D-                               | A24-  _____   Vcc |
+USB D+                               | A25+ |     |  Vin |
+                                     | Gnd  | USB |  Gnd |
+                                      -------------------
 Most pins have multiple configurations available (even analog pins). For example, pin
 10 can be an analog input, a PWM output, Digital I/O, or the TX pin of 'Serial1'. These
 always reference the pin number printed on the board but without the 'A' (with the
@@ -257,7 +257,7 @@ SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 SERCOM sercom3( SERCOM3 ) ;
 
-#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART)
+#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp
index b5f572de7..88e7a42d1 100644
--- a/variants/arduino_zero/variant.cpp
+++ b/variants/arduino_zero/variant.cpp
@@ -288,7 +288,7 @@ SERCOM sercom3( SERCOM3 ) ;
 SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 
-#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART)
+#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 Uart Serial( SERCOM_INSTANCE_SERIAL, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;
 void SERCOM0_Handler()

From 6e2034c5dcc34d5130a9f24dfa016e173b8391e3 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 24 Nov 2015 08:37:46 +0000
Subject: [PATCH 067/124] Added signed drivers to extras directory

---
 extras/MattairTech_CDC.inf            | 103 ++++++++++++++++++++++++++
 extras/mattairtech_cdc.cat            | Bin 0 -> 8252 bytes
 extras/pack.pullrequest.bash          |  33 ---------
 extras/pack.release.bash              |  16 ----
 extras/package_index.json.PR.template |  54 --------------
 5 files changed, 103 insertions(+), 103 deletions(-)
 create mode 100644 extras/MattairTech_CDC.inf
 create mode 100644 extras/mattairtech_cdc.cat
 delete mode 100755 extras/pack.pullrequest.bash
 delete mode 100755 extras/pack.release.bash
 delete mode 100644 extras/package_index.json.PR.template

diff --git a/extras/MattairTech_CDC.inf b/extras/MattairTech_CDC.inf
new file mode 100644
index 000000000..7c595b055
--- /dev/null
+++ b/extras/MattairTech_CDC.inf
@@ -0,0 +1,103 @@
+;************************************************************
+; Windows USB CDC ACM Setup File
+; Copyright (c) 2000 Microsoft Corporation
+; Updated November 23, 2015
+;************************************************************
+
+[DefaultInstall]
+CopyINF=MattairTech_CDC.inf
+
+[Version]
+Signature="$Windows NT$"
+Class=Ports
+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
+Provider=%MFGNAME%
+DriverPackageDisplayName=%DriverPackageDisplayName%
+CatalogFile=MattairTech_CDC.cat
+DriverVer=11/23/2015,1.1.2.0
+
+[Manufacturer]
+%MFGNAME%=DeviceList, NTx86, NTamd64, NTia64
+
+[SourceDisksNames]
+
+[SourceDisksFiles]
+
+[DestinationDirs]
+FakeModemCopyFileSection=12
+DefaultDestDir=12
+
+[DriverInstall]
+Include=mdmcpq.inf,usb.inf
+CopyFiles=FakeModemCopyFileSection
+AddReg=DriverAddReg
+
+[DriverAddReg]
+HKR,,DevLoader,,*ntkern 
+HKR,,NTMPDriver,,usbser.sys 
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[DriverInstall.Services]
+Include=mdmcpq.inf
+AddService=usbser, 0x00000002, DriverService
+
+[DriverService]
+DisplayName=%ServiceName%
+ServiceType=1
+StartType=3
+ErrorControl=1
+ServiceBinary=%12%\usbser.sys
+LoadOrderGroup=Base
+
+
+;------------------------------------------------------------------------------
+;  Vendor and Product ID Definitions
+;------------------------------------------------------------------------------
+; When developing your USB device, the VID and PID used in the PC side
+; application program and the firmware on the microcontroller must match.
+; Modify the below line to use your VID and PID.  Use the format as shown below.
+; Note: One INF file can be used for multiple devices with different VID and PIDs.
+; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
+;------------------------------------------------------------------------------
+[DeviceList]
+%DESCRIPTION.CDC%=DriverInstall, USB\VID_16D0&PID_0557
+%DESCRIPTION.CDC.HID%=DriverInstall, USB\VID_16D0&PID_0856&MI_00
+%DESCRIPTION.CDC.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B34&MI_00
+%DESCRIPTION.CDC.MSD.HID%=DriverInstall, USB\VID_16D0&PID_0B40&MI_00
+%DESCRIPTION.CDC.MSD.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B41&MI_00
+
+[DeviceList.NTx86]
+%DESCRIPTION.CDC%=DriverInstall, USB\VID_16D0&PID_0557
+%DESCRIPTION.CDC.HID%=DriverInstall, USB\VID_16D0&PID_0856&MI_00
+%DESCRIPTION.CDC.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B34&MI_00
+%DESCRIPTION.CDC.MSD.HID%=DriverInstall, USB\VID_16D0&PID_0B40&MI_00
+%DESCRIPTION.CDC.MSD.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B41&MI_00
+
+[DeviceList.NTamd64]
+%DESCRIPTION.CDC%=DriverInstall, USB\VID_16D0&PID_0557
+%DESCRIPTION.CDC.HID%=DriverInstall, USB\VID_16D0&PID_0856&MI_00
+%DESCRIPTION.CDC.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B34&MI_00
+%DESCRIPTION.CDC.MSD.HID%=DriverInstall, USB\VID_16D0&PID_0B40&MI_00
+%DESCRIPTION.CDC.MSD.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B41&MI_00
+
+[DeviceList.NTia64]
+%DESCRIPTION.CDC%=DriverInstall, USB\VID_16D0&PID_0557
+%DESCRIPTION.CDC.HID%=DriverInstall, USB\VID_16D0&PID_0856&MI_00
+%DESCRIPTION.CDC.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B34&MI_00
+%DESCRIPTION.CDC.MSD.HID%=DriverInstall, USB\VID_16D0&PID_0B40&MI_00
+%DESCRIPTION.CDC.MSD.MIDI.HID%=DriverInstall, USB\VID_16D0&PID_0B41&MI_00
+
+;------------------------------------------------------------------------------
+;  String Definitions
+;------------------------------------------------------------------------------
+;Modify these strings to customize your device
+;------------------------------------------------------------------------------
+[Strings]
+DriverPackageDisplayName="MattairTech CDC Drivers"
+ServiceName="USB RS-232 Emulation Driver"
+MFGNAME="MattairTech LLC"
+DESCRIPTION.CDC="MattairTech CDC Serial"
+DESCRIPTION.CDC.HID="MattairTech CDC Serial & HID Keyboard/Mouse"
+DESCRIPTION.CDC.MIDI.HID="MattairTech CDC Serial & MIDI & HID Keyboard/Mouse"
+DESCRIPTION.CDC.MSD.HID="MattairTech CDC Serial & Mass Storage & HID Keyboard/Mouse"
+DESCRIPTION.CDC.MSD.MIDI.HID="MattairTech CDC Serial & Mass Storage & MIDI & HID Keyboard/Mouse"
diff --git a/extras/mattairtech_cdc.cat b/extras/mattairtech_cdc.cat
new file mode 100644
index 0000000000000000000000000000000000000000..525de42fca463cd56843cc5d79be3fc98c2e45ab
GIT binary patch
literal 8252
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

literal 0
HcmV?d00001

diff --git a/extras/pack.pullrequest.bash b/extras/pack.pullrequest.bash
deleted file mode 100755
index 36d4d9c02..000000000
--- a/extras/pack.pullrequest.bash
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash -ex
-
-PR_NUMBER=$1
-BUILD_NUMBER=$2
-VERSION=`grep version= platform.txt | sed 's/version=//g'`
-
-PWD=`pwd`
-FOLDERNAME=`basename $PWD`
-THIS_SCRIPT_NAME=`basename $0`
-FILENAME=package_samd-b${BUILD_NUMBER}.tar.bz2
-
-rm -f $FILENAME
-
-# Change name in platform.txt
-sed -i "s/name=.*/name=SAMD Pull request #${PR_NUMBER} (Build ${BUILD_NUMBER})/" platform.txt
-
-cd ..
-tar --transform "s|$FOLDERNAME|samd-PR${PR_NUMBER}_b${BUILD_NUMBER}|g"  --exclude=extras/** --exclude=.git* --exclude=.idea -cjf $FILENAME $FOLDERNAME
-cd -
-
-mv ../$FILENAME .
-
-CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'`
-SIZE=`wc -c $FILENAME | awk '{ print $1 }'`
-
-cat extras/package_index.json.PR.template |
-sed s/%%PR_NUMBER%%/${PR_NUMBER}/ |
-sed s/%%BUILD_NUMBER%%/${BUILD_NUMBER}/ |
-sed s/%%VERSION%%/${VERSION}-build-${BUILD_NUMBER}/ |
-sed s/%%FILENAME%%/${FILENAME}/ |
-sed s/%%CHECKSUM%%/${CHKSUM}/ |
-sed s/%%SIZE%%/${SIZE}/ > package_samd-b${BUILD_NUMBER}_index.json
-
diff --git a/extras/pack.release.bash b/extras/pack.release.bash
deleted file mode 100755
index 6ccb13108..000000000
--- a/extras/pack.release.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -ex
-
-VERSION=`grep version= platform.txt | sed 's/version=//g'`
-
-PWD=`pwd`
-FOLDERNAME=`basename $PWD`
-THIS_SCRIPT_NAME=`basename $0`
-
-rm -f samd-$VERSION.tar.bz2
-
-cd ..
-tar --transform "s|$FOLDERNAME|$FOLDERNAME-$VERSION|g"  --exclude=extras/** --exclude=.git* --exclude=.idea -cjf samd-$VERSION.tar.bz2 $FOLDERNAME
-cd -
-
-mv ../samd-$VERSION.tar.bz2 .
-
diff --git a/extras/package_index.json.PR.template b/extras/package_index.json.PR.template
deleted file mode 100644
index 2832b54cc..000000000
--- a/extras/package_index.json.PR.template
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "packages": [
-    {
-      "name": "arduino-beta",
-      "maintainer": "Arduino Betatesting",
-      "websiteURL": "http://www.arduino.cc/",
-      "email": "packages@arduino.cc",
-      "help": {
-        "online": "http://www.arduino.cc/en/Reference/HomePage"
-      },
-      "platforms": [
-        {
-          "name": "Arduino SAMD core - Pull request #%%PR_NUMBER%% (build %%BUILD_NUMBER%%)",
-          "architecture": "samd",
-          "version": "%%VERSION%%",
-          "category": "Arduino",
-          "url": "http://downloads.arduino.cc/PR/samd/%%FILENAME%%",
-          "archiveFileName": "%%FILENAME%%",
-          "checksum": "SHA-256:%%CHECKSUM%%",
-          "size": "%%SIZE%%",
-          "boards": [
-            {
-              "name": "Arduino Zero"
-            }
-          ],
-          "toolsDependencies": [
-            {
-              "packager": "arduino",
-              "name": "arm-none-eabi-gcc",
-              "version": "4.8.3-2014q1"
-            },
-            {
-              "packager": "arduino",
-              "name": "bossac",
-              "version": "1.5-arduino"
-            },
-            {
-              "packager": "arduino",
-              "name": "openocd",
-              "version": "0.9.0-arduino"
-            },
-            {
-              "packager": "arduino",
-              "name": "CMSIS",
-              "version": "4.0.0-atmel"
-            }
-          ]
-        }
-      ],
-      "tools": [
-      ]
-    }
-  ]
-}

From a2f09304311e0d6f1be6a95549389cfa24939ecb Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 26 Nov 2015 04:27:49 +0000
Subject: [PATCH 068/124] Minor documentation update

---
 README.md | 88 +++++++++++++++++++++++++++----------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index e94ca21e6..964ef2a8d 100644
--- a/README.md
+++ b/README.md
@@ -63,27 +63,27 @@ DC Current per I/O Pin	|	7 mA										|	7 mA
 
 ## Special Notes
 
-* Boards Manager may require opening twice (with possibly a delay in between) to see some updates.
+* ** Boards Manager must be opened twice to see some updates **
 
-* Errors when compiling, uploading, or burning the bootloader
-  Be sure to install the Arduino samd core before installing the MattairTech samd core. If you have problems upgrading
+* ** Errors when compiling, uploading, or burning the bootloader **
+  * Be sure to install the Arduino samd core before installing the MattairTech samd core. If you have problems upgrading
   the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
   Use Arduino core 1.6.2 or above.
 
-* Tools->Communications menu
-  Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
+* ** Tools->Communications menu **
+  * Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
   must match the included libraries. For example, when including the HID and Keyboard libraries, you must select an
   option that includes HID (ie: CDC_HID_UART). This menu is currently needed to select the USB PID that matches the
   USB device configuration (needed for Windows). This may become automatic in a future release.
 
-  * Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
-  * Different combinations of USB devices will result in different COM port assingments in Windows.
+    * Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
+    * Different combinations of USB devices will result in different COM port assingments in Windows.
 
-* Incude platform specific libraries
-  You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
+* ** Incude platform specific libraries **
+  * You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
 
-* Differences from Arduino in versioning
-  The MattairTech ArduinoCore-samd version currently tracks the IDE version. In some cases, it may indicate the
+* ** Differences from Arduino in versioning **
+  * The MattairTech ArduinoCore-samd version currently tracks the IDE version. In some cases, it may indicate the
   minimum IDE version. This is the case for both 1.6.5-mtX and 1.6.6-mtX (which corresponds to SAMD CORE 1.6.2).
   1.6.6-mt1 corresponds to Arduino SAMD CORE 1.6.2 plus some pull requests.
 
@@ -149,57 +149,57 @@ BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |
 ### Pin Capabilities
 
 * **Digital: All pins can be used for general purpose I/O** 
-* Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-* Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
-* Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-* Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-* These are available using the analogRead() function.
-* All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
-* Each pin provides 10 bits of resolution (1024 values) by default.
-* 12-bit resolution supported by using the analogReadResolution() function.
-* Each pin measures from ground to 3.3 volts.
-* The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+  * **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
+  * These are available using the analogRead() function.
+  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * Each pin measures from ground to 3.3 volts.
+  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
 * **DAC: One analog output is available on pin 2.**
-* Provides a 10-bit voltage output with the analogWrite() function.
+  * Provides a 10-bit voltage output with the analogWrite() function.
 * **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
-* Available using the analogWrite() function.
-* Each pin provides 8 bits of resolution (256 values) by default.
-* 12-bit resolution supported by using the analogWriteResolution() function.
+  * Available using the analogWrite() function.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
 * **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
-* Available using the attachInterrupt() function.
+  * Available using the attachInterrupt() function.
 * **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
-* MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
-* MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
+  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
+  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
 * **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
-* MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-* MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
-* SPI communication using the SPI library.
-* Note that the SPI library will set SS as an output.
-* On the MT-D11, the button must be configured as reset (default) when using SPI.
+  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
+  * SPI communication using the SPI library.
+  * Note that the SPI library will set SS as an output.
+  * On the MT-D11, the button must be configured as reset (default) when using SPI.
 * **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
-* MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
-* MT-D11: Pin 22 (SDA) and pin 23 (SCL).
-* TWI communication using the Wire library.
+  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
+  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
+  * TWI communication using the Wire library.
 * **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
-* Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
 * **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
-* Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-* If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
 * **AREF: One pin can be configured as an AREF analog input.**
-* The upper end of the analog measurement range can be changed using the analogReference() function.
+  * The upper end of the analog measurement range can be changed using the analogReference() function.
 * **Reset: Bring this line LOW to reset the microcontroller.**
 
 ### MT-D21E and MT-D11 Board Configuration Notes
 
 * The 32.768KHz crystal is used by the Arduino core, so it MUST be connected via the solder jumpers.
-* Note that the sketch may still run without the crystal attached, but the clock speed will be very inaccurate.
+* The sketch in some cases can run without the crystal attached, but the clock will be very inaccurate.
 * The 16MHz crystal is not used. It should be disconnected via the solder jumpers.
 * The I2C (TWI) pullup resistors should be enabled via the solder jumpers.
 * The LED should be enabled via the solder jumper.
-* Button A should be connected via the solder jumper. The debouncing capacitor should also be connected.
+* Button A and the debouncing capacitor should be connected via the solder jumpers.
 * Button B (MT-D21E only) is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
-* A reference voltage can be connected to AREF. In this case, the capacitors should be enabled via the solder jumper.
+* A reference voltage can be connected to AREF. In this case, the capacitors should be enabled via the solder jumpers.
 * On the MT-D11, BTN is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
 
 

From 93449e405969e22299ec25b5c1d7738cb1131ee2 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 26 Nov 2015 04:30:48 +0000
Subject: [PATCH 069/124] Minor documentation update, try #2

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 964ef2a8d..a84b5d976 100644
--- a/README.md
+++ b/README.md
@@ -63,14 +63,14 @@ DC Current per I/O Pin	|	7 mA										|	7 mA
 
 ## Special Notes
 
-* ** Boards Manager must be opened twice to see some updates **
+* **Boards Manager must be opened twice to see some updates**
 
-* ** Errors when compiling, uploading, or burning the bootloader **
+* **Errors when compiling, uploading, or burning the bootloader**
   * Be sure to install the Arduino samd core before installing the MattairTech samd core. If you have problems upgrading
   the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
   Use Arduino core 1.6.2 or above.
 
-* ** Tools->Communications menu **
+* **Tools->Communications menu**
   * Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
   must match the included libraries. For example, when including the HID and Keyboard libraries, you must select an
   option that includes HID (ie: CDC_HID_UART). This menu is currently needed to select the USB PID that matches the
@@ -79,10 +79,10 @@ DC Current per I/O Pin	|	7 mA										|	7 mA
     * Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
     * Different combinations of USB devices will result in different COM port assingments in Windows.
 
-* ** Incude platform specific libraries **
+* **Incude platform specific libraries**
   * You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
 
-* ** Differences from Arduino in versioning **
+* **Differences from Arduino in versioning**
   * The MattairTech ArduinoCore-samd version currently tracks the IDE version. In some cases, it may indicate the
   minimum IDE version. This is the case for both 1.6.5-mtX and 1.6.6-mtX (which corresponds to SAMD CORE 1.6.2).
   1.6.6-mt1 corresponds to Arduino SAMD CORE 1.6.2 plus some pull requests.
@@ -153,7 +153,7 @@ BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |
   * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
   * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
   * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-  * **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
+* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
   * These are available using the analogRead() function.
   * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
   * Each pin provides 10 bits of resolution (1024 values) by default.

From 7d11a2be188f3c1e92df0c23559fdc3223ae4c3e Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 1 Dec 2015 16:35:21 +0000
Subject: [PATCH 070/124] Changed default communications configuration to
 CDC_UART

---
 boards.txt | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/boards.txt b/boards.txt
index ce64f4437..d8c1ab7b9 100644
--- a/boards.txt
+++ b/boards.txt
@@ -54,12 +54,12 @@ mattairtech_mt_d21e_bl8k.build.f_cpu=48000000L
 mattairtech_mt_d21e_bl8k.build.usb_product="MT-D21E"
 mattairtech_mt_d21e_bl8k.build.usb_manufacturer="MattairTech"
 mattairtech_mt_d21e_bl8k.build.board=CDC_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart=CDC_HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.menu.com.cdc_uart=CDC_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.board=CDC_UART
 mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.pid=0x0557
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart=CDC_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.pid=0x0856
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid=CDC_HID
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.board=CDC_HID
 mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.pid=0x0856
@@ -122,12 +122,12 @@ mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam
 #mattairtech_mt_d21e_bl16k.build.usb_product="MT-D21E"
 #mattairtech_mt_d21e_bl16k.build.usb_manufacturer="MattairTech"
 #mattairtech_mt_d21e_bl16k.build.board=CDC_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart=CDC_HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_uart=CDC_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.board=CDC_UART
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.pid=0x0557
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart=CDC_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid=CDC_HID
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.board=CDC_HID
 #mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.pid=0x0856
@@ -191,12 +191,12 @@ mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/samd21e15a_sam
 #mattairtech_mt_d21e_bl0k.build.usb_product="MT-D21E"
 #mattairtech_mt_d21e_bl0k.build.usb_manufacturer="MattairTech"
 #mattairtech_mt_d21e_bl0k.build.board=CDC_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_uart=CDC_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.board=CDC_UART
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.pid=0x0557
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid=CDC_HID
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.board=CDC_HID
 #mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.pid=0x0856
@@ -249,12 +249,12 @@ mattairtech_mt_d11.build.f_cpu=48000000L
 mattairtech_mt_d11.build.usb_product="MT-D11"
 mattairtech_mt_d11.build.usb_manufacturer="MattairTech"
 mattairtech_mt_d11.build.board=CDC_UART
-mattairtech_mt_d11.menu.com.cdc_hid_uart=CDC_HID_UART
-mattairtech_mt_d11.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-mattairtech_mt_d11.menu.com.cdc_hid_uart.build.pid=0x0856
 mattairtech_mt_d11.menu.com.cdc_uart=CDC_UART
 mattairtech_mt_d11.menu.com.cdc_uart.build.board=CDC_UART
 mattairtech_mt_d11.menu.com.cdc_uart.build.pid=0x0557
+mattairtech_mt_d11.menu.com.cdc_hid_uart=CDC_HID_UART
+mattairtech_mt_d11.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+mattairtech_mt_d11.menu.com.cdc_hid_uart.build.pid=0x0856
 mattairtech_mt_d11.menu.com.cdc_hid=CDC_HID
 mattairtech_mt_d11.menu.com.cdc_hid.build.board=CDC_HID
 mattairtech_mt_d11.menu.com.cdc_hid.build.pid=0x0856
@@ -306,10 +306,10 @@ arduino_zero_native.build.f_cpu=48000000L
 arduino_zero_native.build.usb_product="Arduino Zero"
 arduino_zero_native.build.usb_manufacturer="Arduino LLC"
 arduino_zero_native.build.board=SAMD_ZERO
-arduino_zero_native.menu.com.cdc_hid_uart=CDC_HID_UART
-arduino_zero_native.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 arduino_zero_native.menu.com.cdc_uart=CDC_UART
 arduino_zero_native.menu.com.cdc_uart.build.board=CDC_UART
+arduino_zero_native.menu.com.cdc_hid_uart=CDC_HID_UART
+arduino_zero_native.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 arduino_zero_native.menu.com.cdc_hid=CDC_HID
 arduino_zero_native.menu.com.cdc_hid.build.board=CDC_HID
 arduino_zero_native.menu.com.cdc=CDC_ONLY
@@ -350,10 +350,10 @@ arduino_zero_native.build.pid=0x804d
 #arduino_zero_edbg.build.usb_product="Arduino Zero"
 #arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
 #arduino_zero_edbg.build.board=SAMD_ZERO
-#arduino_zero_edbg.menu.com.cdc_hid_uart=CDC_HID_UART
-#arduino_zero_edbg.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 #arduino_zero_edbg.menu.com.cdc_uart=CDC_UART
 #arduino_zero_edbg.menu.com.cdc_uart.build.board=CDC_UART
+#arduino_zero_edbg.menu.com.cdc_hid_uart=CDC_HID_UART
+#arduino_zero_edbg.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
 #arduino_zero_edbg.menu.com.cdc_hid=CDC_HID
 #arduino_zero_edbg.menu.com.cdc_hid.build.board=CDC_HID
 #arduino_zero_edbg.menu.com.cdc=CDC_ONLY

From a7aa530cb780180238a082a0fe32295f82ccc874 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 25 Dec 2015 15:19:24 +0000
Subject: [PATCH 071/124] Fixed compilation when CDC_ONLY defined

---
 cores/arduino/USB/USBCore.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index 853f305ae..ca0d30d54 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -19,6 +19,8 @@
 #ifndef __USBCORE_H__
 #define __USBCORE_H__
 
+#include "USBDesc.h"
+
 //	Standard requests
 #define GET_STATUS					0
 #define CLEAR_FEATURE				1
@@ -226,7 +228,9 @@ typedef struct
 typedef struct
 {
 	//	IAD
+#if !defined(CDC_ONLY)
 	IADDescriptor				iad;	// Only needed on compound device
+#endif
 	//	Control
 	InterfaceDescriptor			cif;
 	CDCCSInterfaceDescriptor	header;

From 7959ee9301a01c47c36a83e78c84c99a39d308c5 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 25 Dec 2015 16:59:15 +0000
Subject: [PATCH 072/124] Fixed compilation when CDC_ONLY defined #2

---
 cores/arduino/USB/USBDesc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index 2dd9bc6bd..b7c9067e3 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -28,7 +28,7 @@
 // once an alternate method for USB PID allocation is found.
 #if defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
 #define CDC_ENABLED
-#if defined(ARDUINO_CDC_ONLY)
+#if defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART)
 #define CDC_ONLY
 #else
 #define IAD_PRESENT

From b984e0ed36afd8a1fdfbbf3b79b9af3d32f5d7df Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 28 Dec 2015 11:17:14 +0000
Subject: [PATCH 073/124] Doc update for 1.6.6-mt3

---
 README.md    | 2 ++
 platform.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a84b5d976..547c74c45 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,8 @@ previous version, click on MattairTech SAMD Boards in Boards Manager, then click
   * Wire: allow scanning bus via beginTransmission-endTransmission
   * USB Device: big refactoring and bug fix
   * USB Device: added PluggableUSB interface
+* 1.6.6-mt2 changes the default Communication setting to CDC_UART (from CDC_HID_UART)
+* 1.6.6-mt3 fixes compilation with CDC_UART and CDC_ONLY settings
 
 
 ## Summary
diff --git a/platform.txt b/platform.txt
index 581dcf4d6..48e653e99 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=MattairTech SAMD Boards
-version=1.6.6-mt1
+version=1.6.6-mt3
 
 
 # Compile variables

From 54909e384527cde9d11c88041621142cebc2860c Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Wed, 30 Mar 2016 06:24:27 +0000
Subject: [PATCH 074/124] Enable digitalRead on output pins, only enable pullup
 or pulldown in digitalWrite if pin is not output. arduino/ArduinoCore-samd#56
 arduino/ArduinoCore-samd#79 arduino/ArduinoCore-samd#94
 arduino/ArduinoCore-samd#101

---
 README.md                      | 52 +++++++++++++++++++++++++---------
 cores/arduino/Uart.cpp         |  1 -
 cores/arduino/WVariant.h       |  6 ++++
 cores/arduino/wiring.c         | 10 +++----
 cores/arduino/wiring_digital.c | 47 +++++++++++++++++-------------
 cores/arduino/wiring_private.c | 17 +++++++----
 6 files changed, 89 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 547c74c45..9d727c663 100644
--- a/README.md
+++ b/README.md
@@ -266,9 +266,16 @@ everything else (ie: W) resides in flash (in most cases).
 
 #### Windows
 
-There are currently four USB composite device combinations that include CDC as well as a CDC only device.
-Drivers are required for each of these five devices. The CDC only driver is required by the bootloader.
-The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP3), Vista, 7, 8, and 10.
+Prior to core version 1.6.6-mt1, sketches compiled with both CDC and HID USB code by default, thus requiring a CDC
+driver for the bootloader and a CDC-HID driver for sketches. Now that PluggableUSB is supported, sketches compile
+with only CDC code by default. Thus, only one driver is needed. Since HID and MIDI are currently supported (and
+MSD potentially in the future), driver installation will be required for each different combination of USB devices.
+There are currently four USB composite device combinations that include CDC as well as a CDC only device. Each
+supported combination has a unique USB VID:PID pair, and these are listed in the .inf file. Once the first device
+is installed (the CDC only device), future installations *might* be automatic, otherwise, you may direct the
+installer to the same .inf file. The drivers are signed and support both 32 and 64 bit versions of Windows XP(SP3),
+Vista, 7, 8, and 10.
+
 
 1. If you do not already have the SAM-BA bootloader installed, see below.
 2. Download https://www.mattairtech.com/software/MattairTech_CDC_Driver_Signed.zip and unzip into any folder.
@@ -276,8 +283,8 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 4. Windows will detect the board. Point the installer to the folder from above to install the bootloader driver.
 5. If you don't intend on using Arduino, you can skip the rest of this list. See Using Bossac Standalone below.
 6. If you do not already have the test firmware installed (comes preinstalled), see Using Bossac Standalone below.
-7. Press the reset button to run the test firmware (blink sketch with CDC-HID).
-8. Windows will detect the board. Point the installer to the folder from above to install the sketch driver.
+7. Press the reset button to run the test firmware (blink sketch).
+8. Windows will detect the board. Point the installer to the above folder to install the sketch driver (if needed).
 9. Continue with SAMD Core Installation below.
 
 #### Linux
@@ -291,14 +298,17 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 
 #### OS X
 
+UNTESTED
 1. As of this writing, only the 256 KB chip variants work with the OS X version of the upload tool, bossac.
 2. First, you will need to open boards.txt and change mattairtech_mt_d21e_bl8k.upload.tool to equal arduino:bossac.
 3. Open platform.txt and change tools.bossac.path to equal{runtime.tools.bossac-1.6.1-arduino.path}.
-4. No driver installation is needed. You may get a dialog box asking if you wish to open the “Network Preferences�:
+4. No driver installation is needed.
+5. Plug in the board. You may get a dialog box asking if you wish to open the “Network Preferences�:
    * Click the "Network Preferences..." button, then click "Apply".
    * The board will show up as “Not Configured�, but it will work fine.
 5. Continue with SAMD Core Installation below.
 
+
 ### SAMD Core Installation
 
 * To update from a previous version, click on MattairTech SAMD Boards in Boards Manager, then click Update.
@@ -319,6 +329,16 @@ The drivers are signed and support both 32 and 64 bit versions of Windows XP (SP
 13. You can now upload your own sketch.
 
 
+### Uploading the First Sketch
+
+1. In the Arduino IDE 1.6.7 (or above), open File->Examples->01.Basics->Blink.
+2. Change the three instances of '13' to 'LED_BUILTIN'.
+3. Be sure the correct options are selected in the Tools menu (see AVR Core Installation above).
+4. With the board plugged in, select the correct port from Tools->Port.
+5. Click the Upload button. After compiling, the sketch should be transferred to the board.
+6. Once the bootloader exits, the blink sketch should be running.
+
+
 ## SAM-BA USB CDC Bootloader (Arduino compatible)
 
 The SAM-BA bootloader has both a CDC USB interface, and a UART interface (MT-D21E: TX: pin 10, RX: pin 11). It is
@@ -361,6 +381,7 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
 3. The board is reset. The bootloader (which always runs first) detects the blank flah row, so bootloader operation resumes.
 4. Opening and closing the port at a baud rate other than 1200bps will not erase or reset the SAMD.
 
+
 ### Bootloader Firmware Installation
 
 #### Bootloader Installation Using the Arduino IDE
@@ -383,6 +404,7 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
    * You can optionally set the EEPROM bits or anything else. The Arduino installation method uses factory defaults.
 4. Continue with driver installation above.
 
+
 ### Using Bossac Standalone
 
 When using Bossac standalone, you will need to ensure that your application starts at 0x00002000 for 8 KB bootloaders,
@@ -408,13 +430,13 @@ As an example, bossac will be used to upload the test firmware (blink sketch):
 1. Download firmware from https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip and unzip.
 2. If you have not already installed the bootloader driver, see Driver Installation above.
 3. Be sure there is a binary that matches your chip. On the command line (change the binary to match yours):
-4. On Linux --port might be /dev/ttyACM0. If the device is not found, remove the --port argument for auto-detection.
 
 ```
 bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 ```
+4. On Linux --port might be /dev/ttyACM0. If the device is not found, remove the --port argument for auto-detection.
 5. See http://manpages.ubuntu.com/manpages/vivid/man1/bossac.1.html for details.
-6. Continue with the CDC-HID driver installation above (optional).
+6. The board should reset automatically and the sketch should be running.
 
 
 
@@ -504,7 +526,9 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 
 ## Possible Future Additions
 
-* USB Host mode CDC ACM
+* SAML21 support in the works
+* Timer library in the works (like TimerOne, plus input capture and possibly waveform extensions)
+* USB Host mode CDC ACM (partially complete; BSD-like license?)
 * Features for lower power consumption (library?)
 * Enhanced SD card library
 * Optional use of single on-board LED as USB activity LED
@@ -512,17 +536,19 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 * MSC (Mass Storage) USB Device Class
 * Polyphonic tone
 * Better OS X support
+* Wired-AND, Wired-OR for port pins
+* High-speed port pin access (IOBUS)
 * Libraries for some hardware I plan on using:
-  TFT LCD
-  Motor controller
+  TFT LCD (CFAF128128B-0145T)
+  Motor controller (LV8711T)
   IR decoder
   I2S DAC/AMP and I2S MEMS microphone
   Battery management IC
   XBee/Xbee Pro devices
   RS485
   Several I2C (Wire) sensor devices: 
-    Accelerometer/gyro/magnetometer
-    Barometer/altimeter
+    Accelerometer/magnetometer (LSM303CTR)
+    Barometer/altimeter (LPS22HBTR)
     Humidity/temperature
     Light/color sensor
 
diff --git a/cores/arduino/Uart.cpp b/cores/arduino/Uart.cpp
index 914338b67..3bf278228 100644
--- a/cores/arduino/Uart.cpp
+++ b/cores/arduino/Uart.cpp
@@ -36,7 +36,6 @@ void Uart::begin(unsigned long baudrate)
 
 void Uart::begin(unsigned long baudrate, uint8_t config)
 {
-  pinMode(uc_pinRX,INPUT_PULLUP);//Rx pin set INPUT_PULLUP mode
   pinPeripheral(uc_pinRX, PIO_SERCOM);
   pinPeripheral(uc_pinTX, PIO_SERCOM);
 
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index ddeec4e71..256f9f003 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -161,6 +161,8 @@ typedef enum _EPioType
   PIO_AC_GCLK=12,                     /* The pin is controlled by the AC_GCLK peripheral (output). */
 
   PIO_MULTI,                          /* The pin can be configured to any type based on the attributes. */
+  
+  PIO_STARTUP,                        /* Used as parameter to pinPeripheral() only to set startup state (enable INEN only) */
 } EPioType ;
 
 /**
@@ -228,6 +230,10 @@ typedef enum _EPioPeripheral
 #define PER_ATTR_OUTPUT_TYPE_BUSKEEPER      (3UL<<3)
 #define PER_ATTR_OUTPUT_TYPE_MASK           (3UL<<3)
 
+#define PER_ATTR_INPUT_SYNCHRONIZER_ON_DEMAND     (0UL<<5)
+#define PER_ATTR_INPUT_SYNCHRONIZER_ALWAYS_ON     (1UL<<5)
+#define PER_ATTR_INPUT_SYNCHRONIZER_MASK          (1UL<<5)
+
 
 /* Types used for the table below
  * This struct MUST be 12 bytes long (elements are ordered to prevent unaligned access).
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index adf8a6408..67ef41751 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -96,11 +96,11 @@ void init( void )
   // Clock ADC/DAC for Analog
   PM->APBCMASK.reg |= PM_APBCMASK_ADC | PM_APBCMASK_DAC ;
 
-  // Setup all pins (digital and analog) in INPUT mode (default is nothing)
-  // for ( ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
-  // {
-  //	  pinMode( ul, INPUT ) ;
-  // }
+  //Setup all pins (digital and analog) in STARTUP mode (enable INEN only)
+  for ( ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
+  {
+  	pinMode( ul, PIO_STARTUP ) ;
+  }
 
   // Initialize Analog Controller
   // Setting clock
diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c
index d31c83592..8273679cb 100644
--- a/cores/arduino/wiring_digital.c
+++ b/cores/arduino/wiring_digital.c
@@ -39,29 +39,38 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
   uint32_t pinAttribute = g_APinDescription[ulPin].ulPinAttribute;
   uint8_t pinPort = g_APinDescription[ulPin].ulPort;
   uint8_t pinNum = g_APinDescription[ulPin].ulPin;
-  uint8_t pullConfig = PORT->Group[pinPort].PINCFG[pinNum].reg;
-  
-  // Enable pull resistor if pin attributes allow
-  if ( (ulVal == HIGH && (pinAttribute & PIN_ATTR_INPUT_PULLUP)) || (ulVal == LOW && (pinAttribute & PIN_ATTR_INPUT_PULLDOWN)) )
-  {
-    pullConfig |= (uint8_t)(PORT_PINCFG_PULLEN) ;
+  uint8_t pinConfig = PORT->Group[pinPort].PINCFG[pinNum].reg;
+  uint8_t pinDir = PORT->Group[pinPort].DIR[pinNum].reg;
+  uint8_t pinOut = PORT->Group[pinPort].OUT[pinNum].reg;
+
+  // Enable pull resistor if pin attributes allow and only if pin is not configured as output
+  // Note that most pins should use PIN_ATTR_DIGITAL, which includes both PIN_ATTR_INPUT_PULLUP and PIN_ATTR_INPUT_PULLDOWN.
+  if ( pinDir == 0 ) { // pin DIR is input
+     if ( ulVal == HIGH )
+     {
+       if ( (pinOut == 1 && (pinAttribute & PIN_ATTR_INPUT_PULLUP)) || (pinOut == 0 && (pinAttribute & PIN_ATTR_INPUT_PULLDOWN)) )
+       {
+         pinConfig |= (uint8_t)(PORT_PINCFG_PULLEN) ;
+       }
+     }
+     else
+     {
+       pinConfig &= ~(uint8_t)(PORT_PINCFG_PULLEN) ;
+     }
+     
+     PORT->Group[pinPort].PINCFG[pinNum].reg = pinConfig ;
   }
+  // Set or clear OUT register only when pin DIR is set to output.
+  // Pull direction (pullup or pulldown) is now set with pinMode only.
   else
   {
-    pullConfig &= ~(uint8_t)(PORT_PINCFG_PULLEN) ;
-  }
-
-  PORT->Group[pinPort].PINCFG[pinNum].reg = pullConfig ;
-
-  switch ( ulVal )
-  {
-    case LOW:
-      PORT->Group[pinPort].OUTCLR.reg = (1ul << pinNum) ;
-    break ;
-
-    default:
+    if ( ulVal == HIGH ) {
       PORT->Group[pinPort].OUTSET.reg = (1ul << pinNum) ;
-    break ;
+    }
+    else
+    {
+      PORT->Group[pinPort].OUTCLR.reg = (1ul << pinNum) ;
+    }
   }
 
   return ;
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
index 9cae69ce8..9746ac117 100644
--- a/cores/arduino/wiring_private.c
+++ b/cores/arduino/wiring_private.c
@@ -37,14 +37,14 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
     return -1 ;
   }
 
-  // If pinType is not PIO_MULTI in the pinDescription table, then it must match ulPeripheral
-  if ( pinType != PIO_MULTI && pinType != ulPeripheral )
+  // If pinType is not PIO_MULTI or PIO_STARTUP in the pinDescription table, then it must match ulPeripheral
+  if ( pinType != PIO_MULTI && pinType != PIO_STARTUP && pinType != ulPeripheral )
   {
     return -1 ;
   }
 
   // Make sure ulPeripheral is listed in the attributes
-  if ( !(pinAttribute & (1UL << ulPeripheral)) )
+  if ( !(pinAttribute & (1UL << ulPeripheral)) && pinType != PIO_STARTUP )
   {
     return -1 ;
   }
@@ -123,10 +123,14 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
 
   uint8_t pinPort = g_APinDescription[ulPin].ulPort;
   uint8_t pinNum = g_APinDescription[ulPin].ulPin;
-  uint8_t pinCfg = PORT_PINCFG_INEN;
+  uint8_t pinCfg = PORT_PINCFG_INEN;	// INEN should be enabled for both input and output (but not analog)
 
   switch ( ulPeripheral )
   {
+    case PIO_STARTUP:
+      PORT->Group[pinPort].PINCFG[pinNum].reg=(uint8_t)pinCfg ; // Just enable INEN
+    break;
+    
     // Set pin mode according to chapter '22.6.3 I/O Pin Configuration'
     case PIO_INPUT:
     case PIO_INPUT_PULLUP:
@@ -151,7 +155,6 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
     break ;
 
     case PIO_OUTPUT:
-      pinCfg = 0;
       if ( (peripheralAttribute & PER_ATTR_DRIVE_MASK) == PER_ATTR_DRIVE_STRONG )
       {
         pinCfg |= PORT_PINCFG_DRVSTR;
@@ -162,10 +165,12 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
     break ;
 
 
-    case PIO_EXTINT:
     case PIO_ANALOG_ADC:
     case PIO_ANALOG_DAC:
     case PIO_ANALOG_REF:
+	pinCfg = 0;	// Disable INEN with analog
+	
+    case PIO_EXTINT:
     case PIO_TIMER_PWM:
     case PIO_TIMER_CAPTURE:
     case PIO_SERCOM:

From bebef1d2ebd1e8aa27e8da80f8a61759cb6ca962 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Wed, 30 Mar 2016 20:55:19 +0000
Subject: [PATCH 075/124] Write protect bootloader after "Burn bootloader"
 command. See arduino/ArduinoCore-samd#124

---
 README.md    | 24 ++++++++++++------------
 platform.txt |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 9d727c663..365d337b6 100644
--- a/README.md
+++ b/README.md
@@ -539,18 +539,18 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 * Wired-AND, Wired-OR for port pins
 * High-speed port pin access (IOBUS)
 * Libraries for some hardware I plan on using:
-  TFT LCD (CFAF128128B-0145T)
-  Motor controller (LV8711T)
-  IR decoder
-  I2S DAC/AMP and I2S MEMS microphone
-  Battery management IC
-  XBee/Xbee Pro devices
-  RS485
-  Several I2C (Wire) sensor devices: 
-    Accelerometer/magnetometer (LSM303CTR)
-    Barometer/altimeter (LPS22HBTR)
-    Humidity/temperature
-    Light/color sensor
+  * TFT LCD (CFAF128128B-0145T)
+  * Motor controller (LV8711T)
+  * IR decoder
+  * I2S DAC/AMP and I2S MEMS microphone
+  * Battery management IC
+  * XBee/Xbee Pro devices
+  * RS485
+  * Several I2C (Wire) sensor devices: 
+    * Accelerometer/magnetometer (LSM303CTR)
+    * Barometer/altimeter (LPS22HBTR)
+    * Humidity/temperature
+    * Light/color sensor
 
 
 ## ChangeLog
diff --git a/platform.txt b/platform.txt
index 48e653e99..844c010af 100644
--- a/platform.txt
+++ b/platform.txt
@@ -149,5 +149,5 @@ tools.openocd.erase.pattern=
 
 tools.openocd.bootloader.params.verbose=-d3
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify; at91samd bootloader 8192; reset; shutdown"
 

From 3acaaef8ec839d5ca4223505533c47f1edc2f33d Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 20 May 2016 05:41:33 +0000
Subject: [PATCH 076/124] Make digitalPinToInterrupt(pin) return the same pin
 so that it works as described in the attachInterrupt() documentation.

---
 cores/arduino/Arduino.h         | 5 +++++
 cores/arduino/WInterrupts.c     | 4 ++--
 variants/MT_D11/variant.h       | 3 ---
 variants/MT_D21E/variant.h      | 3 ---
 variants/arduino_zero/variant.h | 2 --
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 1be6d7171..66b10614b 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -20,6 +20,8 @@
 #ifndef Arduino_h
 #define Arduino_h
 
+#define MATTAIRTECH_CORE
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -114,6 +116,9 @@ void loop( void ) ;
 
 #define bit(b) (1UL << (b))
 
+// Interrupts
+#define digitalPinToInterrupt(P)   ( P )
+
 // USB Device
 #include "USB/USBDesc.h"
 #include "USB/USBCore.h"
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 7fa70c61f..42830ed4b 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -61,7 +61,7 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
     return;
   
-  EExt_Interrupts in = digitalPinToInterrupt(pin);
+  EExt_Interrupts in = g_APinDescription[pin].ulExtInt;
   if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
@@ -114,7 +114,7 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
  */
 void detachInterrupt(uint32_t pin)
 {
-  EExt_Interrupts in = digitalPinToInterrupt(pin);
+  EExt_Interrupts in = g_APinDescription[pin].ulExtInt;
   if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index 44b9e33fc..51c2147d2 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -88,9 +88,6 @@ extern "C"
  */
 // #define digitalPinToTimer(P)
 
-// Interrupts
-#define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
-
 
 /* LEDs
  * None of these defines are currently used by the core.
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index 6e6bd5fc1..632f7828a 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -79,9 +79,6 @@ extern "C"
  */
 // #define digitalPinToTimer(P)
 
-// Interrupts
-#define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
-
 
 /* LEDs
  * None of these defines are currently used by the core.
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index 67f11eacb..a13873b58 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -74,8 +74,6 @@ extern "C"
  */
 // #define digitalPinToTimer(P)
 
-// Interrupts
-#define digitalPinToInterrupt(P)   ( g_APinDescription[P].ulExtInt )
 
 // LEDs
 #define PIN_LED_13           (13u)

From a9b095a7d18bda4b0dafc44ea9e2d3bbce2d2cb3 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 20 May 2016 05:45:49 +0000
Subject: [PATCH 077/124] Add support for compiling sketches for SAMD11 without
 a bootloader

---
 boards.txt                                    |  58 +++++
 bootloaders/zero/readme.txt                   |   2 +
 .../gcc/SAMD11C14A_without_bootloader.ld      | 212 ++++++++++++++++++
 .../gcc/SAMD11D14AM_without_bootloader.ld     | 212 ++++++++++++++++++
 .../gcc/SAMD11D14AS_without_bootloader.ld     | 212 ++++++++++++++++++
 5 files changed, 696 insertions(+)
 create mode 100644 variants/MT_D11/linker_scripts/gcc/SAMD11C14A_without_bootloader.ld
 create mode 100644 variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
 create mode 100644 variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld

diff --git a/boards.txt b/boards.txt
index d8c1ab7b9..1ce9535e0 100644
--- a/boards.txt
+++ b/boards.txt
@@ -288,6 +288,64 @@ mattairtech_mt_d11.bootloader.tool=arduino:openocd
 mattairtech_mt_d11.bootloader.file=zero/samd11d14am_sam_ba.bin
 
 
+# MattairTech MT-D11 (no bootloader)
+mattairtech_mt_d11_bl0k.name=MattairTech MT-D11 (no bootloader)
+mattairtech_mt_d11_bl0k.vid.0=0x16D0
+mattairtech_mt_d11_bl0k.pid.0=0x0557
+mattairtech_mt_d11_bl0k.vid.1=0x16D0
+mattairtech_mt_d11_bl0k.pid.1=0x0856
+mattairtech_mt_d11_bl0k.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d11_bl0k.upload.protocol=sam-ba
+mattairtech_mt_d11_bl0k.upload.use_1200bps_touch=true
+mattairtech_mt_d11_bl0k.upload.wait_for_upload_port=true
+mattairtech_mt_d11_bl0k.upload.native_usb=true
+mattairtech_mt_d11_bl0k.upload.maximum_size=16384
+mattairtech_mt_d11_bl0k.build.extra_flags=-D__SAMD11D14AM__ -D__NO_BOOTLOADER__ {build.usb_flags}
+mattairtech_mt_d11_bl0k.build.ldscript=linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
+mattairtech_mt_d11_bl0k.build.openocdscript=openocd_scripts/SAMD11D14AM.cfg
+mattairtech_mt_d11_bl0k.build.mcu=cortex-m0plus
+mattairtech_mt_d11_bl0k.build.f_cpu=48000000L
+mattairtech_mt_d11_bl0k.build.usb_product="MT-D11"
+mattairtech_mt_d11_bl0k.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d11_bl0k.build.board=CDC_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_uart=CDC_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_uart.build.board=CDC_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_uart.build.pid=0x0557
+mattairtech_mt_d11_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
+mattairtech_mt_d11_bl0k.menu.com.cdc_hid=CDC_HID
+mattairtech_mt_d11_bl0k.menu.com.cdc_hid.build.board=CDC_HID
+mattairtech_mt_d11_bl0k.menu.com.cdc_hid.build.pid=0x0856
+mattairtech_mt_d11_bl0k.menu.com.cdc=CDC_ONLY
+mattairtech_mt_d11_bl0k.menu.com.cdc.build.board=CDC_ONLY
+mattairtech_mt_d11_bl0k.menu.com.cdc.build.pid=0x0557
+mattairtech_mt_d11_bl0k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
+mattairtech_mt_d11_bl0k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
+# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
+# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
+# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
+# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
+# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
+# mattairtech_mt_d11_bl0k.menu.com.msd_uart=MSD_UART
+# mattairtech_mt_d11_bl0k.menu.com.msd_uart.build.board=MSD_UART
+# mattairtech_mt_d11_bl0k.menu.com.msd_uart.build.pid=0x0A0C
+mattairtech_mt_d11_bl0k.menu.com.uart=UART_ONLY
+mattairtech_mt_d11_bl0k.menu.com.uart.build.board=UART_ONLY
+mattairtech_mt_d11_bl0k.menu.com.uart.build.pid=0x0856
+mattairtech_mt_d11_bl0k.menu.com.none=USB_UART_DISABLED
+mattairtech_mt_d11_bl0k.menu.com.none.build.board=USB_UART_DISABLED
+mattairtech_mt_d11_bl0k.menu.com.none.build.pid=0x0856
+mattairtech_mt_d11_bl0k.build.core=arduino
+mattairtech_mt_d11_bl0k.build.variant=MT_D11
+mattairtech_mt_d11_bl0k.build.variant_system_lib=
+mattairtech_mt_d11_bl0k.build.vid=0x16D0
+mattairtech_mt_d11_bl0k.build.pid=0x0856
+mattairtech_mt_d11_bl0k.bootloader.tool=arduino:openocd
+mattairtech_mt_d11_bl0k.bootloader.file=zero/samd11d14am_sam_ba.bin
+
 
 # MattairTech Core for Arduino Zero (8KB bootloader, Native USB Port)
 arduino_zero_native.name=Arduino Zero (Native USB Port)
diff --git a/bootloaders/zero/readme.txt b/bootloaders/zero/readme.txt
index 4f9f94912..1ff629b92 100644
--- a/bootloaders/zero/readme.txt
+++ b/bootloaders/zero/readme.txt
@@ -35,6 +35,8 @@ twice in quick succession. If so, bootloader execution is resumed Second, the bo
 checks the state of BOOT_LOAD_PIN (configurable by the user from main.h). If BOOT_LOAD_PIN
 is pulled low, bootloader execution is resumed. Finally, the first location of application
 is fetched and checked. If it is empty (0xFFFFFFFF), then bootloader execution is resumed.
+Note that when Arduino auto-reset (into bootloader) is initiated, the first flash row is
+erased, so the bootloader will always run after reset until a new sketch is transferred.
 Otherwise, it jumps to application and starts execution from there. The LED will light
 during bootloader execution.
 
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_without_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_without_bootloader.ld
new file mode 100644
index 000000000..f85765ef4
--- /dev/null
+++ b/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
new file mode 100644
index 000000000..f85765ef4
--- /dev/null
+++ b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld
new file mode 100644
index 000000000..f85765ef4
--- /dev/null
+++ b/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}

From 441ffca2c7e576f205573a82fde46fe788ad0199 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 20 May 2016 05:49:17 +0000
Subject: [PATCH 078/124] Undo write protection of bootloader from
 bebef1d2ebd1e8aa27e8da80f8a61759cb6ca962

---
 platform.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.txt b/platform.txt
index 844c010af..ba33b1a38 100644
--- a/platform.txt
+++ b/platform.txt
@@ -149,5 +149,5 @@ tools.openocd.erase.pattern=
 
 tools.openocd.bootloader.params.verbose=-d3
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify; at91samd bootloader 8192; reset; shutdown"
+tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify; reset; shutdown"
 

From 11c601bcceea46db39702e743a75cd312c8bdc3c Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 20 May 2016 05:53:34 +0000
Subject: [PATCH 079/124] Update ETCChannel to support SAML and SAMC, minor doc
 update

---
 README.md                | 4 ++++
 cores/arduino/WVariant.h | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 365d337b6..e631fdc31 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,10 @@ DC Current per I/O Pin	|	7 mA										|	7 mA
   1.6.6-mt1 corresponds to Arduino SAMD CORE 1.6.2 plus some pull requests.
 
 
+## Differences Between MattairTech and Arduino Cores
+* TODO
+
+
 ## Pin Configurations
 
 Most pins have multiple configurations available (even analog pins). For example, pin A10 on the MT-D21E can be an analog
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index 256f9f003..0f8e685c0 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -70,24 +70,22 @@ typedef enum _ETCChannel
   TCC2_CH1 = (2<<8)|(1),
   TCC2_CH2 = (2<<8)|(0), // Channel 2 is 0!
   TCC2_CH3 = (2<<8)|(1), // Channel 3 is 1!
-#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+  TC0_CH0  = (0<<8)|(0),
+  TC0_CH1  = (0<<8)|(1),
   TC1_CH0  = (1<<8)|(0),
   TC1_CH1  = (1<<8)|(1),
   TC2_CH0  = (2<<8)|(0),
   TC2_CH1  = (2<<8)|(1),
-#endif
   TC3_CH0  = (3<<8)|(0),
   TC3_CH1  = (3<<8)|(1),
   TC4_CH0  = (4<<8)|(0),
   TC4_CH1  = (4<<8)|(1),
   TC5_CH0  = (5<<8)|(0),
   TC5_CH1  = (5<<8)|(1),
-#if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
   TC6_CH0  = (6<<8)|(0),
   TC6_CH1  = (6<<8)|(1),
   TC7_CH0  = (7<<8)|(0),
   TC7_CH1  = (7<<8)|(1)
-#endif
 } ETCChannel ;
 
 extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;

From a133b582adcdaed90fca0313d4ea307061de814e Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 6 Mar 2017 02:10:40 +0000
Subject: [PATCH 080/124] Add L21 and C21 support (mostly complete)

---
 VARIANT_COMPLIANCE_CHANGELOG      |  12 ++
 cores/arduino/Arduino.h           |   2 +
 cores/arduino/Reset.cpp           |   2 +
 cores/arduino/SERCOM.cpp          |  32 ++--
 cores/arduino/SERCOM.h            |   2 +-
 cores/arduino/Tone.cpp            |  42 ++++-
 cores/arduino/USB/CDC.cpp         |   3 +-
 cores/arduino/USB/USBCore.cpp     |  42 +++--
 cores/arduino/USB/USBCore.h       |   2 -
 cores/arduino/USB/USBDesc.h       |  32 +---
 cores/arduino/USB/samd21_host.c   |  23 ++-
 cores/arduino/WInterrupts.c       |  62 ++++---
 cores/arduino/WVariant.h          | 224 +++++++++++++++++-------
 cores/arduino/cortex_handlers.c   |  96 +++++++++--
 cores/arduino/main.cpp            |   5 +-
 cores/arduino/startup.c           | 118 ++++++++-----
 cores/arduino/wiring.c            | 168 ++++++++++++++----
 cores/arduino/wiring_analog.c     | 258 +++++++++++++++++++---------
 cores/arduino/wiring_analog.h     |  56 +++++-
 cores/arduino/wiring_private.c    |  21 +--
 platform.txt                      |  24 ++-
 variants/MT_D11/README.md         | 198 +++++++++++++++++++++
 variants/MT_D11/variant.cpp       | 259 +++++++---------------------
 variants/MT_D11/variant.h         |  97 ++++++++++-
 variants/MT_D21E/README.md        | 187 ++++++++++++++++++++
 variants/MT_D21E/variant.cpp      | 251 +++++----------------------
 variants/MT_D21E/variant.h        |  25 ++-
 variants/arduino_zero/README.md   | 195 +++++++++++++++++++++
 variants/arduino_zero/variant.cpp | 274 +++++++-----------------------
 variants/arduino_zero/variant.h   |  23 ++-
 30 files changed, 1734 insertions(+), 1001 deletions(-)
 create mode 100644 VARIANT_COMPLIANCE_CHANGELOG
 create mode 100644 variants/MT_D11/README.md
 create mode 100644 variants/MT_D21E/README.md
 create mode 100644 variants/arduino_zero/README.md

diff --git a/VARIANT_COMPLIANCE_CHANGELOG b/VARIANT_COMPLIANCE_CHANGELOG
new file mode 100644
index 000000000..281c7010d
--- /dev/null
+++ b/VARIANT_COMPLIANCE_CHANGELOG
@@ -0,0 +1,12 @@
+* 1.6.8-beta-b0:
+* Introduced MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE define and VARIANT_COMPLIANCE_CHANGELOG file.
+  The definitions in the variants files need the MattairTech SAMD core >= the listed version.
+  The format is different than the stock Arduino SAMD core, which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+  If using board variant files with the old format, the new core will still read the table the old way, losing
+  any new features introduced by the new column.
+* The GCLKCCL column was added. It is not yet used. It will eventually support the Analog Comparators (AC),
+  the Configurable Custom Logic (CCL) units of the L21 and C21, and the GCLK outputs (inputs).
+* New definitions have been added for L21 and C21 support.
+* The C21 has two ADC instances, which is selected in the PeripheralAttribute column.
+* the timer type is now encoded in this column to support the L21 and C21, which use TC numbers starting at 0
+  (rather than 3 as on the D21).
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 66b10614b..4e6936ac3 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -120,9 +120,11 @@ void loop( void ) ;
 #define digitalPinToInterrupt(P)   ( P )
 
 // USB Device
+#if defined(USBCON)
 #include "USB/USBDesc.h"
 #include "USB/USBCore.h"
 #include "USB/USBAPI.h"
 #include "USB/USB_host.h"
+#endif
 
 #endif // Arduino_h
diff --git a/cores/arduino/Reset.cpp b/cores/arduino/Reset.cpp
index 42ebb1d1e..25444218b 100644
--- a/cores/arduino/Reset.cpp
+++ b/cores/arduino/Reset.cpp
@@ -46,6 +46,7 @@ void banzai() {
 	// Disable all interrupts
 	__disable_irq();
 
+#if !defined(__NO_BOOTLOADER__)
 	// Erase application
 	while (!nvmReady())
 		;
@@ -54,6 +55,7 @@ void banzai() {
 	NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMD_ER | NVMCTRL_CTRLA_CMDEX_KEY;
 	while (!nvmReady())
 		;
+#endif
 
 	// Reset the device
 	NVIC_SystemReset() ;
diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index 6f6e6028a..b61b9bdb0 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -55,6 +55,14 @@ static uint64_t divide64(uint64_t n, uint64_t d)
 */
 void SERCOM::initUART(SercomUartMode mode, SercomUartSampleRate sampleRate, uint32_t baudrate)
 {
+#if (SAML21)
+  // On the SAML21, SERCOM5 is on PD0, which is a low power domain on a different bridge than the other SERCOMs.
+  // SERCOM5 does not support SAMPLE_RATE_x8 or SAMPLE_RATE_x3.
+  if (sercom == SERCOM5) {
+    sampleRate = SAMPLE_RATE_x16;
+  }
+#endif
+
   initClockNVIC();
   resetUART();
 
@@ -691,22 +699,21 @@ void SERCOM::initClockNVIC( void )
     clockId = GCM_SERCOM1_CORE;
     IdNvic = SERCOM1_IRQn;
   }
-#if !defined(__SAMD11C14A__)
+#if !(SAMD11C14)
   else if(sercom == SERCOM2)
   {
     clockId = GCM_SERCOM2_CORE;
     IdNvic = SERCOM2_IRQn;
   }
 #endif
-#if !defined(__SAMD11D14AM__) && !defined(__SAMD11C14A__) && !defined(__SAMD11D14AS__)
+#if !(SAMD11_SERIES)
   else if(sercom == SERCOM3)
   {
     clockId = GCM_SERCOM3_CORE;
     IdNvic = SERCOM3_IRQn;
   }
 #endif
-#if defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
-    defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+#if !(SAMD11_SERIES) && !(SAMD21E) && !(SAMC21E)
   else if(sercom == SERCOM4)
   {
     clockId = GCM_SERCOM4_CORE;
@@ -730,12 +737,13 @@ void SERCOM::initClockNVIC( void )
   NVIC_SetPriority (IdNvic, (1<<__NVIC_PRIO_BITS) - 1);  /* set Priority */
 
   //Setting clock
-  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( clockId ) | // Generic Clock 0 (SERCOMx)
-                      GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
-                      GCLK_CLKCTRL_CLKEN ;
-
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-  {
-    /* Wait for synchronization */
-  }
+#if (SAMD21 || SAMD11)
+  GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( clockId ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
+  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+#elif (SAML21 || SAMC21)
+  GCLK->PCHCTRL[clockId].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+#else
+  #error "SERCOM.cpp: Unsupported chip"
+#endif
 }
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
index 4b9d0e634..676947ecf 100644
--- a/cores/arduino/SERCOM.h
+++ b/cores/arduino/SERCOM.h
@@ -21,7 +21,7 @@
 
 #include "sam.h"
 
-#define SERCOM_FREQ_REF 48000000
+#define SERCOM_FREQ_REF F_CPU
 
 typedef enum
 {
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index 4453c3b4d..18276a658 100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
@@ -18,8 +18,15 @@
 
 #include "Tone.h"
 #include "variant.h"
+#include "sam.h"
 
+#if (SAMD21 || SAMD11)
 #define WAIT_TC16_REGS_SYNC(x) while(x->COUNT16.STATUS.bit.SYNCBUSY);
+#elif (SAML21 || SAMC21)
+#define WAIT_TC16_REGS_SYNC(x) while(x->SYNCBUSY.reg);
+#else
+#error "Tone.cpp: Unsupported chip"
+#endif
 
 uint32_t toneMaxFrequency = F_CPU / 2;
 uint32_t lastOutputPin = 0xFFFFFFFF;
@@ -31,19 +38,29 @@ volatile int64_t toggleCount;
 volatile bool toneIsActive = false;
 volatile bool firstTimeRunning = false;
 
-/* TC5 does not exist on the D11. Using TC2 instead. It will conflict with the 2 TC2 PWM pins */
-#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+/* TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14A as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins. */
+#if (SAMD11D14A)
 #define TONE_TC         TC2
 #define TONE_TC_IRQn    TC2_IRQn
+void TC2_Handler (void) __attribute__ ((alias("Tone_Handler")));
+#elif (SAMD11C14)
+#define TONE_TC         TC1
+#define TONE_TC_IRQn    TC1_IRQn
+void TC1_Handler (void) __attribute__ ((alias("Tone_Handler")));
+/* TC5 does not exist on the SAML or SAMC. Using TC3 instead. It will conflict with the 2 associated TC analogWrite() pins. */
+#elif (SAML_SERIES || SAMC_SERIES)
+#define TONE_TC         TC3
+#define TONE_TC_IRQn    TC3_IRQn
+void TC3_Handler (void) __attribute__ ((alias("Tone_Handler")));
 #else
 #define TONE_TC         TC5
 #define TONE_TC_IRQn    TC5_IRQn
+void TC5_Handler (void) __attribute__ ((alias("Tone_Handler")));
 #endif
 
 #define TONE_TC_TOP     0xFFFF
 #define TONE_TC_CHANNEL 0
 
-void TC5_Handler (void) __attribute__ ((weak, alias("Tone_Handler")));
 
 static inline void resetTC (Tc* TCx)
 {
@@ -75,12 +92,16 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
     NVIC_SetPriority(TONE_TC_IRQn, 0);
     
     // Enable GCLK for timer used
-#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
-    GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC1_TC2));
+#if (SAMD11_SERIES)
+    GCLK->CLKCTRL.reg = (uint16_t) ( GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC1_TC2 ));
+    while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+#elif (SAML_SERIES || SAMC_SERIES)
+    GCLK->PCHCTRL[GCM_TC2_TC3].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+    while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
 #else
-    GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_TC4_TC5));
+    GCLK->CLKCTRL.reg = (uint16_t) ( GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC4_TC5 ));
+    while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
 #endif
-    while (GCLK->STATUS.bit.SYNCBUSY);
   }
   
   if (toneIsActive && (outputPin != lastOutputPin))
@@ -131,11 +152,18 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
 
   uint16_t tmpReg = 0;
   tmpReg |= TC_CTRLA_MODE_COUNT16;  // Set Timer counter Mode to 16 bits
+#if (SAMD21 || SAMD11)
   tmpReg |= TC_CTRLA_WAVEGEN_MFRQ;  // Set TONE_TC mode as match frequency
+#endif
   tmpReg |= prescalerConfigBits;
   TONE_TC->COUNT16.CTRLA.reg |= tmpReg;
   WAIT_TC16_REGS_SYNC(TONE_TC)
 
+#if (SAML21 || SAMC21)
+  TONE_TC->WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
+  WAIT_TC16_REGS_SYNC(TONE_TC)
+#endif
+
   TONE_TC->COUNT16.CC[TONE_TC_CHANNEL].reg = (uint16_t) ccValue;
   WAIT_TC16_REGS_SYNC(TONE_TC)
 
diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index 3f1b6f081..52812e35a 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -18,13 +18,12 @@
 
 #include <Arduino.h>
 #include <Reset.h> // Needed for auto-reset with 1200bps port touch
-#include "USBDesc.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 
-#ifdef CDC_ENABLED
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 
 #define CDC_SERIAL_BUFFER_SIZE	256
 
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 68e37ec33..0c51eaf9d 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -21,6 +21,8 @@
 #include "SAMD21_USBDevice.h"
 #include "PluggableUSB.h"
 #include "USBDesc.h"
+#include "WVariant.h"
+#include "sam.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -134,7 +136,7 @@ uint8_t USBDeviceClass::SendInterfaces(uint32_t* total)
 {
 	uint8_t interfaces = 0;
 
-#if defined(CDC_ENABLED)
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 	total[0] += CDC_GetInterface(&interfaces);
 #endif
 
@@ -198,16 +200,12 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 
 	if (t == USB_DEVICE_DESCRIPTOR_TYPE)
 	{
-		//if (setup.wLength == 8)
-		//	_cdcComposite = 1;
-
-		//desc_addr = _cdcComposite ?  (const uint8_t*)&USB_DeviceDescriptorB : (const uint8_t*)&USB_DeviceDescriptor;
-#if defined(IAD_PRESENT)
-		desc_addr = (const uint8_t*)&USB_DeviceDescriptorB;
-#elif defined(CDC_ONLY)
+#if defined(CDC_ONLY)
 		desc_addr = (const uint8_t*)&USB_DeviceDescriptorC;
-#else
+#elif defined(HID_ONLY)
 		desc_addr = (const uint8_t*)&USB_DeviceDescriptor;
+#else
+		desc_addr = (const uint8_t*)&USB_DeviceDescriptorB;
 #endif
 
 		if (*desc_addr > setup.wLength) {
@@ -259,7 +257,7 @@ bool USBDeviceClass::sendDescriptor(USBSetup &setup)
 
 void USBDeviceClass::handleEndpoint(uint8_t ep)
 {
-#if defined(CDC_ENABLED)
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 	if (ep == CDC_ENDPOINT_OUT)
 	{
 		// The RAM Buffer is empty: we can receive data
@@ -303,7 +301,13 @@ void USBDeviceClass::init()
 #endif
 
 	// Enable USB clock
+#if (SAMD21 || SAMD11)
 	PM->APBBMASK.reg |= PM_APBBMASK_USB;
+#elif (SAML21)
+	MCLK->APBBMASK.reg |= MCLK_APBBMASK_USB;
+#else
+	#error "USBCore.cpp: Unsupported chip"
+#endif
 
 	// Set up the USB DP/DN pins
 	PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
@@ -314,11 +318,13 @@ void USBDeviceClass::init()
 	PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
 
 	// Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
-	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(6)     | // Generic Clock Multiplexer 6
-	                    GCLK_CLKCTRL_GEN_GCLK0 | // Generic Clock Generator 0 is source
-	                    GCLK_CLKCTRL_CLKEN;
-	while (GCLK->STATUS.bit.SYNCBUSY)
-		;
+#if (SAMD21 || SAMD11)
+	GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GCM_USB ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
+	while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+#else
+	GCLK->PCHCTRL[GCM_USB].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+	while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+#endif
 
 	USB_SetHandler(&UDD_Handler);
 
@@ -385,7 +391,7 @@ bool USBDeviceClass::handleClassInterfaceSetup(USBSetup& setup)
 {
 	uint8_t i = setup.wIndex;
 
-	#if defined(CDC_ENABLED)
+	#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 	if (CDC_ACM_INTERFACE == i)
 	{
 		if (CDC_Setup(setup) == false) {
@@ -410,7 +416,7 @@ uint32_t EndPoints[] =
 {
 	USB_ENDPOINT_TYPE_CONTROL,
 
-#ifdef CDC_ENABLED
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 	USB_ENDPOINT_TYPE_INTERRUPT | USB_ENDPOINT_IN(0),           // CDC_ENDPOINT_ACM
 	USB_ENDPOINT_TYPE_BULK      | USB_ENDPOINT_OUT(0),               // CDC_ENDPOINT_OUT
 	USB_ENDPOINT_TYPE_BULK | USB_ENDPOINT_IN(0),                // CDC_ENDPOINT_IN
@@ -825,7 +831,7 @@ bool USBDeviceClass::handleStandardSetup(USBSetup &setup)
 			initEndpoints();
 			_usbConfiguration = setup.wValueL;
 
-			#if defined(CDC_ENABLED)
+			#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 			// Enable interrupt for CDC reception from host (OUT packet)
 			usbd.epBank1EnableTransferComplete(CDC_ENDPOINT_ACM);
 			usbd.epBank0EnableTransferComplete(CDC_ENDPOINT_OUT);
diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index 21bf70b1d..2c4314250 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -19,8 +19,6 @@
 #ifndef __USBCORE_H__
 #define __USBCORE_H__
 
-#include "USBDesc.h"
-
 //	Standard requests
 #define GET_STATUS					0
 #define CLEAR_FEATURE				1
diff --git a/cores/arduino/USB/USBDesc.h b/cores/arduino/USB/USBDesc.h
index b7c9067e3..38fa87185 100644
--- a/cores/arduino/USB/USBDesc.h
+++ b/cores/arduino/USB/USBDesc.h
@@ -19,37 +19,11 @@
 #ifndef __USBDESC_H__
 #define __USBDESC_H__
 
-#if !defined(ARDUINO_USB_UART_DISABLED) && !defined(ARDUINO_UART_ONLY)
+#if !defined(USB_DISABLED)
 #define PLUGGABLE_USB_ENABLED
 #endif
 
-// These are controlled by the boards.txt menu system.
-// Now that there is Pluggable USB, these will be eliminated
-// once an alternate method for USB PID allocation is found.
-#if defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
-#define CDC_ENABLED
-#if defined(ARDUINO_CDC_ONLY) || defined(ARDUINO_CDC_UART)
-#define CDC_ONLY
-#else
-#define IAD_PRESENT
-#endif
-#endif
-
-#if defined(ARDUINO_HID_ONLY) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_HID) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
-#define HID_ENABLED
-#endif
-
-#if defined(ARDUINO_MIDI_ONLY) || defined(ARDUINO_MIDI_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
-#define MIDI_ENABLED
-#define IAD_PRESENT
-#endif
-
-#if defined(ARDUINO_MSD_ONLY) || defined(ARDUINO_MSD_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
-#define MSD_ENABLED
-#endif
-
-
-#ifdef CDC_ENABLED
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 #define CDC_INTERFACE_COUNT 2
 #define CDC_ENPOINT_COUNT 3
 #else
@@ -65,7 +39,7 @@
 #define CDC_ENDPOINT_OUT	2
 #define CDC_ENDPOINT_IN		3
 
-#ifdef CDC_ENABLED
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 #define CDC_RX CDC_ENDPOINT_OUT
 #define CDC_TX CDC_ENDPOINT_IN
 #endif
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index ec33ff39e..e3867e5aa 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -23,6 +23,7 @@
 
 #include "../Arduino.h"
 #include "variant.h"
+#include "WVariant.h"
 #include "USB_host.h"
 #include "samd21_host.h"
 #include "sam.h"
@@ -67,7 +68,14 @@ void UHD_Init(void)
 	USB_SetHandler(&UHD_Handler);
 
 	/* Enable USB clock */
+#if (SAMD21 || SAMD11)
 	PM->APBBMASK.reg |= PM_APBBMASK_USB;
+#elif (SAML21)
+	MCLK->APBBMASK.reg |= MCLK_APBBMASK_USB;
+#else
+	#error "samd21_host.c: Unsupported chip"
+#endif
+	
 
 	/* Set up the USB DP/DM pins */
 	pinPeripheral( PIN_USB_DM, PIO_COM );
@@ -82,14 +90,13 @@ void UHD_Init(void)
 	/* ----------------------------------------------------------------------------------------------
 	* Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
 	*/
-	GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(6) |        // Generic Clock Multiplexer 6
-						GCLK_CLKCTRL_GEN_GCLK0 |    // Generic Clock Generator 0 is source
-						GCLK_CLKCTRL_CLKEN;
-
-	while (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY)
-	{
-		/* Wait for synchronization */
-	}
+#if (SAMD21 || SAMD11)
+	GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GCM_USB ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
+	while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+#else
+	GCLK->PCHCTRL[GCM_USB].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+	while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+#endif
 
 	/* Reset */
 	USB->HOST.CTRLA.bit.SWRST = 1;
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index d8123dff6..b0c0bd9ad 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -18,6 +18,7 @@
 
 #include "Arduino.h"
 #include "wiring_private.h"
+#include "sam.h"
 
 #include <string.h>
 
@@ -34,8 +35,17 @@ static void __initialize()
   NVIC_EnableIRQ(EIC_IRQn);
 
   // Enable GCLK for IEC (External Interrupt Controller)
-  GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID(GCM_EIC));
-
+#if (SAMD21 || SAMD11)
+  GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GCM_EIC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
+  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+#elif (SAML21 || SAMC21)
+  GCLK->PCHCTRL[GCM_EIC].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+#else
+  #error "WInterrupts.c: Unsupported chip"
+#endif
+
+#if (SAMD21 || SAMD11)
 /* Shall we do that?
   // Do a software reset on EIC
   EIC->CTRL.SWRST.bit = 1 ;
@@ -45,6 +55,17 @@ static void __initialize()
   // Enable EIC
   EIC->CTRL.bit.ENABLE = 1;
   while (EIC->STATUS.bit.SYNCBUSY == 1) { }
+#elif (SAML21 || SAMC21)
+/* Shall we do that?
+  // Do a software reset on EIC
+  EIC->CTRLA.SWRST.bit = 1 ;
+  while ((EIC->CTRLA.SWRST.bit == 1) && (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK)) { }
+*/
+
+  // Enable EIC
+  EIC->CTRLA.bit.ENABLE = 1;
+  while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
+#endif
 }
 
 /*
@@ -70,8 +91,10 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
     return;
 
-  // Enable wakeup capability on pin in case being used during sleep
+  // Enable wakeup capability on pin in case being used during sleep (WAKEUP always enabled on SAML and SAMC)
+#if (SAMD21 || SAMD11)
   EIC->WAKEUP.reg |= (1 << in);
+#endif
 
   // Assign callback to interrupt
   callbacksInt[in] = callback;
@@ -84,29 +107,10 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   }
 
   // Configure the interrupt mode
-  pos = (in - (8 * config)) << 2;
-  switch (mode)
-  {
-    case LOW:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_LOW_Val << pos;
-      break;
-
-    case HIGH:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_HIGH_Val << pos;
-      break;
-
-    case CHANGE:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_BOTH_Val << pos;
-      break;
-
-    case FALLING:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_FALL_Val << pos;
-      break;
-
-    case RISING:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_RISE_Val << pos;
-      break;
-  }
+  pos = (in - (8 * config)) << 2;				// compute position (ie: 0, 4, 8, 12, ...)
+  uint32_t regConfig = EIC->CONFIG[config].reg;			// copy register to variable
+  // insert new mode and write to register (the hardware numbering for the 5 interrupt modes is in reverse order to the arduino numbering, so using '5-mode').
+  EIC->CONFIG[config].reg = (regConfig | ((5-mode) << pos));
 
   // Enable the interrupt
   EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << in);
@@ -123,8 +127,10 @@ void detachInterrupt(uint32_t pin)
 
   EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
   
-  // Disable wakeup capability on pin during sleep
+  // Disable wakeup capability on pin during sleep (WAKEUP always enabled on SAML and SAMC)
+#if (SAMD21 || SAMD11)
   EIC->WAKEUP.reg &= ~(1 << in);
+#endif
 }
 
 /*
@@ -133,7 +139,7 @@ void detachInterrupt(uint32_t pin)
 void EIC_Handler(void)
 {
   // Test the normal interrupts
-  for (uint32_t i=EXTERNAL_INT_0; i<=EXTERNAL_NUM_INTERRUPTS; i++)
+  for (uint32_t i=EXTERNAL_INT_0; i<=EXTERNAL_INT_15; i++)
   {
     if ((EIC->INTFLAG.reg & (1 << i)) != 0)
     {
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index f7650411c..2f689f307 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -20,15 +20,13 @@
 
 #include <stdint.h>
 #include "sam.h"
+#include "variant.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Definitions and types for pins */
-/* ADC channels for ATSAMD21GxxA and ATSAMD21JxxA: All but 8 and 9  */
-/* ADC channels for ATSAMD21ExxA: All but 2, 3, 8, 9, and 10 */
-/* ADC channels for ATSAMD11D14AM: 0 through 9 */
 typedef enum _EAnalogChannel
 {
   No_ADC_Channel=-1,
@@ -53,53 +51,68 @@ typedef enum _EAnalogChannel
   ADC_Channel18=18,
   ADC_Channel19=19,
   DAC_Channel0,
+  DAC_Channel1,
 } EAnalogChannel ;
 
 // Definitions for TC channels
+// RESERVED (1 bit, used for negative) | Timer Number (3 bits: 0-7) | Timer Type (1 bit: 0=TCC, 1=TC) | Timer Channel (3 bits: 0-7)
 typedef enum _ETCChannel
 {
   NOT_ON_TIMER=-1,
-  TCC0_CH0 = (0<<8)|(0),
-  TCC0_CH1 = (0<<8)|(1),
-  TCC0_CH2 = (0<<8)|(2),
-  TCC0_CH3 = (0<<8)|(3),
-  TCC0_CH4 = (0<<8)|(0), // Channel 4 is 0!
-  TCC0_CH5 = (0<<8)|(1), // Channel 5 is 1!
-  TCC0_CH6 = (0<<8)|(2), // Channel 6 is 2!
-  TCC0_CH7 = (0<<8)|(3), // Channel 7 is 3!
-  TCC1_CH0 = (1<<8)|(0),
-  TCC1_CH1 = (1<<8)|(1),
-  TCC1_CH2 = (1<<8)|(0), // Channel 2 is 0!
-  TCC1_CH3 = (1<<8)|(1), // Channel 3 is 1!
-  TCC2_CH0 = (2<<8)|(0),
-  TCC2_CH1 = (2<<8)|(1),
-  TCC2_CH2 = (2<<8)|(0), // Channel 2 is 0!
-  TCC2_CH3 = (2<<8)|(1), // Channel 3 is 1!
-  TC0_CH0  = (0<<8)|(0),
-  TC0_CH1  = (0<<8)|(1),
-  TC1_CH0  = (1<<8)|(0),
-  TC1_CH1  = (1<<8)|(1),
-  TC2_CH0  = (2<<8)|(0),
-  TC2_CH1  = (2<<8)|(1),
-  TC3_CH0  = (3<<8)|(0),
-  TC3_CH1  = (3<<8)|(1),
-  TC4_CH0  = (4<<8)|(0),
-  TC4_CH1  = (4<<8)|(1),
-  TC5_CH0  = (5<<8)|(0),
-  TC5_CH1  = (5<<8)|(1),
-  TC6_CH0  = (6<<8)|(0),
-  TC6_CH1  = (6<<8)|(1),
-  TC7_CH0  = (7<<8)|(0),
-  TC7_CH1  = (7<<8)|(1),
+  TCC0_CH0 = (0<<4)|(0<<3)|(0),
+  TCC0_CH1 = (0<<4)|(0<<3)|(1),
+  TCC0_CH2 = (0<<4)|(0<<3)|(2),
+  TCC0_CH3 = (0<<4)|(0<<3)|(3),
+  TCC0_CH4 = (0<<4)|(0<<3)|(0), // Channel 4 is 0!
+  TCC0_CH5 = (0<<4)|(0<<3)|(1), // Channel 5 is 1!
+  TCC0_CH6 = (0<<4)|(0<<3)|(2), // Channel 6 is 2!
+  TCC0_CH7 = (0<<4)|(0<<3)|(3), // Channel 7 is 3!
+  TCC1_CH0 = (1<<4)|(0<<3)|(0),
+  TCC1_CH1 = (1<<4)|(0<<3)|(1),
+  TCC1_CH2 = (1<<4)|(0<<3)|(0), // Channel 2 is 0!
+  TCC1_CH3 = (1<<4)|(0<<3)|(1), // Channel 3 is 1!
+  TCC2_CH0 = (2<<4)|(0<<3)|(0),
+  TCC2_CH1 = (2<<4)|(0<<3)|(1),
+  TCC2_CH2 = (2<<4)|(0<<3)|(0), // Channel 2 is 0!
+  TCC2_CH3 = (2<<4)|(0<<3)|(1), // Channel 3 is 1!
+  TC0_CH0  = (0<<4)|(1<<3)|(0),
+  TC0_CH1  = (0<<4)|(1<<3)|(1),
+  TC1_CH0  = (1<<4)|(1<<3)|(0),
+  TC1_CH1  = (1<<4)|(1<<3)|(1),
+  TC2_CH0  = (2<<4)|(1<<3)|(0),
+  TC2_CH1  = (2<<4)|(1<<3)|(1),
+  TC3_CH0  = (3<<4)|(1<<3)|(0),
+  TC3_CH1  = (3<<4)|(1<<3)|(1),
+  TC4_CH0  = (4<<4)|(1<<3)|(0),
+  TC4_CH1  = (4<<4)|(1<<3)|(1),
+  TC5_CH0  = (5<<4)|(1<<3)|(0),
+  TC5_CH1  = (5<<4)|(1<<3)|(1),
+  TC6_CH0  = (6<<4)|(1<<3)|(0),
+  TC6_CH1  = (6<<4)|(1<<3)|(1),
+  TC7_CH0  = (7<<4)|(1<<3)|(0),
+  TC7_CH1  = (7<<4)|(1<<3)|(1),
 } ETCChannel ;
 
 extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
 
-#define GetTCNumber( x ) ( (x) >> 8 )
-#define GetTCChannelNumber( x ) ( (x) & 0xff )
-#define GetTC( x ) ( g_apTCInstances[(x) >> 8] )
+#define GetTCNumber( x ) ( ((x) >> 4) & 0x07 )
+#define GetTCType( x ) ( ((x) >> 3) & 0x01 )
+#define GetTCChannelNumber( x ) ( (x) & 0x07 )
+#if (SAMD)
+#define GetTC( x ) ( g_apTCInstances[((x) >> 4) & 0x07] )
+#elif (SAML21 || SAMC21)
+#define GetTC( x ) ( ( ((x) >> 3) & 0x01 ) == 0 ? g_apTCInstances[((x) >> 4) & 0x07] : g_apTCInstances[(((x) >> 4) & 0x07) + TCC_INST_NUM] )
+#else
+#error "WVariant.h: Unsupported chip"
+#endif
+
+// Definitions for GCLK_CCL column TODO, AC?
+// RESERVED (1 bit, used for negative) | GCLK (3 bits: 0-7) | CCL (4 bits: 2 for CCL number, 2 for pin)
+typedef enum _EGCLK_CCL
+{
+  GCLK_CCL_NONE=-1,
+} EGCLK_CCL ;
 
-/* Only PORTA on D21E and D11 */
 typedef enum _EPortType
 {
   NOT_A_PORT=-1,
@@ -108,7 +121,6 @@ typedef enum _EPortType
   PORTC=2,
 } EPortType ;
 
-/* The D11 has only INT 0 though 7 (the SAMD11C14A lacks INT 0 as well */
 typedef enum
 {
   EXTERNAL_INT_0 = 0,
@@ -119,7 +131,6 @@ typedef enum
   EXTERNAL_INT_5,
   EXTERNAL_INT_6,
   EXTERNAL_INT_7,
-#if !defined(__SAMD11D14AM__) && !defined(__SAMD11C14A__) && !defined(__SAMD11D14AS__)
   EXTERNAL_INT_8,
   EXTERNAL_INT_9,
   EXTERNAL_INT_10,
@@ -128,7 +139,6 @@ typedef enum
   EXTERNAL_INT_13,
   EXTERNAL_INT_14,
   EXTERNAL_INT_15,
-#endif
   EXTERNAL_INT_NMI,
   EXTERNAL_NUM_INTERRUPTS,
   NOT_AN_INTERRUPT = -1,
@@ -155,13 +165,17 @@ typedef enum _EPioType
   PIO_ANALOG_ADC=5,                   /* The pin is controlled by the ANALOG peripheral and is an ADC input. */
   PIO_ANALOG_DAC=6,                   /* The pin is controlled by the ANALOG peripheral and is a DAC output. */
   PIO_ANALOG_REF=7,                   /* The pin is controlled by the ANALOG peripheral and is a voltage reference input (3.3V MAX). */
+  PIO_ANALOG_AC=8,                    /* The pin is controlled by the ANALOG peripheral and is used by the AC (analog comparator). */
+  PIO_ANALOG_PTC=9,                   /* The pin is controlled by the ANALOG peripheral and is used by the PTC (peripheral touch controller). */
+  PIO_ANALOG_SDADC=10,                /* The pin is controlled by the ANALOG peripheral and is used by the PTC (peripheral touch controller). */
 
-  PIO_TIMER_PWM=8,                    /* The pin is controlled by a TIMER peripheral and is a PWM output. */
-  PIO_TIMER_CAPTURE=9,                /* The pin is controlled by a TIMER peripheral and is a capture input. */
+  PIO_TIMER_PWM=11,                   /* The pin is controlled by a TIMER peripheral and is a PWM output. */
+  PIO_TIMER_CAPTURE=12,               /* The pin is controlled by a TIMER peripheral and is a capture input. */
 
-  PIO_SERCOM=10,                      /* The pin is controlled by a SERCOM peripheral (UART, SPI, or I2C). */
-  PIO_COM=11,                         /* The pin is controlled by the COM peripheral (USB or I2S). */
-  PIO_AC_GCLK=12,                     /* The pin is controlled by the AC_GCLK peripheral (output). */
+  PIO_SERCOM=13,                      /* The pin is controlled by a SERCOM peripheral (UART, SPI, or I2C). */
+  PIO_COM=14,                         /* The pin is controlled by the COM peripheral (USB or I2S). */
+  PIO_AC_GCLK=15,                     /* The pin is controlled by the AC_GCLK peripheral (I/O). */
+  PIO_CCL=16,                         /* The pin is controlled by the CCL (configurable custom logic) peripheral (I/O). */
 
   PIO_MULTI,                          /* The pin can be configured to any type based on the attributes. */
 
@@ -184,19 +198,24 @@ typedef enum _EPioType
 #define PIN_ATTR_ADC               (1UL << PIO_ANALOG_ADC)
 #define PIN_ATTR_DAC               (1UL << PIO_ANALOG_DAC)
 #define PIN_ATTR_REF               (1UL << PIO_ANALOG_REF)
+#define PIN_ATTR_AC                (1UL << PIO_ANALOG_AC)
+#define PIN_ATTR_PTC               (1UL << PIO_ANALOG_PTC)
+#define PIN_ATTR_SDADC             (1UL << PIO_ANALOG_SDADC)
   #define PIN_ATTR_ANALOG          PIN_ATTR_ADC
 
   #define PIN_ATTR_TIMER_PWM       (1UL << PIO_TIMER_PWM)
   #define PIN_ATTR_TIMER_CAPTURE   (1UL << PIO_TIMER_CAPTURE)
-#define PIN_ATTR_TIMER             (PIN_ATTR_TIMER_PWM|PIN_ATTR_TIMER_CAPTURE)
+#define PIN_ATTR_TIMER_BOTH        (PIN_ATTR_TIMER_PWM|PIN_ATTR_TIMER_CAPTURE)
+#define PIN_ATTR_TIMER             PIN_ATTR_TIMER_BOTH
 
 #define PIN_ATTR_SERCOM            (1UL << PIO_SERCOM)
 #define PIN_ATTR_COM               (1UL << PIO_COM)
-#define PIN_ATTR_AC_CLK            (1UL << PIO_AC_GCLK)
+#define PIN_ATTR_AC_GCLK           (1UL << PIO_AC_GCLK)
+#define PIN_ATTR_CCL               (1UL << PIO_CCL)
 
 
-//A    B                 C       D          E      F   G   H
-//EIC REF ADC AC PTC DAC SERCOM SERCOM_ALT TC/TCC TCC COM AC/GCLK
+// A   B                 C       D          E      F   G     H     I
+//EIC REF ADC AC PTC DAC SERCOM SERCOM_ALT TC/TCC TCC COM AC/GCLK CCL
 typedef enum _EPioPeripheral
 {
 	PER_PORT=-1,          /* The pin is controlled by PORT. */
@@ -208,6 +227,7 @@ typedef enum _EPioPeripheral
 	PER_TIMER_ALT=5,      /* The pin is controlled by the associated signal of peripheral F. */
 	PER_COM=6,            /* The pin is controlled by the associated signal of peripheral G. */
 	PER_AC_CLK=7,         /* The pin is controlled by the associated signal of peripheral H. */
+	PER_CCL=8,            /* The pin is controlled by the associated signal of peripheral I. */
 } EPioPeripheral ;
 
 /**
@@ -237,6 +257,10 @@ typedef enum _EPioPeripheral
 #define PER_ATTR_INPUT_SYNCHRONIZER_ALWAYS_ON     (1UL<<5)
 #define PER_ATTR_INPUT_SYNCHRONIZER_MASK          (1UL<<5)
 
+#define PER_ATTR_ADC_STD             (0UL<<6)
+#define PER_ATTR_ADC_ALT             (1UL<<6)
+#define PER_ATTR_ADC_MASK            (1UL<<6)
+
 
 /* Types used for the table below
  * This struct MUST be 12 bytes long (elements are ordered to prevent unaligned access).
@@ -248,15 +272,24 @@ typedef struct _PinDescription
   uint8_t         ulPinType ;	                // Must be 8 bits
   uint8_t         ulPeripheralAttribute ;	// Must be 8 bit bitfield
   uint32_t        ulPinAttribute ;	        // Must be 32 bit bitfield
-  uint16_t        ulTCChannel ;	                // Must be 16 bits
+#if defined(MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE) && (MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10608)
+  uint8_t         ulTCChannel ;	                // Must be 8 bits
   uint8_t         ulADCChannelNumber ;	        // Must be 8 bits
   uint8_t         ulExtInt ;	                // Must be 8 bits
+  uint8_t         ulGCLKCCL ;	                // Must be 8 bits
+#else
+  uint16_t        ulTCChannel ;	        	// Must be 16 bits
+  uint8_t         ulADCChannelNumber ;	        // Must be 8 bits
+  uint8_t         ulExtInt ;	                // Must be 8 bits
+#endif
 } PinDescription ;
 
 /* Pins table to be instantiated into variant.cpp */
 extern const PinDescription g_APinDescription[] ;
 
 /* Generic Clock Multiplexer IDs */
+#if (SAMD21 || SAMD11)
+
 #define GCM_DFLL48M_REF           (0x00U)
 #define GCM_FDPLL96M_INPUT        (0x01U)
 #define GCM_FDPLL96M_32K          (0x02U)
@@ -270,9 +303,7 @@ extern const PinDescription g_APinDescription[] ;
 #define GCM_EVSYS_CHANNEL_3       (0x0AU)
 #define GCM_EVSYS_CHANNEL_4       (0x0BU)
 #define GCM_EVSYS_CHANNEL_5       (0x0CU)
-
-#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
-
+#if (SAMD11)
 #define GCM_SERCOMx_SLOW          (0x0DU)
 #define GCM_SERCOM0_CORE          (0x0EU)
 #define GCM_SERCOM1_CORE          (0x0FU)
@@ -284,9 +315,7 @@ extern const PinDescription g_APinDescription[] ;
 #define GCM_AC_ANA                (0x15U)
 #define GCM_DAC                   (0x16U)
 #define GCM_PTC                   (0x17U)
-
 #else
-
 #define GCM_EVSYS_CHANNEL_6       (0x0DU)
 #define GCM_EVSYS_CHANNEL_7       (0x0EU)
 #define GCM_EVSYS_CHANNEL_8       (0x0FU)
@@ -311,6 +340,87 @@ extern const PinDescription g_APinDescription[] ;
 #define GCM_PTC                   (0x22U)
 #define GCM_I2S_0                 (0x23U)
 #define GCM_I2S_1                 (0x24U)
+#endif
+
+#elif (SAML21)
+#define GCM_DFLL48M_REF           (0x00U)
+#define GCM_FDPLL96M_INPUT        (0x01U)
+#define GCM_FDPLL96M_32K          (0x02U)
+#define GCM_EIC                   (0x03U)
+#define GCM_USB                   (0x04U)
+#define GCM_EVSYS_CHANNEL_0       (0x05U)
+#define GCM_EVSYS_CHANNEL_1       (0x06U)
+#define GCM_EVSYS_CHANNEL_2       (0x07U)
+#define GCM_EVSYS_CHANNEL_3       (0x08U)
+#define GCM_EVSYS_CHANNEL_4       (0x09U)
+#define GCM_EVSYS_CHANNEL_5       (0x0AU)
+#define GCM_EVSYS_CHANNEL_6       (0x0BU)
+#define GCM_EVSYS_CHANNEL_7       (0x0CU)
+#define GCM_EVSYS_CHANNEL_8       (0x0DU)
+#define GCM_EVSYS_CHANNEL_9       (0x0EU)
+#define GCM_EVSYS_CHANNEL_10      (0x0FU)
+#define GCM_EVSYS_CHANNEL_11      (0x10U)
+#define GCM_SERCOMx_SLOW          (0x11U)
+#define GCM_SERCOM0_CORE          (0x12U)
+#define GCM_SERCOM1_CORE          (0x13U)
+#define GCM_SERCOM2_CORE          (0x14U)
+#define GCM_SERCOM3_CORE          (0x15U)
+#define GCM_SERCOM4_CORE          (0x16U)
+#define GCM_SERCOM5_SLOW          (0x17U)
+#define GCM_SERCOM5_CORE          (0x18U)
+#define GCM_TCC0_TCC1             (0x19U)
+#define GCM_TCC2                  (0x1AU)
+#define GCM_TC0_TC1               (0x1BU)
+#define GCM_TC2_TC3               (0x1CU)
+#define GCM_TC4                   (0x1DU)
+#define GCM_ADC                   (0x1EU)
+#define GCM_AC                    (0x1FU)
+#define GCM_DAC                   (0x20U)
+#define GCM_PTC                   (0x21U)
+#define GCM_CCL                   (0x22U)
+
+#elif (SAMC21)
+#define GCM_FDPLL96M_INPUT        (0x00U)
+#define GCM_FDPLL96M_32K          (0x01U)
+#define GCM_EIC                   (0x02U)
+#define GCM_FREQM_MEASURE         (0x03U)
+#define GCM_FREQM_REF             (0x04U)
+#define GCM_TSENS                 (0x05U)
+#define GCM_EVSYS_CHANNEL_0       (0x06U)
+#define GCM_EVSYS_CHANNEL_1       (0x07U)
+#define GCM_EVSYS_CHANNEL_2       (0x08U)
+#define GCM_EVSYS_CHANNEL_3       (0x09U)
+#define GCM_EVSYS_CHANNEL_4       (0x0AU)
+#define GCM_EVSYS_CHANNEL_5       (0x0BU)
+#define GCM_EVSYS_CHANNEL_6       (0x0CU)
+#define GCM_EVSYS_CHANNEL_7       (0x0DU)
+#define GCM_EVSYS_CHANNEL_8       (0x0EU)
+#define GCM_EVSYS_CHANNEL_9       (0x0FU)
+#define GCM_EVSYS_CHANNEL_10      (0x10U)
+#define GCM_EVSYS_CHANNEL_11      (0x11U)
+#define GCM_SERCOMx_SLOW          (0x12U)
+#define GCM_SERCOM0_CORE          (0x13U)
+#define GCM_SERCOM1_CORE          (0x14U)
+#define GCM_SERCOM2_CORE          (0x15U)
+#define GCM_SERCOM3_CORE          (0x16U)
+#define GCM_SERCOM4_CORE          (0x17U)
+#define GCM_SERCOM5_SLOW          (0x18U)
+#define GCM_SERCOM5_CORE          (0x19U)
+#define GCM_CAN0                  (0x1AU)
+#define GCM_CAN1                  (0x1BU)
+#define GCM_TCC0_TCC1             (0x1CU)
+#define GCM_TCC2                  (0x1DU)
+#define GCM_TC0_TC1               (0x1EU)
+#define GCM_TC2_TC3               (0x1FU)
+#define GCM_TC4                   (0x20U)
+#define GCM_ADC0                  (0x21U)
+#define GCM_ADC1                  (0x22U)
+#define GCM_SDADC                 (0x23U)
+#define GCM_AC                    (0x22U)
+#define GCM_DAC                   (0x24U)
+#define GCM_PTC                   (0x25U)
+#define GCM_CCL                   (0x26U)
+#define GCM_NVMCTRL               (0x27U)
 
 #endif
 
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
index 5a848d148..ef8f390c0 100644
--- a/cores/arduino/cortex_handlers.c
+++ b/cores/arduino/cortex_handlers.c
@@ -43,11 +43,14 @@ void PendSV_Handler   (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SysTick_Handler  (void);
 
 /* Peripherals handlers */
+void SYSTEM_Handler   (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void PM_Handler       (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SYSCTRL_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void WDT_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void RTC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void EIC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void FREQM_Handler    (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TSENS_Handler    (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void NVMCTRL_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void DMAC_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void USB_Handler      (void) __attribute__ ((weak));
@@ -58,21 +61,29 @@ void SERCOM2_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM3_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM4_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SERCOM5_Handler  (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void CAN0_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void CAN1_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC0_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC1_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TCC2_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TC0_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC1_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC2_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC3_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC4_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
-void TC5_Handler      (void) __attribute__ ((weak)); // Used in Tone.cpp
+void TC5_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC6_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void TC7_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void ADC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void ADC0_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void ADC1_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void AC_Handler       (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void DAC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void SDADC_Handler    (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void PTC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void I2S_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void AES_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
+void TRNG_Handler     (void) __attribute__ ((weak, alias("Dummy_Handler")));
 
 /* Initialize segments */
 extern uint32_t __etext;
@@ -105,6 +116,7 @@ __attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
   (void*) SysTick_Handler,
 
   /* Configurable interrupts */
+#if (SAMD21_SERIES || SAMD11_SERIES)
   (void*) PM_Handler,             /*  0 Power Manager */
   (void*) SYSCTRL_Handler,        /*  1 System Control */
   (void*) WDT_Handler,            /*  2 Watchdog Timer */
@@ -117,17 +129,13 @@ __attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
   (void*) SERCOM0_Handler,        /*  9 Serial Communication Interface 0 */
   (void*) SERCOM1_Handler,        /* 10 Serial Communication Interface 1 */
   (void*) SERCOM2_Handler,        /* 11 Serial Communication Interface 2 */
-#if defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || \
-  defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
-  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+#if (SAMD21_SERIES)
   (void*) SERCOM3_Handler,        /* 12 Serial Communication Interface 3 */
   (void*) SERCOM4_Handler,        /* 13 Serial Communication Interface 4 */
   (void*) SERCOM5_Handler,        /* 14 Serial Communication Interface 5 */
 #endif
   (void*) TCC0_Handler,           /* 15 / 12 Timer Counter Control 0 */
-#if defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || \
-  defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
-  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+#if (SAMD21_SERIES)
   (void*) TCC1_Handler,           /* 16 Timer Counter Control 1 */
   (void*) TCC2_Handler,           /* 17 Timer Counter Control 2 */
   (void*) TC3_Handler,            /* 18 Basic Timer Counter 3 */
@@ -143,11 +151,63 @@ __attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
   (void*) AC_Handler,             /* 24 / 16 Analog Comparators */
   (void*) DAC_Handler,            /* 25 / 17 Digital Analog Converter */
   (void*) PTC_Handler,            /* 26 / 18 Peripheral Touch Controller */
-#if defined(__SAMD21E15A__) || defined(__SAMD21E16A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || \
-  defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
-  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
+#if (SAMD21_SERIES)
   (void*) I2S_Handler             /* 27 Inter-IC Sound Interface */
 #endif
+
+#elif (SAML21_SERIES || SAMC21_SERIES)
+  (void*) SYSTEM_Handler,         /*  0 SYSTEM handler (includes SYSTEM, MCLK, OSCCTRL, OSC32KCTRL, PAC, PM, SUPC, and TAL) */
+  (void*) WDT_Handler,            /*  1 Watchdog Timer */
+  (void*) RTC_Handler,            /*  2 Real-Time Counter */
+  (void*) EIC_Handler,            /*  3 External Interrupt Controller */
+#if (SAMC21_SERIES)
+  (void*) FREQM_Handler,          /*  4 FREQM */
+  (void*) TSENS_Handler,          /*  5 TSENS */
+#endif
+  (void*) NVMCTRL_Handler,        /*  4 / 6 Non-Volatile Memory Controller */
+  (void*) DMAC_Handler,           /*  5 / 7 Direct Memory Access Controller */
+#if (SAML21_SERIES)
+  (void*) USB_Handler,            /*  6 Universal Serial Bus */
+#endif
+  (void*) EVSYS_Handler,          /*  7 / 8 Event System Interface */
+  (void*) SERCOM0_Handler,        /*  8 / 9 Serial Communication Interface 0 */
+  (void*) SERCOM1_Handler,        /*  9 / 10 Serial Communication Interface 1 */
+  (void*) SERCOM2_Handler,        /* 10 / 11 Serial Communication Interface 2 */
+  (void*) SERCOM3_Handler,        /* 11 / 12 Serial Communication Interface 3 */
+  (void*) SERCOM4_Handler,        /* 12 / 13 Serial Communication Interface 4 */
+  (void*) SERCOM5_Handler,        /* 13 / 14 Serial Communication Interface 5 */
+#if (SAMC21_SERIES)
+  (void*) CAN0_Handler,           /* 15 CAN0 */
+  (void*) CAN1_Handler,           /* 16 CAN1 */
+#endif
+  (void*) TCC0_Handler,           /* 14 / 17 Timer Counter Control 0 */
+  (void*) TCC1_Handler,           /* 15 / 18 Timer Counter Control 1 */
+  (void*) TCC2_Handler,           /* 16 / 19 Timer Counter Control 2 */
+  (void*) TC0_Handler,            /* 17 / 20 Basic Timer Counter 0 */
+  (void*) TC1_Handler,            /* 18 / 21 Basic Timer Counter 1 */
+  (void*) TC2_Handler,            /* 19 / 22 Basic Timer Counter 2 */
+  (void*) TC3_Handler,            /* 20 / 23 Basic Timer Counter 3 */
+  (void*) TC4_Handler,            /* 21 / 24 Basic Timer Counter 4 */
+#if (SAMC21_SERIES)
+  (void*) ADC0_Handler,           /* 25 ADC0 */
+  (void*) ADC1_Handler,           /* 26 ADC1 */
+#else
+  (void*) ADC_Handler,            /* 22 Analog Digital Converter */
+#endif
+  (void*) AC_Handler,             /* 23 / 27 Analog Comparators */
+  (void*) DAC_Handler,            /* 24 / 28 Digital Analog Converter */
+#if (SAMC21_SERIES)
+  (void*) SDADC_Handler,          /* 29 SDADC */
+#endif
+  (void*) PTC_Handler,            /* 25 / 30 Peripheral Touch Controller */
+#if (SAML21_SERIES)
+  (void*) AES_Handler,            /* 26 AES */
+  (void*) TRNG_Handler,           /* 27 TRNG */
+#endif
+
+#else
+#error "cortex_handlers.c: Unsupported chip"
+#endif
 };
 
 extern int main(void);
@@ -173,6 +233,20 @@ void Reset_Handler(void)
       *pDest = 0;
   }
 
+  /* Change default QOS values to have the best performance and correct USB behaviour (applies to D21/D11). From startup_samd21.c from ASF 3.32. */
+#if (SAMD21_SERIES || SAMD11_SERIES)
+  SBMATRIX->SFR[SBMATRIX_SLAVE_HMCRAMC0].reg = 2;
+#endif
+
+#if defined(ID_USB)
+  USB->DEVICE.QOSCTRL.bit.CQOS = 2;
+  USB->DEVICE.QOSCTRL.bit.DQOS = 2;
+#endif
+
+  DMAC->QOSCTRL.bit.DQOS = 2;
+  DMAC->QOSCTRL.bit.FQOS = 2;
+  DMAC->QOSCTRL.bit.WRBQOS = 2;
+
   /* Initialize the C library */
   __libc_init_array();
 
@@ -194,6 +268,7 @@ void SysTick_Handler(void)
   SysTick_DefaultHandler();
 }
 
+#if !defined(USB_DISABLED)
 static void (*usb_isr)(void) = NULL;
 
 void USB_Handler(void)
@@ -206,3 +281,4 @@ void USB_SetHandler(void (*new_usb_isr)(void))
 {
   usb_isr = new_usb_isr;
 }
+#endif
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
index 6154d27e0..11a95e9a3 100644
--- a/cores/arduino/main.cpp
+++ b/cores/arduino/main.cpp
@@ -18,6 +18,7 @@
 
 #define ARDUINO_MAIN
 #include "Arduino.h"
+#include "sam.h"
 
 // Weak empty variant initialization function.
 // May be redefined by variant files.
@@ -34,11 +35,9 @@ int main( void )
   initVariant();
 
   delay(1);
-#if defined(USBCON)
-  #if !defined(ARDUINO_USB_UART_DISABLED) && !defined(ARDUINO_UART_ONLY)
+#if defined(USBCON) && !defined(USB_DISABLED)
   USBDevice.init();
   USBDevice.attach();
-  #endif
 #endif
 
   setup();
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index c93780a2f..1675a9bcf 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -45,50 +45,71 @@
 
 void waitForSync( void )
 {
-	while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY )
-	{
-		/* Wait for synchronization */
-	}
+#if (SAMD)
+  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+#elif (SAML21 || SAMC21)
+  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+#else
+  #error "startup.c: Unsupported chip"
+#endif
 }
 
+#if (SAMD || SAML21)
 void waitForDFLL( void )
 {
-	while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 )
-	{
-		/* Wait for synchronization */
-	}
+#if (SAMD)
+  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 );
+#elif (SAML21)
+  while ( (OSCCTRL->STATUS.reg & OSCCTRL_STATUS_DFLLRDY) == 0 );
+#endif
 }
+#endif
 
 void SystemInit( void )
 {
   /* Set 1 Flash Wait State for 48MHz, cf tables 20.9 and 35.27 in SAMD21 Datasheet */
-  NVMCTRL->CTRLB.bit.RWS = NVMCTRL_CTRLB_RWS_HALF_Val ;
+#if (SAMD)
+  NVMCTRL->CTRLB.bit.RWS = NVMCTRL_CTRLB_RWS_HALF_Val ;	// one wait state
+#elif (SAML21 || SAMC21)
+  NVMCTRL->CTRLB.reg |= NVMCTRL_CTRLB_RWS_DUAL ; // two wait states
+#endif
 
   /* Turn on the digital interface clock */
+#if (SAMD)
   PM->APBAMASK.reg |= PM_APBAMASK_GCLK ;
+#elif (SAML21 || SAMC21)
+  MCLK->APBAMASK.reg |= MCLK_APBAMASK_GCLK ;
+#endif
 
   /* ----------------------------------------------------------------------------------------------
-   * 1) Enable XOSC32K clock (External on-board 32.768Hz oscillator)
+   * 0) Software reset the GCLK module to ensure it is re-initialized correctly
    */
+#if (SAMD)
+  GCLK->CTRL.reg = GCLK_CTRL_SWRST ;
+
+  while ( (GCLK->CTRL.reg & GCLK_CTRL_SWRST) && (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY) );	/* Wait for reset to complete */
+#elif (SAML21 || SAMC21)
+  GCLK->CTRLA.reg = GCLK_CTRLA_SWRST ;
+
+  while ( (GCLK->CTRLA.reg & GCLK_CTRLA_SWRST) && (GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK) );	/* Wait for reset to complete */
+#endif
+
+  /* ----------------------------------------------------------------------------------------------
+   * 1) Enable XOSC32K clock (External on-board 32.768Hz crystal oscillator)
+   */
+#if (SAMD)
   SYSCTRL->XOSC32K.reg = SYSCTRL_XOSC32K_STARTUP( 0x6u ) | /* cf table 15.10 of product datasheet in chapter 15.8.6 */
                          SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K ;
   SYSCTRL->XOSC32K.bit.ENABLE = 1 ; /* separate call, as described in chapter 15.6.3 */
 
-  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSC32KRDY) == 0 )
-  {
-    /* Wait for oscillator stabilization */
-  }
+  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSC32KRDY) == 0 );	/* Wait for oscillator stabilization */
+#elif (SAML21 || SAMC21)
+  OSC32KCTRL->XOSC32K.reg = OSC32KCTRL_XOSC32K_STARTUP( 0x4u ) | OSC32KCTRL_XOSC32K_XTALEN | OSC32KCTRL_XOSC32K_EN32K ;
+  OSC32KCTRL->XOSC32K.bit.ENABLE = 1 ; /* separate call, as described in chapter 15.6.3 */
 
-  /* Software reset the module to ensure it is re-initialized correctly */
-  /* Note: Due to synchronization, there is a delay from writing CTRL.SWRST until the reset is complete.
-   * CTRL.SWRST and STATUS.SYNCBUSY will both be cleared when the reset is complete, as described in chapter 13.8.1
-   */
-  GCLK->CTRL.reg = GCLK_CTRL_SWRST ;
-
-  while ( (GCLK->CTRL.reg & GCLK_CTRL_SWRST) && (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY) )
-  {
-    /* Wait for reset to complete */
-  }
+  while ( (OSC32KCTRL->STATUS.reg & OSC32KCTRL_STATUS_XOSC32KRDY) == 0 );	/* Wait for oscillator stabilization */
+  #error "SAML and SAMC porting is not yet complete. I still need to modify the clock code (adding support for more sources). See later commit."
+#endif
 
   /* ----------------------------------------------------------------------------------------------
    * 2) Put XOSC32K as source of Generic Clock Generator 1
@@ -98,19 +119,14 @@ void SystemInit( void )
   waitForSync();
 
   /* Write Generic Clock Generator 1 configuration */
-  GCLK->GENCTRL.reg = GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_XOSC32K ) | // Generic Clock Generator 1
-                      GCLK_GENCTRL_SRC_XOSC32K | // Selected source is External 32KHz Oscillator
-//                      GCLK_GENCTRL_OE | // Output clock to a pin for tests
-                      GCLK_GENCTRL_GENEN ;
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_XOSC32K ) | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_GENEN );
 
   waitForSync();
 
   /* ----------------------------------------------------------------------------------------------
    * 3) Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 0 (DFLL48M reference)
    */
-  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GENERIC_CLOCK_MULTIPLEXER_DFLL48M ) | // Generic Clock Multiplexer 0
-                      GCLK_CLKCTRL_GEN_GCLK1 | // Generic Clock Generator 1 is source
-                      GCLK_CLKCTRL_CLKEN ;
+  GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GENERIC_CLOCK_MULTIPLEXER_DFLL48M ) | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN );
 
   waitForSync();
 
@@ -142,10 +158,7 @@ void SystemInit( void )
   SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_ENABLE ;
 
   while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLLCKC) == 0 ||
-          (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLLCKF) == 0 )
-  {
-    /* Wait for locks flags */
-  }
+	  (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLLCKF) == 0 );	/* Wait for locks flags */
 
   waitForDFLL();
 
@@ -157,11 +170,7 @@ void SystemInit( void )
   waitForSync();
 
   /* Write Generic Clock Generator 0 configuration */
-  GCLK->GENCTRL.reg = GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | // Generic Clock Generator 0
-                      GCLK_GENCTRL_SRC_DFLL48M | // Selected source is DFLL 48MHz
-//                      GCLK_GENCTRL_OE | // Output clock to a pin for tests
-                      GCLK_GENCTRL_IDC | // Set 50/50 duty cycle
-                      GCLK_GENCTRL_GENEN ;
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
 
   waitForSync();
 
@@ -177,21 +186,23 @@ void SystemInit( void )
   GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_OSC8M ) ; // Generic Clock Generator 3
 
   /* Write Generic Clock Generator 3 configuration */
-  GCLK->GENCTRL.reg = GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_OSC8M ) | // Generic Clock Generator 3
-                      GCLK_GENCTRL_SRC_OSC8M | // Selected source is RC OSC 8MHz (already enabled at reset)
-//                      GCLK_GENCTRL_OE | // Output clock to a pin for tests
-                      GCLK_GENCTRL_GENEN ;
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_OSC8M ) | GCLK_GENCTRL_SRC_OSC8M | GCLK_GENCTRL_GENEN );
 
   waitForSync();
 
+
   /*
    * Now that all system clocks are configured, we can set CPU and APBx BUS clocks.
    * There values are normally the one present after Reset.
    */
+#if (SAMD)
   PM->CPUSEL.reg  = PM_CPUSEL_CPUDIV_DIV1 ;
   PM->APBASEL.reg = PM_APBASEL_APBADIV_DIV1_Val ;
   PM->APBBSEL.reg = PM_APBBSEL_APBBDIV_DIV1_Val ;
   PM->APBCSEL.reg = PM_APBCSEL_APBCDIV_DIV1_Val ;
+#elif (SAML21 || SAMC21)
+  MCLK->CPUDIV.reg  = MCLK_CPUDIV_CPUDIV_DIV1 ;
+#endif
 
   SystemCoreClock=VARIANT_MCK ;
 
@@ -199,6 +210,7 @@ void SystemInit( void )
    * 8) Load ADC factory calibration values
    */
 
+#if (SAMD)
   // ADC Bias Calibration
   uint32_t bias = (*((uint32_t *) ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
 
@@ -210,8 +222,24 @@ void SystemInit( void )
 
   ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
 
+#elif (SAML21)
+  uint32_t biasrefbuf = (*((uint32_t *) ADC_FUSES_BIASREFBUF_ADDR) & ADC_FUSES_BIASREFBUF_Msk) >> ADC_FUSES_BIASREFBUF_Pos;
+  uint32_t biascomp = (*((uint32_t *) ADC_FUSES_BIASCOMP_ADDR) & ADC_FUSES_BIASCOMP_Msk) >> ADC_FUSES_BIASCOMP_Pos;
+
+  ADC->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
+
+#elif (SAMC21)
+  uint32_t biasrefbuf = (*((uint32_t *) ADC0_FUSES_BIASREFBUF_ADDR) & ADC0_FUSES_BIASREFBUF_Msk) >> ADC0_FUSES_BIASREFBUF_Pos;
+  uint32_t biascomp = (*((uint32_t *) ADC0_FUSES_BIASCOMP_ADDR) & ADC0_FUSES_BIASCOMP_Msk) >> ADC0_FUSES_BIASCOMP_Pos;
+  ADC0->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
+  
+  biasrefbuf = (*((uint32_t *) ADC1_FUSES_BIASREFBUF_ADDR) & ADC1_FUSES_BIASREFBUF_Msk) >> ADC1_FUSES_BIASREFBUF_Pos;
+  biascomp = (*((uint32_t *) ADC1_FUSES_BIASCOMP_ADDR) & ADC1_FUSES_BIASCOMP_Msk) >> ADC1_FUSES_BIASCOMP_Pos;
+  ADC1->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
+#endif
+
   /*
-   * 9) Disable automatic NVM write operations
+   * 9) Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21)
    */
   NVMCTRL->CTRLB.bit.MANW = 1;
 }
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index 67ef41751..ac92bf01a 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -17,11 +17,32 @@
 */
 
 #include "Arduino.h"
+#include "sam.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+// not defined for SAML or SAMC in version of CMSIS used
+#ifndef ADC_INPUTCTRL_MUXNEG_GND
+#define ADC_INPUTCTRL_MUXNEG_GND (0x18ul << ADC_INPUTCTRL_MUXNEG_Pos)
+#endif
+
+// Wait for synchronization of registers between the clock domains
+static __inline__ void syncADC() __attribute__((always_inline, unused));
+static void syncADC() {
+#if (SAMD)
+  while ( ADC->STATUS.bit.SYNCBUSY == 1 );
+#elif (SAML21)
+  while ( ADC->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+#elif (SAMC21)
+  while ( ADC0->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+  while ( ADC1->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+#else
+  #error "wiring_analog.c: Unsupported chip"
+#endif
+}
+
 /*
  * System Core Clock is at 1MHz (8MHz/8) at Reset.
  * It is switched to 48MHz in the Reset Handler (startup.c)
@@ -72,30 +93,61 @@ void init( void )
 //  // Clock EIC for I/O interrupts
 //	PM->APBAMASK.reg |= PM_APBAMASK_EIC ;
 
-  // Clock SERCOM for Serial
-#if defined(__SAMD21G15A__) || defined(__SAMD21G16A__) || defined(__SAMD21G17A__) || defined(__SAMD21G18A__) || \
-  defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
-  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
-#elif defined(__SAMD11D14AM__) || defined(__SAMD11D14AS__)
-  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 ;
-#elif defined(__SAMD11C14A__)
-  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 ;
+  // Clock SERCOM for Serial, TC/TCC for Pulse and Analog, and ADC/DAC for Analog
+#if (SAMD21 || SAMD11)
+  uint32_t regAPBCMASK = PM->APBCMASK.reg;
+  
+  #if (SAMD11C)
+  regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 ;
+  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TC1 | PM_APBCMASK_TC2 ;	// Note that on the D11C, TC2 is not routed to pins (but can be used internally)
+  #elif (SAMD11D)
+  regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 ;
+  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TC1 | PM_APBCMASK_TC2 ;
+  #elif (SAMD21E)
+  regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 ;
+  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5
+  #elif (SAMD21G)
+  regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
+  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 ;
+  #elif (SAMD21J)
+  regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
+  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 | PM_APBCMASK_TC6 | PM_APBCMASK_TC7 ;
+  #endif
+  
+  regAPBCMASK |= PM_APBCMASK_ADC | PM_APBCMASK_DAC ;
+  
+  PM->APBCMASK.reg |= regAPBCMASK ;
+#elif (SAML21 || SAMC21)
+  uint32_t regAPBCMASK = MCLK->APBCMASK.reg;
+  
+  #if (SAML)
+  regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 ;
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM5;	// On the SAML, SERCOM5 is on the low power bridge
+  regAPBCMASK |= MCLK_APBCMASK_TCC0 | MCLK_APBCMASK_TCC1 | MCLK_APBCMASK_TCC2 | MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1 | MCLK_APBCMASK_TC2 ;
+    #if (SAML21J)
+    regAPBCMASK |= MCLK_APBCMASK_TC3 ;
+    MCLK->APBDMASK.reg |= MCLK_APBDMASK_TC4;	// On the SAML, TC4 is on the low power bridge
+    #endif
+  #elif (SAMC21E)
+  regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 ;
+  regAPBCMASK |= MCLK_APBCMASK_TCC0 | MCLK_APBCMASK_TCC1 | MCLK_APBCMASK_TCC2 | MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1 | MCLK_APBCMASK_TC2 | MCLK_APBCMASK_TC3 | MCLK_APBCMASK_TC4 ;
+  #elif (SAMC21G) || (SAMC21J)
+  regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
+  regAPBCMASK |= MCLK_APBCMASK_TCC0 | MCLK_APBCMASK_TCC1 | MCLK_APBCMASK_TCC2 | MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1 | MCLK_APBCMASK_TC2 | MCLK_APBCMASK_TC3 | MCLK_APBCMASK_TC4 ;
+  #endif
+  
+  #if (SAML)
+  regAPBCMASK |= MCLK_APBCMASK_DAC ;
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_ADC;	// On the SAML, TC4 is on the low power bridge
+  #elif (SAMC)
+  regAPBCMASK |= MCLK_APBCMASK_ADC0 | MCLK_APBCMASK_ADC1 | MCLK_APBCMASK_DAC ;
+  #endif
+  
+  MCLK->APBCMASK.reg |= regAPBCMASK ;
 #else
-  PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 ;
+  #error "wiring.c: Unsupported chip"
 #endif
 
-  // Clock TC/TCC for Pulse and Analog
-#if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
-  PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 | PM_APBCMASK_TC6 | PM_APBCMASK_TC7 ;
-#elif defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
-  PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TC1 | PM_APBCMASK_TC2 ;
-#else
-  PM->APBCMASK.reg |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 ;
-#endif
-
-  // Clock ADC/DAC for Analog
-  PM->APBCMASK.reg |= PM_APBCMASK_ADC | PM_APBCMASK_DAC ;
-
   //Setup all pins (digital and analog) in STARTUP mode (enable INEN only)
   for ( ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
   {
@@ -104,39 +156,87 @@ void init( void )
 
   // Initialize Analog Controller
   // Setting clock
-  while(GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY);
+#if (SAMD)
+  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
 
-  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_ADC ) | // Generic Clock ADC
-                      GCLK_CLKCTRL_GEN_GCLK0     | // Generic Clock Generator 0 is source
-                      GCLK_CLKCTRL_CLKEN ;
+  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_ADC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN ;
 
-  while( ADC->STATUS.bit.SYNCBUSY == 1 );          // Wait for synchronization of registers between the clock domains
+  syncADC();          // Wait for synchronization of registers between the clock domains
 
   ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV512 |    // Divide Clock by 512.
-                   ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
-
-  ADC->SAMPCTRL.reg = 0x3f;                        // Set max Sampling Time Length
-
-  while( ADC->STATUS.bit.SYNCBUSY == 1 );          // Wait for synchronization of registers between the clock domains
+  ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+#elif (SAML21 || SAMC21)
+  SUPC->VREF.reg |= SUPC_VREF_VREFOE;		// Enable Supply Controller Reference output for use with ADC and DAC (AR_INTREF)
+
+  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+
+  GCLK->PCHCTRL[GCM_ADC].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+
+  syncADC();          // Wait for synchronization of registers between the clock domains
+
+  #if (SAML21)
+  ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV256;   // Divide Clock by 256.
+  ADC->CTRLC.reg = ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+  #elif (SAMC21)
+  ADC0->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV256;   // Divide Clock by 256.
+  ADC0->CTRLC.reg = ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+  ADC1->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV256;   // Divide Clock by 256.
+  ADC1->CTRLC.reg = ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+  #endif
+  syncADC();          // Wait for synchronization of registers between the clock domains
+#endif
+  
+#if (SAMD || SAML21)
+  ADC->SAMPCTRL.reg = 0x3f;     // Set max Sampling Time Length (in CLK_ADC cycles for SAMD, half CLK_ADC cycles for SAML and SAMC)
+  syncADC();          // Wait for synchronization of registers between the clock domains
 
   ADC->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND;   // No Negative input (Internal Ground)
+  syncADC();          // Wait for synchronization of registers between the clock domains
 
   // Averaging (see datasheet table in AVGCTRL register description)
   ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 |    // 1 sample only (no oversampling nor averaging)
                      ADC_AVGCTRL_ADJRES(0x0ul);   // Adjusting result by 0
+#elif (SAMC21)
+  ADC0->SAMPCTRL.reg = 0x3f;     // Set max Sampling Time Length (in CLK_ADC cycles for SAMD, half CLK_ADC cycles for SAML and SAMC)
+  ADC1->SAMPCTRL.reg = 0x3f;
+  syncADC();          // Wait for synchronization of registers between the clock domains
+
+  ADC0->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND;   // No Negative input (Internal Ground)
+  ADC1->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND;
+  syncADC();          // Wait for synchronization of registers between the clock domains
+
+  // Averaging (see datasheet table in AVGCTRL register description)
+  ADC0->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 |    // 1 sample only (no oversampling nor averaging)
+                     ADC_AVGCTRL_ADJRES(0x0ul);   // Adjusting result by 0
+  ADC1->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 | ADC_AVGCTRL_ADJRES(0x0ul);
+#endif
 
   analogReference( VARIANT_AR_DEFAULT ) ;         // Use default reference from variant.h
 
   // Initialize DAC
   // Setting clock
+#if (SAMD)
   while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
-  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_DAC ) | // Generic Clock ADC
-                      GCLK_CLKCTRL_GEN_GCLK0     | // Generic Clock Generator 0 is source
-                      GCLK_CLKCTRL_CLKEN ;
+  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_DAC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN ;
 
   while ( DAC->STATUS.bit.SYNCBUSY == 1 ); // Wait for synchronization of registers between the clock domains
   DAC->CTRLB.reg = DAC_CTRLB_REFSEL_AVCC | // Using the 3.3V reference
                    DAC_CTRLB_EOEN ;        // External Output Enable (Vout)
+#elif (SAML21 || SAMC21)
+  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+
+  GCLK->PCHCTRL[GCM_DAC].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+
+  while ( DAC->SYNCBUSY.reg & DAC_SYNCBUSY_MASK );
+
+  #if (SAMC21)
+    DAC->CTRLB.reg = DAC_CTRLB_REFSEL_AVCC;
+  #elif (SAML21)
+    DAC->CTRLB.reg = DAC_CTRLB_REFSEL_VDDANA;
+    DAC->DACCTRL[0].reg = DAC_DACCTRL_REFRESH(2); // setup refresh
+    DAC->DACCTRL[1].reg = DAC_DACCTRL_REFRESH(2); // setup refresh
+  #endif
+#endif
 }
 
 #ifdef __cplusplus
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 6f8646ac7..7a73960b4 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -18,11 +18,46 @@
 
 #include "Arduino.h"
 #include "wiring_private.h"
+#include "variant.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/* Mapping of timer numbers (array index) to generic clock IDs
+ * GCM_* values are defined in WVariant.h in the core.
+ */
+const uint8_t timerClockIDs[] = 
+{
+#if (SAMD11)
+	GCM_TCC0,
+	GCM_TC1_TC2,
+	GCM_TC1_TC2,
+#elif (SAMD21)
+	GCM_TCC0_TCC1,
+	GCM_TCC0_TCC1,
+	GCM_TCC2_TC3,
+	GCM_TCC2_TC3,
+	GCM_TC4_TC5,
+	GCM_TC4_TC5,
+	#if (SAMD21J)
+	GCM_TC6_TC7,
+	GCM_TC6_TC7,
+	#endif
+#elif (SAML21 || SAMC21)
+	GCM_TCC0_TCC1,
+	GCM_TCC0_TCC1,
+	GCM_TCC2,
+	GCM_TC0_TC1,
+	GCM_TC0_TC1,
+	GCM_TC2_TC3,
+	GCM_TC2_TC3,
+	GCM_TC4,
+#else
+#error "wiring_analog.c: Unsupported chip"
+#endif
+};
+
 static int _readResolution = 10;
 static int _ADCResolution = 10;
 static int _writeResolution = 8;
@@ -30,21 +65,34 @@ static int _writeResolution = 8;
 // Wait for synchronization of registers between the clock domains
 static __inline__ void syncADC() __attribute__((always_inline, unused));
 static void syncADC() {
-  while (ADC->STATUS.bit.SYNCBUSY == 1)
-    ;
+#if (SAMD)
+  while ( ADC->STATUS.bit.SYNCBUSY == 1 );
+#elif (SAML21)
+  while ( ADC->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+#elif (SAMC21)
+  while ( ADC0->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+  while ( ADC1->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+#endif
 }
 
 // Wait for synchronization of registers between the clock domains
 static __inline__ void syncDAC() __attribute__((always_inline, unused));
 static void syncDAC() {
-  while (DAC->STATUS.bit.SYNCBUSY == 1)
-    ;
+#if (SAMD)
+  while ( DAC->STATUS.bit.SYNCBUSY == 1 );
+#elif (SAML21 || SAMC21)
+  while ( DAC->SYNCBUSY.reg & DAC_SYNCBUSY_MASK );
+#endif
 }
 
 // Wait for synchronization of registers between the clock domains
 static __inline__ void syncTC_8(Tc* TCx) __attribute__((always_inline, unused));
 static void syncTC_8(Tc* TCx) {
+#if (SAMD)
   while (TCx->COUNT8.STATUS.bit.SYNCBUSY);
+#elif (SAML21 || SAMC21)
+  while (TCx->SYNCBUSY.reg);
+#endif
 }
 
 // Wait for synchronization of registers between the clock domains
@@ -58,17 +106,38 @@ void analogReadResolution( int res )
   _readResolution = res ;
   if (res > 10)
   {
+#if (SAMD)
     ADC->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_12BIT_Val;
+#elif (SAML21)
+    ADC->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_12BIT_Val;
+#elif (SAMC21)
+    ADC0->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_12BIT_Val;
+    ADC1->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_12BIT_Val;
+#endif
     _ADCResolution = 12;
   }
   else if (res > 8)
   {
+#if (SAMD)
     ADC->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_10BIT_Val;
+#elif (SAML21)
+    ADC->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_10BIT_Val;
+#elif (SAMC21)
+    ADC0->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_10BIT_Val;
+    ADC1->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_10BIT_Val;
+#endif
     _ADCResolution = 10;
   }
   else
   {
+#if (SAMD)
     ADC->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_8BIT_Val;
+#elif (SAML21)
+    ADC->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_8BIT_Val;
+#elif (SAMC21)
+    ADC0->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_8BIT_Val;
+    ADC1->CTRLC.bit.RESSEL = ADC_CTRLC_RESSEL_8BIT_Val;
+#endif
     _ADCResolution = 8;
   }
   syncADC();
@@ -97,48 +166,54 @@ static inline uint32_t mapResolution( uint32_t value, uint32_t from, uint32_t to
 }
 
 /*
- * Default Internal Reference is at 1.65V (with ADC gain of 1/2)
- * External Reference should be between 1v and VDDANA-0.6v=2.7v
+ * Default Internal Reference for the SAMD is at 1.65V (with ADC gain of 1/2)
+ * External Reference for the SAMD should be between 1v and VDDANA-0.6v=2.7v
  *
- * Warning : On Arduino Zero board the input/output voltage for SAMD21G18 is 3.3 volts maximum
+ * Warning : The maximum IO voltage is Vcc (for SAMD/SAML Vcc can be up to 3.6 volts)
  */
 void analogReference( eAnalogReference ulMode )
 {
-  uint32_t gain = ADC_INPUTCTRL_GAIN_1X_Val;      // Default Gain Factor Selection
-  uint32_t refsel;
-
   syncADC();
-  switch ( ulMode )
-  {
-    case AR_INTERNAL:
-    case AR_INTERNAL2V23:
-      refsel = ADC_REFCTRL_REFSEL_INTVCC0_Val; // 1/1.48 VDDANA = 1/1.48* 3V3 = 2.2297
-      break;
-
-    case AR_EXTERNAL:
-      if ( pinPeripheral(REFA_PIN, PIO_ANALOG_REF) == RET_STATUS_OK )
-      {
-        refsel = ADC_REFCTRL_REFSEL_AREFA_Val;
-      }
-      break;
 
-    case AR_INTERNAL1V0:
-      refsel = ADC_REFCTRL_REFSEL_INT1V_Val;   // 1.0V voltage reference
-      break;
+  if (ulMode == AR_EXTERNAL_REFA) {
+    if ( pinPeripheral(REFA_PIN, PIO_ANALOG_REF) != RET_STATUS_OK ) {
+        return;
+    }
+  }
 
-    case AR_INTERNAL1V65:
-      refsel = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
-      break;
+#if (SAMD || SAML21)
+  if (ulMode == AR_EXTERNAL_REFB) {
+    if ( pinPeripheral(REFB_PIN, PIO_ANALOG_REF) != RET_STATUS_OK ) {
+        return;
+    }
+  }
+#endif
 
-    case AR_DEFAULT:
-    default:
-      gain = ADC_INPUTCTRL_GAIN_DIV2_Val;    // This allows values up to VDDANA (3.3V) on the pin
-      refsel = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA = 0.5* 3V3 = 1.65V
-      break;
+#if (SAMD)
+  if (ulMode == AR_DEFAULT) {
+    ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val;    // GAIN_DIV2 allows values up to VDDANA on the pin
+    ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC1_Val; // 1/2 VDDANA
+  } else {
+    ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val;
+    ADC->REFCTRL.bit.REFSEL = ulMode;
+  }
+#elif (SAML21 || SAMC21)
+  if (ulMode == 0) {		// Set to 1.0V for the SAML, 1.024V for the SAMC
+    SUPC->VREF.reg &= ~SUPC_VREF_SEL_Msk;
+  } else if (ulMode > 5) {		// Values above 5 are used for the Supply Controller reference (AR_INTREF)
+    SUPC->VREF.reg &= ~SUPC_VREF_SEL_Msk;
+    SUPC->VREF.reg |= SUPC_VREF_SEL(ulMode - 6);	// 
+    ulMode = 0;
   }
+  #if (SAML21)
+  ADC->REFCTRL.bit.REFSEL = ulMode;
+  #elif (SAMC21)
+  ADC0->REFCTRL.bit.REFSEL = ulMode;
+  ADC1->REFCTRL.bit.REFSEL = ulMode;
+  #endif
+#endif
 
-  ADC->INPUTCTRL.bit.GAIN = gain;
-  ADC->REFCTRL.bit.REFSEL = refsel;
+  syncADC();
 }
 
 uint32_t analogRead( uint32_t ulPin )
@@ -147,14 +222,35 @@ uint32_t analogRead( uint32_t ulPin )
 
   REMAP_ANALOG_PIN_ID ;
 
+#if (SAMC21)
+  Adc* ADC;
+  if ( (g_APinDescription[ulPin].ulPeripheralAttribute & PER_ATTR_ADC_MASK) == PER_ATTR_ADC_STD ) {
+    ADC = ADC0;
+  } else {
+    ADC = ADC1;
+  }
+#endif
+
   if ( pinPeripheral(ulPin, PIO_ANALOG_ADC) == RET_STATUS_OK )
   {
     // Disable DAC, if analogWrite(A0,dval) used previously the DAC is enabled
     if ( (g_APinDescription[ulPin].ulPinAttribute & PIN_ATTR_DAC) == PIN_ATTR_DAC )
     {
       syncDAC();
+#if (SAMD || SAMC21)
       DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC
       //DAC->CTRLB.bit.EOEN = 0x00; // The DAC output is turned off.
+#elif (SAML21)
+      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC controller
+      uint8_t DACNumber = 0x00;
+      if ( (g_APinDescription[ulPin].ulPort == 0) && (g_APinDescription[ulPin].ulPin == 5) ) {
+        DACNumber = 0x01;
+      }
+      syncDAC();
+      DAC->DACCTRL[DACNumber].bit.ENABLE = 0x00; // The DACx output is turned off.
+      syncDAC();
+      DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC controller (in case other DACx is in use)
+#endif
       syncDAC();
     }
 
@@ -208,12 +304,27 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
 {
   if ( pinPeripheral(ulPin, PIO_ANALOG_DAC) == RET_STATUS_OK )
   {
-    ulValue = mapResolution(ulValue, _writeResolution, 10);
-
     syncDAC();
+#if (SAMD || SAMC21)
+    ulValue = mapResolution(ulValue, _writeResolution, 10);
     DAC->DATA.reg = ulValue & 0x3FF;  // DAC on 10 bits.
     syncDAC();
     DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC
+#elif (SAML21)
+    DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC controller (so that DACCTRL can be modified)
+    uint8_t DACNumber = 0x00;
+    if ( (g_APinDescription[ulPin].ulPort == 0) && (g_APinDescription[ulPin].ulPin == 5) ) {
+        DACNumber = 0x01;
+    }
+    ulValue = mapResolution(ulValue, _writeResolution, 12);
+    syncDAC();
+    DAC->DATA[DACNumber].reg = ulValue & 0xFFF;  // DACx on 12 bits.
+    syncDAC();
+    DAC->DACCTRL[DACNumber].bit.ENABLE = 0x01; // The DACx output is turned on.
+    syncDAC();
+    while ( (DAC->STATUS.reg & (1 << DACNumber)) == 0 );   // Must wait for DACx to start
+    DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC controller
+#endif
     syncDAC();
     return ;
   }
@@ -222,58 +333,37 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
     Tc*  TCx  = 0 ;
     Tcc* TCCx = 0 ;
     uint8_t Channelx = GetTCChannelNumber( g_APinDescription[ulPin].ulTCChannel ) ;
-    if ( GetTCNumber( g_APinDescription[ulPin].ulTCChannel ) >= TCC_INST_NUM )
-    {
+    uint8_t Timerx = GetTCNumber( g_APinDescription[ulPin].ulTCChannel ) ;
+    uint8_t Typex = GetTCType( g_APinDescription[ulPin].ulTCChannel ) ;
+    
+    if ( Typex == 1 ) {
       TCx = (Tc*) GetTC( g_APinDescription[ulPin].ulTCChannel ) ;
-    }
-    else
-    {
+    } else {
       TCCx = (Tcc*) GetTC( g_APinDescription[ulPin].ulTCChannel ) ;
     }
 
-    // Enable clocks according to TCCx instance to use
-    switch ( GetTCNumber( g_APinDescription[ulPin].ulTCChannel ) )
-    {
-#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
-      case 0: // TCC0
-        // Enable GCLK for TCC0 and TCC1 (timer counter input clock)
-        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TCC0 )) ;
-      break ;
-
-      case 1: // TC1
-      case 2: // TC2
-        // Enable GCLK for TCC2 and TC3 (timer counter input clock)
-        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC1_TC2 )) ;
-      break ;
+    // Enable peripheral clock
+    if ( TCx ) {
+#if (SAML21)
+      if (TCx == TC4) {
+        timerIndex = 7;	// TC4 is on a different lower-power bridge on the SAML
+      } else {
+        timerIndex = (uint8_t)(((uint32_t)TCx - (uint32_t)TCC0) >> 10);
+      }
 #else
-      case 0: // TCC0
-      case 1: // TCC1
-        // Enable GCLK for TCC0 and TCC1 (timer counter input clock)
-        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TCC0_TCC1 )) ;
-      break ;
-
-      case 2: // TCC2
-      case 3: // TC3
-        // Enable GCLK for TCC2 and TC3 (timer counter input clock)
-        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TCC2_TC3 )) ;
-      break ;
-
-      case 4: // TC4
-      case 5: // TC5
-        // Enable GCLK for TC4 and TC5 (timer counter input clock)
-        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC4_TC5 ));
-      break ;
-#endif
-#if defined(__SAMD21J15A__) || defined(__SAMD21J16A__) || defined(__SAMD21J17A__) || defined(__SAMD21J18A__)
-      case 6: // TC6 (not available on Zero)
-      case 7: // TC7 (not available on Zero)
-        // Enable GCLK for TC6 and TC7 (timer counter input clock)
-        GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( GCM_TC6_TC7 ));
-      break ;
+      timerIndex = (uint8_t)(((uint32_t)TCx - (uint32_t)TCC0) >> 10);
 #endif
+    } else {
+      timerIndex = (uint8_t)(((uint32_t)TCCx - (uint32_t)TCC0) >> 10);
     }
 
+#if (SAMD)
+    GCLK->CLKCTRL.reg = (uint16_t) (GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID( timerClockIDs[timerIndex] )) ;
     while ( GCLK->STATUS.bit.SYNCBUSY == 1 ) ;
+#elif (SAML21 || SAMC21)
+    GCLK->PCHCTRL[timerClockIDs[timerIndex]].reg = (GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+    while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+#endif
 
     ulValue = mapResolution(ulValue, _writeResolution, 8);
 
@@ -281,14 +371,18 @@ void analogWrite( uint32_t ulPin, uint32_t ulValue )
     if ( TCx )
     {
       // -- Configure TC
-
       // Disable TCx
       TCx->COUNT8.CTRLA.reg &= ~TC_CTRLA_ENABLE;
       syncTC_8(TCx);
       // Set Timer counter Mode to 8 bits
       TCx->COUNT8.CTRLA.reg |= TC_CTRLA_MODE_COUNT8;
       // Set TCx as normal PWM
+#if (SAMD)
       TCx->COUNT8.CTRLA.reg |= TC_CTRLA_WAVEGEN_NPWM;
+#elif (SAML21 || SAMC21)
+      TCx->WAVE.reg = TC_WAVE_WAVEGEN_NPWM;
+#endif
+      syncTC_8(TCx);
       // Set TCx in waveform mode Normal PWM
       TCx->COUNT8.CC[Channelx].reg = (uint8_t) ulValue;
       syncTC_8(TCx);
diff --git a/cores/arduino/wiring_analog.h b/cores/arduino/wiring_analog.h
index cca46359c..ac487b78a 100644
--- a/cores/arduino/wiring_analog.h
+++ b/cores/arduino/wiring_analog.h
@@ -19,22 +19,64 @@
 #pragma once
 
 #include <stdint.h>
+#include "sam.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
- * \brief SAMD products have only one reference for ADC
+ * \brief TODO Analog reference selection.
+ * For values <= 5, the actual register value is used.
+ * For values > 5 (SAML and SAMC only), the SUPC_VREF_SEL register value is: (ulMode - 6).
+ * Values for the Supply Controller (SUPC) reference on the L21 or C21.
+ * Used when AR_INTREF is selected as the reference.
  */
 typedef enum _eAnalogReference
 {
-  AR_DEFAULT,
-  AR_INTERNAL,
-  AR_EXTERNAL,
-  AR_INTERNAL1V0,
-  AR_INTERNAL1V65,
-  AR_INTERNAL2V23
+#if (SAMD)
+  AR_INTERNAL1V0 = 0,
+  AR_INTERNAL_INTVCC0 = 1,
+  AR_INTERNAL_INTVCC1 = 2,
+  AR_EXTERNAL_REFA = 3,
+  AR_EXTERNAL_REFB = 4,
+  AR_DEFAULT = 5,	// On the SAMD, this also uses 1/2 gain on each input
+#elif (SAML21)
+  AR_INTREF = 0,
+  AR_INTERNAL_INTVCC0 = 1,
+  AR_INTERNAL_INTVCC1 = 2,
+  AR_EXTERNAL_REFA = 3,
+  AR_EXTERNAL_REFB = 4,
+  AR_INTERNAL_INTVCC2 = 5,
+  AR_INTREF_1V0 = 6,
+  AR_INTREF_1V1 = 7,
+  AR_INTREF_1V2 = 8,
+  AR_INTREF_1V25 = 9,
+  AR_INTREF_2V0 = 10,
+  AR_INTREF_2V2 = 11,
+  AR_INTREF_2V4 = 12,
+  AR_INTREF_2V5 = 13,
+  AR_DEFAULT = AR_INTERNAL_INTVCC2,
+  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAML is 1.0V
+#elif (SAMC21)
+  AR_INTREF = 0,
+  AR_INTERNAL_INTVCC0 = 1,
+  AR_INTERNAL_INTVCC1 = 2,
+  AR_EXTERNAL_REFA = 3,
+  AR_EXTERNAL_DAC = 4,
+  AR_INTERNAL_INTVCC2 = 5,
+  AR_INTREF_1V024 = 6,
+  AR_INTREF_2V048 = 7,
+  AR_INTREF_4V096 = 8,
+  AR_DEFAULT = AR_INTERNAL_INTVCC2,
+  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAMC is 1.024V
+#else
+  #error "wiring_analog.c: Unsupported chip"
+#endif
+  AR_INTERNAL = AR_INTERNAL_INTVCC0,
+  AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0,	// 2.23V only when Vcc = 3.3V
+  AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1,	// 1.65V only when Vcc = 3.3V
+  AR_EXTERNAL = AR_EXTERNAL_REFA,
 } eAnalogReference ;
 
 
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
index 9746ac117..f9739ed10 100644
--- a/cores/arduino/wiring_private.c
+++ b/cores/arduino/wiring_private.c
@@ -1,5 +1,6 @@
 /*
   Copyright (c) 2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015-2016, Justin Mattair (justin@mattair.net)
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -176,23 +177,7 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
     case PIO_SERCOM:
     case PIO_COM:
     case PIO_AC_GCLK:
-#if 0
-      // Is the pio pin in the lower 16 ones?
-      // The WRCONFIG register allows update of only 16 pin max out of 32
-      if ( g_APinDescription[ulPin].ulPin < 16 )
-      {
-        PORT->Group[g_APinDescription[ulPin].ulPort].WRCONFIG.reg = PORT_WRCONFIG_WRPMUX | PORT_WRCONFIG_PMUXEN | PORT_WRCONFIG_PMUX( ulPeripheral ) |
-                                                                    PORT_WRCONFIG_WRPINCFG |
-                                                                    PORT_WRCONFIG_PINMASK( g_APinDescription[ulPin].ulPin ) ;
-      }
-      else
-      {
-        PORT->Group[g_APinDescription[ulPin].ulPort].WRCONFIG.reg = PORT_WRCONFIG_HWSEL |
-                                                                    PORT_WRCONFIG_WRPMUX | PORT_WRCONFIG_PMUXEN | PORT_WRCONFIG_PMUX( ulPeripheral ) |
-                                                                    PORT_WRCONFIG_WRPINCFG |
-                                                                    PORT_WRCONFIG_PINMASK( g_APinDescription[ulPin].ulPin - 16 ) ;
-      }
-#else
+
       if ( pinNum & 1 ) // is pin odd?
       {
         uint32_t temp ;
@@ -212,7 +197,7 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
 	PORT->Group[pinPort].PMUX[pinNum >> 1].reg = temp|PORT_PMUX_PMUXE( peripheral ) ;
 	PORT->Group[pinPort].PINCFG[pinNum].reg |= PORT_PINCFG_PMUXEN ; // Enable port mux
       }
-#endif
+
     break ;
 
     default:
diff --git a/platform.txt b/platform.txt
index 8a4d86f30..ee67f92c6 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=MattairTech SAM M0+ Boards
-version=1.6.7
+version=1.6.8
 
 # Compile variables
 # -----------------
@@ -79,13 +79,13 @@ build.usb_manufacturer="Unknown"
 # ----------------
 
 ## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
 
 ## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
 
 ## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
+recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.path} {includes} "{source_file}" -o "{object_file}"
 
 ## Create archives
 # archive_file_path is needed for backwards compatibility with IDE 1.6.5 or older, IDE 1.6.6 or newer overrides this value
@@ -93,7 +93,7 @@ archive_file_path={build.path}/{archive_file}
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group -lm "{build.path}/{archive_file}" -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-T{build.variant.path}/{build.ldscript_path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--start-group -lm "{build.path}/{archive_file}" -Wl,--end-group
 
 ## Create output (bin file)
 recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"
@@ -152,3 +152,17 @@ tools.openocd.erase.pattern=
 tools.openocd.bootloader.params.verbose=-d3
 tools.openocd.bootloader.params.quiet=-d0
 tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/variants/{build.variant}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{{runtime.platform.path}/bootloaders/{bootloader.file}}} verify reset; shutdown"
+
+#
+# AVRDUDE
+#
+tools.avrdude.path={runtime.tools.avrdude.path}
+tools.avrdude.cmd.path={path}/bin/avrdude
+tools.avrdude.config.path={path}/etc/avrdude.conf
+
+tools.avrdude.upload.params.verbose=-v -v
+tools.avrdude.upload.params.quiet=-q -q
+# tools.avrdude.upload.verify is needed for backwards compatibility with IDE 1.6.8 or older, IDE 1.6.9 or newer overrides this value
+tools.avrdude.upload.verify=
+tools.avrdude.upload.params.noverify=-V
+tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} {upload.verify} -p{build.emu.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
new file mode 100644
index 000000000..7d157dc24
--- /dev/null
+++ b/variants/MT_D11/README.md
@@ -0,0 +1,198 @@
+# MattairTech MT-D11 (ATsamD11D14AM)
+
+```
+=========================== MattairTech MT-D11 (ATsamD11D14AM) ==========================
+Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     COM   Other
+=========================================================================================
+                                    -------------------
+DAC                   *            | A2   | USB |  Gnd |
+REF                   *            | A3   |     |  Vcc |
+             TCC00    *      *     | A4    -----   A31 | 31     *    TC21     RX1   SWDIO
+             TCC01    *      *     | A5            A30 | 30          TC20     TX1  SWDCLK
+             TCC02    *            | A6            A27 | 27     *
+             TCC03    *            | A7            A23 | 23                   SCL
+   MOSI / TX2         *      *     | A10           A22 | 22     *             SDA
+   SCK / RX2          *            | A11           A17 | 17          TC11
+      MISO            *     NMI    | A14           A16 | 16     *    TC10             LED
+BTN   SS              *      *     | A15           RST |                             BOOT
+                                    -------------------
+
+* Some pins can be used for more than one function. The same port pin number printed on
+  the board is also used in Arduino (without the 'A') for all of the supported functions
+  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* Tone available on TC2. DO NOT connect voltages higher than 3.3V!
+```
+
+
+# Pins descriptions for the MattairTech MT-D11
+## PIN_MAP_STANDARD
+============================================================================================================================================
+Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| ---	| ----	| NOT A PIN		| NOT A PIN
+1	| ---	| ----	| NOT A PIN		| NOT A PIN
+2	| A2	| PA02	| DAC			| !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+3	| A3	| PA03	| REFA			| !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+4	| A4	| PA04	| REFB / VM		| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+5	| A5	| PA05	| 			| EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+6	| A6	| PA06	| 			| !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+7	| A7	| PA07	| 			| !EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+8	| --	| PA08	| Xin32 / Xin		| Xin32
+9	| --	| PA09	| Xout32 / Xout		| Xout32
+10	| A10	| PA10	| SPI MOSI / TX2	| EIC/EXTINT[2] ADC/AIN[8] PTC/X[2] PTC/Y[8] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TC2/WO[0] !TCC0/WO[2]
+11	| A11	| PA11	| SPI SCK / RX2		| !EIC/EXTINT[3] ADC/AIN[9] PTC/X[3] PTC/Y[9] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TC2/WO[1] !TCC0/WO[3]
+12	| ---	| ----	| NOT A PIN		| NOT A PIN
+13	| ---	| ----	| NOT A PIN		| NOT A PIN
+14	| A14	| PA14	| SPI MISO		| EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+15	| A15	| PA15	| Button / SPI SS	| EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[1] Button
+16	| A16	| PA16	| LED			| EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6] LED
+17	| A17	| PA17	| HOST_ENABLE		| !EIC/EXTINT[1] PTC/X[5] PTC/Y[11] !SERCOM1/PAD[3] !SERCOM2/PAD[3] TC1/WO[1] !TCC0/WO[7] HOST_ENABLE
+18	| ---	| ----	| NOT A PIN		| NOT A PIN
+19	| ---	| ----	| NOT A PIN		| NOT A PIN
+20	| ---	| ----	| NOT A PIN		| NOT A PIN
+21	| ---	| ----	| NOT A PIN		| NOT A PIN
+22	| A22	| PA22	| I2C/SDA w/pullup	| EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+23	| A23	| PA23	| I2C/SCL w/pullup	| !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[0] !TC1/WO[1] !TCC0/WO[5]
+24	| ---	| PA24	| USB_NEGATIVE		| USB/DM
+25	| ---	| PA25	| USB_POSITIVE		| USB/DP
+26	| ---	| ----	| NOT A PIN		| NOT A PIN
+27	| A27	| PA27	| 			| EIC/EXTINT[7] PTC/X[10]
+28	| A28	| PA28	| Reset			| Reset, BOOT (double tap bootloader entry)
+29	| ---	| ----	| NOT A PIN		| NOT A PIN
+30	| A30	| PA30	| TX1 / SWD CLK		| !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+31	| A31	| PA31	| RX1 / SWD IO		| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+============================================================================================================================================
+
+## PIN_MAP_COMPACT
+============================================================================================================================================
+Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| A2	| PA02	| DAC			| !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+1	| A3	| PA03	| REFA			| !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+2	| A4	| PA04	| REFB / VM		| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+3	| A5	| PA05	| 			| EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+4	| A6	| PA06	| 			| !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+5	| A7	| PA07	| 			| !EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+6	| A10	| PA10	| SPI MOSI / TX2	| EIC/EXTINT[2] ADC/AIN[8] PTC/X[2] PTC/Y[8] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TC2/WO[0] !TCC0/WO[2]
+7	| A11	| PA11	| SPI SCK / RX2		| !EIC/EXTINT[3] ADC/AIN[9] PTC/X[3] PTC/Y[9] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TC2/WO[1] !TCC0/WO[3]
+8	| A14	| PA14	| SPI MISO		| EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+9	| A15	| PA15	| Button / SPI SS	| EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[1] Button
+10	| A16	| PA16	| LED			| EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6] LED
+11	| A17	| PA17	| HOST_ENABLE		| !EIC/EXTINT[1] PTC/X[5] PTC/Y[11] !SERCOM1/PAD[3] !SERCOM2/PAD[3] TC1/WO[1] !TCC0/WO[7] HOST_ENABLE
+12	| A22	| PA22	| I2C/SDA w/pullup	| EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+13	| A23	| PA23	| I2C/SCL w/pullup	| !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[0] !TC1/WO[1] !TCC0/WO[5]
+14	| A27	| PA27	| 			| EIC/EXTINT[7] PTC/X[10]
+15	| A30	| PA30	| TX1 / SWD CLK		| !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+16	| A31	| PA31	| RX1 / SWD IO		| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+============================================================================================================================================
+
+* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
+  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* The following Arduino pin numbers are not mapped to a physical pin: 0, 1, 8, 9, 12, 13, 18, 19, 20, 21, 24, 25, 26, 28, and 29.
+* Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+* The tone library uses TC2.
+* Pins 8 and 9 are by default connected to the 32.768KHz crystal.
+
+
+
+# PinDescription table format
+
+## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+## Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+## Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+## See WVariant.h in cores/arduino for the definitions used in the table.
+
+### Port:
+This is the port (ie: PORTA).
+
+### Pin:
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType:
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/MT_D11/variant.cpp b/variants/MT_D11/variant.cpp
index d0cd1a7d5..cdd318843 100644
--- a/variants/MT_D11/variant.cpp
+++ b/variants/MT_D11/variant.cpp
@@ -14,153 +14,13 @@
   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
-  */
-
-/*
- * Modified 8 August 2015 by Justin Mattair
- *   for MattairTech MT-D11 boards (www.mattairtech.com)
- */
-
-/*
-=========================== MattairTech MT-D11 (ATsamd11D14AM) ==========================
-Other  INT   PWM   Digital  Analog                    Digital   PWM      INT     Other
-=========================================================================================
-                                    -------------------
-DAC                   2   2(ADC0)  | A2   | USB |  Gnd |
-REF                   3   3(ADC1)  | A3   |     |  Vcc |
-   4(INT4)  4(TCC00)  4   4(ADC2)  | A4    -----   A31 | 31  31(TC21)  31(INT3)  RX/SWDIO
-   5(INT5)  5(TCC01)  5   5(ADC3)  | A5            A30 | 30  30(TC20)           TX/SWDCLK
-            6(TCC02)  6   6(ADC4)  | A6            A27 | 27            27(INT7)
-            7(TCC03)  7   7(ADC5)  | A7            A23 | 23                      SCL
-MOSI  10(INT2)        10  10(ADC8) | A10           A22 | 22            22(INT6)  SDA
-SCK                   11  11(ADC9) | A11           A17 | 17  17(TC11)
-MISO  14(INTNMI)      14  14(ADC6) | A14           A16 | 16  16(TC10)  16(INT0)  LED
-BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |                         Reset
-                                    -------------------
-Most pins have multiple configurations available (even analog pins). For example, pin
-4 can be an analog input, a PWM output, Digital I/O, or interrupt input. These
-always reference the pin number printed on the board but without the 'A' (with the
-usable pins starting at 2). Tone available on TC2.
-DO NOT connect voltages higher than 3.3V!
 */
 
-
-/*   The PinDescription table describes how each of the pins can be used by the Arduino
- *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
- *   communications, etc.), and the PinDescription table configures which functions can
- *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
- *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
- *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
- *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
- *   verify that the pin can perform the function requested, and to configure the pin for
- *   that function. Most of the contents of pinMode() are now in pinPeripheral().
- * 
- *   There are two ways that pins can be mapped. The first is to map pins contiguously
- *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
- *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
- *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
- *   This only works when there is one port. Because not all port pins are available,
- *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
- *   For an example of both types, see variant.cpp from the MT-D11 variant.
- * 
- *   Explanation of PinDescription table:
- * 
- *   Port                  This is the port (ie: PORTA).
- *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
- *   PinType               This indicates what peripheral function the pin can be
- *                         attached to. In most cases, this is PIO_MULTI, which means
- *                         that the pin can be anything listed in the PinAttribute field.
- *                         It can also be set to a specific peripheral. In this case, any
- *                         attempt to configure the pin (using pinPeripheral or pinMode)
- *                         as anything else will fail (and pinPeripheral will return -1).
- *                         This can be used to prevent accidental re-configuration of a
- *                         pin that is configured for only one function (ie: USB D- and
- *                         D+ pins). If a pin is not used or does not exist,
- *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
- *                         for valid entries. These entries are also used as a parameter
- *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
- *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
- *                         the desired mode. Note that this field is not used to select
- *                         between the two peripherals possible with each of the SERCOM
- *                         and TIMER functions. PeripheralAttribute is now used for this.
- *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
- *                         configuration. It is primarily used to select between the two
- *                         peripherals possible with each of the SERCOM and TIMER
- *                         functions. TIMER pins are individual, while SERCOM uses a
- *                         group of two to four pins. This group of pins can span both
- *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
- *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
- *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
- *                         pin. This bitfield is also used to set the pin drive strength.
- *                         In the future, other attributes (like input buffer
- *                         configuration) may be added. See WVariant.h for valid entries.
- *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
- *                         peripheral functions that a pin can attach to. This includes
- *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
- *                         shorthand for a combination of other attributes.
- *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
- *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
- *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
- *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
- *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
- *                         bitfield is useful for limiting a pin to only input related
- *                         functions or output functions. This allows a pin to have a
- *                         more flexible configuration, while restricting the direction
- *                         (ie: to avoid contention). See WVariant.h for valid entries.
- *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
- *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
- *                         available on pin A4 or pin A8 on the MT-D21E). In general,
- *                         only one pin should be configured (in the pinDescription
- *                         table) per TC channel. See WVariant.h for valid entries.
- *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
- *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
- *                         WVariant.h for valid entries.
- *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
- *                         interrupt numbers are available on multiple pins (ie:
- *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
- *                         MT-D21E). In general, only one pin should be configured (in
- *                         the pinDescription table) per interrupt number. Thus, if an
- *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
- *                         from pin 18. See WVariant.h for valid entries.
- */
-
-
-/*  Pins descriptions for the MattairTech MT-D11
- * 
- * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (! means unavailable with this variant)
- * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
- * | 0       | 2                  | A2               |  PA02  | DAC               | !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
- * | 1       | 3                  | A3               |  PA03  | REFA              | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
- * | 2       | 4                  | A4               |  PA04  | REFB / VM         | EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[2] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
- * | 3       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
- * | 4       | 6                  | A6               |  PA06  |                   | !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
- * | 5       | 7                  | A7               |  PA07  |                   | !EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
- * | --      | --                 | --               |  PA08  | Xin32 / Xin       | Xin32
- * | --      | --                 | --               |  PA09  | Xout32 / Xout     | Xout32
- * | 6       | 10                 | A10              |  PA10  | SPI MOSI          | EIC/EXTINT[2] ADC/AIN[8] PTC/X[2] PTC/Y[8] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TC2/WO[0] !TCC0/WO[2]
- * | 7       | 11                 | A11              |  PA11  | SPI SCK           | !EIC/EXTINT[3] ADC/AIN[9] PTC/X[3] PTC/Y[9] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TC2/WO[1] !TCC0/WO[3]
- * | 8       | 14                 | A14              |  PA14  | SPI MISO          | EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
- * | 9       | 15                 | A15              |  PA15  | Button / SPI SS   | EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[1] Button
- * | 10      | --                 | RST              |  PA28  | Reset             | Reset
- * | 11      | 16                 | A16              |  PA16  | LED               | EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6] LED
- * | 12      | 17                 | A17              |  PA17  | HOST_ENABLE       | !EIC/EXTINT[1] PTC/X[5] PTC/Y[11] !SERCOM1/PAD[3] !SERCOM2/PAD[3] TC1/WO[1] !TCC0/WO[7] HOST_ENABLE
- * | 13      | 22                 | A22              |  PA22  | I2C/SDA w/pullup  | EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
- * | 14      | 23                 | A23              |  PA23  | I2C/SCL w/pullup  | !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[0] !TC1/WO[1] !TCC0/WO[5]
- * | --      | --                 | ---              |  PA24  | USB_NEGATIVE      | USB/DM
- * | --      | --                 | ---              |  PA25  | USB_POSITIVE      | USB/DP
- * | 15      | 27                 | A27              |  PA27  |                   | EIC/EXTINT[7] PTC/X[10]
- * | 16      | 30                 | A30              |  PA30  | TX / SWD CLK      | !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK
- * | 17      | 31                 | A31              |  PA31  | RX / SWD IO       | EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
- * | 18      | --                 | Vcc              |  ----  |                   | Vcc
- * | 19      | --                 | Gnd              |  ----  |                   | Ground
- * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
- * 
- * You may use Arduino pin numbers ranging from 0 to 31. The Arduino pin corresponds to the silkscreen (without the 'A').
- * For example, use pinMode(16, OUTPUT) to set the LED pin (marked as A16) as an output.
- * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 8, 9, 12, 13, 18, 19, 20, 21, 24, 25, 26, 28, and 29.
- * Pins 8 and 9 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
- * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
- * The tone library uses TC2.
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
  */
 
 
@@ -173,92 +33,92 @@ DO NOT connect voltages higher than 3.3V!
 const PinDescription g_APinDescription[]=
 {
 	// 0..1 pins don't exist
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 2..7 - Analog capable pins (DAC available on 2)
-	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE },
-	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE },
-	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4 },
-	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5 },
-	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE },
-	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_NONE },
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 	
 	// 8..9 are unused (pins in use by 32.768KHz crystal, which in turn is used by the Arduino core)
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 10..11 - SERCOM/SPI (SPI) or Analog or Digital functions
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_2 }, // SPI MOSI
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE }, // SPI SCK
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SPI SCK
 	
 	// 12..13 pins don't exist
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 14..15 - SERCOM/SPI (SPI) or Analog or Digital functions (Button available on pin 15)
-	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI }, // SPI MISO
-	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_1 }, // Button / SPI SS (unused)
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // SPI MISO
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE }, // Button / SPI SS (unused)
 	
 	// 16..17 Digital functions (LED available on pin 16)
-	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // LED
-	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE },
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // LED
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 	
 	// 18..21 pins don't exist
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 22..23 SERCOM/I2C (Wire) or Digital functions
-	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA
-	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCL
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SDA
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SCL
 	
 	// 24..26 are unused (25 and 26 in use by USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist)
-	{ PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DM
-	{ PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DP
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 27..29 Digital functions (pin 28 is Reset and pin 29 does not exist)
-	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7 },
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused (Reset)
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 30..31  SERCOM/UART (Serial1) or Digital functions or Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // TX / SWD CLK
-	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3 }, // RX / SWD IO
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // RX / SWD IO
 } ;
 #elif defined PIN_MAP_COMPACT
 const PinDescription g_APinDescription[]=
 {
 	// 0..5 - Analog capable pins (DAC available on 0)
-	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE },
-	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE },
-	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4 },
-	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5 },
-	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE },
-	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_NONE },
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 	
 	// 6..9 - SERCOM/SPI (SPI) or Analog or Digital functions (Button available on pin 9)
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_2 }, // SPI MOSI
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE }, // SPI SCK
-	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI }, // SPI MISO
-	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_1 }, // Button / SPI SS (unused)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SPI SCK
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // SPI MISO
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE }, // Button / SPI SS (unused)
 	
 	// 10..11 Digital functions (LED available on pin 10)
-	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // LED
-	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE },
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // LED
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 	
 	// 12..13 SERCOM/I2C (Wire) or Digital functions
-	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA
-	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCL
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SDA
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SCL
 	
 	// 14 Digital functions
-	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7 },
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
 	
 	// 15..16  SERCOM/UART (Serial1) or Digital functions or Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // TX / SWD CLK
-	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3 }, // RX / SWD IO
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // RX / SWD IO
 } ;
 #endif
 
@@ -269,7 +129,7 @@ SERCOM sercom0( SERCOM0 ) ;
 SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 
-#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
+#if defined(ONE_UART) || defined(TWO_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
 void SERCOM1_Handler()
@@ -277,3 +137,12 @@ void SERCOM1_Handler()
   Serial1.IrqHandler();
 }
 #endif
+
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial2.IrqHandler();
+}
+#endif
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index 5c81b6b00..15aa682bb 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -17,13 +17,21 @@
 */
 
 /*
- * Modified 20 May 2016 by Justin Mattair
- *   for MattairTech MT-D11 boards (www.mattairtech.com)
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
  */
 
 #ifndef _VARIANT_MATTAIRTECH_MT_D11_
 #define _VARIANT_MATTAIRTECH_MT_D11_
 
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
 /*----------------------------------------------------------------------------
  *        Definitions
  *----------------------------------------------------------------------------*/
@@ -32,13 +40,14 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK		(48000000ul)
 
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
 
 #include "WVariant.h"
+#include "sam.h"
 
 #ifdef __cplusplus
 #include "SERCOM.h"
@@ -66,8 +75,8 @@ extern "C"
   #error "variant.h: You must set PIN_MAP_STANDARD or PIN_MAP_COMPACT"
 #endif
 
-#define PINS_COUNT           (32u)
-#define NUM_DIGITAL_PINS     (32u)
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
 #define NUM_ANALOG_INPUTS    (10u)
 #define NUM_ANALOG_OUTPUTS   (1u)
 #define analogInputToDigitalPin(p)  (p)
@@ -95,9 +104,16 @@ extern "C"
  * The RX and TX LEDs are not present.
  * You may optionally add them to any free pins.
  */
+#if defined PIN_MAP_STANDARD
 #define PIN_LED_13           (16u)
 #define PIN_LED_RXL          (10u)
 #define PIN_LED_TXL          (11u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_LED_13           (10u)
+#define PIN_LED_RXL          (6u)
+#define PIN_LED_TXL          (7u)
+#endif
+
 #define PIN_LED              PIN_LED_13
 #define PIN_LED2             PIN_LED_RXL
 #define PIN_LED3             PIN_LED_TXL
@@ -109,13 +125,19 @@ extern "C"
  * Thre is a debouncing capacitor connected, so delay reading the pin
  * at least 6ms after turning on the pullup to allow the capacitor to charge.
  */
+#if defined PIN_MAP_STANDARD
 #define BUTTON               (15u)
+#elif defined PIN_MAP_COMPACT
+#define BUTTON               (9u)
+#endif
+
 #define BUTTON_BUILTIN       BUTTON
 
 
 /*
  * Analog pins
  */
+#if defined PIN_MAP_STANDARD
 #define PIN_A2               (2ul)
 #define PIN_A3               (3ul)
 #define PIN_A4               (4ul)
@@ -127,6 +149,19 @@ extern "C"
 #define PIN_A14              (14ul)
 #define PIN_A15              (15ul)
 #define PIN_DAC0             (2ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_A2               (0ul)
+#define PIN_A3               (1ul)
+#define PIN_A4               (2ul)
+#define PIN_A5               (3ul)
+#define PIN_A6               (4ul)
+#define PIN_A7               (5ul)
+#define PIN_A10              (6ul)
+#define PIN_A11              (7ul)
+#define PIN_A14              (8ul)
+#define PIN_A15              (9ul)
+#define PIN_DAC0             (0ul)
+#endif
 
 static const uint8_t A2   = PIN_A2;
 static const uint8_t A3   = PIN_A3;
@@ -149,13 +184,22 @@ static const uint8_t DAC0 = PIN_DAC0;
 #define VARIANT_AR_DEFAULT	AR_DEFAULT
 
 /* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#if defined PIN_MAP_STANDARD
 #define REFA_PIN    (3ul)
 #define REFB_PIN    (4ul)
+#elif defined PIN_MAP_COMPACT
+#define REFA_PIN    (1ul)
+#define REFB_PIN    (2ul)
+#endif
 
 
 // The ATN pin may be used in the future as the first SPI chip select.
 // On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#if defined PIN_MAP_STANDARD
 #define PIN_ATN              (15ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_ATN              (9ul)
+#endif
 static const uint8_t ATN = PIN_ATN;
 
 
@@ -163,23 +207,49 @@ static const uint8_t ATN = PIN_ATN;
  * Serial interfaces
  */
 // Serial1
+#if defined PIN_MAP_STANDARD
 #define PIN_SERIAL1_RX       (31ul)
 #define PIN_SERIAL1_TX       (30ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL1_RX       (16ul)
+#define PIN_SERIAL1_TX       (15ul)
+#endif
+
 #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
 #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
-
 #define SERCOM_INSTANCE_SERIAL1       &sercom1
 
+// Serial2
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL2_RX       (11ul)
+#define PIN_SERIAL2_TX       (10ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL2_RX       (7ul)
+#define PIN_SERIAL2_TX       (6ul)
+#endif
+
+#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_3)
+#define SERCOM_INSTANCE_SERIAL2       &sercom0
+
 
 /*
  * SPI Interfaces
  */
 #define SPI_INTERFACES_COUNT 1
 
+#if defined PIN_MAP_STANDARD
 #define PIN_SPI_MISO         (14u)
 #define PIN_SPI_MOSI         (10u)
 #define PIN_SPI_SCK          (11u)
 #define PIN_SPI_SS           (15u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SPI_MISO         (8u)
+#define PIN_SPI_MOSI         (6u)
+#define PIN_SPI_SCK          (7u)
+#define PIN_SPI_SS           (9u)
+#endif
+
 #define PERIPH_SPI           sercom0
 #define PAD_SPI_TX           SPI_PAD_2_SCK_3
 #define PAD_SPI_RX           SERCOM_RX_PAD_0
@@ -195,8 +265,14 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
  */
 #define WIRE_INTERFACES_COUNT 1
 
+#if defined PIN_MAP_STANDARD
 #define PIN_WIRE_SDA         (22u)
 #define PIN_WIRE_SCL         (23u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_WIRE_SDA         (12u)
+#define PIN_WIRE_SCL         (13u)
+#endif
+
 #define PERIPH_WIRE          sercom2
 #define WIRE_IT_HANDLER      SERCOM2_Handler
 
@@ -207,9 +283,17 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 /*
  * USB
  */
+#if defined PIN_MAP_STANDARD
 #define PIN_USB_DM                      (24ul)
 #define PIN_USB_DP                      (25ul)
 #define PIN_USB_HOST_ENABLE             (17ul)
+#elif defined PIN_MAP_COMPACT
+// USB pins not directly accessible using PIN_MAP_COMPACT
+#define PIN_USB_DM                      (0ul)
+#define PIN_USB_DP                      (0ul)
+#define PIN_USB_HOST_ENABLE             (0ul)
+#endif
+
 #define PIN_USB_HOST_ENABLE_VALUE	HIGH
 
 #ifdef __cplusplus
@@ -232,6 +316,7 @@ extern SERCOM sercom1;
 extern SERCOM sercom2;
 
 extern Uart Serial1;
+extern Uart Serial2;
 
 #endif
 
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
new file mode 100644
index 000000000..4763044e8
--- /dev/null
+++ b/variants/MT_D21E/README.md
@@ -0,0 +1,187 @@
+# MattairTech MT-D21E (ATsamD21EXXA)
+
+```
+============================= MattairTech MT-D21E (ATsamD21EXXA) ========================
+Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     COM   Other
+=========================================================================================
+                                      -------------------
+Xin32                                | A0            RST |                           BOOT
+Xout32                               | A1            NC  |
+DAC                   *            2 | A2            NC  |
+REFA                  *            3 | A3            A31 | 31    *   TCC11         SWDIO*
+REFB                  *      *     4 | A4            A30 | 30    *   TCC10         SWDCLK
+                      *      *     5 | A5            NC  |
+                      *            6 | A6            A28 | 28    *                   LED
+VM                    *            7 | A7            A27 | 27    *                   BTNA
+             TCC00    *     NMI    8 | A8            A23 | 23    *   TC41     SS
+             TCC01    *      *     9 | A9            A22 | 22    *   TC40     MISO
+       TX1   TCC02    *           10 | A10           A19 | 19    *            SCK
+       RX1   TCC03    *           11 | A11           A18 | 18    *            MOSI
+       TX2   TC30            *    14 | A14           A17 | 17    *   TCC21    SCL
+       RX2   TC31                 15 | A15           A16 | 16    *   TCC20    SDA
+                                     | NC            NC  |
+                                     | NC            NC  |
+                                     | Vbus          3.3V|   * Button B available on 31.
+USB D-       TC50                    | A24-  _____   Vcc |
+USB D+       TC51                    | A25+ |     |  Vin |
+                                     | Gnd  | USB |  Gnd |
+                                      -------------------
+
+Some pins can be used for more than one function. The same port pin number printed on
+the board is also used in Arduino (without the 'A') for all of the supported functions
+(ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+DO NOT connect voltages higher than 3.3V!
+```
+
+# Pins descriptions for the MattairTech MT-D21E
+============================================================================================================================================
+Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| A0	| PA00	| Xin32			| Xin32
+1	| A1	| PA01	| Xout32		| Xout32
+2	| A2	| PA02	|			| !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+3	| A3	| PA03	| REFA			| !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+4	| A4	| PA04	| REFB			| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[0] !TCC0/WO[0]
+5	| A5	| PA05	|			| EIC/EXTINT[5] ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1]
+6	| A6	| PA06	|			| !EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0]
+7	| A7	| PA07	| Voltage Divider	| !EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
+8	| A8	| PA08	|			| EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
+9	| A9	| PA09	|			| EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
+10	| A10	| PA10	| TX1			| !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
+11	| A11	| PA11	| RX1			| !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
+12	| ---	| ----	| NOT A PIN		| NOT A PIN
+13	| ---	| ----	| NOT A PIN		| NOT A PIN
+14	| A14	| PA14	| Xin, TX2		| EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
+15	| A15	| PA15	| Xout, RX2		| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
+16	| A16	| PA16	| I2C/SDA w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
+17	| A17	| PA17	| I2C/SCL w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
+18	| A18	| PA18	| SPI MOSI		| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+19	| A19	| PA19	| SPI SCK		| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
+20	| ---	| ----	| NOT A PIN		| NOT A PIN
+21	| ---	| ----	| NOT A PIN		| NOT A PIN
+22	| A22	| PA22	| SPI MISO		| EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
+23	| A23	| PA23	| SPI SS		| EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
+24	| A24-	| PA24	| USB_NEGATIVE		| USB/DM TC5/WO[0]
+25	| A25+	| PA25	| USB_POSITIVE		| USB/DP TC5/WO[1]
+26	| ---	| ----	| NOT A PIN		| NOT A PIN
+27	| A27	| PA27	| Button A		| EIC/EXTINT[15] Button A
+28	| A28	| PA28	| LED			| EIC/EXTINT[8] LED
+29	| ---	| ----	| NOT A PIN		| NOT A PIN
+30	| A30	| PA30	| SWD CLK		| EIC/EXTINT[10] !SERCOM1/PAD[2] TCC1/WO[0] SWD CLK
+31	| A31	| PA31	| Button B / SWD IO	| EIC/EXTINT[11] !SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
+--	| RST	| ----	|			| Reset, BOOT (double tap bootloader entry)
+============================================================================================================================================
+
+* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
+  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+
+* The following Arduino pin numbers are not mapped to a physical pin: 12, 13, 20, 21, 26, and 29.
+
+* Pins 24 and 25 are by default in use by USB (USB_NEGATIVE and USB_POSITIVE). TC5(D21) is available on these pins otherwise.
+  The tone library uses TC5.
+
+* A0 and A1 are by default connected to the 32.768KHz crystal.
+
+
+
+# PinDescription table format
+
+## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+## Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+## Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+## See WVariant.h in cores/arduino for the definitions used in the table.
+
+### Port:
+This is the port (ie: PORTA).
+
+### Pin:
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType:
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index 841733b84..0b3c22612 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -17,175 +17,10 @@
 */
 
 /*
-  Modified 8 August 2015 by Justin Mattair
-     for MattairTech MT-D21E boards (www.mattairtech.com)
-*/
-
-/*
-============================= MattairTech MT-D21E (ATsamd21eXXa) ========================
-Other  INT     PWM   Digital  Analog                     Digital  PWM      INT      Other
-=========================================================================================
-                                      -------------------
-Xin32                                | A0            RST |                          Reset
-Xout32                               | A1            NC  |
-DAC                     2   2(ADC0)  | A2            NC  |
-REF                     3   3(ADC1)  | A3            A31 | 31  31(TCC11) 31(INT11) SWDIO*
-     4(INT4)            4   4(ADC4)  | A4            A30 | 30  30(TCC10) 30(INT10) SWDCLK
-     5(INT5)            5   5(ADC5)  | A5            NC  |
-                        6   6(ADC6)  | A6            A28 | 28            28(INT8)   LED
-VDIV                    7   7(ADC7)  | A7            A27 | 27            27(INT15)  BTNA
-    8(INTNMI) 8(TCC00)  8   8(ADC16) | A8            A23 | 23  23(TC41)  23(INT7)   SS
-    9(INT9)   9(TCC01)  9   9(ADC17) | A9            A22 | 22  22(TC40)  22(INT6)   MISO
-TX1          10(TCC02)  10  10(ADC18)| A10           A19 | 19            19(INT3)   SCK
-RX1          11(TCC03)  11  11(ADC19)| A11           A18 | 18            18(INT2)   MOSI
-TX2 14(INT14) 14(TC30)  14           | A14           A17 | 17  17(TCC21)  17(INT1)  SCL
-RX2           15(TC31)  15           | A15           A16 | 16  16(TCC20)  16(INT0)  SDA
-                                     | NC            NC  |
-                                     | NC            NC  |
-                                     | Vbus          3.3V|   * Button B available on 31
-USB D-                               | A24-  _____   Vcc |
-USB D+                               | A25+ |     |  Vin |
-                                     | Gnd  | USB |  Gnd |
-                                      -------------------
-Most pins have multiple configurations available (even analog pins). For example, pin
-10 can be an analog input, a PWM output, Digital I/O, or the TX pin of 'Serial1'. These
-always reference the pin number printed on the board but without the 'A' (with the
-usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
-*/
-
-
-/*   The PinDescription table describes how each of the pins can be used by the Arduino
- *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
- *   communications, etc.), and the PinDescription table configures which functions can
- *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
- *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
- *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
- *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
- *   verify that the pin can perform the function requested, and to configure the pin for
- *   that function. Most of the contents of pinMode() are now in pinPeripheral().
- * 
- *   There are two ways that pins can be mapped. The first is to map pins contiguously
- *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
- *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
- *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
- *   This only works when there is one port. Because not all port pins are available,
- *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
- *   For an example of both types, see variant.cpp from the MT-D11 variant.
- * 
- *   Explanation of PinDescription table:
- * 
- *   Port                  This is the port (ie: PORTA).
- *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
- *   PinType               This indicates what peripheral function the pin can be
- *                         attached to. In most cases, this is PIO_MULTI, which means
- *                         that the pin can be anything listed in the PinAttribute field.
- *                         It can also be set to a specific peripheral. In this case, any
- *                         attempt to configure the pin (using pinPeripheral or pinMode)
- *                         as anything else will fail (and pinPeripheral will return -1).
- *                         This can be used to prevent accidental re-configuration of a
- *                         pin that is configured for only one function (ie: USB D- and
- *                         D+ pins). If a pin is not used or does not exist,
- *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
- *                         for valid entries. These entries are also used as a parameter
- *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
- *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
- *                         the desired mode. Note that this field is not used to select
- *                         between the two peripherals possible with each of the SERCOM
- *                         and TIMER functions. PeripheralAttribute is now used for this.
- *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
- *                         configuration. It is primarily used to select between the two
- *                         peripherals possible with each of the SERCOM and TIMER
- *                         functions. TIMER pins are individual, while SERCOM uses a
- *                         group of two to four pins. This group of pins can span both
- *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
- *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
- *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
- *                         pin. This bitfield is also used to set the pin drive strength.
- *                         In the future, other attributes (like input buffer
- *                         configuration) may be added. See WVariant.h for valid entries.
- *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
- *                         peripheral functions that a pin can attach to. This includes
- *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
- *                         shorthand for a combination of other attributes.
- *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
- *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
- *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
- *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
- *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
- *                         bitfield is useful for limiting a pin to only input related
- *                         functions or output functions. This allows a pin to have a
- *                         more flexible configuration, while restricting the direction
- *                         (ie: to avoid contention). See WVariant.h for valid entries.
- *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
- *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
- *                         available on pin A4 or pin A8 on the MT-D21E). In general,
- *                         only one pin should be configured (in the pinDescription
- *                         table) per TC channel. See WVariant.h for valid entries.
- *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
- *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
- *                         WVariant.h for valid entries.
- *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
- *                         interrupt numbers are available on multiple pins (ie:
- *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
- *                         MT-D21E). In general, only one pin should be configured (in
- *                         the pinDescription table) per interrupt number. Thus, if an
- *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
- *                         from pin 18. See WVariant.h for valid entries.
- */
-
-
-/*  Pins descriptions for the MattairTech MT-D21E
- * 
- * | PCB Pin | Arduino Pin Number |    Silkscreen    |  PIN   |   Alt. Function   | Comments (! means unavailable with this variant)
- * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
- * | 0       | --                 | A0               |  PA00  | Xin32             | Xin32
- * | 1       | --                 | A1               |  PA01  | Xout32            | Xout32
- * | 2       | 2                  | A2               |  PA02  |                   | !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
- * | 3       | 3                  | A3               |  PA03  | REFA              | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
- * | 4       | 4                  | A4               |  PA04  | REFB              | EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[0] !TCC0/WO[0]
- * | 5       | 5                  | A5               |  PA05  |                   | EIC/EXTINT[5] ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1]
- * | 6       | 6                  | A6               |  PA06  |                   | !EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0]
- * | 7       | 7                  | A7               |  PA07  | Voltage Divider   | !EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
- * | 8       | 8                  | A8               |  PA08  |                   | EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
- * | 9       | 9                  | A9               |  PA09  |                   | EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
- * | 10      | 10                 | A10              |  PA10  | TX                | !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
- * | 11      | 11                 | A11              |  PA11  | RX                | !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
- * | 12      | 14                 | A14              |  PA14  | Xin, HOST_ENABLE  | EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
- * | 13      | 15                 | A15              |  PA15  | Xout              | !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
- * | 14      | --                 | NC               |  ----  |                   | Not Connected
- * | 15      | --                 | NC               |  ----  |                   | Not Connected
- * | 16      | --                 | Vbus             |  ----  |                   | USB Vbus
- * | 17      | --                 | A24-             |  PA24  | USB_NEGATIVE      | USB/DM
- * | 18      | --                 | A25+             |  PA25  | USB_POSITIVE      | USB/DP
- * | 19      | --                 | Gnd              |  ----  |                   | Ground
- * | 20      | --                 | Gnd              |  ----  |                   | Ground
- * | 21      | --                 | Vin              |  ----  |                   | Vin
- * | 22      | --                 | Vcc              |  ----  |                   | Vcc
- * | 23      | --                 | 3.3V             |  ----  |                   | 3.3V
- * | 24      | --                 | NC               |  ----  |                   | Not Connected
- * | 25      | --                 | NC               |  ----  |                   | Not Connected
- * | 26      | 16                 | A16              |  PA16  | I2C/SDA w/pullup  | EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
- * | 27      | 17                 | A17              |  PA17  | I2C/SCL w/pullup  | EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
- * | 28      | 18                 | A18              |  PA18  | SPI MOSI          | EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
- * | 29      | 19                 | A19              |  PA19  | SPI SCK           | EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
- * | 30      | 22                 | A22              |  PA22  | SPI MISO          | EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
- * | 31      | 23                 | A23              |  PA23  | SPI SS            | EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
- * | 32      | 27                 | A27              |  PA27  | Button A          | EIC/EXTINT[15] Button A
- * | 33      | 28                 | A28              |  PA28  | LED               | EIC/EXTINT[8] LED
- * | 34      | --                 | NC               |  ----  |                   | Not Connected
- * | 35      | 30                 | A30              |  PA30  | SWD CLK           | EIC/EXTINT[10] !SERCOM1/PAD[2] TCC1/WO[0] SWD CLK
- * | 36      | 31                 | A31              |  PA31  | Button B / SWD IO | EIC/EXTINT[11] !SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
- * | 37      | --                 | NC               |  ----  |                   | Not Connected
- * | 38      | --                 | NC               |  ----  |                   | Not Connected
- * | 39      | --                 | RST              |  ----  |                   | Reset
- * +---------+--------------------+------------------+--------+-------------------+-------------------------------------------------
- * 
- * You may use Arduino pin numbers ranging from 0 to 31. The Arduino pin corresponds to the silkscreen (without the 'A').
- * For example, use pinMode(28, OUTPUT) to set the LED pin (marked as A28) as an output.
- * However, the following Arduino pin numbers are not mapped to a physical pin: 0, 1, 12, 13, 20, 21, 24, 25, 26, and 29.
- * Pins 0 and 1 are used by the 32.768KHz crystal which in turn is used by the Arduino core (the 16MHz crystal is unused by Arduino).
- * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
- * The tone library uses TC5.
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
  */
 
 
@@ -196,57 +31,57 @@ usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
  */
 const PinDescription g_APinDescription[]=
 {
-	// 0..1 are unused (pins in use by 32.768KHz crystal, which in turn is used by the Arduino core)
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	// 0..1 are unused by default (pins in use by 32.768KHz crystal, which is used by the Arduino core)
+	{ PORTA,  0, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  1, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 	
 	// 2..9 - Analog capable pins (DAC available on 2)
-	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
-	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // ADC/AIN[1]
-	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4 }, // ADC/AIN[4]
-	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5 }, // ADC/AIN[5]
-	{ PORTA,  6, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NONE }, // ADC/AIN[6]
-	{ PORTA,  7, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9 }, // TCC0/WO[1]
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[0] / DAC
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[1]
+	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4, GCLK_CCL_NONE }, // ADC/AIN[4]
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE }, // ADC/AIN[5]
+	{ PORTA,  6, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[6]
+	{ PORTA,  7, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
 	
 	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE }, // TX: SERCOM0/PAD[2]
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE }, // RX: SERCOM0/PAD[3]
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
 	
 	// 12..13 pins don't exist
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
-	// 14..15 - Digital functions
-	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14 }, // TC3/WO[0], HOST_ENABLE
-	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // TC3/WO[1], ATN
+	// 14..15 - SERCOM/UART (Serial2) or Digital functions
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // TC3/WO[0], HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
 	
 	// 16..17 SERCOM/I2C (Wire) or Digital functions
-	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // SDA: SERCOM1/PAD[0]
-	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // SCL: SERCOM1/PAD[1]
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // SDA: SERCOM1/PAD[0]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // SCL: SERCOM1/PAD[1]
 	
 	// 18..23 - SERCOM/SPI (SPI) or Digital functions (pins 20..21 do not exist)
-	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2 }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
-	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3 }, // SPI SCK: SERCOM3/PAD[3] (PIN_ATTR_SERCOM_ALT)
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
-	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6 }, // SPI MISO: SERCOM3/PAD[0]
-	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7 }, // SPI SS: SERCOM3/PAD[1]
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SPI SCK: SERCOM3/PAD[3] (PIN_ATTR_SERCOM_ALT)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SPI MISO: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // SPI SS: SERCOM3/PAD[1]
 	
-	// 24..26 are unused (25 and 26 in use by USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist)
-	{ PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DM
-	{ PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DP
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	// 24..26 - USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist
+	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 27..29 Button A and LED (pin 29 does not exist)
-	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_INPUT_PULLUP|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_15 }, // Button A
-	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_OUTPUT|PIN_ATTR_INPUT|PIN_ATTR_INPUT_PULLDOWN|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_8 }, // LED
-	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // Unused
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_15, GCLK_CCL_NONE }, // Button A
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_8, GCLK_CCL_NONE }, // LED
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH0, No_ADC_Channel, EXTERNAL_INT_10 }, // TCC1/WO[0] / SWD CLK
-	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH1, No_ADC_Channel, EXTERNAL_INT_11 }, // TCC1/WO[1] / SWD IO
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH0, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH1, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO
 } ;
 
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
@@ -257,18 +92,20 @@ SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 SERCOM sercom3( SERCOM3 ) ;
 
-#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
+#if defined(ONE_UART) || defined(TWO_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
-Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
 void SERCOM0_Handler()
 {
   Serial1.IrqHandler();
 }
+#endif
+
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
 void SERCOM2_Handler()
 {
   Serial2.IrqHandler();
 }
 #endif
-
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index d3d251743..0815874cf 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -17,13 +17,21 @@
 */
 
 /*
-  Modified 20 May 2016 by Justin Mattair
-     for MattairTech MT-D21E boards (www.mattairtech.com)
-*/
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
 
 #ifndef _VARIANT_MATTAIRTECH_MT_D21E_
 #define _VARIANT_MATTAIRTECH_MT_D21E_
 
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
 /*----------------------------------------------------------------------------
  *        Definitions
  *----------------------------------------------------------------------------*/
@@ -32,13 +40,14 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK		(48000000ul)
 
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
 
 #include "WVariant.h"
+#include "sam.h"
 
 #ifdef __cplusplus
 #include "SERCOM.h"
@@ -57,8 +66,8 @@ extern "C"
 // Number of pins defined in PinDescription array
 #define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
 
-#define PINS_COUNT           (32u)
-#define NUM_DIGITAL_PINS     (32u)
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
 #define NUM_ANALOG_INPUTS    (10u)
 #define NUM_ANALOG_OUTPUTS   (1u)
 #define analogInputToDigitalPin(p)  (p)
@@ -97,8 +106,8 @@ extern "C"
 /* Buttons
  * Note that Button B is connected to Reset by default.
  * A solder jumper can be changed to route Button B to pin 31 instead.
- * If the debouncing capacitor is connected (default), delay reading the
- * pin at least 6ms after turning on the pullup to allow the capacitor to charge.
+ * There is a debouncing capacitor connected, so delay reading the pin for
+ * at least 6ms after turning on the pullup to allow the capacitor to charge.
  */
 #define BUTTON_A             (27u)
 #define BUTTON_B             (31u)
diff --git a/variants/arduino_zero/README.md b/variants/arduino_zero/README.md
new file mode 100644
index 000000000..6e652727b
--- /dev/null
+++ b/variants/arduino_zero/README.md
@@ -0,0 +1,195 @@
+# Pins descriptions for the Arduino/Genuino Zero
+
+```
+/*
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * + Pin number +  ZERO Board pin  |  PIN   | Label/Name      | Comments (* is for available peripherals with this configuration)
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | Digital Low      |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 0          | 0 -> RX          |  PA11  |                 | *EIC/EXTINT[11] *ADC/AIN[19]           PTC/X[3] *SERCOM0/PAD[3]   SERCOM2/PAD[3]  TCC0/WO[3]  TCC1/WO[1]
+ * | 1          | 1 <- TX          |  PA10  |                 | *EIC/EXTINT[10] *ADC/AIN[18]           PTC/X[2] *SERCOM0/PAD[2]                   TCC0/WO[2]  TCC1/WO[0]
+ * | 2          | 2                |  PA14  |                 | *EIC/EXTINT[14]                                  SERCOM2/PAD[2]   SERCOM4/PAD[2]  TC3/WO[0]   TCC0/WO[4]
+ * | 3          | ~3               |  PA09  |                 | *EIC/EXTINT[9]  *ADC/AIN[17]           PTC/X[1]  SERCOM0/PAD[1]  *SERCOM2/PAD[1] *TCC0/WO[1]  TCC1/WO[3]
+ * | 4          | ~4               |  PA08  |                 | *EIC/NMI        *ADC/AIN[16]           PTC/X[0]  SERCOM0/PAD[0]  *SERCOM2/PAD[0] *TCC0/WO[0]  TCC1/WO[2]
+ * | 5          | ~5               |  PA15  |                 | *EIC/EXTINT[15]                                  SERCOM2/PAD[3]   SERCOM4/PAD[3] *TC3/WO[1]   TCC0/WO[5]
+ * | 6          | ~6               |  PA20  |                 | *EIC/EXTINT[4]                         PTC/X[8]  SERCOM5/PAD[2]   SERCOM3/PAD[2]             *TCC0/WO[6]
+ * | 7          | 7                |  PA21  |                 | *EIC/EXTINT[5]                         PTC/X[9]  SERCOM5/PAD[3]   SERCOM3/PAD[3]              TCC0/WO[7]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | Digital High     |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 8          | ~8               |  PA06  |                 | EIC/EXTINT[6]  *ADC/AIN[6]  AC/AIN[2] PTC/Y[4]  SERCOM0/PAD[2]                 *TCC1/WO[0]
+ * | 9          | ~9               |  PA07  |                 | EIC/EXTINT[7]  *ADC/AIN[7]  AC/AIN[3] PTC/Y[5]  SERCOM0/PAD[3]                 *TCC1/WO[1]
+ * | 10         | ~10              |  PA18  |                 | *EIC/EXTINT[2]                        PTC/X[6] *SERCOM1/PAD[2]  SERCOM3/PAD[2] *TC3/WO[0]    TCC0/WO[2]
+ * | 11         | ~11              |  PA16  |                 | *EIC/EXTINT[0]                        PTC/X[4] *SERCOM1/PAD[0]  SERCOM3/PAD[0] *TCC2/WO[0]   TCC0/WO[6]
+ * | 12         | ~12              |  PA19  |                 | *EIC/EXTINT[3]                        PTC/X[7] *SERCOM1/PAD[3]  SERCOM3/PAD[3]  TC3/WO[1]   *TCC0/WO[3]
+ * | 13         | ~13              |  PA17  | LED             | *EIC/EXTINT[1]                        PTC/X[5] *SERCOM1/PAD[1]  SERCOM3/PAD[1] *TCC2/WO[1]   TCC0/WO[7]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | Analog Connector |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 14         | A0               |  PA02  | A0              | EIC/EXTINT[2]  *ADC/AIN[0]  *DAC/VOUT  PTC/Y[0]
+ * | 15         | A1               |  PB08  | A1              | *EIC/EXTINT[8] *ADC/AIN[2]            PTC/Y[14] SERCOM4/PAD[0]                  TC4/WO[0]
+ * | 16         | A2               |  PB09  | A2              | EIC/EXTINT[9]  *ADC/AIN[3]            PTC/Y[15] SERCOM4/PAD[1]                  TC4/WO[1]
+ * | 17         | A3               |  PA04  | A3              | EIC/EXTINT[4]  *ADC/AIN[4]  AC/AIN[0] PTC/Y[2]  SERCOM0/PAD[0]                  TCC0/WO[0]
+ * | 18         | A4               |  PA05  | A4              | EIC/EXTINT[5]  *ADC/AIN[5]  AC/AIN[1] PTC/Y[5]  SERCOM0/PAD[1]                  TCC0/WO[1]
+ * | 19         | A5               |  PB02  | A5              | EIC/EXTINT[2]  *ADC/AIN[10]           PTC/Y[8]  SERCOM5/PAD[0]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | Wire             |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 20         | SDA              |  PA22  | SDA             | *EIC/EXTINT[6]                        PTC/X[10] *SERCOM3/PAD[0] SERCOM5/PAD[0] *TC4/WO[0] TCC0/WO[4]
+ * | 21         | SCL              |  PA23  | SCL             | *EIC/EXTINT[7]                        PTC/X[11] *SERCOM3/PAD[1] SERCOM5/PAD[1] *TC4/WO[1] TCC0/WO[5]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            |SPI (Legacy ICSP) |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 22         | 1                |  PA12  | MISO            | *EIC/EXTINT[12] SERCOM2/PAD[0] *SERCOM4/PAD[0] TCC2/WO[0] TCC0/WO[6]
+ * |            | 2                |        | 5V0             |
+ * | 23         | 4                |  PB10  | MOSI            | EIC/EXTINT[10]                *SERCOM4/PAD[2] *TC5/WO[0]  TCC0/WO[4]
+ * | 24         | 3                |  PB11  | SCK             | EIC/EXTINT[11]                *SERCOM4/PAD[3] *TC5/WO[1]  TCC0/WO[5]
+ * |            | 5                |        | RESET           |
+ * |            | 6                |        | GND             |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | LEDs             |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 25         |                  |  PB03  | RX              |
+ * | 26         |                  |  PA27  | TX              |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | USB              |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 27         |                  |  PA28  | USB_HOST_ENABLE | EIC/EXTINT[8]
+ * | 28         |                  |  PA24  | USB_NEGATIVE    | *USB/DM
+ * | 29         |                  |  PA25  | USB_POSITIVE    | *USB/DP
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | EDBG             |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 30         |                  |  PB22  | EDBG_UART TX    | *SERCOM5/PAD[2]
+ * | 31         |                  |  PB23  | EDBG_UART RX    | *SERCOM5/PAD[3]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 32         |                  |  PA22  | EDBG_SDA        | Pin 20 (SDA)
+ * | 33         |                  |  PA23  | EDBG_SCL        | Pin 21 (SCL)
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 34         |                  |  PA19  | EDBG_MISO       | EIC/EXTINT[3] *SERCOM1/PAD[3] SERCOM3/PAD[3] TC3/WO[1]  TCC0/WO[3]
+ * | 35         |                  |  PA16  | EDBG_MOSI       | EIC/EXTINT[0] *SERCOM1/PAD[0] SERCOM3/PAD[0] TCC2/WO[0] TCC0/WO[6]
+ * | 36         |                  |  PA18  | EDBG_SS         | EIC/EXTINT[2] *SERCOM1/PAD[2] SERCOM3/PAD[2] TC3/WO[0]  TCC0/WO[2]
+ * | 37         |                  |  PA17  | EDBG_SCK        | EIC/EXTINT[1] *SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] TCC0/WO[7]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | 38         | ATN              |  PA13  | EDBG_GPIO0      | *EIC/EXTINT[13] SERCOM2/PAD[1] SERCOM4/PAD[1] TCC2/WO[1] TCC0/WO[7]
+ * | 39         |                  |  PA21  | EDBG_GPIO1      | Pin 7
+ * | 40         |                  |  PA06  | EDBG_GPIO2      | Pin 8
+ * | 41         |                  |  PA07  | EDBG_GPIO3      | Pin 9
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            |                  |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            | GND              |        |                 |
+ * | 42         | AREF             |  PA03  |                 | EIC/EXTINT[3] *[ADC|DAC]/VREFA *ADC/AIN[1] PTC/Y[1]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            |32.768KHz Crystal |        |                 |
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * |            |                  |  PA00  | XIN32           | EIC/EXTINT[0] SERCOM1/PAD[0] TCC2/WO[0]
+ * |            |                  |  PA01  | XOUT32          | EIC/EXTINT[1] SERCOM1/PAD[1] TCC2/WO[1]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ */
+```
+
+
+
+# PinDescription table format
+
+## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+## Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+## Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+## See WVariant.h in cores/arduino for the definitions used in the table.
+
+### Port:
+This is the port (ie: PORTA).
+
+### Pin:
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType:
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/arduino_zero/variant.cpp b/variants/arduino_zero/variant.cpp
index 88e7a42d1..aef56041b 100644
--- a/variants/arduino_zero/variant.cpp
+++ b/variants/arduino_zero/variant.cpp
@@ -16,171 +16,11 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-/*   The PinDescription table describes how each of the pins can be used by the Arduino
- *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
- *   communications, etc.), and the PinDescription table configures which functions can
- *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
- *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
- *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
- *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
- *   verify that the pin can perform the function requested, and to configure the pin for
- *   that function. Most of the contents of pinMode() are now in pinPeripheral().
- * 
- *   There are two ways that pins can be mapped. The first is to map pins contiguously
- *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
- *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
- *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
- *   This only works when there is one port. Because not all port pins are available,
- *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
- *   For an example of both types, see variant.cpp from the MT-D11 variant.
- * 
- *   Explanation of PinDescription table:
- * 
- *   Port                  This is the port (ie: PORTA).
- *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
- *   PinType               This indicates what peripheral function the pin can be
- *                         attached to. In most cases, this is PIO_MULTI, which means
- *                         that the pin can be anything listed in the PinAttribute field.
- *                         It can also be set to a specific peripheral. In this case, any
- *                         attempt to configure the pin (using pinPeripheral or pinMode)
- *                         as anything else will fail (and pinPeripheral will return -1).
- *                         This can be used to prevent accidental re-configuration of a
- *                         pin that is configured for only one function (ie: USB D- and
- *                         D+ pins). If a pin is not used or does not exist,
- *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
- *                         for valid entries. These entries are also used as a parameter
- *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
- *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
- *                         the desired mode. Note that this field is not used to select
- *                         between the two peripherals possible with each of the SERCOM
- *                         and TIMER functions. PeripheralAttribute is now used for this.
- *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
- *                         configuration. It is primarily used to select between the two
- *                         peripherals possible with each of the SERCOM and TIMER
- *                         functions. TIMER pins are individual, while SERCOM uses a
- *                         group of two to four pins. This group of pins can span both
- *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
- *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
- *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
- *                         pin. This bitfield is also used to set the pin drive strength.
- *                         In the future, other attributes (like input buffer
- *                         configuration) may be added. See WVariant.h for valid entries.
- *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
- *                         peripheral functions that a pin can attach to. This includes
- *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
- *                         shorthand for a combination of other attributes.
- *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
- *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
- *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
- *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
- *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
- *                         bitfield is useful for limiting a pin to only input related
- *                         functions or output functions. This allows a pin to have a
- *                         more flexible configuration, while restricting the direction
- *                         (ie: to avoid contention). See WVariant.h for valid entries.
- *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
- *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
- *                         available on pin A4 or pin A8 on the MT-D21E). In general,
- *                         only one pin should be configured (in the pinDescription
- *                         table) per TC channel. See WVariant.h for valid entries.
- *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
- *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
- *                         WVariant.h for valid entries.
- *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
- *                         interrupt numbers are available on multiple pins (ie:
- *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
- *                         MT-D21E). In general, only one pin should be configured (in
- *                         the pinDescription table) per interrupt number. Thus, if an
- *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
- *                         from pin 18. See WVariant.h for valid entries.
- */
-
 /*
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * + Pin number +  ZERO Board pin  |  PIN   | Label/Name      | Comments (* is for available peripherals with this configuration)
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | Digital Low      |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 0          | 0 -> RX          |  PA11  |                 | *EIC/EXTINT[11] *ADC/AIN[19]           PTC/X[3] *SERCOM0/PAD[3]   SERCOM2/PAD[3]  TCC0/WO[3]  TCC1/WO[1]
- * | 1          | 1 <- TX          |  PA10  |                 | *EIC/EXTINT[10] *ADC/AIN[18]           PTC/X[2] *SERCOM0/PAD[2]                   TCC0/WO[2]  TCC1/WO[0]
- * | 2          | 2                |  PA14  |                 | *EIC/EXTINT[14]                                  SERCOM2/PAD[2]   SERCOM4/PAD[2]  TC3/WO[0]   TCC0/WO[4]
- * | 3          | ~3               |  PA09  |                 | *EIC/EXTINT[9]  *ADC/AIN[17]           PTC/X[1]  SERCOM0/PAD[1]  *SERCOM2/PAD[1] *TCC0/WO[1]  TCC1/WO[3]
- * | 4          | ~4               |  PA08  |                 | *EIC/NMI        *ADC/AIN[16]           PTC/X[0]  SERCOM0/PAD[0]  *SERCOM2/PAD[0] *TCC0/WO[0]  TCC1/WO[2]
- * | 5          | ~5               |  PA15  |                 | *EIC/EXTINT[15]                                  SERCOM2/PAD[3]   SERCOM4/PAD[3] *TC3/WO[1]   TCC0/WO[5]
- * | 6          | ~6               |  PA20  |                 | *EIC/EXTINT[4]                         PTC/X[8]  SERCOM5/PAD[2]   SERCOM3/PAD[2]             *TCC0/WO[6]
- * | 7          | 7                |  PA21  |                 | *EIC/EXTINT[5]                         PTC/X[9]  SERCOM5/PAD[3]   SERCOM3/PAD[3]              TCC0/WO[7]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | Digital High     |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 8          | ~8               |  PA06  |                 | EIC/EXTINT[6]  *ADC/AIN[6]  AC/AIN[2] PTC/Y[4]  SERCOM0/PAD[2]                 *TCC1/WO[0]
- * | 9          | ~9               |  PA07  |                 | EIC/EXTINT[7]  *ADC/AIN[7]  AC/AIN[3] PTC/Y[5]  SERCOM0/PAD[3]                 *TCC1/WO[1]
- * | 10         | ~10              |  PA18  |                 | *EIC/EXTINT[2]                        PTC/X[6] *SERCOM1/PAD[2]  SERCOM3/PAD[2] *TC3/WO[0]    TCC0/WO[2]
- * | 11         | ~11              |  PA16  |                 | *EIC/EXTINT[0]                        PTC/X[4] *SERCOM1/PAD[0]  SERCOM3/PAD[0] *TCC2/WO[0]   TCC0/WO[6]
- * | 12         | ~12              |  PA19  |                 | *EIC/EXTINT[3]                        PTC/X[7] *SERCOM1/PAD[3]  SERCOM3/PAD[3]  TC3/WO[1]   *TCC0/WO[3]
- * | 13         | ~13              |  PA17  | LED             | *EIC/EXTINT[1]                        PTC/X[5] *SERCOM1/PAD[1]  SERCOM3/PAD[1] *TCC2/WO[1]   TCC0/WO[7]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | Analog Connector |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 14         | A0               |  PA02  | A0              | EIC/EXTINT[2]  *ADC/AIN[0]  *DAC/VOUT  PTC/Y[0]
- * | 15         | A1               |  PB08  | A1              | *EIC/EXTINT[8] *ADC/AIN[2]            PTC/Y[14] SERCOM4/PAD[0]                  TC4/WO[0]
- * | 16         | A2               |  PB09  | A2              | EIC/EXTINT[9]  *ADC/AIN[3]            PTC/Y[15] SERCOM4/PAD[1]                  TC4/WO[1]
- * | 17         | A3               |  PA04  | A3              | EIC/EXTINT[4]  *ADC/AIN[4]  AC/AIN[0] PTC/Y[2]  SERCOM0/PAD[0]                  TCC0/WO[0]
- * | 18         | A4               |  PA05  | A4              | EIC/EXTINT[5]  *ADC/AIN[5]  AC/AIN[1] PTC/Y[5]  SERCOM0/PAD[1]                  TCC0/WO[1]
- * | 19         | A5               |  PB02  | A5              | EIC/EXTINT[2]  *ADC/AIN[10]           PTC/Y[8]  SERCOM5/PAD[0]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | Wire             |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 20         | SDA              |  PA22  | SDA             | *EIC/EXTINT[6]                        PTC/X[10] *SERCOM3/PAD[0] SERCOM5/PAD[0] *TC4/WO[0] TCC0/WO[4]
- * | 21         | SCL              |  PA23  | SCL             | *EIC/EXTINT[7]                        PTC/X[11] *SERCOM3/PAD[1] SERCOM5/PAD[1] *TC4/WO[1] TCC0/WO[5]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            |SPI (Legacy ICSP) |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 22         | 1                |  PA12  | MISO            | *EIC/EXTINT[12] SERCOM2/PAD[0] *SERCOM4/PAD[0] TCC2/WO[0] TCC0/WO[6]
- * |            | 2                |        | 5V0             |
- * | 23         | 4                |  PB10  | MOSI            | EIC/EXTINT[10]                *SERCOM4/PAD[2] *TC5/WO[0]  TCC0/WO[4]
- * | 24         | 3                |  PB11  | SCK             | EIC/EXTINT[11]                *SERCOM4/PAD[3] *TC5/WO[1]  TCC0/WO[5]
- * |            | 5                |        | RESET           |
- * |            | 6                |        | GND             |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | LEDs             |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 25         |                  |  PB03  | RX              |
- * | 26         |                  |  PA27  | TX              |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | USB              |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 27         |                  |  PA28  | USB_HOST_ENABLE | EIC/EXTINT[8]
- * | 28         |                  |  PA24  | USB_NEGATIVE    | *USB/DM
- * | 29         |                  |  PA25  | USB_POSITIVE    | *USB/DP
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | EDBG             |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 30         |                  |  PB22  | EDBG_UART TX    | *SERCOM5/PAD[2]
- * | 31         |                  |  PB23  | EDBG_UART RX    | *SERCOM5/PAD[3]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 32         |                  |  PA22  | EDBG_SDA        | Pin 20 (SDA)
- * | 33         |                  |  PA23  | EDBG_SCL        | Pin 21 (SCL)
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 34         |                  |  PA19  | EDBG_MISO       | EIC/EXTINT[3] *SERCOM1/PAD[3] SERCOM3/PAD[3] TC3/WO[1]  TCC0/WO[3]
- * | 35         |                  |  PA16  | EDBG_MOSI       | EIC/EXTINT[0] *SERCOM1/PAD[0] SERCOM3/PAD[0] TCC2/WO[0] TCC0/WO[6]
- * | 36         |                  |  PA18  | EDBG_SS         | EIC/EXTINT[2] *SERCOM1/PAD[2] SERCOM3/PAD[2] TC3/WO[0]  TCC0/WO[2]
- * | 37         |                  |  PA17  | EDBG_SCK        | EIC/EXTINT[1] *SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] TCC0/WO[7]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * | 38         | ATN              |  PA13  | EDBG_GPIO0      | *EIC/EXTINT[13] SERCOM2/PAD[1] SERCOM4/PAD[1] TCC2/WO[1] TCC0/WO[7]
- * | 39         |                  |  PA21  | EDBG_GPIO1      | Pin 7
- * | 40         |                  |  PA06  | EDBG_GPIO2      | Pin 8
- * | 41         |                  |  PA07  | EDBG_GPIO3      | Pin 9
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            |                  |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            | GND              |        |                 |
- * | 42         | AREF             |  PA03  |                 | EIC/EXTINT[3] *[ADC|DAC]/VREFA *ADC/AIN[1] PTC/Y[1]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            |32.768KHz Crystal |        |                 |
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
- * |            |                  |  PA00  | XIN32           | EIC/EXTINT[0] SERCOM1/PAD[0] TCC2/WO[0]
- * |            |                  |  PA01  | XOUT32          | EIC/EXTINT[1] SERCOM1/PAD[1] TCC2/WO[1]
- * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
  */
 
 
@@ -194,88 +34,88 @@ const PinDescription g_APinDescription[]=
   // 0..13 - Digital pins
   // ----------------------
   // 0/1 - SERCOM/UART (Serial1)
-  { PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel19, EXTERNAL_INT_11 }, // RX: SERCOM0/PAD[3]
-  { PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel18, EXTERNAL_INT_10 }, // TX: SERCOM0/PAD[2]
+  { PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel19, EXTERNAL_INT_11, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+  { PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel18, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
 
   // 2..12
   // Digital Low
-  { PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_14 },
-  { PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9 }, // TCC0/WO[1] SCL: SERCOM2/PAD[1]
-  { PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI }, // TCC0/WO[0] SDA: SERCOM2/PAD[0]
-  { PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_15 }, // TC3/WO[1]
-  { PORTA, 20, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH6, No_ADC_Channel, EXTERNAL_INT_4 }, // TCC0/WO[6]
-  { PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5 },
+  { PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE },
+  { PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1] SCL: SERCOM2/PAD[1]
+  { PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0] SDA: SERCOM2/PAD[0]
+  { PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_15, GCLK_CCL_NONE }, // TC3/WO[1]
+  { PORTA, 20, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH6, No_ADC_Channel, EXTERNAL_INT_4, GCLK_CCL_NONE }, // TCC0/WO[6]
+  { PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5, GCLK_CCL_NONE },
 
   // Digital High
-  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_6 }, // TCC1/WO[0] ADC/AIN[6]
-  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_7 }, // TCC1/WO[1] ADC/AIN[7]
-  { PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2 }, // TC3/WO[0] SS: SERCOM1/PAD[2]
-  { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // TCC2/WO[0] MOSI: SERCOM1/PAD[0]
-  { PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3 }, // TCC0/WO[3] MISO: SERCOM1/PAD[3]
+  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_6, GCLK_CCL_NONE }, // TCC1/WO[0] ADC/AIN[6]
+  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_7, GCLK_CCL_NONE }, // TCC1/WO[1] ADC/AIN[7]
+  { PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // TC3/WO[0] SS: SERCOM1/PAD[2]
+  { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // TCC2/WO[0] MOSI: SERCOM1/PAD[0]
+  { PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // TCC0/WO[3] MISO: SERCOM1/PAD[3]
 
   // 13 (LED)
-  { PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // TCC2/WO[1] SCK: SERCOM1/PAD[1]
+  { PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // TCC2/WO[1] SCK: SERCOM1/PAD[1]
 
   // 14..19 - Analog pins
   // --------------------
-  { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
-  { PORTB,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel2, EXTERNAL_INT_8 }, // ADC/AIN[2]
-  { PORTB,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel3, EXTERNAL_INT_NONE }, // ADC/AIN[3]
-  { PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_NONE }, // ADC/AIN[4]
-  { PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_NONE }, // ADC/AIN[5]
-  { PORTB,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel10, EXTERNAL_INT_NONE }, // ADC/AIN[10]
+  { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[0] / DAC
+  { PORTB,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel2, EXTERNAL_INT_8, GCLK_CCL_NONE }, // ADC/AIN[2]
+  { PORTB,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel3, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[3]
+  { PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[4]
+  { PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[5]
+  { PORTB,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel10, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[10]
 
   // 20..21 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
   // ----------------------
-  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // SDA: SERCOM3/PAD[0]
-  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCL: SERCOM3/PAD[1]
+  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SDA: SERCOM3/PAD[0]
+  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SCL: SERCOM3/PAD[1]
 
   // 22..24 - SPI pins (ICSP:MISO,SCK,MOSI)
   // ----------------------
-  { PORTA, 12, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_12 }, // MISO: SERCOM4/PAD[0]
-  { PORTB, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_NONE }, // MOSI: SERCOM4/PAD[2]
-  { PORTB, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE }, // SCK: SERCOM4/PAD[3]
+  { PORTA, 12, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_12, GCLK_CCL_NONE }, // MISO: SERCOM4/PAD[0]
+  { PORTB, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // MOSI: SERCOM4/PAD[2]
+  { PORTB, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SCK: SERCOM4/PAD[3]
 
   // 25..26 - RX/TX LEDS (PB03/PA27)
   // --------------------
-  { PORTB,  3, PIO_OUTPUT, PER_ATTR_DRIVE_STRONG, PIN_ATTR_OUTPUT, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // used as output only
-  { PORTA, 27, PIO_OUTPUT, PER_ATTR_DRIVE_STRONG, PIN_ATTR_OUTPUT, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // used as output only
+  { PORTB,  3, PIO_OUTPUT, PER_ATTR_DRIVE_STRONG, PIN_ATTR_OUTPUT, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // used as output only
+  { PORTA, 27, PIO_OUTPUT, PER_ATTR_DRIVE_STRONG, PIN_ATTR_OUTPUT, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // used as output only
 
   // 27..29 - USB
   // --------------------
-  { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB Host enable
-  { PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DM
-  { PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // USB/DP
+  { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB Host enable
+  { PORTA, 24, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+  { PORTA, 25, PIO_COM, PER_ATTR_NONE, PIN_ATTR_COM, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
 
   // 30..41 - EDBG
   // ----------------------
   // 30/31 - EDBG/UART
-  { PORTB, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // TX: SERCOM5/PAD[2]
-  { PORTB, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE }, // RX: SERCOM5/PAD[3]
+  { PORTB, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM5/PAD[2]
+  { PORTB, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM5/PAD[3]
 
 	// 32/33 I2C (SDA/SCL and also EDBG:SDA/SCL). These are duplicate entries of pins 20 and 21
-	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
-	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SDA: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // SCL: SERCOM3/PAD[1]
 
 	// 34..37 - EDBG/SPI. These are duplicate entries of pins 12, 11, 10, and 13.
-	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3 }, // MISO: SERCOM1/PAD[3]
-	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0 }, // MOSI: SERCOM1/PAD[0]
-	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2 }, // SS: SERCOM1/PAD[2]
-	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1 }, // SCK: SERCOM1/PAD[1]
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // MISO: SERCOM1/PAD[3]
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // MOSI: SERCOM1/PAD[0]
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SS: SERCOM1/PAD[2]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // SCK: SERCOM1/PAD[1]
 
   // 38..41 - EDBG/Digital
-  { PORTA, 13, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_13 }, // EIC/EXTINT[13] PIN_ATN
+  { PORTA, 13, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_13, GCLK_CCL_NONE }, // EIC/EXTINT[13] PIN_ATN
 
 	// 39..41 These are duplicate entries of pins 7, 8, and 9 so that AREF and DAC are still available on pins 42 and 43
-	{ PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5 },
-	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE }, // TCC1/WO[0] ADC/AIN[6]
-	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE }, // TCC1/WO[1] ADC/AIN[7]
+	{ PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TCC1/WO[0] ADC/AIN[6]
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TCC1/WO[1] ADC/AIN[7]
 
   // 42 (AREF)
-  { PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE }, // VREF ADC/AIN[1]
+  { PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // VREF ADC/AIN[1]
 
-	// 43 - Alternate use of A0 (DAC output). This is a duplicate entry of pin 
-	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE }, // ADC/AIN[0] / DAC
+	// 43 - Alternate use of A0 (DAC output). This is a duplicate entry of pin 14
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[0] / DAC
 } ;
 
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
@@ -288,13 +128,8 @@ SERCOM sercom3( SERCOM3 ) ;
 SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 
-#if defined(ARDUINO_UART_ONLY) || defined(ARDUINO_CDC_HID_UART) || defined(ARDUINO_CDC_UART) || defined(ARDUINO_HID_UART) || defined(ARDUINO_CDC_MIDI_HID_UART) || defined(ARDUINO_CDC_MSD_HID_UART) || defined(ARDUINO_CDC_MSD_MIDI_HID_UART)
-Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+#if defined(ONE_UART) || defined(TWO_UART)
 Uart Serial( SERCOM_INSTANCE_SERIAL, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;
-void SERCOM0_Handler()
-{
-  Serial1.IrqHandler();
-}
 
 void SERCOM5_Handler()
 {
@@ -302,3 +137,12 @@ void SERCOM5_Handler()
 }
 #endif
 
+#if defined(TWO_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
+
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index 980a4b51b..144fa61b7 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -19,6 +19,12 @@
 #ifndef _VARIANT_ARDUINO_ZERO_
 #define _VARIANT_ARDUINO_ZERO_
 
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
 /*----------------------------------------------------------------------------
  *        Definitions
  *----------------------------------------------------------------------------*/
@@ -27,13 +33,14 @@
 #define VARIANT_MAINOSC		(32768ul)
 
 /** Master clock frequency */
-#define VARIANT_MCK			  (48000000ul)
+#define VARIANT_MCK		(48000000ul)
 
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
 
 #include "WVariant.h"
+#include "sam.h"
 
 #ifdef __cplusplus
 #include "SERCOM.h"
@@ -139,7 +146,13 @@ static const uint8_t ATN = PIN_ATN;
 /*
  * SPI Interfaces
  */
+#if defined(TWO_SPI)
 #define SPI_INTERFACES_COUNT 2
+#elif defined(THREE_SPI)
+#define SPI_INTERFACES_COUNT 3
+#else
+#define SPI_INTERFACES_COUNT 1
+#endif
 
 #define PIN_SPI_MISO         (22u)
 #define PIN_SPI_MOSI         (23u)
@@ -163,7 +176,13 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 /*
  * Wire Interfaces
  */
+#if defined(TWO_WIRE)
 #define WIRE_INTERFACES_COUNT 2
+#elif defined(THREE_WIRE)
+#define WIRE_INTERFACES_COUNT 3
+#else
+#define WIRE_INTERFACES_COUNT 1
+#endif
 
 #define PIN_WIRE_SDA         (20u)
 #define PIN_WIRE_SCL         (21u)
@@ -184,7 +203,7 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define PIN_USB_DM          (28ul)
 #define PIN_USB_DP          (29ul)
 #define PIN_USB_HOST_ENABLE (27ul)
-#define PIN_USB_HOST_ENABLE_VALUE	HIGH
+#define PIN_USB_HOST_ENABLE_VALUE	1
 
 #ifdef __cplusplus
 }

From 05ac82403e7d60460ef76e4c578632db5cf9f5ea Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 6 Mar 2017 02:15:30 +0000
Subject: [PATCH 081/124] Add L21 and C21 support to libraries

---
 libraries/HID/HID.h                                      | 4 ++--
 .../SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp  | 7 +++++++
 libraries/SPI/SPI.h                                      | 9 ++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index 60a348aaa..45900f99e 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -23,8 +23,8 @@
 #include <Arduino.h>
 #include "USB/PluggableUSB.h"
 
-#if !defined(HID_ENABLED)
-#error Please select an appropriate option that includes HID in the Tools->Communications menu.
+#if !defined(CDC_HID) || !defined(HID_ONLY) || !defined(WITH_CDC)
+#error Please select CDC_HID, HID_ONLY, or WITH_CDC in the Tools->USB menu.
 #endif
 
 #if defined(USBCON)
diff --git a/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp b/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
index 1681b0a43..3b5d07a47 100644
--- a/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
+++ b/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
@@ -25,7 +25,14 @@ void analogReadCorrection (int offset, uint16_t gain)
   ADC->GAINCORR.reg = ADC_GAINCORR_GAINCORR(gain);
 
   // Enable digital correction logic
+#if (SAMD)
   ADC->CTRLB.bit.CORREN = 1;
   while(ADC->STATUS.bit.SYNCBUSY);
+#elif (SAML21 || SAMC21)
+  ADC->CTRLC.bit.CORREN = 1;
+  while ( ADC->SYNCBUSY.reg & ADC_SYNCBUSY_MASK );
+#else
+  #error "SAMD_AnalogCorrection.h: Unsupported chip"
+#endif
 }
 
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index c45b27b0a..8db271dbc 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -22,6 +22,7 @@
 
 #include <Arduino.h>
 #include <WVariant.h>
+#include "sam.h"
 
 // SPI_HAS_TRANSACTION means SPI has
 //   - beginTransaction()
@@ -35,14 +36,16 @@
 #define SPI_MODE2 0x03
 #define SPI_MODE3 0x01
 
-#if defined(__SAMD21G18A__)
+#if (SAMD || SAML21)
   // Even if not specified on the datasheet, the SAMD21G18A MCU
   // doesn't operate correctly with clock dividers lower than 4.
   // This allows a theoretical maximum SPI clock speed of 12Mhz
-  #define SPI_MIN_CLOCK_DIVIDER 4
   // Other SAMD21xxxxx MCU may be affected as well
-#else
   #define SPI_MIN_CLOCK_DIVIDER 4
+#elif (SAMC21)
+  #define SPI_MIN_CLOCK_DIVIDER 8
+#else
+  #error "SPI.h: Unsupported chip"
 #endif
 
 class SPISettings {

From bfed5bb98898990bd6c00b2bb837f506c9e7fc5e Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 6 Mar 2017 02:18:55 +0000
Subject: [PATCH 082/124] Reorganized linker scripts, openocd scripts, and
 debug scripts. Updated boards.txt with new menu items.

---
 boards.txt                                    | 1174 +++++++++++------
 .../flash_16KB.ld}                            |    0
 .../flash_16KB.ld}                            |    0
 .../debug_scripts/SAMC21E15A.gdb}             |    2 +-
 .../debug_scripts/SAMC21E16A.gdb}             |    2 +-
 variants/MT_D21E/debug_scripts/SAMC21E17A.gdb |   31 +
 variants/MT_D21E/debug_scripts/SAMC21E18A.gdb |   31 +
 variants/MT_D21E/debug_scripts/SAML21E15B.gdb |   31 +
 variants/MT_D21E/debug_scripts/SAML21E16B.gdb |   31 +
 variants/MT_D21E/debug_scripts/SAML21E17B.gdb |   31 +
 variants/MT_D21E/debug_scripts/SAML21E18B.gdb |   31 +
 .../flash_128KB.ld}                           |    0
 .../flash_256KB.ld}                           |    0
 .../flash_32KB.ld}                            |    0
 .../flash_64KB.ld}                            |    0
 .../flash_128KB.ld}                           |    0
 .../flash_256KB.ld}                           |    0
 .../flash_32KB.ld}                            |    0
 .../flash_64KB.ld}                            |    0
 .../flash_128KB.ld}                           |    0
 .../flash_256KB.ld}                           |    0
 .../flash_32KB.ld}                            |    0
 .../flash_64KB.ld}                            |    0
 .../MT_D21E/openocd_scripts/SAMC21E15A.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAMC21E16A.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAMC21E17A.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAMC21E18A.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAML21E15B.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAML21E16B.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAML21E17B.cfg    |   30 +
 .../MT_D21E/openocd_scripts/SAML21E18B.cfg    |   30 +
 .../arduino_zero/debug_scripts/SAMC21G15A.gdb |   31 +
 .../arduino_zero/debug_scripts/SAMC21G16A.gdb |   31 +
 .../arduino_zero/debug_scripts/SAMC21G17A.gdb |   31 +
 .../arduino_zero/debug_scripts/SAMC21G18A.gdb |   31 +
 .../arduino_zero/debug_scripts/SAMD21G15A.gdb |   31 +
 .../arduino_zero/debug_scripts/SAMD21G16A.gdb |   31 +
 .../arduino_zero/debug_scripts/SAMD21G17A.gdb |   31 +
 .../{variant.gdb => SAMD21G18A.gdb}           |    0
 .../arduino_zero/debug_scripts/SAML21G16B.gdb |   31 +
 .../arduino_zero/debug_scripts/SAML21G17B.gdb |   31 +
 .../arduino_zero/debug_scripts/SAML21G18B.gdb |   31 +
 .../gcc/16KB_Bootloader/flash_128KB.ld        |  212 +++
 .../gcc/16KB_Bootloader/flash_256KB.ld        |  212 +++
 .../gcc/16KB_Bootloader/flash_32KB.ld}        |    2 +-
 .../gcc/16KB_Bootloader/flash_64KB.ld         |  212 +++
 .../gcc/8KB_Bootloader/flash_128KB.ld}        |    4 +-
 .../flash_256KB.ld}                           |    0
 .../gcc/8KB_Bootloader/flash_32KB.ld}         |    2 +-
 .../gcc/8KB_Bootloader/flash_64KB.ld          |  212 +++
 .../gcc/No_Bootloader/flash_128KB.ld          |  213 +++
 .../flash_256KB.ld}                           |    0
 .../gcc/No_Bootloader/flash_32KB.ld}          |    5 +-
 .../gcc/No_Bootloader/flash_64KB.ld           |  213 +++
 .../openocd_scripts/SAMC21G15A.cfg            |   30 +
 .../openocd_scripts/SAMC21G16A.cfg            |   30 +
 .../openocd_scripts/SAMC21G17A.cfg            |   30 +
 .../openocd_scripts/SAMC21G18A.cfg            |   30 +
 .../openocd_scripts/SAMD21G15A.cfg}           |    2 +-
 .../openocd_scripts/SAMD21G16A.cfg}           |    2 +-
 .../openocd_scripts/SAMD21G17A.cfg            |   30 +
 .../{arduino_zero.cfg => SAMD21G18A.cfg}      |    0
 .../openocd_scripts/SAML21G16B.cfg            |   30 +
 .../openocd_scripts/SAML21G17B.cfg            |   30 +
 .../openocd_scripts/SAML21G18B.cfg            |   30 +
 65 files changed, 3039 insertions(+), 406 deletions(-)
 rename variants/MT_D11/linker_scripts/gcc/{SAMD11C14A_with_4KB_bootloader.ld => 4KB_Bootloader/flash_16KB.ld} (100%)
 rename variants/MT_D11/linker_scripts/gcc/{SAMD11C14A_without_bootloader.ld => No_Bootloader/flash_16KB.ld} (100%)
 rename variants/{MT_D11/debug_scripts/SAMD11C14A.gdb => MT_D21E/debug_scripts/SAMC21E15A.gdb} (92%)
 rename variants/{MT_D11/debug_scripts/SAMD11D14AS.gdb => MT_D21E/debug_scripts/SAMC21E16A.gdb} (91%)
 create mode 100644 variants/MT_D21E/debug_scripts/SAMC21E17A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAMC21E18A.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAML21E15B.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAML21E16B.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAML21E17B.gdb
 create mode 100644 variants/MT_D21E/debug_scripts/SAML21E18B.gdb
 rename variants/MT_D21E/linker_scripts/gcc/{flash_128KB_with_16KB_bootloader.ld => 16KB_Bootloader/flash_128KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_256KB_with_16KB_bootloader.ld => 16KB_Bootloader/flash_256KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_32KB_with_16KB_bootloader.ld => 16KB_Bootloader/flash_32KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_64KB_with_16KB_bootloader.ld => 16KB_Bootloader/flash_64KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_128KB_with_8KB_bootloader.ld => 8KB_Bootloader/flash_128KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_256KB_with_8KB_bootloader.ld => 8KB_Bootloader/flash_256KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_32KB_with_8KB_bootloader.ld => 8KB_Bootloader/flash_32KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_64KB_with_8KB_bootloader.ld => 8KB_Bootloader/flash_64KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_128KB_without_bootloader.ld => No_Bootloader/flash_128KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_256KB_without_bootloader.ld => No_Bootloader/flash_256KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_32KB_without_bootloader.ld => No_Bootloader/flash_32KB.ld} (100%)
 rename variants/MT_D21E/linker_scripts/gcc/{flash_64KB_without_bootloader.ld => No_Bootloader/flash_64KB.ld} (100%)
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMC21E15A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMC21E16A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMC21E17A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAMC21E18A.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAML21E15B.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAML21E16B.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAML21E17B.cfg
 create mode 100644 variants/MT_D21E/openocd_scripts/SAML21E18B.cfg
 create mode 100644 variants/arduino_zero/debug_scripts/SAMC21G15A.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAMC21G16A.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAMC21G17A.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAMC21G18A.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAMD21G15A.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAMD21G16A.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAMD21G17A.gdb
 rename variants/arduino_zero/debug_scripts/{variant.gdb => SAMD21G18A.gdb} (100%)
 create mode 100644 variants/arduino_zero/debug_scripts/SAML21G16B.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAML21G17B.gdb
 create mode 100644 variants/arduino_zero/debug_scripts/SAML21G18B.gdb
 create mode 100644 variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
 create mode 100644 variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
 rename variants/{MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld => arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld} (97%)
 create mode 100644 variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
 rename variants/{MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld => arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld} (96%)
 rename variants/arduino_zero/linker_scripts/gcc/{flash_with_bootloader.ld => 8KB_Bootloader/flash_256KB.ld} (100%)
 rename variants/{MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld => arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld} (97%)
 create mode 100644 variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
 create mode 100644 variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
 rename variants/arduino_zero/linker_scripts/gcc/{flash_without_bootloader.ld => No_Bootloader/flash_256KB.ld} (100%)
 rename variants/{MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld => arduino_zero/linker_scripts/gcc/No_Bootloader/flash_32KB.ld} (97%)
 create mode 100644 variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
 create mode 100644 variants/arduino_zero/openocd_scripts/SAMC21G15A.cfg
 create mode 100644 variants/arduino_zero/openocd_scripts/SAMC21G16A.cfg
 create mode 100644 variants/arduino_zero/openocd_scripts/SAMC21G17A.cfg
 create mode 100644 variants/arduino_zero/openocd_scripts/SAMC21G18A.cfg
 rename variants/{MT_D11/openocd_scripts/SAMD11C14A.cfg => arduino_zero/openocd_scripts/SAMD21G15A.cfg} (97%)
 rename variants/{MT_D11/openocd_scripts/SAMD11D14AS.cfg => arduino_zero/openocd_scripts/SAMD21G16A.cfg} (97%)
 create mode 100644 variants/arduino_zero/openocd_scripts/SAMD21G17A.cfg
 rename variants/arduino_zero/openocd_scripts/{arduino_zero.cfg => SAMD21G18A.cfg} (100%)
 create mode 100644 variants/arduino_zero/openocd_scripts/SAML21G16B.cfg
 create mode 100644 variants/arduino_zero/openocd_scripts/SAML21G17B.cfg
 create mode 100644 variants/arduino_zero/openocd_scripts/SAML21G18B.cfg

diff --git a/boards.txt b/boards.txt
index 9b167e57e..fcfb42349 100644
--- a/boards.txt
+++ b/boards.txt
@@ -14,425 +14,807 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-menu.cpu=Processor
-menu.com=Communications
+menu.cpu=Microcontroller
+menu.clock=Clock Source
+menu.usb=USB Config
+menu.serial=Serial Config
+menu.bootloader=Bootloader Size
 
-# MattairTech MT-D21E (default 8KB bootloader)
-mattairtech_mt_d21e_bl8k.name=MattairTech MT-D21E (SAM-BA bootloader)
-mattairtech_mt_d21e_bl8k.vid.0=0x16D0
-mattairtech_mt_d21e_bl8k.pid.0=0x0557
-mattairtech_mt_d21e_bl8k.vid.1=0x16D0
-mattairtech_mt_d21e_bl8k.pid.1=0x0856
-mattairtech_mt_d21e_bl8k.upload.tool=MattairTech_Arduino:bossac
-# mattairtech_mt_d21e_bl8k.upload.tool=arduino:bossac
-mattairtech_mt_d21e_bl8k.upload.protocol=sam-ba
-mattairtech_mt_d21e_bl8k.upload.use_1200bps_touch=true
-mattairtech_mt_d21e_bl8k.upload.wait_for_upload_port=true
-mattairtech_mt_d21e_bl8k.upload.native_usb=true
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a=SAMD21E18A
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.upload.maximum_size=253952
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a=SAMD21E17A
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.upload.maximum_size=122880
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a=SAMD21E16A
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.upload.maximum_size=57344
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a=SAMD21E15A
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.upload.maximum_size=24576
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
-mattairtech_mt_d21e_bl8k.build.mcu=cortex-m0plus
-mattairtech_mt_d21e_bl8k.build.f_cpu=48000000L
-mattairtech_mt_d21e_bl8k.build.usb_product="MT-D21E"
-mattairtech_mt_d21e_bl8k.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d21e_bl8k.build.board=CDC_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_uart=CDC_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.board=CDC_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_uart.build.pid=0x0557
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart=CDC_HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid_uart.build.pid=0x0856
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid=CDC_HID
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.board=CDC_HID
-mattairtech_mt_d21e_bl8k.menu.com.cdc_hid.build.pid=0x0856
-mattairtech_mt_d21e_bl8k.menu.com.cdc=CDC_ONLY
-mattairtech_mt_d21e_bl8k.menu.com.cdc.build.board=CDC_ONLY
-mattairtech_mt_d21e_bl8k.menu.com.cdc.build.pid=0x0557
-mattairtech_mt_d21e_bl8k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-mattairtech_mt_d21e_bl8k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
-# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
-# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d21e_bl8k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
-# mattairtech_mt_d21e_bl8k.menu.com.msd_uart=MSD_UART
-# mattairtech_mt_d21e_bl8k.menu.com.msd_uart.build.board=MSD_UART
-# mattairtech_mt_d21e_bl8k.menu.com.msd_uart.build.pid=0x0A0C
-mattairtech_mt_d21e_bl8k.menu.com.uart=UART_ONLY
-mattairtech_mt_d21e_bl8k.menu.com.uart.build.board=UART_ONLY
-mattairtech_mt_d21e_bl8k.menu.com.uart.build.pid=0x0856
-mattairtech_mt_d21e_bl8k.menu.com.none=USB_UART_DISABLED
-mattairtech_mt_d21e_bl8k.menu.com.none.build.board=USB_UART_DISABLED
-mattairtech_mt_d21e_bl8k.menu.com.none.build.pid=0x0856
-mattairtech_mt_d21e_bl8k.build.core=arduino
-mattairtech_mt_d21e_bl8k.build.variant=MT_D21E
-mattairtech_mt_d21e_bl8k.build.variant_system_lib=
-mattairtech_mt_d21e_bl8k.build.vid=0x16D0
-mattairtech_mt_d21e_bl8k.bootloader.tool=arduino:openocd
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e18a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E18A.bin
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e17a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E17A.bin
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e16a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E16A.bin
-mattairtech_mt_d21e_bl8k.menu.cpu.samd21e15a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E15A.bin
+# MattairTech MT-D21E
+mattairtech_mt_d21e.name=MattairTech MT-D21E
+mattairtech_mt_d21e.vid.0=0x16D0
+mattairtech_mt_d21e.pid.0=0x0557
+mattairtech_mt_d21e.vid.1=0x16D0
+mattairtech_mt_d21e.pid.1=0x0856
+mattairtech_mt_d21e.vid.2=0x16D0
+mattairtech_mt_d21e.pid.2=0x0B41
+mattairtech_mt_d21e.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.build.f_cpu=48000000L
+mattairtech_mt_d21e.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d21e.build.board=SAMD_ZERO
+mattairtech_mt_d21e.build.core=arduino
+mattairtech_mt_d21e.build.variant=MT_D21E
+mattairtech_mt_d21e.build.variant_system_lib=
+mattairtech_mt_d21e.build.vid=0x16D0
+mattairtech_mt_d21e.upload.protocol=sam-ba
+mattairtech_mt_d21e.bootloader.tool=arduino:openocd
+mattairtech_mt_d21e.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+mattairtech_mt_d21e.menu.clock.internal=INTERNAL
+mattairtech_mt_d21e.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mattairtech_mt_d21e.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mattairtech_mt_d21e.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mattairtech_mt_d21e.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.menu.cpu.samd21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e18a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E18A.bin
+mattairtech_mt_d21e.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.menu.cpu.samd21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e17a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E17A.bin
+mattairtech_mt_d21e.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.menu.cpu.samd21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e16a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E16A.bin
+mattairtech_mt_d21e.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.menu.cpu.samd21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e15a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E15A.bin
+mattairtech_mt_d21e.menu.bootloader.8kb=8KB
+mattairtech_mt_d21e.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+mattairtech_mt_d21e.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.native_usb=true
+mattairtech_mt_d21e.menu.bootloader.16kb=16KB
+mattairtech_mt_d21e.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+mattairtech_mt_d21e.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.native_usb=true
+mattairtech_mt_d21e.menu.bootloader.0kb=NO_BOOTLOADER
+mattairtech_mt_d21e.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mattairtech_mt_d21e.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.tool=arduino:openocd
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.native_usb=false
+mattairtech_mt_d21e.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.usb.cdc=CDC_ONLY
+mattairtech_mt_d21e.menu.usb.cdc.build.usbcom=CDC_ONLY
+mattairtech_mt_d21e.menu.usb.cdc.build.pid=0x0557
+mattairtech_mt_d21e.menu.usb.cdc_hid=CDC_HID
+mattairtech_mt_d21e.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mattairtech_mt_d21e.menu.usb.cdc_hid.build.pid=0x0856
+mattairtech_mt_d21e.menu.usb.withcdc=WITH_CDC
+mattairtech_mt_d21e.menu.usb.withcdc.build.usbcom=WITH_CDC
+mattairtech_mt_d21e.menu.usb.withcdc.build.pid=0x0B41
+mattairtech_mt_d21e.menu.usb.hid=HID_ONLY
+mattairtech_mt_d21e.menu.usb.hid.build.usbcom=HID_ONLY
+mattairtech_mt_d21e.menu.usb.hid.build.pid=0x0B40
+mattairtech_mt_d21e.menu.usb.nocdc=WITHOUT_CDC
+mattairtech_mt_d21e.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mattairtech_mt_d21e.menu.usb.nocdc.build.pid=0x0A0C
+mattairtech_mt_d21e.menu.usb.none=USB_DISABLED
+mattairtech_mt_d21e.menu.usb.none.build.usbcom=USB_DISABLED
+mattairtech_mt_d21e.menu.usb.none.build.pid=0x0856
 
 
-# MattairTech MT-D21E (16KB bootloader), build only
-#mattairtech_mt_d21e_bl16k.name=MattairTech MT-D21E (MSD bootloader)
-#mattairtech_mt_d21e_bl16k.vid.0=0x16D0
-#mattairtech_mt_d21e_bl16k.pid.0=0x0557
-#mattairtech_mt_d21e_bl16k.vid.1=0x16D0
-#mattairtech_mt_d21e_bl16k.pid.1=0x0856
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a=SAMD21E18A
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a.upload.maximum_size=245760
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a=SAMD21E17A
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a.upload.maximum_size=114688
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a=SAMD21E16A
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a.upload.maximum_size=49152
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a=SAMD21E15A
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a.upload.maximum_size=16384
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ -D__16KB_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl16k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
-#mattairtech_mt_d21e_bl16k.build.mcu=cortex-m0plus
-#mattairtech_mt_d21e_bl16k.build.f_cpu=48000000L
-#mattairtech_mt_d21e_bl16k.build.usb_product="MT-D21E"
-#mattairtech_mt_d21e_bl16k.build.usb_manufacturer="MattairTech"
-#mattairtech_mt_d21e_bl16k.build.board=CDC_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_uart=CDC_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.board=CDC_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_uart.build.pid=0x0557
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart=CDC_HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid_uart.build.pid=0x0856
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid=CDC_HID
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.board=CDC_HID
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_hid.build.pid=0x0856
-#mattairtech_mt_d21e_bl16k.menu.com.cdc=CDC_ONLY
-#mattairtech_mt_d21e_bl16k.menu.com.cdc.build.board=CDC_ONLY
-#mattairtech_mt_d21e_bl16k.menu.com.cdc.build.pid=0x0557
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-#mattairtech_mt_d21e_bl16k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
-# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
-# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d21e_bl16k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
-# mattairtech_mt_d21e_bl16k.menu.com.msd_uart=MSD_UART
-# mattairtech_mt_d21e_bl16k.menu.com.msd_uart.build.board=MSD_UART
-# mattairtech_mt_d21e_bl16k.menu.com.msd_uart.build.pid=0x0A0C
-#mattairtech_mt_d21e_bl16k.menu.com.uart=UART_ONLY
-#mattairtech_mt_d21e_bl16k.menu.com.uart.build.board=UART_ONLY
-#mattairtech_mt_d21e_bl16k.menu.com.uart.build.pid=0x0856
-#mattairtech_mt_d21e_bl16k.menu.com.none=USB_UART_DISABLED
-#mattairtech_mt_d21e_bl16k.menu.com.none.build.board=USB_UART_DISABLED
-#mattairtech_mt_d21e_bl16k.menu.com.none.build.pid=0x0856
-#mattairtech_mt_d21e_bl16k.build.core=arduino
-#mattairtech_mt_d21e_bl16k.build.variant=MT_D21E
-#mattairtech_mt_d21e_bl16k.build.variant_system_lib=
-#mattairtech_mt_d21e_bl16k.build.vid=0x16D0
-#mattairtech_mt_d21e_bl16k.build.pid=0x0856
+# MattairTech MT-D21E (rev B)
+mattairtech_mt_d21e.name=MattairTech MT-D21E (rev B)
+mattairtech_mt_d21e.vid.0=0x16D0
+mattairtech_mt_d21e.pid.0=0x0557
+mattairtech_mt_d21e.vid.1=0x16D0
+mattairtech_mt_d21e.pid.1=0x0856
+mattairtech_mt_d21e.vid.2=0x16D0
+mattairtech_mt_d21e.pid.2=0x0B41
+mattairtech_mt_d21e.build.mcu=cortex-m0plus
+mattairtech_mt_d21e.build.f_cpu=48000000L
+mattairtech_mt_d21e.build.usb_product="MT-D21E"
+mattairtech_mt_d21e.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d21e.build.board=SAMD_ZERO
+mattairtech_mt_d21e.build.core=arduino
+mattairtech_mt_d21e.build.variant=MT_D21E_revB
+mattairtech_mt_d21e.build.variant_system_lib=
+mattairtech_mt_d21e.build.vid=0x16D0
+mattairtech_mt_d21e.upload.protocol=sam-ba
+mattairtech_mt_d21e.bootloader.tool=arduino:openocd
+mattairtech_mt_d21e.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+mattairtech_mt_d21e.menu.clock.internal=INTERNAL
+mattairtech_mt_d21e.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mattairtech_mt_d21e.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mattairtech_mt_d21e.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mattairtech_mt_d21e.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e.menu.cpu.samd21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e18a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E18A.bin
+mattairtech_mt_d21e.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e.menu.cpu.samd21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e17a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E17A.bin
+mattairtech_mt_d21e.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e.menu.cpu.samd21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e16a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E16A.bin
+mattairtech_mt_d21e.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e.menu.cpu.samd21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.samd21e15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
+mattairtech_mt_d21e.menu.cpu.samd21e15a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E15A.bin
+mattairtech_mt_d21e.menu.cpu.saml21e18b=SAML21E18B
+mattairtech_mt_d21e.menu.cpu.saml21e18b.upload.maximum_size=253952
+mattairtech_mt_d21e.menu.cpu.saml21e18b.build.extra_flags=-D__SAML21E18B__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.saml21e18b.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e.menu.cpu.saml21e18b.build.openocdscript=openocd_scripts/SAML21E18B.cfg
+mattairtech_mt_d21e.menu.cpu.saml21e18b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21E18B.bin
+mattairtech_mt_d21e.menu.cpu.saml21e17b=SAML21E17B
+mattairtech_mt_d21e.menu.cpu.saml21e17b.upload.maximum_size=122880
+mattairtech_mt_d21e.menu.cpu.saml21e17b.build.extra_flags=-D__SAML21E17B__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.saml21e17b.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e.menu.cpu.saml21e17b.build.openocdscript=openocd_scripts/SAML21E17B.cfg
+mattairtech_mt_d21e.menu.cpu.saml21e17b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21E17B.bin
+mattairtech_mt_d21e.menu.cpu.saml21e16b=SAML21E16B
+mattairtech_mt_d21e.menu.cpu.saml21e16b.upload.maximum_size=57344
+mattairtech_mt_d21e.menu.cpu.saml21e16b.build.extra_flags=-D__SAML21E16B__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.saml21e16b.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e.menu.cpu.saml21e16b.build.openocdscript=openocd_scripts/SAML21E16B.cfg
+mattairtech_mt_d21e.menu.cpu.saml21e16b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21E16B.bin
+mattairtech_mt_d21e.menu.cpu.saml21e15b=SAML21E15B
+mattairtech_mt_d21e.menu.cpu.saml21e15b.upload.maximum_size=24576
+mattairtech_mt_d21e.menu.cpu.saml21e15b.build.extra_flags=-D__SAML21E15B__ {build.usb_flags}
+mattairtech_mt_d21e.menu.cpu.saml21e15b.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e.menu.cpu.saml21e15b.build.openocdscript=openocd_scripts/SAML21E15B.cfg
+mattairtech_mt_d21e.menu.cpu.saml21e15b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21E15B.bin
+mattairtech_mt_d21e.menu.cpu.samc21e18a=SAMC21E18A
+mattairtech_mt_d21e.menu.cpu.samc21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e.menu.cpu.samc21e18a.build.extra_flags=-D__SAMC21E18A__
+mattairtech_mt_d21e.menu.cpu.samc21e18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e.menu.cpu.samc21e18a.build.openocdscript=openocd_scripts/SAMC21E18A.cfg
+mattairtech_mt_d21e.menu.cpu.samc21e18a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21E18A.bin
+mattairtech_mt_d21e.menu.cpu.samc21e17a=SAMC21E17A
+mattairtech_mt_d21e.menu.cpu.samc21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e.menu.cpu.samc21e17a.build.extra_flags=-D__SAMC21E17A__
+mattairtech_mt_d21e.menu.cpu.samc21e17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e.menu.cpu.samc21e17a.build.openocdscript=openocd_scripts/SAMC21E17A.cfg
+mattairtech_mt_d21e.menu.cpu.samc21e17a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21E17A.bin
+mattairtech_mt_d21e.menu.cpu.samc21e16a=SAMC21E16A
+mattairtech_mt_d21e.menu.cpu.samc21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e.menu.cpu.samc21e16a.build.extra_flags=-D__SAMC21E16A__
+mattairtech_mt_d21e.menu.cpu.samc21e16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e.menu.cpu.samc21e16a.build.openocdscript=openocd_scripts/SAMC21E16A.cfg
+mattairtech_mt_d21e.menu.cpu.samc21e16a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21E16A.bin
+mattairtech_mt_d21e.menu.cpu.samc21e15a=SAMC21E15A
+mattairtech_mt_d21e.menu.cpu.samc21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e.menu.cpu.samc21e15a.build.extra_flags=-D__SAMC21E15A__
+mattairtech_mt_d21e.menu.cpu.samc21e15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e.menu.cpu.samc21e15a.build.openocdscript=openocd_scripts/SAMC21E15A.cfg
+mattairtech_mt_d21e.menu.cpu.samc21e15a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21E15A.bin
+mattairtech_mt_d21e.menu.bootloader.8kb=8KB
+mattairtech_mt_d21e.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+mattairtech_mt_d21e.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21e.menu.bootloader.8kb.upload.native_usb=true
+mattairtech_mt_d21e.menu.bootloader.16kb=16KB
+mattairtech_mt_d21e.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+mattairtech_mt_d21e.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21e.menu.bootloader.16kb.upload.native_usb=true
+mattairtech_mt_d21e.menu.bootloader.0kb=NO_BOOTLOADER
+mattairtech_mt_d21e.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mattairtech_mt_d21e.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.tool=arduino:openocd
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mattairtech_mt_d21e.menu.bootloader.0kb.upload.native_usb=false
+mattairtech_mt_d21e.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.usb.cdc=CDC_ONLY
+mattairtech_mt_d21e.menu.usb.cdc.build.usbcom=CDC_ONLY
+mattairtech_mt_d21e.menu.usb.cdc.build.pid=0x0557
+mattairtech_mt_d21e.menu.usb.cdc_hid=CDC_HID
+mattairtech_mt_d21e.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mattairtech_mt_d21e.menu.usb.cdc_hid.build.pid=0x0856
+mattairtech_mt_d21e.menu.usb.withcdc=WITH_CDC
+mattairtech_mt_d21e.menu.usb.withcdc.build.usbcom=WITH_CDC
+mattairtech_mt_d21e.menu.usb.withcdc.build.pid=0x0B41
+mattairtech_mt_d21e.menu.usb.hid=HID_ONLY
+mattairtech_mt_d21e.menu.usb.hid.build.usbcom=HID_ONLY
+mattairtech_mt_d21e.menu.usb.hid.build.pid=0x0B40
+mattairtech_mt_d21e.menu.usb.nocdc=WITHOUT_CDC
+mattairtech_mt_d21e.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mattairtech_mt_d21e.menu.usb.nocdc.build.pid=0x0A0C
+mattairtech_mt_d21e.menu.usb.none=USB_DISABLED
+mattairtech_mt_d21e.menu.usb.none.build.usbcom=USB_DISABLED
+mattairtech_mt_d21e.menu.usb.none.build.pid=0x0856
 
 
-# MattairTech MT-D21E (no bootloader)
-#mattairtech_mt_d21e_bl0k.name=MattairTech MT-D21E (no bootloader)
-#mattairtech_mt_d21e_bl0k.vid.0=0x16D0
-#mattairtech_mt_d21e_bl0k.pid.0=0x0557
-#mattairtech_mt_d21e_bl0k.vid.1=0x16D0
-#mattairtech_mt_d21e_bl0k.pid.1=0x0856
-#mattairtech_mt_d21e_bl0k.upload.tool=arduino:openocd
-#mattairtech_mt_d21e_bl0k.upload.protocol=sam-ba
-#mattairtech_mt_d21e_bl0k.upload.use_1200bps_touch=false
-#mattairtech_mt_d21e_bl0k.upload.wait_for_upload_port=false
-#mattairtech_mt_d21e_bl0k.upload.native_usb=false
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a=SAMD21E18A
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a.upload.maximum_size=262144
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ -D__NO_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e18a.build.ldscript=linker_scripts/gcc/flash_256KB_without_bootloader.ld
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a=SAMD21E17A
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a.upload.maximum_size=131072
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ -D__NO_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e17a.build.ldscript=linker_scripts/gcc/flash_128KB_without_bootloader.ld
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a=SAMD21E16A
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a.upload.maximum_size=65536
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ -D__NO_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e16a.build.ldscript=linker_scripts/gcc/flash_64KB_without_bootloader.ld
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a=SAMD21E15A
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a.upload.maximum_size=32768
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ -D__NO_BOOTLOADER__ {build.usb_flags}
-#mattairtech_mt_d21e_bl0k.menu.cpu.samd21e15a.build.ldscript=linker_scripts/gcc/flash_32KB_without_bootloader.ld
-#mattairtech_mt_d21e_bl0k.build.mcu=cortex-m0plus
-#mattairtech_mt_d21e_bl0k.build.f_cpu=48000000L
-#mattairtech_mt_d21e_bl0k.build.usb_product="MT-D21E"
-#mattairtech_mt_d21e_bl0k.build.usb_manufacturer="MattairTech"
-#mattairtech_mt_d21e_bl0k.build.board=CDC_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_uart=CDC_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.board=CDC_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_uart.build.pid=0x0557
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid=CDC_HID
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.board=CDC_HID
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_hid.build.pid=0x0856
-#mattairtech_mt_d21e_bl0k.menu.com.cdc=CDC_ONLY
-#mattairtech_mt_d21e_bl0k.menu.com.cdc.build.board=CDC_ONLY
-#mattairtech_mt_d21e_bl0k.menu.com.cdc.build.pid=0x0557
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-#mattairtech_mt_d21e_bl0k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
-# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
-# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d21e_bl0k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
-# mattairtech_mt_d21e_bl0k.menu.com.msd_uart=MSD_UART
-# mattairtech_mt_d21e_bl0k.menu.com.msd_uart.build.board=MSD_UART
-# mattairtech_mt_d21e_bl0k.menu.com.msd_uart.build.pid=0x0A0C
-#mattairtech_mt_d21e_bl0k.menu.com.uart=UART_ONLY
-#mattairtech_mt_d21e_bl0k.menu.com.uart.build.board=UART_ONLY
-#mattairtech_mt_d21e_bl0k.menu.com.uart.build.pid=0x0856
-#mattairtech_mt_d21e_bl0k.menu.com.none=USB_UART_DISABLED
-#mattairtech_mt_d21e_bl0k.menu.com.none.build.board=USB_UART_DISABLED
-#mattairtech_mt_d21e_bl0k.menu.com.none.build.pid=0x0856
-#mattairtech_mt_d21e_bl0k.build.core=arduino
-#mattairtech_mt_d21e_bl0k.build.variant=MT_D21E
-#mattairtech_mt_d21e_bl0k.build.variant_system_lib=
-#mattairtech_mt_d21e_bl0k.build.vid=0x16D0
-#mattairtech_mt_d21e_bl0k.build.pid=0x0856
+# MattairTech MT-D21J
+mattairtech_mt_d21j.name=MattairTech MT-D21J
+mattairtech_mt_d21j.vid.0=0x16D0
+mattairtech_mt_d21j.pid.0=0x0557
+mattairtech_mt_d21j.vid.1=0x16D0
+mattairtech_mt_d21j.pid.1=0x0856
+mattairtech_mt_d21j.vid.2=0x16D0
+mattairtech_mt_d21j.pid.2=0x0B41
+mattairtech_mt_d21j.build.mcu=cortex-m0plus
+mattairtech_mt_d21j.build.f_cpu=48000000L
+mattairtech_mt_d21j.build.usb_product="MT-D21J"
+mattairtech_mt_d21j.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d21j.build.board=SAMD_ZERO
+mattairtech_mt_d21j.build.core=arduino
+mattairtech_mt_d21j.build.variant=MT_L21J
+mattairtech_mt_d21j.build.variant_system_lib=
+mattairtech_mt_d21j.build.vid=0x16D0
+mattairtech_mt_d21j.upload.protocol=sam-ba
+mattairtech_mt_d21j.bootloader.tool=arduino:openocd
+mattairtech_mt_d21j.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mattairtech_mt_d21j.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mattairtech_mt_d21j.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+mattairtech_mt_d21j.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+mattairtech_mt_d21j.menu.clock.internal=INTERNAL
+mattairtech_mt_d21j.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mattairtech_mt_d21j.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mattairtech_mt_d21j.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mattairtech_mt_d21j.menu.cpu.samd21j18a=SAMD21J18A
+mattairtech_mt_d21j.menu.cpu.samd21j18a.upload.maximum_size=253952
+mattairtech_mt_d21j.menu.cpu.samd21j18a.build.extra_flags=-D__SAMD21J18A__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.samd21j18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21j.menu.cpu.samd21j18a.build.openocdscript=openocd_scripts/SAMD21J18A.cfg
+mattairtech_mt_d21j.menu.cpu.samd21j18a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21J18A.bin
+mattairtech_mt_d21j.menu.cpu.samd21j17a=SAMD21J17A
+mattairtech_mt_d21j.menu.cpu.samd21j17a.upload.maximum_size=122880
+mattairtech_mt_d21j.menu.cpu.samd21j17a.build.extra_flags=-D__SAMD21J17A__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.samd21j17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21j.menu.cpu.samd21j17a.build.openocdscript=openocd_scripts/SAMD21J17A.cfg
+mattairtech_mt_d21j.menu.cpu.samd21j17a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21J17A.bin
+mattairtech_mt_d21j.menu.cpu.samd21j16a=SAMD21J16A
+mattairtech_mt_d21j.menu.cpu.samd21j16a.upload.maximum_size=57344
+mattairtech_mt_d21j.menu.cpu.samd21j16a.build.extra_flags=-D__SAMD21J16A__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.samd21j16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21j.menu.cpu.samd21j16a.build.openocdscript=openocd_scripts/SAMD21J16A.cfg
+mattairtech_mt_d21j.menu.cpu.samd21j16a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21J16A.bin
+mattairtech_mt_d21j.menu.cpu.samd21j15a=SAMD21J15A
+mattairtech_mt_d21j.menu.cpu.samd21j15a.upload.maximum_size=24576
+mattairtech_mt_d21j.menu.cpu.samd21j15a.build.extra_flags=-D__SAMD21J15A__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.samd21j15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21j.menu.cpu.samd21j15a.build.openocdscript=openocd_scripts/SAMD21J15A.cfg
+mattairtech_mt_d21j.menu.cpu.samd21j15a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21J15A.bin
+mattairtech_mt_d21j.menu.cpu.saml21j18b=SAML21J18B
+mattairtech_mt_d21j.menu.cpu.saml21j18b.upload.maximum_size=253952
+mattairtech_mt_d21j.menu.cpu.saml21j18b.build.extra_flags=-D__SAML21J18B__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.saml21j18b.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21j.menu.cpu.saml21j18b.build.openocdscript=openocd_scripts/SAML21J18B.cfg
+mattairtech_mt_d21j.menu.cpu.saml21j18b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21J18B.bin
+mattairtech_mt_d21j.menu.cpu.saml21j17b=SAML21J17B
+mattairtech_mt_d21j.menu.cpu.saml21j17b.upload.maximum_size=122880
+mattairtech_mt_d21j.menu.cpu.saml21j17b.build.extra_flags=-D__SAML21J17B__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.saml21j17b.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21j.menu.cpu.saml21j17b.build.openocdscript=openocd_scripts/SAML21J17B.cfg
+mattairtech_mt_d21j.menu.cpu.saml21j17b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21J17B.bin
+mattairtech_mt_d21j.menu.cpu.saml21j16b=SAML21J16B
+mattairtech_mt_d21j.menu.cpu.saml21j16b.upload.maximum_size=57344
+mattairtech_mt_d21j.menu.cpu.saml21j16b.build.extra_flags=-D__SAML21J16B__ {build.usb_flags}
+mattairtech_mt_d21j.menu.cpu.saml21j16b.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21j.menu.cpu.saml21j16b.build.openocdscript=openocd_scripts/SAML21J16B.cfg
+mattairtech_mt_d21j.menu.cpu.saml21j16b.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAML21J16B.bin
+mattairtech_mt_d21j.menu.cpu.samc21j18a=SAMC21J18A
+mattairtech_mt_d21j.menu.cpu.samc21j18a.upload.maximum_size=253952
+mattairtech_mt_d21j.menu.cpu.samc21j18a.build.extra_flags=-D__SAMC21J18A__
+mattairtech_mt_d21j.menu.cpu.samc21j18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21j.menu.cpu.samc21j18a.build.openocdscript=openocd_scripts/SAMC21J18A.cfg
+mattairtech_mt_d21j.menu.cpu.samc21j18a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21J18A.bin
+mattairtech_mt_d21j.menu.cpu.samc21j17a=SAMC21J17A
+mattairtech_mt_d21j.menu.cpu.samc21j17a.upload.maximum_size=122880
+mattairtech_mt_d21j.menu.cpu.samc21j17a.build.extra_flags=-D__SAMC21J17A__
+mattairtech_mt_d21j.menu.cpu.samc21j17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21j.menu.cpu.samc21j17a.build.openocdscript=openocd_scripts/SAMC21J17A.cfg
+mattairtech_mt_d21j.menu.cpu.samc21j17a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21J17A.bin
+mattairtech_mt_d21j.menu.cpu.samc21j16a=SAMC21J16A
+mattairtech_mt_d21j.menu.cpu.samc21j16a.upload.maximum_size=57344
+mattairtech_mt_d21j.menu.cpu.samc21j16a.build.extra_flags=-D__SAMC21J16A__
+mattairtech_mt_d21j.menu.cpu.samc21j16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21j.menu.cpu.samc21j16a.build.openocdscript=openocd_scripts/SAMC21J16A.cfg
+mattairtech_mt_d21j.menu.cpu.samc21j16a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21J16A.bin
+mattairtech_mt_d21j.menu.cpu.samc21j15a=SAMC21J15A
+mattairtech_mt_d21j.menu.cpu.samc21j15a.upload.maximum_size=24576
+mattairtech_mt_d21j.menu.cpu.samc21j15a.build.extra_flags=-D__SAMC21J15A__
+mattairtech_mt_d21j.menu.cpu.samc21j15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21j.menu.cpu.samc21j15a.build.openocdscript=openocd_scripts/SAMC21J15A.cfg
+mattairtech_mt_d21j.menu.cpu.samc21j15a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMC21J15A.bin
+mattairtech_mt_d21j.menu.bootloader.8kb=8KB
+mattairtech_mt_d21j.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+mattairtech_mt_d21j.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+mattairtech_mt_d21j.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21j.menu.bootloader.8kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21j.menu.bootloader.8kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21j.menu.bootloader.8kb.upload.native_usb=true
+mattairtech_mt_d21j.menu.bootloader.16kb=16KB
+mattairtech_mt_d21j.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+mattairtech_mt_d21j.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+mattairtech_mt_d21j.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21j.menu.bootloader.16kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21j.menu.bootloader.16kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21j.menu.bootloader.16kb.upload.native_usb=true
+mattairtech_mt_d21j.menu.bootloader.0kb=NO_BOOTLOADER
+mattairtech_mt_d21j.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mattairtech_mt_d21j.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mattairtech_mt_d21j.menu.bootloader.0kb.upload.tool=arduino:openocd
+mattairtech_mt_d21j.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mattairtech_mt_d21j.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mattairtech_mt_d21j.menu.bootloader.0kb.upload.native_usb=false
+mattairtech_mt_d21j.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21j.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21j.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21j.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21j.menu.serial.one_uart_two_spi=ONE_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21j.menu.serial.one_uart_two_spi.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21j.menu.serial.one_uart_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21j.menu.serial.one_uart_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21j.menu.serial.one_uart_two_wire=ONE_UART_TWO_WIRE_ONE_SPI
+mattairtech_mt_d21j.menu.serial.one_uart_two_wire.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21j.menu.serial.one_uart_two_wire.build.serialcom_wire=TWO_WIRE
+mattairtech_mt_d21j.menu.serial.one_uart_two_wire.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21j.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21j.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mattairtech_mt_d21j.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21j.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21j.menu.serial.three_uart=THREE_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21j.menu.serial.three_uart.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21j.menu.serial.three_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21j.menu.serial.three_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21j.menu.serial.three_uart_two_spi=THREE_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21j.menu.serial.three_uart_two_spi.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21j.menu.serial.three_uart_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21j.menu.serial.three_uart_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21j.menu.serial.three_uart_two_wire=THREE_UART_TWO_WIRE_ONE_SPI
+mattairtech_mt_d21j.menu.serial.three_uart_two_wire.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21j.menu.serial.three_uart_two_wire.build.serialcom_wire=TWO_WIRE
+mattairtech_mt_d21j.menu.serial.three_uart_two_wire.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21j.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21j.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mattairtech_mt_d21j.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21j.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21j.menu.usb.cdc=CDC_ONLY
+mattairtech_mt_d21j.menu.usb.cdc.build.usbcom=CDC_ONLY
+mattairtech_mt_d21j.menu.usb.cdc.build.pid=0x0557
+mattairtech_mt_d21j.menu.usb.cdc_hid=CDC_HID
+mattairtech_mt_d21j.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mattairtech_mt_d21j.menu.usb.cdc_hid.build.pid=0x0856
+mattairtech_mt_d21j.menu.usb.withcdc=WITH_CDC
+mattairtech_mt_d21j.menu.usb.withcdc.build.usbcom=WITH_CDC
+mattairtech_mt_d21j.menu.usb.withcdc.build.pid=0x0B41
+mattairtech_mt_d21j.menu.usb.hid=HID_ONLY
+mattairtech_mt_d21j.menu.usb.hid.build.usbcom=HID_ONLY
+mattairtech_mt_d21j.menu.usb.hid.build.pid=0x0B40
+mattairtech_mt_d21j.menu.usb.nocdc=WITHOUT_CDC
+mattairtech_mt_d21j.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mattairtech_mt_d21j.menu.usb.nocdc.build.pid=0x0A0C
+mattairtech_mt_d21j.menu.usb.none=USB_DISABLED
+mattairtech_mt_d21j.menu.usb.none.build.usbcom=USB_DISABLED
+mattairtech_mt_d21j.menu.usb.none.build.pid=0x0856
 
 
-
-# MattairTech MT-D11 (4KB bootloader)
-mattairtech_mt_d11.name=MattairTech MT-D11 (SAM-BA bootloader)
+# MattairTech MT-D11 (D11D14AM, QFN-24)
+mattairtech_mt_d11.name=MattairTech MT-D11
 mattairtech_mt_d11.vid.0=0x16D0
 mattairtech_mt_d11.pid.0=0x0557
 mattairtech_mt_d11.vid.1=0x16D0
 mattairtech_mt_d11.pid.1=0x0856
-mattairtech_mt_d11.upload.tool=MattairTech_Arduino:bossac
-mattairtech_mt_d11.upload.protocol=sam-ba
-mattairtech_mt_d11.upload.use_1200bps_touch=true
-mattairtech_mt_d11.upload.wait_for_upload_port=true
-mattairtech_mt_d11.upload.native_usb=true
-mattairtech_mt_d11.upload.maximum_size=12288
-mattairtech_mt_d11.build.extra_flags=-D__SAMD11D14AM__ -D__4KB_BOOTLOADER__ {build.usb_flags}
-mattairtech_mt_d11.build.ldscript=linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
-mattairtech_mt_d11.build.openocdscript=openocd_scripts/SAMD11D14AM.cfg
+mattairtech_mt_d11.vid.2=0x16D0
+mattairtech_mt_d11.pid.2=0x0B41
 mattairtech_mt_d11.build.mcu=cortex-m0plus
 mattairtech_mt_d11.build.f_cpu=48000000L
 mattairtech_mt_d11.build.usb_product="MT-D11"
 mattairtech_mt_d11.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d11.build.board=CDC_UART
-mattairtech_mt_d11.menu.com.cdc_uart=CDC_UART
-mattairtech_mt_d11.menu.com.cdc_uart.build.board=CDC_UART
-mattairtech_mt_d11.menu.com.cdc_uart.build.pid=0x0557
-mattairtech_mt_d11.menu.com.cdc_hid_uart=CDC_HID_UART
-mattairtech_mt_d11.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-mattairtech_mt_d11.menu.com.cdc_hid_uart.build.pid=0x0856
-mattairtech_mt_d11.menu.com.cdc_hid=CDC_HID
-mattairtech_mt_d11.menu.com.cdc_hid.build.board=CDC_HID
-mattairtech_mt_d11.menu.com.cdc_hid.build.pid=0x0856
-mattairtech_mt_d11.menu.com.cdc=CDC_ONLY
-mattairtech_mt_d11.menu.com.cdc.build.board=CDC_ONLY
-mattairtech_mt_d11.menu.com.cdc.build.pid=0x0557
-mattairtech_mt_d11.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-mattairtech_mt_d11.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-mattairtech_mt_d11.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
-# mattairtech_mt_d11.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# mattairtech_mt_d11.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# mattairtech_mt_d11.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
-# mattairtech_mt_d11.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d11.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d11.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
-# mattairtech_mt_d11.menu.com.msd_uart=MSD_UART
-# mattairtech_mt_d11.menu.com.msd_uart.build.board=MSD_UART
-# mattairtech_mt_d11.menu.com.msd_uart.build.pid=0x0A0C
-mattairtech_mt_d11.menu.com.uart=UART_ONLY
-mattairtech_mt_d11.menu.com.uart.build.board=UART_ONLY
-mattairtech_mt_d11.menu.com.uart.build.pid=0x0856
-mattairtech_mt_d11.menu.com.none=USB_UART_DISABLED
-mattairtech_mt_d11.menu.com.none.build.board=USB_UART_DISABLED
-mattairtech_mt_d11.menu.com.none.build.pid=0x0856
+mattairtech_mt_d11.build.board=SAMD_ZERO
 mattairtech_mt_d11.build.core=arduino
 mattairtech_mt_d11.build.variant=MT_D11
 mattairtech_mt_d11.build.variant_system_lib=
 mattairtech_mt_d11.build.vid=0x16D0
-mattairtech_mt_d11.build.pid=0x0856
+mattairtech_mt_d11.upload.protocol=sam-ba
 mattairtech_mt_d11.bootloader.tool=arduino:openocd
+mattairtech_mt_d11.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mattairtech_mt_d11.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mattairtech_mt_d11.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+mattairtech_mt_d11.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+mattairtech_mt_d11.menu.clock.internal=INTERNAL
+mattairtech_mt_d11.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mattairtech_mt_d11.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mattairtech_mt_d11.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mattairtech_mt_d11.build.extra_flags=-D__SAMD11D14AM__ {build.usb_flags}
+mattairtech_mt_d11.build.ldscript=linker_scripts/gcc/flash_16KB.ld
+mattairtech_mt_d11.build.openocdscript=openocd_scripts/SAMD11D14AM.cfg
 mattairtech_mt_d11.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD11D14AM.bin
+mattairtech_mt_d11.menu.bootloader.4kb=4KB
+mattairtech_mt_d11.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
+mattairtech_mt_d11.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
+mattairtech_mt_d11.menu.bootloader.4kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d11.menu.bootloader.4kb.upload.use_1200bps_touch=true
+mattairtech_mt_d11.menu.bootloader.4kb.upload.wait_for_upload_port=true
+mattairtech_mt_d11.menu.bootloader.4kb.upload.native_usb=true
+mattairtech_mt_d11.menu.bootloader.4kb.upload.maximum_size=12288
+mattairtech_mt_d11.menu.bootloader.0kb=NO_BOOTLOADER
+mattairtech_mt_d11.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mattairtech_mt_d11.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mattairtech_mt_d11.menu.bootloader.0kb.upload.tool=arduino:openocd
+mattairtech_mt_d11.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mattairtech_mt_d11.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mattairtech_mt_d11.menu.bootloader.0kb.upload.native_usb=false
+mattairtech_mt_d11.menu.bootloader.0kb.upload.maximum_size=16384
+mattairtech_mt_d11.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d11.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mattairtech_mt_d11.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d11.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d11.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d11.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mattairtech_mt_d11.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d11.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d11.menu.serial.two_uart=TWO_UART_ONE_WIRE_NO_SPI
+mattairtech_mt_d11.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mattairtech_mt_d11.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d11.menu.serial.two_uart.build.serialcom_spi=NO_SPI
+mattairtech_mt_d11.menu.usb.cdc=CDC_ONLY
+mattairtech_mt_d11.menu.usb.cdc.build.usbcom=CDC_ONLY
+mattairtech_mt_d11.menu.usb.cdc.build.pid=0x0557
+mattairtech_mt_d11.menu.usb.cdc_hid=CDC_HID
+mattairtech_mt_d11.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mattairtech_mt_d11.menu.usb.cdc_hid.build.pid=0x0856
+mattairtech_mt_d11.menu.usb.withcdc=WITH_CDC
+mattairtech_mt_d11.menu.usb.withcdc.build.usbcom=WITH_CDC
+mattairtech_mt_d11.menu.usb.withcdc.build.pid=0x0B41
+mattairtech_mt_d11.menu.usb.hid=HID_ONLY
+mattairtech_mt_d11.menu.usb.hid.build.usbcom=HID_ONLY
+mattairtech_mt_d11.menu.usb.hid.build.pid=0x0B40
+mattairtech_mt_d11.menu.usb.nocdc=WITHOUT_CDC
+mattairtech_mt_d11.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mattairtech_mt_d11.menu.usb.nocdc.build.pid=0x0A0C
+mattairtech_mt_d11.menu.usb.none=USB_DISABLED
+mattairtech_mt_d11.menu.usb.none.build.usbcom=USB_DISABLED
+mattairtech_mt_d11.menu.usb.none.build.pid=0x0856
+
 
+# Generic D11C14A (SOIC-14)
+d11c14a.name=Generic D11C14A
+d11c14a.vid.0=0x16D0
+d11c14a.pid.0=0x0557
+d11c14a.vid.1=0x16D0
+d11c14a.pid.1=0x0856
+d11c14a.vid.2=0x16D0
+d11c14a.pid.2=0x0B41
+d11c14a.build.mcu=cortex-m0plus
+d11c14a.build.f_cpu=48000000L
+d11c14a.build.usb_product="D11C14A"
+d11c14a.build.usb_manufacturer="MattairTech"
+d11c14a.build.board=SAMD_ZERO
+d11c14a.build.core=arduino
+d11c14a.build.variant=D11C14A
+d11c14a.build.variant_system_lib=
+d11c14a.build.vid=0x16D0
+d11c14a.upload.protocol=sam-ba
+d11c14a.bootloader.tool=arduino:openocd
+d11c14a.menu.clock.crystal_32k=32KHZ_CRYSTAL
+d11c14a.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+d11c14a.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+d11c14a.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+d11c14a.menu.clock.internal=INTERNAL
+d11c14a.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+d11c14a.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+d11c14a.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+d11c14a.build.extra_flags=-D__SAMD11C14A__ {build.usb_flags}
+d11c14a.build.ldscript=linker_scripts/gcc/flash_16KB.ld
+d11c14a.build.openocdscript=openocd_scripts/SAMD11C14A.cfg
+d11c14a.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD11C14A.bin
+d11c14a.menu.bootloader.4kb=4KB
+d11c14a.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
+d11c14a.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
+d11c14a.menu.bootloader.4kb.upload.tool=MattairTech_Arduino:bossac
+d11c14a.menu.bootloader.4kb.upload.use_1200bps_touch=true
+d11c14a.menu.bootloader.4kb.upload.wait_for_upload_port=true
+d11c14a.menu.bootloader.4kb.upload.native_usb=true
+d11c14a.menu.bootloader.4kb.upload.maximum_size=12288
+d11c14a.menu.bootloader.0kb=NO_BOOTLOADER
+d11c14a.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+d11c14a.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+d11c14a.menu.bootloader.0kb.upload.tool=arduino:openocd
+d11c14a.menu.bootloader.0kb.upload.use_1200bps_touch=false
+d11c14a.menu.bootloader.0kb.upload.wait_for_upload_port=false
+d11c14a.menu.bootloader.0kb.upload.native_usb=false
+d11c14a.menu.bootloader.0kb.upload.maximum_size=16384
+d11c14a.menu.serial.one_uart=ONE_UART_ONE_WIRE_NO_SPI
+d11c14a.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+d11c14a.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+d11c14a.menu.serial.one_uart.build.serialcom_spi=NO_SPI
+d11c14a.menu.serial.one_uart_no_wire_one_spi=ONE_UART_NO_WIRE_ONE_SPI
+d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_uart=ONE_UART
+d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
+d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_spi=ONE_SPI
+d11c14a.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+d11c14a.menu.serial.no_uart.build.serialcom_uart=NO_UART
+d11c14a.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+d11c14a.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+d11c14a.menu.serial.two_uart=TWO_UART_NO_WIRE_NO_SPI
+d11c14a.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+d11c14a.menu.serial.two_uart.build.serialcom_wire=NO_WIRE
+d11c14a.menu.serial.two_uart.build.serialcom_spi=NO_SPI
+d11c14a.menu.usb.cdc=CDC_ONLY
+d11c14a.menu.usb.cdc.build.usbcom=CDC_ONLY
+d11c14a.menu.usb.cdc.build.pid=0x0557
+d11c14a.menu.usb.cdc_hid=CDC_HID
+d11c14a.menu.usb.cdc_hid.build.usbcom=CDC_HID
+d11c14a.menu.usb.cdc_hid.build.pid=0x0856
+d11c14a.menu.usb.withcdc=WITH_CDC
+d11c14a.menu.usb.withcdc.build.usbcom=WITH_CDC
+d11c14a.menu.usb.withcdc.build.pid=0x0B41
+d11c14a.menu.usb.hid=HID_ONLY
+d11c14a.menu.usb.hid.build.usbcom=HID_ONLY
+d11c14a.menu.usb.hid.build.pid=0x0B40
+d11c14a.menu.usb.nocdc=WITHOUT_CDC
+d11c14a.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+d11c14a.menu.usb.nocdc.build.pid=0x0A0C
+d11c14a.menu.usb.none=USB_DISABLED
+d11c14a.menu.usb.none.build.usbcom=USB_DISABLED
+d11c14a.menu.usb.none.build.pid=0x0856
 
-# MattairTech MT-D11 (no bootloader)
-mattairtech_mt_d11_bl0k.name=MattairTech MT-D11 (no bootloader)
-mattairtech_mt_d11_bl0k.vid.0=0x16D0
-mattairtech_mt_d11_bl0k.pid.0=0x0557
-mattairtech_mt_d11_bl0k.vid.1=0x16D0
-mattairtech_mt_d11_bl0k.pid.1=0x0856
-mattairtech_mt_d11_bl0k.upload.tool=arduino:openocd
-mattairtech_mt_d11_bl0k.upload.protocol=sam-ba
-mattairtech_mt_d11_bl0k.upload.use_1200bps_touch=false
-mattairtech_mt_d11_bl0k.upload.wait_for_upload_port=false
-mattairtech_mt_d11_bl0k.upload.native_usb=false
-mattairtech_mt_d11_bl0k.upload.maximum_size=16384
-mattairtech_mt_d11_bl0k.build.extra_flags=-D__SAMD11D14AM__ -D__NO_BOOTLOADER__ {build.usb_flags}
-mattairtech_mt_d11_bl0k.build.ldscript=linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
-mattairtech_mt_d11_bl0k.build.openocdscript=openocd_scripts/SAMD11D14AM.cfg
-mattairtech_mt_d11_bl0k.build.mcu=cortex-m0plus
-mattairtech_mt_d11_bl0k.build.f_cpu=48000000L
-mattairtech_mt_d11_bl0k.build.usb_product="MT-D11"
-mattairtech_mt_d11_bl0k.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d11_bl0k.build.board=CDC_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_uart=CDC_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_uart.build.board=CDC_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_uart.build.pid=0x0557
-mattairtech_mt_d11_bl0k.menu.com.cdc_hid_uart=CDC_HID_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_hid_uart.build.pid=0x0856
-mattairtech_mt_d11_bl0k.menu.com.cdc_hid=CDC_HID
-mattairtech_mt_d11_bl0k.menu.com.cdc_hid.build.board=CDC_HID
-mattairtech_mt_d11_bl0k.menu.com.cdc_hid.build.pid=0x0856
-mattairtech_mt_d11_bl0k.menu.com.cdc=CDC_ONLY
-mattairtech_mt_d11_bl0k.menu.com.cdc.build.board=CDC_ONLY
-mattairtech_mt_d11_bl0k.menu.com.cdc.build.pid=0x0557
-mattairtech_mt_d11_bl0k.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-mattairtech_mt_d11_bl0k.menu.com.cdc_midi_hid_uart.build.pid=0x0B34
-# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_hid_uart.build.pid=0x0B40
-# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# mattairtech_mt_d11_bl0k.menu.com.cdc_msd_midi_hid_uart.build.pid=0x0B41
-# mattairtech_mt_d11_bl0k.menu.com.msd_uart=MSD_UART
-# mattairtech_mt_d11_bl0k.menu.com.msd_uart.build.board=MSD_UART
-# mattairtech_mt_d11_bl0k.menu.com.msd_uart.build.pid=0x0A0C
-mattairtech_mt_d11_bl0k.menu.com.uart=UART_ONLY
-mattairtech_mt_d11_bl0k.menu.com.uart.build.board=UART_ONLY
-mattairtech_mt_d11_bl0k.menu.com.uart.build.pid=0x0856
-mattairtech_mt_d11_bl0k.menu.com.none=USB_UART_DISABLED
-mattairtech_mt_d11_bl0k.menu.com.none.build.board=USB_UART_DISABLED
-mattairtech_mt_d11_bl0k.menu.com.none.build.pid=0x0856
-mattairtech_mt_d11_bl0k.build.core=arduino
-mattairtech_mt_d11_bl0k.build.variant=MT_D11
-mattairtech_mt_d11_bl0k.build.variant_system_lib=
-mattairtech_mt_d11_bl0k.build.vid=0x16D0
-mattairtech_mt_d11_bl0k.build.pid=0x0856
 
+# MattairTech Core for Arduino/Genuino Zero (Autodetect Port)
+arduino_zero.name=Arduino/Genuino Zero (Autodetect Port)
+arduino_zero.vid.0=0x2341
+arduino_zero.pid.0=0x804d
+arduino_zero.vid.1=0x2341
+arduino_zero.pid.1=0x004d
+# If the board is a 2341:824d use 2341:824d for build and set other parameters as well
+arduino_zero.vid.2=0x2341
+arduino_zero.pid.2=0x824d
+arduino_zero.vid.2.build.vid=0x2341
+arduino_zero.vid.2.build.pid=0x824d
+arduino_zero.vid.2.build.usb_product="Genuino Zero"
+# If the board is a 2341:024d use 2341:824d for build and set other parameters as well
+arduino_zero.vid.3=0x2341
+arduino_zero.pid.3=0x024d
+arduino_zero.vid.3.build.vid=0x2341
+arduino_zero.vid.3.build.pid=0x824d
+arduino_zero.vid.3.build.usb_product="Genuino Zero"
+# Programming port
+arduino_zero.vid.4=0x03eb
+arduino_zero.pid.4=0x2157
+arduino_zero.vid.4.upload.tool=arduino:openocd
+arduino_zero.vid.4.upload.use_1200bps_touch=false
+arduino_zero.vid.4.upload.wait_for_upload_port=false
+arduino_zero.vid.4.upload.native_usb=false
+arduino_zero.upload.tool=MattairTech_Arduino:bossac
+arduino_zero.upload.use_1200bps_touch=true
+arduino_zero.upload.wait_for_upload_port=true
+arduino_zero.upload.native_usb=true
+arduino_zero.build.mcu=cortex-m0plus
+arduino_zero.build.f_cpu=48000000L
+arduino_zero.build.usb_product="Arduino Zero"
+arduino_zero.build.usb_manufacturer="Arduino LLC"
+arduino_zero.build.board=SAMD_ZERO
+arduino_zero.build.core=arduino
+arduino_zero.build.variant=arduino_zero
+arduino_zero.build.variant_system_lib=
+arduino_zero.build.vid=0x2341
+arduino_zero.build.pid=0x804d
+arduino_zero.upload.protocol=sam-ba
+arduino_zero.menu.clock.crystal_32k=32KHZ_CRYSTAL
+arduino_zero.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+arduino_zero.menu.clock.internal=INTERNAL
+arduino_zero.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+arduino_zero.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+arduino_zero.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+arduino_zero.bootloader.tool=arduino:openocd
+arduino_zero.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
+arduino_zero.build.ldscript=flash_256KB.ld
+arduino_zero.build.openocdscript=openocd_scripts/SAMD21G18A.cfg
+arduino_zero.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21G18A.bin
+arduino_zero.menu.bootloader.8kb=8KB
+arduino_zero.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+arduino_zero.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+arduino_zero.menu.bootloader.8kb.upload.maximum_size=253952
+arduino_zero.menu.bootloader.16kb=16KB
+arduino_zero.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+arduino_zero.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+arduino_zero.menu.bootloader.16kb.upload.maximum_size=245760
+arduino_zero.menu.bootloader.0kb=NO_BOOTLOADER
+arduino_zero.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+arduino_zero.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+arduino_zero.menu.bootloader.0kb.upload.tool=arduino:openocd
+arduino_zero.menu.bootloader.0kb.upload.use_1200bps_touch=false
+arduino_zero.menu.bootloader.0kb.upload.wait_for_upload_port=false
+arduino_zero.menu.bootloader.0kb.upload.native_usb=false
+arduino_zero.menu.bootloader.0kb.upload.maximum_size=262144
+arduino_zero.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+arduino_zero.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+arduino_zero.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+arduino_zero.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+arduino_zero.menu.serial.one_uart_two_wire_two_spi=ONE_UART_TWO_WIRE_TWO_SPI
+arduino_zero.menu.serial.one_uart_two_wire_two_spi.build.serialcom_uart=ONE_UART
+arduino_zero.menu.serial.one_uart_two_wire_two_spi.build.serialcom_wire=TWO_WIRE
+arduino_zero.menu.serial.one_uart_two_wire_two_spi.build.serialcom_spi=TWO_SPI
+arduino_zero.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+arduino_zero.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+arduino_zero.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+arduino_zero.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+arduino_zero.menu.serial.two_uart_two_wire_two_spi=TWO_UART_TWO_WIRE_TWO_SPI
+arduino_zero.menu.serial.two_uart_two_wire_two_spi.build.serialcom_uart=TWO_UART
+arduino_zero.menu.serial.two_uart_two_wire_two_spi.build.serialcom_wire=TWO_WIRE
+arduino_zero.menu.serial.two_uart_two_wire_two_spi.build.serialcom_spi=TWO_SPI
+arduino_zero.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+arduino_zero.menu.serial.no_uart.build.serialcom_uart=NO_UART
+arduino_zero.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+arduino_zero.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+arduino_zero.menu.serial.no_uart_two_wire_two_spi=NO_UART_TWO_WIRE_TWO_SPI
+arduino_zero.menu.serial.no_uart_two_wire_two_spi.build.serialcom_uart=NO_UART
+arduino_zero.menu.serial.no_uart_two_wire_two_spi.build.serialcom_wire=TWO_WIRE
+arduino_zero.menu.serial.no_uart_two_wire_two_spi.build.serialcom_spi=TWO_SPI
+arduino_zero.menu.usb.cdc=CDC_ONLY
+arduino_zero.menu.usb.cdc.build.usbcom=CDC_ONLY
+arduino_zero.menu.usb.cdc_hid=CDC_HID
+arduino_zero.menu.usb.cdc_hid.build.usbcom=CDC_HID
+arduino_zero.menu.usb.withcdc=WITH_CDC
+arduino_zero.menu.usb.withcdc.build.usbcom=WITH_CDC
+arduino_zero.menu.usb.hid=HID_ONLY
+arduino_zero.menu.usb.hid.build.usbcom=HID_ONLY
+arduino_zero.menu.usb.nocdc=WITHOUT_CDC
+arduino_zero.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+arduino_zero.menu.usb.none=USB_DISABLED
+arduino_zero.menu.usb.none.build.usbcom=USB_DISABLED
 
-# MattairTech Core for Arduino Zero (8KB bootloader, Native USB Port)
-arduino_zero_native.name=Arduino Zero (Native USB Port)
-arduino_zero_native.vid.0=0x2341
-arduino_zero_native.pid.0=0x804d
-arduino_zero_native.vid.1=0x2341
-arduino_zero_native.pid.1=0x004d
-arduino_zero_native.upload.tool=MattairTech_Arduino:bossac
-arduino_zero_native.upload.protocol=sam-ba
-arduino_zero_native.upload.maximum_size=262144
-arduino_zero_native.upload.use_1200bps_touch=true
-arduino_zero_native.upload.wait_for_upload_port=true
-arduino_zero_native.upload.native_usb=true
-arduino_zero_native.build.mcu=cortex-m0plus
-arduino_zero_native.build.f_cpu=48000000L
-arduino_zero_native.build.usb_product="Arduino Zero"
-arduino_zero_native.build.usb_manufacturer="Arduino LLC"
-arduino_zero_native.build.board=SAMD_ZERO
-arduino_zero_native.menu.com.cdc_uart=CDC_UART
-arduino_zero_native.menu.com.cdc_uart.build.board=CDC_UART
-arduino_zero_native.menu.com.cdc_hid_uart=CDC_HID_UART
-arduino_zero_native.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-arduino_zero_native.menu.com.cdc_hid=CDC_HID
-arduino_zero_native.menu.com.cdc_hid.build.board=CDC_HID
-arduino_zero_native.menu.com.cdc=CDC_ONLY
-arduino_zero_native.menu.com.cdc.build.board=CDC_ONLY
-arduino_zero_native.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-arduino_zero_native.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-# arduino_zero_native.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# arduino_zero_native.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# arduino_zero_native.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# arduino_zero_native.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# arduino_zero_native.menu.com.msd_uart=MSD_UART
-# arduino_zero_native.menu.com.msd_uart.build.board=MSD_UART
-arduino_zero_native.menu.com.uart=UART_ONLY
-arduino_zero_native.menu.com.uart.build.board=UART_ONLY
-arduino_zero_native.menu.com.none=USB_UART_DISABLED
-arduino_zero_native.menu.com.none.build.board=USB_UART_DISABLED
-arduino_zero_native.build.core=arduino
-arduino_zero_native.build.extra_flags=-D__SAMD21G18A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
-arduino_zero_native.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-arduino_zero_native.build.openocdscript=openocd_scripts/arduino_zero.cfg
-arduino_zero_native.build.variant=arduino_zero
-arduino_zero_native.build.variant_system_lib=
-arduino_zero_native.build.vid=0x2341
-arduino_zero_native.build.pid=0x804d
 
-# MattairTech Core for Arduino Zero (8KB bootloader, Programming Port)
-#arduino_zero_edbg.name=Arduino Zero (Programming Port)
-#arduino_zero_edbg.vid.0=0x03eb
-#arduino_zero_edbg.pid.0=0x2157
-#arduino_zero_edbg.upload.tool=arduino:openocd
-#arduino_zero_edbg.upload.protocol=sam-ba
-#arduino_zero_edbg.upload.maximum_size=262144
-#arduino_zero_edbg.upload.use_1200bps_touch=false
-#arduino_zero_edbg.upload.wait_for_upload_port=false
-#arduino_zero_edbg.upload.native_usb=false
-#arduino_zero_edbg.build.mcu=cortex-m0plus
-#arduino_zero_edbg.build.f_cpu=48000000L
-#arduino_zero_edbg.build.usb_product="Arduino Zero"
-#arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
-#arduino_zero_edbg.build.board=SAMD_ZERO
-#arduino_zero_edbg.menu.com.cdc_uart=CDC_UART
-#arduino_zero_edbg.menu.com.cdc_uart.build.board=CDC_UART
-#arduino_zero_edbg.menu.com.cdc_hid_uart=CDC_HID_UART
-#arduino_zero_edbg.menu.com.cdc_hid_uart.build.board=CDC_HID_UART
-#arduino_zero_edbg.menu.com.cdc_hid=CDC_HID
-#arduino_zero_edbg.menu.com.cdc_hid.build.board=CDC_HID
-#arduino_zero_edbg.menu.com.cdc=CDC_ONLY
-#arduino_zero_edbg.menu.com.cdc.build.board=CDC_ONLY
-#arduino_zero_edbg.menu.com.cdc_midi_hid_uart=CDC_MIDI_HID_UART
-#arduino_zero_edbg.menu.com.cdc_midi_hid_uart.build.board=CDC_MIDI_HID_UART
-# arduino_zero_edbg.menu.com.cdc_msd_hid_uart=CDC_MSD_HID_UART
-# arduino_zero_edbg.menu.com.cdc_msd_hid_uart.build.board=CDC_MSD_HID_UART
-# arduino_zero_edbg.menu.com.cdc_msd_midi_hid_uart=CDC_MSD_MIDI_HID_UART
-# arduino_zero_edbg.menu.com.cdc_msd_midi_hid_uart.build.board=CDC_MSD_MIDI_HID_UART
-# arduino_zero_edbg.menu.com.msd_uart=MSD_UART
-# arduino_zero_edbg.menu.com.msd_uart.build.board=MSD_UART
-#arduino_zero_edbg.menu.com.uart=UART_ONLY
-#arduino_zero_edbg.menu.com.uart.build.board=UART_ONLY
-#arduino_zero_edbg.menu.com.none=USB_UART_DISABLED
-#arduino_zero_edbg.menu.com.none.build.board=USB_UART_DISABLED
-#arduino_zero_edbg.build.core=arduino
-#arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ -D__8KB_BOOTLOADER__ {build.usb_flags}
-#arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-#arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
-#arduino_zero_edbg.build.variant=arduino_zero
-#arduino_zero_edbg.build.variant_system_lib=
-#arduino_zero_edbg.build.vid=0x2341
-#arduino_zero_edbg.build.pid=0x804d
-#arduino_zero_edbg.bootloader.tool=arduino:openocd
-#arduino_zero_edbg.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21E18A.bin
+# MattairTech Core for Arduino M0 / M0 Pro (Autodetect Port)
+mzero.name=Arduino M0 / M0 Pro (Autodetect Port)
+# M0 Pro (Programming port)
+mzero.vid.0=0x03eb
+mzero.pid.0=0x2111
+mzero.vid.0.upload.tool=arduino:openocd
+mzero.vid.0.upload.use_1200bps_touch=false
+mzero.vid.0.upload.wait_for_upload_port=false
+mzero.vid.0.upload.native_usb=false
+# M0 Pro (Native Port)
+mzero.vid.1=0x2a03
+mzero.pid.1=0x004d
+mzero.vid.2=0x2a03
+mzero.pid.2=0x804d
+mzero.vid.3=0x2a03
+mzero.pid.3=0x004f
+mzero.vid.4=0x2a03
+mzero.pid.4=0x804f
+mzero.build.vid=0x2a03
+mzero.build.pid=0x804f
+# M0
+mzero.vid.5=0x2a03
+mzero.pid.5=0x004e
+mzero.vid.5.build.vid=0x2a03
+mzero.vid.5.build.pid=0x804e
+mzero.vid.6=0x2a03
+mzero.pid.6=0x804e
+mzero.vid.6.build.vid=0x2a03
+mzero.vid.6.build.pid=0x804e
+mzero.upload.tool=MattairTech_Arduino:bossac
+mzero.upload.protocol=sam-ba
+mzero.upload.use_1200bps_touch=true
+mzero.upload.wait_for_upload_port=true
+mzero.upload.native_usb=true
+mzero.build.mcu=cortex-m0plus
+mzero.build.f_cpu=48000000L
+mzero.build.usb_product="Arduino M0 / M0 Pro"
+mzero.build.board=SAM_ZERO
+mzero.build.core=arduino
+mzero.build.variant=arduino_m0_m0_pro
+mzero.build.variant_system_lib=
+mzero.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mzero.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mzero.menu.clock.internal=INTERNAL
+mzero.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mzero.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mzero.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mzero.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
+mzero.build.ldscript=flash_256KB.ld
+mzero.build.openocdscript=openocd_scripts/SAMD21G18A.cfg
+mzero.bootloader.file=zero/binaries/sam_m0p_sam_ba_SAMD21G18A.bin
+mzero.bootloader.tool=arduino:openocd
+mzero.menu.bootloader.16kb=16KB
+mzero.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+mzero.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+mzero.menu.bootloader.16kb.upload.maximum_size=245760
+mzero.menu.bootloader.16kb.upload.tool=arduino:avrdude
+mzero.menu.bootloader.16kb.upload.protocol=stk500v2
+mzero.menu.bootloader.16kb.upload.speed=57600
+mzero.menu.bootloader.16kb.build.emu.mcu=atmega2560
+mzero.menu.bootloader.8kb=8KB
+mzero.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+mzero.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+mzero.menu.bootloader.8kb.upload.maximum_size=253952
+mzero.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
+mzero.menu.bootloader.0kb=NO_BOOTLOADER
+mzero.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mzero.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mzero.menu.bootloader.0kb.upload.tool=arduino:openocd
+mzero.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mzero.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mzero.menu.bootloader.0kb.upload.native_usb=false
+mzero.menu.bootloader.0kb.upload.maximum_size=262144
+mzero.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mzero.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mzero.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mzero.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mzero.menu.serial.one_uart_two_wire_two_spi=ONE_UART_TWO_WIRE_TWO_SPI
+mzero.menu.serial.one_uart_two_wire_two_spi.build.serialcom_uart=ONE_UART
+mzero.menu.serial.one_uart_two_wire_two_spi.build.serialcom_wire=TWO_WIRE
+mzero.menu.serial.one_uart_two_wire_two_spi.build.serialcom_spi=TWO_SPI
+mzero.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+mzero.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mzero.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mzero.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+mzero.menu.serial.two_uart_two_wire_two_spi=TWO_UART_TWO_WIRE_TWO_SPI
+mzero.menu.serial.two_uart_two_wire_two_spi.build.serialcom_uart=TWO_UART
+mzero.menu.serial.two_uart_two_wire_two_spi.build.serialcom_wire=TWO_WIRE
+mzero.menu.serial.two_uart_two_wire_two_spi.build.serialcom_spi=TWO_SPI
+mzero.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mzero.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mzero.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mzero.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mzero.menu.serial.no_uart_two_wire_two_spi=NO_UART_TWO_WIRE_TWO_SPI
+mzero.menu.serial.no_uart_two_wire_two_spi.build.serialcom_uart=NO_UART
+mzero.menu.serial.no_uart_two_wire_two_spi.build.serialcom_wire=TWO_WIRE
+mzero.menu.serial.no_uart_two_wire_two_spi.build.serialcom_spi=TWO_SPI
+mzero.menu.usb.cdc=CDC_ONLY
+mzero.menu.usb.cdc.build.usbcom=CDC_ONLY
+mzero.menu.usb.cdc_hid=CDC_HID
+mzero.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mzero.menu.usb.withcdc=WITH_CDC
+mzero.menu.usb.withcdc.build.usbcom=WITH_CDC
+mzero.menu.usb.hid=HID_ONLY
+mzero.menu.usb.hid.build.usbcom=HID_ONLY
+mzero.menu.usb.nocdc=WITHOUT_CDC
+mzero.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mzero.menu.usb.none=USB_DISABLED
+mzero.menu.usb.none.build.usbcom=USB_DISABLED
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_with_4KB_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
similarity index 100%
rename from variants/MT_D11/linker_scripts/gcc/SAMD11C14A_with_4KB_bootloader.ld
rename to variants/MT_D11/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11C14A_without_bootloader.ld b/variants/MT_D11/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
similarity index 100%
rename from variants/MT_D11/linker_scripts/gcc/SAMD11C14A_without_bootloader.ld
rename to variants/MT_D11/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
diff --git a/variants/MT_D11/debug_scripts/SAMD11C14A.gdb b/variants/MT_D21E/debug_scripts/SAMC21E15A.gdb
similarity index 92%
rename from variants/MT_D11/debug_scripts/SAMD11C14A.gdb
rename to variants/MT_D21E/debug_scripts/SAMC21E15A.gdb
index ff7008e6e..070351956 100644
--- a/variants/MT_D11/debug_scripts/SAMD11C14A.gdb
+++ b/variants/MT_D21E/debug_scripts/SAMC21E15A.gdb
@@ -28,4 +28,4 @@ break main
 # End of 'reset' command
 end
 
-target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11c14a" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e15" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D11/debug_scripts/SAMD11D14AS.gdb b/variants/MT_D21E/debug_scripts/SAMC21E16A.gdb
similarity index 91%
rename from variants/MT_D11/debug_scripts/SAMD11D14AS.gdb
rename to variants/MT_D21E/debug_scripts/SAMC21E16A.gdb
index 1daf3ccc2..acabddd1d 100644
--- a/variants/MT_D11/debug_scripts/SAMD11D14AS.gdb
+++ b/variants/MT_D21E/debug_scripts/SAMC21E16A.gdb
@@ -28,4 +28,4 @@ break main
 # End of 'reset' command
 end
 
-target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11d14as" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e16" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMC21E17A.gdb b/variants/MT_D21E/debug_scripts/SAMC21E17A.gdb
new file mode 100644
index 000000000..4ae2dd669
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMC21E17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e17" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAMC21E18A.gdb b/variants/MT_D21E/debug_scripts/SAMC21E18A.gdb
new file mode 100644
index 000000000..2ca3b2cdc
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAMC21E18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e18" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAML21E15B.gdb b/variants/MT_D21E/debug_scripts/SAML21E15B.gdb
new file mode 100644
index 000000000..f4cdf835f
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAML21E15B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e15" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAML21E16B.gdb b/variants/MT_D21E/debug_scripts/SAML21E16B.gdb
new file mode 100644
index 000000000..50e424551
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAML21E16B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e16" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAML21E17B.gdb b/variants/MT_D21E/debug_scripts/SAML21E17B.gdb
new file mode 100644
index 000000000..29323011f
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAML21E17B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e17" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/debug_scripts/SAML21E18B.gdb b/variants/MT_D21E/debug_scripts/SAML21E18B.gdb
new file mode 100644
index 000000000..b48a48445
--- /dev/null
+++ b/variants/MT_D21E/debug_scripts/SAML21E18B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e18" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_16KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_16KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_16KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_16KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_128KB_with_8KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_256KB_with_8KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_32KB_with_8KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_64KB_with_8KB_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_128KB_without_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_256KB_without_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_32KB_without_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
diff --git a/variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld b/variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
similarity index 100%
rename from variants/MT_D21E/linker_scripts/gcc/flash_64KB_without_bootloader.ld
rename to variants/MT_D21E/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
diff --git a/variants/MT_D21E/openocd_scripts/SAMC21E15A.cfg b/variants/MT_D21E/openocd_scripts/SAMC21E15A.cfg
new file mode 100644
index 000000000..b6b72ccda
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMC21E15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMC21E16A.cfg b/variants/MT_D21E/openocd_scripts/SAMC21E16A.cfg
new file mode 100644
index 000000000..613b357da
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMC21E16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMC21E17A.cfg b/variants/MT_D21E/openocd_scripts/SAMC21E17A.cfg
new file mode 100644
index 000000000..c687b08f0
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMC21E17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAMC21E18A.cfg b/variants/MT_D21E/openocd_scripts/SAMC21E18A.cfg
new file mode 100644
index 000000000..b87fb0116
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAMC21E18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAML21E15B.cfg b/variants/MT_D21E/openocd_scripts/SAML21E15B.cfg
new file mode 100644
index 000000000..82fbb0650
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAML21E15B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAML21E16B.cfg b/variants/MT_D21E/openocd_scripts/SAML21E16B.cfg
new file mode 100644
index 000000000..c74f6102a
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAML21E16B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAML21E17B.cfg b/variants/MT_D21E/openocd_scripts/SAML21E17B.cfg
new file mode 100644
index 000000000..3b844e436
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAML21E17B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E/openocd_scripts/SAML21E18B.cfg b/variants/MT_D21E/openocd_scripts/SAML21E18B.cfg
new file mode 100644
index 000000000..4e7a27fde
--- /dev/null
+++ b/variants/MT_D21E/openocd_scripts/SAML21E18B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/arduino_zero/debug_scripts/SAMC21G15A.gdb b/variants/arduino_zero/debug_scripts/SAMC21G15A.gdb
new file mode 100644
index 000000000..f818c9bbe
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMC21G15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21g15" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAMC21G16A.gdb b/variants/arduino_zero/debug_scripts/SAMC21G16A.gdb
new file mode 100644
index 000000000..5c258d3ac
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMC21G16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21g16" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAMC21G17A.gdb b/variants/arduino_zero/debug_scripts/SAMC21G17A.gdb
new file mode 100644
index 000000000..0387ce888
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMC21G17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21g17" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAMC21G18A.gdb b/variants/arduino_zero/debug_scripts/SAMC21G18A.gdb
new file mode 100644
index 000000000..1d0b9d1c0
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMC21G18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21g18" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAMD21G15A.gdb b/variants/arduino_zero/debug_scripts/SAMD21G15A.gdb
new file mode 100644
index 000000000..f8b1d04e3
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMD21G15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21g15" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAMD21G16A.gdb b/variants/arduino_zero/debug_scripts/SAMD21G16A.gdb
new file mode 100644
index 000000000..2f9de5a98
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMD21G16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21g16" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAMD21G17A.gdb b/variants/arduino_zero/debug_scripts/SAMD21G17A.gdb
new file mode 100644
index 000000000..be4c3e9ab
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAMD21G17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21g17" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/variant.gdb b/variants/arduino_zero/debug_scripts/SAMD21G18A.gdb
similarity index 100%
rename from variants/arduino_zero/debug_scripts/variant.gdb
rename to variants/arduino_zero/debug_scripts/SAMD21G18A.gdb
diff --git a/variants/arduino_zero/debug_scripts/SAML21G16B.gdb b/variants/arduino_zero/debug_scripts/SAML21G16B.gdb
new file mode 100644
index 000000000..d229f8f0c
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAML21G16B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21g16" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAML21G17B.gdb b/variants/arduino_zero/debug_scripts/SAML21G17B.gdb
new file mode 100644
index 000000000..f67cdcb2f
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAML21G17B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21g17" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/debug_scripts/SAML21G18B.gdb b/variants/arduino_zero/debug_scripts/SAML21G18B.gdb
new file mode 100644
index 000000000..b5230803b
--- /dev/null
+++ b/variants/arduino_zero/debug_scripts/SAML21G18B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21g18" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..497c7d1ac
--- /dev/null
+++ b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00020000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..3bded2906
--- /dev/null
+++ b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00040000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
similarity index 97%
rename from variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld
rename to variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
index f85765ef4..9f4943b59 100644
--- a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_without_bootloader.ld
+++ b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
@@ -25,7 +25,7 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00008000-0x4000 /* First 16KB used by bootloader */
   RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
 }
 
diff --git a/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..c578a262e
--- /dev/null
+++ b/variants/arduino_zero/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00010000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
similarity index 96%
rename from variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
rename to variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
index 984eb4113..234181a93 100644
--- a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_with_4KB_bootloader.ld
+++ b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
@@ -25,8 +25,8 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
-  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00020000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
 }
 
 /* Linker script to place sections and symbol values. Should be used together
diff --git a/variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
similarity index 100%
rename from variants/arduino_zero/linker_scripts/gcc/flash_with_bootloader.ld
rename to variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
similarity index 97%
rename from variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld
rename to variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
index 984eb4113..418992b15 100644
--- a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AS_with_4KB_bootloader.ld
+++ b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
@@ -25,7 +25,7 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00008000-0x2000 /* First 8KB used by bootloader */
   RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
 }
 
diff --git a/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..e0313532a
--- /dev/null
+++ b/variants/arduino_zero/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
@@ -0,0 +1,212 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00010000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_128KB.ld b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..fc8be6591
--- /dev/null
+++ b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
@@ -0,0 +1,213 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
similarity index 100%
rename from variants/arduino_zero/linker_scripts/gcc/flash_without_bootloader.ld
rename to variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
diff --git a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
similarity index 97%
rename from variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
rename to variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
index f85765ef4..8c0eea088 100644
--- a/variants/MT_D11/linker_scripts/gcc/SAMD11D14AM_without_bootloader.ld
+++ b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
@@ -25,7 +25,7 @@
  */
 MEMORY
 {
-  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00008000
   RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
 }
 
@@ -58,6 +58,7 @@ MEMORY
  *   __StackLimit
  *   __StackTop
  *   __stack
+ *   __ram_end__
  */
 ENTRY(Reset_Handler)
 
@@ -201,7 +202,7 @@ SECTIONS
 
 	/* Set stack top to end of RAM, and stack limit move down by
 	 * size of stack_dummy section */
-	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
 	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
 	PROVIDE(__stack = __StackTop);
 
diff --git a/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_64KB.ld b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..6b0d2a661
--- /dev/null
+++ b/variants/arduino_zero/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
@@ -0,0 +1,213 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/arduino_zero/openocd_scripts/SAMC21G15A.cfg b/variants/arduino_zero/openocd_scripts/SAMC21G15A.cfg
new file mode 100644
index 000000000..10c51c4db
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAMC21G15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21g15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/arduino_zero/openocd_scripts/SAMC21G16A.cfg b/variants/arduino_zero/openocd_scripts/SAMC21G16A.cfg
new file mode 100644
index 000000000..ffb0146b7
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAMC21G16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21g16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/arduino_zero/openocd_scripts/SAMC21G17A.cfg b/variants/arduino_zero/openocd_scripts/SAMC21G17A.cfg
new file mode 100644
index 000000000..5066d74c6
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAMC21G17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21g17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/arduino_zero/openocd_scripts/SAMC21G18A.cfg b/variants/arduino_zero/openocd_scripts/SAMC21G18A.cfg
new file mode 100644
index 000000000..2946d9391
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAMC21G18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D11/openocd_scripts/SAMD11C14A.cfg b/variants/arduino_zero/openocd_scripts/SAMD21G15A.cfg
similarity index 97%
rename from variants/MT_D11/openocd_scripts/SAMD11C14A.cfg
rename to variants/arduino_zero/openocd_scripts/SAMD21G15A.cfg
index 2e1525a73..e5d7eb8bb 100644
--- a/variants/MT_D11/openocd_scripts/SAMD11C14A.cfg
+++ b/variants/arduino_zero/openocd_scripts/SAMD21G15A.cfg
@@ -21,7 +21,7 @@
 source [find interface/cmsis-dap.cfg]
 
 # chip name
-set CHIPNAME at91samd11c14a
+set CHIPNAME at91samd21g15
 set ENDIAN little
 
 # choose a port here
diff --git a/variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg b/variants/arduino_zero/openocd_scripts/SAMD21G16A.cfg
similarity index 97%
rename from variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg
rename to variants/arduino_zero/openocd_scripts/SAMD21G16A.cfg
index 2b1d4c72f..677c80012 100644
--- a/variants/MT_D11/openocd_scripts/SAMD11D14AS.cfg
+++ b/variants/arduino_zero/openocd_scripts/SAMD21G16A.cfg
@@ -21,7 +21,7 @@
 source [find interface/cmsis-dap.cfg]
 
 # chip name
-set CHIPNAME at91samd11d14as
+set CHIPNAME at91samd21g16
 set ENDIAN little
 
 # choose a port here
diff --git a/variants/arduino_zero/openocd_scripts/SAMD21G17A.cfg b/variants/arduino_zero/openocd_scripts/SAMD21G17A.cfg
new file mode 100644
index 000000000..68641e118
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAMD21G17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21g17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/arduino_zero/openocd_scripts/arduino_zero.cfg b/variants/arduino_zero/openocd_scripts/SAMD21G18A.cfg
similarity index 100%
rename from variants/arduino_zero/openocd_scripts/arduino_zero.cfg
rename to variants/arduino_zero/openocd_scripts/SAMD21G18A.cfg
diff --git a/variants/arduino_zero/openocd_scripts/SAML21G16B.cfg b/variants/arduino_zero/openocd_scripts/SAML21G16B.cfg
new file mode 100644
index 000000000..c5ef10770
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAML21G16B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21g16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/arduino_zero/openocd_scripts/SAML21G17B.cfg b/variants/arduino_zero/openocd_scripts/SAML21G17B.cfg
new file mode 100644
index 000000000..48ad58a4d
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAML21G17B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21g17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/arduino_zero/openocd_scripts/SAML21G18B.cfg b/variants/arduino_zero/openocd_scripts/SAML21G18B.cfg
new file mode 100644
index 000000000..0a162e7f5
--- /dev/null
+++ b/variants/arduino_zero/openocd_scripts/SAML21G18B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]

From 472e3a4706eb47395e5b040f4e14636fd38cbaa5 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 6 Mar 2017 02:31:41 +0000
Subject: [PATCH 083/124] Minor changes to bootloader

---
 bootloaders/zero/Makefile            | 7 ++++---
 bootloaders/zero/board_definitions.h | 5 +++++
 bootloaders/zero/sam_ba_usb.c        | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index f67ebdb33..62bef31ac 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -26,22 +26,23 @@ MCU?=SAMD21E18A
 # Size of FLASH: 16KB, 32KB, 64KB, 128KB, 256KB
 FLASHSIZE?=256KB
 
+# The rest of this Config is optional ########
+
 ifeq ($(FLASHSIZE),16KB)
 # set to 0 when building a 4KB bootloader
 ARDUINO_EXTENDED_CAPABILITIES_MK?=0
 # set to only one interface when building a 4KB bootloader
 SAM_BA_INTERFACE_MK?=SAM_BA_USBCDC_ONLY
 else
-# set to 0 when building a 4KB bootloader
 ARDUINO_EXTENDED_CAPABILITIES_MK?=1
-# set to only one interface when building a 4KB bootloader
 SAM_BA_INTERFACE_MK?=SAM_BA_BOTH_INTERFACES
 endif
 
 LINKER_SCRIPT?=bootloader_sam_m0p_$(FLASHSIZE).ld
 
 # MattairTech SAM M0+ Boards (PID == 0x0557)
-CFLAGS_EXTRA?=-D__$(MCU)__ -DUSB_PID_HIGH=0x05 -DUSB_PID_LOW=0x57 -DUSB_VID_LOW=0xD0 -DUSB_VID_HIGH=0x16 -DARDUINO_EXTENDED_CAPABILITIES=$(ARDUINO_EXTENDED_CAPABILITIES_MK) -DSAM_BA_INTERFACE=$(SAM_BA_INTERFACE_MK)
+CFLAGS_EXTRA?=-D__$(MCU)__ -DUSB_PID_HIGH=0x05 -DUSB_PID_LOW=0x57 -DUSB_VID_LOW=0xD0 -DUSB_VID_HIGH=0x16
+CFLAGS_EXTRA+=-DARDUINO_EXTENDED_CAPABILITIES=$(ARDUINO_EXTENDED_CAPABILITIES_MK) -DSAM_BA_INTERFACE=$(SAM_BA_INTERFACE_MK) '-DSTRING_MANUFACTURER="MattairTech LLC"' '-DSTRING_PRODUCT="M0+ Boards"'
 
 # Arduino Zero (PID == 0x004D)
 # CFLAGS_EXTRA?=-D__SAMD21G18A__ -DUSB_PID_HIGH=0x00 -DUSB_PID_LOW=0x4D -DUSB_VID_LOW=0x41 -DUSB_VID_HIGH=0x23
diff --git a/bootloaders/zero/board_definitions.h b/bootloaders/zero/board_definitions.h
index f40a7f51d..667098c47 100644
--- a/bootloaders/zero/board_definitions.h
+++ b/bootloaders/zero/board_definitions.h
@@ -58,8 +58,13 @@
 /*
  * LEDs definitions
  */
+#if defined(__SAMD11D14AM__) || defined(__SAMD11C14A__) || defined(__SAMD11D14AS__)
+#define BOARD_LED_PORT                    (0)
+#define BOARD_LED_PIN                     (16)
+#else
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (28)
+#endif
 
 #define BOARD_LEDRX_PORT                  (0)
 #define BOARD_LEDRX_PIN                   (28)
diff --git a/bootloaders/zero/sam_ba_usb.c b/bootloaders/zero/sam_ba_usb.c
index 2913b9d44..8b71bb5f4 100644
--- a/bootloaders/zero/sam_ba_usb.c
+++ b/bootloaders/zero/sam_ba_usb.c
@@ -205,13 +205,13 @@ void sam_ba_usb_CDC_Enumerate(P_USB_CDC pCdc)
         else
         {
 #if 0 // TODO: pending validation
+          uint16_t STRING_LANGUAGE[2] = { (STD_GET_DESCRIPTOR_STRING<<8) | 4, 0x0409 };
+
           if (wValue>>8 == STD_GET_DESCRIPTOR_STRING)
           {
             switch ( wValue & 0xff )
             {
               case STRING_INDEX_LANGUAGES:
-                uint16_t STRING_LANGUAGE[2] = { (STD_GET_DESCRIPTOR_STRING<<8) | 4, 0x0409 };
-
                 USB_Write(pCdc->pUsb, (const char*)STRING_LANGUAGE, SAM_BA_MIN(sizeof(STRING_LANGUAGE), wLength), USB_EP_CTRL);
               break;
 

From a09e683578f2b5b78f0e5bd59d9a396a7a0d759c Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 6 Mar 2017 02:32:25 +0000
Subject: [PATCH 084/124] Add udev rules for Linux. Minor doc update.

---
 README.md                            | 259 ++++++++++++++++++---------
 drivers/99-mattairtech-USB-CDC.rules |  20 +++
 2 files changed, 196 insertions(+), 83 deletions(-)
 create mode 100644 drivers/99-mattairtech-USB-CDC.rules

diff --git a/README.md b/README.md
index c28be7758..c96ae83c5 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then cl
 ## What's New Beta (1.6.7-beta)
 
 * 1.6.7-beta-b0:
-  * OS X support added (bossac for OS X can now upload to all supported chips) (Thanks @joseangeljimenez for testing)
+  * OS X support added (bossac can now upload to all supported chips) (Thanks @joseangeljimenez for testing)
   * New bossac upload tool (added support for SAML and SAMC)
   * New bootloader from upstream SAMD CORE (see bootloaders/zero/README.md)
   * New beta release method (see README.md)
@@ -150,6 +150,78 @@ BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |
                                     -------------------
 ```
 
+# MattairTech MT-D21J (ATsamX21JXXX)
+
+```
+============================= MattairTech MT-D21J (ATsamX21JXXX) ========================
+Other  COM   PWM  Analog  INT  Arduino*           Arduino*  INT  Analog  PWM   COM  Other
+=========================================================================================
+                                   -------------------
+         Board Variant:           | (no external pin) |
+ B=Basic, S=Standard, A=Advanced  |            |-- B3 | 49   I   O       VBAT(L)/SDCD(+B)
+    M=Memory device installed     |            |-- B5 | 48   I                   INT1(+B)
+                                  |            |-- B4 | 47                       3SEN(+B)
+                                  |                   |
+XBDS(B)                O        0 | B0            RST |                          BOOT(+B)
+MECS(+M)               O        1 | B1            A31 | 31            RX1  SWDIO/XBDO(+B)
+DAC0                   O   I    2 | A2            A30 | 30                     SWDCLK(+B)
+REFA(B)                O        3 | A3        A28(D/C)| 28                      SHCS(D/C)
+3SVO(S)/REFB           O        4 | A4            A27 | 27   I                       INT2
+DAC1(L)                O        5 | A5        X34 (B2)| 34       O   TC60~   LED(+B)/XBRT
+CMVO(A)                O        6 | B6        X33(B16)| 33   I               INT0(+B)/BTN
+ASEN(+A)               O        7 | B7        X32(B17)| 32   I       TC61~       MOPS(+S)
+          TX3          O   I    8 | B8            A23 | 23           TC41~
+          RX3          O   I    9 | B9            A22 | 22           TC40~
+VHDV(A)   MOSI1        O   I   10 | A10           A21 | 21           TC71~
+VBDV(+A)  SCK1         O   I   11 | A11           A20 | 20   I       TC70~
+XBCT(B) SDA1/MISO1 TCC20   I   12 | A12           A19 | 19           TC31~        CMRI(S)
+        SCL1/SS1  TCC21    I   13 | A13           A18 | 18           TC30~  TX1  XBDI(+B)
+HSEN(A)         TC50~      I   14 | B14           A17 | 17                  SCL   SCL(+B)
+BKFS(+A)        TC51~          15 | B15           A16 | 16                  SDA   SDA(+B)
+                                  | Vaux         3.3V |
+USB D- (D/L)+B, CAN TX (C)        | A24   _____  VccL |   ! VccL is 3.3V by default.
+USB D+ (D/L)+B, CAN RX (C)        | A25  |     | VccH |     DO NOT exceed 3.6V on VccL or
+                                  | Gnd  | USB |  Gnd |     on any IO pin with the D21 or
+       Chip Variant:               -------------------      L21 installed. 5V is allowed
+    D=D21, L=L21, C=C21                                     ONLY with the C21 installed.
+                                  1-------------------      By default, VccH is 5V.
+MISO(+B)                       43 | B30          Vcon |
+SCK(+B)                        44 | B23    SPI    B22 | 45                       MOSI(+B)
+SHCS(D/C) or (SDCS(+B))     28(46)| A28(B31)      Gnd |
+                                   -------------------
+
+                                  1-------------------
+LVL_SHIFT_0(+S) TX2    O   I   35 | A6             A7 | 36   I   O    RX2 LVL_SHIFT_1(+S)
+LVL_SHIFT_2(+S)  TCC12 O  NMI  37 | A8    LEVEL    A9 | 38       O TCC13  LVL_SHIFT_3(+S)
+                                  | VccH  SHIFT  VccH |
+                                  | Gnd           Gnd |
+MOTOR_BOUT1(+S)    TCC04       39 | B10           B11 | 40       TCC05    MOTOR_BOUT2(+S)
+MOTOR_AOUT1(+S)    TCC06       41 | B12   MOTOR   B13 | 42       TCC07    MOTOR_AOUT2(+S)
+                                  | Vmotor        Gnd |
+                                   -------------------
+
+* Most pins can be used for more than one function. The same port pin number printed on
+  the board is also used in Arduino (without the 'A') for all of the supported functions
+  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+
+* Different variants have different hardware installed onboard. The alternate functions
+  column shows for which board variant(s) the associated hardware is installed: B=Basic,
+  S=Standard, A=Advanced, and M=Memory device installed. The Advanced variant has all of
+  the hardware that the Standard and Basic have installed, and the Standard variant has
+  all of the Basic hardware.
+
++ This function is enabled by default depending on the variant indicated by the letter.
+  Thus, the associated header pin cannot be used. In most cases (except most +A pins),
+  solder jumpers can be used to enable or disable the alternate onboard function.
+
+~ TC3, TC4, TC5, TC6, and TC7 on the D21 are instead
+  TC4, TC0, TC1, TC2, and TC3 respectively on the L21 and C21.
+
+Silkscreen Legend:
+  Top: A circle around pin is analog function, '~' is timer, small 'I' is interrupt
+  Bottom: A box around pin means 'Other' function enabled by default depending on variant
+```
+
 #### All pins operate at 3.3 volts. DO NOT connect voltages higher than 3.3V!
 
 ### Pin Capabilities
@@ -294,11 +366,13 @@ Vista, 7, 8, and 10.
 #### Linux
 
 0. No driver installation is needed.
-1. On some distros, you may need to add your user to the same group as the port (ie: dialout) and/or set udev rules.
+1. On some distros, you may need to add your user to the same group as the port (ie: dialout) or set udev rules:
+   * See the file https://github.com/mattairtech/ArduinoCore-samd/tree/master/drivers/99-mattairtech-USB-CDC.rules.
 2. You MAY have to install and use Arduino as the root user in order to get reliable access to the serial port.
    * This is true even when group permissions are set correctly, and it may fail after previously working.
    * You can also create/modify a udev rule to set permissions on the port so *everyone* can read / write.
-3. Continue with SAM M0+ Core Installation below.
+3. If you are running modemmanager (ie: Ubuntu), disable it, or use the udev rules file above.
+4. Continue with SAM M0+ Core Installation below.
 
 #### OS X
 
@@ -454,86 +528,105 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 
 ## New PinDescription Table
 
-```
-/*   The PinDescription table describes how each of the pins can be used by the Arduino
- *   core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
- *   communications, etc.), and the PinDescription table configures which functions can
- *   be used for each pin. This table is mainly accessed by the pinPeripheral function in
- *   wiring_private.c, which is used to attach a pin to a particular peripheral function.
- *   The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
- *   analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
- *   verify that the pin can perform the function requested, and to configure the pin for
- *   that function. Most of the contents of pinMode() are now in pinPeripheral().
- * 
- *   There are two ways that pins can be mapped. The first is to map pins contiguously
- *   (no PIO_NOT_A_PIN entries) in the table. This results in the least amount of space
- *   used by the table. A second method, used by default by the MT-D21E and MT-D11, maps
- *   Arduino pin numbers to the actual port pin number (ie: Arduino pin 28 = Port A28).
- *   This only works when there is one port. Because not all port pins are available,
- *   PIO_NOT_A_PIN entries must be added for these pins and more FLASH space is consumed.
- *   For an example of both types, see variant.cpp from the MT-D11 variant.
- * 
- *   Explanation of PinDescription table:
- * 
- *   Port                  This is the port (ie: PORTA).
- *   Pin                   This is the pin (bit) within the port. Valid values are 0-31.
- *   PinType               This indicates what peripheral function the pin can be
- *                         attached to. In most cases, this is PIO_MULTI, which means
- *                         that the pin can be anything listed in the PinAttribute field.
- *                         It can also be set to a specific peripheral. In this case, any
- *                         attempt to configure the pin (using pinPeripheral or pinMode)
- *                         as anything else will fail (and pinPeripheral will return -1).
- *                         This can be used to prevent accidental re-configuration of a
- *                         pin that is configured for only one function (ie: USB D- and
- *                         D+ pins). If a pin is not used or does not exist,
- *                         PIO_NOT_A_PIN must be entered in this field. See WVariant.h
- *                         for valid entries. These entries are also used as a parameter
- *                         to pinPeripheral() with the exception of PIO_NOT_A_PIN and
- *                         PIO_MULTI. The pinMode function now calls pinPeripheral() with
- *                         the desired mode. Note that this field is not used to select
- *                         between the two peripherals possible with each of the SERCOM
- *                         and TIMER functions. PeripheralAttribute is now used for this.
- *   PeripheralAttribute   This is an 8-bit bitfield used for various peripheral
- *                         configuration. It is primarily used to select between the two
- *                         peripherals possible with each of the SERCOM and TIMER
- *                         functions. TIMER pins are individual, while SERCOM uses a
- *                         group of two to four pins. This group of pins can span both
- *                         peripherals. For example, pin 19 (SPI1 SCK) on the MT-D21E
- *                         uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses
- *                         PER_ATTR_SERCOM_STD. Both TIMER and SERCOM can exist for each
- *                         pin. This bitfield is also used to set the pin drive strength.
- *                         In the future, other attributes (like input buffer
- *                         configuration) may be added. See WVariant.h for valid entries.
- *   PinAttribute          This is a 32-bit bitfield used to list all of the valid
- *                         peripheral functions that a pin can attach to. This includes
- *                         GPIO functions like PIN_ATTR_OUTPUT. Certain attributes are
- *                         shorthand for a combination of other attributes.
- *                         PIN_ATTR_DIGITAL includes all of the GPIO functions, while
- *                         PIN_ATTR_TIMER includes both PIN_ATTR_TIMER_PWM and
- *                         PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
- *                         PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. There is
- *                         only one DAC channel, so PIN_ATTR_DAC appears only once. This
- *                         bitfield is useful for limiting a pin to only input related
- *                         functions or output functions. This allows a pin to have a
- *                         more flexible configuration, while restricting the direction
- *                         (ie: to avoid contention). See WVariant.h for valid entries.
- *   TCChannel             This is the TC(C) channel (if any) assigned to the pin. Some
- *                         TC channels are available on multiple pins (ie: TCC0/WO[0] is
- *                         available on pin A4 or pin A8 on the MT-D21E). In general,
- *                         only one pin should be configured (in the pinDescription
- *                         table) per TC channel. See WVariant.h for valid entries.
- *                         The tone library uses TC5 (MT-D21E) or TC2 (MT-D11).
- *   ADCChannelNumber      This is the ADC channel (if any) assigned to the pin. See
- *                         WVariant.h for valid entries.
- *   ExtInt                This is the interrupt (if any) assigned to the pin. Some
- *                         interrupt numbers are available on multiple pins (ie:
- *                         EIC/EXTINT[2] is available on pin A2 or pin A18 on the
- *                         MT-D21E). In general, only one pin should be configured (in
- *                         the pinDescription table) per interrupt number. Thus, if an
- *                         interrupt was needed on pin 2, EXTERNAL_INT_2 can be moved
- *                         from pin 18. See WVariant.h for valid entries.
- */
-```
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+### Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+### Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+### See WVariant.h in cores/arduino for the definitions used in the table.
+
+#### Port:
+This is the port (ie: PORTA).
+
+#### Pin:
+This is the pin (bit) within the port. Valid values are 0-31.
+
+#### PinType:
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+#### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+#### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+#### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+#### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+#### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+#### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
 
 
 ## Possible Future Additions
diff --git a/drivers/99-mattairtech-USB-CDC.rules b/drivers/99-mattairtech-USB-CDC.rules
new file mode 100644
index 000000000..2719bc888
--- /dev/null
+++ b/drivers/99-mattairtech-USB-CDC.rules
@@ -0,0 +1,20 @@
+# udev rules for USB CDC devices on MattairTech development boards
+#
+# Copy this file to the location of your distribution's udev rules, for example on Ubuntu:
+#   sudo cp 99-mattairtech-USB-CDC.rules /etc/udev/rules.d/
+# Then reload udev configuration by executing:
+#   sudo reload udev
+# Or if that doesn't work try:
+#   sudo udevadm control --reload-rules
+#   sudo udevadm trigger
+
+# Rule to access MattairTech USB CDC devices without running Arduino as root.
+# Should work as-is for Ubuntu. Other distributions might need to change
+# GROUP="dialout" to another group (ie: "users").
+SUBSYSTEM=="usb", ATTR{idProduct}=="0557", ATTRS{idVendor}=="16D0", MODE="0660", GROUP="dialout"
+SUBSYSTEM=="usb", ATTR{idProduct}=="0856", ATTRS{idVendor}=="16D0", MODE="0660", GROUP="dialout"
+SUBSYSTEM=="usb", ATTR{idProduct}=="0B41", ATTRS{idVendor}=="16D0", MODE="0660", GROUP="dialout"
+
+# Rule to blacklist MattairTech USB CDC devices from being manipulated by ModemManager.
+# Fixes issue with hanging references to /dev/ttyACM* devices.
+ATTRS{idVendor}=="16D0", ENV{ID_MM_DEVICE_IGNORE}="1"

From 1f06c856ffd4e629f595f489f124379454e41a2d Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Wed, 5 Apr 2017 08:52:54 +0000
Subject: [PATCH 085/124] Added MT-D21E Rev B variant

---
 variants/MT_D21E_revB/README.md               | 198 ++++++++++++
 .../MT_D21E_revB/debug_scripts/SAMC21E15A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMC21E16A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMC21E17A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMC21E18A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMD21E15A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMD21E16A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMD21E17A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAMD21E18A.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAML21E15B.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAML21E16B.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAML21E17B.gdb |  31 ++
 .../MT_D21E_revB/debug_scripts/SAML21E18B.gdb |  31 ++
 .../gcc/16KB_Bootloader/flash_128KB.ld        | 217 +++++++++++++
 .../gcc/16KB_Bootloader/flash_256KB.ld        | 217 +++++++++++++
 .../gcc/16KB_Bootloader/flash_32KB.ld         | 217 +++++++++++++
 .../gcc/16KB_Bootloader/flash_64KB.ld         | 217 +++++++++++++
 .../gcc/8KB_Bootloader/flash_128KB.ld         | 217 +++++++++++++
 .../gcc/8KB_Bootloader/flash_256KB.ld         | 217 +++++++++++++
 .../gcc/8KB_Bootloader/flash_32KB.ld          | 217 +++++++++++++
 .../gcc/8KB_Bootloader/flash_64KB.ld          | 217 +++++++++++++
 .../gcc/No_Bootloader/flash_128KB.ld          | 214 ++++++++++++
 .../gcc/No_Bootloader/flash_256KB.ld          | 214 ++++++++++++
 .../gcc/No_Bootloader/flash_32KB.ld           | 214 ++++++++++++
 .../gcc/No_Bootloader/flash_64KB.ld           | 214 ++++++++++++
 .../openocd_scripts/SAMC21E15A.cfg            |  30 ++
 .../openocd_scripts/SAMC21E16A.cfg            |  30 ++
 .../openocd_scripts/SAMC21E17A.cfg            |  30 ++
 .../openocd_scripts/SAMC21E18A.cfg            |  30 ++
 .../openocd_scripts/SAMD21E15A.cfg            |  30 ++
 .../openocd_scripts/SAMD21E16A.cfg            |  30 ++
 .../openocd_scripts/SAMD21E17A.cfg            |  30 ++
 .../openocd_scripts/SAMD21E18A.cfg            |  30 ++
 .../openocd_scripts/SAML21E15B.cfg            |  30 ++
 .../openocd_scripts/SAML21E16B.cfg            |  30 ++
 .../openocd_scripts/SAML21E17B.cfg            |  30 ++
 .../openocd_scripts/SAML21E18B.cfg            |  30 ++
 variants/MT_D21E_revB/pins_arduino.h          |  21 ++
 variants/MT_D21E_revB/variant.cpp             | 160 +++++++++
 variants/MT_D21E_revB/variant.h               | 306 ++++++++++++++++++
 40 files changed, 4009 insertions(+)
 create mode 100644 variants/MT_D21E_revB/README.md
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMC21E15A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMC21E16A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMC21E17A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMC21E18A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMD21E15A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMD21E16A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMD21E17A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAMD21E18A.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAML21E15B.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAML21E16B.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAML21E17B.gdb
 create mode 100644 variants/MT_D21E_revB/debug_scripts/SAML21E18B.gdb
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
 create mode 100644 variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMC21E15A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMC21E16A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMC21E17A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMC21E18A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMD21E15A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMD21E16A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMD21E17A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAMD21E18A.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAML21E15B.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAML21E16B.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAML21E17B.cfg
 create mode 100644 variants/MT_D21E_revB/openocd_scripts/SAML21E18B.cfg
 create mode 100644 variants/MT_D21E_revB/pins_arduino.h
 create mode 100644 variants/MT_D21E_revB/variant.cpp
 create mode 100644 variants/MT_D21E_revB/variant.h

diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
new file mode 100644
index 000000000..eff1831c0
--- /dev/null
+++ b/variants/MT_D21E_revB/README.md
@@ -0,0 +1,198 @@
+# MattairTech MT-D21E (rev B) (ATSAMx21Exxx)
+
+```
+========================== MattairTech MT-D21E rev B (ATSAMx21Exxx) =====================
+Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     COM   Other
+=========================================================================================
+                                      -------------------
+XI32(+)                              | A0            RST |                        BOOT(+)
+XO32(+)                              | A1            Gnd |
+DAC                   *            2 | A2           Vbat |
+REFA                  *            3 | A3            A31 | 31    *                IO/B(+)
+REFB                  *      *     4 | A4            A30 | 30    *                 CLK(+)
+DAC1(L)               *      *     5 | A5            NC  |
+LED(+)       TCC10    *            6 | A6       A28 (D/C)| 28    *
+VM           TCC11    *            7 | A7            A27 | 27    *               A/CS(+M)
+             TCC00    *     NMI    8 | A8            A23 | 23    * TC41/TC01~ SS
+             TCC01    *      *     9 | A9            A22 | 22    * TC40/TC00~ MISO(+M)
+       TX1   TCC02    *           10 | A10           A19 | 19    *            SCK(+M)
+       RX1   TCC03    *           11 | A11           A18 | 18    *            MOSI(+M)
+       TX2 TC30/TC40~        *    14 | A14           A17 | 17    *   TCC21    SCL(+)
+       RX2 TC31/TC41~             15 | A15           A16 | 16    *   TCC20    SDA(+)
+                                     | NC            NC  |
+     M=Memory device installed       | NC            NC  | ! Vcc is 3.3V by default.
+                                     | Vbus          3.3V|   DO NOT exceed 3.6V on Vcc or
+USB D- (D/L)(+), CAN TX (C)  TC50 24 | A24   _____   Vcc |   any IO pin with the D21 or
+USB D+ (D/L)(+), CAN RX (C)  TC51 25 | A25  |     |  Vin |   L21 installed. 5V is allowed
+                                     | Gnd  | USB |  Gnd |   ONLY with the C21 installed.
+           Chip Variant:              -------------------
+        D=D21, L=L21, C=C21
+
+* Most pins can be used for more than one function. The same port pin number printed on
+  the board is also used in Arduino (without the 'A') for all of the supported functions
+  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+
++ This alternate function is enabled by default (+M functions enabled only when a memory
+  device is installed). Thus, the associated header pin cannot be used. Solder jumpers
+  can be used to enable or disable the alternate onboard function.
+
+~ When two timers are shown, the second is for L21/C21. TC5 is TC1 on the L21/C21.
+
+Silkscreen Legend:
+  Top: A circled pin means analog function and '*' means alternate function (see + above)
+  Bottom: A circled pin means analog function
+```
+
+
+# Pins descriptions for the MattairTech MT-D21E (rev B)
+============================================================================================================================================
+Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| A0	| PA00	| Xin32			| Xin32
+1	| A1	| PA01	| Xout32		| Xout32
+2	| A2	| PA02	| DAC0			| !EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+3	| A3	| PA03	| REFA			| !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+4	| A4	| PA04	| REFB			| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[0] !TCC0/WO[0]
+5	| A5	| PA05	| DAC1(L21)		| EIC/EXTINT[5] ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1] DAC1(L21)
+6	| A6	| PA06	| LED			| !EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0] LED
+7	| A7	| PA07	| Voltage Measurement	| !EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
+8	| A8	| PA08	|			| EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
+9	| A9	| PA09	|			| EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
+10	| A10	| PA10	| TX1			| !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
+11	| A11	| PA11	| RX1			| !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
+12	| ---	| ----	| NOT A PIN		| NOT A PIN
+13	| ---	| ----	| NOT A PIN		| NOT A PIN
+14	| A14	| PA14	| Xin, TX2		| EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
+15	| A15	| PA15	| Xout, RX2		| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
+16	| A16	| PA16	| I2C/SDA w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
+17	| A17	| PA17	| I2C/SCL w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
+18	| A18	| PA18	| SPI MOSI		| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+19	| A19	| PA19	| SPI SCK		| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
+20	| ---	| ----	| NOT A PIN		| NOT A PIN
+21	| ---	| ----	| NOT A PIN		| NOT A PIN
+22	| A22	| PA22	| SPI MISO		| EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
+23	| A23	| PA23	| SPI SS		| EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
+24	| A24-	| PA24	| USB_NEGATIVE		| USB/DM TC5/WO[0]
+25	| A25+	| PA25	| USB_POSITIVE		| USB/DP TC5/WO[1]
+26	| ---	| ----	| NOT A PIN		| NOT A PIN
+27	| A27	| PA27	| A/CS			| EIC/EXTINT[15] A/CS (Jumper A / memory device chip select)
+28	| A28	| PA28	|			| EIC/EXTINT[8]
+29	| ---	| ----	| NOT A PIN		| NOT A PIN
+30	| A30	| PA30	| SWD CLK		| EIC/EXTINT[10] !SERCOM1/PAD[2] TCC1/WO[0] SWD CLK, leave floating during boot
+31	| A31	| PA31	| Button B / SWD IO	| EIC/EXTINT[11] !SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
+--	| RST	| ----	|			| Reset, BOOT (double tap bootloader entry)
+============================================================================================================================================
+
+* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
+  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+
+* The following Arduino pin numbers are not mapped to a physical pin: 12, 13, 20, 21, 26, and 29.
+
+* Pins 24 and 25 are by default in use by USB (USB_NEGATIVE and USB_POSITIVE). TC5(D21) is available on these pins otherwise.
+  The tone library uses TC5.
+
+* A0 and A1 are by default connected to the 32.768KHz crystal.
+
+
+
+# PinDescription table format
+
+## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+## Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+## Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+## See WVariant.h in cores/arduino for the definitions used in the table.
+
+### Port:
+This is the port (ie: PORTA).
+
+### Pin:
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType:
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMC21E15A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMC21E15A.gdb
new file mode 100644
index 000000000..070351956
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMC21E15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e15" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMC21E16A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMC21E16A.gdb
new file mode 100644
index 000000000..acabddd1d
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMC21E16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e16" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMC21E17A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMC21E17A.gdb
new file mode 100644
index 000000000..4ae2dd669
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMC21E17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e17" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMC21E18A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMC21E18A.gdb
new file mode 100644
index 000000000..2ca3b2cdc
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMC21E18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21e18" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMD21E15A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMD21E15A.gdb
new file mode 100644
index 000000000..4ae3c04f0
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMD21E15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e15" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMD21E16A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMD21E16A.gdb
new file mode 100644
index 000000000..eb114b493
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMD21E16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e16" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMD21E17A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMD21E17A.gdb
new file mode 100644
index 000000000..cb1c7c44e
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMD21E17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e17" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAMD21E18A.gdb b/variants/MT_D21E_revB/debug_scripts/SAMD21E18A.gdb
new file mode 100644
index 000000000..13ee2a173
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAMD21E18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21e18" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAML21E15B.gdb b/variants/MT_D21E_revB/debug_scripts/SAML21E15B.gdb
new file mode 100644
index 000000000..f4cdf835f
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAML21E15B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e15" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAML21E16B.gdb b/variants/MT_D21E_revB/debug_scripts/SAML21E16B.gdb
new file mode 100644
index 000000000..50e424551
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAML21E16B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e16" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAML21E17B.gdb b/variants/MT_D21E_revB/debug_scripts/SAML21E17B.gdb
new file mode 100644
index 000000000..29323011f
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAML21E17B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e17" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/debug_scripts/SAML21E18B.gdb b/variants/MT_D21E_revB/debug_scripts/SAML21E18B.gdb
new file mode 100644
index 000000000..b48a48445
--- /dev/null
+++ b/variants/MT_D21E_revB/debug_scripts/SAML21E18B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21e18" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..c541d8cd0
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00020000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..a0b9f951f
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00040000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
new file mode 100644
index 000000000..5d8d047a9
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00008000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..3f7223790
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00010000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..07940acbd
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00020000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..825aee666
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00040000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
new file mode 100644
index 000000000..0d3aaf7a9
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00008000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..1c36f57e1
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00010000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_128KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..941e0adee
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_256KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..865514cbb
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_32KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
new file mode 100644
index 000000000..407777c80
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_64KB.ld b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..6f3d4d3e8
--- /dev/null
+++ b/variants/MT_D21E_revB/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMC21E15A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMC21E15A.cfg
new file mode 100644
index 000000000..b6b72ccda
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMC21E15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMC21E16A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMC21E16A.cfg
new file mode 100644
index 000000000..613b357da
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMC21E16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMC21E17A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMC21E17A.cfg
new file mode 100644
index 000000000..c687b08f0
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMC21E17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMC21E18A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMC21E18A.cfg
new file mode 100644
index 000000000..b87fb0116
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMC21E18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMD21E15A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMD21E15A.cfg
new file mode 100644
index 000000000..0355cc401
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMD21E15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMD21E16A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMD21E16A.cfg
new file mode 100644
index 000000000..4eaf7acfc
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMD21E16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMD21E17A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMD21E17A.cfg
new file mode 100644
index 000000000..6b5641483
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMD21E17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAMD21E18A.cfg b/variants/MT_D21E_revB/openocd_scripts/SAMD21E18A.cfg
new file mode 100644
index 000000000..b99d610ef
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAMD21E18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAML21E15B.cfg b/variants/MT_D21E_revB/openocd_scripts/SAML21E15B.cfg
new file mode 100644
index 000000000..82fbb0650
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAML21E15B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAML21E16B.cfg b/variants/MT_D21E_revB/openocd_scripts/SAML21E16B.cfg
new file mode 100644
index 000000000..c74f6102a
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAML21E16B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAML21E17B.cfg b/variants/MT_D21E_revB/openocd_scripts/SAML21E17B.cfg
new file mode 100644
index 000000000..3b844e436
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAML21E17B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E_revB/openocd_scripts/SAML21E18B.cfg b/variants/MT_D21E_revB/openocd_scripts/SAML21E18B.cfg
new file mode 100644
index 000000000..4e7a27fde
--- /dev/null
+++ b/variants/MT_D21E_revB/openocd_scripts/SAML21E18B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21e18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/MT_D21E_revB/pins_arduino.h b/variants/MT_D21E_revB/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/MT_D21E_revB/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/MT_D21E_revB/variant.cpp b/variants/MT_D21E_revB/variant.cpp
new file mode 100644
index 000000000..c37b16fff
--- /dev/null
+++ b/variants/MT_D21E_revB/variant.cpp
@@ -0,0 +1,160 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+const PinDescription g_APinDescription[]=
+{
+	// 0..1 are unused by default (pins in use by 32.768KHz crystal, which is used by the Arduino core)
+	{ PORTA,  0, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  1, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	
+	// 2..9 - Analog capable pins (DAC available on 2)
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[0] / DAC
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[1]
+	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4, GCLK_CCL_NONE }, // ADC/AIN[4]
+#if (SAMD || SAMC)
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE }, // ADC/AIN[5]
+#elif (SAML)
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE },
+#endif
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[6], LED
+#if (SAMD)
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+#elif (SAML)
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+#elif (SAMC)
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel10, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel11, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+#endif
+	
+	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
+#if (SAMD)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+#elif (SAML)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+#elif (SAMC)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel10, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel11, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+#endif
+	
+	// 12..13 pins don't exist
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	
+	// 14..15 - SERCOM/UART (Serial2) or Digital functions
+#if (SAMD)
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // TC3/WO[0], HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
+#elif (SAML || SAMC)
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // TC3/WO[0], HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
+#endif
+	
+	// 16..17 SERCOM/I2C (Wire) or Digital functions
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // SDA: SERCOM1/PAD[0]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // SCL: SERCOM1/PAD[1]
+	
+	// 18..23 - SERCOM/SPI (SPI) or Digital functions (pins 20..21 do not exist)
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SPI SCK: SERCOM3/PAD[3] (PIN_ATTR_SERCOM_ALT)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+#if (SAMD)
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SPI MISO: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // SPI SS: SERCOM3/PAD[1]
+#elif (SAML || SAMC)
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SPI MISO: SERCOM3/PAD[0]
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // SPI SS: SERCOM3/PAD[1]
+#endif
+	
+	// 24..26 - USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist
+#if (SAMD)
+	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+#elif (SAML || SAMC)
+	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+#endif
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	
+	// 27..29 Digital functions / A/CS (pin 29 does not exist)
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_15, GCLK_CCL_NONE }, // A/CS
+#if (SAMD || SAMC)
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_8, GCLK_CCL_NONE }, // 
+#elif (SAML)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+#endif
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	
+	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO
+} ;
+
+#if (SAMD)
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
+#elif (SAML21 || SAMC21)
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC2 } ;
+#endif
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+SERCOM sercom3( SERCOM3 ) ;
+#if (SAML)
+SERCOM sercom4( SERCOM4 ) ;
+SERCOM sercom5( SERCOM5 ) ;
+#endif
+
+#if defined(ONE_UART) || defined(TWO_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
+
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM2_Handler()
+{
+  Serial2.IrqHandler();
+}
+#endif
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
new file mode 100644
index 000000000..4e2f14b0a
--- /dev/null
+++ b/variants/MT_D21E_revB/variant.h
@@ -0,0 +1,306 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+#ifndef _VARIANT_MATTAIRTECH_MT_D21E_REVB_
+#define _VARIANT_MATTAIRTECH_MT_D21E_REVB_
+
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+/** Frequency of the board main oscillator */
+#define VARIANT_MAINOSC		(32768ul)
+
+/** Master clock frequency */
+#define VARIANT_MCK		(48000000ul)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+#include "sam.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
+
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
+#define NUM_ANALOG_INPUTS    (10u)
+
+#if (SAMD || SAMC)
+#define NUM_ANALOG_OUTPUTS   (1u)
+#elif (SAML)
+#define NUM_ANALOG_OUTPUTS   (2u)
+#else
+#error "variant.h: Unsupported chip"
+#endif
+
+#define analogInputToDigitalPin(p)  (p)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ * The MT-D21E (rev B) onboard LED is on pin 6.
+ * The RX and TX LEDs are not present.
+ * You may optionally add them to any free pins.
+ */
+#define PIN_LED_13           (6u)
+#define PIN_LED_RXL          (30u)
+#define PIN_LED_TXL          (31u)
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+/* Buttons
+ * Note that Button B is connected to Reset by default.
+ * A solder jumper can be changed to route Button B to pin 31 instead.
+ * There is a debouncing capacitor connected, so delay reading the pin for
+ * at least 45ms after turning on the pullup to allow the capacitor to charge.
+ */
+#define JUMPER_A             (27u)
+#define BUTTON_B             (31u)
+#define BUTTON_BUILTIN       BUTTON_A
+
+
+/*
+ * Analog pins
+ */
+#define PIN_A2               (2ul)
+#define PIN_A3               (3ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A6               (6ul)
+#define PIN_A7               (7ul)
+#define PIN_A8               (8ul)
+#define PIN_A9               (9ul)
+#define PIN_A10              (10ul)
+#define PIN_A11              (11ul)
+#define PIN_DAC0             (2ul)
+#if (SAML)
+#define PIN_DAC1             (5ul)
+#endif
+
+static const uint8_t A2   = PIN_A2;
+static const uint8_t A3   = PIN_A3;
+static const uint8_t A4   = PIN_A4;
+static const uint8_t A5   = PIN_A5;
+static const uint8_t A6   = PIN_A6;
+static const uint8_t A7   = PIN_A7;
+static const uint8_t A8   = PIN_A8;
+static const uint8_t A9   = PIN_A9;
+static const uint8_t A10  = PIN_A10;
+static const uint8_t A11  = PIN_A11;
+static const uint8_t DAC0 = PIN_DAC0;
+#if (SAML)
+static const uint8_t DAC1 = PIN_DAC1;
+#endif
+
+#define ADC_RESOLUTION		12
+
+// #define REMAP_ANALOG_PIN_ID(pin)	if ( pin < A0 ) pin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#define REFA_PIN    (3ul)
+#define REFB_PIN    (4ul)
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#define PIN_ATN              (15ul)
+static const uint8_t ATN = PIN_ATN;
+
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#define PIN_SERIAL1_RX       (11ul)
+#define PIN_SERIAL1_TX       (10ul)
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL1       &sercom0
+
+// Serial2
+#define PIN_SERIAL2_RX       (15ul)
+#define PIN_SERIAL2_TX       (14ul)
+#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL2       &sercom2
+
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#define PIN_SPI_MISO         (22u)
+#define PIN_SPI_MOSI         (18u)
+#define PIN_SPI_SCK          (19u)
+#define PIN_SPI_SS           (23u)
+#define PERIPH_SPI           sercom3
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA         (16u)
+#define PIN_WIRE_SCL         (17u)
+#define PERIPH_WIRE          sercom1
+#define WIRE_IT_HANDLER      SERCOM1_Handler
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+
+/*
+ * USB
+ */
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+#define PIN_USB_HOST_ENABLE             (14ul)
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
+
+/*
+ * I2S Interfaces
+ */
+#define I2S_INTERFACES_COUNT 1
+
+#define I2S_DEVICE          0
+#define I2S_CLOCK_GENERATOR 3
+#define PIN_I2S_SD          (9u)
+#define PIN_I2S_SCK         (1u)
+#define PIN_I2S_FS          (0u)
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+extern SERCOM sercom3;
+
+extern Uart Serial1;
+extern Uart Serial2;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#define SERIAL_PORT_MONITOR         Serial1
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+#define Serial                      SerialUSB
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */

From 91aafeb22b53de306a9a25c4436d5ecea6f9c102 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Wed, 5 Apr 2017 09:04:31 +0000
Subject: [PATCH 086/124] Added Generic D11C14A board variant

---
 boards.txt                                    |  83 +++++
 variants/Generic_D11C14A/README.md            | 193 ++++++++++
 .../debug_scripts/SAMD11C14A.gdb              |  31 ++
 .../gcc/4KB_Bootloader/flash_16KB.ld          | 217 ++++++++++++
 .../gcc/No_Bootloader/flash_16KB.ld           | 214 +++++++++++
 .../openocd_scripts/SAMD11C14A.cfg            |  30 ++
 variants/Generic_D11C14A/pins_arduino.h       |  21 ++
 variants/Generic_D11C14A/variant.cpp          | 115 ++++++
 variants/Generic_D11C14A/variant.h            | 333 ++++++++++++++++++
 9 files changed, 1237 insertions(+)
 create mode 100644 variants/Generic_D11C14A/README.md
 create mode 100644 variants/Generic_D11C14A/debug_scripts/SAMD11C14A.gdb
 create mode 100644 variants/Generic_D11C14A/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
 create mode 100644 variants/Generic_D11C14A/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
 create mode 100644 variants/Generic_D11C14A/openocd_scripts/SAMD11C14A.cfg
 create mode 100644 variants/Generic_D11C14A/pins_arduino.h
 create mode 100644 variants/Generic_D11C14A/variant.cpp
 create mode 100644 variants/Generic_D11C14A/variant.h

diff --git a/boards.txt b/boards.txt
index f55abfcea..125a7b42a 100644
--- a/boards.txt
+++ b/boards.txt
@@ -355,6 +355,89 @@ mattairtech_mt_d11.menu.usb.none.build.usbcom=USB_DISABLED
 mattairtech_mt_d11.menu.usb.none.build.pid=0x0856
 
 
+# Generic D11C14A (SOIC-14)
+d11c14a.name=Generic D11C14A
+d11c14a.vid.0=0x16D0
+d11c14a.pid.0=0x0557
+d11c14a.vid.1=0x16D0
+d11c14a.pid.1=0x0856
+d11c14a.vid.2=0x16D0
+d11c14a.pid.2=0x0B41
+d11c14a.build.mcu=cortex-m0plus
+d11c14a.build.f_cpu=48000000L
+d11c14a.build.usb_product="D11C14A"
+d11c14a.build.usb_manufacturer="MattairTech"
+d11c14a.build.board=SAMD_ZERO
+d11c14a.build.core=arduino
+d11c14a.build.variant=Generic_D11C14A
+d11c14a.build.variant_system_lib=
+d11c14a.build.vid=0x16D0
+d11c14a.upload.protocol=sam-ba
+d11c14a.bootloader.tool=arduino:openocd
+d11c14a.menu.clock.crystal_32k=32KHZ_CRYSTAL
+d11c14a.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+d11c14a.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+d11c14a.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+d11c14a.menu.clock.internal=INTERNAL
+d11c14a.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+d11c14a.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+d11c14a.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+d11c14a.build.extra_flags=-D__SAMD11C14A__ {build.usb_flags}
+d11c14a.build.ldscript=linker_scripts/gcc/flash_16KB.ld
+d11c14a.build.openocdscript=openocd_scripts/SAMD11C14A.cfg
+d11c14a.bootloader.file=zero/binaries/sam_ba_Generic_D11C14A_SAMD11C14A.bin
+d11c14a.menu.bootloader.4kb=4KB
+d11c14a.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
+d11c14a.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
+d11c14a.menu.bootloader.4kb.upload.tool=MattairTech_Arduino:bossac
+d11c14a.menu.bootloader.4kb.upload.use_1200bps_touch=true
+d11c14a.menu.bootloader.4kb.upload.wait_for_upload_port=true
+d11c14a.menu.bootloader.4kb.upload.native_usb=true
+d11c14a.menu.bootloader.4kb.upload.maximum_size=12288
+d11c14a.menu.bootloader.0kb=NO_BOOTLOADER
+d11c14a.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+d11c14a.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+d11c14a.menu.bootloader.0kb.upload.tool=arduino:openocd
+d11c14a.menu.bootloader.0kb.upload.use_1200bps_touch=false
+d11c14a.menu.bootloader.0kb.upload.wait_for_upload_port=false
+d11c14a.menu.bootloader.0kb.upload.native_usb=false
+d11c14a.menu.bootloader.0kb.upload.maximum_size=16384
+d11c14a.menu.serial.one_uart=ONE_UART_ONE_WIRE_NO_SPI
+d11c14a.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+d11c14a.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+d11c14a.menu.serial.one_uart.build.serialcom_spi=NO_SPI
+d11c14a.menu.serial.one_uart_no_wire_one_spi=ONE_UART_NO_WIRE_ONE_SPI
+d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_uart=ONE_UART
+d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
+d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_spi=ONE_SPI
+d11c14a.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+d11c14a.menu.serial.no_uart.build.serialcom_uart=NO_UART
+d11c14a.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+d11c14a.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+d11c14a.menu.serial.two_uart=TWO_UART_NO_WIRE_NO_SPI
+d11c14a.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+d11c14a.menu.serial.two_uart.build.serialcom_wire=NO_WIRE
+d11c14a.menu.serial.two_uart.build.serialcom_spi=NO_SPI
+d11c14a.menu.usb.cdc=CDC_ONLY
+d11c14a.menu.usb.cdc.build.usbcom=CDC_ONLY
+d11c14a.menu.usb.cdc.build.pid=0x0557
+d11c14a.menu.usb.cdc_hid=CDC_HID
+d11c14a.menu.usb.cdc_hid.build.usbcom=CDC_HID
+d11c14a.menu.usb.cdc_hid.build.pid=0x0856
+d11c14a.menu.usb.withcdc=WITH_CDC
+d11c14a.menu.usb.withcdc.build.usbcom=WITH_CDC
+d11c14a.menu.usb.withcdc.build.pid=0x0B41
+d11c14a.menu.usb.hid=HID_ONLY
+d11c14a.menu.usb.hid.build.usbcom=HID_ONLY
+d11c14a.menu.usb.hid.build.pid=0x0B40
+d11c14a.menu.usb.nocdc=WITHOUT_CDC
+d11c14a.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+d11c14a.menu.usb.nocdc.build.pid=0x0A0C
+d11c14a.menu.usb.none=USB_DISABLED
+d11c14a.menu.usb.none.build.usbcom=USB_DISABLED
+d11c14a.menu.usb.none.build.pid=0x0856
+
+
 # MattairTech Core for Arduino/Genuino Zero (Autodetect Port)
 arduino_zero.name=Arduino/Genuino Zero (Autodetect Port)
 arduino_zero.bootloader.file=zero/binaries/sam_ba_arduino_zero_SAMD21G18A.bin
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
new file mode 100644
index 000000000..96cd0ec76
--- /dev/null
+++ b/variants/Generic_D11C14A/README.md
@@ -0,0 +1,193 @@
+# Generic ATsamD11C14A
+
+```
+====================================== ATsamD11C14A =====================================
+Other  COM   PWM  Analog  INT  Arduino*           Arduino*  INT  Analog  PWM   COM  Other
+=========================================================================================
+                                   -------------------
+     RX2*    TCC01    *    *    5 | A5             A4 | 4    *    *     TCC00  TX2*   REF
+ TX1 / MOSI  TCC02         *    8 | A8             A2 | 2    *    *                   DAC
+ RX1 / SCK   TCC03         *    9 | A9            Vdd |
+     SDA     TC10     *   NMI  14 | A14           Gnd |
+     SCL     TC11     *    *   15 | A15           A25 | 25                    USB/DP
+BOOT                           28 | A28/RST       A24 | 24                    USB/DM
+SWDCLK  MISO                   30 | A30           A31 | 31   *                SS    SWDIO
+                                   -------------------
+
+* Some pins can be used for more than one function. The same port pin number printed on
+  the board is also used in Arduino (without the 'A') for all of the supported functions
+  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* When using ONE_UART_NO_WIRE_ONE_SPI, Serial1() refers to TX2/RX2 instead of TX1/RX1.
+* Tone available on TC2. TC2 is not routed to pins with the D11C14A.
+* DO NOT connect voltages higher than 3.3V!
+```
+
+
+# Pins descriptions for Generic ATsamD11C14A
+## PIN_MAP_STANDARD
+====================================================================================================================================
+Arduino	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| ----	| NOT A PIN		| NOT A PIN
+1	| ----	| NOT A PIN		| NOT A PIN
+2	| PA02	| DAC			| EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+3	| ----	| NOT A PIN		| NOT A PIN
+4	| PA04	| REFB / TX2* / TCC00	| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[2] AC/AIN[0] PTC/Y[2] SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+5	| PA05	| RX2* / TCC01		| EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+6	| ----	| NOT A PIN		| NOT A PIN
+7	| ----	| NOT A PIN		| NOT A PIN
+8	| PA08	| TX1 / MOSI / TCC02	| EIC/EXTINT[6] SERCOM1/PAD[2] !SERCOM0/PAD[2] TCC0/WO[2] !TCC0/WO[4] Xin32 / Xin
+9	| PA09	| RX1 / SCK / TCC03	| EIC/EXTINT[7] SERCOM1/PAD[3] !SERCOM0/PAD[3] TCC0/WO[3] !TCC0/WO[5] Xout32 / Xout
+10	| ----	| NOT A PIN		| NOT A PIN
+11	| ----	| NOT A PIN		| NOT A PIN
+12	| ----	| NOT A PIN		| NOT A PIN
+13	| ----	| NOT A PIN		| NOT A PIN
+14	| PA14	| SDA / TC10		| EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] TC1/WO[0] !TCC0/WO[0]
+15	| PA15	| SCL / TC11		| EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] TC1/WO[1] !TCC0/WO[1]
+16	| ----	| NOT A PIN		| NOT A PIN
+17	| ----	| NOT A PIN		| NOT A PIN
+18	| ----	| NOT A PIN		| NOT A PIN
+19	| ----	| NOT A PIN		| NOT A PIN
+20	| ----	| NOT A PIN		| NOT A PIN
+21	| ----	| NOT A PIN		| NOT A PIN
+22	| ----	| NOT A PIN		| NOT A PIN
+23	| ----	| NOT A PIN		| NOT A PIN
+24	| PA24	| USB_NEGATIVE		| USB/DM
+25	| PA25	| USB_POSITIVE		| USB/DP
+26	| ----	| NOT A PIN		| NOT A PIN
+27	| ----	| NOT A PIN		| NOT A PIN
+28	| PA28	| Reset			| Reset, BOOT (double tap bootloader entry)
+29	| ----	| NOT A PIN		| NOT A PIN
+30	| PA30	| MISO / SWD CLK	| !EIC/EXTINT[2] SERCOM1/PAD[0] !SERCOM1/PAD[2] !TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+31	| PA31	| SS / SWD IO		| EIC/EXTINT[3] SERCOM1/PAD[1] !SERCOM1/PAD[3] !TC2/WO[1] !TCC0/WO[3] SWD IO
+====================================================================================================================================
+
+## PIN_MAP_COMPACT
+====================================================================================================================================
+Arduino	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| PA02	| DAC			| EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+1	| PA04	| REFB / TX2* / TCC00	| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[2] AC/AIN[0] PTC/Y[2] SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+2	| PA05	| RX2* / TCC01		| EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+3	| PA08	| TX1 / MOSI / TCC02	| EIC/EXTINT[6] SERCOM1/PAD[2] !SERCOM0/PAD[2] TCC0/WO[2] !TCC0/WO[4] Xin32 / Xin
+4	| PA09	| RX1 / SCK / TCC03	| EIC/EXTINT[7] SERCOM1/PAD[3] !SERCOM0/PAD[3] TCC0/WO[3] !TCC0/WO[5] Xout32 / Xout
+5	| PA14	| SDA / TC10		| EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] TC1/WO[0] !TCC0/WO[0]
+6	| PA15	| SCL / TC11		| EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] TC1/WO[1] !TCC0/WO[1]
+7	| PA24	| USB_NEGATIVE		| USB/DM
+8	| PA25	| USB_POSITIVE		| USB/DP
+9	| PA28	| Reset			| Reset, BOOT (double tap bootloader entry)
+10	| PA30	| MISO / SWD CLK	| !EIC/EXTINT[2] SERCOM1/PAD[0] !SERCOM1/PAD[2] !TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+11	| PA31	| SS / SWD IO		| EIC/EXTINT[3] SERCOM1/PAD[1] !SERCOM1/PAD[3] !TC2/WO[1] !TCC0/WO[3] SWD IO
+====================================================================================================================================
+
+* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
+  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* NOT A PIN means the Arduino pin number is not mapped to a physical pin.
+* Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+* The tone library uses TC2. TC2 is not routed to pins with the D11C14A (14-pin).
+* Pins 8 and 9 are by default connected to the 32.768KHz crystal.
+* When using ONE_UART_NO_WIRE_ONE_SPI, Serial1() refers to TX2/RX2 instead of TX1/RX1.
+* SERCOM2 does not exist on the D11C14A.
+
+
+# PinDescription table format
+
+## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+## Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+## Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+## See WVariant.h in cores/arduino for the definitions used in the table.
+
+### Port:
+This is the port (ie: PORTA).
+
+### Pin:
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType:
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/Generic_D11C14A/debug_scripts/SAMD11C14A.gdb b/variants/Generic_D11C14A/debug_scripts/SAMD11C14A.gdb
new file mode 100644
index 000000000..ff7008e6e
--- /dev/null
+++ b/variants/Generic_D11C14A/debug_scripts/SAMD11C14A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11c14a" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Generic_D11C14A/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld b/variants/Generic_D11C14A/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
new file mode 100644
index 000000000..1e2d5f052
--- /dev/null
+++ b/variants/Generic_D11C14A/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x1000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Generic_D11C14A/linker_scripts/gcc/No_Bootloader/flash_16KB.ld b/variants/Generic_D11C14A/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
new file mode 100644
index 000000000..bd135b3dd
--- /dev/null
+++ b/variants/Generic_D11C14A/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Generic_D11C14A/openocd_scripts/SAMD11C14A.cfg b/variants/Generic_D11C14A/openocd_scripts/SAMD11C14A.cfg
new file mode 100644
index 000000000..2e1525a73
--- /dev/null
+++ b/variants/Generic_D11C14A/openocd_scripts/SAMD11C14A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd11c14a
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/Generic_D11C14A/pins_arduino.h b/variants/Generic_D11C14A/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/Generic_D11C14A/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/Generic_D11C14A/variant.cpp b/variants/Generic_D11C14A/variant.cpp
new file mode 100644
index 000000000..878482282
--- /dev/null
+++ b/variants/Generic_D11C14A/variant.cpp
@@ -0,0 +1,115 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+#if defined PIN_MAP_STANDARD
+const PinDescription g_APinDescription[]=
+{
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH2, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH0, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SWD IO
+} ;
+#elif defined PIN_MAP_COMPACT
+const PinDescription g_APinDescription[]=
+{
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH2, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH0, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+	{ PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SWD IO
+} ;
+#endif
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TC1, TC2 } ;
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+
+#if defined(ONE_UART) || defined(TWO_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+#if defined (ONE_SPI)
+void SERCOM0_Handler()
+{
+  Serial1.IrqHandler();
+}
+#else
+void SERCOM1_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
+#endif
+
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial2.IrqHandler();
+}
+#endif
diff --git a/variants/Generic_D11C14A/variant.h b/variants/Generic_D11C14A/variant.h
new file mode 100644
index 000000000..20998f1c5
--- /dev/null
+++ b/variants/Generic_D11C14A/variant.h
@@ -0,0 +1,333 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+#ifndef _VARIANT_MATTAIRTECH_D11C14A_
+#define _VARIANT_MATTAIRTECH_D11C14A_
+
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
+/*----------------------------------------------------------------------------
+ *        Definitions
+ *----------------------------------------------------------------------------*/
+
+/** Frequency of the board main oscillator */
+#define VARIANT_MAINOSC		(32768ul)
+
+/** Master clock frequency */
+#define VARIANT_MCK		(48000000ul)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+#include "sam.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define PIN_MAP_STANDARD
+//#define PIN_MAP_COMPACT
+
+#if defined PIN_MAP_STANDARD
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
+#elif defined PIN_MAP_COMPACT
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (12u)
+#else
+  #error "variant.h: You must set PIN_MAP_STANDARD or PIN_MAP_COMPACT"
+#endif
+
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
+#define NUM_ANALOG_INPUTS    (5u)
+#define NUM_ANALOG_OUTPUTS   (1u)
+#define analogInputToDigitalPin(p)  (p)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_LED_13           (5u)
+#define PIN_LED_RXL          (8u)
+#define PIN_LED_TXL          (9u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_LED_13           (2u)
+#define PIN_LED_RXL          (3u)
+#define PIN_LED_TXL          (4u)
+#endif
+
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+/*
+ * Analog pins
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_A2               (2ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A14              (14ul)
+#define PIN_A15              (15ul)
+#define PIN_DAC0             (2ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_A2               (0ul)
+#define PIN_A4               (1ul)
+#define PIN_A5               (2ul)
+#define PIN_A14              (5ul)
+#define PIN_A15              (6ul)
+#define PIN_DAC0             (2ul)
+#endif
+
+static const uint8_t A2   = PIN_A2;
+static const uint8_t A4   = PIN_A4;
+static const uint8_t A5   = PIN_A5;
+static const uint8_t A14  = PIN_A14;
+static const uint8_t A15  = PIN_A15;
+static const uint8_t DAC0 = PIN_DAC0;
+
+
+#define ADC_RESOLUTION		12
+
+// #define REMAP_ANALOG_PIN_ID(pin)	if ( pin < A0 ) pin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#if defined PIN_MAP_STANDARD
+#define REFB_PIN    (4ul)
+#elif defined PIN_MAP_COMPACT
+#define REFB_PIN    (1ul)
+#endif
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#if defined PIN_MAP_STANDARD
+#define PIN_ATN              (15ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_ATN              (6ul)
+#endif
+static const uint8_t ATN = PIN_ATN;
+
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#if defined(ONE_UART) && defined (ONE_SPI)
+  #if defined PIN_MAP_STANDARD
+    #define PIN_SERIAL1_RX       (5ul)
+    #define PIN_SERIAL1_TX       (4ul)
+  #elif defined PIN_MAP_COMPACT
+    #define PIN_SERIAL1_RX       (2ul)
+    #define PIN_SERIAL1_TX       (1ul)
+  #endif
+  
+  #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+  #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+  #define SERCOM_INSTANCE_SERIAL1       &sercom0
+#else
+  #if defined PIN_MAP_STANDARD
+    #define PIN_SERIAL1_RX       (9ul)
+    #define PIN_SERIAL1_TX       (8ul)
+  #elif defined PIN_MAP_COMPACT
+    #define PIN_SERIAL1_RX       (4ul)
+    #define PIN_SERIAL1_TX       (3ul)
+  #endif
+  
+  #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+  #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+  #define SERCOM_INSTANCE_SERIAL1       &sercom1
+#endif
+
+// Serial2
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL2_RX       (5ul)
+#define PIN_SERIAL2_TX       (4ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL2_RX       (2ul)
+#define PIN_SERIAL2_TX       (1ul)
+#endif
+
+#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_3)
+#define SERCOM_INSTANCE_SERIAL2       &sercom0
+
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 1
+
+#if defined PIN_MAP_STANDARD
+#define PIN_SPI_MISO         (30u)
+#define PIN_SPI_MOSI         (8u)
+#define PIN_SPI_SCK          (9u)
+#define PIN_SPI_SS           (31u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SPI_MISO         (10u)
+#define PIN_SPI_MOSI         (3u)
+#define PIN_SPI_SCK          (4u)
+#define PIN_SPI_SS           (11u)
+#endif
+
+#define PERIPH_SPI           sercom1
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#if defined PIN_MAP_STANDARD
+#define PIN_WIRE_SDA         (14u)
+#define PIN_WIRE_SCL         (15u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_WIRE_SDA         (5u)
+#define PIN_WIRE_SCL         (6u)
+#endif
+
+#define PERIPH_WIRE          sercom0
+#define WIRE_IT_HANDLER      SERCOM0_Handler
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+
+/*
+ * USB
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+#define PIN_USB_HOST_ENABLE             (14ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_USB_DM                      (7ul)
+#define PIN_USB_DP                      (8ul)
+#define PIN_USB_HOST_ENABLE             (5ul)
+#endif
+
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+
+extern Uart Serial1;
+extern Uart Serial2;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#define SERIAL_PORT_MONITOR         Serial1
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+#define Serial                      SerialUSB
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */

From 5e375146b7d41d06f4e19241a6675abc58d46cf2 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 15 Apr 2017 20:15:21 +0000
Subject: [PATCH 087/124] Added new clock code, added MT-D21E Rev B support,
 and numerous changes to get the L21 and C21 to work

---
 boards.txt                                 | 395 +++++++++++----------
 bootloaders/zero/board_init.c              |   9 +-
 bootloaders/zero/main.c                    |  64 ++--
 cores/arduino/Arduino.h                    |  11 +-
 cores/arduino/SERCOM.h                     |   5 +
 cores/arduino/Tone.cpp                     |  20 +-
 cores/arduino/USB/CDC.cpp                  |   2 +
 cores/arduino/USB/SAMD21_USBDevice.h       |   4 +
 cores/arduino/USB/USBCore.cpp              |   6 +-
 cores/arduino/USB/USBCore.h                |   8 +
 cores/arduino/USB/samd21_host.c            |   2 +
 cores/arduino/WInterrupts.c                |  42 ++-
 cores/arduino/WVariant.h                   |  11 +-
 cores/arduino/cortex_handlers.c            |  39 +-
 cores/arduino/delay.c                      |   2 +
 cores/arduino/startup.c                    | 385 +++++++++++++-------
 cores/arduino/wiring.c                     | 102 ++++--
 cores/arduino/wiring_analog.c              | 154 ++++----
 cores/arduino/wiring_private.c             |  56 ++-
 extras/package_index.json.Beta.template    |   8 +-
 extras/package_index.json.PR.template      |   8 +-
 extras/package_index.json.Release.template |   2 +-
 platform.txt                               |  18 +-
 variants/Generic_D11C14A/variant.h         |  32 +-
 variants/MT_D11/variant.h                  |  32 +-
 variants/MT_D21E/variant.h                 |  32 +-
 variants/MT_D21E_revB/variant.cpp          |   2 +-
 variants/MT_D21E_revB/variant.h            |  58 ++-
 variants/arduino_mzero/variant.h           |  33 +-
 variants/arduino_zero/variant.h            |  33 +-
 30 files changed, 1034 insertions(+), 541 deletions(-)

diff --git a/boards.txt b/boards.txt
index 125a7b42a..0b99f5efe 100644
--- a/boards.txt
+++ b/boards.txt
@@ -20,18 +20,183 @@ menu.usb=USB Config
 menu.serial=Serial Config
 menu.bootloader=Bootloader Size
 
+
+# MattairTech MT-D21E (rev B)
+mattairtech_mt_d21e_revb.name=MattairTech MT-D21E (rev B)
+mattairtech_mt_d21e_revb.vid.0=0x16D0
+mattairtech_mt_d21e_revb.pid.0=0x0557
+mattairtech_mt_d21e_revb.vid.1=0x16D0
+mattairtech_mt_d21e_revb.pid.1=0x0856
+mattairtech_mt_d21e_revb.vid.2=0x16D0
+mattairtech_mt_d21e_revb.pid.2=0x0B41
+mattairtech_mt_d21e_revb.vid.3=0x16D0
+mattairtech_mt_d21e_revb.pid.3=0x0B40
+mattairtech_mt_d21e_revb.vid.4=0x16D0
+mattairtech_mt_d21e_revb.pid.4=0x0A0C
+mattairtech_mt_d21e_revb.vid.5=0x16D0
+mattairtech_mt_d21e_revb.pid.5=0x0856
+mattairtech_mt_d21e_revb.build.mcu=cortex-m0plus
+mattairtech_mt_d21e_revb.build.f_cpu=48000000L
+mattairtech_mt_d21e_revb.build.usb_product="MT-D21E Rev B"
+mattairtech_mt_d21e_revb.build.usb_manufacturer="MattairTech LLC"
+mattairtech_mt_d21e_revb.build.board=SAMD_ZERO
+mattairtech_mt_d21e_revb.build.core=arduino
+mattairtech_mt_d21e_revb.build.variant=MT_D21E_revB
+mattairtech_mt_d21e_revb.build.variant_system_lib=
+mattairtech_mt_d21e_revb.build.vid=0x16D0
+mattairtech_mt_d21e_revb.upload.protocol=sam-ba
+mattairtech_mt_d21e_revb.bootloader.tool=arduino:openocd
+mattairtech_mt_d21e_revb.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mattairtech_mt_d21e_revb.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
+mattairtech_mt_d21e_revb.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+mattairtech_mt_d21e_revb.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+mattairtech_mt_d21e_revb.menu.clock.internal=INTERNAL_OSCILLATOR
+mattairtech_mt_d21e_revb.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mattairtech_mt_d21e_revb.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
+mattairtech_mt_d21e_revb.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mattairtech_mt_d21e_revb.menu.cpu.samd21e18a=SAMD21E18A
+mattairtech_mt_d21e_revb.menu.cpu.samd21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e_revb.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.samd21e18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samd21e18a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E18A.bin
+mattairtech_mt_d21e_revb.menu.cpu.samd21e17a=SAMD21E17A
+mattairtech_mt_d21e_revb.menu.cpu.samd21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e_revb.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.samd21e17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samd21e17a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E17A.bin
+mattairtech_mt_d21e_revb.menu.cpu.samd21e16a=SAMD21E16A
+mattairtech_mt_d21e_revb.menu.cpu.samd21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e_revb.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.samd21e16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samd21e16a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E16A.bin
+mattairtech_mt_d21e_revb.menu.cpu.samd21e15a=SAMD21E15A
+mattairtech_mt_d21e_revb.menu.cpu.samd21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e_revb.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.samd21e15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samd21e15a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E15A.bin
+mattairtech_mt_d21e_revb.menu.cpu.saml21e18b=SAML21E18B
+mattairtech_mt_d21e_revb.menu.cpu.saml21e18b.upload.maximum_size=253952
+mattairtech_mt_d21e_revb.menu.cpu.saml21e18b.build.extra_flags=-D__SAML21E18B__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.saml21e18b.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.saml21e18b.build.openocdscript=openocd_scripts/SAML21E18B.cfg
+mattairtech_mt_d21e_revb.menu.cpu.saml21e18b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E18B.bin
+mattairtech_mt_d21e_revb.menu.cpu.saml21e17b=SAML21E17B
+mattairtech_mt_d21e_revb.menu.cpu.saml21e17b.upload.maximum_size=122880
+mattairtech_mt_d21e_revb.menu.cpu.saml21e17b.build.extra_flags=-D__SAML21E17B__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.saml21e17b.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.saml21e17b.build.openocdscript=openocd_scripts/SAML21E17B.cfg
+mattairtech_mt_d21e_revb.menu.cpu.saml21e17b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E17B.bin
+mattairtech_mt_d21e_revb.menu.cpu.saml21e16b=SAML21E16B
+mattairtech_mt_d21e_revb.menu.cpu.saml21e16b.upload.maximum_size=57344
+mattairtech_mt_d21e_revb.menu.cpu.saml21e16b.build.extra_flags=-D__SAML21E16B__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.saml21e16b.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.saml21e16b.build.openocdscript=openocd_scripts/SAML21E16B.cfg
+mattairtech_mt_d21e_revb.menu.cpu.saml21e16b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E16B.bin
+mattairtech_mt_d21e_revb.menu.cpu.saml21e15b=SAML21E15B
+mattairtech_mt_d21e_revb.menu.cpu.saml21e15b.upload.maximum_size=24576
+mattairtech_mt_d21e_revb.menu.cpu.saml21e15b.build.extra_flags=-D__SAML21E15B__ {build.usb_flags}
+mattairtech_mt_d21e_revb.menu.cpu.saml21e15b.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.saml21e15b.build.openocdscript=openocd_scripts/SAML21E15B.cfg
+mattairtech_mt_d21e_revb.menu.cpu.saml21e15b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E15B.bin
+mattairtech_mt_d21e_revb.menu.cpu.samc21e18a=SAMC21E18A
+mattairtech_mt_d21e_revb.menu.cpu.samc21e18a.upload.maximum_size=253952
+mattairtech_mt_d21e_revb.menu.cpu.samc21e18a.build.extra_flags=-D__SAMC21E18A__
+mattairtech_mt_d21e_revb.menu.cpu.samc21e18a.build.ldscript=flash_256KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samc21e18a.build.openocdscript=openocd_scripts/SAMC21E18A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samc21e18a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E18A.bin
+mattairtech_mt_d21e_revb.menu.cpu.samc21e17a=SAMC21E17A
+mattairtech_mt_d21e_revb.menu.cpu.samc21e17a.upload.maximum_size=122880
+mattairtech_mt_d21e_revb.menu.cpu.samc21e17a.build.extra_flags=-D__SAMC21E17A__
+mattairtech_mt_d21e_revb.menu.cpu.samc21e17a.build.ldscript=flash_128KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samc21e17a.build.openocdscript=openocd_scripts/SAMC21E17A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samc21e17a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E17A.bin
+mattairtech_mt_d21e_revb.menu.cpu.samc21e16a=SAMC21E16A
+mattairtech_mt_d21e_revb.menu.cpu.samc21e16a.upload.maximum_size=57344
+mattairtech_mt_d21e_revb.menu.cpu.samc21e16a.build.extra_flags=-D__SAMC21E16A__
+mattairtech_mt_d21e_revb.menu.cpu.samc21e16a.build.ldscript=flash_64KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samc21e16a.build.openocdscript=openocd_scripts/SAMC21E16A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samc21e16a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E16A.bin
+mattairtech_mt_d21e_revb.menu.cpu.samc21e15a=SAMC21E15A
+mattairtech_mt_d21e_revb.menu.cpu.samc21e15a.upload.maximum_size=24576
+mattairtech_mt_d21e_revb.menu.cpu.samc21e15a.build.extra_flags=-D__SAMC21E15A__
+mattairtech_mt_d21e_revb.menu.cpu.samc21e15a.build.ldscript=flash_32KB.ld
+mattairtech_mt_d21e_revb.menu.cpu.samc21e15a.build.openocdscript=openocd_scripts/SAMC21E15A.cfg
+mattairtech_mt_d21e_revb.menu.cpu.samc21e15a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E15A.bin
+mattairtech_mt_d21e_revb.menu.bootloader.8kb=8KB_BOOTLOADER
+mattairtech_mt_d21e_revb.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+mattairtech_mt_d21e_revb.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+mattairtech_mt_d21e_revb.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21e_revb.menu.bootloader.8kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21e_revb.menu.bootloader.8kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21e_revb.menu.bootloader.8kb.upload.native_usb=true
+mattairtech_mt_d21e_revb.menu.bootloader.16kb=16KB_BOOTLOADER
+mattairtech_mt_d21e_revb.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+mattairtech_mt_d21e_revb.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+mattairtech_mt_d21e_revb.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_mt_d21e_revb.menu.bootloader.16kb.upload.use_1200bps_touch=true
+mattairtech_mt_d21e_revb.menu.bootloader.16kb.upload.wait_for_upload_port=true
+mattairtech_mt_d21e_revb.menu.bootloader.16kb.upload.native_usb=true
+mattairtech_mt_d21e_revb.menu.bootloader.0kb=NO_BOOTLOADER
+mattairtech_mt_d21e_revb.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mattairtech_mt_d21e_revb.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mattairtech_mt_d21e_revb.menu.bootloader.0kb.upload.tool=arduino:openocd
+mattairtech_mt_d21e_revb.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mattairtech_mt_d21e_revb.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mattairtech_mt_d21e_revb.menu.bootloader.0kb.upload.native_usb=false
+mattairtech_mt_d21e_revb.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e_revb.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mattairtech_mt_d21e_revb.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.usb.cdc=CDC_ONLY
+mattairtech_mt_d21e_revb.menu.usb.cdc.build.usbcom=CDC_ONLY
+mattairtech_mt_d21e_revb.menu.usb.cdc.build.pid=0x0557
+mattairtech_mt_d21e_revb.menu.usb.cdc_hid=CDC_HID
+mattairtech_mt_d21e_revb.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mattairtech_mt_d21e_revb.menu.usb.cdc_hid.build.pid=0x0856
+mattairtech_mt_d21e_revb.menu.usb.withcdc=WITH_CDC
+mattairtech_mt_d21e_revb.menu.usb.withcdc.build.usbcom=WITH_CDC
+mattairtech_mt_d21e_revb.menu.usb.withcdc.build.pid=0x0B41
+mattairtech_mt_d21e_revb.menu.usb.hid=HID_ONLY
+mattairtech_mt_d21e_revb.menu.usb.hid.build.usbcom=HID_ONLY
+mattairtech_mt_d21e_revb.menu.usb.hid.build.pid=0x0B40
+mattairtech_mt_d21e_revb.menu.usb.nocdc=WITHOUT_CDC
+mattairtech_mt_d21e_revb.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mattairtech_mt_d21e_revb.menu.usb.nocdc.build.pid=0x0A0C
+mattairtech_mt_d21e_revb.menu.usb.none=USB_DISABLED
+mattairtech_mt_d21e_revb.menu.usb.none.build.usbcom=USB_DISABLED
+mattairtech_mt_d21e_revb.menu.usb.none.build.pid=0x0856
+
+
 # MattairTech MT-D21E
-mattairtech_mt_d21e.name=MattairTech MT-D21E
+mattairtech_mt_d21e.name=MattairTech MT-D21E (rev A)
 mattairtech_mt_d21e.vid.0=0x16D0
 mattairtech_mt_d21e.pid.0=0x0557
 mattairtech_mt_d21e.vid.1=0x16D0
 mattairtech_mt_d21e.pid.1=0x0856
 mattairtech_mt_d21e.vid.2=0x16D0
 mattairtech_mt_d21e.pid.2=0x0B41
+mattairtech_mt_d21e.vid.3=0x16D0
+mattairtech_mt_d21e.pid.3=0x0B40
+mattairtech_mt_d21e.vid.4=0x16D0
+mattairtech_mt_d21e.pid.4=0x0A0C
+mattairtech_mt_d21e.vid.5=0x16D0
+mattairtech_mt_d21e.pid.5=0x0856
 mattairtech_mt_d21e.build.mcu=cortex-m0plus
 mattairtech_mt_d21e.build.f_cpu=48000000L
-mattairtech_mt_d21e.build.usb_product="MT-D21E"
-mattairtech_mt_d21e.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d21e.build.usb_product="MT-D21E Rev A"
+mattairtech_mt_d21e.build.usb_manufacturer="MattairTech LLC"
 mattairtech_mt_d21e.build.board=SAMD_ZERO
 mattairtech_mt_d21e.build.core=arduino
 mattairtech_mt_d21e.build.variant=MT_D21E
@@ -40,12 +205,12 @@ mattairtech_mt_d21e.build.vid=0x16D0
 mattairtech_mt_d21e.upload.protocol=sam-ba
 mattairtech_mt_d21e.bootloader.tool=arduino:openocd
 mattairtech_mt_d21e.menu.clock.crystal_32k=32KHZ_CRYSTAL
-mattairtech_mt_d21e.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mattairtech_mt_d21e.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
 mattairtech_mt_d21e.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
 mattairtech_mt_d21e.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
-mattairtech_mt_d21e.menu.clock.internal=INTERNAL
+mattairtech_mt_d21e.menu.clock.internal=INTERNAL_OSCILLATOR
 mattairtech_mt_d21e.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
-mattairtech_mt_d21e.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mattairtech_mt_d21e.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
 mattairtech_mt_d21e.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
 mattairtech_mt_d21e.menu.cpu.samd21e18a=SAMD21E18A
 mattairtech_mt_d21e.menu.cpu.samd21e18a.upload.maximum_size=253952
@@ -71,166 +236,14 @@ mattairtech_mt_d21e.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {buil
 mattairtech_mt_d21e.menu.cpu.samd21e15a.build.ldscript=flash_32KB.ld
 mattairtech_mt_d21e.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
 mattairtech_mt_d21e.menu.cpu.samd21e15a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E15A.bin
-mattairtech_mt_d21e.menu.bootloader.8kb=8KB
+mattairtech_mt_d21e.menu.bootloader.8kb=8KB_BOOTLOADER
 mattairtech_mt_d21e.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
 mattairtech_mt_d21e.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
 mattairtech_mt_d21e.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
 mattairtech_mt_d21e.menu.bootloader.8kb.upload.use_1200bps_touch=true
 mattairtech_mt_d21e.menu.bootloader.8kb.upload.wait_for_upload_port=true
 mattairtech_mt_d21e.menu.bootloader.8kb.upload.native_usb=true
-mattairtech_mt_d21e.menu.bootloader.16kb=16KB
-mattairtech_mt_d21e.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
-mattairtech_mt_d21e.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
-mattairtech_mt_d21e.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
-mattairtech_mt_d21e.menu.bootloader.16kb.upload.use_1200bps_touch=true
-mattairtech_mt_d21e.menu.bootloader.16kb.upload.wait_for_upload_port=true
-mattairtech_mt_d21e.menu.bootloader.16kb.upload.native_usb=true
-mattairtech_mt_d21e.menu.bootloader.0kb=NO_BOOTLOADER
-mattairtech_mt_d21e.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
-mattairtech_mt_d21e.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
-mattairtech_mt_d21e.menu.bootloader.0kb.upload.tool=arduino:openocd
-mattairtech_mt_d21e.menu.bootloader.0kb.upload.use_1200bps_touch=false
-mattairtech_mt_d21e.menu.bootloader.0kb.upload.wait_for_upload_port=false
-mattairtech_mt_d21e.menu.bootloader.0kb.upload.native_usb=false
-mattairtech_mt_d21e.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
-mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_uart=ONE_UART
-mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
-mattairtech_mt_d21e.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
-mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_uart=TWO_UART
-mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
-mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_uart=NO_UART
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
-mattairtech_mt_d21e.menu.usb.cdc=CDC_ONLY
-mattairtech_mt_d21e.menu.usb.cdc.build.usbcom=CDC_ONLY
-mattairtech_mt_d21e.menu.usb.cdc.build.pid=0x0557
-mattairtech_mt_d21e.menu.usb.cdc_hid=CDC_HID
-mattairtech_mt_d21e.menu.usb.cdc_hid.build.usbcom=CDC_HID
-mattairtech_mt_d21e.menu.usb.cdc_hid.build.pid=0x0856
-mattairtech_mt_d21e.menu.usb.withcdc=WITH_CDC
-mattairtech_mt_d21e.menu.usb.withcdc.build.usbcom=WITH_CDC
-mattairtech_mt_d21e.menu.usb.withcdc.build.pid=0x0B41
-mattairtech_mt_d21e.menu.usb.hid=HID_ONLY
-mattairtech_mt_d21e.menu.usb.hid.build.usbcom=HID_ONLY
-mattairtech_mt_d21e.menu.usb.hid.build.pid=0x0B40
-mattairtech_mt_d21e.menu.usb.nocdc=WITHOUT_CDC
-mattairtech_mt_d21e.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
-mattairtech_mt_d21e.menu.usb.nocdc.build.pid=0x0A0C
-mattairtech_mt_d21e.menu.usb.none=USB_DISABLED
-mattairtech_mt_d21e.menu.usb.none.build.usbcom=USB_DISABLED
-mattairtech_mt_d21e.menu.usb.none.build.pid=0x0856
-
-
-# MattairTech MT-D21E (rev B)
-mattairtech_mt_d21e.name=MattairTech MT-D21E (rev B)
-mattairtech_mt_d21e.vid.0=0x16D0
-mattairtech_mt_d21e.pid.0=0x0557
-mattairtech_mt_d21e.vid.1=0x16D0
-mattairtech_mt_d21e.pid.1=0x0856
-mattairtech_mt_d21e.vid.2=0x16D0
-mattairtech_mt_d21e.pid.2=0x0B41
-mattairtech_mt_d21e.build.mcu=cortex-m0plus
-mattairtech_mt_d21e.build.f_cpu=48000000L
-mattairtech_mt_d21e.build.usb_product="MT-D21E"
-mattairtech_mt_d21e.build.usb_manufacturer="MattairTech"
-mattairtech_mt_d21e.build.board=SAMD_ZERO
-mattairtech_mt_d21e.build.core=arduino
-mattairtech_mt_d21e.build.variant=MT_D21E_revB
-mattairtech_mt_d21e.build.variant_system_lib=
-mattairtech_mt_d21e.build.vid=0x16D0
-mattairtech_mt_d21e.upload.protocol=sam-ba
-mattairtech_mt_d21e.bootloader.tool=arduino:openocd
-mattairtech_mt_d21e.menu.clock.crystal_32k=32KHZ_CRYSTAL
-mattairtech_mt_d21e.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
-mattairtech_mt_d21e.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
-mattairtech_mt_d21e.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
-mattairtech_mt_d21e.menu.clock.internal=INTERNAL
-mattairtech_mt_d21e.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
-mattairtech_mt_d21e.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
-mattairtech_mt_d21e.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
-mattairtech_mt_d21e.menu.cpu.samd21e18a=SAMD21E18A
-mattairtech_mt_d21e.menu.cpu.samd21e18a.upload.maximum_size=253952
-mattairtech_mt_d21e.menu.cpu.samd21e18a.build.extra_flags=-D__SAMD21E18A__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.samd21e18a.build.ldscript=flash_256KB.ld
-mattairtech_mt_d21e.menu.cpu.samd21e18a.build.openocdscript=openocd_scripts/SAMD21E18A.cfg
-mattairtech_mt_d21e.menu.cpu.samd21e18a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E18A.bin
-mattairtech_mt_d21e.menu.cpu.samd21e17a=SAMD21E17A
-mattairtech_mt_d21e.menu.cpu.samd21e17a.upload.maximum_size=122880
-mattairtech_mt_d21e.menu.cpu.samd21e17a.build.extra_flags=-D__SAMD21E17A__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.samd21e17a.build.ldscript=flash_128KB.ld
-mattairtech_mt_d21e.menu.cpu.samd21e17a.build.openocdscript=openocd_scripts/SAMD21E17A.cfg
-mattairtech_mt_d21e.menu.cpu.samd21e17a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E17A.bin
-mattairtech_mt_d21e.menu.cpu.samd21e16a=SAMD21E16A
-mattairtech_mt_d21e.menu.cpu.samd21e16a.upload.maximum_size=57344
-mattairtech_mt_d21e.menu.cpu.samd21e16a.build.extra_flags=-D__SAMD21E16A__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.samd21e16a.build.ldscript=flash_64KB.ld
-mattairtech_mt_d21e.menu.cpu.samd21e16a.build.openocdscript=openocd_scripts/SAMD21E16A.cfg
-mattairtech_mt_d21e.menu.cpu.samd21e16a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E16A.bin
-mattairtech_mt_d21e.menu.cpu.samd21e15a=SAMD21E15A
-mattairtech_mt_d21e.menu.cpu.samd21e15a.upload.maximum_size=24576
-mattairtech_mt_d21e.menu.cpu.samd21e15a.build.extra_flags=-D__SAMD21E15A__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.samd21e15a.build.ldscript=flash_32KB.ld
-mattairtech_mt_d21e.menu.cpu.samd21e15a.build.openocdscript=openocd_scripts/SAMD21E15A.cfg
-mattairtech_mt_d21e.menu.cpu.samd21e15a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E15A.bin
-mattairtech_mt_d21e.menu.cpu.saml21e18b=SAML21E18B
-mattairtech_mt_d21e.menu.cpu.saml21e18b.upload.maximum_size=253952
-mattairtech_mt_d21e.menu.cpu.saml21e18b.build.extra_flags=-D__SAML21E18B__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.saml21e18b.build.ldscript=flash_256KB.ld
-mattairtech_mt_d21e.menu.cpu.saml21e18b.build.openocdscript=openocd_scripts/SAML21E18B.cfg
-mattairtech_mt_d21e.menu.cpu.saml21e18b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E18B.bin
-mattairtech_mt_d21e.menu.cpu.saml21e17b=SAML21E17B
-mattairtech_mt_d21e.menu.cpu.saml21e17b.upload.maximum_size=122880
-mattairtech_mt_d21e.menu.cpu.saml21e17b.build.extra_flags=-D__SAML21E17B__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.saml21e17b.build.ldscript=flash_128KB.ld
-mattairtech_mt_d21e.menu.cpu.saml21e17b.build.openocdscript=openocd_scripts/SAML21E17B.cfg
-mattairtech_mt_d21e.menu.cpu.saml21e17b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E17B.bin
-mattairtech_mt_d21e.menu.cpu.saml21e16b=SAML21E16B
-mattairtech_mt_d21e.menu.cpu.saml21e16b.upload.maximum_size=57344
-mattairtech_mt_d21e.menu.cpu.saml21e16b.build.extra_flags=-D__SAML21E16B__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.saml21e16b.build.ldscript=flash_64KB.ld
-mattairtech_mt_d21e.menu.cpu.saml21e16b.build.openocdscript=openocd_scripts/SAML21E16B.cfg
-mattairtech_mt_d21e.menu.cpu.saml21e16b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E16B.bin
-mattairtech_mt_d21e.menu.cpu.saml21e15b=SAML21E15B
-mattairtech_mt_d21e.menu.cpu.saml21e15b.upload.maximum_size=24576
-mattairtech_mt_d21e.menu.cpu.saml21e15b.build.extra_flags=-D__SAML21E15B__ {build.usb_flags}
-mattairtech_mt_d21e.menu.cpu.saml21e15b.build.ldscript=flash_32KB.ld
-mattairtech_mt_d21e.menu.cpu.saml21e15b.build.openocdscript=openocd_scripts/SAML21E15B.cfg
-mattairtech_mt_d21e.menu.cpu.saml21e15b.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E15B.bin
-mattairtech_mt_d21e.menu.cpu.samc21e18a=SAMC21E18A
-mattairtech_mt_d21e.menu.cpu.samc21e18a.upload.maximum_size=253952
-mattairtech_mt_d21e.menu.cpu.samc21e18a.build.extra_flags=-D__SAMC21E18A__
-mattairtech_mt_d21e.menu.cpu.samc21e18a.build.ldscript=flash_256KB.ld
-mattairtech_mt_d21e.menu.cpu.samc21e18a.build.openocdscript=openocd_scripts/SAMC21E18A.cfg
-mattairtech_mt_d21e.menu.cpu.samc21e18a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E18A.bin
-mattairtech_mt_d21e.menu.cpu.samc21e17a=SAMC21E17A
-mattairtech_mt_d21e.menu.cpu.samc21e17a.upload.maximum_size=122880
-mattairtech_mt_d21e.menu.cpu.samc21e17a.build.extra_flags=-D__SAMC21E17A__
-mattairtech_mt_d21e.menu.cpu.samc21e17a.build.ldscript=flash_128KB.ld
-mattairtech_mt_d21e.menu.cpu.samc21e17a.build.openocdscript=openocd_scripts/SAMC21E17A.cfg
-mattairtech_mt_d21e.menu.cpu.samc21e17a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E17A.bin
-mattairtech_mt_d21e.menu.cpu.samc21e16a=SAMC21E16A
-mattairtech_mt_d21e.menu.cpu.samc21e16a.upload.maximum_size=57344
-mattairtech_mt_d21e.menu.cpu.samc21e16a.build.extra_flags=-D__SAMC21E16A__
-mattairtech_mt_d21e.menu.cpu.samc21e16a.build.ldscript=flash_64KB.ld
-mattairtech_mt_d21e.menu.cpu.samc21e16a.build.openocdscript=openocd_scripts/SAMC21E16A.cfg
-mattairtech_mt_d21e.menu.cpu.samc21e16a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E16A.bin
-mattairtech_mt_d21e.menu.cpu.samc21e15a=SAMC21E15A
-mattairtech_mt_d21e.menu.cpu.samc21e15a.upload.maximum_size=24576
-mattairtech_mt_d21e.menu.cpu.samc21e15a.build.extra_flags=-D__SAMC21E15A__
-mattairtech_mt_d21e.menu.cpu.samc21e15a.build.ldscript=flash_32KB.ld
-mattairtech_mt_d21e.menu.cpu.samc21e15a.build.openocdscript=openocd_scripts/SAMC21E15A.cfg
-mattairtech_mt_d21e.menu.cpu.samc21e15a.bootloader.file=zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E15A.bin
-mattairtech_mt_d21e.menu.bootloader.8kb=8KB
-mattairtech_mt_d21e.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
-mattairtech_mt_d21e.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
-mattairtech_mt_d21e.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
-mattairtech_mt_d21e.menu.bootloader.8kb.upload.use_1200bps_touch=true
-mattairtech_mt_d21e.menu.bootloader.8kb.upload.wait_for_upload_port=true
-mattairtech_mt_d21e.menu.bootloader.8kb.upload.native_usb=true
-mattairtech_mt_d21e.menu.bootloader.16kb=16KB
+mattairtech_mt_d21e.menu.bootloader.16kb=16KB_BOOTLOADER
 mattairtech_mt_d21e.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
 mattairtech_mt_d21e.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
 mattairtech_mt_d21e.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
@@ -284,10 +297,16 @@ mattairtech_mt_d11.vid.1=0x16D0
 mattairtech_mt_d11.pid.1=0x0856
 mattairtech_mt_d11.vid.2=0x16D0
 mattairtech_mt_d11.pid.2=0x0B41
+mattairtech_mt_d11.vid.3=0x16D0
+mattairtech_mt_d11.pid.3=0x0B40
+mattairtech_mt_d11.vid.4=0x16D0
+mattairtech_mt_d11.pid.4=0x0A0C
+mattairtech_mt_d11.vid.5=0x16D0
+mattairtech_mt_d11.pid.5=0x0856
 mattairtech_mt_d11.build.mcu=cortex-m0plus
 mattairtech_mt_d11.build.f_cpu=48000000L
 mattairtech_mt_d11.build.usb_product="MT-D11"
-mattairtech_mt_d11.build.usb_manufacturer="MattairTech"
+mattairtech_mt_d11.build.usb_manufacturer="MattairTech LLC"
 mattairtech_mt_d11.build.board=SAMD_ZERO
 mattairtech_mt_d11.build.core=arduino
 mattairtech_mt_d11.build.variant=MT_D11
@@ -296,18 +315,18 @@ mattairtech_mt_d11.build.vid=0x16D0
 mattairtech_mt_d11.upload.protocol=sam-ba
 mattairtech_mt_d11.bootloader.tool=arduino:openocd
 mattairtech_mt_d11.menu.clock.crystal_32k=32KHZ_CRYSTAL
-mattairtech_mt_d11.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+mattairtech_mt_d11.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
 mattairtech_mt_d11.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
 mattairtech_mt_d11.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
-mattairtech_mt_d11.menu.clock.internal=INTERNAL
+mattairtech_mt_d11.menu.clock.internal=INTERNAL_OSCILLATOR
 mattairtech_mt_d11.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
-mattairtech_mt_d11.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mattairtech_mt_d11.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
 mattairtech_mt_d11.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
 mattairtech_mt_d11.build.extra_flags=-D__SAMD11D14AM__ {build.usb_flags}
-mattairtech_mt_d11.build.ldscript=linker_scripts/gcc/flash_16KB.ld
+mattairtech_mt_d11.build.ldscript=flash_16KB.ld
 mattairtech_mt_d11.build.openocdscript=openocd_scripts/SAMD11D14AM.cfg
 mattairtech_mt_d11.bootloader.file=zero/binaries/sam_ba_MT_D11_SAMD11D14AM.bin
-mattairtech_mt_d11.menu.bootloader.4kb=4KB
+mattairtech_mt_d11.menu.bootloader.4kb=4KB_BOOTLOADER
 mattairtech_mt_d11.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
 mattairtech_mt_d11.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
 mattairtech_mt_d11.menu.bootloader.4kb.upload.tool=MattairTech_Arduino:bossac
@@ -363,10 +382,16 @@ d11c14a.vid.1=0x16D0
 d11c14a.pid.1=0x0856
 d11c14a.vid.2=0x16D0
 d11c14a.pid.2=0x0B41
+d11c14a.vid.3=0x16D0
+d11c14a.pid.3=0x0B40
+d11c14a.vid.4=0x16D0
+d11c14a.pid.4=0x0A0C
+d11c14a.vid.5=0x16D0
+d11c14a.pid.5=0x0856
 d11c14a.build.mcu=cortex-m0plus
 d11c14a.build.f_cpu=48000000L
 d11c14a.build.usb_product="D11C14A"
-d11c14a.build.usb_manufacturer="MattairTech"
+d11c14a.build.usb_manufacturer="MattairTech LLC"
 d11c14a.build.board=SAMD_ZERO
 d11c14a.build.core=arduino
 d11c14a.build.variant=Generic_D11C14A
@@ -374,19 +399,19 @@ d11c14a.build.variant_system_lib=
 d11c14a.build.vid=0x16D0
 d11c14a.upload.protocol=sam-ba
 d11c14a.bootloader.tool=arduino:openocd
+d11c14a.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
+d11c14a.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+d11c14a.menu.clock.internal=INTERNAL_OSCILLATOR
+d11c14a.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
 d11c14a.menu.clock.crystal_32k=32KHZ_CRYSTAL
-d11c14a.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
+d11c14a.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
 d11c14a.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
 d11c14a.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
-d11c14a.menu.clock.internal=INTERNAL
-d11c14a.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
-d11c14a.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
-d11c14a.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
 d11c14a.build.extra_flags=-D__SAMD11C14A__ {build.usb_flags}
-d11c14a.build.ldscript=linker_scripts/gcc/flash_16KB.ld
+d11c14a.build.ldscript=flash_16KB.ld
 d11c14a.build.openocdscript=openocd_scripts/SAMD11C14A.cfg
 d11c14a.bootloader.file=zero/binaries/sam_ba_Generic_D11C14A_SAMD11C14A.bin
-d11c14a.menu.bootloader.4kb=4KB
+d11c14a.menu.bootloader.4kb=4KB_BOOTLOADER
 d11c14a.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
 d11c14a.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
 d11c14a.menu.bootloader.4kb.upload.tool=MattairTech_Arduino:bossac
@@ -482,20 +507,20 @@ arduino_zero.build.vid=0x2341
 arduino_zero.build.pid=0x804d
 arduino_zero.upload.protocol=sam-ba
 arduino_zero.menu.clock.crystal_32k=32KHZ_CRYSTAL
-arduino_zero.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
-arduino_zero.menu.clock.internal=INTERNAL
+arduino_zero.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
+arduino_zero.menu.clock.internal=INTERNAL_OSCILLATOR
 arduino_zero.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
-arduino_zero.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+arduino_zero.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
 arduino_zero.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
 arduino_zero.bootloader.tool=arduino:openocd
 arduino_zero.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
 arduino_zero.build.ldscript=flash_256KB.ld
 arduino_zero.build.openocdscript=openocd_scripts/SAMD21G18A.cfg
-arduino_zero.menu.bootloader.8kb=8KB
+arduino_zero.menu.bootloader.8kb=8KB_BOOTLOADER
 arduino_zero.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
 arduino_zero.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
 arduino_zero.menu.bootloader.8kb.upload.maximum_size=253952
-arduino_zero.menu.bootloader.16kb=16KB
+arduino_zero.menu.bootloader.16kb=16KB_BOOTLOADER
 arduino_zero.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
 arduino_zero.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
 arduino_zero.menu.bootloader.16kb.upload.maximum_size=245760
@@ -587,19 +612,19 @@ mzero.build.f_cpu=48000000L
 mzero.build.usb_product="Arduino M0 / M0 Pro"
 mzero.build.board=SAM_ZERO
 mzero.build.core=arduino
-mzero.build.variant=arduino_m0_m0_pro
+mzero.build.variant=arduino_mzero
 mzero.build.variant_system_lib=
 mzero.menu.clock.crystal_32k=32KHZ_CRYSTAL
-mzero.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32KHZ_CRYSTAL
-mzero.menu.clock.internal=INTERNAL
+mzero.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
+mzero.menu.clock.internal=INTERNAL_OSCILLATOR
 mzero.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
-mzero.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED
+mzero.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
 mzero.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
 mzero.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
 mzero.build.ldscript=flash_256KB.ld
 mzero.build.openocdscript=openocd_scripts/SAMD21G18A.cfg
 mzero.bootloader.tool=arduino:openocd
-mzero.menu.bootloader.16kb=16KB
+mzero.menu.bootloader.16kb=16KB_BOOTLOADER
 mzero.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
 mzero.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
 mzero.menu.bootloader.16kb.upload.maximum_size=245760
@@ -607,7 +632,7 @@ mzero.menu.bootloader.16kb.upload.tool=arduino:avrdude
 mzero.menu.bootloader.16kb.upload.protocol=stk500v2
 mzero.menu.bootloader.16kb.upload.speed=57600
 mzero.menu.bootloader.16kb.build.emu.mcu=atmega2560
-mzero.menu.bootloader.8kb=8KB
+mzero.menu.bootloader.8kb=8KB_BOOTLOADER
 mzero.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
 mzero.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
 mzero.menu.bootloader.8kb.upload.maximum_size=253952
diff --git a/bootloaders/zero/board_init.c b/bootloaders/zero/board_init.c
index 96ca72fc0..85e5c8640 100644
--- a/bootloaders/zero/board_init.c
+++ b/bootloaders/zero/board_init.c
@@ -30,10 +30,6 @@
 #define GENERIC_CLOCK_GENERATOR_XOSC      (1u)
 #define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT (D21/D11) */
 #define GENERIC_CLOCK_GENERATOR_OSC_HS    (3u)
-#define GENERIC_CLOCK_GENERATOR_FDPLL96M  (4u)
-#define GENERIC_CLOCK_GENERATOR_XOSC32K   (5u)
-#define GENERIC_CLOCK_GENERATOR_OSC32K    (6u) /* GCLK6 not available on D11 */
-#define GENERIC_CLOCK_GENERATOR_DFLL48M   (7u) /* only D and L have the DFLL48M, GCLK7 not available on D11 */
 
 // Constants for Clock multiplexers
 #if (SAMD || SAML21)
@@ -374,10 +370,7 @@ void board_init( void )
   waitForSync();
 #endif
 
-  /*
-   * Now that all system clocks are configured, we can set CPU and APBx BUS clocks.
-   * There values are normally the one present after Reset.
-   */
+  /* Set CPU and APB dividers before switching the CPU/APB clocks to the new clock source */
 #if (SAMD)
   PM->CPUSEL.reg  = PM_CPUSEL_CPUDIV_DIV1 ;
   PM->APBASEL.reg = PM_APBASEL_APBADIV_DIV1_Val ;
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 3ea28e943..4789c0005 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -76,6 +76,38 @@ uint32_t* pulSketch_Start_Address;
     return;
   }
 
+#if defined(BOOT_LOAD_PIN)
+  volatile PortGroup *boot_port = (volatile PortGroup *)(&(PORT->Group[BOOT_LOAD_PIN / 32]));
+  volatile bool boot_en;
+
+  // Enable the input mode in Boot GPIO Pin
+  boot_port->DIRCLR.reg = BOOT_PIN_MASK;
+  boot_port->PINCFG[BOOT_LOAD_PIN & 0x1F].reg = PORT_PINCFG_INEN | PORT_PINCFG_PULLEN;
+  boot_port->OUTSET.reg = BOOT_PIN_MASK;
+
+  /* Allow time for debouncing capacitor to charge (10ms) */
+  /* Needed when BOOT_DOUBLE_TAP is not used */
+
+#if (SAMD21 || SAMD11)
+  #define numLoopsDebounce 2500UL
+#elif (SAML21 || SAMC21)
+  #define numLoopsDebounce 10000UL
+#endif
+  for (uint32_t i=0; i<numLoopsDebounce; i++) /* 10ms */
+    /* force compiler to not optimize this... */
+    __asm__ __volatile__("");
+
+  // Read the BOOT_LOAD_PIN status
+  boot_en = (boot_port->IN.reg) & BOOT_PIN_MASK;
+
+  // Check the bootloader enable condition
+  if (!boot_en)
+  {
+    // Stay in bootloader
+    return;
+  }
+#endif
+
 #if defined(BOOT_DOUBLE_TAP_ENABLED)
   #define DOUBLE_TAP_MAGIC 0x07738135
 
@@ -121,38 +153,6 @@ uint32_t* pulSketch_Start_Address;
   }
 #endif
 
-#if defined(BOOT_LOAD_PIN)
-  volatile PortGroup *boot_port = (volatile PortGroup *)(&(PORT->Group[BOOT_LOAD_PIN / 32]));
-  volatile bool boot_en;
-
-  // Enable the input mode in Boot GPIO Pin
-  boot_port->DIRCLR.reg = BOOT_PIN_MASK;
-  boot_port->PINCFG[BOOT_LOAD_PIN & 0x1F].reg = PORT_PINCFG_INEN | PORT_PINCFG_PULLEN;
-  boot_port->OUTSET.reg = BOOT_PIN_MASK;
-
-  /* Allow time for debouncing capacitor to charge (10ms) */
-  /* Needed when BOOT_DOUBLE_TAP is not used */
-
-#if (SAMD21 || SAMD11)
-  #define numLoopsDebounce 2500UL
-#elif (SAML21 || SAMC21)
-  #define numLoopsDebounce 10000UL
-#endif
-  for (uint32_t i=0; i<numLoopsDebounce; i++) /* 10ms */
-    /* force compiler to not optimize this... */
-    __asm__ __volatile__("");
-
-  // Read the BOOT_LOAD_PIN status
-  boot_en = (boot_port->IN.reg) & BOOT_PIN_MASK;
-
-  // Check the bootloader enable condition
-  if (!boot_en)
-  {
-    // Stay in bootloader
-    return;
-  }
-#endif
-
   /* Rebase the Stack Pointer */
   __set_MSP( (uint32_t)(__sketch_vectors_ptr) );
 
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 92a719134..d30d916c2 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -65,8 +65,6 @@ void init( void );
 void setup( void ) ;
 void loop( void ) ;
 
-#include "WVariant.h"
-
 #ifdef __cplusplus
 } // extern "C"
 #endif
@@ -75,6 +73,11 @@ void loop( void ) ;
 #ifdef __cplusplus
   #include "WCharacter.h"
   #include "WString.h"
+
+extern "C"{
+#include "WVariant.h"
+} // extern "C"
+
   #include "Tone.h"
   #include "WMath.h"
   #include "HardwareSerial.h"
@@ -129,7 +132,9 @@ void loop( void ) ;
 #include "USB/USBDesc.h"
 #include "USB/USBCore.h"
 #include "USB/USBAPI.h"
-#include "USB/USB_host.h"
+#if (SAMD21 || SAML21)
+  #include "USB/USB_host.h"
+#endif
 #endif
 
 #endif // Arduino_h
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
index fe9754b0e..1e8a09d36 100644
--- a/cores/arduino/SERCOM.h
+++ b/cores/arduino/SERCOM.h
@@ -23,6 +23,11 @@
 
 #define SERCOM_FREQ_REF F_CPU
 
+// Not defined in CMSIS for SAML or SAMC
+#ifndef SERCOM_SPI_CTRLA_MODE_SPI_MASTER
+#define SERCOM_SPI_CTRLA_MODE_SPI_MASTER	(0x3ul << SERCOM_SPI_CTRLA_MODE_Pos)
+#endif
+
 typedef enum
 {
 	UART_EXT_CLOCK = 0,
diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index dbe2c5041..1bd0604a0 100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
@@ -24,7 +24,7 @@
 #if (SAMD21 || SAMD11)
 #define WAIT_TC16_REGS_SYNC(x) while(x->COUNT16.STATUS.bit.SYNCBUSY);
 #elif (SAML21 || SAMC21)
-#define WAIT_TC16_REGS_SYNC(x) while(x->SYNCBUSY.reg);
+#define WAIT_TC16_REGS_SYNC(x) while(x->COUNT16.SYNCBUSY.reg);
 #else
 #error "Tone.cpp: Unsupported chip"
 #endif
@@ -39,20 +39,20 @@ volatile int64_t toggleCount;
 volatile bool toneIsActive = false;
 volatile bool firstTimeRunning = false;
 
-/* TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14A as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins. */
-#if (SAMD11D14A)
+/* TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14 as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins. */
+#if (SAMD11D)
 #define TONE_TC         TC2
 #define TONE_TC_IRQn    TC2_IRQn
 void TC2_Handler (void) __attribute__ ((alias("Tone_Handler")));
-#elif (SAMD11C14)
+#elif (SAMD11C)
+#define TONE_TC         TC1
+#define TONE_TC_IRQn    TC1_IRQn
+void TC1_Handler (void) __attribute__ ((alias("Tone_Handler")));
+/* TC5 does not exist on the SAML or SAMC. Using TC1 instead. */
+#elif (SAML || SAMC)
 #define TONE_TC         TC1
 #define TONE_TC_IRQn    TC1_IRQn
 void TC1_Handler (void) __attribute__ ((alias("Tone_Handler")));
-/* TC5 does not exist on the SAML or SAMC. Using TC3 instead. It will conflict with the 2 associated TC analogWrite() pins. */
-#elif (SAML_SERIES || SAMC_SERIES)
-#define TONE_TC         TC3
-#define TONE_TC_IRQn    TC3_IRQn
-void TC3_Handler (void) __attribute__ ((alias("Tone_Handler")));
 #else
 #define TONE_TC         TC5
 #define TONE_TC_IRQn    TC5_IRQn
@@ -161,7 +161,7 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
   WAIT_TC16_REGS_SYNC(TONE_TC)
 
 #if (SAML21 || SAMC21)
-  TONE_TC->WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
+  TONE_TC->COUNT16.WAVE.reg = TC_WAVE_WAVEGEN_MFRQ;
   WAIT_TC16_REGS_SYNC(TONE_TC)
 #endif
 
diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
index d82c68eb1..65953caca 100644
--- a/cores/arduino/USB/CDC.cpp
+++ b/cores/arduino/USB/CDC.cpp
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
+#if (!SAMC)
 #if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 
 #define CDC_SERIAL_BUFFER_SIZE	256
@@ -292,3 +293,4 @@ bool Serial_::rts() {
 Serial_ SerialUSB(USBDevice);
 
 #endif
+#endif
diff --git a/cores/arduino/USB/SAMD21_USBDevice.h b/cores/arduino/USB/SAMD21_USBDevice.h
index a33bc1b0f..f72c7f672 100644
--- a/cores/arduino/USB/SAMD21_USBDevice.h
+++ b/cores/arduino/USB/SAMD21_USBDevice.h
@@ -16,6 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#if (!SAMC)
 #pragma once
 
 #include <Arduino.h>
@@ -44,7 +45,9 @@ class USBDevice_SAMD21G18x {
 
 	// USB mode (device/host)
 	inline void setUSBDeviceMode() { usb.CTRLA.bit.MODE = USB_CTRLA_MODE_DEVICE_Val; }
+#if (SAMD21 || SAML21)
 	inline void setUSBHostMode()   { usb.CTRLA.bit.MODE = USB_CTRLA_MODE_HOST_Val;   }
+#endif
 
 	inline void runInStandby()   { usb.CTRLA.bit.RUNSTDBY = 1; }
 	inline void noRunInStandby() { usb.CTRLA.bit.RUNSTDBY = 0; }
@@ -393,3 +396,4 @@ class DoubleBufferedEPOutHandler : public EPHandler {
 	volatile bool notify;
 };
 
+#endif
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index d20a0e70d..c1d95a9f0 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -16,13 +16,16 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "sam.h"
+
+#if (!SAMC)
+
 #include <Arduino.h>
 
 #include "SAMD21_USBDevice.h"
 #include "PluggableUSB.h"
 #include "USBDesc.h"
 #include "WVariant.h"
-#include "sam.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -968,3 +971,4 @@ void USBDeviceClass::ISRHandler()
 // USBDevice class instance
 USBDeviceClass USBDevice;
 
+#endif
diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index 6a5f8e163..5f928533e 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -19,6 +19,14 @@
 #ifndef __USBCORE_H__
 #define __USBCORE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void USB_SetHandler(void (*pf_isr)(void));
+#ifdef __cplusplus
+}
+#endif
+
 //	Standard requests
 #define GET_STATUS					0
 #define CLEAR_FEATURE				1
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index 666c0f505..33f71ef84 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -17,6 +17,7 @@
 */
 
 
+#if (SAMD21 || SAML21)
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -524,3 +525,4 @@ uint32_t UHD_Pipe_Is_Transfer_Complete(uint32_t ul_pipe, uint32_t ul_token_type)
 // }
 
 #endif //  HOST_DEFINED
+#endif //  (SAMD21 || SAML21)
\ No newline at end of file
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 27360fbcf..56c846991 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -40,12 +40,14 @@ static void __initialize()
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GCM_EIC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
   while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
 #elif (SAML21 || SAMC21)
+  MCLK->APBAMASK.reg |= MCLK_APBAMASK_EIC;
   GCLK->PCHCTRL[GCM_EIC].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
-  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+  while ( (GCLK->PCHCTRL[GCM_EIC].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );	// wait for sync
 #else
   #error "WInterrupts.c: Unsupported chip"
 #endif
 
+// SAML and SAMC EIC.CONFIG registers are enable-protected, thus must be disabled/enabled for each config change
 #if (SAMD21 || SAMD11)
 /* Shall we do that?
   // Do a software reset on EIC
@@ -56,16 +58,6 @@ static void __initialize()
   // Enable EIC
   EIC->CTRL.bit.ENABLE = 1;
   while (EIC->STATUS.bit.SYNCBUSY == 1) { }
-#elif (SAML21 || SAMC21)
-/* Shall we do that?
-  // Do a software reset on EIC
-  EIC->CTRLA.SWRST.bit = 1 ;
-  while ((EIC->CTRLA.SWRST.bit == 1) && (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK)) { }
-*/
-
-  // Enable EIC
-  EIC->CTRLA.bit.ENABLE = 1;
-  while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
 #endif
 }
 
@@ -88,6 +80,12 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
     enabled = 1;
   }
 
+#if (SAML21)
+  // The CHANGE and RISING interrupt modes on pin A31 on the SAML21 do not seem to work properly
+  if ((g_APinDescription[pin].ulPort == 0) && (g_APinDescription[pin].ulPin == 31) && ((mode == CHANGE) || (mode == RISING)))
+    return;
+#endif
+
   // Assign pin to EIC
   if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
     return;
@@ -109,12 +107,26 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
 
   // Configure the interrupt mode
   pos = (in - (8 * config)) << 2;				// compute position (ie: 0, 4, 8, 12, ...)
-  uint32_t regConfig = EIC->CONFIG[config].reg;			// copy register to variable
+
+#if (SAML21 || SAMC21)
+  EIC->CTRLA.reg = 0;	// disable EIC before changing CONFIG
+  while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
+#endif
+
+  uint32_t regConfig = (~(EIC_CONFIG_SENSE0_Msk << pos) & EIC->CONFIG[config].reg);		// copy register to variable, clearing mode bits
   // insert new mode and write to register (the hardware numbering for the 5 interrupt modes is in reverse order to the arduino numbering, so using '5-mode').
   EIC->CONFIG[config].reg = (regConfig | ((5-mode) << pos));
 
+#if (SAML21 || SAMC21)
+  EIC->CTRLA.reg = EIC_CTRLA_ENABLE;	// enable EIC
+  while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
+#endif
+
+  // Clear the interrupt flag
+  EIC->INTFLAG.reg = (1 << in);
+
   // Enable the interrupt
-  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << in);
+  EIC->INTENSET.reg = (1 << in);
 }
 
 /*
@@ -127,7 +139,7 @@ void detachInterrupt(uint32_t pin)
     return;
 
   EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
-  
+
   // Disable wakeup capability on pin during sleep (WAKEUP always enabled on SAML and SAMC)
 #if (SAMD21 || SAMD11)
   EIC->WAKEUP.reg &= ~(1 << in);
@@ -140,7 +152,7 @@ void detachInterrupt(uint32_t pin)
 void EIC_Handler(void)
 {
   // Test the normal interrupts
-  for (uint32_t i=EXTERNAL_INT_0; i<=EXTERNAL_INT_15; i++)
+ for (uint32_t i=EXTERNAL_INT_0; i<=EXTERNAL_INT_15; i++)
   {
     if ((EIC->INTFLAG.reg & (1 << i)) != 0)
     {
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index a08152020..999ea5a1c 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -101,8 +101,8 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
 #define GetTCChannelNumber( x ) ( (x) & 0x07 )
 #if (SAMD)
 #define GetTC( x ) ( g_apTCInstances[((x) >> 4) & 0x07] )
-#elif (SAML21 || SAMC21)
-#define GetTC( x ) ( ( ((x) >> 3) & 0x01 ) == 0 ? g_apTCInstances[((x) >> 4) & 0x07] : g_apTCInstances[(((x) >> 4) & 0x07) + TCC_INST_NUM] )
+#elif (SAML || SAMC)
+#define GetTC( x ) ( (((x) >> 3) & 0x01 ) == 0 ? g_apTCInstances[((x) >> 4) & 0x07] : (((((x) >> 4) & 0x07) == 4) ? TC4 : g_apTCInstances[(((x) >> 4) & 0x07) + TCC_INST_NUM]) )
 #else
 #error "WVariant.h: Unsupported chip"
 #endif
@@ -279,9 +279,10 @@ typedef struct _PinDescription
   uint8_t         ulExtInt ;	                // Must be 8 bits
   uint8_t         ulGCLKCCL ;	                // Must be 8 bits
 #else
-  uint16_t        ulTCChannel ;	        	// Must be 16 bits
-  uint8_t         ulADCChannelNumber ;	        // Must be 8 bits
-  uint8_t         ulExtInt ;	                // Must be 8 bits
+#error "The PinDescription table in the variant.cpp file of your board variant must be updated so that MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10608. See VARIANT_COMPLIANCE_CHANGELOG."
+//  uint16_t        ulTCChannel ;	        	// Must be 16 bits
+//  uint8_t         ulADCChannelNumber ;	        // Must be 8 bits
+//  uint8_t         ulExtInt ;	                // Must be 8 bits
 #endif
 } PinDescription ;
 
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
index a13ee4652..fa0b02f72 100644
--- a/cores/arduino/cortex_handlers.c
+++ b/cores/arduino/cortex_handlers.c
@@ -35,7 +35,7 @@ void Dummy_Handler(void)
 }
 
 /* Cortex-M0+ core handlers */
-void HardFault_Handler(void) __attribute__ ((weak, alias("Dummy_Handler")));
+void HardFault_Handler(void);
 void Reset_Handler    (void);
 void NMI_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
 void SVC_Handler      (void) __attribute__ ((weak, alias("Dummy_Handler")));
@@ -152,7 +152,7 @@ __attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
   (void*) DAC_Handler,            /* 25 / 17 Digital Analog Converter */
   (void*) PTC_Handler,            /* 26 / 18 Peripheral Touch Controller */
 #if (SAMD21)
-  (void*) I2S_Handler             /* 27 Inter-IC Sound Interface */
+  (void*) I2S_Handler,             /* 27 Inter-IC Sound Interface */
   (void*) (0UL),                  /* Reserved */
 #endif
 
@@ -234,18 +234,16 @@ void Reset_Handler(void)
   }
 
   /* Change default QOS values to have the best performance and correct USB behaviour (applies to D21/D11). From startup_samd21.c from ASF 3.32. */
-#if (SAMD21_SERIES || SAMD11_SERIES)
+#if (SAMD21 || SAMD11)
   SBMATRIX->SFR[SBMATRIX_SLAVE_HMCRAMC0].reg = 2;
-#endif
-
-#if defined(ID_USB)
+  
   USB->DEVICE.QOSCTRL.bit.CQOS = 2;
   USB->DEVICE.QOSCTRL.bit.DQOS = 2;
-#endif
-
+  
   DMAC->QOSCTRL.bit.DQOS = 2;
   DMAC->QOSCTRL.bit.FQOS = 2;
   DMAC->QOSCTRL.bit.WRBQOS = 2;
+#endif
 
   SystemInit();
 
@@ -279,3 +277,28 @@ void USB_SetHandler(void (*new_usb_isr)(void))
   usb_isr = new_usb_isr;
 }
 #endif
+
+void HardFault_Handler(void)
+{
+  __BKPT(13);
+  while (1);
+}
+/*
+void NMI_Handler(void)
+{
+  __BKPT(14);
+  while (1);
+}
+
+void SVC_Handler(void)
+{
+  __BKPT(5);
+  while (1);
+}
+
+void PendSV_Handler(void)
+{
+  __BKPT(2);
+  while (1);
+}
+*/
\ No newline at end of file
diff --git a/cores/arduino/delay.c b/cores/arduino/delay.c
index ea000abb0..067d7ba94 100644
--- a/cores/arduino/delay.c
+++ b/cores/arduino/delay.c
@@ -82,7 +82,9 @@ void SysTick_DefaultHandler(void)
 {
   // Increment tick count each ms
   _ulTickCount++;
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
   tickReset();
+#endif
 }
 
 #ifdef __cplusplus
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index e600ef238..701f50607 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
 
   This library is free software; you can redistribute it and/or
@@ -23,25 +24,25 @@
 
 /**
  * \brief SystemInit() configures the needed clocks and according Flash Read Wait States.
- * At reset:
- * - OSC8M clock source is enabled with a divider by 8 (1MHz).
- * - Generic Clock Generator 0 (GCLKMAIN) is using OSC8M as source.
- * We need to:
- * 1) Enable XOSC32K clock (External on-board 32.768Hz oscillator), will be used as DFLL48M reference.
- * 2) Put XOSC32K as source of Generic Clock Generator 1
- * 3) Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 0 (DFLL48M reference)
- * 4) Enable DFLL48M clock
- * 5) Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz.
- * 6) Modify PRESCaler value of OSCM to have 8MHz
- * 7) Put OSC8M as source for Generic Clock Generator 3
  */
+
 // Constants for Clock generators
 #define GENERIC_CLOCK_GENERATOR_MAIN      (0u)
-#define GENERIC_CLOCK_GENERATOR_XOSC32K   (1u)
-#define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT */
-#define GENERIC_CLOCK_GENERATOR_OSC8M     (3u)
+#define GENERIC_CLOCK_GENERATOR_XOSC      (1u)
+#define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT (D21/D11) */
+#define GENERIC_CLOCK_GENERATOR_OSC_HS    (3u)
+
 // Constants for Clock multiplexers
-#define GENERIC_CLOCK_MULTIPLEXER_DFLL48M (0u)
+#if (SAMD || SAML21)
+  #define GENERIC_CLOCK_MULTIPLEXER_DFLL    (0u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL   (1u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL96M_32K (2u)
+#elif (SAMC21)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL   (0u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL96M_32K (1u)
+#else
+  #error "startup.c: Unsupported chip"
+#endif
 
 void waitForSync( void )
 {
@@ -49,8 +50,6 @@ void waitForSync( void )
   while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
 #elif (SAML21 || SAMC21)
   while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
-#else
-  #error "startup.c: Unsupported chip"
 #endif
 }
 
@@ -65,9 +64,16 @@ void waitForDFLL( void )
 }
 #endif
 
+#if (SAML21 || SAMC21)
+void waitForPLL( void )
+{
+  while ( OSCCTRL->DPLLSYNCBUSY.reg & OSCCTRL_DPLLSYNCBUSY_MASK );
+}
+#endif
+
 void SystemInit( void )
 {
-  /* Set 1 Flash Wait State for 48MHz, cf tables 20.9 and 35.27 in SAMD21 Datasheet */
+  /* Set 1 Flash Wait State for 48MHz (2 for the L21 and C21), cf tables 20.9 and 35.27 in SAMD21 Datasheet */
 #if (SAMD)
   NVMCTRL->CTRLB.bit.RWS = NVMCTRL_CTRLB_RWS_HALF_Val ;	// one wait state
 #elif (SAML21 || SAMC21)
@@ -81,8 +87,15 @@ void SystemInit( void )
   MCLK->APBAMASK.reg |= MCLK_APBAMASK_GCLK ;
 #endif
 
+#if (SAML21)
+  PM->INTFLAG.reg = PM_INTFLAG_PLRDY; //clear flag
+  PM->PLCFG.reg |= PM_PLCFG_PLSEL_PL2 ;	// must set to highest performance level
+  while ( (PM->INTFLAG.reg & PM_INTFLAG_PLRDY) != PM_INTFLAG_PLRDY );
+  PM->INTFLAG.reg = PM_INTFLAG_PLRDY; //clear flag
+#endif
+
   /* ----------------------------------------------------------------------------------------------
-   * 0) Software reset the GCLK module to ensure it is re-initialized correctly
+   * Software reset the GCLK module to ensure it is re-initialized correctly
    */
 #if (SAMD)
   GCLK->CTRL.reg = GCLK_CTRL_SWRST ;
@@ -94,152 +107,284 @@ void SystemInit( void )
   while ( (GCLK->CTRLA.reg & GCLK_CTRLA_SWRST) && (GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK) );	/* Wait for reset to complete */
 #endif
 
+
+#if defined(CLOCKCONFIG_32768HZ_CRYSTAL)
   /* ----------------------------------------------------------------------------------------------
-   * 1) Enable XOSC32K clock (External on-board 32.768Hz crystal oscillator)
+   * Enable XOSC32K clock (External on-board 32.768Hz crystal oscillator)
    */
+
+#if defined(PLL_FRACTIONAL_ENABLE)
+  #define DPLLRATIO_LDR		2928u
+  #define DPLLRATIO_LDRFRAC	11u
+#else
+  #define DPLLRATIO_LDR		2929u
+  #define DPLLRATIO_LDRFRAC	0u
+#endif
+
 #if (SAMD)
-  SYSCTRL->XOSC32K.reg = SYSCTRL_XOSC32K_STARTUP( 0x6u ) | /* cf table 15.10 of product datasheet in chapter 15.8.6 */
-                         SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K ;
+  SYSCTRL->XOSC32K.reg = (SYSCTRL_XOSC32K_STARTUP( 0x6u ) | SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K) ;
   SYSCTRL->XOSC32K.bit.ENABLE = 1 ; /* separate call, as described in chapter 15.6.3 */
 
   while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSC32KRDY) == 0 );	/* Wait for oscillator stabilization */
-#elif (SAML21 || SAMC21)
-  OSC32KCTRL->XOSC32K.reg = OSC32KCTRL_XOSC32K_STARTUP( 0x4u ) | OSC32KCTRL_XOSC32K_XTALEN | OSC32KCTRL_XOSC32K_EN32K ;
-  OSC32KCTRL->XOSC32K.bit.ENABLE = 1 ; /* separate call, as described in chapter 15.6.3 */
+  
+  SYSCTRL->DPLLRATIO.reg = ( SYSCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | SYSCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
+  
+  SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK(0) ;  /* select 32KHz crystal input */
+  
+  SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE ;
+  
+  while ( (SYSCTRL->DPLLSTATUS.reg & SYSCTRL_DPLLSTATUS_CLKRDY) != SYSCTRL_DPLLSTATUS_CLKRDY );
+  
+  /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz. */
+  GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENDIV_DIV(2) ) ;
+  waitForSync();
 
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+  waitForSync();
+  
+#elif (SAML21 || SAMC21)
+  OSC32KCTRL->XOSC32K.reg = (OSC32KCTRL_XOSC32K_STARTUP( 0x4u ) | OSC32KCTRL_XOSC32K_XTALEN | OSC32KCTRL_XOSC32K_EN32K | OSC32KCTRL_XOSC32K_EN1K) ;
+  OSC32KCTRL->XOSC32K.bit.ENABLE = 1 ;
+  
   while ( (OSC32KCTRL->STATUS.reg & OSC32KCTRL_STATUS_XOSC32KRDY) == 0 );	/* Wait for oscillator stabilization */
-  #error "SAML and SAMC porting is not yet complete. I still need to modify the clock code (adding support for more sources). See later commit."
+  
+  OSCCTRL->DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
+  waitForPLL();
+  
+  OSCCTRL->DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_REFCLK(0) ;  /* select 32KHz crystal input */
+  
+  OSCCTRL->DPLLPRESC.reg = 0;
+  waitForPLL();
+  
+  OSCCTRL->DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE ;
+  waitForPLL();
+  
+  while ( (OSCCTRL->DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_CLKRDY) != OSCCTRL_DPLLSTATUS_CLKRDY );
+  
+  /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz. */
+  GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+  waitForSync();
 #endif
 
+#elif defined(CLOCKCONFIG_HS_CRYSTAL)
   /* ----------------------------------------------------------------------------------------------
-   * 2) Put XOSC32K as source of Generic Clock Generator 1
+   * Enable XOSC clock (External on-board high speed crystal oscillator)
    */
-  GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_XOSC32K ) ; // Generic Clock Generator 1
 
-  waitForSync();
+#if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
+  #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 4000000UL and 32000000UL"
+#endif
+
+#if defined(PLL_FAST_STARTUP)
+  #if (HS_CRYSTAL_FREQUENCY_HERTZ < 1000000UL)
+    #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be at least 1000000UL when PLL_FAST_STARTUP is defined"
+  #else
+    #define HS_CRYSTAL_DIVISOR	1000000UL
+  #endif
+#else
+  #define HS_CRYSTAL_DIVISOR	32000UL
+#endif
+
+#define HS_CRYSTAL_DIVIDER	(HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVISOR)
+#define DPLLRATIO_FLOAT		(96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
+
+#if defined(PLL_FRACTIONAL_ENABLED)
+  #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+  #define DPLLRATIO_LDRFRAC	(uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
+#else
+  #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+  #define DPLLRATIO_LDRFRAC	0
+#endif
 
-  /* Write Generic Clock Generator 1 configuration */
-  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_XOSC32K ) | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_GENEN );
+#if (SAMD)
+  SYSCTRL->XOSC.reg = (SYSCTRL_XOSC_STARTUP( 0x8u ) | SYSCTRL_XOSC_GAIN( 0x4u ) | SYSCTRL_XOSC_XTALEN | SYSCTRL_XOSC_ENABLE) ;	// startup time is 8ms
+  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSCRDY) == 0 );	/* Wait for oscillator stabilization */
 
+  SYSCTRL->XOSC.reg |= SYSCTRL_XOSC_AMPGC ;	// set only after startup time
+  
+  /* Connect GCLK1 to XOSC and set prescaler */
+  GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_XOSC ) | GCLK_GENDIV_DIV(HS_CRYSTAL_DIVIDER) ) ; // Set divider for generic clock generator 1
   waitForSync();
 
-  /* ----------------------------------------------------------------------------------------------
-   * 3) Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 0 (DFLL48M reference)
-   */
-  GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GENERIC_CLOCK_MULTIPLEXER_DFLL48M ) | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN );
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_XOSC ) | GCLK_GENCTRL_SRC_XOSC | GCLK_GENCTRL_GENEN );
+  waitForSync();
+  
+  /* Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 1 (FDPLL reference) */
+  GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GENERIC_CLOCK_MULTIPLEXER_FDPLL ) | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN );
+  waitForSync();
+  
+  /* Configure PLL */
+  SYSCTRL->DPLLRATIO.reg = ( SYSCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | SYSCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
+  
+  SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK(2) ;  /* select GCLK input */
+  
+  SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE ;
+  
+  while ( (SYSCTRL->DPLLSTATUS.reg & SYSCTRL_DPLLSTATUS_CLKRDY) != SYSCTRL_DPLLSTATUS_CLKRDY );
+  
+  /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz. */
+  GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENDIV_DIV(2) ) ;
+  waitForSync();
 
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+  waitForSync();
+  
+#elif (SAML21 || SAMC21)
+  OSCCTRL->XOSCCTRL.reg = (OSCCTRL_XOSCCTRL_STARTUP( 0x8u ) | OSCCTRL_XOSCCTRL_GAIN( 0x4u ) | OSCCTRL_XOSCCTRL_XTALEN | OSCCTRL_XOSCCTRL_ENABLE) ;	// startup time is 8ms
+  while ( (OSCCTRL->STATUS.reg & OSCCTRL_STATUS_XOSCRDY) == 0 );	/* Wait for oscillator stabilization */
+
+  OSCCTRL->XOSCCTRL.reg |= OSCCTRL_XOSCCTRL_AMPGC ;	// set only after startup time
+  
+  /* Connect GCLK1 to XOSC and set prescaler */
+  GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_XOSC].reg = ( GCLK_GENCTRL_DIV(HS_CRYSTAL_DIVIDER) | GCLK_GENCTRL_SRC_XOSC | GCLK_GENCTRL_GENEN );
+  waitForSync();
+  
+  /* Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 1 (FDPLL reference) */
+  GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK1 );
+  while ( (GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );	// wait for sync
+  
+  /* Configure PLL */
+  OSCCTRL->DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
+  waitForPLL();
+  
+  OSCCTRL->DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_REFCLK(2) ;  /* select GCLK input */
+  
+  OSCCTRL->DPLLPRESC.reg = 0;
+  waitForPLL();
+  
+  OSCCTRL->DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE ;
+  waitForPLL();
+  
+  while ( (OSCCTRL->DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_CLKRDY) != OSCCTRL_DPLLSTATUS_CLKRDY );
+  
+  /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz. */
+  GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
+#endif
 
+#elif (defined(CLOCKCONFIG_INTERNAL) || defined(CLOCKCONFIG_INTERNAL_USB))
   /* ----------------------------------------------------------------------------------------------
-   * 4) Enable DFLL48M clock
+   * Enable DFLL48M clock (D21/L21) or RC oscillator (C21)
    */
-
-  /* DFLL Configuration in Closed Loop mode, cf product datasheet chapter 15.6.7.1 - Closed-Loop Operation */
-
+#if (SAMD)
   /* Remove the OnDemand mode, Bug http://avr32.icgroup.norway.atmel.com/bugzilla/show_bug.cgi?id=9905 */
   SYSCTRL->DFLLCTRL.bit.ONDEMAND = 0 ;
-
-  waitForDFLL();
-
-  SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
-                         SYSCTRL_DFLLMUL_FSTEP( 511 ) | // Fine step is 511, half of the max value
-                         SYSCTRL_DFLLMUL_MUL( (VARIANT_MCK/VARIANT_MAINOSC) ) ; // External 32KHz is the reference
-
   waitForDFLL();
-
+  
+  /* Load NVM Coarse calibration value */
+  uint32_t calib = (*((uint32_t *) FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk) >> FUSES_DFLL48M_COARSE_CAL_Pos;
+  SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(calib) | SYSCTRL_DFLLVAL_FINE(512);
+  
   /* Write full configuration to DFLL control register */
-  SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | /* Enable the closed loop mode */
-                           SYSCTRL_DFLLCTRL_WAITLOCK |
-                           SYSCTRL_DFLLCTRL_QLDIS ; /* Disable Quick lock */
-
-  waitForDFLL();
-
+  #if defined(CLOCKCONFIG_INTERNAL_USB)
+    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
+                           SYSCTRL_DFLLMUL_FSTEP( 0xA ) | // value from datasheet USB Characteristics
+                           SYSCTRL_DFLLMUL_MUL( 0xBB80 ) ; // 1KHz USB SOF signal (48MHz Fcpu / 1KHz SOF)
+                         
+    SYSCTRL->DFLLCTRL.reg =  SYSCTRL_DFLLCTRL_USBCRM | /* USB correction */
+                             SYSCTRL_DFLLCTRL_MODE | /* Closed loop mode */
+                             SYSCTRL_DFLLCTRL_CCDIS ;
+    waitForDFLL();
+  #endif
+  
   /* Enable the DFLL */
   SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_ENABLE ;
-
-  while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLLCKC) == 0 ||
-	  (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLLCKF) == 0 );	/* Wait for locks flags */
-
   waitForDFLL();
-
-  /* ----------------------------------------------------------------------------------------------
-   * 5) Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz.
-   */
+  
+  /* Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz */
   GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) ; // Generic Clock Generator 0
-
   waitForSync();
 
-  /* Write Generic Clock Generator 0 configuration */
   GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
-
   waitForSync();
+  
+#elif (SAML21)
+  /* Defines missing from CMSIS */
+  #ifndef FUSES_DFLL48M_COARSE_CAL_ADDR
+    #define FUSES_DFLL48M_COARSE_CAL_ADDR (NVMCTRL_OTP5)
+  #endif
+  #ifndef FUSES_DFLL48M_COARSE_CAL_Pos
+    #define FUSES_DFLL48M_COARSE_CAL_Pos 26
+  #endif
+  #ifndef FUSES_DFLL48M_COARSE_CAL_Msk
+    #define FUSES_DFLL48M_COARSE_CAL_Msk (0x3Ful << FUSES_DFLL48M_COARSE_CAL_Pos)
+  #endif
+  
+  OSCCTRL->DFLLCTRL.bit.ONDEMAND = 0 ;
+  waitForDFLL();
+  
+  /* Load NVM Coarse calibration value */
+  uint32_t calib = (*((uint32_t *) FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk) >> FUSES_DFLL48M_COARSE_CAL_Pos;
+  OSCCTRL->DFLLVAL.reg = OSCCTRL_DFLLVAL_COARSE(calib) | OSCCTRL_DFLLVAL_FINE(512);
+  
+  /* Write full configuration to DFLL control register */
+  #if defined(CLOCKCONFIG_INTERNAL_USB)
+    OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
+                           OSCCTRL_DFLLMUL_FSTEP( 0xA ) | // value from datasheet USB Characteristics
+                           OSCCTRL_DFLLMUL_MUL( 0xBB80 ) ; // 1KHz USB SOF signal (48MHz Fcpu / 1KHz SOF)
+                         
+    OSCCTRL->DFLLCTRL.reg =  OSCCTRL_DFLLCTRL_USBCRM | /* USB correction */
+                             OSCCTRL_DFLLCTRL_MODE | /* Closed loop mode */
+                             OSCCTRL_DFLLCTRL_CCDIS ;
+    waitForDFLL();
+  #endif
+  
+  /* Enable the DFLL */
+  OSCCTRL->DFLLCTRL.reg |= OSCCTRL_DFLLCTRL_ENABLE ;
+  waitForDFLL();
+  
+  /* Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz */
+  GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+  waitForSync();
+  
+#elif (SAMC21)
+  #if defined(CLOCKCONFIG_INTERNAL_USB)
+    #error "startup.c: CLOCKCONFIG_INTERNAL_USB setting invalid for C21 chips as they lack USB."
+  #endif
+  
+  /* Change OSC48M divider to /1. CPU will run at 48MHz */
+  OSCCTRL->OSC48MDIV.reg = OSCCTRL_OSC48MDIV_DIV(0);
+  while ( OSCCTRL->OSC48MSYNCBUSY.reg & OSCCTRL_OSC48MSYNCBUSY_OSC48MDIV );
+#endif
+#else
+  #error "startup.c: Clock source must be selected in the boards.txt file (normally through the Tools menu)."
+#endif
 
-  /* ----------------------------------------------------------------------------------------------
-   * 6) Modify PRESCaler value of OSC8M to have 8MHz
-   */
-  SYSCTRL->OSC8M.bit.PRESC = SYSCTRL_OSC8M_PRESC_0_Val ;  //CMSIS 4.5 changed the prescaler defines
-  SYSCTRL->OSC8M.bit.ONDEMAND = 0 ;
-
-  /* ----------------------------------------------------------------------------------------------
-   * 7) Put OSC8M as source for Generic Clock Generator 3
-   */
-  GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_OSC8M ) ; // Generic Clock Generator 3
-
-  /* Write Generic Clock Generator 3 configuration */
-  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_OSC8M ) | GCLK_GENCTRL_SRC_OSC8M | GCLK_GENCTRL_GENEN );
+#if (SAMD21)
+  /* Modify PRESCaler value of OSC8M to have 8MHz */
+  SYSCTRL->OSC8M.bit.PRESC = SYSCTRL_OSC8M_PRESC_0_Val ;  // recent versions of CMSIS from Atmel changed the prescaler defines
+  //SYSCTRL->OSC8M.bit.ONDEMAND = 0 ;
 
+  /* Put OSC8M as source for Generic Clock Generator 3 */
+  GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_OSC_HS ) ; // Generic Clock Generator 3
   waitForSync();
 
+  GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_OSC_HS ) | GCLK_GENCTRL_SRC_OSC8M | GCLK_GENCTRL_GENEN );
+  waitForSync();
+  
+#elif (SAML21)
+  /* Note that after reset, the L21 starts with the OSC16M set to 4MHz, NOT the DFLL@48MHz as stated in some documentation. */
+  /* Modify FSEL value of OSC16M to have 8MHz */
+  OSCCTRL->OSC16MCTRL.bit.FSEL = OSCCTRL_OSC16MCTRL_FSEL_8_Val;
 
-  /*
-   * Now that all system clocks are configured, we can set CPU and APBx BUS clocks.
-   * There values are normally the one present after Reset.
-   */
-#if (SAMD)
-  PM->CPUSEL.reg  = PM_CPUSEL_CPUDIV_DIV1 ;
-  PM->APBASEL.reg = PM_APBASEL_APBADIV_DIV1_Val ;
-  PM->APBBSEL.reg = PM_APBBSEL_APBBDIV_DIV1_Val ;
-  PM->APBCSEL.reg = PM_APBCSEL_APBCDIV_DIV1_Val ;
-#elif (SAML21 || SAMC21)
-  MCLK->CPUDIV.reg  = MCLK_CPUDIV_CPUDIV_DIV1 ;
+  /* Put OSC16M as source for Generic Clock Generator 3 */
+  GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_OSC_HS].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_OSC16M | GCLK_GENCTRL_GENEN );
+  waitForSync();
 #endif
 
   SystemCoreClock=VARIANT_MCK ;
 
-  /* ----------------------------------------------------------------------------------------------
-   * 8) Load ADC factory calibration values
-   */
-
-#if (SAMD)
-  // ADC Bias Calibration
-  uint32_t bias = (*((uint32_t *) ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
-
-  // ADC Linearity bits 4:0
-  uint32_t linearity = (*((uint32_t *) ADC_FUSES_LINEARITY_0_ADDR) & ADC_FUSES_LINEARITY_0_Msk) >> ADC_FUSES_LINEARITY_0_Pos;
-
-  // ADC Linearity bits 7:5
-  linearity |= ((*((uint32_t *) ADC_FUSES_LINEARITY_1_ADDR) & ADC_FUSES_LINEARITY_1_Msk) >> ADC_FUSES_LINEARITY_1_Pos) << 5;
-
-  ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
-
-#elif (SAML21)
-  uint32_t biasrefbuf = (*((uint32_t *) ADC_FUSES_BIASREFBUF_ADDR) & ADC_FUSES_BIASREFBUF_Msk) >> ADC_FUSES_BIASREFBUF_Pos;
-  uint32_t biascomp = (*((uint32_t *) ADC_FUSES_BIASCOMP_ADDR) & ADC_FUSES_BIASCOMP_Msk) >> ADC_FUSES_BIASCOMP_Pos;
-
-  ADC->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
-
-#elif (SAMC21)
-  uint32_t biasrefbuf = (*((uint32_t *) ADC0_FUSES_BIASREFBUF_ADDR) & ADC0_FUSES_BIASREFBUF_Msk) >> ADC0_FUSES_BIASREFBUF_Pos;
-  uint32_t biascomp = (*((uint32_t *) ADC0_FUSES_BIASCOMP_ADDR) & ADC0_FUSES_BIASCOMP_Msk) >> ADC0_FUSES_BIASCOMP_Pos;
-  ADC0->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
-  
-  biasrefbuf = (*((uint32_t *) ADC1_FUSES_BIASREFBUF_ADDR) & ADC1_FUSES_BIASREFBUF_Msk) >> ADC1_FUSES_BIASREFBUF_Pos;
-  biascomp = (*((uint32_t *) ADC1_FUSES_BIASCOMP_ADDR) & ADC1_FUSES_BIASCOMP_Msk) >> ADC1_FUSES_BIASCOMP_Pos;
-  ADC1->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
-#endif
+  #if (SAMD)
+    PM->CPUSEL.reg  = PM_CPUSEL_CPUDIV_DIV1 ;
+    PM->APBASEL.reg = PM_APBASEL_APBADIV_DIV1_Val ;
+    PM->APBBSEL.reg = PM_APBBSEL_APBBDIV_DIV1_Val ;
+    PM->APBCSEL.reg = PM_APBCSEL_APBCDIV_DIV1_Val ;
+  #elif (SAML21 || SAMC21)
+    MCLK->CPUDIV.reg  = MCLK_CPUDIV_CPUDIV_DIV1 ;
+  #endif
 
   /*
-   * 9) Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21)
+   * Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21)
    */
   NVMCTRL->CTRLB.bit.MANW = 1;
 }
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index f98129e51..e9f9db0d9 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -88,10 +88,10 @@ void init( void )
   NVIC_SetPriority (SysTick_IRQn,  (1 << __NVIC_PRIO_BITS) - 2);  /* set Priority for Systick Interrupt (2nd lowest) */
 
   // Clock PORT for Digital I/O
-//  PM->APBBMASK.reg |= PM_APBBMASK_PORT ;
+//	PM->APBBMASK.reg |= PM_APBBMASK_PORT ;
 //
 //  // Clock EIC for I/O interrupts
-//  PM->APBAMASK.reg |= PM_APBAMASK_EIC ;
+//	PM->APBAMASK.reg |= PM_APBAMASK_EIC ;
 
   // Clock SERCOM for Serial, TC/TCC for Pulse and Analog, and ADC/DAC for Analog
 #if (SAMD21 || SAMD11)
@@ -105,7 +105,7 @@ void init( void )
   regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TC1 | PM_APBCMASK_TC2 ;
   #elif (SAMD21E)
   regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 ;
-  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5
+  regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 ;
   #elif (SAMD21G)
   regAPBCMASK |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
   regAPBCMASK |= PM_APBCMASK_TCC0 | PM_APBCMASK_TCC1 | PM_APBCMASK_TCC2 | PM_APBCMASK_TC3 | PM_APBCMASK_TC4 | PM_APBCMASK_TC5 ;
@@ -122,11 +122,10 @@ void init( void )
   
   #if (SAML)
   regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 ;
-  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM5;	// On the SAML, SERCOM5 is on the low power bridge
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM5 | MCLK_APBDMASK_TC4;	// On the SAML, SERCOM5 and TC4 are on the low power bridge
   regAPBCMASK |= MCLK_APBCMASK_TCC0 | MCLK_APBCMASK_TCC1 | MCLK_APBCMASK_TCC2 | MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1 | MCLK_APBCMASK_TC2 ;
     #if (SAML21J)
-    regAPBCMASK |= MCLK_APBCMASK_TC3 ;
-    MCLK->APBDMASK.reg |= MCLK_APBDMASK_TC4;	// On the SAML, TC4 is on the low power bridge
+    regAPBCMASK |= MCLK_APBCMASK_TC2 | MCLK_APBCMASK_TC3 ;
     #endif
   #elif (SAMC21E)
   regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 ;
@@ -138,7 +137,7 @@ void init( void )
   
   #if (SAML)
   regAPBCMASK |= MCLK_APBCMASK_DAC ;
-  MCLK->APBDMASK.reg |= MCLK_APBDMASK_ADC;	// On the SAML, TC4 is on the low power bridge
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_ADC;	// On the SAML, ADC is on the low power bridge
   #elif (SAMC)
   regAPBCMASK |= MCLK_APBCMASK_ADC0 | MCLK_APBCMASK_ADC1 | MCLK_APBCMASK_DAC ;
   #endif
@@ -154,40 +153,84 @@ void init( void )
     pinMode( ul, PIO_STARTUP ) ;
   }
 
-  // Initialize Analog Controller
-  // Setting clock
+// I/O mux table footnote for D21 and D11: enable pullups on PA24 and PA24 when using as GPIO to avoid excessive current
+//  Errata: disable pull resistors on PA24 or PA25 manually before switching to peripheral
+//  Errata: do not use continuous sampling (not enabled by default) on PA24 or PA25
+#if (SAMD && defined(USB_DISABLED))
+  PORT->Group[0].OUTSET.reg = (uint32_t)(1<<PIN_PA24G_USB_DM);
+  PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PULLEN = 1;
+  PORT->Group[0].OUTSET.reg = (uint32_t)(1<<PIN_PA25G_USB_DP);
+  PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PULLEN = 1;
+#endif
+
+
+  /* ----------------------------------------------------------------------------------------------
+   * Initialize Analog Controller
+   */
+
+  // Load ADC factory calibration values
 #if (SAMD)
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+  // ADC Bias Calibration
+  uint32_t bias = (*((uint32_t *) ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
 
-  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_ADC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN ;
+  // ADC Linearity bits 4:0
+  uint32_t linearity = (*((uint32_t *) ADC_FUSES_LINEARITY_0_ADDR) & ADC_FUSES_LINEARITY_0_Msk) >> ADC_FUSES_LINEARITY_0_Pos;
+
+  // ADC Linearity bits 7:5
+  linearity |= ((*((uint32_t *) ADC_FUSES_LINEARITY_1_ADDR) & ADC_FUSES_LINEARITY_1_Msk) >> ADC_FUSES_LINEARITY_1_Pos) << 5;
 
+  ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
+
+#elif (SAML21)
+  uint32_t biasrefbuf = (*((uint32_t *) ADC_FUSES_BIASREFBUF_ADDR) & ADC_FUSES_BIASREFBUF_Msk) >> ADC_FUSES_BIASREFBUF_Pos;
+  uint32_t biascomp = (*((uint32_t *) ADC_FUSES_BIASCOMP_ADDR) & ADC_FUSES_BIASCOMP_Msk) >> ADC_FUSES_BIASCOMP_Pos;
+
+  ADC->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
+
+#elif (SAMC21)
+  uint32_t biasrefbuf = (*((uint32_t *) ADC0_FUSES_BIASREFBUF_ADDR) & ADC0_FUSES_BIASREFBUF_Msk) >> ADC0_FUSES_BIASREFBUF_Pos;
+  uint32_t biascomp = (*((uint32_t *) ADC0_FUSES_BIASCOMP_ADDR) & ADC0_FUSES_BIASCOMP_Msk) >> ADC0_FUSES_BIASCOMP_Pos;
+  ADC0->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
+
+  biasrefbuf = (*((uint32_t *) ADC1_FUSES_BIASREFBUF_ADDR) & ADC1_FUSES_BIASREFBUF_Msk) >> ADC1_FUSES_BIASREFBUF_Pos;
+  biascomp = (*((uint32_t *) ADC1_FUSES_BIASCOMP_ADDR) & ADC1_FUSES_BIASCOMP_Msk) >> ADC1_FUSES_BIASCOMP_Pos;
+  ADC1->CALIB.reg = ADC_CALIB_BIASREFBUF(biasrefbuf) | ADC_CALIB_BIASCOMP(biascomp);
+#endif
   syncADC();          // Wait for synchronization of registers between the clock domains
 
+  // Setting clock, prescaler and resolution
+#if (SAMD)
+  GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_ADC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN ;
+  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+
   ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV512 |    // Divide Clock by 512.
   ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
 #elif (SAML21 || SAMC21)
   SUPC->VREF.reg |= SUPC_VREF_VREFOE;		// Enable Supply Controller Reference output for use with ADC and DAC (AR_INTREF)
 
+  #if (SAML21)
+    GCLK->PCHCTRL[GCM_ADC].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  #elif (SAMC21)
+    GCLK->PCHCTRL[GCM_ADC0].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+    GCLK->PCHCTRL[GCM_ADC1].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  #endif
   while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
 
-  GCLK->PCHCTRL[GCM_ADC].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
-
-  syncADC();          // Wait for synchronization of registers between the clock domains
-
   #if (SAML21)
   ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV256;   // Divide Clock by 256.
-  ADC->CTRLC.reg = ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+  ADC->CTRLC.reg = ADC_CTRLC_RESSEL_10BIT;         // 10 bits resolution as default
   #elif (SAMC21)
   ADC0->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV256;   // Divide Clock by 256.
-  ADC0->CTRLC.reg = ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+  ADC0->CTRLC.reg = ADC_CTRLC_RESSEL_10BIT | ADC_CTRLC_R2R;         // 10 bits resolution as default, R2R requires ADC_SAMPCTRL_OFFCOMP=1
   ADC1->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV256;   // Divide Clock by 256.
-  ADC1->CTRLC.reg = ADC_CTRLB_RESSEL_10BIT;         // 10 bits resolution as default
+  ADC1->CTRLC.reg = ADC_CTRLC_RESSEL_10BIT | ADC_CTRLC_R2R;         // 10 bits resolution as default, R2R requires ADC_SAMPCTRL_OFFCOMP=1
   #endif
-  syncADC();          // Wait for synchronization of registers between the clock domains
 #endif
-  
+  syncADC();          // Wait for synchronization of registers between the clock domains
+
+  // Setting configuration
 #if (SAMD || SAML21)
-  ADC->SAMPCTRL.reg = 0x3f;     // Set max Sampling Time Length (in CLK_ADC cycles for SAMD, half CLK_ADC cycles for SAML and SAMC)
+  ADC->SAMPCTRL.reg = 0x3f;     // Set max Sampling Time Length
   syncADC();          // Wait for synchronization of registers between the clock domains
 
   ADC->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND;   // No Negative input (Internal Ground)
@@ -197,8 +240,8 @@ void init( void )
   ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 |    // 1 sample only (no oversampling nor averaging)
                      ADC_AVGCTRL_ADJRES(0x0ul);   // Adjusting result by 0
 #elif (SAMC21)
-  ADC0->SAMPCTRL.reg = 0x3f;     // Set max Sampling Time Length (in CLK_ADC cycles for SAMD, half CLK_ADC cycles for SAML and SAMC)
-  ADC1->SAMPCTRL.reg = 0x3f;
+  ADC0->SAMPCTRL.reg = (ADC_SAMPCTRL_SAMPLEN(0x0) | ADC_SAMPCTRL_OFFCOMP);     // ADC_SAMPCTRL_SAMPLEN must be 0 when ADC_SAMPCTRL_OFFCOMP=1
+  ADC1->SAMPCTRL.reg = (ADC_SAMPCTRL_SAMPLEN(0x0) | ADC_SAMPCTRL_OFFCOMP);     // ADC_SAMPCTRL_SAMPLEN must be 0 when ADC_SAMPCTRL_OFFCOMP=1
   syncADC();          // Wait for synchronization of registers between the clock domains
 
   ADC0->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND;   // No Negative input (Internal Ground)
@@ -210,11 +253,14 @@ void init( void )
                      ADC_AVGCTRL_ADJRES(0x0ul);   // Adjusting result by 0
   ADC1->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_1 | ADC_AVGCTRL_ADJRES(0x0ul);
 #endif
+  syncADC();          // Wait for synchronization of registers between the clock domains
 
   analogReference( VARIANT_AR_DEFAULT ) ;         // Use default reference from variant.h
 
-  // Initialize DAC
-  // Setting clock
+
+  /* ----------------------------------------------------------------------------------------------
+   * Initialize DAC
+   */
 #if (SAMD)
   while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
   GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID( GCM_DAC ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN ;
@@ -231,11 +277,11 @@ void init( void )
   while ( DAC->SYNCBUSY.reg & DAC_SYNCBUSY_MASK );
 
   #if (SAMC21)
-    DAC->CTRLB.reg = DAC_CTRLB_REFSEL_AVCC;
+    DAC->CTRLB.reg = (DAC_CTRLB_REFSEL_AVCC | DAC_CTRLB_EOEN);
   #elif (SAML21)
     DAC->CTRLB.reg = DAC_CTRLB_REFSEL_VDDANA;
-    DAC->DACCTRL[0].reg = DAC_DACCTRL_REFRESH(2); // setup refresh
-    DAC->DACCTRL[1].reg = DAC_DACCTRL_REFRESH(2); // setup refresh
+    DAC->DACCTRL[0].reg = (DAC_DACCTRL_REFRESH(3) | DAC_DACCTRL_CCTRL(2));
+    DAC->DACCTRL[1].reg = (DAC_DACCTRL_REFRESH(3) | DAC_DACCTRL_CCTRL(2));
   #endif
 #endif
 }
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 5de433dd5..71cc3db61 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -20,6 +20,7 @@
 #include "Arduino.h"
 #include "wiring_private.h"
 #include "variant.h"
+#include "delay.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,10 +42,8 @@ const uint8_t timerClockIDs[] =
 	GCM_TCC2_TC3,
 	GCM_TC4_TC5,
 	GCM_TC4_TC5,
-	#if (SAMD21J)
 	GCM_TC6_TC7,
 	GCM_TC6_TC7,
-	#endif
 #elif (SAML21 || SAMC21)
 	GCM_TCC0_TCC1,
 	GCM_TCC0_TCC1,
@@ -62,6 +61,7 @@ const uint8_t timerClockIDs[] =
 static int _readResolution = 10;
 static int _ADCResolution = 10;
 static int _writeResolution = 8;
+extern bool dacEnabled[];
 
 // Wait for synchronization of registers between the clock domains
 static __inline__ void syncADC() __attribute__((always_inline, unused));
@@ -92,7 +92,7 @@ static void syncTC_8(Tc* TCx) {
 #if (SAMD)
   while (TCx->COUNT8.STATUS.bit.SYNCBUSY);
 #elif (SAML21 || SAMC21)
-  while (TCx->SYNCBUSY.reg);
+  while (TCx->COUNT8.SYNCBUSY.reg & (TC_SYNCBUSY_SWRST | TC_SYNCBUSY_ENABLE | TC_SYNCBUSY_CTRLB | TC_SYNCBUSY_STATUS | TC_SYNCBUSY_COUNT));
 #endif
 }
 
@@ -164,19 +164,24 @@ static inline uint32_t mapResolution(uint32_t value, uint32_t from, uint32_t to)
 void analogReference(eAnalogReference mode)
 {
   syncADC();
-
-  if (mode == AR_EXTERNAL_REFA) {
-    if ( pinPeripheral(REFA_PIN, PIO_ANALOG_REF) != RET_STATUS_OK ) {
-        return;
+#if (!SAMD11C)
+  #if defined(REFA_PIN)
+    if (mode == AR_EXTERNAL_REFA) {
+      if ( pinPeripheral(REFA_PIN, PIO_ANALOG_REF) != RET_STATUS_OK ) {
+          return;
+      }
     }
-  }
+  #endif
+#endif
 
 #if (SAMD || SAML21)
-  if (mode == AR_EXTERNAL_REFB) {
-    if ( pinPeripheral(REFB_PIN, PIO_ANALOG_REF) != RET_STATUS_OK ) {
-        return;
+  #if defined(REFB_PIN)
+    if (mode == AR_EXTERNAL_REFB) {
+      if ( pinPeripheral(REFB_PIN, PIO_ANALOG_REF) != RET_STATUS_OK ) {
+          return;
+      }
     }
-  }
+  #endif
 #endif
 
 #if (SAMD)
@@ -202,7 +207,30 @@ void analogReference(eAnalogReference mode)
   ADC1->REFCTRL.bit.REFSEL = mode;
   #endif
 #endif
+  syncADC();
 
+  // Start conversion, since The first conversion after the reference is changed must not be used.
+#if (SAMC21)
+  ADC0->CTRLA.bit.ENABLE = 0x01;             // Enable ADC
+  ADC1->CTRLA.bit.ENABLE = 0x01;             // Enable ADC
+  syncADC();
+  ADC0->SWTRIG.bit.START = 1;
+  ADC1->SWTRIG.bit.START = 1;
+  syncADC();
+  while ((ADC0->INTFLAG.bit.RESRDY == 0) || (ADC1->INTFLAG.bit.RESRDY == 0));     // Waiting for conversion to complete
+  ADC0->INTFLAG.reg = ADC_INTFLAG_RESRDY;    // Clear the Data Ready flag
+  ADC1->INTFLAG.reg = ADC_INTFLAG_RESRDY;    // Clear the Data Ready flag
+  ADC0->CTRLA.bit.ENABLE = 0x00;             // Disable ADC
+  ADC1->CTRLA.bit.ENABLE = 0x00;             // Disable ADC
+#else
+  ADC->CTRLA.bit.ENABLE = 0x01;             // Enable ADC
+  syncADC();
+  ADC->SWTRIG.bit.START = 1;
+  syncADC();
+  while (ADC->INTFLAG.bit.RESRDY == 0);     // Waiting for conversion to complete
+  ADC->INTFLAG.reg = ADC_INTFLAG_RESRDY;    // Clear the Data Ready flag
+  ADC->CTRLA.bit.ENABLE = 0x00;             // Disable ADC
+#endif
   syncADC();
 }
 
@@ -223,63 +251,23 @@ uint32_t analogRead( uint32_t pin )
   }
 #endif
 
+  // pinPeripheral now handles disabling the DAC (if active)
   if ( pinPeripheral(pin, PIO_ANALOG_ADC) == RET_STATUS_OK )
   {
-    // Disable DAC, if analogWrite(A0,dval) used previously the DAC is enabled
-    if ( (g_APinDescription[pin].ulPinAttribute & PIN_ATTR_DAC) == PIN_ATTR_DAC )
-    {
-      syncDAC();
-#if (SAMD || SAMC21)
-      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC
-      //DAC->CTRLB.bit.EOEN = 0x00; // The DAC output is turned off.
-#elif (SAML21)
-      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC controller
-      uint8_t DACNumber = 0x00;
-      if ( (g_APinDescription[pin].ulPort == 0) && (g_APinDescription[pin].ulPin == 5) ) {
-        DACNumber = 0x01;
-      }
-      syncDAC();
-      DAC->DACCTRL[DACNumber].bit.ENABLE = 0x00; // The DACx output is turned off.
-      syncDAC();
-      DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC controller (in case other DACx is in use)
-#endif
-      syncDAC();
-    }
-
-    syncADC();
     ADC->INPUTCTRL.bit.MUXPOS = g_APinDescription[pin].ulADCChannelNumber; // Selection for the positive ADC input
-
-    // Control A
-    /*
-     * Bit 1 ENABLE: Enable
-     *   0: The ADC is disabled.
-     *   1: The ADC is enabled.
-     * Due to synchronization, there is a delay from writing CTRLA.ENABLE until the peripheral is enabled/disabled. The
-     * value written to CTRL.ENABLE will read back immediately and the Synchronization Busy bit in the Status register
-     * (STATUS.SYNCBUSY) will be set. STATUS.SYNCBUSY will be cleared when the operation is complete.
-     *
-     * Before enabling the ADC, the asynchronous clock source must be selected and enabled, and the ADC reference must be
-     * configured. The first conversion after the reference is changed must not be used.
-     */
     syncADC();
+
     ADC->CTRLA.bit.ENABLE = 0x01;             // Enable ADC
+    syncADC();
 
     // Start conversion
-    syncADC();
     ADC->SWTRIG.bit.START = 1;
-
-    // Clear the Data Ready flag
-    ADC->INTFLAG.reg = ADC_INTFLAG_RESRDY;
-
-    // Start conversion again, since The first conversion after the reference is changed must not be used.
     syncADC();
-    ADC->SWTRIG.bit.START = 1;
 
     // Store the value
     while (ADC->INTFLAG.bit.RESRDY == 0);   // Waiting for conversion to complete
     valueRead = ADC->RESULT.reg;
 
-    syncADC();
     ADC->CTRLA.bit.ENABLE = 0x00;             // Disable ADC
     syncADC();
   }
@@ -301,31 +289,47 @@ void analogWrite(uint32_t pin, uint32_t value)
     value = mapResolution(value, _writeResolution, 10);
     DAC->DATA.reg = value & 0x3FF;  // DAC on 10 bits.
     syncDAC();
-    DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC
+    if (!dacEnabled[0]) {
+      dacEnabled[0] = true;
+      DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC
+      syncDAC();
+    }
 #elif (SAML21)
-    DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC controller (so that DACCTRL can be modified)
     uint8_t DACNumber = 0x00;
+    value = mapResolution(value, _writeResolution, 12);
+
     if ( (g_APinDescription[pin].ulPort == 0) && (g_APinDescription[pin].ulPin == 5) ) {
         DACNumber = 0x01;
     }
-    value = mapResolution(value, _writeResolution, 12);
-    syncDAC();
-    DAC->DATA[DACNumber].reg = value & 0xFFF;  // DACx on 12 bits.
-    syncDAC();
-    DAC->DACCTRL[DACNumber].bit.ENABLE = 0x01; // The DACx output is turned on.
-    syncDAC();
-    while ( (DAC->STATUS.reg & (1 << DACNumber)) == 0 );   // Must wait for DACx to start
-    DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC controller
+
+    if (!dacEnabled[DACNumber]) {
+      dacEnabled[DACNumber] = true;
+      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC controller (so that DACCTRL can be modified)
+      delayMicroseconds(40);	// Must delay for at least 30us when turning off while refresh is on due to DAC errata
+
+      DAC->DATA[DACNumber].reg = value & 0xFFF;  // DACx on 12 bits.
+      syncDAC();
+      DAC->DACCTRL[DACNumber].bit.ENABLE = 0x01; // The DACx output is turned on.
+      DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC controller
+      syncDAC();
+      while ( (DAC->STATUS.reg & (1 << DACNumber)) == 0 );   // Must wait for DACx to start
+
+      DAC->DATA[DACNumber].reg = value & 0xFFF;  // DACx on 12 bits.
+      syncDAC();
+    } else {
+      DAC->DATA[DACNumber].reg = value & 0xFFF;  // DACx on 12 bits.
+      syncDAC();
+    }
 #endif
-    syncDAC();
     return;
   }
   else if ( pinPeripheral(pin, PIO_TIMER_PWM) == RET_STATUS_OK )
   {
     Tc*  TCx  = 0 ;
     Tcc* TCCx = 0 ;
+    uint8_t timerIndex;
     uint8_t Channelx = GetTCChannelNumber( g_APinDescription[pin].ulTCChannel ) ;
-    uint8_t Timerx = GetTCNumber( g_APinDescription[pin].ulTCChannel ) ;
+    // uint8_t Timerx = GetTCNumber( g_APinDescription[pin].ulTCChannel ) ;
     uint8_t Typex = GetTCType( g_APinDescription[pin].ulTCChannel ) ;
     static bool tcEnabled[TCC_INST_NUM+TC_INST_NUM];
 
@@ -377,7 +381,7 @@ void analogWrite(uint32_t pin, uint32_t value)
 #if (SAMD)
         TCx->COUNT8.CTRLA.reg |= TC_CTRLA_WAVEGEN_NPWM;
 #elif (SAML21 || SAMC21)
-        TCx->WAVE.reg = TC_WAVE_WAVEGEN_NPWM;
+	TCx->COUNT8.WAVE.reg = TC_WAVE_WAVEGEN_NPWM;
 #endif
         syncTC_8(TCx);
         // Set the initial value
@@ -418,19 +422,21 @@ void analogWrite(uint32_t pin, uint32_t value)
         TCx->COUNT8.CC[Channelx].reg = (uint8_t) value;
 #elif (SAML21 || SAMC21)
         // SAML and SAMC have double-buffered TCs
-	TCx->CTRLBSET.bit.LUPD = 1;
-	syncTC_8(TCx);
 	TCx->COUNT8.CCBUF[Channelx].reg = (uint32_t) value;
-	syncTC_8(TCx);
-	TCx->CTRLBCLR.bit.LUPD = 1;
 #endif
         syncTC_8(TCx);
       } else {
+#if (SAMD)
         TCCx->CTRLBSET.bit.LUPD = 1;
         syncTCC(TCCx);
 	TCCx->CCB[Channelx].reg = (uint32_t) value;
-        syncTCC(TCCx);
-        TCCx->CTRLBCLR.bit.LUPD = 1;
+	syncTCC(TCCx);
+	TCCx->CTRLBCLR.bit.LUPD = 1;
+// LUPD caused endless spinning in syncTCC() on SAML (and probably SAMC). Note that CCBUF writes are already
+// atomic. The LUPD bit is intended for updating several registers at once, which analogWrite() does not do.
+#elif (SAML21 || SAMC21)
+	TCCx->CCBUF[Channelx].reg = (uint32_t) value;
+#endif
         syncTCC(TCCx);
       }
     }
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
index 6d8d1a377..63a46cf48 100644
--- a/cores/arduino/wiring_private.c
+++ b/cores/arduino/wiring_private.c
@@ -20,6 +20,18 @@
 #include "Arduino.h"
 #include "wiring_private.h"
 
+bool dacEnabled[] = {false, false};
+
+// Wait for synchronization of registers between the clock domains
+static __inline__ void syncDAC() __attribute__((always_inline, unused));
+static void syncDAC() {
+#if (SAMD)
+  while ( DAC->STATUS.bit.SYNCBUSY == 1 );
+#elif (SAML21 || SAMC21)
+  while ( DAC->SYNCBUSY.reg & DAC_SYNCBUSY_MASK );
+#endif
+}
+
 int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
 {
   // Prevent out of bounds access
@@ -124,12 +136,52 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
     break ;
   }
 
-  noInterrupts(); // Avoid possible invalid interim pin state
-
   uint8_t pinPort = g_APinDescription[ulPin].ulPort;
   uint8_t pinNum = g_APinDescription[ulPin].ulPin;
   uint8_t pinCfg = PORT_PINCFG_INEN;	// INEN should be enabled for both input and output (but not analog)
 
+  // Disable DAC, if analogWrite() used previously the DAC is enabled
+  // Note that on the L21, the DAC output would interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected
+  if ((pinAttribute & PIN_ATTR_DAC) && !((1UL << ulPeripheral) & PIN_ATTR_DAC))
+  {
+#if (SAMD || SAMC21)
+    if (dacEnabled[0]) {
+      dacEnabled[0] = false;
+      syncDAC();
+      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC
+      //DAC->CTRLB.bit.EOEN = 0x00; // The DAC output is turned off.
+      syncDAC();
+    }
+#elif (SAML21)
+    uint8_t DACNumber = 0x00;
+
+    if ( (pinPort == 0) && (pinNum == 5) ) {
+      DACNumber = 0x01;
+    }
+
+    if (dacEnabled[DACNumber]) {
+      dacEnabled[DACNumber] = false;
+      syncDAC();
+      DAC->CTRLA.bit.ENABLE = 0x00; // Disable DAC controller (so that DACCTRL can be modified)
+      delayMicroseconds(40);	// Must delay for at least 30us when turning off while refresh is on due to DAC errata
+
+      DAC->DACCTRL[DACNumber].bit.ENABLE = 0x00; // The DACx output is turned off.
+
+      if (dacEnabled[0] || dacEnabled[1]) {
+        DAC->CTRLA.bit.ENABLE = 0x01;     // Enable DAC controller, so that the other DAC can function
+        syncDAC();
+        if (DACNumber == 0) {
+          while ( (DAC->STATUS.reg & (1 << 1)) == 0 );   // Must wait for DACx to start
+        } else {
+          while ( (DAC->STATUS.reg & (1 << 0)) == 0 );   // Must wait for DACx to start
+        }
+      }
+    }
+#endif
+  }
+
+  noInterrupts(); // Avoid possible invalid interim pin state
+
   switch ( ulPeripheral )
   {
     case PIO_STARTUP:
diff --git a/extras/package_index.json.Beta.template b/extras/package_index.json.Beta.template
index 14fdceb16..86b11968c 100644
--- a/extras/package_index.json.Beta.template
+++ b/extras/package_index.json.Beta.template
@@ -23,7 +23,11 @@
           "size": "%%SIZE%%",
           "boards": [
             {"name": "MT-D21E"},
-            {"name": "MT-D11"}
+            {"name": "MT-D21E_revB"},
+            {"name": "MT-D11"},
+            {"name": "Generic_D11C14A"},
+            {"name": "arduino_zero"},
+            {"name": "arduino_mzero"}
           ],
           "toolsDependencies": [
             {
@@ -39,7 +43,7 @@
             {
               "packager": "arduino",
               "name": "openocd",
-	      "version": "0.9.0-arduino6-static"
+	      "version": "0.9.0-arduino"
             },
             {
               "packager": "arduino",
diff --git a/extras/package_index.json.PR.template b/extras/package_index.json.PR.template
index a2b4f1ed0..14c0d839c 100644
--- a/extras/package_index.json.PR.template
+++ b/extras/package_index.json.PR.template
@@ -23,7 +23,11 @@
           "size": "%%SIZE%%",
           "boards": [
             {"name": "MT-D21E"},
-            {"name": "MT-D11"}
+            {"name": "MT-D21E_revB"},
+            {"name": "MT-D11"},
+            {"name": "Generic_D11C14A"},
+            {"name": "arduino_zero"},
+            {"name": "arduino_mzero"}
           ],
           "toolsDependencies": [
             {
@@ -39,7 +43,7 @@
             {
               "packager": "arduino",
               "name": "openocd",
-              "version": "0.9.0-arduino6-static"
+              "version": "0.9.0-arduino"
             },
             {
               "packager": "arduino",
diff --git a/extras/package_index.json.Release.template b/extras/package_index.json.Release.template
index f8edfc725..ae5f4677e 100644
--- a/extras/package_index.json.Release.template
+++ b/extras/package_index.json.Release.template
@@ -25,7 +25,7 @@
 	{
 		"packager": "arduino",
 		"name": "openocd",
-		"version": "0.9.0-arduino6-static"
+		"version": "0.9.0-arduino"
 	},
 	{
 		"packager": "arduino",
diff --git a/platform.txt b/platform.txt
index 4e0262224..5439983fb 100644
--- a/platform.txt
+++ b/platform.txt
@@ -58,15 +58,15 @@ compiler.readelf.cmd=arm-none-eabi-readelf
 build.extra_flags=
 
 # These can be overridden in platform.local.txt
-compiler.c.extra_flags=
+compiler.c.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
 compiler.c.elf.extra_flags=
 #compiler.c.elf.extra_flags=-v
-compiler.cpp.extra_flags=
-compiler.S.extra_flags=
+compiler.cpp.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.S.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
-compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/"
+compiler.arm.cmsis.c.flags=
 compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
 
 # USB Flags
@@ -81,13 +81,13 @@ build.usb_manufacturer="Unknown"
 # ----------------
 
 ## Compile c files
-recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
+recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
 
 ## Compile c++ files
-recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
+recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
 
 ## Compile S files
-recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
+recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
 
 ## Create archives
 # archive_file_path is needed for backwards compatibility with IDE 1.6.5 or older, IDE 1.6.6 or newer overrides this value
@@ -156,7 +156,7 @@ tools.bossac.upload.network_pattern="{network_cmd}" -address {serial.port} -port
 # OpenOCD sketch upload
 #
 
-tools.openocd.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
+tools.openocd.path={runtime.tools.openocd-0.9.0-arduino.path}
 tools.openocd.cmd=bin/openocd
 tools.openocd.cmd.windows=bin/openocd.exe
 
@@ -185,7 +185,7 @@ tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/
 # FIXME: this programmer is a workaround for default options being overwritten by uploadUsingPreferences
 #
 
-tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino6-static.path}
+tools.openocd-withbootsize.path={runtime.tools.openocd-0.9.0-arduino.path}
 tools.openocd-withbootsize.cmd=bin/openocd
 tools.openocd-withbootsize.cmd.windows=bin/openocd.exe
 
diff --git a/variants/Generic_D11C14A/variant.h b/variants/Generic_D11C14A/variant.h
index 20998f1c5..f92c1d9e6 100644
--- a/variants/Generic_D11C14A/variant.h
+++ b/variants/Generic_D11C14A/variant.h
@@ -33,15 +33,37 @@
 #define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
 
 /*----------------------------------------------------------------------------
- *        Definitions
+ *        Clock Configuration
  *----------------------------------------------------------------------------*/
 
-/** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		(32768ul)
-
-/** Master clock frequency */
+/** Master clock frequency (also Fcpu frequency) */
 #define VARIANT_MCK		(48000000ul)
 
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index 0ea981bd1..199258135 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -33,15 +33,37 @@
 #define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
 
 /*----------------------------------------------------------------------------
- *        Definitions
+ *        Clock Configuration
  *----------------------------------------------------------------------------*/
 
-/** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		(32768ul)
-
-/** Master clock frequency */
+/** Master clock frequency (also Fcpu frequency) */
 #define VARIANT_MCK		(48000000ul)
 
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index a782a9cb0..1fabacc24 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -33,15 +33,37 @@
 #define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
 
 /*----------------------------------------------------------------------------
- *        Definitions
+ *        Clock Configuration
  *----------------------------------------------------------------------------*/
 
-/** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		(32768ul)
-
-/** Master clock frequency */
+/** Master clock frequency (also Fcpu frequency) */
 #define VARIANT_MCK		(48000000ul)
 
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
diff --git a/variants/MT_D21E_revB/variant.cpp b/variants/MT_D21E_revB/variant.cpp
index c37b16fff..c0212735f 100644
--- a/variants/MT_D21E_revB/variant.cpp
+++ b/variants/MT_D21E_revB/variant.cpp
@@ -128,7 +128,7 @@ const PinDescription g_APinDescription[]=
 #if (SAMD)
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
 #elif (SAML21 || SAMC21)
-const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC2 } ;
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC4 } ;
 #endif
 
 // Multi-serial objects instantiation
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
index 4e2f14b0a..88a595aae 100644
--- a/variants/MT_D21E_revB/variant.h
+++ b/variants/MT_D21E_revB/variant.h
@@ -33,15 +33,37 @@
 #define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
 
 /*----------------------------------------------------------------------------
- *        Definitions
+ *        Clock Configuration
  *----------------------------------------------------------------------------*/
 
-/** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		(32768ul)
-
-/** Master clock frequency */
+/** Master clock frequency (also Fcpu frequency) */
 #define VARIANT_MCK		(48000000ul)
 
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
@@ -285,22 +307,38 @@ extern Uart Serial2;
 //
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#if (!SAMC)
+  #define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#endif
 // SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
 // It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
 // The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
 // Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
 // the USB Host debugging output.
-#define SERIAL_PORT_MONITOR         Serial1
+#if (SAMC)
+  #define SERIAL_PORT_MONITOR         Serial2
+#else
+  #define SERIAL_PORT_MONITOR         Serial1
+#endif
+
 // Serial has no physical pins broken out, so it's not listed as HARDWARE port
-#define SERIAL_PORT_HARDWARE        Serial1
-#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+#if (SAMC)
+  #define SERIAL_PORT_HARDWARE        Serial2
+  #define SERIAL_PORT_HARDWARE_OPEN   Serial2
+#else
+  #define SERIAL_PORT_HARDWARE        Serial1
+  #define SERIAL_PORT_HARDWARE_OPEN   Serial1
+#endif
 
 // The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
 // accessible using Serial (the Arduino serial monitor is normally connected to this).
 // So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
 // Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
 // Remember to use while(!Serial); to wait for a connection before Serial printing.
-#define Serial                      SerialUSB
+#if (SAMC)
+  #define Serial		      Serial1
+#else
+  #define Serial                      SerialUSB
+#endif
 
 #endif /* _VARIANT_ARDUINO_ZERO_ */
diff --git a/variants/arduino_mzero/variant.h b/variants/arduino_mzero/variant.h
index f1efc0c23..72aa72ed0 100644
--- a/variants/arduino_mzero/variant.h
+++ b/variants/arduino_mzero/variant.h
@@ -26,15 +26,37 @@
 #define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
 
 /*----------------------------------------------------------------------------
- *        Definitions
+ *        Clock Configuration
  *----------------------------------------------------------------------------*/
 
-/** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		(32768ul)
-
-/** Master clock frequency */
+/** Master clock frequency (also Fcpu frequency) */
 #define VARIANT_MCK		(48000000ul)
 
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+//#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
@@ -118,6 +140,7 @@ static const uint8_t DAC0 = PIN_DAC0;
 
 /* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
 #define REFA_PIN    (15ul)
+#define REFB_PIN    (27ul)
 
 /*
  * Serial interfaces
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index 7e9b9f6ce..115b7af6f 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -26,15 +26,37 @@
 #define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
 
 /*----------------------------------------------------------------------------
- *        Definitions
+ *        Clock Configuration
  *----------------------------------------------------------------------------*/
 
-/** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		(32768ul)
-
-/** Master clock frequency */
+/** Master clock frequency (also Fcpu frequency) */
 #define VARIANT_MCK		(48000000ul)
 
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+//#define HS_CRYSTAL_FREQUENCY_HERTZ	16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
 /*----------------------------------------------------------------------------
  *        Headers
  *----------------------------------------------------------------------------*/
@@ -118,6 +140,7 @@ static const uint8_t DAC0 = PIN_DAC0;
 
 /* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
 #define REFA_PIN    (42ul)
+#define REFB_PIN    (17ul)
 
 // Other pins
 #define PIN_ATN              (38ul)

From 52f9b5041baa307e609b8c8188b7dd8f6f6ba127 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 21 Apr 2017 17:45:40 +0000
Subject: [PATCH 088/124] Changed peripheral assignments for D11C. Auto switch
 from SerialUSB to Serial1 when CDC not enabled.

---
 boards.txt                           |  8 +--
 variants/Generic_D11C14A/README.md   | 42 +++++++-----
 variants/Generic_D11C14A/variant.cpp |  7 --
 variants/Generic_D11C14A/variant.h   | 98 +++++++++++++++++-----------
 variants/MT_D11/README.md            | 20 ++++--
 variants/MT_D11/variant.h            | 16 ++++-
 variants/MT_D21E/README.md           | 23 +++----
 variants/MT_D21E/variant.h           |  6 ++
 variants/MT_D21E_revB/README.md      | 22 ++++---
 variants/MT_D21E_revB/variant.h      |  7 +-
 10 files changed, 153 insertions(+), 96 deletions(-)

diff --git a/boards.txt b/boards.txt
index 0b99f5efe..4464f5201 100644
--- a/boards.txt
+++ b/boards.txt
@@ -431,6 +431,10 @@ d11c14a.menu.serial.one_uart=ONE_UART_ONE_WIRE_NO_SPI
 d11c14a.menu.serial.one_uart.build.serialcom_uart=ONE_UART
 d11c14a.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
 d11c14a.menu.serial.one_uart.build.serialcom_spi=NO_SPI
+d11c14a.menu.serial.two_uart=TWO_UART_NO_WIRE_NO_SPI
+d11c14a.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+d11c14a.menu.serial.two_uart.build.serialcom_wire=NO_WIRE
+d11c14a.menu.serial.two_uart.build.serialcom_spi=NO_SPI
 d11c14a.menu.serial.one_uart_no_wire_one_spi=ONE_UART_NO_WIRE_ONE_SPI
 d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_uart=ONE_UART
 d11c14a.menu.serial.one_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
@@ -439,10 +443,6 @@ d11c14a.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
 d11c14a.menu.serial.no_uart.build.serialcom_uart=NO_UART
 d11c14a.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
 d11c14a.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
-d11c14a.menu.serial.two_uart=TWO_UART_NO_WIRE_NO_SPI
-d11c14a.menu.serial.two_uart.build.serialcom_uart=TWO_UART
-d11c14a.menu.serial.two_uart.build.serialcom_wire=NO_WIRE
-d11c14a.menu.serial.two_uart.build.serialcom_spi=NO_SPI
 d11c14a.menu.usb.cdc=CDC_ONLY
 d11c14a.menu.usb.cdc.build.usbcom=CDC_ONLY
 d11c14a.menu.usb.cdc.build.pid=0x0557
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
index 96cd0ec76..7d80b01e3 100644
--- a/variants/Generic_D11C14A/README.md
+++ b/variants/Generic_D11C14A/README.md
@@ -4,21 +4,26 @@
 ====================================== ATsamD11C14A =====================================
 Other  COM   PWM  Analog  INT  Arduino*           Arduino*  INT  Analog  PWM   COM  Other
 =========================================================================================
-                                   -------------------
-     RX2*    TCC01    *    *    5 | A5             A4 | 4    *    *     TCC00  TX2*   REF
- TX1 / MOSI  TCC02         *    8 | A8             A2 | 2    *    *                   DAC
- RX1 / SCK   TCC03         *    9 | A9            Vdd |
-     SDA     TC10     *   NMI  14 | A14           Gnd |
-     SCL     TC11     *    *   15 | A15           A25 | 25                    USB/DP
+                                  1-------------------
+  SCK*/RX2  TCC01    *     *    5 | A5             A4 | 4    *    *  TCC00 MOSI*/TX2  REF
+    MOSI*   TCC02          *    8 | A8             A2 | 2    *    *                   DAC
+    SCK*    TCC03          *    9 | A9            Vdd |
+  SDA/MISO*  TC10    *    NMI  14 | A14           Gnd |
+   SCL/SS*   TC11    *     *   15 | A15           A25 | 25                    USB/DP
 BOOT                           28 | A28/RST       A24 | 24                    USB/DM
-SWDCLK  MISO                   30 | A30           A31 | 31   *                SS    SWDIO
+SWDCLK  TX1/MISO*              30 | A30           A31 | 31   *            RX1/SS*   SWDIO
                                    -------------------
 
-* Some pins can be used for more than one function. The same port pin number printed on
-  the board is also used in Arduino (without the 'A') for all of the supported functions
-  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
-* When using ONE_UART_NO_WIRE_ONE_SPI, Serial1() refers to TX2/RX2 instead of TX1/RX1.
-* Tone available on TC2. TC2 is not routed to pins with the D11C14A.
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the board is also used in Arduino (but without the 'A') for all
+  of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.). When
+  using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
+  left pin (A2). PIN_MAP_COMPACT uses less RAM.
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+* When using NO_UART_ONE_WIRE_ONE_SPI, use SPI on pins 4, 5, 14, and 15.
+  When using ONE_UART_NO_WIRE_ONE_SPI, use SPI on pins 8, 9, 30, and 31.
+* Tone available on TC2. TC2 is not routed to pins in the D11C14A.
+* Leave pin A30 floating (or use external pullup) during reset.
 * DO NOT connect voltages higher than 3.3V!
 ```
 
@@ -80,13 +85,16 @@ Arduino	| Port	| Alternate Function	| Comments (! means not used with this perip
 11	| PA31	| SS / SWD IO		| EIC/EXTINT[3] SERCOM1/PAD[1] !SERCOM1/PAD[3] !TC2/WO[1] !TCC0/WO[3] SWD IO
 ====================================================================================================================================
 
-* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
-  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the board is also used in Arduino (but without the 'A') for all
+  of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.). When
+  using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
+  left pin (A2). PIN_MAP_COMPACT uses less RAM.
 * NOT A PIN means the Arduino pin number is not mapped to a physical pin.
 * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
-* The tone library uses TC2. TC2 is not routed to pins with the D11C14A (14-pin).
-* Pins 8 and 9 are by default connected to the 32.768KHz crystal.
-* When using ONE_UART_NO_WIRE_ONE_SPI, Serial1() refers to TX2/RX2 instead of TX1/RX1.
+* The tone library uses TC2. TC2 is not routed to pins in the D11C14A (14-pin).
+* When using ONE_UART_NO_WIRE_ONE_SPI, Serial1 refers to TX2/RX2 instead of TX1/RX1.
+* Leave pin A30 floating (or use external pullup) during reset.
 * SERCOM2 does not exist on the D11C14A.
 
 
diff --git a/variants/Generic_D11C14A/variant.cpp b/variants/Generic_D11C14A/variant.cpp
index 878482282..08805e484 100644
--- a/variants/Generic_D11C14A/variant.cpp
+++ b/variants/Generic_D11C14A/variant.cpp
@@ -92,18 +92,11 @@ SERCOM sercom1( SERCOM1 ) ;
 #if defined(ONE_UART) || defined(TWO_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
-#if defined (ONE_SPI)
-void SERCOM0_Handler()
-{
-  Serial1.IrqHandler();
-}
-#else
 void SERCOM1_Handler()
 {
   Serial1.IrqHandler();
 }
 #endif
-#endif
 
 #if defined(TWO_UART)
 Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
diff --git a/variants/Generic_D11C14A/variant.h b/variants/Generic_D11C14A/variant.h
index f92c1d9e6..1948e7e83 100644
--- a/variants/Generic_D11C14A/variant.h
+++ b/variants/Generic_D11C14A/variant.h
@@ -194,32 +194,18 @@ static const uint8_t ATN = PIN_ATN;
  * Serial interfaces
  */
 // Serial1
-#if defined(ONE_UART) && defined (ONE_SPI)
-  #if defined PIN_MAP_STANDARD
-    #define PIN_SERIAL1_RX       (5ul)
-    #define PIN_SERIAL1_TX       (4ul)
-  #elif defined PIN_MAP_COMPACT
-    #define PIN_SERIAL1_RX       (2ul)
-    #define PIN_SERIAL1_TX       (1ul)
-  #endif
-  
-  #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
-  #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
-  #define SERCOM_INSTANCE_SERIAL1       &sercom0
-#else
-  #if defined PIN_MAP_STANDARD
-    #define PIN_SERIAL1_RX       (9ul)
-    #define PIN_SERIAL1_TX       (8ul)
-  #elif defined PIN_MAP_COMPACT
-    #define PIN_SERIAL1_RX       (4ul)
-    #define PIN_SERIAL1_TX       (3ul)
-  #endif
-  
-  #define PAD_SERIAL1_TX       (UART_TX_PAD_2)
-  #define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
-  #define SERCOM_INSTANCE_SERIAL1       &sercom1
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL1_RX       (31ul)
+#define PIN_SERIAL1_TX       (30ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL1_RX       (11ul)
+#define PIN_SERIAL1_TX       (10ul)
 #endif
 
+#define PAD_SERIAL1_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_1)
+#define SERCOM_INSTANCE_SERIAL1       &sercom1
+
 // Serial2
 #if defined PIN_MAP_STANDARD
 #define PIN_SERIAL2_RX       (5ul)
@@ -237,23 +223,47 @@ static const uint8_t ATN = PIN_ATN;
 /*
  * SPI Interfaces
  */
+#if defined(ONE_SPI)
 #define SPI_INTERFACES_COUNT 1
-
-#if defined PIN_MAP_STANDARD
-#define PIN_SPI_MISO         (30u)
-#define PIN_SPI_MOSI         (8u)
-#define PIN_SPI_SCK          (9u)
-#define PIN_SPI_SS           (31u)
-#elif defined PIN_MAP_COMPACT
-#define PIN_SPI_MISO         (10u)
-#define PIN_SPI_MOSI         (3u)
-#define PIN_SPI_SCK          (4u)
-#define PIN_SPI_SS           (11u)
+#else
+#define SPI_INTERFACES_COUNT 0
 #endif
 
-#define PERIPH_SPI           sercom1
-#define PAD_SPI_TX           SPI_PAD_2_SCK_3
-#define PAD_SPI_RX           SERCOM_RX_PAD_0
+#if defined(ONE_WIRE) && defined (ONE_SPI)
+  #if defined PIN_MAP_STANDARD
+    #define PIN_SPI_MISO         (30u)
+    #define PIN_SPI_MOSI         (8u)
+    #define PIN_SPI_SCK          (9u)
+    #define PIN_SPI_SS           (31u)
+  #elif defined PIN_MAP_COMPACT
+    #define PIN_SPI_MISO         (10u)
+    #define PIN_SPI_MOSI         (3u)
+    #define PIN_SPI_SCK          (4u)
+    #define PIN_SPI_SS           (11u)
+  #endif
+
+  #define PERIPH_SPI           sercom1
+  #define PAD_SPI_TX           SPI_PAD_2_SCK_3
+  #define PAD_SPI_RX           SERCOM_RX_PAD_0
+
+// ONE_UART and ONE_SPI
+#else
+  #if defined PIN_MAP_STANDARD
+    #define PIN_SPI_MISO         (14u)
+    #define PIN_SPI_MOSI         (4u)
+    #define PIN_SPI_SCK          (5u)
+    #define PIN_SPI_SS           (15u)
+  #elif defined PIN_MAP_COMPACT
+    #define PIN_SPI_MISO         (5u)
+    #define PIN_SPI_MOSI         (1u)
+    #define PIN_SPI_SCK          (2u)
+    #define PIN_SPI_SS           (5u)
+  #endif
+
+  #define PERIPH_SPI           sercom0
+  #define PAD_SPI_TX           SPI_PAD_2_SCK_3
+  #define PAD_SPI_RX           SERCOM_RX_PAD_0
+#endif
 
 static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
 static const uint8_t MOSI = PIN_SPI_MOSI ;
@@ -264,7 +274,11 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 /*
  * Wire Interfaces
  */
+#if defined(ONE_WIRE)
 #define WIRE_INTERFACES_COUNT 1
+#else
+#define WIRE_INTERFACES_COUNT 0
+#endif
 
 #if defined PIN_MAP_STANDARD
 #define PIN_WIRE_SDA         (14u)
@@ -345,11 +359,17 @@ extern Uart Serial2;
 #define SERIAL_PORT_HARDWARE        Serial1
 #define SERIAL_PORT_HARDWARE_OPEN   Serial1
 
-// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// The MT-D11 does not have the EDBG support chip, which provides a USB-UART bridge
 // accessible using Serial (the Arduino serial monitor is normally connected to this).
 // So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
 // Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
 // Remember to use while(!Serial); to wait for a connection before Serial printing.
+
+// When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 #define Serial                      SerialUSB
+#else
+#define Serial                      Serial1
+#endif
 
 #endif /* _VARIANT_ARDUINO_ZERO_ */
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
index 7d157dc24..8d8705b0f 100644
--- a/variants/MT_D11/README.md
+++ b/variants/MT_D11/README.md
@@ -17,9 +17,13 @@ REF                   *            | A3   |     |  Vcc |
 BTN   SS              *      *     | A15           RST |                             BOOT
                                     -------------------
 
-* Some pins can be used for more than one function. The same port pin number printed on
-  the board is also used in Arduino (without the 'A') for all of the supported functions
-  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the board is also used in Arduino (but without the 'A') for all
+  of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.). When
+  using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
+  left pin (A2). PIN_MAP_COMPACT uses less RAM.
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+* Leave pin A30 floating (or use external pullup) during reset.
 * Tone available on TC2. DO NOT connect voltages higher than 3.3V!
 ```
 
@@ -86,12 +90,16 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 16	| A31	| PA31	| RX1 / SWD IO		| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
 ============================================================================================================================================
 
-* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
-  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the board is also used in Arduino (but without the 'A') for all
+  of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.). When
+  using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
+  left pin (A2). PIN_MAP_COMPACT uses less RAM.
 * The following Arduino pin numbers are not mapped to a physical pin: 0, 1, 8, 9, 12, 13, 18, 19, 20, 21, 24, 25, 26, 28, and 29.
 * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
-* The tone library uses TC2.
+* Leave pin A30 floating (or use external pullup) during reset.
 * Pins 8 and 9 are by default connected to the 32.768KHz crystal.
+* The tone library uses TC2.
 
 
 
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index 199258135..defe780fa 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -257,7 +257,11 @@ static const uint8_t ATN = PIN_ATN;
 /*
  * SPI Interfaces
  */
+#if defined(ONE_SPI)
 #define SPI_INTERFACES_COUNT 1
+#else
+#define SPI_INTERFACES_COUNT 0
+#endif
 
 #if defined PIN_MAP_STANDARD
 #define PIN_SPI_MISO         (14u)
@@ -284,7 +288,11 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 /*
  * Wire Interfaces
  */
+#if defined(ONE_WIRE)
 #define WIRE_INTERFACES_COUNT 1
+#else
+#define WIRE_INTERFACES_COUNT 0
+#endif
 
 #if defined PIN_MAP_STANDARD
 #define PIN_WIRE_SDA         (22u)
@@ -367,11 +375,17 @@ extern Uart Serial2;
 #define SERIAL_PORT_HARDWARE        Serial1
 #define SERIAL_PORT_HARDWARE_OPEN   Serial1
 
-// The MT-D21E does not have the EDBG support chip, which provides a USB-UART bridge
+// The MT-D11 does not have the EDBG support chip, which provides a USB-UART bridge
 // accessible using Serial (the Arduino serial monitor is normally connected to this).
 // So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
 // Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
 // Remember to use while(!Serial); to wait for a connection before Serial printing.
+
+// When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 #define Serial                      SerialUSB
+#else
+#define Serial                      Serial1
+#endif
 
 #endif /* _VARIANT_ARDUINO_ZERO_ */
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
index 4763044e8..0beaac421 100644
--- a/variants/MT_D21E/README.md
+++ b/variants/MT_D21E/README.md
@@ -27,10 +27,12 @@ USB D+       TC51                    | A25+ |     |  Vin |
                                      | Gnd  | USB |  Gnd |
                                       -------------------
 
-Some pins can be used for more than one function. The same port pin number printed on
-the board is also used in Arduino (without the 'A') for all of the supported functions
-(ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
-DO NOT connect voltages higher than 3.3V!
+* Most pins can be used for more than one function. The port pin number printed
+  on the board is also used in Arduino (but without the 'A') for all of the supported
+  functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+* Leave pin A30 floating (or use external pullup) during reset.
+* Tone available on TC5. DO NOT connect voltages higher than 3.3V!
 ```
 
 # Pins descriptions for the MattairTech MT-D21E
@@ -72,15 +74,14 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 --	| RST	| ----	|			| Reset, BOOT (double tap bootloader entry)
 ============================================================================================================================================
 
-* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
-  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
-
+* Most pins can be used for more than one function. The port pin number printed
+  on the board is also used in Arduino (but without the 'A') for all of the supported
+  functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
 * The following Arduino pin numbers are not mapped to a physical pin: 12, 13, 20, 21, 26, and 29.
-
-* Pins 24 and 25 are by default in use by USB (USB_NEGATIVE and USB_POSITIVE). TC5(D21) is available on these pins otherwise.
-  The tone library uses TC5.
-
+* Pins 24 and 25 are by default in use by USB (USB_NEGATIVE and USB_POSITIVE).
+* TC5(D21) is available on these pins otherwise. The tone library uses TC5.
 * A0 and A1 are by default connected to the 32.768KHz crystal.
+* Leave pin A30 floating (or use external pullup) during reset.
 
 
 
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index 1fabacc24..c99e633b8 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -309,6 +309,12 @@ extern Uart Serial2;
 // So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
 // Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
 // Remember to use while(!Serial); to wait for a connection before Serial printing.
+
+// When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
 #define Serial                      SerialUSB
+#else
+#define Serial                      Serial1
+#endif
 
 #endif /* _VARIANT_ARDUINO_ZERO_ */
diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
index eff1831c0..0ad81229d 100644
--- a/variants/MT_D21E_revB/README.md
+++ b/variants/MT_D21E_revB/README.md
@@ -28,9 +28,12 @@ USB D+ (D/L)(+), CAN RX (C)  TC51 25 | A25  |     |  Vin |   L21 installed. 5V i
            Chip Variant:              -------------------
         D=D21, L=L21, C=C21
 
-* Most pins can be used for more than one function. The same port pin number printed on
-  the board is also used in Arduino (without the 'A') for all of the supported functions
-  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* Most pins can be used for more than one function. The port pin number printed
+  on the board is also used in Arduino (but without the 'A') for all of the supported
+  functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+* Leave pin A30 floating (or use external pullup) during reset.
+* Tone available on TC5. DO NOT connect voltages higher than 3.3V!
 
 + This alternate function is enabled by default (+M functions enabled only when a memory
   device is installed). Thus, the associated header pin cannot be used. Solder jumpers
@@ -83,15 +86,14 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 --	| RST	| ----	|			| Reset, BOOT (double tap bootloader entry)
 ============================================================================================================================================
 
-* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
-  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
-
+* Most pins can be used for more than one function. The port pin number printed
+  on the board is also used in Arduino (but without the 'A') for all of the supported
+  functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
 * The following Arduino pin numbers are not mapped to a physical pin: 12, 13, 20, 21, 26, and 29.
-
-* Pins 24 and 25 are by default in use by USB (USB_NEGATIVE and USB_POSITIVE). TC5(D21) is available on these pins otherwise.
-  The tone library uses TC5.
-
+* Pins 24 and 25 are by default in use by USB (USB_NEGATIVE and USB_POSITIVE).
+* TC5(D21) is available on these pins otherwise. The tone library uses TC5.
 * A0 and A1 are by default connected to the 32.768KHz crystal.
+* Leave pin A30 floating (or use external pullup) during reset.
 
 
 
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
index 88a595aae..07046a4c5 100644
--- a/variants/MT_D21E_revB/variant.h
+++ b/variants/MT_D21E_revB/variant.h
@@ -338,7 +338,12 @@ extern Uart Serial2;
 #if (SAMC)
   #define Serial		      Serial1
 #else
-  #define Serial                      SerialUSB
+  // When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+  #if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
+    #define Serial                      SerialUSB
+  #else
+    #define Serial                      Serial1
+  #endif
 #endif
 
 #endif /* _VARIANT_ARDUINO_ZERO_ */

From 914f38accd8912536ba24ccd4aa2a4f5222746ae Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 22 Apr 2017 04:28:12 +0000
Subject: [PATCH 089/124] Updated documentation

---
 README.md                           | 674 +++++++++++++++++-----------
 bootloaders/zero/binaries/README.md |   3 -
 variants/Generic_D11C14A/README.md  |  51 +++
 variants/MT_D11/README.md           |  55 +++
 variants/MT_D21E/README.md          |  55 +++
 variants/MT_D21E_revB/README.md     |  55 +++
 variants/MT_D21E_revB/variant.h     |   2 +-
 7 files changed, 637 insertions(+), 258 deletions(-)

diff --git a/README.md b/README.md
index 4cf2f1db7..b7e87798f 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,22 @@
 # MattairTech Arduino SAM M0+ Core
 
+This documentation is currently under construction.
+
 This is a fork from arduino/ArduinoCore-samd on GitHub. This will be used to maintain
 Arduino support for SAM M0+ boards including the MattairTech MT-D21E and the MT-D11
-(see https://www.mattairtech.com/). It primarily adds support for new devices as well
-as a more flexible pin configuration / mapping system. It also adds some size
-optimizations (~7.5KB for blink sketch with CDC+HID+UART, ~2.5KB without USB or UART).
+(see https://www.mattairtech.com/). It adds support for new devices like the L21, C21, and
+D11. It also adds new clock sources, like a high speed crystal or internal oscillator.
 
 This core is intended to be installed using Boards Manager (see below). To update from a
 previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.
 
+**Differences from Arduino in Versioning**
+The MattairTech version number does not correspond to either the IDE version or to the
+upstream ArduinoCore-samd version. See the CHANGELOG for details on which upstream
+commits have been merged in to the MattairTech core.
+
 
-## What's New Beta (1.6.8-beta)
+## What's New Beta (1.6.8-beta). See Beta Builds section for installation instructions.
 
 1.6.8-beta-b0:
 * Added L21 and C21 support. Improved D11D and D11C support.
@@ -26,12 +32,13 @@ previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then cl
 * New Tools->Bootloader Size menu allows selection of bootloader size
 * New Tools->USB Config menu simplifies USB configuration compared to previous core
 * Updated variant.cpp table format for future CCL and GCLK use. See VARIANT_COMPLIANCE_CHANGELOG.
+* Updated bootloader.
 * Updated bossac upload tool (fixed support for SAML and SAMC)
 * New CMSIS-Atmel package (this is different than from Arduino)
-* Merged in all changes from upstream through SAMD CORE 1.6.13 (2017.03.31)
+* Merged in all changes from upstream through SAMD CORE 1.6.14 (April 2017)
 
 
-## What's New Release (1.6.6)
+## What's New Release (1.6.6). NOTE: This is out of date, use the beta for now.
 
 * 1.6.6-mt3:
   * Fixes compilation with CDC_UART and CDC_ONLY settings
@@ -48,7 +55,9 @@ previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then cl
   * Merged in changes from upstream SAMD CORE 1.6.2 2015.11.03 (see CHANGELOG for details)
 
 
-## Summary
+## Specifications
+
+TODO: Update for L21 and C21
 
 Feature                 |	MT-D21E										|	MT-D11
 ------------------------|---------------------------------------------------------------------------------------|------------------------------------------------------
@@ -70,173 +79,328 @@ Operating Voltage	|	3.3V (Do not connect voltages higher than 3.3V!)				|	3.3V (
 DC Current per I/O Pin	|	7 mA										|	7 mA
 
 
-## Special Notes
 
-* **Boards Manager must be opened twice to see some updates**
+## Board Variants
 
-* **Errors when compiling, uploading, or burning the bootloader**
-  * Be sure to install the Arduino samd core before installing the MattairTech sam m0+ core. If you have problems upgrading
-  the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
-  Use Arduino core 1.6.2 or above.
+Pin configuration and peripheral assignment information is now in the README.md for each board variant.
+README.md also now includes technical information on the new PinDescription table format.
 
-* **Tools->Communications menu**
-  * Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
-  must match the included libraries. For example, when including the HID and Keyboard libraries, you must select an
-  option that includes HID (ie: CDC_HID_UART). This menu is currently needed to select the USB PID that matches the
-  USB device configuration (needed for Windows). This may become automatic in a future release.
+* [MattairTech MT-D21E Rev B (SAMx21Exxx)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/MT_D21E_revB/README.md)
 
-    * Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
-    * Different combinations of USB devices will result in different COM port assingments in Windows.
+* [MattairTech MT-D21E Rev A (SAMD21ExxA)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/MT_D21E/README.md)
 
-* **Incude platform specific libraries**
-  * You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
+* [MattairTech MT-D11 (SAMD11D14AM)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/MT_D11/README.md)
 
-* **Differences from Arduino in versioning**
-  * The MattairTech ArduinoCore-samd version currently tracks the IDE version. In some cases, it may indicate the
-  minimum IDE version. This is the case for both 1.6.5-mtX and 1.6.6-mtX (which corresponds to SAMD CORE 1.6.2).
-  1.6.6-mt1 corresponds to Arduino SAMD CORE 1.6.2 plus some pull requests.
+* [MattairTech Generic D11C14A](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/Generic_D11C14A/README.md)
 
+* MattairTech x21J based board (coming June)
 
-### Additional Differences Between MattairTech and Arduino Cores
-* TODO
+* MattairTech Generic D11D14AS (coming soon)
 
+* MattairTech Generic D11D14AM (coming soon)
 
-## Pin Configurations
+* MattairTech Generic x21E (coming soon)
 
-Most pins have multiple configurations available (even analog pins). For example, pin A10 on the MT-D21E can be an analog
-input, a PWM output, Digital I/O, or the TX pin of 'Serial1'. These always reference the pin number printed on the board
-but without the 'A' (with the usable pins starting at 2). DO NOT connect voltages higher than 3.3V!
+* MattairTech Generic x21G (coming soon)
 
+* MattairTech Generic x21J (coming soon)
 
-# MattairTech MT-D21E (rev B) (ATSAMx21Exxx)
+* [Arduino Zero (arduino.cc)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/arduino_zero/README.md)
 
-```
-========================== MattairTech MT-D21E rev B (ATSAMx21Exxx) =====================
-Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     COM   Other
-=========================================================================================
-                                      -------------------
-XI32(+)                              | A0            RST |                        BOOT(+)
-XO32(+)                              | A1            Gnd |
-DAC                   *            2 | A2           Vbat |
-REFA                  *            3 | A3            A31 | 31    *                IO/B(+)
-REFB                  *      *     4 | A4            A30 | 30    *                 CLK(+)
-DAC1(L)               *      *     5 | A5            NC  |
-LED(+)       TCC10    *            6 | A6       A28 (D/C)| 28    *
-VM           TCC11    *            7 | A7            A27 | 27    *               A/CS(+M)
-             TCC00    *     NMI    8 | A8            A23 | 23    * TC41/TC01~ SS
-             TCC01    *      *     9 | A9            A22 | 22    * TC40/TC00~ MISO(+M)
-       TX1   TCC02    *           10 | A10           A19 | 19    *            SCK(+M)
-       RX1   TCC03    *           11 | A11           A18 | 18    *            MOSI(+M)
-       TX2 TC30/TC40~        *    14 | A14           A17 | 17    *   TCC21    SCL(+)
-       RX2 TC31/TC41~             15 | A15           A16 | 16    *   TCC20    SDA(+)
-                                     | NC            NC  |
-     M=Memory device installed       | NC            NC  | ! Vcc is 3.3V by default.
-                                     | Vbus          3.3V|   DO NOT exceed 3.6V on Vcc or
-USB D- (D/L)(+), CAN TX (C)  TC50 24 | A24   _____   Vcc |   any IO pin with the D21 or
-USB D+ (D/L)(+), CAN RX (C)  TC51 25 | A25  |     |  Vin |   L21 installed. 5V is allowed
-                                     | Gnd  | USB |  Gnd |   ONLY with the C21 installed.
-           Chip Variant:              -------------------
-        D=D21, L=L21, C=C21
-
-* Most pins can be used for more than one function. The same port pin number printed on
-  the board is also used in Arduino (without the 'A') for all of the supported functions
-  (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
-
-+ This alternate function is enabled by default (+M functions enabled only when a memory
-  device is installed). Thus, the associated header pin cannot be used. Solder jumpers
-  can be used to enable or disable the alternate onboard function.
-
-~ When two timers are shown, the second is for L21/C21. TC5 is TC1 on the L21/C21.
-
-Silkscreen Legend:
-  Top: A circled pin means analog function and '*' means alternate function (see + above)
-  Bottom: A circled pin means analog function
-```
+* [Arduino M0 (arduino.org)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/arduino_mzero/README.md)
 
 
-### SAMD11 (MT-D11)
 
-```
-=========================== MattairTech MT-D11 (ATsamd11D14AM) ==========================
-Other  INT   PWM   Digital  Analog                    Digital   PWM      INT     Other
-=========================================================================================
-                                    -------------------
-DAC                   2   2(ADC0)  | A2   | USB |  Gnd |
-REF                   3   3(ADC1)  | A3   |     |  Vcc |
-   4(INT4)  4(TCC00)  4   4(ADC2)  | A4    -----   A31 | 31  31(TC21)  31(INT3)  RX/SWDIO
-   5(INT5)  5(TCC01)  5   5(ADC3)  | A5            A30 | 30  30(TC20)           TX/SWDCLK
-            6(TCC02)  6   6(ADC4)  | A6            A27 | 27            27(INT7)
-            7(TCC03)  7   7(ADC5)  | A7            A23 | 23                      SCL
-MOSI  10(INT2)        10  10(ADC8) | A10           A22 | 22            22(INT6)  SDA
-SCK                   11  11(ADC9) | A11           A17 | 17  17(TC11)
-MISO  14(INTNMI)      14  14(ADC6) | A14           A16 | 16  16(TC10)  16(INT0)  LED
-BTN/SS  15(INT1)      15  15(ADC7) | A15           RST |                         Reset
-                                    -------------------
-```
+## Tools Menu Additions
+
+Depending on the board variant, different menu options will appear in the Tools menu. 
+
+
+### Microcontroller Menu
+
+This menu will appear with boards that have multiple microcontroller options.
+
+
+### Clock Source Menu
+
+There are up to four clock source choices, depending on board variant and microcontroller. They are:
+
+* 32KHZ_CRYSTAL (default)
+* HIGH_SPEED_CRYSTAL
+* INTERNAL_OSCILLATOR
+* INTERNAL_USB_CALIBRATED_OSCILLATOR
+
+See Clock Source section for more information.
+
+
+### Bootloader Size Menu
+
+With the D21, L21, and C21, the bootloader size can be configured as:
+
+* 8KB_BOOTLOADER (default)
+* 16KB_BOOTLOADER
+* NO_BOOTLOADER
+
+With the D11, the bootloader size can be configured as:
+
+* 4KB_BOOTLOADER (default)
+* NO_BOOTLOADER
+
+Choose NO_BOOTLOADER if not using a bootloader (an external programmer will be used for sketch upload).
+
+
+### Serial Config Menu
+
+This menu is used to select different combinations of serial peripherals. This is useful especially for
+the D11, which has a reduced pin count and number of SERCOMs. It can also be used to reduce FLASH and
+SRAM usage by selecting fewer UART peripherals, which are instantiated in the core, rather than only
+when including a library (like SPI and WIRE). Most board variants support two UART as an option.
+
+
+### USB Config Menu
+
+This menu will appear with all microcontrollers except the C21, which does not have USB. The options are:
+
+* CDC_ONLY (default)
+* CDC_HID
+* WITH_CDC
+* HID_ONLY
+* WITHOUT_CDC
+* USB_DISABLED
+
+Choose an option that best matches your code and library usage. Each option results in a different USB PID.
+Choose an option with CDC if you want auto-reset to function, or the serial monitor over USB. If CDC is
+not enabled, Serial will refer to Serial1 instead of SerialUSB. These options can be used to optimize FLASH
+and SRAM usage by allowing CDC to be disabled (or USB completely disabled).
+
+
+## Clock Source
 
+TODO
+There are up to four clock source choices, depending on board variant and microcontroller. They are:
+
+* 32KHZ_CRYSTAL (default)
+* HIGH_SPEED_CRYSTAL
+* INTERNAL_OSCILLATOR
+* INTERNAL_USB_CALIBRATED_OSCILLATOR
+
+ * If CLOCKCONFIG_32768HZ_CRYSTAL or
+ * CLOCKCONFIG_HS_CRYSTAL is defined, then the PLL will be used. If
+ * CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ must
+ * also be defined with the crystal frequency in Hertz. CLOCKCONFIG_INTERNAL
+ * uses the DFLL in open-loop mode, except with the C21 which lacks a DFLL, so
+ * the internal 48MHz RC oscillator is used instead. CLOCKCONFIG_INTERNAL_USB
+ * can be defined for the D21, D11, or L21. It will also use the DFLL in
+ * open-loop mode, except when connected to a USB port with data lines (and
+ * not suspended), where it will calibrate against the USB SOF signal.
+
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
+#error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 4000000UL and 32000000UL"
+#endif
+
+#if defined(PLL_FAST_STARTUP)
+#if (HS_CRYSTAL_FREQUENCY_HERTZ < 1000000UL)
+#error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be at least 1000000UL when PLL_FAST_STARTUP is defined"
+#else
+#define HS_CRYSTAL_DIVISOR	1000000UL
+#endif
+#else
+#define HS_CRYSTAL_DIVISOR	32000UL
+#endif
+
+#define HS_CRYSTAL_DIVIDER	(HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVISOR)
+#define DPLLRATIO_FLOAT		(96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
+
+#if defined(PLL_FRACTIONAL_ENABLED)
+#define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+#define DPLLRATIO_LDRFRAC	(uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
+#else
+#define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+#define DPLLRATIO_LDRFRAC	0
+#endif
+
+Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz.
+
+// Constants for Clock generators
+#define GENERIC_CLOCK_GENERATOR_MAIN      (0u)
+#define GENERIC_CLOCK_GENERATOR_XOSC      (1u)
+#define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT (D21/D11) */
+#define GENERIC_CLOCK_GENERATOR_OSC_HS    (3u)
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
+* What to do with unused default internal RC oscillator:
+#if (SAMD21)
+/* Modify PRESCaler value of OSC8M to have 8MHz */
+/* Put OSC8M as source for Generic Clock Generator 3 */
+#elif (SAML21)
+/* Note that after reset, the L21 starts with the OSC16M set to 4MHz, NOT the DFLL@48MHz as stated in some documentation. */
+/* Modify FSEL value of OSC16M to have 8MHz */
+/* Put OSC16M as source for Generic Clock Generator 3 */
+#endif
+
+
+### External High-Speed Crystal
+TODO
+
+### External 32.768KHz Crystal
+TODO
+
+### Internal Oscillator with USB Calibration
+TODO
+
+### Internal Oscillator
+TODO
+
+
+
+## Analog Reference
+
+TODO: Analog reference selection
+
+ * For values <= 5, the actual register value is used.
+ * For values > 5 (SAML and SAMC only), the SUPC_VREF_SEL register value is: (ulMode - 6).
+ * Values for the Supply Controller (SUPC) reference on the L21 or C21.
+ * Used when AR_INTREF is selected as the reference.
+
+typedef enum _eAnalogReference
+{
+#if (SAMD)
+  AR_INTERNAL1V0 = 0,
+  AR_INTERNAL_INTVCC0 = 1,
+  AR_INTERNAL_INTVCC1 = 2,
+  AR_EXTERNAL_REFA = 3,
+  AR_EXTERNAL_REFB = 4,
+  AR_DEFAULT = 5,	// On the SAMD, this also uses 1/2 gain on each input
+#elif (SAML21)
+  AR_INTREF = 0,
+  AR_INTERNAL_INTVCC0 = 1,
+  AR_INTERNAL_INTVCC1 = 2,
+  AR_EXTERNAL_REFA = 3,
+  AR_EXTERNAL_REFB = 4,
+  AR_INTERNAL_INTVCC2 = 5,
+  AR_INTREF_1V0 = 6,
+  AR_INTREF_1V1 = 7,
+  AR_INTREF_1V2 = 8,
+  AR_INTREF_1V25 = 9,
+  AR_INTREF_2V0 = 10,
+  AR_INTREF_2V2 = 11,
+  AR_INTREF_2V4 = 12,
+  AR_INTREF_2V5 = 13,
+  AR_DEFAULT = AR_INTERNAL_INTVCC2,
+  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAML is 1.0V
+#elif (SAMC21)
+  AR_INTREF = 0,
+  AR_INTERNAL_INTVCC0 = 1,
+  AR_INTERNAL_INTVCC1 = 2,
+  AR_EXTERNAL_REFA = 3,
+  AR_EXTERNAL_DAC = 4,
+  AR_INTERNAL_INTVCC2 = 5,
+  AR_INTREF_1V024 = 6,
+  AR_INTREF_2V048 = 7,
+  AR_INTREF_4V096 = 8,
+  AR_DEFAULT = AR_INTERNAL_INTVCC2,
+  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAMC is 1.024V
+#else
+  #error "wiring_analog.c: Unsupported chip"
+#endif
+  AR_INTERNAL = AR_INTERNAL_INTVCC0,
+  AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0,	// 2.23V only when Vcc = 3.3V
+  AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1,	// 1.65V only when Vcc = 3.3V
+  AR_EXTERNAL = AR_EXTERNAL_REFA,
+} eAnalogReference ;
+
+
+
+## Random TODO Notes
+
+* TONE: TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14 as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins.
+* D21: Enables wakeup capability on pin in case being used during sleep (WAKEUP always enabled on SAML and SAMC)
+* All pins (digital and analog) setup in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
+* INEN enabled for both input and output (but not analog)
+* pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
+  interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
+* Pull resistors enabled only if pin attributes allow and only if pin is not configured as output.
+* Pull direction (pullup or pulldown) is now set with pinMode only (defaults to pullup if pinMode never called).
+
+
+
+## Chip Specific Notes
+
+### SAMD21
+
+* When USB is disabled, pullups will be enabled on PA24 and PA24 to avoid excessive current consumption (<1mA) due to floating pins.
+  Note that it is not necessary to enable pull resistors on any other pins that are floating.
+  Errata: Disable pull resistors on PA24 and PA25 manually before switching to a peripheral.
+
+
+### SAML21
+
+* There are two DACs, DAC0 and DAC1. Both are supported. Because changing the configuration of one DAC requires disabling both,
+  there will be about a 40us period when the second DAC is disabled. Most of this time is due to an errata that requires a delay of
+  at least 30us when turning off the DAC while refresh is on. The L21 DACs have a refresh setting which must be enabled in this core.
+* The analog reference has additional options on the L21 and C21. See Analog Reference below.
+* On the L21, SERCOM5 is in a low power domain. The Fm+ and HS modes of I2C (wire) are not supported.
+* The SAML and SAMC have double-buffered TCs, which are supported in the core.
+* The CHANGE and RISING interrupt modes on pin A31 do not seem to work properly on the L21.
+* The L21 has two performance levels that affect power consumption. During powerup, the L21 starts at the lowest performance level (PL0).
+  The startup code changes to the highest performance level (PL2) in order to support 48MHz and USB (among other things).
+* Two Flash Wait States are inserted for the L21 and C21 (the D21/D11 use one wait state).
+
+
+### SAMC21
+
+* There are two SAR ADCs. Both are supported. The PinDescription table determines the peripheral instance and pin mapping.
+* The analog reference has additional options on the L21 and C21. See Analog Reference below.
+* The SAML and SAMC have double-buffered TCs, which are supported in the core.
+* Two Flash Wait States are inserted for the L21 and C21 (the D21/D11 use one wait state).
+* The C21 requires internal pull resistors to be activated on floating pins to minimize power consumption (not needed on D21/D11 or L21).
+* The C21 uses the minimum sampling time so that rail-to-rail and offset compensation works. Offset compensation adds 3 ADC clock cycles,
+  so the total is 4 clock cycles. The D21, D11, and L21 use the maximum sampling time.
+
+
+### SAMD11
+
+* The D11D has three SERCOM. The D11C has two sercom (no sercom2).
+* When USB is disabled, pullups will be enabled on PA24 and PA24 to avoid excessive current consumption (<1mA) due to floating pins.
+  Note that it is not necessary to enable pull resistors on any other pins that are floating.
+  Errata: Disable pull resistors on PA24 and PA25 manually before switching to a peripheral.
+
+#### Reducing SRAM/FLASH Usage
+
+TODO
+
+
+### Differences Between MattairTech and Arduino Cores
+
+* TODO
+* Table summarizing which core files are modified and by how much
+* Changes due to adding/changing features vs porting to new chip
 
-#### All pins operate at 3.3 volts. DO NOT connect voltages higher than 3.3V!
-
-### Pin Capabilities
-
-* **Digital: All pins can be used for general purpose I/O** 
-  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
-  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-  * These are available using the analogRead() function.
-  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
-  * Each pin provides 10 bits of resolution (1024 values) by default.
-  * 12-bit resolution supported by using the analogReadResolution() function.
-  * Each pin measures from ground to 3.3 volts.
-  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
-* **DAC: One analog output is available on pin 2.**
-  * Provides a 10-bit voltage output with the analogWrite() function.
-* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
-  * Available using the analogWrite() function.
-  * Each pin provides 8 bits of resolution (256 values) by default.
-  * 12-bit resolution supported by using the analogWriteResolution() function.
-* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
-  * Available using the attachInterrupt() function.
-* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
-  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
-  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
-* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
-  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
-  * SPI communication using the SPI library.
-  * Note that the SPI library will set SS as an output.
-  * On the MT-D11, the button must be configured as reset (default) when using SPI.
-* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
-  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
-  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
-  * TWI communication using the Wire library.
-* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
-  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
-  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
-* **AREF: One pin can be configured as an AREF analog input.**
-  * The upper end of the analog measurement range can be changed using the analogReference() function.
-* **Reset: Bring this line LOW to reset the microcontroller.**
-
-### MT-D21E and MT-D11 Board Configuration Notes
-
-* The 32.768KHz crystal is used by the Arduino core, so it MUST be connected via the solder jumpers.
-* The sketch in some cases can run without the crystal attached, but the clock will be very inaccurate.
-* The 16MHz crystal is not used. It should be disconnected via the solder jumpers.
-* The I2C (TWI) pullup resistors should be enabled via the solder jumpers.
-* The LED should be enabled via the solder jumper.
-* Button A and the debouncing capacitor should be connected via the solder jumpers.
-* Button B (MT-D21E only) is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
-* A reference voltage can be connected to AREF. In this case, the capacitors should be enabled via the solder jumpers.
-* On the MT-D11, BTN is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
 
 
 ## Serial Monitor
 
-To print to the Serial Monitor over USB, use 'Serial'. Serial points to SerialUSB (Serial1 and Serial2 are UARTs).
+To print to the Serial Monitor over USB, use 'Serial'. Serial refers to SerialUSB (Serial1 and Serial2 are UARTs).
 Unlike most Arduino boards (ie. Uno), SAM M0+ boards do not automatically reset when the serial monitor is opened.
 To see what your sketch outputs to the serial monitor from the beginning, the sketch must wait for the SerialUSB
 port to open first. Add the following to setup():
@@ -250,9 +414,13 @@ You can also reset the board manually with the Reset button if you wish to resta
 the Reset button will reset the SAM M0+ chip, which in turn will reset USB communication. This interruption means
 that if the serial monitor is open, it will be necessary to close and re-open it to restart communication.
 
+When USB CDC is not enabled, Serial will instead refer to Serial1, which is the first UART.
+
 
 ## Code Size and RAM Usage (1.6.5-mt2)
 
+TODO: Update this. Maybe just for D11 and move to D11 Chip Specific Notes.
+
 Sketch and Configuration    | MT-D21E (Flash + RAM) | MT-D11 (Flash + RAM)
 ----------------------------|-----------------------|-----------------------
 Blink (CDC + HID + UART)    |     7564 + 1524       |     7452 + 1424
@@ -303,16 +471,17 @@ There are currently four USB composite device combinations that include CDC as w
 supported combination has a unique USB VID:PID pair, and these are listed in the .inf file. Once the first device
 is installed (the CDC only device), future installations *might* be automatic, otherwise, you may direct the
 installer to the same .inf file. The drivers are signed and support both 32 and 64 bit versions of Windows XP(SP3),
-Vista, 7, 8, and 10.
+Vista, 7, 8, and 10. Note that the Windows 10 generic CDC drivers work as well.
 
 
 1. If you do not already have the SAM-BA bootloader installed, see below.
 2. Download https://www.mattairtech.com/software/MattairTech_CDC_Driver_Signed.zip and unzip into any folder.
-3. Plug in the board while holding down button A to enter the bootloader. The LED should light.
+   Note that the Windows 10 generic CDC drivers work as well.
+3. Plug in the board. The LED should fade when the bootloader is running (or blink if the test sketch is running).
 4. Windows will detect the board. Point the installer to the folder from above to install the bootloader driver.
 5. If you don't intend on using Arduino, you can skip the rest of this list. See Using Bossac Standalone below.
 6. If you do not already have the test firmware installed (comes preinstalled), see Using Bossac Standalone below.
-7. Press the reset button to run the test firmware (blink sketch).
+7. Press the reset button to run the test firmware (if needed). The LED will blink.
 8. Windows will detect the board. Point the installer to the above folder to install the sketch driver (if needed).
 9. Continue with SAM M0+ Core Installation below.
 
@@ -329,7 +498,7 @@ Vista, 7, 8, and 10.
 
 #### OS X
 
-OS X support currently in beta (see below), the following instructions are still for 1.6.6-mtX.
+OS X support currently in beta (see below), the following instructions are only for 1.6.6-mtX and below.
 1. Only the 256 KB chip variants work with the OS X version of the upload tool, bossac.
 2. First, you will need to open boards.txt and change mattairtech_mt_d21e_bl8k.upload.tool to equal arduino:bossac.
 3. Open platform.txt and change tools.bossac.path to equal{runtime.tools.bossac-1.6.1-arduino.path}.
@@ -343,26 +512,25 @@ OS X support currently in beta (see below), the following instructions are still
 ### SAM M0+ Core Installation
 
 * To update from a previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.
-* Boards Manager may require opening twice (with possibly a delay in between) to see some updates.
 
-1. The MattairTech SAM M0+ Core requires Arduino 1.6.7 (1.6.5-mtX required IDE 1.6.5).
+1. The MattairTech SAM M0+ Core requires Arduino 1.6.7 or above (including 1.8.x).
 2. In the Arduino IDE, click File->Preferences.
 3. Click the button next to Additional Boards Manager URLs.
 4. Add https://www.mattairtech.com/software/arduino/package_MattairTech_index.json.
 5. Save preferences, then open the Boards Manager.
 6. Install the Arduino SAM M0+ Boards package. Use version 1.6.2 or higher.
-7. Install the MattairTech SAM M0+ Boards package (1.6.7).
+7. Install the MattairTech SAM M0+ Boards package.
 8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E (or MT-D11).
-9. Select the processor with the now visible Tools->Processor menu.
+9. Select the MCU with the now visible Tools->Microcontroller menu (if present).
 10. If you do not already have the bootloader or blink sketch installed, see SAM-BA USB CDC Bootloader below.
 11. Plug in the board. The blink sketch should be running.
-12. Click Tools->Port and choose the COM port.
+12. Click Tools->Port and choose the COM port. Note that the board indicated may not match the chosen board.
 13. You can now upload your own sketch.
 
 
 ### Uploading the First Sketch
 
-1. In the Arduino IDE 1.6.7 (or above), open File->Examples->01.Basics->Blink.
+1. In the Arduino IDE (1.6.7 or above), open File->Examples->01.Basics->Blink.
 2. Change the three instances of '13' to 'LED_BUILTIN'.
 3. Be sure the correct options are selected in the Tools menu (see AVR Core Installation above).
 4. With the board plugged in, select the correct port from Tools->Port.
@@ -372,13 +540,12 @@ OS X support currently in beta (see below), the following instructions are still
 
 ## SAM-BA USB CDC Bootloader (Arduino compatible)
 
-The SAM-BA bootloader has both a CDC USB interface, and a UART interface (TX: pin 10, RX: pin 11, 8N1).
-It is compatible with the Arduino IDE (Zero compatible), or it can be used with the Bossac tool standalone. Under
-Arduino, auto-reset is supported (automatically runs the bootloader while the sketch is running) as well as
-automatic return from reset. The SAM-BA bootloader described here adds to the Arduino version, which in
-turn is based on the bootloader from Atmel. The Arduino version added several features, including three
-new commands (Arduino Extended Capabilities) that increase upload speed. The bootloader normally requires
-8 KB FLASH, however, a 4 KB version can be used for the D11 chips.
+The SAM-BA bootloader has both a CDC USB interface, and a UART interface. It is compatible with the Arduino IDE, or
+it can be used with the Bossac tool standalone. With Arduino, auto-reset is supported (automatically runs the
+bootloader while the sketch is running) as well as automatic return from reset. The SAM-BA bootloader described
+here adds to the Arduino version, which in turn is based on the bootloader from Atmel. The Arduino version added
+several features, including three new commands (Arduino Extended Capabilities) that increase upload speed. The
+bootloader normally requires 8 KB FLASH, however, a 4 KB version can be used for the D11 chips.
 
 Bossac is a command line utility for uploading firmware to SAM-BA bootloaders. It runs on Windows. Linux, and OS X.
 It is used by Arduino to upload firmware to SAM and SAM M0+ boards. The version Bossac described here adds to the
@@ -402,7 +569,7 @@ The bootloader can be started by:
    * If the application (sketch) area is blank, the bootloader will run.
 
 Otherwise, it jumps to application and starts execution from there. The LED will light during bootloader execution.
-Note that the 4KB bootloader does not support the Arduino Extended Capabilities or BOOT_DOUBLE_TAP.
+Note that the 4KB bootloader does not support the Arduino Extended Capabilities.
 However, BOOT_DOUBLE_TAP does fit into the SAMD11 4KB bootloader.
 
 When the Arduino IDE initiates the bootloader, the following procedure is used:
@@ -412,6 +579,8 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
 3. The board is reset. The bootloader (which always runs first) detects the blank flah row, so bootloader operation resumes.
 4. Opening and closing the port at a baud rate other than 1200bps will not erase or reset the SAM M0+.
 
+**See [bootloaders/zero/README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/bootloaders/zero/README.md) for more technical information on the bootloader.**
+
 
 ### Bootloader Firmware Installation
 
@@ -421,8 +590,8 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
 2. Plug in the SAM M0+ board. The bootloader must be running to (press reset twice within 500ms).
 3. Plug an Atmel ICE into USB, then connect it to the powered SAM M0+ board. A green LED should light on the Atmel ICE.
 4. Click Tools->Programmer->Atmel ICE.
-5. Click Tools->Board->MattairTech MT-D21E (or MT-D11).
-6. Click Tools->Processor and select your chip.
+5. Click Tools->Board->MattairTech MT-D21E (or whichever board you are using).
+6. Click Tools->Microcontroller and select your MCU (if menu present).
 7. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
 8. Continue with driver installation above.
 
@@ -431,7 +600,7 @@ A running sketch may interfere with the bootloader installation process. Be sure
 #### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
 
 1. Download the bootloader from https://www.mattairtech.com/software/arduino/SAM-BA-bootloaders-zero-mattairtech.zip.
-2. Unzip to any directory. Be sure that a bootloader is available for your particular chip.
+2. Unzip to any directory. Be sure that a bootloader is available for your particular MCU.
 3. Follow the procedures for your upload tool to upload the firmware.
    * Perform a chip erase first. Be sure no BOOTPROT bits are set.
    * Install the binary file to 0x00000000 of the FLASH.
@@ -440,8 +609,38 @@ A running sketch may interfere with the bootloader installation process. Be sure
 4. Continue with driver installation above.
 
 
+### Bootloader Binaries
+
+The bootloaders/zero/binaries directory contains all of the SAM-BAm0+
+bootloaders built by the build_all_bootloaders.sh script.
+
+#### MattairTech Boards
+MattairTech boards are all configured with only one interface:
+SAM_BA_USBCDC_ONLY (except C21, which uses SAM_BA_UART_ONLY).
+CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_INTERNAL_USB
+(CLOCKCONFIG_INTERNAL for the C21). Only the main LED is defined.
+BOOT_LOAD_PIN is not defined, but BOOT_DOUBLE_TAP_ENABLED is.
+
+#### Arduino/Genuino Boards
+Arduino/Genuino boards are all configured with both interfaces.
+CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_32768HZ_CRYSTAL.
+All LEDs that are installed for each board are defined (and some
+have LED_POLARITY_LOW_ON set). BOOT_LOAD_PIN is not defined, but
+BOOT_DOUBLE_TAP_ENABLED is.
+
+#### Generic Boards
+The generic boards are all configured to minimize external hardware
+requirements. Only one interface is enabled: SAM_BA_USBCDC_ONLY
+(except C21, which uses SAM_BA_UART_ONLY). CLOCKCONFIG_CLOCK_SOURCE
+is set to CLOCKCONFIG_INTERNAL_USB (CLOCKCONFIG_INTERNAL for the C21),
+so no crystal is required. No LEDs are defined. BOOT_LOAD_PIN is not
+defined, but BOOT_DOUBLE_TAP_ENABLED is, since it uses the reset pin.
+
+
 ### Using Bossac Standalone
 
+TODO: Update https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip with new chips (L21 and C21).
+
 When using Bossac standalone, you will need to ensure that your application starts at 0x00002000 for 8 KB bootloaders,
 and 0x00001000 for 4 KB bootloaders. This is because the bootloader resides at 0x00000000. This can be accomplished
 by passing the following flag to the linker (typically LDFLAGS in your makefile; adjust for your bootloader size):
@@ -450,19 +649,19 @@ by passing the following flag to the linker (typically LDFLAGS in your makefile;
 Wl,sectionstart=.text=0x2000
 ```
 
-You may also use a linker script. See the MattairTech SAM M0+ package for examples.
+You can also use a linker script. See the MattairTech SAM M0+ package for examples.
 Be sure to generate and use a binary file. Many makefiles are set up to generate an elf, hex, and bin already.
 
 Download Bossac from:
 
-* https://www.mattairtech.com/software/arduino/bossac-1.6.1-arduino-mattairtech-1-mingw32.tar.bz2 (Windows 32 bit and 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.6.1-arduino-mattairtech-1-x86_64-linux-gnu.tar.bz2 (Linux 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.6.1-arduino-mattairtech-1-i686-linux-gnu.tar.bz2 (Linux 32 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.6.1-arduino-mattairtech-1-x86_64-apple-darwin.tar.bz2 (OS X 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
 
 Linux 64 bit users can also download Bossa (GUI) and bossash (shell) from:
 
-* https://www.mattairtech.com/software/arduino/Bossa-1.6.1-arduino-mattairtech-1-x86_64-linux-gnu.tar.bz2 (Linux 64 bit)
+* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
 
 As an example, bossac will be used to upload the test firmware (blink sketch):
 
@@ -481,6 +680,9 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 
 ## New PinDescription Table
 
+Technical information on the new PinDescription table format is now in the README.md
+that accompanies each board variant. See board variants above.
+
 ### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
@@ -509,87 +711,23 @@ pin 28 = Port A28). This works well when there is only one port (or if the PORTB
 are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
 for pins that are used for other purposes or for pins that do not exist (especially the
 D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
-from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
-designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
-using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
-used, leaving the other pin for some number above 31.
+from the MT-D11 variant.
+
+### See Board Variants above for more technical information on the PinDescription table.
 
 ### See WVariant.h in cores/arduino for the definitions used in the table.
 
-#### Port:
-This is the port (ie: PORTA).
-
-#### Pin:
-This is the pin (bit) within the port. Valid values are 0-31.
-
-#### PinType:
-This indicates what peripheral function the pin can be attached to. In most cases,
-this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
-field. It can also be set to a specific peripheral. In this case, any attempt to
-configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
-pinPeripheral will return -1). This can be used to prevent accidental re-configuration
-of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
-is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
-WVariant.h for valid entries. These entries are also used as a parameter to
-pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
-now calls pinPeripheral() with the desired mode. Note that this field is not used to
-select between the two peripherals possible with each of the SERCOM and TIMER functions.
-PeripheralAttribute is now used for this.
-
-#### PeripheralAttribute:
-This is an 8-bit bitfield used for various peripheral configuration. It is primarily
-used to select between the two peripherals possible with each of the SERCOM and TIMER
-functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
-This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
-MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
-Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
-pin drive strength. In the future, other attributes (like input buffer configuration)
-may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
-selected here. See WVariant.h for valid entries.
-
-#### PinAttribute
-This is a 32-bit bitfield used to list all of the valid peripheral functions that a
-pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
-attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
-includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
-PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
-PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
-limiting a pin to only input related functions or output functions. This allows a pin
-to have a more flexible configuration, while restricting the direction (ie: to avoid
-contention). See WVariant.h for valid entries.
-
-#### TCChannel
-This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
-on multiple pins. In general, only one pin should be configured in the pinDescription
-table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
-to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
-D21). See WVariant.h for valid entries.
-
-#### ADCChannelNumber
-This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
-which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
-
-#### ExtInt
-This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
-available on multiple pins. In general, only one pin should be configured in the
-pinDescription table per interrupt number. Thus, for example, if an interrupt was
-needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
-entries.
-
-#### GCLKCCL
-This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
-the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
-C21, and the GCLK outputs (inputs).
-
-
-## Possible Future Additions
-
-* SAML21 and C21 support is currently under development
+
+
+## Possible Future Additions/Changes
+
 * Timer library is currently under development (like TimerOne, plus input capture, plus ??)
 * OS X support currently in beta testing
+* Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
 
 * USB Host mode CDC ACM (partially complete; BSD-like license?)
 * Features for lower power consumption (library?)
+* Reliability and security enhancements
 * Enhanced SD card library
 * Optional use of single on-board LED as USB activity LED
 * MSC (Mass Storage) USB Device Class
@@ -598,7 +736,7 @@ C21, and the GCLK outputs (inputs).
 * High-speed port pin access (IOBUS)
 * Libraries for some hardware I plan on using:
   * TFT LCD (CFAF128128B-0145T)
-  * Motor controller (LV8711T)
+  * Motor controller
   * IR decoder
   * I2S DAC/AMP and I2S MEMS microphone
   * Battery management IC
@@ -616,6 +754,34 @@ C21, and the GCLK outputs (inputs).
 The Changelog has moved to a separate file named CHANGELOG. The most recent changes are still in the 'What's New' section above.
 
 
+## Troubleshooting
+
+TODO: Update
+
+* **On Linux, disable modem manager**
+
+* **Do not perform a manual auto-reset (using a terminal program to change baud to 1200)**
+
+* **Boards Manager must be opened twice to see some updates**
+
+* **Errors when compiling, uploading, or burning the bootloader**
+* Be sure to install the Arduino samd core before installing the MattairTech sam m0+ core. If you have problems upgrading
+the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
+Use Arduino core 1.6.2 or above.
+
+* **Tools->Communications menu**
+* Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
+must match the included libraries. For example, when including the HID and Keyboard libraries, you must select an
+option that includes HID (ie: CDC_HID_UART). This menu is currently needed to select the USB PID that matches the
+USB device configuration (needed for Windows). This may become automatic in a future release.
+
+* Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
+* Different combinations of USB devices will result in different COM port assingments in Windows.
+
+* **Incude platform specific libraries**
+* You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
+
+
 ## Bugs or Issues
 
 If you find a bug you can submit an issue here on github:
@@ -630,7 +796,7 @@ Before posting a new issue, please check if the same problem has been already re
 Contributions are always welcome. The preferred way to receive code cotribution is by submitting a Pull Request on github.
 
 
-## Beta builds
+## Beta Builds
 
 Periodically, a beta is released for testing.
 
@@ -649,7 +815,7 @@ where ${VERSION} and ${BUILD_NUMBER} match the beta name as shown in the CHANGEL
 In this case, the IDE will not notify the user of updates.
 
 
-## License and credits
+## License and Credits
 
 This core has been developed by Arduino LLC in collaboration with Atmel.
 This fork developed by Justin Mattair of MattairTech LLC.
diff --git a/bootloaders/zero/binaries/README.md b/bootloaders/zero/binaries/README.md
index 799d3f858..4ce8a0850 100644
--- a/bootloaders/zero/binaries/README.md
+++ b/bootloaders/zero/binaries/README.md
@@ -4,9 +4,6 @@ This directory contains the SAM-BA m0+ bootloaders built by the
 build_all_bootloaders.sh script from the 'MattairTech SAM M0+
 Boards' Arduino core, which is available at
 https://github.com/mattairtech/ArduinoCore-samd.
-Note that the link above might not correspond to these binaries.
-I've released the binaries before the core. These binaries are from
-core version 1.6.8-beta-b0.
 
 ## MattairTech Boards
 MattairTech boards are all configured with only one interface:
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
index 7d80b01e3..db03ae0ba 100644
--- a/variants/Generic_D11C14A/README.md
+++ b/variants/Generic_D11C14A/README.md
@@ -98,6 +98,57 @@ Arduino	| Port	| Alternate Function	| Comments (! means not used with this perip
 * SERCOM2 does not exist on the D11C14A.
 
 
+# Board Configuration Notes
+
+TODO: Update this for Generic D11C14A
+
+* Either the 32.768KHz crystal or the 16MHz crystal can be used.
+* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
+
+* **Digital: All pins can be used for general purpose I/O** 
+  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
+  * These are available using the analogRead() function.
+  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * Each pin measures from ground to 3.3 volts.
+  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+* **DAC: One analog output is available on pin 2.**
+  * Provides a 10-bit voltage output with the analogWrite() function.
+* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
+  * Available using the analogWrite() function.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
+  * Available using the attachInterrupt() function.
+* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
+  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
+  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
+* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
+  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
+  * SPI communication using the SPI library.
+  * Note that the SPI library will set SS as an output.
+  * On the MT-D11, the button must be configured as reset (default) when using SPI.
+* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
+  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
+  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
+  * TWI communication using the Wire library.
+* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
+  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
+  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+* **AREF: One pin can be configured as an AREF analog input.**
+  * The upper end of the analog measurement range can be changed using the analogReference() function.
+* **Reset: Bring this line LOW to reset the microcontroller.**
+
+
+
 # PinDescription table format
 
 ## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
index 8d8705b0f..3897cdc77 100644
--- a/variants/MT_D11/README.md
+++ b/variants/MT_D11/README.md
@@ -102,6 +102,61 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * The tone library uses TC2.
 
 
+# Board Configuration Notes
+
+TODO: Update this
+
+* Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
+* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
+* The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
+* BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
+* A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
+* The I2C (TWI) pullup resistors are enabled by default.
+* The LED is enabled by default.
+
+* **Digital: All pins can be used for general purpose I/O** 
+  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
+  * These are available using the analogRead() function.
+  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * Each pin measures from ground to 3.3 volts.
+  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+* **DAC: One analog output is available on pin 2.**
+  * Provides a 10-bit voltage output with the analogWrite() function.
+* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
+  * Available using the analogWrite() function.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
+  * Available using the attachInterrupt() function.
+* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
+  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
+  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
+* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
+  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
+  * SPI communication using the SPI library.
+  * Note that the SPI library will set SS as an output.
+  * On the MT-D11, the button must be configured as reset (default) when using SPI.
+* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
+  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
+  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
+  * TWI communication using the Wire library.
+* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
+  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
+  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+* **AREF: One pin can be configured as an AREF analog input.**
+  * The upper end of the analog measurement range can be changed using the analogReference() function.
+* **Reset: Bring this line LOW to reset the microcontroller.**
+
+
 
 # PinDescription table format
 
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
index 0beaac421..fd8ce3360 100644
--- a/variants/MT_D21E/README.md
+++ b/variants/MT_D21E/README.md
@@ -84,6 +84,61 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * Leave pin A30 floating (or use external pullup) during reset.
 
 
+# Board Configuration Notes
+
+TODO: Update this
+
+* Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
+* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
+* The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
+* BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
+* A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
+* The I2C (TWI) pullup resistors are enabled by default.
+* The LED is enabled by default.
+
+* **Digital: All pins can be used for general purpose I/O** 
+  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
+  * These are available using the analogRead() function.
+  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * Each pin measures from ground to 3.3 volts.
+  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+* **DAC: One analog output is available on pin 2.**
+  * Provides a 10-bit voltage output with the analogWrite() function.
+* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
+  * Available using the analogWrite() function.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
+  * Available using the attachInterrupt() function.
+* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
+  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
+  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
+* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
+  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
+  * SPI communication using the SPI library.
+  * Note that the SPI library will set SS as an output.
+  * On the MT-D11, the button must be configured as reset (default) when using SPI.
+* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
+  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
+  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
+  * TWI communication using the Wire library.
+* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
+  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
+  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+* **AREF: One pin can be configured as an AREF analog input.**
+  * The upper end of the analog measurement range can be changed using the analogReference() function.
+* **Reset: Bring this line LOW to reset the microcontroller.**
+
+
 
 # PinDescription table format
 
diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
index 0ad81229d..4d2936006 100644
--- a/variants/MT_D21E_revB/README.md
+++ b/variants/MT_D21E_revB/README.md
@@ -96,6 +96,61 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * Leave pin A30 floating (or use external pullup) during reset.
 
 
+# Board Configuration Notes
+
+TODO: Update this
+
+* Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
+* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
+* The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
+* BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
+* A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
+* The I2C (TWI) pullup resistors are enabled by default.
+* The LED is enabled by default.
+
+* **Digital: All pins can be used for general purpose I/O** 
+  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
+* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
+  * These are available using the analogRead() function.
+  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * Each pin measures from ground to 3.3 volts.
+  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
+* **DAC: One analog output is available on pin 2.**
+  * Provides a 10-bit voltage output with the analogWrite() function.
+* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
+  * Available using the analogWrite() function.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
+  * Available using the attachInterrupt() function.
+* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
+  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
+  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
+* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
+  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
+  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
+  * SPI communication using the SPI library.
+  * Note that the SPI library will set SS as an output.
+  * On the MT-D11, the button must be configured as reset (default) when using SPI.
+* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
+  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
+  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
+  * TWI communication using the Wire library.
+* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
+  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
+* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
+  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+* **AREF: One pin can be configured as an AREF analog input.**
+  * The upper end of the analog measurement range can be changed using the analogReference() function.
+* **Reset: Bring this line LOW to reset the microcontroller.**
+
+
 
 # PinDescription table format
 
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
index 07046a4c5..b383815a7 100644
--- a/variants/MT_D21E_revB/variant.h
+++ b/variants/MT_D21E_revB/variant.h
@@ -141,7 +141,7 @@ extern "C"
  */
 #define JUMPER_A             (27u)
 #define BUTTON_B             (31u)
-#define BUTTON_BUILTIN       BUTTON_A
+#define BUTTON_BUILTIN       BUTTON_B
 
 
 /*

From 170dc00d98fbe8d334386b4469313a9a0b0da1cc Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 24 Apr 2017 09:45:54 +0000
Subject: [PATCH 090/124] Fixed auto-reset not working with some versions of
 Windows, other fixups

---
 cores/arduino/USB/USBCore.cpp   | 12 +-----------
 cores/arduino/USB/USBCore.h     |  2 +-
 cores/arduino/USB/samd21_host.h |  2 ++
 cores/arduino/startup.c         |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index c1d95a9f0..6eb5bb10d 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -635,10 +635,6 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 	uint32_t written = 0;
 	uint32_t length = 0;
 
-	// if len is a multiple of EPX_SIZE an ZLP needs to be sent
-	// to indicate end of transfer
-	bool sendZlp = (len % EPX_SIZE) == 0;
-
 	if (!_usbConfiguration)
 		return -1;
 	if (len > 16384)
@@ -652,7 +648,7 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 #endif
 
 	// Flash area
-	while (len != 0 || sendZlp)
+	while (len != 0)
 	{
 		if (usbd.epBank1IsReady(ep)) {
 			// previous transfer is still not complete
@@ -697,12 +693,6 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 
 		written += length;
 		len -= length;
-		
-		if (len == 0 && sendZlp) {
-			// empty transfer sent
-			sendZlp = false;
-		}
-
 		data = (char *)data + length;
 	}
 	return written;
diff --git a/cores/arduino/USB/USBCore.h b/cores/arduino/USB/USBCore.h
index 5f928533e..f40013e34 100644
--- a/cores/arduino/USB/USBCore.h
+++ b/cores/arduino/USB/USBCore.h
@@ -262,7 +262,7 @@ typedef struct
 _Pragma("pack()")
 
 #define D_DEVICE(_class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs) \
-	{ 18, 1, 0x200, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
+	{ 18, 1, 0x110, _class,_subClass,_proto,_packetSize0,_vid,_pid,_version,_im,_ip,_is,_configs }
 /* Table 9-8. Standard Device Descriptor
  * bLength, bDescriptorType, bcdUSB, bDeviceClass, bDeviceSubClass, bDeviceProtocol, bMaxPacketSize0,
  *    idVendor, idProduct, bcdDevice, iManufacturer, iProduct, iSerialNumber, bNumConfigurations */
diff --git a/cores/arduino/USB/samd21_host.h b/cores/arduino/USB/samd21_host.h
index 23101d19a..18cb5ee7c 100644
--- a/cores/arduino/USB/samd21_host.h
+++ b/cores/arduino/USB/samd21_host.h
@@ -25,9 +25,11 @@ extern "C" {
 
 extern __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table[USB_EPT_NUM];
 
+#ifndef USB_HOST_PINTFLAG_TRCPT_Pos
 #define USB_HOST_PINTFLAG_TRCPT_Pos 0            /**< \brief (USB_HOST_PINTFLAG) Transfer Complete 0/1 Interrupt Flag */
 #define USB_HOST_PINTFLAG_TRCPT_Msk (0x3u << USB_HOST_PINTFLAG_TRCPT_Pos)
 #define USB_HOST_PINTFLAG_TRCPT(value) ((USB_HOST_PINTFLAG_TRCPT_Msk & ((value) << USB_HOST_PINTFLAG_TRCPT_Pos)))
+#endif
 
 #define  USB_EP_DIR_IN        0x80  // USB_SETUP_DEVICE_TO_HOST
 #define  USB_EP_DIR_OUT       0x00  // USB_SETUP_HOST_TO_DEVICE
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index 701f50607..63e4d80e4 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -172,7 +172,7 @@ void SystemInit( void )
    */
 
 #if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
-  #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 4000000UL and 32000000UL"
+  #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 400000UL and 32000000UL"
 #endif
 
 #if defined(PLL_FAST_STARTUP)

From 0aefab982d2142c09dbcd12592aae7448feb170a Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 24 Apr 2017 09:47:28 +0000
Subject: [PATCH 091/124] Updated documentation

---
 README.md                          | 387 +++++++++++++----------------
 bootloaders/zero/README.md         |  80 +++---
 variants/Generic_D11C14A/README.md | 104 ++++----
 variants/MT_D11/README.md          | 109 ++++----
 variants/MT_D21E/README.md         | 102 ++++----
 variants/MT_D21E_revB/README.md    | 110 ++++----
 variants/arduino_mzero/README.md   |  16 +-
 variants/arduino_zero/README.md    |  16 +-
 8 files changed, 434 insertions(+), 490 deletions(-)

diff --git a/README.md b/README.md
index b7e87798f..cbc11a224 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,5 @@
 # MattairTech Arduino SAM M0+ Core
 
-This documentation is currently under construction.
-
 This is a fork from arduino/ArduinoCore-samd on GitHub. This will be used to maintain
 Arduino support for SAM M0+ boards including the MattairTech MT-D21E and the MT-D11
 (see https://www.mattairtech.com/). It adds support for new devices like the L21, C21, and
@@ -10,15 +8,19 @@ D11. It also adds new clock sources, like a high speed crystal or internal oscil
 This core is intended to be installed using Boards Manager (see below). To update from a
 previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.
 
-**Differences from Arduino in Versioning**
-The MattairTech version number does not correspond to either the IDE version or to the
-upstream ArduinoCore-samd version. See the CHANGELOG for details on which upstream
-commits have been merged in to the MattairTech core.
+**Differences from Arduino in Versioning**  The MattairTech version number does not
+correspond to either the IDE version or to the upstream ArduinoCore-samd version. See the
+CHANGELOG for details on which upstream commits have been merged in to the MattairTech core.
+
 
+## What's New Beta (1.6.8-beta)
+**See Beta Builds section for installation instructions.**
 
-## What's New Beta (1.6.8-beta). See Beta Builds section for installation instructions.
+**1.6.8-beta-b1:**
+* Fixed auto-reset not working on some versions of Windows
+* Documentation updates
 
-1.6.8-beta-b0:
+**1.6.8-beta-b0:**
 * Added L21 and C21 support. Improved D11D and D11C support.
   * Use Tools->Microcontroller menu to select mcu.
 * Both the core and bootloader have added support for:
@@ -38,7 +40,8 @@ commits have been merged in to the MattairTech core.
 * Merged in all changes from upstream through SAMD CORE 1.6.14 (April 2017)
 
 
-## What's New Release (1.6.6). NOTE: This is out of date, use the beta for now.
+## What's New Release (1.6.6)
+**This is out of date, use the beta for now.**
 
 * 1.6.6-mt3:
   * Fixes compilation with CDC_UART and CDC_ONLY settings
@@ -55,28 +58,27 @@ commits have been merged in to the MattairTech core.
   * Merged in changes from upstream SAMD CORE 1.6.2 2015.11.03 (see CHANGELOG for details)
 
 
-## Specifications
-
-TODO: Update for L21 and C21
+## Features Summary
 
-Feature                 |	MT-D21E										|	MT-D11
-------------------------|---------------------------------------------------------------------------------------|------------------------------------------------------
-Microcontroller		|	ATSAMD21ExxA, 32-Bit ARM Cortex M0+						|	ATSAMD11D14AM, 32-Bit ARM Cortex M0+
-Clock Speed		|	48 MHz										|	48 MHz
-Flash Memory		|	256 KB (D21E18A) / 128 KB (D21E17A) / 64 KB (D21E16A) / 32 KB (D21E15A)		|	16 KB (4KB used by USB SAM-BA bootloader)
-SRAM			|	32 KB (D21E18A) / 16 KB (D21E17A) / 8 KB (D21E16A) / 4 KB (D21E15A)		|	4 KB
-EEPROM			|	None (emulation may be available in the future)					|	None (emulation may be available in the future)
-Digital Pins		|	22										|	17
-Analog Input Pins	|	10, 12-bit ADC channels								|	10, 12-bit ADC channels
-Analog Output Pins	|	1, 10-bit DAC									|	1, 10-bit DAC
-PWM Output Pins		|	12										|	8
-External Interrupts	|	15 (1 NMI)									|	9 (1 NMI)
-USB			|	Device and Host (CDC and HID)							|	Device and Host (CDC and HID)
-UART (Serial)		|	2										|	1
-SPI			|	1										|	1
-I2C (TWI)		|	1										|	1
-Operating Voltage	|	3.3V (Do not connect voltages higher than 3.3V!)				|	3.3V (Do not connect voltages higher than 3.3V!)
-DC Current per I/O Pin	|	7 mA										|	7 mA
+Feature		| 21J (64 pin)				| 21G (48 pin)				| 21E (32 pin)				| D11 (24, 20, or 14 pin)
+----------------|---------------------------------------|---------------------------------------|---------------------------------------|---------------------------------------
+Board Variants	| New board coming June, Generic 21J	| Arduino Zero, Arduino M0, Generic 21G	| MT-D21E, Generic 21E			| MT-D11, Generic D11D14AM, Generic D11D14AS, Generic D11C14A
+Processor	| 48 MHz 32-bit ARM Cortex M0+		| 48 MHz 32-bit ARM Cortex M0+		| 48 MHz 32-bit ARM Cortex M0+		| 48 MHz 32-bit ARM Cortex M0+
+Flash Memory	| Up to 256KB (L21/C21 have RWW)	| Up to 256KB (L21/C21 have RWW)	| Up to 256KB (L21/C21 have RWW)	| 16 KB (4KB used by bootloader)
+SRAM		| Up to 32KB (plus <=8KB LPSRAM on L21)	| Up to 32KB (plus <=8KB LPSRAM on L21)	| Up to 32KB (plus <=8KB LPSRAM on L21)	| 4 KB
+Digital Pins	| 52 (51 for L21)			| 38 (37 for L21)			| 26 (25 for L21)			| 24-pin: 21, 20-pin: 17, 14-pin: 11
+Analog Inputs	| 20 channels, 12-bit			| 14 channels, 12-bit			| 10 channels, 12-bit			| 24-pin: 10, 20-pin: 8, 14-pin: 5 (12-bit)
+Analog Outputs	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)	| One 10-bit
+PWM Outputs	| 18					| 14					| 14					| 8 (6 for 14-pin)
+Interrupts	| 16					| 16					| 16					| 8 (7 for 14-pin)
+USB		| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device
+SERCOM		| 6					| 6					| 4					| 3 (2 for 14-pin)
+UART (Serial)	| Up to 3				| Up to 3				| Up to 2				| Up to 2
+SPI		| Up to 3				| Up to 2				| 1					| 1
+I2C (WIRE)	| Up to 3				| Up to 2				| 1					| 1
+I2S		| Present on the D21 only		| Present on the D21 only		| Present on the D21 only		| Not present
+Voltage		| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V
+I/O Pin	Current	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| 7 mA
 
 
 
@@ -176,7 +178,6 @@ and SRAM usage by allowing CDC to be disabled (or USB completely disabled).
 
 ## Clock Source
 
-TODO
 There are up to four clock source choices, depending on board variant and microcontroller. They are:
 
 * 32KHZ_CRYSTAL (default)
@@ -184,163 +185,98 @@ There are up to four clock source choices, depending on board variant and microc
 * INTERNAL_OSCILLATOR
 * INTERNAL_USB_CALIBRATED_OSCILLATOR
 
- * If CLOCKCONFIG_32768HZ_CRYSTAL or
- * CLOCKCONFIG_HS_CRYSTAL is defined, then the PLL will be used. If
- * CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ must
- * also be defined with the crystal frequency in Hertz. CLOCKCONFIG_INTERNAL
- * uses the DFLL in open-loop mode, except with the C21 which lacks a DFLL, so
- * the internal 48MHz RC oscillator is used instead. CLOCKCONFIG_INTERNAL_USB
- * can be defined for the D21, D11, or L21. It will also use the DFLL in
- * open-loop mode, except when connected to a USB port with data lines (and
- * not suspended), where it will calibrate against the USB SOF signal.
-
-/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
- * must also be defined with the external crystal frequency in Hertz.
- */
-#if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
-#error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 4000000UL and 32000000UL"
-#endif
-
-#if defined(PLL_FAST_STARTUP)
-#if (HS_CRYSTAL_FREQUENCY_HERTZ < 1000000UL)
-#error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be at least 1000000UL when PLL_FAST_STARTUP is defined"
-#else
-#define HS_CRYSTAL_DIVISOR	1000000UL
-#endif
-#else
-#define HS_CRYSTAL_DIVISOR	32000UL
-#endif
-
-#define HS_CRYSTAL_DIVIDER	(HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVISOR)
-#define DPLLRATIO_FLOAT		(96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
-
-#if defined(PLL_FRACTIONAL_ENABLED)
-#define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
-#define DPLLRATIO_LDRFRAC	(uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
-#else
-#define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
-#define DPLLRATIO_LDRFRAC	0
-#endif
-
-Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz.
-
-// Constants for Clock generators
-#define GENERIC_CLOCK_GENERATOR_MAIN      (0u)
-#define GENERIC_CLOCK_GENERATOR_XOSC      (1u)
-#define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT (D21/D11) */
-#define GENERIC_CLOCK_GENERATOR_OSC_HS    (3u)
-
-/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
- * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
- * a more accurate 48MHz output frequency at the expense of increased jitter.
- */
-
-/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
- * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
- * multiplied by the PLL. This will result in a faster lock time for the PLL,
- * however, it will also result in a less accurate PLL output frequency if the
- * crystal is not divisible (without remainder) by 1MHz. In this case, define
- * PLL_FRACTIONAL_ENABLED as well.
- */
-
-/* The fine calibration value for DFLL open-loop mode is defined here.
- * The coarse calibration value is loaded from NVM OTP (factory calibration values).
- */
-#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
-
-* What to do with unused default internal RC oscillator:
-#if (SAMD21)
-/* Modify PRESCaler value of OSC8M to have 8MHz */
-/* Put OSC8M as source for Generic Clock Generator 3 */
-#elif (SAML21)
-/* Note that after reset, the L21 starts with the OSC16M set to 4MHz, NOT the DFLL@48MHz as stated in some documentation. */
-/* Modify FSEL value of OSC16M to have 8MHz */
-/* Put OSC16M as source for Generic Clock Generator 3 */
-#endif
+### External 32.768KHz Crystal
 
+The PLL will be used with the 32.768KHz crystal. PLL_FRACTIONAL_ENABLED can be defined,
+which will result in a more accurate 48MHz output frequency at the expense of increased
+jitter.
 
 ### External High-Speed Crystal
-TODO
 
-### External 32.768KHz Crystal
-TODO
+HS_CRYSTAL_FREQUENCY_HERTZ must be defined with the external crystal frequency in Hertz.
+The crystal frequency must be between 400000Hz and 32000000Hz. The PLL will be used.
+PLL_FRACTIONAL_ENABLED can be defined, which will result in a more accurate 48MHz output
+frequency at the expense of increased jitter. If PLL_FAST_STARTUP is defined, the crystal
+will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being multiplied
+by the PLL. This will result in a faster lock time for the PLL, however, it will also
+result in a less accurate PLL output frequency if the crystal is not divisible (without
+remainder) by 1MHz. In this case, define PLL_FRACTIONAL_ENABLED as well. By default,
+PLL_FAST_STARTUP is disabled. PLL_FAST_STARTUP is also useful for USB host mode
+applications. See datasheet USB electrical characteristics. The crystal frequency must
+be at least 1000000Hz when PLL_FAST_STARTUP is defined.
+
+### Internal Oscillator
+
+The DFLL will be used in open-loop mode, except with the C21 which lacks a DFLL, so the
+internal 48MHz RC oscillator is used instead. NVM_SW_CALIB_DFLL48M_FINE_VAL is the fine
+calibration value for DFLL open-loop mode. The coarse calibration value is loaded from
+NVM OTP (factory calibration values).
 
 ### Internal Oscillator with USB Calibration
-TODO
 
-### Internal Oscillator
-TODO
+This is available for the D21, D11, or L21. It will also use the DFLL in open-loop mode,
+except when connected to a USB port with data lines (and not suspended), then it
+will calibrate against the USB SOF signal. NVM_SW_CALIB_DFLL48M_FINE_VAL is the fine
+calibration value for DFLL open-loop mode. The coarse calibration value is loaded from
+NVM OTP (factory calibration values).
 
+### Clock Generators
 
+0. MAIN (mcu)
+1. XOSC (high speed crystal)
+2. OSCULP32K (initialized at reset for WDT on D21 and D11)
+3. OSC_HS (the reset default internal RC oscillator is put here at 8MHz, except with C21)
 
-## Analog Reference
 
-TODO: Analog reference selection
-
- * For values <= 5, the actual register value is used.
- * For values > 5 (SAML and SAMC only), the SUPC_VREF_SEL register value is: (ulMode - 6).
- * Values for the Supply Controller (SUPC) reference on the L21 or C21.
- * Used when AR_INTREF is selected as the reference.
-
-typedef enum _eAnalogReference
-{
-#if (SAMD)
-  AR_INTERNAL1V0 = 0,
-  AR_INTERNAL_INTVCC0 = 1,
-  AR_INTERNAL_INTVCC1 = 2,
-  AR_EXTERNAL_REFA = 3,
-  AR_EXTERNAL_REFB = 4,
-  AR_DEFAULT = 5,	// On the SAMD, this also uses 1/2 gain on each input
-#elif (SAML21)
-  AR_INTREF = 0,
-  AR_INTERNAL_INTVCC0 = 1,
-  AR_INTERNAL_INTVCC1 = 2,
-  AR_EXTERNAL_REFA = 3,
-  AR_EXTERNAL_REFB = 4,
-  AR_INTERNAL_INTVCC2 = 5,
-  AR_INTREF_1V0 = 6,
-  AR_INTREF_1V1 = 7,
-  AR_INTREF_1V2 = 8,
-  AR_INTREF_1V25 = 9,
-  AR_INTREF_2V0 = 10,
-  AR_INTREF_2V2 = 11,
-  AR_INTREF_2V4 = 12,
-  AR_INTREF_2V5 = 13,
-  AR_DEFAULT = AR_INTERNAL_INTVCC2,
-  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAML is 1.0V
-#elif (SAMC21)
-  AR_INTREF = 0,
-  AR_INTERNAL_INTVCC0 = 1,
-  AR_INTERNAL_INTVCC1 = 2,
-  AR_EXTERNAL_REFA = 3,
-  AR_EXTERNAL_DAC = 4,
-  AR_INTERNAL_INTVCC2 = 5,
-  AR_INTREF_1V024 = 6,
-  AR_INTREF_2V048 = 7,
-  AR_INTREF_4V096 = 8,
-  AR_DEFAULT = AR_INTERNAL_INTVCC2,
-  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAMC is 1.024V
-#else
-  #error "wiring_analog.c: Unsupported chip"
-#endif
-  AR_INTERNAL = AR_INTERNAL_INTVCC0,
-  AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0,	// 2.23V only when Vcc = 3.3V
-  AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1,	// 1.65V only when Vcc = 3.3V
-  AR_EXTERNAL = AR_EXTERNAL_REFA,
-} eAnalogReference ;
-
-
-
-## Random TODO Notes
 
-* TONE: TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14 as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins.
-* D21: Enables wakeup capability on pin in case being used during sleep (WAKEUP always enabled on SAML and SAMC)
-* All pins (digital and analog) setup in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
-* INEN enabled for both input and output (but not analog)
-* pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
-  interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
-* Pull resistors enabled only if pin attributes allow and only if pin is not configured as output.
-* Pull direction (pullup or pulldown) is now set with pinMode only (defaults to pullup if pinMode never called).
+## Analog Reference
+
+TODO: more info
+
+* D21 / D11
+  * AR_INTERNAL1V0
+  * AR_INTERNAL_INTVCC0
+  * AR_INTERNAL_INTVCC1
+  * AR_EXTERNAL_REFA
+  * AR_EXTERNAL_REFB
+  * AR_DEFAULT (this also uses 1/2 gain on each input)
+
+* L21
+  * AR_INTREF
+  * AR_INTERNAL_INTVCC0
+  * AR_INTERNAL_INTVCC1
+  * AR_EXTERNAL_REFA
+  * AR_EXTERNAL_REFB
+  * AR_INTERNAL_INTVCC2
+  * AR_INTREF_1V0
+  * AR_INTREF_1V1
+  * AR_INTREF_1V2
+  * AR_INTREF_1V25
+  * AR_INTREF_2V0
+  * AR_INTREF_2V2
+  * AR_INTREF_2V4
+  * AR_INTREF_2V5
+  * AR_DEFAULT = AR_INTERNAL_INTVCC2
+  * AR_INTERNAL1V0 = AR_INTREF (Default INTREF for SAML is 1.0V)
+
+* C21
+  * AR_INTREF
+  * AR_INTERNAL_INTVCC0
+  * AR_INTERNAL_INTVCC1
+  * AR_EXTERNAL_REFA
+  * AR_EXTERNAL_DAC
+  * AR_INTERNAL_INTVCC2
+  * AR_INTREF_1V024
+  * AR_INTREF_2V048
+  * AR_INTREF_4V096
+  * AR_DEFAULT = AR_INTERNAL_INTVCC2
+  * AR_INTERNAL1V0 = AR_INTREF (Default INTREF for SAMC is 1.024V)
+
+* Common
+  * AR_INTERNAL = AR_INTERNAL_INTVCC0
+  * AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0 (2.23V only when Vcc = 3.3V)
+  * AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1 (1.65V only when Vcc = 3.3V)
+  * AR_EXTERNAL = AR_EXTERNAL_REFA
 
 
 
@@ -358,7 +294,7 @@ typedef enum _eAnalogReference
 * There are two DACs, DAC0 and DAC1. Both are supported. Because changing the configuration of one DAC requires disabling both,
   there will be about a 40us period when the second DAC is disabled. Most of this time is due to an errata that requires a delay of
   at least 30us when turning off the DAC while refresh is on. The L21 DACs have a refresh setting which must be enabled in this core.
-* The analog reference has additional options on the L21 and C21. See Analog Reference below.
+* The analog reference has additional options on the L21 and C21. See Analog Reference section.
 * On the L21, SERCOM5 is in a low power domain. The Fm+ and HS modes of I2C (wire) are not supported.
 * The SAML and SAMC have double-buffered TCs, which are supported in the core.
 * The CHANGE and RISING interrupt modes on pin A31 do not seem to work properly on the L21.
@@ -370,7 +306,7 @@ typedef enum _eAnalogReference
 ### SAMC21
 
 * There are two SAR ADCs. Both are supported. The PinDescription table determines the peripheral instance and pin mapping.
-* The analog reference has additional options on the L21 and C21. See Analog Reference below.
+* The analog reference has additional options on the L21 and C21. See Analog Reference section.
 * The SAML and SAMC have double-buffered TCs, which are supported in the core.
 * Two Flash Wait States are inserted for the L21 and C21 (the D21/D11 use one wait state).
 * The C21 requires internal pull resistors to be activated on floating pins to minimize power consumption (not needed on D21/D11 or L21).
@@ -385,7 +321,7 @@ typedef enum _eAnalogReference
   Note that it is not necessary to enable pull resistors on any other pins that are floating.
   Errata: Disable pull resistors on PA24 and PA25 manually before switching to a peripheral.
 
-#### Reducing SRAM/FLASH Usage
+#### Reducing SRAM/FLASH Usage on the D11
 
 TODO
 
@@ -397,6 +333,17 @@ TODO
 * Changes due to adding/changing features vs porting to new chip
 
 
+## Random Notes (TODO)
+
+* TONE: TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14 as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins.
+* D21: Enables wakeup capability on pin in case being used during sleep (WAKEUP always enabled on SAML and SAMC)
+* All pins (digital and analog) setup in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
+* INEN enabled for both input and output (but not analog)
+* pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
+interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
+* Pull resistors enabled only if pin attributes allow and only if pin is not configured as output.
+* Pull direction (pullup or pulldown) is now set with pinMode only (defaults to pullup if pinMode never called).
+
 
 ## Serial Monitor
 
@@ -524,9 +471,11 @@ OS X support currently in beta (see below), the following instructions are only
 9. Select the MCU with the now visible Tools->Microcontroller menu (if present).
 10. If you do not already have the bootloader or blink sketch installed, see SAM-BA USB CDC Bootloader below.
 11. Plug in the board. The blink sketch should be running.
-12. Click Tools->Port and choose the COM port. Note that the board indicated may not match the chosen board.
+12. Click Tools->Port and choose the COM port. Note that the board indicated may not match the chosen board*
 13. You can now upload your own sketch.
 
+*Currently, with MattairTech boards, USB PIDs are shared across boards (but they are different based on Tools->USB Config).*
+*This will result in Tools->Port showing "MattairTech MT-D21E (rev B)" for all MattairTech boards.*
 
 ### Uploading the First Sketch
 
@@ -538,6 +487,25 @@ OS X support currently in beta (see below), the following instructions are only
 6. Once the bootloader exits, the blink sketch should be running.
 
 
+## Beta Builds
+
+Periodically, a beta is released for testing.
+
+The beta builds are available through Boards Manager. If you want to install them:
+  1. Open the **Preferences** of the Arduino IDE.
+  2. Add this URL `https://www.mattairtech.com/software/arduino/beta/package_MattairTech_index.json` in the **Additional Boards Manager URLs** field, and click OK.
+  3. Open the **Boards Manager** (menu Tools->Board->Board Manager...)
+  4. Install **MattairTech SAM M0+ Boards - Beta build**
+  5. Select one of the boards under **MattairTech SAM M0+ Beta Build XX** in Tools->Board menu
+  6. Compile/Upload as usual
+
+The Arduino IDE will notify the user if an update to the beta is available, which can then be installed automatically.
+Alternatively, if a particular beta is needed, replace the url in step 2 with:
+  `https://www.mattairtech.com/software/arduino/beta/package_MattairTech_sam_m0p-${VERSION}-beta-b${BUILD_NUMBER}_index.json`
+where ${VERSION} and ${BUILD_NUMBER} match the beta name as shown in the CHANGELOG (ie: package_MattairTech_sam_m0p-1.6.7-beta-b0_index.json).
+In this case, the IDE will not notify the user of updates.
+
+
 ## SAM-BA USB CDC Bootloader (Arduino compatible)
 
 The SAM-BA bootloader has both a CDC USB interface, and a UART interface. It is compatible with the Arduino IDE, or
@@ -713,9 +681,9 @@ for pins that are used for other purposes or for pins that do not exist (especia
 D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
 from the MT-D11 variant.
 
-### See Board Variants above for more technical information on the PinDescription table.
+**See Board Variants above for more technical information on the PinDescription table.**
 
-### See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
 
 
@@ -724,6 +692,7 @@ from the MT-D11 variant.
 * Timer library is currently under development (like TimerOne, plus input capture, plus ??)
 * OS X support currently in beta testing
 * Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
+* Drivers for MT-D21E optional memory devices (SRAM, FLASH, EEPROM)
 
 * USB Host mode CDC ACM (partially complete; BSD-like license?)
 * Features for lower power consumption (library?)
@@ -756,30 +725,33 @@ The Changelog has moved to a separate file named CHANGELOG. The most recent chan
 
 ## Troubleshooting
 
-TODO: Update
+* **Tools->Port shows wrong board**
+  * Currently, with MattairTech boards, USB PIDs are shared across boards (but they are different based on Tools->USB Config).
+    This will result in Tools->Port showing "MattairTech MT-D21E (rev B)" for all MattairTech boards.
 
-* **On Linux, disable modem manager**
+* **Tools->USB Config menu**
+  * Currently, the Tools->USB Config menu (was Tools->Communications) must be used to select the communications configuration.
+    This configuration must match the included libraries. For example, when including the HID and Keyboard libraries, you must
+    select an option that includes HID (all options except CDC_ONLY or USB_DISABLED). This menu is currently needed to select
+    the USB PID that matches the USB device configuration (needed for some versions of Windows). It is also used to control
+    if CDC support is compiled (CDC is always enabled in the stock Arduino core). Auto reset requires CDC to be enabled.
 
-* **Do not perform a manual auto-reset (using a terminal program to change baud to 1200)**
+    * Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
+    * Different combinations of USB devices will result in different COM port assingments in Windows.
 
-* **Boards Manager must be opened twice to see some updates**
+* **Incude platform specific libraries**
+  * You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
 
 * **Errors when compiling, uploading, or burning the bootloader**
-* Be sure to install the Arduino samd core before installing the MattairTech sam m0+ core. If you have problems upgrading
-the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
-Use Arduino core 1.6.2 or above.
+  * Be sure to install the Arduino samd core before installing the MattairTech sam m0+ core. If you have problems upgrading
+    the IDE to 1.6.6, you may need to uninstall both the Arduino and MattairTech cores, then re-install in the proper order.
+    Use Arduino core 1.6.2 or above.
 
-* **Tools->Communications menu**
-* Currently, the Tools->Communications menu must be used to select the communications configuration. This configuration
-must match the included libraries. For example, when including the HID and Keyboard libraries, you must select an
-option that includes HID (ie: CDC_HID_UART). This menu is currently needed to select the USB PID that matches the
-USB device configuration (needed for Windows). This may become automatic in a future release.
+* **On Linux, disable modem manager (Ubuntu)**
 
-* Be sure that the Tools->Communications menu matches the sketch and libraries you are compiling.
-* Different combinations of USB devices will result in different COM port assingments in Windows.
+* Do not perform a manual auto-reset (using a terminal program to change baud to 1200)
 
-* **Incude platform specific libraries**
-* You may need to manually include platform specific libraries such as SPI.h, Wire.h, and HID.h.
+* Boards Manager must be opened twice to see some updates (only applies to some old IDE versions)
 
 
 ## Bugs or Issues
@@ -796,25 +768,6 @@ Before posting a new issue, please check if the same problem has been already re
 Contributions are always welcome. The preferred way to receive code cotribution is by submitting a Pull Request on github.
 
 
-## Beta Builds
-
-Periodically, a beta is released for testing.
-
-The beta builds are available through Boards Manager. If you want to install them:
-  1. Open the **Preferences** of the Arduino IDE.
-  2. Add this URL `https://www.mattairtech.com/software/arduino/beta/package_MattairTech_index.json` in the **Additional Boards Manager URLs** field, and click OK.
-  3. Open the **Boards Manager** (menu Tools->Board->Board Manager...)
-  4. Install **MattairTech SAM M0+ Boards - Beta build**
-  5. Select one of the boards under **MattairTech SAM M0+ Beta Build XX** in Tools->Board menu
-  6. Compile/Upload as usual
-
-The Arduino IDE will notify the user if an update to the beta is available, which can then be installed automatically.
-Alternatively, if a particular beta is needed, replace the url in step 2 with:
-  `https://www.mattairtech.com/software/arduino/beta/package_MattairTech_sam_m0p-${VERSION}-beta-b${BUILD_NUMBER}_index.json`
-where ${VERSION} and ${BUILD_NUMBER} match the beta name as shown in the CHANGELOG (ie: package_MattairTech_sam_m0p-1.6.7-beta-b0_index.json).
-In this case, the IDE will not notify the user of updates.
-
-
 ## License and Credits
 
 This core has been developed by Arduino LLC in collaboration with Atmel.
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index 9e3357368..c4f57a7ef 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -1,6 +1,6 @@
 # Arduino Zero Bootloader
 
-## 1- Prerequisites
+## Prerequisites for Building
 
 The project build is based on Makefile system.
 Makefile is present at project root and try to handle multi-platform cases.
@@ -40,30 +40,30 @@ Make is usually available by default.
 Make is available through XCode package.
 
 
-## 2- Makefile Configuration
+## Makefile Configuration
 
 The section between 'Begin Configuration' and 'End Configuration' in the Makefile should be edited.
 Set BOARD_ID and MCU to a chip listed in the comments.
 
-# Boards definitions:
-# MT_D21E_rev_A, MT_D21E_rev_B, MT_D11, MT_D21J
-# arduino_zero, arduino_mkrzero, arduino_mkr1000, genuino_mkr1000, genuino_zero
-# Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
+### Boards definitions:
+* MT_D21E_rev_A, MT_D21E_rev_B, MT_D11, MT_D21J
+* arduino_zero, arduino_mkrzero, arduino_mkr1000, genuino_mkr1000, genuino_zero
+* Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
 
-# MCU definitions:
-# SAMD21J: SAMD21J18A, SAMD21J17A, SAMD21J16A, SAMD21J15A
-# SAMD21G: SAMD21G18A, SAMD21G17A, SAMD21G16A, SAMD21G15A
-# SAMD21E: SAMD21E18A, SAMD21E17A, SAMD21E16A, SAMD21E15A
-# SAML21J: SAML21J18B, SAML21J17B, SAML21J16B
-# SAML21G: SAML21G18B, SAML21G17B, SAML21G16B
-# SAML21E: SAML21E18B, SAML21E17B, SAML21E16B, SAML21E15B
-# SAMC21J: SAMC21J18A, SAMC21J17A, SAMC21J16A, SAMC21J15A
-# SAMC21G: SAMC21G18A, SAMC21G17A, SAMC21G16A, SAMC21G15A
-# SAMC21E: SAMC21E18A, SAMC21E17A, SAMC21E16A, SAMC21E15A
-# SAMD11:  SAMD11D14AM, SAMD11C14A, SAMD11D14AS
+### MCU definitions:
+* SAMD21J: SAMD21J18A, SAMD21J17A, SAMD21J16A, SAMD21J15A
+* SAMD21G: SAMD21G18A, SAMD21G17A, SAMD21G16A, SAMD21G15A
+* SAMD21E: SAMD21E18A, SAMD21E17A, SAMD21E16A, SAMD21E15A
+* SAML21J: SAML21J18B, SAML21J17B, SAML21J16B
+* SAML21G: SAML21G18B, SAML21G17B, SAML21G16B
+* SAML21E: SAML21E18B, SAML21E17B, SAML21E16B, SAML21E15B
+* SAMC21J: SAMC21J18A, SAMC21J17A, SAMC21J16A, SAMC21J15A
+* SAMC21G: SAMC21G18A, SAMC21G17A, SAMC21G16A, SAMC21G15A
+* SAMC21E: SAMC21E18A, SAMC21E17A, SAMC21E16A, SAMC21E15A
+* SAMD11:  SAMD11D14AM, SAMD11C14A, SAMD11D14AS
 
 
-## 3- Behaviour / Board Configuration
+## Board Configuration
 
 Configuration for each board is available in the board_definitions directory.
 Each board has a file named board_definitions_BOARD_NAME.h, where BOARD_NAME is
@@ -181,7 +181,7 @@ so no crystal is required. No LEDs are defined. BOOT_LOAD_PIN is not
 defined, but BOOT_DOUBLE_TAP_ENABLED is, since it uses the reset pin.
 
 
-## Boot condition test sequence
+## Boot Condition Test Sequence
 First, the start location of the sketch is fetched and checked. If it
 is empty (0xFFFFFFFF), then bootloader execution is resumed. Note that
 when Arduino auto-reset (into bootloader) is initiated, the first flash
@@ -198,7 +198,27 @@ should not be defined. USB_VENDOR_STRINGS_ENABLED also should not be
 defined in most cases, as well as BOOT_LOAD_PIN.
 
 
-## 4- Details
+## Building
+
+If not specified the makefile builds for **MT_D21E_rev_B**:
+
+```
+make
+```
+
+if you want to make a custom bootloader for a derivative board you must supply all the
+necessary information in a `board_definitions_xxx.h` file, and add the corresponding case in
+`board_definitions.h`. For example for the **Generic_x21J** board with a **SAMD21J18A** MCU,
+we use `board_definitions_Generic_x21J.h` and it is build with the following command:
+
+```
+BOARD_ID=Generic_x21J MCU=SAMD21J18A make clean all
+```
+
+which will produce a binary named sam_ba_Generic_x21J_SAMD21J18A.bin
+
+
+## Technical Details
 
 **Pinmap**
 
@@ -228,23 +248,3 @@ of the system stack. The applet in this case is a very simple word copy function
 1KB is reserved for the applet, and there are two 64 byte data buffers placed after it. The
 applet has its own stack at the top of RAM, but the word copy applet uses little/none of this.
 The bossac tool is responsible for loading the applet. See Devices.h from the Bossa source.
-
-
-## 5- How to build
-
-If not specified the makefile builds for **MT_D21E_rev_B**:
-
-```
-make
-```
-
-if you want to make a custom bootloader for a derivative board you must supply all the
-necessary information in a `board_definitions_xxx.h` file, and add the corresponding case in
-`board_definitions.h`. For example for the **Generic_x21J** board with a **SAMD21J18A** MCU,
-we use `board_definitions_Generic_x21J.h` and it is build with the following command:
-
-```
-BOARD_ID=Generic_x21J MCU=SAMD21J18A make clean all
-```
-
-which will produce a binary named sam_ba_Generic_x21J_SAMD21J18A.bin
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
index db03ae0ba..1c099a321 100644
--- a/variants/Generic_D11C14A/README.md
+++ b/variants/Generic_D11C14A/README.md
@@ -28,8 +28,10 @@ SWDCLK  TX1/MISO*              30 | A30           A31 | 31   *            RX1/SS
 ```
 
 
-# Pins descriptions for Generic ATsamD11C14A
-## PIN_MAP_STANDARD
+## Pins descriptions for Generic ATsamD11C14A
+
+### PIN_MAP_STANDARD
+```
 ====================================================================================================================================
 Arduino	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
 --------|-------|-----------------------|-------------------------------------------------------------------------------------------
@@ -66,8 +68,11 @@ Arduino	| Port	| Alternate Function	| Comments (! means not used with this perip
 30	| PA30	| MISO / SWD CLK	| !EIC/EXTINT[2] SERCOM1/PAD[0] !SERCOM1/PAD[2] !TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
 31	| PA31	| SS / SWD IO		| EIC/EXTINT[3] SERCOM1/PAD[1] !SERCOM1/PAD[3] !TC2/WO[1] !TCC0/WO[3] SWD IO
 ====================================================================================================================================
+```
+
 
-## PIN_MAP_COMPACT
+### PIN_MAP_COMPACT
+```
 ====================================================================================================================================
 Arduino	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
 --------|-------|-----------------------|-------------------------------------------------------------------------------------------
@@ -96,68 +101,57 @@ Arduino	| Port	| Alternate Function	| Comments (! means not used with this perip
 * When using ONE_UART_NO_WIRE_ONE_SPI, Serial1 refers to TX2/RX2 instead of TX1/RX1.
 * Leave pin A30 floating (or use external pullup) during reset.
 * SERCOM2 does not exist on the D11C14A.
+```
 
 
-# Board Configuration Notes
-
-TODO: Update this for Generic D11C14A
+## Board Configuration Notes
 
-* Either the 32.768KHz crystal or the 16MHz crystal can be used.
-* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
+* **Crystals**
+  * Either a 32.768KHz crystal or a high speed crystal can be used.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
 
-* **Digital: All pins can be used for general purpose I/O** 
-  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin, enabled by default).
   * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-  * These are available using the analogRead() function.
-  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+
+* **Analog Inputs**
+  * 5 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
   * Each pin provides 10 bits of resolution (1024 values) by default.
   * 12-bit resolution supported by using the analogReadResolution() function.
-  * Each pin measures from ground to 3.3 volts.
-  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
-* **DAC: One analog output is available on pin 2.**
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REF.
+
+* **DAC**
+  * One analog output is available on pin 2.
   * Provides a 10-bit voltage output with the analogWrite() function.
-* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
-  * Available using the analogWrite() function.
+
+* **PWM**
+  * 6 pins can be configured as PWM outputs.
   * Each pin provides 8 bits of resolution (256 values) by default.
   * 12-bit resolution supported by using the analogWriteResolution() function.
-* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
-  * Available using the attachInterrupt() function.
-* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
-  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
-  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
-* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
-  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
-  * SPI communication using the SPI library.
-  * Note that the SPI library will set SS as an output.
-  * On the MT-D11, the button must be configured as reset (default) when using SPI.
-* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
-  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
-  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
-  * TWI communication using the Wire library.
-* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
-  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
-  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
-* **AREF: One pin can be configured as an AREF analog input.**
-  * The upper end of the analog measurement range can be changed using the analogReference() function.
-* **Reset: Bring this line LOW to reset the microcontroller.**
-
-
-
-# PinDescription table format
-
-## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+
+* **External Interrupts**
+  * 7 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 2 SERCOM are available.
+  * Up to 2 UART instances
+  * 1 SPI instance
+  * 1 WIRE (I2C) instance
+
+
+
+## PinDescription table format
+
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
 table the old way, losing any new features introduced by the new column. Additionally,
 new definitions have been added for L21 and C21 support.
 
-## Each pin can have multiple functions.
+### Each pin can have multiple functions.
 The PinDescription table describes how each of the pins can be used by the Arduino
 core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
 communications, etc.), and the PinDescription table configures which functions can
@@ -168,7 +162,7 @@ analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
 verify that the pin can perform the function requested, and to configure the pin for
 that function. Most of the contents of pinMode() are now in pinPeripheral().
 
-## Pin Mapping
+### Pin Mapping
 There are different ways that pins can be mapped. Typically, there is no relation
 between the arduino pin number used, and the actual port pin designator. Thus, the 
 pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
@@ -184,15 +178,15 @@ designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2),
 using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
 used, leaving the other pin for some number above 31.
 
-## See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
-### Port:
+### Port
 This is the port (ie: PORTA).
 
-### Pin:
+### Pin
 This is the pin (bit) within the port. Valid values are 0-31.
 
-### PinType:
+### PinType
 This indicates what peripheral function the pin can be attached to. In most cases,
 this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
 field. It can also be set to a specific peripheral. In this case, any attempt to
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
index 3897cdc77..72b088338 100644
--- a/variants/MT_D11/README.md
+++ b/variants/MT_D11/README.md
@@ -28,8 +28,10 @@ BTN   SS              *      *     | A15           RST |
 ```
 
 
-# Pins descriptions for the MattairTech MT-D11
-## PIN_MAP_STANDARD
+## Pins descriptions for the MattairTech MT-D11
+
+### PIN_MAP_STANDARD
+```
 ============================================================================================================================================
 Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
 --------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
@@ -66,8 +68,10 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 30	| A30	| PA30	| TX1 / SWD CLK		| !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
 31	| A31	| PA31	| RX1 / SWD IO		| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
 ============================================================================================================================================
+```
 
-## PIN_MAP_COMPACT
+### PIN_MAP_COMPACT
+```
 ============================================================================================================================================
 Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
 --------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
@@ -100,73 +104,68 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * Leave pin A30 floating (or use external pullup) during reset.
 * Pins 8 and 9 are by default connected to the 32.768KHz crystal.
 * The tone library uses TC2.
+```
+
 
+## Board Configuration Notes
 
-# Board Configuration Notes
+* **Crystals**
+  * Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
 
-TODO: Update this
+* **LED (LED_BUILTIN)**
+  * Bring the pin HIGH to turn the LED on.
+  * The LED is enabled (solder jumper) by default.
 
-* Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
-* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
-* The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
-* BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
-* A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
-* The I2C (TWI) pullup resistors are enabled by default.
-* The LED is enabled by default.
+* **Button (BUTTON_BUILTIN)**
+  * Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+  * The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
+  * BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
 
-* **Digital: All pins can be used for general purpose I/O** 
-  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin, enabled by default).
   * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-  * These are available using the analogRead() function.
-  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+
+* **Analog Inputs**
+  * 10 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
   * Each pin provides 10 bits of resolution (1024 values) by default.
   * 12-bit resolution supported by using the analogReadResolution() function.
-  * Each pin measures from ground to 3.3 volts.
-  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
-* **DAC: One analog output is available on pin 2.**
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REF. In this case, the capacitor should be enabled via the solder jumper.
+
+* **DAC**
+  * One analog output is available on pin 2.
   * Provides a 10-bit voltage output with the analogWrite() function.
-* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
-  * Available using the analogWrite() function.
+
+* **PWM**
+  * 8 pins can be configured as PWM outputs.
   * Each pin provides 8 bits of resolution (256 values) by default.
   * 12-bit resolution supported by using the analogWriteResolution() function.
-* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
-  * Available using the attachInterrupt() function.
-* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
-  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
-  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
-* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
-  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
-  * SPI communication using the SPI library.
-  * Note that the SPI library will set SS as an output.
-  * On the MT-D11, the button must be configured as reset (default) when using SPI.
-* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
-  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
-  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
-  * TWI communication using the Wire library.
-* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
-  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
-  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
-* **AREF: One pin can be configured as an AREF analog input.**
-  * The upper end of the analog measurement range can be changed using the analogReference() function.
-* **Reset: Bring this line LOW to reset the microcontroller.**
+
+* **External Interrupts**
+  * 8 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 3 SERCOM are available.
+  * Up to 2 UART instances
+  * 1 SPI instance
+  * 1 WIRE (I2C) instance
+  * The WIRE pullup resistors are enabled by default.
 
 
 
-# PinDescription table format
+## PinDescription table format
 
-## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
 table the old way, losing any new features introduced by the new column. Additionally,
 new definitions have been added for L21 and C21 support.
 
-## Each pin can have multiple functions.
+### Each pin can have multiple functions.
 The PinDescription table describes how each of the pins can be used by the Arduino
 core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
 communications, etc.), and the PinDescription table configures which functions can
@@ -177,7 +176,7 @@ analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
 verify that the pin can perform the function requested, and to configure the pin for
 that function. Most of the contents of pinMode() are now in pinPeripheral().
 
-## Pin Mapping
+### Pin Mapping
 There are different ways that pins can be mapped. Typically, there is no relation
 between the arduino pin number used, and the actual port pin designator. Thus, the 
 pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
@@ -193,15 +192,15 @@ designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2),
 using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
 used, leaving the other pin for some number above 31.
 
-## See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
-### Port:
+### Port
 This is the port (ie: PORTA).
 
-### Pin:
+### Pin
 This is the pin (bit) within the port. Valid values are 0-31.
 
-### PinType:
+### PinType
 This indicates what peripheral function the pin can be attached to. In most cases,
 this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
 field. It can also be set to a specific peripheral. In this case, any attempt to
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
index fd8ce3360..d4826bba9 100644
--- a/variants/MT_D21E/README.md
+++ b/variants/MT_D21E/README.md
@@ -35,7 +35,8 @@ USB D+       TC51                    | A25+ |     |  Vin |
 * Tone available on TC5. DO NOT connect voltages higher than 3.3V!
 ```
 
-# Pins descriptions for the MattairTech MT-D21E
+## Pins descriptions for the MattairTech MT-D21E
+```
 ============================================================================================================================================
 Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
 --------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
@@ -82,73 +83,68 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * TC5(D21) is available on these pins otherwise. The tone library uses TC5.
 * A0 and A1 are by default connected to the 32.768KHz crystal.
 * Leave pin A30 floating (or use external pullup) during reset.
+```
 
 
-# Board Configuration Notes
+## Board Configuration Notes
 
-TODO: Update this
+* **Crystals**
+  * Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
 
-* Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
-* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
-* The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
-* BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
-* A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
-* The I2C (TWI) pullup resistors are enabled by default.
-* The LED is enabled by default.
+* **LED (LED_BUILTIN)**
+  * Bring the pin HIGH to turn the LED on.
+  * The LED is enabled (solder jumper) by default.
 
-* **Digital: All pins can be used for general purpose I/O** 
-  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+* **Buttons (BUTTON_BUILTIN)**
+  * Button A (BTNA) is connected to pin 27 by default (BUTTON_BUILTIN).
+  * Button B (BTNB) is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
+  * Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin, enabled by default).
   * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-  * These are available using the analogRead() function.
-  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+
+* **Analog Inputs**
+  * 10 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
   * Each pin provides 10 bits of resolution (1024 values) by default.
   * 12-bit resolution supported by using the analogReadResolution() function.
-  * Each pin measures from ground to 3.3 volts.
-  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
-* **DAC: One analog output is available on pin 2.**
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
+
+* **DAC**
+  * One analog output is available on pin 2.
   * Provides a 10-bit voltage output with the analogWrite() function.
-* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
-  * Available using the analogWrite() function.
+
+* **PWM**
+  * 12 pins can be configured as PWM outputs.
   * Each pin provides 8 bits of resolution (256 values) by default.
   * 12-bit resolution supported by using the analogWriteResolution() function.
-* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
-  * Available using the attachInterrupt() function.
-* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
-  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
-  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
-* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
-  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
-  * SPI communication using the SPI library.
-  * Note that the SPI library will set SS as an output.
-  * On the MT-D11, the button must be configured as reset (default) when using SPI.
-* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
-  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
-  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
-  * TWI communication using the Wire library.
-* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
-  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
-  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
-* **AREF: One pin can be configured as an AREF analog input.**
-  * The upper end of the analog measurement range can be changed using the analogReference() function.
-* **Reset: Bring this line LOW to reset the microcontroller.**
+
+* **External Interrupts**
+  * 14 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 4 SERCOM are available.
+  * Up to 2 UART instances
+  * 1 SPI instance
+  * 1 WIRE (I2C) instance
+  * The WIRE pullup resistors are enabled by default.
 
 
 
-# PinDescription table format
+## PinDescription table format
 
-## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
 table the old way, losing any new features introduced by the new column. Additionally,
 new definitions have been added for L21 and C21 support.
 
-## Each pin can have multiple functions.
+### Each pin can have multiple functions.
 The PinDescription table describes how each of the pins can be used by the Arduino
 core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
 communications, etc.), and the PinDescription table configures which functions can
@@ -159,7 +155,7 @@ analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
 verify that the pin can perform the function requested, and to configure the pin for
 that function. Most of the contents of pinMode() are now in pinPeripheral().
 
-## Pin Mapping
+### Pin Mapping
 There are different ways that pins can be mapped. Typically, there is no relation
 between the arduino pin number used, and the actual port pin designator. Thus, the 
 pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
@@ -175,15 +171,15 @@ designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2),
 using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
 used, leaving the other pin for some number above 31.
 
-## See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
-### Port:
+### Port
 This is the port (ie: PORTA).
 
-### Pin:
+### Pin
 This is the pin (bit) within the port. Valid values are 0-31.
 
-### PinType:
+### PinType
 This indicates what peripheral function the pin can be attached to. In most cases,
 this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
 field. It can also be set to a specific peripheral. In this case, any attempt to
diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
index 4d2936006..5f28f2e48 100644
--- a/variants/MT_D21E_revB/README.md
+++ b/variants/MT_D21E_revB/README.md
@@ -47,7 +47,8 @@ Silkscreen Legend:
 ```
 
 
-# Pins descriptions for the MattairTech MT-D21E (rev B)
+## Pins descriptions for the MattairTech MT-D21E (rev B)
+```
 ============================================================================================================================================
 Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
 --------|-------|-------|-----------------------|-------------------------------------------------------------------------------------------
@@ -94,73 +95,74 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * TC5(D21) is available on these pins otherwise. The tone library uses TC5.
 * A0 and A1 are by default connected to the 32.768KHz crystal.
 * Leave pin A30 floating (or use external pullup) during reset.
+```
+
 
+## Board Configuration Notes
 
-# Board Configuration Notes
+* **Crystals**
+  * Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
 
-TODO: Update this
+* **LED (LED_BUILTIN)**
+  * Bring the pin HIGH to turn the LED on.
+  * The LED is enabled (solder jumper) by default.
 
-* Either the 32.768KHz crystal or the 16MHz crystal can be used. Be sure to set the correct solder jumpers.
-* The bootloader does not use an external crystal by default. Double-tap the reset button to enter.
-* The button is connected to the Reset pin by default, but can be connected to pin 15 via the solder jumper.
-* BTN pin is shared with SPI SS, so the button must be configured as reset (default) when using SPI.
-* A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
-* The I2C (TWI) pullup resistors are enabled by default.
-* The LED is enabled by default.
+* **Button (BUTTON_BUILTIN)**
+  * Button (B) is connected to the Reset pin by default, but can be connected to pin 31 via the solder jumper.
+  * Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
+
+* **Jumper**
+  * Jumper (A) is connected (solder jumper) to pin 27 by default.
+  * Since this pin is shared with the optional memory device CD pin, **leave the jumper off** when a memory device is installed.
 
-* **Digital: All pins can be used for general purpose I/O** 
-  * Supports INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
-  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin).
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * When PER_ATTR_DRIVE_STRONG is set for the pin (enabled by default), each pin can source or sink a maximum of:
+    * **D21:** 7mA high, 10mA low
+    * **L21:** 5mA high, 6mA low (8 high drive pins: 10mA high, 12mA low)
+    * **C21:** 6mA high, 10mA low (2 high drive pins (A10, A11): 12mA high, 20mA low)
   * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
-  * Use the pinMode(), digitalWrite(), and digitalRead() functions.
-* **Analog Inputs: 10 pins can be configured as ADC analog inputs.**
-  * These are available using the analogRead() function.
-  * All pins can be used for GPIO and some pins can be used for other digital functions (ie. pwm or serial).
+
+* **Analog Inputs**
+  * 10 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
   * Each pin provides 10 bits of resolution (1024 values) by default.
   * 12-bit resolution supported by using the analogReadResolution() function.
-  * Each pin measures from ground to 3.3 volts.
-  * The upper end of the measurement range can be changed using the AREF pin and the analogReference() function.
-* **DAC: One analog output is available on pin 2.**
-  * Provides a 10-bit voltage output with the analogWrite() function.
-* **PWM: 12 pins (MT-D21E) or 8 pins (MT-D11) can be configured as PWM outputs.**
-  * Available using the analogWrite() function.
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REFA or REFB. In these cases, the capacitors should be enabled via the solder jumpers.
+
+* **DAC**
+  * D21/C21: One 10-bit 350Ksps analog output is available on pin 2.
+  * L21: Two 12-bit 1Msps analog outputs are available on pins 2 and 5.
+
+* **PWM**
+  * 12 pins can be configured as PWM outputs.
   * Each pin provides 8 bits of resolution (256 values) by default.
   * 12-bit resolution supported by using the analogWriteResolution() function.
-* **External Interrupts: 15 pins (MT-D21E) or 9 pins (MT-D11) can be configured with external interrupts.**
-  * Available using the attachInterrupt() function.
-* **Serial: 2 pairs of pins (MT-D21E) or 1 pair (MT-D11) can be configured for TTL serial I/O.**
-  * MT-D21E: Serial1: pin 11 (RX) and pin 10 (TX). Serial2: pin 15 (RX) and pin 14 (TX).
-  * MT-D11: Serial1: pin 31 (RX) and pin 30 (TX).
-* **SPI: 3 or 4 pins can be configured for SPI I/O (SPI).**
-  * MT-D21E: Pin 18 (MOSI), pin 19 (SCK), pin 22 (MISO), and optionally pin 23 (SS, not currently used).
-  * MT-D11: Pin 10 (MOSI), pin 11 (SCK), pin 14 (MISO), and optionally pin 15 (SS, not currently used).
-  * SPI communication using the SPI library.
-  * Note that the SPI library will set SS as an output.
-  * On the MT-D11, the button must be configured as reset (default) when using SPI.
-* **TWI (I2C): 2 pins can be configured for TWI I/O (Wire).**
-  * MT-D21E: Pin 16 (SDA) and pin 17 (SCL).
-  * MT-D11: Pin 22 (SDA) and pin 23 (SCL).
-  * TWI communication using the Wire library.
-* **LED: One pin can be configured to light the onboard LED (LED_BUILTIN).**
-  * Pin 28 (MT-D21E) or pin 16 (MT-D11). Bring the pin HIGH to turn the LED on. The pullup is disabled on this pin.
-* **Button: One pin can be configured to read the onboard Button A (BUTTON_BUILTIN).**
-  * Pin 27 (MT-D21E) or pin 15 (MT-D11). Pressing the button will bring the pin LOW. The pullup must be enabled first.
-  * If the debouncing capacitor is connected, delay reading the pin at least 6ms after turning on the pullup.
-* **AREF: One pin can be configured as an AREF analog input.**
-  * The upper end of the analog measurement range can be changed using the analogReference() function.
-* **Reset: Bring this line LOW to reset the microcontroller.**
+
+* **External Interrupts**
+  * 14 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 4 SERCOM are available.
+  * Up to 2 UART instances
+  * 1 SPI instance
+  * 1 WIRE (I2C) instance
+  * The WIRE pullup resistors are enabled by default.
 
 
 
-# PinDescription table format
+## PinDescription table format
 
-## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
 table the old way, losing any new features introduced by the new column. Additionally,
 new definitions have been added for L21 and C21 support.
 
-## Each pin can have multiple functions.
+### Each pin can have multiple functions.
 The PinDescription table describes how each of the pins can be used by the Arduino
 core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
 communications, etc.), and the PinDescription table configures which functions can
@@ -171,7 +173,7 @@ analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
 verify that the pin can perform the function requested, and to configure the pin for
 that function. Most of the contents of pinMode() are now in pinPeripheral().
 
-## Pin Mapping
+### Pin Mapping
 There are different ways that pins can be mapped. Typically, there is no relation
 between the arduino pin number used, and the actual port pin designator. Thus, the 
 pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
@@ -187,15 +189,15 @@ designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2),
 using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
 used, leaving the other pin for some number above 31.
 
-## See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
-### Port:
+### Port
 This is the port (ie: PORTA).
 
-### Pin:
+### Pin
 This is the pin (bit) within the port. Valid values are 0-31.
 
-### PinType:
+### PinType
 This indicates what peripheral function the pin can be attached to. In most cases,
 this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
 field. It can also be set to a specific peripheral. In this case, any attempt to
diff --git a/variants/arduino_mzero/README.md b/variants/arduino_mzero/README.md
index fc38b0fee..bc49b6d41 100644
--- a/variants/arduino_mzero/README.md
+++ b/variants/arduino_mzero/README.md
@@ -86,15 +86,15 @@
 
 
 
-# PinDescription table format
+## PinDescription table format
 
-## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
 table the old way, losing any new features introduced by the new column. Additionally,
 new definitions have been added for L21 and C21 support.
 
-## Each pin can have multiple functions.
+### Each pin can have multiple functions.
 The PinDescription table describes how each of the pins can be used by the Arduino
 core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
 communications, etc.), and the PinDescription table configures which functions can
@@ -105,7 +105,7 @@ analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
 verify that the pin can perform the function requested, and to configure the pin for
 that function. Most of the contents of pinMode() are now in pinPeripheral().
 
-## Pin Mapping
+### Pin Mapping
 There are different ways that pins can be mapped. Typically, there is no relation
 between the arduino pin number used, and the actual port pin designator. Thus, the 
 pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
@@ -121,15 +121,15 @@ designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2),
 using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
 used, leaving the other pin for some number above 31.
 
-## See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
-### Port:
+### Port
 This is the port (ie: PORTA).
 
-### Pin:
+### Pin
 This is the pin (bit) within the port. Valid values are 0-31.
 
-### PinType:
+### PinType
 This indicates what peripheral function the pin can be attached to. In most cases,
 this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
 field. It can also be set to a specific peripheral. In this case, any attempt to
diff --git a/variants/arduino_zero/README.md b/variants/arduino_zero/README.md
index 6e652727b..e623a7498 100644
--- a/variants/arduino_zero/README.md
+++ b/variants/arduino_zero/README.md
@@ -92,15 +92,15 @@
 
 
 
-# PinDescription table format
+## PinDescription table format
 
-## Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
 MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
 If using board variant files with the old format, the new core will still read the
 table the old way, losing any new features introduced by the new column. Additionally,
 new definitions have been added for L21 and C21 support.
 
-## Each pin can have multiple functions.
+### Each pin can have multiple functions.
 The PinDescription table describes how each of the pins can be used by the Arduino
 core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
 communications, etc.), and the PinDescription table configures which functions can
@@ -111,7 +111,7 @@ analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
 verify that the pin can perform the function requested, and to configure the pin for
 that function. Most of the contents of pinMode() are now in pinPeripheral().
 
-## Pin Mapping
+### Pin Mapping
 There are different ways that pins can be mapped. Typically, there is no relation
 between the arduino pin number used, and the actual port pin designator. Thus, the 
 pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
@@ -127,15 +127,15 @@ designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2),
 using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
 used, leaving the other pin for some number above 31.
 
-## See WVariant.h in cores/arduino for the definitions used in the table.
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
 
-### Port:
+### Port
 This is the port (ie: PORTA).
 
-### Pin:
+### Pin
 This is the pin (bit) within the port. Valid values are 0-31.
 
-### PinType:
+### PinType
 This indicates what peripheral function the pin can be attached to. In most cases,
 this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
 field. It can also be set to a specific peripheral. In this case, any attempt to

From 571229352c7caa4c145f68639bf39c79cfffe20d Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 18 May 2017 04:34:27 +0000
Subject: [PATCH 092/124] Added more Serial, SPI, and WIRE instances to MT-D21E
 (rev A and B). Documentation updates.

---
 CHANGELOG                         | 13 ++++++++
 README.md                         | 41 +++++++++++++++++--------
 boards.txt                        | 48 ++++++++++++++++++++++++++---
 variants/MT_D21E/README.md        | 46 ++++++++++++++--------------
 variants/MT_D21E/variant.cpp      | 37 ++++++++++++++++++-----
 variants/MT_D21E/variant.h        | 45 ++++++++++++++++++++++++++++
 variants/MT_D21E_revB/README.md   | 50 +++++++++++++++----------------
 variants/MT_D21E_revB/variant.cpp | 45 +++++++++++++++++++++-------
 variants/MT_D21E_revB/variant.h   | 45 ++++++++++++++++++++++++++++
 9 files changed, 287 insertions(+), 83 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c28a8ad9e..d2637a29d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+1.6.8-beta-b2:
+* Added more Serial, SPI, and WIRE options
+* Added MicroSD card firmware loading in the bootloader
+* Fixed SDU library to work with MattairTech boards
+* Fixed auto-detection for Arduino Zero and M0 board variants
+* Documentation updates
+* Merged in changes from upstream SAMD CORE 1.6.15:
+  * 
+
+1.6.8-beta-b1:
+* Fixed auto-reset not working on some versions of Windows
+* Documentation updates
+
 1.6.8-beta-b0:
 * Added L21 and C21 support. Improved D11D and D11C support.
   * Use Tools->Microcontroller menu to select mcu.
diff --git a/README.md b/README.md
index cbc11a224..708aac865 100644
--- a/README.md
+++ b/README.md
@@ -72,13 +72,14 @@ Analog Outputs	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)
 PWM Outputs	| 18					| 14					| 14					| 8 (6 for 14-pin)
 Interrupts	| 16					| 16					| 16					| 8 (7 for 14-pin)
 USB		| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device
-SERCOM		| 6					| 6					| 4					| 3 (2 for 14-pin)
-UART (Serial)	| Up to 3				| Up to 3				| Up to 2				| Up to 2
-SPI		| Up to 3				| Up to 2				| 1					| 1
-I2C (WIRE)	| Up to 3				| Up to 2				| 1					| 1
+SERCOM*		| 6					| 6					| 4					| 3 (2 for 14-pin)
+UART (Serial)*	| Up to 6				| Up to 6				| Up to 4				| Up to 2
+SPI*		| Up to 3				| Up to 2				| Up to 2				| Up to 1
+I2C (WIRE)*	| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2S		| Present on the D21 only		| Present on the D21 only		| Present on the D21 only		| Not present
 Voltage		| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V
 I/O Pin	Current	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| 7 mA
+* Note that the maximum number of UART/SPI/I2C is the number of SERCOM. The number listed above for UART/SPI/I2C indicated how many are configurable through the Arduino IDE menu.
 
 
 
@@ -153,10 +154,17 @@ Choose NO_BOOTLOADER if not using a bootloader (an external programmer will be u
 
 ### Serial Config Menu
 
-This menu is used to select different combinations of serial peripherals. This is useful especially for
-the D11, which has a reduced pin count and number of SERCOMs. It can also be used to reduce FLASH and
-SRAM usage by selecting fewer UART peripherals, which are instantiated in the core, rather than only
-when including a library (like SPI and WIRE). Most board variants support two UART as an option.
+This menu is used to select different combinations of serial peripherals. It adds additional UART, SPI,
+and WIRE instances. This is also useful for the D11, which has a reduced pin count and number of SERCOMs.
+It can also be used to reduce FLASH and SRAM usage by selecting fewer UART peripherals, which are
+instantiated in the core, rather than only when including a library (like SPI and WIRE). Note that with
+options where there is more than one SPI or WIRE, the additional instances will consume a small amount
+of RAM, but neither the peripheral nor the pins are configured until begin() method is called (thus, the
+pins can be used for other purposes).
+
+Use the ASCII art rendering at the top of the README.md file of the board variant used in order to
+determine the mapping of instances to pins. When USB CDC is enabled, Serial refers to SerialUSB,
+otherwise it refers to Serial1 (TX1/RX1).
 
 
 ### USB Config Menu
@@ -458,6 +466,8 @@ OS X support currently in beta (see below), the following instructions are only
 
 ### SAM M0+ Core Installation
 
+**See Beta Builds section below to install the beta, as it uses a different json file**
+
 * To update from a previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.
 
 1. The MattairTech SAM M0+ Core requires Arduino 1.6.7 or above (including 1.8.x).
@@ -516,7 +526,7 @@ several features, including three new commands (Arduino Extended Capabilities) t
 bootloader normally requires 8 KB FLASH, however, a 4 KB version can be used for the D11 chips.
 
 Bossac is a command line utility for uploading firmware to SAM-BA bootloaders. It runs on Windows. Linux, and OS X.
-It is used by Arduino to upload firmware to SAM and SAM M0+ boards. The version Bossac described here adds to the
+It is used by Arduino to upload firmware to SAM and SAM M0+ boards. The version described here adds to the
 Arduino version (https://github.com/shumatech/BOSSA, Arduino branch), which in turn is a fork from the original
 Bossa (http://www.shumatech.com/web/products/bossa). It adds support for more SAM M0+ chips (D21, L21, C21, and D11).
 
@@ -687,13 +697,15 @@ from the MT-D11 variant.
 
 
 
-## Possible Future Additions/Changes
+## Future Additions/Changes
 
-* Timer library is currently under development (like TimerOne, plus input capture, plus ??)
-* OS X support currently in beta testing
-* Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
+### In-Progress
+* Timer library (like TimerOne, plus input capture, plus ??)
 * Drivers for MT-D21E optional memory devices (SRAM, FLASH, EEPROM)
+* OS X support currently in beta testing
 
+### Possible Future
+* Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
 * USB Host mode CDC ACM (partially complete; BSD-like license?)
 * Features for lower power consumption (library?)
 * Reliability and security enhancements
@@ -753,6 +765,9 @@ The Changelog has moved to a separate file named CHANGELOG. The most recent chan
 
 * Boards Manager must be opened twice to see some updates (only applies to some old IDE versions)
 
+* **Boards manager might not install/uninstall the core or tools properly if the contents of the arduino15 directory has been manually modified**
+  * Be sure to delete all manually installed folders (not just files)
+
 
 ## Bugs or Issues
 
diff --git a/boards.txt b/boards.txt
index 4464f5201..8d71bb7fc 100644
--- a/boards.txt
+++ b/boards.txt
@@ -151,14 +151,34 @@ mattairtech_mt_d21e_revb.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
 mattairtech_mt_d21e_revb.menu.serial.one_uart.build.serialcom_uart=ONE_UART
 mattairtech_mt_d21e_revb.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
 mattairtech_mt_d21e_revb.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.one_uart_one_wire_two_spi=ONE_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.one_uart_one_wire_two_spi.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e_revb.menu.serial.one_uart_one_wire_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.one_uart_one_wire_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.one_uart_two_wire_one_spi=ONE_UART_TWO_WIRE_ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.one_uart_two_wire_one_spi.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e_revb.menu.serial.one_uart_two_wire_one_spi.build.serialcom_wire=TWO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.one_uart_two_wire_one_spi.build.serialcom_spi=ONE_SPI
 mattairtech_mt_d21e_revb.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
 mattairtech_mt_d21e_revb.menu.serial.two_uart.build.serialcom_uart=TWO_UART
 mattairtech_mt_d21e_revb.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
 mattairtech_mt_d21e_revb.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
-mattairtech_mt_d21e_revb.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.three_uart_one_wire_no_spi=THREE_UART_ONE_WIRE_NO_SPI
+mattairtech_mt_d21e_revb.menu.serial.three_uart_one_wire_no_spi.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21e_revb.menu.serial.three_uart_one_wire_no_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.three_uart_one_wire_no_spi.build.serialcom_spi=NO_SPI
+mattairtech_mt_d21e_revb.menu.serial.three_uart_no_wire_one_spi=THREE_UART_NO_WIRE_ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.three_uart_no_wire_one_spi.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21e_revb.menu.serial.three_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.three_uart_no_wire_one_spi.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.four_uart=FOUR_UART_NO_WIRE_NO_SPI
+mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_uart=FOUR_UART
+mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_spi=NO_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart=NO_UART_ONE_WIRE_TWO_SPI
 mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_uart=NO_UART
 mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_spi=TWO_SPI
 mattairtech_mt_d21e_revb.menu.usb.cdc=CDC_ONLY
 mattairtech_mt_d21e_revb.menu.usb.cdc.build.usbcom=CDC_ONLY
 mattairtech_mt_d21e_revb.menu.usb.cdc.build.pid=0x0557
@@ -261,14 +281,34 @@ mattairtech_mt_d21e.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
 mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_uart=ONE_UART
 mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
 mattairtech_mt_d21e.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.one_uart_one_wire_two_spi=ONE_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21e.menu.serial.one_uart_one_wire_two_spi.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e.menu.serial.one_uart_one_wire_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.one_uart_one_wire_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e.menu.serial.one_uart_two_wire_one_spi=ONE_UART_TWO_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.one_uart_two_wire_one_spi.build.serialcom_uart=ONE_UART
+mattairtech_mt_d21e.menu.serial.one_uart_two_wire_one_spi.build.serialcom_wire=TWO_WIRE
+mattairtech_mt_d21e.menu.serial.one_uart_two_wire_one_spi.build.serialcom_spi=ONE_SPI
 mattairtech_mt_d21e.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
 mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_uart=TWO_UART
 mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
 mattairtech_mt_d21e.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
-mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.three_uart_one_wire_no_spi=THREE_UART_ONE_WIRE_NO_SPI
+mattairtech_mt_d21e.menu.serial.three_uart_one_wire_no_spi.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21e.menu.serial.three_uart_one_wire_no_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.three_uart_one_wire_no_spi.build.serialcom_spi=NO_SPI
+mattairtech_mt_d21e.menu.serial.three_uart_no_wire_one_spi=THREE_UART_NO_WIRE_ONE_SPI
+mattairtech_mt_d21e.menu.serial.three_uart_no_wire_one_spi.build.serialcom_uart=THREE_UART
+mattairtech_mt_d21e.menu.serial.three_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e.menu.serial.three_uart_no_wire_one_spi.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.four_uart=FOUR_UART_NO_WIRE_NO_SPI
+mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_uart=FOUR_UART
+mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_spi=NO_SPI
+mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_TWO_SPI
 mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_uart=NO_UART
 mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=TWO_SPI
 mattairtech_mt_d21e.menu.usb.cdc=CDC_ONLY
 mattairtech_mt_d21e.menu.usb.cdc.build.usbcom=CDC_ONLY
 mattairtech_mt_d21e.menu.usb.cdc.build.pid=0x0557
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
index d4826bba9..1ecc3be07 100644
--- a/variants/MT_D21E/README.md
+++ b/variants/MT_D21E/README.md
@@ -8,17 +8,17 @@ Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     CO
 Xin32                                | A0            RST |                           BOOT
 Xout32                               | A1            NC  |
 DAC                   *            2 | A2            NC  |
-REFA                  *            3 | A3            A31 | 31    *   TCC11         SWDIO*
-REFB                  *      *     4 | A4            A30 | 30    *   TCC10         SWDCLK
+REFA                  *            3 | A3            A31 | 31    *   TCC11   RX3   SWDIO*
+REFB                  *      *     4 | A4            A30 | 30    *   TCC10   TX3   SWDCLK
                       *      *     5 | A5            NC  |
                       *            6 | A6            A28 | 28    *                   LED
 VM                    *            7 | A7            A27 | 27    *                   BTNA
-             TCC00    *     NMI    8 | A8            A23 | 23    *   TC41     SS
-             TCC01    *      *     9 | A9            A22 | 22    *   TC40     MISO
-       TX1   TCC02    *           10 | A10           A19 | 19    *            SCK
-       RX1   TCC03    *           11 | A11           A18 | 18    *            MOSI
-       TX2   TC30            *    14 | A14           A17 | 17    *   TCC21    SCL
-       RX2   TC31                 15 | A15           A16 | 16    *   TCC20    SDA
+  SDA1/MISO1  TCC00   *     NMI    8 | A8            A23 | 23    *   TC41     SS
+   SCL1/SS1   TCC01   *      *     9 | A9            A22 | 22    *   TC40     MISO
+      TX1     TCC02   *           10 | A10           A19 | 19    *            SCK
+      RX1     TCC03   *           11 | A11           A18 | 18    *            MOSI
+   TX2/MOSI1   TC30          *    14 | A14           A17 | 17    *   TCC21    SCL/RX4
+    RX2/SCK1   TC31               15 | A15           A16 | 16    *   TCC20    SDA/TX4
                                      | NC            NC  |
                                      | NC            NC  |
                                      | Vbus          3.3V|   * Button B available on 31.
@@ -48,30 +48,30 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 5	| A5	| PA05	|			| EIC/EXTINT[5] ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1]
 6	| A6	| PA06	|			| !EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0]
 7	| A7	| PA07	| Voltage Divider	| !EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
-8	| A8	| PA08	|			| EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
-9	| A9	| PA09	|			| EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
+8	| A8	| PA08	| SDA1/MISO1		| EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
+9	| A9	| PA09	| SCL1/SS1		| EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
 10	| A10	| PA10	| TX1			| !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
 11	| A11	| PA11	| RX1			| !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
 12	| ---	| ----	| NOT A PIN		| NOT A PIN
 13	| ---	| ----	| NOT A PIN		| NOT A PIN
-14	| A14	| PA14	| Xin, TX2		| EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
-15	| A15	| PA15	| Xout, RX2		| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
-16	| A16	| PA16	| I2C/SDA w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
-17	| A17	| PA17	| I2C/SCL w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
-18	| A18	| PA18	| SPI MOSI		| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
-19	| A19	| PA19	| SPI SCK		| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
+14	| A14	| PA14	| Xin, TX2/MOSI1	| EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
+15	| A15	| PA15	| Xout, RX2/SCK1	| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
+16	| A16	| PA16	| SDA/TX4 w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
+17	| A17	| PA17	| SCL/RX4 w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
+18	| A18	| PA18	| SPI			| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+19	| A19	| PA19	| SCK			| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
 20	| ---	| ----	| NOT A PIN		| NOT A PIN
 21	| ---	| ----	| NOT A PIN		| NOT A PIN
-22	| A22	| PA22	| SPI MISO		| EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
-23	| A23	| PA23	| SPI SS		| EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
+22	| A22	| PA22	| MISO			| EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
+23	| A23	| PA23	| SS			| EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
 24	| A24-	| PA24	| USB_NEGATIVE		| USB/DM TC5/WO[0]
 25	| A25+	| PA25	| USB_POSITIVE		| USB/DP TC5/WO[1]
 26	| ---	| ----	| NOT A PIN		| NOT A PIN
 27	| A27	| PA27	| Button A		| EIC/EXTINT[15] Button A
 28	| A28	| PA28	| LED			| EIC/EXTINT[8] LED
 29	| ---	| ----	| NOT A PIN		| NOT A PIN
-30	| A30	| PA30	| SWD CLK		| EIC/EXTINT[10] !SERCOM1/PAD[2] TCC1/WO[0] SWD CLK
-31	| A31	| PA31	| Button B / SWD IO	| EIC/EXTINT[11] !SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
+30	| A30	| PA30	| SWDCLK / TX3		| EIC/EXTINT[10] SERCOM1/PAD[2] TCC1/WO[0] SWD CLK, leave floating during boot
+31	| A31	| PA31	| Button B / SWDIO / RX3| EIC/EXTINT[11] SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
 --	| RST	| ----	|			| Reset, BOOT (double tap bootloader entry)
 ============================================================================================================================================
 
@@ -129,9 +129,9 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 
 * **SERCOM**
   * 4 SERCOM are available.
-  * Up to 2 UART instances
-  * 1 SPI instance
-  * 1 WIRE (I2C) instance
+  * Up to 4 UART instances
+  * Up to 2 SPI instances
+  * Up to 2 WIRE (I2C) instances
   * The WIRE pullup resistors are enabled by default.
 
 
diff --git a/variants/MT_D21E/variant.cpp b/variants/MT_D21E/variant.cpp
index 7188cc520..d360c87bd 100644
--- a/variants/MT_D21E/variant.cpp
+++ b/variants/MT_D21E/variant.cpp
@@ -42,8 +42,8 @@ const PinDescription g_APinDescription[]=
 	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE }, // ADC/AIN[5]
 	{ PORTA,  6, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[6]
 	{ PORTA,  7, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
 	
 	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
 	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
@@ -57,9 +57,14 @@ const PinDescription g_APinDescription[]=
 	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // TC3/WO[0], HOST_ENABLE
 	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
 	
-	// 16..17 SERCOM/I2C (Wire) or Digital functions
+	// 16..17 SERCOM/I2C (Wire) or Serial4 or Digital functions
+#if defined(FOUR_UART)
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // TX4: SERCOM3/PAD[0]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // RX4: SERCOM3/PAD[1]
+#else
 	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // SDA: SERCOM1/PAD[0]
 	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // SCL: SERCOM1/PAD[1]
+#endif
 	
 	// 18..23 - SERCOM/SPI (SPI) or Digital functions (pins 20..21 do not exist)
 	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
@@ -80,8 +85,8 @@ const PinDescription g_APinDescription[]=
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH0, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK
-	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC1_CH1, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC1_CH0, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK / TX3
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC1_CH1, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO / RX3
 } ;
 
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
@@ -92,7 +97,7 @@ SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 SERCOM sercom3( SERCOM3 ) ;
 
-#if defined(ONE_UART) || defined(TWO_UART)
+#if defined(ONE_UART) || defined(TWO_UART) || defined(THREE_UART) || defined(FOUR_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
 void SERCOM0_Handler()
@@ -101,7 +106,7 @@ void SERCOM0_Handler()
 }
 #endif
 
-#if defined(TWO_UART)
+#if defined(TWO_UART) || defined(THREE_UART) || defined(FOUR_UART)
 Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
 void SERCOM2_Handler()
@@ -109,3 +114,21 @@ void SERCOM2_Handler()
   Serial2.IrqHandler();
 }
 #endif
+
+#if defined(THREE_UART) || defined(FOUR_UART)
+Uart Serial3( SERCOM_INSTANCE_SERIAL3, PIN_SERIAL3_RX, PIN_SERIAL3_TX, PAD_SERIAL3_RX, PAD_SERIAL3_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial3.IrqHandler();
+}
+#endif
+
+#if defined(FOUR_UART)
+Uart Serial4( SERCOM_INSTANCE_SERIAL4, PIN_SERIAL4_RX, PIN_SERIAL4_TX, PAD_SERIAL4_RX, PAD_SERIAL4_TX ) ;
+
+void SERCOM3_Handler()
+{
+  Serial4.IrqHandler();
+}
+#endif
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index c99e633b8..740949fdd 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -200,11 +200,31 @@ static const uint8_t ATN = PIN_ATN;
 
 #define SERCOM_INSTANCE_SERIAL2       &sercom2
 
+// Serial3
+#define PIN_SERIAL3_RX       (31ul)
+#define PIN_SERIAL3_TX       (30ul)
+#define PAD_SERIAL3_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL3_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL3       &sercom1
+
+// Serial4
+#define PIN_SERIAL4_RX       (17ul)
+#define PIN_SERIAL4_TX       (16ul)
+#define PAD_SERIAL4_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL4_RX       (SERCOM_RX_PAD_1)
+
+#define SERCOM_INSTANCE_SERIAL4       &sercom3
+
 
 /*
  * SPI Interfaces
  */
+#if defined(TWO_SPI)
+#define SPI_INTERFACES_COUNT 2
+#else
 #define SPI_INTERFACES_COUNT 1
+#endif
 
 #define PIN_SPI_MISO         (22u)
 #define PIN_SPI_MOSI         (18u)
@@ -219,11 +239,28 @@ static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
+#define PIN_SPI1_MISO         (8u)
+#define PIN_SPI1_MOSI         (14u)
+#define PIN_SPI1_SCK          (15u)
+#define PIN_SPI1_SS           (9u)
+#define PERIPH_SPI1           sercom2
+#define PAD_SPI1_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI1_RX           SERCOM_RX_PAD_0
+
+static const uint8_t SS1   = PIN_SPI1_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI1 = PIN_SPI1_MOSI ;
+static const uint8_t MISO1 = PIN_SPI1_MISO ;
+static const uint8_t SCK1  = PIN_SPI1_SCK ;
+
 
 /*
  * Wire Interfaces
  */
+#if defined(TWO_WIRE)
+#define WIRE_INTERFACES_COUNT 2
+#else
 #define WIRE_INTERFACES_COUNT 1
+#endif
 
 #define PIN_WIRE_SDA         (16u)
 #define PIN_WIRE_SCL         (17u)
@@ -233,6 +270,14 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
+#define PIN_WIRE1_SDA         (8u)
+#define PIN_WIRE1_SCL         (9u)
+#define PERIPH_WIRE1          sercom2
+#define WIRE1_IT_HANDLER      SERCOM2_Handler
+
+static const uint8_t SDA1 = PIN_WIRE1_SDA;
+static const uint8_t SCL1 = PIN_WIRE1_SCL;
+
 
 /*
  * USB
diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
index 5f28f2e48..0484e1a51 100644
--- a/variants/MT_D21E_revB/README.md
+++ b/variants/MT_D21E_revB/README.md
@@ -8,17 +8,17 @@ Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     CO
 XI32(+)                              | A0            RST |                        BOOT(+)
 XO32(+)                              | A1            Gnd |
 DAC                   *            2 | A2           Vbat |
-REFA                  *            3 | A3            A31 | 31    *                IO/B(+)
-REFB                  *      *     4 | A4            A30 | 30    *                 CLK(+)
+REFA                  *            3 | A3            A31 | 31    *           RX3  IO/B(+)
+REFB                  *      *     4 | A4            A30 | 30    *           TX3   CLK(+)
 DAC1(L)               *      *     5 | A5            NC  |
-LED(+)       TCC10    *            6 | A6       A28 (D/C)| 28    *
-VM           TCC11    *            7 | A7            A27 | 27    *               A/CS(+M)
-             TCC00    *     NMI    8 | A8            A23 | 23    * TC41/TC01~ SS
-             TCC01    *      *     9 | A9            A22 | 22    * TC40/TC00~ MISO(+M)
-       TX1   TCC02    *           10 | A10           A19 | 19    *            SCK(+M)
-       RX1   TCC03    *           11 | A11           A18 | 18    *            MOSI(+M)
-       TX2 TC30/TC40~        *    14 | A14           A17 | 17    *   TCC21    SCL(+)
-       RX2 TC31/TC41~             15 | A15           A16 | 16    *   TCC20    SDA(+)
+LED(+)        TCC10   *            6 | A6       A28 (D/C)| 28    *
+VM            TCC11   *            7 | A7            A27 | 27    *               A/CS(+M)
+  SDA1/MISO1  TCC00   *     NMI    8 | A8            A23 | 23    * TC41/TC01~ SS
+   SCL1/SS1   TCC01   *      *     9 | A9            A22 | 22    * TC40/TC00~ MISO(+M)
+      TX1     TCC02   *           10 | A10           A19 | 19    *            SCK(+M)
+      RX1     TCC03   *           11 | A11           A18 | 18    *            MOSI(+M)
+  TX2/MOSI1 TC30/TC40~       *    14 | A14           A17 | 17    *   TCC21    SCL/RX4(+)
+   RX2/SCK1 TC31/TC41~            15 | A15           A16 | 16    *   TCC20    SDA/TX4(+)
                                      | NC            NC  |
      M=Memory device installed       | NC            NC  | ! Vcc is 3.3V by default.
                                      | Vbus          3.3V|   DO NOT exceed 3.6V on Vcc or
@@ -60,30 +60,30 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 5	| A5	| PA05	| DAC1(L21)		| EIC/EXTINT[5] ADC/AIN[5] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[1] !TCC0/WO[1] DAC1(L21)
 6	| A6	| PA06	| LED			| !EIC/EXTINT[6] ADC/AIN[6] AC/AIN[2] PTC/Y[4] !SERCOM0/PAD[2] !TCC1/WO[0] LED
 7	| A7	| PA07	| Voltage Measurement	| !EIC/EXTINT[7] ADC/AIN[7] AC/AIN[3] PTC/Y[5] !SERCOM0/PAD[3] !TCC1/WO[1]
-8	| A8	| PA08	|			| EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] !SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
-9	| A9	| PA09	|			| EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] !SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
+8	| A8	| PA08	| SDA1/MISO1		| EIC/NMI ADC/AIN[16] PTC/X[0] !SERCOM0/PAD[0] SERCOM2/PAD[0] TCC0/WO[0] !TCC1/WO[2]
+9	| A9	| PA09	| SCL1/SS1		| EIC/EXTINT[9] ADC/AIN[17] PTC/X[1] !SERCOM0/PAD[1] SERCOM2/PAD[1] TCC0/WO[1] !TCC1/WO[3]
 10	| A10	| PA10	| TX1			| !EIC/EXTINT[10] ADC/AIN[18] PTC/X[2] SERCOM0/PAD[2] !SERCOM2/PAD[2] !TCC1/WO[0] TCC0/WO[2]
 11	| A11	| PA11	| RX1			| !EIC/EXTINT[11] ADC/AIN[19] PTC/X[3] SERCOM0/PAD[3] !SERCOM2/PAD[3] !TCC1/WO[1] TCC0/WO[3]
 12	| ---	| ----	| NOT A PIN		| NOT A PIN
 13	| ---	| ----	| NOT A PIN		| NOT A PIN
-14	| A14	| PA14	| Xin, TX2		| EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
-15	| A15	| PA15	| Xout, RX2		| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
-16	| A16	| PA16	| I2C/SDA w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] !SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
-17	| A17	| PA17	| I2C/SCL w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] !SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
-18	| A18	| PA18	| SPI MOSI		| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
-19	| A19	| PA19	| SPI SCK		| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
+14	| A14	| PA14	| Xin, TX2/MOSI1	| EIC/EXTINT[14] SERCOM2/PAD[2] TC3/WO[0] !TCC0/WO[4] Xin, HOST_ENABLE
+15	| A15	| PA15	| Xout, RX2/SCK1	| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
+16	| A16	| PA16	| SDA/TX4 w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
+17	| A17	| PA17	| SCL/RX4 w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
+18	| A18	| PA18	| SPI			| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+19	| A19	| PA19	| SCK			| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
 20	| ---	| ----	| NOT A PIN		| NOT A PIN
 21	| ---	| ----	| NOT A PIN		| NOT A PIN
-22	| A22	| PA22	| SPI MISO		| EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
-23	| A23	| PA23	| SPI SS		| EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
+22	| A22	| PA22	| MISO			| EIC/EXTINT[6] PTC/X[10] SERCOM3/PAD[0] TC4/WO[0] !TCC0/WO[4]
+23	| A23	| PA23	| SS			| EIC/EXTINT[7] PTC/X[11] SERCOM3/PAD[1] TC4/WO[1] !TCC0/WO[5]
 24	| A24-	| PA24	| USB_NEGATIVE		| USB/DM TC5/WO[0]
 25	| A25+	| PA25	| USB_POSITIVE		| USB/DP TC5/WO[1]
 26	| ---	| ----	| NOT A PIN		| NOT A PIN
 27	| A27	| PA27	| A/CS			| EIC/EXTINT[15] A/CS (Jumper A / memory device chip select)
 28	| A28	| PA28	|			| EIC/EXTINT[8]
 29	| ---	| ----	| NOT A PIN		| NOT A PIN
-30	| A30	| PA30	| SWD CLK		| EIC/EXTINT[10] !SERCOM1/PAD[2] TCC1/WO[0] SWD CLK, leave floating during boot
-31	| A31	| PA31	| Button B / SWD IO	| EIC/EXTINT[11] !SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
+30	| A30	| PA30	| SWDCLK / TX3		| EIC/EXTINT[10] SERCOM1/PAD[2] TCC1/WO[0] SWD CLK, leave floating during boot
+31	| A31	| PA31	| Button B / SWDIO / RX3| EIC/EXTINT[11] SERCOM1/PAD[3] TCC1/WO[1] Button B SWD IO
 --	| RST	| ----	|			| Reset, BOOT (double tap bootloader entry)
 ============================================================================================================================================
 
@@ -147,9 +147,9 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 
 * **SERCOM**
   * 4 SERCOM are available.
-  * Up to 2 UART instances
-  * 1 SPI instance
-  * 1 WIRE (I2C) instance
+  * Up to 4 UART instances
+  * Up to 2 SPI instances
+  * Up to 2 WIRE (I2C) instances
   * The WIRE pullup resistors are enabled by default.
 
 
diff --git a/variants/MT_D21E_revB/variant.cpp b/variants/MT_D21E_revB/variant.cpp
index c0212735f..fbccb2739 100644
--- a/variants/MT_D21E_revB/variant.cpp
+++ b/variants/MT_D21E_revB/variant.cpp
@@ -47,16 +47,16 @@ const PinDescription g_APinDescription[]=
 	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[6], LED
 #if (SAMD)
 	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
 #elif (SAML)
 	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
 #elif (SAMC)
 	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel10, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel11, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel10, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel11, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
 #endif
 	
 	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
@@ -84,9 +84,14 @@ const PinDescription g_APinDescription[]=
 	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
 #endif
 	
-	// 16..17 SERCOM/I2C (Wire) or Digital functions
+	// 16..17 SERCOM/I2C (Wire) or Serial4 or Digital functions
+#if defined(FOUR_UART)
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // TX4: SERCOM3/PAD[0]
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // RX4: SERCOM3/PAD[1]
+#else
 	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // SDA: SERCOM1/PAD[0]
 	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // SCL: SERCOM1/PAD[1]
+#endif
 	
 	// 18..23 - SERCOM/SPI (SPI) or Digital functions (pins 20..21 do not exist)
 	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
@@ -121,8 +126,8 @@ const PinDescription g_APinDescription[]=
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK
-	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG), (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK / TX3
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO / RX3
 } ;
 
 #if (SAMD)
@@ -141,7 +146,7 @@ SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 #endif
 
-#if defined(ONE_UART) || defined(TWO_UART)
+#if defined(ONE_UART) || defined(TWO_UART) || defined(THREE_UART) || defined(FOUR_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
 void SERCOM0_Handler()
@@ -150,7 +155,7 @@ void SERCOM0_Handler()
 }
 #endif
 
-#if defined(TWO_UART)
+#if defined(TWO_UART) || defined(THREE_UART) || defined(FOUR_UART)
 Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
 void SERCOM2_Handler()
@@ -158,3 +163,21 @@ void SERCOM2_Handler()
   Serial2.IrqHandler();
 }
 #endif
+
+#if defined(THREE_UART) || defined(FOUR_UART)
+Uart Serial3( SERCOM_INSTANCE_SERIAL3, PIN_SERIAL3_RX, PIN_SERIAL3_TX, PAD_SERIAL3_RX, PAD_SERIAL3_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial3.IrqHandler();
+}
+#endif
+
+#if defined(FOUR_UART)
+Uart Serial4( SERCOM_INSTANCE_SERIAL4, PIN_SERIAL4_RX, PIN_SERIAL4_TX, PAD_SERIAL4_RX, PAD_SERIAL4_TX ) ;
+
+void SERCOM3_Handler()
+{
+  Serial4.IrqHandler();
+}
+#endif
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
index b383815a7..ced2e0281 100644
--- a/variants/MT_D21E_revB/variant.h
+++ b/variants/MT_D21E_revB/variant.h
@@ -214,11 +214,31 @@ static const uint8_t ATN = PIN_ATN;
 
 #define SERCOM_INSTANCE_SERIAL2       &sercom2
 
+// Serial3
+#define PIN_SERIAL3_RX       (31ul)
+#define PIN_SERIAL3_TX       (30ul)
+#define PAD_SERIAL3_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL3_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL3       &sercom1
+
+// Serial4
+#define PIN_SERIAL4_RX       (17ul)
+#define PIN_SERIAL4_TX       (16ul)
+#define PAD_SERIAL4_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL4_RX       (SERCOM_RX_PAD_1)
+
+#define SERCOM_INSTANCE_SERIAL4       &sercom3
+
 
 /*
  * SPI Interfaces
  */
+#if defined(TWO_SPI)
+#define SPI_INTERFACES_COUNT 2
+#else
 #define SPI_INTERFACES_COUNT 1
+#endif
 
 #define PIN_SPI_MISO         (22u)
 #define PIN_SPI_MOSI         (18u)
@@ -233,11 +253,28 @@ static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
+#define PIN_SPI1_MISO         (8u)
+#define PIN_SPI1_MOSI         (14u)
+#define PIN_SPI1_SCK          (15u)
+#define PIN_SPI1_SS           (9u)
+#define PERIPH_SPI1           sercom2
+#define PAD_SPI1_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI1_RX           SERCOM_RX_PAD_0
+
+static const uint8_t SS1   = PIN_SPI1_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI1 = PIN_SPI1_MOSI ;
+static const uint8_t MISO1 = PIN_SPI1_MISO ;
+static const uint8_t SCK1  = PIN_SPI1_SCK ;
+
 
 /*
  * Wire Interfaces
  */
+#if defined(TWO_WIRE)
+#define WIRE_INTERFACES_COUNT 2
+#else
 #define WIRE_INTERFACES_COUNT 1
+#endif
 
 #define PIN_WIRE_SDA         (16u)
 #define PIN_WIRE_SCL         (17u)
@@ -247,6 +284,14 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
+#define PIN_WIRE1_SDA         (8u)
+#define PIN_WIRE1_SCL         (9u)
+#define PERIPH_WIRE1          sercom2
+#define WIRE1_IT_HANDLER      SERCOM2_Handler
+
+static const uint8_t SDA1 = PIN_WIRE1_SDA;
+static const uint8_t SCL1 = PIN_WIRE1_SCL;
+
 
 /*
  * USB

From 0cca97cddf0eaf524f96d056c43474dc87e711be Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Mon, 22 May 2017 06:24:55 +0000
Subject: [PATCH 093/124] Fixed bootloader compilation on Windows.
 Documentation updates.

---
 CHANGELOG                  |  3 ++-
 README.md                  |  7 ++++---
 bootloaders/zero/Makefile  |  8 ++++++--
 bootloaders/zero/README.md | 32 +++++++++++++++++++-------------
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d2637a29d..56ff3407f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,9 @@
-1.6.8-beta-b2:
+1.6.8-beta-b2 (in-progress):
 * Added more Serial, SPI, and WIRE options
 * Added MicroSD card firmware loading in the bootloader
 * Fixed SDU library to work with MattairTech boards
 * Fixed auto-detection for Arduino Zero and M0 board variants
+* Fixed bootloader compilation on Windows
 * Documentation updates
 * Merged in changes from upstream SAMD CORE 1.6.15:
   * 
diff --git a/README.md b/README.md
index 708aac865..8eff5976b 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,8 @@ Analog Outputs	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)
 PWM Outputs	| 18					| 14					| 14					| 8 (6 for 14-pin)
 Interrupts	| 16					| 16					| 16					| 8 (7 for 14-pin)
 USB		| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device
-SERCOM*		| 6					| 6					| 4					| 3 (2 for 14-pin)
-UART (Serial)*	| Up to 6				| Up to 6				| Up to 4				| Up to 2
+SERCOM*		| 6					| 6					| 4 (6 for L21)				| 3 (2 for 14-pin)
+UART (Serial)*	| Up to 6				| Up to 6				| Up to 4 (up to 5 for L21)		| Up to 2
 SPI*		| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2C (WIRE)*	| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2S		| Present on the D21 only		| Present on the D21 only		| Present on the D21 only		| Not present
@@ -306,6 +306,7 @@ TODO: more info
 * On the L21, SERCOM5 is in a low power domain. The Fm+ and HS modes of I2C (wire) are not supported.
 * The SAML and SAMC have double-buffered TCs, which are supported in the core.
 * The CHANGE and RISING interrupt modes on pin A31 do not seem to work properly on the L21.
+* When using pin A31 as UART RX, in Arduino, pinMode(31, INPUT_PULLUP) must be called before SerialX.begin().
 * The L21 has two performance levels that affect power consumption. During powerup, the L21 starts at the lowest performance level (PL0).
   The startup code changes to the highest performance level (PL2) in order to support 48MHz and USB (among other things).
 * Two Flash Wait States are inserted for the L21 and C21 (the D21/D11 use one wait state).
@@ -475,7 +476,7 @@ OS X support currently in beta (see below), the following instructions are only
 3. Click the button next to Additional Boards Manager URLs.
 4. Add https://www.mattairtech.com/software/arduino/package_MattairTech_index.json.
 5. Save preferences, then open the Boards Manager.
-6. Install the Arduino SAM M0+ Boards package. Use version 1.6.2 or higher.
+6. Install the Arduino SAMD Boards package. Use version 1.6.2 or higher.
 7. Install the MattairTech SAM M0+ Boards package.
 8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E (or MT-D11).
 9. Select the MCU with the now visible Tools->Microcontroller menu (if present).
diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index df7075a92..daafb888a 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -74,10 +74,12 @@ ifeq ($(OS),Windows_NT)
   ifeq ($(TERM),xterm)
     T=$(shell cygpath -u $(LOCALAPPDATA))
     MODULE_PATH?=$(T)/Arduino15/packages/$(CORE_VENDOR)
+    MODULE_PATH_ARDUINO?=$(T)/Arduino15/packages/arduino
     RM=rm
     SEP=/
   else
     MODULE_PATH?=$(LOCALAPPDATA)/Arduino15/packages/$(CORE_VENDOR)
+    MODULE_PATH_ARDUINO?=$(LOCALAPPDATA)/Arduino15/packages/arduino
     RM=rm
     SEP=\\
   endif
@@ -86,18 +88,20 @@ else
 
   ifeq ($(UNAME_S),Linux)
     MODULE_PATH?=$(HOME)/.arduino15/packages/$(CORE_VENDOR)
+    MODULE_PATH_ARDUINO?=$(HOME)/.arduino15/packages/arduino
     RM=rm
     SEP=/
   endif
 
   ifeq ($(UNAME_S),Darwin)
     MODULE_PATH?=$(HOME)/Library/Arduino15/packages/$(CORE_VENDOR)/
+    MODULE_PATH_ARDUINO?=$(HOME)/Library/Arduino15/packages/arduino/
     RM=rm
     SEP=/
   endif
 endif
 
-ARM_GCC_PATH?=$(MODULE_PATH)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
+ARM_GCC_PATH?=$(MODULE_PATH_ARDUINO)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
 BUILD_PATH=build
 
 # -----------------------------------------------------------------------------
@@ -122,7 +126,7 @@ BIN=$(NAME).bin
 HEX=$(NAME).hex
 
 
-INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/"
+INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/"
 
 # -----------------------------------------------------------------------------
 # Linker options
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index c4f57a7ef..20185491a 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -1,17 +1,14 @@
 # Arduino Zero Bootloader
 
-## Prerequisites for Building
-
-The project build is based on Makefile system.
-Makefile is present at project root and try to handle multi-platform cases.
+This bootloader is based on the Arduino Zero bootloader which is a part of the Arduino SAMD core.
+It provides a USB-CDC and/or TTL serial communications interface to a host running the bossac
+command-line firmware programming utility (or Bossa with a GUI). This version adds support for
+the L21 and C21 microcontrollers. It also adds support for four different clock sources (2 external
+crystals and two internal oscillator options). There are additional boards added, and binaries for
+most board/chip combinations are pre-built. Additionally, MicroSD firmware loading is supported.
 
-Multi-plaform GCC is provided by ARM here: https://launchpad.net/gcc-arm-embedded/+download
 
-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.
+## Prerequisites for Using
 
 This version of the bootloader requires bossac (1.7.0-mattairtech-1)
 from the package "MattairTech SAM M0+ Boards" or download bossac directly:
@@ -19,18 +16,27 @@ from the package "MattairTech SAM M0+ Boards" or download bossac directly:
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
+Note that the SAM-BA tools from Atmel will not work, and the version of bossac from the Arduino
+SAMD Core currently does not support the L21, C21, or D11 (but it does support the D21).
+
+
+## Prerequisites for Building
+
+For all builds and platforms you will need to have the Arduino IDE installed as well as the packages
+for both Arduino SAMD Boards and for MattairTech SAM M0+ Boards, which provides the needed dependencies
+(CMSIS, CMSIS-Atmel, and the compiler toolchain: arm-none-eabi-gcc), which can be installed using the
+Arduino IDE Boards Manager. This project uses a Makefile, which is present in the root (zero) directory.
+However, you will need a make program:
 
 ### Windows
 
 * Native command line
 Make binary can be obtained here: http://gnuwin32.sourceforge.net/packages/make.htm
+Be sure that no other version of make is in your PATH (ie: MinGW).
 
 * Cygwin/MSys/MSys2/Babun/etc...
 It is available natively in all distributions.
 
-* Atmel Studio
-An Atmel Studio **7** Makefile-based project is present at project root, just open samd21_sam_ba.atsln file in AS7.
-
 ### Linux
 
 Make is usually available by default.

From 41e9022f7756c1184582ad20eec791df4e05e3dd Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Wed, 21 Jun 2017 09:12:25 +0000
Subject: [PATCH 094/124] Added SD Card support to bootloader. New binaries.

---
 bootloaders/zero/Makefile                     |   25 +-
 bootloaders/zero/README.md                    |  676 ++++++++--
 bootloaders/zero/SDCard/00readme.txt          |   46 +
 bootloaders/zero/SDCard/diskio.h              |   92 ++
 bootloaders/zero/SDCard/integer.h             |   33 +
 bootloaders/zero/SDCard/mmcbbp.c              |  277 +++++
 bootloaders/zero/SDCard/pff.c                 | 1108 +++++++++++++++++
 bootloaders/zero/SDCard/pff.h                 |  159 +++
 bootloaders/zero/SDCard/pffconf.h             |   97 ++
 bootloaders/zero/SDCard/sdBootloader.c        |  111 ++
 bootloaders/zero/SDCard/sdBootloader.h        |   45 +
 bootloaders/zero/binaries/README.md           |   63 +-
 .../sam_ba_Generic_D11C14A_SAMD11C14A.bin     |  Bin 3896 -> 3872 bytes
 .../sam_ba_Generic_D11D14AM_SAMD11D14AM.bin   |  Bin 3896 -> 3872 bytes
 .../sam_ba_Generic_D11D14AS_SAMD11D14AS.bin   |  Bin 3896 -> 3872 bytes
 .../sam_ba_Generic_x21E_SAMC21E15A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMC21E16A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMC21E17A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMC21E18A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMD21E15A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAMD21E16A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAMD21E17A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAMD21E18A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAML21E15B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21E_SAML21E16B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21E_SAML21E17B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21E_SAML21E18B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21G_SAMC21G15A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMC21G16A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMC21G17A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMC21G18A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMD21G15A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAMD21G16A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAMD21G17A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAMD21G18A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAML21G16B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21G_SAML21G17B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21G_SAML21G18B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21J_SAMC21J15A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMC21J16A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMC21J17A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMC21J18A.bin        |  Bin 3816 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMD21J15A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAMD21J16A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAMD21J17A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAMD21J18A.bin        |  Bin 5196 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAML21J16B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21J_SAML21J17B.bin        |  Bin 5140 -> 4964 bytes
 .../sam_ba_Generic_x21J_SAML21J18B.bin        |  Bin 5140 -> 4964 bytes
 .../binaries/sam_ba_MT_D11_SAMD11D14AM.bin    |  Bin 4072 -> 4036 bytes
 .../sam_ba_MT_D21E_rev_A_SAMD21E17A.bin       |  Bin 5372 -> 5204 bytes
 .../sam_ba_MT_D21E_rev_A_SAMD21E18A.bin       |  Bin 5372 -> 5204 bytes
 .../sam_ba_MT_D21E_rev_B_SAMC21E18A.bin       |  Bin 3984 -> 3888 bytes
 .../sam_ba_MT_D21E_rev_B_SAMD21E17A.bin       |  Bin 5368 -> 5196 bytes
 .../sam_ba_MT_D21E_rev_B_SAMD21E18A.bin       |  Bin 5368 -> 5196 bytes
 .../sam_ba_MT_D21E_rev_B_SAML21E18B.bin       |  Bin 5312 -> 5132 bytes
 .../binaries/sam_ba_arduino_m0_SAMD21G18A.bin |  Bin 5468 -> 5196 bytes
 .../sam_ba_arduino_m0_pro_SAMD21G18A.bin      |  Bin 6604 -> 6304 bytes
 .../sam_ba_arduino_mkr1000_SAMD21G18A.bin     |  Bin 6484 -> 6192 bytes
 .../sam_ba_arduino_mkrzero_SAMD21G18A.bin     |  Bin 6488 -> 6296 bytes
 .../sam_ba_arduino_zero_SAMD21G18A.bin        |  Bin 6584 -> 6288 bytes
 .../sam_ba_genuino_mkr1000_SAMD21G18A.bin     |  Bin 6484 -> 6288 bytes
 .../sam_ba_genuino_zero_SAMD21G18A.bin        |  Bin 6584 -> 6288 bytes
 ...m_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin |  Bin 0 -> 4044 bytes
 ...ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin |  Bin 0 -> 4044 bytes
 ...ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin |  Bin 0 -> 4044 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E15B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E16B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E17B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E18B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAML21G16B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21G_SAML21G17B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21G_SAML21G18B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin |  Bin 0 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin |  Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAML21J16B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21J_SAML21J17B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21J_SAML21J18B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_MT_D11_SAMD11D14AM.bin      |  Bin 0 -> 4044 bytes
 ...sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin |  Bin 0 -> 8128 bytes
 ...sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin |  Bin 0 -> 8128 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin |  Bin 0 -> 6820 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin |  Bin 0 -> 8116 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin |  Bin 0 -> 8116 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin |  Bin 0 -> 8056 bytes
 .../sam_ba_sdcard_arduino_m0_SAMD21G18A.bin   |  Bin 0 -> 8120 bytes
 ...am_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin |  Bin 0 -> 8124 bytes
 ...m_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin |  Bin 0 -> 8048 bytes
 ...m_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin |  Bin 0 -> 8112 bytes
 .../sam_ba_sdcard_arduino_zero_SAMD21G18A.bin |  Bin 0 -> 8108 bytes
 ...m_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin |  Bin 0 -> 8108 bytes
 .../sam_ba_sdcard_genuino_zero_SAMD21G18A.bin |  Bin 0 -> 8108 bytes
 bootloaders/zero/board_definitions.h          |   70 +-
 .../board_definitions_Generic_D11C14A.h       |  177 ++-
 .../board_definitions_Generic_D11D14AM.h      |  177 ++-
 .../board_definitions_Generic_D11D14AS.h      |  177 ++-
 .../board_definitions_Generic_x21E.h          |  179 ++-
 .../board_definitions_Generic_x21G.h          |  179 ++-
 .../board_definitions_Generic_x21J.h          |  179 ++-
 .../board_definitions_MT_D11.h                |  161 ++-
 .../board_definitions_MT_D21E_rev_A.h         |  159 ++-
 .../board_definitions_MT_D21E_rev_B.h         |  159 ++-
 .../board_definitions_arduino_m0.h            |  172 ++-
 .../board_definitions_arduino_m0_pro.h        |  176 ++-
 .../board_definitions_arduino_mkr1000.h       |  159 ++-
 .../board_definitions_arduino_mkrzero.h       |  167 ++-
 .../board_definitions_arduino_zero.h          |  176 ++-
 .../board_definitions_genuino_mkr1000.h       |  164 ++-
 .../board_definitions_genuino_zero.h          |  176 ++-
 bootloaders/zero/board_driver_led.c           |   14 +-
 bootloaders/zero/board_driver_led.h           |   14 +-
 bootloaders/zero/board_driver_serial.c        |    2 +
 bootloaders/zero/board_driver_serial.h        |   13 +-
 bootloaders/zero/board_driver_usb.c           |   30 +-
 bootloaders/zero/board_driver_usb.h           |    1 +
 bootloaders/zero/board_init.c                 |   24 +-
 bootloaders/zero/build_all_bootloaders.sh     |  193 ++-
 .../bootloader_sam_m0p_128KB.ld               |    6 +-
 .../linker_scripts/bootloader_sam_m0p_16KB.ld |    6 +-
 .../bootloader_sam_m0p_256KB.ld               |    6 +-
 .../linker_scripts/bootloader_sam_m0p_32KB.ld |    6 +-
 .../linker_scripts/bootloader_sam_m0p_64KB.ld |    6 +-
 bootloaders/zero/main.c                       |  198 ++-
 bootloaders/zero/sam_ba_monitor.c             |   99 +-
 bootloaders/zero/sam_ba_monitor.h             |    1 +
 bootloaders/zero/sam_ba_serial.c              |   52 +-
 bootloaders/zero/sam_ba_serial.h              |    1 +
 bootloaders/zero/samd21_sam_ba.atsln          |   22 -
 bootloaders/zero/samd21_sam_ba.cproj          |  218 ----
 bootloaders/zero/util.c                       |  193 +++
 bootloaders/zero/util.h                       |   47 +
 153 files changed, 5709 insertions(+), 982 deletions(-)
 create mode 100644 bootloaders/zero/SDCard/00readme.txt
 create mode 100644 bootloaders/zero/SDCard/diskio.h
 create mode 100644 bootloaders/zero/SDCard/integer.h
 create mode 100644 bootloaders/zero/SDCard/mmcbbp.c
 create mode 100644 bootloaders/zero/SDCard/pff.c
 create mode 100644 bootloaders/zero/SDCard/pff.h
 create mode 100644 bootloaders/zero/SDCard/pffconf.h
 create mode 100644 bootloaders/zero/SDCard/sdBootloader.c
 create mode 100644 bootloaders/zero/SDCard/sdBootloader.h
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E15B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E16B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E17B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E18B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G16B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G17B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G18B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J16B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J17B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J18B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D11_SAMD11D14AM.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_arduino_zero_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_genuino_zero_SAMD21G18A.bin
 delete mode 100644 bootloaders/zero/samd21_sam_ba.atsln
 delete mode 100644 bootloaders/zero/samd21_sam_ba.cproj
 create mode 100644 bootloaders/zero/util.c
 create mode 100644 bootloaders/zero/util.h

diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index daafb888a..7633233b7 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -18,6 +18,11 @@
 
 # Begin Config ###############################
 
+# -----------------------------------------------------------------------------
+# SD Card support. This can also be set in the relevant board_definitions file.
+# SDCARD_DISABLED, SDCARD_ENABLED
+SDCARD?=SDCARD_DISABLED
+
 # -----------------------------------------------------------------------------
 # Boards definitions:
 # MT_D21E_rev_A, MT_D21E_rev_B, MT_D11
@@ -44,7 +49,11 @@ MCU?=SAMD21E18A
 
 # End Config ###############################
 
+ifeq ($(findstring ENABLED,$(SDCARD)),ENABLED)
+NAME=sam_ba_sdcard_$(BOARD_ID)_$(MCU)
+else
 NAME=sam_ba_$(BOARD_ID)_$(MCU)
+endif
 
 ifeq ($(findstring 18,$(MCU)),18)
 FLASHSIZE=256KB
@@ -113,7 +122,8 @@ SIZE=$(ARM_GCC_PATH)size
 
 # -----------------------------------------------------------------------------
 # Compiler options
-CFLAGS_EXTRA=-D__$(MCU)__ -DBOARD_ID_$(BOARD_ID)
+# eliminate PARANOIA define to save a tiny amount of code (~40B)
+CFLAGS_EXTRA=-D$(SDCARD) -D__$(MCU)__ -DBOARD_ID_$(BOARD_ID) -DPARANOIA
 CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_PATH)/%.lst)
 ifdef DEBUG
   CFLAGS+=-g3 -O1 -DDEBUG=1
@@ -141,6 +151,10 @@ SOURCES= \
   board_driver_serial.c \
   board_init.c \
   board_startup.c \
+  util.c \
+  SDCard/sdBootloader.c \
+  SDCard/mmcbbp.c \
+  SDCard/pff.c \
   main.c \
   sam_ba_monitor.c \
   sam_ba_serial.c
@@ -152,6 +166,10 @@ SOURCES= \
   board_driver_usb.c \
   board_init.c \
   board_startup.c \
+  util.c \
+  SDCard/sdBootloader.c \
+  SDCard/mmcbbp.c \
+  SDCard/pff.c \
   main.c \
   sam_ba_usb.c \
   sam_ba_cdc.c \
@@ -200,6 +218,7 @@ $(BUILD_PATH):
 	@echo ----------------------------------------------------------
 	@echo Creating build folder
 	-mkdir $(BUILD_PATH)
+	-mkdir $(BUILD_PATH)/SDCard
 
 print_info:
 	@echo ----------------------------------------------------------
@@ -227,14 +246,18 @@ clean: $(AS_CLEAN)
 	@echo Cleaning project
 	-$(RM) $(BIN)
 	-$(RM) $(HEX)
+	-$(RM) $(BUILD_PATH)/SDCard/*.*
 	-$(RM) $(BUILD_PATH)/*.*
+	-rmdir $(BUILD_PATH)/SDCard
 	-rmdir $(BUILD_PATH)
 
 mostly_clean: $(AS_CLEAN)
 	@echo ----------------------------------------------------------
 	@echo Cleaning project except bin
 	-$(RM) $(HEX)
+	-$(RM) $(BUILD_PATH)/SDCard/*.*
 	-$(RM) $(BUILD_PATH)/*.*
+	-rmdir $(BUILD_PATH)/SDCard
 	-rmdir $(BUILD_PATH)
 
 .phony: print_info $(BUILD_PATH)
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index 20185491a..ebd303fcb 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -1,26 +1,314 @@
 # Arduino Zero Bootloader
 
-This bootloader is based on the Arduino Zero bootloader which is a part of the Arduino SAMD core.
-It provides a USB-CDC and/or TTL serial communications interface to a host running the bossac
-command-line firmware programming utility (or Bossa with a GUI). This version adds support for
-the L21 and C21 microcontrollers. It also adds support for four different clock sources (2 external
-crystals and two internal oscillator options). There are additional boards added, and binaries for
-most board/chip combinations are pre-built. Additionally, MicroSD firmware loading is supported.
+This bootloader is based on the Arduino Zero bootloader which is a part of the Arduino SAMD core. It
+provides a USB-CDC and/or TTL serial communications interface to a host running the bossac command
+line firmware programming utility (or the Arduino IDE) running on Windows, Linux, or OS X. Optionally,
+SD Card firmware loading is supported, using SDSC or SDHC cards with a FAT16 or FAT32 filesystem.
+This version adds support for the D11, L21, and C21 microcontrollers. It also adds support for four
+different clock sources (two external crystals and two internal oscillator options). There are
+additional board definitions added, and binaries for most board/chip combinations are pre-built.
+
+## Features
+
+* SAM-BA USB CDC and UART interfaces with optional terminal mode
+* SD Card interface (both USB CDC and SD Card support fits in 8KB)
+* Four different clock sources (two external crystals and two internal oscillator options)
+* Arduino IDE auto-reset and double-tap reset button support
+* Arduino extended commands for faster firmware loading
+* Supports the D21, L21, C21, and D11 SAM M0+ chips
+* Bossac command line utility for Windows, Linux, and OS X
+
+
+## SD Card Support
+
+When SDCARD_ENABLED is defined, SD card bootloader support is compiled in. Support for
+the other interfaces (USB CDC and/or UART) can be compiled in as well. External pins
+can be defined to control the run-time behavior. If the SD bootloader is configured to
+run, it always runs before the other intarfaces. If the SD bootloader does not find
+the appropriate binary file on the SD card (or if the SD card does not exist), then
+the other interface(s), if configured, will activate.
+
+The SD bootloader supports MMCv3, SDv1 (SDSC), and SDv2 (SDSC and SDHC) cards with
+FAT16 and FAT32 filesystem support. The filesystem is mounted read only, with no directory
+support, so the files must be placed in the root directory. Only 8.3 format filenames are
+supported (no long filenames, LFN). After reset, the SPI bus operates at 250KHz. After
+successful sd card initialization, the speed is increased to 6MHz. While the sd bootloader
+is running, the LED, if configured, will PWM fade quickly (~4Hz).
+
+1. The bootloader can be run by Arduino IDE auto-reset, double-tap reset, and/or external
+   pin state. It will run automatically if the first four bytes of FLASH is erased.
+   SDCARD_ENABLED must be defined to compile in SD card bootloader support.
+2. If SDCARD_USE_PIN1 or SDCARD_USE_PIN2 defined, read the pin(s) to determine if the sd
+   bootloader should run (either pin enabled), and which file to load (UPDATE.BIN when
+   PIN1 is enabled, UPDATE2.BIN if PIN2 is enabled). If neither pin is enabled, the
+   enabled SAM-BA interface, if configured, will run. If a SAM-BA interface is not
+   enabled, the LED will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE. If the
+   pins are not defined, then the SD bootloader will always run. The LED, if configured,
+   will PWM fade quickly while the SD bootloader is running.
+3. The SD bootloader initializes the SD card. If successful, it mounts the FAT16 or FAT32
+   volume, if present. It then looks for the appropriate file (UPDATE.BIN or UPDATE2.BIN)
+   in the root directory. If there is no SD card, no FAT16/FAT32 volume, or no file, the
+   SD bootloader will exit, and the enabled SAM-BA interface, if configured, will run. If
+   a SAM-BA interface is not enabled, the LED will blink with status code
+   LED_STATUS_FILE_NOT_FOUND.
+4. If SDCARD_VERIFICATION_DISABLED is not defined, the SD bootloader compares the update
+   file on the SD card with the already installed firmware. If they already match, then
+   the bootloader will jump to the firmware, unless SDCARD_AUTORUN_DISABLED is defined,
+   in which case the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+   If the update file differs from the installed firmware, it continues to step 5.
+5. The application section of the FLASH is erased. The selected update file is written
+   to the FLASH. If the file exceeds the size of the FLASH, the LED will blink with
+   status code LED_STATUS_FILE_TOO_LARGE.
+6. If SDCARD_VERIFICATION_DISABLED is not defined, the SD bootloader verifies the FLASH
+   by re-reading the update file. If the files differ, the application section of the
+   FLASH is erased (so it will never be executed; the bootloader will still run) and the
+   LED will blink with LED_STATUS_VERIFICATION_FAILURE. If verification is successful,
+   the bootloader will jump to the firmware, unless SDCARD_AUTORUN_DISABLED is defined,
+   in which case the LED will blink with status code LED_STATUS_SUCCESS.
+
+
+### SD Card External Pins
+
+If SDCARD_USE_PIN1 is defined, then the SD Card bootloader will run depending
+on the state of an external pin and the value of SDCARD_PIN1_POLARITY. The
+SPI peripheral and SPI pins will only be setup if the SD card bootloader runs.
+
+Pin1            | Action
+----------------|---------------------
+Inactive        | Skip SD bootloader
+Active          | Run SD bootloader
+
+If SDCARD_USE_PIN1 and SDCARD_USE_PIN2 are defined, then the SD Card bootloader
+will run depending on the state of two external pins and the values of
+SDCARD_PIN1_POLARITY and SDCARD_PIN1_POLARITY. The SPI peripheral and pins
+will only be setup if the SD card bootloader runs. Note that if SDCARD_USE_PIN2
+is defined, then SDCARD_USE_PIN1 must also be defined.
+
+Pin1            | Pin2          | Action
+----------------|---------------|-----------------------------------
+Inactive        | Inactive      | Skip SD bootloader
+Active          | Inactive      | Run SD bootloader w/ UPDATE.BIN
+Inactive        | Active        | Run SD bootloader w/ UPDATE2.BIN
+Active          | Active        | Skip SD bootloader
+
+SDCARD_PIN1_POLARITY and SDCARD_PIN2_POLARITY can be set to PIN_POLARITY_ACTIVE_LOW
+or PIN_POLARITY_ACTIVE_HIGH. If polarity is undefined, PIN_POLARITY_ACTIVE_HIGH
+is used.
+
+If neither SDCARD_USE_PIN1 or SDCARD_USE_PIN2 are defined, then the SD Card
+bootloader will always run.
+
+
+## Status LED
+
+When the bootloader is running, and if both BOARD_LED_PIN and BOARD_LED_FADE_ENABLED are
+defined, the LED will PWM fade in an "M-wave" pattern. When the SD bootloader is running,
+the fading will be twice as fast (~4Hz) as the SAM-BA interface (USB CDC or UART at ~2Hz).
+If BOARD_LED_FADE_ENABLED is not defined, the LED will simply turn on.
+
+**Status codes**
+
+Status Code                     | Blink Period  | Description
+--------------------------------|---------------|---------------------------------------
+LED_STATUS_SUCCESS              | 1Hz           | FLASH write success.
+LED_STATUS_FILE_ALREADY_MATCHES | 2Hz           | File already the same.
+LED_STATUS_FILE_NOT_FOUND       | 4Hz           | SD Card or update file not present.
+LED_STATUS_NO_SAM_BA_INTERFACE  | 8Hz           | No SAM-BA interface is available (nothing to do).
+LED_STATUS_FILE_TOO_LARGE       | 16Hz          | Update file exceeds size of application FLASH. Application FLASH erased.
+LED_STATUS_VERIFICATION_FAILURE | 32Hz          | Application FLASH verification failure. Application FLASH erased.
+
+
+## SAM-BA monitor commands
+
+The SAM-BA interface, which is used with both USB CDC and UART,
+can operate in either binary (default) or terminal mode. If
+TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+(add prompt, add \n\r to EOL, format numbers, etc.) will be compiled
+in. To switch to terminal mode, type 'T#' (you should then see a
+prompt). Then, type 'V#' to show version information.
+
+Command | Action                | Argument(s)           | Example
+--------|-----------------------|-----------------------|------------------------
+N       | Set Normal Mode       | No argument           | N#
+T       | Set Terminal Mode     | No argument           | T#
+O       | Write a byte          | Address, Value#       | O200001,CA#
+o       | Read a byte           | Address,#             | o200001,#
+H       | Write a half word     | Address, Value#       | H200002,CAFE#
+h       | Read a half word      | Address,#             | h200002,#
+W       | Write a word          | Address, Value#       | W200000,CAFEDECA#
+w       | Read a word           | Address,#             | w200000,#
+S       | Send a file           | Address,#             | S200000,#
+R       | Receive a file        | Address, NbOfBytes#   | R200000, 1234#
+G       | Go                    | Address#              | G200200#
+V       | Display version       | No argument           | V#
+
+For more information on SAM-BA, see (especially pages 10 and 11): 
+http://www.atmel.com/Images/Atmel-42438-SAM-BA-Overview-and-Customization-Process_ApplicationNote_AT09423.pdf
+
+
+## Bootloader Binaries
+
+The bootloaders/zero/binaries directory contains the SAM-BA m0+
+bootloaders built by the build_all_bootloaders.sh script from
+the 'MattairTech SAM M0+ Boards' Arduino core, which is available
+at https://github.com/mattairtech/ArduinoCore-samd. Each board
+and chip combination has two bootloaders available:
+
+* SAM-BA interface only
+  * USB CDC only for all MattairTech boards
+  * Both USB CDC and UART for most Arduino boards
+  * The Generic board variants minimize external pin usage
+    * Only the SAM-BA interface pins are used (no crystal, LED, etc.)
+  * Filename is: sam_ba_$(BOARD_ID)_$(MCU)
+
+* SAM-BA interface and SD Card interface
+  * USB CDC only for all Arduino and most MattairTech boards
+  * No SAM-BA interface for the D11 chips
+  * All board variants define SDCARD_USE_PIN1 (except D11)
+  * The Generic board variants use the LED
+  * SDCARD_AUTORUN_DISABLED is defined
+  * Filename is: sam_ba_sdcard_$(BOARD_ID)_$(MCU)
+
+
+### MattairTech Boards
+
+MattairTech boards are all configured with only one interface:
+SAM_BA_USBCDC_ONLY (except C21, which uses SAM_BA_UART_ONLY).
+CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_INTERNAL_USB
+(CLOCKCONFIG_INTERNAL for the C21). Only the main LED is defined.
+BOOT_LOAD_PIN is not defined, but BOOT_DOUBLE_TAP_ENABLED is.
+When the SD Card interface is enabled, SDCARD_AUTORUN_DISABLED and
+SDCARD_USE_PIN1 are defined.
+
+### MattairTech/Generic D11 Boards
+
+All boards are configured with only the USB CDC interface, except
+when SDCARD_ENABLED is defined, then only the SD Card interface is
+enabled. ARDUINO_EXTENDED_CAPABILITIES is set to 0 (disabled).
+TERMINAL_MODE_ENABLED is not defined. As of 1.6.8-beta-b2,
+USB_VENDOR_STRINGS_ENABLED is now defined. BOOT_LOAD_PIN is not
+defined, but BOOT_DOUBLE_TAP_ENABLED is. When the SD Card interface is
+enabled, SDCARD_AUTORUN_DISABLED is defined (but not SDCARD_USE_PIN1).
+
+### Arduino/Genuino Boards
+
+Most Arduino/Genuino boards are configured with both interfaces,
+except when SDCARD_ENABLED is defined, then only USB CDC is enabled.
+CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_32768HZ_CRYSTAL.
+All LEDs that are installed for each board are defined (and some
+have LED_POLARITY_LOW_ON set). BOOT_LOAD_PIN is not defined, but
+BOOT_DOUBLE_TAP_ENABLED is. When the SD Card interface is enabled,
+SDCARD_AUTORUN_DISABLED and SDCARD_USE_PIN1 are defined.
+
+### Generic Boards
 
+The generic boards are all configured to minimize external hardware
+requirements. Only one interface is enabled: SAM_BA_USBCDC_ONLY
+(except C21, which uses SAM_BA_UART_ONLY). CLOCKCONFIG_CLOCK_SOURCE
+is set to CLOCKCONFIG_INTERNAL_USB (CLOCKCONFIG_INTERNAL for the C21),
+so no crystal is required. No LEDs are defined. BOOT_LOAD_PIN is not
+defined, but BOOT_DOUBLE_TAP_ENABLED is, since it uses the reset pin.
+When the SD Card interface is enabled, SDCARD_AUTORUN_DISABLED and
+SDCARD_USE_PIN1 are defined.
+
+
+## Installation
+
+### Driver Installation
+
+The bootloader requires a USB CDC driver to be installed when using the SAM-BA USB CDC interface.
+This driver is the same as the one used by the MattairTech SAM M0+ Core.
+
+**See the MattairTech SAM M0+ Core [README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/README.md) "Driver Installation" for installation instructions.**
+
+
+### Bootloader Firmware Installation
+
+#### Bootloader Installation Using the Arduino IDE
 
-## Prerequisites for Using
+1. If you do not already have the MattairTech SAM M0+ core installed, see SAM M0+ Core Installation above.
+2. Plug in the SAM M0+ board. The bootloader must be running to (press reset twice within 500ms).
+3. Plug an Atmel ICE into USB, then connect it to the powered SAM M0+ board. A green LED should light on the Atmel ICE.
+4. Click Tools->Programmer->Atmel ICE.
+5. Click Tools->Board->MattairTech MT-D21E (or whichever board you are using).
+6. Click Tools->Microcontroller and select your MCU (if menu present).
+7. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
+8. Continue with driver installation above.
+
+A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.
+
+#### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
+
+1. Download the bootloader from https://www.mattairtech.com/software/arduino/SAM-BA-bootloaders-zero-mattairtech.zip.
+2. Unzip to any directory. Be sure that a bootloader is available for your particular MCU.
+3. Follow the procedures for your upload tool to upload the firmware.
+   * Perform a chip erase first. Be sure no BOOTPROT bits are set.
+   * Install the binary file to 0x00000000 of the FLASH.
+   * You can optionally set the BOOTPROT bits to 8KB (or 4KB for the MT-D11). The Arduino installation method does not set these.
+   * You can optionally set the EEPROM bits or anything else. The Arduino installation method uses factory defaults.
+4. Continue with driver installation above.
+
+
+### Bossac Utility Installation
+
+This version of the bootloader requires bossac (1.7.0-mattairtech-1) from the package "MattairTech SAM M0+ Boards".
+If using the Arduino IDE to upload firmware, then download the core.
+
+**See the MattairTech SAM M0+ Core [README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/README.md) "Driver Installation" for installation instructions.).**
+
+If using Bossac standalone, download bossac directly at:
 
-This version of the bootloader requires bossac (1.7.0-mattairtech-1)
-from the package "MattairTech SAM M0+ Boards" or download bossac directly:
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
+
 Note that the SAM-BA tools from Atmel will not work, and the version of bossac from the Arduino
 SAMD Core currently does not support the L21, C21, or D11 (but it does support the D21).
 
+#### Using Bossac Standalone
+
+TODO: Update https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip with new chips (L21 and C21).
+
+When using Bossac standalone, you will need to ensure that your application starts at 0x00002000 for 8 KB bootloaders,
+and 0x00001000 for 4 KB bootloaders. This is because the bootloader resides at 0x00000000. This can be accomplished
+by passing the following flag to the linker (typically LDFLAGS in your makefile; adjust for your bootloader size):
+
+```
+Wl,sectionstart=.text=0x2000
+```
 
-## Prerequisites for Building
+You can also use a linker script. See the MattairTech SAM M0+ package for examples.
+Be sure to generate and use a binary file. Many makefiles are set up to generate an elf, hex, and bin already.
+
+Download Bossac from:
+
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
+
+Linux 64 bit users can also download Bossa (GUI) and bossash (shell) from:
+
+* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
+
+As an example, bossac will be used to upload the test firmware (blink sketch):
+
+1. Download firmware from https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip and unzip.
+2. If you have not already installed the bootloader driver, see Driver Installation above.
+3. Be sure there is a binary that matches your chip. On the command line (change the binary to match yours):
+
+```
+bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
+```
+4. On Linux --port might be /dev/ttyACM0. If the device is not found, remove the --port argument for auto-detection.
+5. See http://manpages.ubuntu.com/manpages/vivid/man1/bossac.1.html for details.
+6. The board should reset automatically and the sketch should be running.
+
+
+## Building Bootloader
+
+### Prerequisites for Building
 
 For all builds and platforms you will need to have the Arduino IDE installed as well as the packages
 for both Arduino SAMD Boards and for MattairTech SAM M0+ Boards, which provides the needed dependencies
@@ -28,7 +316,7 @@ for both Arduino SAMD Boards and for MattairTech SAM M0+ Boards, which provides
 Arduino IDE Boards Manager. This project uses a Makefile, which is present in the root (zero) directory.
 However, you will need a make program:
 
-### Windows
+#### Windows
 
 * Native command line
 Make binary can be obtained here: http://gnuwin32.sourceforge.net/packages/make.htm
@@ -37,26 +325,35 @@ Be sure that no other version of make is in your PATH (ie: MinGW).
 * Cygwin/MSys/MSys2/Babun/etc...
 It is available natively in all distributions.
 
-### Linux
+#### Linux
 
 Make is usually available by default.
 
-### OS X
+#### OS X
 
 Make is available through XCode package.
 
 
-## Makefile Configuration
+### Makefile Configuration
 
 The section between 'Begin Configuration' and 'End Configuration' in the Makefile should be edited.
-Set BOARD_ID and MCU to a chip listed in the comments.
+Set SDCARD, BOARD_ID, and MCU to one of the values listed in the comments.
+
+#### SD Card support
+
+  * SDCARD_DISABLED, SDCARD_ENABLED
+
+This can also be set in the relevant board_definitions file. It is present in the makefile to
+allow the build_all_bootloaders.sh script to select SD Card support.
+
+#### Boards definitions:
 
-### Boards definitions:
 * MT_D21E_rev_A, MT_D21E_rev_B, MT_D11, MT_D21J
 * arduino_zero, arduino_mkrzero, arduino_mkr1000, genuino_mkr1000, genuino_zero
 * Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
 
-### MCU definitions:
+#### MCU definitions:
+
 * SAMD21J: SAMD21J18A, SAMD21J17A, SAMD21J16A, SAMD21J15A
 * SAMD21G: SAMD21G18A, SAMD21G17A, SAMD21G16A, SAMD21G15A
 * SAMD21E: SAMD21E18A, SAMD21E17A, SAMD21E16A, SAMD21E15A
@@ -69,23 +366,164 @@ Set BOARD_ID and MCU to a chip listed in the comments.
 * SAMD11:  SAMD11D14AM, SAMD11C14A, SAMD11D14AS
 
 
-## Board Configuration
+### Board Configuration
 
 Configuration for each board is available in the board_definitions directory.
 Each board has a file named board_definitions_BOARD_NAME.h, where BOARD_NAME is
 listed above in the makefile configuration. The following options are available:
 
+#### Sizes of Options
+
+Compilation Option                      | Size (Bytes)
+----------------------------------------|--------------------------
+*Core*                                  | ~1200*
+SAM_BA_CDC                              | 1148*
+SAM_BA_UART                             | 1108*
+*SAM-BA Monitor*                        | 1200*
+SDCARD_ENABLED                          | 2788*
+SDCARD_VERIFICATION_DISABLED            | 284
+USB_VENDOR_STRINGS_ENABLED              | 228
+TERMINAL_MODE_ENABLED                   | 228
+BOARD_LED_FADE_ENABLED                  | 160
+SAM_BA_INTERFACE_USE_PIN                | 100
+BOOT_DOUBLE_TAP_ENABLED                 | 96
+BOOT_LOAD_PIN                           | 84
+SDCARD_USE_PIN1 & SDCARD_USE_PIN2       | 92
+SDCARD_USE_PIN1                         | 60
+ARDUINO_EXTENDED_CAPABILITIES (X/Y/Z)   | 904*
+ *X (Chip Erase) & Y (Write FLASH)*     | 120*
+ *Z (CRC Verification)*                 | 248*
+ *crc16Table*                           | 512*
+
+ *SAM_BA_CDC and SAM_BA_UART automatically pull in SAM-BA Monitor*
+ *ARDUINO_EXTENDED_CAPABILITIES and SDCARD_ENABLED include X and Y functions*
+ *ARDUINO_EXTENDED_CAPABILITIES and SAM_BA_UART include crc16Table*
+ *ARDUINO_EXTENDED_CAPABILITIES includes Z function*
+
+#### Example Compiled Binary Size
+
+Precompiled Bootloader                  | Size (Bytes)
+----------------------------------------|--------------------------
+Default 8KB with CDC only               | 5196
+8KB with CDC and SDCARD                 | 8052
+Default 4KB with CDC only               | 4036
+4KB with SDCARD only                    | 4044
+
+
+### TERMINAL_MODE_ENABLED
+
+The SAM-BA interface, which is used with both USB CDC and UART (TTL
+serial), can operate in either binary (default) or terminal mode. If
+TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+(add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+Then, type 'V#' to show version information. See SAM-BA monitor commands.
+Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+
+### SDCARD_ENABLED
+
+If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+See "SD Card Bootloader" section. This define can also be set from the
+makefile (so it can be used with the build_all_bootloaders.sh script).
+Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+
+#### SDCARD_SPI_SERCOM_INSTANCE
+#### SDCARD_SPI_PAD_SETTINGS
+#### SDCARD_SPI_PAD0
+#### SDCARD_SPI_PAD1
+#### SDCARD_SPI_PAD2
+#### SDCARD_SPI_PAD3
+
+If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+<YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+associated pins are only initialized if either pin is active.
+
+### SDCARD_SPI_CS_PORT
+### SDCARD_SPI_CS_PIN
+
+If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+
+### SDCARD_USE_PIN1
+#### SDCARD_PIN1_POLARITY
+#### SDCARD_PIN1_PORT
+#### SDCARD_PIN1_PIN
+#### SDCARD_PIN1_CONFIG
+
+### SDCARD_USE_PIN2
+#### SDCARD_PIN2_POLARITY
+#### SDCARD_PIN2_PORT
+#### SDCARD_PIN2_PIN
+#### SDCARD_PIN2_CONFIG
+
+If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+also be defined. See "SD Card External Pins" section for more information. PORT
+can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+
+### SDCARD_VERIFICATION_DISABLED
+
+If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+after programming will not occur, nor will the initial check to see if the
+FLASH contents are already the same as the file.
+Size: ~284B. By default, this is not defined, so verification will be enabled.
+
+### SDCARD_AUTORUN_DISABLED
+
+If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+automatically run the firmware that was just installed. Instead, the LED will
+blink with status code LED_STATUS_SUCCESS. This option also applies when the
+binary file on the SD card already matches the installed firmware. In this
+case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+By default, SDCARD_AUTORUN_DISABLED is defined.
+
 ### SAM_BA_INTERFACE
-Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
-SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
-The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+
+Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+
+### SAM_BA_INTERFACE_USE_PIN
+#### SAM_BA_INTERFACE_PIN_POLARITY
+#### SAM_BA_INTERFACE_PIN_PORT
+#### SAM_BA_INTERFACE_PIN_PIN
+#### SAM_BA_INTERFACE_PIN_CONFIG
+
+If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+interface is used, then the pin acts as an enable. In both cases, the value of
+SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+device is not selected/enabled. If no interface is selected by the pin, the LED
+will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
 
 ### ARDUINO_EXTENDED_CAPABILITIES
+
 If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
 will become available which will speed up programming when using the Arduino
 IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+Size: ~904B. This is defined and set to 1 by default (except with 4KB).
+
+Arduino Extended Capabilities:
+
+* X: Erase the flash memory starting from ADDR to the end of flash.
+* Y: Write the content of a buffer in SRAM into flash memory.
+* Z: Calculate the CRC for a given area of memory.
 
 ### CLOCKCONFIG_CLOCK_SOURCE
+
 The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
 CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
 or CLOCKCONFIG_INTERNAL_USB. If CLOCKCONFIG_32768HZ_CRYSTAL or
@@ -99,15 +537,18 @@ open-loop mode, except when connected to a USB port with data lines (and
 not suspended), where it will calibrate against the USB SOF signal.
 
 ### HS_CRYSTAL_FREQUENCY_HERTZ
+
 If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
 must also be defined with the external crystal frequency in Hertz.
 
 ### PLL_FRACTIONAL_ENABLED
+
 If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
 defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
 a more accurate 48MHz output frequency at the expense of increased jitter.
 
 ### PLL_FAST_STARTUP
+
 If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
 will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
 multiplied by the PLL. This will result in a faster lock time for the PLL,
@@ -118,93 +559,96 @@ also useful for USB host mode applications. See datasheet USB electrical
 characteristics.
 
 ### VARIANT_MCK
+
 Master clock frequency (also Fcpu frequency), set to 48000000ul only for now.
 
 ### NVM_SW_CALIB_DFLL48M_FINE_VAL
+
 The fine calibration value for DFLL open-loop mode is defined here.
 The coarse calibration value is loaded from NVM OTP (factory calibration values).
 
 ### USB_VENDOR_STRINGS_ENABLED
-If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
-STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
-
-### STRING_MANUFACTURER
-Manufacturer Name
+#### STRING_MANUFACTURER
+#### STRING_PRODUCT
 
-### STRING_PRODUCT
-Product Name
-
-### USB_VID_HIGH
-High byte of USB VID
-
-### USB_VID_LOW
-Low byte of USB VID
+If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
+STRING_PRODUCT will be sent to the host.
+Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
 
-### USB_PID_HIGH
-High byte of USB PID
+#### USB_VID_HIGH
+#### USB_VID_LOW
+#### USB_PID_HIGH
+#### USB_PID_LOW
 
-### USB_PID_LOW
-Low byte of USB PID
+If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set.
 
 ### BOOT_USART_SERCOM_INSTANCE
-This must be a single digit representing the SERCOM number
-
-### BOOT_USART_PAD_SETTINGS
-UART_RX_PAD3_TX_PAD2
-
-### BOOT_USART_PADx
-where x is 0, 1, 2, or 3. Consult CMSIS defines to determine what
-goes here (ie:PINMUX_PA10C_SERCOM0_PAD2). Use PINMUX_UNUSED if not used.
+#### BOOT_USART_PAD_SETTINGS
+#### BOOT_USART_PAD3
+#### BOOT_USART_PAD2
+#### BOOT_USART_PAD1
+#### BOOT_USART_PAD0
+
+BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+if not used. By default, this interface is not enabled (except with the C21).
 
 ### BOOT_DOUBLE_TAP_ENABLED
-If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
-quickly tapping two times on the reset button.
 
-### BOOT_LOAD_PIN
-If BOOT_LOAD_PIN is defined (ie: PIN_PA27), the bootloader is started
-if the selected pin is tied LOW during startup. An internal pullup
-resistor will be enabled. There will be a 10ms delay before testin the
-pin to allow time for debouncing capacitors to charge (button use).
+If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+tapping two times on the reset button (within 1/2 second).
+Size: ~96B. Enabled by default.
 
-### BOARD_LED_PORT, BOARD_LEDRX_PORT, BOARD_LEDTX_PORT
-### BOARD_LED_PIN, BOARD_LEDRX_PIN, BOARD_LEDTX_PIN
-If the PORT is defined, then the LED on the associated pin is enabled.
+### BOOT_LOAD_PIN_ENABLED
+#### BOOT_LOAD_PIN
+#### BOOT_LOAD_PIN_PORT
+#### BOOT_LOAD_PIN_POLARITY
+#### BOOT_LOAD_PIN_CONFIG
 
-### BOARD_LED_POLARITY
-This can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+pin is active after reset. There is a 10ms delay before testing the pin to
+allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+(Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+Size: ~84B. Disabled by default.
 
 ### BOARD_LED_FADE_ENABLED
-If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
-a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
 
+If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+"M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+Size: ~160B. Enabled by default.
 
-## Generic Boards
-The generic boards are all configured to minimize external hardware
-requirements. Only one interface is enabled: SAM_BA_USBCDC_ONLY
-(except C21, which uses SAM_BA_UART_ONLY). CLOCKCONFIG_CLOCK_SOURCE
-is set to CLOCKCONFIG_INTERNAL_USB (CLOCKCONFIG_INTERNAL for the C21),
-so no crystal is required. No LEDs are defined. BOOT_LOAD_PIN is not
-defined, but BOOT_DOUBLE_TAP_ENABLED is, since it uses the reset pin.
+### BOARD_LED_PORT
+#### BOARD_LED_PIN
+#### BOARD_LED_POLARITY
 
+### BOARD_LEDRX_PORT
+#### BOARD_LEDRX_PIN
+#### BOARD_LEDRX_POLARITY
 
-## Boot Condition Test Sequence
-First, the start location of the sketch is fetched and checked. If it
-is empty (0xFFFFFFFF), then bootloader execution is resumed. Note that
-when Arduino auto-reset (into bootloader) is initiated, the first flash
-row is erased, so the bootloader will always run after reset until a
-new sketch is transferred. Next, it checks for the double-tap reset
-condition. Then, it checks the boot pin state (after a 10ms delay to
-allow debounce capacitor charging). If no bootloader entry condition
-is present, it jumps to the application and starts execution from there.
+### BOARD_LEDTX_PORT
+#### BOARD_LEDTX_PIN
+#### BOARD_LEDTX_POLARITY
+
+If the LED PORT is defined, then the LED on the associated pin is enabled.
+Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+By default, only BOARD_LED is enabled.
 
 
-## Building a 4KB bootloader
-Only one interface should be selected. ARDUINO_EXTENDED_CAPABILITIES
-should not be defined. USB_VENDOR_STRINGS_ENABLED also should not be
-defined in most cases, as well as BOOT_LOAD_PIN.
+### Building a 4KB bootloader
 
+Only one interface (USB CDC, UART, or SD Card) should be selected.
+ARDUINO_EXTENDED_CAPABILITIES should be set to 0. All external pins
+should be undefined, as well as TERMINAL_MODE_ENABLED. As of
+1.6.8-beta-b2, USB_VENDOR_STRINGS_ENABLED can now be defined.
+BOOT_DOUBLE_TAP_ENABLED can be defined.
 
-## Building
+
+### Building
 
 If not specified the makefile builds for **MT_D21E_rev_B**:
 
@@ -212,20 +656,46 @@ If not specified the makefile builds for **MT_D21E_rev_B**:
 make
 ```
 
-if you want to make a custom bootloader for a derivative board you must supply all the
+If you want to make a custom bootloader for a derivative board you must supply all the
 necessary information in a `board_definitions_xxx.h` file, and add the corresponding case in
-`board_definitions.h`. For example for the **Generic_x21J** board with a **SAMD21J18A** MCU,
-we use `board_definitions_Generic_x21J.h` and it is build with the following command:
+`board_definitions.h`. For example, for the **Generic_x21J** board with a **SAMD21J18A** MCU,
+use `board_definitions_Generic_x21J.h` and build with the following command:
 
 ```
-BOARD_ID=Generic_x21J MCU=SAMD21J18A make clean all
+BOARD_ID=Generic_x21J MCU=SAMD21J18A SDCARD=SDCARD_ENABLED make clean all
 ```
 
-which will produce a binary named sam_ba_Generic_x21J_SAMD21J18A.bin
+which will produce a binary named sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin
+
+
+## Possible Future Additions/Changes
+
+* IP Protection / Security options (control/eliminate direct register access, applet loading/executing, and reading/checksumming of flash contents)
+* Variable bootloader sizes for each chip
 
 
 ## Technical Details
 
+**Arduino IDE Auto-Reset**
+
+When the Arduino IDE initiates the bootloader, the following procedure is used:
+
+1. The IDE opens and closes the USB serial port at a baud rate of 1200bps. This triggers a “soft erase� procedure.
+2. The first row of application section flash memory is erased by the MCU. If it is interrupted for any reason, the erase procedure will likely fail.
+3. The board is reset. The bootloader (which always runs first) detects the blank flah row, so bootloader operation resumes.
+4. Opening and closing the port at a baud rate other than 1200bps will not erase or reset the SAM M0+.
+
+**Boot Condition Test Sequence**
+
+First, the start location of the sketch is fetched and checked. If it
+is empty (0xFFFFFFFF), then bootloader execution is resumed. Note that
+when Arduino auto-reset (into bootloader) is initiated, the first flash
+row is erased, so the bootloader will always run after reset until a
+new sketch is transferred. Next, it checks for the double-tap reset
+condition. Then, it checks the boot pin state (after a 10ms delay to
+allow debounce capacitor charging). If no bootloader entry condition
+is present, it jumps to the application and starts execution from there.
+
 **Pinmap**
 
 The following pins are used by the program :
@@ -254,3 +724,37 @@ of the system stack. The applet in this case is a very simple word copy function
 1KB is reserved for the applet, and there are two 64 byte data buffers placed after it. The
 applet has its own stack at the top of RAM, but the word copy applet uses little/none of this.
 The bossac tool is responsible for loading the applet. See Devices.h from the Bossa source.
+
+
+## License
+
+Copyright (c) 2015 Arduino LLC.  All right reserved.
+Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
+Copyright (c) 2017 MattairTech 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
+
+### Petit FatFS
+
+Petit FatFs module is an open source software to implement FAT file system to
+small embedded systems. This is a free software and is opened for education,
+research and commercial developments under license policy of following trems.
+
+Copyright (C) 2014, ChaN, all right reserved.
+
+* The Petit FatFs module is a free software and there is NO WARRANTY.
+* No restriction on use. You can use, modify and redistribute it for
+  personal, non-profit or commercial use UNDER YOUR RESPONSIBILITY.
+* Redistributions of source code must retain the above copyright notice.
diff --git a/bootloaders/zero/SDCard/00readme.txt b/bootloaders/zero/SDCard/00readme.txt
new file mode 100644
index 000000000..974a17bca
--- /dev/null
+++ b/bootloaders/zero/SDCard/00readme.txt
@@ -0,0 +1,46 @@
+Petit FatFs Module Source Files R0.03                (C)ChaN, 2014
+
+
+FILES
+
+  pff.h      Common include file for Petit FatFs and application module.
+  pff.c      Petit FatFs module.
+  diskio.h   Common include file for Petit FatFs and disk I/O module.
+  diskio.c   Skeleton of low level disk I/O module.
+  integer.h  Alternative type definitions for integer variables.
+
+  Low level disk I/O module is not included in this archive because the Petit
+  FatFs module is only a generic file system layer and not depend on any
+  specific storage device. You have to provide a low level disk I/O module that
+  written to control your storage device.
+
+
+
+AGREEMENTS
+
+ Petit FatFs module is an open source software to implement FAT file system to
+ small embedded systems. This is a free software and is opened for education,
+ research and commercial developments under license policy of following trems.
+
+  Copyright (C) 2014, ChaN, all right reserved.
+
+ * The Petit FatFs module is a free software and there is NO WARRANTY.
+ * No restriction on use. You can use, modify and redistribute it for
+   personal, non-profit or commercial use UNDER YOUR RESPONSIBILITY.
+ * Redistributions of source code must retain the above copyright notice.
+
+
+
+REVISION HISTORY
+
+  Jun 15, 2009  R0.01a  First release (Branched from FatFs R0.07b)
+
+  Dec 14, 2009  R0.02   Added multiple code page support.
+                        Added write funciton.
+                        Changed stream read mode interface.
+  Dec 07,'2010  R0.02a  Added some configuration options.
+                        Fixed fails to open objects with DBCS character.
+
+  Jun 10, 2014  R0.03   Separated out configuration options to pffconf.h.
+                        Added _USE_LCC option.
+                        Added _FS_FAT16 option.
diff --git a/bootloaders/zero/SDCard/diskio.h b/bootloaders/zero/SDCard/diskio.h
new file mode 100644
index 000000000..2505d506d
--- /dev/null
+++ b/bootloaders/zero/SDCard/diskio.h
@@ -0,0 +1,92 @@
+/*-----------------------------------------------------------------------
+/  PFF - Low level disk interface modlue include file    (C)ChaN, 2014
+/-----------------------------------------------------------------------*/
+
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sam.h>
+#include "integer.h"
+
+
+/* Status of Disk Functions */
+typedef BYTE	DSTATUS;
+
+
+/* Results of Disk Functions */
+typedef enum {
+	RES_OK = 0,		/* 0: Function succeeded */
+	RES_ERROR,		/* 1: Disk error */
+	RES_NOTRDY,		/* 2: Not ready */
+	RES_PARERR		/* 3: Invalid parameter */
+} DRESULT;
+
+
+/* SERCOM SPI available pad settings */
+enum spi_pad_settings {
+  SPI_RX_PAD0_TX_PAD2_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(0) | SERCOM_SPI_CTRLA_DOPO(1),
+  SPI_RX_PAD0_TX_PAD3_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(0) | SERCOM_SPI_CTRLA_DOPO(2),
+  SPI_RX_PAD1_TX_PAD2_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(1) | SERCOM_SPI_CTRLA_DOPO(1),
+  SPI_RX_PAD1_TX_PAD0_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(1) | SERCOM_SPI_CTRLA_DOPO(3),
+  SPI_RX_PAD2_TX_PAD0_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(2) | SERCOM_SPI_CTRLA_DOPO(0),
+  SPI_RX_PAD2_TX_PAD3_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(2) | SERCOM_SPI_CTRLA_DOPO(2),
+  SPI_RX_PAD2_TX_PAD0_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(2) | SERCOM_SPI_CTRLA_DOPO(3),
+  SPI_RX_PAD3_TX_PAD0_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(3) | SERCOM_SPI_CTRLA_DOPO(0),
+};
+
+
+/*---------------------------------------*/
+/* Prototypes for disk control functions */
+
+DSTATUS disk_initialize (void);
+DRESULT disk_readp (BYTE* buff, DWORD sector, UINT offser, UINT count);
+DRESULT disk_writep (const BYTE* buff, DWORD sc);
+
+#define DUMMY_BYTE			0xFF
+
+#define STA_NOINIT		0x01	/* Drive not initialized */
+#define STA_NODISK		0x02	/* No medium in the drive */
+
+/* Card type flags (CardType) */
+#define CT_MMC				0x01	/* MMC ver 3 */
+#define CT_SD1				0x02	/* SD ver 1 */
+#define CT_SD2				0x04	/* SD ver 2 */
+#define CT_SDC				(CT_SD1|CT_SD2)	/* SD */
+#define CT_BLOCK			0x08	/* Block addressing */
+
+/* Definitions for MMC/SDC command */
+#define CMD0    (0x40+0)        /* GO_IDLE_STATE */
+#define CMD1    (0x40+1)        /* SEND_OP_COND (MMC) */
+#define ACMD41  (0xC0+41)       /* SEND_OP_COND (SDC) */
+#define CMD8    (0x40+8)        /* SEND_IF_COND */
+#define CMD16   (0x40+16)       /* SET_BLOCKLEN */
+#define CMD17   (0x40+17)       /* READ_SINGLE_BLOCK */
+#define CMD24   (0x40+24)       /* WRITE_BLOCK */
+#define CMD55   (0x40+55)       /* APP_CMD */
+#define CMD58   (0x40+58)       /* READ_OCR */
+
+#define   SERCOM_MODE_USART_EXT_CLK_Val         0x0ul
+#define   SERCOM_MODE_USART_INT_CLK_Val         0x1ul
+#define   SERCOM_MODE_SPI_SLAVE_Val             0x2ul
+#define   SERCOM_MODE_SPI_MASTER_Val            0x3ul
+#define   SERCOM_MODE_I2C_SLAVE_Val             0x4ul
+#define   SERCOM_MODE_I2C_MASTER_Val            0x5ul
+
+#define   SERCOM_DORD_MSB_FIRST_Val             0x0ul
+#define   SERCOM_DORD_LSB_FIRST_Val             0x1ul
+
+#define   SERCOM_CHAR_SIZE_8_BITS_Val           0x0ul
+#define   SERCOM_CHAR_SIZE_9_BITS_Val           0x1ul
+
+#define   SDCARD_SPI_BUAD_SLOW                  250000ul
+#define   SDCARD_SPI_BUAD_FAST                  6000000ul
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _DISKIO_DEFINED */
diff --git a/bootloaders/zero/SDCard/integer.h b/bootloaders/zero/SDCard/integer.h
new file mode 100644
index 000000000..074a46bd5
--- /dev/null
+++ b/bootloaders/zero/SDCard/integer.h
@@ -0,0 +1,33 @@
+/*-------------------------------------------*/
+/* Integer type definitions for FatFs module */
+/*-------------------------------------------*/
+
+#ifndef _FF_INTEGER
+#define _FF_INTEGER
+
+#ifdef _WIN32	/* FatFs development platform */
+
+#include <windows.h>
+#include <tchar.h>
+
+#else			/* Embedded platform */
+
+/* This type MUST be 8 bit */
+typedef unsigned char	BYTE;
+
+/* These types MUST be 16 bit */
+typedef short			SHORT;
+typedef unsigned short	WORD;
+typedef unsigned short	WCHAR;
+
+/* These types MUST be 16 bit or 32 bit */
+typedef int				INT;
+typedef unsigned int	UINT;
+
+/* These types MUST be 32 bit */
+typedef long			LONG;
+typedef unsigned long	DWORD;
+
+#endif
+
+#endif
diff --git a/bootloaders/zero/SDCard/mmcbbp.c b/bootloaders/zero/SDCard/mmcbbp.c
new file mode 100644
index 000000000..90c17fccf
--- /dev/null
+++ b/bootloaders/zero/SDCard/mmcbbp.c
@@ -0,0 +1,277 @@
+/*-----------------------------------------------------------------------/
+/  PFF - Generic low level disk control module            (C)ChaN, 2014
+/------------------------------------------------------------------------/
+/
+/  Copyright (C) 2014, ChaN, all right reserved.
+/  Copyright (c) 2017 MattairTech LLC. All right reserved.
+/
+/ * This software is a free software and there is NO WARRANTY.
+/ * No restriction on use. You can use, modify and redistribute it for
+/   personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY.
+/ * Redistributions of source code must retain the above copyright notice.
+/-----------------------------------------------------------------------*/
+
+#include <sam.h>
+#include "pff.h"
+#include "../board_definitions.h"
+#include "diskio.h"
+#include "../util.h"
+
+
+/*--------------------------------------------------------------------------
+
+   Module Private Functions
+
+---------------------------------------------------------------------------*/
+
+static
+BYTE CardType;
+
+/* Set sd card baud rate */
+void setBaud (uint32_t baud)
+{
+  SDCARD_SPI_MODULE->SPI.CTRLA.bit.ENABLE = 0;
+  while(SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.ENABLE);
+
+  //Synchronous arithmetic
+  SDCARD_SPI_MODULE->SPI.BAUD.reg = ((VARIANT_MCK / (2 * baud)) - 1);
+
+
+  SDCARD_SPI_MODULE->SPI.CTRLA.bit.ENABLE = 1;
+  while(SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.ENABLE);
+}
+
+/* Initialize SPI port */
+inline void init_spi (void)
+{
+  // Attach pins to peripheral through peripheral multiplexer
+  pinMux(SDCARD_SPI_PAD0);
+  pinMux(SDCARD_SPI_PAD1);
+  pinMux(SDCARD_SPI_PAD2);
+  pinMux(SDCARD_SPI_PAD3);
+
+  // Configure chip select pin
+  pinConfig(SDCARD_SPI_CS_PORT, SDCARD_SPI_CS_PIN, OUTPUT_HIGH);
+
+  // 
+#if (SAMD21 || SAMD11)
+  PM->APBCMASK.reg |= SDCARD_SPI_BUS_CLOCK_INDEX;
+#elif (SAML21)
+  MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 ;
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM5;  // On the SAML, SERCOM5 is on the low power bridge
+#elif (SAMC21)
+  #if (SAMC21E)
+  MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 ;
+  #elif (SAMC21G) || (SAMC21J)
+  MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
+  #endif
+#else
+  #error "mmcbbp.c: Unsupported microcontroller"
+#endif
+
+  // Reset
+#if defined(PARANOIA)
+  SDCARD_SPI_MODULE->SPI.CTRLA.bit.SWRST = 1;
+  while(SDCARD_SPI_MODULE->SPI.CTRLA.bit.SWRST || SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.SWRST);
+#endif
+
+  // Setting clock
+#if (SAMD21 || SAMD11)
+  GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( SDCARD_SPI_PER_CLOCK_INDEX ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
+  waitForSync();
+#elif (SAML21 || SAMC21)
+  GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  waitForSync();
+#else
+  #error "mmcbbp.c: Unsupported microcontroller"
+#endif
+
+  SDCARD_SPI_MODULE->SPI.CTRLA.reg = SERCOM_SPI_CTRLA_MODE(SERCOM_MODE_SPI_MASTER_Val) |
+                          ( 0 << SERCOM_SPI_CTRLA_CPHA_Pos ) |
+                          ( 0 << SERCOM_SPI_CTRLA_CPOL_Pos ) |
+                          SDCARD_SPI_PAD_SETTINGS |
+                          SERCOM_DORD_MSB_FIRST_Val << SERCOM_SPI_CTRLA_DORD_Pos;
+
+  SDCARD_SPI_MODULE->SPI.CTRLB.reg = SERCOM_SPI_CTRLB_CHSIZE(SERCOM_CHAR_SIZE_8_BITS_Val) |
+                          SERCOM_SPI_CTRLB_RXEN;        //Active the SPI receiver.
+
+  setBaud (SDCARD_SPI_BUAD_SLOW);       // also enables SPI peripheral
+}
+
+/* Select MMC */
+void deselect (void)
+{
+  pinConfig(SDCARD_SPI_CS_PORT, SDCARD_SPI_CS_PIN, OUTPUT_HIGH);
+}
+
+/* Deselect MMC */
+inline void select (void)
+{
+  pinConfig(SDCARD_SPI_CS_PORT, SDCARD_SPI_CS_PIN, OUTPUT_LOW);
+}
+
+/* Send a byte to the MMC or send a 0xFF to the MMC and get the received byte */
+BYTE xfer_spi (BYTE data)
+{
+  SDCARD_SPI_MODULE->SPI.DATA.bit.DATA = data; // Writing data into Data register
+
+  while( SDCARD_SPI_MODULE->SPI.INTFLAG.bit.RXC == 0 )
+  {
+    // Waiting Complete Reception
+  }
+
+  return SDCARD_SPI_MODULE->SPI.DATA.bit.DATA;  // Reading data
+}
+
+
+/*-----------------------------------------------------------------------*/
+/* Send a command packet to MMC                                          */
+/*-----------------------------------------------------------------------*/
+
+static
+BYTE send_cmd (
+	BYTE cmd,		/* 1st byte (Start + Index) */
+	DWORD arg		/* Argument (32 bits) */
+)
+{
+	BYTE n, res;
+
+
+	if (cmd & 0x80) {	/* ACMD<n> is the command sequense of CMD55-CMD<n> */
+		cmd &= 0x7F;
+		res = send_cmd(CMD55, 0);
+		if (res > 1) return res;
+	}
+
+	/* Select the card */
+	select();
+
+	/* Send a command packet */
+	xfer_spi(cmd);						/* Start + Command index */
+	xfer_spi((BYTE)(arg >> 24));		/* Argument[31..24] */
+	xfer_spi((BYTE)(arg >> 16));		/* Argument[23..16] */
+	xfer_spi((BYTE)(arg >> 8));			/* Argument[15..8] */
+	xfer_spi((BYTE)arg);				/* Argument[7..0] */
+	n = 0x01;							/* Dummy CRC + Stop */
+	if (cmd == CMD0) n = 0x95;			/* Valid CRC for CMD0(0) */
+	if (cmd == CMD8) n = 0x87;			/* Valid CRC for CMD8(0x1AA) */
+	xfer_spi(n);
+
+	/* Receive a command response */
+	n = 10;								/* Wait for a valid response in timeout of 10 attempts */
+	do {
+		res = xfer_spi(DUMMY_BYTE);
+	} while ((res & 0x80) && --n);
+
+	return res;			/* Return with the response value */
+}
+
+
+
+
+/*--------------------------------------------------------------------------
+
+   Public Functions
+
+---------------------------------------------------------------------------*/
+
+/*-----------------------------------------------------------------------*/
+/* Initialize Disk Drive                                                 */
+/*-----------------------------------------------------------------------*/
+
+DSTATUS disk_initialize (void)
+{
+	BYTE n, cmd, ty, ocr[4];
+	UINT tmr;
+
+        deselect();
+	init_spi();							/* Initialize ports to control MMC */
+	for (n = 100; n; n--) delayUs(1000);	/* 1ms delay */
+	for (n = 10; n; n--) xfer_spi(DUMMY_BYTE);	/* 80 Dummy clocks with CS=H */
+
+	ty = 0;
+	if (send_cmd(CMD0, 0) == 1) {			/* Enter Idle state */
+		if (send_cmd(CMD8, 0x1AA) == 1) {	/* SDv2 */
+			for (n = 0; n < 4; n++) ocr[n] = xfer_spi(DUMMY_BYTE);		/* Get trailing return value of R7 resp */
+			if (ocr[2] == 0x01 && ocr[3] == 0xAA) {			/* The card can work at vdd range of 2.7-3.6V */
+				for (tmr = 10000; tmr && send_cmd(ACMD41, 1UL << 30); tmr--) delayUs(100);	/* Wait for leaving idle state (ACMD41 with HCS bit) */
+				if (tmr && send_cmd(CMD58, 0) == 0) {		/* Check CCS bit in the OCR */
+					for (n = 0; n < 4; n++) ocr[n] = xfer_spi(DUMMY_BYTE);
+					ty = (ocr[0] & 0x40) ? CT_SD2 | CT_BLOCK : CT_SD2;	/* SDv2 (HC or SC) */
+				}
+			}
+		} else {							/* SDv1 or MMCv3 */
+			if (send_cmd(ACMD41, 0) <= 1) 	{
+				ty = CT_SD1; cmd = ACMD41;	/* SDv1 */
+			} else {
+				ty = CT_MMC; cmd = CMD1;	/* MMCv3 */
+			}
+			for (tmr = 10000; tmr && send_cmd(cmd, 0); tmr--) delayUs(100);	/* Wait for leaving idle state */
+			if (!tmr || send_cmd(CMD16, 512) != 0)			/* Set R/W block length to 512 */
+				ty = 0;
+		}
+	}
+	CardType = ty;
+        deselect();
+
+        if (ty) {                    /* OK */
+          setBaud (SDCARD_SPI_BUAD_FAST);   /* Set fast clock */
+        }
+
+	return ty ? 0 : STA_NOINIT;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read partial sector                                                   */
+/*-----------------------------------------------------------------------*/
+
+DRESULT disk_readp (
+	BYTE *buff,		/* Pointer to the read buffer (NULL:Read bytes are forwarded to the stream) */
+	DWORD sector,	/* Sector number (LBA) */
+	UINT offset,	/* Byte offset to read from (0..511) */
+	UINT count		/* Number of bytes to read (ofs + cnt mus be <= 512) */
+)
+{
+	DRESULT res;
+	BYTE rc;
+	UINT bc;
+
+
+	if (!(CardType & CT_BLOCK)) sector *= 512;	/* Convert to byte address if needed */
+
+	res = RES_ERROR;
+	if (send_cmd(CMD17, sector) == 0) {		/* READ_SINGLE_BLOCK */
+
+		bc = 40000;
+		do {							/* Wait for data packet */
+			rc = xfer_spi(DUMMY_BYTE);
+		} while (rc == 0xFF && --bc);
+
+		if (rc == 0xFE) {				/* A data packet arrived */
+			bc = 514 - offset - count;
+
+			/* Skip leading bytes */
+			if (offset) {
+				do xfer_spi(DUMMY_BYTE); while (--offset);
+			}
+
+			/* Receive a part of the sector */
+			do {
+				*buff++ = xfer_spi(DUMMY_BYTE);
+			} while (--count);
+
+			/* Skip trailing bytes and CRC */
+			do xfer_spi(DUMMY_BYTE); while (--bc);
+
+			res = RES_OK;
+		}
+	}
+
+	deselect();
+
+	return res;
+}
+
+
diff --git a/bootloaders/zero/SDCard/pff.c b/bootloaders/zero/SDCard/pff.c
new file mode 100644
index 000000000..f8f6329c7
--- /dev/null
+++ b/bootloaders/zero/SDCard/pff.c
@@ -0,0 +1,1108 @@
+/*----------------------------------------------------------------------------/
+/  Petit FatFs - FAT file system module  R0.03                (C)ChaN, 2014
+/-----------------------------------------------------------------------------/
+/ Petit FatFs module is a generic FAT file system module for small embedded
+/ systems. This is a free software that opened for education, research and
+/ commercial developments under license policy of following trems.
+/
+/  Copyright (C) 2014, ChaN, all right reserved.
+/
+/ * The Petit FatFs module is a free software and there is NO WARRANTY.
+/ * No restriction on use. You can use, modify and redistribute it for
+/   personal, non-profit or commercial products UNDER YOUR RESPONSIBILITY.
+/ * Redistributions of source code must retain the above copyright notice.
+/
+/-----------------------------------------------------------------------------/
+/ Jun 15,'09  R0.01a  First release.
+/
+/ Dec 14,'09  R0.02   Added multiple code page support.
+/                     Added write funciton.
+/                     Changed stream read mode interface.
+/ Dec 07,'10  R0.02a  Added some configuration options.
+/                     Fixed fails to open objects with DBCS character.
+
+/ Jun 10,'14  R0.03   Separated out configuration options to pffconf.h.
+/                     Added _USE_LCC option.
+/                     Added _FS_FAT16 option.
+/----------------------------------------------------------------------------*/
+
+#include "pff.h"		/* Petit FatFs configurations and declarations */
+#include "diskio.h"		/* Declarations of low level disk I/O functions */
+
+
+
+/*--------------------------------------------------------------------------
+
+   Module Private Definitions
+
+---------------------------------------------------------------------------*/
+
+
+#if _PFATFS != 4004	/* Revision ID */
+#error Wrong include file (pff.h).
+#endif
+
+#if _FS_FAT32
+#if !_FS_FAT16 && !_FS_FAT12
+#define _FS_32ONLY 1
+#else
+#define _FS_32ONLY 0
+#endif
+#else
+#if !_FS_FAT16 && !_FS_FAT12
+#error Wrong _FS_FATxx setting.
+#endif
+#define _FS_32ONLY 0
+#endif
+
+#define ABORT(err)	{fs->flag = 0; return err;}
+
+
+
+/*--------------------------------------------------------*/
+/* DBCS code ranges and SBCS extend char conversion table */
+/*--------------------------------------------------------*/
+
+#if _CODE_PAGE == 932	/* Japanese Shift-JIS */
+#define _DF1S	0x81	/* DBC 1st byte range 1 start */
+#define _DF1E	0x9F	/* DBC 1st byte range 1 end */
+#define _DF2S	0xE0	/* DBC 1st byte range 2 start */
+#define _DF2E	0xFC	/* DBC 1st byte range 2 end */
+#define _DS1S	0x40	/* DBC 2nd byte range 1 start */
+#define _DS1E	0x7E	/* DBC 2nd byte range 1 end */
+#define _DS2S	0x80	/* DBC 2nd byte range 2 start */
+#define _DS2E	0xFC	/* DBC 2nd byte range 2 end */
+
+#elif _CODE_PAGE == 936	/* Simplified Chinese GBK */
+#define _DF1S	0x81
+#define _DF1E	0xFE
+#define _DS1S	0x40
+#define _DS1E	0x7E
+#define _DS2S	0x80
+#define _DS2E	0xFE
+
+#elif _CODE_PAGE == 949	/* Korean */
+#define _DF1S	0x81
+#define _DF1E	0xFE
+#define _DS1S	0x41
+#define _DS1E	0x5A
+#define _DS2S	0x61
+#define _DS2E	0x7A
+#define _DS3S	0x81
+#define _DS3E	0xFE
+
+#elif _CODE_PAGE == 950	/* Traditional Chinese Big5 */
+#define _DF1S	0x81
+#define _DF1E	0xFE
+#define _DS1S	0x40
+#define _DS1E	0x7E
+#define _DS2S	0xA1
+#define _DS2E	0xFE
+
+#elif _CODE_PAGE == 437	/* U.S. (OEM) */
+#define _EXCVT {0x80,0x9A,0x90,0x41,0x8E,0x41,0x8F,0x80,0x45,0x45,0x45,0x49,0x49,0x49,0x8E,0x8F,0x90,0x92,0x92,0x4F,0x99,0x4F,0x55,0x55,0x59,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 720	/* Arabic (OEM) */
+#define _EXCVT {0x80,0x81,0x45,0x41,0x84,0x41,0x86,0x43,0x45,0x45,0x45,0x49,0x49,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x49,0x49,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 737	/* Greek (OEM) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x92,0x92,0x93,0x94,0x95,0x96,0x97,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, \
+				0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0xAA,0x92,0x93,0x94,0x95,0x96,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0x97,0xEA,0xEB,0xEC,0xE4,0xED,0xEE,0xE7,0xE8,0xF1,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 775	/* Baltic (OEM) */
+#define _EXCVT {0x80,0x9A,0x91,0xA0,0x8E,0x95,0x8F,0x80,0xAD,0xED,0x8A,0x8A,0xA1,0x8D,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0x95,0x96,0x97,0x97,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xE0,0xA3,0xA3,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xB5,0xB6,0xB7,0xB8,0xBD,0xBE,0xC6,0xC7,0xA5,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE3,0xE8,0xE8,0xEA,0xEA,0xEE,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 850	/* Multilingual Latin 1 (OEM) */
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 852	/* Latin 2 (OEM) */
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xDE,0x8F,0x80,0x9D,0xD3,0x8A,0x8A,0xD7,0x8D,0x8E,0x8F,0x90,0x91,0x91,0xE2,0x99,0x95,0x95,0x97,0x97,0x99,0x9A,0x9B,0x9B,0x9D,0x9E,0x9F, \
+				0xB5,0xD6,0xE0,0xE9,0xA4,0xA4,0xA6,0xA6,0xA8,0xA8,0xAA,0x8D,0xAC,0xB8,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBD,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC6,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD2,0xD5,0xD6,0xD7,0xB7,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE3,0xD5,0xE6,0xE6,0xE8,0xE9,0xE8,0xEB,0xED,0xED,0xDD,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xEB,0xFC,0xFC,0xFE,0xFF}
+
+#elif _CODE_PAGE == 855	/* Cyrillic (OEM) */
+#define _EXCVT {0x81,0x81,0x83,0x83,0x85,0x85,0x87,0x87,0x89,0x89,0x8B,0x8B,0x8D,0x8D,0x8F,0x8F,0x91,0x91,0x93,0x93,0x95,0x95,0x97,0x97,0x99,0x99,0x9B,0x9B,0x9D,0x9D,0x9F,0x9F, \
+				0xA1,0xA1,0xA3,0xA3,0xA5,0xA5,0xA7,0xA7,0xA9,0xA9,0xAB,0xAB,0xAD,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB6,0xB6,0xB8,0xB8,0xB9,0xBA,0xBB,0xBC,0xBE,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD3,0xD3,0xD5,0xD5,0xD7,0xD7,0xDD,0xD9,0xDA,0xDB,0xDC,0xDD,0xE0,0xDF, \
+				0xE0,0xE2,0xE2,0xE4,0xE4,0xE6,0xE6,0xE8,0xE8,0xEA,0xEA,0xEC,0xEC,0xEE,0xEE,0xEF,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF8,0xFA,0xFA,0xFC,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 857	/* Turkish (OEM) */
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0x98,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x98,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9E, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xDE,0x59,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 858	/* Multilingual Latin 1 + Euro (OEM) */
+#define _EXCVT {0x80,0x9A,0x90,0xB6,0x8E,0xB7,0x8F,0x80,0xD2,0xD3,0xD4,0xD8,0xD7,0xDE,0x8E,0x8F,0x90,0x92,0x92,0xE2,0x99,0xE3,0xEA,0xEB,0x59,0x99,0x9A,0x9D,0x9C,0x9D,0x9E,0x9F, \
+				0xB5,0xD6,0xE0,0xE9,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC7,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE5,0xE5,0xE6,0xE7,0xE7,0xE9,0xEA,0xEB,0xED,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 862	/* Hebrew (OEM) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0x41,0x49,0x4F,0x55,0xA5,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0x21,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 866	/* Russian (OEM) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0x90,0x91,0x92,0x93,0x9d,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,0xF0,0xF0,0xF2,0xF2,0xF4,0xF4,0xF6,0xF6,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 874	/* Thai (OEM, Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 1250 /* Central Europe (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xA3,0xB4,0xB5,0xB6,0xB7,0xB8,0xA5,0xAA,0xBB,0xBC,0xBD,0xBC,0xAF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+
+#elif _CODE_PAGE == 1251 /* Cyrillic (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x82,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x80,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x8D,0x8E,0x8F, \
+				0xA0,0xA2,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB2,0xA5,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xA3,0xBD,0xBD,0xAF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF}
+
+#elif _CODE_PAGE == 1252 /* Latin 1 (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0xAd,0x9B,0x8C,0x9D,0xAE,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+
+#elif _CODE_PAGE == 1253 /* Greek (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xA2,0xB8,0xB9,0xBA, \
+				0xE0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xFB,0xBC,0xFD,0xBF,0xFF}
+
+#elif _CODE_PAGE == 1254 /* Turkish (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x8A,0x9B,0x8C,0x9D,0x9E,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0x9F}
+
+#elif _CODE_PAGE == 1255 /* Hebrew (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 1256 /* Arabic (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x8C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0x41,0xE1,0x41,0xE3,0xE4,0xE5,0xE6,0x43,0x45,0x45,0x45,0x45,0xEC,0xED,0x49,0x49,0xF0,0xF1,0xF2,0xF3,0x4F,0xF5,0xF6,0xF7,0xF8,0x55,0xFA,0x55,0x55,0xFD,0xFE,0xFF}
+
+#elif _CODE_PAGE == 1257 /* Baltic (Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F, \
+				0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xA8,0xB9,0xAA,0xBB,0xBC,0xBD,0xBE,0xAF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xFF}
+
+#elif _CODE_PAGE == 1258 /* Vietnam (OEM, Windows) */
+#define _EXCVT {0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0xAC,0x9D,0x9E,0x9F, \
+				0xA0,0x21,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF, \
+				0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xEC,0xCD,0xCE,0xCF,0xD0,0xD1,0xF2,0xD3,0xD4,0xD5,0xD6,0xF7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xFE,0x9F}
+
+#else
+#error Unknown code page.
+
+#endif
+
+
+
+/* Character code support macros */
+
+#define IsUpper(c)	(((c)>='A')&&((c)<='Z'))
+#define IsLower(c)	(((c)>='a')&&((c)<='z'))
+
+#ifndef _EXCVT	/* DBCS configuration */
+
+#ifdef _DF2S	/* Two 1st byte areas */
+#define IsDBCS1(c)	(((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E) || ((BYTE)(c) >= _DF2S && (BYTE)(c) <= _DF2E))
+#else			/* One 1st byte area */
+#define IsDBCS1(c)	((BYTE)(c) >= _DF1S && (BYTE)(c) <= _DF1E)
+#endif
+
+#ifdef _DS3S	/* Three 2nd byte areas */
+#define IsDBCS2(c)	(((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E) || ((BYTE)(c) >= _DS3S && (BYTE)(c) <= _DS3E))
+#else			/* Two 2nd byte areas */
+#define IsDBCS2(c)	(((BYTE)(c) >= _DS1S && (BYTE)(c) <= _DS1E) || ((BYTE)(c) >= _DS2S && (BYTE)(c) <= _DS2E))
+#endif
+
+#else			/* SBCS configuration */
+
+#define IsDBCS1(c)	0
+#define IsDBCS2(c)	0
+
+#endif /* _EXCVT */
+
+
+/* FatFs refers the members in the FAT structures with byte offset instead
+/ of structure member because there are incompatibility of the packing option
+/ between various compilers. */
+
+#define BS_jmpBoot			0
+#define BS_OEMName			3
+#define BPB_BytsPerSec		11
+#define BPB_SecPerClus		13
+#define BPB_RsvdSecCnt		14
+#define BPB_NumFATs			16
+#define BPB_RootEntCnt		17
+#define BPB_TotSec16		19
+#define BPB_Media			21
+#define BPB_FATSz16			22
+#define BPB_SecPerTrk		24
+#define BPB_NumHeads		26
+#define BPB_HiddSec			28
+#define BPB_TotSec32		32
+#define BS_55AA				510
+
+#define BS_DrvNum			36
+#define BS_BootSig			38
+#define BS_VolID			39
+#define BS_VolLab			43
+#define BS_FilSysType		54
+
+#define BPB_FATSz32			36
+#define BPB_ExtFlags		40
+#define BPB_FSVer			42
+#define BPB_RootClus		44
+#define BPB_FSInfo			48
+#define BPB_BkBootSec		50
+#define BS_DrvNum32			64
+#define BS_BootSig32		66
+#define BS_VolID32			67
+#define BS_VolLab32			71
+#define BS_FilSysType32		82
+
+#define MBR_Table			446
+
+#define	DIR_Name			0
+#define	DIR_Attr			11
+#define	DIR_NTres			12
+#define	DIR_CrtTime			14
+#define	DIR_CrtDate			16
+#define	DIR_FstClusHI		20
+#define	DIR_WrtTime			22
+#define	DIR_WrtDate			24
+#define	DIR_FstClusLO		26
+#define	DIR_FileSize		28
+
+
+
+/*--------------------------------------------------------------------------
+
+   Private Functions
+
+---------------------------------------------------------------------------*/
+
+
+static
+FATFS *FatFs;	/* Pointer to the file system object (logical drive) */
+
+
+/* Fill memory */
+static
+void mem_set (void* dst, int val, int cnt) {
+	char *d = (char*)dst;
+	while (cnt--) *d++ = (char)val;
+}
+
+/* Compare memory to memory */
+static
+int mem_cmp (const void* dst, const void* src, int cnt) {
+	const char *d = (const char *)dst, *s = (const char *)src;
+	int r = 0;
+	while (cnt-- && (r = *d++ - *s++) == 0) ;
+	return r;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* FAT access - Read value of a FAT entry                                */
+/*-----------------------------------------------------------------------*/
+
+static
+CLUST get_fat (	/* 1:IO error, Else:Cluster status */
+	CLUST clst	/* Cluster# to get the link information */
+)
+{
+	BYTE buf[4];
+	FATFS *fs = FatFs;
+
+	if (clst < 2 || clst >= fs->n_fatent)	/* Range check */
+		return 1;
+
+	switch (fs->fs_type) {
+#if _FS_FAT12
+	case FS_FAT12 : {
+		UINT wc, bc, ofs;
+
+		bc = (UINT)clst; bc += bc / 2;
+		ofs = bc % 512; bc /= 512;
+		if (ofs != 511) {
+			if (disk_readp(buf, fs->fatbase + bc, ofs, 2)) break;
+		} else {
+			if (disk_readp(buf, fs->fatbase + bc, 511, 1)) break;
+			if (disk_readp(buf+1, fs->fatbase + bc + 1, 0, 1)) break;
+		}
+		wc = LD_WORD(buf);
+		return (clst & 1) ? (wc >> 4) : (wc & 0xFFF);
+	}
+#endif
+#if _FS_FAT16
+	case FS_FAT16 :
+		if (disk_readp(buf, fs->fatbase + clst / 256, ((UINT)clst % 256) * 2, 2)) break;
+		return LD_WORD(buf);
+#endif
+#if _FS_FAT32
+	case FS_FAT32 :
+		if (disk_readp(buf, fs->fatbase + clst / 128, ((UINT)clst % 128) * 4, 4)) break;
+		return LD_DWORD(buf) & 0x0FFFFFFF;
+#endif
+	}
+
+	return 1;	/* An error occured at the disk I/O layer */
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Get sector# from cluster# / Get cluster field from directory entry    */
+/*-----------------------------------------------------------------------*/
+
+static
+DWORD clust2sect (	/* !=0: Sector number, 0: Failed - invalid cluster# */
+	CLUST clst		/* Cluster# to be converted */
+)
+{
+	FATFS *fs = FatFs;
+
+
+	clst -= 2;
+	if (clst >= (fs->n_fatent - 2)) return 0;		/* Invalid cluster# */
+	return (DWORD)clst * fs->csize + fs->database;
+}
+
+
+static
+CLUST get_clust (
+	BYTE* dir		/* Pointer to directory entry */
+)
+{
+	FATFS *fs = FatFs;
+	CLUST clst = 0;
+
+
+	if (_FS_32ONLY || (_FS_FAT32 && fs->fs_type == FS_FAT32)) {
+		clst = LD_WORD(dir+DIR_FstClusHI);
+		clst <<= 16;
+	}
+	clst |= LD_WORD(dir+DIR_FstClusLO);
+
+	return clst;
+}
+
+
+/*-----------------------------------------------------------------------*/
+/* Directory handling - Rewind directory index                           */
+/*-----------------------------------------------------------------------*/
+
+static
+FRESULT dir_rewind (
+	DIR *dj			/* Pointer to directory object */
+)
+{
+	CLUST clst;
+	FATFS *fs = FatFs;
+
+
+	dj->index = 0;
+	clst = dj->sclust;
+	if (clst == 1 || clst >= fs->n_fatent)	/* Check start cluster range */
+		return FR_DISK_ERR;
+	if (_FS_FAT32 && !clst && (_FS_32ONLY || fs->fs_type == FS_FAT32))	/* Replace cluster# 0 with root cluster# if in FAT32 */
+		clst = (CLUST)fs->dirbase;
+	dj->clust = clst;						/* Current cluster */
+	dj->sect = (_FS_32ONLY || clst) ? clust2sect(clst) : fs->dirbase;	/* Current sector */
+
+	return FR_OK;	/* Seek succeeded */
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Directory handling - Move directory index next                        */
+/*-----------------------------------------------------------------------*/
+
+static
+FRESULT dir_next (	/* FR_OK:Succeeded, FR_NO_FILE:End of table */
+	DIR *dj			/* Pointer to directory object */
+)
+{
+	CLUST clst;
+	WORD i;
+	FATFS *fs = FatFs;
+
+
+	i = dj->index + 1;
+	if (!i || !dj->sect)	/* Report EOT when index has reached 65535 */
+		return FR_NO_FILE;
+
+	if (!(i % 16)) {		/* Sector changed? */
+		dj->sect++;			/* Next sector */
+
+		if (dj->clust == 0) {	/* Static table */
+			if (i >= fs->n_rootdir)	/* Report EOT when end of table */
+				return FR_NO_FILE;
+		}
+		else {					/* Dynamic table */
+			if (((i / 16) & (fs->csize - 1)) == 0) {	/* Cluster changed? */
+				clst = get_fat(dj->clust);		/* Get next cluster */
+				if (clst <= 1) return FR_DISK_ERR;
+				if (clst >= fs->n_fatent)		/* When it reached end of dynamic table */
+					return FR_NO_FILE;			/* Report EOT */
+				dj->clust = clst;				/* Initialize data for new cluster */
+				dj->sect = clust2sect(clst);
+			}
+		}
+	}
+
+	dj->index = i;
+
+	return FR_OK;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Directory handling - Find an object in the directory                  */
+/*-----------------------------------------------------------------------*/
+
+static
+FRESULT dir_find (
+	DIR *dj,		/* Pointer to the directory object linked to the file name */
+	BYTE *dir		/* 32-byte working buffer */
+)
+{
+	FRESULT res;
+	BYTE c;
+
+
+	res = dir_rewind(dj);			/* Rewind directory object */
+	if (res != FR_OK) return res;
+
+	do {
+		res = disk_readp(dir, dj->sect, (dj->index % 16) * 32, 32)	/* Read an entry */
+			? FR_DISK_ERR : FR_OK;
+		if (res != FR_OK) break;
+		c = dir[DIR_Name];	/* First character */
+		if (c == 0) { res = FR_NO_FILE; break; }	/* Reached to end of table */
+		if (!(dir[DIR_Attr] & AM_VOL) && !mem_cmp(dir, dj->fn, 11)) /* Is it a valid entry? */
+			break;
+		res = dir_next(dj);					/* Next entry */
+	} while (res == FR_OK);
+
+	return res;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read an object from the directory                                     */
+/*-----------------------------------------------------------------------*/
+#if _USE_DIR
+static
+FRESULT dir_read (
+	DIR *dj,		/* Pointer to the directory object to store read object name */
+	BYTE *dir		/* 32-byte working buffer */
+)
+{
+	FRESULT res;
+	BYTE a, c;
+
+
+	res = FR_NO_FILE;
+	while (dj->sect) {
+		res = disk_readp(dir, dj->sect, (dj->index % 16) * 32, 32)	/* Read an entry */
+			? FR_DISK_ERR : FR_OK;
+		if (res != FR_OK) break;
+		c = dir[DIR_Name];
+		if (c == 0) { res = FR_NO_FILE; break; }	/* Reached to end of table */
+		a = dir[DIR_Attr] & AM_MASK;
+		if (c != 0xE5 && c != '.' && !(a & AM_VOL))	/* Is it a valid entry? */
+			break;
+		res = dir_next(dj);			/* Next entry */
+		if (res != FR_OK) break;
+	}
+
+	if (res != FR_OK) dj->sect = 0;
+
+	return res;
+}
+#endif
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Pick a segment and create the object name in directory form           */
+/*-----------------------------------------------------------------------*/
+
+
+static
+FRESULT create_name (
+	DIR *dj,			/* Pointer to the directory object */
+	const char **path	/* Pointer to pointer to the segment in the path string */
+)
+{
+	BYTE c, ni, si, i, *sfn;
+	const char *p;
+#if _USE_LCC
+#ifdef _EXCVT
+	static const BYTE cvt[] = _EXCVT;
+#endif
+#endif
+
+	/* Create file name in directory form */
+	sfn = dj->fn;
+	mem_set(sfn, ' ', 11);
+	si = i = 0; ni = 8;
+	p = *path;
+	for (;;) {
+		c = p[si++];
+		if (c <= ' ' || c == '/') break;	/* Break on end of segment */
+		if (c == '.' || i >= ni) {
+			if (ni != 8 || c != '.') break;
+			i = 8; ni = 11;
+			continue;
+		}
+#if _USE_LCC
+#ifdef _EXCVT
+		if (c >= 0x80)					/* To upper extended char (SBCS) */
+			c = cvt[c - 0x80];
+#endif
+		if (IsDBCS1(c) && i < ni - 1) {	/* DBC 1st byte? */
+			BYTE d = p[si++];			/* Get 2nd byte */
+			sfn[i++] = c;
+			sfn[i++] = d;
+		} else
+#endif
+		{						/* Single byte code */
+			if (_USE_LCC && IsLower(c)) c -= 0x20;	/* toupper */
+			sfn[i++] = c;
+		}
+	}
+	*path = &p[si];						/* Rerurn pointer to the next segment */
+
+	sfn[11] = (c <= ' ') ? 1 : 0;		/* Set last segment flag if end of path */
+
+	return FR_OK;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Get file information from directory entry                             */
+/*-----------------------------------------------------------------------*/
+#if _USE_DIR
+static
+void get_fileinfo (		/* No return code */
+	DIR *dj,			/* Pointer to the directory object */
+	BYTE *dir,			/* 32-byte working buffer */
+	FILINFO *fno	 	/* Pointer to store the file information */
+)
+{
+	BYTE i, c;
+	char *p;
+
+
+	p = fno->fname;
+	if (dj->sect) {
+		for (i = 0; i < 8; i++) {	/* Copy file name body */
+			c = dir[i];
+			if (c == ' ') break;
+			if (c == 0x05) c = 0xE5;
+			*p++ = c;
+		}
+		if (dir[8] != ' ') {		/* Copy file name extension */
+			*p++ = '.';
+			for (i = 8; i < 11; i++) {
+				c = dir[i];
+				if (c == ' ') break;
+				*p++ = c;
+			}
+		}
+		fno->fattrib = dir[DIR_Attr];				/* Attribute */
+		fno->fsize = LD_DWORD(dir+DIR_FileSize);	/* Size */
+		fno->fdate = LD_WORD(dir+DIR_WrtDate);		/* Date */
+		fno->ftime = LD_WORD(dir+DIR_WrtTime);		/* Time */
+	}
+	*p = 0;
+}
+#endif /* _USE_DIR */
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Follow a file path                                                    */
+/*-----------------------------------------------------------------------*/
+
+static
+FRESULT follow_path (	/* FR_OK(0): successful, !=0: error code */
+	DIR *dj,			/* Directory object to return last directory and found object */
+	BYTE *dir,			/* 32-byte working buffer */
+	const char *path	/* Full-path string to find a file or directory */
+)
+{
+	FRESULT res;
+
+
+	while (*path == ' ') path++;		/* Strip leading spaces */
+	if (*path == '/') path++;			/* Strip heading separator if exist */
+	dj->sclust = 0;						/* Set start directory (always root dir) */
+
+	if ((BYTE)*path < ' ') {			/* Null path means the root directory */
+		res = dir_rewind(dj);
+		dir[0] = 0;
+
+	} else {							/* Follow path */
+		for (;;) {
+			res = create_name(dj, &path);	/* Get a segment */
+			if (res != FR_OK) break;
+			res = dir_find(dj, dir);		/* Find it */
+			if (res != FR_OK) break;		/* Could not find the object */
+			if (dj->fn[11]) break;			/* Last segment match. Function completed. */
+			if (!(dir[DIR_Attr] & AM_DIR)) { /* Cannot follow path because it is a file */
+				res = FR_NO_FILE; break;
+			}
+			dj->sclust = get_clust(dir);	/* Follow next */
+		}
+	}
+
+	return res;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Check a sector if it is an FAT boot record                            */
+/*-----------------------------------------------------------------------*/
+
+static
+BYTE check_fs (	/* 0:The FAT boot record, 1:Valid boot record but not an FAT, 2:Not a boot record, 3:Error */
+	BYTE *buf,	/* Working buffer */
+	DWORD sect	/* Sector# (lba) to check if it is an FAT boot record or not */
+)
+{
+	if (disk_readp(buf, sect, 510, 2))		/* Read the boot record */
+		return 3;
+	if (LD_WORD(buf) != 0xAA55)				/* Check record signature */
+		return 2;
+
+	if (!_FS_32ONLY && !disk_readp(buf, sect, BS_FilSysType, 2) && LD_WORD(buf) == 0x4146)	/* Check FAT12/16 */
+		return 0;
+	if (_FS_FAT32 && !disk_readp(buf, sect, BS_FilSysType32, 2) && LD_WORD(buf) == 0x4146)	/* Check FAT32 */
+		return 0;
+	return 1;
+}
+
+
+
+
+/*--------------------------------------------------------------------------
+
+   Public Functions
+
+--------------------------------------------------------------------------*/
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Mount/Unmount a Locical Drive                                         */
+/*-----------------------------------------------------------------------*/
+
+FRESULT pf_mount (
+	FATFS *fs		/* Pointer to new file system object */
+)
+{
+	BYTE fmt, buf[36];
+	DWORD bsect, fsize, tsect, mclst;
+
+
+	FatFs = 0;
+
+	if (disk_initialize() & STA_NOINIT)	/* Check if the drive is ready or not */
+		return FR_NOT_READY;
+
+	/* Search FAT partition on the drive */
+	bsect = 0;
+	fmt = check_fs(buf, bsect);			/* Check sector 0 as an SFD format */
+	if (fmt == 1) {						/* Not an FAT boot record, it may be FDISK format */
+		/* Check a partition listed in top of the partition table */
+		if (disk_readp(buf, bsect, MBR_Table, 16)) {	/* 1st partition entry */
+			fmt = 3;
+		} else {
+			if (buf[4]) {					/* Is the partition existing? */
+				bsect = LD_DWORD(&buf[8]);	/* Partition offset in LBA */
+				fmt = check_fs(buf, bsect);	/* Check the partition */
+			}
+		}
+	}
+	if (fmt == 3) return FR_DISK_ERR;
+	if (fmt) return FR_NO_FILESYSTEM;	/* No valid FAT patition is found */
+
+	/* Initialize the file system object */
+	if (disk_readp(buf, bsect, 13, sizeof (buf))) return FR_DISK_ERR;
+
+	fsize = LD_WORD(buf+BPB_FATSz16-13);				/* Number of sectors per FAT */
+	if (!fsize) fsize = LD_DWORD(buf+BPB_FATSz32-13);
+
+	fsize *= buf[BPB_NumFATs-13];						/* Number of sectors in FAT area */
+	fs->fatbase = bsect + LD_WORD(buf+BPB_RsvdSecCnt-13); /* FAT start sector (lba) */
+	fs->csize = buf[BPB_SecPerClus-13];					/* Number of sectors per cluster */
+	fs->n_rootdir = LD_WORD(buf+BPB_RootEntCnt-13);		/* Nmuber of root directory entries */
+	tsect = LD_WORD(buf+BPB_TotSec16-13);				/* Number of sectors on the file system */
+	if (!tsect) tsect = LD_DWORD(buf+BPB_TotSec32-13);
+	mclst = (tsect						/* Last cluster# + 1 */
+		- LD_WORD(buf+BPB_RsvdSecCnt-13) - fsize - fs->n_rootdir / 16
+		) / fs->csize + 2;
+	fs->n_fatent = (CLUST)mclst;
+
+	fmt = 0;							/* Determine the FAT sub type */
+	if (_FS_FAT12 && mclst < 0xFF7)
+		fmt = FS_FAT12;
+	if (_FS_FAT16 && mclst >= 0xFF8 && mclst < 0xFFF7)
+		fmt = FS_FAT16;
+	if (_FS_FAT32 && mclst >= 0xFFF7)
+		fmt = FS_FAT32;
+	if (!fmt) return FR_NO_FILESYSTEM;
+	fs->fs_type = fmt;
+
+	if (_FS_32ONLY || (_FS_FAT32 && fmt == FS_FAT32))
+		fs->dirbase = LD_DWORD(buf+(BPB_RootClus-13));	/* Root directory start cluster */
+	else
+		fs->dirbase = fs->fatbase + fsize;				/* Root directory start sector (lba) */
+	fs->database = fs->fatbase + fsize + fs->n_rootdir / 16;	/* Data start sector (lba) */
+
+	fs->flag = 0;
+	FatFs = fs;
+
+	return FR_OK;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Open or Create a File                                                 */
+/*-----------------------------------------------------------------------*/
+
+FRESULT pf_open (
+	const char *path	/* Pointer to the file name */
+)
+{
+	FRESULT res;
+	DIR dj;
+	BYTE sp[12], dir[32];
+	FATFS *fs = FatFs;
+
+
+	if (!fs) return FR_NOT_ENABLED;		/* Check file system */
+
+	fs->flag = 0;
+	dj.fn = sp;
+	res = follow_path(&dj, dir, path);	/* Follow the file path */
+	if (res != FR_OK) return res;		/* Follow failed */
+	if (!dir[0] || (dir[DIR_Attr] & AM_DIR))	/* It is a directory */
+		return FR_NO_FILE;
+
+	fs->org_clust = get_clust(dir);		/* File start cluster */
+	fs->fsize = LD_DWORD(dir+DIR_FileSize);	/* File size */
+	fs->fptr = 0;						/* File pointer */
+	fs->flag = FA_OPENED;
+
+	return FR_OK;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read File                                                             */
+/*-----------------------------------------------------------------------*/
+#if _USE_READ
+
+FRESULT pf_read (
+	void* buff,		/* Pointer to the read buffer (NULL:Forward data to the stream)*/
+	UINT btr,		/* Number of bytes to read */
+	UINT* br		/* Pointer to number of bytes read */
+)
+{
+	DRESULT dr;
+	CLUST clst;
+	DWORD sect, remain;
+	UINT rcnt;
+	BYTE cs, *rbuff = buff;
+	FATFS *fs = FatFs;
+
+
+	*br = 0;
+	if (!fs) return FR_NOT_ENABLED;		/* Check file system */
+	if (!(fs->flag & FA_OPENED))		/* Check if opened */
+		return FR_NOT_OPENED;
+
+	remain = fs->fsize - fs->fptr;
+	if (btr > remain) btr = (UINT)remain;			/* Truncate btr by remaining bytes */
+
+	while (btr)	{									/* Repeat until all data transferred */
+		if ((fs->fptr % 512) == 0) {				/* On the sector boundary? */
+			cs = (BYTE)(fs->fptr / 512 & (fs->csize - 1));	/* Sector offset in the cluster */
+			if (!cs) {								/* On the cluster boundary? */
+				if (fs->fptr == 0)					/* On the top of the file? */
+					clst = fs->org_clust;
+				else
+					clst = get_fat(fs->curr_clust);
+				if (clst <= 1) ABORT(FR_DISK_ERR);
+				fs->curr_clust = clst;				/* Update current cluster */
+			}
+			sect = clust2sect(fs->curr_clust);		/* Get current sector */
+			if (!sect) ABORT(FR_DISK_ERR);
+			fs->dsect = sect + cs;
+		}
+		rcnt = 512 - (UINT)fs->fptr % 512;			/* Get partial sector data from sector buffer */
+		if (rcnt > btr) rcnt = btr;
+		dr = disk_readp(!buff ? 0 : rbuff, fs->dsect, (UINT)fs->fptr % 512, rcnt);
+		if (dr) ABORT(FR_DISK_ERR);
+		fs->fptr += rcnt; rbuff += rcnt;			/* Update pointers and counters */
+		btr -= rcnt; *br += rcnt;
+	}
+
+	return FR_OK;
+}
+#endif
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Write File                                                            */
+/*-----------------------------------------------------------------------*/
+#if _USE_WRITE
+
+FRESULT pf_write (
+	const void* buff,	/* Pointer to the data to be written */
+	UINT btw,			/* Number of bytes to write (0:Finalize the current write operation) */
+	UINT* bw			/* Pointer to number of bytes written */
+)
+{
+	CLUST clst;
+	DWORD sect, remain;
+	const BYTE *p = buff;
+	BYTE cs;
+	UINT wcnt;
+	FATFS *fs = FatFs;
+
+
+	*bw = 0;
+	if (!fs) return FR_NOT_ENABLED;		/* Check file system */
+	if (!(fs->flag & FA_OPENED))		/* Check if opened */
+		return FR_NOT_OPENED;
+
+	if (!btw) {		/* Finalize request */
+		if ((fs->flag & FA__WIP) && disk_writep(0, 0)) ABORT(FR_DISK_ERR);
+		fs->flag &= ~FA__WIP;
+		return FR_OK;
+	} else {		/* Write data request */
+		if (!(fs->flag & FA__WIP))		/* Round-down fptr to the sector boundary */
+			fs->fptr &= 0xFFFFFE00;
+	}
+	remain = fs->fsize - fs->fptr;
+	if (btw > remain) btw = (UINT)remain;			/* Truncate btw by remaining bytes */
+
+	while (btw)	{									/* Repeat until all data transferred */
+		if ((UINT)fs->fptr % 512 == 0) {			/* On the sector boundary? */
+			cs = (BYTE)(fs->fptr / 512 & (fs->csize - 1));	/* Sector offset in the cluster */
+			if (!cs) {								/* On the cluster boundary? */
+				if (fs->fptr == 0)					/* On the top of the file? */
+					clst = fs->org_clust;
+				else
+					clst = get_fat(fs->curr_clust);
+				if (clst <= 1) ABORT(FR_DISK_ERR);
+				fs->curr_clust = clst;				/* Update current cluster */
+			}
+			sect = clust2sect(fs->curr_clust);		/* Get current sector */
+			if (!sect) ABORT(FR_DISK_ERR);
+			fs->dsect = sect + cs;
+			if (disk_writep(0, fs->dsect)) ABORT(FR_DISK_ERR);	/* Initiate a sector write operation */
+			fs->flag |= FA__WIP;
+		}
+		wcnt = 512 - (UINT)fs->fptr % 512;			/* Number of bytes to write to the sector */
+		if (wcnt > btw) wcnt = btw;
+		if (disk_writep(p, wcnt)) ABORT(FR_DISK_ERR);	/* Send data to the sector */
+		fs->fptr += wcnt; p += wcnt;				/* Update pointers and counters */
+		btw -= wcnt; *bw += wcnt;
+		if ((UINT)fs->fptr % 512 == 0) {
+			if (disk_writep(0, 0)) ABORT(FR_DISK_ERR);	/* Finalize the currtent secter write operation */
+			fs->flag &= ~FA__WIP;
+		}
+	}
+
+	return FR_OK;
+}
+#endif
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Seek File R/W Pointer                                                 */
+/*-----------------------------------------------------------------------*/
+#if _USE_LSEEK
+
+FRESULT pf_lseek (
+	DWORD ofs		/* File pointer from top of file */
+)
+{
+	CLUST clst;
+	DWORD bcs, sect, ifptr;
+	FATFS *fs = FatFs;
+
+
+	if (!fs) return FR_NOT_ENABLED;		/* Check file system */
+	if (!(fs->flag & FA_OPENED))		/* Check if opened */
+			return FR_NOT_OPENED;
+
+	if (ofs > fs->fsize) ofs = fs->fsize;	/* Clip offset with the file size */
+	ifptr = fs->fptr;
+	fs->fptr = 0;
+	if (ofs > 0) {
+		bcs = (DWORD)fs->csize * 512;	/* Cluster size (byte) */
+		if (ifptr > 0 &&
+			(ofs - 1) / bcs >= (ifptr - 1) / bcs) {	/* When seek to same or following cluster, */
+			fs->fptr = (ifptr - 1) & ~(bcs - 1);	/* start from the current cluster */
+			ofs -= fs->fptr;
+			clst = fs->curr_clust;
+		} else {							/* When seek to back cluster, */
+			clst = fs->org_clust;			/* start from the first cluster */
+			fs->curr_clust = clst;
+		}
+		while (ofs > bcs) {				/* Cluster following loop */
+			clst = get_fat(clst);		/* Follow cluster chain */
+			if (clst <= 1 || clst >= fs->n_fatent) ABORT(FR_DISK_ERR);
+			fs->curr_clust = clst;
+			fs->fptr += bcs;
+			ofs -= bcs;
+		}
+		fs->fptr += ofs;
+		sect = clust2sect(clst);		/* Current sector */
+		if (!sect) ABORT(FR_DISK_ERR);
+		fs->dsect = sect + (fs->fptr / 512 & (fs->csize - 1));
+	}
+
+	return FR_OK;
+}
+#endif
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Create a Directroy Object                                             */
+/*-----------------------------------------------------------------------*/
+#if _USE_DIR
+
+FRESULT pf_opendir (
+	DIR *dj,			/* Pointer to directory object to create */
+	const char *path	/* Pointer to the directory path */
+)
+{
+	FRESULT res;
+	BYTE sp[12], dir[32];
+	FATFS *fs = FatFs;
+
+
+	if (!fs) {				/* Check file system */
+		res = FR_NOT_ENABLED;
+	} else {
+		dj->fn = sp;
+		res = follow_path(dj, dir, path);		/* Follow the path to the directory */
+		if (res == FR_OK) {						/* Follow completed */
+			if (dir[0]) {						/* It is not the root dir */
+				if (dir[DIR_Attr] & AM_DIR)		/* The object is a directory */
+					dj->sclust = get_clust(dir);
+				else							/* The object is not a directory */
+					res = FR_NO_FILE;
+			}
+			if (res == FR_OK)
+				res = dir_rewind(dj);			/* Rewind dir */
+		}
+	}
+
+	return res;
+}
+
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read Directory Entry in Sequense                                      */
+/*-----------------------------------------------------------------------*/
+
+FRESULT pf_readdir (
+	DIR *dj,			/* Pointer to the open directory object */
+	FILINFO *fno		/* Pointer to file information to return */
+)
+{
+	FRESULT res;
+	BYTE sp[12], dir[32];
+	FATFS *fs = FatFs;
+
+
+	if (!fs) {				/* Check file system */
+		res = FR_NOT_ENABLED;
+	} else {
+		dj->fn = sp;
+		if (!fno) {
+			res = dir_rewind(dj);
+		} else {
+			res = dir_read(dj, dir);	/* Get current directory item */
+			if (res == FR_NO_FILE) res = FR_OK;
+			if (res == FR_OK) {				/* A valid entry is found */
+				get_fileinfo(dj, dir, fno);	/* Get the object information */
+				res = dir_next(dj);			/* Increment read index for next */
+				if (res == FR_NO_FILE) res = FR_OK;
+			}
+		}
+	}
+
+	return res;
+}
+
+#endif /* _USE_DIR */
+
diff --git a/bootloaders/zero/SDCard/pff.h b/bootloaders/zero/SDCard/pff.h
new file mode 100644
index 000000000..76157d085
--- /dev/null
+++ b/bootloaders/zero/SDCard/pff.h
@@ -0,0 +1,159 @@
+/*---------------------------------------------------------------------------/
+/  Petit FatFs - FAT file system module include file  R0.03   (C)ChaN, 2014
+/----------------------------------------------------------------------------/
+/ Petit FatFs module is an open source software to implement FAT file system to
+/ small embedded systems. This is a free software and is opened for education,
+/ research and commercial developments under license policy of following trems.
+/
+/  Copyright (C) 2014, ChaN, all right reserved.
+/
+/ * The Petit FatFs module is a free software and there is NO WARRANTY.
+/ * No restriction on use. You can use, modify and redistribute it for
+/   personal, non-profit or commercial use UNDER YOUR RESPONSIBILITY.
+/ * Redistributions of source code must retain the above copyright notice.
+/
+/----------------------------------------------------------------------------*/
+
+#ifndef _PFATFS
+#define _PFATFS	4004	/* Revision ID */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "integer.h"
+#include "pffconf.h"
+
+#if _PFATFS != _PFFCONF
+#error Wrong configuration file (pffconf.h).
+#endif
+
+#if _FS_FAT32
+#define	CLUST	DWORD
+#else
+#define	CLUST	WORD
+#endif
+
+
+/* File system object structure */
+
+typedef struct {
+	BYTE	fs_type;	/* FAT sub type */
+	BYTE	flag;		/* File status flags */
+	BYTE	csize;		/* Number of sectors per cluster */
+	BYTE	pad1;
+	WORD	n_rootdir;	/* Number of root directory entries (0 on FAT32) */
+	CLUST	n_fatent;	/* Number of FAT entries (= number of clusters + 2) */
+	DWORD	fatbase;	/* FAT start sector */
+	DWORD	dirbase;	/* Root directory start sector (Cluster# on FAT32) */
+	DWORD	database;	/* Data start sector */
+	DWORD	fptr;		/* File R/W pointer */
+	DWORD	fsize;		/* File size */
+	CLUST	org_clust;	/* File start cluster */
+	CLUST	curr_clust;	/* File current cluster */
+	DWORD	dsect;		/* File current data sector */
+} FATFS;
+
+
+
+/* Directory object structure */
+
+typedef struct {
+	WORD	index;		/* Current read/write index number */
+	BYTE*	fn;			/* Pointer to the SFN (in/out) {file[8],ext[3],status[1]} */
+	CLUST	sclust;		/* Table start cluster (0:Static table) */
+	CLUST	clust;		/* Current cluster */
+	DWORD	sect;		/* Current sector */
+} DIR;
+
+
+
+/* File status structure */
+
+typedef struct {
+	DWORD	fsize;		/* File size */
+	WORD	fdate;		/* Last modified date */
+	WORD	ftime;		/* Last modified time */
+	BYTE	fattrib;	/* Attribute */
+	char	fname[13];	/* File name */
+} FILINFO;
+
+
+
+/* File function return code (FRESULT) */
+
+typedef enum {
+	FR_OK = 0,			/* 0 */
+	FR_DISK_ERR,		/* 1 */
+	FR_NOT_READY,		/* 2 */
+	FR_NO_FILE,			/* 3 */
+	FR_NOT_OPENED,		/* 4 */
+	FR_NOT_ENABLED,		/* 5 */
+	FR_NO_FILESYSTEM	/* 6 */
+} FRESULT;
+
+
+
+/*--------------------------------------------------------------*/
+/* Petit FatFs module application interface                     */
+
+FRESULT pf_mount (FATFS* fs);								/* Mount/Unmount a logical drive */
+FRESULT pf_open (const char* path);							/* Open a file */
+FRESULT pf_read (void* buff, UINT btr, UINT* br);			/* Read data from the open file */
+FRESULT pf_write (const void* buff, UINT btw, UINT* bw);	/* Write data to the open file */
+FRESULT pf_lseek (DWORD ofs);								/* Move file pointer of the open file */
+FRESULT pf_opendir (DIR* dj, const char* path);				/* Open a directory */
+FRESULT pf_readdir (DIR* dj, FILINFO* fno);					/* Read a directory item from the open directory */
+
+
+
+/*--------------------------------------------------------------*/
+/* Flags and offset address                                     */
+
+/* File status flag (FATFS.flag) */
+
+#define	FA_OPENED	0x01
+#define	FA_WPRT		0x02
+#define	FA__WIP		0x40
+
+
+/* FAT sub type (FATFS.fs_type) */
+
+#define FS_FAT12	1
+#define FS_FAT16	2
+#define FS_FAT32	3
+
+
+/* File attribute bits for directory entry */
+
+#define	AM_RDO	0x01	/* Read only */
+#define	AM_HID	0x02	/* Hidden */
+#define	AM_SYS	0x04	/* System */
+#define	AM_VOL	0x08	/* Volume label */
+#define AM_LFN	0x0F	/* LFN entry */
+#define AM_DIR	0x10	/* Directory */
+#define AM_ARC	0x20	/* Archive */
+#define AM_MASK	0x3F	/* Mask of defined bits */
+
+
+/*--------------------------------*/
+/* Multi-byte word access macros  */
+
+#if _WORD_ACCESS == 1	/* Enable word access to the FAT structure */
+#define	LD_WORD(ptr)		(WORD)(*(WORD*)(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(*(DWORD*)(BYTE*)(ptr))
+#define	ST_WORD(ptr,val)	*(WORD*)(BYTE*)(ptr)=(WORD)(val)
+#define	ST_DWORD(ptr,val)	*(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
+#else					/* Use byte-by-byte access to the FAT structure */
+#define	LD_WORD(ptr)		(WORD)(((WORD)*((BYTE*)(ptr)+1)<<8)|(WORD)*(BYTE*)(ptr))
+#define	LD_DWORD(ptr)		(DWORD)(((DWORD)*((BYTE*)(ptr)+3)<<24)|((DWORD)*((BYTE*)(ptr)+2)<<16)|((WORD)*((BYTE*)(ptr)+1)<<8)|*(BYTE*)(ptr))
+#define	ST_WORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8)
+#define	ST_DWORD(ptr,val)	*(BYTE*)(ptr)=(BYTE)(val); *((BYTE*)(ptr)+1)=(BYTE)((WORD)(val)>>8); *((BYTE*)(ptr)+2)=(BYTE)((DWORD)(val)>>16); *((BYTE*)(ptr)+3)=(BYTE)((DWORD)(val)>>24)
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _PFATFS */
diff --git a/bootloaders/zero/SDCard/pffconf.h b/bootloaders/zero/SDCard/pffconf.h
new file mode 100644
index 000000000..a5038506a
--- /dev/null
+++ b/bootloaders/zero/SDCard/pffconf.h
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------/
+/  Petit FatFs - Configuration file  R0.03 (C)ChaN, 2014
+/---------------------------------------------------------------------------*/
+
+#ifndef _PFFCONF
+#define _PFFCONF 4004	/* Revision ID */
+
+#include "../board_definitions.h"
+
+/*---------------------------------------------------------------------------/
+/ Function Configurations
+/---------------------------------------------------------------------------*/
+
+#define	_USE_READ	1	/* Enable pf_read() function */
+#define	_USE_DIR	0	/* Enable pf_opendir() and pf_readdir() function */
+
+#if defined(SDCARD_VERIFICATION_DISABLED)
+#define	_USE_LSEEK	0	/* Enable pf_lseek() function */
+#else
+#define _USE_LSEEK      1       /* Enable pf_lseek() function */
+#endif
+
+#define	_USE_WRITE	0	/* Enable pf_write() function */
+
+#define _FS_FAT12	0	/* Enable FAT12 */
+#define _FS_FAT16	1	/* Enable FAT16 */
+#define _FS_FAT32	1	/* Enable FAT32 */
+
+
+/*---------------------------------------------------------------------------/
+/ Locale and Namespace Configurations
+/---------------------------------------------------------------------------*/
+
+#define _USE_LCC	0	/* Allow lower case characters for path name */
+
+#define	_CODE_PAGE	437
+/* The _CODE_PAGE specifies the code page to be used on the target system.
+/  SBCS code pages with _USE_LCC == 1 requiers a 128 byte of case conversion
+/  table. This might occupy RAM on some platforms, e.g. avr-gcc.
+/  When _USE_LCC == 0, _CODE_PAGE has no effect.
+/
+/   932  - Japanese Shift_JIS (DBCS, OEM, Windows)
+/   936  - Simplified Chinese GBK (DBCS, OEM, Windows)
+/   949  - Korean (DBCS, OEM, Windows)
+/   950  - Traditional Chinese Big5 (DBCS, OEM, Windows)
+/   1250 - Central Europe (Windows)
+/   1251 - Cyrillic (Windows)
+/   1252 - Latin 1 (Windows)
+/   1253 - Greek (Windows)
+/   1254 - Turkish (Windows)
+/   1255 - Hebrew (Windows)
+/   1256 - Arabic (Windows)
+/   1257 - Baltic (Windows)
+/   1258 - Vietnam (OEM, Windows)
+/   437  - U.S. (OEM)
+/   720  - Arabic (OEM)
+/   737  - Greek (OEM)
+/   775  - Baltic (OEM)
+/   850  - Multilingual Latin 1 (OEM)
+/   858  - Multilingual Latin 1 + Euro (OEM)
+/   852  - Latin 2 (OEM)
+/   855  - Cyrillic (OEM)
+/   866  - Russian (OEM)
+/   857  - Turkish (OEM)
+/   862  - Hebrew (OEM)
+/   874  - Thai (OEM, Windows)
+*/
+
+
+/*---------------------------------------------------------------------------/
+/ System Configurations
+/---------------------------------------------------------------------------*/
+
+#define _WORD_ACCESS	0
+/* The _WORD_ACCESS option is an only platform dependent option. It defines
+/  which access method is used to the word data on the FAT volume.
+/
+/   0: Byte-by-byte access. Always compatible with all platforms.
+/   1: Word access. Do not choose this unless under both the following conditions.
+/
+/  * Address misaligned memory access is always allowed for ALL instructions.
+/  * Byte order on the memory is little-endian.
+/
+/  If it is the case, _WORD_ACCESS can also be set to 1 to improve performance and
+/  reduce code size. Following table shows an example of some processor types.
+/
+/   ARM7TDMI    0           ColdFire    0           V850E       0
+/   Cortex-M3   0           Z80         0/1         V850ES      0/1
+/   Cortex-M0   0           RX600(LE)   0/1         TLCS-870    0/1
+/   AVR         0/1         RX600(BE)   0           TLCS-900    0/1
+/   AVR32       0           RL78        0           R32C        0
+/   PIC18       0/1         SH-2        0           M16C        0/1
+/   PIC24       0           H8S         0           MSP430      0
+/   PIC32       0           H8/300H     0           x86         0/1
+*/
+
+#endif /* _PFFCONF */
diff --git a/bootloaders/zero/SDCard/sdBootloader.c b/bootloaders/zero/SDCard/sdBootloader.c
new file mode 100644
index 000000000..d7a30f971
--- /dev/null
+++ b/bootloaders/zero/SDCard/sdBootloader.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2017 MattairTech LLC. All right reserved.
+ * Copyright (C) 2014, ChaN, 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
+ */
+
+#include "sdBootloader.h"
+
+FATFS Fatfs;                    /* Petit-FatFs work area */
+BYTE Buff[FLASH_PAGE_SIZE];        /* Page data buffer */
+
+char updateBin[] = "UPDATE.BIN";
+char update2Bin[] = "UPDATE2.BIN";
+
+uint8_t sdBootloader (uint8_t mode)
+{
+  DWORD fa = APP_START;       /* Flash address */
+  UINT br;        /* Bytes read */
+  char * fileName;
+
+  if (mode == SD_BOOTLOADER_MODE_UPDATE) {
+    fileName = updateBin;
+  } else {
+    fileName = update2Bin;
+  }
+
+  if (pf_mount(&Fatfs) == FR_OK) {       /* Initialize file system */
+    if (pf_open(fileName) == FR_OK) {      /* Open application file */
+#if !defined(SDCARD_VERIFICATION_DISABLED)
+      // Check if installed binary already matches file
+      if (flashVerify()) {
+        #if defined(SDCARD_AUTORUN_DISABLED)
+        LED_status(LED_STATUS_FILE_ALREADY_MATCHES);
+        #else
+        systemReset();       // software reset, then execute flash
+        #endif
+      }
+      pf_lseek(0);
+#endif
+
+      flashErase(fa); // erase entire FLASH beyond bootloader
+
+      do {
+        memset(Buff, 0xFF, FLASH_PAGE_SIZE);       /* Clear buffer */
+        pf_read(Buff, FLASH_PAGE_SIZE, &br);       /* Load a page data */
+        if (br) {
+          if (fa >= FLASH_SIZE) {
+            flashErase(APP_START); // erase entire FLASH beyond bootloader
+            LED_status(LED_STATUS_FILE_TOO_LARGE);
+          } else {
+            flashWrite(br, (uint32_t *)Buff, (uint32_t *)fa);
+          }
+        }
+        fa += FLASH_PAGE_SIZE;
+      } while (br);
+
+#if !defined(SDCARD_VERIFICATION_DISABLED)
+      // Verification
+      if (!flashVerify()) {
+        flashErase(APP_START); // erase entire FLASH beyond bootloader
+        LED_status(LED_STATUS_VERIFICATION_FAILURE);
+      }
+#endif
+
+#if defined(SDCARD_AUTORUN_DISABLED)
+      LED_status(LED_STATUS_SUCCESS);
+#else
+      systemReset();       // software reset, then execute flash
+#endif
+    }
+  }
+
+  return(SD_BOOTLOADER_FILE_NOT_FOUND);
+}
+
+bool flashVerify (void)
+{
+  DWORD fa = APP_START;
+  UINT br;
+
+  pf_lseek(0);
+
+  do {
+    pf_read(Buff, FLASH_PAGE_SIZE, &br);       /* Load a page data */
+
+    if (br) {
+      for (uint8_t i=0; i<br; i++) {
+        if (Buff[i] != *((BYTE *)(fa + i))) {
+          return (false);
+        }
+      }
+    }
+
+    fa += FLASH_PAGE_SIZE;
+  } while (br);
+
+  return (true);
+}
diff --git a/bootloaders/zero/SDCard/sdBootloader.h b/bootloaders/zero/SDCard/sdBootloader.h
new file mode 100644
index 000000000..1f8a71b44
--- /dev/null
+++ b/bootloaders/zero/SDCard/sdBootloader.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017 MattairTech LLC. All right reserved.
+ * Copyright (C) 2014, ChaN, 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 _SD_BOOTLOADER_H_
+#define _SD_BOOTLOADER_H_
+
+#include "sam.h"
+#include <string.h>
+#include <stdbool.h>
+#include "pff.h"
+#include "../board_definitions.h"
+#include "../board_driver_led.h"
+#include "../util.h"
+
+#define SD_BOOTLOADER_MODE_NO_UPDATE    0
+#define SD_BOOTLOADER_MODE_UPDATE       1
+#define SD_BOOTLOADER_MODE_UPDATE2      2
+
+#define SD_BOOTLOADER_NOT_CALLED                0
+#define SD_BOOTLOADER_SUCCESS                   1
+#define SD_BOOTLOADER_FILE_ALREADY_MATCHES      2
+#define SD_BOOTLOADER_FILE_NOT_FOUND            3
+#define SD_BOOTLOADER_FILE_TOO_LARGE            4
+#define SD_BOOTLOADER_VERIFICATION_FAILURE      5
+
+uint8_t sdBootloader (uint8_t mode);
+bool flashVerify (void);
+
+#endif
diff --git a/bootloaders/zero/binaries/README.md b/bootloaders/zero/binaries/README.md
index 4ce8a0850..51c3b23a5 100644
--- a/bootloaders/zero/binaries/README.md
+++ b/bootloaders/zero/binaries/README.md
@@ -1,37 +1,73 @@
 # Arduino Zero Bootloader Binaries
 
-This directory contains the SAM-BA m0+ bootloaders built by the
-build_all_bootloaders.sh script from the 'MattairTech SAM M0+
-Boards' Arduino core, which is available at
-https://github.com/mattairtech/ArduinoCore-samd.
+The bootloaders/zero/binaries directory contains the SAM-BA m0+
+bootloaders built by the build_all_bootloaders.sh script from
+the 'MattairTech SAM M0+ Boards' Arduino core, which is available
+at https://github.com/mattairtech/ArduinoCore-samd. Each board
+and chip combination has two bootloaders available:
+
+* SAM-BA interface only
+  * USB CDC only for all MattairTech boards
+  * Both USB CDC and UART for most Arduino boards
+  * The Generic board variants minimize external pin usage
+    * Only the SAM-BA interface pins are used (no crystal, LED, etc.)
+  * Filename is: sam_ba_$(BOARD_ID)_$(MCU)
+
+* SAM-BA interface and SD Card interface
+  * USB CDC only for all Arduino and most MattairTech boards
+  * No SAM-BA interface for the D11 chips
+  * All board variants define SDCARD_USE_PIN1 (except D11)
+  * The Generic board variants use the LED
+  * SDCARD_AUTORUN_DISABLED is defined
+  * Filename is: sam_ba_sdcard_$(BOARD_ID)_$(MCU)
+
 
 ## MattairTech Boards
+
 MattairTech boards are all configured with only one interface:
 SAM_BA_USBCDC_ONLY (except C21, which uses SAM_BA_UART_ONLY).
 CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_INTERNAL_USB
 (CLOCKCONFIG_INTERNAL for the C21). Only the main LED is defined.
 BOOT_LOAD_PIN is not defined, but BOOT_DOUBLE_TAP_ENABLED is.
+When the SD Card interface is enabled, SDCARD_AUTORUN_DISABLED and
+SDCARD_USE_PIN1 are defined.
+
+## MattairTech/Generic D11 Boards
+
+All boards are configured with only the USB CDC interface, except
+when SDCARD_ENABLED is defined, then only the SD Card interface is
+enabled. ARDUINO_EXTENDED_CAPABILITIES is set to 0 (disabled).
+TERMINAL_MODE_ENABLED is not defined. As of 1.6.8-beta-b2,
+USB_VENDOR_STRINGS_ENABLED is now defined. BOOT_LOAD_PIN is not
+defined, but BOOT_DOUBLE_TAP_ENABLED is. When the SD Card interface is
+enabled, SDCARD_AUTORUN_DISABLED is defined (but not SDCARD_USE_PIN1).
 
 ## Arduino/Genuino Boards
-Arduino/Genuino boards are all configured with both interfaces.
+
+Most Arduino/Genuino boards are configured with both interfaces,
+except when SDCARD_ENABLED is defined, then only USB CDC is enabled.
 CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_32768HZ_CRYSTAL.
 All LEDs that are installed for each board are defined (and some
 have LED_POLARITY_LOW_ON set). BOOT_LOAD_PIN is not defined, but
-BOOT_DOUBLE_TAP_ENABLED is.
+BOOT_DOUBLE_TAP_ENABLED is. When the SD Card interface is enabled,
+SDCARD_AUTORUN_DISABLED and SDCARD_USE_PIN1 are defined.
 
 ## Generic Boards
+
 The generic boards are all configured to minimize external hardware
 requirements. Only one interface is enabled: SAM_BA_USBCDC_ONLY
 (except C21, which uses SAM_BA_UART_ONLY). CLOCKCONFIG_CLOCK_SOURCE
 is set to CLOCKCONFIG_INTERNAL_USB (CLOCKCONFIG_INTERNAL for the C21),
 so no crystal is required. No LEDs are defined. BOOT_LOAD_PIN is not
 defined, but BOOT_DOUBLE_TAP_ENABLED is, since it uses the reset pin.
+When the SD Card interface is enabled, SDCARD_AUTORUN_DISABLED and
+SDCARD_USE_PIN1 are defined.
 
 
 ## License
+Copyright (c) 2017 MattairTech LLC. All right reserved.
 Copyright (c) 2015 Arduino LLC.  All right reserved.
 Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
-Copyright (c) 2017 MattairTech 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
@@ -46,3 +82,16 @@ 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
+
+### Petit FatFS
+
+Petit FatFs module is an open source software to implement FAT file system to
+small embedded systems. This is a free software and is opened for education,
+research and commercial developments under license policy of following trems.
+
+Copyright (C) 2014, ChaN, all right reserved.
+
+* The Petit FatFs module is a free software and there is NO WARRANTY.
+* No restriction on use. You can use, modify and redistribute it for
+  personal, non-profit or commercial use UNDER YOUR RESPONSIBILITY.
+* Redistributions of source code must retain the above copyright notice.
diff --git a/bootloaders/zero/binaries/sam_ba_Generic_D11C14A_SAMD11C14A.bin b/bootloaders/zero/binaries/sam_ba_Generic_D11C14A_SAMD11C14A.bin
index 5f14510d5ed9cb3bc1093560e2401ebf38a68a17..84805bd14a68f561aa727019f6f97321da339d69 100755
GIT binary patch
delta 2694
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
YxHduScUtiEEH(ywTqAD%<BEI#3yz6(rvLx|

delta 2719
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
Mm1_|hzpdH)U!RPFG5`Po

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_D11D14AM_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_Generic_D11D14AM_SAMD11D14AM.bin
index 56a2ca87de126728226dee307d117c3a22a44e12..6d68b1169453155c44d175eab49003daddd6f6f8 100755
GIT binary patch
delta 2694
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
Z3%E8x%Xgab^(-_7d|boj`p0GW{};5{b@l)N

delta 2719
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
NtJfkjep`3<e*v>)gEIgC

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_D11D14AS_SAMD11D14AS.bin b/bootloaders/zero/binaries/sam_ba_Generic_D11D14AS_SAMD11D14AS.bin
index ecfa9537fb3903fc9899663ec9c5f4618cc33ad9..d6952faefd3f19ac983ce8bc9d8a0da05a7d2465 100755
GIT binary patch
delta 2694
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
ZR&Z^CmhUv<>se?F__&74^^eQ$|1Y;cb^QPU

delta 2719
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
NS-lpK@!Pt4{tL6MgEs&G

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E15A.bin
index 7659bd9eaacee315b3448de3c5414fe0e0ee5601..e021e90491f0f8045e571a2c12ba9e7ddb033432 100755
GIT binary patch
delta 2035
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
Rb*P0pcfdGKJ53sY{{``vi}wHk

delta 2140
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
Wpsl^DJ@A`&oocEZMDHz#@%s;_1&w3?

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E16A.bin
index bd85dd3bede96751e27acacd7d8995d487592a46..64e9d62a071a2e51b9325a088e0e6ba15ae1f713 100755
GIT binary patch
delta 2035
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
RZ9py5xeF$6+GWxB{1-#=jF$ia

delta 2140
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
Wp{>2EJ@A`&oocEZMDMML@%s;)M2&<1

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E17A.bin
index 9e9d49d29f2db19194ac3f33ef31b27406f41bbe..6473527f026e713b6a5678609e98f9a1d88dd8f8 100755
GIT binary patch
delta 2035
zcmZ8i4{RIN8UNnd@xT1@C2g?J*VI0zkoY>)e_BWz*j&5B_Pr#dgV82|=~9OF0vo;2
zvRO!#vvrIzC^R)_X;n6m){Q?xDnY3LDOyk~t<@O#q9K{?k1nDj)7T_e9XL%K-@Z!=
zns&P1d*AoH@8A2r_wN3&;mC%T+BYD0ngG0jI6)@)z<L095t%Qamyv$eHu?2V_d0-}
zCDkS$l-*hjfDZ-U$rD8uMS`aj(lE0J`Sh?l%m|Jxba>p89vN#^NQl??`~|1|BTp{N
zJULgYs=E~k?S5=>JnO9e*{Qg4yh<eDhgt@buoGN3ijZ7&VmL1(?N;RP|CK8~LvAk|
zU9ua+)bc!pxO2;k^+i+(TB)5O*XM(nnUhYXJY^?Mxh{=46k$R*q&sULk*FEHvZ!U|
z`b`seg@L%!rdgSpa6z}f)I88aH;Lg1`Ox1{7s9`S=Y~n*m%F_(DILayokKTIY(Dg9
z0T)j}o8Rr96Fyn2%+B>&j&`9VJ3^aDiyKQn<1V-UG)$TvB!6kROa=p&eGmAPiOxKc
zI?|om!>&(!(S#={=8r>bXfpXsTGZyI{rO`_PV}Vbrv*)$bx?sh=*bk(o5Fk35I&qD
zC6ZXd<O_5CUzUTTBaEX$YFWp!-6+@6OxIx7P=t~A#?oigAd9-BNCP)v=$n$H6jnWk
z#5S%uzC~>@!s>>sS-oi9qIM|l?C@3B5i|T^x}DCbqs*5vtIPF$XFF(zGNQ&Fnv>j|
z+tXHXc+&BGAe~g5lAuE6iDfUfOM=!)19^~Fbf_51&|NK&AXGw2P&u?zTU<Lg{{{n^
zAZZ=AZ9h5S48H6HuK~vIZP-9;Uku@zfyx6*u36WNO>~L8IF)hDl5V@sQJW&DHtN%~
zjQe?1^fdwW7C+_=G{0pwoQYx+;wXK-IBW|PrjWvVKxL*h0O7FuA$?qW@{FK;F!<q+
z%%WmoJQ<qG{E33(Q{Sgs#7-Oq^^b!WauMcczexRa{tq<3guEF6{ro~W0;Pu*&JQJU
zbB@w1J(mkGPAW6A`mp&<)|S6p-mbrkmW`~K5<h-BOA7IbdQy0o5*A=2M$~tPu#59?
z6^w)$XF&#)AFL!;Hxqmj^$o?#-t+P5n@YR(dhRvF%^F40*RK8!yH9oq>g)6sC6MRY
z)2W8}Un>`dHncxJehd$A>%zBWr+$*Yqy!kxM#qC}D$}s=P1&v&PSGHSwrO=Ei|iB)
zA=fxjHTEF)f)ZwJOi(MvewovQjD#EpLq`&OHrsxL3)xh&y3SlMek?cWVfIuu!0agd
z&tgVy*MClZxa&L3C$T!#N!fSyiM5u4e$mKNM=*eKrZVRW#yuE_gcI5URAk1G+@!A+
zPv1`uepS2=>VO(=828GfdLKKOD>EXQ)pPYe_9)Ueq-T-V2Ft8Rv{ud{_Xw^uBYg(x
z9`U-xYxVo+c<#O-zdE9zM>Q%I+S&c$dNq)@6+yO@Y>XtV9o#h-XEL+;Hd&Y1NRF)a
z@aej3Y9u$HL{(l@@CNJ^y=V!ty_B_D5Es;|i+yOd%Q_JvDVo(sF?gA!a-1}1q?El_
zJ1_ctYPFZ<aC2q0vtSI%ttiY;=(bAiQ*DNyNvL#mbqh_cDQz)E<fy)hwKKT+GoP(!
zJ8?ASD0Sy!B2>Drk!=p~^TjUOi@Mj-?5#V)tx`P6i?_O?F?R(1=8Sozc^~WN?;(9x
z=KGla)iQHoZNl|JACqsCa6`Q<_jtHb^Wj++)b-e{V(L4k7TWcd<EHw(1}{dpUzl#C
z?rwY8$2h{L{VGN2&g~67+se1?=rxYvjmld03vm}BiP(i0Kv?%~FW$yeIKPCry?}#t
z1$z-&ap8W%t%xy1FJc#B5U~~4cjNqR#2&;bf)~dysJ*;rhmR5BNjr_r5l;8BkV*_k
zmeZ_lG~8&6{l>iM)46^txdDWgRKYt#y1ttVie|M|v&L(+wyatGqQ>KRwZ_xV&?WpW
zT^ehpNpxpcH?E$SnzJpr<2JLpy3&lts9kHq3;F->;#Y<P4{*>3)(`4^{NjQgQjsqJ
zeuIH!{QsN==m@@o%w}YI5U!c`ra26}QoPgML;h9V?;aysQFo6b2f^Q>W~8{yW3F)#
zOH#a}aq)lFzSfk8eeMGAy8+yYLB#hER}j}c06)S{tMb?*!FUwk*liGt?uc%E>&+&a
RTZdL?a|ev$w9}&T`7ihvjMxAG

delta 2140
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
WfVTFo_P}rAb*iau5WTk`#_vCd!i~fL

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E18A.bin
index e3dc35a0e5318d17be724dd4644d892705977cf3..c3422322068a96ceb47e4d7f4a5b20df5c37b98f 100755
GIT binary patch
delta 2038
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
V-?}@wb+{3?-45e8?KEk8{tFXdjsE}u

delta 2143
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
bY=E}*uJ%Azu;Vv<bv{$wATF>4F@FC64!e%%

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E15A.bin
index 78ace994fc14c20b902eb5bc1bd2eaed73e9b02d..df0b2ffecefc095577690daca5bb160c2863f267 100755
GIT binary patch
delta 2633
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

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E16A.bin
index 225840f145c76bfa5d155d220a018ccf2d5bd1c7..d3be23bf90782948ac520e522073fa60a6500368 100755
GIT binary patch
delta 2633
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

delta 2771
zcmZ8ie^3<H9e;1{CkN=AXYtruWN#1jxYLB=Kmk#YJB7Pj4u7WdBgrg;qz~)VD@L<A
zn!7|viIpj^X@`*7*3rz=q-GRLV$;%+YSL;mom*OGh$b^f+k|v7vDn0daIpO@X#eQV
zeD3?czuvz0`M&Ra=T?8{T9VF3EY=}(SBua+ZLh_?93gZcl!w1L7(dp#F+ZaLAyzd`
z_CD>&n6x7FI2d;KzWQD3$208V*l-U<tfDAC=mE1?%EQih`OrF^b=+#ltSNY_rIgnf
z&>|J2V<r4jE?4Xg=EibG2mC)8&Jx+65j2yZj?tpvFhP`u_e7c!P2$c$<et4<#A637
zs`dd<Hl+W$DnyYTnfaW>-y1-(&SCMN!g<|XxX2GPc52C)EK`*~-;Lxvj_J;KnEa=L
zT#)Xhh`}+MZStRlBn@Zs+qx~9oCxKIi92(}I9SvLXdTO>3pj7>A*Fm6X_3ES3#zUH
zGy+f-^6UM;!**0%ASBS{X?4?z(j$F|gSbrcQbC<cg;_dGwb)bh*!jg{$mxrr6vMF0
z^zgGlkLpiK_o&UdM=H~NEB=tWB>1+2kK&uf=0W6{xgD!jzen-6$u0ft%~<V74KgDC
z^iUDM($Pd*+fD{4Agf7ux7`S`u>Rc^%$3A^;w^*rCih^LsoQK_f;)Q(6-vRgCzPo%
zC6A{`!r8Z^k9rMRgJ&CCY5wo6ea>d2y00r|Pf;A0VSH5?5|pVcij_YA@|Oy?cNuT>
zJ6ko*%b@>4S-N2VxuT0~>^Rmj+%ea&izFZyM|KI*!y`3Po3=pe(TedE)7q32_;?gK
zsH-y*^Ao@ys~)HxYEga-=P4Znc7atCLe+(l@*yi(&S2llq&$d<>@vsOMC`Qr9lS}-
zBW$=kfMuJoG?go?4C4w^l$LV^CprF=u}g6d1ZjRiSk5;STdgvcue27vjV8;dbNCez
zEz=}eBO?y;-V8mWkO>DZt%w^C3>+;;Z|Lb~#2GaCkD2rYFwG)V4%Js%r0j(QhS292
zp)XO&oI<JJX%IRH>o*Re$#-Uq!{#9!ud8zcDf{MF#zB;+CXnV~bw6g<V{Ayrj9fG_
zIZPIVCb!N>YYYYWPtp#<KQlj@^LDw&%Y(|)J!z})d(=~D>CZ-&p$qbrsh?h+Gw#B1
zwWkgPjsl(sBmjp16f6S+9I(_g4v-u|f(5BRc00%_fFE!KbP<r*W#n8$3g9tQSKpu^
zjGW3;UfPgSKXpE>0f`;T)IfR)YPSXA4X`cD;blGeyp32P$dJbD5^$QOag%jzb($4(
zR1J1$9x~La)7WP<3}TN5bV-hcoQf~`xLP&yuvv0sej`3MtFp4lh_Ox&9gz(=_h*o^
zA2L|tW!#`=r!|a?i7muU4`tQqAZ`iRKZUr}OexbJFeT9%L$ZkBm~!Cy-fRKA)^=~g
z2U+T|Q|C7hX&578Vft$+zKx?3MzFsGmm7;*l#C-3PYbcyYrsuH8qPeBeM!+>EQXL5
zAtE7d%(BN%sFUz?7jkQobQiAd8>ADu|I^imd<im6049feFB;E(7|CS3H@sJO+}Lqd
zxFKA<&R-7=kRydVH9ME~p`8tX2vfq3$+^MSV3zQH7!{a=Ymw!`wYtLCwYvACPU2$h
z?S4mpEsDFS<nI?&{vMAwoA4f=2N;R|b{j3Y$p$hI_-ynyyq(aZ0=L}qzd79~`NjCJ
z>U|>e=#!WDD`7jKxG`X-Lb<@(#a*5%c>{4n@mGHIRtT54g#r2^kBOaNFBaaa9|+*l
z5&@-r!p}k_1d+J52TkV8_(&0HvblvbksNZ@W)WVGSYsZ7H+Y28aEahbS~$c1Bw`mW
z<of~BC`Woj*J(uh+Iwn&=Vaf)21aVS$9H;6^2yLE5hqM-A<gZYp8nc4PU5pu+dMk?
z1m7L8lVyaCiQ^&A6a35ZMMEMsz6T6P`OZaMAmjTz8d-$rz(x!y;xWnx`R7BhSBJez
z1O4~W{GRdWJbHOQe;BM<hn;AIuO@0eR*16!8yU)Tz?ynbw7z{1ctIW{ZyJAw*Ryuu
zqQAC$e78p{!|UaXwLoB7s@{_&FOVuf!9VpsQhVmrOPw44re}}rByHg_f;nZXbKXf>
zVXT31e7*(hS;Q=QMDRQbo^0@R!1$qk-#ovqF4_Q{SRr_XO2)-l$&*ZuV2_JB33)V0
z4Z%K*@b$!|dN=VAwVu1?eI)YWgVA~2t3^U2Tp?6OtfYZ43+j%v$@OY+N@&=*4{EMv
zl|$AT@r5bwgOo4Q;8`IT)US%JBUbQVLJ|}&KiXjYyrn$kO5{ad$KoFtW^Xpz{yo9+
zrLgNU@<yuBb6AEN@!l|UQ?i|83j0#aqDGQSzD>;aiNZI7eZ~U<a<?Sid{)$x$gKAr
z`vhh|PE&L(!9ToUd^4c=OF>juUzVtW=iq+wG^%ODzWN<^CZ2^(M1E9V4qaCaSQCf8
zqW~8m0jL6~ZN`Eu0F(mMX1xN5T`)ccU;qp4sOsQ*1$@JR9|2N;e!w{Z^}3>50NDjG
zTVSjOY_2amb_W)F8ijNHxubOawTUXeYGLP(q?$aB%9Z>Il1I?0f8`Db^huZKg^T>y
zG%nLK|C#VEaD*4yt#i)cT*{UBEzG)%VsC~UePZz1*b&>_niqEC4R=SKM1Ova7~vem
z=A2~pgVVBiu8=>%(Xm2kc3LRlq5e`}ZPLy=VF`;9H_jENEKG659|sve!=)X|BW`R7
z<_a`et1EOxnz5B+eWe%cL2m(FJ7yz$Dls+%jj1(mjckhK5{rOSnPF2*{YdtMGm^C+
zZ+@!MuQGiJm^n(pqc;SDcK~V$REkx)e+{}yeSs7;ufTVtr_IOXMkt+GeR38`2sbK7
zgaH&li_jtPL|Z!8k_xt@*t;GTmsXZ~E4>w{!IX^}0Znj1ve70~@<_3oT4X|KE1(6?
m2{`jWUI*D+-O+Zi{X6?B8ycIQfLMn)aCxgm!5B%rwei0Oetz))

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E17A.bin
index f651ae7680f5a02a4e926a6f1ba4561743b84e68..1c379d56499eaefd79800f39fbd6b0b9ca7720fd 100755
GIT binary patch
delta 2633
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

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E18A.bin
index c8c94e899ecbd9979d270867188b5076f857f4b0..52b86be3ce2297e2e8b4dc98888816c170c45aa1 100755
GIT binary patch
delta 2633
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
A8UO$Q

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E15B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E15B.bin
index b9d9be6f879b1826a70ca52edc23413c2aad42ae..5e7cf2d348e21c814ef221f325b46160ef087406 100755
GIT binary patch
delta 2555
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

delta 2705
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E16B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E16B.bin
index be29c99f72c215175e8870fe9ad11c1ab25b9905..7db3b3d8c9c2368555f4dbc557efbefcf03f9a05 100755
GIT binary patch
delta 2555
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

delta 2705
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E17B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E17B.bin
index 147e0fa9601ab703867550fc3835fa80593973a2..15732be6225dc1bf50081833d04cbebe9ceb579e 100755
GIT binary patch
delta 2555
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

delta 2705
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E18B.bin
index 135a0b9a7cb431c4b9e433b4284c54dd5f35dbb0..22675b86e6ae1991c24edb251a0750f765f0b242 100755
GIT binary patch
delta 2555
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

delta 2705
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G15A.bin
index 3b9a1d55e918dec0e6c7f716e2a7c4d53a79a066..e55d9a2f13ff25e0cda5d8c878dc64e697815ab1 100755
GIT binary patch
delta 2038
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
W_1mUSZXGJ3+8r>4(@u-V-+uxBo{aeb

delta 2143
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
bU<0(ZceMw)LT$h9tMi%a262Hci1GUm#P^P5

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G16A.bin
index 29ff1842ecee3a6bf100401562c26ec290eb8495..8a746084da86134365c06c65e36e9714e0a0221d 100755
GIT binary patch
delta 2038
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
V-!^q~8&DC|?t%%Nc3Ct&{{>U@jhX-e

delta 2143
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
bz(#0m?`jWpg#y3ntMi%a262I{i1GUmx~YzZ

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G17A.bin
index 4b30a89d37d1390133799103dc580b47f9622cac..318b0ecd9013c32656668cdbba5e8e6944bf5341 100755
GIT binary patch
delta 2038
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
Vf7{f_twTdJyA8&1+F{c8{1*uZjobhL

delta 2143
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
bfep~s-qjxH3I%@MSLZX;4dMb@5aahBrRR>t

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G18A.bin
index 035639731b9521829032d7e6ee9cdc6c67cfc64e..b83420741d828b58bf61f13a880c3f951239ca5d 100755
GIT binary patch
delta 2038
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
WH-78w<Tl_&+;$gC;Izx4@%b-u<&Ite

delta 2143
zcmZvde{5UD9l*cm=OoWg+SpA??dO;9Y$wI>gDtj`wn?+%+Erq|i{16dXxeV*oOS5J
z(D2GS46N7{n+V$~H8Gvi(4tlX2?p&-rc@v;kgh4C6@U0;>t@h8Ig?nBCLpXEDN7UY
z``m)2X_h|k?t9<w-F?5`yRUDk@x#WIH?yFeBmhT{VKQuYtpR{zD17ldj{Vc7;mu8!
zIsnBOEe?N2wG>wZ*l<7`KAvYj?ARvkn%TXR=aky$PF7F%43g-c)XF$f#I%^1t}$P&
zjcw(%F>_==x5hz<9UL0mT66Oc#O?e(&T<>GY?D(x5QZ%v;#Y?7QVnirgK+*?(oO7n
zoit<(CtfF@810|Y2d}nqqJgiLNvNryk3*|VSEwUHypHgl)T%e~rudNv(H*S5<YaQ3
zbVBP*-O0TCsq5lU**g|>&@r}(?&FT$^1>74f%7oGZgDkTqfNQ@GP`D}wmk?Yu#%{K
z06b%?ChL(fHdhAJMIGj!UIgDlfhaiX2F(BB#?3kOUqPSiAZ#SI<M1Oj%4rPZBPiKQ
zP<l%MXf={H0rP`5#7S{NkVV-pkM^4AevgzBG5&Vc6Q5Z(Q9+ZKKpp9H?+F~sVZ`ep
z|3~3K_Ds3zTpOCU;jp1PaQ>6);!|d=feDqkq8LrOcdF+U>O?9HfnO*{L!@hDT*_7b
zk8Ic(TLzK&iQ#kN%kOHna^Onf;`S@sFS0A_;$?a{HpU-s*&*zxAAueHzstr=>;!*d
zd>~rKF2$kQ%BHo|Y`U){J>7RH;pINrH5hh}_JYq;_-!Sw3luyKc7Zk`Q;9dXNzBhT
z@v+F?W`09mT*{RFps)U`*AIoi&%TiiVRowvuhG}zE^hJ^d3m9ud<JvAQ|;C_aX-)I
zBTes}jgg?AjY;Py;Vw=Bgq=-}MaWE$K`F#e#ey8T`6$f)WiiBC`Cf;go!0K)pE~U9
zMXe#Na<WNfC#l3qm&8uf=QUTx&VLrM&UpB6?6L%WWbkMufRRc7Q$0s!cc@nVr?F=>
zZx)xf^L>ND(b3-ho;+Pq+NM_NKc+`C7hlDtbY?b&a*jT8OU|Wdccc6x`jcBS<FgN|
zf}Wwo?cg;fu8R6W`eY1ab-RWHR$h2-dH3w2YPJ3_eGEs<ZWkBW^|@ZP0qq=^jjW~o
zD5lN0!2{<HRxTsxn`a-O)rt#qG1|Lvc9&|_i8qu^q22ycQmxY~N!7nazx`!Wf4&T8
z;hDWp-K~51{&<lSPkG_+vX>8FU%>to%PBn0R{56Z2dKFpH7l~H`W^~jDEKnn)|cpy
zgSV5ZtV{OE4g7xj4(7^K<v|q+0w*DX{c~<}($7QOIL~d%A+FutFuq)Myp?J3PS&M0
z@P65b^FTEhHW-H!lrZuTp1Cor9cLAJD4sQW-Y$i-es!(hoLrY!&l}L-HOS-X-I?eY
zKTK_m`Erd3-=Vi_7O(De{9{g`?HF~D|FX14eN4wAqJcR0O}dNMvWH5m5+Zl<?{Zr*
z*YZkqM0|vSKUMJ4x`djmO@<C#!&Sg*P29uDu`}W;5h45g=0sJpBiB>PM?No{gq}Sl
zl-&OD9K#AV{=If#DfJ;SWE9zo7-iaz7-iOtgpsc!MhQ>hyce*23E7Ak<!F@ddgKJ^
zE+Nk&myuIQ_Er3tUM!a<u)Q0NwqoCm+?(t;^f7vS65`IVb4Ge@uA6pOBL7NhuliNJ
zi>~F39M*l}oQzZ#e3^g@^J_jQ9o6z@bAd{ZNTu8kFV%SKJ;AVDUT<j&Sp0CUCg4z}
z91r#!-bFTjnw|0T>X(aL#C!12l9%6g`?@@^)IuNkNa+@=c8N9P#mq<UDY&Q?UAVRI
zH<nsTcDb$dopG63eCA>!_Y-^6$s`=z(pl9i6r1>lt^lb<Ifb&h=-|7%2(d=R(%pVR
zw`xvqXIWCJja$>kCM#}VlDbNJ^#ddQMylVy%owSk#P%)3I07TZM!GMeY^2^e0^5X4
zi6Ui8&8Dc7mT0}lnHi2c)6R?=ziZ=l86_&BWDTP>qqwbTwJJ-WbiY4njlQ3<(=a+=
zqu=B<Du@5APkZWPw)lupUbwbcPv!Lg!#1e_Z0SHKV!U+k;!F4CYiEXt|1*GB(YX*l
zb7!zUhqPlqfQS<p#;Z)R^1`3;OJXZ|Cx4eEMT+@nEc+~m`Yf6T^B-Bt6)9+p<o{)z
z`!C%GwV_=i-cuW*AYmkj06z2h(gBzOzGeYPA={B-$ghx2D|%ZC@I#!HNF7juol3AR
bumRfIyV?U?q2RCk>U^fUL0n)9V*LICe0GmU

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G15A.bin
index 4de2eaa371208d5f0af84416260b23769f369adc..62551791434ced85b3ad94d7aab417c07048c346 100755
GIT binary patch
delta 2641
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
Gb^iwv;a#i%

delta 2796
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
KBLo!D+5BG{`hm*;

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G16A.bin
index 73cfe6a0909bfbd2c644c198555059596103f8a3..8fbc1b2823728ebce3c70a33c7bedcba6580fc71 100755
GIT binary patch
delta 2641
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
G*8d+699~QS

delta 2796
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
JBZ;>*{})E=f$RVP

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G17A.bin
index 07a72aa5f180c7725600f47eb4d0b1b92ad494a0..347bbb707443dcb7844be925e6b977e2919f9a4b 100755
GIT binary patch
delta 2641
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
F{{JvAUXB0&

delta 2796
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
KBLo!D+5BIeDuOHk

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G18A.bin
index fc8c41cd261f45088289dd2b4c16132941e9eee1..3af67184ce848208a4dddffba844db19ce0d45c1 100755
GIT binary patch
delta 2641
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
HI@bLka3fz4

delta 2796
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
Kgn%MCoBs<(2!gEu

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G16B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G16B.bin
index b5c2a91ea0d64e187a25c751f0ed2ebb5f8c79bc..77de884064128c459978deba023dee1d701f362f 100755
GIT binary patch
delta 2555
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

delta 2705
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G17B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G17B.bin
index df8965e6780f51d09392c3e1c162346cd622da2f..c745da26f39e267fa70d2079f804b2637341762e 100755
GIT binary patch
delta 2555
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

delta 2705
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G18B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G18B.bin
index 25a0fb8f1b36933ea25887a14774d093ad803a72..fe167d8d36ebf718025cbdef4c6f53deecc74c2b 100755
GIT binary patch
delta 2555
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

delta 2705
zcmZ8jeNa=`6~Fi8>k)`11|fNQNRkH{5@iYT1CVM=wm|X-){j;|*Lk43d$CT9Qr755
zlU3QWD{O&hXMomDnd#2db#_PD!Md}ui`Cs$+s@?CI>Xl4nb7W*?%3U8w=EO{ujfVV
zAI;3~oqNwY_r806=bZcU>Dr5~73ny#n=}YvfJW1AvgIO#vS9M`XMk}*|JMq$8WFN9
z${YR9d$Mkr5jp^hz5PSS%@YguQ_=B0jO?;3|DX@lMzH{M@rtoZ9y^EHv_+=iP|FtH
z8Z!m0(aroyhb7h>v_vg2J3M`L>X<V~MVXk%Z-uAe&<B}lDereOLMh)&N_i%*Af4qN
zXqXtz*oI@0F8zm+Iu&WkF66BKp#YLJj<Zgye^S$fSNC$E62Bv8s_Rmdk(_LQp$AC?
zTyAfnBir8-<bvidis-mW1LL={!?0B4R5sW9ExjgHUYPR3>$|M6xKr<E;5cf>D)AaF
z*sxcw7)NU4Z*(DlHJ}O5XF+}hSkxiJ3JJ7*ULio1`^3+2kTT0+DHYHtycop}s>SyH
z66PL$6LG#MO0le+oge=$aHZIj;v;H1?i0PL7n`2)m;~E5z(xTFREC3S?bDZ0`~&hw
z&Exyg+KC#JgZ%SjB@Jq4JMlZr!FAzwVNV-n&kpWsNkCxOF?4(=hJ!=mXR5Ua)^Qi!
z3v%b=x!=iFo+0m{ffWOkIr!(6Jf3SE;PxZM_JPb@pq%E6-@CGj_q57$S7fd;$0-KY
zioV0ZKLp)~tPW$&e7v0$22Tp};*08H@uIpKn?y-%jw=PzM<Kf+Z$iBkhbzX+B$vg$
zHA!g{mDnUFZ;4^f;&<?Rsesr+y#Xv)gq10)uqK2nQAt{|3LH8272Pd!!$F207IOLh
z#8NBI1?AT3XtrWLkIxUQ*=E5Uo^TkCWN8tF^f+j0Mb2T3po0n$k7$_}Vhd>Y(}na5
zkfoF`jr>a4Z+f|1XCHyoeSuQO6iR)dLZ}1IN{^x0Uo6n$#<8=Urv8D36Xdz?FWOlL
zk>@%<8pkJUj1X6JOv6rGrP(|-hefkrUljkQEy7=jCf(;b^pdyRMP411=kk|CE&U30
zC@sEDyL4~Da(V97JLB{oY*HHK3?Kn`2@n$<dfW3Z6Pyrc7LaNH4LA++PC#}y?Q{__
zfT#4`1EabS;^evQX<bU$^fzf0NbHd3Zl>qpgwKM%ZcGCWi2Lwm3o(OFNgCT%D5n=k
z^yUqR()L*1axBI%UA?l)md7d<+0O+uNhhh}WMA@tk{{!^QJmJVjxRh`qJI)QU9W`_
zHo%(Ij}bQrE9}I}x?%oITE$w}XvS}TET>)rek(wa!EYVAksS=^lW4szS;9Km3g9$9
zUBqm#{A<PstLB%_LyxIgnl-V5wG@BY$s}md_rTR;M=najVdw`TTH6EEB*f0_cEdGU
zbF~ayy1^qME@s=}=OIBf&vYZVD#>)?s)11^q4~eL(mg$};x)kRSpQY}@^8c0toNSx
z_O5%oZVUH>+jsf9b;IOz@ov@bl>=yZ<F7)L@MH3`(biy&@L>oQ>4iJtT;WcAar938
zhY^mrSX-OlF<6V@E-LxU%*k)@$Y~L7@dbd1$oo4P!A-W3;lN)eZ}K+6#AG*;a{t7+
zQS#yRyA8e=@@SLS_!}V`p`25|PNn=7Z;S2mR7+cl8*;zq<G1T@xmy@!uJV}J2=-#(
z?S|n1o-7wo$|wA^uACqeSNEaWyagXAA<Y)IFcQuqk1QtPjj%cDA$Y4txCG6Qs~BN~
z|4G;uGm#4c{iKuh*WG0h8EEUP1)h@wnE)ngdZ%}L^wMi}7sDKEZ6f>IRDFZBhn*sC
zNbU4!r1N}l*hW?nCK{WrgL#5~HU31Ah)(YV#TmZq$y^}Q$2=-2#$$(t=u*T(OC9|8
z>L6B!ty=|s_VLob>60F<bc{a*TD8MQRKiy?wH`D0S%8f!`6RHW+z74LJAfAicl);K
z7kI7R23!o*R!r~ps3rLJ_@XV~csSMI$&oUoO3(3!{zq!xl5z_>r@!UdCvoI(Xo_H`
zJlD0vkyaS1U>sj+fqa&*Pb@L890ZF2EGJ<6RDX1d-&r4Nghs3sJVF)gV$I|rn<v=f
zF^z~ks-%iwpGx@W%(ezM@ew7TdzO48y!^t*l4htx2!|?#s<4?fvPMCPNS)lGB&VE#
z$bFD=WmN^Nnj*ds<@_k+3paZ5rJ{zlk<G*m_G?Il<P}C5>A$vA)VUG`5m#sYBi-Zs
z`z`;NvGW@t>M8POs>yRof*kSQ5OPzJjbsZ)Q>!90v662SV?(0&N^pQ~7m&Lp>E?4H
zo<w$ouk#bw1#$Yw27-V17JVh4`h8JE)37N~lM(~}NnS!VP1x74>&uyH=tTGw?x=vS
zD+8>L!{ZFV1xNs@0ZN<MK^6fv0y51C3%g<517H;iK1%Dp4)Orlx&Q|OKL-eaqX6m+
zS?&ON9(<mKu^O<wVN>UqaM(*IWc6DonfQ-ps`=_n<fW-*&ofdLpHB)1TKjkFctD$U
z#k_E3ch2KYTK3;F-V8@L({5dhI&P)2+;3txXO(%g+~^aX*J7Wr9I1JEFW&lSk|Wy7
zQ-p>(h%Rzu-Ey@YSuEyHJDF%PG&>^{@sNKpupw#VIXJ?TjhhyWQzo{o^4Fs*pXE|d
z6%aRuze558+8vde64lfivZcz4wJ>jixq8Y%_Ell557MdiZk41DTZu`)sqBzGs=UOo
zTq8LddH*woeue2%z|0w{5Iz_%hy#=qC=@GnpM$wVeUWG|=Hu&PvGH7-hSV9AFHR<f
zaHE1m7(fBk2)zWBNXrR(d8NI)%)14ZZLHept@4$jM!f+w0h*yg3}_oFFD+A+KFUJK
rphu_#5COC;%YKmicbquf(e|BVRgF!}&w;PQ7<flxk}*bNwz=uQ3!GS3

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J15A.bin
index 72eed20d30e10ebb8c2a62b4501c53f49566ac99..8d25e8a459b72dba1cb93826e651d2f1d166da9d 100755
GIT binary patch
delta 2038
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
WH-78x;x?cns@(+>IPEfN{QVdIpN#nc

delta 2143
zcmZvde{5679l*cm=OoWgAU1(wKfk2Uc0wJ$c8l#KkdQHBqr`p}oAF~Kz*e0zR$aPk
z_2^jLcGO1Qv~(L1iOUpHs6c9^b}fu%3TmZg4I^{~^$)*nY;H9sXHu6+Q`>ZG4P8jQ
z?=!TTrdj&DyYGF!clZ5%@4mj_#`han->L`Y6ahGjjF1t#YaIX_N8z*I3GAOSjcjSM
z)Bz~QXmR9Qs-?IZz=i|j$ca4jVaGOU*Uau+Jg3w~cd>f9cZfvyrdG#^BBsU6OpW<k
zZEPE_jhQ2hx-||;?9lMgwwhaiAa3V(ahBVdWt*Drg)nRd5x+8omuql48-(-EkRD>s
z>!cxTIPn?*#c2PGK6tfFlMQ^WOhQcseF9otx<VZp;&p`YrdGX?H^q-ei0)wZB`1^P
zqzhVa=}zY5Pu&oQ%ii&*gO0N`bU%0Wl^35V4_<(U4NGh3I&Ip$kJ&X#we3MLft5t<
zgWwrwHCc~@vAHs!F6prF<0bGd7KnnAZo<OPZ{C_m{}uGP4#GxaJB~b3qnyDYK7f*~
z1f@3wfL0@Eldv#!Q=Aef1zD8s@>rjV9`Hyx5#w)1J@J`!6BRUx3Dl8J_npMC97fy;
z`9BH=vuDdy=iAV<4TlZY!3!VV5T7z@4NR!S6~$=Mebc?CQ72Mq82my(8YbPN6H>0~
ze`LeX*fNMLOpcrvUwT`sl>=7;mv&s;afw}Jm#)w&v2p%*%T8fu{V41l_+2(`Vki0Y
z6NAw@b~z5sRyL!pWi$OP>6!k^2`~4_uA#7dtPgyq!fz{aU8LY~u#2=2nNIv>yTtr_
zGarxqZT8pH#idNy5Bl1_di_xN``qiv5N5Z!@G5;R?&2m-k(U=c%4ad>yVM?iGxzgs
zKGO8gxfluh*|>C`67J$8K-jtDc!bOb8I(fobS%h$n~%Z5UzS3=mG5)-*%|FF{;|W(
zUeFrSDkqy&c8W@zbW7|EeNJ;_?EI$@>#T>5#I8udM~9A80vN3XFx`7}Zl`M1e-e8}
z^JZ~rJKsMf92@I9;K|cfrR{2!{zH0HbMZA?N@wO`DCg+Yx8+=VZV$>opg+1TGd}mQ
zD(D$X+zwt-;;N`0qEE&!R<~<dVCBVkR`$$2s#fa{)5mbs>~?X1-I(uF8_>>y*~nVT
zk7C-48$5X7P~|d$zGdzKTCKP+7h`>!=60)Qop?j(6xtmqCDl5;l2rX0^qZe2^=B)9
z7M{7Use5!UKM*f+;wdj4S@H5g><id`VkL#g*(%@Gd=EAEqh?hWRo_A3GX-Cv+xrs(
zaqxCAm37NLxq;s=-^E;+sywJdLEt1Luz${PN&0z+8|S%wCB(Hm8^%|vPP8&D-o?7L
z20kF$a2}}U!ban8f)Yj^!ZSB!wd1TJ55==4&zq%?HlVK8o0A(7oxA}JUWGiK-rb1-
z@%_}Mm@n6u@Ev}$X6f2~$3Ny3+Ky2d`7cU))yH%^A{vN;-=w>EEqkc6CLwYs|2DTJ
zb1g4NN5w}N_)`TxtxKr6+GObPbzB9!*2I0B96u|*91*g=Z%$MtJ953HeB{%@Dd^ox
zLdhK;&NHk~<KJsHmQp_wL&lJ8h*72kh*4%eNErDFVwCVS&U+r)7m-bfQI1CGb|NQH
zcNuvOxq_TVvajIB^g_8jiS4~;v<>@a<jcv9!ylrzry%YOJ7=Y5=X+>RCGszn_Niag
zyXkt~$YH}r&Z$Us!Iufhu(0k^(orpcG9Reqh*Zk$$a0Oh-V+Sl<xWdmz~YDNH35e*
z?Rc>F$ZoRv<Ls=LSHD!`BHn|Cmc9I*JJ;ob<rez5M@qL~wM(oSFJ?Y+U%^Ga=)&!V
zzq;H~vde8<Z%xS5;xiW;xu4jhPA1{#)~>2nq1ePXb_Yl`$|;o1MF-#0O^7urmhSZn
zx>a*>JIj(%ZQPnRHd%G&lGIh&YwsE9H&XpNX2wYU6t-_5#t|4PHqw0wWh3>*5!fbW
zN)#z$YBoisv_$JY&df;EnRaH}_+1~b%P3J1C2JV98O3cyt2J5rr2E|=YxLceorci~
z8~r-BQ91l?ea2HCv&Bb+^5XTSdMc;?AGRqCU~30L5#yzM8(+H5Upq5I{GR~4g3g8T
znLCT^d88ft0Ysd<I8kMal^6e%Ulv=*Tlsq|DN@WoZP{-z)aTGNnE$|1u1G;+B>yk#
z{D0}*s}1cI@t)cc1qmZL1n`;1mkz)T@FfdC3fX}iM}CQPS<%~CfbZk1MCzat>{5bl
bfsN4C-rXMP4t4&jzs_f>8^Q&)BF67O#c7Ue

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J16A.bin
index 00ff72d10a7e86eea31fd97f381e8d5d5f532d21..5046e0f611665896771719edecc80213f2dd98d0 100755
GIT binary patch
delta 2038
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
U+ompV11h509WaU0PLsyxzf<*%ng9R*

delta 2143
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
bz(#0m?`jWpg*N`Cug+(x8^i^+BF67OyBm&+

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J17A.bin
index ce93d82eceffd72a15a85ca5cacd64e84e05d6dc..799e0ecbdbba1fecdd5c9b468b63811f1defce95 100755
GIT binary patch
delta 2038
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
Vf7{f_twTdJyA8&1+F{c8{1*u9joSbK

delta 2143
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J18A.bin
index 73f3741c5cf5ada3653244e59555f7266905a13b..4ebbc22797ebc6703b279bae151daf784169b8d2 100755
GIT binary patch
delta 2038
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
WH-78w<Tl_&+;$gC;Izx4@%b-u=8j$f

delta 2143
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
bz$R#G?`{uthdO`NU*|K`4dDV?5##qCeCUr%

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J15A.bin
index d124f85e75c7779371bbb682551e86e791b124b2..7612033472c38cdc952a927976c674e3d370e245 100755
GIT binary patch
delta 2633
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

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J16A.bin
index b03f062c5c92f0b7515bcd91c0d7979430bf8343..861ce62a6524e2ec2644402c0c4cc1f9cbab3cfa 100755
GIT binary patch
delta 2633
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

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J17A.bin
index 8913cb3d8f9215492b55cad6baf1a3c014f727e8..54ddb29c33f40c1464886b1e57e33c0ddcc7fbf5 100755
GIT binary patch
delta 2633
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

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J18A.bin
index e65924f8b6b8439b56d90de73ff5e8f78a259d69..6b2981f370257f1da51a5c693877497b4397cf0d 100755
GIT binary patch
delta 2633
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
ADgXcg

delta 2771
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

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J16B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J16B.bin
index 05dc815cad30ff0d68523ca7d642e1d67860399a..2ce7f1413133bbc89ff9c073752768a6150e157f 100755
GIT binary patch
delta 2559
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

delta 2728
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
E0c{jm@Bjb+

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J17B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J17B.bin
index 79f042c58427a384a0bd83f10e26f68f7eb17841..8731d94f1e5df92c869e8954b5ce3c1b0d5286de 100755
GIT binary patch
delta 2559
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

delta 2728
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
E1-8;zFaQ7m

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J18B.bin
index 8644b7500cc341bc0ba029b8861446856e8a654c..61f1be2868b10e72e2664bc628a4efd8e2eb169c 100755
GIT binary patch
delta 2559
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

delta 2728
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
E0ZOo0u>b%7

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D11_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_MT_D11_SAMD11D14AM.bin
index 8c0affe612fbcd5457eafa86d72503867ac2536d..c79712f9077c989dbc47622c3c867463869af6e2 100755
GIT binary patch
delta 2824
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
LVM?U^*uDFI4uO`y

delta 2831
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

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E17A.bin
index a31b12e3f9d94719b4647a367a71ce7659bf7605..ef01630b3217fb0d75b9997e4fa2579920432ace 100755
GIT binary patch
delta 2481
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
H7H#<-l*2zH

delta 2658
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

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E18A.bin
index 34a3ef1b9e936717151d88662b8a259be9bd817a..d4702ccf7fea01b02112cfdb9880c45aee044478 100755
GIT binary patch
delta 2481
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
GTmA=%UO%1y

delta 2658
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

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E18A.bin
index 13c25eacc40aca4c5dbdcfb6c354bca7bb5523ec..1e0b59614595db218b44a5758017794d221b2951 100755
GIT binary patch
delta 2028
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
VZ8H8h*V!@ax4<NRVTTab^Izk?j~D;|

delta 2137
zcmZXV4{TdU9mjw7Y$wl7(%4P5+Rrbk|0G-D*N!+&(!{NbYe$Lgi{14PG-<o(oP}{2
zgBePhx3$<EAO%>pCT60`TGUFb#2B5@KqinDNY`x8Y7%~difpLJMjA#!jFiFBHBHR#
zIUPb^>GSS>zu(=xyYKIQep8L7HgC9-21lm=(2TSS;}-ip0I(H}PkvtP@6wI$Y&4ny
z9Gdso_~#Vkv08w7bX1SO_&nK?Z6z-aY(>*NV~OgW`*_At723yY>Ch+%4J9^2h(k<@
zsrgF%^{Q|$uL|pf%c>~?j_}d3(ca2CzaviDmvNR;n`NGz>&u#j`s@~AN7`~rpU(zw
zFMw0Ha=W-z#P>V2jl4nD+YIibIodr_$LnR{Ys{(B&}vs*)S4o0YrsiOY6EvfP6ml;
zWwm)5YmAT{XuYG_n45p&LvgI+o(xHJlGW2g+}dASex@}1IxKBjdDi_0L%=neW(O1X
zv_3lLJjg6jV}<!K5Wqx2mSJ#BvPzf4Hc)#Clob`0##W$ZIY%6@bpI__`u?pu#j;-2
z5Gad$;z*_Ad?mo&AaBk?{+Bv{2k;=`OlkSz8Z3?85@*F3oh-^0`E<WPM_f`yoZURv
z*NuZni(VC|E-En{wI-AO=g`+w1K`gd*B`05STantp=cfGJ(pe8+tV*=3sY$fJi44T
zM*I`gQpWH<cCvqc?JgX<G&4RWzVc4AO7>p!UfFYP&lPr!UAaoHh9~*c&3kowYbRju
z;IASAJHua|9u8Hrw<6GFV)M~@Hb2muoF8~A=H@N3eKg=a-4E#&A@^qa1eYnetn4yv
zK;~k<*ex*+-_9q4e_nWl+PRb}c|fiIliLHizZQNT_o0#%xl8nC5jz)Li@dblS-Ob&
z?o)QC+qs8lgN^UL7AEZ;HYrU}!tI=R341L*86*qs4Dvp9F5J$6r}d{`>5nTu-pUVJ
zJ?wn+UVhVRVHcuxNrjW`3Oh?BPW%!(Pk#`#r!4%tLDPbZkB6^Hz$Zpe^#dMYqI`h4
zzLSN$ib?%W_<K<|E^Xn5Ms=r7_m8-;v?jk>F{t09C!==0kxR)`A&hp0emlMH$RrB~
z&~c1@Yu#qN@PwjMQ<ONZyfV)fQ9Vk(9>%je?PEGtT7Gx!K;cQHLVbchg<ieW&UNg=
zV!u*{<E*HLvGgRWrd`|N*N>L(9jH4CkJ1W<9kn>!-(A?R=vCrQ`;rM9IFgSm)oNK(
z^&$Gme?)z54cxw@tMFOnfa>NWkws2irR5WAZa$2C9rmADOJF`*<@Lx{G4e1*YB2I8
z?0@3tYjpQOY%l`u9;PtA+#=WUhvj>jJ)JUSLDA)OocMI?pT(VV5BG5`pS#z5JbL$q
zku}4Mtt=YpVg6_xAC%2Zt0aAHo0gn*2~Y0BoNKc>aMmLCMFiK|d0%u;*`zkb?~8Tu
zI*ea}EGBPrY*745qC4D@X^6EPPrqHca{Z9?A4Lc4z*8^sALWOXr&P=l^+v!WsCHh(
z9?x%#iQLA&z|HYY^Q)l=@dyJ?BIlviF(p$K_Z`21tAN`S+serc7sXeDy5Ba%4DrrP
zAO0hKoI4ABL&O)~^FdLMl?VaYHHek;ATp4~#~CDyXr+1>(aJ1<^dkEatyo8J;t#R?
zF|q^EN?j{mKN7&$C=x`zi1Z>4BEp4IX$adk9Mg+^J@V;z=kX74vu7b<3)mK<^h?DZ
zbVvE*59ALjpHlsF6K~*f-`{Ps!HQf<$}7XtJs*?K3i+d=x2zE<m)nWeN_VZRJz$Z$
zjBQ?{2X0h)t&TbCV|^#~lkGPb+`QtIMK0n!czo5(@4tIn9$jswPrIaKGZwqVnkeQ!
z8{C?+Q#Wp5ec{inHs>vJThFhjWom5EFE(%wv4m_)Lhr5~L#uAFk#F;RNd?*owDpTt
ze!x$NDJ15%cyy{MYU370@>LO2QhQ0w-8)iUZm++u$*(E>5Gr#9@SB#v&LfDH0!?B~
z?$4vGNw1~AJR?)$kWxaE5R#G-t##Q_;~`tpmU7~AQ=~fO2#IK!0vJs>oF*K#kv2Nt
z8#RUAOIT<CH({oSxtYp=+v>clHf)Ye=t|4KU#X??;Uqr(5A$pkKc$@rML>kWJ2LJY
zS;fx+=ppF&2w(~~w+%mTm$3aQ(vAI2M4Y)iErd(UYW9M$mAsk#jWI!vWxb|DMlCvx
zBfGLMm`Y`<OY>yURu%s%cCy;HN5t2d5eE`LG6)bvK=c3wBY?pK@Goq8u-%8;K;Ewc
o_!`cNCBEWl?{T!ZdAC7Zhrh%7lbh9wVAj_gU=&x_g=oKj132Z3ZU6uP

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E17A.bin
index ec6d251d2479c74d6ceba2988530c0121d57712f..b775aa60f14de025931e49b7e6184e2b4006a5db 100755
GIT binary patch
delta 2483
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
Jeturp{{S`QHktqc

delta 2679
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

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E18A.bin
index 0f8c4e8a1c4c3a11839193550e834fd3bb9dc2e3..f6b08a4d66b14f848834861d4095d6cee12b226b 100755
GIT binary patch
delta 2483
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
HKd<Y5GSN33

delta 2679
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

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E18B.bin
index 5e164e6d0c6cfbbc127098913e35ad398018c925..711db2ce06248d7652234ab2bc29bb329b700fc8 100755
GIT binary patch
delta 2479
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

delta 2631
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
BQ1Ac%

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_m0_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_m0_SAMD21G18A.bin
index 69b04f1e197391c5010f60dc0ea0820639375c68..564906554f1d909a4d990a5e95015ac7c124dbcf 100755
GIT binary patch
delta 2464
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

delta 2760
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

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_m0_pro_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_m0_pro_SAMD21G18A.bin
index ac858f0cab0173b5f9d81bd1bc7aa6af8d94c6be..43f456b79776b4d86c3848823f1567417b4a41c9 100755
GIT binary patch
delta 2911
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

delta 3194
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
OCe`o(rE00w)b&3c(B}34

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_mkr1000_SAMD21G18A.bin
index 7f171fe8ea310663b668dec7e17ba7654abbaf9f..342c88f00fbbc988af3ac522cbc4c139993951e4 100755
GIT binary patch
delta 2675
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

delta 2932
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

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_mkrzero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_mkrzero_SAMD21G18A.bin
index 57847829f6bdc0036ef2b9a06fed93080148f5c0..195074f256cc7e7336c3b1ded5b1cea524428d85 100755
GIT binary patch
delta 2774
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
Bg=PQ%

delta 2953
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
F{0~j<q09gP

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_zero_SAMD21G18A.bin
index 4c0d29fdcaa1f7642934278735e0eb2210cda35d..fb022cbc4c8d718cb94311e506b505411b18dc06 100755
GIT binary patch
delta 2794
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
H0z3Z;2p@oW

delta 3034
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
HmcIW1r?#nA

diff --git a/bootloaders/zero/binaries/sam_ba_genuino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_genuino_mkr1000_SAMD21G18A.bin
index 774b752d9eb9d4bea5a0391eeb82d07f05f80857..c6d038c290a7f953185137bfdbdfad68e38163e1 100755
GIT binary patch
delta 2743
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

delta 2932
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

diff --git a/bootloaders/zero/binaries/sam_ba_genuino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_genuino_zero_SAMD21G18A.bin
index 1e3798080e0e6d8528c748672ba6f0fc45e68354..a3d47ea9b372b44703134924d5a2a1b4a8d52428 100755
GIT binary patch
delta 2794
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
Ls9XJRV8?#|3P^x_

delta 3034
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
HmcIW1sT`?U

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..0326c5a04f5c5b5e3b6858410f6c3cc7f6d995be
GIT binary patch
literal 4044
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin
new file mode 100755
index 0000000000000000000000000000000000000000..c349e2e00df8b1877310db7b9c1efebcd5eb132e
GIT binary patch
literal 4044
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin
new file mode 100755
index 0000000000000000000000000000000000000000..0326c5a04f5c5b5e3b6858410f6c3cc7f6d995be
GIT binary patch
literal 4044
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..338266a2ca79604e4c601c6d8e86d4eb7c151848
GIT binary patch
literal 6820
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%0ANBWKETQoFa>$52
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..a6ab6abaadec1da0c91cb97962fbe6e4b6878997
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..b73a20a4127e76e2b3c431c05f3e79b5b6adcdad
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..0287ace262970442f47952a3fd4f235c9ea2103b
GIT binary patch
literal 6820
zcmaJmdwdgB*7wfj-B<bm^BBq`(_)$wNL#@2G@VFEGA#mv3#IC`uzu6(Y8I6pS%Cnu
zRx2w|AEiYFx+)KGu^JSyT17u~MV%?4Euap929`zZqNWtcd}j*y?eF{J%dcnV-nr-A
zbMATFb8auLMDzjzp)f!-!2kD~{U77=pnX0QA#2=F#fZpfl=U3)5t1&16!bP`n5ea@
z7$I6)?_LK&rnm{lNy!*8g*6Ogh!nKG0lp%sb%v>{yYecoALe<k%(cc{VHal+k=HEK
z5u2DJuD11bI-;xH0lG&o)mcPb+S6%?I>dgjsm~U%iUGE}(;B^ud5w}6p+u|rAe+~d
z9ny)5J5h1gkvvgfjOEG#r05IsqJ%hy?dc?<lt_r%hSs)-PO*(8<<(5UeN=y>&I-JR
zfFFFBCmOa+TjNXi4i+p%Hw3R@(G=>x`Ft{=$>cx-@?Dfkfhgz*lKj;kE?}TX3df8W
zKfnCV%sGO@mGN$-oe1))R$av=+_`|Q(bgdpAXgkQUObG~MrR;Itia4{<AuX)vx7Ct
zZ1a(T1Gr_IH<}zQA(0$*JECY^cV~1)cV!rO&E{h61%i&w4ldvq2pFE3+=2#6u%<2}
zf?e6sZ1F>*?yw~s5-ed8o0QEF<eGiohK3OEX^fb{**vWHN1z-)703in3I#41L0eW7
z0N!YH=P@GltyCfdKo39wWJa<=<?+?5PR@*EaxHA8Y*8|*9%qvhVq{wrd#>-h`MR<U
zejtJR-@l|&TG+uJ<RT6XCQ=|lL~FJ)g}D3{!G4TfD{JXBa;)h{ogw0gIhM<sJp8Kv
zr-ZgoRV6`6sDgM-Rr}*H6Y|)ljH*nokYZxK<zE9XVxB>dEx=_@&9?fmv<CKRoH;61
zy!?9@+l+GTW_!2eM514_Ls;hqSVspCjR&cb(u2gwtkn!o|2;mcKZ&cICvA)DfwFuN
zyN3t!qj#82*!*Rd03~ijS*{I%M}t(fyVEYN4-k|ks99^Y%OA(g<N4iqGmHC>H(Op^
zNKt3?j|PJFTAuJ?d2^j!AsEtYm$M>kY_+_B$y0P*y}Y{Mq`o;o*jr#+?<Hkpb#s8V
z-^8yj!0wZJ(*8)GjfZ*FW?R^v7WH>o5vm9PtY(htyK%P-HDabYU<)8GAqUy{6<7)8
zw^nGjfslc72nMc=#d10`KZuw$ES7NDg&}!f)hof(2n6R~2W6OXMeo<eLFfICUyK#}
z4X0P*ogOOSLjA=TaT{Wg*Ce&DhMrTk_FJ03I&s<2&R-LOamagG#xzn8J*}$=bbDPK
zd$8=OLW-x#6GHv#29amFtocy+1>_0HYVx3pJft*82auW!r8J5QFUIH?R+Hyb8fB_l
zbp_lW3im&GUgH4oME(D~fLoC#QyR`~W{rK9vA<1SPpipmQ>0QvxhXZ-pTh0HkMC=s
z(FQaO@@2eFQzHQ{H#JDdfMQmP1Wvmv^MF?qKrMjAw`OPM@pO)GIfN0^BS8m$romLz
zX1wru1u}+ke{ukqcX!hFFoNd442-sc7nOH`udte*m_T;dxO8qc`D@D5rRkupagJpU
zVGXv{J66mFTO_#F#>>8|%_)xuJ9ShB1rhehpJ?QQc`Ek!dRH=3;2M|S4ICxq6b<`2
zqIxpb<d>=^y}MIQ9#TCP?fsd03Z4hmK(S7Ghz=DKlBR_xVAi{;r9g%ETPkTF5928(
zAvXRh1E=VoxSHIh-W*bsu@t5QteSivbrbaNA9^lLY5Z$+pGeK(@?A$Dk{qd<$zhO)
z1>|8Du$!yO28%h~kPTiI<^pa95B#NOaG?;x#~{uvf_|;KxL}aRQ)1{OaJVmpij%UX
z5KmR<v(UdsMWYAg09^z-TdwNzaWR%qK}0$13ejPtjbjfbYy97;;+MA1!{c?MlkzJf
z_MMT>i93C#<S|t-*GKx(fN_h8^G8UFftH$F3v~W1_a#mbtvpMu7zK9NOB9?Q<*xQq
zntUt4CKwHSs+znjg+`x~-%TuoRVD!!T|*QLRsTFZPFFl2mx(n7bU3{rkE5b$GFwF;
z-yD$C4=JAI!ONC*#ay%Khk;+Gs(D|4)dfx^2s9j#C<h=H4n~MJpyyujt#pLZdWl5V
zYY~cot;N<YL<8}B%E=iir<g}MjOg<)F&lXKIfXpntA&Niuxd>P$5N_?l<`yqGB}q=
zd47_u)w`Xeoe0jkDU?ppaQ>0PQ+`cot@l&=?Q|56>j3SjL;HLa_IV!sVNc3K4RmR=
z1DoNTAvF73o$nM7y-6S@KEject>VIlS;20b7IUir&%`+ehln6@>Ez&YV!4yZ4LWu2
zu86J30h_i3ui|BK*0@6eyx1B+M`2%{v_ZghGn?H5S%91^l0`_)Z8*VeIe`syen3Tv
zwSle!zgKLOwM(N#ak;Pt_LTOu2(9eco?MZDjDz%9r6Q$Az!v;scjv=477*3sBG6*K
z%!`nl5VoL0IV7xfzhlNPS_2>1RwEsw;mih{bXgHQL}YO4Y(Yk}1s91<z(*LFk%H;r
zLv&Sld3+8c7|jpW<OG#ukf&I#gSE|sJvc04?j)EEECbQ2h?)SNT?p$M<$4&;AsoR>
zE~m4N&6NnCSwzi&@nI^471HEIq8q5?1`QEsXS=N?zop`6CsIhtMwNHX+o`IR6$riY
zmUf=q#3A>(Jq}(E^!+K!7^wUJL8CE9dQu@@q^T14{vvq92>Bbg)|-Q@jG8=t*-GdK
z73O~A!?J;1seHezW7!1QZGMnhMpOC0Ma!H-eo&kLs7iWHNyu{s_EAD*xC>x~Zdl=K
z`GsYRmR(Pb44UN^RxDa^J<J{%Jh6OakXhk`uP4N9;%y)|ZLcnIuMKbff!`73?+2P7
z$?dTd_d5yHvhDudV4B>q+-cZcxoCNPrBmk!o_L^Od2X<PV1l?!XKr<LJCPG|sFW>Y
z53iwOwq3j}(!|nzE$r4llJP}B)AAjaS!G97;>kx><^Ug%A?@s0nHy}Z%qZ<ynFF#!
z%6_}AZi3ywCGCj5yH1FX;B`tH+g`DdCCZK^GWPTj>D1D%s;M6l`c*}!KYlx>qecoX
zd-OCKi{y6{#1K3F95rlUL>lCV#|<XNPOf2ZsyJx_dnz<OG13?6)o)jmkEblVMnt!>
zNM5Bp53?MU$u*DKR(rOS_Ez*FhIVaW7giitqTjyQ4si^miKLB+ez&(Ni*W=jFU`Sz
zs;GemNv92sty0P$mqzkR<&Mg-GP`JE(gGg2QLt>!uf=7rR(@f_(<X?wPtTXrd_T*F
zmLcDC`D24{SWQk&8P^+H35ulBN?X`{678}_aoPFASnqymjQ2*VnSHJ2R_fik=Q_RA
z?u2*d1OY!erU_5j+lj`6Bp>9f)1?xlQ$8i&GG86?=w#g1()0>DsV`f>o65|Oh<K8N
zO@kOQC51hs`(PA&(ART{SCeNidFu4L@?#qlmKPb3q>+!7zFTHxMg%CZC2hRC{@axu
zS2X5c>7jCi^((vTG<{vD!_1$fCdE{Qq}vl|RGRChgmyxabS`M>a*RpF$8dN(1<~Ug
zDwp5P&XE?0I{Jw5#=}a(wuTI9jbjsw`bJQ=9krm*6;emT5xrf0UaYa;X{CWLV25T|
zvwymgQ20hQdGr$YjO^p<wf19|Ad<>_)UN!+{(SwGh8Xj%z9*v{wL8Y-KLe}gQ@C|&
zqn0zF_5f=Ol)-++!yFRw*hNuHXDC}5P}>@NN8My$qkXsY89UlIjo+W}P*7dasUce{
z;*xPn&{L>5a)t95hfg#-J;XDjI~umst!1Z4&x=cmHEfPlLJ9e|<)i+dizO6ZUk(}3
zCl_)18diVk9(Hn|qwcJOZ_HHaM!r5xQIq$<UMzjvg!QbkXIleb-vXTMcE;JCdI_+{
zMNy;D(QwxGT%DS90M`WU6w@Z9L;QmUPaYBQ*tXPb5mw{$vaAQ<W2?u`^a{9iq;#ee
z`6zjGWOUUvkm+6%z!Jk-6u00V${DZaGZlvSz-f1M@LJv#$raX|Gc~Eq)4_Z$&My>f
zGa$z}U%yw&L<8<NzNRjp8yP_bHGD~9x7$pZEjb2Du(aOj-ptdKgC|`C#Kt=YX^M1d
zdD=6BTi6^K^*=h8!|9-+$>E&f8yDb90&>NqmdEsa22lTl0~f(!)Z`a~rxK96(+Hun
zkY}c&z(uHS$FI7_NN+VFtAdobp+tZmJxe>cAjgqm_M!n(mnlwCCMuiKs!$A;PjF-e
z_~C5P=nNXeabiPgKFsmQEff`AyT>e&6e{vcI>_6Rpi{K`9W?<>aSqb$Xtt$I-t6dL
z)1)jH4w#FGUVmW`#HH&>>``RKlYdI!9eyS)Dl%NuLO0u5qZxE>)X3>dokFibD*CWl
z_)xHe1YS|~d;Fl6*+5(4W69nh&zaWfBDqjQYO)T3jJ5N%0LHX@zCSKiA%@{U<CeJ}
z+T)0RTK(BfpWvsQ4FOl{j8EVUvGE7Fu~a@h9sI}DABMexS$Kr~XU_*ir?~1x@_WY_
zFOnLMzc*8hL<XsgI}mn4F54@BZq$7tQoPAGQGNqvrU@-9)%SV`mwNd&#~U0LoB}Sv
z{Jxn`QS_AZNGan>1zJG;T^Gs(kKnL*`P~t#@Qy8;e>svH-4)&$F$-xFo}A0S0F?;D
z7k(GFJ>nFzg=SXY^K9fJM-I&2*svb<n00&(+%dFqTOv*&TUgjY3#~Ks$8YrM<joun
zl*wpH2|=%wb3rdHmQ;QRy(c1!kRv$we&uc-A=3hO859B5aSMM9<u(y65~5e0dR+OF
zPcJjV!y%`jgKs}4X83aDzi>9#^K|tgkc}qo`n_w1ED*^bDI#Z}oj|8`#sOt6(7{Yu
z^d7(yl$pMC$O=Jn^4;9Mze(=X6atLh%FVuo@?_!Oa4+P@kmIB#3rnC)Lc0sv(du5I
zh|)&(LhmjZ$$<7AXctkJXY5SXat-0ynRdP=0xR-<Dp$CL8pb<CvPH|BNQmAV|Ffz~
z1s_<Gn%t1`2{mCnq`&4A*;*5>iun0#J_7zapR&SC<kLwZP5z}0{#;@*%(_9d1`4;R
z$t6I$S75`0yINr*^FeY}Saae)ITwb#^$Hcr0$&z<o55+Zg%)f)sn`WK;7lDD%dtZ^
zW0e}8UoI4K1vKi6jcg$|tz!+6M=XKJR&XAVH&DMM3b=B>z075K%E)B7O9R=|1hc=y
z>_uN0ORVl5n^2iO7rduuvY^}1E0{ns3~=YWBEJ!-obWR6DjQh2gC7Q(YGH4cGP#1^
z)=f{{tYlOEi63@mab}OM*Cr4+J80)Q_*yYhUo^h=x=G~<1-|t86@NPh?}GpmKrevi
zhqVw3Jb+US@FDay-_v44Ief1Jm;~^9fGGeWfY|_ZVSFCE7XT~-xD6nissoz3-rr5K
z2^d>~Mx_`kbi3f<v0?}jQEeCcD_YTAc^7`)U8(Wb3!w32jpKsFEKQ{#_tTy`)SOT%
z`MjD9&ki;Fx7sZ0N(E*gc+Z^?$_#HLQ_0<_46vZwXgYY}{{`*Ni9i-aptPa-<RH{0
zNQYSOuL${Jzpnw50E`289Uu;1ioerI0Nq_sF%I430Y1UmRs@XQSz3(J=4&zc7s!n-
zNE+s5sDJ<W`)L(1t*l;BlmAjliW$nbY?P@h8rQP!O53ZfPNGFM`LT+}4Z!Id?Xtp%
znmnvRB|}@g(k$}>Bo{#4HD)3dhz;F+-3xL~#!-Qu%A!V5Z?ZJ3-UV{$?sSTHJ@PqZ
zE${tS&EO1_qX|I;lOD+yy%5`t65iBE6-8rXK_^XkqCJMk{jGBtbu0ljqJrVH)b?Bo
zuos{|K5gdOJ;+V2Pp3+wQ@9Oqqk`R7nG{ZsIigUh!@Wvu+~%N~T%neU-EgWJB~&;b
zD#oQl{ax$?IS3iWA3Zlo!yx~L>YznC(dMbBRZY%O(WY48he55HuTsf&bS=?R5Xo&q
zz7eu3j9bhiDzeEKFsG^$AzOhuUBy$46dHX-MniW1CF%go9iytrX+RJ8EYkSsNQKyh
zC!59G7}1V5;4-4+t3-FF0qPdiPHxg}ZDJ*;B{qfJfQnz2b-+y~%+FVK94@4yaMl%i
zC_Q9onjAD4XtL;!msdTs2Qhd(6WyfAfWgYRNOo*oWbvrnXb{%;SE}?zHF*wlT~bD4
zNeN#M_oZW@a-D|8{2*5=xKP7^9NSkecXtx&u}3fIJX4`^QInshCMx=u2$vspmZ##@
z7}V-k74l8cqz&>?DP<(o<R_`OI~nnM+uNPkmm!hu&%zy4nYat?A<qPth)1Ck(@8d1
z?FER)q@u06Ek(4u;eMHr(5O+-GzG(1fZOh%Vx?bo;*EO~`XN8Tqx_Wd%6_lv9gR;%
zsA!x7`f^)eZDNZL;erC=R#w-uiY0o?*og-cC(+e@7(q3kXkzi9fWr~2GHqdrL&#Zc
zat9y1(%ua1gIC(epsi(@PBWIw<`W4kWqlLQc&Pdj-5oT(N`#250UNQN1Rt_%Sxr&D
zM1p_qQ#0RWgAY4w;B%VaS>uRlVM*y=?R#^zdcfL6Qmbt(a8In&2ZM0ehv1H(yK>-7
z)0@x0jQ?zh;qvPb0Ji{a1=tTTeHi?oU^qfcA<>H5cNbmihrg2RP>Fw%fBYnWIht?D
zKnnnB5ChL?sC0}UEv#6w_`Zg_?w&M%LCq~1vo0%3FY-Sacy88z^NFZwRndmX);nH)
z^qt-Er^kQ%sU*ir+*3No9iIdD#Y?`ZpV(qs^XFG;I=T*RKA@ia`b2#}a2&0}dEYPo
z;NHL8uy$_ab6niB*8Ic|-+lJWi|?;HeA9#_qq2wl4PP$(_4X%jezkJpYs+4+KUMzF
zH_24u=`Y{>;Jwgy^Zz2eAO=izHp0V{AN=TS-(OGv{e0-*hE0|ozJ0&cd>(mi*^`Zb
zbj-4pP0I0JI(qEmw=X<%=Kl8i&6D>#c0GURLl2y+dcW3POitm`E2x*wK6dF}pM3I_
zcXwKsurB=cQ!Dn~b@<kwXXZ{T9Wy&Wn)$5y){kF(bMZ6h+mrsj;92pprVTq*{o~~`
zThryy@67z^?&C4*R`jm_1g)D@7^sZ?7r$>!Ys-a>Bd<(7Kpk3n;?{F76YF!%xqC{-
zvw3s=RDbi5f5tz4Zu=7tuf6M+8^0?)obmp*;|>&T$y=qn{oWai3+C!?IQqiiYnvW=
z{i)j$E0QBVnDXVJQU9K>!LVoe?`~hZbXeuMo2&Z%@KNUZv8O-Wbo${(_U+nn!~EZe
z4C1vyx9zxTb$N$p`Ny?KuRoK2;e2y%`~F>R`|pd)t+}po__CiYlH(Qc#z|u?Wu3kA
ztLjg7b~W!l_4G&UMm=D>b8+qTs%=x&6f4v_=_7xfrrz?|1K+g&{f)Q#9vgV}n!6^f
ym^bs@TU*9-PLnhH^EC@F<>?VJPet=)-B2-idg&N8Jo8F>sEHZ?r$R%7-~RycpUhSO

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..252623f865e90fe61fd57e02569ff662f4360215
GIT binary patch
literal 8116
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
UFbafDffB<HXI1bmFxv3<zjqKfV*mgE

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..b7b5622bf3ee44724842818f9fad7c38c2cb9548
GIT binary patch
literal 8116
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
Uqd@31C^7tSRt4XDqYZ!m3&JKiga7~l

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..74a451d13dd81370730fba1546f7b8a6aa265876
GIT binary patch
literal 8116
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
Uqd@2sC^7tSRt?_*qYZ!m3!5Z3#sB~S

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..0df96614727aca1c71457378d33542c7c7a88019
GIT binary patch
literal 8116
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
TfzWACV))^#8ov2@8~*+mPr*4$

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E15B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E15B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..4d0ef6bfd2c1e949f44c7708d1636f4e95e0ba21
GIT binary patch
literal 8056
zcmaJmX?PS>w)a-`md@5$fL@BEx+_2@jgSQ}0&1livvehh0W^ewm4LqL$Y2N2sYHQ>
z=omzwkPKr;P=UCBfP<0Namg6a8HcCy><Xd@=vbNH1m!WtLG2Ji*E`k3`TX&|moKO8
za?ZW?+_T+#Pmd=fdW9aLGJpzz|L^aPU*MNRJuwv_OUO{pNXTQ9^*r(rVO=Rw(0iC+
z0+t>LAzGVnJOd$9$OL#YY%DdEX%xm%Qq<Z8=tbf75>roa@z1o6z_^VQV=W=NjONV}
z$}!2AKC6@}ZL{`u+XGX5EFG>jOE|x;+Z?b<BRQslDL#wDa=qP_z;(JQ$|N5pS)@m~
z^gc_ePFmZIW+tCam-I8ST%3gzeO7vakSe*pZX!TQgmfS_vsrRT9UKAsVO?iyEx^}r
zffsz89~!w4OF-Qc+VI9$)>^d4OUCGE3XKemjSg%0K!_A|RQnD)Wpb+dCT@B-NbhNG
z-;lyA4Y1C1epkbihSg$PMK3*z4eAZv)xv83T-NQas!cAn3IMgM#H3O;8=Q8OfL@_W
z48{k^DgiNfG%yW%C9UbKfjC1`ctjYb8v{MZF``vfefl`?HAk!8ibfDaHh3F!JQkXT
zc!_YOdE*0tlHTIwun|iri^o|Vex}sr?Wjc~iDRx(G-4ie!cOc08hLzd8*@%?m(smd
zphJ?4<DXJ|rpqC&h)-d6aY)uX+Y<;jGY832U7dJkveAQNlG%>UUI%IS#>PHoleW0b
ztQ|C?b0(IWz4ky=oqc<P^9iqgt9?6;mB<-%;gNxHO~y!vSOc;m1G1r=R>V?55NZ30
zgwm-@-`yBLGnG1RGf-9j85E1yWHQ%M@F8mmCsRS!3Nh7S_ErmV%53W4jOUBe`S-AD
zEu>r^q5b1{PjabgE@z!mn?_ao_v>2Yw<olcKwrDUAMZ1>)wTEG%T~g5wqZqM&{fF+
zra|jD*Vthk11U#i^8Hz^qapiZJyjs3Q^=DlTY0O`zP5T@YkVtNy|!xIWFNs+uRXx5
zMBmo1G~xYr8D<Isr8CqUzg>lyG&VIH&jYotHQ@k9^wq3;LH9y}3HUUY;gRxj%v@ZK
zfF3CnMN^|ayFs6t41R!8)2W)<+(^4nHj*u%&*p|e3HTMS=2rV->(>$txnWylkXgxT
zShA_ZIDSUcxi*K^YxAD!-nt=B5(w>MNY_eqa#<Rm=BruP>r7|2>l3`i(`weLbJ?s#
z%abc|r%zqGbK0*^@$yyoO=7dXt<zSl`4tK}i<ZY#OkHyfFpHMg-0xzm|DzjrdtzAt
zbf~SP*`dboMyM0~Iq|IiYK#Yzp!tP|4?3&GoW+{9szsesD<AN)u$u>JgJ5&m)zQ!)
z5zyZe*wctzDcsd?kjbn#r|)RU33#NlM%@{TuNEoZ&P8NLdC<k|X!A17YUGq^<LzRQ
zX-#S+I#HT;sCF{X)U^U{8uo3K*`fJ>RzI#<cuyS~Nx#BuN^rG#bz1*}3H(LqGhd14
z6MS|7wAK*lK`biL>=Mk9y=H{y1bd*tE`#rwA2E^`888Mk#JF`|5J`WG4krTW0SJI3
zUvg<-Xd9=KlYB{h8<!-TmBjMja*;4%WNQm|dEo0RT|uG%5o6?|YdWQk8|y<(;{CDV
z=rF8AYq2w(yk4SAgp7PUXYM!hoat<>!DkQJH-TTC!MSSg_rscw)h#dz_$6Lc)saxp
zgxt1pVtEojjbehHO@9Mg#5{+dUV#gqxx?bY;bxGZaq;xv%uW9Q++LJwi?j9GhlWQq
zUxaxU!8|&EK*&pFgdZi&Cnxhb;U0V*S2)gF*Vx#C3<<j?dou#}nTD*n1!k6#T2Zod
z7yBecjoxmXw38($vsa7Nnr&!tF*k&n-)8jUy&N7uITks+f});ey|x;G$ied7TD<}m
zoHIpE_BC5;1Ot<*=yG&&eEANRu(bhJpF_%~iXALxTPo<wv5T}l!FC7)qpOIsmf7M1
zxfAPHU@aEF$oJx2E2_uL4%W(|976VTRYh3wX0#Xec7yi-jRCC2z;|$1PGG9MU@ROC
z<ASR(nf|O>0xXUIiyM<+%!Do67y`YIw2ud~Ucd<z_!T$BI?+h(IPO3UoK@jA&d_(E
z#<r@3Gs?K&T=!4I>>QNyjf`nH{peeI1Om}FhOisU?sBBK%iR!xca0(UZL)TfEWC=`
ztgJ>pR*{<wkI^hrBYz&(R=j&WNC&YRiA1%PsS4G}y4(=w=8b6_;8)PdKd<6;<W34t
z=J#^Of$P*t^j2Dpyf{uO*${2i$UmdF6ZrA`4c6#@H4O4~x{sroK(}jrj1IzzPmPnn
zX>V~l*rEww4)Cn;t=U>(D1j%Oc5x~N5nZ_GH<fo7uYOvDjHP(wnJc)kx0`-|5o10F
zScpWQ7WRPuaGI}}Kz37{I+q&xDQfCL2;^U1X|5zJ-u62C<~zV13BJ8v(-7DVj42Fx
zyLD6|L|o(9U(?75<5cYS^lxD(c8XK)0*)ebl!kqsRozKy<a5=X(A%v>POEOSR(_&h
zfbYjDJ5v{aoGzV7gf%VfhEXR~bCwF_A63#op1}*x!wuml88}4`gw)7kwW?H&Y>r}@
z<<v-1bUCzs9s6#KYW!>K?v7USna;C*v-fPRy<Ur4_PWJ92FXB8u!-2km#2W`4Ej^R
z<H}+utQz?&TEdr>GD48)B-RLOq)J_zHAdrwL3AEC4Mow+h-{vQZ&v9`(7s<qH;l?G
zoeeu|RCO76CJv)4pK``oN|zxGkKL54?W0=7uO3{E=jv{V$gfM-b5Xu5z2dnb&ngc(
zPwBq_iWMr(m>OOSYpIc~u+G2af#GjrGncDH)4?A5iL7s?yDD-iP0k$H2BT5mtVZgi
z=!VPk$>AoLWgc+R6I;=#<}Sx`bTdcg0;$@7&Lm`|^He~MB&rDHoC*^AHY#ue_}fE0
zLFW>BJMcS2)%=j<bnJy;0!>CFN(D$mu~-ZG{uF#H0b#T=Od`t+gnkFM7kp|Z8VzMo
z4&F#P;PkZ{(Whm^9l*;-6uH4?r%h8PRcJEkkE(7`#y2C7!R6to`+M0^anx~x1Hr9t
zA*E9^nm<SJ!k>n<+KK2pHadXkbb)r%*gpRN`@8~vaU|-7Ggw=j-HQ-GXm+|S!yzJi
zk4W6~1V{F@ODp|LyuDV<PTPUb#5+X0gdm3LWbY<olY>a}I&>#D2REmJZCkxR(<Sqk
zkX;12U^Cnku_ryeOT_dJE~O7{#Bz#6!U><|9}=|tu@!XwzKRr!pRNV}SFDt!M_Y^H
z(_jwl&L3zK+qv0&X%YdqZ_;B4XDfXoHsd3`-P^4k5UP<ipv4SXkQfOOR<B(-EpBn0
zh{H!L>?!Luq+>LiJAfuZR-`To85}yRmyxXAHIf795k_%H!Sv+Vx~i)%REZ$wf<J0@
zKr+ZZQ?7-%;|QB~k}s~CV0Li~M6qmY9(edPnAa%R0X~(mdz1Lo?hY<3Ou(AiR3+di
zsTgL6m)A%xSS`(K@Hx6Wt<@QAMd!MaLQ+<$uxI%zs#;ux(A$61&bFmIay@m-F6d$X
znNiFbs0@~%(JU1HokAX=sXXXE0v<6{{>r7bDv^azBZJqignm?E8j%Of26~I~kEX7s
zd9d3IFVjR*8QwKb4kE*=jek-l-50{heG&GNM<u$lV1{0p;cxQGO>3HNB{IEn^2?jo
zY`zsnXL^S=WqO&-4(J_{4oG){+_b$qr8lg&^`F9_fY1nQf+P<HhZ-FOYCF&fw{f{^
zlf$sLc+IA|Vu#M|9eN~dQ<^u6V7$0P7uRm@bsz^C`B&8Hvz0YdLF-|`>TBWXfi`ac
z0Lgd)plSKO;^cy}TkwK&TT+3KG%xu|-<C9QeQ{!b-<DL6B~sq8d1~j`41C0f==*EM
zz*Iq}ba0(TD><Uzi{Zp$BQc$tM^rWX9YQ~;2#tj9<#kl1*mg`$quEG4p&*7h^l-qi
zi;-xM8=f;ZJbOVkx3uWI73^u6ad)Ptv|oQvjr=xhK0GyW5Z(t{m6u?Y_WD^)9jLj~
zP3IK#BZhYF;#L;Dzd?U+txb(=0%@XftD--e(~`{CS@WxvIG4)y(;(^i7;dXl0Pjj9
zZ&B_mE-0``CMKSB%k`r9U`7otI9~jj72h&Xy7#sWIo|Vwe7XsFZj(PUh-cKuf~aw)
zp`D;eDn7rBdn-&kZ2??xWq5YZJK<S5w}*FdZ}zRGPA<FLokJZR&RIN9#J`)>g6F-_
zjb@dGJ${%eoM&{%7erj(sYPy`j62#|Ugzcyq$qe#LEIA(o^R*kAx12WV)qRLfCV4)
z^j#3t$faxUTK(aSVC%5?2qTd+^3dV0n=H&!mI7PS@P&1M-_kXqG1nG1mFBJ6(o?JH
z>uN1#9uAlkQ#K0UI~-5NJ6|2vPAZa415I6zF_F+L9`B?edQ73xguPs4c#Wi^&l+z(
zqxcW_6RBqV9u5smrEn)|LpKzKyZmSMHu)u~+Kg|>XFr1-#>txf)AfWR)T@zm*RVTt
zK&aE|PhW#bDhmOd@*CSrb^H85=A^zau@iOLXJtGGvu04ZeSf`ndqSNoXJrduKXYLW
z33u8x0Zb<<`~0Y*+16FNKy0-gbv$Q7t+xp847(|KYtzw~t!49(5GCp<G}AZ1dC8d}
z|Fbck5#8nASNj-uOZX+}A)=W}4d+o}#@!icWc{@~3hyk0o00z-?ri4tryt-JuwAv6
z>_UB#Le~p*@roLG5cXmoI3VuijC}|ELR}kha?}yxzV9c%9@hknN|*nV^~G8>Vh64X
z*eRw>N|*F2GhQ&2bzAq<X%SZA^t!A^L%9{Xi*rPrpBcW`jXab*%Qvfh3fz0AusF;J
zX2m6XVt2<GLXyG=*>Ku@J~l&e`O?JZ%cd5UdDffBhlG`)wM2~suhhNag7d#asIGPL
zP9Msu7V_$QU2#O5S$n_c*BM=V1)8!8q?3TiD2~w->C|p(on!mB$ub(5J35Kixpb60
z&?VATdr2xEJNaDpfCD_`hcIwI^6(fMIXyNGb_4gGvGc>whtMUsbD9u44!NGWTOTme
z`;ADu`&tyFyhj2a&J#G|Xj3Q}DN)hLYh$J!OK2OTFF&VeglGf~O3EolBWIwrfNb^=
zhz^AGRPQkpHJM5Pt*GNHsxKxPB6n%P5_rgjnZH}{{1mAgp=^Wfru@YS{Mt6k9t-rm
z&i!;&EZ$m)3;t&qp-AX$pH57Z-YT0xsW<8=3thM&KCo1Jqx8+iWS~td2+C4HOB@mJ
zEeNJGzRuf%cQjg|ZSq=!I~$LcnSy<drj}HK@S20HtEu7O?enFVZcil&rDTfm9x8pb
z*h<yihUAk9{YB7OhMs`<w0<z|i>;8oXjQhscefJELE*K7JCv>PTI>M)Cki@SHQ38^
z##(m`wu6q5eEVSK;7-PYJ2-!M(idUo9AI7HmWiHyu{H{`gPNDm8O>{Pi`(Ju<{e!y
zxIH$0_8|HqZ}9P0ed^$Ev@)DMSkQ7`gA2Y6GxnI|_?A?cTWsTSzqzHgdvjSz3`4{)
z-d|uE%XBde3Ar;P)XsHd&y+CSkHZA?L=`iv-q#%{OHp(#eDMA<G%|I3L5pr;hWRiz
zJ~R}g@|X1imsa(HQqV$Eo`z`TGthE0a!LIP-U|2>c73AMmLVoS=!V<;e<`cWkjosj
zwk&a3*czWDkkOJ%=dxDlA>C-;gpw*bT1*8i@p)@kBg(<yP6JZT8O|kNAAd-(wQO<i
z@-FtB>P`t*TaulawFUE9Ag2-T0-ToHcpgf)0S$Eid#)iXyxqdItGeMS#o}Di@PtCN
zY+*XQ3wiBziCdB((?kUGTM+0m2skL^N1!Bg(14_9zL6OwV_XecI~zL;^=HTy+NE(h
zWVJW^j5*hMw_z1v*a^&8zz`Gl4CQC4&c*?Q52!5v$M_Dz&A*sg8;}1@m8(F01bl2C
zz<z)O051SM2S9)iVgM(N(0(VBE`)YcfPnuXl<NQj053uNAV7SJ=@+(O1nop4_eG70
zrng9xgc3WWkqglX`084qH-_{)cHy1)kX1|rn&t4KNt*EEG{CJZHqNn%P71rCk*A}y
zG<gDN2^q_^IiI;kQiz7A8+M7Mj9L(`!Hku)^k{Lw64Lt;;H0%t77;Tppq>sdvFo@%
z$W(5COjaWFK6ni=?Jxr^=21D&UK!Qyc7fO&qoIUyJ<ugVe=X3>pyp7J?Fgfp#<2EY
zEri(Pjb_<zu>Lq)0Ha1H_%nq_%0#6=B!pKa#B=O}SGo`=c>!dlgWO4O$V^dXj~$DX
zfdA~Aunw{eNYp7>wgI(3Oq42-?$8cv{DQsqE-pT-Sz}x_(Vsgl8}3dw=Gg)$4lnqA
z7$3@I;sX-H2h8*iYkMG(?hhDwUA{x?7fD557AO8iw1L;Zsp^kuIf!E*b8Y<%Z+v&z
z)U5NR31sX%@WMHuy#Y*s({gtsp>R237~vDX$@Ta#d*Ht-K3VJ$b18?Pb+(uM74ErK
z;bVR_l>uM7@KMEI%5uaw@d@tRz7JzB4HfMCgFyzYzJBn7#oBGj5bojMFLQvW_KVuP
z@U2o(TI#t;ej7%{LtLQ-{!ohZbA%52+dLK>BF@9YTZ<w4(U&hEr9j9RX%USW#|lKZ
zXt(AFM|~FYgf&HY&6gH9T=t4DPK>AUf;8b}$eO?%NI1+N^f{yyaR;aGd){}-o(khz
z{X1cg$%B>fn?MJ@&*u<R#Fc(pY%kFd-tN)KdwCjGCIeBW6k6@P6I$`Xh;kRScKaAH
zRkRBu%KaWfrbX;DC?d?`692O_t%Y!saKlPh2bEuY^fDuEFLgi;kraLyF7c$vzu~R0
z=iAiBK{ndyTldCeyyp8zKBY*!fp)+;?IrIk%U~TXEBgS@iOOP60=!&7a`OHB#(zt$
zFRJBXk1BV1R>}*+jb;7tj#nceMi+=1piV;l1k?i+{UXFjXuS=s^?*r)`f;ddQ`bkl
z8m-~|Wi^X!LbVTO6mqFFaTPU5a7bjE_PQhChN<ztq#|GRfHi6P1dmu<hGY7BI!d-z
zmzDc+g%rUDcZw>?0wa+}7cSN0pKli~4=;dGi!^JXaGM%=2-fZwxiZ34p>Vz`kemg4
zXYg7fUj}>Y7mJh?o@D4Nft!OSU#mbWHqiw%UtgQeb1|CPO0_3fo+hS=X!=Df*+%Yp
ziZg`WQXZW1&yC`_2I|M*EWQwEuXDLDYGjgK`D_X`FD^GPE(d*S%(J-qtYUG>GVq?h
z1)}ayzi0x<%mD5@6Y_ILQ_GsbtE^z<c3~1|s*PJ6PU5rvJ+CEtr;<YD-t?F5WIoQV
z>$i#oPVw3V9(s#z(r3@@zj1z{0*M3q4-khmf9r+v7{GCWceOhB;dzJ!34pTz9DzQ~
z_g;hkUg-Y@;3U8$fDZt|00RI=0RJVFg8)MS!vHB%Ev%{QziYl##MtaLDl;LUXcL_R
zRt%*?K--0WLMyt7a@s$7i#6UfUNoNK%~dS?T7-J5<A_o=7|U;s!`vu)P8eRnF3a&2
zZsuv6m1W$|>H4<9F9dPefk%hWqo3Pl2(lo<EgU}0+U?$Q(>{(kjT|*5m-oqu`d+Ai
zJW>Aw>e}tx5r@NZaYMrv%JQz3^@QvZ-Rm_TCrXL^td-bFLd>!O8z_4uOhVr4Ej8&~
z&b!@i1wYo}l_i9jHjWH`T=T&)?Hy(5A*pTFHjW5u@2WA#l_KUOyvb0`Rk<o7P%;|o
zEgpT>^zL&o`j>Sb8K<kL-MF#VzhT)uYec%d+>1)?S%1$4{~CH}QH7MBcN<E@u~Z8i
zo_v=c5tu+2p|2;w`8XM&sQ^U)t0v0FpnM2UN#BF(>HJ*y&$|)j<<8HYJ3qGoRhbjf
z3V>?F!1orEKPwllEZVU4LI3*u=U1($UZri=Y2oNKxsS3hF8Q-C958Lo-sRhW-)m2v
zI4b}5;CJ8WrCNvw@+)1TO32%9_^j@xHf!_4uUB{VoZkDsdiifdby?myv<|2LW9^3<
zUs&|mvicYKko&Q?-T(ahlOK=#>8UeI=WUptGC9}q`9nY5yZg@L#Vg-zdfE0&;p1OL
zqQlRA{_ck#lzv_H8}Vg{HPu=PH&giWsY?U@`OWXIly3L$F(2~0^<(v?zBikGSKnY?
zVlJ4Unse>k7azTM^|_0UomD#)ykkH7(z?eVIbZ&#8rMv6p^#8Sy?W{CYyb1tzkZo>
zG`>fCs_fZkHovj{%<3N&r`?i2>yC^-((~#czx(p5@lPD@&Hw$1=cT7xb{*RKU$0%<
zpCI3GV)6I)4+bs!(aGE)TDN2xTO9Zg;jQNOwyRxdU%&Z%>hzYO)t6r*cBWo-_2tjy
z(kp*mcjtz0Lm$0(aQF7d*8h0>*E7!~{^{>?-p|^XzEyYc#*(#J%k+!Ry*&2jp2z?2
z%-zGABU3+I`1$GS|C+bUaBT8j_dfK{q~bYumJj^uRMM5%-~46IH`||h>+qpPRriz{
zq#0tbb<nh}u*<#aqndNKUd*_9Wk-MKJBK^odC<44`o{XnP2Zct_SbV-=g+#9d}-a6
z6@PuDXUEYC&z^c}`Xk15Yin*RKd`WQrb3-a$o%dWb=4=2eAW5;x8EChdi41z>*sA=
zzIfy6wprb`$Vnp^ngy8B;fL(Fo6+(mi;9-rmOqOtTRc&ZRZ$$_1v5m!{5TyLp_T>I
zXCVvLWf4#@Ags^A2pjdyqzS2UIxt={Ols6`C0MN>v;u+*7%@D+{O~Q(+VJ<kGW#Ue

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E16B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E16B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..2c657dbfddc5c3506ea7270cf6e8470e799b3f69
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E17B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E17B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..bc47f8bc52c337cc71ccacf682e219dfcc8980e0
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E18B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..e23f135c608310881d6e7364e15acb726199576e
GIT binary patch
literal 8056
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
Az5oCK

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..64da336d16016a3e8bc567df5245014ebd3fdb49
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..9f09b2f67efd274841cff5501fbfd9462c247b35
GIT binary patch
literal 6820
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%0ANBWKETQoFa>$52
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1c2256e96e8e3e731592b1be7fc4f87023837f2d
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..72cc008828bbcc6767ef2ad89938ad67dba2ca11
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..690dfe8a31bf5212ca2268772c12e664f865d407
GIT binary patch
literal 8116
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
VAdCW`)1bug!&w!4^NlwA{V$f)H*)|0

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..4529312cab4266224c0c51f28cd71d7be318ff85
GIT binary patch
literal 8116
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
Vgi#=L8k87*IIDthzR`xi{{_lJIEw%P

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..4ce924fee1030ffe2e2afcd643123c123ab919f7
GIT binary patch
literal 8116
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
V2%|vgG$=9ra8?Q5e4`D2{|lw!IL-h7

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..18a98aa24df43c3f3411b2d6d2b261114a648f30
GIT binary patch
literal 8116
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
Uy+G(RC^7tSRt?{Ly$yf=3tE3UQvd(}

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G16B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G16B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..34a3e27bd24e6112ae636d9d3e3eb947cc771cf1
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G17B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G17B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..22c7b037cd09f3ab33ca8c771df52525d34a97bd
GIT binary patch
literal 8056
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
AIsgCw

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G18B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..9c04d4738b90ef47bdb6f6e97d2a4939bfdb7e8f
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1dc8d3364115798faf3100e553e863b1ad67499d
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..44f62141750e6dbc3ee68191692c231595af5b3a
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..a1d9cc7ef4c3e8e661c182d3a03e7bed759448bb
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..0a7b7f8efed15e6a46989d677f050eee8415e157
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..7e47350631f9c8846e3c86ae7b69f19f0b839931
GIT binary patch
literal 8116
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
V!YB|r4N43@oK?X$-)O_%{{o&+H+BF3

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..0eb2912cd524f3071c447da6ef9ae63bdb8860b6
GIT binary patch
literal 8116
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
Vgi#=L8k87*IIDthzR`xi{{`u0IF|qb

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..36db9320918f3bc726fa177976355d961692239f
GIT binary patch
literal 8116
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
VVH60R0wsnY&Z^;CV6@@ye*vvsIMDzA

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..693e2f50dc0980bf5559fd9966a75090a83a9728
GIT binary patch
literal 8116
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
UFAzEnN(?`oRl_%5Z^PgJ0$*7<RR910

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J16B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J16B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..d233117a987813663d4a6ec22916a5b1f7915b6e
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J17B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J17B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..bf46e00312c9ffb0185e88e73306cf697a9986ef
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J18B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..71aaef5ec33dd1c7fe1ddd8d1b25ee57a89142af
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D11_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D11_SAMD11D14AM.bin
new file mode 100755
index 0000000000000000000000000000000000000000..c349e2e00df8b1877310db7b9c1efebcd5eb132e
GIT binary patch
literal 4044
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..d13db9e7111eb76d99dd7cb18c2c0c9621c2b98f
GIT binary patch
literal 8128
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..f6baa4464b31dee219259e9204d2227d316b36b8
GIT binary patch
literal 8128
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..af53b978f30c9b12d185653e14052844ae622e46
GIT binary patch
literal 6820
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..8187c0b03b4be4f012895b8c719f31db09c3a17c
GIT binary patch
literal 8116
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
U7zIM7K#Adpvl{po7;X6bziDzeS^xk5

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..03dbd7ef3d14663afedfbbfd221f05dec04c747d
GIT binary patch
literal 8116
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
UULbTDlo)<EtA=mB-iE*b3my+Q-v9sr

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..ce3d4b5ab0f61830786a85897a212f2ea55d0db4
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..da6366e6c793b67837eb62d5cc40a5a0372cc634
GIT binary patch
literal 8120
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
H!{7e`2!J|1

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..64cf3afa9f61982b21789040040d8442bead58aa
GIT binary patch
literal 8124
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
MSuK2vjW+!KFD@-R?f?J)

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1afe3eb3d56f3724e0c9141eb9e1ffaa642cbfa6
GIT binary patch
literal 8048
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..ec41692074ccf09e680780018e1ba11b7e7099c4
GIT binary patch
literal 8112
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
E556cV)c^nh

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_zero_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..d447131cba64548a3bcb0914e17fc7b81a90308d
GIT binary patch
literal 8108
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..b249103bb01de48bc7891a4333793a4db0b053fe
GIT binary patch
literal 8108
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
Crzvs(

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_genuino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_genuino_zero_SAMD21G18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..b7f09e2db644459c97443b74519e0b8829da1433
GIT binary patch
literal 8108
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
C;wowY

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/board_definitions.h b/bootloaders/zero/board_definitions.h
index 44c8db86a..f2ce2b14c 100644
--- a/bootloaders/zero/board_definitions.h
+++ b/bootloaders/zero/board_definitions.h
@@ -1,6 +1,7 @@
 /*
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
+  Copyright (c) 2017 MattairTech 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
@@ -58,8 +59,6 @@
 // Common definitions
 // ------------------
 
-#define BOOT_PIN_MASK (1U << (BOOT_LOAD_PIN & 0x1f))
-
 // These are undefined in CMSIS for L21 and C21
 #if (SAML21)
 #ifndef GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
@@ -81,8 +80,21 @@
 #endif
 #endif
 
-#define LED_POLARITY_LOW_ON	0
-#define LED_POLARITY_HIGH_ON	1
+#define LED_POLARITY_LOW_ON             0
+#define LED_POLARITY_HIGH_ON            1
+#define PIN_POLARITY_ACTIVE_LOW         0
+#define PIN_POLARITY_ACTIVE_HIGH        1
+#define PIN_POLARITY_USBCDC_LOW         0
+#define PIN_POLARITY_USBCDC_HIGH        1
+
+#define INPUT                   (0x0)
+#define OUTPUT                  (0x1)
+#define INPUT_PULLUP            (0x2)
+#define INPUT_PULLDOWN          (0x3)
+#define OUTPUT_HIGH             (0x4)
+#define OUTPUT_LOW              (0x5)
+
+#define PINMUX_UNUSED          0xFFFFFFFF
 
 /*
  * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
@@ -151,6 +163,56 @@
   #endif
 #endif
 
+#if (SDCARD_SPI_SERCOM_INSTANCE == 0)
+  #define SDCARD_SPI_MODULE                   SERCOM0
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
+  #if (SAMD21 || SAMD11)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
+  #elif (SAML21 || SAMC21)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM0
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 1)
+  #define SDCARD_SPI_MODULE                   SERCOM1
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM1_CORE_Val
+  #if (SAMD21 || SAMD11)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM1
+  #elif (SAML21 || SAMC21)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM1
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 2)
+  #define SDCARD_SPI_MODULE                   SERCOM2
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM2_CORE_Val
+  #if (SAMD21 || SAMD11)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM2
+  #elif (SAML21 || SAMC21)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM2
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 3)
+  #define SDCARD_SPI_MODULE                   SERCOM3
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM3_CORE_Val
+  #if (SAMD21 || SAMD11)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM3
+  #elif (SAML21 || SAMC21)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM3
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 4)
+  #define SDCARD_SPI_MODULE                   SERCOM4
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM4_CORE_Val
+  #if (SAMD21 || SAMD11)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM4
+  #elif (SAML21 || SAMC21)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM4
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 5)
+  #define SDCARD_SPI_MODULE                   SERCOM5
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM5_CORE_Val
+  #if (SAMD21 || SAMD11)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM5
+  #elif (SAML21 || SAMC21)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM5
+  #endif
+#endif
+
 #ifndef SAM_BA_INTERFACE
   #define SAM_BA_INTERFACE    SAM_BA_BOTH_INTERFACES
 #endif
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h b/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h
index 2890c7c3e..65ef5b4b9 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,17 +23,115 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
  */
-#define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+//#define TERMINAL_MODE_ENABLED
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      1
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA30C_SERCOM1_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA08C_SERCOM1_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA09C_SERCOM1_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (15)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+//#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_NONE
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#endif
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	0
+#define ARDUINO_EXTENDED_CAPABILITIES   0
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -79,19 +178,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
-//#define USB_VENDOR_STRINGS_ENABLED
+#define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "Generic SAMD11C14A"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA05C_SERCOM0_PAD3
@@ -100,27 +206,48 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (15)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA15
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
- */
-//#define BOARD_LED_PORT                    (0)
-//#define BOARD_LED_PIN                     (16)
-//#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-//#define BOARD_LED_FADE_ENABLED
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (16)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (16)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (16)
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h
index 31cddd1f6..54a560142 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,17 +23,115 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
  */
-#define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+//#define TERMINAL_MODE_ENABLED
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      0
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA14C_SERCOM0_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA10C_SERCOM0_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA11C_SERCOM0_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (15)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+//#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_NONE
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#endif
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	0
+#define ARDUINO_EXTENDED_CAPABILITIES   0
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -79,19 +178,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
-//#define USB_VENDOR_STRINGS_ENABLED
+#define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "Generic SAMD11D14AM"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA05C_SERCOM0_PAD3
@@ -100,27 +206,48 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (15)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA15
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
- */
-//#define BOARD_LED_PORT                    (0)
-//#define BOARD_LED_PIN                     (16)
-//#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-//#define BOARD_LED_FADE_ENABLED
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (16)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (16)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (16)
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h
index 9c01e5068..04eb0e033 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,17 +23,115 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
  */
-#define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+//#define TERMINAL_MODE_ENABLED
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      1
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA30C_SERCOM1_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA08C_SERCOM1_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA09C_SERCOM1_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (15)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+//#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_NONE
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#endif
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	0
+#define ARDUINO_EXTENDED_CAPABILITIES   0
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -79,19 +178,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
-//#define USB_VENDOR_STRINGS_ENABLED
+#define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "Generic SAMD11D14AS"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA05C_SERCOM0_PAD3
@@ -100,27 +206,48 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (15)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA15
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
- */
-//#define BOARD_LED_PORT                    (0)
-//#define BOARD_LED_PIN                     (16)
-//#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-//#define BOARD_LED_FADE_ENABLED
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (16)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (16)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (16)
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h b/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h
index 4992d9404..1ace79979 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,21 +23,121 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      3
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA22C_SERCOM3_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA18D_SERCOM3_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19D_SERCOM3_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (23)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
 #if (SAMC21)
-  #define SAM_BA_INTERFACE		SAM_BA_UART_ONLY
+  #define SAM_BA_INTERFACE              SAM_BA_UART_ONLY
 #else
-  #define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
 #endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -87,19 +188,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "Generic SAMx21E"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -108,27 +216,48 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA27
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (27)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
- */
-//#define BOARD_LED_PORT                    (0)
-//#define BOARD_LED_PIN                     (6)
-//#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-//#define BOARD_LED_FADE_ENABLED
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (6)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (6)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (6)
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h b/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h
index 8d46e3f42..fc4d47032 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,21 +23,121 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      3
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA22C_SERCOM3_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA18D_SERCOM3_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19D_SERCOM3_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (23)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
 #if (SAMC21)
-  #define SAM_BA_INTERFACE		SAM_BA_UART_ONLY
+  #define SAM_BA_INTERFACE              SAM_BA_UART_ONLY
 #else
-  #define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
 #endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -87,19 +188,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "Generic SAMx21G"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -108,27 +216,48 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA27
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (27)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
- */
-//#define BOARD_LED_PORT                    (0)
-//#define BOARD_LED_PIN                     (6)
-//#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-//#define BOARD_LED_FADE_ENABLED
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (6)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (6)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (6)
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h b/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h
index 7e993566a..fdb72ae98 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,21 +23,121 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      3
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA22C_SERCOM3_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA18D_SERCOM3_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19D_SERCOM3_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (23)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
 #if (SAMC21)
-  #define SAM_BA_INTERFACE		SAM_BA_UART_ONLY
+  #define SAM_BA_INTERFACE              SAM_BA_UART_ONLY
 #else
-  #define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
 #endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -87,19 +188,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "Generic SAMx21J"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -108,27 +216,48 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA27
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (27)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
- */
-//#define BOARD_LED_PORT                    (1)
-//#define BOARD_LED_PIN                     (2)
-//#define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-//#define BOARD_LED_FADE_ENABLED
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#if defined(SDCARD_ENABLED)
+  #define BOARD_LED_PORT                    (0)
+  #define BOARD_LED_PIN                     (6)
+  #define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#else
+  //#define BOARD_LED_PORT                    (0)
+  //#define BOARD_LED_PIN                     (6)
+  //#define BOARD_LED_POLARITY    LED_POLARITY_HIGH_ON
+#endif
 
 //#define BOARD_LEDRX_PORT                  (1)
 //#define BOARD_LEDRX_PIN                   (2)
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D11.h b/bootloaders/zero/board_definitions/board_definitions_MT_D11.h
index 0555fa327..95270cbf6 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D11.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D11.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,15 +23,113 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
  */
-#define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+//#define TERMINAL_MODE_ENABLED
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      0
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA14C_SERCOM0_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA10C_SERCOM0_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA11C_SERCOM0_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (15)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+//#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_NONE
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#endif
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
 #define ARDUINO_EXTENDED_CAPABILITIES	0
 
@@ -79,19 +178,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
-//#define USB_VENDOR_STRINGS_ENABLED
+#define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "MT-D11"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA05C_SERCOM0_PAD3
@@ -100,27 +206,42 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (15)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA15
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (16)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (16)
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h
index 2b430c9c0..caebf81eb 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,15 +23,115 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      3
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA22C_SERCOM3_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA18D_SERCOM3_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19D_SERCOM3_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (23)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
 #define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
 #define ARDUINO_EXTENDED_CAPABILITIES	1
 
@@ -79,19 +180,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "MT-D21E Rev A"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -100,27 +208,42 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (27)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA27
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (28)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (28)
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
index 429008204..0cd06538b 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -22,9 +23,84 @@
 
 #include <sam.h>
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      3
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA22C_SERCOM3_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PA18D_SERCOM3_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PA19D_SERCOM3_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (23)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
 #if (SAMC21)
   #define SAM_BA_INTERFACE		SAM_BA_UART_ONLY
@@ -32,9 +108,34 @@
   #define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
 #endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
 #define ARDUINO_EXTENDED_CAPABILITIES	1
 
@@ -87,19 +188,26 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
 #define STRING_PRODUCT "MT-D21E Rev B"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
 #define USB_VID_LOW    0xD0
 #define USB_PID_HIGH   0x05
 #define USB_PID_LOW    0x57
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -108,27 +216,42 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (27)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA27
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (6)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (6)
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h b/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h
index 1e3bc7b08..97c7ac80b 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -20,17 +21,113 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
  */
-#define SAM_BA_INTERFACE		SAM_BA_USBCDC_ONLY
+#define SDCARD_AUTORUN_DISABLED
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -77,18 +174,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Arduino m0"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x2A
 #define USB_VID_LOW    0x03
 #define USB_PID_HIGH   0x00
 #define USB_PID_LOW    0x4E
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        5
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PB23D_SERCOM5_PAD3
@@ -97,35 +201,49 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (17)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
-#define BOARD_LEDRX_PORT                  (1)
-#define BOARD_LEDRX_PIN                   (3)
-#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDRX_PORT                  (1)
+//#define BOARD_LEDRX_PIN                   (3)
+//#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
 
-#define BOARD_LEDTX_PORT                  (0)
-#define BOARD_LEDTX_PIN                   (27)
-#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDTX_PORT                  (0)
+//#define BOARD_LEDTX_PIN                   (27)
+//#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
 
 #endif // _BOARD_DEFINITIONS_H_
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h b/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h
index 4b6b22010..6a6986b4a 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -20,17 +21,117 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
-#define SAM_BA_INTERFACE		SAM_BA_BOTH_INTERFACES
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_BOTH_INTERFACES
+#endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -77,18 +178,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Arduino m0 pro"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x2A
 #define USB_VID_LOW    0x03
 #define USB_PID_HIGH   0x00
 #define USB_PID_LOW    0x4D
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        5
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PB23D_SERCOM5_PAD3
@@ -97,35 +205,49 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (17)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
-#define BOARD_LEDRX_PORT                  (1)
-#define BOARD_LEDRX_PIN                   (3)
-#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDRX_PORT                  (1)
+//#define BOARD_LEDRX_PIN                   (3)
+//#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
 
-#define BOARD_LEDTX_PORT                  (0)
-#define BOARD_LEDTX_PIN                   (27)
-#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDTX_PORT                  (0)
+//#define BOARD_LEDTX_PIN                   (27)
+//#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
 
 #endif // _BOARD_DEFINITIONS_H_
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h b/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h
index af128afe6..042544117 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -20,17 +21,117 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
  */
-#define SAM_BA_INTERFACE		SAM_BA_BOTH_INTERFACES
+#define SDCARD_AUTORUN_DISABLED
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_BOTH_INTERFACES
+#endif
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -77,18 +178,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Arduino MKR1000"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x23
 #define USB_VID_LOW    0x41
 #define USB_PID_HIGH   0x00
 #define USB_PID_LOW    0x4E
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -97,29 +205,36 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-#define BOOT_DOUBLE_TAP_ENABLED
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+#define BOARD_LED_FADE_ENABLED
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 // PA20 (digital pin 6)
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (20)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
 // No RX/TX led
 //#define BOARD_LEDRX_PORT
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h b/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h
index 64b55dac4..d34d9e71c 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h
@@ -1,5 +1,7 @@
 /*
-  Copyright (c) 2016 Arduino LLC.  All right reserved.
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  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
@@ -19,17 +21,117 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
-#define SAM_BA_INTERFACE		SAM_BA_BOTH_INTERFACES
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_BOTH_INTERFACES
+#endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -76,18 +178,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Arduino MKRZero"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x23
 #define USB_VID_LOW    0x41
 #define USB_PID_HIGH   0x00
 #define USB_PID_LOW    0x4F
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        5
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PB23D_SERCOM5_PAD3
@@ -96,28 +205,42 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21
-//#define BOOT_LOAD_PIN                     PIN_PA15
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (1)
 #define BOARD_LED_PIN                     (8)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
 // No RX/TX led
 //#define BOARD_LEDRX_PORT
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h b/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h
index 8d2698c3d..219544909 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -20,17 +21,117 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
-#define SAM_BA_INTERFACE		SAM_BA_BOTH_INTERFACES
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_BOTH_INTERFACES
+#endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -77,18 +178,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Arduino Zero"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x23
 #define USB_VID_LOW    0x41
 #define USB_PID_HIGH   0x00
 #define USB_PID_LOW    0x4D
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -97,35 +205,49 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (17)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
-#define BOARD_LEDRX_PORT                  (1)
-#define BOARD_LEDRX_PIN                   (3)
-#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDRX_PORT                  (1)
+//#define BOARD_LEDRX_PIN                   (3)
+//#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
 
-#define BOARD_LEDTX_PORT                  (0)
-#define BOARD_LEDTX_PIN                   (27)
-#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDTX_PORT                  (0)
+//#define BOARD_LEDTX_PIN                   (27)
+//#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
 
 #endif // _BOARD_DEFINITIONS_H_
diff --git a/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h b/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h
index 745275a07..fd1ed6521 100644
--- a/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h
+++ b/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -20,17 +21,117 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
-#define SAM_BA_INTERFACE		SAM_BA_BOTH_INTERFACES
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_BOTH_INTERFACES
+#endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -77,18 +178,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Genuino MKR1000"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x23
 #define USB_VID_LOW    0x41
 #define USB_PID_HIGH   0x02
 #define USB_PID_LOW    0x4E
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -97,28 +205,42 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (20)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
 //#define BOARD_LEDRX_PORT                  (0)
 //#define BOARD_LEDRX_PIN                   (20)
diff --git a/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h b/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h
index d9978fd93..a563ff51c 100644
--- a/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h
+++ b/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h
@@ -1,4 +1,5 @@
 /*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
   Copyright (c) 2015 Arduino LLC.  All right reserved.
   Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
 
@@ -20,17 +21,117 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
-/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, or
- * SAM_BA_BOTH_INTERFACES. Select only one interface with 4KB bootloaders.
- * The C21 lacks USB, so set to SAM_BA_UART_ONLY in this case.
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+//#define SDCARD_ENABLED
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      4
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PA12D_SERCOM4_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB10D_SERCOM4_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB11D_SERCOM4_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (0)
+#define SDCARD_SPI_CS_PIN               (18)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (6)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (7)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+ */
+#define SDCARD_AUTORUN_DISABLED
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
  */
-#define SAM_BA_INTERFACE		SAM_BA_BOTH_INTERFACES
+#if defined(SDCARD_ENABLED)
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_BOTH_INTERFACES
+#endif
 
-/* If ARDUINO_EXTENDED_CAPABILITIES is defined, 3 additional commands will
- * become available which will speed up programming when using the Arduino
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (21)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
  * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
  */
-#define ARDUINO_EXTENDED_CAPABILITIES	1
+#define ARDUINO_EXTENDED_CAPABILITIES   1
 
 /* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
  * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
@@ -77,18 +178,25 @@
 #define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
 
 /* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
- * STRING_PRODUCT will be sent to the host. Do not enable with 4KB bootloaders.
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_PRODUCT "Genuino Zero"
 
-/* USB VID and PID */
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x23
 #define USB_VID_LOW    0x41
 #define USB_PID_HIGH   0x02
 #define USB_PID_LOW    0x4D
 
-/* USART configuration */
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
 #define BOOT_USART_SERCOM_INSTANCE        0
 #define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
 #define BOOT_USART_PAD3                   PINMUX_PA11C_SERCOM0_PAD3
@@ -97,35 +205,49 @@
 #define BOOT_USART_PAD0                   PINMUX_UNUSED
 
 /*
- * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by
- * quickly tapping two times on the reset button.
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
  */
 #define BOOT_DOUBLE_TAP_ENABLED
 
 /*
- * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
- * pin is tied LOW.
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
  */
-//#define BOOT_LOAD_PIN                     PIN_PA21 // Pin 7
-//#define BOOT_LOAD_PIN                     PIN_PA15 // Pin 5
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (0)
+#define BOOT_LOAD_PIN                     (21)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
 
 /*
- * LEDs definitions
- * If the PORT is defined, then the associated LED is enabled
- * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces
- * a PWM pulse or heartbeat, otherwise, it simply turns on if enabled.
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
  */
 #define BOARD_LED_PORT                    (0)
 #define BOARD_LED_PIN                     (17)
 #define BOARD_LED_POLARITY	LED_POLARITY_HIGH_ON
-#define BOARD_LED_FADE_ENABLED
 
-#define BOARD_LEDRX_PORT                  (1)
-#define BOARD_LEDRX_PIN                   (3)
-#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDRX_PORT                  (1)
+//#define BOARD_LEDRX_PIN                   (3)
+//#define BOARD_LEDRX_POLARITY	LED_POLARITY_LOW_ON
 
-#define BOARD_LEDTX_PORT                  (0)
-#define BOARD_LEDTX_PIN                   (27)
-#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
+//#define BOARD_LEDTX_PORT                  (0)
+//#define BOARD_LEDTX_PIN                   (27)
+//#define BOARD_LEDTX_POLARITY	LED_POLARITY_LOW_ON
 
 #endif // _BOARD_DEFINITIONS_H_
diff --git a/bootloaders/zero/board_driver_led.c b/bootloaders/zero/board_driver_led.c
index 157b1d262..c3fa95639 100644
--- a/bootloaders/zero/board_driver_led.c
+++ b/bootloaders/zero/board_driver_led.c
@@ -26,10 +26,10 @@
 
 volatile uint8_t ledKeepValue = 0;
 volatile uint8_t ledTargetValue = 20;
-volatile int8_t ledDirection = 4;
+volatile int8_t ledDirection = 8;
 volatile uint8_t ledTargetValueMin = LED_TARGET_VALUE_MIN_1;
 
-inline void LED_pulse()
+inline void LED_pulse(void)
 {
   if (ledKeepValue == 0) {
     ledTargetValue += ledDirection;
@@ -54,3 +54,13 @@ inline void LED_pulse()
     LED_toggle();
   }
 }
+
+void LED_status(uint32_t periodMS)
+{
+  __disable_irq();
+
+  while (1) {
+    LED_toggle();
+    delayUs(periodMS * 500UL);
+  }
+}
diff --git a/bootloaders/zero/board_driver_led.h b/bootloaders/zero/board_driver_led.h
index c5a554e78..7563da20f 100644
--- a/bootloaders/zero/board_driver_led.h
+++ b/bootloaders/zero/board_driver_led.h
@@ -22,6 +22,18 @@
 
 #include <sam.h>
 #include "board_definitions.h"
+#include "util.h"
+
+#define LED_STATUS_SUCCESS                      1000
+#define LED_STATUS_FILE_ALREADY_MATCHES         500
+#define LED_STATUS_FILE_NOT_FOUND               250
+#define LED_STATUS_NO_SAM_BA_INTERFACE          125
+#define LED_STATUS_FILE_TOO_LARGE               63
+#define LED_STATUS_VERIFICATION_FAILURE         31
+
+void LED_pulse(void);
+void LED_status(uint32_t periodMS);
+
 
 #if defined(BOARD_LED_PORT)
   #if ((defined BOARD_LED_POLARITY) && BOARD_LED_POLARITY == LED_POLARITY_LOW_ON)
@@ -40,8 +52,6 @@
   inline void LED_toggle(void) { }
 #endif
 
-void LED_pulse();
-
 #if defined(BOARD_LEDRX_PORT)
   #if ((defined BOARD_LEDRX_POLARITY) && BOARD_LEDRX_POLARITY == LED_POLARITY_LOW_ON)
     inline void LEDRX_on(void) { PORT->Group[BOARD_LEDRX_PORT].OUTCLR.reg = (1<<BOARD_LEDRX_PIN); }
diff --git a/bootloaders/zero/board_driver_serial.c b/bootloaders/zero/board_driver_serial.c
index 38a3ff5c4..381a9401c 100644
--- a/bootloaders/zero/board_driver_serial.c
+++ b/bootloaders/zero/board_driver_serial.c
@@ -26,6 +26,7 @@ void uart_basic_init(Sercom *sercom, uint16_t baud_val, enum uart_pad_settings p
 	while(sercom->USART.SYNCBUSY.reg);
 	
 	/* Disable the SERCOM UART module */
+#if defined(PARANOIA)
 	sercom->USART.CTRLA.bit.ENABLE = 0;
 	while(sercom->USART.SYNCBUSY.reg);
 	
@@ -33,6 +34,7 @@ void uart_basic_init(Sercom *sercom, uint16_t baud_val, enum uart_pad_settings p
 	sercom->USART.CTRLA.bit.SWRST = 1;
 	while(sercom->USART.CTRLA.bit.SWRST);
 	while(sercom->USART.SYNCBUSY.reg);
+#endif
 	
 	/* Update the UART pad settings, mode and data order settings */
 	sercom->USART.CTRLA.reg = pad_conf | SERCOM_USART_CTRLA_MODE(1) | SERCOM_USART_CTRLA_DORD;
diff --git a/bootloaders/zero/board_driver_serial.h b/bootloaders/zero/board_driver_serial.h
index 809f7ec01..3ecb715f9 100644
--- a/bootloaders/zero/board_driver_serial.h
+++ b/bootloaders/zero/board_driver_serial.h
@@ -24,16 +24,15 @@
 #include <stdbool.h>
 #include <sam.h>
 
-#define PINMUX_UNUSED          0xFFFFFFFF
 
 /* SERCOM UART available pad settings */
 enum uart_pad_settings {
-	UART_RX_PAD0_TX_PAD2 = SERCOM_USART_CTRLA_RXPO(0) | SERCOM_USART_CTRLA_TXPO(1),
-	UART_RX_PAD1_TX_PAD2 = SERCOM_USART_CTRLA_RXPO(1) | SERCOM_USART_CTRLA_TXPO(1),
-	UART_RX_PAD2_TX_PAD0 = SERCOM_USART_CTRLA_RXPO(2),
-	UART_RX_PAD3_TX_PAD0 = SERCOM_USART_CTRLA_RXPO(3),
-	UART_RX_PAD1_TX_PAD0 = SERCOM_USART_CTRLA_RXPO(1),
-	UART_RX_PAD3_TX_PAD2 = SERCOM_USART_CTRLA_RXPO(3) | SERCOM_USART_CTRLA_TXPO(1),
+  UART_RX_PAD0_TX_PAD2 = SERCOM_USART_CTRLA_RXPO(0) | SERCOM_USART_CTRLA_TXPO(1),
+  UART_RX_PAD1_TX_PAD2 = SERCOM_USART_CTRLA_RXPO(1) | SERCOM_USART_CTRLA_TXPO(1),
+  UART_RX_PAD2_TX_PAD0 = SERCOM_USART_CTRLA_RXPO(2),
+  UART_RX_PAD3_TX_PAD0 = SERCOM_USART_CTRLA_RXPO(3),
+  UART_RX_PAD1_TX_PAD0 = SERCOM_USART_CTRLA_RXPO(1),
+  UART_RX_PAD3_TX_PAD2 = SERCOM_USART_CTRLA_RXPO(3) | SERCOM_USART_CTRLA_TXPO(1),
 };
 
 /**
diff --git a/bootloaders/zero/board_driver_usb.c b/bootloaders/zero/board_driver_usb.c
index 2656e6aad..15ee2aec8 100644
--- a/bootloaders/zero/board_driver_usb.c
+++ b/bootloaders/zero/board_driver_usb.c
@@ -22,10 +22,13 @@
 #include "sam_ba_usb.h"
 #include "sam_ba_cdc.h"
 
+#define USB_PAD_TRANSN_REG_POS            (6)
 #define NVM_USB_PAD_TRANSN_POS            (45)
 #define NVM_USB_PAD_TRANSN_SIZE           (5)
+#define USB_PAD_TRANSP_REG_POS            (0)
 #define NVM_USB_PAD_TRANSP_POS            (50)
 #define NVM_USB_PAD_TRANSP_SIZE           (5)
+#define USB_PAD_TRIM_REG_POS              (12)
 #define NVM_USB_PAD_TRIM_POS              (55)
 #define NVM_USB_PAD_TRIM_SIZE             (3)
 
@@ -67,7 +70,7 @@ P_USB_CDC USB_Open(P_USB_CDC pCdc, Usb *pUsb)
  */
 void USB_Init(void)
 {
-  uint32_t pad_transn, pad_transp, pad_trim;
+  uint8_t pad_transn, pad_transp, pad_trim;
 
   /* Enable USB clock */
 #if (SAMD21 || SAMD11)
@@ -77,33 +80,31 @@ void USB_Init(void)
 #endif
 
   /* Set up the USB DP/DN pins */
-  PORT->Group[0].PINCFG[PIN_PA24G_USB_DM].bit.PMUXEN = 1;
-  PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg &= ~(0xF << (4 * (PIN_PA24G_USB_DM & 0x01u)));
-  PORT->Group[0].PMUX[PIN_PA24G_USB_DM/2].reg |= MUX_PA24G_USB_DM << (4 * (PIN_PA24G_USB_DM & 0x01u));
-  PORT->Group[0].PINCFG[PIN_PA25G_USB_DP].bit.PMUXEN = 1;
-  PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg &= ~(0xF << (4 * (PIN_PA25G_USB_DP & 0x01u)));
-  PORT->Group[0].PMUX[PIN_PA25G_USB_DP/2].reg |= MUX_PA25G_USB_DP << (4 * (PIN_PA25G_USB_DP & 0x01u));
+  pinMux(PINMUX_PA24G_USB_DM);
+  pinMux(PINMUX_PA25G_USB_DP);
 
   /* ----------------------------------------------------------------------------------------------
    * Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
    */
 #if (SAMD21 || SAMD11)
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GCM_USB ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+  waitForSync();
 #else
   GCLK->PCHCTRL[GCM_USB].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
-  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+  waitForSync();
 #endif
 
   /* Reset */
+#if defined(PARANOIA)
   USB->DEVICE.CTRLA.bit.SWRST = 1;
   while (USB->DEVICE.SYNCBUSY.bit.SWRST)
   {
     /* Sync wait */
   }
+#endif
 
   /* Load Pad Calibration */
-  pad_transn =( *((uint32_t *)(NVMCTRL_OTP4)
+  pad_transn =(uint8_t)( *((uint32_t *)(NVMCTRL_OTP4)
       + (NVM_USB_PAD_TRANSN_POS / 32))
     >> (NVM_USB_PAD_TRANSN_POS % 32))
     & ((1 << NVM_USB_PAD_TRANSN_SIZE) - 1);
@@ -113,9 +114,7 @@ void USB_Init(void)
     pad_transn = 5;
   }
 
-  USB->DEVICE.PADCAL.bit.TRANSN = pad_transn;
-
-  pad_transp =( *((uint32_t *)(NVMCTRL_OTP4)
+  pad_transp =(uint8_t)( *((uint32_t *)(NVMCTRL_OTP4)
       + (NVM_USB_PAD_TRANSP_POS / 32))
       >> (NVM_USB_PAD_TRANSP_POS % 32))
       & ((1 << NVM_USB_PAD_TRANSP_SIZE) - 1);
@@ -125,8 +124,7 @@ void USB_Init(void)
     pad_transp = 29;
   }
 
-  USB->DEVICE.PADCAL.bit.TRANSP = pad_transp;
-  pad_trim =( *((uint32_t *)(NVMCTRL_OTP4)
+  pad_trim =(uint8_t)( *((uint32_t *)(NVMCTRL_OTP4)
       + (NVM_USB_PAD_TRIM_POS / 32))
       >> (NVM_USB_PAD_TRIM_POS % 32))
       & ((1 << NVM_USB_PAD_TRIM_SIZE) - 1);
@@ -136,7 +134,7 @@ void USB_Init(void)
     pad_trim = 3;
   }
 
-  USB->DEVICE.PADCAL.bit.TRIM = pad_trim;
+  USB->DEVICE.PADCAL.reg = (uint16_t)((pad_trim << USB_PAD_TRIM_REG_POS) | (pad_transn << USB_PAD_TRANSN_REG_POS) | (pad_transp << USB_PAD_TRANSP_REG_POS));
 
   /* Set the configuration */
   /* Set mode to Device mode */
diff --git a/bootloaders/zero/board_driver_usb.h b/bootloaders/zero/board_driver_usb.h
index 4e71b8c1a..878ba626d 100644
--- a/bootloaders/zero/board_driver_usb.h
+++ b/bootloaders/zero/board_driver_usb.h
@@ -21,6 +21,7 @@
 #define _BOARD_DRIVER_USB_H_
 
 #include "sam_ba_cdc.h"
+#include "util.h"
 
 extern UsbDeviceDescriptor usb_endpoint_table[MAX_EP];
 extern uint8_t udd_ep_out_cache_buffer[2][64]; //1 for CTRL, 1 for BULK
diff --git a/bootloaders/zero/board_init.c b/bootloaders/zero/board_init.c
index 85e5c8640..69237989b 100644
--- a/bootloaders/zero/board_init.c
+++ b/bootloaders/zero/board_init.c
@@ -20,6 +20,9 @@
 
 #include <sam.h>
 #include "board_definitions.h"
+#include "util.h"
+
+extern uint32_t SystemCoreClock;
 
 /**
  * \brief SystemInit() configures the needed clocks and according Flash Read Wait States.
@@ -43,15 +46,6 @@
   #error "startup.c: Unsupported chip"
 #endif
 
-void waitForSync( void )
-{
-#if (SAMD)
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
-#elif (SAML21 || SAMC21)
-  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
-#endif
-}
-
 #if (SAMD || SAML21)
 void waitForDFLL( void )
 {
@@ -72,6 +66,11 @@ void waitForPLL( void )
 
 void board_init( void )
 {
+  /*
+   * Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21)
+   */
+  NVMCTRL->CTRLB.bit.MANW = 1;
+
   /* Set 1 Flash Wait State for 48MHz (2 for the L21 and C21), cf tables 20.9 and 35.27 in SAMD21 Datasheet */
 #if (SAMD)
   NVMCTRL->CTRLB.bit.RWS = NVMCTRL_CTRLB_RWS_HALF_Val ;	// one wait state
@@ -370,6 +369,8 @@ void board_init( void )
   waitForSync();
 #endif
 
+  SystemCoreClock=VARIANT_MCK;
+
   /* Set CPU and APB dividers before switching the CPU/APB clocks to the new clock source */
 #if (SAMD)
   PM->CPUSEL.reg  = PM_CPUSEL_CPUDIV_DIV1 ;
@@ -379,9 +380,4 @@ void board_init( void )
 #elif (SAML21 || SAMC21)
   MCLK->CPUDIV.reg  = MCLK_CPUDIV_CPUDIV_DIV1 ;
 #endif
-
-  /*
-   * Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21)
-   */
-  NVMCTRL->CTRLB.bit.MANW = 1;
 }
diff --git a/bootloaders/zero/build_all_bootloaders.sh b/bootloaders/zero/build_all_bootloaders.sh
index 77103f151..b9c6c0638 100755
--- a/bootloaders/zero/build_all_bootloaders.sh
+++ b/bootloaders/zero/build_all_bootloaders.sh
@@ -2,69 +2,136 @@
 
 make clean
 
-BOARD_ID=arduino_zero MCU=SAMD21G18A make all mostly_clean
-
-BOARD_ID=genuino_zero MCU=SAMD21G18A make all mostly_clean
-
-BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A make all mostly_clean
-
-BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A make all mostly_clean
-
-BOARD_ID=arduino_mkrzero MCU=SAMD21G18A make all mostly_clean
-
-BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A make all mostly_clean
-BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A make all mostly_clean
-
-BOARD_ID=MT_D21E_rev_B MCU=SAMD21E17A make all mostly_clean
-BOARD_ID=MT_D21E_rev_B MCU=SAMD21E18A make all mostly_clean
-BOARD_ID=MT_D21E_rev_B MCU=SAML21E18B make all mostly_clean
-BOARD_ID=MT_D21E_rev_B MCU=SAMC21E18A make all mostly_clean
-
-BOARD_ID=MT_D11 MCU=SAMD11D14AM make all mostly_clean
-
-BOARD_ID=Generic_x21E MCU=SAMD21E15A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMD21E16A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMD21E17A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMD21E18A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAML21E15B make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAML21E16B make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAML21E17B make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAML21E18B make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMC21E15A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMC21E16A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMC21E17A make all mostly_clean
-BOARD_ID=Generic_x21E MCU=SAMC21E18A make all mostly_clean
-
-BOARD_ID=Generic_x21G MCU=SAMD21G15A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMD21G16A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMD21G17A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMD21G18A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAML21G16B make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAML21G17B make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAML21G18B make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMC21G15A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMC21G16A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMC21G17A make all mostly_clean
-BOARD_ID=Generic_x21G MCU=SAMC21G18A make all mostly_clean
-
-BOARD_ID=Generic_x21J MCU=SAMD21J15A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMD21J16A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMD21J17A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMD21J18A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAML21J16B make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAML21J17B make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAML21J18B make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMC21J15A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMC21J16A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMC21J17A make all mostly_clean
-BOARD_ID=Generic_x21J MCU=SAMC21J18A make all mostly_clean
-
-BOARD_ID=Generic_D11D14AM MCU=SAMD11D14AM make all mostly_clean
-BOARD_ID=Generic_D11D14AS MCU=SAMD11D14AS make all mostly_clean
-BOARD_ID=Generic_D11C14A MCU=SAMD11C14A make all mostly_clean
-
-BOARD_ID=arduino_m0 MCU=SAMD21G18A make all mostly_clean
-BOARD_ID=arduino_m0_pro MCU=SAMD21G18A make all mostly_clean
+# With SDCARD_DISABLED
+BOARD_ID=arduino_zero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=genuino_zero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=arduino_mkrzero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=MT_D21E_rev_B MCU=SAMD21E17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_B MCU=SAMD21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_B MCU=SAML21E18B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_B MCU=SAMC21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=MT_D11 MCU=SAMD11D14AM SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=Generic_x21E MCU=SAMD21E15A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMD21E16A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMD21E17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMD21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E15B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E16B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E17B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E18B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E15A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E16A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=Generic_x21G MCU=SAMD21G15A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMD21G16A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMD21G17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAML21G16B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAML21G17B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAML21G18B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G15A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G16A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=Generic_x21J MCU=SAMD21J15A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMD21J16A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMD21J17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMD21J18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAML21J16B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAML21J17B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAML21J18B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J15A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J16A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J17A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=Generic_D11D14AM MCU=SAMD11D14AM SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_D11D14AS MCU=SAMD11D14AS SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+BOARD_ID=arduino_m0 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=arduino_m0_pro MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
+
+# With SDCARD_ENABLED
+BOARD_ID=arduino_zero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=genuino_zero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=arduino_mkrzero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=MT_D21E_rev_B MCU=SAMD21E17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_B MCU=SAMD21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_B MCU=SAML21E18B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=MT_D21E_rev_B MCU=SAMC21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=MT_D11 MCU=SAMD11D14AM SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=Generic_x21E MCU=SAMD21E15A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMD21E16A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMD21E17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMD21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E15B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E16B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E17B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAML21E18B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E15A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E16A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21E MCU=SAMC21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=Generic_x21G MCU=SAMD21G15A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMD21G16A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMD21G17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAML21G16B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAML21G17B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAML21G18B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G15A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G16A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21G MCU=SAMC21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=Generic_x21J MCU=SAMD21J15A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMD21J16A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMD21J17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMD21J18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAML21J16B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAML21J17B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAML21J18B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J15A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J16A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J17A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_x21J MCU=SAMC21J18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=Generic_D11D14AM MCU=SAMD11D14AM SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_D11D14AS MCU=SAMD11D14AS SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_ENABLED make all mostly_clean
+
+BOARD_ID=arduino_m0 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=arduino_m0_pro MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
 
 mv -v *.bin ./binaries/
 
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_128KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_128KB.ld
index 62808782b..1ac6fa45c 100644
--- a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_128KB.ld
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_128KB.ld
@@ -211,11 +211,15 @@ SECTIONS
 	/* Set stack top to end of RAM, and stack limit move down by
 	 * size of stack_dummy section */
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
 	PROVIDE(__stack = __StackTop);
 
 	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
 
 	/* Check if data + heap + stack exceeds RAM limit */
 	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
 }
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_16KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_16KB.ld
index 79bf34fc4..919a3cba3 100644
--- a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_16KB.ld
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_16KB.ld
@@ -211,11 +211,15 @@ SECTIONS
 	/* Set stack top to end of RAM, and stack limit move down by
 	 * size of stack_dummy section */
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
 	PROVIDE(__stack = __StackTop);
 
 	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
 
 	/* Check if data + heap + stack exceeds RAM limit */
 	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 4KB (vectors + text + data). Please recompile with different options.")
 }
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_256KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_256KB.ld
index 2a8b056d3..ddba7b6ef 100644
--- a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_256KB.ld
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_256KB.ld
@@ -211,11 +211,15 @@ SECTIONS
 	/* Set stack top to end of RAM, and stack limit move down by
 	 * size of stack_dummy section */
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
 	PROVIDE(__stack = __StackTop);
 
 	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
 
 	/* Check if data + heap + stack exceeds RAM limit */
 	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
 }
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_32KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_32KB.ld
index 5d89ebcde..ffd55e78e 100644
--- a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_32KB.ld
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_32KB.ld
@@ -211,11 +211,15 @@ SECTIONS
 	/* Set stack top to end of RAM, and stack limit move down by
 	 * size of stack_dummy section */
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
 	PROVIDE(__stack = __StackTop);
 
 	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
 
 	/* Check if data + heap + stack exceeds RAM limit */
 	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
 }
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_64KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_64KB.ld
index 1a4707232..a9fa8f7ad 100644
--- a/bootloaders/zero/linker_scripts/bootloader_sam_m0p_64KB.ld
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m0p_64KB.ld
@@ -211,11 +211,15 @@ SECTIONS
 	/* Set stack top to end of RAM, and stack limit move down by
 	 * size of stack_dummy section */
 	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
-	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
 	PROVIDE(__stack = __StackTop);
 
 	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
 
 	/* Check if data + heap + stack exceeds RAM limit */
 	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
 }
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 4789c0005..47acb7bd8 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -18,17 +18,21 @@
 */
 
 #include <stdio.h>
+#include <stdbool.h>
 #include <sam.h>
 #include "sam_ba_monitor.h"
 #include "sam_ba_serial.h"
 #include "board_definitions.h"
 #include "board_driver_led.h"
+#include "SDCard/sdBootloader.h"
+#include "util.h"
 #if (SAMD21 || SAMD11 || SAML21)
   #include "sam_ba_usb.h"
   #include "sam_ba_cdc.h"
 #endif
 
 extern uint32_t __sketch_vectors_ptr; // Exported value from linker script
+extern volatile int8_t ledDirection;
 extern void board_init(void);
 
 #if (defined DEBUG) && (DEBUG == 1)
@@ -60,6 +64,7 @@ uint32_t* pulSketch_Start_Address;
   /*
    * Load the sketch Reset Handler address
    * __sketch_vectors_ptr is exported from linker script and point on first 32b word of sketch vector table
+   * Remember, variables exported from a linker script are different than normal variables (only address, no value)
    * First 32b word is sketch stack
    * Second 32b word is sketch entry point: Reset_Handler()
    */
@@ -76,29 +81,14 @@ uint32_t* pulSketch_Start_Address;
     return;
   }
 
-#if defined(BOOT_LOAD_PIN)
-  volatile PortGroup *boot_port = (volatile PortGroup *)(&(PORT->Group[BOOT_LOAD_PIN / 32]));
-  volatile bool boot_en;
+#if defined(BOOT_LOAD_PIN_ENABLED)
+  configPin(BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN, BOOT_LOAD_PIN_CONFIG);
 
-  // Enable the input mode in Boot GPIO Pin
-  boot_port->DIRCLR.reg = BOOT_PIN_MASK;
-  boot_port->PINCFG[BOOT_LOAD_PIN & 0x1F].reg = PORT_PINCFG_INEN | PORT_PINCFG_PULLEN;
-  boot_port->OUTSET.reg = BOOT_PIN_MASK;
-
-  /* Allow time for debouncing capacitor to charge (10ms) */
-  /* Needed when BOOT_DOUBLE_TAP is not used */
-
-#if (SAMD21 || SAMD11)
-  #define numLoopsDebounce 2500UL
-#elif (SAML21 || SAMC21)
-  #define numLoopsDebounce 10000UL
-#endif
-  for (uint32_t i=0; i<numLoopsDebounce; i++) /* 10ms */
-    /* force compiler to not optimize this... */
-    __asm__ __volatile__("");
+  /* Allow time for debouncing capacitor (if using a button) to charge (10ms) */
+  delayUs(10000UL);
 
   // Read the BOOT_LOAD_PIN status
-  boot_en = (boot_port->IN.reg) & BOOT_PIN_MASK;
+  volatile bool boot_en = isPinActive(BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN, BOOT_LOAD_PIN_POLARITY);
 
   // Check the bootloader enable condition
   if (!boot_en)
@@ -135,18 +125,8 @@ uint32_t* pulSketch_Start_Address;
     /* First tap */
     BOOT_DOUBLE_TAP_DATA = DOUBLE_TAP_MAGIC;
 
-    /* Wait 0.5sec to see if the user tap reset again.
-     * The loop value is based on SAMD21 default 1MHz clock @ reset.
-     * SAML21 and SAMC21 have a default 4MHz clock @ reset.
-     */
-#if (SAMD21 || SAMD11)
-  #define numLoops 125000UL
-#elif (SAML21 || SAMC21)
-  #define numLoops 500000UL
-#endif
-    for (uint32_t i=0; i<numLoops; i++) /* 500ms */
-      /* force compiler to not optimize this... */
-      __asm__ __volatile__("");
+    /* Wait 0.5sec to see if the user tap reset again */
+    delayUs(500000UL);
 
     /* Timeout happened, continue boot... */
     BOOT_DOUBLE_TAP_DATA = 0;
@@ -186,25 +166,15 @@ int main(void)
   check_start_application();
 
   /* We have determined we should stay in the monitor. */
+
   /* System initialization */
   board_init();
   __enable_irq();
 
-#if SAM_BA_INTERFACE == SAM_BA_UART_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
-  /* UART is enabled in all cases */
-  serial_open();
-#endif
-
-#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
-  pCdc = usb_init();
-#endif
-
-  DEBUG_PIN_LOW;
-
   /* Initialize LEDs */
   LED_init();
   #if !defined(BOARD_LED_FADE_ENABLED)
-    LED_on();
+  LED_on();
   #endif
   LEDRX_init();
   LEDRX_off();
@@ -214,9 +184,139 @@ int main(void)
   /* Start the sys tick (20 us) */
   SysTick_Config(VARIANT_MCK / 50000);
 
+
+/* If SDCARD_ENABLED defined, read optional external pins and run SD Card bootloader (if enabled).
+ */
+  #if defined(SDCARD_ENABLED)
+    uint8_t bootloaderMode = SD_BOOTLOADER_MODE_NO_UPDATE;
+    #if defined(SAM_BA_INTERFACE_USE_PIN)
+      uint8_t sdcardStatus = SD_BOOTLOADER_NOT_CALLED;
+    #endif
+
+    #if defined(SDCARD_USE_PIN1)
+      pinConfig(SDCARD_PIN1_PORT, SDCARD_PIN1_PIN, SDCARD_PIN1_CONFIG);
+    #endif
+    #if defined(SDCARD_USE_PIN2)
+      #if !defined(SDCARD_USE_PIN1)
+        #error "main.c: When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must also be defined"
+      #endif
+      pinConfig(SDCARD_PIN2_PORT, SDCARD_PIN2_PIN, SDCARD_PIN2_CONFIG);
+    #endif
+
+    #if (defined(SDCARD_USE_PIN1) && defined(SDCARD_USE_PIN2))
+      bool pin1 = isPinActive(SDCARD_PIN1_PORT, SDCARD_PIN1_PIN, SDCARD_PIN1_POLARITY);
+      bool pin2 = isPinActive(SDCARD_PIN2_PORT, SDCARD_PIN2_PIN, SDCARD_PIN2_POLARITY);
+      if (pin1) {
+        bootloaderMode = SD_BOOTLOADER_MODE_UPDATE;
+      } else if (pin2) {
+        bootloaderMode = SD_BOOTLOADER_MODE_UPDATE2;
+      }
+    #elif defined(SDCARD_USE_PIN1)
+      if (isPinActive(SDCARD_PIN1_PORT, SDCARD_PIN1_PIN, SDCARD_PIN1_POLARITY)) {
+        bootloaderMode = SD_BOOTLOADER_MODE_UPDATE;
+      }
+    #else
+      bootloaderMode = SD_BOOTLOADER_MODE_UPDATE;
+    #endif
+
+    if (bootloaderMode != SD_BOOTLOADER_MODE_NO_UPDATE) {
+    #if defined(SAM_BA_INTERFACE_USE_PIN)
+      sdcardStatus = sdBootloader(bootloaderMode);
+    #else
+      sdBootloader(bootloaderMode);
+    #endif
+    }
+  #endif
+
+/* When using SAM_BA_INTERFACE_USE_PIN, check the pin to determine which SAM-BA interface to use.
+ */
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+  uint8_t sambaInterface = SAM_BA_NONE;
+  pinConfig(SAM_BA_INTERFACE_PIN_PORT, SAM_BA_INTERFACE_PIN_PIN, SAM_BA_INTERFACE_PIN_CONFIG);
+
+  if (isPinActive(SAM_BA_INTERFACE_PIN_PORT, SAM_BA_INTERFACE_PIN_PIN, PIN_POLARITY_ACTIVE_LOW)) {      // pin is low
+  #if ((SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES) && (SAM_BA_INTERFACE_PIN_POLARITY == PIN_POLARITY_USBCDC_LOW))
+    sambaInterface = SAM_BA_USBCDC_ONLY;
+  #elif ((SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY) && (SAM_BA_INTERFACE_PIN_POLARITY == PIN_POLARITY_ACTIVE_LOW))
+    sambaInterface = SAM_BA_USBCDC_ONLY;
+  #elif ((SAM_BA_INTERFACE == SAM_BA_UART_ONLY) && (SAM_BA_INTERFACE_PIN_POLARITY == PIN_POLARITY_ACTIVE_LOW))
+    sambaInterface = SAM_BA_UART_ONLY;
+  #endif
+  } else {      // pin is high
+  #if ((SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES) && (SAM_BA_INTERFACE_PIN_POLARITY == PIN_POLARITY_USBCDC_HIGH))
+    sambaInterface = SAM_BA_USBCDC_ONLY;
+  #elif ((SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY) && (SAM_BA_INTERFACE_PIN_POLARITY == PIN_POLARITY_ACTIVE_HIGH))
+    sambaInterface = SAM_BA_USBCDC_ONLY;
+  #elif ((SAM_BA_INTERFACE == SAM_BA_UART_ONLY) && (SAM_BA_INTERFACE_PIN_POLARITY == PIN_POLARITY_ACTIVE_HIGH))
+    sambaInterface = SAM_BA_UART_ONLY;
+  #endif
+  }
+#endif
+
+/* Check if we should continue with a SAM-BA interface (if compiled and enabled).
+ * Only show LED_STATUS_FILE_NOT_FOUND if a SAM-BA interface is not available.
+ * LED_STATUS_FILE_NOT_FOUND occurs if there is no SD Card, no FAT16/FAT32
+ * filesystem, or no file (UPDATE.BIN or UPDATE2.BIN) in the root directory.
+ */
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+  #if defined(SDCARD_ENABLED)
+  if (sambaInterface == SAM_BA_NONE) {
+    if (sdcardStatus == SD_BOOTLOADER_FILE_NOT_FOUND) {
+      LED_status(LED_STATUS_FILE_NOT_FOUND);
+    } else if (sdcardStatus == SD_BOOTLOADER_NOT_CALLED) {
+      LED_status(LED_STATUS_NO_SAM_BA_INTERFACE);
+    }
+  }
+  #else
+    #if (SAM_BA_INTERFACE == SAM_BA_NONE)
+      LED_status(LED_STATUS_NO_SAM_BA_INTERFACE);
+    #else
+    if (sambaInterface == SAM_BA_NONE) {
+      LED_status(LED_STATUS_NO_SAM_BA_INTERFACE);
+    }
+    #endif
+  #endif
+#else
+  #if (SAM_BA_INTERFACE == SAM_BA_NONE)
+    LED_status(LED_STATUS_NO_SAM_BA_INTERFACE);
+  #endif
+#endif
+
+/* Enable the appropriate SAM-BA interfaces. When using SAM_BA_INTERFACE_USE_PIN,
+ * the peripheral and pins are only setup for the selected/enabled interface.
+ */
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+  if (sambaInterface == SAM_BA_UART_ONLY) {
+#endif
+
+#if SAM_BA_INTERFACE == SAM_BA_UART_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
+  /* UART is enabled in all cases */
+    serial_open();
+#endif
+
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+  } else if (sambaInterface == SAM_BA_USBCDC_ONLY) {
+#endif
+
+#if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
+    pCdc = usb_init();
+#endif
+
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+  }
+#endif
+
+
+  ledDirection = 4;
+  DEBUG_PIN_LOW;
+
   /* Wait for a complete enum on usb or a '#' char on serial line */
   while (1)
   {
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+    if (sambaInterface == SAM_BA_USBCDC_ONLY) {
+#endif
+
 #if SAM_BA_INTERFACE == SAM_BA_USBCDC_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
     if (pCdc->IsConfigured(pCdc) != 0)
     {
@@ -235,6 +335,10 @@ int main(void)
     }
 #endif
 
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+    } else if (sambaInterface == SAM_BA_UART_ONLY) {
+#endif
+
 #if SAM_BA_INTERFACE == SAM_BA_UART_ONLY  ||  SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES
     /* Check if a '#' has been received */
     if (!main_b_cdc_enable && serial_sharp_received())
@@ -247,12 +351,16 @@ int main(void)
       }
     }
 #endif
+
+#if defined(SAM_BA_INTERFACE_USE_PIN)
+    }
+#endif
   }
 }
 
 void SysTick_Handler(void)
 {
-#if defined BOARD_LED_FADE_ENABLED
+#if (defined(BOARD_LED_FADE_ENABLED) && defined(BOARD_LED_PORT))
   LED_pulse();
 #endif
 
diff --git a/bootloaders/zero/sam_ba_monitor.c b/bootloaders/zero/sam_ba_monitor.c
index 93a6bc4d9..0d660f56d 100644
--- a/bootloaders/zero/sam_ba_monitor.c
+++ b/bootloaders/zero/sam_ba_monitor.c
@@ -28,6 +28,7 @@
   #include "sam_ba_cdc.h"
 #endif
 #include "board_driver_led.h"
+#include "util.h"
 
 const char RomBOOT_Version[] = SAM_BA_VERSION;
 #if (defined ARDUINO_EXTENDED_CAPABILITIES) && (ARDUINO_EXTENDED_CAPABILITIES == 1)
@@ -86,13 +87,19 @@ const t_monitor_if usbcdc_if =
 t_monitor_if * ptr_monitor_if;
 
 /* b_terminal_mode mode (ascii) or hex mode */
+#if defined(TERMINAL_MODE_ENABLED)
 volatile bool b_terminal_mode = false;
+#endif
 volatile bool b_sam_ba_interface_usart = false;
 
 /* Pulse generation counters to keep track of the time remaining for each pulse type */
 #define TX_RX_LED_PULSE_PERIOD 100
+#if defined(BOARD_LEDTX_PORT)
 volatile uint16_t txLEDPulse = 0; // time remaining for Tx LED pulse
+#endif
+#if defined(BOARD_LEDRX_PORT)
 volatile uint16_t rxLEDPulse = 0; // time remaining for Rx LED pulse
+#endif
 
 void sam_ba_monitor_init(uint8_t com_interface)
 {
@@ -121,8 +128,10 @@ static uint32_t sam_ba_putdata(t_monitor_if* pInterface, void const* data, uint3
 
 	result=pInterface->putdata(data, length);
 
+#if defined(BOARD_LEDTX_PORT)
 	LEDTX_on();
 	txLEDPulse = TX_RX_LED_PULSE_PERIOD;
+#endif
 
 	return result;
 }
@@ -136,11 +145,13 @@ static uint32_t sam_ba_getdata(t_monitor_if* pInterface, void* data, uint32_t le
 
 	result=pInterface->getdata(data, length);
 
+#if defined(BOARD_LEDRX_PORT)
 	if (result)
 	{
 		LEDRX_on();
 		rxLEDPulse = TX_RX_LED_PULSE_PERIOD;
 	}
+#endif
 
 	return result;
 }
@@ -154,8 +165,10 @@ static uint32_t sam_ba_putdata_xmd(t_monitor_if* pInterface, void const* data, u
 
 	result=pInterface->putdata_xmd(data, length);
 
+#if defined(BOARD_LEDTX_PORT)
 	LEDTX_on();
 	txLEDPulse = TX_RX_LED_PULSE_PERIOD;
+#endif
 
 	return result;
 }
@@ -169,11 +182,13 @@ static uint32_t sam_ba_getdata_xmd(t_monitor_if* pInterface, void* data, uint32_
 
 	result=pInterface->getdata_xmd(data, length);
 
+#if defined(BOARD_LEDRX_PORT)
 	if (result)
 	{
 		LEDRX_on();
 		rxLEDPulse = TX_RX_LED_PULSE_PERIOD;
 	}
+#endif
 
 	return result;
 }
@@ -186,6 +201,7 @@ static uint32_t sam_ba_getdata_xmd(t_monitor_if* pInterface, void* data, uint32_
  */
 void sam_ba_putdata_term(uint8_t* data, uint32_t length)
 {
+  #if defined(TERMINAL_MODE_ENABLED)
   uint8_t temp, buf[12], *data_ascii;
   uint32_t i, int_value;
 
@@ -220,6 +236,7 @@ void sam_ba_putdata_term(uint8_t* data, uint32_t length)
     sam_ba_putdata(ptr_monitor_if, buf, length * 2 + 4);
   }
   else
+#endif
     sam_ba_putdata(ptr_monitor_if, data, length);
   return;
 }
@@ -249,9 +266,8 @@ uint8_t command, *ptr_data, *ptr, data[SIZEBUFMAX];
 uint8_t j;
 uint32_t u32tmp;
 
-uint32_t PAGE_SIZE, PAGES, MAX_FLASH;
-
 // Prints a 32-bit integer in hex.
+#if ((SAM_BA_INTERFACE != SAM_BA_NONE) && ((defined(ARDUINO_EXTENDED_CAPABILITIES)) && (ARDUINO_EXTENDED_CAPABILITIES == 1)))
 static void put_uint32(uint32_t n)
 {
   char buff[8];
@@ -265,6 +281,7 @@ static void put_uint32(uint32_t n)
   }
   sam_ba_putdata( ptr_monitor_if, buff, 8);
 }
+#endif
 
 static void sam_ba_monitor_loop(void)
 {
@@ -277,10 +294,12 @@ static void sam_ba_monitor_loop(void)
 
     if (*ptr == '#')
     {
+      #if defined(TERMINAL_MODE_ENABLED)
       if (b_terminal_mode)
       {
         sam_ba_putdata(ptr_monitor_if, "\n\r", 2);
       }
+      #endif
       if (command == 'S')
       {
         //Check if some data are remaining in the "data" buffer
@@ -351,10 +370,12 @@ static void sam_ba_monitor_loop(void)
         /* Rebase the Stack Pointer */
         __set_MSP(sp);
         __enable_irq();
+
         if (b_sam_ba_interface_usart) {
           ptr_monitor_if->put_c(0x6);
         }
       }
+      #if defined(TERMINAL_MODE_ENABLED)
       else if (command == 'T')
       {
         b_terminal_mode = 1;
@@ -368,6 +389,7 @@ static void sam_ba_monitor_loop(void)
         }
         b_terminal_mode = 0;
       }
+      #endif
       else if (command == 'V')
       {
         sam_ba_putdata( ptr_monitor_if, "v", 1);
@@ -399,18 +421,7 @@ static void sam_ba_monitor_loop(void)
         // Note: the flash memory is erased in ROWS, that is in block of 4 pages.
         //       Even if the starting address is the last byte of a ROW the entire
         //       ROW is erased anyway.
-
-        uint32_t dst_addr = current_number; // starting address
-
-        while (dst_addr < MAX_FLASH)
-        {
-          // Execute "ER" Erase Row
-          NVMCTRL->ADDR.reg = dst_addr / 2;
-          NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_ER;
-          while (NVMCTRL->INTFLAG.bit.READY == 0)
-            ;
-          dst_addr += PAGE_SIZE * 4; // Skip a ROW
-        }
+        flashErase(current_number);
 
         // Notify command completed
         sam_ba_putdata( ptr_monitor_if, "X\n\r", 3);
@@ -435,40 +446,7 @@ static void sam_ba_monitor_loop(void)
         }
         else
         {
-          // Write to flash
-          uint32_t size = current_number/4;
-          uint32_t *src_addr = src_buff_addr;
-          uint32_t *dst_addr = (uint32_t*)ptr_data;
-
-          // Set automatic page write
-          NVMCTRL->CTRLB.bit.MANW = 0;
-
-          // Do writes in pages
-          while (size)
-          {
-            // Execute "PBC" Page Buffer Clear
-            NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_PBC;
-            while (NVMCTRL->INTFLAG.bit.READY == 0)
-              ;
-
-            // Fill page buffer
-            uint32_t i;
-            for (i=0; i<(PAGE_SIZE/4) && i<size; i++)
-            {
-              dst_addr[i] = src_addr[i];
-            }
-
-            // Execute "WP" Write Page
-            //NVMCTRL->ADDR.reg = ((uint32_t)dst_addr) / 2;
-            NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_WP;
-            while (NVMCTRL->INTFLAG.bit.READY == 0)
-              ;
-
-            // Advance to next page
-            dst_addr += i;
-            src_addr += i;
-            size     -= i;
-          }
+          flashWrite(current_number, src_buff_addr, (uint32_t*)ptr_data);
         }
 
         // Notify command completed
@@ -500,10 +478,12 @@ static void sam_ba_monitor_loop(void)
       command = 'z';
       current_number = 0;
 
+      #if defined(TERMINAL_MODE_ENABLED)
       if (b_terminal_mode)
       {
         sam_ba_putdata( ptr_monitor_if, ">", 1);
       }
+      #endif
     }
     else
     {
@@ -535,24 +515,22 @@ static void sam_ba_monitor_loop(void)
 
 void sam_ba_monitor_sys_tick(void)
 {
-	/* Check whether the TX or RX LED one-shot period has elapsed.  if so, turn off the LED */
+  /* Check whether the TX or RX LED one-shot period has elapsed.  if so, turn off the LED */
+  #if defined(BOARD_LEDTX_PORT)
 	if (txLEDPulse && !(--txLEDPulse))
 		LEDTX_off();
+  #endif
+  #if defined(BOARD_LEDRX_PORT)
 	if (rxLEDPulse && !(--rxLEDPulse))
 		LEDRX_off();
+  #endif
 }
 
 /**
  * \brief This function starts the SAM-BA monitor.
  */
-#if (defined ARDUINO_EXTENDED_CAPABILITIES) && (ARDUINO_EXTENDED_CAPABILITIES == 1)
 void sam_ba_monitor_run(void)
 {
-  uint32_t pageSizes[] = { 8, 16, 32, 64, 128, 256, 512, 1024 };
-  PAGE_SIZE = pageSizes[NVMCTRL->PARAM.bit.PSZ];
-  PAGES = NVMCTRL->PARAM.bit.NVMP;
-  MAX_FLASH = PAGE_SIZE * PAGES;
-
   ptr_data = NULL;
   command = 'z';
   while (1)
@@ -560,14 +538,3 @@ void sam_ba_monitor_run(void)
     sam_ba_monitor_loop();
   }
 }
-#else
-void sam_ba_monitor_run(void)
-{
-  ptr_data = NULL;
-  command = 'z';
-  while (1)
-  {
-    sam_ba_monitor_loop();
-  }
-}
-#endif
diff --git a/bootloaders/zero/sam_ba_monitor.h b/bootloaders/zero/sam_ba_monitor.h
index 4b0f0c537..e8a9e2bd1 100644
--- a/bootloaders/zero/sam_ba_monitor.h
+++ b/bootloaders/zero/sam_ba_monitor.h
@@ -26,6 +26,7 @@
 #define SAM_BA_BOTH_INTERFACES      0
 #define SAM_BA_UART_ONLY            1
 #define SAM_BA_USBCDC_ONLY          2
+#define SAM_BA_NONE                 3
 
 /* Selects USB as the communication interface of the monitor */
 #define SAM_BA_INTERFACE_USBCDC     0
diff --git a/bootloaders/zero/sam_ba_serial.c b/bootloaders/zero/sam_ba_serial.c
index 256d57d25..5e1be8c99 100644
--- a/bootloaders/zero/sam_ba_serial.c
+++ b/bootloaders/zero/sam_ba_serial.c
@@ -51,49 +51,11 @@ uint8_t mode_of_transfer;
  */
 void serial_open(void)
 {
-	uint32_t port;
-	uint32_t pin;
-
-	/* Configure the port pins for SERCOM_USART */
-	if (BOOT_USART_PAD0 != PINMUX_UNUSED)
-  {
-		/* Mask 6th bit in pin number to check whether it is greater than 32 i.e., PORTB pin */
-		port = (BOOT_USART_PAD0 & 0x200000) >> 21;
-		pin = (BOOT_USART_PAD0 >> 16);
-		PORT->Group[port].PINCFG[(pin - (port*32))].bit.PMUXEN = 1;
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg &= ~(0xF << (4 * (pin & 0x01u)));
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg |= (BOOT_USART_PAD0 & 0xFF) << (4 * (pin & 0x01u));
-	}
-
-	if (BOOT_USART_PAD1 != PINMUX_UNUSED)
-  {
-		/* Mask 6th bit in pin number to check whether it is greater than 32 i.e., PORTB pin */
-		port = (BOOT_USART_PAD1 & 0x200000) >> 21;
-		pin = BOOT_USART_PAD1 >> 16;
-		PORT->Group[port].PINCFG[(pin - (port*32))].bit.PMUXEN = 1;
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg &= ~(0xF << (4 * (pin & 0x01u)));
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg |= (BOOT_USART_PAD1 & 0xFF) << (4 * (pin & 0x01u));
-	}
-
-	if (BOOT_USART_PAD2 != PINMUX_UNUSED)
-  {
-		/* Mask 6th bit in pin number to check whether it is greater than 32 i.e., PORTB pin */
-		port = (BOOT_USART_PAD2 & 0x200000) >> 21;
-		pin = BOOT_USART_PAD2 >> 16;
-		PORT->Group[port].PINCFG[(pin - (port*32))].bit.PMUXEN = 1;
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg &= ~(0xF << (4 * (pin & 0x01u)));
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg |= (BOOT_USART_PAD2 & 0xFF) << (4 * (pin & 0x01u));
-	}
-
-	if (BOOT_USART_PAD3 != PINMUX_UNUSED)
-  {
-		/* Mask 6th bit in pin number to check whether it is greater than 32 i.e., PORTB pin */
-		port = (BOOT_USART_PAD3 & 0x200000) >> 21;
-		pin = BOOT_USART_PAD3 >> 16;
-		PORT->Group[port].PINCFG[(pin - (port*32))].bit.PMUXEN = 1;
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg &= ~(0xF << (4 * (pin & 0x01u)));
-		PORT->Group[port].PMUX[(pin - (port*32))/2].reg |= (BOOT_USART_PAD3 & 0xFF) << (4 * (pin & 0x01u));
-	}
+        /* Configure the port pins for SERCOM_USART */
+	pinMux(BOOT_USART_PAD0);
+        pinMux(BOOT_USART_PAD1);
+        pinMux(BOOT_USART_PAD2);
+        pinMux(BOOT_USART_PAD3);
 
 	/* Enable clock for BOOT_USART_MODULE */
 #if (SAMD21 || SAMD11)
@@ -114,10 +76,10 @@ void serial_open(void)
 	/* Set GCLK_GEN0 as source for GCLK_ID_SERCOMx_CORE */
 #if (SAMD21 || SAMD11)
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( BOOT_USART_PER_CLOCK_INDEX ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
-  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+  waitForSync();
 #elif (SAML21 || SAMC21)
   GCLK->PCHCTRL[BOOT_USART_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
-  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+  waitForSync();
 #endif
 
 	/* Baud rate 115200 - clock 48MHz -> BAUD value-63018 */
diff --git a/bootloaders/zero/sam_ba_serial.h b/bootloaders/zero/sam_ba_serial.h
index cb69f459e..f28163b2d 100644
--- a/bootloaders/zero/sam_ba_serial.h
+++ b/bootloaders/zero/sam_ba_serial.h
@@ -22,6 +22,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "util.h"
 
 
 /* USART buffer size (must be a power of two) */
diff --git a/bootloaders/zero/samd21_sam_ba.atsln b/bootloaders/zero/samd21_sam_ba.atsln
deleted file mode 100644
index cf1043181..000000000
--- a/bootloaders/zero/samd21_sam_ba.atsln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Atmel Studio Solution File, Format Version 11.00
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "samd21_sam_ba", "samd21_sam_ba.cproj", "{DCE6C7E3-EE26-4D79-826B-08594B9AD897}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Release|ARM = Release|ARM
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|ARM.ActiveCfg = Debug|ARM
-		{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Debug|ARM.Build.0 = Debug|ARM
-		{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|ARM.ActiveCfg = Release|ARM
-		{DCE6C7E3-EE26-4D79-826B-08594B9AD897}.Release|ARM.Build.0 = Release|ARM
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/bootloaders/zero/samd21_sam_ba.cproj b/bootloaders/zero/samd21_sam_ba.cproj
deleted file mode 100644
index 70ee7e93a..000000000
--- a/bootloaders/zero/samd21_sam_ba.cproj
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectVersion>7.0</ProjectVersion>
-    <ToolchainName>com.Atmel.ARMGCC.C</ToolchainName>
-    <ProjectGuid>dce6c7e3-ee26-4d79-826b-08594b9ad897</ProjectGuid>
-    <avrdevice>ATSAMD21G18A</avrdevice>
-    <avrdeviceseries>none</avrdeviceseries>
-    <OutputType>Executable</OutputType>
-    <Language>C</Language>
-    <OutputFileName>$(MSBuildProjectName)</OutputFileName>
-    <OutputFileExtension>.elf</OutputFileExtension>
-    <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
-    <AssemblyName>samd21_sam_ba</AssemblyName>
-    <Name>samd21_sam_ba</Name>
-    <RootNamespace>samd21_sam_ba</RootNamespace>
-    <ToolchainFlavour>Native</ToolchainFlavour>
-    <KeepTimersRunning>true</KeepTimersRunning>
-    <OverrideVtor>false</OverrideVtor>
-    <CacheFlash>true</CacheFlash>
-    <ProgFlashFromRam>true</ProgFlashFromRam>
-    <RamSnippetAddress>0x20000000</RamSnippetAddress>
-    <UncachedRange />
-    <preserveEEPROM>true</preserveEEPROM>
-    <OverrideVtorValue>exception_table</OverrideVtorValue>
-    <BootSegment>2</BootSegment>
-    <eraseonlaunchrule>0</eraseonlaunchrule>
-    <ExternalProgrammingToolCommand />
-    <AsfFrameworkConfig>
-      <framework-data xmlns="">
-        <options />
-        <configurations />
-        <files />
-        <documentation help="" />
-        <offline-documentation help="" />
-        <dependencies>
-          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.27.3" />
-        </dependencies>
-      </framework-data>
-    </AsfFrameworkConfig>
-    <avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>
-    <avrtoolserialnumber>J41800001895</avrtoolserialnumber>
-    <avrdeviceexpectedsignature>0x10010000</avrdeviceexpectedsignature>
-    <avrtoolinterface>SWD</avrtoolinterface>
-    <com_atmel_avrdbg_tool_atmelice>
-      <ToolOptions>
-        <InterfaceProperties>
-          <SwdClock>2000000</SwdClock>
-        </InterfaceProperties>
-        <InterfaceName>SWD</InterfaceName>
-      </ToolOptions>
-      <ToolType>com.atmel.avrdbg.tool.atmelice</ToolType>
-      <ToolNumber>J41800001895</ToolNumber>
-      <ToolName>Atmel-ICE</ToolName>
-    </com_atmel_avrdbg_tool_atmelice>
-    <avrtoolinterfaceclock>2000000</avrtoolinterfaceclock>
-    <com_atmel_avrdbg_tool_edbg>
-      <ToolOptions>
-        <InterfaceProperties>
-        </InterfaceProperties>
-        <InterfaceName>SWD</InterfaceName>
-      </ToolOptions>
-      <ToolType>com.atmel.avrdbg.tool.edbg</ToolType>
-      <ToolNumber>ATML2320040200000259</ToolNumber>
-      <ToolName>EDBG</ToolName>
-    </com_atmel_avrdbg_tool_edbg>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <ToolchainSettings>
-      <ArmGcc>
-  <armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
-  <armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
-  <armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
-  <armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
-  <armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
-  <armgcc.compiler.symbols.DefSymbols>
-    <ListValues>
-      <Value>NDEBUG</Value>
-    </ListValues>
-  </armgcc.compiler.symbols.DefSymbols>
-  <armgcc.compiler.optimization.level>Optimize for size (-Os)</armgcc.compiler.optimization.level>
-  <armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
-  <armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
-  <armgcc.linker.libraries.Libraries>
-    <ListValues>
-      <Value>libm</Value>
-    </ListValues>
-  </armgcc.linker.libraries.Libraries>
-  <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
-  <armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21j18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
-</ArmGcc>
-    </ToolchainSettings>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <ToolchainSettings>
-      <ArmGcc>
-  <armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
-  <armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
-  <armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
-  <armgcc.common.outputfiles.bin>True</armgcc.common.outputfiles.bin>
-  <armgcc.common.outputfiles.srec>True</armgcc.common.outputfiles.srec>
-  <armgcc.compiler.symbols.DefSymbols>
-    <ListValues>
-      <Value>DEBUG</Value>
-    </ListValues>
-  </armgcc.compiler.symbols.DefSymbols>
-  <armgcc.compiler.optimization.level>Optimize (-O1)</armgcc.compiler.optimization.level>
-  <armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>True</armgcc.compiler.optimization.PrepareFunctionsForGarbageCollection>
-  <armgcc.compiler.optimization.DebugLevel>Maximum (-g3)</armgcc.compiler.optimization.DebugLevel>
-  <armgcc.compiler.warnings.AllWarnings>True</armgcc.compiler.warnings.AllWarnings>
-  <armgcc.linker.libraries.Libraries>
-    <ListValues>
-      <Value>libm</Value>
-    </ListValues>
-  </armgcc.linker.libraries.Libraries>
-  <armgcc.linker.optimization.GarbageCollectUnusedSections>True</armgcc.linker.optimization.GarbageCollectUnusedSections>
-  <armgcc.linker.miscellaneous.LinkerFlags>-Tsamd21j18a_flash.ld</armgcc.linker.miscellaneous.LinkerFlags>
-  <armgcc.assembler.debugging.DebugLevel>Default (-g)</armgcc.assembler.debugging.DebugLevel>
-  <armgcc.preprocessingassembler.debugging.DebugLevel>Default (-Wa,-g)</armgcc.preprocessingassembler.debugging.DebugLevel>
-</ArmGcc>
-    </ToolchainSettings>
-    <UsesExternalMakeFile>True</UsesExternalMakeFile>
-    <OutputDirectory />
-    <BuildTarget>DEBUG=1 all</BuildTarget>
-    <CleanTarget>clean</CleanTarget>
-    <ExternalMakeFilePath>Makefile</ExternalMakeFilePath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="board_definitions.h">
-      <SubType>compile</SubType>
-      <Link>board_definitions.h</Link>
-    </Compile>
-    <Compile Include="board_driver_led.c">
-      <SubType>compile</SubType>
-      <Link>board_driver_led.c</Link>
-    </Compile>
-    <Compile Include="board_driver_led.h">
-      <SubType>compile</SubType>
-      <Link>board_driver_led.h</Link>
-    </Compile>
-    <Compile Include="board_driver_serial.c">
-      <SubType>compile</SubType>
-      <Link>board_driver_serial.c</Link>
-    </Compile>
-    <Compile Include="board_driver_serial.h">
-      <SubType>compile</SubType>
-      <Link>board_driver_serial.h</Link>
-    </Compile>
-    <Compile Include="board_driver_usb.c">
-      <SubType>compile</SubType>
-      <Link>board_driver_usb.c</Link>
-    </Compile>
-    <Compile Include="board_driver_usb.h">
-      <SubType>compile</SubType>
-      <Link>board_driver_usb.h</Link>
-    </Compile>
-    <Compile Include="board_init.c">
-      <SubType>compile</SubType>
-      <Link>board_init.c</Link>
-    </Compile>
-    <Compile Include="board_startup.c">
-      <SubType>compile</SubType>
-      <Link>board_startup.c</Link>
-    </Compile>
-    <Compile Include="main.c">
-      <SubType>compile</SubType>
-      <Link>main.c</Link>
-    </Compile>
-    <Compile Include="sam_ba_cdc.c">
-      <SubType>compile</SubType>
-      <Link>sam_ba_cdc.c</Link>
-    </Compile>
-    <Compile Include="sam_ba_cdc.h">
-      <SubType>compile</SubType>
-      <Link>sam_ba_cdc.h</Link>
-    </Compile>
-    <Compile Include="sam_ba_monitor.c">
-      <SubType>compile</SubType>
-      <Link>sam_ba_monitor.c</Link>
-    </Compile>
-    <Compile Include="sam_ba_monitor.h">
-      <SubType>compile</SubType>
-      <Link>sam_ba_monitor.h</Link>
-    </Compile>
-    <Compile Include="sam_ba_serial.c">
-      <SubType>compile</SubType>
-      <Link>sam_ba_serial.c</Link>
-    </Compile>
-    <Compile Include="sam_ba_serial.h">
-      <SubType>compile</SubType>
-      <Link>sam_ba_serial.h</Link>
-    </Compile>
-    <Compile Include="sam_ba_usb.c">
-      <SubType>compile</SubType>
-      <Link>sam_ba_usb.c</Link>
-    </Compile>
-    <Compile Include="sam_ba_usb.h">
-      <SubType>compile</SubType>
-      <Link>sam_ba_usb.h</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile">
-      <SubType>compile</SubType>
-      <Link>Makefile</Link>
-    </None>
-    <None Include="README.md">
-      <SubType>compile</SubType>
-      <Link>README.md</Link>
-    </None>
-    <None Include="bootloader_samd21x18.ld">
-      <SubType>compile</SubType>
-      <Link>bootloader_samd21x18.ld</Link>
-    </None>
-  </ItemGroup>
-  <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
-</Project>
\ No newline at end of file
diff --git a/bootloaders/zero/util.c b/bootloaders/zero/util.c
new file mode 100644
index 000000000..46b382902
--- /dev/null
+++ b/bootloaders/zero/util.c
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2015 Arduino LLC.  All right reserved.
+ * Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
+ * Copyright (c) 2017 MattairTech 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
+ */
+
+#include "util.h"
+
+extern uint32_t __sketch_vectors_ptr; // Exported value from linker script
+
+/*
+ * The SAMD21 has a default 1MHz clock @ reset.
+ * SAML21 and SAMC21 have a default 4MHz clock @ reset.
+ * It is switched to 48MHz in board_init.c
+ */
+#if (SAMD21 || SAMD11)
+  #define CLOCK_DEFAULT 1000000ul
+#elif (SAML21 || SAMC21)
+  #define CLOCK_DEFAULT 4000000ul
+#endif
+uint32_t SystemCoreClock=CLOCK_DEFAULT;
+
+void flashErase (uint32_t startAddress)
+{
+  // Syntax: X[ADDR]#
+  // Erase the flash memory starting from ADDR to the end of flash.
+
+  // Note: the flash memory is erased in ROWS, that is in block of 4 pages.
+  //       Even if the starting address is the last byte of a ROW the entire
+  //       ROW is erased anyway.
+
+  uint32_t dst_addr = startAddress; // starting address
+
+  while (dst_addr < FLASH_SIZE)
+  {
+    // Execute "ER" Erase Row
+    NVMCTRL->ADDR.reg = dst_addr / 2;
+    NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_ER;
+    while (NVMCTRL->INTFLAG.bit.READY == 0)
+      ;
+    dst_addr += FLASH_PAGE_SIZE * 4; // Skip a ROW
+  }
+}
+
+void flashWrite (uint32_t numBytes, uint32_t * buffer, uint32_t * ptr_data)
+{
+  // This command writes the content of a buffer in SRAM into flash memory.
+
+  // Syntax: Y[ADDR],0#
+  // Set the starting address of the SRAM buffer.
+
+  // Syntax: Y[ROM_ADDR],[SIZE]#
+  // Write the first SIZE bytes from the SRAM buffer (previously set) into
+  // flash memory starting from address ROM_ADDR
+
+  // Write to flash
+  uint32_t size = numBytes/4;
+  uint32_t *src_addr = buffer;
+  uint32_t *dst_addr = ptr_data;
+
+  // Do writes in pages
+  while (size)
+  {
+    // Execute "PBC" Page Buffer Clear
+    NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_PBC;
+    while (NVMCTRL->INTFLAG.bit.READY == 0)
+      ;
+
+    // Fill page buffer
+    uint32_t i;
+    for (i=0; i<(FLASH_PAGE_SIZE/4) && i<size; i++)
+    {
+      dst_addr[i] = src_addr[i];
+    }
+
+    // Execute "WP" Write Page
+    //NVMCTRL->ADDR.reg = ((uint32_t)dst_addr) / 2;
+    NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_WP;
+    while (NVMCTRL->INTFLAG.bit.READY == 0)
+      ;
+
+    // Advance to next page
+    dst_addr += i;
+    src_addr += i;
+    size     -= i;
+  }
+}
+
+void pinMux (uint32_t pinmux)
+{
+  uint32_t port;
+  uint32_t pin;
+
+  if (pinmux != PINMUX_UNUSED)
+  {
+    /* Mask 6th bit in pin number to check whether it is greater than 32 i.e., PORTB pin */
+    port = (pinmux & 0x200000) >> 21;
+    pin = (pinmux >> 16);
+    PORT->Group[port].PINCFG[(pin - (port*32))].bit.PMUXEN = 1;
+    PORT->Group[port].PMUX[(pin - (port*32))/2].reg &= ~(0xF << (4 * (pin & 0x01u)));
+    PORT->Group[port].PMUX[(pin - (port*32))/2].reg |= (pinmux & 0xFF) << (4 * (pin & 0x01u));
+  }
+}
+
+void pinConfig (uint8_t port, uint8_t pin, uint8_t config)
+{
+  uint8_t pinCfg = PORT_PINCFG_INEN;
+
+  if (config == INPUT_PULLUP || config == INPUT_PULLDOWN  || config == INPUT) {
+    PORT->Group[port].DIRCLR.reg = (1 << pin);
+    if (config == INPUT_PULLUP) {
+      pinCfg |= PORT_PINCFG_PULLEN;
+      PORT->Group[port].OUTSET.reg = (1 << pin);
+    } else if (config == INPUT_PULLDOWN) {
+      pinCfg |= PORT_PINCFG_PULLEN;
+      PORT->Group[port].OUTCLR.reg = (1 << pin);
+    }
+  } else {
+    if (config == OUTPUT_HIGH) {
+      PORT->Group[port].OUTSET.reg = (1 << pin);
+    } else if (config == OUTPUT_LOW) {
+      PORT->Group[port].OUTCLR.reg = (1 << pin);
+    }
+    PORT->Group[port].DIRSET.reg = (1 << pin);
+  }
+
+  PORT->Group[port].PINCFG[pin].reg = (uint8_t)pinCfg;
+}
+
+bool isPinActive (uint8_t port, uint8_t pin, uint8_t config)
+{
+  uint32_t pinState = ((PORT->Group[port].IN.reg) & (1 << pin));
+  if (config == PIN_POLARITY_ACTIVE_LOW) {
+    if (!pinState) return(true);
+  } else {
+    if (pinState) return(true);
+  }
+  return(false);
+}
+
+void delayUs (uint32_t delay)
+{
+  /* The SAMD21 has a default 1MHz clock @ reset.
+   * SAML21 and SAMC21 have a default 4MHz clock @ reset.
+   * It is switched to 48MHz in board_init.c
+   */
+  uint32_t numLoops;
+
+  if (SystemCoreClock == VARIANT_MCK) {
+    numLoops = (12 * delay);
+  } else {
+#if (SAMD21 || SAMD11)
+    numLoops = (delay >> 2);
+#elif (SAML21 || SAMC21)
+    numLoops = delay;
+#endif
+  }
+
+  for (uint32_t i=0; i < numLoops; i++) /* 10ms */
+    /* force compiler to not optimize this... */
+    __asm__ __volatile__("");
+}
+
+void systemReset (void)
+{
+  /* Request a system reset */
+  SCB->AIRCR = (uint32_t)((1 << SCB_AIRCR_SYSRESETREQ_Pos) | (SCB_AIRCR_VECTKEY_Val << SCB_AIRCR_VECTKEY_Pos));
+
+  while(1);
+}
+
+void waitForSync (void)
+{
+  #if (SAMD)
+  while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
+  #elif (SAML21 || SAMC21)
+  while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
+  #endif
+}
diff --git a/bootloaders/zero/util.h b/bootloaders/zero/util.h
new file mode 100644
index 000000000..a1040dc12
--- /dev/null
+++ b/bootloaders/zero/util.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2015 Arduino LLC.  All right reserved.
+ * Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  All right reserved.
+ * Copyright (c) 2017 MattairTech LLC. All right reserved.
+ * Copyright (C) 2014, ChaN, 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 _UTIL_H_
+#define _UTIL_H_
+
+#include "sam.h"
+#include <stdbool.h>
+#include "board_definitions.h"
+
+// TODO: Variable bootloader sizes
+#if (SAMD11)
+  #define APP_START 0x00001000
+#else
+  #define APP_START 0x00002000
+#endif
+
+#define SCB_AIRCR_VECTKEY_Val   0x05FA
+
+void flashErase (uint32_t startAddress);
+void flashWrite (uint32_t startAddress, uint32_t * buffer, uint32_t * ptr_data);
+void pinMux (uint32_t pinmux);
+void systemReset (void);
+void pinConfig (uint8_t port, uint8_t pin, uint8_t config);
+bool isPinActive (uint8_t port, uint8_t pin, uint8_t config);
+void delayUs (uint32_t delay);
+void waitForSync (void);
+
+#endif

From a3c489d821c65f1a278de1aece602a4f2ec1e291 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Wed, 21 Jun 2017 09:32:05 +0000
Subject: [PATCH 095/124] Update bootloader README.md formatting.

---
 bootloaders/zero/README.md | 76 +++++++++++---------------------------
 1 file changed, 22 insertions(+), 54 deletions(-)

diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index ebd303fcb..c08b938af 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -55,7 +55,7 @@ is running, the LED, if configured, will PWM fade quickly (~4Hz).
    file on the SD card with the already installed firmware. If they already match, then
    the bootloader will jump to the firmware, unless SDCARD_AUTORUN_DISABLED is defined,
    in which case the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
-   If the update file differs from the installed firmware, it continues to step 5.
+   If the update file differs from the installed firmware, continue to step 5.
 5. The application section of the FLASH is erased. The selected update file is written
    to the FLASH. If the file exceeds the size of the FLASH, the LED will blink with
    status code LED_STATUS_FILE_TOO_LARGE.
@@ -391,14 +391,14 @@ BOOT_LOAD_PIN                           | 84
 SDCARD_USE_PIN1 & SDCARD_USE_PIN2       | 92
 SDCARD_USE_PIN1                         | 60
 ARDUINO_EXTENDED_CAPABILITIES (X/Y/Z)   | 904*
- *X (Chip Erase) & Y (Write FLASH)*     | 120*
- *Z (CRC Verification)*                 | 248*
- *crc16Table*                           | 512*
+*X (Chip Erase) & Y (Write FLASH)*      | 120*
+*Z (CRC Verification)*                  | 248*
+*crc16Table*                            | 512*
 
- *SAM_BA_CDC and SAM_BA_UART automatically pull in SAM-BA Monitor*
- *ARDUINO_EXTENDED_CAPABILITIES and SDCARD_ENABLED include X and Y functions*
- *ARDUINO_EXTENDED_CAPABILITIES and SAM_BA_UART include crc16Table*
- *ARDUINO_EXTENDED_CAPABILITIES includes Z function*
+* SAM_BA_CDC and SAM_BA_UART automatically pull in SAM-BA Monitor
+* ARDUINO_EXTENDED_CAPABILITIES and SDCARD_ENABLED include X and Y functions
+* ARDUINO_EXTENDED_CAPABILITIES and SAM_BA_UART include crc16Table
+* ARDUINO_EXTENDED_CAPABILITIES includes Z function
 
 #### Example Compiled Binary Size
 
@@ -427,12 +427,8 @@ See "SD Card Bootloader" section. This define can also be set from the
 makefile (so it can be used with the build_all_bootloaders.sh script).
 Size: ~2788B. Disabled by default. Available with 4KB bootloader.
 
-#### SDCARD_SPI_SERCOM_INSTANCE
-#### SDCARD_SPI_PAD_SETTINGS
-#### SDCARD_SPI_PAD0
-#### SDCARD_SPI_PAD1
-#### SDCARD_SPI_PAD2
-#### SDCARD_SPI_PAD3
+### SDCARD_SPI_SERCOM_INSTANCE
+#### SDCARD_SPI_PAD_SETTINGS, SDCARD_SPI_PAD0, SDCARD_SPI_PAD1, SDCARD_SPI_PAD2, SDCARD_SPI_PAD3
 
 If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
 When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -442,23 +438,16 @@ Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
 When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
 associated pins are only initialized if either pin is active.
 
-### SDCARD_SPI_CS_PORT
-### SDCARD_SPI_CS_PIN
+### SDCARD_SPI_CS_PORT, SDCARD_SPI_CS_PIN
 
 If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
 must also be defined. PORT can be 0 (Port A) or 1 (Port B).
 
 ### SDCARD_USE_PIN1
-#### SDCARD_PIN1_POLARITY
-#### SDCARD_PIN1_PORT
-#### SDCARD_PIN1_PIN
-#### SDCARD_PIN1_CONFIG
+#### SDCARD_PIN1_POLARITY, SDCARD_PIN1_PORT, SDCARD_PIN1_PIN, SDCARD_PIN1_CONFIG
 
 ### SDCARD_USE_PIN2
-#### SDCARD_PIN2_POLARITY
-#### SDCARD_PIN2_PORT
-#### SDCARD_PIN2_PIN
-#### SDCARD_PIN2_CONFIG
+#### SDCARD_PIN2_POLARITY, SDCARD_PIN2_PORT, SDCARD_PIN2_PIN, SDCARD_PIN2_CONFIG
 
 If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
 optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
@@ -492,10 +481,7 @@ lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
 SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
 
 ### SAM_BA_INTERFACE_USE_PIN
-#### SAM_BA_INTERFACE_PIN_POLARITY
-#### SAM_BA_INTERFACE_PIN_PORT
-#### SAM_BA_INTERFACE_PIN_PIN
-#### SAM_BA_INTERFACE_PIN_CONFIG
+#### SAM_BA_INTERFACE_PIN_POLARITY, SAM_BA_INTERFACE_PIN_PORT, SAM_BA_INTERFACE_PIN_PIN, SAM_BA_INTERFACE_PIN_CONFIG
 
 If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
 SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
@@ -568,26 +554,19 @@ The fine calibration value for DFLL open-loop mode is defined here.
 The coarse calibration value is loaded from NVM OTP (factory calibration values).
 
 ### USB_VENDOR_STRINGS_ENABLED
-#### STRING_MANUFACTURER
-#### STRING_PRODUCT
+#### STRING_MANUFACTURER, STRING_PRODUCT
 
 If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
 STRING_PRODUCT will be sent to the host.
 Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
 
-#### USB_VID_HIGH
-#### USB_VID_LOW
-#### USB_PID_HIGH
-#### USB_PID_LOW
+### USB_VID_HIGH
+#### USB_VID_LOW, USB_PID_HIGH, USB_PID_LOW
 
 If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set.
 
 ### BOOT_USART_SERCOM_INSTANCE
-#### BOOT_USART_PAD_SETTINGS
-#### BOOT_USART_PAD3
-#### BOOT_USART_PAD2
-#### BOOT_USART_PAD1
-#### BOOT_USART_PAD0
+#### BOOT_USART_PAD_SETTINGS, BOOT_USART_PAD3, BOOT_USART_PAD2, BOOT_USART_PAD1, BOOT_USART_PAD0
 
 BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
 See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
@@ -603,10 +582,7 @@ tapping two times on the reset button (within 1/2 second).
 Size: ~96B. Enabled by default.
 
 ### BOOT_LOAD_PIN_ENABLED
-#### BOOT_LOAD_PIN
-#### BOOT_LOAD_PIN_PORT
-#### BOOT_LOAD_PIN_POLARITY
-#### BOOT_LOAD_PIN_CONFIG
+#### BOOT_LOAD_PIN, BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN_POLARITY, BOOT_LOAD_PIN_CONFIG
 
 If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
 pin is active after reset. There is a 10ms delay before testing the pin to
@@ -622,17 +598,9 @@ If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in a
 is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
 Size: ~160B. Enabled by default.
 
-### BOARD_LED_PORT
-#### BOARD_LED_PIN
-#### BOARD_LED_POLARITY
-
-### BOARD_LEDRX_PORT
-#### BOARD_LEDRX_PIN
-#### BOARD_LEDRX_POLARITY
-
-### BOARD_LEDTX_PORT
-#### BOARD_LEDTX_PIN
-#### BOARD_LEDTX_POLARITY
+### BOARD_LED_PORT, BOARD_LED_PIN, BOARD_LED_POLARITY
+#### BOARD_LEDRX_PORT, BOARD_LEDRX_PIN, BOARD_LEDRX_POLARITY
+#### BOARD_LEDTX_PORT, BOARD_LEDTX_PIN, BOARD_LEDTX_POLARITY
 
 If the LED PORT is defined, then the LED on the associated pin is enabled.
 Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.

From 9a3bdbbac9c28283c8828d7b2d7043a66122137f Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 23 Jun 2017 03:27:13 +0000
Subject: [PATCH 096/124] Removed SDU library, as the bootloader now supports
 SD cards directly

---
 CHANGELOG                                |    4 +-
 bootloaders/zero/README.md               |   25 +-
 libraries/SDU/extras/SDUBoot/SDUBoot.ino |   92 --
 libraries/SDU/extras/SDUBoot/build.sh    |   26 -
 libraries/SDU/keywords.txt               |   17 -
 libraries/SDU/library.properties         |    9 -
 libraries/SDU/src/SDU.cpp                |   34 -
 libraries/SDU/src/SDU.h                  |   24 -
 libraries/SDU/src/boot/mkr1000.h         | 1192 ----------------------
 libraries/SDU/src/boot/mkrzero.h         | 1192 ----------------------
 libraries/SDU/src/boot/zero.h            | 1141 ---------------------
 11 files changed, 14 insertions(+), 3742 deletions(-)
 delete mode 100644 libraries/SDU/extras/SDUBoot/SDUBoot.ino
 delete mode 100755 libraries/SDU/extras/SDUBoot/build.sh
 delete mode 100644 libraries/SDU/keywords.txt
 delete mode 100644 libraries/SDU/library.properties
 delete mode 100644 libraries/SDU/src/SDU.cpp
 delete mode 100644 libraries/SDU/src/SDU.h
 delete mode 100644 libraries/SDU/src/boot/mkr1000.h
 delete mode 100644 libraries/SDU/src/boot/mkrzero.h
 delete mode 100644 libraries/SDU/src/boot/zero.h

diff --git a/CHANGELOG b/CHANGELOG
index 56ff3407f..6ddec2c37 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 1.6.8-beta-b2 (in-progress):
 * Added more Serial, SPI, and WIRE options
-* Added MicroSD card firmware loading in the bootloader
-* Fixed SDU library to work with MattairTech boards
+* Added SD Card firmware loading support to the bootloader (4KB and 8KB)
+* Removed SDU library, as the bootloader now supports SD cards directly
 * Fixed auto-detection for Arduino Zero and M0 board variants
 * Fixed bootloader compilation on Windows
 * Documentation updates
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index c08b938af..ef25211d1 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -69,16 +69,20 @@ is running, the LED, if configured, will PWM fade quickly (~4Hz).
 
 ### SD Card External Pins
 
-If SDCARD_USE_PIN1 is defined, then the SD Card bootloader will run depending
+If only SDCARD_USE_PIN1 is defined, then the SD Card bootloader will run depending
 on the state of an external pin and the value of SDCARD_PIN1_POLARITY. The
 SPI peripheral and SPI pins will only be setup if the SD card bootloader runs.
+This is the default setting with the precompiled binaries that include SD Card support.
+
+*Hint: When doing development with an SD card installed, and thus probably using the*
+*SAM-BA interface, either ensure there is no UPDATE.BIN, or use pin 1 to skip the SD card*
 
 Pin1            | Action
 ----------------|---------------------
 Inactive        | Skip SD bootloader
 Active          | Run SD bootloader
 
-If SDCARD_USE_PIN1 and SDCARD_USE_PIN2 are defined, then the SD Card bootloader
+If both SDCARD_USE_PIN1 and SDCARD_USE_PIN2 are defined, then the SD Card bootloader
 will run depending on the state of two external pins and the values of
 SDCARD_PIN1_POLARITY and SDCARD_PIN1_POLARITY. The SPI peripheral and pins
 will only be setup if the SD card bootloader runs. Note that if SDCARD_USE_PIN2
@@ -155,6 +159,7 @@ at https://github.com/mattairtech/ArduinoCore-samd. Each board
 and chip combination has two bootloaders available:
 
 * SAM-BA interface only
+  * This is the bootloader that is installed by the Arduino IDE
   * USB CDC only for all MattairTech boards
   * Both USB CDC and UART for most Arduino boards
   * The Generic board variants minimize external pin usage
@@ -263,9 +268,14 @@ If using Bossac standalone, download bossac directly at:
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
 
+Linux 64 bit users can also download Bossa (GUI) and bossash (shell) from:
+
+* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
+
 Note that the SAM-BA tools from Atmel will not work, and the version of bossac from the Arduino
 SAMD Core currently does not support the L21, C21, or D11 (but it does support the D21).
 
+
 #### Using Bossac Standalone
 
 TODO: Update https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip with new chips (L21 and C21).
@@ -281,17 +291,6 @@ Wl,sectionstart=.text=0x2000
 You can also use a linker script. See the MattairTech SAM M0+ package for examples.
 Be sure to generate and use a binary file. Many makefiles are set up to generate an elf, hex, and bin already.
 
-Download Bossac from:
-
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
-
-Linux 64 bit users can also download Bossa (GUI) and bossash (shell) from:
-
-* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
-
 As an example, bossac will be used to upload the test firmware (blink sketch):
 
 1. Download firmware from https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip and unzip.
diff --git a/libraries/SDU/extras/SDUBoot/SDUBoot.ino b/libraries/SDU/extras/SDUBoot/SDUBoot.ino
deleted file mode 100644
index 016360cda..000000000
--- a/libraries/SDU/extras/SDUBoot/SDUBoot.ino
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-  Copyright (c) 2017 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
-*/
-
-#include <SD.h>
-#include <FlashStorage.h>
-
-#define SDU_START    0x2000
-#define SDU_SIZE     0x4000
-
-#define SKETCH_START (uint32_t*)(SDU_START + SDU_SIZE)
-
-#ifndef SDCARD_SS_PIN
-#define SDCARD_SS_PIN 4
-#endif
-
-#define UPDATE_FILE "UPDATE.BIN"
-
-FlashClass flash;
-
-// Initialize C library
-extern "C" void __libc_init_array(void);
-
-int main() {
-  init();
-
-  __libc_init_array();
-
-  delay(1);
-
-  if (SD.begin(SDCARD_SS_PIN) && SD.exists(UPDATE_FILE)) {
-    File updateFile = SD.open(UPDATE_FILE);
-    uint32_t updateSize = updateFile.size();
-    bool updateFlashed = false;
-
-    if (updateSize > SDU_SIZE) {
-      // skip the SDU section
-      updateFile.seek(SDU_SIZE);
-      updateSize -= SDU_SIZE;
-
-      uint32_t flashAddress = (uint32_t)SKETCH_START;
-
-      // erase the pages
-      flash.erase((void*)flashAddress, updateSize);
-
-      uint8_t buffer[512];
-
-      // write the pages
-      for (uint32_t i = 0; i < updateSize; i += sizeof(buffer)) {
-        updateFile.read(buffer, sizeof(buffer));
-
-        flash.write((void*)flashAddress, buffer, sizeof(buffer));
-
-        flashAddress += sizeof(buffer);
-      }
-
-      updateFlashed = true;
-    }
-
-    updateFile.close();
-
-    if (updateFlashed) {
-      SD.remove(UPDATE_FILE);
-    }
-  }
-
-  // jump to the sketch
-  __set_MSP(*SKETCH_START);
-
-  //Reset vector table address
-  SCB->VTOR = ((uint32_t)(SKETCH_START) & SCB_VTOR_TBLOFF_Msk);
-
-  // address of Reset_Handler is written by the linker at the beginning of the .text section (see linker script)
-  uint32_t resetHandlerAddress = (uint32_t) * (SKETCH_START + 1);
-  // jump to reset handler
-  asm("bx %0"::"r"(resetHandlerAddress));
-}
-
diff --git a/libraries/SDU/extras/SDUBoot/build.sh b/libraries/SDU/extras/SDUBoot/build.sh
deleted file mode 100755
index d62592535..000000000
--- a/libraries/SDU/extras/SDUBoot/build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -x
-
-ARDUINO=arduino
-SKETCH_NAME="SDUBoot.ino"
-SKETCH="$PWD/$SKETCH_NAME"
-BUILD_PATH="$PWD/build"
-OUTPUT_PATH="../../src/boot"
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	ARDUINO="/Applications/Arduino.app/Contents/MacOS/Arduino"
-fi
-
-buildSDUBootSketch() {
-	BOARD=$1
-	DESTINATION=$2
-
-	$ARDUINO --verify --board $BOARD --preserve-temp-files --pref build.path="$BUILD_PATH" $SKETCH
-	cat "$BUILD_PATH/$SKETCH_NAME.bin" | xxd -i > $DESTINATION
-	rm -rf "$BUILD_PATH"
-}
-
-mkdir -p "$OUTPUT_PATH"
-
-buildSDUBootSketch "arduino:samd:arduino_zero_edbg" "$OUTPUT_PATH/zero.h"
-buildSDUBootSketch "arduino:samd:mkr1000" "$OUTPUT_PATH/mkr1000.h"
-buildSDUBootSketch "arduino:samd:mkrzero" "$OUTPUT_PATH/mkrzero.h"
diff --git a/libraries/SDU/keywords.txt b/libraries/SDU/keywords.txt
deleted file mode 100644
index a9db990ee..000000000
--- a/libraries/SDU/keywords.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-#######################################
-# Syntax Coloring Map For SDU
-#######################################
-
-#######################################
-# Datatypes (KEYWORD1)
-#######################################
-
-SDU	KEYWORD1
-
-#######################################
-# Methods and Functions (KEYWORD2)
-#######################################
-
-#######################################
-# Constants (LITERAL1)
-#######################################
diff --git a/libraries/SDU/library.properties b/libraries/SDU/library.properties
deleted file mode 100644
index 68113aed8..000000000
--- a/libraries/SDU/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=SDU
-version=1.0.0
-author=Arduino
-maintainer=Arduino <info@arduino.cc>
-sentence=Update the sketch on your board from an SD card
-paragraph=Requires an SD card
-category=Other
-url=http://www.arduino.cc/en/Reference/SDU
-architectures=samd
diff --git a/libraries/SDU/src/SDU.cpp b/libraries/SDU/src/SDU.cpp
deleted file mode 100644
index 984687ca3..000000000
--- a/libraries/SDU/src/SDU.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-  Copyright (c) 2017 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
-*/
-
-#include <Arduino.h>
-
-#include "SDU.h"
-
-__attribute__ ((section(".sketch_boot")))
-unsigned char sduBoot[0x4000] = {
-#if defined(ARDUINO_SAMD_ZERO)
-  #include "boot/zero.h"
-#elif defined(ARDUINO_SAMD_MKR1000)
-  #include "boot/mkr1000.h"
-#elif defined(ARDUINO_SAMD_MKRZERO)
-  #include "boot/mkrzero.h"
-#else
-  #error "Unsupported board!"
-#endif
-};
diff --git a/libraries/SDU/src/SDU.h b/libraries/SDU/src/SDU.h
deleted file mode 100644
index 59fcc16fd..000000000
--- a/libraries/SDU/src/SDU.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-  Copyright (c) 2017 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 _SDU_H_INCLUDED
-#define _SDU_H_INCLUDED
-
-// nothing for now
-
-#endif
diff --git a/libraries/SDU/src/boot/mkr1000.h b/libraries/SDU/src/boot/mkr1000.h
deleted file mode 100644
index dc7bf119e..000000000
--- a/libraries/SDU/src/boot/mkr1000.h
+++ /dev/null
@@ -1,1192 +0,0 @@
-  0x00, 0x80, 0x00, 0x20, 0x8d, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0xe1, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0xe5, 0x3a, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0xb5, 0x06, 0x4c, 0x23, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x05, 0x4b,
-  0x00, 0x2b, 0x02, 0xd0, 0x04, 0x48, 0x00, 0xe0, 0x00, 0xbf, 0x01, 0x23,
-  0x23, 0x70, 0x10, 0xbd, 0xa0, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-  0x3c, 0x57, 0x00, 0x00, 0x08, 0xb5, 0x08, 0x4b, 0x00, 0x2b, 0x03, 0xd0,
-  0x07, 0x48, 0x08, 0x49, 0x00, 0xe0, 0x00, 0xbf, 0x07, 0x48, 0x03, 0x68,
-  0x00, 0x2b, 0x03, 0xd0, 0x06, 0x4b, 0x00, 0x2b, 0x00, 0xd0, 0x98, 0x47,
-  0x08, 0xbd, 0xc0, 0x46, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x57, 0x00, 0x00,
-  0xa4, 0x00, 0x00, 0x20, 0x9c, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-  0xf0, 0xb5, 0x33, 0x4c, 0xa5, 0x44, 0x01, 0xf0, 0x47, 0xfe, 0x02, 0xf0,
-  0x9b, 0xfc, 0x01, 0x20, 0x01, 0xf0, 0x6a, 0xfd, 0x2f, 0x4d, 0x04, 0x21,
-  0x28, 0x1c, 0x00, 0xf0, 0xe3, 0xf9, 0x00, 0x28, 0x44, 0xd0, 0x2d, 0x4e,
-  0x28, 0x1c, 0x31, 0x1c, 0x00, 0xf0, 0xbc, 0xfa, 0x00, 0x28, 0x3d, 0xd0,
-  0x29, 0x1c, 0x01, 0xa8, 0x32, 0x1c, 0x01, 0x23, 0x00, 0xf0, 0x5e, 0xfa,
-  0x01, 0xa8, 0x00, 0xf0, 0xfc, 0xf8, 0x80, 0x21, 0x04, 0x1c, 0xc9, 0x01,
-  0x88, 0x42, 0x2d, 0xd9, 0x01, 0xa8, 0x00, 0xf0, 0xe2, 0xf8, 0x22, 0x4a,
-  0xc0, 0x21, 0xa7, 0x18, 0x21, 0x48, 0xc9, 0x01, 0x3a, 0x1c, 0x01, 0xf0,
-  0xf9, 0xfb, 0xc0, 0x24, 0xe4, 0x01, 0x80, 0x22, 0x0a, 0xa9, 0x92, 0x00,
-  0x01, 0xa8, 0x00, 0xf0, 0xcb, 0xf8, 0x80, 0x23, 0x21, 0x1c, 0x0a, 0xaa,
-  0x9b, 0x00, 0x19, 0x48, 0x01, 0xf0, 0x92, 0xfb, 0x80, 0x22, 0x92, 0x00,
-  0xa3, 0x18, 0x17, 0x4a, 0xa4, 0x18, 0xbc, 0x42, 0x01, 0xd2, 0x1c, 0x1c,
-  0xe9, 0xe7, 0x01, 0x24, 0x01, 0xa8, 0x00, 0xf0, 0xe9, 0xf8, 0x00, 0x2c,
-  0x06, 0xd0, 0x28, 0x1c, 0x31, 0x1c, 0x00, 0xf0, 0x8b, 0xfa, 0x01, 0xe0,
-  0x00, 0x24, 0xf3, 0xe7, 0xc0, 0x23, 0xdb, 0x01, 0x1b, 0x68, 0x83, 0xf3,
-  0x08, 0x88, 0x0c, 0x4b, 0xc0, 0x22, 0xd2, 0x01, 0x9a, 0x60, 0x0b, 0x4b,
-  0x1b, 0x68, 0x18, 0x47, 0x00, 0x20, 0x8b, 0x23, 0x9b, 0x00, 0x9d, 0x44,
-  0xf0, 0xbd, 0xc0, 0x46, 0xd4, 0xfd, 0xff, 0xff, 0xd4, 0x00, 0x00, 0x20,
-  0xf4, 0x4c, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xbc, 0x00, 0x00, 0x20,
-  0x00, 0xa2, 0xff, 0xff, 0x00, 0xed, 0x00, 0xe0, 0x04, 0x60, 0x00, 0x00,
-  0x08, 0xb5, 0x00, 0x21, 0x02, 0x48, 0x0a, 0x1c, 0x01, 0xf0, 0x3c, 0xfb,
-  0x08, 0xbd, 0xc0, 0x46, 0xbc, 0x00, 0x00, 0x20, 0x13, 0xb5, 0x02, 0x68,
-  0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33, 0x54, 0x68, 0x19, 0x1c, 0x01, 0x22,
-  0xa0, 0x47, 0x16, 0xbd, 0x38, 0xb5, 0x04, 0x1c, 0x00, 0x6a, 0x00, 0x25,
-  0xa8, 0x42, 0x02, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x0a, 0xe0, 0x45, 0x60,
-  0x92, 0xb2, 0x01, 0xf0, 0x0b, 0xf8, 0x23, 0x6a, 0x5b, 0x68, 0x00, 0x2b,
-  0x02, 0xd0, 0x01, 0x23, 0x63, 0x60, 0x28, 0x1c, 0x38, 0xbd, 0x00, 0x6a,
-  0x08, 0xb5, 0x00, 0x28, 0x01, 0xd0, 0x00, 0xf0, 0x49, 0xfe, 0x08, 0xbd,
-  0x13, 0xb5, 0x6c, 0x46, 0x07, 0x34, 0x21, 0x1c, 0x01, 0x22, 0x00, 0xf0,
-  0x65, 0xfd, 0x01, 0x28, 0x01, 0xd1, 0x20, 0x78, 0x00, 0xe0, 0x01, 0x48,
-  0x00, 0xb2, 0x16, 0xbd, 0xff, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x08, 0xb5,
-  0x00, 0x28, 0x02, 0xd0, 0xff, 0xf7, 0xea, 0xff, 0x01, 0xe0, 0x01, 0x20,
-  0x40, 0x42, 0x08, 0xbd, 0x38, 0xb5, 0x05, 0x1c, 0x00, 0x6a, 0x00, 0x28,
-  0x0a, 0xd0, 0xff, 0xf7, 0xdf, 0xff, 0x04, 0x1c, 0x63, 0x1c, 0x05, 0xd0,
-  0x28, 0x6a, 0x01, 0x69, 0x01, 0x39, 0x00, 0xf0, 0xed, 0xfd, 0x20, 0x1c,
-  0x38, 0xbd, 0x00, 0x00, 0xf8, 0xb5, 0xfa, 0x23, 0x9b, 0x00, 0x83, 0x60,
-  0x0d, 0x4b, 0x00, 0x25, 0x08, 0x33, 0x04, 0x1c, 0x45, 0x60, 0x03, 0x60,
-  0x28, 0x20, 0x0f, 0x1c, 0x16, 0x1c, 0x02, 0xf0, 0xe5, 0xfb, 0x20, 0x62,
-  0xa8, 0x42, 0x0a, 0xd0, 0x39, 0x1c, 0x28, 0x22, 0x02, 0xf0, 0x01, 0xfc,
-  0x20, 0x1c, 0x10, 0x30, 0x31, 0x1c, 0x0c, 0x22, 0x02, 0xf0, 0xc6, 0xfc,
-  0x25, 0x77, 0x20, 0x1c, 0xf8, 0xbd, 0xc0, 0x46, 0x00, 0x4d, 0x00, 0x00,
-  0xfa, 0x22, 0x92, 0x00, 0x82, 0x60, 0x04, 0x4a, 0x00, 0x23, 0x08, 0x32,
-  0x43, 0x60, 0x02, 0x60, 0x03, 0x62, 0x03, 0x74, 0x70, 0x47, 0xc0, 0x46,
-  0x00, 0x4d, 0x00, 0x00, 0x00, 0x6a, 0x08, 0xb5, 0x00, 0x28, 0x01, 0xd0,
-  0x00, 0xf0, 0x0a, 0xfd, 0x08, 0xbd, 0x00, 0x6a, 0x08, 0xb5, 0x00, 0x28,
-  0x04, 0xd0, 0x00, 0xf0, 0xad, 0xfd, 0x43, 0x1e, 0x98, 0x41, 0xc0, 0xb2,
-  0x08, 0xbd, 0x03, 0x6a, 0x00, 0x2b, 0x01, 0xd0, 0x18, 0x69, 0x01, 0xe0,
-  0x01, 0x20, 0x40, 0x42, 0x70, 0x47, 0x00, 0x6a, 0x00, 0x28, 0x00, 0xd0,
-  0xc0, 0x69, 0x70, 0x47, 0x38, 0xb5, 0x04, 0x1c, 0x00, 0x6a, 0x00, 0x28,
-  0x0b, 0xd0, 0x20, 0x1c, 0xff, 0xf7, 0xf3, 0xff, 0x05, 0x1c, 0x20, 0x1c,
-  0xff, 0xf7, 0xe7, 0xff, 0x02, 0x4b, 0x28, 0x1a, 0x98, 0x42, 0x00, 0xd9,
-  0x18, 0x1c, 0x38, 0xbd, 0xff, 0x7f, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c,
-  0x00, 0x6a, 0x00, 0x28, 0x06, 0xd0, 0x00, 0xf0, 0xef, 0xfd, 0x20, 0x6a,
-  0x02, 0xf0, 0x92, 0xfb, 0x00, 0x23, 0x23, 0x62, 0x10, 0xbd, 0x00, 0x00,
-  0x10, 0xb5, 0x0a, 0x1c, 0x0c, 0x49, 0x8a, 0xb0, 0x04, 0x1c, 0x00, 0x23,
-  0x00, 0x91, 0x69, 0x46, 0x4b, 0x72, 0x01, 0x93, 0x21, 0x1c, 0x68, 0x46,
-  0x01, 0x23, 0x00, 0xf0, 0x89, 0xfe, 0x04, 0x1c, 0x60, 0x1e, 0x84, 0x41,
-  0xe4, 0xb2, 0x00, 0x2c, 0x02, 0xd0, 0x68, 0x46, 0x00, 0xf0, 0xd0, 0xfd,
-  0x20, 0x1c, 0x0a, 0xb0, 0x10, 0xbd, 0xc0, 0x46, 0x40, 0x4d, 0x00, 0x00,
-  0x08, 0xb5, 0x01, 0x23, 0x00, 0x2a, 0x05, 0xd0, 0x00, 0xf0, 0x22, 0xff,
-  0x03, 0x1c, 0x58, 0x1e, 0x83, 0x41, 0xdb, 0xb2, 0x18, 0x1c, 0x08, 0xbd,
-  0x38, 0xb5, 0x01, 0x22, 0x05, 0x1c, 0x0c, 0x1c, 0x01, 0xf0, 0x9c, 0xf9,
-  0x02, 0x1c, 0x01, 0x20, 0x00, 0x2a, 0x03, 0xd1, 0x28, 0x1c, 0x21, 0x1c,
-  0x01, 0xf0, 0x94, 0xf9, 0x38, 0xbd, 0xf0, 0xb5, 0x0c, 0x68, 0x03, 0x5d,
-  0x2f, 0x3b, 0x5d, 0x42, 0x6b, 0x41, 0xe4, 0x18, 0x27, 0x1c, 0x0c, 0x37,
-  0x23, 0x1c, 0xc5, 0x5c, 0x1e, 0x1b, 0x2f, 0x2d, 0x09, 0xd0, 0x00, 0x2d,
-  0x07, 0xd0, 0x01, 0x33, 0x16, 0x1b, 0xf6, 0x18, 0x01, 0x3e, 0x35, 0x70,
-  0xbb, 0x42, 0xf2, 0xd1, 0x0c, 0x26, 0x00, 0x24, 0x94, 0x55, 0xc2, 0x5c,
-  0x2f, 0x3a, 0x54, 0x42, 0x62, 0x41, 0x9b, 0x18, 0x0b, 0x60, 0xc0, 0x5c,
-  0x43, 0x1e, 0x98, 0x41, 0xc0, 0xb2, 0xf0, 0xbd, 0xf0, 0xb5, 0xa1, 0xb0,
-  0x03, 0x90, 0x25, 0x48, 0x0d, 0x1c, 0x04, 0x92, 0x05, 0x93, 0x0c, 0xaa,
-  0x00, 0x23, 0x16, 0xa9, 0x0d, 0x93, 0x0c, 0x90, 0x53, 0x72, 0x17, 0x93,
-  0x16, 0x90, 0x4b, 0x72, 0x07, 0x93, 0x2c, 0x1c, 0x00, 0x92, 0x07, 0xa9,
-  0x08, 0xaa, 0x03, 0x98, 0xff, 0xf7, 0xc3, 0xff, 0x01, 0x26, 0x02, 0x1c,
-  0x72, 0x40, 0x01, 0x90, 0xd2, 0xb2, 0x20, 0x1c, 0x08, 0xa9, 0x05, 0x9b,
-  0x04, 0x9f, 0xb8, 0x47, 0x00, 0x28, 0x07, 0xd1, 0xac, 0x42, 0x01, 0xd1,
-  0x00, 0x20, 0x23, 0xe0, 0x20, 0x1c, 0x00, 0xf0, 0x5f, 0xfd, 0xf9, 0xe7,
-  0x01, 0x9f, 0x00, 0x2f, 0x11, 0xd0, 0x33, 0x1c, 0x00, 0x98, 0x21, 0x1c,
-  0x08, 0xaa, 0x00, 0xf0, 0x05, 0xfe, 0x06, 0x1c, 0xac, 0x42, 0x0f, 0xd0,
-  0x20, 0x1c, 0x00, 0xf0, 0x4f, 0xfd, 0x00, 0x2e, 0xe8, 0xd0, 0x23, 0x1c,
-  0x00, 0x9c, 0x00, 0x93, 0xd1, 0xe7, 0xac, 0x42, 0x02, 0xd0, 0x20, 0x1c,
-  0x00, 0xf0, 0x44, 0xfd, 0x30, 0x1c, 0x03, 0xe0, 0x00, 0x28, 0xdb, 0xd0,
-  0x16, 0xac, 0xf0, 0xe7, 0x21, 0xb0, 0xf0, 0xbd, 0x40, 0x4d, 0x00, 0x00,
-  0x38, 0xb5, 0x0a, 0x1c, 0x01, 0x21, 0x04, 0x1c, 0x00, 0xf0, 0xd6, 0xf9,
-  0x00, 0x28, 0x01, 0xd1, 0x00, 0x20, 0x0f, 0xe0, 0x25, 0x1c, 0x10, 0x35,
-  0x28, 0x1c, 0x21, 0x1c, 0xff, 0xf7, 0x6c, 0xff, 0x00, 0x28, 0xf5, 0xd0,
-  0x20, 0x1c, 0x38, 0x30, 0x29, 0x1c, 0x00, 0xf0, 0xe1, 0xfb, 0x43, 0x1e,
-  0x98, 0x41, 0xc0, 0xb2, 0x38, 0xbd, 0x00, 0x00, 0x4b, 0x68, 0x43, 0x60,
-  0x0a, 0x4b, 0x03, 0x60, 0x0b, 0x7a, 0x03, 0x72, 0x4b, 0x7a, 0x43, 0x72,
-  0xcb, 0x68, 0xc3, 0x60, 0x0b, 0x69, 0x03, 0x61, 0x4b, 0x69, 0x43, 0x61,
-  0x0b, 0x7e, 0x03, 0x76, 0xcb, 0x69, 0xc3, 0x61, 0x0b, 0x6a, 0x49, 0x6a,
-  0x03, 0x62, 0x41, 0x62, 0x70, 0x47, 0xc0, 0x46, 0x40, 0x4d, 0x00, 0x00,
-  0xf0, 0xb5, 0x9d, 0xb0, 0x05, 0x1c, 0x38, 0x31, 0x08, 0xa8, 0x02, 0x92,
-  0x03, 0x93, 0xff, 0xf7, 0xdd, 0xff, 0x24, 0x4a, 0x12, 0xaf, 0x00, 0x23,
-  0x02, 0x9c, 0x7b, 0x60, 0x12, 0x92, 0x7b, 0x72, 0x08, 0xae, 0x20, 0x1c,
-  0x2f, 0x21, 0x02, 0xf0, 0x6d, 0xfb, 0x00, 0x28, 0x2e, 0xd0, 0x23, 0x78,
-  0x2f, 0x2b, 0x01, 0xd1, 0x01, 0x34, 0xf4, 0xe7, 0x00, 0x1b, 0xc0, 0xb2,
-  0x03, 0x1c, 0x0c, 0x28, 0x00, 0xd9, 0x0c, 0x23, 0xdb, 0xb2, 0x1a, 0x1c,
-  0x21, 0x1c, 0x04, 0xa8, 0x01, 0x93, 0x02, 0xf0, 0x65, 0xfb, 0x01, 0x9a,
-  0x00, 0x23, 0x04, 0xa9, 0x38, 0x1c, 0x8b, 0x54, 0x00, 0xf0, 0xd4, 0xfc,
-  0x38, 0x1c, 0x31, 0x1c, 0x04, 0xaa, 0x01, 0x23, 0x00, 0xf0, 0x7e, 0xfd,
-  0x00, 0x28, 0x04, 0xd1, 0x0c, 0x4b, 0x68, 0x60, 0x2b, 0x60, 0x68, 0x72,
-  0x10, 0xe0, 0x01, 0x9b, 0x30, 0x1c, 0xe4, 0x18, 0x00, 0xf0, 0xc2, 0xfc,
-  0x33, 0x1c, 0x3e, 0x1c, 0x1f, 0x1c, 0xca, 0xe7, 0x02, 0x99, 0x03, 0x9a,
-  0x64, 0x1a, 0x14, 0x60, 0x28, 0x1c, 0x31, 0x1c, 0xff, 0xf7, 0x98, 0xff,
-  0x28, 0x1c, 0x1d, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0x40, 0x4d, 0x00, 0x00,
-  0xf0, 0xb5, 0xa3, 0xb0, 0x05, 0x1c, 0x1f, 0x1c, 0x04, 0xa8, 0x03, 0xab,
-  0x16, 0x1c, 0x01, 0x91, 0xff, 0xf7, 0xa2, 0xff, 0x03, 0x9b, 0xf6, 0x18,
-  0x33, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x04, 0xa9, 0x18, 0xa8, 0xff, 0xf7,
-  0x7f, 0xff, 0x28, 0x1c, 0x18, 0xa9, 0x1e, 0x4a, 0x34, 0xe0, 0x00, 0x23,
-  0x0e, 0xac, 0x63, 0x60, 0x63, 0x72, 0x6b, 0x46, 0x19, 0x33, 0x1b, 0x4a,
-  0x1b, 0x78, 0x0e, 0x92, 0x00, 0x2b, 0x03, 0xd1, 0x28, 0x1c, 0xff, 0xf7,
-  0x55, 0xfe, 0x27, 0xe0, 0x02, 0x3b, 0x01, 0x2b, 0x09, 0xd8, 0x01, 0x99,
-  0x20, 0x1c, 0x38, 0x31, 0x32, 0x1c, 0x3b, 0x1c, 0x00, 0xf0, 0x30, 0xfd,
-  0x00, 0x28, 0x0b, 0xd1, 0xee, 0xe7, 0x20, 0x1c, 0x04, 0xa9, 0x32, 0x1c,
-  0x3b, 0x1c, 0x00, 0xf0, 0x27, 0xfd, 0x00, 0x28, 0xe6, 0xd0, 0x04, 0xa8,
-  0x00, 0xf0, 0x72, 0xfc, 0x06, 0x23, 0x1f, 0x42, 0x03, 0xd0, 0x20, 0x1c,
-  0x15, 0x99, 0x00, 0xf0, 0xfd, 0xfb, 0x21, 0x1c, 0x18, 0xa8, 0xff, 0xf7,
-  0x49, 0xff, 0x28, 0x1c, 0x18, 0xa9, 0x32, 0x1c, 0xff, 0xf7, 0x0a, 0xfe,
-  0x28, 0x1c, 0x23, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0x20, 0x4d, 0x00, 0x00,
-  0x40, 0x4d, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x1c, 0x08, 0x1c, 0x19, 0x1c,
-  0x38, 0x31, 0x02, 0x4a, 0x00, 0x23, 0xff, 0xf7, 0xc7, 0xfe, 0x08, 0xbd,
-  0x9d, 0x23, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x1c, 0x08, 0x1c, 0x19, 0x1c,
-  0x38, 0x31, 0x02, 0x4a, 0x00, 0x23, 0xff, 0xf7, 0xbb, 0xfe, 0x08, 0xbd,
-  0xd9, 0x23, 0x00, 0x00, 0x08, 0x4b, 0x02, 0x21, 0x19, 0x61, 0x19, 0x1c,
-  0x00, 0x22, 0x30, 0x31, 0x0a, 0x70, 0x06, 0x49, 0x5a, 0x71, 0x9a, 0x71,
-  0x9a, 0x72, 0x1a, 0x73, 0xda, 0x63, 0x99, 0x63, 0x41, 0x33, 0x1a, 0x70,
-  0x70, 0x47, 0xc0, 0x46, 0xd4, 0x00, 0x00, 0x20, 0x40, 0x4d, 0x00, 0x00,
-  0x08, 0xb5, 0x01, 0x1c, 0x01, 0x48, 0x01, 0xf0, 0xb1, 0xf9, 0x08, 0xbd,
-  0x78, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x02, 0x48, 0xff, 0x21, 0x01, 0xf0,
-  0xa9, 0xf9, 0x08, 0xbd, 0x78, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x01, 0x21,
-  0x00, 0x79, 0x01, 0xf0, 0x3d, 0xfc, 0x05, 0x4b, 0x1a, 0x78, 0x00, 0x2a,
-  0x04, 0xd0, 0x00, 0x22, 0x03, 0x48, 0x1a, 0x70, 0x01, 0xf0, 0x86, 0xf9,
-  0x08, 0xbd, 0xc0, 0x46, 0x40, 0x01, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x10, 0xb5, 0x08, 0x4b, 0x04, 0x1c, 0x1a, 0x78, 0x00, 0x2a, 0x06, 0xd1,
-  0x01, 0x22, 0x1a, 0x70, 0x05, 0x4b, 0x06, 0x48, 0x06, 0xcb, 0x01, 0xf0,
-  0x57, 0xf9, 0x20, 0x79, 0x00, 0x21, 0x01, 0xf0, 0x1d, 0xfc, 0x10, 0xbd,
-  0x40, 0x01, 0x00, 0x20, 0x38, 0x01, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x10, 0xb5, 0x83, 0x79, 0x04, 0x1c, 0x00, 0x2b, 0x0d, 0xd0, 0x23, 0x89,
-  0x5a, 0x1c, 0x22, 0x81, 0x05, 0x4a, 0x93, 0x42, 0x02, 0xd8, 0xff, 0xf7,
-  0xbf, 0xff, 0xf6, 0xe7, 0x20, 0x1c, 0xff, 0xf7, 0xc3, 0xff, 0x00, 0x23,
-  0xa3, 0x71, 0x10, 0xbd, 0x01, 0x02, 0x00, 0x00, 0x00, 0xb5, 0x06, 0x29,
-  0x03, 0xd9, 0x16, 0x23, 0x43, 0x71, 0x00, 0x20, 0x1c, 0xe0, 0x0f, 0x4b,
-  0x05, 0x29, 0x13, 0xd8, 0x08, 0x1c, 0x00, 0x22, 0x02, 0xf0, 0xe8, 0xf8,
-  0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0b, 0x49, 0x08, 0xe0, 0x0b, 0x49,
-  0x06, 0xe0, 0x0b, 0x49, 0x04, 0xe0, 0x0b, 0x49, 0x02, 0xe0, 0x0b, 0x49,
-  0x00, 0xe0, 0x0b, 0x49, 0x19, 0x60, 0x02, 0xe0, 0x0a, 0x4a, 0x1a, 0x60,
-  0x00, 0x22, 0x1a, 0x71, 0x5a, 0x71, 0x01, 0x20, 0x00, 0xbd, 0xc0, 0x46,
-  0x38, 0x01, 0x00, 0x20, 0x00, 0x1b, 0xb7, 0x00, 0x00, 0x09, 0x3d, 0x00,
-  0x80, 0x84, 0x1e, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x20, 0xa1, 0x07, 0x00,
-  0x90, 0xd0, 0x03, 0x00, 0x48, 0xe8, 0x01, 0x00, 0x38, 0xb5, 0x0c, 0x1c,
-  0x01, 0xf0, 0xe2, 0xf9, 0x05, 0x1c, 0xff, 0xf7, 0x79, 0xff, 0xff, 0x28,
-  0x08, 0xd0, 0x01, 0xf0, 0xdb, 0xf9, 0xab, 0xb2, 0x80, 0xb2, 0xc0, 0x1a,
-  0xa0, 0x42, 0xf4, 0xdb, 0x00, 0x20, 0x00, 0xe0, 0x01, 0x20, 0x38, 0xbd,
-  0xf8, 0xb5, 0x04, 0x1c, 0x0e, 0x1c, 0x17, 0x1c, 0xff, 0xf7, 0x9a, 0xff,
-  0x20, 0x1c, 0xff, 0xf7, 0x7f, 0xff, 0x96, 0x21, 0x49, 0x00, 0x20, 0x1c,
-  0xff, 0xf7, 0xde, 0xff, 0x40, 0x20, 0x30, 0x43, 0xff, 0xf7, 0x52, 0xff,
-  0x18, 0x25, 0x38, 0x1c, 0xe8, 0x40, 0xc0, 0xb2, 0x08, 0x3d, 0xff, 0xf7,
-  0x4b, 0xff, 0x2b, 0x1c, 0x08, 0x33, 0xf6, 0xd1, 0x95, 0x20, 0x00, 0x2e,
-  0x03, 0xd0, 0x87, 0x20, 0x08, 0x2e, 0x00, 0xd0, 0xff, 0x20, 0xff, 0xf7,
-  0x3f, 0xff, 0x00, 0x25, 0xff, 0xf7, 0x44, 0xff, 0x43, 0xb2, 0xe0, 0x72,
-  0x00, 0x2b, 0x04, 0xda, 0xff, 0x2d, 0x02, 0xd0, 0x01, 0x35, 0xed, 0xb2,
-  0xf4, 0xe7, 0xf8, 0xbd, 0xf7, 0xb5, 0x00, 0x25, 0x02, 0x71, 0x05, 0x73,
-  0x85, 0x72, 0x85, 0x71, 0x45, 0x71, 0x04, 0x1c, 0x01, 0x91, 0x01, 0xf0,
-  0x95, 0xf9, 0x01, 0x21, 0x87, 0xb2, 0x20, 0x79, 0x01, 0xf0, 0x14, 0xfb,
-  0x01, 0x21, 0x20, 0x79, 0x01, 0xf0, 0x70, 0xfb, 0x43, 0x4e, 0x30, 0x1c,
-  0x01, 0xf0, 0x7a, 0xf8, 0x42, 0x4b, 0x43, 0x49, 0x1d, 0x71, 0x5d, 0x71,
-  0x19, 0x60, 0x30, 0x1c, 0x5a, 0x68, 0x01, 0xf0, 0x99, 0xf8, 0x0a, 0x25,
-  0x01, 0x3d, 0xff, 0x20, 0xed, 0xb2, 0xff, 0xf7, 0x0b, 0xff, 0x00, 0x2d,
-  0xf8, 0xd1, 0x30, 0x1c, 0x01, 0xf0, 0xaa, 0xf8, 0x20, 0x1c, 0xff, 0xf7,
-  0x27, 0xff, 0x00, 0x21, 0x20, 0x1c, 0x0a, 0x1c, 0xff, 0xf7, 0x9a, 0xff,
-  0x06, 0x1c, 0xe0, 0x72, 0x01, 0x28, 0x09, 0xd0, 0x01, 0xf0, 0x66, 0xf9,
-  0xc0, 0x1b, 0xfa, 0x23, 0x80, 0xb2, 0xdb, 0x00, 0x98, 0x42, 0xee, 0xd9,
-  0x01, 0x23, 0x3c, 0xe0, 0xd5, 0x22, 0x20, 0x1c, 0x08, 0x21, 0x52, 0x00,
-  0xff, 0xf7, 0x86, 0xff, 0x04, 0x23, 0x18, 0x42, 0x01, 0xd0, 0x26, 0x73,
-  0x0b, 0xe0, 0x1e, 0x1c, 0xff, 0xf7, 0xea, 0xfe, 0x01, 0x3e, 0xf6, 0xb2,
-  0xe0, 0x72, 0x00, 0x2e, 0xf8, 0xd1, 0x02, 0x23, 0xaa, 0x28, 0x26, 0xd1,
-  0x23, 0x73, 0x26, 0x7b, 0x02, 0x3e, 0x73, 0x42, 0x5e, 0x41, 0xb6, 0x07,
-  0x37, 0x21, 0x00, 0x22, 0x20, 0x1c, 0xff, 0xf7, 0x6b, 0xff, 0x32, 0x1c,
-  0x20, 0x1c, 0x29, 0x21, 0xff, 0xf7, 0x66, 0xff, 0x02, 0x1c, 0xe0, 0x72,
-  0x09, 0xd0, 0x01, 0xf0, 0x33, 0xf9, 0xc0, 0x1b, 0xfa, 0x23, 0x80, 0xb2,
-  0xdb, 0x00, 0x98, 0x42, 0xea, 0xd9, 0x08, 0x23, 0x09, 0xe0, 0x23, 0x7b,
-  0x02, 0x2b, 0x19, 0xd1, 0x20, 0x1c, 0x3a, 0x21, 0xff, 0xf7, 0x52, 0xff,
-  0x00, 0x28, 0x05, 0xd0, 0x06, 0x23, 0x63, 0x71, 0x20, 0x1c, 0xff, 0xf7,
-  0xbf, 0xfe, 0x15, 0xe0, 0xff, 0xf7, 0xb4, 0xfe, 0xc0, 0x23, 0x18, 0x40,
-  0x98, 0x42, 0x01, 0xd1, 0x03, 0x23, 0x23, 0x73, 0xff, 0xf7, 0xac, 0xfe,
-  0xff, 0xf7, 0xaa, 0xfe, 0xff, 0xf7, 0xa8, 0xfe, 0x20, 0x1c, 0xff, 0xf7,
-  0xad, 0xfe, 0x20, 0x1c, 0x01, 0x99, 0xff, 0xf7, 0xeb, 0xfe, 0x05, 0x1c,
-  0x28, 0x1c, 0xfe, 0xbd, 0x78, 0x07, 0x00, 0x20, 0x38, 0x01, 0x00, 0x20,
-  0x90, 0xd0, 0x03, 0x00, 0x38, 0xb5, 0x04, 0x1c, 0x01, 0xf0, 0xfa, 0xf8,
-  0x05, 0x1c, 0xff, 0xf7, 0x91, 0xfe, 0xe0, 0x72, 0xff, 0x28, 0x0a, 0xd1,
-  0x01, 0xf0, 0xf2, 0xf8, 0xab, 0xb2, 0x80, 0xb2, 0xc0, 0x1a, 0x96, 0x23,
-  0x5b, 0x00, 0x98, 0x42, 0xf1, 0xdd, 0x0f, 0x23, 0x02, 0xe0, 0xfe, 0x28,
-  0x06, 0xd0, 0x0d, 0x23, 0x20, 0x1c, 0x63, 0x71, 0xff, 0xf7, 0x84, 0xfe,
-  0x00, 0x20, 0x00, 0xe0, 0x01, 0x20, 0x38, 0xbd, 0xf8, 0xb5, 0x04, 0x1c,
-  0x0f, 0x1c, 0x15, 0x1c, 0x1e, 0x1e, 0x45, 0xd0, 0x9a, 0x18, 0x80, 0x23,
-  0x9b, 0x00, 0x9a, 0x42, 0x42, 0xdc, 0x83, 0x79, 0x00, 0x2b, 0x05, 0xd0,
-  0x02, 0x68, 0x91, 0x42, 0x02, 0xd1, 0x03, 0x89, 0xab, 0x42, 0x16, 0xd9,
-  0x23, 0x7b, 0x27, 0x60, 0x03, 0x2b, 0x00, 0xd0, 0x7f, 0x02, 0x3a, 0x1c,
-  0x20, 0x1c, 0x11, 0x21, 0xff, 0xf7, 0xee, 0xfe, 0x07, 0x1e, 0x02, 0xd0,
-  0x03, 0x23, 0x63, 0x71, 0x2a, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0xba, 0xff,
-  0x00, 0x28, 0x25, 0xd0, 0x01, 0x23, 0x27, 0x81, 0xa3, 0x71, 0x23, 0x89,
-  0xab, 0x42, 0x05, 0xd2, 0xff, 0xf7, 0x48, 0xfe, 0x23, 0x89, 0x01, 0x33,
-  0x23, 0x81, 0xf6, 0xe7, 0x06, 0x9d, 0x06, 0x9a, 0xab, 0x1a, 0x9b, 0xb2,
-  0xb3, 0x42, 0x04, 0xd2, 0xff, 0xf7, 0x3c, 0xfe, 0x28, 0x70, 0x01, 0x35,
-  0xf5, 0xe7, 0x23, 0x89, 0xa2, 0x7a, 0xf3, 0x18, 0x9b, 0xb2, 0x23, 0x81,
-  0x00, 0x2a, 0x02, 0xd0, 0x06, 0x4a, 0x93, 0x42, 0x02, 0xd9, 0x20, 0x1c,
-  0xff, 0xf7, 0x60, 0xfe, 0x01, 0x20, 0x03, 0xe0, 0x20, 0x1c, 0xff, 0xf7,
-  0x2f, 0xfe, 0x00, 0x20, 0xf8, 0xbd, 0xc0, 0x46, 0xff, 0x01, 0x00, 0x00,
-  0x07, 0xb5, 0x80, 0x23, 0x00, 0x92, 0x9b, 0x00, 0x00, 0x22, 0xff, 0xf7,
-  0xa3, 0xff, 0x0e, 0xbd, 0x70, 0xb5, 0x05, 0x1c, 0x08, 0x1c, 0x16, 0x1c,
-  0xff, 0xf7, 0x0c, 0xfe, 0x00, 0x24, 0x30, 0x5d, 0xff, 0xf7, 0x08, 0xfe,
-  0x01, 0x34, 0x80, 0x23, 0x9b, 0x00, 0x9c, 0x42, 0xf7, 0xd1, 0xff, 0x20,
-  0xff, 0xf7, 0x00, 0xfe, 0xff, 0x20, 0xff, 0xf7, 0xfd, 0xfd, 0xff, 0xf7,
-  0x03, 0xfe, 0x1f, 0x23, 0xe8, 0x72, 0x03, 0x40, 0x01, 0x20, 0x05, 0x2b,
-  0x05, 0xd0, 0x11, 0x23, 0x28, 0x1c, 0x6b, 0x71, 0xff, 0xf7, 0x00, 0xfe,
-  0x00, 0x20, 0x70, 0xbd, 0x70, 0xb5, 0x0b, 0x1c, 0x04, 0x1c, 0x16, 0x1c,
-  0x00, 0x29, 0x01, 0xd1, 0x12, 0x23, 0x28, 0xe0, 0x02, 0x7b, 0x03, 0x2a,
-  0x00, 0xd0, 0x4b, 0x02, 0x20, 0x1c, 0x18, 0x21, 0x1a, 0x1c, 0xff, 0xf7,
-  0x79, 0xfe, 0x05, 0x1e, 0x01, 0xd0, 0x04, 0x23, 0x1b, 0xe0, 0x20, 0x1c,
-  0xfe, 0x21, 0x32, 0x1c, 0xff, 0xf7, 0xc2, 0xff, 0x00, 0x28, 0x15, 0xd0,
-  0x96, 0x21, 0x20, 0x1c, 0x89, 0x00, 0xff, 0xf7, 0x55, 0xfe, 0x00, 0x28,
-  0x01, 0xd1, 0x15, 0x23, 0x0b, 0xe0, 0x20, 0x1c, 0x0d, 0x21, 0x2a, 0x1c,
-  0xff, 0xf7, 0x60, 0xfe, 0x00, 0x28, 0x03, 0xd1, 0xff, 0xf7, 0xc8, 0xfd,
-  0x00, 0x28, 0x06, 0xd0, 0x14, 0x23, 0x63, 0x71, 0x20, 0x1c, 0xff, 0xf7,
-  0xc9, 0xfd, 0x00, 0x20, 0x03, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0xc4, 0xfd,
-  0x01, 0x20, 0x70, 0xbd, 0x03, 0x4b, 0x04, 0x4a, 0x1a, 0x60, 0x00, 0x22,
-  0x5a, 0x71, 0x1a, 0x71, 0x70, 0x47, 0xc0, 0x46, 0x38, 0x01, 0x00, 0x20,
-  0x00, 0x09, 0x3d, 0x00, 0x02, 0x1c, 0x10, 0xb5, 0x0c, 0x32, 0x04, 0x1c,
-  0x01, 0x21, 0x40, 0x6a, 0x00, 0xf0, 0x24, 0xfd, 0x00, 0x28, 0x0a, 0xd0,
-  0x23, 0x6a, 0x01, 0x20, 0x00, 0x2b, 0x06, 0xd1, 0xe3, 0x68, 0x22, 0x7a,
-  0x23, 0x62, 0x80, 0x23, 0x5b, 0x42, 0x13, 0x43, 0x23, 0x72, 0x10, 0xbd,
-  0x70, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xe6, 0xff, 0x00, 0x28, 0x01, 0xd1,
-  0x00, 0x20, 0x1b, 0xe0, 0x63, 0x6a, 0xe6, 0x68, 0x1a, 0x7c, 0x02, 0x3e,
-  0x96, 0x40, 0x5a, 0x69, 0x1d, 0x79, 0xb6, 0x18, 0x00, 0x2d, 0x08, 0xd0,
-  0x70, 0x1e, 0x40, 0x19, 0x00, 0xf0, 0x4c, 0xfc, 0x00, 0x28, 0xed, 0xd0,
-  0x01, 0x3d, 0xed, 0xb2, 0xf4, 0xe7, 0x63, 0x6a, 0x01, 0x20, 0x1a, 0x7c,
-  0x80, 0x23, 0x9b, 0x00, 0x93, 0x40, 0xe2, 0x69, 0xd3, 0x18, 0xe3, 0x61,
-  0x70, 0xbd, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c, 0x40, 0x69, 0x00, 0xf0,
-  0x13, 0xfc, 0x00, 0x28, 0x03, 0xd0, 0x20, 0x7e, 0x01, 0x4b, 0x40, 0x01,
-  0xc0, 0x18, 0x10, 0xbd, 0x50, 0x01, 0x00, 0x20, 0xf0, 0xb5, 0x00, 0x23,
-  0x87, 0xb0, 0x07, 0x1c, 0x0e, 0x1c, 0x20, 0x22, 0xf2, 0x54, 0x01, 0x33,
-  0x0b, 0x2b, 0xfa, 0xd1, 0x07, 0x21, 0x00, 0x25, 0x01, 0x91, 0x3c, 0x78,
-  0x00, 0x2c, 0x2a, 0xd0, 0x2e, 0x2c, 0x06, 0xd1, 0x01, 0x9b, 0x0a, 0x2b,
-  0x2b, 0xd0, 0x0a, 0x21, 0x08, 0x25, 0x01, 0x91, 0x1f, 0xe0, 0x02, 0xa8,
-  0x14, 0x49, 0x10, 0x22, 0x01, 0xf0, 0x29, 0xff, 0x00, 0x23, 0x02, 0xa9,
-  0xca, 0x5c, 0x00, 0x2a, 0x03, 0xd0, 0x01, 0x33, 0xa2, 0x42, 0xf8, 0xd1,
-  0x19, 0xe0, 0x01, 0x9b, 0x9d, 0x42, 0x16, 0xd8, 0x23, 0x1c, 0x21, 0x3b,
-  0x5d, 0x2b, 0x12, 0xd8, 0x22, 0x1c, 0x6b, 0x1c, 0x61, 0x3a, 0xdb, 0xb2,
-  0x75, 0x19, 0x19, 0x2a, 0x01, 0xd8, 0x20, 0x3c, 0xe4, 0xb2, 0x2c, 0x70,
-  0x1d, 0x1c, 0x01, 0x37, 0xd1, 0xe7, 0x30, 0x78, 0x20, 0x38, 0x43, 0x1e,
-  0x98, 0x41, 0xc0, 0xb2, 0x00, 0xe0, 0x00, 0x20, 0x07, 0xb0, 0xf0, 0xbd,
-  0x22, 0x4d, 0x00, 0x00, 0x38, 0xb5, 0x42, 0x7a, 0x04, 0x1c, 0x0d, 0x1c,
-  0x00, 0x2a, 0x01, 0xd0, 0x00, 0x20, 0x1f, 0xe0, 0x4b, 0x1c, 0xdb, 0x7f,
-  0x10, 0x2b, 0x06, 0xd1, 0x02, 0x23, 0x43, 0x72, 0x02, 0x62, 0x4b, 0x8c,
-  0x5b, 0x01, 0xc3, 0x61, 0x0c, 0xe0, 0x20, 0x2b, 0xf0, 0xd1, 0x03, 0x23,
-  0x43, 0x72, 0x49, 0x6a, 0x22, 0x1c, 0x01, 0x62, 0x1c, 0x32, 0x28, 0x1c,
-  0x00, 0xf0, 0x18, 0xfc, 0x00, 0x28, 0xe5, 0xd0, 0x00, 0x23, 0x01, 0x20,
-  0x65, 0x62, 0x20, 0x72, 0xe3, 0x60, 0x23, 0x61, 0x63, 0x61, 0x23, 0x76,
-  0x38, 0xbd, 0x00, 0x00, 0xf0, 0xb5, 0x43, 0x7a, 0x85, 0xb0, 0x04, 0x1c,
-  0x0e, 0x1c, 0x03, 0x92, 0x00, 0x2b, 0x01, 0xd1, 0x3a, 0x48, 0x11, 0xe0,
-  0x03, 0x7a, 0xd8, 0x07, 0xfa, 0xd5, 0xe2, 0x69, 0x20, 0x69, 0x03, 0x99,
-  0x13, 0x1a, 0x99, 0x42, 0x01, 0xd9, 0x9b, 0xb2, 0x03, 0x93, 0x03, 0x99,
-  0x02, 0x91, 0x02, 0x9b, 0x00, 0x2b, 0x04, 0xd1, 0x03, 0x99, 0x88, 0xb2,
-  0x00, 0xb2, 0x05, 0xb0, 0xf0, 0xbd, 0x23, 0x69, 0x61, 0x7a, 0xdf, 0x05,
-  0xff, 0x0d, 0x5a, 0x0a, 0x60, 0x6a, 0x02, 0x29, 0x02, 0xd1, 0x41, 0x6a,
-  0x51, 0x18, 0x1b, 0xe0, 0x05, 0x79, 0x01, 0x3d, 0x2a, 0x40, 0xd5, 0xb2,
-  0x00, 0x2f, 0x0d, 0xd1, 0x00, 0x2d, 0x0b, 0xd1, 0x00, 0x2b, 0x02, 0xd1,
-  0x22, 0x6a, 0xe2, 0x60, 0x06, 0xe0, 0x22, 0x1c, 0xe1, 0x68, 0x0c, 0x32,
-  0x00, 0xf0, 0xa0, 0xfb, 0x00, 0x28, 0xc9, 0xd0, 0x63, 0x6a, 0xe1, 0x68,
-  0x1a, 0x7c, 0x02, 0x39, 0x5b, 0x69, 0x91, 0x40, 0xc9, 0x18, 0x49, 0x19,
-  0x80, 0x22, 0x02, 0x9d, 0x92, 0x00, 0xd3, 0x1b, 0x9d, 0x42, 0x00, 0xdd,
-  0x9d, 0xb2, 0x23, 0x7a, 0x58, 0x06, 0x01, 0xd4, 0x95, 0x42, 0x18, 0xd1,
-  0x16, 0x4b, 0x1b, 0x68, 0x99, 0x42, 0x14, 0xd0, 0x15, 0x4b, 0x3a, 0x1c,
-  0x18, 0x68, 0x00, 0x96, 0x2b, 0x1c, 0xff, 0xf7, 0x1f, 0xfe, 0x00, 0x28,
-  0xa8, 0xd0, 0x76, 0x19, 0x01, 0xe0, 0xdf, 0x1b, 0xf6, 0x19, 0x21, 0x69,
-  0x02, 0x9a, 0x4b, 0x19, 0x55, 0x1b, 0xad, 0xb2, 0x23, 0x61, 0x02, 0x95,
-  0xab, 0xe7, 0x08, 0x1c, 0x00, 0x21, 0x00, 0xf0, 0x2b, 0xfb, 0x00, 0x28,
-  0x96, 0xd0, 0x09, 0x4b, 0x32, 0x1c, 0xff, 0x18, 0x79, 0x19, 0x3b, 0x1c,
-  0x8b, 0x42, 0xe8, 0xd0, 0x18, 0x78, 0x01, 0x33, 0x10, 0x70, 0x01, 0x32,
-  0xf8, 0xe7, 0xc0, 0x46, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x73, 0xb5, 0x43, 0x7a,
-  0x04, 0x1c, 0x01, 0x2b, 0x01, 0xd8, 0x00, 0x20, 0x16, 0xe0, 0x03, 0x69,
-  0x6d, 0x46, 0x07, 0x35, 0xde, 0x05, 0x29, 0x1c, 0x01, 0x22, 0x36, 0x0f,
-  0xff, 0xf7, 0x6a, 0xff, 0x01, 0x28, 0x01, 0xd1, 0x2b, 0x78, 0x00, 0xe0,
-  0x05, 0x4b, 0x1b, 0xb2, 0x01, 0x33, 0xec, 0xd0, 0x23, 0x69, 0x70, 0x01,
-  0x1f, 0x33, 0x23, 0x61, 0x02, 0x4b, 0xc0, 0x18, 0x76, 0xbd, 0xc0, 0x46,
-  0xff, 0xff, 0x00, 0x00, 0x50, 0x01, 0x00, 0x20, 0x70, 0xb5, 0x04, 0x1c,
-  0x40, 0x7a, 0x0d, 0x1c, 0x00, 0x28, 0x2a, 0xd0, 0xe2, 0x69, 0x91, 0x42,
-  0x01, 0xd9, 0x00, 0x20, 0x25, 0xe0, 0x02, 0x28, 0x21, 0xd0, 0x00, 0x2d,
-  0x01, 0xd1, 0xe5, 0x60, 0x1d, 0xe0, 0x62, 0x6a, 0x21, 0x69, 0x13, 0x7c,
-  0x68, 0x1e, 0x09, 0x33, 0x4a, 0x1e, 0xd8, 0x40, 0xda, 0x40, 0x03, 0x1e,
-  0x93, 0x42, 0x01, 0xd3, 0x00, 0x29, 0x02, 0xd1, 0x22, 0x6a, 0xe2, 0x60,
-  0x00, 0xe0, 0x83, 0x1a, 0x1e, 0x1c, 0x00, 0x2e, 0x09, 0xd0, 0x22, 0x1c,
-  0x60, 0x6a, 0xe1, 0x68, 0x0c, 0x32, 0x00, 0xf0, 0x07, 0xfb, 0x01, 0x3e,
-  0x00, 0x28, 0xf4, 0xd1, 0x01, 0xe0, 0x25, 0x61, 0x01, 0x20, 0x70, 0xbd,
-  0x38, 0xb5, 0x05, 0x1c, 0x40, 0x7a, 0x00, 0x28, 0x33, 0xd0, 0x2b, 0x7a,
-  0x7f, 0x2b, 0x2d, 0xd9, 0x28, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x9a, 0xfe,
-  0x04, 0x1e, 0x2a, 0xd0, 0x6b, 0x7a, 0x01, 0x2b, 0x07, 0xd8, 0x2b, 0x7f,
-  0x03, 0x77, 0x6b, 0x7f, 0x43, 0x77, 0xab, 0x7f, 0x83, 0x77, 0xeb, 0x7f,
-  0xc3, 0x77, 0x2b, 0x6a, 0x9a, 0xb2, 0x1b, 0x0c, 0x23, 0x75, 0x1b, 0x0a,
-  0x63, 0x75, 0x0d, 0x4b, 0xa2, 0x76, 0x1b, 0x68, 0x12, 0x0a, 0xe2, 0x76,
-  0x00, 0x2b, 0x0b, 0xd0, 0x20, 0x1c, 0x21, 0x1c, 0x18, 0x30, 0x16, 0x31,
-  0x98, 0x47, 0x63, 0x7e, 0x22, 0x7e, 0x1b, 0x02, 0x13, 0x43, 0xa3, 0x74,
-  0x1b, 0x0a, 0xe3, 0x74, 0x2a, 0x7a, 0x7f, 0x23, 0x13, 0x40, 0x2b, 0x72,
-  0x00, 0xf0, 0x5c, 0xfa, 0xff, 0xe7, 0x38, 0xbd, 0x44, 0x01, 0x00, 0x20,
-  0x10, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xc0, 0xff, 0x00, 0x28, 0x02, 0xd0,
-  0x00, 0x23, 0x63, 0x72, 0x01, 0x20, 0x10, 0xbd, 0x73, 0xb5, 0x42, 0x7a,
-  0x04, 0x1c, 0x0d, 0x1c, 0x00, 0x20, 0x01, 0x2a, 0x4b, 0xd1, 0x20, 0x7a,
-  0x02, 0x23, 0x18, 0x40, 0x47, 0xd0, 0xe3, 0x69, 0x00, 0x20, 0x99, 0x42,
-  0x43, 0xd8, 0x10, 0x1c, 0x00, 0x2b, 0x40, 0xd0, 0x20, 0x1c, 0x29, 0x1c,
-  0x26, 0x69, 0xff, 0xf7, 0x71, 0xff, 0x00, 0x28, 0x25, 0xd0, 0x60, 0x6a,
-  0x00, 0x2d, 0x06, 0xd1, 0x21, 0x6a, 0x00, 0xf0, 0x95, 0xfb, 0x00, 0x28,
-  0x1d, 0xd0, 0x25, 0x62, 0x1d, 0xe0, 0xe1, 0x68, 0x01, 0xaa, 0x00, 0xf0,
-  0x93, 0xfa, 0x00, 0x28, 0x15, 0xd0, 0x60, 0x6a, 0x01, 0x99, 0x43, 0x1c,
-  0xdb, 0x7f, 0x10, 0x2b, 0x01, 0xd1, 0x12, 0x4b, 0x00, 0xe0, 0x12, 0x4b,
-  0x99, 0x42, 0x0c, 0xd2, 0x00, 0xf0, 0x7e, 0xfb, 0x00, 0x28, 0x06, 0xd0,
-  0x60, 0x6a, 0xe1, 0x68, 0x0e, 0x4a, 0x00, 0xf0, 0xcf, 0xfa, 0x00, 0x28,
-  0x01, 0xd1, 0x00, 0x20, 0x11, 0xe0, 0x22, 0x7a, 0x80, 0x23, 0x5b, 0x42,
-  0x13, 0x43, 0xe5, 0x61, 0x23, 0x72, 0x20, 0x1c, 0xff, 0xf7, 0x70, 0xff,
-  0x00, 0x28, 0xf2, 0xd0, 0x29, 0x1e, 0xb1, 0x42, 0x00, 0xd9, 0x31, 0x1c,
-  0x20, 0x1c, 0xff, 0xf7, 0x35, 0xff, 0x76, 0xbd, 0xf8, 0xff, 0x00, 0x00,
-  0xf8, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0x38, 0xb5, 0x23, 0x4b,
-  0x15, 0x1c, 0x4a, 0x01, 0xd3, 0x18, 0x04, 0x1c, 0xd8, 0x7a, 0x11, 0x22,
-  0x10, 0x42, 0x04, 0xd0, 0x42, 0x22, 0x15, 0x42, 0x01, 0xd0, 0x00, 0x20,
-  0x36, 0xe0, 0x1d, 0x4a, 0x21, 0x76, 0x12, 0x68, 0x62, 0x61, 0x5a, 0x7d,
-  0x18, 0x7d, 0xd9, 0x7e, 0x12, 0x02, 0x02, 0x43, 0x98, 0x7e, 0x09, 0x02,
-  0x12, 0x04, 0x01, 0x43, 0x11, 0x43, 0x21, 0x62, 0xd8, 0x7a, 0x18, 0x22,
-  0x02, 0x40, 0x0c, 0xd1, 0x5a, 0x7f, 0x19, 0x7f, 0x12, 0x02, 0x0a, 0x43,
-  0x99, 0x7f, 0xdb, 0x7f, 0x09, 0x04, 0x0a, 0x43, 0x1b, 0x06, 0x13, 0x43,
-  0xe3, 0x61, 0x01, 0x23, 0x09, 0xe0, 0x10, 0x2a, 0xdb, 0xd1, 0x22, 0x1c,
-  0x60, 0x6a, 0x1c, 0x32, 0x00, 0xf0, 0x5a, 0xfa, 0x00, 0x28, 0xd4, 0xd0,
-  0x04, 0x23, 0x63, 0x72, 0x0f, 0x23, 0x00, 0x21, 0x2b, 0x40, 0x23, 0x72,
-  0xe1, 0x60, 0x21, 0x61, 0x01, 0x20, 0x6a, 0x06, 0x02, 0xd5, 0x20, 0x1c,
-  0xff, 0xf7, 0x60, 0xff, 0x38, 0xbd, 0xc0, 0x46, 0x50, 0x01, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x20, 0xf0, 0xb5, 0x45, 0x7a, 0x87, 0xb0, 0x04, 0x1c,
-  0x0e, 0x1c, 0x01, 0x93, 0x00, 0x2d, 0x00, 0xd0, 0x86, 0xe0, 0x10, 0x1c,
-  0x03, 0xa9, 0xff, 0xf7, 0xbb, 0xfd, 0x00, 0x28, 0x00, 0xd1, 0x80, 0xe0,
-  0x72, 0x6a, 0x2f, 0x1c, 0x62, 0x62, 0xf5, 0x60, 0x35, 0x61, 0x33, 0x69,
-  0xf2, 0x69, 0x93, 0x42, 0x26, 0xd2, 0xdb, 0x05, 0x1b, 0x0f, 0x30, 0x1c,
-  0x00, 0x93, 0xff, 0xf7, 0x9f, 0xfe, 0x01, 0x1e, 0x6f, 0xd0, 0x03, 0x78,
-  0x00, 0x2b, 0x01, 0xd0, 0xe5, 0x2b, 0x0b, 0xd1, 0x00, 0x2f, 0x04, 0xd1,
-  0x00, 0x9b, 0x23, 0x76, 0x34, 0x4b, 0x1b, 0x68, 0x63, 0x61, 0x0b, 0x78,
-  0x01, 0x27, 0x00, 0x2b, 0xe3, 0xd1, 0x0d, 0xe0, 0x03, 0xa8, 0x0b, 0x22,
-  0x01, 0xf0, 0xca, 0xfc, 0x00, 0x28, 0xdc, 0xd1, 0x01, 0x9a, 0x30, 0x23,
-  0x13, 0x40, 0x30, 0x2b, 0x53, 0xd0, 0x20, 0x1c, 0x00, 0x99, 0x4b, 0xe0,
-  0x01, 0x9a, 0x12, 0x23, 0x13, 0x40, 0x12, 0x2b, 0x4b, 0xd1, 0x00, 0x2f,
-  0x06, 0xd0, 0x20, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x6f, 0xfd, 0x06, 0x1e,
-  0x0a, 0xd1, 0x42, 0xe0, 0x73, 0x7a, 0x02, 0x2b, 0x3f, 0xd0, 0x30, 0x1c,
-  0xff, 0xf7, 0x40, 0xfd, 0x00, 0x28, 0x3a, 0xd0, 0x1f, 0x4e, 0x27, 0x76,
-  0x00, 0x21, 0x20, 0x22, 0x30, 0x1c, 0x01, 0xf0, 0xbb, 0xfc, 0x30, 0x1c,
-  0x03, 0xa9, 0x0b, 0x22, 0x01, 0xf0, 0xad, 0xfc, 0x1a, 0x4b, 0x1b, 0x68,
-  0x00, 0x2b, 0x05, 0xd0, 0x30, 0x1c, 0x31, 0x1c, 0x10, 0x30, 0x0e, 0x31,
-  0x98, 0x47, 0x06, 0xe0, 0x21, 0x22, 0x32, 0x74, 0xb3, 0x73, 0x28, 0x22,
-  0x08, 0x23, 0x72, 0x74, 0xf3, 0x73, 0x73, 0x7c, 0x32, 0x7c, 0x1b, 0x02,
-  0x13, 0x43, 0xff, 0x22, 0x1a, 0x40, 0x1b, 0x0a, 0xf3, 0x74, 0x73, 0x76,
-  0xf3, 0x7b, 0xb2, 0x74, 0x32, 0x76, 0xb2, 0x7b, 0x1b, 0x02, 0x13, 0x43,
-  0xb3, 0x75, 0x1b, 0x0a, 0xf3, 0x75, 0x00, 0xf0, 0x21, 0xf9, 0x00, 0x28,
-  0x07, 0xd0, 0x21, 0x7e, 0x01, 0x9a, 0x20, 0x1c, 0xff, 0xf7, 0x26, 0xff,
-  0x05, 0x1c, 0x00, 0xe0, 0x00, 0x25, 0x28, 0x1c, 0x07, 0xb0, 0xf0, 0xbd,
-  0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x44, 0x01, 0x00, 0x20,
-  0x10, 0xb5, 0x00, 0x21, 0x04, 0x1c, 0xff, 0xf7, 0xbb, 0xfe, 0x00, 0x28,
-  0x0b, 0xd0, 0x20, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x15, 0xfd, 0x00, 0x28,
-  0x05, 0xd0, 0xe5, 0x23, 0x03, 0x70, 0x00, 0x23, 0x63, 0x72, 0x00, 0xf0,
-  0xfb, 0xf8, 0x10, 0xbd, 0x10, 0xb5, 0x0a, 0x1c, 0x0a, 0x49, 0x8a, 0xb0,
-  0x08, 0x31, 0x00, 0x23, 0x04, 0x1c, 0x00, 0x91, 0x69, 0x46, 0x4b, 0x72,
-  0x01, 0x93, 0x68, 0x46, 0x21, 0x1c, 0x02, 0x23, 0xff, 0xf7, 0x42, 0xff,
-  0x00, 0x28, 0x02, 0xd0, 0x68, 0x46, 0xff, 0xf7, 0xd7, 0xff, 0x0a, 0xb0,
-  0x10, 0xbd, 0xc0, 0x46, 0x38, 0x4d, 0x00, 0x00, 0xf0, 0xb5, 0x43, 0x7a,
-  0x87, 0xb0, 0x04, 0x1c, 0x0d, 0x1c, 0x03, 0x92, 0x01, 0x2b, 0x0d, 0xd1,
-  0x03, 0x7a, 0x99, 0x07, 0x0a, 0xd5, 0x5a, 0x07, 0x0c, 0xd5, 0xe1, 0x69,
-  0x22, 0x69, 0x8a, 0x42, 0x08, 0xd0, 0x20, 0x1c, 0xff, 0xf7, 0x06, 0xfe,
-  0x00, 0x28, 0x03, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x00, 0x20, 0xaa, 0xe0,
-  0x03, 0x9b, 0x01, 0x93, 0x3b, 0xe0, 0x60, 0x6a, 0x73, 0x0a, 0x07, 0x79,
-  0xf6, 0x05, 0x01, 0x3f, 0x1f, 0x40, 0xff, 0xb2, 0xf6, 0x0d, 0x00, 0x2f,
-  0x36, 0xd0, 0x80, 0x22, 0x92, 0x00, 0x92, 0x1b, 0x01, 0x99, 0x92, 0xb2,
-  0x0b, 0x1c, 0x91, 0x42, 0x00, 0xd9, 0x13, 0x1c, 0x9b, 0xb2, 0x02, 0x93,
-  0x63, 0x6a, 0xe1, 0x68, 0x1a, 0x7c, 0x02, 0x39, 0x91, 0x40, 0x5a, 0x69,
-  0x8b, 0x18, 0x02, 0x9a, 0xdf, 0x19, 0x80, 0x23, 0x9b, 0x00, 0x9a, 0x42,
-  0x3f, 0xd1, 0x44, 0x4b, 0x19, 0x68, 0xb9, 0x42, 0x02, 0xd1, 0x01, 0x22,
-  0x52, 0x42, 0x1a, 0x60, 0x41, 0x4b, 0x39, 0x1c, 0x18, 0x68, 0x2a, 0x1c,
-  0xff, 0xf7, 0x22, 0xfc, 0x00, 0x28, 0xc7, 0xd0, 0x80, 0x22, 0x92, 0x00,
-  0xad, 0x18, 0x01, 0x99, 0x02, 0x9a, 0x8b, 0x1a, 0x21, 0x69, 0x9b, 0xb2,
-  0x01, 0x93, 0x8b, 0x18, 0x23, 0x61, 0x01, 0x9a, 0x26, 0x69, 0x00, 0x2a,
-  0xbf, 0xd1, 0x49, 0xe0, 0x00, 0x2e, 0xc6, 0xd1, 0xe1, 0x68, 0x00, 0x29,
-  0x03, 0xd1, 0x23, 0x6a, 0x00, 0x2b, 0x16, 0xd1, 0x0f, 0xe0, 0x05, 0xaa,
-  0x00, 0xf0, 0xe2, 0xf8, 0x00, 0x28, 0x58, 0xd0, 0x62, 0x6a, 0x05, 0x9b,
-  0x01, 0x32, 0xd2, 0x7f, 0x10, 0x2a, 0x01, 0xd1, 0x2c, 0x4a, 0x00, 0xe0,
-  0x2c, 0x4a, 0x93, 0x42, 0x05, 0xd3, 0x20, 0x1c, 0xff, 0xf7, 0x3c, 0xfc,
-  0x00, 0x28, 0xaa, 0xd1, 0x98, 0xe7, 0xe3, 0x60, 0xa7, 0xe7, 0x00, 0x2e,
-  0x0f, 0xd1, 0x23, 0x69, 0xe1, 0x69, 0x8b, 0x42, 0x0b, 0xd3, 0x00, 0xf0,
-  0x59, 0xf8, 0x00, 0x28, 0x8c, 0xd0, 0x1f, 0x4b, 0x01, 0x21, 0x1f, 0x60,
-  0x21, 0x4b, 0x1a, 0x78, 0x0a, 0x43, 0x1a, 0x70, 0x06, 0xe0, 0x38, 0x1c,
-  0x01, 0x21, 0x00, 0xf0, 0x75, 0xf8, 0x00, 0x28, 0x00, 0xd1, 0x7d, 0xe7,
-  0x1c, 0x4b, 0x2a, 0x1c, 0xf6, 0x18, 0x02, 0x9b, 0xf1, 0x18, 0x33, 0x1c,
-  0x8b, 0x42, 0x04, 0xd0, 0x10, 0x78, 0x01, 0x32, 0x18, 0x70, 0x01, 0x33,
-  0xf8, 0xe7, 0x9e, 0x1b, 0xad, 0x19, 0xa8, 0xe7, 0xe1, 0x69, 0x23, 0x7a,
-  0x8e, 0x42, 0x01, 0xd9, 0xe6, 0x61, 0x06, 0xe0, 0x12, 0x4a, 0x12, 0x68,
-  0x00, 0x2a, 0x06, 0xd0, 0x03, 0x9a, 0x00, 0x2a, 0x03, 0xd0, 0x80, 0x22,
-  0x52, 0x42, 0x13, 0x43, 0x23, 0x72, 0x23, 0x7a, 0x19, 0x07, 0x01, 0xd4,
-  0x03, 0x98, 0x06, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0x8b, 0xfd, 0x00, 0x28,
-  0x00, 0xd1, 0x51, 0xe7, 0xf6, 0xe7, 0x07, 0xb0, 0xf0, 0xbd, 0xc0, 0x46,
-  0x00, 0x00, 0x00, 0x20, 0x4c, 0x01, 0x00, 0x20, 0xf8, 0xff, 0x00, 0x00,
-  0xf8, 0xff, 0xff, 0x0f, 0x50, 0x03, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20,
-  0x44, 0x01, 0x00, 0x20, 0x07, 0xb5, 0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33,
-  0x19, 0x1c, 0x01, 0x22, 0xff, 0xf7, 0x22, 0xff, 0x0e, 0xbd, 0x00, 0x00,
-  0xf8, 0xb5, 0x0f, 0x4f, 0x01, 0x20, 0x3b, 0x78, 0x00, 0x2b, 0x18, 0xd0,
-  0x0d, 0x4e, 0x0e, 0x4b, 0x0e, 0x4d, 0x19, 0x68, 0x30, 0x68, 0x2a, 0x1c,
-  0xff, 0xf7, 0x80, 0xfb, 0x00, 0x28, 0x0e, 0xd0, 0x0b, 0x4c, 0x21, 0x68,
-  0x00, 0x29, 0x07, 0xd0, 0x30, 0x68, 0x2a, 0x1c, 0xff, 0xf7, 0x76, 0xfb,
-  0x00, 0x28, 0x04, 0xd0, 0x00, 0x23, 0x23, 0x60, 0x00, 0x23, 0x3b, 0x70,
-  0x01, 0x20, 0xf8, 0xbd, 0x50, 0x03, 0x00, 0x20, 0x4c, 0x01, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x48, 0x01, 0x00, 0x20,
-  0x70, 0xb5, 0x0d, 0x4d, 0x04, 0x1c, 0x2b, 0x68, 0x0e, 0x1c, 0x83, 0x42,
-  0x0e, 0xd0, 0xff, 0xf7, 0xcd, 0xff, 0x00, 0x28, 0x01, 0xd1, 0x00, 0x20,
-  0x0d, 0xe0, 0x08, 0x4b, 0x21, 0x1c, 0x18, 0x68, 0x07, 0x4a, 0xff, 0xf7,
-  0x25, 0xfb, 0x00, 0x28, 0xf5, 0xd0, 0x2c, 0x60, 0x05, 0x4b, 0x01, 0x20,
-  0x1a, 0x78, 0x16, 0x43, 0x1e, 0x70, 0x70, 0xbd, 0x00, 0x00, 0x00, 0x20,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20,
-  0x10, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xae, 0xff, 0x00, 0x28, 0x0f, 0xd0,
-  0x00, 0x23, 0x08, 0x4a, 0x00, 0x21, 0x99, 0x54, 0x80, 0x22, 0x01, 0x33,
-  0x92, 0x00, 0x93, 0x42, 0xf7, 0xd1, 0x05, 0x4b, 0x01, 0x20, 0x1c, 0x60,
-  0x04, 0x4b, 0x1a, 0x78, 0x02, 0x43, 0x1a, 0x70, 0x10, 0xbd, 0xc0, 0x46,
-  0x50, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20,
-  0xc3, 0x68, 0x70, 0xb5, 0x01, 0x33, 0x0c, 0x1c, 0x15, 0x1c, 0x99, 0x42,
-  0x01, 0xd9, 0x00, 0x20, 0x21, 0xe0, 0x46, 0x1c, 0xf1, 0x7f, 0xc2, 0x69,
-  0xe3, 0x09, 0x10, 0x29, 0x00, 0xd1, 0x23, 0x0a, 0x98, 0x18, 0x0d, 0x4b,
-  0x1b, 0x68, 0x98, 0x42, 0x07, 0xd1, 0xf2, 0x7f, 0x0b, 0x4b, 0x10, 0x2a,
-  0x09, 0xd1, 0xe4, 0xb2, 0x64, 0x00, 0x1b, 0x5b, 0x0b, 0xe0, 0x00, 0x21,
-  0xff, 0xf7, 0x9e, 0xff, 0x00, 0x28, 0xf2, 0xd1, 0xe3, 0xe7, 0x7f, 0x22,
-  0x14, 0x40, 0xa4, 0x00, 0x1b, 0x59, 0x1b, 0x01, 0x1b, 0x09, 0x2b, 0x60,
-  0x01, 0x20, 0x70, 0xbd, 0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20,
-  0x73, 0xb5, 0x05, 0x1c, 0x01, 0x91, 0x16, 0x1c, 0x00, 0x24, 0x28, 0x1c,
-  0x01, 0x99, 0x01, 0xaa, 0xff, 0xf7, 0xc6, 0xff, 0x00, 0x28, 0x10, 0xd0,
-  0x2a, 0x7c, 0x80, 0x23, 0x9b, 0x00, 0x93, 0x40, 0xe4, 0x18, 0x6b, 0x1c,
-  0xdb, 0x7f, 0x01, 0x9a, 0x10, 0x2b, 0x01, 0xd1, 0x03, 0x4b, 0x00, 0xe0,
-  0x03, 0x4b, 0x9a, 0x42, 0xe9, 0xd3, 0x34, 0x60, 0x01, 0x20, 0x76, 0xbd,
-  0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f, 0xf7, 0xb5, 0x05, 0x1c,
-  0x0c, 0x1c, 0x01, 0x92, 0x01, 0x29, 0x32, 0xd9, 0xc3, 0x68, 0x00, 0x20,
-  0x01, 0x33, 0x99, 0x42, 0x2e, 0xd8, 0x6f, 0x1c, 0xfa, 0x7f, 0xee, 0x69,
-  0xcb, 0x09, 0x10, 0x2a, 0x00, 0xd1, 0x0b, 0x0a, 0x9e, 0x19, 0x14, 0x4b,
-  0x1b, 0x68, 0x9e, 0x42, 0x08, 0xd1, 0xfa, 0x7f, 0x12, 0x4b, 0x10, 0x2a,
-  0x0b, 0xd1, 0xe4, 0xb2, 0x01, 0x9a, 0x64, 0x00, 0x1a, 0x53, 0x0b, 0xe0,
-  0x30, 0x1c, 0x00, 0x21, 0xff, 0xf7, 0x48, 0xff, 0x00, 0x28, 0xf0, 0xd1,
-  0x12, 0xe0, 0x7f, 0x22, 0x14, 0x40, 0x01, 0x9a, 0xa4, 0x00, 0x1a, 0x51,
-  0x09, 0x4b, 0x01, 0x20, 0x1a, 0x78, 0x02, 0x43, 0x1a, 0x70, 0x2b, 0x7e,
-  0x83, 0x42, 0x05, 0xd9, 0xab, 0x68, 0xf6, 0x18, 0x05, 0x4b, 0x1e, 0x60,
-  0x00, 0xe0, 0x00, 0x20, 0xfe, 0xbd, 0xc0, 0x46, 0x00, 0x00, 0x00, 0x20,
-  0x50, 0x01, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20, 0x48, 0x01, 0x00, 0x20,
-  0xf0, 0xb5, 0x15, 0x68, 0x87, 0xb0, 0x06, 0x1c, 0x02, 0x91, 0x17, 0x1c,
-  0x00, 0x2d, 0x03, 0xd0, 0x00, 0x21, 0x01, 0x35, 0x01, 0x91, 0x06, 0xe0,
-  0x02, 0x9b, 0x05, 0x68, 0x01, 0x3b, 0x5a, 0x42, 0x53, 0x41, 0xdb, 0xb2,
-  0x01, 0x93, 0xf2, 0x68, 0x00, 0x23, 0x01, 0x32, 0x03, 0x92, 0x2c, 0x1c,
-  0x00, 0x93, 0x00, 0x99, 0xf2, 0x68, 0x91, 0x42, 0x21, 0xd2, 0x03, 0x9b,
-  0x9c, 0x42, 0x01, 0xd9, 0x02, 0x24, 0x25, 0x1c, 0x30, 0x1c, 0x21, 0x1c,
-  0x05, 0xaa, 0xff, 0xf7, 0x43, 0xff, 0x00, 0x28, 0x15, 0xd0, 0x05, 0x99,
-  0x63, 0x1c, 0x00, 0x29, 0x01, 0xd0, 0x1d, 0x1c, 0x03, 0xe0, 0x02, 0x99,
-  0x5a, 0x1b, 0x8a, 0x42, 0x04, 0xd0, 0x00, 0x9a, 0x1c, 0x1c, 0x01, 0x32,
-  0x00, 0x92, 0xe0, 0xe7, 0x30, 0x1c, 0x21, 0x1c, 0x13, 0x4a, 0xff, 0xf7,
-  0x7f, 0xff, 0x00, 0x28, 0x0b, 0xd1, 0x00, 0x20, 0x1d, 0xe0, 0x63, 0x1e,
-  0x30, 0x1c, 0x19, 0x1c, 0x22, 0x1c, 0x00, 0x93, 0xff, 0xf7, 0x74, 0xff,
-  0x00, 0x28, 0xf4, 0xd0, 0x00, 0x9c, 0xac, 0x42, 0xf3, 0xd8, 0x39, 0x68,
-  0x00, 0x29, 0x06, 0xd1, 0x01, 0x99, 0x3d, 0x60, 0x00, 0x29, 0x09, 0xd0,
-  0x01, 0x35, 0x35, 0x60, 0x06, 0xe0, 0x30, 0x1c, 0x2a, 0x1c, 0xff, 0xf7,
-  0x61, 0xff, 0x00, 0x28, 0xf2, 0xd1, 0xe0, 0xe7, 0x01, 0x20, 0x07, 0xb0,
-  0xf0, 0xbd, 0xc0, 0x46, 0xff, 0xff, 0xff, 0x0f, 0x02, 0x23, 0x37, 0xb5,
-  0x05, 0x1c, 0x0c, 0x1c, 0x03, 0x60, 0x28, 0x1c, 0x21, 0x1c, 0x01, 0xaa,
-  0xff, 0xf7, 0xfc, 0xfe, 0x00, 0x28, 0x12, 0xd0, 0x28, 0x1c, 0x21, 0x1c,
-  0x00, 0x22, 0xff, 0xf7, 0x47, 0xff, 0x00, 0x28, 0x0b, 0xd0, 0x6b, 0x1c,
-  0xdb, 0x7f, 0x01, 0x9c, 0x10, 0x2b, 0x01, 0xd1, 0x04, 0x4b, 0x00, 0xe0,
-  0x04, 0x4b, 0x9c, 0x42, 0xe7, 0xd3, 0x01, 0x20, 0x00, 0xe0, 0x00, 0x20,
-  0x3e, 0xbd, 0xc0, 0x46, 0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f,
-  0xf8, 0xb5, 0x44, 0x4b, 0x04, 0x1c, 0x15, 0x1c, 0x19, 0x60, 0x29, 0xd0,
-  0x04, 0x2a, 0x01, 0xd9, 0x00, 0x20, 0x7d, 0xe0, 0x00, 0x20, 0x01, 0x1c,
-  0xff, 0xf7, 0x90, 0xfe, 0x00, 0x28, 0xf7, 0xd0, 0x2d, 0x01, 0x3d, 0x4b,
-  0xa9, 0x35, 0xff, 0x35, 0x5d, 0x19, 0xaa, 0x79, 0xab, 0x1d, 0x50, 0x06,
-  0xee, 0xd1, 0xea, 0x7c, 0xa9, 0x7c, 0x12, 0x02, 0x0a, 0x43, 0x29, 0x7d,
-  0x09, 0x04, 0x0a, 0x43, 0x69, 0x7d, 0x09, 0x06, 0x0a, 0x43, 0x63, 0x2a,
-  0xe2, 0xd9, 0xaa, 0x7b, 0xed, 0x7b, 0x2d, 0x02, 0x15, 0x43, 0x9a, 0x7a,
-  0xdb, 0x7a, 0x12, 0x04, 0x15, 0x43, 0x1b, 0x06, 0x1d, 0x43, 0xd7, 0xd0,
-  0x28, 0x1c, 0x00, 0x21, 0xff, 0xf7, 0x6a, 0xfe, 0x00, 0x28, 0xd1, 0xd0,
-  0x2a, 0x4b, 0x19, 0x7b, 0xda, 0x7a, 0x09, 0x02, 0x11, 0x43, 0x80, 0x22,
-  0x92, 0x00, 0x91, 0x42, 0xc8, 0xd1, 0x1a, 0x7c, 0x00, 0x2a, 0xc5, 0xd0,
-  0xd9, 0x89, 0x00, 0x29, 0xc2, 0xd0, 0x59, 0x7b, 0x00, 0x29, 0xbf, 0xd0,
-  0x22, 0x76, 0x00, 0x22, 0x21, 0x71, 0x22, 0x74, 0x22, 0x7c, 0x01, 0x20,
-  0x90, 0x40, 0x81, 0x42, 0x04, 0xd0, 0x50, 0x1c, 0x20, 0x74, 0x07, 0x2a,
-  0xf6, 0xd9, 0xb1, 0xe7, 0xd9, 0x8a, 0x00, 0x29, 0x00, 0xd1, 0x59, 0x6a,
-  0xa1, 0x60, 0xd8, 0x89, 0x28, 0x18, 0xe0, 0x61, 0x1f, 0x69, 0x3e, 0x02,
-  0x36, 0x0c, 0x66, 0x84, 0xb7, 0xb2, 0x1e, 0x7c, 0x71, 0x43, 0x0e, 0x18,
-  0x13, 0x48, 0x79, 0x01, 0x09, 0x18, 0x49, 0x12, 0x71, 0x18, 0x66, 0x62,
-  0x61, 0x61, 0x18, 0x7d, 0xde, 0x7c, 0x00, 0x02, 0x30, 0x43, 0x00, 0xd1,
-  0x18, 0x6a, 0x6d, 0x1a, 0x28, 0x18, 0xd0, 0x40, 0x02, 0x1c, 0xe0, 0x60,
-  0x0b, 0x48, 0x61, 0x1c, 0x82, 0x42, 0x01, 0xd8, 0x0c, 0x23, 0x07, 0xe0,
-  0x09, 0x48, 0x82, 0x42, 0x01, 0xd8, 0x10, 0x23, 0x02, 0xe0, 0xdb, 0x6a,
-  0x63, 0x62, 0x20, 0x23, 0xcb, 0x77, 0x01, 0x20, 0xf8, 0xbd, 0xc0, 0x46,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0xff, 0x01, 0x00, 0x00,
-  0xf4, 0x0f, 0x00, 0x00, 0xf4, 0xff, 0x00, 0x00, 0x08, 0xb5, 0x05, 0x49,
-  0x05, 0x4a, 0x06, 0x48, 0x00, 0xf0, 0x10, 0xf8, 0x05, 0x4b, 0x06, 0x49,
-  0x00, 0x22, 0x1a, 0x70, 0x5a, 0x54, 0x08, 0xbd, 0x00, 0x4e, 0x00, 0x00,
-  0x01, 0x04, 0x00, 0x00, 0x54, 0x03, 0x00, 0x20, 0x6c, 0x03, 0x00, 0x20,
-  0x02, 0x04, 0x00, 0x00, 0x30, 0xb5, 0x09, 0x4c, 0x09, 0x4b, 0xa5, 0x68,
-  0x6d, 0x03, 0x6d, 0x0f, 0xad, 0x00, 0xeb, 0x58, 0x03, 0x60, 0xa4, 0x68,
-  0x01, 0x61, 0xa4, 0xb2, 0x44, 0x60, 0x5c, 0x43, 0x9b, 0x00, 0x84, 0x60,
-  0xc3, 0x60, 0x42, 0x61, 0x30, 0xbd, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41,
-  0x00, 0x53, 0x00, 0x00, 0xf7, 0xb5, 0x1f, 0x4e, 0x80, 0x27, 0x75, 0x68,
-  0x03, 0x33, 0x3d, 0x43, 0x9b, 0x08, 0x75, 0x60, 0x00, 0x2b, 0x34, 0xd0,
-  0x1b, 0x4d, 0x35, 0x80, 0x35, 0x7d, 0xef, 0x07, 0xfc, 0xd5, 0x1d, 0x1c,
-  0x5f, 0x1b, 0x01, 0x97, 0x07, 0x68, 0xbf, 0x08, 0xbc, 0x46, 0x01, 0x9f,
-  0x67, 0x45, 0x1f, 0xd2, 0x00, 0x2d, 0x1d, 0xd0, 0x17, 0x78, 0x01, 0x3d,
-  0x01, 0x97, 0xff, 0x27, 0xbc, 0x43, 0x01, 0x9f, 0x3c, 0x43, 0x57, 0x78,
-  0x3f, 0x02, 0x01, 0x97, 0x0f, 0x4f, 0x3c, 0x40, 0x01, 0x9f, 0x3c, 0x43,
-  0x97, 0x78, 0x3f, 0x04, 0xbc, 0x46, 0x0d, 0x4f, 0x3c, 0x40, 0xd7, 0x78,
-  0xa4, 0xb2, 0x3f, 0x06, 0x00, 0x97, 0x67, 0x46, 0x3c, 0x43, 0x00, 0x9f,
-  0x04, 0x32, 0x3c, 0x43, 0x10, 0xc1, 0xd7, 0xe7, 0x07, 0x4b, 0x33, 0x80,
-  0x33, 0x7d, 0xdf, 0x07, 0xfc, 0xd5, 0x2b, 0x1c, 0xc8, 0xe7, 0xf7, 0xbd,
-  0x00, 0x40, 0x00, 0x41, 0x44, 0xa5, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff,
-  0xff, 0xff, 0x00, 0xff, 0x04, 0xa5, 0xff, 0xff, 0x04, 0x4b, 0x05, 0x4a,
-  0x49, 0x08, 0xd9, 0x61, 0x1a, 0x80, 0x1a, 0x7d, 0xd1, 0x07, 0xfc, 0xd5,
-  0x70, 0x47, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41, 0x02, 0xa5, 0xff, 0xff,
-  0x70, 0xb5, 0x05, 0x1c, 0x0c, 0x1c, 0x16, 0x1c, 0xeb, 0x68, 0x28, 0x1c,
-  0x21, 0x1c, 0x9e, 0x42, 0x05, 0xd9, 0xff, 0xf7, 0xe7, 0xff, 0xeb, 0x68,
-  0xe4, 0x18, 0xf6, 0x1a, 0xf4, 0xe7, 0xff, 0xf7, 0xe1, 0xff, 0x70, 0xbd,
-  0x43, 0x7a, 0x00, 0x2b, 0x04, 0xd1, 0x83, 0x72, 0xc3, 0x72, 0xc3, 0x60,
-  0x01, 0x23, 0x43, 0x72, 0x70, 0x47, 0x30, 0xb5, 0x85, 0xb0, 0x04, 0x1c,
-  0x02, 0xad, 0x00, 0x68, 0x02, 0x91, 0x03, 0x92, 0x00, 0xf0, 0x84, 0xfc,
-  0x6b, 0x79, 0xe1, 0x79, 0x22, 0x7a, 0x00, 0x93, 0x20, 0x68, 0x00, 0x23,
-  0x00, 0xf0, 0x1e, 0xfd, 0x29, 0x79, 0x20, 0x68, 0x02, 0x9a, 0x00, 0xf0,
-  0x47, 0xfc, 0x20, 0x68, 0x00, 0xf0, 0x6a, 0xfc, 0x05, 0xb0, 0x30, 0xbd,
-  0x70, 0xb5, 0x04, 0x1c, 0x18, 0x26, 0xff, 0xf7, 0xd7, 0xff, 0x20, 0x79,
-  0x33, 0x1c, 0x43, 0x43, 0x0d, 0x4d, 0x08, 0x21, 0xeb, 0x18, 0x59, 0x56,
-  0x00, 0xf0, 0x14, 0xfb, 0xa0, 0x79, 0x33, 0x1c, 0x43, 0x43, 0x08, 0x21,
-  0xeb, 0x18, 0x59, 0x56, 0x00, 0xf0, 0x0c, 0xfb, 0x60, 0x79, 0x08, 0x21,
-  0x46, 0x43, 0xad, 0x19, 0x69, 0x56, 0x00, 0xf0, 0x05, 0xfb, 0x04, 0x4b,
-  0x20, 0x1c, 0x06, 0xcb, 0xff, 0xf7, 0xc3, 0xff, 0x70, 0xbd, 0xc0, 0x46,
-  0x20, 0x53, 0x00, 0x00, 0x70, 0x07, 0x00, 0x20, 0x07, 0xb5, 0x83, 0x7a,
-  0x00, 0x91, 0x01, 0x92, 0x00, 0x2b, 0x0d, 0xd0, 0x9a, 0x07, 0x06, 0xd5,
-  0xef, 0xf3, 0x10, 0x83, 0x5a, 0x42, 0x53, 0x41, 0xc3, 0x72, 0x72, 0xb6,
-  0x04, 0xe0, 0xda, 0x07, 0x02, 0xd5, 0x82, 0x89, 0x03, 0x4b, 0x9a, 0x60,
-  0x00, 0x99, 0x01, 0x9a, 0xff, 0xf7, 0xa5, 0xff, 0x07, 0xbd, 0xc0, 0x46,
-  0x00, 0x18, 0x00, 0x40, 0x83, 0x7a, 0x00, 0x2b, 0x0b, 0xd0, 0x9a, 0x07,
-  0x04, 0xd5, 0xc3, 0x7a, 0x00, 0x2b, 0x06, 0xd0, 0x62, 0xb6, 0x04, 0xe0,
-  0xda, 0x07, 0x02, 0xd5, 0x82, 0x89, 0x01, 0x4b, 0xda, 0x60, 0x70, 0x47,
-  0x00, 0x18, 0x00, 0x40, 0x08, 0xb5, 0x00, 0x68, 0x00, 0xf0, 0x21, 0xfc,
-  0x08, 0xbd, 0x00, 0x00, 0x0f, 0x4b, 0x10, 0x4a, 0x10, 0x49, 0x1a, 0x60,
-  0x00, 0x22, 0x5a, 0x71, 0x1a, 0x71, 0x0f, 0x4b, 0x0f, 0x48, 0x19, 0x60,
-  0x0a, 0x21, 0x19, 0x71, 0x09, 0x21, 0x99, 0x71, 0x08, 0x21, 0x59, 0x71,
-  0x03, 0x21, 0x5a, 0x72, 0xda, 0x71, 0x19, 0x72, 0x0a, 0x4b, 0x18, 0x60,
-  0x1d, 0x20, 0x18, 0x71, 0x1b, 0x20, 0x98, 0x71, 0x1a, 0x20, 0x5a, 0x72,
-  0x58, 0x71, 0xda, 0x71, 0x19, 0x72, 0x70, 0x47, 0x70, 0x07, 0x00, 0x20,
-  0x00, 0x09, 0x3d, 0x00, 0x00, 0x08, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x04, 0x08, 0x00, 0x20, 0x88, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x02, 0x48,
-  0x00, 0xf0, 0xfc, 0xfc, 0x08, 0xbd, 0xc0, 0x46, 0x98, 0x07, 0x00, 0x20,
-  0x13, 0xb5, 0x12, 0x49, 0x12, 0x48, 0x00, 0xf0, 0x3d, 0xfb, 0x12, 0x49,
-  0x12, 0x48, 0x00, 0xf0, 0x39, 0xfb, 0x12, 0x49, 0x12, 0x48, 0x00, 0xf0,
-  0x35, 0xfb, 0x12, 0x49, 0x12, 0x48, 0x00, 0xf0, 0x31, 0xfb, 0x12, 0x49,
-  0x12, 0x48, 0x00, 0xf0, 0x2d, 0xfb, 0x12, 0x4c, 0x12, 0x49, 0x20, 0x1c,
-  0x00, 0xf0, 0x28, 0xfb, 0x03, 0x23, 0x00, 0x93, 0x01, 0x23, 0x01, 0x93,
-  0x21, 0x1c, 0x0d, 0x22, 0x0e, 0x23, 0x0e, 0x48, 0x00, 0xf0, 0xb0, 0xfc,
-  0x13, 0xbd, 0xc0, 0x46, 0x00, 0x08, 0x00, 0x42, 0xfc, 0x07, 0x00, 0x20,
-  0x00, 0x0c, 0x00, 0x42, 0x00, 0x08, 0x00, 0x20, 0x00, 0x10, 0x00, 0x42,
-  0x04, 0x08, 0x00, 0x20, 0x00, 0x14, 0x00, 0x42, 0xf8, 0x07, 0x00, 0x20,
-  0x00, 0x18, 0x00, 0x42, 0x08, 0x08, 0x00, 0x20, 0x0c, 0x08, 0x00, 0x20,
-  0x00, 0x1c, 0x00, 0x42, 0x98, 0x07, 0x00, 0x20, 0xfe, 0xe7, 0x00, 0x00,
-  0x08, 0xb5, 0x03, 0x4b, 0x1b, 0x68, 0x00, 0x2b, 0x00, 0xd0, 0x98, 0x47,
-  0x08, 0xbd, 0xc0, 0x46, 0x10, 0x08, 0x00, 0x20, 0x38, 0xb5, 0x0f, 0x49,
-  0x0f, 0x4c, 0xa1, 0x42, 0x04, 0xd1, 0x00, 0xf0, 0x4f, 0xf8, 0xfe, 0xf7,
-  0xbb, 0xfa, 0x0b, 0xe0, 0x0c, 0x4d, 0x8d, 0x42, 0xf7, 0xd0, 0x00, 0x23,
-  0xca, 0x18, 0xe8, 0x18, 0xa2, 0x42, 0x04, 0xd2, 0x00, 0x68, 0x04, 0x33,
-  0x10, 0x60, 0xf7, 0xe7, 0xfe, 0xe7, 0x90, 0x42, 0xeb, 0xd0, 0x06, 0x4b,
-  0x06, 0x4a, 0x93, 0x42, 0xe7, 0xd2, 0x00, 0x22, 0x04, 0xc3, 0xf9, 0xe7,
-  0x00, 0x00, 0x00, 0x20, 0xa0, 0x00, 0x00, 0x20, 0x40, 0x57, 0x00, 0x00,
-  0xa0, 0x00, 0x00, 0x20, 0xf4, 0x0c, 0x00, 0x20, 0x08, 0xb5, 0x00, 0xf0,
-  0x26, 0xf8, 0x00, 0x28, 0x01, 0xd1, 0x00, 0xf0, 0x17, 0xf8, 0x08, 0xbd,
-  0x01, 0x4b, 0x18, 0x68, 0x70, 0x47, 0xc0, 0x46, 0x14, 0x08, 0x00, 0x20,
-  0x70, 0xb5, 0x04, 0x1e, 0x08, 0xd0, 0x05, 0x4b, 0x1d, 0x68, 0x1e, 0x1c,
-  0x00, 0xf0, 0x12, 0xf8, 0x33, 0x68, 0x5b, 0x1b, 0xa3, 0x42, 0xf9, 0xd3,
-  0x70, 0xbd, 0xc0, 0x46, 0x14, 0x08, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b,
-  0x1a, 0x68, 0x01, 0x32, 0x1a, 0x60, 0x00, 0xf0, 0x6d, 0xfa, 0x08, 0xbd,
-  0x14, 0x08, 0x00, 0x20, 0x70, 0x47, 0x00, 0x20, 0x70, 0x47, 0x00, 0x00,
-  0x70, 0xb5, 0x4c, 0x4a, 0x1e, 0x21, 0x53, 0x68, 0x02, 0x20, 0x8b, 0x43,
-  0x03, 0x43, 0x4a, 0x49, 0x53, 0x60, 0x8b, 0x69, 0x08, 0x24, 0x23, 0x43,
-  0x8b, 0x61, 0x48, 0x4c, 0x48, 0x4b, 0x9c, 0x82, 0x9c, 0x8a, 0x20, 0x43,
-  0x98, 0x82, 0x10, 0x1c, 0xda, 0x68, 0x94, 0x07, 0xfc, 0xd5, 0x45, 0x4a,
-  0x01, 0x24, 0x14, 0x70, 0x14, 0x78, 0xe5, 0x07, 0x04, 0xd5, 0x42, 0x4c,
-  0x64, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xf7, 0xdb, 0x01, 0x24, 0x94, 0x60,
-  0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb, 0x3d, 0x4d, 0x3c, 0x4c,
-  0x65, 0x60, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb, 0x82, 0x25,
-  0x38, 0x4c, 0xed, 0x01, 0x65, 0x80, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c,
-  0xfb, 0xdb, 0x9c, 0x8c, 0x80, 0x25, 0xac, 0x43, 0x9c, 0x84, 0xdc, 0x68,
-  0xe6, 0x06, 0xfc, 0xd5, 0x33, 0x4d, 0x30, 0x4c, 0xe5, 0x62, 0xdd, 0x68,
-  0x2e, 0x4c, 0xee, 0x06, 0xfb, 0xd5, 0xa5, 0x8c, 0x30, 0x4e, 0x35, 0x43,
-  0xa5, 0x84, 0xdd, 0x68, 0x2a, 0x4c, 0xee, 0x06, 0xfb, 0xd5, 0xa5, 0x8c,
-  0x02, 0x26, 0x35, 0x43, 0xa5, 0x84, 0xdc, 0x68, 0x25, 0x06, 0xfc, 0xd5,
-  0x25, 0x4c, 0xe4, 0x68, 0x66, 0x06, 0xf8, 0xd5, 0xdc, 0x68, 0xe5, 0x06,
-  0xfc, 0xd5, 0x00, 0x24, 0x94, 0x60, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c,
-  0xfb, 0xdb, 0x24, 0x4d, 0x1f, 0x4c, 0x65, 0x60, 0x55, 0x78, 0x1e, 0x4c,
-  0x6d, 0xb2, 0x00, 0x2d, 0xfa, 0xdb, 0x1e, 0x6a, 0x20, 0x4d, 0x35, 0x40,
-  0x80, 0x26, 0x76, 0x00, 0x35, 0x43, 0x1d, 0x62, 0x1d, 0x6a, 0x80, 0x26,
-  0xb5, 0x43, 0x1d, 0x62, 0x03, 0x23, 0xa3, 0x60, 0x1b, 0x4b, 0x63, 0x60,
-  0x53, 0x78, 0x5b, 0xb2, 0x00, 0x2b, 0xfb, 0xdb, 0x00, 0x23, 0x0b, 0x72,
-  0x18, 0x4a, 0x4b, 0x72, 0x8b, 0x72, 0xcb, 0x72, 0x17, 0x4b, 0xff, 0x21,
-  0x1a, 0x60, 0x17, 0x4b, 0x17, 0x4a, 0x1b, 0x68, 0x12, 0x68, 0x5c, 0x01,
-  0xd2, 0x0e, 0x21, 0x40, 0x11, 0x43, 0x9a, 0x06, 0x52, 0x0f, 0x12, 0x02,
-  0x0b, 0x1c, 0x13, 0x43, 0x12, 0x4a, 0x13, 0x85, 0x43, 0x68, 0x80, 0x22,
-  0x13, 0x43, 0x43, 0x60, 0x70, 0xbd, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41,
-  0x00, 0x04, 0x00, 0x40, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x40,
-  0x00, 0x0c, 0x00, 0x40, 0x01, 0x05, 0x01, 0x00, 0xb8, 0x05, 0xff, 0x7d,
-  0x04, 0x0a, 0x00, 0x00, 0x00, 0x07, 0x03, 0x00, 0xff, 0xfc, 0xff, 0xff,
-  0x03, 0x06, 0x01, 0x00, 0x00, 0x6c, 0xdc, 0x02, 0x04, 0x00, 0x00, 0x20,
-  0x24, 0x60, 0x80, 0x00, 0x20, 0x60, 0x80, 0x00, 0x00, 0x40, 0x00, 0x42,
-  0x31, 0x4b, 0xfa, 0x21, 0x18, 0x68, 0x10, 0xb5, 0x89, 0x00, 0x00, 0xf0,
-  0xff, 0xfd, 0x2f, 0x4b, 0x01, 0x38, 0x98, 0x42, 0x24, 0xd8, 0x2e, 0x4a,
-  0x2e, 0x4b, 0x50, 0x60, 0x18, 0x6a, 0xc0, 0x21, 0x00, 0x02, 0x00, 0x0a,
-  0x09, 0x06, 0x01, 0x43, 0x19, 0x62, 0x00, 0x24, 0x07, 0x21, 0x94, 0x60,
-  0x11, 0x60, 0x19, 0x6a, 0x80, 0x22, 0x09, 0x02, 0x09, 0x0a, 0x12, 0x06,
-  0x0a, 0x43, 0x1a, 0x62, 0x25, 0x4b, 0xfc, 0x21, 0x1a, 0x6a, 0x0a, 0x43,
-  0x1a, 0x62, 0x19, 0x6a, 0xfc, 0x22, 0x92, 0x01, 0x0a, 0x43, 0x1a, 0x62,
-  0x19, 0x6a, 0xa0, 0x22, 0xd2, 0x02, 0x0a, 0x43, 0x1a, 0x62, 0x00, 0xe0,
-  0xfe, 0xe7, 0x20, 0x1c, 0x00, 0x21, 0x01, 0x34, 0x00, 0xf0, 0x70, 0xf8,
-  0x16, 0x2c, 0xf8, 0xd1, 0x1a, 0x4c, 0x63, 0x78, 0x5b, 0xb2, 0x00, 0x2b,
-  0xfa, 0xdb, 0x19, 0x4b, 0x63, 0x80, 0x19, 0x4b, 0x5a, 0x7e, 0xd2, 0x09,
-  0x01, 0x2a, 0xfa, 0xd0, 0xe4, 0x22, 0xd2, 0x00, 0x9a, 0x80, 0x3f, 0x22,
-  0xda, 0x70, 0x59, 0x7e, 0x13, 0x4a, 0xc9, 0x09, 0x01, 0x29, 0xfa, 0xd0,
-  0xc0, 0x23, 0x5b, 0x01, 0x00, 0x20, 0x13, 0x61, 0x90, 0x70, 0x00, 0xf0,
-  0x23, 0xf8, 0x63, 0x78, 0x5b, 0xb2, 0x00, 0x2b, 0xfb, 0xdb, 0x0d, 0x4a,
-  0x09, 0x4b, 0x5a, 0x80, 0x0c, 0x4b, 0xda, 0x79, 0xd2, 0x09, 0x01, 0x2a,
-  0xfa, 0xd0, 0x41, 0x22, 0x5a, 0x70, 0x10, 0xbd, 0x04, 0x00, 0x00, 0x20,
-  0xff, 0xff, 0xff, 0x00, 0x10, 0xe0, 0x00, 0xe0, 0x00, 0xed, 0x00, 0xe0,
-  0x00, 0x04, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x40, 0x1e, 0x40, 0x00, 0x00,
-  0x00, 0x40, 0x00, 0x42, 0x21, 0x40, 0x00, 0x00, 0x00, 0x48, 0x00, 0x42,
-  0x00, 0xb5, 0x14, 0x4a, 0x51, 0x7e, 0x13, 0x1c, 0xc9, 0x09, 0x01, 0x29,
-  0xf9, 0xd0, 0x01, 0x38, 0x04, 0x28, 0x13, 0xd8, 0x19, 0x69, 0x10, 0x4a,
-  0x0a, 0x40, 0x1a, 0x61, 0x5a, 0x78, 0x0f, 0x21, 0x8a, 0x43, 0x00, 0xf0,
-  0x71, 0xfd, 0x03, 0x05, 0x09, 0x07, 0x03, 0x00, 0x01, 0x21, 0x02, 0xe0,
-  0x03, 0x21, 0x00, 0xe0, 0x02, 0x21, 0x0a, 0x43, 0x5a, 0x70, 0x0a, 0xe0,
-  0x11, 0x69, 0xf0, 0x23, 0x1b, 0x05, 0x0b, 0x43, 0x13, 0x61, 0x53, 0x78,
-  0x0f, 0x21, 0x8b, 0x43, 0x02, 0x21, 0x0b, 0x43, 0x53, 0x70, 0x00, 0xbd,
-  0x00, 0x40, 0x00, 0x42, 0xff, 0xff, 0xff, 0xf0, 0x10, 0xb5, 0x18, 0x24,
-  0x02, 0x1c, 0x20, 0x1c, 0x50, 0x43, 0x2a, 0x4b, 0x18, 0x18, 0x00, 0x7a,
-  0x40, 0xb2, 0x01, 0x30, 0x4c, 0xd0, 0x03, 0x29, 0x4a, 0xd8, 0x08, 0x1c,
-  0x21, 0x1c, 0x00, 0xf0, 0x45, 0xfd, 0x02, 0x33, 0x11, 0x21, 0x62, 0x43,
-  0x98, 0x56, 0x9a, 0x18, 0xc3, 0x01, 0x22, 0x48, 0x52, 0x68, 0x1b, 0x18,
-  0x99, 0x18, 0x40, 0x31, 0x02, 0x20, 0x08, 0x70, 0x01, 0x21, 0x91, 0x40,
-  0x59, 0x60, 0x35, 0xe0, 0x62, 0x43, 0x98, 0x56, 0x1b, 0x49, 0x9a, 0x18,
-  0x52, 0x68, 0xc3, 0x01, 0x5b, 0x18, 0x99, 0x18, 0x40, 0x31, 0x06, 0x20,
-  0x08, 0x70, 0x01, 0x21, 0x91, 0x40, 0x59, 0x60, 0x99, 0x61, 0x25, 0xe0,
-  0x51, 0x43, 0x5a, 0x56, 0x13, 0x48, 0x59, 0x18, 0x4b, 0x68, 0xd2, 0x01,
-  0x11, 0x18, 0xc8, 0x18, 0x40, 0x30, 0x06, 0x24, 0x04, 0x70, 0x01, 0x20,
-  0x98, 0x40, 0x48, 0x60, 0x0e, 0x49, 0x52, 0x18, 0x50, 0x60, 0x13, 0xe0,
-  0x51, 0x43, 0x5a, 0x56, 0x59, 0x18, 0x0a, 0x4b, 0x49, 0x68, 0xd2, 0x01,
-  0xd2, 0x18, 0x53, 0x18, 0x40, 0x33, 0x18, 0x78, 0x02, 0x24, 0x20, 0x43,
-  0x18, 0x70, 0x18, 0x78, 0x04, 0x24, 0xa0, 0x43, 0x18, 0x70, 0x01, 0x23,
-  0x8b, 0x40, 0x93, 0x60, 0x10, 0xbd, 0xc0, 0x46, 0x20, 0x53, 0x00, 0x00,
-  0x00, 0x44, 0x00, 0x41, 0x10, 0x44, 0x00, 0x41, 0x18, 0x23, 0x58, 0x43,
-  0x13, 0x4a, 0xf0, 0xb5, 0x13, 0x18, 0x08, 0x24, 0x1c, 0x57, 0x01, 0x34,
-  0x1f, 0xd0, 0x82, 0x56, 0x10, 0x4e, 0xd2, 0x01, 0x5d, 0x68, 0x01, 0x24,
-  0x90, 0x19, 0x23, 0x1c, 0x86, 0x68, 0xab, 0x40, 0x1e, 0x42, 0x0b, 0xd1,
-  0x0e, 0x1c, 0x77, 0x1e, 0xbe, 0x41, 0x40, 0x19, 0x34, 0x40, 0x40, 0x30,
-  0xa5, 0x00, 0x04, 0x78, 0x04, 0x26, 0xb4, 0x43, 0x2c, 0x43, 0x04, 0x70,
-  0x00, 0x29, 0x03, 0xd1, 0x05, 0x49, 0x52, 0x18, 0x53, 0x60, 0x02, 0xe0,
-  0x02, 0x4e, 0x92, 0x19, 0x93, 0x61, 0xf0, 0xbd, 0x20, 0x53, 0x00, 0x00,
-  0x00, 0x44, 0x00, 0x41, 0x10, 0x44, 0x00, 0x41, 0x18, 0x22, 0x42, 0x43,
-  0xf8, 0xb5, 0x2d, 0x4d, 0x08, 0x24, 0xaa, 0x18, 0x14, 0x57, 0x03, 0x1c,
-  0x62, 0x1c, 0x50, 0xd0, 0x48, 0x1c, 0x00, 0x24, 0x0c, 0x28, 0x4c, 0xd8,
-  0x00, 0xf0, 0xb6, 0xfc, 0x07, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e,
-  0x1e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x01, 0x24, 0x64, 0x42, 0x40, 0xe0,
-  0x09, 0x29, 0x02, 0xd1, 0x18, 0x1c, 0x00, 0x21, 0x03, 0xe0, 0x0a, 0x29,
-  0x04, 0xd1, 0x18, 0x1c, 0x02, 0x21, 0xff, 0xf7, 0x4b, 0xff, 0x23, 0xe0,
-  0x00, 0x24, 0x0b, 0x29, 0x31, 0xd1, 0x18, 0x1c, 0x01, 0x21, 0xff, 0xf7,
-  0x43, 0xff, 0x2c, 0xe0, 0x18, 0x22, 0x53, 0x43, 0xea, 0x18, 0x52, 0x68,
-  0xeb, 0x56, 0x01, 0x20, 0x14, 0x1c, 0x04, 0x40, 0x55, 0x08, 0xdb, 0x01,
-  0x00, 0x2c, 0x11, 0xd0, 0x12, 0x4c, 0x1b, 0x19, 0x5d, 0x19, 0x30, 0x35,
-  0x2e, 0x78, 0x0c, 0x01, 0x0f, 0x21, 0x31, 0x40, 0x21, 0x43, 0x9a, 0x18,
-  0xc9, 0xb2, 0x29, 0x70, 0x40, 0x32, 0x13, 0x78, 0x18, 0x43, 0x10, 0x70,
-  0x00, 0x24, 0x0e, 0xe0, 0x09, 0x4e, 0x0f, 0x27, 0x9b, 0x19, 0x5d, 0x19,
-  0x30, 0x35, 0x2e, 0x78, 0x9a, 0x18, 0xbe, 0x43, 0x31, 0x43, 0xc9, 0xb2,
-  0x29, 0x70, 0x40, 0x32, 0x13, 0x78, 0x18, 0x43, 0x10, 0x70, 0x20, 0x1c,
-  0xf8, 0xbd, 0xc0, 0x46, 0x20, 0x53, 0x00, 0x00, 0x00, 0x44, 0x00, 0x41,
-  0xf7, 0xb5, 0x8a, 0x18, 0x06, 0x1c, 0x0d, 0x1c, 0x01, 0x92, 0x0c, 0x1c,
-  0x01, 0x9b, 0x67, 0x1b, 0x9c, 0x42, 0x07, 0xd0, 0x33, 0x68, 0x21, 0x78,
-  0x1b, 0x68, 0x30, 0x1c, 0x98, 0x47, 0x01, 0x34, 0x00, 0x28, 0xf3, 0xd1,
-  0x38, 0x1c, 0xfe, 0xbd, 0x15, 0x4a, 0x13, 0x68, 0x58, 0x1c, 0x25, 0xd0,
-  0x01, 0x3b, 0x13, 0x60, 0x00, 0x2b, 0x21, 0xd1, 0x72, 0xb6, 0x12, 0x4a,
-  0x12, 0x4b, 0x04, 0x32, 0x9a, 0x42, 0x07, 0xd8, 0xbf, 0xf3, 0x4f, 0x8f,
-  0x10, 0x4a, 0x11, 0x4b, 0xda, 0x60, 0xbf, 0xf3, 0x4f, 0x8f, 0x11, 0xe0,
-  0x0f, 0x4b, 0x19, 0x7d, 0xc8, 0x07, 0xfb, 0xd5, 0x18, 0x8b, 0x20, 0x21,
-  0xff, 0x31, 0x92, 0x08, 0x52, 0x00, 0x01, 0x43, 0x19, 0x83, 0xda, 0x61,
-  0x0a, 0x4a, 0x1a, 0x80, 0x1a, 0x7d, 0xd1, 0x07, 0xfc, 0xd5, 0xe5, 0xe7,
-  0xc0, 0x46, 0xfd, 0xe7, 0x70, 0x47, 0xc0, 0x46, 0x08, 0x00, 0x00, 0x20,
-  0x00, 0x20, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x04, 0x00, 0xfa, 0x05,
-  0x00, 0xed, 0x00, 0xe0, 0x00, 0x40, 0x00, 0x41, 0x02, 0xa5, 0xff, 0xff,
-  0x01, 0x60, 0x70, 0x47, 0xf7, 0xb5, 0x08, 0xac, 0x26, 0x78, 0x04, 0x68,
-  0x9d, 0x1e, 0x27, 0x68, 0x6c, 0x1e, 0xa5, 0x41, 0xec, 0xb2, 0x92, 0x07,
-  0x05, 0x68, 0x3a, 0x43, 0x27, 0x06, 0x3a, 0x43, 0x2a, 0x60, 0x02, 0x68,
-  0x07, 0x25, 0x29, 0x40, 0x50, 0x68, 0xb5, 0x01, 0x00, 0x2c, 0x00, 0xd0,
-  0x5c, 0x03, 0x29, 0x43, 0x01, 0x43, 0x0c, 0x43, 0x54, 0x60, 0xf7, 0xbd,
-  0x30, 0xb5, 0x03, 0x68, 0xc0, 0x25, 0x1c, 0x68, 0xad, 0x03, 0x12, 0x05,
-  0x2a, 0x40, 0x22, 0x43, 0xc0, 0x24, 0xa4, 0x02, 0x09, 0x04, 0x21, 0x40,
-  0x11, 0x43, 0x19, 0x60, 0x03, 0x68, 0x5a, 0x68, 0x14, 0x43, 0x5c, 0x60,
-  0x30, 0xbd, 0x03, 0x68, 0x01, 0x21, 0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60,
-  0x02, 0x68, 0x11, 0x68, 0x01, 0x23, 0x19, 0x42, 0xfb, 0xd1, 0xd1, 0x69,
-  0x19, 0x42, 0xf8, 0xd1, 0x70, 0x47, 0x03, 0x68, 0x02, 0x21, 0x1a, 0x68,
-  0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68, 0xd3, 0x69, 0x99, 0x07, 0xfc, 0xd4,
-  0x70, 0x47, 0x03, 0x68, 0x1a, 0x7e, 0xd1, 0x07, 0x02, 0xd4, 0x1a, 0x7e,
-  0x91, 0x07, 0xfc, 0xd5, 0x70, 0x47, 0x03, 0x68, 0x00, 0x22, 0x5a, 0x83,
-  0x70, 0x47, 0x03, 0x68, 0x18, 0x7e, 0x40, 0x07, 0xc0, 0x0f, 0x70, 0x47,
-  0x03, 0x68, 0x18, 0x7e, 0xc0, 0x09, 0x70, 0x47, 0x03, 0x68, 0x80, 0x22,
-  0x19, 0x7e, 0x52, 0x42, 0x0a, 0x43, 0x1a, 0x76, 0x70, 0x47, 0x03, 0x68,
-  0x18, 0x8d, 0xc0, 0xb2, 0x70, 0x47, 0x03, 0x68, 0x1a, 0x7e, 0x01, 0x20,
-  0x02, 0x42, 0xfb, 0xd0, 0x19, 0x85, 0x70, 0x47, 0x70, 0xb5, 0x03, 0x68,
-  0x01, 0x26, 0x8d, 0x07, 0xed, 0x0f, 0x31, 0x40, 0x1c, 0x68, 0x6d, 0x07,
-  0x09, 0x07, 0x29, 0x43, 0x21, 0x43, 0x19, 0x60, 0x04, 0x68, 0x51, 0x00,
-  0x03, 0x48, 0x00, 0xf0, 0x9f, 0xfb, 0x01, 0x38, 0xc0, 0xb2, 0x20, 0x73,
-  0x70, 0xbd, 0xc0, 0x46, 0x00, 0x6c, 0xdc, 0x02, 0x03, 0x68, 0x01, 0x21,
-  0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68, 0x11, 0x68, 0x01, 0x23,
-  0x19, 0x42, 0xfb, 0xd1, 0xd1, 0x69, 0x19, 0x42, 0xf8, 0xd1, 0x70, 0x47,
-  0x03, 0x68, 0x02, 0x21, 0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68,
-  0xd3, 0x69, 0x99, 0x07, 0xfc, 0xd4, 0x70, 0x47, 0x03, 0x68, 0xda, 0x69,
-  0x91, 0x07, 0xfc, 0xd4, 0x1a, 0x68, 0x02, 0x21, 0x8a, 0x43, 0x1a, 0x60,
-  0x70, 0x47, 0x03, 0x68, 0x9a, 0x6a, 0x52, 0x0a, 0x52, 0x02, 0x11, 0x43,
-  0x99, 0x62, 0x03, 0x68, 0x1a, 0x7e, 0x51, 0x07, 0xfc, 0xd5, 0x98, 0x6a,
-  0xc0, 0xb2, 0x70, 0x47, 0x03, 0x68, 0x22, 0x4a, 0x30, 0xb5, 0x93, 0x42,
-  0x11, 0xd0, 0x21, 0x4a, 0x93, 0x42, 0x11, 0xd0, 0x20, 0x4a, 0x93, 0x42,
-  0x11, 0xd0, 0x20, 0x4a, 0x93, 0x42, 0x11, 0xd0, 0x1f, 0x4a, 0x93, 0x42,
-  0x11, 0xd0, 0x1f, 0x4a, 0x93, 0x42, 0x30, 0xd1, 0x0e, 0x23, 0x19, 0x22,
-  0x0d, 0xe0, 0x09, 0x23, 0x14, 0x22, 0x0a, 0xe0, 0x0a, 0x23, 0x15, 0x22,
-  0x07, 0xe0, 0x0b, 0x23, 0x16, 0x22, 0x04, 0xe0, 0x0c, 0x23, 0x17, 0x22,
-  0x01, 0xe0, 0x0d, 0x23, 0x18, 0x22, 0xdc, 0xb2, 0x15, 0x49, 0x01, 0x20,
-  0x9b, 0x08, 0xa0, 0x40, 0x9b, 0x00, 0x08, 0x60, 0x5b, 0x18, 0x03, 0x20,
-  0xc0, 0x21, 0x89, 0x00, 0x04, 0x40, 0x5d, 0x58, 0xe0, 0x00, 0xff, 0x24,
-  0x84, 0x40, 0xa5, 0x43, 0x2c, 0x1c, 0xc0, 0x25, 0x85, 0x40, 0x28, 0x1c,
-  0x20, 0x43, 0x58, 0x50, 0x80, 0x23, 0xdb, 0x01, 0x1a, 0x43, 0x0a, 0x4b,
-  0x5a, 0x80, 0x5a, 0x78, 0x52, 0xb2, 0x00, 0x2a, 0xfb, 0xdb, 0x30, 0xbd,
-  0x00, 0x08, 0x00, 0x42, 0x00, 0x0c, 0x00, 0x42, 0x00, 0x10, 0x00, 0x42,
-  0x00, 0x14, 0x00, 0x42, 0x00, 0x18, 0x00, 0x42, 0x00, 0x1c, 0x00, 0x42,
-  0x00, 0xe1, 0x00, 0xe0, 0x00, 0x0c, 0x00, 0x40, 0xf8, 0xb5, 0x04, 0x1c,
-  0x15, 0x1c, 0x0e, 0x1c, 0x1f, 0x1c, 0xff, 0xf7, 0xa3, 0xff, 0x20, 0x1c,
-  0xff, 0xf7, 0x1b, 0xff, 0xb1, 0x00, 0x1c, 0x22, 0x0a, 0x40, 0x69, 0x07,
-  0x23, 0x68, 0x09, 0x0c, 0x0a, 0x43, 0x1a, 0x60, 0x22, 0x68, 0x84, 0x23,
-  0x93, 0x75, 0x01, 0x2e, 0x1a, 0xd1, 0x08, 0x21, 0x01, 0x2d, 0x00, 0xd1,
-  0x10, 0x21, 0x0c, 0x4b, 0x79, 0x43, 0x18, 0x68, 0xc0, 0x00, 0x00, 0xf0,
-  0xf3, 0xfa, 0x23, 0x68, 0x07, 0x21, 0x9a, 0x89, 0x01, 0x40, 0xd2, 0x04,
-  0x49, 0x03, 0xd2, 0x0c, 0x0a, 0x43, 0x9a, 0x81, 0x23, 0x68, 0x00, 0x04,
-  0xc2, 0x0c, 0x98, 0x89, 0x40, 0x0b, 0x40, 0x03, 0x10, 0x43, 0x98, 0x81,
-  0xf8, 0xbd, 0xc0, 0x46, 0x04, 0x00, 0x00, 0x20, 0xf7, 0xb5, 0x01, 0x93,
-  0x08, 0xab, 0x04, 0x1c, 0x1f, 0x78, 0x0d, 0x1c, 0x16, 0x1c, 0xff, 0xf7,
-  0x3d, 0xff, 0x20, 0x1c, 0xff, 0xf7, 0x68, 0xff, 0xbf, 0x07, 0x0c, 0x22,
-  0x17, 0x43, 0xc0, 0x22, 0x92, 0x03, 0x36, 0x05, 0x16, 0x40, 0xc0, 0x22,
-  0x92, 0x02, 0x2d, 0x04, 0x23, 0x68, 0x3e, 0x43, 0x01, 0x99, 0x15, 0x40,
-  0x35, 0x43, 0x07, 0x22, 0x1d, 0x60, 0x0a, 0x40, 0x80, 0x21, 0x23, 0x68,
-  0x89, 0x02, 0x0a, 0x43, 0x5a, 0x60, 0xf7, 0xbd, 0x01, 0x20, 0x70, 0x47,
-  0x08, 0xb5, 0x03, 0x68, 0x13, 0x22, 0xdb, 0x69, 0x98, 0x47, 0x08, 0xbd,
-  0x10, 0xb5, 0x04, 0x1c, 0x00, 0x69, 0xff, 0xf7, 0xbe, 0xfe, 0x20, 0x1c,
-  0x14, 0x30, 0x00, 0xf0, 0x7d, 0xfa, 0x10, 0xbd, 0x08, 0xb5, 0x00, 0x69,
-  0xff, 0xf7, 0xcd, 0xfe, 0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0,
-  0x85, 0xfa, 0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0, 0x86, 0xfa,
-  0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0, 0x6d, 0xfa, 0x08, 0xbd,
-  0x08, 0xb5, 0x00, 0x69, 0xff, 0xf7, 0xd9, 0xfe, 0x01, 0x20, 0x08, 0xbd,
-  0xf7, 0xb5, 0x1d, 0x1c, 0x08, 0xab, 0x1b, 0x78, 0x04, 0x1c, 0x00, 0x93,
-  0x09, 0xab, 0x1b, 0x78, 0x16, 0x1c, 0x01, 0x93, 0x00, 0x23, 0x43, 0x60,
-  0xfa, 0x23, 0x9b, 0x00, 0x83, 0x60, 0x09, 0x4b, 0x0f, 0x1c, 0x08, 0x33,
-  0x03, 0x60, 0x14, 0x30, 0x00, 0xf0, 0x36, 0xfa, 0x00, 0x9a, 0x23, 0x1c,
-  0x5c, 0x33, 0x27, 0x61, 0x9a, 0x70, 0x01, 0x9a, 0x1e, 0x70, 0x5d, 0x70,
-  0x20, 0x1c, 0xda, 0x70, 0xfe, 0xbd, 0xc0, 0x46, 0x80, 0x56, 0x00, 0x00,
-  0x10, 0xb5, 0x04, 0x1c, 0x00, 0x69, 0xff, 0xf7, 0x9a, 0xfe, 0x00, 0x28,
-  0x07, 0xd0, 0x20, 0x69, 0xff, 0xf7, 0xa5, 0xfe, 0x01, 0x1c, 0x20, 0x1c,
-  0x14, 0x30, 0x00, 0xf0, 0x24, 0xfa, 0x20, 0x69, 0xff, 0xf7, 0x92, 0xfe,
-  0x00, 0x28, 0x05, 0xd0, 0x20, 0x69, 0xff, 0xf7, 0x91, 0xfe, 0x20, 0x69,
-  0xff, 0xf7, 0x81, 0xfe, 0x10, 0xbd, 0xf0, 0x23, 0x08, 0x1c, 0x18, 0x40,
-  0x30, 0x38, 0x43, 0x42, 0x58, 0x41, 0x70, 0x47, 0xf0, 0x23, 0x1b, 0x01,
-  0x19, 0x40, 0x80, 0x23, 0x9b, 0x00, 0x99, 0x42, 0x0c, 0xd0, 0xc0, 0x23,
-  0x9b, 0x00, 0x99, 0x42, 0x06, 0xd0, 0x80, 0x23, 0x5b, 0x00, 0x05, 0x20,
-  0x99, 0x42, 0x04, 0xd0, 0x00, 0x20, 0x02, 0xe0, 0x07, 0x20, 0x00, 0xe0,
-  0x06, 0x20, 0x70, 0x47, 0x0f, 0x23, 0x19, 0x40, 0x01, 0x29, 0x05, 0xd0,
-  0x02, 0x39, 0x4b, 0x42, 0x4b, 0x41, 0x02, 0x20, 0xc0, 0x1a, 0x00, 0xe0,
-  0x00, 0x20, 0x70, 0x47, 0xf0, 0xb5, 0x03, 0x1c, 0x85, 0xb0, 0x03, 0x91,
-  0x5c, 0x33, 0x04, 0x1c, 0x18, 0x27, 0x18, 0x78, 0x3b, 0x1c, 0x43, 0x43,
-  0x1b, 0x4e, 0x08, 0x21, 0xf3, 0x18, 0x59, 0x56, 0x15, 0x1c, 0xff, 0xf7,
-  0x45, 0xfd, 0x23, 0x1c, 0x5d, 0x33, 0x18, 0x78, 0x08, 0x21, 0x47, 0x43,
-  0xf6, 0x19, 0x71, 0x56, 0xff, 0xf7, 0x3c, 0xfd, 0x01, 0x21, 0x0a, 0x1c,
-  0x03, 0x9b, 0x20, 0x69, 0xff, 0xf7, 0xf2, 0xfe, 0x29, 0x1c, 0x20, 0x1c,
-  0xff, 0xf7, 0xba, 0xff, 0x29, 0x1c, 0x07, 0x1c, 0x20, 0x1c, 0xff, 0xf7,
-  0xcb, 0xff, 0x29, 0x1c, 0x06, 0x1c, 0x20, 0x1c, 0xff, 0xf7, 0xa9, 0xff,
-  0x39, 0x1c, 0x00, 0x90, 0x33, 0x1c, 0x20, 0x69, 0x01, 0x22, 0xff, 0xf7,
-  0xd3, 0xfd, 0x23, 0x1c, 0x5f, 0x33, 0x19, 0x78, 0x01, 0x3b, 0x1a, 0x78,
-  0x20, 0x69, 0xff, 0xf7, 0xe7, 0xfd, 0x20, 0x69, 0xff, 0xf7, 0x05, 0xfe,
-  0x05, 0xb0, 0xf0, 0xbd, 0x20, 0x53, 0x00, 0x00, 0x3f, 0x20, 0x70, 0x47,
-  0x13, 0xb5, 0x02, 0x68, 0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33, 0x54, 0x68,
-  0x19, 0x1c, 0x01, 0x22, 0xa0, 0x47, 0x16, 0xbd, 0x08, 0xb5, 0x00, 0x69,
-  0x02, 0x21, 0x00, 0xf0, 0x49, 0xf8, 0x08, 0xbd, 0x08, 0xb5, 0x00, 0x69,
-  0x03, 0x21, 0x00, 0xf0, 0x59, 0xf8, 0x08, 0xbd, 0x38, 0xb5, 0x0d, 0x1c,
-  0x04, 0x1c, 0x13, 0x1c, 0x00, 0x69, 0x03, 0x21, 0x2a, 0x1c, 0x00, 0xf0,
-  0xf1, 0xf8, 0x00, 0x28, 0x01, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x38, 0xbd,
-  0x10, 0xb5, 0x05, 0x4c, 0x23, 0x68, 0x5a, 0x1c, 0x04, 0xd1, 0x03, 0x68,
-  0xdb, 0x68, 0x98, 0x47, 0x20, 0x60, 0x03, 0x1c, 0x18, 0x1c, 0x10, 0xbd,
-  0x0c, 0x00, 0x00, 0x20, 0x07, 0x4a, 0x08, 0xb5, 0x13, 0x68, 0x59, 0x1c,
-  0x04, 0xd0, 0x01, 0x21, 0x49, 0x42, 0x11, 0x60, 0x18, 0x1c, 0x03, 0xe0,
-  0x00, 0x69, 0x02, 0x21, 0x00, 0xf0, 0xc2, 0xf8, 0x08, 0xbd, 0xc0, 0x46,
-  0x0c, 0x00, 0x00, 0x20, 0x06, 0x4b, 0xfa, 0x21, 0x89, 0x00, 0x99, 0x60,
-  0x05, 0x49, 0x00, 0x22, 0x08, 0x31, 0x19, 0x60, 0x04, 0x49, 0x5a, 0x60,
-  0x19, 0x61, 0x1a, 0x76, 0x70, 0x47, 0xc0, 0x46, 0x18, 0x08, 0x00, 0x20,
-  0xb0, 0x56, 0x00, 0x00, 0xd8, 0x0b, 0x00, 0x20, 0x08, 0xb5, 0x08, 0x4b,
-  0x8a, 0x00, 0xd0, 0x58, 0x00, 0x28, 0x03, 0xd0, 0x03, 0x68, 0x9b, 0x68,
-  0x98, 0x47, 0x06, 0xe0, 0xc9, 0xb2, 0x04, 0x4b, 0x49, 0x01, 0x59, 0x18,
-  0x88, 0x68, 0x80, 0x04, 0x80, 0x0c, 0x08, 0xbd, 0xbc, 0x0b, 0x00, 0x20,
-  0xdc, 0x0b, 0x00, 0x20, 0x10, 0xb5, 0x0c, 0x1c, 0xff, 0xf7, 0xe6, 0xff,
-  0x00, 0x28, 0x0c, 0xd0, 0x06, 0x4b, 0xe1, 0xb2, 0x1b, 0x68, 0x08, 0x31,
-  0x49, 0x01, 0x59, 0x18, 0x4a, 0x79, 0x80, 0x23, 0x5b, 0x42, 0x13, 0x43,
-  0x4b, 0x71, 0x02, 0x23, 0xcb, 0x71, 0x10, 0xbd, 0xdc, 0x0b, 0x00, 0x20,
-  0x10, 0xb5, 0xc9, 0xb2, 0x0c, 0x48, 0x49, 0x01, 0x43, 0x18, 0x9a, 0x68,
-  0x92, 0x04, 0x92, 0x0c, 0x3f, 0x2a, 0x08, 0xd9, 0x14, 0x1c, 0x9a, 0x68,
-  0x40, 0x3c, 0xa4, 0x04, 0x92, 0x0b, 0xa4, 0x0c, 0x92, 0x03, 0x22, 0x43,
-  0x02, 0xe0, 0x9a, 0x68, 0x92, 0x0b, 0x92, 0x03, 0x9a, 0x60, 0x41, 0x18,
-  0x88, 0x68, 0xc0, 0xb2, 0x10, 0xbd, 0xc0, 0x46, 0xdc, 0x0b, 0x00, 0x20,
-  0xf0, 0xb5, 0x1c, 0x1c, 0x2a, 0x4b, 0x85, 0xb0, 0x1b, 0x68, 0x06, 0x1c,
-  0x0d, 0x1c, 0x02, 0x92, 0x00, 0x2b, 0x46, 0xd0, 0x27, 0x4b, 0x8a, 0x00,
-  0xd0, 0x58, 0x00, 0x28, 0x05, 0xd0, 0x03, 0x68, 0x02, 0x99, 0x5b, 0x68,
-  0x22, 0x1c, 0x98, 0x47, 0x3f, 0xe0, 0x30, 0x1c, 0xff, 0xf7, 0x9e, 0xff,
-  0xa0, 0x42, 0x04, 0xd2, 0x30, 0x1c, 0x29, 0x1c, 0xff, 0xf7, 0x98, 0xff,
-  0x04, 0x1c, 0x29, 0x1c, 0x30, 0x1c, 0xff, 0xf7, 0xbf, 0xff, 0x1c, 0x4f,
-  0xe9, 0xb2, 0x4a, 0x01, 0x01, 0x91, 0x39, 0x68, 0x03, 0x92, 0x8b, 0x18,
-  0xff, 0x33, 0x5a, 0x7a, 0x01, 0x21, 0x0a, 0x43, 0x17, 0x49, 0x5a, 0x72,
-  0xab, 0x01, 0xc9, 0x18, 0x02, 0x98, 0x22, 0x1c, 0x00, 0xf0, 0xa1, 0xf9,
-  0x00, 0x2c, 0x1b, 0xd0, 0x30, 0x1c, 0x29, 0x1c, 0xff, 0xf7, 0x7a, 0xff,
-  0x00, 0x28, 0x15, 0xd1, 0x01, 0x9b, 0x3a, 0x68, 0x08, 0x33, 0x5b, 0x01,
-  0xd3, 0x18, 0x19, 0x79, 0x40, 0x20, 0x01, 0x43, 0x19, 0x71, 0x01, 0x21,
-  0xd9, 0x71, 0x03, 0x99, 0x53, 0x18, 0xff, 0x33, 0x9a, 0x7a, 0x01, 0x21,
-  0x0a, 0x43, 0x9a, 0x72, 0x02, 0xe0, 0x01, 0x20, 0x40, 0x42, 0x00, 0xe0,
-  0x20, 0x1c, 0x05, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0xe0, 0x0c, 0x00, 0x20,
-  0xbc, 0x0b, 0x00, 0x20, 0xdc, 0x0b, 0x00, 0x20, 0xfc, 0x09, 0x00, 0x20,
-  0x13, 0xb5, 0x6c, 0x46, 0x07, 0x34, 0x22, 0x1c, 0x01, 0x23, 0xff, 0xf7,
-  0x99, 0xff, 0x01, 0x28, 0x01, 0xd1, 0x20, 0x78, 0x01, 0xe0, 0x01, 0x20,
-  0x40, 0x42, 0x16, 0xbd, 0xf0, 0xb5, 0x1c, 0x1c, 0x3a, 0x4b, 0x85, 0xb0,
-  0x1b, 0x68, 0x0e, 0x1c, 0x02, 0x92, 0x00, 0x2b, 0x60, 0xd0, 0x80, 0x23,
-  0xdb, 0x01, 0x9c, 0x42, 0x5c, 0xd8, 0x00, 0x22, 0x00, 0x92, 0x00, 0x2c,
-  0x56, 0xd0, 0x34, 0x4d, 0xf7, 0xb2, 0x2b, 0x68, 0x01, 0x93, 0x3b, 0x1c,
-  0x08, 0x33, 0x01, 0x9a, 0x5b, 0x01, 0xd3, 0x18, 0x9b, 0x79, 0xdb, 0x09,
-  0x1a, 0xd0, 0x2f, 0x4b, 0x2f, 0x49, 0x18, 0x68, 0x00, 0xf0, 0xae, 0xf8,
-  0x2e, 0x4b, 0x17, 0x21, 0x58, 0x43, 0x00, 0xf0, 0xa9, 0xf8, 0x3b, 0x1c,
-  0x08, 0x33, 0x01, 0x9a, 0x5b, 0x01, 0xd3, 0x18, 0xdb, 0x79, 0x9a, 0x07,
-  0x08, 0xd4, 0x29, 0x4b, 0x9a, 0x5d, 0x00, 0x2a, 0x38, 0xd1, 0x42, 0x1e,
-  0x00, 0x28, 0x35, 0xd0, 0x10, 0x1c, 0xee, 0xe7, 0x24, 0x4b, 0x00, 0x22,
-  0x9a, 0x55, 0x25, 0x1e, 0x3f, 0x2d, 0x00, 0xd9, 0x3f, 0x25, 0x22, 0x4a,
-  0xb3, 0x01, 0xd3, 0x18, 0x18, 0x1c, 0x02, 0x99, 0x2a, 0x1c, 0x03, 0x93,
-  0x00, 0xf0, 0x21, 0xf9, 0x18, 0x4a, 0x7b, 0x01, 0xd3, 0x18, 0x03, 0x9a,
-  0xa9, 0x04, 0x5a, 0x61, 0x9a, 0x69, 0x89, 0x0c, 0x92, 0x0b, 0x92, 0x03,
-  0x0a, 0x43, 0x9a, 0x61, 0x3b, 0x1c, 0x01, 0x9a, 0x08, 0x33, 0x5b, 0x01,
-  0xd3, 0x18, 0x02, 0x22, 0xda, 0x71, 0x59, 0x79, 0x80, 0x22, 0x52, 0x42,
-  0x0a, 0x43, 0x5a, 0x71, 0x00, 0x9b, 0x02, 0x9a, 0x5b, 0x19, 0x52, 0x19,
-  0x00, 0x93, 0x64, 0x1b, 0x02, 0x92, 0xa6, 0xe7, 0x00, 0x98, 0x0b, 0xe0,
-  0x01, 0x20, 0x08, 0xe0, 0x01, 0x22, 0x9a, 0x55, 0x7b, 0x01, 0xed, 0x18,
-  0xab, 0x69, 0x10, 0x1c, 0x9b, 0x0b, 0x9b, 0x03, 0xab, 0x61, 0x40, 0x42,
-  0x05, 0xb0, 0xf0, 0xbd, 0xe0, 0x0c, 0x00, 0x20, 0xdc, 0x0b, 0x00, 0x20,
-  0x04, 0x00, 0x00, 0x20, 0x40, 0x42, 0x0f, 0x00, 0x70, 0x11, 0x01, 0x00,
-  0x34, 0x08, 0x00, 0x20, 0x3c, 0x08, 0x00, 0x20, 0x01, 0x4a, 0x02, 0x4b,
-  0x1a, 0x60, 0x70, 0x47, 0x00, 0x50, 0x00, 0x41, 0xdc, 0x0b, 0x00, 0x20,
-  0x10, 0xb5, 0x00, 0x21, 0x40, 0x22, 0x04, 0x1c, 0x00, 0xf0, 0xde, 0xf8,
-  0x00, 0x23, 0x20, 0x1c, 0x23, 0x64, 0x63, 0x64, 0x10, 0xbd, 0x02, 0x6c,
-  0x10, 0xb5, 0x3f, 0x23, 0x54, 0x1c, 0x23, 0x40, 0x44, 0x6c, 0xa3, 0x42,
-  0x01, 0xd0, 0x81, 0x54, 0x03, 0x64, 0x10, 0xbd, 0x00, 0x23, 0x03, 0x64,
-  0x43, 0x64, 0x70, 0x47, 0x43, 0x6c, 0x02, 0x6c, 0x93, 0x42, 0x06, 0xd0,
-  0xc2, 0x5c, 0x3f, 0x21, 0x01, 0x33, 0x0b, 0x40, 0x43, 0x64, 0x10, 0x1c,
-  0x01, 0xe0, 0x01, 0x20, 0x40, 0x42, 0x70, 0x47, 0x02, 0x6c, 0x43, 0x6c,
-  0xd0, 0x1a, 0x00, 0xd5, 0x40, 0x30, 0x70, 0x47, 0x43, 0x6c, 0x02, 0x6c,
-  0x93, 0x42, 0x01, 0xd0, 0xc0, 0x5c, 0x01, 0xe0, 0x01, 0x20, 0x40, 0x42,
-  0x70, 0x47, 0x00, 0x00, 0x02, 0xb4, 0x71, 0x46, 0x49, 0x08, 0x49, 0x00,
-  0x09, 0x5c, 0x49, 0x00, 0x8e, 0x44, 0x02, 0xbc, 0x70, 0x47, 0xc0, 0x46,
-  0x00, 0x29, 0x34, 0xd0, 0x01, 0x23, 0x00, 0x22, 0x10, 0xb4, 0x88, 0x42,
-  0x2c, 0xd3, 0x01, 0x24, 0x24, 0x07, 0xa1, 0x42, 0x04, 0xd2, 0x81, 0x42,
-  0x02, 0xd2, 0x09, 0x01, 0x1b, 0x01, 0xf8, 0xe7, 0xe4, 0x00, 0xa1, 0x42,
-  0x04, 0xd2, 0x81, 0x42, 0x02, 0xd2, 0x49, 0x00, 0x5b, 0x00, 0xf8, 0xe7,
-  0x88, 0x42, 0x01, 0xd3, 0x40, 0x1a, 0x1a, 0x43, 0x4c, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0x5c, 0x08, 0x22, 0x43, 0x8c, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0x9c, 0x08, 0x22, 0x43, 0xcc, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0xdc, 0x08, 0x22, 0x43, 0x00, 0x28, 0x03, 0xd0,
-  0x1b, 0x09, 0x01, 0xd0, 0x09, 0x09, 0xe3, 0xe7, 0x10, 0x1c, 0x10, 0xbc,
-  0x70, 0x47, 0x00, 0x28, 0x01, 0xd0, 0x00, 0x20, 0xc0, 0x43, 0x07, 0xb4,
-  0x02, 0x48, 0x02, 0xa1, 0x40, 0x18, 0x02, 0x90, 0x03, 0xbd, 0xc0, 0x46,
-  0x19, 0x00, 0x00, 0x00, 0x00, 0x29, 0xf0, 0xd0, 0x03, 0xb5, 0xff, 0xf7,
-  0xb9, 0xff, 0x0e, 0xbc, 0x42, 0x43, 0x89, 0x1a, 0x18, 0x47, 0xc0, 0x46,
-  0x70, 0x47, 0xc0, 0x46, 0x70, 0xb5, 0x0e, 0x4b, 0x0e, 0x4d, 0x00, 0x24,
-  0xed, 0x1a, 0xad, 0x10, 0x1e, 0x1c, 0xac, 0x42, 0x04, 0xd0, 0xa3, 0x00,
-  0xf3, 0x58, 0x98, 0x47, 0x01, 0x34, 0xf8, 0xe7, 0x00, 0xf0, 0x32, 0xf9,
-  0x08, 0x4b, 0x09, 0x4d, 0x00, 0x24, 0xed, 0x1a, 0xad, 0x10, 0x1e, 0x1c,
-  0xac, 0x42, 0x04, 0xd0, 0xa3, 0x00, 0xf3, 0x58, 0x98, 0x47, 0x01, 0x34,
-  0xf8, 0xe7, 0x70, 0xbd, 0x74, 0x00, 0x00, 0x20, 0x74, 0x00, 0x00, 0x20,
-  0x74, 0x00, 0x00, 0x20, 0x98, 0x00, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b,
-  0x01, 0x1c, 0x18, 0x68, 0x00, 0xf0, 0x76, 0xf8, 0x08, 0xbd, 0xc0, 0x46,
-  0x70, 0x00, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b, 0x01, 0x1c, 0x18, 0x68,
-  0x00, 0xf0, 0x24, 0xf8, 0x08, 0xbd, 0xc0, 0x46, 0x70, 0x00, 0x00, 0x20,
-  0x30, 0xb5, 0x00, 0x23, 0x93, 0x42, 0x08, 0xd0, 0xc5, 0x5c, 0x01, 0x33,
-  0xcc, 0x18, 0x01, 0x3c, 0x24, 0x78, 0xa5, 0x42, 0xf6, 0xd0, 0x28, 0x1b,
-  0x00, 0xe0, 0x00, 0x20, 0x30, 0xbd, 0x10, 0xb5, 0x00, 0x23, 0x93, 0x42,
-  0x03, 0xd0, 0xcc, 0x5c, 0xc4, 0x54, 0x01, 0x33, 0xf9, 0xe7, 0x10, 0xbd,
-  0x03, 0x1c, 0x82, 0x18, 0x93, 0x42, 0x02, 0xd0, 0x19, 0x70, 0x01, 0x33,
-  0xfa, 0xe7, 0x70, 0x47, 0x30, 0xb5, 0x00, 0x29, 0x40, 0xd0, 0x04, 0x39,
-  0x0b, 0x68, 0x00, 0x2b, 0x00, 0xda, 0xc9, 0x18, 0x1e, 0x4a, 0x13, 0x68,
-  0x14, 0x1c, 0x00, 0x2b, 0x02, 0xd1, 0x4b, 0x60, 0x11, 0x60, 0x33, 0xe0,
-  0x99, 0x42, 0x0f, 0xd2, 0x08, 0x68, 0x0a, 0x18, 0x9a, 0x42, 0x05, 0xd1,
-  0x13, 0x68, 0x52, 0x68, 0xc0, 0x18, 0x08, 0x60, 0x4a, 0x60, 0x00, 0xe0,
-  0x4b, 0x60, 0x21, 0x60, 0x24, 0xe0, 0x8a, 0x42, 0x03, 0xd8, 0x13, 0x1c,
-  0x5a, 0x68, 0x00, 0x2a, 0xf9, 0xd1, 0x1d, 0x68, 0x5c, 0x19, 0x8c, 0x42,
-  0x0b, 0xd1, 0x09, 0x68, 0x69, 0x18, 0x58, 0x18, 0x19, 0x60, 0x90, 0x42,
-  0x14, 0xd1, 0x14, 0x68, 0x52, 0x68, 0x09, 0x19, 0x19, 0x60, 0x5a, 0x60,
-  0x0e, 0xe0, 0x8c, 0x42, 0x02, 0xd9, 0x0c, 0x23, 0x03, 0x60, 0x09, 0xe0,
-  0x08, 0x68, 0x0c, 0x18, 0x94, 0x42, 0x03, 0xd1, 0x14, 0x68, 0x52, 0x68,
-  0x00, 0x19, 0x08, 0x60, 0x4a, 0x60, 0x59, 0x60, 0x30, 0xbd, 0xc0, 0x46,
-  0xe8, 0x0c, 0x00, 0x20, 0x70, 0xb5, 0x03, 0x23, 0xcd, 0x1c, 0x9d, 0x43,
-  0x08, 0x35, 0x06, 0x1c, 0x0c, 0x2d, 0x01, 0xd2, 0x0c, 0x25, 0x01, 0xe0,
-  0x00, 0x2d, 0x3f, 0xdb, 0x8d, 0x42, 0x3d, 0xd3, 0x20, 0x4b, 0x1c, 0x68,
-  0x1a, 0x1c, 0x21, 0x1c, 0x00, 0x29, 0x13, 0xd0, 0x08, 0x68, 0x43, 0x1b,
-  0x0d, 0xd4, 0x0b, 0x2b, 0x02, 0xd9, 0x0b, 0x60, 0xcc, 0x18, 0x1e, 0xe0,
-  0x8c, 0x42, 0x02, 0xd1, 0x63, 0x68, 0x13, 0x60, 0x1a, 0xe0, 0x48, 0x68,
-  0x60, 0x60, 0x0c, 0x1c, 0x16, 0xe0, 0x0c, 0x1c, 0x49, 0x68, 0xe9, 0xe7,
-  0x14, 0x4c, 0x20, 0x68, 0x00, 0x28, 0x03, 0xd1, 0x30, 0x1c, 0x00, 0xf0,
-  0x25, 0xf8, 0x20, 0x60, 0x30, 0x1c, 0x29, 0x1c, 0x00, 0xf0, 0x20, 0xf8,
-  0x43, 0x1c, 0x15, 0xd0, 0xc4, 0x1c, 0x03, 0x23, 0x9c, 0x43, 0x84, 0x42,
-  0x0a, 0xd1, 0x25, 0x60, 0x20, 0x1c, 0x0b, 0x30, 0x07, 0x22, 0x23, 0x1d,
-  0x90, 0x43, 0xc3, 0x1a, 0x0b, 0xd0, 0x5a, 0x42, 0xe2, 0x50, 0x08, 0xe0,
-  0x21, 0x1a, 0x30, 0x1c, 0x00, 0xf0, 0x0a, 0xf8, 0x01, 0x30, 0xee, 0xd1,
-  0x0c, 0x23, 0x33, 0x60, 0x00, 0x20, 0x70, 0xbd, 0xe8, 0x0c, 0x00, 0x20,
-  0xe4, 0x0c, 0x00, 0x20, 0x38, 0xb5, 0x07, 0x4c, 0x00, 0x23, 0x05, 0x1c,
-  0x08, 0x1c, 0x23, 0x60, 0x00, 0xf0, 0x2a, 0xf8, 0x43, 0x1c, 0x03, 0xd1,
-  0x23, 0x68, 0x00, 0x2b, 0x00, 0xd0, 0x2b, 0x60, 0x38, 0xbd, 0xc0, 0x46,
-  0xf0, 0x0c, 0x00, 0x20, 0xc9, 0xb2, 0x03, 0x78, 0x00, 0x2b, 0x03, 0xd0,
-  0x8b, 0x42, 0x04, 0xd0, 0x01, 0x30, 0xf8, 0xe7, 0x00, 0x29, 0x00, 0xd0,
-  0x18, 0x1c, 0x70, 0x47, 0x30, 0xb5, 0x03, 0x1c, 0x00, 0x2a, 0x07, 0xd0,
-  0x0c, 0x78, 0x01, 0x33, 0x5d, 0x1e, 0x01, 0x3a, 0x2c, 0x70, 0x01, 0x31,
-  0x00, 0x2c, 0xf5, 0xd1, 0x9a, 0x18, 0x93, 0x42, 0x03, 0xd0, 0x00, 0x21,
-  0x19, 0x70, 0x01, 0x33, 0xf9, 0xe7, 0x30, 0xbd, 0x09, 0x4a, 0x13, 0x68,
-  0x00, 0x2b, 0x0c, 0xd0, 0x18, 0x18, 0x69, 0x46, 0x88, 0x42, 0x02, 0xd8,
-  0x10, 0x60, 0x18, 0x1c, 0x70, 0x47, 0x05, 0x4b, 0x0c, 0x22, 0x01, 0x20,
-  0x1a, 0x60, 0x40, 0x42, 0xf8, 0xe7, 0x03, 0x4b, 0x13, 0x60, 0xef, 0xe7,
-  0xec, 0x0c, 0x00, 0x20, 0xf0, 0x0c, 0x00, 0x20, 0xf4, 0x0c, 0x00, 0x20,
-  0xf8, 0xb5, 0xc0, 0x46, 0xf8, 0xbc, 0x08, 0xbc, 0x9e, 0x46, 0x70, 0x47,
-  0xf8, 0xb5, 0xc0, 0x46, 0xf8, 0xbc, 0x08, 0xbc, 0x9e, 0x46, 0x70, 0x47,
-  0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x2e, 0x42, 0x49, 0x4e, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x22, 0x00, 0x00,
-  0x2d, 0x22, 0x00, 0x00, 0x59, 0x23, 0x00, 0x00, 0x85, 0x22, 0x00, 0x00,
-  0x99, 0x22, 0x00, 0x00, 0x57, 0x22, 0x00, 0x00, 0x2f, 0x00, 0x7c, 0x3c,
-  0x3e, 0x5e, 0x2b, 0x3d, 0x3f, 0x2f, 0x5b, 0x5d, 0x3b, 0x2c, 0x2a, 0x22,
-  0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x09, 0x34, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-  0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-  0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x04, 0x00, 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x04, 0x01, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x12, 0x00, 0x00, 0x01, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x13, 0x00, 0x01, 0x01, 0x01, 0x01, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x05, 0x00, 0x05, 0x0a, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x05, 0x01, 0x05, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x14, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x15, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x11, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x13, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x03, 0x01, 0x03, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x11, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x06, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x07, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x18, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x19, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x12, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0d, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0e, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x09, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x91, 0x44, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00,
-  0x73, 0x44, 0x00, 0x00, 0x87, 0x44, 0x00, 0x00, 0x7d, 0x44, 0x00, 0x00,
-  0x69, 0x44, 0x00, 0x00, 0x49, 0x44, 0x00, 0x00, 0x6d, 0x45, 0x00, 0x00,
-  0x55, 0x44, 0x00, 0x00, 0x45, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xf9, 0x45, 0x00, 0x00, 0x25, 0x46, 0x00, 0x00,
-  0x0d, 0x46, 0x00, 0x00, 0x5d, 0x46, 0x00, 0x00, 0x41, 0x46, 0x00, 0x00,
-  0x19, 0x46, 0x00, 0x00, 0xf5, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-  0x40, 0x42, 0x0f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0xdc, 0x56, 0x00, 0x00, 0xfc, 0x56, 0x00, 0x00,
-  0x1c, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x56, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x20, 0xdd, 0x20, 0x00, 0x00, 0x05, 0x22, 0x00, 0x00,
-  0xe9, 0x26, 0x00, 0x00, 0xb1, 0x2b, 0x00, 0x00, 0x5d, 0x38, 0x00, 0x00,
-  0x8d, 0x3a, 0x00, 0x00, 0xf5, 0x3a, 0x00, 0x00, 0x81, 0x46, 0x00, 0x00,
-  0x25, 0x49, 0x00, 0x00, 0xb5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/libraries/SDU/src/boot/mkrzero.h b/libraries/SDU/src/boot/mkrzero.h
deleted file mode 100644
index cc4f4da03..000000000
--- a/libraries/SDU/src/boot/mkrzero.h
+++ /dev/null
@@ -1,1192 +0,0 @@
-  0x00, 0x80, 0x00, 0x20, 0x8d, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0xe1, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0xe5, 0x3a, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00,
-  0x75, 0x3b, 0x00, 0x00, 0x75, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0xb5, 0x06, 0x4c, 0x23, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x05, 0x4b,
-  0x00, 0x2b, 0x02, 0xd0, 0x04, 0x48, 0x00, 0xe0, 0x00, 0xbf, 0x01, 0x23,
-  0x23, 0x70, 0x10, 0xbd, 0xa0, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-  0x3c, 0x57, 0x00, 0x00, 0x08, 0xb5, 0x08, 0x4b, 0x00, 0x2b, 0x03, 0xd0,
-  0x07, 0x48, 0x08, 0x49, 0x00, 0xe0, 0x00, 0xbf, 0x07, 0x48, 0x03, 0x68,
-  0x00, 0x2b, 0x03, 0xd0, 0x06, 0x4b, 0x00, 0x2b, 0x00, 0xd0, 0x98, 0x47,
-  0x08, 0xbd, 0xc0, 0x46, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x57, 0x00, 0x00,
-  0xa4, 0x00, 0x00, 0x20, 0x9c, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-  0xf0, 0xb5, 0x33, 0x4c, 0xa5, 0x44, 0x01, 0xf0, 0x47, 0xfe, 0x02, 0xf0,
-  0x9b, 0xfc, 0x01, 0x20, 0x01, 0xf0, 0x6a, 0xfd, 0x2f, 0x4d, 0x1c, 0x21,
-  0x28, 0x1c, 0x00, 0xf0, 0xe3, 0xf9, 0x00, 0x28, 0x44, 0xd0, 0x2d, 0x4e,
-  0x28, 0x1c, 0x31, 0x1c, 0x00, 0xf0, 0xbc, 0xfa, 0x00, 0x28, 0x3d, 0xd0,
-  0x29, 0x1c, 0x01, 0xa8, 0x32, 0x1c, 0x01, 0x23, 0x00, 0xf0, 0x5e, 0xfa,
-  0x01, 0xa8, 0x00, 0xf0, 0xfc, 0xf8, 0x80, 0x21, 0x04, 0x1c, 0xc9, 0x01,
-  0x88, 0x42, 0x2d, 0xd9, 0x01, 0xa8, 0x00, 0xf0, 0xe2, 0xf8, 0x22, 0x4a,
-  0xc0, 0x21, 0xa7, 0x18, 0x21, 0x48, 0xc9, 0x01, 0x3a, 0x1c, 0x01, 0xf0,
-  0xf9, 0xfb, 0xc0, 0x24, 0xe4, 0x01, 0x80, 0x22, 0x0a, 0xa9, 0x92, 0x00,
-  0x01, 0xa8, 0x00, 0xf0, 0xcb, 0xf8, 0x80, 0x23, 0x21, 0x1c, 0x0a, 0xaa,
-  0x9b, 0x00, 0x19, 0x48, 0x01, 0xf0, 0x92, 0xfb, 0x80, 0x22, 0x92, 0x00,
-  0xa3, 0x18, 0x17, 0x4a, 0xa4, 0x18, 0xbc, 0x42, 0x01, 0xd2, 0x1c, 0x1c,
-  0xe9, 0xe7, 0x01, 0x24, 0x01, 0xa8, 0x00, 0xf0, 0xe9, 0xf8, 0x00, 0x2c,
-  0x06, 0xd0, 0x28, 0x1c, 0x31, 0x1c, 0x00, 0xf0, 0x8b, 0xfa, 0x01, 0xe0,
-  0x00, 0x24, 0xf3, 0xe7, 0xc0, 0x23, 0xdb, 0x01, 0x1b, 0x68, 0x83, 0xf3,
-  0x08, 0x88, 0x0c, 0x4b, 0xc0, 0x22, 0xd2, 0x01, 0x9a, 0x60, 0x0b, 0x4b,
-  0x1b, 0x68, 0x18, 0x47, 0x00, 0x20, 0x8b, 0x23, 0x9b, 0x00, 0x9d, 0x44,
-  0xf0, 0xbd, 0xc0, 0x46, 0xd4, 0xfd, 0xff, 0xff, 0xd4, 0x00, 0x00, 0x20,
-  0xf4, 0x4c, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xbc, 0x00, 0x00, 0x20,
-  0x00, 0xa2, 0xff, 0xff, 0x00, 0xed, 0x00, 0xe0, 0x04, 0x60, 0x00, 0x00,
-  0x08, 0xb5, 0x00, 0x21, 0x02, 0x48, 0x0a, 0x1c, 0x01, 0xf0, 0x3c, 0xfb,
-  0x08, 0xbd, 0xc0, 0x46, 0xbc, 0x00, 0x00, 0x20, 0x13, 0xb5, 0x02, 0x68,
-  0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33, 0x54, 0x68, 0x19, 0x1c, 0x01, 0x22,
-  0xa0, 0x47, 0x16, 0xbd, 0x38, 0xb5, 0x04, 0x1c, 0x00, 0x6a, 0x00, 0x25,
-  0xa8, 0x42, 0x02, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x0a, 0xe0, 0x45, 0x60,
-  0x92, 0xb2, 0x01, 0xf0, 0x0b, 0xf8, 0x23, 0x6a, 0x5b, 0x68, 0x00, 0x2b,
-  0x02, 0xd0, 0x01, 0x23, 0x63, 0x60, 0x28, 0x1c, 0x38, 0xbd, 0x00, 0x6a,
-  0x08, 0xb5, 0x00, 0x28, 0x01, 0xd0, 0x00, 0xf0, 0x49, 0xfe, 0x08, 0xbd,
-  0x13, 0xb5, 0x6c, 0x46, 0x07, 0x34, 0x21, 0x1c, 0x01, 0x22, 0x00, 0xf0,
-  0x65, 0xfd, 0x01, 0x28, 0x01, 0xd1, 0x20, 0x78, 0x00, 0xe0, 0x01, 0x48,
-  0x00, 0xb2, 0x16, 0xbd, 0xff, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x08, 0xb5,
-  0x00, 0x28, 0x02, 0xd0, 0xff, 0xf7, 0xea, 0xff, 0x01, 0xe0, 0x01, 0x20,
-  0x40, 0x42, 0x08, 0xbd, 0x38, 0xb5, 0x05, 0x1c, 0x00, 0x6a, 0x00, 0x28,
-  0x0a, 0xd0, 0xff, 0xf7, 0xdf, 0xff, 0x04, 0x1c, 0x63, 0x1c, 0x05, 0xd0,
-  0x28, 0x6a, 0x01, 0x69, 0x01, 0x39, 0x00, 0xf0, 0xed, 0xfd, 0x20, 0x1c,
-  0x38, 0xbd, 0x00, 0x00, 0xf8, 0xb5, 0xfa, 0x23, 0x9b, 0x00, 0x83, 0x60,
-  0x0d, 0x4b, 0x00, 0x25, 0x08, 0x33, 0x04, 0x1c, 0x45, 0x60, 0x03, 0x60,
-  0x28, 0x20, 0x0f, 0x1c, 0x16, 0x1c, 0x02, 0xf0, 0xe5, 0xfb, 0x20, 0x62,
-  0xa8, 0x42, 0x0a, 0xd0, 0x39, 0x1c, 0x28, 0x22, 0x02, 0xf0, 0x01, 0xfc,
-  0x20, 0x1c, 0x10, 0x30, 0x31, 0x1c, 0x0c, 0x22, 0x02, 0xf0, 0xc6, 0xfc,
-  0x25, 0x77, 0x20, 0x1c, 0xf8, 0xbd, 0xc0, 0x46, 0x00, 0x4d, 0x00, 0x00,
-  0xfa, 0x22, 0x92, 0x00, 0x82, 0x60, 0x04, 0x4a, 0x00, 0x23, 0x08, 0x32,
-  0x43, 0x60, 0x02, 0x60, 0x03, 0x62, 0x03, 0x74, 0x70, 0x47, 0xc0, 0x46,
-  0x00, 0x4d, 0x00, 0x00, 0x00, 0x6a, 0x08, 0xb5, 0x00, 0x28, 0x01, 0xd0,
-  0x00, 0xf0, 0x0a, 0xfd, 0x08, 0xbd, 0x00, 0x6a, 0x08, 0xb5, 0x00, 0x28,
-  0x04, 0xd0, 0x00, 0xf0, 0xad, 0xfd, 0x43, 0x1e, 0x98, 0x41, 0xc0, 0xb2,
-  0x08, 0xbd, 0x03, 0x6a, 0x00, 0x2b, 0x01, 0xd0, 0x18, 0x69, 0x01, 0xe0,
-  0x01, 0x20, 0x40, 0x42, 0x70, 0x47, 0x00, 0x6a, 0x00, 0x28, 0x00, 0xd0,
-  0xc0, 0x69, 0x70, 0x47, 0x38, 0xb5, 0x04, 0x1c, 0x00, 0x6a, 0x00, 0x28,
-  0x0b, 0xd0, 0x20, 0x1c, 0xff, 0xf7, 0xf3, 0xff, 0x05, 0x1c, 0x20, 0x1c,
-  0xff, 0xf7, 0xe7, 0xff, 0x02, 0x4b, 0x28, 0x1a, 0x98, 0x42, 0x00, 0xd9,
-  0x18, 0x1c, 0x38, 0xbd, 0xff, 0x7f, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c,
-  0x00, 0x6a, 0x00, 0x28, 0x06, 0xd0, 0x00, 0xf0, 0xef, 0xfd, 0x20, 0x6a,
-  0x02, 0xf0, 0x92, 0xfb, 0x00, 0x23, 0x23, 0x62, 0x10, 0xbd, 0x00, 0x00,
-  0x10, 0xb5, 0x0a, 0x1c, 0x0c, 0x49, 0x8a, 0xb0, 0x04, 0x1c, 0x00, 0x23,
-  0x00, 0x91, 0x69, 0x46, 0x4b, 0x72, 0x01, 0x93, 0x21, 0x1c, 0x68, 0x46,
-  0x01, 0x23, 0x00, 0xf0, 0x89, 0xfe, 0x04, 0x1c, 0x60, 0x1e, 0x84, 0x41,
-  0xe4, 0xb2, 0x00, 0x2c, 0x02, 0xd0, 0x68, 0x46, 0x00, 0xf0, 0xd0, 0xfd,
-  0x20, 0x1c, 0x0a, 0xb0, 0x10, 0xbd, 0xc0, 0x46, 0x40, 0x4d, 0x00, 0x00,
-  0x08, 0xb5, 0x01, 0x23, 0x00, 0x2a, 0x05, 0xd0, 0x00, 0xf0, 0x22, 0xff,
-  0x03, 0x1c, 0x58, 0x1e, 0x83, 0x41, 0xdb, 0xb2, 0x18, 0x1c, 0x08, 0xbd,
-  0x38, 0xb5, 0x01, 0x22, 0x05, 0x1c, 0x0c, 0x1c, 0x01, 0xf0, 0x9c, 0xf9,
-  0x02, 0x1c, 0x01, 0x20, 0x00, 0x2a, 0x03, 0xd1, 0x28, 0x1c, 0x21, 0x1c,
-  0x01, 0xf0, 0x94, 0xf9, 0x38, 0xbd, 0xf0, 0xb5, 0x0c, 0x68, 0x03, 0x5d,
-  0x2f, 0x3b, 0x5d, 0x42, 0x6b, 0x41, 0xe4, 0x18, 0x27, 0x1c, 0x0c, 0x37,
-  0x23, 0x1c, 0xc5, 0x5c, 0x1e, 0x1b, 0x2f, 0x2d, 0x09, 0xd0, 0x00, 0x2d,
-  0x07, 0xd0, 0x01, 0x33, 0x16, 0x1b, 0xf6, 0x18, 0x01, 0x3e, 0x35, 0x70,
-  0xbb, 0x42, 0xf2, 0xd1, 0x0c, 0x26, 0x00, 0x24, 0x94, 0x55, 0xc2, 0x5c,
-  0x2f, 0x3a, 0x54, 0x42, 0x62, 0x41, 0x9b, 0x18, 0x0b, 0x60, 0xc0, 0x5c,
-  0x43, 0x1e, 0x98, 0x41, 0xc0, 0xb2, 0xf0, 0xbd, 0xf0, 0xb5, 0xa1, 0xb0,
-  0x03, 0x90, 0x25, 0x48, 0x0d, 0x1c, 0x04, 0x92, 0x05, 0x93, 0x0c, 0xaa,
-  0x00, 0x23, 0x16, 0xa9, 0x0d, 0x93, 0x0c, 0x90, 0x53, 0x72, 0x17, 0x93,
-  0x16, 0x90, 0x4b, 0x72, 0x07, 0x93, 0x2c, 0x1c, 0x00, 0x92, 0x07, 0xa9,
-  0x08, 0xaa, 0x03, 0x98, 0xff, 0xf7, 0xc3, 0xff, 0x01, 0x26, 0x02, 0x1c,
-  0x72, 0x40, 0x01, 0x90, 0xd2, 0xb2, 0x20, 0x1c, 0x08, 0xa9, 0x05, 0x9b,
-  0x04, 0x9f, 0xb8, 0x47, 0x00, 0x28, 0x07, 0xd1, 0xac, 0x42, 0x01, 0xd1,
-  0x00, 0x20, 0x23, 0xe0, 0x20, 0x1c, 0x00, 0xf0, 0x5f, 0xfd, 0xf9, 0xe7,
-  0x01, 0x9f, 0x00, 0x2f, 0x11, 0xd0, 0x33, 0x1c, 0x00, 0x98, 0x21, 0x1c,
-  0x08, 0xaa, 0x00, 0xf0, 0x05, 0xfe, 0x06, 0x1c, 0xac, 0x42, 0x0f, 0xd0,
-  0x20, 0x1c, 0x00, 0xf0, 0x4f, 0xfd, 0x00, 0x2e, 0xe8, 0xd0, 0x23, 0x1c,
-  0x00, 0x9c, 0x00, 0x93, 0xd1, 0xe7, 0xac, 0x42, 0x02, 0xd0, 0x20, 0x1c,
-  0x00, 0xf0, 0x44, 0xfd, 0x30, 0x1c, 0x03, 0xe0, 0x00, 0x28, 0xdb, 0xd0,
-  0x16, 0xac, 0xf0, 0xe7, 0x21, 0xb0, 0xf0, 0xbd, 0x40, 0x4d, 0x00, 0x00,
-  0x38, 0xb5, 0x0a, 0x1c, 0x01, 0x21, 0x04, 0x1c, 0x00, 0xf0, 0xd6, 0xf9,
-  0x00, 0x28, 0x01, 0xd1, 0x00, 0x20, 0x0f, 0xe0, 0x25, 0x1c, 0x10, 0x35,
-  0x28, 0x1c, 0x21, 0x1c, 0xff, 0xf7, 0x6c, 0xff, 0x00, 0x28, 0xf5, 0xd0,
-  0x20, 0x1c, 0x38, 0x30, 0x29, 0x1c, 0x00, 0xf0, 0xe1, 0xfb, 0x43, 0x1e,
-  0x98, 0x41, 0xc0, 0xb2, 0x38, 0xbd, 0x00, 0x00, 0x4b, 0x68, 0x43, 0x60,
-  0x0a, 0x4b, 0x03, 0x60, 0x0b, 0x7a, 0x03, 0x72, 0x4b, 0x7a, 0x43, 0x72,
-  0xcb, 0x68, 0xc3, 0x60, 0x0b, 0x69, 0x03, 0x61, 0x4b, 0x69, 0x43, 0x61,
-  0x0b, 0x7e, 0x03, 0x76, 0xcb, 0x69, 0xc3, 0x61, 0x0b, 0x6a, 0x49, 0x6a,
-  0x03, 0x62, 0x41, 0x62, 0x70, 0x47, 0xc0, 0x46, 0x40, 0x4d, 0x00, 0x00,
-  0xf0, 0xb5, 0x9d, 0xb0, 0x05, 0x1c, 0x38, 0x31, 0x08, 0xa8, 0x02, 0x92,
-  0x03, 0x93, 0xff, 0xf7, 0xdd, 0xff, 0x24, 0x4a, 0x12, 0xaf, 0x00, 0x23,
-  0x02, 0x9c, 0x7b, 0x60, 0x12, 0x92, 0x7b, 0x72, 0x08, 0xae, 0x20, 0x1c,
-  0x2f, 0x21, 0x02, 0xf0, 0x6d, 0xfb, 0x00, 0x28, 0x2e, 0xd0, 0x23, 0x78,
-  0x2f, 0x2b, 0x01, 0xd1, 0x01, 0x34, 0xf4, 0xe7, 0x00, 0x1b, 0xc0, 0xb2,
-  0x03, 0x1c, 0x0c, 0x28, 0x00, 0xd9, 0x0c, 0x23, 0xdb, 0xb2, 0x1a, 0x1c,
-  0x21, 0x1c, 0x04, 0xa8, 0x01, 0x93, 0x02, 0xf0, 0x65, 0xfb, 0x01, 0x9a,
-  0x00, 0x23, 0x04, 0xa9, 0x38, 0x1c, 0x8b, 0x54, 0x00, 0xf0, 0xd4, 0xfc,
-  0x38, 0x1c, 0x31, 0x1c, 0x04, 0xaa, 0x01, 0x23, 0x00, 0xf0, 0x7e, 0xfd,
-  0x00, 0x28, 0x04, 0xd1, 0x0c, 0x4b, 0x68, 0x60, 0x2b, 0x60, 0x68, 0x72,
-  0x10, 0xe0, 0x01, 0x9b, 0x30, 0x1c, 0xe4, 0x18, 0x00, 0xf0, 0xc2, 0xfc,
-  0x33, 0x1c, 0x3e, 0x1c, 0x1f, 0x1c, 0xca, 0xe7, 0x02, 0x99, 0x03, 0x9a,
-  0x64, 0x1a, 0x14, 0x60, 0x28, 0x1c, 0x31, 0x1c, 0xff, 0xf7, 0x98, 0xff,
-  0x28, 0x1c, 0x1d, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0x40, 0x4d, 0x00, 0x00,
-  0xf0, 0xb5, 0xa3, 0xb0, 0x05, 0x1c, 0x1f, 0x1c, 0x04, 0xa8, 0x03, 0xab,
-  0x16, 0x1c, 0x01, 0x91, 0xff, 0xf7, 0xa2, 0xff, 0x03, 0x9b, 0xf6, 0x18,
-  0x33, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x04, 0xa9, 0x18, 0xa8, 0xff, 0xf7,
-  0x7f, 0xff, 0x28, 0x1c, 0x18, 0xa9, 0x1e, 0x4a, 0x34, 0xe0, 0x00, 0x23,
-  0x0e, 0xac, 0x63, 0x60, 0x63, 0x72, 0x6b, 0x46, 0x19, 0x33, 0x1b, 0x4a,
-  0x1b, 0x78, 0x0e, 0x92, 0x00, 0x2b, 0x03, 0xd1, 0x28, 0x1c, 0xff, 0xf7,
-  0x55, 0xfe, 0x27, 0xe0, 0x02, 0x3b, 0x01, 0x2b, 0x09, 0xd8, 0x01, 0x99,
-  0x20, 0x1c, 0x38, 0x31, 0x32, 0x1c, 0x3b, 0x1c, 0x00, 0xf0, 0x30, 0xfd,
-  0x00, 0x28, 0x0b, 0xd1, 0xee, 0xe7, 0x20, 0x1c, 0x04, 0xa9, 0x32, 0x1c,
-  0x3b, 0x1c, 0x00, 0xf0, 0x27, 0xfd, 0x00, 0x28, 0xe6, 0xd0, 0x04, 0xa8,
-  0x00, 0xf0, 0x72, 0xfc, 0x06, 0x23, 0x1f, 0x42, 0x03, 0xd0, 0x20, 0x1c,
-  0x15, 0x99, 0x00, 0xf0, 0xfd, 0xfb, 0x21, 0x1c, 0x18, 0xa8, 0xff, 0xf7,
-  0x49, 0xff, 0x28, 0x1c, 0x18, 0xa9, 0x32, 0x1c, 0xff, 0xf7, 0x0a, 0xfe,
-  0x28, 0x1c, 0x23, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0x20, 0x4d, 0x00, 0x00,
-  0x40, 0x4d, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x1c, 0x08, 0x1c, 0x19, 0x1c,
-  0x38, 0x31, 0x02, 0x4a, 0x00, 0x23, 0xff, 0xf7, 0xc7, 0xfe, 0x08, 0xbd,
-  0x9d, 0x23, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x1c, 0x08, 0x1c, 0x19, 0x1c,
-  0x38, 0x31, 0x02, 0x4a, 0x00, 0x23, 0xff, 0xf7, 0xbb, 0xfe, 0x08, 0xbd,
-  0xd9, 0x23, 0x00, 0x00, 0x08, 0x4b, 0x02, 0x21, 0x19, 0x61, 0x19, 0x1c,
-  0x00, 0x22, 0x30, 0x31, 0x0a, 0x70, 0x06, 0x49, 0x5a, 0x71, 0x9a, 0x71,
-  0x9a, 0x72, 0x1a, 0x73, 0xda, 0x63, 0x99, 0x63, 0x41, 0x33, 0x1a, 0x70,
-  0x70, 0x47, 0xc0, 0x46, 0xd4, 0x00, 0x00, 0x20, 0x40, 0x4d, 0x00, 0x00,
-  0x08, 0xb5, 0x01, 0x1c, 0x01, 0x48, 0x01, 0xf0, 0xb1, 0xf9, 0x08, 0xbd,
-  0x88, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x02, 0x48, 0xff, 0x21, 0x01, 0xf0,
-  0xa9, 0xf9, 0x08, 0xbd, 0x88, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x01, 0x21,
-  0x00, 0x79, 0x01, 0xf0, 0x3d, 0xfc, 0x05, 0x4b, 0x1a, 0x78, 0x00, 0x2a,
-  0x04, 0xd0, 0x00, 0x22, 0x03, 0x48, 0x1a, 0x70, 0x01, 0xf0, 0x86, 0xf9,
-  0x08, 0xbd, 0xc0, 0x46, 0x40, 0x01, 0x00, 0x20, 0x88, 0x07, 0x00, 0x20,
-  0x10, 0xb5, 0x08, 0x4b, 0x04, 0x1c, 0x1a, 0x78, 0x00, 0x2a, 0x06, 0xd1,
-  0x01, 0x22, 0x1a, 0x70, 0x05, 0x4b, 0x06, 0x48, 0x06, 0xcb, 0x01, 0xf0,
-  0x57, 0xf9, 0x20, 0x79, 0x00, 0x21, 0x01, 0xf0, 0x1d, 0xfc, 0x10, 0xbd,
-  0x40, 0x01, 0x00, 0x20, 0x38, 0x01, 0x00, 0x20, 0x88, 0x07, 0x00, 0x20,
-  0x10, 0xb5, 0x83, 0x79, 0x04, 0x1c, 0x00, 0x2b, 0x0d, 0xd0, 0x23, 0x89,
-  0x5a, 0x1c, 0x22, 0x81, 0x05, 0x4a, 0x93, 0x42, 0x02, 0xd8, 0xff, 0xf7,
-  0xbf, 0xff, 0xf6, 0xe7, 0x20, 0x1c, 0xff, 0xf7, 0xc3, 0xff, 0x00, 0x23,
-  0xa3, 0x71, 0x10, 0xbd, 0x01, 0x02, 0x00, 0x00, 0x00, 0xb5, 0x06, 0x29,
-  0x03, 0xd9, 0x16, 0x23, 0x43, 0x71, 0x00, 0x20, 0x1c, 0xe0, 0x0f, 0x4b,
-  0x05, 0x29, 0x13, 0xd8, 0x08, 0x1c, 0x00, 0x22, 0x02, 0xf0, 0xe8, 0xf8,
-  0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0b, 0x49, 0x08, 0xe0, 0x0b, 0x49,
-  0x06, 0xe0, 0x0b, 0x49, 0x04, 0xe0, 0x0b, 0x49, 0x02, 0xe0, 0x0b, 0x49,
-  0x00, 0xe0, 0x0b, 0x49, 0x19, 0x60, 0x02, 0xe0, 0x0a, 0x4a, 0x1a, 0x60,
-  0x00, 0x22, 0x1a, 0x71, 0x5a, 0x71, 0x01, 0x20, 0x00, 0xbd, 0xc0, 0x46,
-  0x38, 0x01, 0x00, 0x20, 0x00, 0x1b, 0xb7, 0x00, 0x00, 0x09, 0x3d, 0x00,
-  0x80, 0x84, 0x1e, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x20, 0xa1, 0x07, 0x00,
-  0x90, 0xd0, 0x03, 0x00, 0x48, 0xe8, 0x01, 0x00, 0x38, 0xb5, 0x0c, 0x1c,
-  0x01, 0xf0, 0xe2, 0xf9, 0x05, 0x1c, 0xff, 0xf7, 0x79, 0xff, 0xff, 0x28,
-  0x08, 0xd0, 0x01, 0xf0, 0xdb, 0xf9, 0xab, 0xb2, 0x80, 0xb2, 0xc0, 0x1a,
-  0xa0, 0x42, 0xf4, 0xdb, 0x00, 0x20, 0x00, 0xe0, 0x01, 0x20, 0x38, 0xbd,
-  0xf8, 0xb5, 0x04, 0x1c, 0x0e, 0x1c, 0x17, 0x1c, 0xff, 0xf7, 0x9a, 0xff,
-  0x20, 0x1c, 0xff, 0xf7, 0x7f, 0xff, 0x96, 0x21, 0x49, 0x00, 0x20, 0x1c,
-  0xff, 0xf7, 0xde, 0xff, 0x40, 0x20, 0x30, 0x43, 0xff, 0xf7, 0x52, 0xff,
-  0x18, 0x25, 0x38, 0x1c, 0xe8, 0x40, 0xc0, 0xb2, 0x08, 0x3d, 0xff, 0xf7,
-  0x4b, 0xff, 0x2b, 0x1c, 0x08, 0x33, 0xf6, 0xd1, 0x95, 0x20, 0x00, 0x2e,
-  0x03, 0xd0, 0x87, 0x20, 0x08, 0x2e, 0x00, 0xd0, 0xff, 0x20, 0xff, 0xf7,
-  0x3f, 0xff, 0x00, 0x25, 0xff, 0xf7, 0x44, 0xff, 0x43, 0xb2, 0xe0, 0x72,
-  0x00, 0x2b, 0x04, 0xda, 0xff, 0x2d, 0x02, 0xd0, 0x01, 0x35, 0xed, 0xb2,
-  0xf4, 0xe7, 0xf8, 0xbd, 0xf7, 0xb5, 0x00, 0x25, 0x02, 0x71, 0x05, 0x73,
-  0x85, 0x72, 0x85, 0x71, 0x45, 0x71, 0x04, 0x1c, 0x01, 0x91, 0x01, 0xf0,
-  0x95, 0xf9, 0x01, 0x21, 0x87, 0xb2, 0x20, 0x79, 0x01, 0xf0, 0x14, 0xfb,
-  0x01, 0x21, 0x20, 0x79, 0x01, 0xf0, 0x70, 0xfb, 0x43, 0x4e, 0x30, 0x1c,
-  0x01, 0xf0, 0x7a, 0xf8, 0x42, 0x4b, 0x43, 0x49, 0x1d, 0x71, 0x5d, 0x71,
-  0x19, 0x60, 0x30, 0x1c, 0x5a, 0x68, 0x01, 0xf0, 0x99, 0xf8, 0x0a, 0x25,
-  0x01, 0x3d, 0xff, 0x20, 0xed, 0xb2, 0xff, 0xf7, 0x0b, 0xff, 0x00, 0x2d,
-  0xf8, 0xd1, 0x30, 0x1c, 0x01, 0xf0, 0xaa, 0xf8, 0x20, 0x1c, 0xff, 0xf7,
-  0x27, 0xff, 0x00, 0x21, 0x20, 0x1c, 0x0a, 0x1c, 0xff, 0xf7, 0x9a, 0xff,
-  0x06, 0x1c, 0xe0, 0x72, 0x01, 0x28, 0x09, 0xd0, 0x01, 0xf0, 0x66, 0xf9,
-  0xc0, 0x1b, 0xfa, 0x23, 0x80, 0xb2, 0xdb, 0x00, 0x98, 0x42, 0xee, 0xd9,
-  0x01, 0x23, 0x3c, 0xe0, 0xd5, 0x22, 0x20, 0x1c, 0x08, 0x21, 0x52, 0x00,
-  0xff, 0xf7, 0x86, 0xff, 0x04, 0x23, 0x18, 0x42, 0x01, 0xd0, 0x26, 0x73,
-  0x0b, 0xe0, 0x1e, 0x1c, 0xff, 0xf7, 0xea, 0xfe, 0x01, 0x3e, 0xf6, 0xb2,
-  0xe0, 0x72, 0x00, 0x2e, 0xf8, 0xd1, 0x02, 0x23, 0xaa, 0x28, 0x26, 0xd1,
-  0x23, 0x73, 0x26, 0x7b, 0x02, 0x3e, 0x73, 0x42, 0x5e, 0x41, 0xb6, 0x07,
-  0x37, 0x21, 0x00, 0x22, 0x20, 0x1c, 0xff, 0xf7, 0x6b, 0xff, 0x32, 0x1c,
-  0x20, 0x1c, 0x29, 0x21, 0xff, 0xf7, 0x66, 0xff, 0x02, 0x1c, 0xe0, 0x72,
-  0x09, 0xd0, 0x01, 0xf0, 0x33, 0xf9, 0xc0, 0x1b, 0xfa, 0x23, 0x80, 0xb2,
-  0xdb, 0x00, 0x98, 0x42, 0xea, 0xd9, 0x08, 0x23, 0x09, 0xe0, 0x23, 0x7b,
-  0x02, 0x2b, 0x19, 0xd1, 0x20, 0x1c, 0x3a, 0x21, 0xff, 0xf7, 0x52, 0xff,
-  0x00, 0x28, 0x05, 0xd0, 0x06, 0x23, 0x63, 0x71, 0x20, 0x1c, 0xff, 0xf7,
-  0xbf, 0xfe, 0x15, 0xe0, 0xff, 0xf7, 0xb4, 0xfe, 0xc0, 0x23, 0x18, 0x40,
-  0x98, 0x42, 0x01, 0xd1, 0x03, 0x23, 0x23, 0x73, 0xff, 0xf7, 0xac, 0xfe,
-  0xff, 0xf7, 0xaa, 0xfe, 0xff, 0xf7, 0xa8, 0xfe, 0x20, 0x1c, 0xff, 0xf7,
-  0xad, 0xfe, 0x20, 0x1c, 0x01, 0x99, 0xff, 0xf7, 0xeb, 0xfe, 0x05, 0x1c,
-  0x28, 0x1c, 0xfe, 0xbd, 0x88, 0x07, 0x00, 0x20, 0x38, 0x01, 0x00, 0x20,
-  0x90, 0xd0, 0x03, 0x00, 0x38, 0xb5, 0x04, 0x1c, 0x01, 0xf0, 0xfa, 0xf8,
-  0x05, 0x1c, 0xff, 0xf7, 0x91, 0xfe, 0xe0, 0x72, 0xff, 0x28, 0x0a, 0xd1,
-  0x01, 0xf0, 0xf2, 0xf8, 0xab, 0xb2, 0x80, 0xb2, 0xc0, 0x1a, 0x96, 0x23,
-  0x5b, 0x00, 0x98, 0x42, 0xf1, 0xdd, 0x0f, 0x23, 0x02, 0xe0, 0xfe, 0x28,
-  0x06, 0xd0, 0x0d, 0x23, 0x20, 0x1c, 0x63, 0x71, 0xff, 0xf7, 0x84, 0xfe,
-  0x00, 0x20, 0x00, 0xe0, 0x01, 0x20, 0x38, 0xbd, 0xf8, 0xb5, 0x04, 0x1c,
-  0x0f, 0x1c, 0x15, 0x1c, 0x1e, 0x1e, 0x45, 0xd0, 0x9a, 0x18, 0x80, 0x23,
-  0x9b, 0x00, 0x9a, 0x42, 0x42, 0xdc, 0x83, 0x79, 0x00, 0x2b, 0x05, 0xd0,
-  0x02, 0x68, 0x91, 0x42, 0x02, 0xd1, 0x03, 0x89, 0xab, 0x42, 0x16, 0xd9,
-  0x23, 0x7b, 0x27, 0x60, 0x03, 0x2b, 0x00, 0xd0, 0x7f, 0x02, 0x3a, 0x1c,
-  0x20, 0x1c, 0x11, 0x21, 0xff, 0xf7, 0xee, 0xfe, 0x07, 0x1e, 0x02, 0xd0,
-  0x03, 0x23, 0x63, 0x71, 0x2a, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0xba, 0xff,
-  0x00, 0x28, 0x25, 0xd0, 0x01, 0x23, 0x27, 0x81, 0xa3, 0x71, 0x23, 0x89,
-  0xab, 0x42, 0x05, 0xd2, 0xff, 0xf7, 0x48, 0xfe, 0x23, 0x89, 0x01, 0x33,
-  0x23, 0x81, 0xf6, 0xe7, 0x06, 0x9d, 0x06, 0x9a, 0xab, 0x1a, 0x9b, 0xb2,
-  0xb3, 0x42, 0x04, 0xd2, 0xff, 0xf7, 0x3c, 0xfe, 0x28, 0x70, 0x01, 0x35,
-  0xf5, 0xe7, 0x23, 0x89, 0xa2, 0x7a, 0xf3, 0x18, 0x9b, 0xb2, 0x23, 0x81,
-  0x00, 0x2a, 0x02, 0xd0, 0x06, 0x4a, 0x93, 0x42, 0x02, 0xd9, 0x20, 0x1c,
-  0xff, 0xf7, 0x60, 0xfe, 0x01, 0x20, 0x03, 0xe0, 0x20, 0x1c, 0xff, 0xf7,
-  0x2f, 0xfe, 0x00, 0x20, 0xf8, 0xbd, 0xc0, 0x46, 0xff, 0x01, 0x00, 0x00,
-  0x07, 0xb5, 0x80, 0x23, 0x00, 0x92, 0x9b, 0x00, 0x00, 0x22, 0xff, 0xf7,
-  0xa3, 0xff, 0x0e, 0xbd, 0x70, 0xb5, 0x05, 0x1c, 0x08, 0x1c, 0x16, 0x1c,
-  0xff, 0xf7, 0x0c, 0xfe, 0x00, 0x24, 0x30, 0x5d, 0xff, 0xf7, 0x08, 0xfe,
-  0x01, 0x34, 0x80, 0x23, 0x9b, 0x00, 0x9c, 0x42, 0xf7, 0xd1, 0xff, 0x20,
-  0xff, 0xf7, 0x00, 0xfe, 0xff, 0x20, 0xff, 0xf7, 0xfd, 0xfd, 0xff, 0xf7,
-  0x03, 0xfe, 0x1f, 0x23, 0xe8, 0x72, 0x03, 0x40, 0x01, 0x20, 0x05, 0x2b,
-  0x05, 0xd0, 0x11, 0x23, 0x28, 0x1c, 0x6b, 0x71, 0xff, 0xf7, 0x00, 0xfe,
-  0x00, 0x20, 0x70, 0xbd, 0x70, 0xb5, 0x0b, 0x1c, 0x04, 0x1c, 0x16, 0x1c,
-  0x00, 0x29, 0x01, 0xd1, 0x12, 0x23, 0x28, 0xe0, 0x02, 0x7b, 0x03, 0x2a,
-  0x00, 0xd0, 0x4b, 0x02, 0x20, 0x1c, 0x18, 0x21, 0x1a, 0x1c, 0xff, 0xf7,
-  0x79, 0xfe, 0x05, 0x1e, 0x01, 0xd0, 0x04, 0x23, 0x1b, 0xe0, 0x20, 0x1c,
-  0xfe, 0x21, 0x32, 0x1c, 0xff, 0xf7, 0xc2, 0xff, 0x00, 0x28, 0x15, 0xd0,
-  0x96, 0x21, 0x20, 0x1c, 0x89, 0x00, 0xff, 0xf7, 0x55, 0xfe, 0x00, 0x28,
-  0x01, 0xd1, 0x15, 0x23, 0x0b, 0xe0, 0x20, 0x1c, 0x0d, 0x21, 0x2a, 0x1c,
-  0xff, 0xf7, 0x60, 0xfe, 0x00, 0x28, 0x03, 0xd1, 0xff, 0xf7, 0xc8, 0xfd,
-  0x00, 0x28, 0x06, 0xd0, 0x14, 0x23, 0x63, 0x71, 0x20, 0x1c, 0xff, 0xf7,
-  0xc9, 0xfd, 0x00, 0x20, 0x03, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0xc4, 0xfd,
-  0x01, 0x20, 0x70, 0xbd, 0x03, 0x4b, 0x04, 0x4a, 0x1a, 0x60, 0x00, 0x22,
-  0x5a, 0x71, 0x1a, 0x71, 0x70, 0x47, 0xc0, 0x46, 0x38, 0x01, 0x00, 0x20,
-  0x00, 0x09, 0x3d, 0x00, 0x02, 0x1c, 0x10, 0xb5, 0x0c, 0x32, 0x04, 0x1c,
-  0x01, 0x21, 0x40, 0x6a, 0x00, 0xf0, 0x24, 0xfd, 0x00, 0x28, 0x0a, 0xd0,
-  0x23, 0x6a, 0x01, 0x20, 0x00, 0x2b, 0x06, 0xd1, 0xe3, 0x68, 0x22, 0x7a,
-  0x23, 0x62, 0x80, 0x23, 0x5b, 0x42, 0x13, 0x43, 0x23, 0x72, 0x10, 0xbd,
-  0x70, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xe6, 0xff, 0x00, 0x28, 0x01, 0xd1,
-  0x00, 0x20, 0x1b, 0xe0, 0x63, 0x6a, 0xe6, 0x68, 0x1a, 0x7c, 0x02, 0x3e,
-  0x96, 0x40, 0x5a, 0x69, 0x1d, 0x79, 0xb6, 0x18, 0x00, 0x2d, 0x08, 0xd0,
-  0x70, 0x1e, 0x40, 0x19, 0x00, 0xf0, 0x4c, 0xfc, 0x00, 0x28, 0xed, 0xd0,
-  0x01, 0x3d, 0xed, 0xb2, 0xf4, 0xe7, 0x63, 0x6a, 0x01, 0x20, 0x1a, 0x7c,
-  0x80, 0x23, 0x9b, 0x00, 0x93, 0x40, 0xe2, 0x69, 0xd3, 0x18, 0xe3, 0x61,
-  0x70, 0xbd, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c, 0x40, 0x69, 0x00, 0xf0,
-  0x13, 0xfc, 0x00, 0x28, 0x03, 0xd0, 0x20, 0x7e, 0x01, 0x4b, 0x40, 0x01,
-  0xc0, 0x18, 0x10, 0xbd, 0x50, 0x01, 0x00, 0x20, 0xf0, 0xb5, 0x00, 0x23,
-  0x87, 0xb0, 0x07, 0x1c, 0x0e, 0x1c, 0x20, 0x22, 0xf2, 0x54, 0x01, 0x33,
-  0x0b, 0x2b, 0xfa, 0xd1, 0x07, 0x21, 0x00, 0x25, 0x01, 0x91, 0x3c, 0x78,
-  0x00, 0x2c, 0x2a, 0xd0, 0x2e, 0x2c, 0x06, 0xd1, 0x01, 0x9b, 0x0a, 0x2b,
-  0x2b, 0xd0, 0x0a, 0x21, 0x08, 0x25, 0x01, 0x91, 0x1f, 0xe0, 0x02, 0xa8,
-  0x14, 0x49, 0x10, 0x22, 0x01, 0xf0, 0x29, 0xff, 0x00, 0x23, 0x02, 0xa9,
-  0xca, 0x5c, 0x00, 0x2a, 0x03, 0xd0, 0x01, 0x33, 0xa2, 0x42, 0xf8, 0xd1,
-  0x19, 0xe0, 0x01, 0x9b, 0x9d, 0x42, 0x16, 0xd8, 0x23, 0x1c, 0x21, 0x3b,
-  0x5d, 0x2b, 0x12, 0xd8, 0x22, 0x1c, 0x6b, 0x1c, 0x61, 0x3a, 0xdb, 0xb2,
-  0x75, 0x19, 0x19, 0x2a, 0x01, 0xd8, 0x20, 0x3c, 0xe4, 0xb2, 0x2c, 0x70,
-  0x1d, 0x1c, 0x01, 0x37, 0xd1, 0xe7, 0x30, 0x78, 0x20, 0x38, 0x43, 0x1e,
-  0x98, 0x41, 0xc0, 0xb2, 0x00, 0xe0, 0x00, 0x20, 0x07, 0xb0, 0xf0, 0xbd,
-  0x22, 0x4d, 0x00, 0x00, 0x38, 0xb5, 0x42, 0x7a, 0x04, 0x1c, 0x0d, 0x1c,
-  0x00, 0x2a, 0x01, 0xd0, 0x00, 0x20, 0x1f, 0xe0, 0x4b, 0x1c, 0xdb, 0x7f,
-  0x10, 0x2b, 0x06, 0xd1, 0x02, 0x23, 0x43, 0x72, 0x02, 0x62, 0x4b, 0x8c,
-  0x5b, 0x01, 0xc3, 0x61, 0x0c, 0xe0, 0x20, 0x2b, 0xf0, 0xd1, 0x03, 0x23,
-  0x43, 0x72, 0x49, 0x6a, 0x22, 0x1c, 0x01, 0x62, 0x1c, 0x32, 0x28, 0x1c,
-  0x00, 0xf0, 0x18, 0xfc, 0x00, 0x28, 0xe5, 0xd0, 0x00, 0x23, 0x01, 0x20,
-  0x65, 0x62, 0x20, 0x72, 0xe3, 0x60, 0x23, 0x61, 0x63, 0x61, 0x23, 0x76,
-  0x38, 0xbd, 0x00, 0x00, 0xf0, 0xb5, 0x43, 0x7a, 0x85, 0xb0, 0x04, 0x1c,
-  0x0e, 0x1c, 0x03, 0x92, 0x00, 0x2b, 0x01, 0xd1, 0x3a, 0x48, 0x11, 0xe0,
-  0x03, 0x7a, 0xd8, 0x07, 0xfa, 0xd5, 0xe2, 0x69, 0x20, 0x69, 0x03, 0x99,
-  0x13, 0x1a, 0x99, 0x42, 0x01, 0xd9, 0x9b, 0xb2, 0x03, 0x93, 0x03, 0x99,
-  0x02, 0x91, 0x02, 0x9b, 0x00, 0x2b, 0x04, 0xd1, 0x03, 0x99, 0x88, 0xb2,
-  0x00, 0xb2, 0x05, 0xb0, 0xf0, 0xbd, 0x23, 0x69, 0x61, 0x7a, 0xdf, 0x05,
-  0xff, 0x0d, 0x5a, 0x0a, 0x60, 0x6a, 0x02, 0x29, 0x02, 0xd1, 0x41, 0x6a,
-  0x51, 0x18, 0x1b, 0xe0, 0x05, 0x79, 0x01, 0x3d, 0x2a, 0x40, 0xd5, 0xb2,
-  0x00, 0x2f, 0x0d, 0xd1, 0x00, 0x2d, 0x0b, 0xd1, 0x00, 0x2b, 0x02, 0xd1,
-  0x22, 0x6a, 0xe2, 0x60, 0x06, 0xe0, 0x22, 0x1c, 0xe1, 0x68, 0x0c, 0x32,
-  0x00, 0xf0, 0xa0, 0xfb, 0x00, 0x28, 0xc9, 0xd0, 0x63, 0x6a, 0xe1, 0x68,
-  0x1a, 0x7c, 0x02, 0x39, 0x5b, 0x69, 0x91, 0x40, 0xc9, 0x18, 0x49, 0x19,
-  0x80, 0x22, 0x02, 0x9d, 0x92, 0x00, 0xd3, 0x1b, 0x9d, 0x42, 0x00, 0xdd,
-  0x9d, 0xb2, 0x23, 0x7a, 0x58, 0x06, 0x01, 0xd4, 0x95, 0x42, 0x18, 0xd1,
-  0x16, 0x4b, 0x1b, 0x68, 0x99, 0x42, 0x14, 0xd0, 0x15, 0x4b, 0x3a, 0x1c,
-  0x18, 0x68, 0x00, 0x96, 0x2b, 0x1c, 0xff, 0xf7, 0x1f, 0xfe, 0x00, 0x28,
-  0xa8, 0xd0, 0x76, 0x19, 0x01, 0xe0, 0xdf, 0x1b, 0xf6, 0x19, 0x21, 0x69,
-  0x02, 0x9a, 0x4b, 0x19, 0x55, 0x1b, 0xad, 0xb2, 0x23, 0x61, 0x02, 0x95,
-  0xab, 0xe7, 0x08, 0x1c, 0x00, 0x21, 0x00, 0xf0, 0x2b, 0xfb, 0x00, 0x28,
-  0x96, 0xd0, 0x09, 0x4b, 0x32, 0x1c, 0xff, 0x18, 0x79, 0x19, 0x3b, 0x1c,
-  0x8b, 0x42, 0xe8, 0xd0, 0x18, 0x78, 0x01, 0x33, 0x10, 0x70, 0x01, 0x32,
-  0xf8, 0xe7, 0xc0, 0x46, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x73, 0xb5, 0x43, 0x7a,
-  0x04, 0x1c, 0x01, 0x2b, 0x01, 0xd8, 0x00, 0x20, 0x16, 0xe0, 0x03, 0x69,
-  0x6d, 0x46, 0x07, 0x35, 0xde, 0x05, 0x29, 0x1c, 0x01, 0x22, 0x36, 0x0f,
-  0xff, 0xf7, 0x6a, 0xff, 0x01, 0x28, 0x01, 0xd1, 0x2b, 0x78, 0x00, 0xe0,
-  0x05, 0x4b, 0x1b, 0xb2, 0x01, 0x33, 0xec, 0xd0, 0x23, 0x69, 0x70, 0x01,
-  0x1f, 0x33, 0x23, 0x61, 0x02, 0x4b, 0xc0, 0x18, 0x76, 0xbd, 0xc0, 0x46,
-  0xff, 0xff, 0x00, 0x00, 0x50, 0x01, 0x00, 0x20, 0x70, 0xb5, 0x04, 0x1c,
-  0x40, 0x7a, 0x0d, 0x1c, 0x00, 0x28, 0x2a, 0xd0, 0xe2, 0x69, 0x91, 0x42,
-  0x01, 0xd9, 0x00, 0x20, 0x25, 0xe0, 0x02, 0x28, 0x21, 0xd0, 0x00, 0x2d,
-  0x01, 0xd1, 0xe5, 0x60, 0x1d, 0xe0, 0x62, 0x6a, 0x21, 0x69, 0x13, 0x7c,
-  0x68, 0x1e, 0x09, 0x33, 0x4a, 0x1e, 0xd8, 0x40, 0xda, 0x40, 0x03, 0x1e,
-  0x93, 0x42, 0x01, 0xd3, 0x00, 0x29, 0x02, 0xd1, 0x22, 0x6a, 0xe2, 0x60,
-  0x00, 0xe0, 0x83, 0x1a, 0x1e, 0x1c, 0x00, 0x2e, 0x09, 0xd0, 0x22, 0x1c,
-  0x60, 0x6a, 0xe1, 0x68, 0x0c, 0x32, 0x00, 0xf0, 0x07, 0xfb, 0x01, 0x3e,
-  0x00, 0x28, 0xf4, 0xd1, 0x01, 0xe0, 0x25, 0x61, 0x01, 0x20, 0x70, 0xbd,
-  0x38, 0xb5, 0x05, 0x1c, 0x40, 0x7a, 0x00, 0x28, 0x33, 0xd0, 0x2b, 0x7a,
-  0x7f, 0x2b, 0x2d, 0xd9, 0x28, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x9a, 0xfe,
-  0x04, 0x1e, 0x2a, 0xd0, 0x6b, 0x7a, 0x01, 0x2b, 0x07, 0xd8, 0x2b, 0x7f,
-  0x03, 0x77, 0x6b, 0x7f, 0x43, 0x77, 0xab, 0x7f, 0x83, 0x77, 0xeb, 0x7f,
-  0xc3, 0x77, 0x2b, 0x6a, 0x9a, 0xb2, 0x1b, 0x0c, 0x23, 0x75, 0x1b, 0x0a,
-  0x63, 0x75, 0x0d, 0x4b, 0xa2, 0x76, 0x1b, 0x68, 0x12, 0x0a, 0xe2, 0x76,
-  0x00, 0x2b, 0x0b, 0xd0, 0x20, 0x1c, 0x21, 0x1c, 0x18, 0x30, 0x16, 0x31,
-  0x98, 0x47, 0x63, 0x7e, 0x22, 0x7e, 0x1b, 0x02, 0x13, 0x43, 0xa3, 0x74,
-  0x1b, 0x0a, 0xe3, 0x74, 0x2a, 0x7a, 0x7f, 0x23, 0x13, 0x40, 0x2b, 0x72,
-  0x00, 0xf0, 0x5c, 0xfa, 0xff, 0xe7, 0x38, 0xbd, 0x44, 0x01, 0x00, 0x20,
-  0x10, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xc0, 0xff, 0x00, 0x28, 0x02, 0xd0,
-  0x00, 0x23, 0x63, 0x72, 0x01, 0x20, 0x10, 0xbd, 0x73, 0xb5, 0x42, 0x7a,
-  0x04, 0x1c, 0x0d, 0x1c, 0x00, 0x20, 0x01, 0x2a, 0x4b, 0xd1, 0x20, 0x7a,
-  0x02, 0x23, 0x18, 0x40, 0x47, 0xd0, 0xe3, 0x69, 0x00, 0x20, 0x99, 0x42,
-  0x43, 0xd8, 0x10, 0x1c, 0x00, 0x2b, 0x40, 0xd0, 0x20, 0x1c, 0x29, 0x1c,
-  0x26, 0x69, 0xff, 0xf7, 0x71, 0xff, 0x00, 0x28, 0x25, 0xd0, 0x60, 0x6a,
-  0x00, 0x2d, 0x06, 0xd1, 0x21, 0x6a, 0x00, 0xf0, 0x95, 0xfb, 0x00, 0x28,
-  0x1d, 0xd0, 0x25, 0x62, 0x1d, 0xe0, 0xe1, 0x68, 0x01, 0xaa, 0x00, 0xf0,
-  0x93, 0xfa, 0x00, 0x28, 0x15, 0xd0, 0x60, 0x6a, 0x01, 0x99, 0x43, 0x1c,
-  0xdb, 0x7f, 0x10, 0x2b, 0x01, 0xd1, 0x12, 0x4b, 0x00, 0xe0, 0x12, 0x4b,
-  0x99, 0x42, 0x0c, 0xd2, 0x00, 0xf0, 0x7e, 0xfb, 0x00, 0x28, 0x06, 0xd0,
-  0x60, 0x6a, 0xe1, 0x68, 0x0e, 0x4a, 0x00, 0xf0, 0xcf, 0xfa, 0x00, 0x28,
-  0x01, 0xd1, 0x00, 0x20, 0x11, 0xe0, 0x22, 0x7a, 0x80, 0x23, 0x5b, 0x42,
-  0x13, 0x43, 0xe5, 0x61, 0x23, 0x72, 0x20, 0x1c, 0xff, 0xf7, 0x70, 0xff,
-  0x00, 0x28, 0xf2, 0xd0, 0x29, 0x1e, 0xb1, 0x42, 0x00, 0xd9, 0x31, 0x1c,
-  0x20, 0x1c, 0xff, 0xf7, 0x35, 0xff, 0x76, 0xbd, 0xf8, 0xff, 0x00, 0x00,
-  0xf8, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0x38, 0xb5, 0x23, 0x4b,
-  0x15, 0x1c, 0x4a, 0x01, 0xd3, 0x18, 0x04, 0x1c, 0xd8, 0x7a, 0x11, 0x22,
-  0x10, 0x42, 0x04, 0xd0, 0x42, 0x22, 0x15, 0x42, 0x01, 0xd0, 0x00, 0x20,
-  0x36, 0xe0, 0x1d, 0x4a, 0x21, 0x76, 0x12, 0x68, 0x62, 0x61, 0x5a, 0x7d,
-  0x18, 0x7d, 0xd9, 0x7e, 0x12, 0x02, 0x02, 0x43, 0x98, 0x7e, 0x09, 0x02,
-  0x12, 0x04, 0x01, 0x43, 0x11, 0x43, 0x21, 0x62, 0xd8, 0x7a, 0x18, 0x22,
-  0x02, 0x40, 0x0c, 0xd1, 0x5a, 0x7f, 0x19, 0x7f, 0x12, 0x02, 0x0a, 0x43,
-  0x99, 0x7f, 0xdb, 0x7f, 0x09, 0x04, 0x0a, 0x43, 0x1b, 0x06, 0x13, 0x43,
-  0xe3, 0x61, 0x01, 0x23, 0x09, 0xe0, 0x10, 0x2a, 0xdb, 0xd1, 0x22, 0x1c,
-  0x60, 0x6a, 0x1c, 0x32, 0x00, 0xf0, 0x5a, 0xfa, 0x00, 0x28, 0xd4, 0xd0,
-  0x04, 0x23, 0x63, 0x72, 0x0f, 0x23, 0x00, 0x21, 0x2b, 0x40, 0x23, 0x72,
-  0xe1, 0x60, 0x21, 0x61, 0x01, 0x20, 0x6a, 0x06, 0x02, 0xd5, 0x20, 0x1c,
-  0xff, 0xf7, 0x60, 0xff, 0x38, 0xbd, 0xc0, 0x46, 0x50, 0x01, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x20, 0xf0, 0xb5, 0x45, 0x7a, 0x87, 0xb0, 0x04, 0x1c,
-  0x0e, 0x1c, 0x01, 0x93, 0x00, 0x2d, 0x00, 0xd0, 0x86, 0xe0, 0x10, 0x1c,
-  0x03, 0xa9, 0xff, 0xf7, 0xbb, 0xfd, 0x00, 0x28, 0x00, 0xd1, 0x80, 0xe0,
-  0x72, 0x6a, 0x2f, 0x1c, 0x62, 0x62, 0xf5, 0x60, 0x35, 0x61, 0x33, 0x69,
-  0xf2, 0x69, 0x93, 0x42, 0x26, 0xd2, 0xdb, 0x05, 0x1b, 0x0f, 0x30, 0x1c,
-  0x00, 0x93, 0xff, 0xf7, 0x9f, 0xfe, 0x01, 0x1e, 0x6f, 0xd0, 0x03, 0x78,
-  0x00, 0x2b, 0x01, 0xd0, 0xe5, 0x2b, 0x0b, 0xd1, 0x00, 0x2f, 0x04, 0xd1,
-  0x00, 0x9b, 0x23, 0x76, 0x34, 0x4b, 0x1b, 0x68, 0x63, 0x61, 0x0b, 0x78,
-  0x01, 0x27, 0x00, 0x2b, 0xe3, 0xd1, 0x0d, 0xe0, 0x03, 0xa8, 0x0b, 0x22,
-  0x01, 0xf0, 0xca, 0xfc, 0x00, 0x28, 0xdc, 0xd1, 0x01, 0x9a, 0x30, 0x23,
-  0x13, 0x40, 0x30, 0x2b, 0x53, 0xd0, 0x20, 0x1c, 0x00, 0x99, 0x4b, 0xe0,
-  0x01, 0x9a, 0x12, 0x23, 0x13, 0x40, 0x12, 0x2b, 0x4b, 0xd1, 0x00, 0x2f,
-  0x06, 0xd0, 0x20, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x6f, 0xfd, 0x06, 0x1e,
-  0x0a, 0xd1, 0x42, 0xe0, 0x73, 0x7a, 0x02, 0x2b, 0x3f, 0xd0, 0x30, 0x1c,
-  0xff, 0xf7, 0x40, 0xfd, 0x00, 0x28, 0x3a, 0xd0, 0x1f, 0x4e, 0x27, 0x76,
-  0x00, 0x21, 0x20, 0x22, 0x30, 0x1c, 0x01, 0xf0, 0xbb, 0xfc, 0x30, 0x1c,
-  0x03, 0xa9, 0x0b, 0x22, 0x01, 0xf0, 0xad, 0xfc, 0x1a, 0x4b, 0x1b, 0x68,
-  0x00, 0x2b, 0x05, 0xd0, 0x30, 0x1c, 0x31, 0x1c, 0x10, 0x30, 0x0e, 0x31,
-  0x98, 0x47, 0x06, 0xe0, 0x21, 0x22, 0x32, 0x74, 0xb3, 0x73, 0x28, 0x22,
-  0x08, 0x23, 0x72, 0x74, 0xf3, 0x73, 0x73, 0x7c, 0x32, 0x7c, 0x1b, 0x02,
-  0x13, 0x43, 0xff, 0x22, 0x1a, 0x40, 0x1b, 0x0a, 0xf3, 0x74, 0x73, 0x76,
-  0xf3, 0x7b, 0xb2, 0x74, 0x32, 0x76, 0xb2, 0x7b, 0x1b, 0x02, 0x13, 0x43,
-  0xb3, 0x75, 0x1b, 0x0a, 0xf3, 0x75, 0x00, 0xf0, 0x21, 0xf9, 0x00, 0x28,
-  0x07, 0xd0, 0x21, 0x7e, 0x01, 0x9a, 0x20, 0x1c, 0xff, 0xf7, 0x26, 0xff,
-  0x05, 0x1c, 0x00, 0xe0, 0x00, 0x25, 0x28, 0x1c, 0x07, 0xb0, 0xf0, 0xbd,
-  0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x44, 0x01, 0x00, 0x20,
-  0x10, 0xb5, 0x00, 0x21, 0x04, 0x1c, 0xff, 0xf7, 0xbb, 0xfe, 0x00, 0x28,
-  0x0b, 0xd0, 0x20, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x15, 0xfd, 0x00, 0x28,
-  0x05, 0xd0, 0xe5, 0x23, 0x03, 0x70, 0x00, 0x23, 0x63, 0x72, 0x00, 0xf0,
-  0xfb, 0xf8, 0x10, 0xbd, 0x10, 0xb5, 0x0a, 0x1c, 0x0a, 0x49, 0x8a, 0xb0,
-  0x08, 0x31, 0x00, 0x23, 0x04, 0x1c, 0x00, 0x91, 0x69, 0x46, 0x4b, 0x72,
-  0x01, 0x93, 0x68, 0x46, 0x21, 0x1c, 0x02, 0x23, 0xff, 0xf7, 0x42, 0xff,
-  0x00, 0x28, 0x02, 0xd0, 0x68, 0x46, 0xff, 0xf7, 0xd7, 0xff, 0x0a, 0xb0,
-  0x10, 0xbd, 0xc0, 0x46, 0x38, 0x4d, 0x00, 0x00, 0xf0, 0xb5, 0x43, 0x7a,
-  0x87, 0xb0, 0x04, 0x1c, 0x0d, 0x1c, 0x03, 0x92, 0x01, 0x2b, 0x0d, 0xd1,
-  0x03, 0x7a, 0x99, 0x07, 0x0a, 0xd5, 0x5a, 0x07, 0x0c, 0xd5, 0xe1, 0x69,
-  0x22, 0x69, 0x8a, 0x42, 0x08, 0xd0, 0x20, 0x1c, 0xff, 0xf7, 0x06, 0xfe,
-  0x00, 0x28, 0x03, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x00, 0x20, 0xaa, 0xe0,
-  0x03, 0x9b, 0x01, 0x93, 0x3b, 0xe0, 0x60, 0x6a, 0x73, 0x0a, 0x07, 0x79,
-  0xf6, 0x05, 0x01, 0x3f, 0x1f, 0x40, 0xff, 0xb2, 0xf6, 0x0d, 0x00, 0x2f,
-  0x36, 0xd0, 0x80, 0x22, 0x92, 0x00, 0x92, 0x1b, 0x01, 0x99, 0x92, 0xb2,
-  0x0b, 0x1c, 0x91, 0x42, 0x00, 0xd9, 0x13, 0x1c, 0x9b, 0xb2, 0x02, 0x93,
-  0x63, 0x6a, 0xe1, 0x68, 0x1a, 0x7c, 0x02, 0x39, 0x91, 0x40, 0x5a, 0x69,
-  0x8b, 0x18, 0x02, 0x9a, 0xdf, 0x19, 0x80, 0x23, 0x9b, 0x00, 0x9a, 0x42,
-  0x3f, 0xd1, 0x44, 0x4b, 0x19, 0x68, 0xb9, 0x42, 0x02, 0xd1, 0x01, 0x22,
-  0x52, 0x42, 0x1a, 0x60, 0x41, 0x4b, 0x39, 0x1c, 0x18, 0x68, 0x2a, 0x1c,
-  0xff, 0xf7, 0x22, 0xfc, 0x00, 0x28, 0xc7, 0xd0, 0x80, 0x22, 0x92, 0x00,
-  0xad, 0x18, 0x01, 0x99, 0x02, 0x9a, 0x8b, 0x1a, 0x21, 0x69, 0x9b, 0xb2,
-  0x01, 0x93, 0x8b, 0x18, 0x23, 0x61, 0x01, 0x9a, 0x26, 0x69, 0x00, 0x2a,
-  0xbf, 0xd1, 0x49, 0xe0, 0x00, 0x2e, 0xc6, 0xd1, 0xe1, 0x68, 0x00, 0x29,
-  0x03, 0xd1, 0x23, 0x6a, 0x00, 0x2b, 0x16, 0xd1, 0x0f, 0xe0, 0x05, 0xaa,
-  0x00, 0xf0, 0xe2, 0xf8, 0x00, 0x28, 0x58, 0xd0, 0x62, 0x6a, 0x05, 0x9b,
-  0x01, 0x32, 0xd2, 0x7f, 0x10, 0x2a, 0x01, 0xd1, 0x2c, 0x4a, 0x00, 0xe0,
-  0x2c, 0x4a, 0x93, 0x42, 0x05, 0xd3, 0x20, 0x1c, 0xff, 0xf7, 0x3c, 0xfc,
-  0x00, 0x28, 0xaa, 0xd1, 0x98, 0xe7, 0xe3, 0x60, 0xa7, 0xe7, 0x00, 0x2e,
-  0x0f, 0xd1, 0x23, 0x69, 0xe1, 0x69, 0x8b, 0x42, 0x0b, 0xd3, 0x00, 0xf0,
-  0x59, 0xf8, 0x00, 0x28, 0x8c, 0xd0, 0x1f, 0x4b, 0x01, 0x21, 0x1f, 0x60,
-  0x21, 0x4b, 0x1a, 0x78, 0x0a, 0x43, 0x1a, 0x70, 0x06, 0xe0, 0x38, 0x1c,
-  0x01, 0x21, 0x00, 0xf0, 0x75, 0xf8, 0x00, 0x28, 0x00, 0xd1, 0x7d, 0xe7,
-  0x1c, 0x4b, 0x2a, 0x1c, 0xf6, 0x18, 0x02, 0x9b, 0xf1, 0x18, 0x33, 0x1c,
-  0x8b, 0x42, 0x04, 0xd0, 0x10, 0x78, 0x01, 0x32, 0x18, 0x70, 0x01, 0x33,
-  0xf8, 0xe7, 0x9e, 0x1b, 0xad, 0x19, 0xa8, 0xe7, 0xe1, 0x69, 0x23, 0x7a,
-  0x8e, 0x42, 0x01, 0xd9, 0xe6, 0x61, 0x06, 0xe0, 0x12, 0x4a, 0x12, 0x68,
-  0x00, 0x2a, 0x06, 0xd0, 0x03, 0x9a, 0x00, 0x2a, 0x03, 0xd0, 0x80, 0x22,
-  0x52, 0x42, 0x13, 0x43, 0x23, 0x72, 0x23, 0x7a, 0x19, 0x07, 0x01, 0xd4,
-  0x03, 0x98, 0x06, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0x8b, 0xfd, 0x00, 0x28,
-  0x00, 0xd1, 0x51, 0xe7, 0xf6, 0xe7, 0x07, 0xb0, 0xf0, 0xbd, 0xc0, 0x46,
-  0x00, 0x00, 0x00, 0x20, 0x4c, 0x01, 0x00, 0x20, 0xf8, 0xff, 0x00, 0x00,
-  0xf8, 0xff, 0xff, 0x0f, 0x50, 0x03, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20,
-  0x44, 0x01, 0x00, 0x20, 0x07, 0xb5, 0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33,
-  0x19, 0x1c, 0x01, 0x22, 0xff, 0xf7, 0x22, 0xff, 0x0e, 0xbd, 0x00, 0x00,
-  0xf8, 0xb5, 0x0f, 0x4f, 0x01, 0x20, 0x3b, 0x78, 0x00, 0x2b, 0x18, 0xd0,
-  0x0d, 0x4e, 0x0e, 0x4b, 0x0e, 0x4d, 0x19, 0x68, 0x30, 0x68, 0x2a, 0x1c,
-  0xff, 0xf7, 0x80, 0xfb, 0x00, 0x28, 0x0e, 0xd0, 0x0b, 0x4c, 0x21, 0x68,
-  0x00, 0x29, 0x07, 0xd0, 0x30, 0x68, 0x2a, 0x1c, 0xff, 0xf7, 0x76, 0xfb,
-  0x00, 0x28, 0x04, 0xd0, 0x00, 0x23, 0x23, 0x60, 0x00, 0x23, 0x3b, 0x70,
-  0x01, 0x20, 0xf8, 0xbd, 0x50, 0x03, 0x00, 0x20, 0x4c, 0x01, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x48, 0x01, 0x00, 0x20,
-  0x70, 0xb5, 0x0d, 0x4d, 0x04, 0x1c, 0x2b, 0x68, 0x0e, 0x1c, 0x83, 0x42,
-  0x0e, 0xd0, 0xff, 0xf7, 0xcd, 0xff, 0x00, 0x28, 0x01, 0xd1, 0x00, 0x20,
-  0x0d, 0xe0, 0x08, 0x4b, 0x21, 0x1c, 0x18, 0x68, 0x07, 0x4a, 0xff, 0xf7,
-  0x25, 0xfb, 0x00, 0x28, 0xf5, 0xd0, 0x2c, 0x60, 0x05, 0x4b, 0x01, 0x20,
-  0x1a, 0x78, 0x16, 0x43, 0x1e, 0x70, 0x70, 0xbd, 0x00, 0x00, 0x00, 0x20,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20,
-  0x10, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xae, 0xff, 0x00, 0x28, 0x0f, 0xd0,
-  0x00, 0x23, 0x08, 0x4a, 0x00, 0x21, 0x99, 0x54, 0x80, 0x22, 0x01, 0x33,
-  0x92, 0x00, 0x93, 0x42, 0xf7, 0xd1, 0x05, 0x4b, 0x01, 0x20, 0x1c, 0x60,
-  0x04, 0x4b, 0x1a, 0x78, 0x02, 0x43, 0x1a, 0x70, 0x10, 0xbd, 0xc0, 0x46,
-  0x50, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20,
-  0xc3, 0x68, 0x70, 0xb5, 0x01, 0x33, 0x0c, 0x1c, 0x15, 0x1c, 0x99, 0x42,
-  0x01, 0xd9, 0x00, 0x20, 0x21, 0xe0, 0x46, 0x1c, 0xf1, 0x7f, 0xc2, 0x69,
-  0xe3, 0x09, 0x10, 0x29, 0x00, 0xd1, 0x23, 0x0a, 0x98, 0x18, 0x0d, 0x4b,
-  0x1b, 0x68, 0x98, 0x42, 0x07, 0xd1, 0xf2, 0x7f, 0x0b, 0x4b, 0x10, 0x2a,
-  0x09, 0xd1, 0xe4, 0xb2, 0x64, 0x00, 0x1b, 0x5b, 0x0b, 0xe0, 0x00, 0x21,
-  0xff, 0xf7, 0x9e, 0xff, 0x00, 0x28, 0xf2, 0xd1, 0xe3, 0xe7, 0x7f, 0x22,
-  0x14, 0x40, 0xa4, 0x00, 0x1b, 0x59, 0x1b, 0x01, 0x1b, 0x09, 0x2b, 0x60,
-  0x01, 0x20, 0x70, 0xbd, 0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20,
-  0x73, 0xb5, 0x05, 0x1c, 0x01, 0x91, 0x16, 0x1c, 0x00, 0x24, 0x28, 0x1c,
-  0x01, 0x99, 0x01, 0xaa, 0xff, 0xf7, 0xc6, 0xff, 0x00, 0x28, 0x10, 0xd0,
-  0x2a, 0x7c, 0x80, 0x23, 0x9b, 0x00, 0x93, 0x40, 0xe4, 0x18, 0x6b, 0x1c,
-  0xdb, 0x7f, 0x01, 0x9a, 0x10, 0x2b, 0x01, 0xd1, 0x03, 0x4b, 0x00, 0xe0,
-  0x03, 0x4b, 0x9a, 0x42, 0xe9, 0xd3, 0x34, 0x60, 0x01, 0x20, 0x76, 0xbd,
-  0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f, 0xf7, 0xb5, 0x05, 0x1c,
-  0x0c, 0x1c, 0x01, 0x92, 0x01, 0x29, 0x32, 0xd9, 0xc3, 0x68, 0x00, 0x20,
-  0x01, 0x33, 0x99, 0x42, 0x2e, 0xd8, 0x6f, 0x1c, 0xfa, 0x7f, 0xee, 0x69,
-  0xcb, 0x09, 0x10, 0x2a, 0x00, 0xd1, 0x0b, 0x0a, 0x9e, 0x19, 0x14, 0x4b,
-  0x1b, 0x68, 0x9e, 0x42, 0x08, 0xd1, 0xfa, 0x7f, 0x12, 0x4b, 0x10, 0x2a,
-  0x0b, 0xd1, 0xe4, 0xb2, 0x01, 0x9a, 0x64, 0x00, 0x1a, 0x53, 0x0b, 0xe0,
-  0x30, 0x1c, 0x00, 0x21, 0xff, 0xf7, 0x48, 0xff, 0x00, 0x28, 0xf0, 0xd1,
-  0x12, 0xe0, 0x7f, 0x22, 0x14, 0x40, 0x01, 0x9a, 0xa4, 0x00, 0x1a, 0x51,
-  0x09, 0x4b, 0x01, 0x20, 0x1a, 0x78, 0x02, 0x43, 0x1a, 0x70, 0x2b, 0x7e,
-  0x83, 0x42, 0x05, 0xd9, 0xab, 0x68, 0xf6, 0x18, 0x05, 0x4b, 0x1e, 0x60,
-  0x00, 0xe0, 0x00, 0x20, 0xfe, 0xbd, 0xc0, 0x46, 0x00, 0x00, 0x00, 0x20,
-  0x50, 0x01, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20, 0x48, 0x01, 0x00, 0x20,
-  0xf0, 0xb5, 0x15, 0x68, 0x87, 0xb0, 0x06, 0x1c, 0x02, 0x91, 0x17, 0x1c,
-  0x00, 0x2d, 0x03, 0xd0, 0x00, 0x21, 0x01, 0x35, 0x01, 0x91, 0x06, 0xe0,
-  0x02, 0x9b, 0x05, 0x68, 0x01, 0x3b, 0x5a, 0x42, 0x53, 0x41, 0xdb, 0xb2,
-  0x01, 0x93, 0xf2, 0x68, 0x00, 0x23, 0x01, 0x32, 0x03, 0x92, 0x2c, 0x1c,
-  0x00, 0x93, 0x00, 0x99, 0xf2, 0x68, 0x91, 0x42, 0x21, 0xd2, 0x03, 0x9b,
-  0x9c, 0x42, 0x01, 0xd9, 0x02, 0x24, 0x25, 0x1c, 0x30, 0x1c, 0x21, 0x1c,
-  0x05, 0xaa, 0xff, 0xf7, 0x43, 0xff, 0x00, 0x28, 0x15, 0xd0, 0x05, 0x99,
-  0x63, 0x1c, 0x00, 0x29, 0x01, 0xd0, 0x1d, 0x1c, 0x03, 0xe0, 0x02, 0x99,
-  0x5a, 0x1b, 0x8a, 0x42, 0x04, 0xd0, 0x00, 0x9a, 0x1c, 0x1c, 0x01, 0x32,
-  0x00, 0x92, 0xe0, 0xe7, 0x30, 0x1c, 0x21, 0x1c, 0x13, 0x4a, 0xff, 0xf7,
-  0x7f, 0xff, 0x00, 0x28, 0x0b, 0xd1, 0x00, 0x20, 0x1d, 0xe0, 0x63, 0x1e,
-  0x30, 0x1c, 0x19, 0x1c, 0x22, 0x1c, 0x00, 0x93, 0xff, 0xf7, 0x74, 0xff,
-  0x00, 0x28, 0xf4, 0xd0, 0x00, 0x9c, 0xac, 0x42, 0xf3, 0xd8, 0x39, 0x68,
-  0x00, 0x29, 0x06, 0xd1, 0x01, 0x99, 0x3d, 0x60, 0x00, 0x29, 0x09, 0xd0,
-  0x01, 0x35, 0x35, 0x60, 0x06, 0xe0, 0x30, 0x1c, 0x2a, 0x1c, 0xff, 0xf7,
-  0x61, 0xff, 0x00, 0x28, 0xf2, 0xd1, 0xe0, 0xe7, 0x01, 0x20, 0x07, 0xb0,
-  0xf0, 0xbd, 0xc0, 0x46, 0xff, 0xff, 0xff, 0x0f, 0x02, 0x23, 0x37, 0xb5,
-  0x05, 0x1c, 0x0c, 0x1c, 0x03, 0x60, 0x28, 0x1c, 0x21, 0x1c, 0x01, 0xaa,
-  0xff, 0xf7, 0xfc, 0xfe, 0x00, 0x28, 0x12, 0xd0, 0x28, 0x1c, 0x21, 0x1c,
-  0x00, 0x22, 0xff, 0xf7, 0x47, 0xff, 0x00, 0x28, 0x0b, 0xd0, 0x6b, 0x1c,
-  0xdb, 0x7f, 0x01, 0x9c, 0x10, 0x2b, 0x01, 0xd1, 0x04, 0x4b, 0x00, 0xe0,
-  0x04, 0x4b, 0x9c, 0x42, 0xe7, 0xd3, 0x01, 0x20, 0x00, 0xe0, 0x00, 0x20,
-  0x3e, 0xbd, 0xc0, 0x46, 0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f,
-  0xf8, 0xb5, 0x44, 0x4b, 0x04, 0x1c, 0x15, 0x1c, 0x19, 0x60, 0x29, 0xd0,
-  0x04, 0x2a, 0x01, 0xd9, 0x00, 0x20, 0x7d, 0xe0, 0x00, 0x20, 0x01, 0x1c,
-  0xff, 0xf7, 0x90, 0xfe, 0x00, 0x28, 0xf7, 0xd0, 0x2d, 0x01, 0x3d, 0x4b,
-  0xa9, 0x35, 0xff, 0x35, 0x5d, 0x19, 0xaa, 0x79, 0xab, 0x1d, 0x50, 0x06,
-  0xee, 0xd1, 0xea, 0x7c, 0xa9, 0x7c, 0x12, 0x02, 0x0a, 0x43, 0x29, 0x7d,
-  0x09, 0x04, 0x0a, 0x43, 0x69, 0x7d, 0x09, 0x06, 0x0a, 0x43, 0x63, 0x2a,
-  0xe2, 0xd9, 0xaa, 0x7b, 0xed, 0x7b, 0x2d, 0x02, 0x15, 0x43, 0x9a, 0x7a,
-  0xdb, 0x7a, 0x12, 0x04, 0x15, 0x43, 0x1b, 0x06, 0x1d, 0x43, 0xd7, 0xd0,
-  0x28, 0x1c, 0x00, 0x21, 0xff, 0xf7, 0x6a, 0xfe, 0x00, 0x28, 0xd1, 0xd0,
-  0x2a, 0x4b, 0x19, 0x7b, 0xda, 0x7a, 0x09, 0x02, 0x11, 0x43, 0x80, 0x22,
-  0x92, 0x00, 0x91, 0x42, 0xc8, 0xd1, 0x1a, 0x7c, 0x00, 0x2a, 0xc5, 0xd0,
-  0xd9, 0x89, 0x00, 0x29, 0xc2, 0xd0, 0x59, 0x7b, 0x00, 0x29, 0xbf, 0xd0,
-  0x22, 0x76, 0x00, 0x22, 0x21, 0x71, 0x22, 0x74, 0x22, 0x7c, 0x01, 0x20,
-  0x90, 0x40, 0x81, 0x42, 0x04, 0xd0, 0x50, 0x1c, 0x20, 0x74, 0x07, 0x2a,
-  0xf6, 0xd9, 0xb1, 0xe7, 0xd9, 0x8a, 0x00, 0x29, 0x00, 0xd1, 0x59, 0x6a,
-  0xa1, 0x60, 0xd8, 0x89, 0x28, 0x18, 0xe0, 0x61, 0x1f, 0x69, 0x3e, 0x02,
-  0x36, 0x0c, 0x66, 0x84, 0xb7, 0xb2, 0x1e, 0x7c, 0x71, 0x43, 0x0e, 0x18,
-  0x13, 0x48, 0x79, 0x01, 0x09, 0x18, 0x49, 0x12, 0x71, 0x18, 0x66, 0x62,
-  0x61, 0x61, 0x18, 0x7d, 0xde, 0x7c, 0x00, 0x02, 0x30, 0x43, 0x00, 0xd1,
-  0x18, 0x6a, 0x6d, 0x1a, 0x28, 0x18, 0xd0, 0x40, 0x02, 0x1c, 0xe0, 0x60,
-  0x0b, 0x48, 0x61, 0x1c, 0x82, 0x42, 0x01, 0xd8, 0x0c, 0x23, 0x07, 0xe0,
-  0x09, 0x48, 0x82, 0x42, 0x01, 0xd8, 0x10, 0x23, 0x02, 0xe0, 0xdb, 0x6a,
-  0x63, 0x62, 0x20, 0x23, 0xcb, 0x77, 0x01, 0x20, 0xf8, 0xbd, 0xc0, 0x46,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0xff, 0x01, 0x00, 0x00,
-  0xf4, 0x0f, 0x00, 0x00, 0xf4, 0xff, 0x00, 0x00, 0x08, 0xb5, 0x05, 0x49,
-  0x05, 0x4a, 0x06, 0x48, 0x00, 0xf0, 0x10, 0xf8, 0x05, 0x4b, 0x06, 0x49,
-  0x00, 0x22, 0x1a, 0x70, 0x5a, 0x54, 0x08, 0xbd, 0x00, 0x4e, 0x00, 0x00,
-  0x01, 0x04, 0x00, 0x00, 0x54, 0x03, 0x00, 0x20, 0x6c, 0x03, 0x00, 0x20,
-  0x02, 0x04, 0x00, 0x00, 0x30, 0xb5, 0x09, 0x4c, 0x09, 0x4b, 0xa5, 0x68,
-  0x6d, 0x03, 0x6d, 0x0f, 0xad, 0x00, 0xeb, 0x58, 0x03, 0x60, 0xa4, 0x68,
-  0x01, 0x61, 0xa4, 0xb2, 0x44, 0x60, 0x5c, 0x43, 0x9b, 0x00, 0x84, 0x60,
-  0xc3, 0x60, 0x42, 0x61, 0x30, 0xbd, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41,
-  0x00, 0x53, 0x00, 0x00, 0xf7, 0xb5, 0x1f, 0x4e, 0x80, 0x27, 0x75, 0x68,
-  0x03, 0x33, 0x3d, 0x43, 0x9b, 0x08, 0x75, 0x60, 0x00, 0x2b, 0x34, 0xd0,
-  0x1b, 0x4d, 0x35, 0x80, 0x35, 0x7d, 0xef, 0x07, 0xfc, 0xd5, 0x1d, 0x1c,
-  0x5f, 0x1b, 0x01, 0x97, 0x07, 0x68, 0xbf, 0x08, 0xbc, 0x46, 0x01, 0x9f,
-  0x67, 0x45, 0x1f, 0xd2, 0x00, 0x2d, 0x1d, 0xd0, 0x17, 0x78, 0x01, 0x3d,
-  0x01, 0x97, 0xff, 0x27, 0xbc, 0x43, 0x01, 0x9f, 0x3c, 0x43, 0x57, 0x78,
-  0x3f, 0x02, 0x01, 0x97, 0x0f, 0x4f, 0x3c, 0x40, 0x01, 0x9f, 0x3c, 0x43,
-  0x97, 0x78, 0x3f, 0x04, 0xbc, 0x46, 0x0d, 0x4f, 0x3c, 0x40, 0xd7, 0x78,
-  0xa4, 0xb2, 0x3f, 0x06, 0x00, 0x97, 0x67, 0x46, 0x3c, 0x43, 0x00, 0x9f,
-  0x04, 0x32, 0x3c, 0x43, 0x10, 0xc1, 0xd7, 0xe7, 0x07, 0x4b, 0x33, 0x80,
-  0x33, 0x7d, 0xdf, 0x07, 0xfc, 0xd5, 0x2b, 0x1c, 0xc8, 0xe7, 0xf7, 0xbd,
-  0x00, 0x40, 0x00, 0x41, 0x44, 0xa5, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff,
-  0xff, 0xff, 0x00, 0xff, 0x04, 0xa5, 0xff, 0xff, 0x04, 0x4b, 0x05, 0x4a,
-  0x49, 0x08, 0xd9, 0x61, 0x1a, 0x80, 0x1a, 0x7d, 0xd1, 0x07, 0xfc, 0xd5,
-  0x70, 0x47, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41, 0x02, 0xa5, 0xff, 0xff,
-  0x70, 0xb5, 0x05, 0x1c, 0x0c, 0x1c, 0x16, 0x1c, 0xeb, 0x68, 0x28, 0x1c,
-  0x21, 0x1c, 0x9e, 0x42, 0x05, 0xd9, 0xff, 0xf7, 0xe7, 0xff, 0xeb, 0x68,
-  0xe4, 0x18, 0xf6, 0x1a, 0xf4, 0xe7, 0xff, 0xf7, 0xe1, 0xff, 0x70, 0xbd,
-  0x43, 0x7a, 0x00, 0x2b, 0x04, 0xd1, 0x83, 0x72, 0xc3, 0x72, 0xc3, 0x60,
-  0x01, 0x23, 0x43, 0x72, 0x70, 0x47, 0x30, 0xb5, 0x85, 0xb0, 0x04, 0x1c,
-  0x02, 0xad, 0x00, 0x68, 0x02, 0x91, 0x03, 0x92, 0x00, 0xf0, 0x84, 0xfc,
-  0x6b, 0x79, 0xe1, 0x79, 0x22, 0x7a, 0x00, 0x93, 0x20, 0x68, 0x00, 0x23,
-  0x00, 0xf0, 0x1e, 0xfd, 0x29, 0x79, 0x20, 0x68, 0x02, 0x9a, 0x00, 0xf0,
-  0x47, 0xfc, 0x20, 0x68, 0x00, 0xf0, 0x6a, 0xfc, 0x05, 0xb0, 0x30, 0xbd,
-  0x70, 0xb5, 0x04, 0x1c, 0x18, 0x26, 0xff, 0xf7, 0xd7, 0xff, 0x20, 0x79,
-  0x33, 0x1c, 0x43, 0x43, 0x0d, 0x4d, 0x08, 0x21, 0xeb, 0x18, 0x59, 0x56,
-  0x00, 0xf0, 0x14, 0xfb, 0xa0, 0x79, 0x33, 0x1c, 0x43, 0x43, 0x08, 0x21,
-  0xeb, 0x18, 0x59, 0x56, 0x00, 0xf0, 0x0c, 0xfb, 0x60, 0x79, 0x08, 0x21,
-  0x46, 0x43, 0xad, 0x19, 0x69, 0x56, 0x00, 0xf0, 0x05, 0xfb, 0x04, 0x4b,
-  0x20, 0x1c, 0x06, 0xcb, 0xff, 0xf7, 0xc3, 0xff, 0x70, 0xbd, 0xc0, 0x46,
-  0x20, 0x53, 0x00, 0x00, 0x70, 0x07, 0x00, 0x20, 0x07, 0xb5, 0x83, 0x7a,
-  0x00, 0x91, 0x01, 0x92, 0x00, 0x2b, 0x0d, 0xd0, 0x9a, 0x07, 0x06, 0xd5,
-  0xef, 0xf3, 0x10, 0x83, 0x5a, 0x42, 0x53, 0x41, 0xc3, 0x72, 0x72, 0xb6,
-  0x04, 0xe0, 0xda, 0x07, 0x02, 0xd5, 0x82, 0x89, 0x03, 0x4b, 0x9a, 0x60,
-  0x00, 0x99, 0x01, 0x9a, 0xff, 0xf7, 0xa5, 0xff, 0x07, 0xbd, 0xc0, 0x46,
-  0x00, 0x18, 0x00, 0x40, 0x83, 0x7a, 0x00, 0x2b, 0x0b, 0xd0, 0x9a, 0x07,
-  0x04, 0xd5, 0xc3, 0x7a, 0x00, 0x2b, 0x06, 0xd0, 0x62, 0xb6, 0x04, 0xe0,
-  0xda, 0x07, 0x02, 0xd5, 0x82, 0x89, 0x01, 0x4b, 0xda, 0x60, 0x70, 0x47,
-  0x00, 0x18, 0x00, 0x40, 0x08, 0xb5, 0x00, 0x68, 0x00, 0xf0, 0x21, 0xfc,
-  0x08, 0xbd, 0x00, 0x00, 0x0f, 0x4b, 0x10, 0x4a, 0x10, 0x49, 0x1a, 0x60,
-  0x00, 0x22, 0x5a, 0x71, 0x1a, 0x71, 0x0f, 0x4b, 0x0f, 0x48, 0x19, 0x60,
-  0x0a, 0x21, 0x19, 0x71, 0x09, 0x21, 0x99, 0x71, 0x08, 0x21, 0x59, 0x71,
-  0x03, 0x21, 0x5a, 0x72, 0xda, 0x71, 0x19, 0x72, 0x0a, 0x4b, 0x18, 0x60,
-  0x1d, 0x20, 0x18, 0x71, 0x1b, 0x20, 0x98, 0x71, 0x1a, 0x20, 0x5a, 0x72,
-  0x58, 0x71, 0xda, 0x71, 0x19, 0x72, 0x70, 0x47, 0x70, 0x07, 0x00, 0x20,
-  0x00, 0x09, 0x3d, 0x00, 0x00, 0x08, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x04, 0x08, 0x00, 0x20, 0x88, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x02, 0x48,
-  0x00, 0xf0, 0xfc, 0xfc, 0x08, 0xbd, 0xc0, 0x46, 0x98, 0x07, 0x00, 0x20,
-  0x13, 0xb5, 0x12, 0x49, 0x12, 0x48, 0x00, 0xf0, 0x3d, 0xfb, 0x12, 0x49,
-  0x12, 0x48, 0x00, 0xf0, 0x39, 0xfb, 0x12, 0x49, 0x12, 0x48, 0x00, 0xf0,
-  0x35, 0xfb, 0x12, 0x49, 0x12, 0x48, 0x00, 0xf0, 0x31, 0xfb, 0x12, 0x49,
-  0x12, 0x48, 0x00, 0xf0, 0x2d, 0xfb, 0x12, 0x4c, 0x12, 0x49, 0x20, 0x1c,
-  0x00, 0xf0, 0x28, 0xfb, 0x03, 0x23, 0x00, 0x93, 0x01, 0x23, 0x01, 0x93,
-  0x21, 0x1c, 0x0d, 0x22, 0x0e, 0x23, 0x0e, 0x48, 0x00, 0xf0, 0xb0, 0xfc,
-  0x13, 0xbd, 0xc0, 0x46, 0x00, 0x08, 0x00, 0x42, 0xfc, 0x07, 0x00, 0x20,
-  0x00, 0x0c, 0x00, 0x42, 0x00, 0x08, 0x00, 0x20, 0x00, 0x10, 0x00, 0x42,
-  0x04, 0x08, 0x00, 0x20, 0x00, 0x14, 0x00, 0x42, 0xf8, 0x07, 0x00, 0x20,
-  0x00, 0x18, 0x00, 0x42, 0x08, 0x08, 0x00, 0x20, 0x0c, 0x08, 0x00, 0x20,
-  0x00, 0x1c, 0x00, 0x42, 0x98, 0x07, 0x00, 0x20, 0xfe, 0xe7, 0x00, 0x00,
-  0x08, 0xb5, 0x03, 0x4b, 0x1b, 0x68, 0x00, 0x2b, 0x00, 0xd0, 0x98, 0x47,
-  0x08, 0xbd, 0xc0, 0x46, 0x10, 0x08, 0x00, 0x20, 0x38, 0xb5, 0x0f, 0x49,
-  0x0f, 0x4c, 0xa1, 0x42, 0x04, 0xd1, 0x00, 0xf0, 0x4f, 0xf8, 0xfe, 0xf7,
-  0xbb, 0xfa, 0x0b, 0xe0, 0x0c, 0x4d, 0x8d, 0x42, 0xf7, 0xd0, 0x00, 0x23,
-  0xca, 0x18, 0xe8, 0x18, 0xa2, 0x42, 0x04, 0xd2, 0x00, 0x68, 0x04, 0x33,
-  0x10, 0x60, 0xf7, 0xe7, 0xfe, 0xe7, 0x90, 0x42, 0xeb, 0xd0, 0x06, 0x4b,
-  0x06, 0x4a, 0x93, 0x42, 0xe7, 0xd2, 0x00, 0x22, 0x04, 0xc3, 0xf9, 0xe7,
-  0x00, 0x00, 0x00, 0x20, 0xa0, 0x00, 0x00, 0x20, 0x40, 0x57, 0x00, 0x00,
-  0xa0, 0x00, 0x00, 0x20, 0xf4, 0x0c, 0x00, 0x20, 0x08, 0xb5, 0x00, 0xf0,
-  0x26, 0xf8, 0x00, 0x28, 0x01, 0xd1, 0x00, 0xf0, 0x17, 0xf8, 0x08, 0xbd,
-  0x01, 0x4b, 0x18, 0x68, 0x70, 0x47, 0xc0, 0x46, 0x14, 0x08, 0x00, 0x20,
-  0x70, 0xb5, 0x04, 0x1e, 0x08, 0xd0, 0x05, 0x4b, 0x1d, 0x68, 0x1e, 0x1c,
-  0x00, 0xf0, 0x12, 0xf8, 0x33, 0x68, 0x5b, 0x1b, 0xa3, 0x42, 0xf9, 0xd3,
-  0x70, 0xbd, 0xc0, 0x46, 0x14, 0x08, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b,
-  0x1a, 0x68, 0x01, 0x32, 0x1a, 0x60, 0x00, 0xf0, 0x6d, 0xfa, 0x08, 0xbd,
-  0x14, 0x08, 0x00, 0x20, 0x70, 0x47, 0x00, 0x20, 0x70, 0x47, 0x00, 0x00,
-  0x70, 0xb5, 0x4c, 0x4a, 0x1e, 0x21, 0x53, 0x68, 0x02, 0x20, 0x8b, 0x43,
-  0x03, 0x43, 0x4a, 0x49, 0x53, 0x60, 0x8b, 0x69, 0x08, 0x24, 0x23, 0x43,
-  0x8b, 0x61, 0x48, 0x4c, 0x48, 0x4b, 0x9c, 0x82, 0x9c, 0x8a, 0x20, 0x43,
-  0x98, 0x82, 0x10, 0x1c, 0xda, 0x68, 0x94, 0x07, 0xfc, 0xd5, 0x45, 0x4a,
-  0x01, 0x24, 0x14, 0x70, 0x14, 0x78, 0xe5, 0x07, 0x04, 0xd5, 0x42, 0x4c,
-  0x64, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xf7, 0xdb, 0x01, 0x24, 0x94, 0x60,
-  0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb, 0x3d, 0x4d, 0x3c, 0x4c,
-  0x65, 0x60, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb, 0x82, 0x25,
-  0x38, 0x4c, 0xed, 0x01, 0x65, 0x80, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c,
-  0xfb, 0xdb, 0x9c, 0x8c, 0x80, 0x25, 0xac, 0x43, 0x9c, 0x84, 0xdc, 0x68,
-  0xe6, 0x06, 0xfc, 0xd5, 0x33, 0x4d, 0x30, 0x4c, 0xe5, 0x62, 0xdd, 0x68,
-  0x2e, 0x4c, 0xee, 0x06, 0xfb, 0xd5, 0xa5, 0x8c, 0x30, 0x4e, 0x35, 0x43,
-  0xa5, 0x84, 0xdd, 0x68, 0x2a, 0x4c, 0xee, 0x06, 0xfb, 0xd5, 0xa5, 0x8c,
-  0x02, 0x26, 0x35, 0x43, 0xa5, 0x84, 0xdc, 0x68, 0x25, 0x06, 0xfc, 0xd5,
-  0x25, 0x4c, 0xe4, 0x68, 0x66, 0x06, 0xf8, 0xd5, 0xdc, 0x68, 0xe5, 0x06,
-  0xfc, 0xd5, 0x00, 0x24, 0x94, 0x60, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c,
-  0xfb, 0xdb, 0x24, 0x4d, 0x1f, 0x4c, 0x65, 0x60, 0x55, 0x78, 0x1e, 0x4c,
-  0x6d, 0xb2, 0x00, 0x2d, 0xfa, 0xdb, 0x1e, 0x6a, 0x20, 0x4d, 0x35, 0x40,
-  0x80, 0x26, 0x76, 0x00, 0x35, 0x43, 0x1d, 0x62, 0x1d, 0x6a, 0x80, 0x26,
-  0xb5, 0x43, 0x1d, 0x62, 0x03, 0x23, 0xa3, 0x60, 0x1b, 0x4b, 0x63, 0x60,
-  0x53, 0x78, 0x5b, 0xb2, 0x00, 0x2b, 0xfb, 0xdb, 0x00, 0x23, 0x0b, 0x72,
-  0x18, 0x4a, 0x4b, 0x72, 0x8b, 0x72, 0xcb, 0x72, 0x17, 0x4b, 0xff, 0x21,
-  0x1a, 0x60, 0x17, 0x4b, 0x17, 0x4a, 0x1b, 0x68, 0x12, 0x68, 0x5c, 0x01,
-  0xd2, 0x0e, 0x21, 0x40, 0x11, 0x43, 0x9a, 0x06, 0x52, 0x0f, 0x12, 0x02,
-  0x0b, 0x1c, 0x13, 0x43, 0x12, 0x4a, 0x13, 0x85, 0x43, 0x68, 0x80, 0x22,
-  0x13, 0x43, 0x43, 0x60, 0x70, 0xbd, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41,
-  0x00, 0x04, 0x00, 0x40, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x08, 0x00, 0x40,
-  0x00, 0x0c, 0x00, 0x40, 0x01, 0x05, 0x01, 0x00, 0xb8, 0x05, 0xff, 0x7d,
-  0x04, 0x0a, 0x00, 0x00, 0x00, 0x07, 0x03, 0x00, 0xff, 0xfc, 0xff, 0xff,
-  0x03, 0x06, 0x01, 0x00, 0x00, 0x6c, 0xdc, 0x02, 0x04, 0x00, 0x00, 0x20,
-  0x24, 0x60, 0x80, 0x00, 0x20, 0x60, 0x80, 0x00, 0x00, 0x40, 0x00, 0x42,
-  0x31, 0x4b, 0xfa, 0x21, 0x18, 0x68, 0x10, 0xb5, 0x89, 0x00, 0x00, 0xf0,
-  0xff, 0xfd, 0x2f, 0x4b, 0x01, 0x38, 0x98, 0x42, 0x24, 0xd8, 0x2e, 0x4a,
-  0x2e, 0x4b, 0x50, 0x60, 0x18, 0x6a, 0xc0, 0x21, 0x00, 0x02, 0x00, 0x0a,
-  0x09, 0x06, 0x01, 0x43, 0x19, 0x62, 0x00, 0x24, 0x07, 0x21, 0x94, 0x60,
-  0x11, 0x60, 0x19, 0x6a, 0x80, 0x22, 0x09, 0x02, 0x09, 0x0a, 0x12, 0x06,
-  0x0a, 0x43, 0x1a, 0x62, 0x25, 0x4b, 0xfc, 0x21, 0x1a, 0x6a, 0x0a, 0x43,
-  0x1a, 0x62, 0x19, 0x6a, 0xfc, 0x22, 0x92, 0x01, 0x0a, 0x43, 0x1a, 0x62,
-  0x19, 0x6a, 0xa0, 0x22, 0xd2, 0x02, 0x0a, 0x43, 0x1a, 0x62, 0x00, 0xe0,
-  0xfe, 0xe7, 0x20, 0x1c, 0x00, 0x21, 0x01, 0x34, 0x00, 0xf0, 0x70, 0xf8,
-  0x0f, 0x2c, 0xf8, 0xd1, 0x1a, 0x4c, 0x63, 0x78, 0x5b, 0xb2, 0x00, 0x2b,
-  0xfa, 0xdb, 0x19, 0x4b, 0x63, 0x80, 0x19, 0x4b, 0x5a, 0x7e, 0xd2, 0x09,
-  0x01, 0x2a, 0xfa, 0xd0, 0xe4, 0x22, 0xd2, 0x00, 0x9a, 0x80, 0x3f, 0x22,
-  0xda, 0x70, 0x59, 0x7e, 0x13, 0x4a, 0xc9, 0x09, 0x01, 0x29, 0xfa, 0xd0,
-  0xc0, 0x23, 0x5b, 0x01, 0x00, 0x20, 0x13, 0x61, 0x90, 0x70, 0x00, 0xf0,
-  0x23, 0xf8, 0x63, 0x78, 0x5b, 0xb2, 0x00, 0x2b, 0xfb, 0xdb, 0x0d, 0x4a,
-  0x09, 0x4b, 0x5a, 0x80, 0x0c, 0x4b, 0xda, 0x79, 0xd2, 0x09, 0x01, 0x2a,
-  0xfa, 0xd0, 0x41, 0x22, 0x5a, 0x70, 0x10, 0xbd, 0x04, 0x00, 0x00, 0x20,
-  0xff, 0xff, 0xff, 0x00, 0x10, 0xe0, 0x00, 0xe0, 0x00, 0xed, 0x00, 0xe0,
-  0x00, 0x04, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x40, 0x1e, 0x40, 0x00, 0x00,
-  0x00, 0x40, 0x00, 0x42, 0x21, 0x40, 0x00, 0x00, 0x00, 0x48, 0x00, 0x42,
-  0x00, 0xb5, 0x14, 0x4a, 0x51, 0x7e, 0x13, 0x1c, 0xc9, 0x09, 0x01, 0x29,
-  0xf9, 0xd0, 0x01, 0x38, 0x04, 0x28, 0x13, 0xd8, 0x19, 0x69, 0x10, 0x4a,
-  0x0a, 0x40, 0x1a, 0x61, 0x5a, 0x78, 0x0f, 0x21, 0x8a, 0x43, 0x00, 0xf0,
-  0x71, 0xfd, 0x03, 0x05, 0x09, 0x07, 0x03, 0x00, 0x01, 0x21, 0x02, 0xe0,
-  0x03, 0x21, 0x00, 0xe0, 0x02, 0x21, 0x0a, 0x43, 0x5a, 0x70, 0x0a, 0xe0,
-  0x11, 0x69, 0xf0, 0x23, 0x1b, 0x05, 0x0b, 0x43, 0x13, 0x61, 0x53, 0x78,
-  0x0f, 0x21, 0x8b, 0x43, 0x02, 0x21, 0x0b, 0x43, 0x53, 0x70, 0x00, 0xbd,
-  0x00, 0x40, 0x00, 0x42, 0xff, 0xff, 0xff, 0xf0, 0x10, 0xb5, 0x18, 0x24,
-  0x02, 0x1c, 0x20, 0x1c, 0x50, 0x43, 0x2a, 0x4b, 0x18, 0x18, 0x00, 0x7a,
-  0x40, 0xb2, 0x01, 0x30, 0x4c, 0xd0, 0x03, 0x29, 0x4a, 0xd8, 0x08, 0x1c,
-  0x21, 0x1c, 0x00, 0xf0, 0x45, 0xfd, 0x02, 0x33, 0x11, 0x21, 0x62, 0x43,
-  0x98, 0x56, 0x9a, 0x18, 0xc3, 0x01, 0x22, 0x48, 0x52, 0x68, 0x1b, 0x18,
-  0x99, 0x18, 0x40, 0x31, 0x02, 0x20, 0x08, 0x70, 0x01, 0x21, 0x91, 0x40,
-  0x59, 0x60, 0x35, 0xe0, 0x62, 0x43, 0x98, 0x56, 0x1b, 0x49, 0x9a, 0x18,
-  0x52, 0x68, 0xc3, 0x01, 0x5b, 0x18, 0x99, 0x18, 0x40, 0x31, 0x06, 0x20,
-  0x08, 0x70, 0x01, 0x21, 0x91, 0x40, 0x59, 0x60, 0x99, 0x61, 0x25, 0xe0,
-  0x51, 0x43, 0x5a, 0x56, 0x13, 0x48, 0x59, 0x18, 0x4b, 0x68, 0xd2, 0x01,
-  0x11, 0x18, 0xc8, 0x18, 0x40, 0x30, 0x06, 0x24, 0x04, 0x70, 0x01, 0x20,
-  0x98, 0x40, 0x48, 0x60, 0x0e, 0x49, 0x52, 0x18, 0x50, 0x60, 0x13, 0xe0,
-  0x51, 0x43, 0x5a, 0x56, 0x59, 0x18, 0x0a, 0x4b, 0x49, 0x68, 0xd2, 0x01,
-  0xd2, 0x18, 0x53, 0x18, 0x40, 0x33, 0x18, 0x78, 0x02, 0x24, 0x20, 0x43,
-  0x18, 0x70, 0x18, 0x78, 0x04, 0x24, 0xa0, 0x43, 0x18, 0x70, 0x01, 0x23,
-  0x8b, 0x40, 0x93, 0x60, 0x10, 0xbd, 0xc0, 0x46, 0x20, 0x53, 0x00, 0x00,
-  0x00, 0x44, 0x00, 0x41, 0x10, 0x44, 0x00, 0x41, 0x18, 0x23, 0x58, 0x43,
-  0x13, 0x4a, 0xf0, 0xb5, 0x13, 0x18, 0x08, 0x24, 0x1c, 0x57, 0x01, 0x34,
-  0x1f, 0xd0, 0x82, 0x56, 0x10, 0x4e, 0xd2, 0x01, 0x5d, 0x68, 0x01, 0x24,
-  0x90, 0x19, 0x23, 0x1c, 0x86, 0x68, 0xab, 0x40, 0x1e, 0x42, 0x0b, 0xd1,
-  0x0e, 0x1c, 0x77, 0x1e, 0xbe, 0x41, 0x40, 0x19, 0x34, 0x40, 0x40, 0x30,
-  0xa5, 0x00, 0x04, 0x78, 0x04, 0x26, 0xb4, 0x43, 0x2c, 0x43, 0x04, 0x70,
-  0x00, 0x29, 0x03, 0xd1, 0x05, 0x49, 0x52, 0x18, 0x53, 0x60, 0x02, 0xe0,
-  0x02, 0x4e, 0x92, 0x19, 0x93, 0x61, 0xf0, 0xbd, 0x20, 0x53, 0x00, 0x00,
-  0x00, 0x44, 0x00, 0x41, 0x10, 0x44, 0x00, 0x41, 0x18, 0x22, 0x42, 0x43,
-  0xf8, 0xb5, 0x2d, 0x4d, 0x08, 0x24, 0xaa, 0x18, 0x14, 0x57, 0x03, 0x1c,
-  0x62, 0x1c, 0x50, 0xd0, 0x48, 0x1c, 0x00, 0x24, 0x0c, 0x28, 0x4c, 0xd8,
-  0x00, 0xf0, 0xb6, 0xfc, 0x07, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e,
-  0x1e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x01, 0x24, 0x64, 0x42, 0x40, 0xe0,
-  0x09, 0x29, 0x02, 0xd1, 0x18, 0x1c, 0x00, 0x21, 0x03, 0xe0, 0x0a, 0x29,
-  0x04, 0xd1, 0x18, 0x1c, 0x02, 0x21, 0xff, 0xf7, 0x4b, 0xff, 0x23, 0xe0,
-  0x00, 0x24, 0x0b, 0x29, 0x31, 0xd1, 0x18, 0x1c, 0x01, 0x21, 0xff, 0xf7,
-  0x43, 0xff, 0x2c, 0xe0, 0x18, 0x22, 0x53, 0x43, 0xea, 0x18, 0x52, 0x68,
-  0xeb, 0x56, 0x01, 0x20, 0x14, 0x1c, 0x04, 0x40, 0x55, 0x08, 0xdb, 0x01,
-  0x00, 0x2c, 0x11, 0xd0, 0x12, 0x4c, 0x1b, 0x19, 0x5d, 0x19, 0x30, 0x35,
-  0x2e, 0x78, 0x0c, 0x01, 0x0f, 0x21, 0x31, 0x40, 0x21, 0x43, 0x9a, 0x18,
-  0xc9, 0xb2, 0x29, 0x70, 0x40, 0x32, 0x13, 0x78, 0x18, 0x43, 0x10, 0x70,
-  0x00, 0x24, 0x0e, 0xe0, 0x09, 0x4e, 0x0f, 0x27, 0x9b, 0x19, 0x5d, 0x19,
-  0x30, 0x35, 0x2e, 0x78, 0x9a, 0x18, 0xbe, 0x43, 0x31, 0x43, 0xc9, 0xb2,
-  0x29, 0x70, 0x40, 0x32, 0x13, 0x78, 0x18, 0x43, 0x10, 0x70, 0x20, 0x1c,
-  0xf8, 0xbd, 0xc0, 0x46, 0x20, 0x53, 0x00, 0x00, 0x00, 0x44, 0x00, 0x41,
-  0xf7, 0xb5, 0x8a, 0x18, 0x06, 0x1c, 0x0d, 0x1c, 0x01, 0x92, 0x0c, 0x1c,
-  0x01, 0x9b, 0x67, 0x1b, 0x9c, 0x42, 0x07, 0xd0, 0x33, 0x68, 0x21, 0x78,
-  0x1b, 0x68, 0x30, 0x1c, 0x98, 0x47, 0x01, 0x34, 0x00, 0x28, 0xf3, 0xd1,
-  0x38, 0x1c, 0xfe, 0xbd, 0x15, 0x4a, 0x13, 0x68, 0x58, 0x1c, 0x25, 0xd0,
-  0x01, 0x3b, 0x13, 0x60, 0x00, 0x2b, 0x21, 0xd1, 0x72, 0xb6, 0x12, 0x4a,
-  0x12, 0x4b, 0x04, 0x32, 0x9a, 0x42, 0x07, 0xd8, 0xbf, 0xf3, 0x4f, 0x8f,
-  0x10, 0x4a, 0x11, 0x4b, 0xda, 0x60, 0xbf, 0xf3, 0x4f, 0x8f, 0x11, 0xe0,
-  0x0f, 0x4b, 0x19, 0x7d, 0xc8, 0x07, 0xfb, 0xd5, 0x18, 0x8b, 0x20, 0x21,
-  0xff, 0x31, 0x92, 0x08, 0x52, 0x00, 0x01, 0x43, 0x19, 0x83, 0xda, 0x61,
-  0x0a, 0x4a, 0x1a, 0x80, 0x1a, 0x7d, 0xd1, 0x07, 0xfc, 0xd5, 0xe5, 0xe7,
-  0xc0, 0x46, 0xfd, 0xe7, 0x70, 0x47, 0xc0, 0x46, 0x08, 0x00, 0x00, 0x20,
-  0x00, 0x20, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x04, 0x00, 0xfa, 0x05,
-  0x00, 0xed, 0x00, 0xe0, 0x00, 0x40, 0x00, 0x41, 0x02, 0xa5, 0xff, 0xff,
-  0x01, 0x60, 0x70, 0x47, 0xf7, 0xb5, 0x08, 0xac, 0x26, 0x78, 0x04, 0x68,
-  0x9d, 0x1e, 0x27, 0x68, 0x6c, 0x1e, 0xa5, 0x41, 0xec, 0xb2, 0x92, 0x07,
-  0x05, 0x68, 0x3a, 0x43, 0x27, 0x06, 0x3a, 0x43, 0x2a, 0x60, 0x02, 0x68,
-  0x07, 0x25, 0x29, 0x40, 0x50, 0x68, 0xb5, 0x01, 0x00, 0x2c, 0x00, 0xd0,
-  0x5c, 0x03, 0x29, 0x43, 0x01, 0x43, 0x0c, 0x43, 0x54, 0x60, 0xf7, 0xbd,
-  0x30, 0xb5, 0x03, 0x68, 0xc0, 0x25, 0x1c, 0x68, 0xad, 0x03, 0x12, 0x05,
-  0x2a, 0x40, 0x22, 0x43, 0xc0, 0x24, 0xa4, 0x02, 0x09, 0x04, 0x21, 0x40,
-  0x11, 0x43, 0x19, 0x60, 0x03, 0x68, 0x5a, 0x68, 0x14, 0x43, 0x5c, 0x60,
-  0x30, 0xbd, 0x03, 0x68, 0x01, 0x21, 0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60,
-  0x02, 0x68, 0x11, 0x68, 0x01, 0x23, 0x19, 0x42, 0xfb, 0xd1, 0xd1, 0x69,
-  0x19, 0x42, 0xf8, 0xd1, 0x70, 0x47, 0x03, 0x68, 0x02, 0x21, 0x1a, 0x68,
-  0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68, 0xd3, 0x69, 0x99, 0x07, 0xfc, 0xd4,
-  0x70, 0x47, 0x03, 0x68, 0x1a, 0x7e, 0xd1, 0x07, 0x02, 0xd4, 0x1a, 0x7e,
-  0x91, 0x07, 0xfc, 0xd5, 0x70, 0x47, 0x03, 0x68, 0x00, 0x22, 0x5a, 0x83,
-  0x70, 0x47, 0x03, 0x68, 0x18, 0x7e, 0x40, 0x07, 0xc0, 0x0f, 0x70, 0x47,
-  0x03, 0x68, 0x18, 0x7e, 0xc0, 0x09, 0x70, 0x47, 0x03, 0x68, 0x80, 0x22,
-  0x19, 0x7e, 0x52, 0x42, 0x0a, 0x43, 0x1a, 0x76, 0x70, 0x47, 0x03, 0x68,
-  0x18, 0x8d, 0xc0, 0xb2, 0x70, 0x47, 0x03, 0x68, 0x1a, 0x7e, 0x01, 0x20,
-  0x02, 0x42, 0xfb, 0xd0, 0x19, 0x85, 0x70, 0x47, 0x70, 0xb5, 0x03, 0x68,
-  0x01, 0x26, 0x8d, 0x07, 0xed, 0x0f, 0x31, 0x40, 0x1c, 0x68, 0x6d, 0x07,
-  0x09, 0x07, 0x29, 0x43, 0x21, 0x43, 0x19, 0x60, 0x04, 0x68, 0x51, 0x00,
-  0x03, 0x48, 0x00, 0xf0, 0x9f, 0xfb, 0x01, 0x38, 0xc0, 0xb2, 0x20, 0x73,
-  0x70, 0xbd, 0xc0, 0x46, 0x00, 0x6c, 0xdc, 0x02, 0x03, 0x68, 0x01, 0x21,
-  0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68, 0x11, 0x68, 0x01, 0x23,
-  0x19, 0x42, 0xfb, 0xd1, 0xd1, 0x69, 0x19, 0x42, 0xf8, 0xd1, 0x70, 0x47,
-  0x03, 0x68, 0x02, 0x21, 0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68,
-  0xd3, 0x69, 0x99, 0x07, 0xfc, 0xd4, 0x70, 0x47, 0x03, 0x68, 0xda, 0x69,
-  0x91, 0x07, 0xfc, 0xd4, 0x1a, 0x68, 0x02, 0x21, 0x8a, 0x43, 0x1a, 0x60,
-  0x70, 0x47, 0x03, 0x68, 0x9a, 0x6a, 0x52, 0x0a, 0x52, 0x02, 0x11, 0x43,
-  0x99, 0x62, 0x03, 0x68, 0x1a, 0x7e, 0x51, 0x07, 0xfc, 0xd5, 0x98, 0x6a,
-  0xc0, 0xb2, 0x70, 0x47, 0x03, 0x68, 0x22, 0x4a, 0x30, 0xb5, 0x93, 0x42,
-  0x11, 0xd0, 0x21, 0x4a, 0x93, 0x42, 0x11, 0xd0, 0x20, 0x4a, 0x93, 0x42,
-  0x11, 0xd0, 0x20, 0x4a, 0x93, 0x42, 0x11, 0xd0, 0x1f, 0x4a, 0x93, 0x42,
-  0x11, 0xd0, 0x1f, 0x4a, 0x93, 0x42, 0x30, 0xd1, 0x0e, 0x23, 0x19, 0x22,
-  0x0d, 0xe0, 0x09, 0x23, 0x14, 0x22, 0x0a, 0xe0, 0x0a, 0x23, 0x15, 0x22,
-  0x07, 0xe0, 0x0b, 0x23, 0x16, 0x22, 0x04, 0xe0, 0x0c, 0x23, 0x17, 0x22,
-  0x01, 0xe0, 0x0d, 0x23, 0x18, 0x22, 0xdc, 0xb2, 0x15, 0x49, 0x01, 0x20,
-  0x9b, 0x08, 0xa0, 0x40, 0x9b, 0x00, 0x08, 0x60, 0x5b, 0x18, 0x03, 0x20,
-  0xc0, 0x21, 0x89, 0x00, 0x04, 0x40, 0x5d, 0x58, 0xe0, 0x00, 0xff, 0x24,
-  0x84, 0x40, 0xa5, 0x43, 0x2c, 0x1c, 0xc0, 0x25, 0x85, 0x40, 0x28, 0x1c,
-  0x20, 0x43, 0x58, 0x50, 0x80, 0x23, 0xdb, 0x01, 0x1a, 0x43, 0x0a, 0x4b,
-  0x5a, 0x80, 0x5a, 0x78, 0x52, 0xb2, 0x00, 0x2a, 0xfb, 0xdb, 0x30, 0xbd,
-  0x00, 0x08, 0x00, 0x42, 0x00, 0x0c, 0x00, 0x42, 0x00, 0x10, 0x00, 0x42,
-  0x00, 0x14, 0x00, 0x42, 0x00, 0x18, 0x00, 0x42, 0x00, 0x1c, 0x00, 0x42,
-  0x00, 0xe1, 0x00, 0xe0, 0x00, 0x0c, 0x00, 0x40, 0xf8, 0xb5, 0x04, 0x1c,
-  0x15, 0x1c, 0x0e, 0x1c, 0x1f, 0x1c, 0xff, 0xf7, 0xa3, 0xff, 0x20, 0x1c,
-  0xff, 0xf7, 0x1b, 0xff, 0xb1, 0x00, 0x1c, 0x22, 0x0a, 0x40, 0x69, 0x07,
-  0x23, 0x68, 0x09, 0x0c, 0x0a, 0x43, 0x1a, 0x60, 0x22, 0x68, 0x84, 0x23,
-  0x93, 0x75, 0x01, 0x2e, 0x1a, 0xd1, 0x08, 0x21, 0x01, 0x2d, 0x00, 0xd1,
-  0x10, 0x21, 0x0c, 0x4b, 0x79, 0x43, 0x18, 0x68, 0xc0, 0x00, 0x00, 0xf0,
-  0xf3, 0xfa, 0x23, 0x68, 0x07, 0x21, 0x9a, 0x89, 0x01, 0x40, 0xd2, 0x04,
-  0x49, 0x03, 0xd2, 0x0c, 0x0a, 0x43, 0x9a, 0x81, 0x23, 0x68, 0x00, 0x04,
-  0xc2, 0x0c, 0x98, 0x89, 0x40, 0x0b, 0x40, 0x03, 0x10, 0x43, 0x98, 0x81,
-  0xf8, 0xbd, 0xc0, 0x46, 0x04, 0x00, 0x00, 0x20, 0xf7, 0xb5, 0x01, 0x93,
-  0x08, 0xab, 0x04, 0x1c, 0x1f, 0x78, 0x0d, 0x1c, 0x16, 0x1c, 0xff, 0xf7,
-  0x3d, 0xff, 0x20, 0x1c, 0xff, 0xf7, 0x68, 0xff, 0xbf, 0x07, 0x0c, 0x22,
-  0x17, 0x43, 0xc0, 0x22, 0x92, 0x03, 0x36, 0x05, 0x16, 0x40, 0xc0, 0x22,
-  0x92, 0x02, 0x2d, 0x04, 0x23, 0x68, 0x3e, 0x43, 0x01, 0x99, 0x15, 0x40,
-  0x35, 0x43, 0x07, 0x22, 0x1d, 0x60, 0x0a, 0x40, 0x80, 0x21, 0x23, 0x68,
-  0x89, 0x02, 0x0a, 0x43, 0x5a, 0x60, 0xf7, 0xbd, 0x01, 0x20, 0x70, 0x47,
-  0x08, 0xb5, 0x03, 0x68, 0x13, 0x22, 0xdb, 0x69, 0x98, 0x47, 0x08, 0xbd,
-  0x10, 0xb5, 0x04, 0x1c, 0x00, 0x69, 0xff, 0xf7, 0xbe, 0xfe, 0x20, 0x1c,
-  0x14, 0x30, 0x00, 0xf0, 0x7d, 0xfa, 0x10, 0xbd, 0x08, 0xb5, 0x00, 0x69,
-  0xff, 0xf7, 0xcd, 0xfe, 0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0,
-  0x85, 0xfa, 0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0, 0x86, 0xfa,
-  0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0, 0x6d, 0xfa, 0x08, 0xbd,
-  0x08, 0xb5, 0x00, 0x69, 0xff, 0xf7, 0xd9, 0xfe, 0x01, 0x20, 0x08, 0xbd,
-  0xf7, 0xb5, 0x1d, 0x1c, 0x08, 0xab, 0x1b, 0x78, 0x04, 0x1c, 0x00, 0x93,
-  0x09, 0xab, 0x1b, 0x78, 0x16, 0x1c, 0x01, 0x93, 0x00, 0x23, 0x43, 0x60,
-  0xfa, 0x23, 0x9b, 0x00, 0x83, 0x60, 0x09, 0x4b, 0x0f, 0x1c, 0x08, 0x33,
-  0x03, 0x60, 0x14, 0x30, 0x00, 0xf0, 0x36, 0xfa, 0x00, 0x9a, 0x23, 0x1c,
-  0x5c, 0x33, 0x27, 0x61, 0x9a, 0x70, 0x01, 0x9a, 0x1e, 0x70, 0x5d, 0x70,
-  0x20, 0x1c, 0xda, 0x70, 0xfe, 0xbd, 0xc0, 0x46, 0x80, 0x56, 0x00, 0x00,
-  0x10, 0xb5, 0x04, 0x1c, 0x00, 0x69, 0xff, 0xf7, 0x9a, 0xfe, 0x00, 0x28,
-  0x07, 0xd0, 0x20, 0x69, 0xff, 0xf7, 0xa5, 0xfe, 0x01, 0x1c, 0x20, 0x1c,
-  0x14, 0x30, 0x00, 0xf0, 0x24, 0xfa, 0x20, 0x69, 0xff, 0xf7, 0x92, 0xfe,
-  0x00, 0x28, 0x05, 0xd0, 0x20, 0x69, 0xff, 0xf7, 0x91, 0xfe, 0x20, 0x69,
-  0xff, 0xf7, 0x81, 0xfe, 0x10, 0xbd, 0xf0, 0x23, 0x08, 0x1c, 0x18, 0x40,
-  0x30, 0x38, 0x43, 0x42, 0x58, 0x41, 0x70, 0x47, 0xf0, 0x23, 0x1b, 0x01,
-  0x19, 0x40, 0x80, 0x23, 0x9b, 0x00, 0x99, 0x42, 0x0c, 0xd0, 0xc0, 0x23,
-  0x9b, 0x00, 0x99, 0x42, 0x06, 0xd0, 0x80, 0x23, 0x5b, 0x00, 0x05, 0x20,
-  0x99, 0x42, 0x04, 0xd0, 0x00, 0x20, 0x02, 0xe0, 0x07, 0x20, 0x00, 0xe0,
-  0x06, 0x20, 0x70, 0x47, 0x0f, 0x23, 0x19, 0x40, 0x01, 0x29, 0x05, 0xd0,
-  0x02, 0x39, 0x4b, 0x42, 0x4b, 0x41, 0x02, 0x20, 0xc0, 0x1a, 0x00, 0xe0,
-  0x00, 0x20, 0x70, 0x47, 0xf0, 0xb5, 0x03, 0x1c, 0x85, 0xb0, 0x03, 0x91,
-  0x5c, 0x33, 0x04, 0x1c, 0x18, 0x27, 0x18, 0x78, 0x3b, 0x1c, 0x43, 0x43,
-  0x1b, 0x4e, 0x08, 0x21, 0xf3, 0x18, 0x59, 0x56, 0x15, 0x1c, 0xff, 0xf7,
-  0x45, 0xfd, 0x23, 0x1c, 0x5d, 0x33, 0x18, 0x78, 0x08, 0x21, 0x47, 0x43,
-  0xf6, 0x19, 0x71, 0x56, 0xff, 0xf7, 0x3c, 0xfd, 0x01, 0x21, 0x0a, 0x1c,
-  0x03, 0x9b, 0x20, 0x69, 0xff, 0xf7, 0xf2, 0xfe, 0x29, 0x1c, 0x20, 0x1c,
-  0xff, 0xf7, 0xba, 0xff, 0x29, 0x1c, 0x07, 0x1c, 0x20, 0x1c, 0xff, 0xf7,
-  0xcb, 0xff, 0x29, 0x1c, 0x06, 0x1c, 0x20, 0x1c, 0xff, 0xf7, 0xa9, 0xff,
-  0x39, 0x1c, 0x00, 0x90, 0x33, 0x1c, 0x20, 0x69, 0x01, 0x22, 0xff, 0xf7,
-  0xd3, 0xfd, 0x23, 0x1c, 0x5f, 0x33, 0x19, 0x78, 0x01, 0x3b, 0x1a, 0x78,
-  0x20, 0x69, 0xff, 0xf7, 0xe7, 0xfd, 0x20, 0x69, 0xff, 0xf7, 0x05, 0xfe,
-  0x05, 0xb0, 0xf0, 0xbd, 0x20, 0x53, 0x00, 0x00, 0x3f, 0x20, 0x70, 0x47,
-  0x13, 0xb5, 0x02, 0x68, 0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33, 0x54, 0x68,
-  0x19, 0x1c, 0x01, 0x22, 0xa0, 0x47, 0x16, 0xbd, 0x08, 0xb5, 0x00, 0x69,
-  0x02, 0x21, 0x00, 0xf0, 0x49, 0xf8, 0x08, 0xbd, 0x08, 0xb5, 0x00, 0x69,
-  0x03, 0x21, 0x00, 0xf0, 0x59, 0xf8, 0x08, 0xbd, 0x38, 0xb5, 0x0d, 0x1c,
-  0x04, 0x1c, 0x13, 0x1c, 0x00, 0x69, 0x03, 0x21, 0x2a, 0x1c, 0x00, 0xf0,
-  0xf1, 0xf8, 0x00, 0x28, 0x01, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x38, 0xbd,
-  0x10, 0xb5, 0x05, 0x4c, 0x23, 0x68, 0x5a, 0x1c, 0x04, 0xd1, 0x03, 0x68,
-  0xdb, 0x68, 0x98, 0x47, 0x20, 0x60, 0x03, 0x1c, 0x18, 0x1c, 0x10, 0xbd,
-  0x0c, 0x00, 0x00, 0x20, 0x07, 0x4a, 0x08, 0xb5, 0x13, 0x68, 0x59, 0x1c,
-  0x04, 0xd0, 0x01, 0x21, 0x49, 0x42, 0x11, 0x60, 0x18, 0x1c, 0x03, 0xe0,
-  0x00, 0x69, 0x02, 0x21, 0x00, 0xf0, 0xc2, 0xf8, 0x08, 0xbd, 0xc0, 0x46,
-  0x0c, 0x00, 0x00, 0x20, 0x06, 0x4b, 0xfa, 0x21, 0x89, 0x00, 0x99, 0x60,
-  0x05, 0x49, 0x00, 0x22, 0x08, 0x31, 0x19, 0x60, 0x04, 0x49, 0x5a, 0x60,
-  0x19, 0x61, 0x1a, 0x76, 0x70, 0x47, 0xc0, 0x46, 0x18, 0x08, 0x00, 0x20,
-  0xb0, 0x56, 0x00, 0x00, 0xd8, 0x0b, 0x00, 0x20, 0x08, 0xb5, 0x08, 0x4b,
-  0x8a, 0x00, 0xd0, 0x58, 0x00, 0x28, 0x03, 0xd0, 0x03, 0x68, 0x9b, 0x68,
-  0x98, 0x47, 0x06, 0xe0, 0xc9, 0xb2, 0x04, 0x4b, 0x49, 0x01, 0x59, 0x18,
-  0x88, 0x68, 0x80, 0x04, 0x80, 0x0c, 0x08, 0xbd, 0xbc, 0x0b, 0x00, 0x20,
-  0xdc, 0x0b, 0x00, 0x20, 0x10, 0xb5, 0x0c, 0x1c, 0xff, 0xf7, 0xe6, 0xff,
-  0x00, 0x28, 0x0c, 0xd0, 0x06, 0x4b, 0xe1, 0xb2, 0x1b, 0x68, 0x08, 0x31,
-  0x49, 0x01, 0x59, 0x18, 0x4a, 0x79, 0x80, 0x23, 0x5b, 0x42, 0x13, 0x43,
-  0x4b, 0x71, 0x02, 0x23, 0xcb, 0x71, 0x10, 0xbd, 0xdc, 0x0b, 0x00, 0x20,
-  0x10, 0xb5, 0xc9, 0xb2, 0x0c, 0x48, 0x49, 0x01, 0x43, 0x18, 0x9a, 0x68,
-  0x92, 0x04, 0x92, 0x0c, 0x3f, 0x2a, 0x08, 0xd9, 0x14, 0x1c, 0x9a, 0x68,
-  0x40, 0x3c, 0xa4, 0x04, 0x92, 0x0b, 0xa4, 0x0c, 0x92, 0x03, 0x22, 0x43,
-  0x02, 0xe0, 0x9a, 0x68, 0x92, 0x0b, 0x92, 0x03, 0x9a, 0x60, 0x41, 0x18,
-  0x88, 0x68, 0xc0, 0xb2, 0x10, 0xbd, 0xc0, 0x46, 0xdc, 0x0b, 0x00, 0x20,
-  0xf0, 0xb5, 0x1c, 0x1c, 0x2a, 0x4b, 0x85, 0xb0, 0x1b, 0x68, 0x06, 0x1c,
-  0x0d, 0x1c, 0x02, 0x92, 0x00, 0x2b, 0x46, 0xd0, 0x27, 0x4b, 0x8a, 0x00,
-  0xd0, 0x58, 0x00, 0x28, 0x05, 0xd0, 0x03, 0x68, 0x02, 0x99, 0x5b, 0x68,
-  0x22, 0x1c, 0x98, 0x47, 0x3f, 0xe0, 0x30, 0x1c, 0xff, 0xf7, 0x9e, 0xff,
-  0xa0, 0x42, 0x04, 0xd2, 0x30, 0x1c, 0x29, 0x1c, 0xff, 0xf7, 0x98, 0xff,
-  0x04, 0x1c, 0x29, 0x1c, 0x30, 0x1c, 0xff, 0xf7, 0xbf, 0xff, 0x1c, 0x4f,
-  0xe9, 0xb2, 0x4a, 0x01, 0x01, 0x91, 0x39, 0x68, 0x03, 0x92, 0x8b, 0x18,
-  0xff, 0x33, 0x5a, 0x7a, 0x01, 0x21, 0x0a, 0x43, 0x17, 0x49, 0x5a, 0x72,
-  0xab, 0x01, 0xc9, 0x18, 0x02, 0x98, 0x22, 0x1c, 0x00, 0xf0, 0xa1, 0xf9,
-  0x00, 0x2c, 0x1b, 0xd0, 0x30, 0x1c, 0x29, 0x1c, 0xff, 0xf7, 0x7a, 0xff,
-  0x00, 0x28, 0x15, 0xd1, 0x01, 0x9b, 0x3a, 0x68, 0x08, 0x33, 0x5b, 0x01,
-  0xd3, 0x18, 0x19, 0x79, 0x40, 0x20, 0x01, 0x43, 0x19, 0x71, 0x01, 0x21,
-  0xd9, 0x71, 0x03, 0x99, 0x53, 0x18, 0xff, 0x33, 0x9a, 0x7a, 0x01, 0x21,
-  0x0a, 0x43, 0x9a, 0x72, 0x02, 0xe0, 0x01, 0x20, 0x40, 0x42, 0x00, 0xe0,
-  0x20, 0x1c, 0x05, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0xe0, 0x0c, 0x00, 0x20,
-  0xbc, 0x0b, 0x00, 0x20, 0xdc, 0x0b, 0x00, 0x20, 0xfc, 0x09, 0x00, 0x20,
-  0x13, 0xb5, 0x6c, 0x46, 0x07, 0x34, 0x22, 0x1c, 0x01, 0x23, 0xff, 0xf7,
-  0x99, 0xff, 0x01, 0x28, 0x01, 0xd1, 0x20, 0x78, 0x01, 0xe0, 0x01, 0x20,
-  0x40, 0x42, 0x16, 0xbd, 0xf0, 0xb5, 0x1c, 0x1c, 0x3a, 0x4b, 0x85, 0xb0,
-  0x1b, 0x68, 0x0e, 0x1c, 0x02, 0x92, 0x00, 0x2b, 0x60, 0xd0, 0x80, 0x23,
-  0xdb, 0x01, 0x9c, 0x42, 0x5c, 0xd8, 0x00, 0x22, 0x00, 0x92, 0x00, 0x2c,
-  0x56, 0xd0, 0x34, 0x4d, 0xf7, 0xb2, 0x2b, 0x68, 0x01, 0x93, 0x3b, 0x1c,
-  0x08, 0x33, 0x01, 0x9a, 0x5b, 0x01, 0xd3, 0x18, 0x9b, 0x79, 0xdb, 0x09,
-  0x1a, 0xd0, 0x2f, 0x4b, 0x2f, 0x49, 0x18, 0x68, 0x00, 0xf0, 0xae, 0xf8,
-  0x2e, 0x4b, 0x17, 0x21, 0x58, 0x43, 0x00, 0xf0, 0xa9, 0xf8, 0x3b, 0x1c,
-  0x08, 0x33, 0x01, 0x9a, 0x5b, 0x01, 0xd3, 0x18, 0xdb, 0x79, 0x9a, 0x07,
-  0x08, 0xd4, 0x29, 0x4b, 0x9a, 0x5d, 0x00, 0x2a, 0x38, 0xd1, 0x42, 0x1e,
-  0x00, 0x28, 0x35, 0xd0, 0x10, 0x1c, 0xee, 0xe7, 0x24, 0x4b, 0x00, 0x22,
-  0x9a, 0x55, 0x25, 0x1e, 0x3f, 0x2d, 0x00, 0xd9, 0x3f, 0x25, 0x22, 0x4a,
-  0xb3, 0x01, 0xd3, 0x18, 0x18, 0x1c, 0x02, 0x99, 0x2a, 0x1c, 0x03, 0x93,
-  0x00, 0xf0, 0x21, 0xf9, 0x18, 0x4a, 0x7b, 0x01, 0xd3, 0x18, 0x03, 0x9a,
-  0xa9, 0x04, 0x5a, 0x61, 0x9a, 0x69, 0x89, 0x0c, 0x92, 0x0b, 0x92, 0x03,
-  0x0a, 0x43, 0x9a, 0x61, 0x3b, 0x1c, 0x01, 0x9a, 0x08, 0x33, 0x5b, 0x01,
-  0xd3, 0x18, 0x02, 0x22, 0xda, 0x71, 0x59, 0x79, 0x80, 0x22, 0x52, 0x42,
-  0x0a, 0x43, 0x5a, 0x71, 0x00, 0x9b, 0x02, 0x9a, 0x5b, 0x19, 0x52, 0x19,
-  0x00, 0x93, 0x64, 0x1b, 0x02, 0x92, 0xa6, 0xe7, 0x00, 0x98, 0x0b, 0xe0,
-  0x01, 0x20, 0x08, 0xe0, 0x01, 0x22, 0x9a, 0x55, 0x7b, 0x01, 0xed, 0x18,
-  0xab, 0x69, 0x10, 0x1c, 0x9b, 0x0b, 0x9b, 0x03, 0xab, 0x61, 0x40, 0x42,
-  0x05, 0xb0, 0xf0, 0xbd, 0xe0, 0x0c, 0x00, 0x20, 0xdc, 0x0b, 0x00, 0x20,
-  0x04, 0x00, 0x00, 0x20, 0x40, 0x42, 0x0f, 0x00, 0x70, 0x11, 0x01, 0x00,
-  0x34, 0x08, 0x00, 0x20, 0x3c, 0x08, 0x00, 0x20, 0x01, 0x4a, 0x02, 0x4b,
-  0x1a, 0x60, 0x70, 0x47, 0x00, 0x50, 0x00, 0x41, 0xdc, 0x0b, 0x00, 0x20,
-  0x10, 0xb5, 0x00, 0x21, 0x40, 0x22, 0x04, 0x1c, 0x00, 0xf0, 0xde, 0xf8,
-  0x00, 0x23, 0x20, 0x1c, 0x23, 0x64, 0x63, 0x64, 0x10, 0xbd, 0x02, 0x6c,
-  0x10, 0xb5, 0x3f, 0x23, 0x54, 0x1c, 0x23, 0x40, 0x44, 0x6c, 0xa3, 0x42,
-  0x01, 0xd0, 0x81, 0x54, 0x03, 0x64, 0x10, 0xbd, 0x00, 0x23, 0x03, 0x64,
-  0x43, 0x64, 0x70, 0x47, 0x43, 0x6c, 0x02, 0x6c, 0x93, 0x42, 0x06, 0xd0,
-  0xc2, 0x5c, 0x3f, 0x21, 0x01, 0x33, 0x0b, 0x40, 0x43, 0x64, 0x10, 0x1c,
-  0x01, 0xe0, 0x01, 0x20, 0x40, 0x42, 0x70, 0x47, 0x02, 0x6c, 0x43, 0x6c,
-  0xd0, 0x1a, 0x00, 0xd5, 0x40, 0x30, 0x70, 0x47, 0x43, 0x6c, 0x02, 0x6c,
-  0x93, 0x42, 0x01, 0xd0, 0xc0, 0x5c, 0x01, 0xe0, 0x01, 0x20, 0x40, 0x42,
-  0x70, 0x47, 0x00, 0x00, 0x02, 0xb4, 0x71, 0x46, 0x49, 0x08, 0x49, 0x00,
-  0x09, 0x5c, 0x49, 0x00, 0x8e, 0x44, 0x02, 0xbc, 0x70, 0x47, 0xc0, 0x46,
-  0x00, 0x29, 0x34, 0xd0, 0x01, 0x23, 0x00, 0x22, 0x10, 0xb4, 0x88, 0x42,
-  0x2c, 0xd3, 0x01, 0x24, 0x24, 0x07, 0xa1, 0x42, 0x04, 0xd2, 0x81, 0x42,
-  0x02, 0xd2, 0x09, 0x01, 0x1b, 0x01, 0xf8, 0xe7, 0xe4, 0x00, 0xa1, 0x42,
-  0x04, 0xd2, 0x81, 0x42, 0x02, 0xd2, 0x49, 0x00, 0x5b, 0x00, 0xf8, 0xe7,
-  0x88, 0x42, 0x01, 0xd3, 0x40, 0x1a, 0x1a, 0x43, 0x4c, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0x5c, 0x08, 0x22, 0x43, 0x8c, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0x9c, 0x08, 0x22, 0x43, 0xcc, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0xdc, 0x08, 0x22, 0x43, 0x00, 0x28, 0x03, 0xd0,
-  0x1b, 0x09, 0x01, 0xd0, 0x09, 0x09, 0xe3, 0xe7, 0x10, 0x1c, 0x10, 0xbc,
-  0x70, 0x47, 0x00, 0x28, 0x01, 0xd0, 0x00, 0x20, 0xc0, 0x43, 0x07, 0xb4,
-  0x02, 0x48, 0x02, 0xa1, 0x40, 0x18, 0x02, 0x90, 0x03, 0xbd, 0xc0, 0x46,
-  0x19, 0x00, 0x00, 0x00, 0x00, 0x29, 0xf0, 0xd0, 0x03, 0xb5, 0xff, 0xf7,
-  0xb9, 0xff, 0x0e, 0xbc, 0x42, 0x43, 0x89, 0x1a, 0x18, 0x47, 0xc0, 0x46,
-  0x70, 0x47, 0xc0, 0x46, 0x70, 0xb5, 0x0e, 0x4b, 0x0e, 0x4d, 0x00, 0x24,
-  0xed, 0x1a, 0xad, 0x10, 0x1e, 0x1c, 0xac, 0x42, 0x04, 0xd0, 0xa3, 0x00,
-  0xf3, 0x58, 0x98, 0x47, 0x01, 0x34, 0xf8, 0xe7, 0x00, 0xf0, 0x32, 0xf9,
-  0x08, 0x4b, 0x09, 0x4d, 0x00, 0x24, 0xed, 0x1a, 0xad, 0x10, 0x1e, 0x1c,
-  0xac, 0x42, 0x04, 0xd0, 0xa3, 0x00, 0xf3, 0x58, 0x98, 0x47, 0x01, 0x34,
-  0xf8, 0xe7, 0x70, 0xbd, 0x74, 0x00, 0x00, 0x20, 0x74, 0x00, 0x00, 0x20,
-  0x74, 0x00, 0x00, 0x20, 0x98, 0x00, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b,
-  0x01, 0x1c, 0x18, 0x68, 0x00, 0xf0, 0x76, 0xf8, 0x08, 0xbd, 0xc0, 0x46,
-  0x70, 0x00, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b, 0x01, 0x1c, 0x18, 0x68,
-  0x00, 0xf0, 0x24, 0xf8, 0x08, 0xbd, 0xc0, 0x46, 0x70, 0x00, 0x00, 0x20,
-  0x30, 0xb5, 0x00, 0x23, 0x93, 0x42, 0x08, 0xd0, 0xc5, 0x5c, 0x01, 0x33,
-  0xcc, 0x18, 0x01, 0x3c, 0x24, 0x78, 0xa5, 0x42, 0xf6, 0xd0, 0x28, 0x1b,
-  0x00, 0xe0, 0x00, 0x20, 0x30, 0xbd, 0x10, 0xb5, 0x00, 0x23, 0x93, 0x42,
-  0x03, 0xd0, 0xcc, 0x5c, 0xc4, 0x54, 0x01, 0x33, 0xf9, 0xe7, 0x10, 0xbd,
-  0x03, 0x1c, 0x82, 0x18, 0x93, 0x42, 0x02, 0xd0, 0x19, 0x70, 0x01, 0x33,
-  0xfa, 0xe7, 0x70, 0x47, 0x30, 0xb5, 0x00, 0x29, 0x40, 0xd0, 0x04, 0x39,
-  0x0b, 0x68, 0x00, 0x2b, 0x00, 0xda, 0xc9, 0x18, 0x1e, 0x4a, 0x13, 0x68,
-  0x14, 0x1c, 0x00, 0x2b, 0x02, 0xd1, 0x4b, 0x60, 0x11, 0x60, 0x33, 0xe0,
-  0x99, 0x42, 0x0f, 0xd2, 0x08, 0x68, 0x0a, 0x18, 0x9a, 0x42, 0x05, 0xd1,
-  0x13, 0x68, 0x52, 0x68, 0xc0, 0x18, 0x08, 0x60, 0x4a, 0x60, 0x00, 0xe0,
-  0x4b, 0x60, 0x21, 0x60, 0x24, 0xe0, 0x8a, 0x42, 0x03, 0xd8, 0x13, 0x1c,
-  0x5a, 0x68, 0x00, 0x2a, 0xf9, 0xd1, 0x1d, 0x68, 0x5c, 0x19, 0x8c, 0x42,
-  0x0b, 0xd1, 0x09, 0x68, 0x69, 0x18, 0x58, 0x18, 0x19, 0x60, 0x90, 0x42,
-  0x14, 0xd1, 0x14, 0x68, 0x52, 0x68, 0x09, 0x19, 0x19, 0x60, 0x5a, 0x60,
-  0x0e, 0xe0, 0x8c, 0x42, 0x02, 0xd9, 0x0c, 0x23, 0x03, 0x60, 0x09, 0xe0,
-  0x08, 0x68, 0x0c, 0x18, 0x94, 0x42, 0x03, 0xd1, 0x14, 0x68, 0x52, 0x68,
-  0x00, 0x19, 0x08, 0x60, 0x4a, 0x60, 0x59, 0x60, 0x30, 0xbd, 0xc0, 0x46,
-  0xe8, 0x0c, 0x00, 0x20, 0x70, 0xb5, 0x03, 0x23, 0xcd, 0x1c, 0x9d, 0x43,
-  0x08, 0x35, 0x06, 0x1c, 0x0c, 0x2d, 0x01, 0xd2, 0x0c, 0x25, 0x01, 0xe0,
-  0x00, 0x2d, 0x3f, 0xdb, 0x8d, 0x42, 0x3d, 0xd3, 0x20, 0x4b, 0x1c, 0x68,
-  0x1a, 0x1c, 0x21, 0x1c, 0x00, 0x29, 0x13, 0xd0, 0x08, 0x68, 0x43, 0x1b,
-  0x0d, 0xd4, 0x0b, 0x2b, 0x02, 0xd9, 0x0b, 0x60, 0xcc, 0x18, 0x1e, 0xe0,
-  0x8c, 0x42, 0x02, 0xd1, 0x63, 0x68, 0x13, 0x60, 0x1a, 0xe0, 0x48, 0x68,
-  0x60, 0x60, 0x0c, 0x1c, 0x16, 0xe0, 0x0c, 0x1c, 0x49, 0x68, 0xe9, 0xe7,
-  0x14, 0x4c, 0x20, 0x68, 0x00, 0x28, 0x03, 0xd1, 0x30, 0x1c, 0x00, 0xf0,
-  0x25, 0xf8, 0x20, 0x60, 0x30, 0x1c, 0x29, 0x1c, 0x00, 0xf0, 0x20, 0xf8,
-  0x43, 0x1c, 0x15, 0xd0, 0xc4, 0x1c, 0x03, 0x23, 0x9c, 0x43, 0x84, 0x42,
-  0x0a, 0xd1, 0x25, 0x60, 0x20, 0x1c, 0x0b, 0x30, 0x07, 0x22, 0x23, 0x1d,
-  0x90, 0x43, 0xc3, 0x1a, 0x0b, 0xd0, 0x5a, 0x42, 0xe2, 0x50, 0x08, 0xe0,
-  0x21, 0x1a, 0x30, 0x1c, 0x00, 0xf0, 0x0a, 0xf8, 0x01, 0x30, 0xee, 0xd1,
-  0x0c, 0x23, 0x33, 0x60, 0x00, 0x20, 0x70, 0xbd, 0xe8, 0x0c, 0x00, 0x20,
-  0xe4, 0x0c, 0x00, 0x20, 0x38, 0xb5, 0x07, 0x4c, 0x00, 0x23, 0x05, 0x1c,
-  0x08, 0x1c, 0x23, 0x60, 0x00, 0xf0, 0x2a, 0xf8, 0x43, 0x1c, 0x03, 0xd1,
-  0x23, 0x68, 0x00, 0x2b, 0x00, 0xd0, 0x2b, 0x60, 0x38, 0xbd, 0xc0, 0x46,
-  0xf0, 0x0c, 0x00, 0x20, 0xc9, 0xb2, 0x03, 0x78, 0x00, 0x2b, 0x03, 0xd0,
-  0x8b, 0x42, 0x04, 0xd0, 0x01, 0x30, 0xf8, 0xe7, 0x00, 0x29, 0x00, 0xd0,
-  0x18, 0x1c, 0x70, 0x47, 0x30, 0xb5, 0x03, 0x1c, 0x00, 0x2a, 0x07, 0xd0,
-  0x0c, 0x78, 0x01, 0x33, 0x5d, 0x1e, 0x01, 0x3a, 0x2c, 0x70, 0x01, 0x31,
-  0x00, 0x2c, 0xf5, 0xd1, 0x9a, 0x18, 0x93, 0x42, 0x03, 0xd0, 0x00, 0x21,
-  0x19, 0x70, 0x01, 0x33, 0xf9, 0xe7, 0x30, 0xbd, 0x09, 0x4a, 0x13, 0x68,
-  0x00, 0x2b, 0x0c, 0xd0, 0x18, 0x18, 0x69, 0x46, 0x88, 0x42, 0x02, 0xd8,
-  0x10, 0x60, 0x18, 0x1c, 0x70, 0x47, 0x05, 0x4b, 0x0c, 0x22, 0x01, 0x20,
-  0x1a, 0x60, 0x40, 0x42, 0xf8, 0xe7, 0x03, 0x4b, 0x13, 0x60, 0xef, 0xe7,
-  0xec, 0x0c, 0x00, 0x20, 0xf0, 0x0c, 0x00, 0x20, 0xf4, 0x0c, 0x00, 0x20,
-  0xf8, 0xb5, 0xc0, 0x46, 0xf8, 0xbc, 0x08, 0xbc, 0x9e, 0x46, 0x70, 0x47,
-  0xf8, 0xb5, 0xc0, 0x46, 0xf8, 0xbc, 0x08, 0xbc, 0x9e, 0x46, 0x70, 0x47,
-  0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x2e, 0x42, 0x49, 0x4e, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x22, 0x00, 0x00,
-  0x2d, 0x22, 0x00, 0x00, 0x59, 0x23, 0x00, 0x00, 0x85, 0x22, 0x00, 0x00,
-  0x99, 0x22, 0x00, 0x00, 0x57, 0x22, 0x00, 0x00, 0x2f, 0x00, 0x7c, 0x3c,
-  0x3e, 0x5e, 0x2b, 0x3d, 0x3f, 0x2f, 0x5b, 0x5d, 0x3b, 0x2c, 0x2a, 0x22,
-  0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x09, 0x34, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-  0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-  0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x04, 0x00, 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x04, 0x01, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x12, 0x00, 0x00, 0x01, 0x00, 0x01, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x13, 0x00, 0x01, 0x01, 0x01, 0x01, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x05, 0x00, 0x05, 0x0a, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x05, 0x01, 0x05, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x14, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x15, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x03, 0x00, 0x03, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x11, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x13, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x03, 0x01, 0x03, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0xff, 0xff, 0xff, 0xff, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x09, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x11, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0xff, 0xff, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x06, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0x07, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x18, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x19, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x12, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0d, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0e, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x01, 0x04, 0x01, 0x04, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x91, 0x44, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00,
-  0x73, 0x44, 0x00, 0x00, 0x87, 0x44, 0x00, 0x00, 0x7d, 0x44, 0x00, 0x00,
-  0x69, 0x44, 0x00, 0x00, 0x49, 0x44, 0x00, 0x00, 0x6d, 0x45, 0x00, 0x00,
-  0x55, 0x44, 0x00, 0x00, 0x45, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xf9, 0x45, 0x00, 0x00, 0x25, 0x46, 0x00, 0x00,
-  0x0d, 0x46, 0x00, 0x00, 0x5d, 0x46, 0x00, 0x00, 0x41, 0x46, 0x00, 0x00,
-  0x19, 0x46, 0x00, 0x00, 0xf5, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
-  0x40, 0x42, 0x0f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0x00, 0x00, 0x00, 0x00, 0xdc, 0x56, 0x00, 0x00, 0xfc, 0x56, 0x00, 0x00,
-  0x1c, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x56, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x20, 0xdd, 0x20, 0x00, 0x00, 0x05, 0x22, 0x00, 0x00,
-  0xe9, 0x26, 0x00, 0x00, 0xb1, 0x2b, 0x00, 0x00, 0x5d, 0x38, 0x00, 0x00,
-  0x8d, 0x3a, 0x00, 0x00, 0xf5, 0x3a, 0x00, 0x00, 0x81, 0x46, 0x00, 0x00,
-  0x25, 0x49, 0x00, 0x00, 0xb5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/libraries/SDU/src/boot/zero.h b/libraries/SDU/src/boot/zero.h
deleted file mode 100644
index c63fc65af..000000000
--- a/libraries/SDU/src/boot/zero.h
+++ /dev/null
@@ -1,1141 +0,0 @@
-  0x00, 0x80, 0x00, 0x20, 0x91, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0xe5, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x7d, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0xc5, 0x3a, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0xd5, 0x3a, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00,
-  0x79, 0x3b, 0x00, 0x00, 0x79, 0x3b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0xb5, 0x06, 0x4c, 0x23, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x05, 0x4b,
-  0x00, 0x2b, 0x02, 0xd0, 0x04, 0x48, 0x00, 0xe0, 0x00, 0xbf, 0x01, 0x23,
-  0x23, 0x70, 0x10, 0xbd, 0xa0, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-  0xd4, 0x54, 0x00, 0x00, 0x08, 0xb5, 0x08, 0x4b, 0x00, 0x2b, 0x03, 0xd0,
-  0x07, 0x48, 0x08, 0x49, 0x00, 0xe0, 0x00, 0xbf, 0x07, 0x48, 0x03, 0x68,
-  0x00, 0x2b, 0x03, 0xd0, 0x06, 0x4b, 0x00, 0x2b, 0x00, 0xd0, 0x98, 0x47,
-  0x08, 0xbd, 0xc0, 0x46, 0x00, 0x00, 0x00, 0x00, 0xd4, 0x54, 0x00, 0x00,
-  0xa4, 0x00, 0x00, 0x20, 0x90, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
-  0xf0, 0xb5, 0x33, 0x4c, 0xa5, 0x44, 0x01, 0xf0, 0x49, 0xfe, 0x02, 0xf0,
-  0xfd, 0xfa, 0x01, 0x20, 0x01, 0xf0, 0x6c, 0xfd, 0x2f, 0x4d, 0x04, 0x21,
-  0x28, 0x1c, 0x00, 0xf0, 0xe3, 0xf9, 0x00, 0x28, 0x44, 0xd0, 0x2d, 0x4e,
-  0x28, 0x1c, 0x31, 0x1c, 0x00, 0xf0, 0xbc, 0xfa, 0x00, 0x28, 0x3d, 0xd0,
-  0x29, 0x1c, 0x01, 0xa8, 0x32, 0x1c, 0x01, 0x23, 0x00, 0xf0, 0x5e, 0xfa,
-  0x01, 0xa8, 0x00, 0xf0, 0xfc, 0xf8, 0x80, 0x21, 0x04, 0x1c, 0xc9, 0x01,
-  0x88, 0x42, 0x2d, 0xd9, 0x01, 0xa8, 0x00, 0xf0, 0xe2, 0xf8, 0x22, 0x4a,
-  0xc0, 0x21, 0xa7, 0x18, 0x21, 0x48, 0xc9, 0x01, 0x3a, 0x1c, 0x01, 0xf0,
-  0xf9, 0xfb, 0xc0, 0x24, 0xe4, 0x01, 0x80, 0x22, 0x0a, 0xa9, 0x92, 0x00,
-  0x01, 0xa8, 0x00, 0xf0, 0xcb, 0xf8, 0x80, 0x23, 0x21, 0x1c, 0x0a, 0xaa,
-  0x9b, 0x00, 0x19, 0x48, 0x01, 0xf0, 0x92, 0xfb, 0x80, 0x22, 0x92, 0x00,
-  0xa3, 0x18, 0x17, 0x4a, 0xa4, 0x18, 0xbc, 0x42, 0x01, 0xd2, 0x1c, 0x1c,
-  0xe9, 0xe7, 0x01, 0x24, 0x01, 0xa8, 0x00, 0xf0, 0xe9, 0xf8, 0x00, 0x2c,
-  0x06, 0xd0, 0x28, 0x1c, 0x31, 0x1c, 0x00, 0xf0, 0x8b, 0xfa, 0x01, 0xe0,
-  0x00, 0x24, 0xf3, 0xe7, 0xc0, 0x23, 0xdb, 0x01, 0x1b, 0x68, 0x83, 0xf3,
-  0x08, 0x88, 0x0c, 0x4b, 0xc0, 0x22, 0xd2, 0x01, 0x9a, 0x60, 0x0b, 0x4b,
-  0x1b, 0x68, 0x18, 0x47, 0x00, 0x20, 0x8b, 0x23, 0x9b, 0x00, 0x9d, 0x44,
-  0xf0, 0xbd, 0xc0, 0x46, 0xd4, 0xfd, 0xff, 0xff, 0xd4, 0x00, 0x00, 0x20,
-  0xb8, 0x49, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xbc, 0x00, 0x00, 0x20,
-  0x00, 0xa2, 0xff, 0xff, 0x00, 0xed, 0x00, 0xe0, 0x04, 0x60, 0x00, 0x00,
-  0x08, 0xb5, 0x00, 0x21, 0x02, 0x48, 0x0a, 0x1c, 0x01, 0xf0, 0x3c, 0xfb,
-  0x08, 0xbd, 0xc0, 0x46, 0xbc, 0x00, 0x00, 0x20, 0x13, 0xb5, 0x02, 0x68,
-  0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33, 0x54, 0x68, 0x19, 0x1c, 0x01, 0x22,
-  0xa0, 0x47, 0x16, 0xbd, 0x38, 0xb5, 0x04, 0x1c, 0x00, 0x6a, 0x00, 0x25,
-  0xa8, 0x42, 0x02, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x0a, 0xe0, 0x45, 0x60,
-  0x92, 0xb2, 0x01, 0xf0, 0x0b, 0xf8, 0x23, 0x6a, 0x5b, 0x68, 0x00, 0x2b,
-  0x02, 0xd0, 0x01, 0x23, 0x63, 0x60, 0x28, 0x1c, 0x38, 0xbd, 0x00, 0x6a,
-  0x08, 0xb5, 0x00, 0x28, 0x01, 0xd0, 0x00, 0xf0, 0x49, 0xfe, 0x08, 0xbd,
-  0x13, 0xb5, 0x6c, 0x46, 0x07, 0x34, 0x21, 0x1c, 0x01, 0x22, 0x00, 0xf0,
-  0x65, 0xfd, 0x01, 0x28, 0x01, 0xd1, 0x20, 0x78, 0x00, 0xe0, 0x01, 0x48,
-  0x00, 0xb2, 0x16, 0xbd, 0xff, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x08, 0xb5,
-  0x00, 0x28, 0x02, 0xd0, 0xff, 0xf7, 0xea, 0xff, 0x01, 0xe0, 0x01, 0x20,
-  0x40, 0x42, 0x08, 0xbd, 0x38, 0xb5, 0x05, 0x1c, 0x00, 0x6a, 0x00, 0x28,
-  0x0a, 0xd0, 0xff, 0xf7, 0xdf, 0xff, 0x04, 0x1c, 0x63, 0x1c, 0x05, 0xd0,
-  0x28, 0x6a, 0x01, 0x69, 0x01, 0x39, 0x00, 0xf0, 0xed, 0xfd, 0x20, 0x1c,
-  0x38, 0xbd, 0x00, 0x00, 0xf8, 0xb5, 0xfa, 0x23, 0x9b, 0x00, 0x83, 0x60,
-  0x0d, 0x4b, 0x00, 0x25, 0x08, 0x33, 0x04, 0x1c, 0x45, 0x60, 0x03, 0x60,
-  0x28, 0x20, 0x0f, 0x1c, 0x16, 0x1c, 0x02, 0xf0, 0x47, 0xfa, 0x20, 0x62,
-  0xa8, 0x42, 0x0a, 0xd0, 0x39, 0x1c, 0x28, 0x22, 0x02, 0xf0, 0x63, 0xfa,
-  0x20, 0x1c, 0x10, 0x30, 0x31, 0x1c, 0x0c, 0x22, 0x02, 0xf0, 0x28, 0xfb,
-  0x25, 0x77, 0x20, 0x1c, 0xf8, 0xbd, 0xc0, 0x46, 0xc8, 0x49, 0x00, 0x00,
-  0xfa, 0x22, 0x92, 0x00, 0x82, 0x60, 0x04, 0x4a, 0x00, 0x23, 0x08, 0x32,
-  0x43, 0x60, 0x02, 0x60, 0x03, 0x62, 0x03, 0x74, 0x70, 0x47, 0xc0, 0x46,
-  0xc8, 0x49, 0x00, 0x00, 0x00, 0x6a, 0x08, 0xb5, 0x00, 0x28, 0x01, 0xd0,
-  0x00, 0xf0, 0x0a, 0xfd, 0x08, 0xbd, 0x00, 0x6a, 0x08, 0xb5, 0x00, 0x28,
-  0x04, 0xd0, 0x00, 0xf0, 0xad, 0xfd, 0x43, 0x1e, 0x98, 0x41, 0xc0, 0xb2,
-  0x08, 0xbd, 0x03, 0x6a, 0x00, 0x2b, 0x01, 0xd0, 0x18, 0x69, 0x01, 0xe0,
-  0x01, 0x20, 0x40, 0x42, 0x70, 0x47, 0x00, 0x6a, 0x00, 0x28, 0x00, 0xd0,
-  0xc0, 0x69, 0x70, 0x47, 0x38, 0xb5, 0x04, 0x1c, 0x00, 0x6a, 0x00, 0x28,
-  0x0b, 0xd0, 0x20, 0x1c, 0xff, 0xf7, 0xf3, 0xff, 0x05, 0x1c, 0x20, 0x1c,
-  0xff, 0xf7, 0xe7, 0xff, 0x02, 0x4b, 0x28, 0x1a, 0x98, 0x42, 0x00, 0xd9,
-  0x18, 0x1c, 0x38, 0xbd, 0xff, 0x7f, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c,
-  0x00, 0x6a, 0x00, 0x28, 0x06, 0xd0, 0x00, 0xf0, 0xef, 0xfd, 0x20, 0x6a,
-  0x02, 0xf0, 0xf4, 0xf9, 0x00, 0x23, 0x23, 0x62, 0x10, 0xbd, 0x00, 0x00,
-  0x10, 0xb5, 0x0a, 0x1c, 0x0c, 0x49, 0x8a, 0xb0, 0x04, 0x1c, 0x00, 0x23,
-  0x00, 0x91, 0x69, 0x46, 0x4b, 0x72, 0x01, 0x93, 0x21, 0x1c, 0x68, 0x46,
-  0x01, 0x23, 0x00, 0xf0, 0x89, 0xfe, 0x04, 0x1c, 0x60, 0x1e, 0x84, 0x41,
-  0xe4, 0xb2, 0x00, 0x2c, 0x02, 0xd0, 0x68, 0x46, 0x00, 0xf0, 0xd0, 0xfd,
-  0x20, 0x1c, 0x0a, 0xb0, 0x10, 0xbd, 0xc0, 0x46, 0x08, 0x4a, 0x00, 0x00,
-  0x08, 0xb5, 0x01, 0x23, 0x00, 0x2a, 0x05, 0xd0, 0x00, 0xf0, 0x22, 0xff,
-  0x03, 0x1c, 0x58, 0x1e, 0x83, 0x41, 0xdb, 0xb2, 0x18, 0x1c, 0x08, 0xbd,
-  0x38, 0xb5, 0x01, 0x22, 0x05, 0x1c, 0x0c, 0x1c, 0x01, 0xf0, 0x9c, 0xf9,
-  0x02, 0x1c, 0x01, 0x20, 0x00, 0x2a, 0x03, 0xd1, 0x28, 0x1c, 0x21, 0x1c,
-  0x01, 0xf0, 0x94, 0xf9, 0x38, 0xbd, 0xf0, 0xb5, 0x0c, 0x68, 0x03, 0x5d,
-  0x2f, 0x3b, 0x5d, 0x42, 0x6b, 0x41, 0xe4, 0x18, 0x27, 0x1c, 0x0c, 0x37,
-  0x23, 0x1c, 0xc5, 0x5c, 0x1e, 0x1b, 0x2f, 0x2d, 0x09, 0xd0, 0x00, 0x2d,
-  0x07, 0xd0, 0x01, 0x33, 0x16, 0x1b, 0xf6, 0x18, 0x01, 0x3e, 0x35, 0x70,
-  0xbb, 0x42, 0xf2, 0xd1, 0x0c, 0x26, 0x00, 0x24, 0x94, 0x55, 0xc2, 0x5c,
-  0x2f, 0x3a, 0x54, 0x42, 0x62, 0x41, 0x9b, 0x18, 0x0b, 0x60, 0xc0, 0x5c,
-  0x43, 0x1e, 0x98, 0x41, 0xc0, 0xb2, 0xf0, 0xbd, 0xf0, 0xb5, 0xa1, 0xb0,
-  0x03, 0x90, 0x25, 0x48, 0x0d, 0x1c, 0x04, 0x92, 0x05, 0x93, 0x0c, 0xaa,
-  0x00, 0x23, 0x16, 0xa9, 0x0d, 0x93, 0x0c, 0x90, 0x53, 0x72, 0x17, 0x93,
-  0x16, 0x90, 0x4b, 0x72, 0x07, 0x93, 0x2c, 0x1c, 0x00, 0x92, 0x07, 0xa9,
-  0x08, 0xaa, 0x03, 0x98, 0xff, 0xf7, 0xc3, 0xff, 0x01, 0x26, 0x02, 0x1c,
-  0x72, 0x40, 0x01, 0x90, 0xd2, 0xb2, 0x20, 0x1c, 0x08, 0xa9, 0x05, 0x9b,
-  0x04, 0x9f, 0xb8, 0x47, 0x00, 0x28, 0x07, 0xd1, 0xac, 0x42, 0x01, 0xd1,
-  0x00, 0x20, 0x23, 0xe0, 0x20, 0x1c, 0x00, 0xf0, 0x5f, 0xfd, 0xf9, 0xe7,
-  0x01, 0x9f, 0x00, 0x2f, 0x11, 0xd0, 0x33, 0x1c, 0x00, 0x98, 0x21, 0x1c,
-  0x08, 0xaa, 0x00, 0xf0, 0x05, 0xfe, 0x06, 0x1c, 0xac, 0x42, 0x0f, 0xd0,
-  0x20, 0x1c, 0x00, 0xf0, 0x4f, 0xfd, 0x00, 0x2e, 0xe8, 0xd0, 0x23, 0x1c,
-  0x00, 0x9c, 0x00, 0x93, 0xd1, 0xe7, 0xac, 0x42, 0x02, 0xd0, 0x20, 0x1c,
-  0x00, 0xf0, 0x44, 0xfd, 0x30, 0x1c, 0x03, 0xe0, 0x00, 0x28, 0xdb, 0xd0,
-  0x16, 0xac, 0xf0, 0xe7, 0x21, 0xb0, 0xf0, 0xbd, 0x08, 0x4a, 0x00, 0x00,
-  0x38, 0xb5, 0x0a, 0x1c, 0x01, 0x21, 0x04, 0x1c, 0x00, 0xf0, 0xd6, 0xf9,
-  0x00, 0x28, 0x01, 0xd1, 0x00, 0x20, 0x0f, 0xe0, 0x25, 0x1c, 0x10, 0x35,
-  0x28, 0x1c, 0x21, 0x1c, 0xff, 0xf7, 0x6c, 0xff, 0x00, 0x28, 0xf5, 0xd0,
-  0x20, 0x1c, 0x38, 0x30, 0x29, 0x1c, 0x00, 0xf0, 0xe1, 0xfb, 0x43, 0x1e,
-  0x98, 0x41, 0xc0, 0xb2, 0x38, 0xbd, 0x00, 0x00, 0x4b, 0x68, 0x43, 0x60,
-  0x0a, 0x4b, 0x03, 0x60, 0x0b, 0x7a, 0x03, 0x72, 0x4b, 0x7a, 0x43, 0x72,
-  0xcb, 0x68, 0xc3, 0x60, 0x0b, 0x69, 0x03, 0x61, 0x4b, 0x69, 0x43, 0x61,
-  0x0b, 0x7e, 0x03, 0x76, 0xcb, 0x69, 0xc3, 0x61, 0x0b, 0x6a, 0x49, 0x6a,
-  0x03, 0x62, 0x41, 0x62, 0x70, 0x47, 0xc0, 0x46, 0x08, 0x4a, 0x00, 0x00,
-  0xf0, 0xb5, 0x9d, 0xb0, 0x05, 0x1c, 0x38, 0x31, 0x08, 0xa8, 0x02, 0x92,
-  0x03, 0x93, 0xff, 0xf7, 0xdd, 0xff, 0x24, 0x4a, 0x12, 0xaf, 0x00, 0x23,
-  0x02, 0x9c, 0x7b, 0x60, 0x12, 0x92, 0x7b, 0x72, 0x08, 0xae, 0x20, 0x1c,
-  0x2f, 0x21, 0x02, 0xf0, 0xcf, 0xf9, 0x00, 0x28, 0x2e, 0xd0, 0x23, 0x78,
-  0x2f, 0x2b, 0x01, 0xd1, 0x01, 0x34, 0xf4, 0xe7, 0x00, 0x1b, 0xc0, 0xb2,
-  0x03, 0x1c, 0x0c, 0x28, 0x00, 0xd9, 0x0c, 0x23, 0xdb, 0xb2, 0x1a, 0x1c,
-  0x21, 0x1c, 0x04, 0xa8, 0x01, 0x93, 0x02, 0xf0, 0xc7, 0xf9, 0x01, 0x9a,
-  0x00, 0x23, 0x04, 0xa9, 0x38, 0x1c, 0x8b, 0x54, 0x00, 0xf0, 0xd4, 0xfc,
-  0x38, 0x1c, 0x31, 0x1c, 0x04, 0xaa, 0x01, 0x23, 0x00, 0xf0, 0x7e, 0xfd,
-  0x00, 0x28, 0x04, 0xd1, 0x0c, 0x4b, 0x68, 0x60, 0x2b, 0x60, 0x68, 0x72,
-  0x10, 0xe0, 0x01, 0x9b, 0x30, 0x1c, 0xe4, 0x18, 0x00, 0xf0, 0xc2, 0xfc,
-  0x33, 0x1c, 0x3e, 0x1c, 0x1f, 0x1c, 0xca, 0xe7, 0x02, 0x99, 0x03, 0x9a,
-  0x64, 0x1a, 0x14, 0x60, 0x28, 0x1c, 0x31, 0x1c, 0xff, 0xf7, 0x98, 0xff,
-  0x28, 0x1c, 0x1d, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0x08, 0x4a, 0x00, 0x00,
-  0xf0, 0xb5, 0xa3, 0xb0, 0x05, 0x1c, 0x1f, 0x1c, 0x04, 0xa8, 0x03, 0xab,
-  0x16, 0x1c, 0x01, 0x91, 0xff, 0xf7, 0xa2, 0xff, 0x03, 0x9b, 0xf6, 0x18,
-  0x33, 0x78, 0x00, 0x2b, 0x07, 0xd1, 0x04, 0xa9, 0x18, 0xa8, 0xff, 0xf7,
-  0x7f, 0xff, 0x28, 0x1c, 0x18, 0xa9, 0x1e, 0x4a, 0x34, 0xe0, 0x00, 0x23,
-  0x0e, 0xac, 0x63, 0x60, 0x63, 0x72, 0x6b, 0x46, 0x19, 0x33, 0x1b, 0x4a,
-  0x1b, 0x78, 0x0e, 0x92, 0x00, 0x2b, 0x03, 0xd1, 0x28, 0x1c, 0xff, 0xf7,
-  0x55, 0xfe, 0x27, 0xe0, 0x02, 0x3b, 0x01, 0x2b, 0x09, 0xd8, 0x01, 0x99,
-  0x20, 0x1c, 0x38, 0x31, 0x32, 0x1c, 0x3b, 0x1c, 0x00, 0xf0, 0x30, 0xfd,
-  0x00, 0x28, 0x0b, 0xd1, 0xee, 0xe7, 0x20, 0x1c, 0x04, 0xa9, 0x32, 0x1c,
-  0x3b, 0x1c, 0x00, 0xf0, 0x27, 0xfd, 0x00, 0x28, 0xe6, 0xd0, 0x04, 0xa8,
-  0x00, 0xf0, 0x72, 0xfc, 0x06, 0x23, 0x1f, 0x42, 0x03, 0xd0, 0x20, 0x1c,
-  0x15, 0x99, 0x00, 0xf0, 0xfd, 0xfb, 0x21, 0x1c, 0x18, 0xa8, 0xff, 0xf7,
-  0x49, 0xff, 0x28, 0x1c, 0x18, 0xa9, 0x32, 0x1c, 0xff, 0xf7, 0x0a, 0xfe,
-  0x28, 0x1c, 0x23, 0xb0, 0xf0, 0xbd, 0xc0, 0x46, 0xe8, 0x49, 0x00, 0x00,
-  0x08, 0x4a, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x1c, 0x08, 0x1c, 0x19, 0x1c,
-  0x38, 0x31, 0x02, 0x4a, 0x00, 0x23, 0xff, 0xf7, 0xc7, 0xfe, 0x08, 0xbd,
-  0x9d, 0x23, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x1c, 0x08, 0x1c, 0x19, 0x1c,
-  0x38, 0x31, 0x02, 0x4a, 0x00, 0x23, 0xff, 0xf7, 0xbb, 0xfe, 0x08, 0xbd,
-  0xd9, 0x23, 0x00, 0x00, 0x08, 0x4b, 0x02, 0x21, 0x19, 0x61, 0x19, 0x1c,
-  0x00, 0x22, 0x30, 0x31, 0x0a, 0x70, 0x06, 0x49, 0x5a, 0x71, 0x9a, 0x71,
-  0x9a, 0x72, 0x1a, 0x73, 0xda, 0x63, 0x99, 0x63, 0x41, 0x33, 0x1a, 0x70,
-  0x70, 0x47, 0xc0, 0x46, 0xd4, 0x00, 0x00, 0x20, 0x08, 0x4a, 0x00, 0x00,
-  0x08, 0xb5, 0x01, 0x1c, 0x01, 0x48, 0x01, 0xf0, 0xb1, 0xf9, 0x08, 0xbd,
-  0x78, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x02, 0x48, 0xff, 0x21, 0x01, 0xf0,
-  0xa9, 0xf9, 0x08, 0xbd, 0x78, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x01, 0x21,
-  0x00, 0x79, 0x01, 0xf0, 0x3f, 0xfc, 0x05, 0x4b, 0x1a, 0x78, 0x00, 0x2a,
-  0x04, 0xd0, 0x00, 0x22, 0x03, 0x48, 0x1a, 0x70, 0x01, 0xf0, 0x86, 0xf9,
-  0x08, 0xbd, 0xc0, 0x46, 0x40, 0x01, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x10, 0xb5, 0x08, 0x4b, 0x04, 0x1c, 0x1a, 0x78, 0x00, 0x2a, 0x06, 0xd1,
-  0x01, 0x22, 0x1a, 0x70, 0x05, 0x4b, 0x06, 0x48, 0x06, 0xcb, 0x01, 0xf0,
-  0x57, 0xf9, 0x20, 0x79, 0x00, 0x21, 0x01, 0xf0, 0x1f, 0xfc, 0x10, 0xbd,
-  0x40, 0x01, 0x00, 0x20, 0x38, 0x01, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x10, 0xb5, 0x83, 0x79, 0x04, 0x1c, 0x00, 0x2b, 0x0d, 0xd0, 0x23, 0x89,
-  0x5a, 0x1c, 0x22, 0x81, 0x05, 0x4a, 0x93, 0x42, 0x02, 0xd8, 0xff, 0xf7,
-  0xbf, 0xff, 0xf6, 0xe7, 0x20, 0x1c, 0xff, 0xf7, 0xc3, 0xff, 0x00, 0x23,
-  0xa3, 0x71, 0x10, 0xbd, 0x01, 0x02, 0x00, 0x00, 0x00, 0xb5, 0x06, 0x29,
-  0x03, 0xd9, 0x16, 0x23, 0x43, 0x71, 0x00, 0x20, 0x1c, 0xe0, 0x0f, 0x4b,
-  0x05, 0x29, 0x13, 0xd8, 0x08, 0x1c, 0x00, 0x22, 0x01, 0xf0, 0x4a, 0xff,
-  0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0b, 0x49, 0x08, 0xe0, 0x0b, 0x49,
-  0x06, 0xe0, 0x0b, 0x49, 0x04, 0xe0, 0x0b, 0x49, 0x02, 0xe0, 0x0b, 0x49,
-  0x00, 0xe0, 0x0b, 0x49, 0x19, 0x60, 0x02, 0xe0, 0x0a, 0x4a, 0x1a, 0x60,
-  0x00, 0x22, 0x1a, 0x71, 0x5a, 0x71, 0x01, 0x20, 0x00, 0xbd, 0xc0, 0x46,
-  0x38, 0x01, 0x00, 0x20, 0x00, 0x1b, 0xb7, 0x00, 0x00, 0x09, 0x3d, 0x00,
-  0x80, 0x84, 0x1e, 0x00, 0x40, 0x42, 0x0f, 0x00, 0x20, 0xa1, 0x07, 0x00,
-  0x90, 0xd0, 0x03, 0x00, 0x48, 0xe8, 0x01, 0x00, 0x38, 0xb5, 0x0c, 0x1c,
-  0x01, 0xf0, 0xe4, 0xf9, 0x05, 0x1c, 0xff, 0xf7, 0x79, 0xff, 0xff, 0x28,
-  0x08, 0xd0, 0x01, 0xf0, 0xdd, 0xf9, 0xab, 0xb2, 0x80, 0xb2, 0xc0, 0x1a,
-  0xa0, 0x42, 0xf4, 0xdb, 0x00, 0x20, 0x00, 0xe0, 0x01, 0x20, 0x38, 0xbd,
-  0xf8, 0xb5, 0x04, 0x1c, 0x0e, 0x1c, 0x17, 0x1c, 0xff, 0xf7, 0x9a, 0xff,
-  0x20, 0x1c, 0xff, 0xf7, 0x7f, 0xff, 0x96, 0x21, 0x49, 0x00, 0x20, 0x1c,
-  0xff, 0xf7, 0xde, 0xff, 0x40, 0x20, 0x30, 0x43, 0xff, 0xf7, 0x52, 0xff,
-  0x18, 0x25, 0x38, 0x1c, 0xe8, 0x40, 0xc0, 0xb2, 0x08, 0x3d, 0xff, 0xf7,
-  0x4b, 0xff, 0x2b, 0x1c, 0x08, 0x33, 0xf6, 0xd1, 0x95, 0x20, 0x00, 0x2e,
-  0x03, 0xd0, 0x87, 0x20, 0x08, 0x2e, 0x00, 0xd0, 0xff, 0x20, 0xff, 0xf7,
-  0x3f, 0xff, 0x00, 0x25, 0xff, 0xf7, 0x44, 0xff, 0x43, 0xb2, 0xe0, 0x72,
-  0x00, 0x2b, 0x04, 0xda, 0xff, 0x2d, 0x02, 0xd0, 0x01, 0x35, 0xed, 0xb2,
-  0xf4, 0xe7, 0xf8, 0xbd, 0xf7, 0xb5, 0x00, 0x25, 0x02, 0x71, 0x05, 0x73,
-  0x85, 0x72, 0x85, 0x71, 0x45, 0x71, 0x04, 0x1c, 0x01, 0x91, 0x01, 0xf0,
-  0x97, 0xf9, 0x01, 0x21, 0x87, 0xb2, 0x20, 0x79, 0x01, 0xf0, 0x16, 0xfb,
-  0x01, 0x21, 0x20, 0x79, 0x01, 0xf0, 0x72, 0xfb, 0x43, 0x4e, 0x30, 0x1c,
-  0x01, 0xf0, 0x7a, 0xf8, 0x42, 0x4b, 0x43, 0x49, 0x1d, 0x71, 0x5d, 0x71,
-  0x19, 0x60, 0x30, 0x1c, 0x5a, 0x68, 0x01, 0xf0, 0x99, 0xf8, 0x0a, 0x25,
-  0x01, 0x3d, 0xff, 0x20, 0xed, 0xb2, 0xff, 0xf7, 0x0b, 0xff, 0x00, 0x2d,
-  0xf8, 0xd1, 0x30, 0x1c, 0x01, 0xf0, 0xaa, 0xf8, 0x20, 0x1c, 0xff, 0xf7,
-  0x27, 0xff, 0x00, 0x21, 0x20, 0x1c, 0x0a, 0x1c, 0xff, 0xf7, 0x9a, 0xff,
-  0x06, 0x1c, 0xe0, 0x72, 0x01, 0x28, 0x09, 0xd0, 0x01, 0xf0, 0x68, 0xf9,
-  0xc0, 0x1b, 0xfa, 0x23, 0x80, 0xb2, 0xdb, 0x00, 0x98, 0x42, 0xee, 0xd9,
-  0x01, 0x23, 0x3c, 0xe0, 0xd5, 0x22, 0x20, 0x1c, 0x08, 0x21, 0x52, 0x00,
-  0xff, 0xf7, 0x86, 0xff, 0x04, 0x23, 0x18, 0x42, 0x01, 0xd0, 0x26, 0x73,
-  0x0b, 0xe0, 0x1e, 0x1c, 0xff, 0xf7, 0xea, 0xfe, 0x01, 0x3e, 0xf6, 0xb2,
-  0xe0, 0x72, 0x00, 0x2e, 0xf8, 0xd1, 0x02, 0x23, 0xaa, 0x28, 0x26, 0xd1,
-  0x23, 0x73, 0x26, 0x7b, 0x02, 0x3e, 0x73, 0x42, 0x5e, 0x41, 0xb6, 0x07,
-  0x37, 0x21, 0x00, 0x22, 0x20, 0x1c, 0xff, 0xf7, 0x6b, 0xff, 0x32, 0x1c,
-  0x20, 0x1c, 0x29, 0x21, 0xff, 0xf7, 0x66, 0xff, 0x02, 0x1c, 0xe0, 0x72,
-  0x09, 0xd0, 0x01, 0xf0, 0x35, 0xf9, 0xc0, 0x1b, 0xfa, 0x23, 0x80, 0xb2,
-  0xdb, 0x00, 0x98, 0x42, 0xea, 0xd9, 0x08, 0x23, 0x09, 0xe0, 0x23, 0x7b,
-  0x02, 0x2b, 0x19, 0xd1, 0x20, 0x1c, 0x3a, 0x21, 0xff, 0xf7, 0x52, 0xff,
-  0x00, 0x28, 0x05, 0xd0, 0x06, 0x23, 0x63, 0x71, 0x20, 0x1c, 0xff, 0xf7,
-  0xbf, 0xfe, 0x15, 0xe0, 0xff, 0xf7, 0xb4, 0xfe, 0xc0, 0x23, 0x18, 0x40,
-  0x98, 0x42, 0x01, 0xd1, 0x03, 0x23, 0x23, 0x73, 0xff, 0xf7, 0xac, 0xfe,
-  0xff, 0xf7, 0xaa, 0xfe, 0xff, 0xf7, 0xa8, 0xfe, 0x20, 0x1c, 0xff, 0xf7,
-  0xad, 0xfe, 0x20, 0x1c, 0x01, 0x99, 0xff, 0xf7, 0xeb, 0xfe, 0x05, 0x1c,
-  0x28, 0x1c, 0xfe, 0xbd, 0x78, 0x07, 0x00, 0x20, 0x38, 0x01, 0x00, 0x20,
-  0x90, 0xd0, 0x03, 0x00, 0x38, 0xb5, 0x04, 0x1c, 0x01, 0xf0, 0xfc, 0xf8,
-  0x05, 0x1c, 0xff, 0xf7, 0x91, 0xfe, 0xe0, 0x72, 0xff, 0x28, 0x0a, 0xd1,
-  0x01, 0xf0, 0xf4, 0xf8, 0xab, 0xb2, 0x80, 0xb2, 0xc0, 0x1a, 0x96, 0x23,
-  0x5b, 0x00, 0x98, 0x42, 0xf1, 0xdd, 0x0f, 0x23, 0x02, 0xe0, 0xfe, 0x28,
-  0x06, 0xd0, 0x0d, 0x23, 0x20, 0x1c, 0x63, 0x71, 0xff, 0xf7, 0x84, 0xfe,
-  0x00, 0x20, 0x00, 0xe0, 0x01, 0x20, 0x38, 0xbd, 0xf8, 0xb5, 0x04, 0x1c,
-  0x0f, 0x1c, 0x15, 0x1c, 0x1e, 0x1e, 0x45, 0xd0, 0x9a, 0x18, 0x80, 0x23,
-  0x9b, 0x00, 0x9a, 0x42, 0x42, 0xdc, 0x83, 0x79, 0x00, 0x2b, 0x05, 0xd0,
-  0x02, 0x68, 0x91, 0x42, 0x02, 0xd1, 0x03, 0x89, 0xab, 0x42, 0x16, 0xd9,
-  0x23, 0x7b, 0x27, 0x60, 0x03, 0x2b, 0x00, 0xd0, 0x7f, 0x02, 0x3a, 0x1c,
-  0x20, 0x1c, 0x11, 0x21, 0xff, 0xf7, 0xee, 0xfe, 0x07, 0x1e, 0x02, 0xd0,
-  0x03, 0x23, 0x63, 0x71, 0x2a, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0xba, 0xff,
-  0x00, 0x28, 0x25, 0xd0, 0x01, 0x23, 0x27, 0x81, 0xa3, 0x71, 0x23, 0x89,
-  0xab, 0x42, 0x05, 0xd2, 0xff, 0xf7, 0x48, 0xfe, 0x23, 0x89, 0x01, 0x33,
-  0x23, 0x81, 0xf6, 0xe7, 0x06, 0x9d, 0x06, 0x9a, 0xab, 0x1a, 0x9b, 0xb2,
-  0xb3, 0x42, 0x04, 0xd2, 0xff, 0xf7, 0x3c, 0xfe, 0x28, 0x70, 0x01, 0x35,
-  0xf5, 0xe7, 0x23, 0x89, 0xa2, 0x7a, 0xf3, 0x18, 0x9b, 0xb2, 0x23, 0x81,
-  0x00, 0x2a, 0x02, 0xd0, 0x06, 0x4a, 0x93, 0x42, 0x02, 0xd9, 0x20, 0x1c,
-  0xff, 0xf7, 0x60, 0xfe, 0x01, 0x20, 0x03, 0xe0, 0x20, 0x1c, 0xff, 0xf7,
-  0x2f, 0xfe, 0x00, 0x20, 0xf8, 0xbd, 0xc0, 0x46, 0xff, 0x01, 0x00, 0x00,
-  0x07, 0xb5, 0x80, 0x23, 0x00, 0x92, 0x9b, 0x00, 0x00, 0x22, 0xff, 0xf7,
-  0xa3, 0xff, 0x0e, 0xbd, 0x70, 0xb5, 0x05, 0x1c, 0x08, 0x1c, 0x16, 0x1c,
-  0xff, 0xf7, 0x0c, 0xfe, 0x00, 0x24, 0x30, 0x5d, 0xff, 0xf7, 0x08, 0xfe,
-  0x01, 0x34, 0x80, 0x23, 0x9b, 0x00, 0x9c, 0x42, 0xf7, 0xd1, 0xff, 0x20,
-  0xff, 0xf7, 0x00, 0xfe, 0xff, 0x20, 0xff, 0xf7, 0xfd, 0xfd, 0xff, 0xf7,
-  0x03, 0xfe, 0x1f, 0x23, 0xe8, 0x72, 0x03, 0x40, 0x01, 0x20, 0x05, 0x2b,
-  0x05, 0xd0, 0x11, 0x23, 0x28, 0x1c, 0x6b, 0x71, 0xff, 0xf7, 0x00, 0xfe,
-  0x00, 0x20, 0x70, 0xbd, 0x70, 0xb5, 0x0b, 0x1c, 0x04, 0x1c, 0x16, 0x1c,
-  0x00, 0x29, 0x01, 0xd1, 0x12, 0x23, 0x28, 0xe0, 0x02, 0x7b, 0x03, 0x2a,
-  0x00, 0xd0, 0x4b, 0x02, 0x20, 0x1c, 0x18, 0x21, 0x1a, 0x1c, 0xff, 0xf7,
-  0x79, 0xfe, 0x05, 0x1e, 0x01, 0xd0, 0x04, 0x23, 0x1b, 0xe0, 0x20, 0x1c,
-  0xfe, 0x21, 0x32, 0x1c, 0xff, 0xf7, 0xc2, 0xff, 0x00, 0x28, 0x15, 0xd0,
-  0x96, 0x21, 0x20, 0x1c, 0x89, 0x00, 0xff, 0xf7, 0x55, 0xfe, 0x00, 0x28,
-  0x01, 0xd1, 0x15, 0x23, 0x0b, 0xe0, 0x20, 0x1c, 0x0d, 0x21, 0x2a, 0x1c,
-  0xff, 0xf7, 0x60, 0xfe, 0x00, 0x28, 0x03, 0xd1, 0xff, 0xf7, 0xc8, 0xfd,
-  0x00, 0x28, 0x06, 0xd0, 0x14, 0x23, 0x63, 0x71, 0x20, 0x1c, 0xff, 0xf7,
-  0xc9, 0xfd, 0x00, 0x20, 0x03, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0xc4, 0xfd,
-  0x01, 0x20, 0x70, 0xbd, 0x03, 0x4b, 0x04, 0x4a, 0x1a, 0x60, 0x00, 0x22,
-  0x5a, 0x71, 0x1a, 0x71, 0x70, 0x47, 0xc0, 0x46, 0x38, 0x01, 0x00, 0x20,
-  0x00, 0x09, 0x3d, 0x00, 0x02, 0x1c, 0x10, 0xb5, 0x0c, 0x32, 0x04, 0x1c,
-  0x01, 0x21, 0x40, 0x6a, 0x00, 0xf0, 0x24, 0xfd, 0x00, 0x28, 0x0a, 0xd0,
-  0x23, 0x6a, 0x01, 0x20, 0x00, 0x2b, 0x06, 0xd1, 0xe3, 0x68, 0x22, 0x7a,
-  0x23, 0x62, 0x80, 0x23, 0x5b, 0x42, 0x13, 0x43, 0x23, 0x72, 0x10, 0xbd,
-  0x70, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xe6, 0xff, 0x00, 0x28, 0x01, 0xd1,
-  0x00, 0x20, 0x1b, 0xe0, 0x63, 0x6a, 0xe6, 0x68, 0x1a, 0x7c, 0x02, 0x3e,
-  0x96, 0x40, 0x5a, 0x69, 0x1d, 0x79, 0xb6, 0x18, 0x00, 0x2d, 0x08, 0xd0,
-  0x70, 0x1e, 0x40, 0x19, 0x00, 0xf0, 0x4c, 0xfc, 0x00, 0x28, 0xed, 0xd0,
-  0x01, 0x3d, 0xed, 0xb2, 0xf4, 0xe7, 0x63, 0x6a, 0x01, 0x20, 0x1a, 0x7c,
-  0x80, 0x23, 0x9b, 0x00, 0x93, 0x40, 0xe2, 0x69, 0xd3, 0x18, 0xe3, 0x61,
-  0x70, 0xbd, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c, 0x40, 0x69, 0x00, 0xf0,
-  0x13, 0xfc, 0x00, 0x28, 0x03, 0xd0, 0x20, 0x7e, 0x01, 0x4b, 0x40, 0x01,
-  0xc0, 0x18, 0x10, 0xbd, 0x50, 0x01, 0x00, 0x20, 0xf0, 0xb5, 0x00, 0x23,
-  0x87, 0xb0, 0x07, 0x1c, 0x0e, 0x1c, 0x20, 0x22, 0xf2, 0x54, 0x01, 0x33,
-  0x0b, 0x2b, 0xfa, 0xd1, 0x07, 0x21, 0x00, 0x25, 0x01, 0x91, 0x3c, 0x78,
-  0x00, 0x2c, 0x2a, 0xd0, 0x2e, 0x2c, 0x06, 0xd1, 0x01, 0x9b, 0x0a, 0x2b,
-  0x2b, 0xd0, 0x0a, 0x21, 0x08, 0x25, 0x01, 0x91, 0x1f, 0xe0, 0x02, 0xa8,
-  0x14, 0x49, 0x10, 0x22, 0x01, 0xf0, 0x8b, 0xfd, 0x00, 0x23, 0x02, 0xa9,
-  0xca, 0x5c, 0x00, 0x2a, 0x03, 0xd0, 0x01, 0x33, 0xa2, 0x42, 0xf8, 0xd1,
-  0x19, 0xe0, 0x01, 0x9b, 0x9d, 0x42, 0x16, 0xd8, 0x23, 0x1c, 0x21, 0x3b,
-  0x5d, 0x2b, 0x12, 0xd8, 0x22, 0x1c, 0x6b, 0x1c, 0x61, 0x3a, 0xdb, 0xb2,
-  0x75, 0x19, 0x19, 0x2a, 0x01, 0xd8, 0x20, 0x3c, 0xe4, 0xb2, 0x2c, 0x70,
-  0x1d, 0x1c, 0x01, 0x37, 0xd1, 0xe7, 0x30, 0x78, 0x20, 0x38, 0x43, 0x1e,
-  0x98, 0x41, 0xc0, 0xb2, 0x00, 0xe0, 0x00, 0x20, 0x07, 0xb0, 0xf0, 0xbd,
-  0xea, 0x49, 0x00, 0x00, 0x38, 0xb5, 0x42, 0x7a, 0x04, 0x1c, 0x0d, 0x1c,
-  0x00, 0x2a, 0x01, 0xd0, 0x00, 0x20, 0x1f, 0xe0, 0x4b, 0x1c, 0xdb, 0x7f,
-  0x10, 0x2b, 0x06, 0xd1, 0x02, 0x23, 0x43, 0x72, 0x02, 0x62, 0x4b, 0x8c,
-  0x5b, 0x01, 0xc3, 0x61, 0x0c, 0xe0, 0x20, 0x2b, 0xf0, 0xd1, 0x03, 0x23,
-  0x43, 0x72, 0x49, 0x6a, 0x22, 0x1c, 0x01, 0x62, 0x1c, 0x32, 0x28, 0x1c,
-  0x00, 0xf0, 0x18, 0xfc, 0x00, 0x28, 0xe5, 0xd0, 0x00, 0x23, 0x01, 0x20,
-  0x65, 0x62, 0x20, 0x72, 0xe3, 0x60, 0x23, 0x61, 0x63, 0x61, 0x23, 0x76,
-  0x38, 0xbd, 0x00, 0x00, 0xf0, 0xb5, 0x43, 0x7a, 0x85, 0xb0, 0x04, 0x1c,
-  0x0e, 0x1c, 0x03, 0x92, 0x00, 0x2b, 0x01, 0xd1, 0x3a, 0x48, 0x11, 0xe0,
-  0x03, 0x7a, 0xd8, 0x07, 0xfa, 0xd5, 0xe2, 0x69, 0x20, 0x69, 0x03, 0x99,
-  0x13, 0x1a, 0x99, 0x42, 0x01, 0xd9, 0x9b, 0xb2, 0x03, 0x93, 0x03, 0x99,
-  0x02, 0x91, 0x02, 0x9b, 0x00, 0x2b, 0x04, 0xd1, 0x03, 0x99, 0x88, 0xb2,
-  0x00, 0xb2, 0x05, 0xb0, 0xf0, 0xbd, 0x23, 0x69, 0x61, 0x7a, 0xdf, 0x05,
-  0xff, 0x0d, 0x5a, 0x0a, 0x60, 0x6a, 0x02, 0x29, 0x02, 0xd1, 0x41, 0x6a,
-  0x51, 0x18, 0x1b, 0xe0, 0x05, 0x79, 0x01, 0x3d, 0x2a, 0x40, 0xd5, 0xb2,
-  0x00, 0x2f, 0x0d, 0xd1, 0x00, 0x2d, 0x0b, 0xd1, 0x00, 0x2b, 0x02, 0xd1,
-  0x22, 0x6a, 0xe2, 0x60, 0x06, 0xe0, 0x22, 0x1c, 0xe1, 0x68, 0x0c, 0x32,
-  0x00, 0xf0, 0xa0, 0xfb, 0x00, 0x28, 0xc9, 0xd0, 0x63, 0x6a, 0xe1, 0x68,
-  0x1a, 0x7c, 0x02, 0x39, 0x5b, 0x69, 0x91, 0x40, 0xc9, 0x18, 0x49, 0x19,
-  0x80, 0x22, 0x02, 0x9d, 0x92, 0x00, 0xd3, 0x1b, 0x9d, 0x42, 0x00, 0xdd,
-  0x9d, 0xb2, 0x23, 0x7a, 0x58, 0x06, 0x01, 0xd4, 0x95, 0x42, 0x18, 0xd1,
-  0x16, 0x4b, 0x1b, 0x68, 0x99, 0x42, 0x14, 0xd0, 0x15, 0x4b, 0x3a, 0x1c,
-  0x18, 0x68, 0x00, 0x96, 0x2b, 0x1c, 0xff, 0xf7, 0x1f, 0xfe, 0x00, 0x28,
-  0xa8, 0xd0, 0x76, 0x19, 0x01, 0xe0, 0xdf, 0x1b, 0xf6, 0x19, 0x21, 0x69,
-  0x02, 0x9a, 0x4b, 0x19, 0x55, 0x1b, 0xad, 0xb2, 0x23, 0x61, 0x02, 0x95,
-  0xab, 0xe7, 0x08, 0x1c, 0x00, 0x21, 0x00, 0xf0, 0x2b, 0xfb, 0x00, 0x28,
-  0x96, 0xd0, 0x09, 0x4b, 0x32, 0x1c, 0xff, 0x18, 0x79, 0x19, 0x3b, 0x1c,
-  0x8b, 0x42, 0xe8, 0xd0, 0x18, 0x78, 0x01, 0x33, 0x10, 0x70, 0x01, 0x32,
-  0xf8, 0xe7, 0xc0, 0x46, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x73, 0xb5, 0x43, 0x7a,
-  0x04, 0x1c, 0x01, 0x2b, 0x01, 0xd8, 0x00, 0x20, 0x16, 0xe0, 0x03, 0x69,
-  0x6d, 0x46, 0x07, 0x35, 0xde, 0x05, 0x29, 0x1c, 0x01, 0x22, 0x36, 0x0f,
-  0xff, 0xf7, 0x6a, 0xff, 0x01, 0x28, 0x01, 0xd1, 0x2b, 0x78, 0x00, 0xe0,
-  0x05, 0x4b, 0x1b, 0xb2, 0x01, 0x33, 0xec, 0xd0, 0x23, 0x69, 0x70, 0x01,
-  0x1f, 0x33, 0x23, 0x61, 0x02, 0x4b, 0xc0, 0x18, 0x76, 0xbd, 0xc0, 0x46,
-  0xff, 0xff, 0x00, 0x00, 0x50, 0x01, 0x00, 0x20, 0x70, 0xb5, 0x04, 0x1c,
-  0x40, 0x7a, 0x0d, 0x1c, 0x00, 0x28, 0x2a, 0xd0, 0xe2, 0x69, 0x91, 0x42,
-  0x01, 0xd9, 0x00, 0x20, 0x25, 0xe0, 0x02, 0x28, 0x21, 0xd0, 0x00, 0x2d,
-  0x01, 0xd1, 0xe5, 0x60, 0x1d, 0xe0, 0x62, 0x6a, 0x21, 0x69, 0x13, 0x7c,
-  0x68, 0x1e, 0x09, 0x33, 0x4a, 0x1e, 0xd8, 0x40, 0xda, 0x40, 0x03, 0x1e,
-  0x93, 0x42, 0x01, 0xd3, 0x00, 0x29, 0x02, 0xd1, 0x22, 0x6a, 0xe2, 0x60,
-  0x00, 0xe0, 0x83, 0x1a, 0x1e, 0x1c, 0x00, 0x2e, 0x09, 0xd0, 0x22, 0x1c,
-  0x60, 0x6a, 0xe1, 0x68, 0x0c, 0x32, 0x00, 0xf0, 0x07, 0xfb, 0x01, 0x3e,
-  0x00, 0x28, 0xf4, 0xd1, 0x01, 0xe0, 0x25, 0x61, 0x01, 0x20, 0x70, 0xbd,
-  0x38, 0xb5, 0x05, 0x1c, 0x40, 0x7a, 0x00, 0x28, 0x33, 0xd0, 0x2b, 0x7a,
-  0x7f, 0x2b, 0x2d, 0xd9, 0x28, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x9a, 0xfe,
-  0x04, 0x1e, 0x2a, 0xd0, 0x6b, 0x7a, 0x01, 0x2b, 0x07, 0xd8, 0x2b, 0x7f,
-  0x03, 0x77, 0x6b, 0x7f, 0x43, 0x77, 0xab, 0x7f, 0x83, 0x77, 0xeb, 0x7f,
-  0xc3, 0x77, 0x2b, 0x6a, 0x9a, 0xb2, 0x1b, 0x0c, 0x23, 0x75, 0x1b, 0x0a,
-  0x63, 0x75, 0x0d, 0x4b, 0xa2, 0x76, 0x1b, 0x68, 0x12, 0x0a, 0xe2, 0x76,
-  0x00, 0x2b, 0x0b, 0xd0, 0x20, 0x1c, 0x21, 0x1c, 0x18, 0x30, 0x16, 0x31,
-  0x98, 0x47, 0x63, 0x7e, 0x22, 0x7e, 0x1b, 0x02, 0x13, 0x43, 0xa3, 0x74,
-  0x1b, 0x0a, 0xe3, 0x74, 0x2a, 0x7a, 0x7f, 0x23, 0x13, 0x40, 0x2b, 0x72,
-  0x00, 0xf0, 0x5c, 0xfa, 0xff, 0xe7, 0x38, 0xbd, 0x44, 0x01, 0x00, 0x20,
-  0x10, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xc0, 0xff, 0x00, 0x28, 0x02, 0xd0,
-  0x00, 0x23, 0x63, 0x72, 0x01, 0x20, 0x10, 0xbd, 0x73, 0xb5, 0x42, 0x7a,
-  0x04, 0x1c, 0x0d, 0x1c, 0x00, 0x20, 0x01, 0x2a, 0x4b, 0xd1, 0x20, 0x7a,
-  0x02, 0x23, 0x18, 0x40, 0x47, 0xd0, 0xe3, 0x69, 0x00, 0x20, 0x99, 0x42,
-  0x43, 0xd8, 0x10, 0x1c, 0x00, 0x2b, 0x40, 0xd0, 0x20, 0x1c, 0x29, 0x1c,
-  0x26, 0x69, 0xff, 0xf7, 0x71, 0xff, 0x00, 0x28, 0x25, 0xd0, 0x60, 0x6a,
-  0x00, 0x2d, 0x06, 0xd1, 0x21, 0x6a, 0x00, 0xf0, 0x95, 0xfb, 0x00, 0x28,
-  0x1d, 0xd0, 0x25, 0x62, 0x1d, 0xe0, 0xe1, 0x68, 0x01, 0xaa, 0x00, 0xf0,
-  0x93, 0xfa, 0x00, 0x28, 0x15, 0xd0, 0x60, 0x6a, 0x01, 0x99, 0x43, 0x1c,
-  0xdb, 0x7f, 0x10, 0x2b, 0x01, 0xd1, 0x12, 0x4b, 0x00, 0xe0, 0x12, 0x4b,
-  0x99, 0x42, 0x0c, 0xd2, 0x00, 0xf0, 0x7e, 0xfb, 0x00, 0x28, 0x06, 0xd0,
-  0x60, 0x6a, 0xe1, 0x68, 0x0e, 0x4a, 0x00, 0xf0, 0xcf, 0xfa, 0x00, 0x28,
-  0x01, 0xd1, 0x00, 0x20, 0x11, 0xe0, 0x22, 0x7a, 0x80, 0x23, 0x5b, 0x42,
-  0x13, 0x43, 0xe5, 0x61, 0x23, 0x72, 0x20, 0x1c, 0xff, 0xf7, 0x70, 0xff,
-  0x00, 0x28, 0xf2, 0xd0, 0x29, 0x1e, 0xb1, 0x42, 0x00, 0xd9, 0x31, 0x1c,
-  0x20, 0x1c, 0xff, 0xf7, 0x35, 0xff, 0x76, 0xbd, 0xf8, 0xff, 0x00, 0x00,
-  0xf8, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x0f, 0x38, 0xb5, 0x23, 0x4b,
-  0x15, 0x1c, 0x4a, 0x01, 0xd3, 0x18, 0x04, 0x1c, 0xd8, 0x7a, 0x11, 0x22,
-  0x10, 0x42, 0x04, 0xd0, 0x42, 0x22, 0x15, 0x42, 0x01, 0xd0, 0x00, 0x20,
-  0x36, 0xe0, 0x1d, 0x4a, 0x21, 0x76, 0x12, 0x68, 0x62, 0x61, 0x5a, 0x7d,
-  0x18, 0x7d, 0xd9, 0x7e, 0x12, 0x02, 0x02, 0x43, 0x98, 0x7e, 0x09, 0x02,
-  0x12, 0x04, 0x01, 0x43, 0x11, 0x43, 0x21, 0x62, 0xd8, 0x7a, 0x18, 0x22,
-  0x02, 0x40, 0x0c, 0xd1, 0x5a, 0x7f, 0x19, 0x7f, 0x12, 0x02, 0x0a, 0x43,
-  0x99, 0x7f, 0xdb, 0x7f, 0x09, 0x04, 0x0a, 0x43, 0x1b, 0x06, 0x13, 0x43,
-  0xe3, 0x61, 0x01, 0x23, 0x09, 0xe0, 0x10, 0x2a, 0xdb, 0xd1, 0x22, 0x1c,
-  0x60, 0x6a, 0x1c, 0x32, 0x00, 0xf0, 0x5a, 0xfa, 0x00, 0x28, 0xd4, 0xd0,
-  0x04, 0x23, 0x63, 0x72, 0x0f, 0x23, 0x00, 0x21, 0x2b, 0x40, 0x23, 0x72,
-  0xe1, 0x60, 0x21, 0x61, 0x01, 0x20, 0x6a, 0x06, 0x02, 0xd5, 0x20, 0x1c,
-  0xff, 0xf7, 0x60, 0xff, 0x38, 0xbd, 0xc0, 0x46, 0x50, 0x01, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x20, 0xf0, 0xb5, 0x45, 0x7a, 0x87, 0xb0, 0x04, 0x1c,
-  0x0e, 0x1c, 0x01, 0x93, 0x00, 0x2d, 0x00, 0xd0, 0x86, 0xe0, 0x10, 0x1c,
-  0x03, 0xa9, 0xff, 0xf7, 0xbb, 0xfd, 0x00, 0x28, 0x00, 0xd1, 0x80, 0xe0,
-  0x72, 0x6a, 0x2f, 0x1c, 0x62, 0x62, 0xf5, 0x60, 0x35, 0x61, 0x33, 0x69,
-  0xf2, 0x69, 0x93, 0x42, 0x26, 0xd2, 0xdb, 0x05, 0x1b, 0x0f, 0x30, 0x1c,
-  0x00, 0x93, 0xff, 0xf7, 0x9f, 0xfe, 0x01, 0x1e, 0x6f, 0xd0, 0x03, 0x78,
-  0x00, 0x2b, 0x01, 0xd0, 0xe5, 0x2b, 0x0b, 0xd1, 0x00, 0x2f, 0x04, 0xd1,
-  0x00, 0x9b, 0x23, 0x76, 0x34, 0x4b, 0x1b, 0x68, 0x63, 0x61, 0x0b, 0x78,
-  0x01, 0x27, 0x00, 0x2b, 0xe3, 0xd1, 0x0d, 0xe0, 0x03, 0xa8, 0x0b, 0x22,
-  0x01, 0xf0, 0x2c, 0xfb, 0x00, 0x28, 0xdc, 0xd1, 0x01, 0x9a, 0x30, 0x23,
-  0x13, 0x40, 0x30, 0x2b, 0x53, 0xd0, 0x20, 0x1c, 0x00, 0x99, 0x4b, 0xe0,
-  0x01, 0x9a, 0x12, 0x23, 0x13, 0x40, 0x12, 0x2b, 0x4b, 0xd1, 0x00, 0x2f,
-  0x06, 0xd0, 0x20, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x6f, 0xfd, 0x06, 0x1e,
-  0x0a, 0xd1, 0x42, 0xe0, 0x73, 0x7a, 0x02, 0x2b, 0x3f, 0xd0, 0x30, 0x1c,
-  0xff, 0xf7, 0x40, 0xfd, 0x00, 0x28, 0x3a, 0xd0, 0x1f, 0x4e, 0x27, 0x76,
-  0x00, 0x21, 0x20, 0x22, 0x30, 0x1c, 0x01, 0xf0, 0x1d, 0xfb, 0x30, 0x1c,
-  0x03, 0xa9, 0x0b, 0x22, 0x01, 0xf0, 0x0f, 0xfb, 0x1a, 0x4b, 0x1b, 0x68,
-  0x00, 0x2b, 0x05, 0xd0, 0x30, 0x1c, 0x31, 0x1c, 0x10, 0x30, 0x0e, 0x31,
-  0x98, 0x47, 0x06, 0xe0, 0x21, 0x22, 0x32, 0x74, 0xb3, 0x73, 0x28, 0x22,
-  0x08, 0x23, 0x72, 0x74, 0xf3, 0x73, 0x73, 0x7c, 0x32, 0x7c, 0x1b, 0x02,
-  0x13, 0x43, 0xff, 0x22, 0x1a, 0x40, 0x1b, 0x0a, 0xf3, 0x74, 0x73, 0x76,
-  0xf3, 0x7b, 0xb2, 0x74, 0x32, 0x76, 0xb2, 0x7b, 0x1b, 0x02, 0x13, 0x43,
-  0xb3, 0x75, 0x1b, 0x0a, 0xf3, 0x75, 0x00, 0xf0, 0x21, 0xf9, 0x00, 0x28,
-  0x07, 0xd0, 0x21, 0x7e, 0x01, 0x9a, 0x20, 0x1c, 0xff, 0xf7, 0x26, 0xff,
-  0x05, 0x1c, 0x00, 0xe0, 0x00, 0x25, 0x28, 0x1c, 0x07, 0xb0, 0xf0, 0xbd,
-  0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x44, 0x01, 0x00, 0x20,
-  0x10, 0xb5, 0x00, 0x21, 0x04, 0x1c, 0xff, 0xf7, 0xbb, 0xfe, 0x00, 0x28,
-  0x0b, 0xd0, 0x20, 0x1c, 0x01, 0x21, 0xff, 0xf7, 0x15, 0xfd, 0x00, 0x28,
-  0x05, 0xd0, 0xe5, 0x23, 0x03, 0x70, 0x00, 0x23, 0x63, 0x72, 0x00, 0xf0,
-  0xfb, 0xf8, 0x10, 0xbd, 0x10, 0xb5, 0x0a, 0x1c, 0x0a, 0x49, 0x8a, 0xb0,
-  0x08, 0x31, 0x00, 0x23, 0x04, 0x1c, 0x00, 0x91, 0x69, 0x46, 0x4b, 0x72,
-  0x01, 0x93, 0x68, 0x46, 0x21, 0x1c, 0x02, 0x23, 0xff, 0xf7, 0x42, 0xff,
-  0x00, 0x28, 0x02, 0xd0, 0x68, 0x46, 0xff, 0xf7, 0xd7, 0xff, 0x0a, 0xb0,
-  0x10, 0xbd, 0xc0, 0x46, 0x00, 0x4a, 0x00, 0x00, 0xf0, 0xb5, 0x43, 0x7a,
-  0x87, 0xb0, 0x04, 0x1c, 0x0d, 0x1c, 0x03, 0x92, 0x01, 0x2b, 0x0d, 0xd1,
-  0x03, 0x7a, 0x99, 0x07, 0x0a, 0xd5, 0x5a, 0x07, 0x0c, 0xd5, 0xe1, 0x69,
-  0x22, 0x69, 0x8a, 0x42, 0x08, 0xd0, 0x20, 0x1c, 0xff, 0xf7, 0x06, 0xfe,
-  0x00, 0x28, 0x03, 0xd1, 0x01, 0x23, 0x63, 0x60, 0x00, 0x20, 0xaa, 0xe0,
-  0x03, 0x9b, 0x01, 0x93, 0x3b, 0xe0, 0x60, 0x6a, 0x73, 0x0a, 0x07, 0x79,
-  0xf6, 0x05, 0x01, 0x3f, 0x1f, 0x40, 0xff, 0xb2, 0xf6, 0x0d, 0x00, 0x2f,
-  0x36, 0xd0, 0x80, 0x22, 0x92, 0x00, 0x92, 0x1b, 0x01, 0x99, 0x92, 0xb2,
-  0x0b, 0x1c, 0x91, 0x42, 0x00, 0xd9, 0x13, 0x1c, 0x9b, 0xb2, 0x02, 0x93,
-  0x63, 0x6a, 0xe1, 0x68, 0x1a, 0x7c, 0x02, 0x39, 0x91, 0x40, 0x5a, 0x69,
-  0x8b, 0x18, 0x02, 0x9a, 0xdf, 0x19, 0x80, 0x23, 0x9b, 0x00, 0x9a, 0x42,
-  0x3f, 0xd1, 0x44, 0x4b, 0x19, 0x68, 0xb9, 0x42, 0x02, 0xd1, 0x01, 0x22,
-  0x52, 0x42, 0x1a, 0x60, 0x41, 0x4b, 0x39, 0x1c, 0x18, 0x68, 0x2a, 0x1c,
-  0xff, 0xf7, 0x22, 0xfc, 0x00, 0x28, 0xc7, 0xd0, 0x80, 0x22, 0x92, 0x00,
-  0xad, 0x18, 0x01, 0x99, 0x02, 0x9a, 0x8b, 0x1a, 0x21, 0x69, 0x9b, 0xb2,
-  0x01, 0x93, 0x8b, 0x18, 0x23, 0x61, 0x01, 0x9a, 0x26, 0x69, 0x00, 0x2a,
-  0xbf, 0xd1, 0x49, 0xe0, 0x00, 0x2e, 0xc6, 0xd1, 0xe1, 0x68, 0x00, 0x29,
-  0x03, 0xd1, 0x23, 0x6a, 0x00, 0x2b, 0x16, 0xd1, 0x0f, 0xe0, 0x05, 0xaa,
-  0x00, 0xf0, 0xe2, 0xf8, 0x00, 0x28, 0x58, 0xd0, 0x62, 0x6a, 0x05, 0x9b,
-  0x01, 0x32, 0xd2, 0x7f, 0x10, 0x2a, 0x01, 0xd1, 0x2c, 0x4a, 0x00, 0xe0,
-  0x2c, 0x4a, 0x93, 0x42, 0x05, 0xd3, 0x20, 0x1c, 0xff, 0xf7, 0x3c, 0xfc,
-  0x00, 0x28, 0xaa, 0xd1, 0x98, 0xe7, 0xe3, 0x60, 0xa7, 0xe7, 0x00, 0x2e,
-  0x0f, 0xd1, 0x23, 0x69, 0xe1, 0x69, 0x8b, 0x42, 0x0b, 0xd3, 0x00, 0xf0,
-  0x59, 0xf8, 0x00, 0x28, 0x8c, 0xd0, 0x1f, 0x4b, 0x01, 0x21, 0x1f, 0x60,
-  0x21, 0x4b, 0x1a, 0x78, 0x0a, 0x43, 0x1a, 0x70, 0x06, 0xe0, 0x38, 0x1c,
-  0x01, 0x21, 0x00, 0xf0, 0x75, 0xf8, 0x00, 0x28, 0x00, 0xd1, 0x7d, 0xe7,
-  0x1c, 0x4b, 0x2a, 0x1c, 0xf6, 0x18, 0x02, 0x9b, 0xf1, 0x18, 0x33, 0x1c,
-  0x8b, 0x42, 0x04, 0xd0, 0x10, 0x78, 0x01, 0x32, 0x18, 0x70, 0x01, 0x33,
-  0xf8, 0xe7, 0x9e, 0x1b, 0xad, 0x19, 0xa8, 0xe7, 0xe1, 0x69, 0x23, 0x7a,
-  0x8e, 0x42, 0x01, 0xd9, 0xe6, 0x61, 0x06, 0xe0, 0x12, 0x4a, 0x12, 0x68,
-  0x00, 0x2a, 0x06, 0xd0, 0x03, 0x9a, 0x00, 0x2a, 0x03, 0xd0, 0x80, 0x22,
-  0x52, 0x42, 0x13, 0x43, 0x23, 0x72, 0x23, 0x7a, 0x19, 0x07, 0x01, 0xd4,
-  0x03, 0x98, 0x06, 0xe0, 0x20, 0x1c, 0xff, 0xf7, 0x8b, 0xfd, 0x00, 0x28,
-  0x00, 0xd1, 0x51, 0xe7, 0xf6, 0xe7, 0x07, 0xb0, 0xf0, 0xbd, 0xc0, 0x46,
-  0x00, 0x00, 0x00, 0x20, 0x4c, 0x01, 0x00, 0x20, 0xf8, 0xff, 0x00, 0x00,
-  0xf8, 0xff, 0xff, 0x0f, 0x50, 0x03, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20,
-  0x44, 0x01, 0x00, 0x20, 0x07, 0xb5, 0x6b, 0x46, 0xd9, 0x71, 0x07, 0x33,
-  0x19, 0x1c, 0x01, 0x22, 0xff, 0xf7, 0x22, 0xff, 0x0e, 0xbd, 0x00, 0x00,
-  0xf8, 0xb5, 0x0f, 0x4f, 0x01, 0x20, 0x3b, 0x78, 0x00, 0x2b, 0x18, 0xd0,
-  0x0d, 0x4e, 0x0e, 0x4b, 0x0e, 0x4d, 0x19, 0x68, 0x30, 0x68, 0x2a, 0x1c,
-  0xff, 0xf7, 0x80, 0xfb, 0x00, 0x28, 0x0e, 0xd0, 0x0b, 0x4c, 0x21, 0x68,
-  0x00, 0x29, 0x07, 0xd0, 0x30, 0x68, 0x2a, 0x1c, 0xff, 0xf7, 0x76, 0xfb,
-  0x00, 0x28, 0x04, 0xd0, 0x00, 0x23, 0x23, 0x60, 0x00, 0x23, 0x3b, 0x70,
-  0x01, 0x20, 0xf8, 0xbd, 0x50, 0x03, 0x00, 0x20, 0x4c, 0x01, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x48, 0x01, 0x00, 0x20,
-  0x70, 0xb5, 0x0d, 0x4d, 0x04, 0x1c, 0x2b, 0x68, 0x0e, 0x1c, 0x83, 0x42,
-  0x0e, 0xd0, 0xff, 0xf7, 0xcd, 0xff, 0x00, 0x28, 0x01, 0xd1, 0x00, 0x20,
-  0x0d, 0xe0, 0x08, 0x4b, 0x21, 0x1c, 0x18, 0x68, 0x07, 0x4a, 0xff, 0xf7,
-  0x25, 0xfb, 0x00, 0x28, 0xf5, 0xd0, 0x2c, 0x60, 0x05, 0x4b, 0x01, 0x20,
-  0x1a, 0x78, 0x16, 0x43, 0x1e, 0x70, 0x70, 0xbd, 0x00, 0x00, 0x00, 0x20,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20,
-  0x10, 0xb5, 0x04, 0x1c, 0xff, 0xf7, 0xae, 0xff, 0x00, 0x28, 0x0f, 0xd0,
-  0x00, 0x23, 0x08, 0x4a, 0x00, 0x21, 0x99, 0x54, 0x80, 0x22, 0x01, 0x33,
-  0x92, 0x00, 0x93, 0x42, 0xf7, 0xd1, 0x05, 0x4b, 0x01, 0x20, 0x1c, 0x60,
-  0x04, 0x4b, 0x1a, 0x78, 0x02, 0x43, 0x1a, 0x70, 0x10, 0xbd, 0xc0, 0x46,
-  0x50, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20,
-  0xc3, 0x68, 0x70, 0xb5, 0x01, 0x33, 0x0c, 0x1c, 0x15, 0x1c, 0x99, 0x42,
-  0x01, 0xd9, 0x00, 0x20, 0x21, 0xe0, 0x46, 0x1c, 0xf1, 0x7f, 0xc2, 0x69,
-  0xe3, 0x09, 0x10, 0x29, 0x00, 0xd1, 0x23, 0x0a, 0x98, 0x18, 0x0d, 0x4b,
-  0x1b, 0x68, 0x98, 0x42, 0x07, 0xd1, 0xf2, 0x7f, 0x0b, 0x4b, 0x10, 0x2a,
-  0x09, 0xd1, 0xe4, 0xb2, 0x64, 0x00, 0x1b, 0x5b, 0x0b, 0xe0, 0x00, 0x21,
-  0xff, 0xf7, 0x9e, 0xff, 0x00, 0x28, 0xf2, 0xd1, 0xe3, 0xe7, 0x7f, 0x22,
-  0x14, 0x40, 0xa4, 0x00, 0x1b, 0x59, 0x1b, 0x01, 0x1b, 0x09, 0x2b, 0x60,
-  0x01, 0x20, 0x70, 0xbd, 0x00, 0x00, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20,
-  0x73, 0xb5, 0x05, 0x1c, 0x01, 0x91, 0x16, 0x1c, 0x00, 0x24, 0x28, 0x1c,
-  0x01, 0x99, 0x01, 0xaa, 0xff, 0xf7, 0xc6, 0xff, 0x00, 0x28, 0x10, 0xd0,
-  0x2a, 0x7c, 0x80, 0x23, 0x9b, 0x00, 0x93, 0x40, 0xe4, 0x18, 0x6b, 0x1c,
-  0xdb, 0x7f, 0x01, 0x9a, 0x10, 0x2b, 0x01, 0xd1, 0x03, 0x4b, 0x00, 0xe0,
-  0x03, 0x4b, 0x9a, 0x42, 0xe9, 0xd3, 0x34, 0x60, 0x01, 0x20, 0x76, 0xbd,
-  0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f, 0xf7, 0xb5, 0x05, 0x1c,
-  0x0c, 0x1c, 0x01, 0x92, 0x01, 0x29, 0x32, 0xd9, 0xc3, 0x68, 0x00, 0x20,
-  0x01, 0x33, 0x99, 0x42, 0x2e, 0xd8, 0x6f, 0x1c, 0xfa, 0x7f, 0xee, 0x69,
-  0xcb, 0x09, 0x10, 0x2a, 0x00, 0xd1, 0x0b, 0x0a, 0x9e, 0x19, 0x14, 0x4b,
-  0x1b, 0x68, 0x9e, 0x42, 0x08, 0xd1, 0xfa, 0x7f, 0x12, 0x4b, 0x10, 0x2a,
-  0x0b, 0xd1, 0xe4, 0xb2, 0x01, 0x9a, 0x64, 0x00, 0x1a, 0x53, 0x0b, 0xe0,
-  0x30, 0x1c, 0x00, 0x21, 0xff, 0xf7, 0x48, 0xff, 0x00, 0x28, 0xf0, 0xd1,
-  0x12, 0xe0, 0x7f, 0x22, 0x14, 0x40, 0x01, 0x9a, 0xa4, 0x00, 0x1a, 0x51,
-  0x09, 0x4b, 0x01, 0x20, 0x1a, 0x78, 0x02, 0x43, 0x1a, 0x70, 0x2b, 0x7e,
-  0x83, 0x42, 0x05, 0xd9, 0xab, 0x68, 0xf6, 0x18, 0x05, 0x4b, 0x1e, 0x60,
-  0x00, 0xe0, 0x00, 0x20, 0xfe, 0xbd, 0xc0, 0x46, 0x00, 0x00, 0x00, 0x20,
-  0x50, 0x01, 0x00, 0x20, 0x50, 0x03, 0x00, 0x20, 0x48, 0x01, 0x00, 0x20,
-  0xf0, 0xb5, 0x15, 0x68, 0x87, 0xb0, 0x06, 0x1c, 0x02, 0x91, 0x17, 0x1c,
-  0x00, 0x2d, 0x03, 0xd0, 0x00, 0x21, 0x01, 0x35, 0x01, 0x91, 0x06, 0xe0,
-  0x02, 0x9b, 0x05, 0x68, 0x01, 0x3b, 0x5a, 0x42, 0x53, 0x41, 0xdb, 0xb2,
-  0x01, 0x93, 0xf2, 0x68, 0x00, 0x23, 0x01, 0x32, 0x03, 0x92, 0x2c, 0x1c,
-  0x00, 0x93, 0x00, 0x99, 0xf2, 0x68, 0x91, 0x42, 0x21, 0xd2, 0x03, 0x9b,
-  0x9c, 0x42, 0x01, 0xd9, 0x02, 0x24, 0x25, 0x1c, 0x30, 0x1c, 0x21, 0x1c,
-  0x05, 0xaa, 0xff, 0xf7, 0x43, 0xff, 0x00, 0x28, 0x15, 0xd0, 0x05, 0x99,
-  0x63, 0x1c, 0x00, 0x29, 0x01, 0xd0, 0x1d, 0x1c, 0x03, 0xe0, 0x02, 0x99,
-  0x5a, 0x1b, 0x8a, 0x42, 0x04, 0xd0, 0x00, 0x9a, 0x1c, 0x1c, 0x01, 0x32,
-  0x00, 0x92, 0xe0, 0xe7, 0x30, 0x1c, 0x21, 0x1c, 0x13, 0x4a, 0xff, 0xf7,
-  0x7f, 0xff, 0x00, 0x28, 0x0b, 0xd1, 0x00, 0x20, 0x1d, 0xe0, 0x63, 0x1e,
-  0x30, 0x1c, 0x19, 0x1c, 0x22, 0x1c, 0x00, 0x93, 0xff, 0xf7, 0x74, 0xff,
-  0x00, 0x28, 0xf4, 0xd0, 0x00, 0x9c, 0xac, 0x42, 0xf3, 0xd8, 0x39, 0x68,
-  0x00, 0x29, 0x06, 0xd1, 0x01, 0x99, 0x3d, 0x60, 0x00, 0x29, 0x09, 0xd0,
-  0x01, 0x35, 0x35, 0x60, 0x06, 0xe0, 0x30, 0x1c, 0x2a, 0x1c, 0xff, 0xf7,
-  0x61, 0xff, 0x00, 0x28, 0xf2, 0xd1, 0xe0, 0xe7, 0x01, 0x20, 0x07, 0xb0,
-  0xf0, 0xbd, 0xc0, 0x46, 0xff, 0xff, 0xff, 0x0f, 0x02, 0x23, 0x37, 0xb5,
-  0x05, 0x1c, 0x0c, 0x1c, 0x03, 0x60, 0x28, 0x1c, 0x21, 0x1c, 0x01, 0xaa,
-  0xff, 0xf7, 0xfc, 0xfe, 0x00, 0x28, 0x12, 0xd0, 0x28, 0x1c, 0x21, 0x1c,
-  0x00, 0x22, 0xff, 0xf7, 0x47, 0xff, 0x00, 0x28, 0x0b, 0xd0, 0x6b, 0x1c,
-  0xdb, 0x7f, 0x01, 0x9c, 0x10, 0x2b, 0x01, 0xd1, 0x04, 0x4b, 0x00, 0xe0,
-  0x04, 0x4b, 0x9c, 0x42, 0xe7, 0xd3, 0x01, 0x20, 0x00, 0xe0, 0x00, 0x20,
-  0x3e, 0xbd, 0xc0, 0x46, 0xf8, 0xff, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x0f,
-  0xf8, 0xb5, 0x44, 0x4b, 0x04, 0x1c, 0x15, 0x1c, 0x19, 0x60, 0x29, 0xd0,
-  0x04, 0x2a, 0x01, 0xd9, 0x00, 0x20, 0x7d, 0xe0, 0x00, 0x20, 0x01, 0x1c,
-  0xff, 0xf7, 0x90, 0xfe, 0x00, 0x28, 0xf7, 0xd0, 0x2d, 0x01, 0x3d, 0x4b,
-  0xa9, 0x35, 0xff, 0x35, 0x5d, 0x19, 0xaa, 0x79, 0xab, 0x1d, 0x50, 0x06,
-  0xee, 0xd1, 0xea, 0x7c, 0xa9, 0x7c, 0x12, 0x02, 0x0a, 0x43, 0x29, 0x7d,
-  0x09, 0x04, 0x0a, 0x43, 0x69, 0x7d, 0x09, 0x06, 0x0a, 0x43, 0x63, 0x2a,
-  0xe2, 0xd9, 0xaa, 0x7b, 0xed, 0x7b, 0x2d, 0x02, 0x15, 0x43, 0x9a, 0x7a,
-  0xdb, 0x7a, 0x12, 0x04, 0x15, 0x43, 0x1b, 0x06, 0x1d, 0x43, 0xd7, 0xd0,
-  0x28, 0x1c, 0x00, 0x21, 0xff, 0xf7, 0x6a, 0xfe, 0x00, 0x28, 0xd1, 0xd0,
-  0x2a, 0x4b, 0x19, 0x7b, 0xda, 0x7a, 0x09, 0x02, 0x11, 0x43, 0x80, 0x22,
-  0x92, 0x00, 0x91, 0x42, 0xc8, 0xd1, 0x1a, 0x7c, 0x00, 0x2a, 0xc5, 0xd0,
-  0xd9, 0x89, 0x00, 0x29, 0xc2, 0xd0, 0x59, 0x7b, 0x00, 0x29, 0xbf, 0xd0,
-  0x22, 0x76, 0x00, 0x22, 0x21, 0x71, 0x22, 0x74, 0x22, 0x7c, 0x01, 0x20,
-  0x90, 0x40, 0x81, 0x42, 0x04, 0xd0, 0x50, 0x1c, 0x20, 0x74, 0x07, 0x2a,
-  0xf6, 0xd9, 0xb1, 0xe7, 0xd9, 0x8a, 0x00, 0x29, 0x00, 0xd1, 0x59, 0x6a,
-  0xa1, 0x60, 0xd8, 0x89, 0x28, 0x18, 0xe0, 0x61, 0x1f, 0x69, 0x3e, 0x02,
-  0x36, 0x0c, 0x66, 0x84, 0xb7, 0xb2, 0x1e, 0x7c, 0x71, 0x43, 0x0e, 0x18,
-  0x13, 0x48, 0x79, 0x01, 0x09, 0x18, 0x49, 0x12, 0x71, 0x18, 0x66, 0x62,
-  0x61, 0x61, 0x18, 0x7d, 0xde, 0x7c, 0x00, 0x02, 0x30, 0x43, 0x00, 0xd1,
-  0x18, 0x6a, 0x6d, 0x1a, 0x28, 0x18, 0xd0, 0x40, 0x02, 0x1c, 0xe0, 0x60,
-  0x0b, 0x48, 0x61, 0x1c, 0x82, 0x42, 0x01, 0xd8, 0x0c, 0x23, 0x07, 0xe0,
-  0x09, 0x48, 0x82, 0x42, 0x01, 0xd8, 0x10, 0x23, 0x02, 0xe0, 0xdb, 0x6a,
-  0x63, 0x62, 0x20, 0x23, 0xcb, 0x77, 0x01, 0x20, 0xf8, 0xbd, 0xc0, 0x46,
-  0x4c, 0x01, 0x00, 0x20, 0x50, 0x01, 0x00, 0x20, 0xff, 0x01, 0x00, 0x00,
-  0xf4, 0x0f, 0x00, 0x00, 0xf4, 0xff, 0x00, 0x00, 0x08, 0xb5, 0x05, 0x49,
-  0x05, 0x4a, 0x06, 0x48, 0x00, 0xf0, 0x10, 0xf8, 0x05, 0x4b, 0x06, 0x49,
-  0x00, 0x22, 0x1a, 0x70, 0x5a, 0x54, 0x08, 0xbd, 0x00, 0x4b, 0x00, 0x00,
-  0x01, 0x04, 0x00, 0x00, 0x54, 0x03, 0x00, 0x20, 0x6c, 0x03, 0x00, 0x20,
-  0x02, 0x04, 0x00, 0x00, 0x30, 0xb5, 0x09, 0x4c, 0x09, 0x4b, 0xa5, 0x68,
-  0x6d, 0x03, 0x6d, 0x0f, 0xad, 0x00, 0xeb, 0x58, 0x03, 0x60, 0xa4, 0x68,
-  0x01, 0x61, 0xa4, 0xb2, 0x44, 0x60, 0x5c, 0x43, 0x9b, 0x00, 0x84, 0x60,
-  0xc3, 0x60, 0x42, 0x61, 0x30, 0xbd, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41,
-  0x00, 0x50, 0x00, 0x00, 0xf7, 0xb5, 0x1f, 0x4e, 0x80, 0x27, 0x75, 0x68,
-  0x03, 0x33, 0x3d, 0x43, 0x9b, 0x08, 0x75, 0x60, 0x00, 0x2b, 0x34, 0xd0,
-  0x1b, 0x4d, 0x35, 0x80, 0x35, 0x7d, 0xef, 0x07, 0xfc, 0xd5, 0x1d, 0x1c,
-  0x5f, 0x1b, 0x01, 0x97, 0x07, 0x68, 0xbf, 0x08, 0xbc, 0x46, 0x01, 0x9f,
-  0x67, 0x45, 0x1f, 0xd2, 0x00, 0x2d, 0x1d, 0xd0, 0x17, 0x78, 0x01, 0x3d,
-  0x01, 0x97, 0xff, 0x27, 0xbc, 0x43, 0x01, 0x9f, 0x3c, 0x43, 0x57, 0x78,
-  0x3f, 0x02, 0x01, 0x97, 0x0f, 0x4f, 0x3c, 0x40, 0x01, 0x9f, 0x3c, 0x43,
-  0x97, 0x78, 0x3f, 0x04, 0xbc, 0x46, 0x0d, 0x4f, 0x3c, 0x40, 0xd7, 0x78,
-  0xa4, 0xb2, 0x3f, 0x06, 0x00, 0x97, 0x67, 0x46, 0x3c, 0x43, 0x00, 0x9f,
-  0x04, 0x32, 0x3c, 0x43, 0x10, 0xc1, 0xd7, 0xe7, 0x07, 0x4b, 0x33, 0x80,
-  0x33, 0x7d, 0xdf, 0x07, 0xfc, 0xd5, 0x2b, 0x1c, 0xc8, 0xe7, 0xf7, 0xbd,
-  0x00, 0x40, 0x00, 0x41, 0x44, 0xa5, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff,
-  0xff, 0xff, 0x00, 0xff, 0x04, 0xa5, 0xff, 0xff, 0x04, 0x4b, 0x05, 0x4a,
-  0x49, 0x08, 0xd9, 0x61, 0x1a, 0x80, 0x1a, 0x7d, 0xd1, 0x07, 0xfc, 0xd5,
-  0x70, 0x47, 0xc0, 0x46, 0x00, 0x40, 0x00, 0x41, 0x02, 0xa5, 0xff, 0xff,
-  0x70, 0xb5, 0x05, 0x1c, 0x0c, 0x1c, 0x16, 0x1c, 0xeb, 0x68, 0x28, 0x1c,
-  0x21, 0x1c, 0x9e, 0x42, 0x05, 0xd9, 0xff, 0xf7, 0xe7, 0xff, 0xeb, 0x68,
-  0xe4, 0x18, 0xf6, 0x1a, 0xf4, 0xe7, 0xff, 0xf7, 0xe1, 0xff, 0x70, 0xbd,
-  0x43, 0x7a, 0x00, 0x2b, 0x04, 0xd1, 0x83, 0x72, 0xc3, 0x72, 0xc3, 0x60,
-  0x01, 0x23, 0x43, 0x72, 0x70, 0x47, 0x30, 0xb5, 0x85, 0xb0, 0x04, 0x1c,
-  0x02, 0xad, 0x00, 0x68, 0x02, 0x91, 0x03, 0x92, 0x00, 0xf0, 0x86, 0xfc,
-  0x6b, 0x79, 0xe1, 0x79, 0x22, 0x7a, 0x00, 0x93, 0x20, 0x68, 0x00, 0x23,
-  0x00, 0xf0, 0x20, 0xfd, 0x29, 0x79, 0x20, 0x68, 0x02, 0x9a, 0x00, 0xf0,
-  0x49, 0xfc, 0x20, 0x68, 0x00, 0xf0, 0x6c, 0xfc, 0x05, 0xb0, 0x30, 0xbd,
-  0x70, 0xb5, 0x04, 0x1c, 0x18, 0x26, 0xff, 0xf7, 0xd7, 0xff, 0x20, 0x79,
-  0x33, 0x1c, 0x43, 0x43, 0x0d, 0x4d, 0x08, 0x21, 0xeb, 0x18, 0x59, 0x56,
-  0x00, 0xf0, 0x16, 0xfb, 0xa0, 0x79, 0x33, 0x1c, 0x43, 0x43, 0x08, 0x21,
-  0xeb, 0x18, 0x59, 0x56, 0x00, 0xf0, 0x0e, 0xfb, 0x60, 0x79, 0x08, 0x21,
-  0x46, 0x43, 0xad, 0x19, 0x69, 0x56, 0x00, 0xf0, 0x07, 0xfb, 0x04, 0x4b,
-  0x20, 0x1c, 0x06, 0xcb, 0xff, 0xf7, 0xc3, 0xff, 0x70, 0xbd, 0xc0, 0x46,
-  0x20, 0x50, 0x00, 0x00, 0x70, 0x07, 0x00, 0x20, 0x07, 0xb5, 0x83, 0x7a,
-  0x00, 0x91, 0x01, 0x92, 0x00, 0x2b, 0x0d, 0xd0, 0x9a, 0x07, 0x06, 0xd5,
-  0xef, 0xf3, 0x10, 0x83, 0x5a, 0x42, 0x53, 0x41, 0xc3, 0x72, 0x72, 0xb6,
-  0x04, 0xe0, 0xda, 0x07, 0x02, 0xd5, 0x82, 0x89, 0x03, 0x4b, 0x9a, 0x60,
-  0x00, 0x99, 0x01, 0x9a, 0xff, 0xf7, 0xa5, 0xff, 0x07, 0xbd, 0xc0, 0x46,
-  0x00, 0x18, 0x00, 0x40, 0x83, 0x7a, 0x00, 0x2b, 0x0b, 0xd0, 0x9a, 0x07,
-  0x04, 0xd5, 0xc3, 0x7a, 0x00, 0x2b, 0x06, 0xd0, 0x62, 0xb6, 0x04, 0xe0,
-  0xda, 0x07, 0x02, 0xd5, 0x82, 0x89, 0x01, 0x4b, 0xda, 0x60, 0x70, 0x47,
-  0x00, 0x18, 0x00, 0x40, 0x08, 0xb5, 0x00, 0x68, 0x00, 0xf0, 0x23, 0xfc,
-  0x08, 0xbd, 0x00, 0x00, 0x09, 0x4b, 0x0a, 0x4a, 0x0a, 0x49, 0x1a, 0x60,
-  0x00, 0x22, 0x5a, 0x71, 0x1a, 0x71, 0x09, 0x4b, 0x19, 0x60, 0x16, 0x21,
-  0x19, 0x71, 0x18, 0x21, 0x99, 0x71, 0x17, 0x21, 0x59, 0x71, 0x01, 0x21,
-  0x5a, 0x72, 0xd9, 0x71, 0x1a, 0x72, 0x70, 0x47, 0x70, 0x07, 0x00, 0x20,
-  0x00, 0x09, 0x3d, 0x00, 0x58, 0x08, 0x00, 0x20, 0x78, 0x07, 0x00, 0x20,
-  0x08, 0xb5, 0x02, 0x48, 0x00, 0xf0, 0x0e, 0xfd, 0x08, 0xbd, 0xc0, 0x46,
-  0xe8, 0x07, 0x00, 0x20, 0x08, 0xb5, 0x02, 0x48, 0x00, 0xf0, 0x06, 0xfd,
-  0x08, 0xbd, 0xc0, 0x46, 0x88, 0x07, 0x00, 0x20, 0xf7, 0xb5, 0x16, 0x4f,
-  0x16, 0x49, 0x38, 0x1c, 0x00, 0xf0, 0x46, 0xfb, 0x15, 0x49, 0x16, 0x48,
-  0x00, 0xf0, 0x42, 0xfb, 0x15, 0x49, 0x16, 0x48, 0x00, 0xf0, 0x3e, 0xfb,
-  0x15, 0x49, 0x16, 0x48, 0x00, 0xf0, 0x3a, 0xfb, 0x15, 0x49, 0x16, 0x48,
-  0x00, 0xf0, 0x36, 0xfb, 0x15, 0x4d, 0x03, 0x26, 0x01, 0x24, 0x28, 0x1c,
-  0x14, 0x49, 0x00, 0xf0, 0x2f, 0xfb, 0x39, 0x1c, 0x00, 0x96, 0x23, 0x1c,
-  0x01, 0x94, 0x00, 0x22, 0x11, 0x48, 0x00, 0xf0, 0xb9, 0xfc, 0x00, 0x96,
-  0x29, 0x1c, 0x01, 0x94, 0x1f, 0x22, 0x1e, 0x23, 0x0e, 0x48, 0x00, 0xf0,
-  0xb1, 0xfc, 0xf7, 0xbd, 0x4c, 0x08, 0x00, 0x20, 0x00, 0x08, 0x00, 0x42,
-  0x00, 0x0c, 0x00, 0x42, 0x50, 0x08, 0x00, 0x20, 0x00, 0x10, 0x00, 0x42,
-  0x54, 0x08, 0x00, 0x20, 0x00, 0x14, 0x00, 0x42, 0x48, 0x08, 0x00, 0x20,
-  0x00, 0x18, 0x00, 0x42, 0x58, 0x08, 0x00, 0x20, 0x5c, 0x08, 0x00, 0x20,
-  0x00, 0x1c, 0x00, 0x42, 0xe8, 0x07, 0x00, 0x20, 0x88, 0x07, 0x00, 0x20,
-  0xfe, 0xe7, 0x00, 0x00, 0x08, 0xb5, 0x03, 0x4b, 0x1b, 0x68, 0x00, 0x2b,
-  0x00, 0xd0, 0x98, 0x47, 0x08, 0xbd, 0xc0, 0x46, 0x60, 0x08, 0x00, 0x20,
-  0x38, 0xb5, 0x0f, 0x49, 0x0f, 0x4c, 0xa1, 0x42, 0x04, 0xd1, 0x00, 0xf0,
-  0x4f, 0xf8, 0xfe, 0xf7, 0xb9, 0xfa, 0x0b, 0xe0, 0x0c, 0x4d, 0x8d, 0x42,
-  0xf7, 0xd0, 0x00, 0x23, 0xca, 0x18, 0xe8, 0x18, 0xa2, 0x42, 0x04, 0xd2,
-  0x00, 0x68, 0x04, 0x33, 0x10, 0x60, 0xf7, 0xe7, 0xfe, 0xe7, 0x90, 0x42,
-  0xeb, 0xd0, 0x06, 0x4b, 0x06, 0x4a, 0x93, 0x42, 0xe7, 0xd2, 0x00, 0x22,
-  0x04, 0xc3, 0xf9, 0xe7, 0x00, 0x00, 0x00, 0x20, 0xa0, 0x00, 0x00, 0x20,
-  0xd8, 0x54, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x20, 0x78, 0x08, 0x00, 0x20,
-  0x08, 0xb5, 0x00, 0xf0, 0x26, 0xf8, 0x00, 0x28, 0x01, 0xd1, 0x00, 0xf0,
-  0x17, 0xf8, 0x08, 0xbd, 0x01, 0x4b, 0x18, 0x68, 0x70, 0x47, 0xc0, 0x46,
-  0x64, 0x08, 0x00, 0x20, 0x70, 0xb5, 0x04, 0x1e, 0x08, 0xd0, 0x05, 0x4b,
-  0x1d, 0x68, 0x1e, 0x1c, 0x00, 0xf0, 0x12, 0xf8, 0x33, 0x68, 0x5b, 0x1b,
-  0xa3, 0x42, 0xf9, 0xd3, 0x70, 0xbd, 0xc0, 0x46, 0x64, 0x08, 0x00, 0x20,
-  0x08, 0xb5, 0x03, 0x4b, 0x1a, 0x68, 0x01, 0x32, 0x1a, 0x60, 0x00, 0xf0,
-  0x6d, 0xfa, 0x08, 0xbd, 0x64, 0x08, 0x00, 0x20, 0x70, 0x47, 0x00, 0x20,
-  0x70, 0x47, 0x00, 0x00, 0x70, 0xb5, 0x4c, 0x4a, 0x1e, 0x21, 0x53, 0x68,
-  0x02, 0x20, 0x8b, 0x43, 0x03, 0x43, 0x4a, 0x49, 0x53, 0x60, 0x8b, 0x69,
-  0x08, 0x24, 0x23, 0x43, 0x8b, 0x61, 0x48, 0x4c, 0x48, 0x4b, 0x9c, 0x82,
-  0x9c, 0x8a, 0x20, 0x43, 0x98, 0x82, 0x10, 0x1c, 0xda, 0x68, 0x94, 0x07,
-  0xfc, 0xd5, 0x45, 0x4a, 0x01, 0x24, 0x14, 0x70, 0x14, 0x78, 0xe5, 0x07,
-  0x04, 0xd5, 0x42, 0x4c, 0x64, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xf7, 0xdb,
-  0x01, 0x24, 0x94, 0x60, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb,
-  0x3d, 0x4d, 0x3c, 0x4c, 0x65, 0x60, 0x54, 0x78, 0x64, 0xb2, 0x00, 0x2c,
-  0xfb, 0xdb, 0x82, 0x25, 0x38, 0x4c, 0xed, 0x01, 0x65, 0x80, 0x54, 0x78,
-  0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb, 0x9c, 0x8c, 0x80, 0x25, 0xac, 0x43,
-  0x9c, 0x84, 0xdc, 0x68, 0xe6, 0x06, 0xfc, 0xd5, 0x33, 0x4d, 0x30, 0x4c,
-  0xe5, 0x62, 0xdd, 0x68, 0x2e, 0x4c, 0xee, 0x06, 0xfb, 0xd5, 0xa5, 0x8c,
-  0x30, 0x4e, 0x35, 0x43, 0xa5, 0x84, 0xdd, 0x68, 0x2a, 0x4c, 0xee, 0x06,
-  0xfb, 0xd5, 0xa5, 0x8c, 0x02, 0x26, 0x35, 0x43, 0xa5, 0x84, 0xdc, 0x68,
-  0x25, 0x06, 0xfc, 0xd5, 0x25, 0x4c, 0xe4, 0x68, 0x66, 0x06, 0xf8, 0xd5,
-  0xdc, 0x68, 0xe5, 0x06, 0xfc, 0xd5, 0x00, 0x24, 0x94, 0x60, 0x54, 0x78,
-  0x64, 0xb2, 0x00, 0x2c, 0xfb, 0xdb, 0x24, 0x4d, 0x1f, 0x4c, 0x65, 0x60,
-  0x55, 0x78, 0x1e, 0x4c, 0x6d, 0xb2, 0x00, 0x2d, 0xfa, 0xdb, 0x1e, 0x6a,
-  0x20, 0x4d, 0x35, 0x40, 0x80, 0x26, 0x76, 0x00, 0x35, 0x43, 0x1d, 0x62,
-  0x1d, 0x6a, 0x80, 0x26, 0xb5, 0x43, 0x1d, 0x62, 0x03, 0x23, 0xa3, 0x60,
-  0x1b, 0x4b, 0x63, 0x60, 0x53, 0x78, 0x5b, 0xb2, 0x00, 0x2b, 0xfb, 0xdb,
-  0x00, 0x23, 0x0b, 0x72, 0x18, 0x4a, 0x4b, 0x72, 0x8b, 0x72, 0xcb, 0x72,
-  0x17, 0x4b, 0xff, 0x21, 0x1a, 0x60, 0x17, 0x4b, 0x17, 0x4a, 0x1b, 0x68,
-  0x12, 0x68, 0x5c, 0x01, 0xd2, 0x0e, 0x21, 0x40, 0x11, 0x43, 0x9a, 0x06,
-  0x52, 0x0f, 0x12, 0x02, 0x0b, 0x1c, 0x13, 0x43, 0x12, 0x4a, 0x13, 0x85,
-  0x43, 0x68, 0x80, 0x22, 0x13, 0x43, 0x43, 0x60, 0x70, 0xbd, 0xc0, 0x46,
-  0x00, 0x40, 0x00, 0x41, 0x00, 0x04, 0x00, 0x40, 0x0c, 0x06, 0x00, 0x00,
-  0x00, 0x08, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x40, 0x01, 0x05, 0x01, 0x00,
-  0xb8, 0x05, 0xff, 0x7d, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x07, 0x03, 0x00,
-  0xff, 0xfc, 0xff, 0xff, 0x03, 0x06, 0x01, 0x00, 0x00, 0x6c, 0xdc, 0x02,
-  0x04, 0x00, 0x00, 0x20, 0x24, 0x60, 0x80, 0x00, 0x20, 0x60, 0x80, 0x00,
-  0x00, 0x40, 0x00, 0x42, 0x31, 0x4b, 0xfa, 0x21, 0x18, 0x68, 0x10, 0xb5,
-  0x89, 0x00, 0x00, 0xf0, 0x5f, 0xfc, 0x2f, 0x4b, 0x01, 0x38, 0x98, 0x42,
-  0x24, 0xd8, 0x2e, 0x4a, 0x2e, 0x4b, 0x50, 0x60, 0x18, 0x6a, 0xc0, 0x21,
-  0x00, 0x02, 0x00, 0x0a, 0x09, 0x06, 0x01, 0x43, 0x19, 0x62, 0x00, 0x24,
-  0x07, 0x21, 0x94, 0x60, 0x11, 0x60, 0x19, 0x6a, 0x80, 0x22, 0x09, 0x02,
-  0x09, 0x0a, 0x12, 0x06, 0x0a, 0x43, 0x1a, 0x62, 0x25, 0x4b, 0xfc, 0x21,
-  0x1a, 0x6a, 0x0a, 0x43, 0x1a, 0x62, 0x19, 0x6a, 0xfc, 0x22, 0x92, 0x01,
-  0x0a, 0x43, 0x1a, 0x62, 0x19, 0x6a, 0xa0, 0x22, 0xd2, 0x02, 0x0a, 0x43,
-  0x1a, 0x62, 0x00, 0xe0, 0xfe, 0xe7, 0x20, 0x1c, 0x00, 0x21, 0x01, 0x34,
-  0x00, 0xf0, 0x70, 0xf8, 0x14, 0x2c, 0xf8, 0xd1, 0x1a, 0x4c, 0x63, 0x78,
-  0x5b, 0xb2, 0x00, 0x2b, 0xfa, 0xdb, 0x19, 0x4b, 0x63, 0x80, 0x19, 0x4b,
-  0x5a, 0x7e, 0xd2, 0x09, 0x01, 0x2a, 0xfa, 0xd0, 0xe4, 0x22, 0xd2, 0x00,
-  0x9a, 0x80, 0x3f, 0x22, 0xda, 0x70, 0x59, 0x7e, 0x13, 0x4a, 0xc9, 0x09,
-  0x01, 0x29, 0xfa, 0xd0, 0xc0, 0x23, 0x5b, 0x01, 0x00, 0x20, 0x13, 0x61,
-  0x90, 0x70, 0x00, 0xf0, 0x23, 0xf8, 0x63, 0x78, 0x5b, 0xb2, 0x00, 0x2b,
-  0xfb, 0xdb, 0x0d, 0x4a, 0x09, 0x4b, 0x5a, 0x80, 0x0c, 0x4b, 0xda, 0x79,
-  0xd2, 0x09, 0x01, 0x2a, 0xfa, 0xd0, 0x41, 0x22, 0x5a, 0x70, 0x10, 0xbd,
-  0x04, 0x00, 0x00, 0x20, 0xff, 0xff, 0xff, 0x00, 0x10, 0xe0, 0x00, 0xe0,
-  0x00, 0xed, 0x00, 0xe0, 0x00, 0x04, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x40,
-  0x1e, 0x40, 0x00, 0x00, 0x00, 0x40, 0x00, 0x42, 0x21, 0x40, 0x00, 0x00,
-  0x00, 0x48, 0x00, 0x42, 0x00, 0xb5, 0x14, 0x4a, 0x51, 0x7e, 0x13, 0x1c,
-  0xc9, 0x09, 0x01, 0x29, 0xf9, 0xd0, 0x01, 0x38, 0x04, 0x28, 0x13, 0xd8,
-  0x19, 0x69, 0x10, 0x4a, 0x0a, 0x40, 0x1a, 0x61, 0x5a, 0x78, 0x0f, 0x21,
-  0x8a, 0x43, 0x00, 0xf0, 0xd1, 0xfb, 0x03, 0x05, 0x09, 0x07, 0x03, 0x00,
-  0x01, 0x21, 0x02, 0xe0, 0x03, 0x21, 0x00, 0xe0, 0x02, 0x21, 0x0a, 0x43,
-  0x5a, 0x70, 0x0a, 0xe0, 0x11, 0x69, 0xf0, 0x23, 0x1b, 0x05, 0x0b, 0x43,
-  0x13, 0x61, 0x53, 0x78, 0x0f, 0x21, 0x8b, 0x43, 0x02, 0x21, 0x0b, 0x43,
-  0x53, 0x70, 0x00, 0xbd, 0x00, 0x40, 0x00, 0x42, 0xff, 0xff, 0xff, 0xf0,
-  0x10, 0xb5, 0x18, 0x24, 0x02, 0x1c, 0x20, 0x1c, 0x50, 0x43, 0x2a, 0x4b,
-  0x18, 0x18, 0x00, 0x7a, 0x40, 0xb2, 0x01, 0x30, 0x4c, 0xd0, 0x03, 0x29,
-  0x4a, 0xd8, 0x08, 0x1c, 0x21, 0x1c, 0x00, 0xf0, 0xa5, 0xfb, 0x02, 0x33,
-  0x11, 0x21, 0x62, 0x43, 0x98, 0x56, 0x9a, 0x18, 0xc3, 0x01, 0x22, 0x48,
-  0x52, 0x68, 0x1b, 0x18, 0x99, 0x18, 0x40, 0x31, 0x02, 0x20, 0x08, 0x70,
-  0x01, 0x21, 0x91, 0x40, 0x59, 0x60, 0x35, 0xe0, 0x62, 0x43, 0x98, 0x56,
-  0x1b, 0x49, 0x9a, 0x18, 0x52, 0x68, 0xc3, 0x01, 0x5b, 0x18, 0x99, 0x18,
-  0x40, 0x31, 0x06, 0x20, 0x08, 0x70, 0x01, 0x21, 0x91, 0x40, 0x59, 0x60,
-  0x99, 0x61, 0x25, 0xe0, 0x51, 0x43, 0x5a, 0x56, 0x13, 0x48, 0x59, 0x18,
-  0x4b, 0x68, 0xd2, 0x01, 0x11, 0x18, 0xc8, 0x18, 0x40, 0x30, 0x06, 0x24,
-  0x04, 0x70, 0x01, 0x20, 0x98, 0x40, 0x48, 0x60, 0x0e, 0x49, 0x52, 0x18,
-  0x50, 0x60, 0x13, 0xe0, 0x51, 0x43, 0x5a, 0x56, 0x59, 0x18, 0x0a, 0x4b,
-  0x49, 0x68, 0xd2, 0x01, 0xd2, 0x18, 0x53, 0x18, 0x40, 0x33, 0x18, 0x78,
-  0x02, 0x24, 0x20, 0x43, 0x18, 0x70, 0x18, 0x78, 0x04, 0x24, 0xa0, 0x43,
-  0x18, 0x70, 0x01, 0x23, 0x8b, 0x40, 0x93, 0x60, 0x10, 0xbd, 0xc0, 0x46,
-  0x20, 0x50, 0x00, 0x00, 0x00, 0x44, 0x00, 0x41, 0x10, 0x44, 0x00, 0x41,
-  0x18, 0x23, 0x58, 0x43, 0x13, 0x4a, 0xf0, 0xb5, 0x13, 0x18, 0x08, 0x24,
-  0x1c, 0x57, 0x01, 0x34, 0x1f, 0xd0, 0x82, 0x56, 0x10, 0x4e, 0xd2, 0x01,
-  0x5d, 0x68, 0x01, 0x24, 0x90, 0x19, 0x23, 0x1c, 0x86, 0x68, 0xab, 0x40,
-  0x1e, 0x42, 0x0b, 0xd1, 0x0e, 0x1c, 0x77, 0x1e, 0xbe, 0x41, 0x40, 0x19,
-  0x34, 0x40, 0x40, 0x30, 0xa5, 0x00, 0x04, 0x78, 0x04, 0x26, 0xb4, 0x43,
-  0x2c, 0x43, 0x04, 0x70, 0x00, 0x29, 0x03, 0xd1, 0x05, 0x49, 0x52, 0x18,
-  0x53, 0x60, 0x02, 0xe0, 0x02, 0x4e, 0x92, 0x19, 0x93, 0x61, 0xf0, 0xbd,
-  0x20, 0x50, 0x00, 0x00, 0x00, 0x44, 0x00, 0x41, 0x10, 0x44, 0x00, 0x41,
-  0x18, 0x22, 0x42, 0x43, 0xf8, 0xb5, 0x2d, 0x4d, 0x08, 0x24, 0xaa, 0x18,
-  0x14, 0x57, 0x03, 0x1c, 0x62, 0x1c, 0x50, 0xd0, 0x48, 0x1c, 0x00, 0x24,
-  0x0c, 0x28, 0x4c, 0xd8, 0x00, 0xf0, 0x16, 0xfb, 0x07, 0x1e, 0x1e, 0x1e,
-  0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x01, 0x24,
-  0x64, 0x42, 0x40, 0xe0, 0x09, 0x29, 0x02, 0xd1, 0x18, 0x1c, 0x00, 0x21,
-  0x03, 0xe0, 0x0a, 0x29, 0x04, 0xd1, 0x18, 0x1c, 0x02, 0x21, 0xff, 0xf7,
-  0x4b, 0xff, 0x23, 0xe0, 0x00, 0x24, 0x0b, 0x29, 0x31, 0xd1, 0x18, 0x1c,
-  0x01, 0x21, 0xff, 0xf7, 0x43, 0xff, 0x2c, 0xe0, 0x18, 0x22, 0x53, 0x43,
-  0xea, 0x18, 0x52, 0x68, 0xeb, 0x56, 0x01, 0x20, 0x14, 0x1c, 0x04, 0x40,
-  0x55, 0x08, 0xdb, 0x01, 0x00, 0x2c, 0x11, 0xd0, 0x12, 0x4c, 0x1b, 0x19,
-  0x5d, 0x19, 0x30, 0x35, 0x2e, 0x78, 0x0c, 0x01, 0x0f, 0x21, 0x31, 0x40,
-  0x21, 0x43, 0x9a, 0x18, 0xc9, 0xb2, 0x29, 0x70, 0x40, 0x32, 0x13, 0x78,
-  0x18, 0x43, 0x10, 0x70, 0x00, 0x24, 0x0e, 0xe0, 0x09, 0x4e, 0x0f, 0x27,
-  0x9b, 0x19, 0x5d, 0x19, 0x30, 0x35, 0x2e, 0x78, 0x9a, 0x18, 0xbe, 0x43,
-  0x31, 0x43, 0xc9, 0xb2, 0x29, 0x70, 0x40, 0x32, 0x13, 0x78, 0x18, 0x43,
-  0x10, 0x70, 0x20, 0x1c, 0xf8, 0xbd, 0xc0, 0x46, 0x20, 0x50, 0x00, 0x00,
-  0x00, 0x44, 0x00, 0x41, 0xf7, 0xb5, 0x8a, 0x18, 0x06, 0x1c, 0x0d, 0x1c,
-  0x01, 0x92, 0x0c, 0x1c, 0x01, 0x9b, 0x67, 0x1b, 0x9c, 0x42, 0x07, 0xd0,
-  0x33, 0x68, 0x21, 0x78, 0x1b, 0x68, 0x30, 0x1c, 0x98, 0x47, 0x01, 0x34,
-  0x00, 0x28, 0xf3, 0xd1, 0x38, 0x1c, 0xfe, 0xbd, 0x15, 0x4a, 0x13, 0x68,
-  0x58, 0x1c, 0x25, 0xd0, 0x01, 0x3b, 0x13, 0x60, 0x00, 0x2b, 0x21, 0xd1,
-  0x72, 0xb6, 0x12, 0x4a, 0x12, 0x4b, 0x04, 0x32, 0x9a, 0x42, 0x07, 0xd8,
-  0xbf, 0xf3, 0x4f, 0x8f, 0x10, 0x4a, 0x11, 0x4b, 0xda, 0x60, 0xbf, 0xf3,
-  0x4f, 0x8f, 0x11, 0xe0, 0x0f, 0x4b, 0x19, 0x7d, 0xc8, 0x07, 0xfb, 0xd5,
-  0x18, 0x8b, 0x20, 0x21, 0xff, 0x31, 0x92, 0x08, 0x52, 0x00, 0x01, 0x43,
-  0x19, 0x83, 0xda, 0x61, 0x0a, 0x4a, 0x1a, 0x80, 0x1a, 0x7d, 0xd1, 0x07,
-  0xfc, 0xd5, 0xe5, 0xe7, 0xc0, 0x46, 0xfd, 0xe7, 0x70, 0x47, 0xc0, 0x46,
-  0x08, 0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00,
-  0x04, 0x00, 0xfa, 0x05, 0x00, 0xed, 0x00, 0xe0, 0x00, 0x40, 0x00, 0x41,
-  0x02, 0xa5, 0xff, 0xff, 0x01, 0x60, 0x70, 0x47, 0xf7, 0xb5, 0x08, 0xac,
-  0x26, 0x78, 0x04, 0x68, 0x9d, 0x1e, 0x27, 0x68, 0x6c, 0x1e, 0xa5, 0x41,
-  0xec, 0xb2, 0x92, 0x07, 0x05, 0x68, 0x3a, 0x43, 0x27, 0x06, 0x3a, 0x43,
-  0x2a, 0x60, 0x02, 0x68, 0x07, 0x25, 0x29, 0x40, 0x50, 0x68, 0xb5, 0x01,
-  0x00, 0x2c, 0x00, 0xd0, 0x5c, 0x03, 0x29, 0x43, 0x01, 0x43, 0x0c, 0x43,
-  0x54, 0x60, 0xf7, 0xbd, 0x30, 0xb5, 0x03, 0x68, 0xc0, 0x25, 0x1c, 0x68,
-  0xad, 0x03, 0x12, 0x05, 0x2a, 0x40, 0x22, 0x43, 0xc0, 0x24, 0xa4, 0x02,
-  0x09, 0x04, 0x21, 0x40, 0x11, 0x43, 0x19, 0x60, 0x03, 0x68, 0x5a, 0x68,
-  0x14, 0x43, 0x5c, 0x60, 0x30, 0xbd, 0x03, 0x68, 0x01, 0x21, 0x1a, 0x68,
-  0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68, 0x11, 0x68, 0x01, 0x23, 0x19, 0x42,
-  0xfb, 0xd1, 0xd1, 0x69, 0x19, 0x42, 0xf8, 0xd1, 0x70, 0x47, 0x03, 0x68,
-  0x02, 0x21, 0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68, 0xd3, 0x69,
-  0x99, 0x07, 0xfc, 0xd4, 0x70, 0x47, 0x03, 0x68, 0x1a, 0x7e, 0xd1, 0x07,
-  0x02, 0xd4, 0x1a, 0x7e, 0x91, 0x07, 0xfc, 0xd5, 0x70, 0x47, 0x03, 0x68,
-  0x00, 0x22, 0x5a, 0x83, 0x70, 0x47, 0x03, 0x68, 0x18, 0x7e, 0x40, 0x07,
-  0xc0, 0x0f, 0x70, 0x47, 0x03, 0x68, 0x18, 0x7e, 0xc0, 0x09, 0x70, 0x47,
-  0x03, 0x68, 0x80, 0x22, 0x19, 0x7e, 0x52, 0x42, 0x0a, 0x43, 0x1a, 0x76,
-  0x70, 0x47, 0x03, 0x68, 0x18, 0x8d, 0xc0, 0xb2, 0x70, 0x47, 0x03, 0x68,
-  0x1a, 0x7e, 0x01, 0x20, 0x02, 0x42, 0xfb, 0xd0, 0x19, 0x85, 0x70, 0x47,
-  0x70, 0xb5, 0x03, 0x68, 0x01, 0x26, 0x8d, 0x07, 0xed, 0x0f, 0x31, 0x40,
-  0x1c, 0x68, 0x6d, 0x07, 0x09, 0x07, 0x29, 0x43, 0x21, 0x43, 0x19, 0x60,
-  0x04, 0x68, 0x51, 0x00, 0x03, 0x48, 0x00, 0xf0, 0xff, 0xf9, 0x01, 0x38,
-  0xc0, 0xb2, 0x20, 0x73, 0x70, 0xbd, 0xc0, 0x46, 0x00, 0x6c, 0xdc, 0x02,
-  0x03, 0x68, 0x01, 0x21, 0x1a, 0x68, 0x0a, 0x43, 0x1a, 0x60, 0x02, 0x68,
-  0x11, 0x68, 0x01, 0x23, 0x19, 0x42, 0xfb, 0xd1, 0xd1, 0x69, 0x19, 0x42,
-  0xf8, 0xd1, 0x70, 0x47, 0x03, 0x68, 0x02, 0x21, 0x1a, 0x68, 0x0a, 0x43,
-  0x1a, 0x60, 0x02, 0x68, 0xd3, 0x69, 0x99, 0x07, 0xfc, 0xd4, 0x70, 0x47,
-  0x03, 0x68, 0xda, 0x69, 0x91, 0x07, 0xfc, 0xd4, 0x1a, 0x68, 0x02, 0x21,
-  0x8a, 0x43, 0x1a, 0x60, 0x70, 0x47, 0x03, 0x68, 0x9a, 0x6a, 0x52, 0x0a,
-  0x52, 0x02, 0x11, 0x43, 0x99, 0x62, 0x03, 0x68, 0x1a, 0x7e, 0x51, 0x07,
-  0xfc, 0xd5, 0x98, 0x6a, 0xc0, 0xb2, 0x70, 0x47, 0x03, 0x68, 0x22, 0x4a,
-  0x30, 0xb5, 0x93, 0x42, 0x11, 0xd0, 0x21, 0x4a, 0x93, 0x42, 0x11, 0xd0,
-  0x20, 0x4a, 0x93, 0x42, 0x11, 0xd0, 0x20, 0x4a, 0x93, 0x42, 0x11, 0xd0,
-  0x1f, 0x4a, 0x93, 0x42, 0x11, 0xd0, 0x1f, 0x4a, 0x93, 0x42, 0x30, 0xd1,
-  0x0e, 0x23, 0x19, 0x22, 0x0d, 0xe0, 0x09, 0x23, 0x14, 0x22, 0x0a, 0xe0,
-  0x0a, 0x23, 0x15, 0x22, 0x07, 0xe0, 0x0b, 0x23, 0x16, 0x22, 0x04, 0xe0,
-  0x0c, 0x23, 0x17, 0x22, 0x01, 0xe0, 0x0d, 0x23, 0x18, 0x22, 0xdc, 0xb2,
-  0x15, 0x49, 0x01, 0x20, 0x9b, 0x08, 0xa0, 0x40, 0x9b, 0x00, 0x08, 0x60,
-  0x5b, 0x18, 0x03, 0x20, 0xc0, 0x21, 0x89, 0x00, 0x04, 0x40, 0x5d, 0x58,
-  0xe0, 0x00, 0xff, 0x24, 0x84, 0x40, 0xa5, 0x43, 0x2c, 0x1c, 0xc0, 0x25,
-  0x85, 0x40, 0x28, 0x1c, 0x20, 0x43, 0x58, 0x50, 0x80, 0x23, 0xdb, 0x01,
-  0x1a, 0x43, 0x0a, 0x4b, 0x5a, 0x80, 0x5a, 0x78, 0x52, 0xb2, 0x00, 0x2a,
-  0xfb, 0xdb, 0x30, 0xbd, 0x00, 0x08, 0x00, 0x42, 0x00, 0x0c, 0x00, 0x42,
-  0x00, 0x10, 0x00, 0x42, 0x00, 0x14, 0x00, 0x42, 0x00, 0x18, 0x00, 0x42,
-  0x00, 0x1c, 0x00, 0x42, 0x00, 0xe1, 0x00, 0xe0, 0x00, 0x0c, 0x00, 0x40,
-  0xf8, 0xb5, 0x04, 0x1c, 0x15, 0x1c, 0x0e, 0x1c, 0x1f, 0x1c, 0xff, 0xf7,
-  0xa3, 0xff, 0x20, 0x1c, 0xff, 0xf7, 0x1b, 0xff, 0xb1, 0x00, 0x1c, 0x22,
-  0x0a, 0x40, 0x69, 0x07, 0x23, 0x68, 0x09, 0x0c, 0x0a, 0x43, 0x1a, 0x60,
-  0x22, 0x68, 0x84, 0x23, 0x93, 0x75, 0x01, 0x2e, 0x1a, 0xd1, 0x08, 0x21,
-  0x01, 0x2d, 0x00, 0xd1, 0x10, 0x21, 0x0c, 0x4b, 0x79, 0x43, 0x18, 0x68,
-  0xc0, 0x00, 0x00, 0xf0, 0x53, 0xf9, 0x23, 0x68, 0x07, 0x21, 0x9a, 0x89,
-  0x01, 0x40, 0xd2, 0x04, 0x49, 0x03, 0xd2, 0x0c, 0x0a, 0x43, 0x9a, 0x81,
-  0x23, 0x68, 0x00, 0x04, 0xc2, 0x0c, 0x98, 0x89, 0x40, 0x0b, 0x40, 0x03,
-  0x10, 0x43, 0x98, 0x81, 0xf8, 0xbd, 0xc0, 0x46, 0x04, 0x00, 0x00, 0x20,
-  0xf7, 0xb5, 0x01, 0x93, 0x08, 0xab, 0x04, 0x1c, 0x1f, 0x78, 0x0d, 0x1c,
-  0x16, 0x1c, 0xff, 0xf7, 0x3d, 0xff, 0x20, 0x1c, 0xff, 0xf7, 0x68, 0xff,
-  0xbf, 0x07, 0x0c, 0x22, 0x17, 0x43, 0xc0, 0x22, 0x92, 0x03, 0x36, 0x05,
-  0x16, 0x40, 0xc0, 0x22, 0x92, 0x02, 0x2d, 0x04, 0x23, 0x68, 0x3e, 0x43,
-  0x01, 0x99, 0x15, 0x40, 0x35, 0x43, 0x07, 0x22, 0x1d, 0x60, 0x0a, 0x40,
-  0x80, 0x21, 0x23, 0x68, 0x89, 0x02, 0x0a, 0x43, 0x5a, 0x60, 0xf7, 0xbd,
-  0x01, 0x20, 0x70, 0x47, 0x08, 0xb5, 0x03, 0x68, 0x13, 0x22, 0xdb, 0x69,
-  0x98, 0x47, 0x08, 0xbd, 0x10, 0xb5, 0x04, 0x1c, 0x00, 0x69, 0xff, 0xf7,
-  0xbe, 0xfe, 0x20, 0x1c, 0x14, 0x30, 0x00, 0xf0, 0xdd, 0xf8, 0x10, 0xbd,
-  0x08, 0xb5, 0x00, 0x69, 0xff, 0xf7, 0xcd, 0xfe, 0x08, 0xbd, 0x08, 0xb5,
-  0x14, 0x30, 0x00, 0xf0, 0xe5, 0xf8, 0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30,
-  0x00, 0xf0, 0xe6, 0xf8, 0x08, 0xbd, 0x08, 0xb5, 0x14, 0x30, 0x00, 0xf0,
-  0xcd, 0xf8, 0x08, 0xbd, 0x08, 0xb5, 0x00, 0x69, 0xff, 0xf7, 0xd9, 0xfe,
-  0x01, 0x20, 0x08, 0xbd, 0xf7, 0xb5, 0x1d, 0x1c, 0x08, 0xab, 0x1b, 0x78,
-  0x04, 0x1c, 0x00, 0x93, 0x09, 0xab, 0x1b, 0x78, 0x16, 0x1c, 0x01, 0x93,
-  0x00, 0x23, 0x43, 0x60, 0xfa, 0x23, 0x9b, 0x00, 0x83, 0x60, 0x09, 0x4b,
-  0x0f, 0x1c, 0x08, 0x33, 0x03, 0x60, 0x14, 0x30, 0x00, 0xf0, 0x96, 0xf8,
-  0x00, 0x9a, 0x23, 0x1c, 0x5c, 0x33, 0x27, 0x61, 0x9a, 0x70, 0x01, 0x9a,
-  0x1e, 0x70, 0x5d, 0x70, 0x20, 0x1c, 0xda, 0x70, 0xfe, 0xbd, 0xc0, 0x46,
-  0x40, 0x54, 0x00, 0x00, 0x10, 0xb5, 0x04, 0x1c, 0x00, 0x69, 0xff, 0xf7,
-  0x9a, 0xfe, 0x00, 0x28, 0x07, 0xd0, 0x20, 0x69, 0xff, 0xf7, 0xa5, 0xfe,
-  0x01, 0x1c, 0x20, 0x1c, 0x14, 0x30, 0x00, 0xf0, 0x84, 0xf8, 0x20, 0x69,
-  0xff, 0xf7, 0x92, 0xfe, 0x00, 0x28, 0x05, 0xd0, 0x20, 0x69, 0xff, 0xf7,
-  0x91, 0xfe, 0x20, 0x69, 0xff, 0xf7, 0x81, 0xfe, 0x10, 0xbd, 0xf0, 0x23,
-  0x08, 0x1c, 0x18, 0x40, 0x30, 0x38, 0x43, 0x42, 0x58, 0x41, 0x70, 0x47,
-  0xf0, 0x23, 0x1b, 0x01, 0x19, 0x40, 0x80, 0x23, 0x9b, 0x00, 0x99, 0x42,
-  0x0c, 0xd0, 0xc0, 0x23, 0x9b, 0x00, 0x99, 0x42, 0x06, 0xd0, 0x80, 0x23,
-  0x5b, 0x00, 0x05, 0x20, 0x99, 0x42, 0x04, 0xd0, 0x00, 0x20, 0x02, 0xe0,
-  0x07, 0x20, 0x00, 0xe0, 0x06, 0x20, 0x70, 0x47, 0x0f, 0x23, 0x19, 0x40,
-  0x01, 0x29, 0x05, 0xd0, 0x02, 0x39, 0x4b, 0x42, 0x4b, 0x41, 0x02, 0x20,
-  0xc0, 0x1a, 0x00, 0xe0, 0x00, 0x20, 0x70, 0x47, 0xf0, 0xb5, 0x03, 0x1c,
-  0x85, 0xb0, 0x03, 0x91, 0x5c, 0x33, 0x04, 0x1c, 0x18, 0x27, 0x18, 0x78,
-  0x3b, 0x1c, 0x43, 0x43, 0x1b, 0x4e, 0x08, 0x21, 0xf3, 0x18, 0x59, 0x56,
-  0x15, 0x1c, 0xff, 0xf7, 0x45, 0xfd, 0x23, 0x1c, 0x5d, 0x33, 0x18, 0x78,
-  0x08, 0x21, 0x47, 0x43, 0xf6, 0x19, 0x71, 0x56, 0xff, 0xf7, 0x3c, 0xfd,
-  0x01, 0x21, 0x0a, 0x1c, 0x03, 0x9b, 0x20, 0x69, 0xff, 0xf7, 0xf2, 0xfe,
-  0x29, 0x1c, 0x20, 0x1c, 0xff, 0xf7, 0xba, 0xff, 0x29, 0x1c, 0x07, 0x1c,
-  0x20, 0x1c, 0xff, 0xf7, 0xcb, 0xff, 0x29, 0x1c, 0x06, 0x1c, 0x20, 0x1c,
-  0xff, 0xf7, 0xa9, 0xff, 0x39, 0x1c, 0x00, 0x90, 0x33, 0x1c, 0x20, 0x69,
-  0x01, 0x22, 0xff, 0xf7, 0xd3, 0xfd, 0x23, 0x1c, 0x5f, 0x33, 0x19, 0x78,
-  0x01, 0x3b, 0x1a, 0x78, 0x20, 0x69, 0xff, 0xf7, 0xe7, 0xfd, 0x20, 0x69,
-  0xff, 0xf7, 0x05, 0xfe, 0x05, 0xb0, 0xf0, 0xbd, 0x20, 0x50, 0x00, 0x00,
-  0x10, 0xb5, 0x00, 0x21, 0x40, 0x22, 0x04, 0x1c, 0x00, 0xf0, 0xde, 0xf8,
-  0x00, 0x23, 0x20, 0x1c, 0x23, 0x64, 0x63, 0x64, 0x10, 0xbd, 0x02, 0x6c,
-  0x10, 0xb5, 0x3f, 0x23, 0x54, 0x1c, 0x23, 0x40, 0x44, 0x6c, 0xa3, 0x42,
-  0x01, 0xd0, 0x81, 0x54, 0x03, 0x64, 0x10, 0xbd, 0x00, 0x23, 0x03, 0x64,
-  0x43, 0x64, 0x70, 0x47, 0x43, 0x6c, 0x02, 0x6c, 0x93, 0x42, 0x06, 0xd0,
-  0xc2, 0x5c, 0x3f, 0x21, 0x01, 0x33, 0x0b, 0x40, 0x43, 0x64, 0x10, 0x1c,
-  0x01, 0xe0, 0x01, 0x20, 0x40, 0x42, 0x70, 0x47, 0x02, 0x6c, 0x43, 0x6c,
-  0xd0, 0x1a, 0x00, 0xd5, 0x40, 0x30, 0x70, 0x47, 0x43, 0x6c, 0x02, 0x6c,
-  0x93, 0x42, 0x01, 0xd0, 0xc0, 0x5c, 0x01, 0xe0, 0x01, 0x20, 0x40, 0x42,
-  0x70, 0x47, 0x00, 0x00, 0x02, 0xb4, 0x71, 0x46, 0x49, 0x08, 0x49, 0x00,
-  0x09, 0x5c, 0x49, 0x00, 0x8e, 0x44, 0x02, 0xbc, 0x70, 0x47, 0xc0, 0x46,
-  0x00, 0x29, 0x34, 0xd0, 0x01, 0x23, 0x00, 0x22, 0x10, 0xb4, 0x88, 0x42,
-  0x2c, 0xd3, 0x01, 0x24, 0x24, 0x07, 0xa1, 0x42, 0x04, 0xd2, 0x81, 0x42,
-  0x02, 0xd2, 0x09, 0x01, 0x1b, 0x01, 0xf8, 0xe7, 0xe4, 0x00, 0xa1, 0x42,
-  0x04, 0xd2, 0x81, 0x42, 0x02, 0xd2, 0x49, 0x00, 0x5b, 0x00, 0xf8, 0xe7,
-  0x88, 0x42, 0x01, 0xd3, 0x40, 0x1a, 0x1a, 0x43, 0x4c, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0x5c, 0x08, 0x22, 0x43, 0x8c, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0x9c, 0x08, 0x22, 0x43, 0xcc, 0x08, 0xa0, 0x42,
-  0x02, 0xd3, 0x00, 0x1b, 0xdc, 0x08, 0x22, 0x43, 0x00, 0x28, 0x03, 0xd0,
-  0x1b, 0x09, 0x01, 0xd0, 0x09, 0x09, 0xe3, 0xe7, 0x10, 0x1c, 0x10, 0xbc,
-  0x70, 0x47, 0x00, 0x28, 0x01, 0xd0, 0x00, 0x20, 0xc0, 0x43, 0x07, 0xb4,
-  0x02, 0x48, 0x02, 0xa1, 0x40, 0x18, 0x02, 0x90, 0x03, 0xbd, 0xc0, 0x46,
-  0x19, 0x00, 0x00, 0x00, 0x00, 0x29, 0xf0, 0xd0, 0x03, 0xb5, 0xff, 0xf7,
-  0xb9, 0xff, 0x0e, 0xbc, 0x42, 0x43, 0x89, 0x1a, 0x18, 0x47, 0xc0, 0x46,
-  0x70, 0x47, 0xc0, 0x46, 0x70, 0xb5, 0x0e, 0x4b, 0x0e, 0x4d, 0x00, 0x24,
-  0xed, 0x1a, 0xad, 0x10, 0x1e, 0x1c, 0xac, 0x42, 0x04, 0xd0, 0xa3, 0x00,
-  0xf3, 0x58, 0x98, 0x47, 0x01, 0x34, 0xf8, 0xe7, 0x00, 0xf0, 0x32, 0xf9,
-  0x08, 0x4b, 0x09, 0x4d, 0x00, 0x24, 0xed, 0x1a, 0xad, 0x10, 0x1e, 0x1c,
-  0xac, 0x42, 0x04, 0xd0, 0xa3, 0x00, 0xf3, 0x58, 0x98, 0x47, 0x01, 0x34,
-  0xf8, 0xe7, 0x70, 0xbd, 0x70, 0x00, 0x00, 0x20, 0x70, 0x00, 0x00, 0x20,
-  0x70, 0x00, 0x00, 0x20, 0x8c, 0x00, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b,
-  0x01, 0x1c, 0x18, 0x68, 0x00, 0xf0, 0x76, 0xf8, 0x08, 0xbd, 0xc0, 0x46,
-  0x6c, 0x00, 0x00, 0x20, 0x08, 0xb5, 0x03, 0x4b, 0x01, 0x1c, 0x18, 0x68,
-  0x00, 0xf0, 0x24, 0xf8, 0x08, 0xbd, 0xc0, 0x46, 0x6c, 0x00, 0x00, 0x20,
-  0x30, 0xb5, 0x00, 0x23, 0x93, 0x42, 0x08, 0xd0, 0xc5, 0x5c, 0x01, 0x33,
-  0xcc, 0x18, 0x01, 0x3c, 0x24, 0x78, 0xa5, 0x42, 0xf6, 0xd0, 0x28, 0x1b,
-  0x00, 0xe0, 0x00, 0x20, 0x30, 0xbd, 0x10, 0xb5, 0x00, 0x23, 0x93, 0x42,
-  0x03, 0xd0, 0xcc, 0x5c, 0xc4, 0x54, 0x01, 0x33, 0xf9, 0xe7, 0x10, 0xbd,
-  0x03, 0x1c, 0x82, 0x18, 0x93, 0x42, 0x02, 0xd0, 0x19, 0x70, 0x01, 0x33,
-  0xfa, 0xe7, 0x70, 0x47, 0x30, 0xb5, 0x00, 0x29, 0x40, 0xd0, 0x04, 0x39,
-  0x0b, 0x68, 0x00, 0x2b, 0x00, 0xda, 0xc9, 0x18, 0x1e, 0x4a, 0x13, 0x68,
-  0x14, 0x1c, 0x00, 0x2b, 0x02, 0xd1, 0x4b, 0x60, 0x11, 0x60, 0x33, 0xe0,
-  0x99, 0x42, 0x0f, 0xd2, 0x08, 0x68, 0x0a, 0x18, 0x9a, 0x42, 0x05, 0xd1,
-  0x13, 0x68, 0x52, 0x68, 0xc0, 0x18, 0x08, 0x60, 0x4a, 0x60, 0x00, 0xe0,
-  0x4b, 0x60, 0x21, 0x60, 0x24, 0xe0, 0x8a, 0x42, 0x03, 0xd8, 0x13, 0x1c,
-  0x5a, 0x68, 0x00, 0x2a, 0xf9, 0xd1, 0x1d, 0x68, 0x5c, 0x19, 0x8c, 0x42,
-  0x0b, 0xd1, 0x09, 0x68, 0x69, 0x18, 0x58, 0x18, 0x19, 0x60, 0x90, 0x42,
-  0x14, 0xd1, 0x14, 0x68, 0x52, 0x68, 0x09, 0x19, 0x19, 0x60, 0x5a, 0x60,
-  0x0e, 0xe0, 0x8c, 0x42, 0x02, 0xd9, 0x0c, 0x23, 0x03, 0x60, 0x09, 0xe0,
-  0x08, 0x68, 0x0c, 0x18, 0x94, 0x42, 0x03, 0xd1, 0x14, 0x68, 0x52, 0x68,
-  0x00, 0x19, 0x08, 0x60, 0x4a, 0x60, 0x59, 0x60, 0x30, 0xbd, 0xc0, 0x46,
-  0x6c, 0x08, 0x00, 0x20, 0x70, 0xb5, 0x03, 0x23, 0xcd, 0x1c, 0x9d, 0x43,
-  0x08, 0x35, 0x06, 0x1c, 0x0c, 0x2d, 0x01, 0xd2, 0x0c, 0x25, 0x01, 0xe0,
-  0x00, 0x2d, 0x3f, 0xdb, 0x8d, 0x42, 0x3d, 0xd3, 0x20, 0x4b, 0x1c, 0x68,
-  0x1a, 0x1c, 0x21, 0x1c, 0x00, 0x29, 0x13, 0xd0, 0x08, 0x68, 0x43, 0x1b,
-  0x0d, 0xd4, 0x0b, 0x2b, 0x02, 0xd9, 0x0b, 0x60, 0xcc, 0x18, 0x1e, 0xe0,
-  0x8c, 0x42, 0x02, 0xd1, 0x63, 0x68, 0x13, 0x60, 0x1a, 0xe0, 0x48, 0x68,
-  0x60, 0x60, 0x0c, 0x1c, 0x16, 0xe0, 0x0c, 0x1c, 0x49, 0x68, 0xe9, 0xe7,
-  0x14, 0x4c, 0x20, 0x68, 0x00, 0x28, 0x03, 0xd1, 0x30, 0x1c, 0x00, 0xf0,
-  0x25, 0xf8, 0x20, 0x60, 0x30, 0x1c, 0x29, 0x1c, 0x00, 0xf0, 0x20, 0xf8,
-  0x43, 0x1c, 0x15, 0xd0, 0xc4, 0x1c, 0x03, 0x23, 0x9c, 0x43, 0x84, 0x42,
-  0x0a, 0xd1, 0x25, 0x60, 0x20, 0x1c, 0x0b, 0x30, 0x07, 0x22, 0x23, 0x1d,
-  0x90, 0x43, 0xc3, 0x1a, 0x0b, 0xd0, 0x5a, 0x42, 0xe2, 0x50, 0x08, 0xe0,
-  0x21, 0x1a, 0x30, 0x1c, 0x00, 0xf0, 0x0a, 0xf8, 0x01, 0x30, 0xee, 0xd1,
-  0x0c, 0x23, 0x33, 0x60, 0x00, 0x20, 0x70, 0xbd, 0x6c, 0x08, 0x00, 0x20,
-  0x68, 0x08, 0x00, 0x20, 0x38, 0xb5, 0x07, 0x4c, 0x00, 0x23, 0x05, 0x1c,
-  0x08, 0x1c, 0x23, 0x60, 0x00, 0xf0, 0x2a, 0xf8, 0x43, 0x1c, 0x03, 0xd1,
-  0x23, 0x68, 0x00, 0x2b, 0x00, 0xd0, 0x2b, 0x60, 0x38, 0xbd, 0xc0, 0x46,
-  0x74, 0x08, 0x00, 0x20, 0xc9, 0xb2, 0x03, 0x78, 0x00, 0x2b, 0x03, 0xd0,
-  0x8b, 0x42, 0x04, 0xd0, 0x01, 0x30, 0xf8, 0xe7, 0x00, 0x29, 0x00, 0xd0,
-  0x18, 0x1c, 0x70, 0x47, 0x30, 0xb5, 0x03, 0x1c, 0x00, 0x2a, 0x07, 0xd0,
-  0x0c, 0x78, 0x01, 0x33, 0x5d, 0x1e, 0x01, 0x3a, 0x2c, 0x70, 0x01, 0x31,
-  0x00, 0x2c, 0xf5, 0xd1, 0x9a, 0x18, 0x93, 0x42, 0x03, 0xd0, 0x00, 0x21,
-  0x19, 0x70, 0x01, 0x33, 0xf9, 0xe7, 0x30, 0xbd, 0x09, 0x4a, 0x13, 0x68,
-  0x00, 0x2b, 0x0c, 0xd0, 0x18, 0x18, 0x69, 0x46, 0x88, 0x42, 0x02, 0xd8,
-  0x10, 0x60, 0x18, 0x1c, 0x70, 0x47, 0x05, 0x4b, 0x0c, 0x22, 0x01, 0x20,
-  0x1a, 0x60, 0x40, 0x42, 0xf8, 0xe7, 0x03, 0x4b, 0x13, 0x60, 0xef, 0xe7,
-  0x70, 0x08, 0x00, 0x20, 0x74, 0x08, 0x00, 0x20, 0x78, 0x08, 0x00, 0x20,
-  0xf8, 0xb5, 0xc0, 0x46, 0xf8, 0xbc, 0x08, 0xbc, 0x9e, 0x46, 0x70, 0x47,
-  0xf8, 0xb5, 0xc0, 0x46, 0xf8, 0xbc, 0x08, 0xbc, 0x9e, 0x46, 0x70, 0x47,
-  0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x2e, 0x42, 0x49, 0x4e, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x19, 0x22, 0x00, 0x00, 0x2d, 0x22, 0x00, 0x00, 0x59, 0x23, 0x00, 0x00,
-  0x85, 0x22, 0x00, 0x00, 0x99, 0x22, 0x00, 0x00, 0x57, 0x22, 0x00, 0x00,
-  0x2f, 0x00, 0x7c, 0x3c, 0x3e, 0x5e, 0x2b, 0x3d, 0x3f, 0x2f, 0x5b, 0x5d,
-  0x3b, 0x2c, 0x2a, 0x22, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x34, 0x00, 0x00,
-  0xe1, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-  0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-  0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0e, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x09, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x00, 0x01, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0f, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x03, 0x01, 0x03, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x14, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x15, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x01, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x01, 0x01, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x12, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x03, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x13, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x11, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x04, 0x00, 0x04, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x09, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x01, 0x04, 0x01, 0x04, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x04, 0x00, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x05, 0x00, 0xff, 0xff, 0xff, 0xff, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0c, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0c, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x0a, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0a, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x0b, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0x0b, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1b, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x1c, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x18, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x19, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x16, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x17, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x13, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x12, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x11, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0d, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x00, 0xff, 0xff, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x15, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x03, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x07, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0x01, 0x01, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-  0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-  0x14, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x95, 0x44, 0x00, 0x00, 0xe1, 0x40, 0x00, 0x00,
-  0x77, 0x44, 0x00, 0x00, 0x8b, 0x44, 0x00, 0x00, 0x81, 0x44, 0x00, 0x00,
-  0x6d, 0x44, 0x00, 0x00, 0x4d, 0x44, 0x00, 0x00, 0x71, 0x45, 0x00, 0x00,
-  0x59, 0x44, 0x00, 0x00, 0x49, 0x44, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x40, 0x42, 0x0f, 0x00,
-  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x74, 0x54, 0x00, 0x00,
-  0x94, 0x54, 0x00, 0x00, 0xb4, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x70, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x20, 0xdd, 0x20, 0x00, 0x00,
-  0x05, 0x22, 0x00, 0x00, 0xe9, 0x26, 0x00, 0x00, 0xb1, 0x2b, 0x00, 0x00,
-  0x5d, 0x38, 0x00, 0x00, 0x8d, 0x3a, 0x00, 0x00, 0xe5, 0x3a, 0x00, 0x00,
-  0xb5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

From 1a484a9759e9015d1a8b911dd78db22fcf11eea5 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 24 Jun 2017 06:35:18 +0000
Subject: [PATCH 097/124] Improved preprocessor check on missing CMSIS-Atmel

---
 bootloaders/zero/board_definitions.h | 2 +-
 bootloaders/zero/board_driver_usb.c  | 2 +-
 bootloaders/zero/board_init.c        | 2 +-
 bootloaders/zero/main.c              | 2 +-
 bootloaders/zero/sam_ba_serial.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootloaders/zero/board_definitions.h b/bootloaders/zero/board_definitions.h
index f2ce2b14c..2657fe30e 100644
--- a/bootloaders/zero/board_definitions.h
+++ b/bootloaders/zero/board_definitions.h
@@ -108,7 +108,7 @@
 #elif (SAML21 || SAMC21)
   #define BOOT_DOUBLE_TAP_ADDRESS           (HSRAM_ADDR + HSRAM_SIZE - 4)
 #else
-  #error "board_definitions.h: Unsupported chip"
+  #error "board_definitions.h: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
 
 #define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
diff --git a/bootloaders/zero/board_driver_usb.c b/bootloaders/zero/board_driver_usb.c
index 15ee2aec8..ee66620b1 100644
--- a/bootloaders/zero/board_driver_usb.c
+++ b/bootloaders/zero/board_driver_usb.c
@@ -38,7 +38,7 @@
 #elif (SAML21)
   #define GCM_USB                   (0x04U)
 #else
-  #error "board_driver_usb.c: Unsupported chip"
+  #error "board_driver_usb.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
 
 
diff --git a/bootloaders/zero/board_init.c b/bootloaders/zero/board_init.c
index 69237989b..8e5eeefd7 100644
--- a/bootloaders/zero/board_init.c
+++ b/bootloaders/zero/board_init.c
@@ -43,7 +43,7 @@ extern uint32_t SystemCoreClock;
   #define GENERIC_CLOCK_MULTIPLEXER_FDPLL   (0u)
   #define GENERIC_CLOCK_MULTIPLEXER_FDPLL96M_32K (1u)
 #else
-  #error "startup.c: Unsupported chip"
+  #error "startup.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
 
 #if (SAMD || SAML21)
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 47acb7bd8..8b0adcb96 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -106,7 +106,7 @@ uint32_t* pulSketch_Start_Address;
 #elif (SAML21 || SAMC21)
   if (RSTC->RCAUSE.bit.POR)
 #else
-  #error "main.c: Unsupported chip"
+  #error "main.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
 
   {
diff --git a/bootloaders/zero/sam_ba_serial.c b/bootloaders/zero/sam_ba_serial.c
index 5e1be8c99..8e87af0f4 100644
--- a/bootloaders/zero/sam_ba_serial.c
+++ b/bootloaders/zero/sam_ba_serial.c
@@ -70,7 +70,7 @@ void serial_open(void)
   MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
   #endif
 #else
-  #error "sam_ba_serial.c: Unsupported chip"
+  #error "sam_ba_serial.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
 
 	/* Set GCLK_GEN0 as source for GCLK_ID_SERCOMx_CORE */

From b2462aba733d02ce90ffd764e6030bbf8de61366 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 24 Jun 2017 07:03:42 +0000
Subject: [PATCH 098/124] Added bootloader documentation for manually
 downloading CMSIS-Atmel

---
 bootloaders/zero/README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index ef25211d1..04928d2f1 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -312,8 +312,16 @@ bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
 For all builds and platforms you will need to have the Arduino IDE installed as well as the packages
 for both Arduino SAMD Boards and for MattairTech SAM M0+ Boards, which provides the needed dependencies
 (CMSIS, CMSIS-Atmel, and the compiler toolchain: arm-none-eabi-gcc), which can be installed using the
-Arduino IDE Boards Manager. This project uses a Makefile, which is present in the root (zero) directory.
-However, you will need a make program:
+Arduino IDE Boards Manager. If you do not wish to install the MattairTech SAM M0+ Boards core, then the
+arm-none-eabi-gcc, CMSIS, and openocd packages are included with the stock Arduino SAMD. However, you
+will still need to download bossac (see above) and CMSIS-Atmel from MattairTech:
+
+* https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz
+
+Then install to ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel (or similar based on your OS)
+and rename the folder in CMSIS-Atmel from CMSIS to 1.0.0-mattairtech-1.
+
+This project uses a Makefile, which is in the root zero directory. However, you will need a make program:
 
 #### Windows
 

From 78f25ce9ea30c9d22ba8f92192b5db480be94c81 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Tue, 27 Jun 2017 20:41:41 +0000
Subject: [PATCH 099/124] Fixed BOOT_LOAD_PIN. Fixed Makefile for Windows.
 Added filename customization.

---
 bootloaders/zero/Makefile                     | 53 ++++++++++---------
 bootloaders/zero/README.md                    | 19 ++++++-
 bootloaders/zero/SDCard/sdBootloader.c        | 11 +++-
 .../board_definitions_Generic_D11C14A.h       | 13 +++++
 .../board_definitions_Generic_D11D14AM.h      | 13 +++++
 .../board_definitions_Generic_D11D14AS.h      | 13 +++++
 .../board_definitions_Generic_x21E.h          | 13 +++++
 .../board_definitions_Generic_x21G.h          | 13 +++++
 .../board_definitions_Generic_x21J.h          | 13 +++++
 .../board_definitions_MT_D11.h                | 13 +++++
 .../board_definitions_MT_D21E_rev_A.h         | 13 +++++
 .../board_definitions_MT_D21E_rev_B.h         | 13 +++++
 .../board_definitions_arduino_m0.h            | 13 +++++
 .../board_definitions_arduino_m0_pro.h        | 13 +++++
 .../board_definitions_arduino_mkr1000.h       | 13 +++++
 .../board_definitions_arduino_mkrzero.h       | 13 +++++
 .../board_definitions_arduino_zero.h          | 13 +++++
 .../board_definitions_genuino_mkr1000.h       | 13 +++++
 .../board_definitions_genuino_zero.h          | 13 +++++
 bootloaders/zero/main.c                       |  7 +--
 20 files changed, 264 insertions(+), 34 deletions(-)

diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index 7633233b7..621602b6a 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -89,7 +89,7 @@ ifeq ($(OS),Windows_NT)
   else
     MODULE_PATH?=$(LOCALAPPDATA)/Arduino15/packages/$(CORE_VENDOR)
     MODULE_PATH_ARDUINO?=$(LOCALAPPDATA)/Arduino15/packages/arduino
-    RM=rm
+    RM=del
     SEP=\\
   endif
 else
@@ -110,8 +110,9 @@ else
   endif
 endif
 
+PATHSEP=$(strip $(SEP))
 ARM_GCC_PATH?=$(MODULE_PATH_ARDUINO)/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-none-eabi-
-BUILD_PATH=build
+BUILD_DIR=build
 
 # -----------------------------------------------------------------------------
 # Tools
@@ -124,7 +125,7 @@ SIZE=$(ARM_GCC_PATH)size
 # Compiler options
 # eliminate PARANOIA define to save a tiny amount of code (~40B)
 CFLAGS_EXTRA=-D$(SDCARD) -D__$(MCU)__ -DBOARD_ID_$(BOARD_ID) -DPARANOIA
-CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_PATH)/%.lst)
+CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_DIR)/%.lst)
 ifdef DEBUG
   CFLAGS+=-g3 -O1 -DDEBUG=1
 else
@@ -177,8 +178,8 @@ SOURCES= \
   sam_ba_serial.c
 endif
 
-OBJECTS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.o))
-DEPS=$(addprefix $(BUILD_PATH)/, $(SOURCES:.c=.d))
+OBJECTS=$(addprefix $(BUILD_DIR)/, $(SOURCES:.c=.o))
+DEPS=$(addprefix $(BUILD_DIR)/, $(SOURCES:.c=.d))
 
 ifneq "test$(AVRSTUDIO_EXE_PATH)" "test"
   AS_BUILD=copy_for_atmel_studio
@@ -191,34 +192,34 @@ endif
 
 all: print_info $(SOURCES) $(BIN) $(HEX) $(AS_BUILD)
 
-$(ELF): Makefile $(BUILD_PATH) $(OBJECTS)
+$(ELF): Makefile $(BUILD_DIR) $(OBJECTS)
 	@echo ----------------------------------------------------------
 	@echo Creating ELF binary
-	"$(CC)" -L. -L$(BUILD_PATH) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps -Tlinker_scripts/$(LINKER_SCRIPT) -Wl,-Map,"$(BUILD_PATH)/$(NAME).map" -o "$(BUILD_PATH)/$(ELF)" -Wl,--start-group $(OBJECTS) -lm -Wl,--end-group
-	"$(NM)" "$(BUILD_PATH)/$(ELF)" >"$(BUILD_PATH)/$(NAME)_symbols.txt"
-	"$(SIZE)" --format=sysv -t -x $(BUILD_PATH)/$(ELF)
+	"$(CC)" -L. -L$(BUILD_DIR) $(LDFLAGS) -Os -Wl,--gc-sections -save-temps -Tlinker_scripts/$(LINKER_SCRIPT) -Wl,-Map,"$(BUILD_DIR)/$(NAME).map" -o "$(BUILD_DIR)/$(ELF)" -Wl,--start-group $(OBJECTS) -lm -Wl,--end-group
+	"$(NM)" "$(BUILD_DIR)/$(ELF)" >"$(BUILD_DIR)/$(NAME)_symbols.txt"
+	"$(SIZE)" --format=sysv -t -x $(BUILD_DIR)/$(ELF)
 
 $(BIN): $(ELF)
 	@echo ----------------------------------------------------------
 	@echo Creating flash binary
-	"$(OBJCOPY)" -O binary $(BUILD_PATH)/$< $@
+	"$(OBJCOPY)" -O binary $(BUILD_DIR)/$< $@
 
 $(HEX): $(ELF)
 	@echo ----------------------------------------------------------
 	@echo Creating flash binary
-	"$(OBJCOPY)" -O ihex $(BUILD_PATH)/$< $@
+	"$(OBJCOPY)" -O ihex $(BUILD_DIR)/$< $@
 
-$(BUILD_PATH)/%.o: %.c
+$(BUILD_DIR)/%.o: %.c
 	@echo ----------------------------------------------------------
 	@echo Compiling $< to $@
 	"$(CC)" $(CFLAGS) $(CFLAGS_EXTRA) $(INCLUDES) $< -o $@
 	@echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-$(BUILD_PATH):
+$(BUILD_DIR):
 	@echo ----------------------------------------------------------
 	@echo Creating build folder
-	-mkdir $(BUILD_PATH)
-	-mkdir $(BUILD_PATH)/SDCard
+	-mkdir $(BUILD_DIR)
+	-mkdir $(BUILD_DIR)$(PATHSEP)SDCard
 
 print_info:
 	@echo ----------------------------------------------------------
@@ -234,30 +235,30 @@ print_info:
 copy_for_atmel_studio: $(BIN) $(HEX)
 	@echo ----------------------------------------------------------
 	@echo Atmel Studio detected, copying ELF to project root for debug
-	cp $(BUILD_PATH)/$(ELF) .
+	cp $(BUILD_DIR)$(PATHSEP)$(ELF) .
 
 clean_for_atmel_studio:
 	@echo ----------------------------------------------------------
 	@echo Atmel Studio detected, cleaning ELF from project root
-	-$(RM) ./$(ELF)
+	-$(RM) .$(PATHSEP)$(ELF)
 
 clean: $(AS_CLEAN)
 	@echo ----------------------------------------------------------
 	@echo Cleaning project
 	-$(RM) $(BIN)
 	-$(RM) $(HEX)
-	-$(RM) $(BUILD_PATH)/SDCard/*.*
-	-$(RM) $(BUILD_PATH)/*.*
-	-rmdir $(BUILD_PATH)/SDCard
-	-rmdir $(BUILD_PATH)
+	-$(RM) $(BUILD_DIR)$(PATHSEP)SDCard$(PATHSEP)*.*
+	-$(RM) $(BUILD_DIR)$(PATHSEP)*.*
+	-rmdir $(BUILD_DIR)$(PATHSEP)SDCard
+	-rmdir $(BUILD_DIR)
 
 mostly_clean: $(AS_CLEAN)
 	@echo ----------------------------------------------------------
 	@echo Cleaning project except bin
 	-$(RM) $(HEX)
-	-$(RM) $(BUILD_PATH)/SDCard/*.*
-	-$(RM) $(BUILD_PATH)/*.*
-	-rmdir $(BUILD_PATH)/SDCard
-	-rmdir $(BUILD_PATH)
+	-$(RM) $(BUILD_DIR)$(PATHSEP)SDCard$(PATHSEP)*.*
+	-$(RM) $(BUILD_DIR)$(PATHSEP)*.*
+	-rmdir $(BUILD_DIR)$(PATHSEP)SDCard
+	-rmdir $(BUILD_DIR)
 
-.phony: print_info $(BUILD_PATH)
+.phony: print_info $(BUILD_DIR)
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index 04928d2f1..e89f8d8d4 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -240,7 +240,7 @@ This driver is the same as the one used by the MattairTech SAM M0+ Core.
 7. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
 8. Continue with driver installation above.
 
-A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.
+**A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.**
 
 #### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
 
@@ -479,6 +479,17 @@ binary file on the SD card already matches the installed firmware. In this
 case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
 By default, SDCARD_AUTORUN_DISABLED is defined.
 
+### SDCARD_FILENAME_PRIMARY
+### SDCARD_FILENAME_SECONDARY
+
+Two different binary files can be loaded, depending on external pin settings.
+By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+SDCARD_FILENAME_PRIMARY is loaded.
+
 ### SAM_BA_INTERFACE
 
 Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
@@ -651,6 +662,10 @@ which will produce a binary named sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin
 
 ## Technical Details
 
+**TTL Serial**
+
+The TX and RX pins are defined in the relevant board_definitions_* file. The baud rate is 115200 (8N1).
+
 **Arduino IDE Auto-Reset**
 
 When the Arduino IDE initiates the bootloader, the following procedure is used:
@@ -700,6 +715,8 @@ of the system stack. The applet in this case is a very simple word copy function
 applet has its own stack at the top of RAM, but the word copy applet uses little/none of this.
 The bossac tool is responsible for loading the applet. See Devices.h from the Bossa source.
 
+**A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.**
+
 
 ## License
 
diff --git a/bootloaders/zero/SDCard/sdBootloader.c b/bootloaders/zero/SDCard/sdBootloader.c
index d7a30f971..892ae8610 100644
--- a/bootloaders/zero/SDCard/sdBootloader.c
+++ b/bootloaders/zero/SDCard/sdBootloader.c
@@ -22,8 +22,15 @@
 FATFS Fatfs;                    /* Petit-FatFs work area */
 BYTE Buff[FLASH_PAGE_SIZE];        /* Page data buffer */
 
-char updateBin[] = "UPDATE.BIN";
-char update2Bin[] = "UPDATE2.BIN";
+#ifndef SDCARD_FILENAME_PRIMARY
+#define SDCARD_FILENAME_PRIMARY "UPDATE.BIN"
+#endif
+#ifndef SDCARD_FILENAME_SECONDARY
+#define SDCARD_FILENAME_SECONDARY "UPDATE2.BIN"
+#endif
+
+char updateBin[] = SDCARD_FILENAME_PRIMARY;
+char update2Bin[] = SDCARD_FILENAME_SECONDARY;
 
 uint8_t sdBootloader (uint8_t mode)
 {
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h b/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h
index 65ef5b4b9..7eb060274 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_D11C14A.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h
index 54a560142..8f18962af 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AM.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h
index 04eb0e033..8a8fbe01f 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_D11D14AS.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h b/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h
index 1ace79979..527ea0bbe 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_x21E.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h b/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h
index fc4d47032..5bd156502 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_x21G.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h b/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h
index fdb72ae98..16843a4c2 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Generic_x21J.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D11.h b/bootloaders/zero/board_definitions/board_definitions_MT_D11.h
index 95270cbf6..4fdc40eeb 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D11.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D11.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h
index caebf81eb..79e728629 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_A.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
index 0cd06538b..9a0ea5571 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h b/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h
index 97c7ac80b..237e6d7ed 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_m0.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h b/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h
index 6a6986b4a..5a87e7ce0 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_m0_pro.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h b/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h
index 042544117..72ef64abc 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_mkr1000.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h b/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h
index d34d9e71c..0ca6b571c 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_mkrzero.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h b/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h
index 219544909..acce186d3 100644
--- a/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h
+++ b/bootloaders/zero/board_definitions/board_definitions_arduino_zero.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h b/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h
index fd1ed6521..b7f219d01 100644
--- a/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h
+++ b/bootloaders/zero/board_definitions/board_definitions_genuino_mkr1000.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h b/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h
index a563ff51c..c798ef0bd 100644
--- a/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h
+++ b/bootloaders/zero/board_definitions/board_definitions_genuino_zero.h
@@ -38,7 +38,9 @@
  * makefile (so it can be used with the build_all_bootloaders.sh script).
  * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
  */
+#ifndef SDCARD_ENABLED
 //#define SDCARD_ENABLED
+#endif
 
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
@@ -96,6 +98,17 @@
  */
 #define SDCARD_AUTORUN_DISABLED
 
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
 /* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
  * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
  * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 8b0adcb96..427fb2239 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -82,16 +82,13 @@ uint32_t* pulSketch_Start_Address;
   }
 
 #if defined(BOOT_LOAD_PIN_ENABLED)
-  configPin(BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN, BOOT_LOAD_PIN_CONFIG);
+  pinConfig(BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN, BOOT_LOAD_PIN_CONFIG);
 
   /* Allow time for debouncing capacitor (if using a button) to charge (10ms) */
   delayUs(10000UL);
 
   // Read the BOOT_LOAD_PIN status
-  volatile bool boot_en = isPinActive(BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN, BOOT_LOAD_PIN_POLARITY);
-
-  // Check the bootloader enable condition
-  if (!boot_en)
+  if (isPinActive(BOOT_LOAD_PIN_PORT, BOOT_LOAD_PIN, BOOT_LOAD_PIN_POLARITY))
   {
     // Stay in bootloader
     return;

From 36654c5ba01191a27456ad862090e2ad0ad06c27 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 6 Jul 2017 02:16:27 +0000
Subject: [PATCH 100/124] Added support for up to 6 SERCOM on the L21E
 (32-pin). Added two additional timers to the C21E.

---
 boards.txt                         |  32 +++--
 cores/arduino/USB/samd21_host.c    |   2 +-
 cores/arduino/wiring.c             |  11 +-
 variants/Generic_D11C14A/README.md |   4 +-
 variants/MT_D11/README.md          |   3 +-
 variants/MT_D11/variant.h          |   2 +-
 variants/MT_D21E/README.md         |   3 +-
 variants/MT_D21E/variant.h         |  10 +-
 variants/MT_D21E_revB/README.md    |  69 +++++++++--
 variants/MT_D21E_revB/variant.cpp  | 182 ++++++++++++++++++++++-------
 variants/MT_D21E_revB/variant.h    |  92 ++++++++++++++-
 11 files changed, 337 insertions(+), 73 deletions(-)

diff --git a/boards.txt b/boards.txt
index 8d71bb7fc..bfda423a2 100644
--- a/boards.txt
+++ b/boards.txt
@@ -175,10 +175,26 @@ mattairtech_mt_d21e_revb.menu.serial.four_uart=FOUR_UART_NO_WIRE_NO_SPI
 mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_uart=FOUR_UART
 mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_wire=NO_WIRE
 mattairtech_mt_d21e_revb.menu.serial.four_uart.build.serialcom_spi=NO_SPI
-mattairtech_mt_d21e_revb.menu.serial.no_uart=NO_UART_ONE_WIRE_TWO_SPI
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_uart=NO_UART
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e_revb.menu.serial.no_uart.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi=NO_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.no_uart_one_wire_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi=FOUR_UART_ONE_WIRE_ONE_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi.build.serialcom_uart=FOUR_UART
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.four_uart_one_wire_one_spi.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi=FIVE_UART_NO_WIRE_ONE_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi.build.serialcom_uart=FIVE_UART
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.five_uart_no_wire_one_spi.build.serialcom_spi=ONE_SPI
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi=FIVE_UART_ONE_WIRE_NO_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi.build.serialcom_uart=FIVE_UART
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e_revb.menu.serial.five_uart_one_wire_no_spi.build.serialcom_spi=NO_SPI
+mattairtech_mt_d21e_revb.menu.serial.six_uart=SIX_UART_NO_WIRE_NO_SPI (L21 only)
+mattairtech_mt_d21e_revb.menu.serial.six_uart.build.serialcom_uart=SIX_UART
+mattairtech_mt_d21e_revb.menu.serial.six_uart.build.serialcom_wire=NO_WIRE
+mattairtech_mt_d21e_revb.menu.serial.six_uart.build.serialcom_spi=NO_SPI
 mattairtech_mt_d21e_revb.menu.usb.cdc=CDC_ONLY
 mattairtech_mt_d21e_revb.menu.usb.cdc.build.usbcom=CDC_ONLY
 mattairtech_mt_d21e_revb.menu.usb.cdc.build.pid=0x0557
@@ -305,10 +321,10 @@ mattairtech_mt_d21e.menu.serial.four_uart=FOUR_UART_NO_WIRE_NO_SPI
 mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_uart=FOUR_UART
 mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_wire=NO_WIRE
 mattairtech_mt_d21e.menu.serial.four_uart.build.serialcom_spi=NO_SPI
-mattairtech_mt_d21e.menu.serial.no_uart=NO_UART_ONE_WIRE_TWO_SPI
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_uart=NO_UART
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
-mattairtech_mt_d21e.menu.serial.no_uart.build.serialcom_spi=TWO_SPI
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi=NO_UART_ONE_WIRE_TWO_SPI
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi.build.serialcom_uart=NO_UART
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_mt_d21e.menu.serial.no_uart_one_wire_two_spi.build.serialcom_spi=TWO_SPI
 mattairtech_mt_d21e.menu.usb.cdc=CDC_ONLY
 mattairtech_mt_d21e.menu.usb.cdc.build.usbcom=CDC_ONLY
 mattairtech_mt_d21e.menu.usb.cdc.build.pid=0x0557
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index 33f71ef84..3522035d4 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -16,6 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "sam.h"
 
 #if (SAMD21 || SAML21)
 #include <stdio.h>
@@ -27,7 +28,6 @@
 #include "WVariant.h"
 #include "USB_host.h"
 #include "samd21_host.h"
-#include "sam.h"
 #include "wiring_digital.h"
 #include "wiring_private.h"
 
diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c
index e9f9db0d9..40622e485 100644
--- a/cores/arduino/wiring.c
+++ b/cores/arduino/wiring.c
@@ -134,25 +134,30 @@ void init( void )
   regAPBCMASK |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
   regAPBCMASK |= MCLK_APBCMASK_TCC0 | MCLK_APBCMASK_TCC1 | MCLK_APBCMASK_TCC2 | MCLK_APBCMASK_TC0 | MCLK_APBCMASK_TC1 | MCLK_APBCMASK_TC2 | MCLK_APBCMASK_TC3 | MCLK_APBCMASK_TC4 ;
   #endif
-  
+
   #if (SAML)
   regAPBCMASK |= MCLK_APBCMASK_DAC ;
   MCLK->APBDMASK.reg |= MCLK_APBDMASK_ADC;	// On the SAML, ADC is on the low power bridge
   #elif (SAMC)
   regAPBCMASK |= MCLK_APBCMASK_ADC0 | MCLK_APBCMASK_ADC1 | MCLK_APBCMASK_DAC ;
   #endif
-  
+
   MCLK->APBCMASK.reg |= regAPBCMASK ;
 #else
   #error "wiring.c: Unsupported chip"
 #endif
 
-  //Setup all pins (digital and analog) in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
+  // Setup all pins (digital and analog) in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
   for (uint32_t ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
   {
     pinMode( ul, PIO_STARTUP ) ;
   }
 
+  // At least on the L21, pin A31 must be set as an input. It is possible that debugger probe detection is being falsely
+  // detected (even with a pullup on A31 (SWCLK)), which would change the peripheral mux of A31 to COM.
+  // This might not normally be a problem, but one strange effect is that Serial2 loses characters if pin A31 is not set as INPUT.
+  pinMode(31, INPUT);
+
 // I/O mux table footnote for D21 and D11: enable pullups on PA24 and PA24 when using as GPIO to avoid excessive current
 //  Errata: disable pull resistors on PA24 or PA25 manually before switching to peripheral
 //  Errata: do not use continuous sampling (not enabled by default) on PA24 or PA25
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
index 1c099a321..44f087a81 100644
--- a/variants/Generic_D11C14A/README.md
+++ b/variants/Generic_D11C14A/README.md
@@ -20,8 +20,8 @@ SWDCLK  TX1/MISO*              30 | A30           A31 | 31   *            RX1/SS
   using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
   left pin (A2). PIN_MAP_COMPACT uses less RAM.
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
-* When using NO_UART_ONE_WIRE_ONE_SPI, use SPI on pins 4, 5, 14, and 15.
-  When using ONE_UART_NO_WIRE_ONE_SPI, use SPI on pins 8, 9, 30, and 31.
+* When using ONE_UART_NO_WIRE_ONE_SPI, use SPI on pins 4, 5, 14, and 15.
+  When using NO_UART_ONE_WIRE_ONE_SPI, use SPI on pins 8, 9, 30, and 31.
 * Tone available on TC2. TC2 is not routed to pins in the D11C14A.
 * Leave pin A30 floating (or use external pullup) during reset.
 * DO NOT connect voltages higher than 3.3V!
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
index 72b088338..68fceea34 100644
--- a/variants/MT_D11/README.md
+++ b/variants/MT_D11/README.md
@@ -24,7 +24,8 @@ BTN   SS              *      *     | A15           RST |
   left pin (A2). PIN_MAP_COMPACT uses less RAM.
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * Leave pin A30 floating (or use external pullup) during reset.
-* Tone available on TC2. DO NOT connect voltages higher than 3.3V!
+* DO NOT connect voltages higher than 3.3V!
+* Tone available on TC2.
 ```
 
 
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index defe780fa..bb0f807f7 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -388,4 +388,4 @@ extern Uart Serial2;
 #define Serial                      Serial1
 #endif
 
-#endif /* _VARIANT_ARDUINO_ZERO_ */
+#endif /* _VARIANT_MATTAIRTECH_MT_D11_ */
diff --git a/variants/MT_D21E/README.md b/variants/MT_D21E/README.md
index 1ecc3be07..ef6a0beef 100644
--- a/variants/MT_D21E/README.md
+++ b/variants/MT_D21E/README.md
@@ -32,7 +32,8 @@ USB D+       TC51                    | A25+ |     |  Vin |
   functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * Leave pin A30 floating (or use external pullup) during reset.
-* Tone available on TC5. DO NOT connect voltages higher than 3.3V!
+* DO NOT connect voltages higher than 3.3V!
+* Tone available on TC5.
 ```
 
 ## Pins descriptions for the MattairTech MT-D21E
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index 740949fdd..b3e3148cd 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -294,9 +294,9 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
 
 #define I2S_DEVICE          0
 #define I2S_CLOCK_GENERATOR 3
-#define PIN_I2S_SD          (9u)
-#define PIN_I2S_SCK         (1u)
-#define PIN_I2S_FS          (0u)
+#define PIN_I2S_SD          (7u)
+#define PIN_I2S_SCK         (10u)
+#define PIN_I2S_FS          (11u)
 
 #ifdef __cplusplus
 }
@@ -320,6 +320,8 @@ extern SERCOM sercom3;
 
 extern Uart Serial1;
 extern Uart Serial2;
+extern Uart Serial3;
+extern Uart Serial4;
 
 #endif
 
@@ -362,4 +364,4 @@ extern Uart Serial2;
 #define Serial                      Serial1
 #endif
 
-#endif /* _VARIANT_ARDUINO_ZERO_ */
+#endif /* _VARIANT_MATTAIRTECH_MT_D21E_ */
diff --git a/variants/MT_D21E_revB/README.md b/variants/MT_D21E_revB/README.md
index 0484e1a51..7909bdc38 100644
--- a/variants/MT_D21E_revB/README.md
+++ b/variants/MT_D21E_revB/README.md
@@ -33,7 +33,7 @@ USB D+ (D/L)(+), CAN RX (C)  TC51 25 | A25  |     |  Vin |   L21 installed. 5V i
   functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * Leave pin A30 floating (or use external pullup) during reset.
-* Tone available on TC5. DO NOT connect voltages higher than 3.3V!
+* Tone available on TC5.
 
 + This alternate function is enabled by default (+M functions enabled only when a memory
   device is installed). Thus, the associated header pin cannot be used. Solder jumpers
@@ -46,6 +46,60 @@ Silkscreen Legend:
   Bottom: A circled pin means analog function
 ```
 
+## COM Arrangement When Using "L21 Only" Options
+
+The following applies only to the L21 and only when using menu options with (L21 only).
+If using the L21 with the other options, use the above ASCII diagram.
+
+The additional options are:
+
+* FOUR_UART_ONE_WIRE_ONE_SPI
+* FIVE_UART_NO_WIRE_ONE_SPI
+* FIVE_UART_ONE_WIRE_NO_SPI
+* SIX_UART_NO_WIRE_NO_SPI
+
+```
+         -------------------
+        | A0            RST |
+        | A1            Gnd |
+        | A2           Vbat |
+        | A3            A31 |
+        | A4            A30 |
+        | A5            NC  |
+        | A6            NC  |
+        | A7            A27 | CS (MEM)
+TX3     | A8            A23 | SS/RX5
+RX3     | A9            A22 | MISO/TX5
+TX1     | A10           A19 | SCK
+RX1     | A11           A18 | MOSI
+TX2     | A14           A17 | SCL/RX5/RX6
+RX2     | A15           A16 | SDA/TX5/TX6
+        | NC            NC  |
+        | NC            NC  |
+        | Vbus          3.3V|
+USB/TX4 | A24   _____   Vcc |
+USB/RX4 | A25  |     |  Vin |
+        | Gnd  | USB |  Gnd |
+         -------------------
+
+* If the memory device is installed, it is connected to SPI (A18, A19, and A22).
+  If selecting an option without SPI, then A22 will become TX5. Be sure to keep the
+  memory device CS pin high. You can disconnect A27 from CS by desoldering J13.
+* Serial4 is shared with the USB pins. Thus, USB cannot be used is using Serial4. Be
+  sure to disconnect the USB connector D- and D+ pins by desoldering J4 and J7.
+* It is not necessary to use all serial instances, and they can be skipped. For
+  example, with the FIVE_UART_NO_WIRE_ONE_SPI option, USB can still be used by NOT
+  calling Serial4.begin(), thus not enabling the Serial4 peripheral. However, Serial5
+  can still be used.
+* Serial5 can be located either on pins A16/A17 or A22/A23. If SPI is enabled, then
+  Serial5 is on pins A16/A17, otherwise it is on pins A22/A23.
+* SERCOM5 has low-power capabilities and can run in power domain PD0, at the expense
+  of DMA support and a few other features (see core README.md). It is available in two
+  locations only, A24/A25 and A22/A23. If SPI is enabled, then SERCOM5 is connected to
+  Serial4 on A24/A25 (must disable USB), otherwise, it uses Serial5 on A22/A23.
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+```
+
 
 ## Pins descriptions for the MattairTech MT-D21E (rev B)
 ```
@@ -70,7 +124,7 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 15	| A15	| PA15	| Xout, RX2/SCK1	| !EIC/EXTINT[15] SERCOM2/PAD[3] TC3/WO[1] !TCC0/WO[5] Xout
 16	| A16	| PA16	| SDA/TX4 w/pullup	| EIC/EXTINT[0] PTC/X[4] SERCOM1/PAD[0] SERCOM3/PAD[0] TCC2/WO[0] !TCC0/WO[6]
 17	| A17	| PA17	| SCL/RX4 w/pullup	| EIC/EXTINT[1] PTC/X[5] SERCOM1/PAD[1] SERCOM3/PAD[1] TCC2/WO[1] !TCC0/WO[7]
-18	| A18	| PA18	| SPI			| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
+18	| A18	| PA18	| MOSI			| EIC/EXTINT[2] PTC/X[6] !SERCOM1/PAD[2] SERCOM3/PAD[2] !TC3/WO[0] !TCC0/WO[2]
 19	| A19	| PA19	| SCK			| EIC/EXTINT[3] PTC/X[7] !SERCOM1/PAD[3] SERCOM3/PAD[3] !TC3/WO[1] !TCC0/WO[3]
 20	| ---	| ----	| NOT A PIN		| NOT A PIN
 21	| ---	| ----	| NOT A PIN		| NOT A PIN
@@ -95,6 +149,7 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 * TC5(D21) is available on these pins otherwise. The tone library uses TC5.
 * A0 and A1 are by default connected to the 32.768KHz crystal.
 * Leave pin A30 floating (or use external pullup) during reset.
+* This table does not list "L21 Only" COM configurations.
 ```
 
 
@@ -146,10 +201,10 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
   * 14 pins can be configured with external interrupts.
 
 * **SERCOM**
-  * 4 SERCOM are available.
-  * Up to 4 UART instances
-  * Up to 2 SPI instances
-  * Up to 2 WIRE (I2C) instances
+  * 4 SERCOM are available (6 on the L21E).
+  * Up to 4 UART instances (6 on the L21E).
+  * Up to 2 SPI instances.
+  * Up to 2 WIRE (I2C) instances.
   * The WIRE pullup resistors are enabled by default.
 
 
@@ -211,7 +266,7 @@ now calls pinPeripheral() with the desired mode. Note that this field is not use
 select between the two peripherals possible with each of the SERCOM and TIMER functions.
 PeripheralAttribute is now used for this.
 
-### PeripheralAttribute:
+### PeripheralAttribute
 This is an 8-bit bitfield used for various peripheral configuration. It is primarily
 used to select between the two peripherals possible with each of the SERCOM and TIMER
 functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
diff --git a/variants/MT_D21E_revB/variant.cpp b/variants/MT_D21E_revB/variant.cpp
index fbccb2739..59de33806 100644
--- a/variants/MT_D21E_revB/variant.cpp
+++ b/variants/MT_D21E_revB/variant.cpp
@@ -36,39 +36,49 @@ const PinDescription g_APinDescription[]=
 	{ PORTA,  1, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 	
 	// 2..9 - Analog capable pins (DAC available on 2)
-	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[0] / DAC
-	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[1]
-	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4, GCLK_CCL_NONE }, // ADC/AIN[4]
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // DAC
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_4, GCLK_CCL_NONE },
 #if (SAMD || SAMC)
-	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE }, // ADC/AIN[5]
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE },
 #elif (SAML)
 	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_5, GCLK_CCL_NONE },
 #endif
-	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[6], LED
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH0, ADC_Channel6, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // LED
 #if (SAMD)
-	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE },
 #elif (SAML)
-	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  #if defined(USE_SIX_SERCOM)
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE },
+  #else
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel17, EXTERNAL_INT_9, GCLK_CCL_NONE },
+  #endif
 #elif (SAMC)
-	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ADC/AIN[7]
-	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel10, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // TCC0/WO[0]
-	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel11, EXTERNAL_INT_9, GCLK_CCL_NONE }, // TCC0/WO[1]
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC1_CH1, ADC_Channel7, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel10, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel11, EXTERNAL_INT_9, GCLK_CCL_NONE },
 #endif
 	
 	// 10..11 - SERCOM/UART (Serial1) or Analog or Digital functions
 #if (SAMD)
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 #elif (SAML)
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+  #if defined(USE_SIX_SERCOM)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  #else
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel18, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel19, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  #endif
 #elif (SAMC)
-	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel10, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TX: SERCOM0/PAD[2]
-	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel11, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // RX: SERCOM0/PAD[3]
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel10, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH3, ADC_Channel11, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
 #endif
 	
 	// 12..13 pins don't exist
@@ -77,40 +87,69 @@ const PinDescription g_APinDescription[]=
 	
 	// 14..15 - SERCOM/UART (Serial2) or Digital functions
 #if (SAMD)
-	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // TC3/WO[0], HOST_ENABLE
-	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
-#elif (SAML || SAMC)
-	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // TC3/WO[0], HOST_ENABLE
-	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // TC3/WO[1], ATN
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ATN
+#elif (SAML)
+  #if defined(USE_SIX_SERCOM)
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ATN
+  #else
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ATN
+  #endif
+#elif (SAMC)
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE }, // HOST_ENABLE
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // ATN
 #endif
 	
 	// 16..17 SERCOM/I2C (Wire) or Serial4 or Digital functions
-#if defined(FOUR_UART)
-	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // TX4: SERCOM3/PAD[0]
-	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // RX4: SERCOM3/PAD[1]
+#if (defined(FOUR_UART) && !defined(USE_SIX_SERCOM))
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE },
 #else
-	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // SDA: SERCOM1/PAD[0]
-	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // SCL: SERCOM1/PAD[1]
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE },
 #endif
 	
 	// 18..23 - SERCOM/SPI (SPI) or Digital functions (pins 20..21 do not exist)
-	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // SPI MOSI: SERCOM3/PAD[2] (PIN_ATTR_SERCOM_ALT)
-	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SPI SCK: SERCOM3/PAD[3] (PIN_ATTR_SERCOM_ALT)
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE },
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE },
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 #if (SAMD)
-	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SPI MISO: SERCOM3/PAD[0]
-	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // SPI SS: SERCOM3/PAD[1]
-#elif (SAML || SAMC)
-	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // SPI MISO: SERCOM3/PAD[0]
-	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // SPI SS: SERCOM3/PAD[1]
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
+#elif (SAML)
+  #if (defined(USE_SIX_SERCOM) && !defined(ONE_SPI))
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
+  #else
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
+  #endif
+#elif (SAMC)
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH0, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC0_CH1, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE },
 #endif
 	
 	// 24..26 - USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist
 #if (SAMD)
 	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
 	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
-#elif (SAML || SAMC)
+#elif (SAML)
+  #if defined(USE_SIX_SERCOM)
+    #if defined(ONE_SPI)
+	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+    #else
+	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+    #endif
+  #else
+	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+  #endif
+#elif (SAMC)
 	{ PORTA, 24, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
 	{ PORTA, 25, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
 #endif
@@ -126,14 +165,16 @@ const PinDescription g_APinDescription[]=
 	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
 	
 	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
-	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // TCC1/WO[0] / SWD CLK / TX3
-	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // TCC1/WO[1] / SWD IO / RX3
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_10, GCLK_CCL_NONE }, // SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_11, GCLK_CCL_NONE }, // SWD IO
 } ;
 
 #if (SAMD)
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
-#elif (SAML21 || SAMC21)
+#elif (SAML21)
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC4 } ;
+#elif (SAMC21)
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC2, TC3, TC4 } ;
 #endif
 
 // Multi-serial objects instantiation
@@ -146,6 +187,8 @@ SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 #endif
 
+// All microcontrollers support configurations with four SERCOM
+#if !defined(USE_SIX_SERCOM)
 #if defined(ONE_UART) || defined(TWO_UART) || defined(THREE_UART) || defined(FOUR_UART)
 Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
@@ -181,3 +224,60 @@ void SERCOM3_Handler()
   Serial4.IrqHandler();
 }
 #endif
+
+// In addition to the configurations using four SERCOMs, the L21E supports USE_SIX_SERCOM
+#else
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM2_Handler()
+{
+  Serial1.IrqHandler();
+}
+
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM4_Handler()
+{
+  Serial2.IrqHandler();
+}
+
+Uart Serial3( SERCOM_INSTANCE_SERIAL3, PIN_SERIAL3_RX, PIN_SERIAL3_TX, PAD_SERIAL3_RX, PAD_SERIAL3_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial3.IrqHandler();
+}
+
+Uart Serial4( SERCOM_INSTANCE_SERIAL4, PIN_SERIAL4_RX, PIN_SERIAL4_TX, PAD_SERIAL4_RX, PAD_SERIAL4_TX ) ;
+
+#if defined(ONE_SPI)
+void SERCOM5_Handler()
+#else
+void SERCOM3_Handler()
+#endif
+{
+  Serial4.IrqHandler();
+}
+
+#if defined(FIVE_UART) || defined(SIX_UART)
+Uart Serial5( SERCOM_INSTANCE_SERIAL5, PIN_SERIAL5_RX, PIN_SERIAL5_TX, PAD_SERIAL5_RX, PAD_SERIAL5_TX ) ;
+
+#if defined(ONE_SPI)
+void SERCOM1_Handler()
+#else
+void SERCOM5_Handler()
+#endif
+{
+  Serial5.IrqHandler();
+}
+#endif
+
+#if defined(SIX_UART)
+Uart Serial6( SERCOM_INSTANCE_SERIAL6, PIN_SERIAL6_RX, PIN_SERIAL6_TX, PAD_SERIAL6_RX, PAD_SERIAL6_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial6.IrqHandler();
+}
+#endif
+#endif
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
index ced2e0281..72ed8ee03 100644
--- a/variants/MT_D21E_revB/variant.h
+++ b/variants/MT_D21E_revB/variant.h
@@ -198,6 +198,17 @@ static const uint8_t ATN = PIN_ATN;
 /*
  * Serial interfaces
  */
+#if ((defined(FOUR_UART) && (defined(ONE_SPI) || defined(ONE_WIRE))) || defined(FIVE_UART) || defined(SIX_UART))
+  #if (SAML)
+    #define USE_SIX_SERCOM
+  #else
+    #error "variant.h: Only the L21E supports configurations with six SERCOM"
+  #endif
+#endif
+
+// All microcontrollers support configurations with four SERCOM
+#if !defined(USE_SIX_SERCOM)
+
 // Serial1
 #define PIN_SERIAL1_RX       (11ul)
 #define PIN_SERIAL1_TX       (10ul)
@@ -230,6 +241,69 @@ static const uint8_t ATN = PIN_ATN;
 
 #define SERCOM_INSTANCE_SERIAL4       &sercom3
 
+// In addition to the configurations using four SERCOMs, the L21E supports USE_SIX_SERCOM
+#else
+
+// Serial1
+#define PIN_SERIAL1_RX       (11ul)
+#define PIN_SERIAL1_TX       (10ul)
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL1       &sercom2
+
+// Serial2
+#define PIN_SERIAL2_RX       (15ul)
+#define PIN_SERIAL2_TX       (14ul)
+#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL2       &sercom4
+
+// Serial3
+#define PIN_SERIAL3_RX       (9ul)
+#define PIN_SERIAL3_TX       (8ul)
+#define PAD_SERIAL3_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL3_RX       (SERCOM_RX_PAD_1)
+
+#define SERCOM_INSTANCE_SERIAL3       &sercom0
+
+// Serial4
+#define PIN_SERIAL4_RX       (25ul)
+#define PIN_SERIAL4_TX       (24ul)
+#define PAD_SERIAL4_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL4_RX       (SERCOM_RX_PAD_3)
+
+#if defined(ONE_SPI)
+  #define SERCOM_INSTANCE_SERIAL4       &sercom5
+#else
+  #define SERCOM_INSTANCE_SERIAL4       &sercom3
+#endif
+
+// Serial5 (L21 only)
+#if defined(ONE_SPI)
+  #define PIN_SERIAL5_RX       (17ul)
+  #define PIN_SERIAL5_TX       (16ul)
+  #define PAD_SERIAL5_TX       (UART_TX_PAD_0)
+  #define PAD_SERIAL5_RX       (SERCOM_RX_PAD_1)
+  #define SERCOM_INSTANCE_SERIAL5       &sercom1
+#else
+  #define PIN_SERIAL5_RX       (23ul)
+  #define PIN_SERIAL5_TX       (22ul)
+  #define PAD_SERIAL5_TX       (UART_TX_PAD_0)
+  #define PAD_SERIAL5_RX       (SERCOM_RX_PAD_1)
+  #define SERCOM_INSTANCE_SERIAL5       &sercom5
+#endif
+
+// Serial6 (L21 only)
+#define PIN_SERIAL6_RX       (17ul)
+#define PIN_SERIAL6_TX       (16ul)
+#define PAD_SERIAL6_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL6_RX       (SERCOM_RX_PAD_1)
+
+#define SERCOM_INSTANCE_SERIAL6       &sercom1
+#endif
+
 
 /*
  * SPI Interfaces
@@ -308,9 +382,9 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
 
 #define I2S_DEVICE          0
 #define I2S_CLOCK_GENERATOR 3
-#define PIN_I2S_SD          (9u)
-#define PIN_I2S_SCK         (1u)
-#define PIN_I2S_FS          (0u)
+#define PIN_I2S_SD          (7u)
+#define PIN_I2S_SCK         (10u)
+#define PIN_I2S_FS          (11u)
 
 #ifdef __cplusplus
 }
@@ -331,9 +405,19 @@ extern SERCOM sercom0;
 extern SERCOM sercom1;
 extern SERCOM sercom2;
 extern SERCOM sercom3;
+#if (SAML)
+extern SERCOM sercom4;
+extern SERCOM sercom5;
+#endif
 
 extern Uart Serial1;
 extern Uart Serial2;
+extern Uart Serial3;
+extern Uart Serial4;
+#if (SAML)
+extern Uart Serial5;
+extern Uart Serial6;
+#endif
 
 #endif
 
@@ -391,4 +475,4 @@ extern Uart Serial2;
   #endif
 #endif
 
-#endif /* _VARIANT_ARDUINO_ZERO_ */
+#endif /* _VARIANT_MATTAIRTECH_MT_D21E_REVB_ */

From b905dfc35f8beba868dcf339b419ec3834538c7d Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 6 Jul 2017 03:25:34 +0000
Subject: [PATCH 101/124] Removed the two non-existant timers from the C21E
 that were recently added

---
 variants/MT_D21E_revB/variant.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/variants/MT_D21E_revB/variant.cpp b/variants/MT_D21E_revB/variant.cpp
index 59de33806..53f2425c6 100644
--- a/variants/MT_D21E_revB/variant.cpp
+++ b/variants/MT_D21E_revB/variant.cpp
@@ -171,10 +171,8 @@ const PinDescription g_APinDescription[]=
 
 #if (SAMD)
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5 } ;
-#elif (SAML21)
+#else
 const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC4 } ;
-#elif (SAMC21)
-const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC2, TC3, TC4 } ;
 #endif
 
 // Multi-serial objects instantiation

From 8d7a00f8757e622bade9c74ede5dc6fb57e441be Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 6 Jul 2017 04:22:43 +0000
Subject: [PATCH 102/124] Updated documentation

---
 CHANGELOG                     |   9 +-
 README.md                     | 390 ++++++++++++++++++----------------
 cores/arduino/wiring_analog.h |  17 +-
 3 files changed, 224 insertions(+), 192 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6ddec2c37..ff0831bbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,13 @@
-1.6.8-beta-b2 (in-progress):
-* Added more Serial, SPI, and WIRE options
+1.6.8-beta-b2:
 * Added SD Card firmware loading support to the bootloader (4KB and 8KB)
 * Removed SDU library, as the bootloader now supports SD cards directly
-* Fixed auto-detection for Arduino Zero and M0 board variants
+* Removed automatic page writes from bootloader (may have caused bricked board during development)
 * Fixed bootloader compilation on Windows
-* Documentation updates
+* Added more Serial, SPI, and WIRE instances to MT-D21E (rev A and B)
+* Added support for up to 6 SERCOM on the L21E (32-pin)
 * Merged in changes from upstream SAMD CORE 1.6.15:
   * 
+* Documentation updates
 
 1.6.8-beta-b1:
 * Fixed auto-reset not working on some versions of Windows
diff --git a/README.md b/README.md
index 8eff5976b..6b1bc822a 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,15 @@
-# MattairTech Arduino SAM M0+ Core
+# MattairTech SAM M0+ Core for Arduino
 
-This is a fork from arduino/ArduinoCore-samd on GitHub. This will be used to maintain
-Arduino support for SAM M0+ boards including the MattairTech MT-D21E and the MT-D11
-(see https://www.mattairtech.com/). It adds support for new devices like the L21, C21, and
-D11. It also adds new clock sources, like a high speed crystal or internal oscillator.
+The MattairTech SAM M0+ Core is a fork from arduino/ArduinoCore-samd on GitHub, which will
+be used to maintain Arduino support for MattairTech branded boards (see
+https://www.mattairtech.com/) as well as "Generic" boards.
 
-This core is intended to be installed using Boards Manager (see below). To update from a
-previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.
+* Supports the SAMD21, SAMD11, SAML21, and SAMC21.
+* Supports four clock sources (two crystals, internal oscillator, and USB calibrated).
+* USB CDC Bootloader with optional SDCard support
+
+*This core is intended to be installed using Boards Manager (see below). To update from a*
+*previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.*
 
 **Differences from Arduino in Versioning**  The MattairTech version number does not
 correspond to either the IDE version or to the upstream ArduinoCore-samd version. See the
@@ -16,6 +19,9 @@ CHANGELOG for details on which upstream commits have been merged in to the Matta
 ## What's New Beta (1.6.8-beta)
 **See Beta Builds section for installation instructions.**
 
+**1.6.8-beta-b2:**
+
+
 **1.6.8-beta-b1:**
 * Fixed auto-reset not working on some versions of Windows
 * Documentation updates
@@ -73,13 +79,14 @@ PWM Outputs	| 18					| 14					| 14					| 8 (6 for 14-pin)
 Interrupts	| 16					| 16					| 16					| 8 (7 for 14-pin)
 USB		| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device
 SERCOM*		| 6					| 6					| 4 (6 for L21)				| 3 (2 for 14-pin)
-UART (Serial)*	| Up to 6				| Up to 6				| Up to 4 (up to 5 for L21)		| Up to 2
+UART (Serial)*	| Up to 6				| Up to 6				| Up to 4 (up to 6 for L21)		| Up to 2
 SPI*		| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2C (WIRE)*	| Up to 3				| Up to 2				| Up to 2				| Up to 1
 I2S		| Present on the D21 only		| Present on the D21 only		| Present on the D21 only		| Not present
 Voltage		| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V
 I/O Pin	Current	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| 7 mA
-* Note that the maximum number of UART/SPI/I2C is the number of SERCOM. The number listed above for UART/SPI/I2C indicated how many are configurable through the Arduino IDE menu.
+
+*Note that the maximum number of UART/SPI/I2C is the number of SERCOM. The number listed above for UART/SPI/I2C indicated how many are configurable through the Arduino IDE menu.*
 
 
 
@@ -96,7 +103,7 @@ README.md also now includes technical information on the new PinDescription tabl
 
 * [MattairTech Generic D11C14A](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/Generic_D11C14A/README.md)
 
-* MattairTech x21J based board (coming June)
+* MattairTech x21J based board (coming July)
 
 * MattairTech Generic D11D14AS (coming soon)
 
@@ -186,12 +193,62 @@ and SRAM usage by allowing CDC to be disabled (or USB completely disabled).
 
 ## Clock Source
 
-There are up to four clock source choices, depending on board variant and microcontroller. They are:
+There are up to four clock source choices, depending on board features and microcontroller. Since currently
+the cpu must run at 48MHz, the PLL or DFLL must be used (the SAMC can use OSC48M).
 
 * 32KHZ_CRYSTAL (default)
+  * Uses both XOSC32K and FDPLL96M
+  * High long-term accuracy, slow startup, medium current (PLL)
+
 * HIGH_SPEED_CRYSTAL
+  * Uses both XOSC and FDPLL96M
+  * High accuracy, medium startup, high current (XOSC and PLL)
+
 * INTERNAL_OSCILLATOR
-* INTERNAL_USB_CALIBRATED_OSCILLATOR
+  * Uses DFLL48M in open-loop mode (SAMC uses OSC48M)
+  * Low accuracy, fast startup, medium-low current (low current with SAMC)
+
+* INTERNAL_USB_CALIBRATED_OSCILLATOR (not available with SAMC)
+  * Uses DFLL48M in closed-loop mode
+  * High accuracy, medium-fast startup, medium current
+
+### SAMD
+
+Source          | Frequency Range                       | Supply Current (max.) | Startup Time typ. (max.)      | Notes, jitter, accuracy, other differences
+----------------|---------------------------------------|-----------------------|-------------------------------|--------------------------------------------------------
+XOSC            | 0.4MHz-32MHz crystal                  | 307uA (552uA) AGC on  | 5K-14K cycles (10K-48K)       | up to 32MHz digital clock input, Supply current based on 16MHz crystal
+XOSC32K         | 32.768KHz typical crystal             | 1.22uA (2.19uA)       | 28K cycles (30K)              | 32.768KHz typical digital clock input
+OSC32K          | 32.27-33.26KHz (28.50-34.74KHz)       | 0.67uA (1.32uA)       | 1 cycle (2 cycles)            | 
+OSCULP32K       | 31.29-34.57KHz (25.55-38.01KHz)       | 0.125uA max.          | 10 cycles                     | 
+OSC8M           | 7.94-8.06MHz (7.80-8.16MHz)           | 64uA                  | 2.1us (3us)                   | 
+FDPLL96M        | 32KHz-2MHz in, 48MHz-96MHz out        | 500uA (700uA)         | Lock: 25us (50us) @ 2MHz in   | 1.5% (2%) period jitter (32KHz in, 48MHz out), Lock: 1.3ms (2ms) @ 32KHz in
+DFLL48M open    | 47MHz-49MHz out                       | 403uA (453uA)         | 8us (9us)                     | 
+DFLL48M closed  | 0.73-33KHz in, 47.96-47.98MHz out     | 425uA (482uA)         | Lock: 200us (500us)           | 0.42ns max. jitter
+
+### SAML
+
+Source          | Frequency Range                       | Supply Current (max.) | Startup Time typ. (max.)      | Notes, jitter, accuracy, other differences
+----------------|---------------------------------------|-----------------------|-------------------------------|--------------------------------------------------------
+XOSC            | 0.4MHz-32MHz crystal                  | 293uA (393uA) AGC on  | 5K-14K cycles (10K-48K)       | up to 24MHz digital clock input, Supply current based on 16MHz crystal
+XOSC32K         | 32.768KHz typical crystal             | 0.311uA (2.19uA)      | 25K cycles (82K)              | 32.768KHz typical digital clock input (1MHz max.)
+OSC32K          | 32.57-33.05KHz (28.58-34.72KHz)       | 0.54uA (1.10uA)       | 1 cycle (2 cycles)            | 
+OSCULP32K       | 31.77-34.03KHz (26.29-38.39KHz)       | Not Specified.        | Not Specified                 | 
+OSC16M          | 15.75-16.24MHz                        | 141uA (169uA)         | 1.4us (3.1us)                 | Wake up time: 0.12us (0.25us)
+FDPLL96M        | 32KHz-2MHz in, 48MHz-96MHz out        | 454uA (548uA)         | Lock: 25us (35us) @ 2MHz in   | 1.9% (4%) period jitter (32KHz in, 48MHz out), Lock: 1ms (2ms) @ 32KHz in
+DFLL48M open    | 46.6MHz-49MHz out                     | 286uA                 | 8.3us (9.1us)                 | 
+DFLL48M closed  | 0.73-33KHz in, 47.96-47.98MHz out     | 362uA                 | Lock: 200us (700us)           | 0.51ns max. jitter
+
+### SAMC
+
+Source          | Frequency Range                       | Supply Current (max.) | Startup Time typ. (max.)      | Notes, jitter, accuracy, other differences
+----------------|---------------------------------------|-----------------------|-------------------------------|--------------------------------------------------------
+XOSC            | 0.4MHz-32MHz crystal                  | 429uA (699uA) AGC on  | 6K-12K cycles (20K-48K)       | up to 48MHz digital clock input, Supply current based on 16MHz crystal
+XOSC32K         | 32.768KHz typical crystal             | 1.53uA (2.84uA)       | 16K cycles (24K)              | 32.768KHz typical digital clock input
+OSC32K          | 32.11-33.43KHz (25.55-37.36KHz)       | 0.864uA (1.08uA)      | 1 cycle (2 cycles)            | 
+OSCULP32K       | 30.96-34.57KHz (22.93-38.99KHz)       | Not Specified.        | Not Specified                 | 
+OSC48M          | 47.04-48.96MHz                        | 87uA (174uA)          | 22.5us (25.5us)               | 
+FDPLL96M        | 32KHz-2MHz in, 48MHz-96MHz out        | 536uA (612uA)         | Not Yet Specified             | 
+
 
 ### External 32.768KHz Crystal
 
@@ -228,7 +285,7 @@ will calibrate against the USB SOF signal. NVM_SW_CALIB_DFLL48M_FINE_VAL is the
 calibration value for DFLL open-loop mode. The coarse calibration value is loaded from
 NVM OTP (factory calibration values).
 
-### Clock Generators
+### Clock Generators Currently Used
 
 0. MAIN (mcu)
 1. XOSC (high speed crystal)
@@ -239,52 +296,51 @@ NVM OTP (factory calibration values).
 
 ## Analog Reference
 
-TODO: more info
-
-* D21 / D11
-  * AR_INTERNAL1V0
-  * AR_INTERNAL_INTVCC0
-  * AR_INTERNAL_INTVCC1
-  * AR_EXTERNAL_REFA
-  * AR_EXTERNAL_REFB
-  * AR_DEFAULT (this also uses 1/2 gain on each input)
+* D21
+  * AR_DEFAULT uses 1/2X gain on each input.
+  * The external reference should be between 1.0V and VDDANA-0.6V.
 
 * L21
-  * AR_INTREF
-  * AR_INTERNAL_INTVCC0
-  * AR_INTERNAL_INTVCC1
-  * AR_EXTERNAL_REFA
-  * AR_EXTERNAL_REFB
-  * AR_INTERNAL_INTVCC2
-  * AR_INTREF_1V0
-  * AR_INTREF_1V1
-  * AR_INTREF_1V2
-  * AR_INTREF_1V25
-  * AR_INTREF_2V0
-  * AR_INTREF_2V2
-  * AR_INTREF_2V4
-  * AR_INTREF_2V5
   * AR_DEFAULT = AR_INTERNAL_INTVCC2
-  * AR_INTERNAL1V0 = AR_INTREF (Default INTREF for SAML is 1.0V)
+  * Both AR_INTREF and AR_INTERNAL1V0 has the same effect as AR_INTREF_1V0.
+  * The external reference should be between 1v and VDDANA-0.6v=2.7v.
 
 * C21
-  * AR_INTREF
-  * AR_INTERNAL_INTVCC0
-  * AR_INTERNAL_INTVCC1
-  * AR_EXTERNAL_REFA
-  * AR_EXTERNAL_DAC
-  * AR_INTERNAL_INTVCC2
-  * AR_INTREF_1V024
-  * AR_INTREF_2V048
-  * AR_INTREF_4V096
   * AR_DEFAULT = AR_INTERNAL_INTVCC2
-  * AR_INTERNAL1V0 = AR_INTREF (Default INTREF for SAMC is 1.024V)
+  * Both AR_INTREF and AR_INTERNAL1V0 has the same effect as AR_INTREF_1V024.
+  * The external reference should be between 1v and VDDANA-0.6v=2.7v.
+
+**Warning : The maximum reference voltage is Vcc (up to 3.6 volts for the SAMD/SAML, 5V for the SAMC)**
+
+### Reference Selection Table
+
+D21 / D11               | Volts      | L21                   | Volts     | C21                   | Volts
+------------------------|------------|-----------------------|-----------|-----------------------|--------
+AR_DEFAULT              | 1/2 VCC    | AR_DEFAULT            | VCC       | AR_DEFAULT            | VCC
+AR_INTERNAL1V0          | 1.00V      | AR_INTREF             | 1.00V     | AR_INTREF             | 1.024V
+AR_INTERNAL_INTVCC0     | 1/1.48 VCC | AR_INTREF_1V0         | 1.00V     | AR_INTREF_1V024       | 1.024V
+AR_INTERNAL_INTVCC1     | 1/2 VCC    | AR_INTREF_1V1         | 1.10V     | AR_INTREF_2V048       | 2.048V
+AR_EXTERNAL_REFA        | REFA       | AR_INTREF_1V2         | 1.20V     | AR_INTREF_4V096       | 4.096V
+AR_EXTERNAL_REFB        | REFB       | AR_INTREF_1V25        | 1.25V     | AR_INTERNAL1V0        | 1.024V
+                        |            | AR_INTREF_2V0         | 2.00V     | AR_INTERNAL_INTVCC0   | 1/1.6 VCC
+                        |            | AR_INTREF_2V2         | 2.20V     | AR_INTERNAL_INTVCC1   | 1/2 VCC
+                        |            | AR_INTREF_2V4         | 2.40V     | AR_INTERNAL_INTVCC2   | VCC
+                        |            | AR_INTREF_2V5         | 2.50V     | AR_EXTERNAL_REFA      | REFA
+                        |            | AR_INTERNAL1V0        | 1.00V     | AR_EXTERNAL_DAC       | DAC
+                        |            | AR_INTERNAL_INTVCC0   | 1/1.6 VCC |                       |
+                        |            | AR_INTERNAL_INTVCC1   | 1/2 VCC   |                       |
+                        |            | AR_INTERNAL_INTVCC2   | VCC       |                       |
+                        |            | AR_EXTERNAL_REFA      | REFA      |                       |
+                        |            | AR_EXTERNAL_REFB      | REFB      |                       |
+
+### Common Settings
 
-* Common
-  * AR_INTERNAL = AR_INTERNAL_INTVCC0
-  * AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0 (2.23V only when Vcc = 3.3V)
-  * AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1 (1.65V only when Vcc = 3.3V)
-  * AR_EXTERNAL = AR_EXTERNAL_REFA
+AR_INTERNAL = AR_INTERNAL_INTVCC0
+AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0
+AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1
+AR_EXTERNAL = AR_EXTERNAL_REFA
+
+*When using AR_INTERNAL2V23 or AR_INTERNAL1V65, these voltages are correct only when Vcc = 3.3V)*
 
 
 
@@ -306,10 +362,11 @@ TODO: more info
 * On the L21, SERCOM5 is in a low power domain. The Fm+ and HS modes of I2C (wire) are not supported.
 * The SAML and SAMC have double-buffered TCs, which are supported in the core.
 * The CHANGE and RISING interrupt modes on pin A31 do not seem to work properly on the L21.
-* When using pin A31 as UART RX, in Arduino, pinMode(31, INPUT_PULLUP) must be called before SerialX.begin().
 * The L21 has two performance levels that affect power consumption. During powerup, the L21 starts at the lowest performance level (PL0).
   The startup code changes to the highest performance level (PL2) in order to support 48MHz and USB (among other things).
 * Two Flash Wait States are inserted for the L21 and C21 (the D21/D11 use one wait state).
+* pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
+  interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
 
 
 ### SAMC21
@@ -326,6 +383,7 @@ TODO: more info
 ### SAMD11
 
 * The D11D has three SERCOM. The D11C has two sercom (no sercom2).
+* TONE: TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14 as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins.
 * When USB is disabled, pullups will be enabled on PA24 and PA24 to avoid excessive current consumption (<1mA) due to floating pins.
   Note that it is not necessary to enable pull resistors on any other pins that are floating.
   Errata: Disable pull resistors on PA24 and PA25 manually before switching to a peripheral.
@@ -339,21 +397,18 @@ TODO
 
 * TODO
 * Table summarizing which core files are modified and by how much
+* Communications interfaces are mostly unchanged, including USB
 * Changes due to adding/changing features vs porting to new chip
 
-
-## Random Notes (TODO)
-
-* TONE: TC5 does not exist on the D11. Using TC2 instead (TC1 on the D11C14 as TC2 is not routed to pins). It will conflict with the 2 associated TC analogWrite() pins.
-* D21: Enables wakeup capability on pin in case being used during sleep (WAKEUP always enabled on SAML and SAMC)
 * All pins (digital and analog) setup in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
 * INEN enabled for both input and output (but not analog)
 * pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
-interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
+  interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
 * Pull resistors enabled only if pin attributes allow and only if pin is not configured as output.
 * Pull direction (pullup or pulldown) is now set with pinMode only (defaults to pullup if pinMode never called).
 
 
+
 ## Serial Monitor
 
 To print to the Serial Monitor over USB, use 'Serial'. Serial refers to SerialUSB (Serial1 and Serial2 are UARTs).
@@ -454,11 +509,9 @@ Vista, 7, 8, and 10. Note that the Windows 10 generic CDC drivers work as well.
 
 #### OS X
 
-OS X support currently in beta (see below), the following instructions are only for 1.6.6-mtX and below.
-1. Only the 256 KB chip variants work with the OS X version of the upload tool, bossac.
-2. First, you will need to open boards.txt and change mattairtech_mt_d21e_bl8k.upload.tool to equal arduino:bossac.
-3. Open platform.txt and change tools.bossac.path to equal{runtime.tools.bossac-1.6.1-arduino.path}.
-4. No driver installation is needed.
+*OS X support was added in version 1.6.7-beta-b0.*
+
+0. No driver installation is needed.
 5. Plug in the board. You may get a dialog box asking if you wish to open the “Network Preferences�:
    * Click the "Network Preferences..." button, then click "Apply".
    * The board will show up as “Not Configured�, but it will work fine.
@@ -492,7 +545,7 @@ OS X support currently in beta (see below), the following instructions are only
 
 1. In the Arduino IDE (1.6.7 or above), open File->Examples->01.Basics->Blink.
 2. Change the three instances of '13' to 'LED_BUILTIN'.
-3. Be sure the correct options are selected in the Tools menu (see AVR Core Installation above).
+3. Be sure the correct options are selected in the Tools menu (see Core Installation above).
 4. With the board plugged in, select the correct port from Tools->Port.
 5. Click the Upload button. After compiling, the sketch should be transferred to the board.
 6. Once the bootloader exits, the blink sketch should be running.
@@ -519,26 +572,26 @@ In this case, the IDE will not notify the user of updates.
 
 ## SAM-BA USB CDC Bootloader (Arduino compatible)
 
-The SAM-BA bootloader has both a CDC USB interface, and a UART interface. It is compatible with the Arduino IDE, or
-it can be used with the Bossac tool standalone. With Arduino, auto-reset is supported (automatically runs the
-bootloader while the sketch is running) as well as automatic return from reset. The SAM-BA bootloader described
-here adds to the Arduino version, which in turn is based on the bootloader from Atmel. The Arduino version added
-several features, including three new commands (Arduino Extended Capabilities) that increase upload speed. The
-bootloader normally requires 8 KB FLASH, however, a 4 KB version can be used for the D11 chips.
+This bootloader is based on the Arduino Zero bootloader which is a part of the Arduino SAMD core. It
+provides a USB-CDC and/or TTL serial communications interface to a host running the bossac command
+line firmware programming utility (or the Arduino IDE) running on Windows, Linux, or OS X. Optionally,
+SD Card firmware loading is supported, using SDSC or SDHC cards with a FAT16 or FAT32 filesystem.
+This version adds support for the D11, L21, and C21 microcontrollers. It also adds support for four
+different clock sources (two external crystals and two internal oscillator options). There are
+additional board definitions added, and binaries for most board/chip combinations are pre-built.
 
-Bossac is a command line utility for uploading firmware to SAM-BA bootloaders. It runs on Windows. Linux, and OS X.
-It is used by Arduino to upload firmware to SAM and SAM M0+ boards. The version described here adds to the
-Arduino version (https://github.com/shumatech/BOSSA, Arduino branch), which in turn is a fork from the original
-Bossa (http://www.shumatech.com/web/products/bossa). It adds support for more SAM M0+ chips (D21, L21, C21, and D11).
+**See [bootloaders/zero/README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/bootloaders/zero/README.md) for more technical information on the bootloader.**
 
-Note that only the Arduino or Mattairtech versions of bossac are currently supported for SAM M0+ chips.
-Neither the stock bossac (or Bossa) nor the Atmel SAM-BA upload tool will work.
 
-Arduino Extended Capabilities:
+### Features
 
-   * X: Erase the flash memory starting from ADDR to the end of flash.
-   * Y: Write the content of a buffer in SRAM into flash memory.
-   * Z: Calculate the CRC for a given area of memory.
+* SAM-BA USB CDC and UART interfaces with optional terminal mode
+* SD Card interface (both USB CDC and SD Card support fits in 8KB)
+* Four different clock sources (two external crystals and two internal oscillator options)
+* Arduino IDE auto-reset and double-tap reset button support
+* Arduino extended commands for faster firmware loading
+* Supports the D21, L21, C21, and D11 SAM M0+ chips
+* Bossac command line utility for Windows, Linux, and OS X
 
 The bootloader can be started by:
 
@@ -547,18 +600,17 @@ The bootloader can be started by:
    * Clicking 'Upload Sketch' in the Arduino IDE, which will automatically start the bootloader (when CDC is enabled).
    * If the application (sketch) area is blank, the bootloader will run.
 
-Otherwise, it jumps to application and starts execution from there. The LED will light during bootloader execution.
-Note that the 4KB bootloader does not support the Arduino Extended Capabilities.
-However, BOOT_DOUBLE_TAP does fit into the SAMD11 4KB bootloader.
+Otherwise, it jumps to application and starts execution from there. The LED will PWM fade during bootloader execution.
 
-When the Arduino IDE initiates the bootloader, the following procedure is used:
 
-1. The IDE opens and closes the USB serial port at a baud rate of 1200bps. This triggers a “soft erase� procedure.
-2. The first row of application section flash memory is erased by the MCU. If it is interrupted for any reason, the erase procedure will likely fail.
-3. The board is reset. The bootloader (which always runs first) detects the blank flah row, so bootloader operation resumes.
-4. Opening and closing the port at a baud rate other than 1200bps will not erase or reset the SAM M0+.
+### Bossac
 
-**See [bootloaders/zero/README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/bootloaders/zero/README.md) for more technical information on the bootloader.**
+Bossac is a command line utility for uploading firmware to SAM-BA bootloaders. It runs on Windows. Linux, and OS X.
+It is used by Arduino to upload firmware to SAM and SAM M0+ boards. The version described here adds to the
+Arduino version (https://github.com/shumatech/BOSSA, Arduino branch), which in turn is a fork from the original
+Bossa (http://www.shumatech.com/web/products/bossa). It adds support for more SAM M0+ chips (D21, L21, C21, and D11).
+Note that only the Arduino or Mattairtech versions of bossac are currently supported for SAM M0+ chips.
+Neither the stock bossac (or Bossa) nor the Atmel SAM-BA upload tool will work.
 
 
 ### Bootloader Firmware Installation
@@ -574,87 +626,40 @@ When the Arduino IDE initiates the bootloader, the following procedure is used:
 7. Click Tools->Burn Bootloader. Ignore any messages about not supporting shutdown or reset.
 8. Continue with driver installation above.
 
-A running sketch may interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.
+A running sketch *may* interfere with the bootloader installation process. Be sure you are running the existing bootloader or using a blank chip.
 
 #### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
 
-1. Download the bootloader from https://www.mattairtech.com/software/arduino/SAM-BA-bootloaders-zero-mattairtech.zip.
-2. Unzip to any directory. Be sure that a bootloader is available for your particular MCU.
-3. Follow the procedures for your upload tool to upload the firmware.
-   * Perform a chip erase first. Be sure no BOOTPROT bits are set.
-   * Install the binary file to 0x00000000 of the FLASH.
-   * You can optionally set the BOOTPROT bits to 8KB (or 4KB for the MT-D11). The Arduino installation method does not set these.
-   * You can optionally set the EEPROM bits or anything else. The Arduino installation method uses factory defaults.
-4. Continue with driver installation above.
+**See [bootloaders/zero/README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/bootloaders/zero/README.md) for information.**
 
 
 ### Bootloader Binaries
 
-The bootloaders/zero/binaries directory contains all of the SAM-BAm0+
-bootloaders built by the build_all_bootloaders.sh script.
-
-#### MattairTech Boards
-MattairTech boards are all configured with only one interface:
-SAM_BA_USBCDC_ONLY (except C21, which uses SAM_BA_UART_ONLY).
-CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_INTERNAL_USB
-(CLOCKCONFIG_INTERNAL for the C21). Only the main LED is defined.
-BOOT_LOAD_PIN is not defined, but BOOT_DOUBLE_TAP_ENABLED is.
+The bootloaders/zero/binaries directory contains the SAM-BA m0+
+bootloaders built by the build_all_bootloaders.sh script from
+the 'MattairTech SAM M0+ Boards' Arduino core, which is available
+at https://github.com/mattairtech/ArduinoCore-samd. Each board
+and chip combination has two bootloaders available:
 
-#### Arduino/Genuino Boards
-Arduino/Genuino boards are all configured with both interfaces.
-CLOCKCONFIG_CLOCK_SOURCE is set to CLOCKCONFIG_32768HZ_CRYSTAL.
-All LEDs that are installed for each board are defined (and some
-have LED_POLARITY_LOW_ON set). BOOT_LOAD_PIN is not defined, but
-BOOT_DOUBLE_TAP_ENABLED is.
+* SAM-BA interface only
+  * USB CDC only for all MattairTech boards
+  * Both USB CDC and UART for most Arduino boards
+  * The Generic board variants minimize external pin usage
+    * Only the SAM-BA interface pins are used (no crystal, LED, etc.)
+  * Filename is: sam_ba_$(BOARD_ID)_$(MCU)
 
-#### Generic Boards
-The generic boards are all configured to minimize external hardware
-requirements. Only one interface is enabled: SAM_BA_USBCDC_ONLY
-(except C21, which uses SAM_BA_UART_ONLY). CLOCKCONFIG_CLOCK_SOURCE
-is set to CLOCKCONFIG_INTERNAL_USB (CLOCKCONFIG_INTERNAL for the C21),
-so no crystal is required. No LEDs are defined. BOOT_LOAD_PIN is not
-defined, but BOOT_DOUBLE_TAP_ENABLED is, since it uses the reset pin.
+* SAM-BA interface and SD Card interface
+  * USB CDC only for all Arduino and most MattairTech boards
+  * No SAM-BA interface for the D11 chips
+  * All board variants define SDCARD_USE_PIN1 (except D11)
+  * The Generic board variants use the LED
+  * SDCARD_AUTORUN_DISABLED is defined
+  * Filename is: sam_ba_sdcard_$(BOARD_ID)_$(MCU)
 
 
 ### Using Bossac Standalone
 
-TODO: Update https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip with new chips (L21 and C21).
-
-When using Bossac standalone, you will need to ensure that your application starts at 0x00002000 for 8 KB bootloaders,
-and 0x00001000 for 4 KB bootloaders. This is because the bootloader resides at 0x00000000. This can be accomplished
-by passing the following flag to the linker (typically LDFLAGS in your makefile; adjust for your bootloader size):
-
-```
-Wl,sectionstart=.text=0x2000
-```
-
-You can also use a linker script. See the MattairTech SAM M0+ package for examples.
-Be sure to generate and use a binary file. Many makefiles are set up to generate an elf, hex, and bin already.
-
-Download Bossac from:
-
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
-
-Linux 64 bit users can also download Bossa (GUI) and bossash (shell) from:
-
-* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
-
-As an example, bossac will be used to upload the test firmware (blink sketch):
-
-1. Download firmware from https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip and unzip.
-2. If you have not already installed the bootloader driver, see Driver Installation above.
-3. Be sure there is a binary that matches your chip. On the command line (change the binary to match yours):
-
-```
-bossac.exe -d --port=COM5 -U true -i -e -w -v Blink_Demo_ATSAMD21E18A.bin -R
-```
-4. On Linux --port might be /dev/ttyACM0. If the device is not found, remove the --port argument for auto-detection.
-5. See http://manpages.ubuntu.com/manpages/vivid/man1/bossac.1.html for details.
-6. The board should reset automatically and the sketch should be running.
-
+**See [bootloaders/zero/README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/bootloaders/zero/README.md) for information on using Bossac standalone.**
 
 
 ## New PinDescription Table
@@ -698,37 +703,64 @@ from the MT-D11 variant.
 
 
 
-## Future Additions/Changes
+## MattairTech Libraries
+
+### Available Now
 
-### In-Progress
-* Timer library (like TimerOne, plus input capture, plus ??)
-* Drivers for MT-D21E optional memory devices (SRAM, FLASH, EEPROM)
-* OS X support currently in beta testing
+*Use Libraries Manager to install*
+
+* SRAM_23LC - Library for Microchip Technology Inc. 23LC (23LCV, 23A, 23K) SPI SRAM chips
+  * Byte and block transfers
+
+* EEPROM_CAT25 - Library for On Semiconductor CAT25 SPI EEPROM chips
+  * Byte, block, and page transfers
+
+### Under Development
+
+* ZeroTimers - 8/16/24/32 bit timer library with API based on TimerOne
+  * PWM
+  * interrupt
+  * Input capture
+
+* POWER_PAC1921 - Library for Microchip Technologies high-side power/current/voltage monitor with I2C and analog out
+* SENSOR_LPS22HB - Library for ST MEMS nano pressure sensor / temperature sensor with I2C
+* SENSOR_LSM6DS3H - Library for ST iNemo inertial module: 3D accelerometer / 3D gyroscope with I2C and interrupt
+* FLASH_AT25 - Library for Adesto Technologies AT25 SPI serial FLASH devices
 
 ### Possible Future
+
+* Several I2C (Wire) sensor devices
+* TFT LCD (CFAF128128B-0145T)
+* IR decoder
+* I2S DAC/AMP and I2S MEMS microphone
+* Battery management IC
+* XBee/Xbee Pro devices?
+
+
+## Core Future Additions/Changes
+
+### Under Development
+
+* PlatformIO support
+* Fix programming port for Arduino Zero and M0 board variants
 * Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
-* USB Host mode CDC ACM (partially complete; BSD-like license?)
-* Features for lower power consumption (library?)
+
+### Possible Future
+
+* Features for lower power consumption (library?) Summer 2017?
 * Reliability and security enhancements
-* Enhanced SD card library
+* USB Host mode CDC ACM (partially complete; BSD-like license?)
+* SD card library? Port of FatFS and/or Petit FatFS?
 * Optional use of single on-board LED as USB activity LED
 * MSC (Mass Storage) USB Device Class
 * Polyphonic tone
 * Wired-AND, Wired-OR for port pins
 * High-speed port pin access (IOBUS)
-* Libraries for some hardware I plan on using:
-  * TFT LCD (CFAF128128B-0145T)
-  * Motor controller
-  * IR decoder
-  * I2S DAC/AMP and I2S MEMS microphone
-  * Battery management IC
-  * XBee/Xbee Pro devices
-  * RS485
-  * Several I2C (Wire) sensor devices: 
-    * Accelerometer/magnetometer (LSM303CTR)
-    * Barometer/altimeter (LPS22HBTR)
-    * Humidity/temperature
-    * Light/color sensor
+
+### Feature Requests
+
+Please use the GitHub Issue Tracker if you would like to request a feature.
+
 
 
 ## ChangeLog
diff --git a/cores/arduino/wiring_analog.h b/cores/arduino/wiring_analog.h
index ac487b78a..c5844ba75 100644
--- a/cores/arduino/wiring_analog.h
+++ b/cores/arduino/wiring_analog.h
@@ -26,11 +26,10 @@ extern "C" {
 #endif
 
 /*
- * \brief TODO Analog reference selection.
- * For values <= 5, the actual register value is used.
- * For values > 5 (SAML and SAMC only), the SUPC_VREF_SEL register value is: (ulMode - 6).
- * Values for the Supply Controller (SUPC) reference on the L21 or C21.
- * Used when AR_INTREF is selected as the reference.
+ * \brief Analog reference selection.
+ * For eAnalogReference values <= 5, the value is written to the REFSEL register.
+ * For values > 5 (SAML and SAMC only), 0 is written into the REFSEL register, and
+ * the SUPC_VREF_SEL (supply controller) register value is: (eAnalogReference - 6).
  */
 typedef enum _eAnalogReference
 {
@@ -42,7 +41,7 @@ typedef enum _eAnalogReference
   AR_EXTERNAL_REFB = 4,
   AR_DEFAULT = 5,	// On the SAMD, this also uses 1/2 gain on each input
 #elif (SAML21)
-  AR_INTREF = 0,
+  AR_INTREF = 0,                // This has the same effect as AR_INTREF_1V0
   AR_INTERNAL_INTVCC0 = 1,
   AR_INTERNAL_INTVCC1 = 2,
   AR_EXTERNAL_REFA = 3,
@@ -57,9 +56,9 @@ typedef enum _eAnalogReference
   AR_INTREF_2V4 = 12,
   AR_INTREF_2V5 = 13,
   AR_DEFAULT = AR_INTERNAL_INTVCC2,
-  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAML is 1.0V
+  AR_INTERNAL1V0 = AR_INTREF,
 #elif (SAMC21)
-  AR_INTREF = 0,
+  AR_INTREF = 0,                // This has the same effect as AR_INTREF_1V024
   AR_INTERNAL_INTVCC0 = 1,
   AR_INTERNAL_INTVCC1 = 2,
   AR_EXTERNAL_REFA = 3,
@@ -69,7 +68,7 @@ typedef enum _eAnalogReference
   AR_INTREF_2V048 = 7,
   AR_INTREF_4V096 = 8,
   AR_DEFAULT = AR_INTERNAL_INTVCC2,
-  AR_INTERNAL1V0 = AR_INTREF,		// Default INTREF for SAMC is 1.024V
+  AR_INTERNAL1V0 = AR_INTREF,
 #else
   #error "wiring_analog.c: Unsupported chip"
 #endif

From 9bb5076856e9d49a6166127be4dba01094726d4c Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Thu, 6 Jul 2017 08:03:08 +0000
Subject: [PATCH 103/124] Github doc fixup

---
 README.md | 86 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 8a20979fa..25cf63b50 100644
--- a/README.md
+++ b/README.md
@@ -207,21 +207,21 @@ and SRAM usage by allowing CDC to be disabled (or USB completely disabled).
 There are up to four clock source choices, depending on board features and microcontroller. Since currently
 the cpu must run at 48MHz, the PLL or DFLL must be used (the SAMC can use OSC48M).
 
-* 32KHZ_CRYSTAL (default)
-  * Uses both XOSC32K and FDPLL96M
-  * High long-term accuracy, slow startup, medium current (PLL)
+### 32KHZ_CRYSTAL (default)
+* Uses both XOSC32K and FDPLL96M
+* High long-term accuracy, slow startup, medium current (PLL)
 
-* HIGH_SPEED_CRYSTAL
-  * Uses both XOSC and FDPLL96M
-  * High accuracy, medium startup, high current (XOSC and PLL)
+### HIGH_SPEED_CRYSTAL
+* Uses both XOSC and FDPLL96M
+* High accuracy, medium startup, high current (XOSC and PLL)
 
-* INTERNAL_OSCILLATOR
-  * Uses DFLL48M in open-loop mode (SAMC uses OSC48M)
-  * Low accuracy, fast startup, medium-low current (low current with SAMC)
+### INTERNAL_OSCILLATOR
+* Uses DFLL48M in open-loop mode (SAMC uses OSC48M)
+* Low accuracy, fast startup, medium-low current (low current with SAMC)
 
-* INTERNAL_USB_CALIBRATED_OSCILLATOR (not available with SAMC)
-  * Uses DFLL48M in closed-loop mode
-  * High accuracy, medium-fast startup, medium current
+### INTERNAL_USB_CALIBRATED_OSCILLATOR (not available with SAMC)
+* Uses DFLL48M in closed-loop mode
+* High accuracy, medium-fast startup, medium current
 
 ### SAMD
 
@@ -307,19 +307,19 @@ NVM OTP (factory calibration values).
 
 ## Analog Reference
 
-* D21
-  * AR_DEFAULT uses 1/2X gain on each input.
-  * The external reference should be between 1.0V and VDDANA-0.6V.
+### D21
+* AR_DEFAULT uses 1/2X gain on each input.
+* The external reference should be between 1.0V and VDDANA-0.6V.
 
-* L21
-  * AR_DEFAULT = AR_INTERNAL_INTVCC2
-  * Both AR_INTREF and AR_INTERNAL1V0 has the same effect as AR_INTREF_1V0.
-  * The external reference should be between 1v and VDDANA-0.6v=2.7v.
+### L21
+* AR_DEFAULT = AR_INTERNAL_INTVCC2
+* Both AR_INTREF and AR_INTERNAL1V0 has the same effect as AR_INTREF_1V0.
+* The external reference should be between 1v and VDDANA-0.6v=2.7v.
 
-* C21
-  * AR_DEFAULT = AR_INTERNAL_INTVCC2
-  * Both AR_INTREF and AR_INTERNAL1V0 has the same effect as AR_INTREF_1V024.
-  * The external reference should be between 1v and VDDANA-0.6v=2.7v.
+### C21
+* AR_DEFAULT = AR_INTERNAL_INTVCC2
+* Both AR_INTREF and AR_INTERNAL1V0 has the same effect as AR_INTREF_1V024.
+* The external reference should be between 1v and VDDANA-0.6v=2.7v.
 
 **Warning : The maximum reference voltage is Vcc (up to 3.6 volts for the SAMD/SAML, 5V for the SAMC)**
 
@@ -333,16 +333,16 @@ AR_INTERNAL_INTVCC0     | 1/1.48 VCC | AR_INTREF_1V0         | 1.00V     | AR_IN
 AR_INTERNAL_INTVCC1     | 1/2 VCC    | AR_INTREF_1V1         | 1.10V     | AR_INTREF_2V048       | 2.048V
 AR_EXTERNAL_REFA        | REFA       | AR_INTREF_1V2         | 1.20V     | AR_INTREF_4V096       | 4.096V
 AR_EXTERNAL_REFB        | REFB       | AR_INTREF_1V25        | 1.25V     | AR_INTERNAL1V0        | 1.024V
-                        |            | AR_INTREF_2V0         | 2.00V     | AR_INTERNAL_INTVCC0   | 1/1.6 VCC
-                        |            | AR_INTREF_2V2         | 2.20V     | AR_INTERNAL_INTVCC1   | 1/2 VCC
-                        |            | AR_INTREF_2V4         | 2.40V     | AR_INTERNAL_INTVCC2   | VCC
-                        |            | AR_INTREF_2V5         | 2.50V     | AR_EXTERNAL_REFA      | REFA
-                        |            | AR_INTERNAL1V0        | 1.00V     | AR_EXTERNAL_DAC       | DAC
-                        |            | AR_INTERNAL_INTVCC0   | 1/1.6 VCC |                       |
-                        |            | AR_INTERNAL_INTVCC1   | 1/2 VCC   |                       |
-                        |            | AR_INTERNAL_INTVCC2   | VCC       |                       |
-                        |            | AR_EXTERNAL_REFA      | REFA      |                       |
-                        |            | AR_EXTERNAL_REFB      | REFB      |                       |
+---                     |            | AR_INTREF_2V0         | 2.00V     | AR_INTERNAL_INTVCC0   | 1/1.6 VCC
+---                     |            | AR_INTREF_2V2         | 2.20V     | AR_INTERNAL_INTVCC1   | 1/2 VCC
+---                     |            | AR_INTREF_2V4         | 2.40V     | AR_INTERNAL_INTVCC2   | VCC
+---                     |            | AR_INTREF_2V5         | 2.50V     | AR_EXTERNAL_REFA      | REFA
+---                     |            | AR_INTERNAL1V0        | 1.00V     | AR_EXTERNAL_DAC       | DAC
+---                     |            | AR_INTERNAL_INTVCC0   | 1/1.6 VCC |                       |
+---                     |            | AR_INTERNAL_INTVCC1   | 1/2 VCC   |                       |
+---                     |            | AR_INTERNAL_INTVCC2   | VCC       |                       |
+---                     |            | AR_EXTERNAL_REFA      | REFA      |                       |
+---                     |            | AR_EXTERNAL_REFB      | REFB      |                       |
 
 ### Common Settings
 
@@ -404,21 +404,17 @@ AR_EXTERNAL = AR_EXTERNAL_REFA
 TODO
 
 
-## Differences Between MattairTech and Arduino Cores
-
-* TODO
+## Differences Between MattairTech and Arduino Cores (TODO)
 
 * Table summarizing which core files are modified and by how much
 * Communications interfaces are mostly unchanged, including USB
 * Changes due to adding/changing features vs porting to new chip
-
 * All pins (digital and analog) setup in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
 * INEN enabled for both input and output (but not analog)
 * pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
   interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected.
 * Pull resistors enabled only if pin attributes allow and only if pin is not configured as output.
 * Pull direction (pullup or pulldown) is now set with pinMode only (defaults to pullup if pinMode never called).
-
 * At least on the L21, pin A31 must be set as an input. It is possible that debugger probe detection is being falsely
   detected (even with a pullup on A31 (SWCLK)), which would change the peripheral mux of A31 to COM.
   This might not normally be a problem, but one strange effect is that Serial2 loses characters if pin A31 is not set as INPUT.
@@ -839,6 +835,7 @@ This fork developed by Justin Mattair of MattairTech LLC.
 
 ```
   Copyright (c) 2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2017 MattairTech 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
@@ -854,3 +851,16 @@ This fork developed by Justin Mattair of MattairTech LLC.
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ```
+
+### Petit FatFS
+
+Petit FatFs module is an open source software to implement FAT file system to
+small embedded systems. This is a free software and is opened for education,
+research and commercial developments under license policy of following trems.
+
+Copyright (C) 2014, ChaN, all right reserved.
+
+* The Petit FatFs module is a free software and there is NO WARRANTY.
+* No restriction on use. You can use, modify and redistribute it for
+  personal, non-profit or commercial use UNDER YOUR RESPONSIBILITY.
+* Redistributions of source code must retain the above copyright notice.

From 7c28b408ff8adf44e06d24eafac84c395af90629 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 29 Sep 2017 12:04:18 +0000
Subject: [PATCH 104/124] Added MattairTech Xeno support (64-pin D21/L21/C21)

---
 CHANGELOG                                     |  17 +
 README.md                                     |  99 +++--
 boards.txt                                    | 172 ++++++++
 bootloaders/zero/Makefile                     |   2 +-
 .../zero/binaries/sam_ba_Xeno_SAMC21J18A.bin  | Bin 0 -> 3892 bytes
 .../zero/binaries/sam_ba_Xeno_SAMD21J18A.bin  | Bin 0 -> 5192 bytes
 .../zero/binaries/sam_ba_Xeno_SAML21J18B.bin  | Bin 0 -> 5128 bytes
 .../sam_ba_sdcard_Xeno_SAMC21J18A.bin         | Bin 0 -> 6828 bytes
 .../sam_ba_sdcard_Xeno_SAMD21J18A.bin         | Bin 0 -> 8116 bytes
 .../sam_ba_sdcard_Xeno_SAML21J18B.bin         | Bin 0 -> 8056 bytes
 bootloaders/zero/board_definitions.h          |   2 +
 .../board_definitions_Xeno.h                  | 277 ++++++++++++
 bootloaders/zero/build_all_bootloaders.sh     |  42 +-
 platform.txt                                  |   2 +-
 variants/Xeno/README.md                       | 293 +++++++++++++
 variants/Xeno/debug_scripts/SAMC21J15A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMC21J16A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMC21J17A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMC21J18A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMD21J15A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMD21J16A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMD21J17A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAMD21J18A.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAML21J16B.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAML21J17B.gdb    |  31 ++
 variants/Xeno/debug_scripts/SAML21J18B.gdb    |  31 ++
 .../gcc/16KB_Bootloader/flash_128KB.ld        | 217 +++++++++
 .../gcc/16KB_Bootloader/flash_256KB.ld        | 217 +++++++++
 .../gcc/16KB_Bootloader/flash_32KB.ld         | 217 +++++++++
 .../gcc/16KB_Bootloader/flash_64KB.ld         | 217 +++++++++
 .../gcc/8KB_Bootloader/flash_128KB.ld         | 217 +++++++++
 .../gcc/8KB_Bootloader/flash_256KB.ld         | 217 +++++++++
 .../gcc/8KB_Bootloader/flash_32KB.ld          | 217 +++++++++
 .../gcc/8KB_Bootloader/flash_64KB.ld          | 217 +++++++++
 .../gcc/No_Bootloader/flash_128KB.ld          | 214 +++++++++
 .../gcc/No_Bootloader/flash_256KB.ld          | 214 +++++++++
 .../gcc/No_Bootloader/flash_32KB.ld           | 214 +++++++++
 .../gcc/No_Bootloader/flash_64KB.ld           | 214 +++++++++
 variants/Xeno/openocd_scripts/SAMC21J15A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMC21J16A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMC21J17A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMC21J18A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMD21J15A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMD21J16A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMD21J17A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAMD21J18A.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAML21J16B.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAML21J17B.cfg  |  30 ++
 variants/Xeno/openocd_scripts/SAML21J18B.cfg  |  30 ++
 variants/Xeno/pins_arduino.h                  |  21 +
 variants/Xeno/variant.cpp                     | 215 +++++++++
 variants/Xeno/variant.h                       | 412 ++++++++++++++++++
 52 files changed, 4746 insertions(+), 71 deletions(-)
 create mode 100755 bootloaders/zero/binaries/sam_ba_Xeno_SAMC21J18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_Xeno_SAMD21J18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_Xeno_SAML21J18B.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMC21J18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD21J18A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAML21J18B.bin
 create mode 100644 bootloaders/zero/board_definitions/board_definitions_Xeno.h
 create mode 100644 variants/Xeno/README.md
 create mode 100644 variants/Xeno/debug_scripts/SAMC21J15A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMC21J16A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMC21J17A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMC21J18A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMD21J15A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMD21J16A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMD21J17A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAMD21J18A.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAML21J16B.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAML21J17B.gdb
 create mode 100644 variants/Xeno/debug_scripts/SAML21J18B.gdb
 create mode 100644 variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
 create mode 100644 variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
 create mode 100644 variants/Xeno/openocd_scripts/SAMC21J15A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMC21J16A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMC21J17A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMC21J18A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMD21J15A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMD21J16A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMD21J17A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAMD21J18A.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAML21J16B.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAML21J17B.cfg
 create mode 100644 variants/Xeno/openocd_scripts/SAML21J18B.cfg
 create mode 100644 variants/Xeno/pins_arduino.h
 create mode 100644 variants/Xeno/variant.cpp
 create mode 100644 variants/Xeno/variant.h

diff --git a/CHANGELOG b/CHANGELOG
index c31fd80e7..f7293e594 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,20 @@
+1.6.16: (identical to beta version 1.6.8-beta-b3)
+1.6.8-beta-b3:
+* Changed version numbering to match Arduino SAMD core to indicate which upstream changes have been merged in.
+  Release version 1.6.7 then skips to 1.6.16. Beta version 1.6.8-beta-b3 became release version 1.6.16.
+* Added MattairTech Xeno support (64-pin D21, L21, and C21)
+* Merged in changes from upstream SAMD CORE 1.6.17 (not released yet):
+  * Fix changing trigger mode (RISING/FALLING/...) in attachInterrupt(..) during runtime. Thanks @joverbee
+  * Improved ISR response time. Thanks @joverbee
+* Merged in changes from upstream SAMD CORE 1.6.16 2017.08.23:
+  * PWMs now can perform real 16-bit resolution if analogWriteResolution(16) is set. Thanks @Adminius
+  * USB CDC: fixed issue of available() getting stuck when receiving ZLP's
+  * Serial (UART) tx is now buffered.
+  * Updated Stream and Print class
+  * Native USB now supports USB Serial Number
+  * Fixed pgm_read_ptr compatibility macro. Thanks @nkrkv
+* Documentation updates
+
 1.6.8-beta-b2:
 * Added SD Card firmware loading support to the bootloader (4KB and 8KB)
 * Removed SDU library, as the bootloader now supports SD cards directly
diff --git a/README.md b/README.md
index 25cf63b50..2abb06d0e 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 The MattairTech SAM M0+ Core is a fork from arduino/ArduinoCore-samd on GitHub, which will
 be used to maintain Arduino support for MattairTech branded boards (see
-https://www.mattairtech.com/) as well as "Generic" boards.
+https://www.mattairtech.com/) as well as for "Generic" boards.
 
 * Supports the SAMD21, SAMD11, SAML21, and SAMC21.
 * Supports four clock sources (two crystals, internal oscillator, and USB calibrated).
@@ -11,14 +11,35 @@ https://www.mattairtech.com/) as well as "Generic" boards.
 *This core is intended to be installed using Boards Manager (see below). To update from a*
 *previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.*
 
-**Differences from Arduino in Versioning**  The MattairTech version number does not
-correspond to either the IDE version or to the upstream ArduinoCore-samd version. See the
-CHANGELOG for details on which upstream commits have been merged in to the MattairTech core.
+**New Version Numbering**  The MattairTech version number will now track with the Arduino
+version number, to better understand which upstream changes have been merged in. See the
+CHANGELOG for details on upstream commits and MattairTech additions that have been merged.
 
 
-## What's New Beta (1.6.8-beta)
+## What's New - Release Version (1.6.16)
+
+* Changed version numbering to match Arduino SAMD core to indicate which upstream changes have been merged in.
+  Release version 1.6.7 then skips to 1.6.16. Beta version 1.6.8-beta-b3 became 1.6.16.
+* Added MattairTech Xeno support (64-pin D21, L21, and C21)
+* Merged in changes from upstream SAMD CORE 1.6.17 (not released yet):
+  * Fix changing trigger mode (RISING/FALLING/...) in attachInterrupt(..) during runtime. Thanks @joverbee
+  * Improved ISR response time. Thanks @joverbee
+* Merged in changes from upstream SAMD CORE 1.6.16 2017.08.23:
+  * PWMs now can perform real 16-bit resolution if analogWriteResolution(16) is set. Thanks @Adminius
+  * USB CDC: fixed issue of available() getting stuck when receiving ZLP's
+  * Serial (UART) tx is now buffered.
+  * Updated Stream and Print class
+  * Native USB now supports USB Serial Number
+  * Fixed pgm_read_ptr compatibility macro. Thanks @nkrkv
+* Documentation updates
+
+
+## What's New - Beta Version (1.6.8-beta)
 **See Beta Builds section for installation instructions.**
 
+**1.6.8-beta-b3:**
+*Beta version 1.6.8-beta-b3 became release version 1.6.16. See above*
+
 **1.6.8-beta-b2:**
 * Added SD Card firmware loading support to the bootloader (4KB and 8KB)
 * Removed SDU library, as the bootloader now supports SD cards directly
@@ -57,47 +78,29 @@ CHANGELOG for details on which upstream commits have been merged in to the Matta
 * Merged in all changes from upstream through SAMD CORE 1.6.14 (April 2017)
 
 
-## What's New Release (1.6.6)
-**This is out of date, use the beta for now.**
-
-* 1.6.6-mt3:
-  * Fixes compilation with CDC_UART and CDC_ONLY settings
-
-* 1.6.6-mt2:
-  * Changes the default Communication setting to CDC_UART (from CDC_HID_UART)
-
-* 1.6.6-mt1:
-  * New documentation section 'Special Notes'. Please read!
-  * Updated ASCII pinouts to be more readable and less ambiguous.
-  * Updated the Signed driver for Windows (extras directory) (see CHANGELOG for details)
-  * Merged in changes from upstream (see CHANGELOG for details)
-  * Fix warnings about deprecated recipe.ar.pattern
-  * Merged in changes from upstream SAMD CORE 1.6.2 2015.11.03 (see CHANGELOG for details)
-
-
 ## Features Summary
 
 Feature		| 21J (64 pin)				| 21G (48 pin)				| 21E (32 pin)				| D11 (24, 20, or 14 pin)
 ----------------|---------------------------------------|---------------------------------------|---------------------------------------|---------------------------------------
-Board Variants	| New board coming June, Generic 21J	| Arduino Zero, Arduino M0, Generic 21G	| MT-D21E, Generic 21E			| MT-D11, Generic D11D14AM, Generic D11D14AS, Generic D11C14A
+Board Variants	| MattairTech Xeno, Generic 21J	        | Arduino Zero, Arduino M0, Generic 21G	| MT-D21E, Generic 21E			| MT-D11, Generic D11D14AM, Generic D11D14AS, Generic D11C14A
 Processor	| 48 MHz 32-bit ARM Cortex M0+		| 48 MHz 32-bit ARM Cortex M0+		| 48 MHz 32-bit ARM Cortex M0+		| 48 MHz 32-bit ARM Cortex M0+
 Flash Memory	| Up to 256KB (L21/C21 have RWW)	| Up to 256KB (L21/C21 have RWW)	| Up to 256KB (L21/C21 have RWW)	| 16 KB (4KB used by bootloader)
 SRAM		| Up to 32KB (plus <=8KB LPSRAM on L21)	| Up to 32KB (plus <=8KB LPSRAM on L21)	| Up to 32KB (plus <=8KB LPSRAM on L21)	| 4 KB
 Digital Pins	| 52 (51 for L21)			| 38 (37 for L21)			| 26 (25 for L21)			| 24-pin: 21, 20-pin: 17, 14-pin: 11
-Analog Inputs	| 20 channels, 12-bit			| 14 channels, 12-bit			| 10 channels, 12-bit			| 24-pin: 10, 20-pin: 8, 14-pin: 5 (12-bit)
+Analog Inputs	| 18 channels, 12-bit			| 14 channels, 12-bit			| 10 channels, 12-bit			| 24-pin: 10, 20-pin: 8, 14-pin: 5 (12-bit)
 Analog Outputs	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)	| One 10-bit (two 12-bit on L21)	| One 10-bit
 PWM Outputs	| 18					| 14					| 14					| 8 (6 for 14-pin)
 Interrupts	| 16					| 16					| 16					| 8 (7 for 14-pin)
 USB		| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device and Host (not C21)	| Full Speed Device
 SERCOM*		| 6					| 6					| 4 (6 for L21)				| 3 (2 for 14-pin)
-UART (Serial)*	| Up to 6				| Up to 6				| Up to 4 (up to 6 for L21)		| Up to 2
-SPI*		| Up to 3				| Up to 2				| Up to 2				| Up to 1
-I2C (WIRE)*	| Up to 3				| Up to 2				| Up to 2				| Up to 1
+UART (Serial)*	| Up to 3 (will add more later)		| Up to 6				| Up to 4 (up to 6 for L21)		| Up to 2
+SPI*		| Up to 2 (will add more later)		| Up to 2				| Up to 2				| Up to 1
+I2C (WIRE)*	| Up to 2 (will add more later)		| Up to 2				| Up to 2				| Up to 1
 I2S		| Present on the D21 only		| Present on the D21 only		| Present on the D21 only		| Not present
 Voltage		| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V (2.7V-5.5V for the C21)	| 1.62V-3.63V
 I/O Pin	Current	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| 7 mA
 
-*Note that the maximum number of UART/SPI/I2C is the number of SERCOM. The number listed above for UART/SPI/I2C indicated how many are configurable through the Arduino IDE menu.*
+*Note that the maximum number of UART/SPI/I2C is the number of SERCOM. The number listed above for UART/SPI/I2C indicated how many are currently configurable through the Arduino IDE menu.*
 
 
 
@@ -106,6 +109,8 @@ I/O Pin	Current	| D21: 7mA, L21: 5mA, C21: 6mA@5V	| D21: 7mA, L21: 5mA, C21: 6mA
 Pin configuration and peripheral assignment information is now in the README.md for each board variant.
 README.md also now includes technical information on the new PinDescription table format.
 
+* [MattairTech Xeno (SAMx21Jxxx)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/Xeno/README.md)
+
 * [MattairTech MT-D21E Rev B (SAMx21Exxx)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/MT_D21E_revB/README.md)
 
 * [MattairTech MT-D21E Rev A (SAMD21ExxA)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/MT_D21E/README.md)
@@ -114,17 +119,15 @@ README.md also now includes technical information on the new PinDescription tabl
 
 * [MattairTech Generic D11C14A](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/Generic_D11C14A/README.md)
 
-* MattairTech x21J based board (coming July)
-
-* MattairTech Generic D11D14AS (coming soon)
+* MattairTech Generic D11D14AS (future)
 
-* MattairTech Generic D11D14AM (coming soon)
+* MattairTech Generic D11D14AM (future)
 
-* MattairTech Generic x21E (coming soon)
+* MattairTech Generic x21E (future)
 
-* MattairTech Generic x21G (coming soon)
+* MattairTech Generic x21G (future)
 
-* MattairTech Generic x21J (coming soon)
+* MattairTech Generic x21J (future)
 
 * [Arduino Zero (arduino.cc)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/arduino_zero/README.md)
 
@@ -207,19 +210,19 @@ and SRAM usage by allowing CDC to be disabled (or USB completely disabled).
 There are up to four clock source choices, depending on board features and microcontroller. Since currently
 the cpu must run at 48MHz, the PLL or DFLL must be used (the SAMC can use OSC48M).
 
-### 32KHZ_CRYSTAL (default)
+#### 32KHZ_CRYSTAL (default)
 * Uses both XOSC32K and FDPLL96M
 * High long-term accuracy, slow startup, medium current (PLL)
 
-### HIGH_SPEED_CRYSTAL
+#### HIGH_SPEED_CRYSTAL
 * Uses both XOSC and FDPLL96M
 * High accuracy, medium startup, high current (XOSC and PLL)
 
-### INTERNAL_OSCILLATOR
+#### INTERNAL_OSCILLATOR
 * Uses DFLL48M in open-loop mode (SAMC uses OSC48M)
 * Low accuracy, fast startup, medium-low current (low current with SAMC)
 
-### INTERNAL_USB_CALIBRATED_OSCILLATOR (not available with SAMC)
+#### INTERNAL_USB_CALIBRATED_OSCILLATOR (not available with SAMC)
 * Uses DFLL48M in closed-loop mode
 * High accuracy, medium-fast startup, medium current
 
@@ -346,10 +349,10 @@ AR_EXTERNAL_REFB        | REFB       | AR_INTREF_1V25        | 1.25V     | AR_IN
 
 ### Common Settings
 
-AR_INTERNAL = AR_INTERNAL_INTVCC0
-AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0
-AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1
-AR_EXTERNAL = AR_EXTERNAL_REFA
+* AR_INTERNAL = AR_INTERNAL_INTVCC0
+* AR_INTERNAL2V23 = AR_INTERNAL_INTVCC0
+* AR_INTERNAL1V65 = AR_INTERNAL_INTVCC1
+* AR_EXTERNAL = AR_EXTERNAL_REFA
 
 *When using AR_INTERNAL2V23 or AR_INTERNAL1V65, these voltages are correct only when Vcc = 3.3V)*
 
@@ -406,9 +409,8 @@ TODO
 
 ## Differences Between MattairTech and Arduino Cores (TODO)
 
-* Table summarizing which core files are modified and by how much
 * Communications interfaces are mostly unchanged, including USB
-* Changes due to adding/changing features vs porting to new chip
+* All pins have high drive strength enabled by default
 * All pins (digital and analog) setup in STARTUP mode (enable INEN and set default pull direction to pullup (pullup will not be enabled))
 * INEN enabled for both input and output (but not analog)
 * pinPeripheral now handles disabling the DAC (if active). Note that on the L21, the DAC output would
@@ -419,6 +421,8 @@ TODO
   detected (even with a pullup on A31 (SWCLK)), which would change the peripheral mux of A31 to COM.
   This might not normally be a problem, but one strange effect is that Serial2 loses characters if pin A31 is not set as INPUT.
   So, the startup code calls pinMode(31, INPUT).
+* Todo: Table summarizing which core files are modified and by how much
+* Todo: List changes due to adding/changing features vs porting to new chip
 
 
 ## Serial Monitor
@@ -754,12 +758,13 @@ from the MT-D11 variant.
 ### Under Development
 
 * PlatformIO support
+* SAM D51 (M4F) support (pin compatible with D21, similar peripherals and pin mapping)
 * Fix programming port for Arduino Zero and M0 board variants
 * Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
 
 ### Possible Future
 
-* Features for lower power consumption (library?) Summer 2017?
+* Features for lower power consumption (library?) Fall 2017?
 * Reliability and security enhancements
 * USB Host mode CDC ACM (partially complete; BSD-like license?)
 * SD card library? Port of FatFS and/or Petit FatFS?
diff --git a/boards.txt b/boards.txt
index bfda423a2..b4b421e0c 100644
--- a/boards.txt
+++ b/boards.txt
@@ -21,6 +21,178 @@ menu.serial=Serial Config
 menu.bootloader=Bootloader Size
 
 
+# MattairTech Xeno
+mattairtech_xeno.name=MattairTech Xeno
+mattairtech_xeno.vid.0=0x16D0
+mattairtech_xeno.pid.0=0x0557
+mattairtech_xeno.vid.1=0x16D0
+mattairtech_xeno.pid.1=0x0856
+mattairtech_xeno.vid.2=0x16D0
+mattairtech_xeno.pid.2=0x0B41
+mattairtech_xeno.vid.3=0x16D0
+mattairtech_xeno.pid.3=0x0B40
+mattairtech_xeno.vid.4=0x16D0
+mattairtech_xeno.pid.4=0x0A0C
+mattairtech_xeno.vid.5=0x16D0
+mattairtech_xeno.pid.5=0x0856
+mattairtech_xeno.build.mcu=cortex-m0plus
+mattairtech_xeno.build.f_cpu=48000000L
+mattairtech_xeno.build.usb_product="Xeno"
+mattairtech_xeno.build.usb_manufacturer="MattairTech LLC"
+mattairtech_xeno.build.board=SAMD_ZERO
+mattairtech_xeno.build.core=arduino
+mattairtech_xeno.build.variant=Xeno
+mattairtech_xeno.build.variant_system_lib=
+mattairtech_xeno.build.vid=0x16D0
+mattairtech_xeno.upload.protocol=sam-ba
+mattairtech_xeno.bootloader.tool=arduino:openocd
+mattairtech_xeno.menu.clock.crystal_32k=32KHZ_CRYSTAL
+mattairtech_xeno.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
+mattairtech_xeno.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+mattairtech_xeno.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+mattairtech_xeno.menu.clock.internal=INTERNAL_OSCILLATOR
+mattairtech_xeno.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+mattairtech_xeno.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
+mattairtech_xeno.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+mattairtech_xeno.menu.cpu.samd21j18a=SAMD21J18A
+mattairtech_xeno.menu.cpu.samd21j18a.upload.maximum_size=253952
+mattairtech_xeno.menu.cpu.samd21j18a.build.extra_flags=-D__SAMD21J18A__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.samd21j18a.build.ldscript=flash_256KB.ld
+mattairtech_xeno.menu.cpu.samd21j18a.build.openocdscript=openocd_scripts/SAMD21J18A.cfg
+mattairtech_xeno.menu.cpu.samd21j18a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMD21J18A.bin
+mattairtech_xeno.menu.cpu.samd21j17a=SAMD21J17A
+mattairtech_xeno.menu.cpu.samd21j17a.upload.maximum_size=122880
+mattairtech_xeno.menu.cpu.samd21j17a.build.extra_flags=-D__SAMD21J17A__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.samd21j17a.build.ldscript=flash_128KB.ld
+mattairtech_xeno.menu.cpu.samd21j17a.build.openocdscript=openocd_scripts/SAMD21J17A.cfg
+mattairtech_xeno.menu.cpu.samd21j17a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMD21J17A.bin
+mattairtech_xeno.menu.cpu.samd21j16a=SAMD21J16A
+mattairtech_xeno.menu.cpu.samd21j16a.upload.maximum_size=57344
+mattairtech_xeno.menu.cpu.samd21j16a.build.extra_flags=-D__SAMD21J16A__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.samd21j16a.build.ldscript=flash_64KB.ld
+mattairtech_xeno.menu.cpu.samd21j16a.build.openocdscript=openocd_scripts/SAMD21J16A.cfg
+mattairtech_xeno.menu.cpu.samd21j16a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMD21J16A.bin
+mattairtech_xeno.menu.cpu.samd21j15a=SAMD21J15A
+mattairtech_xeno.menu.cpu.samd21j15a.upload.maximum_size=24576
+mattairtech_xeno.menu.cpu.samd21j15a.build.extra_flags=-D__SAMD21J15A__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.samd21j15a.build.ldscript=flash_32KB.ld
+mattairtech_xeno.menu.cpu.samd21j15a.build.openocdscript=openocd_scripts/SAMD21J15A.cfg
+mattairtech_xeno.menu.cpu.samd21j15a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMD21J15A.bin
+mattairtech_xeno.menu.cpu.saml21j18b=SAML21J18B
+mattairtech_xeno.menu.cpu.saml21j18b.upload.maximum_size=253952
+mattairtech_xeno.menu.cpu.saml21j18b.build.extra_flags=-D__SAML21J18B__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.saml21j18b.build.ldscript=flash_256KB.ld
+mattairtech_xeno.menu.cpu.saml21j18b.build.openocdscript=openocd_scripts/SAML21J18B.cfg
+mattairtech_xeno.menu.cpu.saml21j18b.bootloader.file=zero/binaries/sam_ba_Xeno_SAML21J18B.bin
+mattairtech_xeno.menu.cpu.saml21j17b=SAML21J17B
+mattairtech_xeno.menu.cpu.saml21j17b.upload.maximum_size=122880
+mattairtech_xeno.menu.cpu.saml21j17b.build.extra_flags=-D__SAML21J17B__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.saml21j17b.build.ldscript=flash_128KB.ld
+mattairtech_xeno.menu.cpu.saml21j17b.build.openocdscript=openocd_scripts/SAML21J17B.cfg
+mattairtech_xeno.menu.cpu.saml21j17b.bootloader.file=zero/binaries/sam_ba_Xeno_SAML21J17B.bin
+mattairtech_xeno.menu.cpu.saml21j16b=SAML21J16B
+mattairtech_xeno.menu.cpu.saml21j16b.upload.maximum_size=57344
+mattairtech_xeno.menu.cpu.saml21j16b.build.extra_flags=-D__SAML21J16B__ {build.usb_flags}
+mattairtech_xeno.menu.cpu.saml21j16b.build.ldscript=flash_64KB.ld
+mattairtech_xeno.menu.cpu.saml21j16b.build.openocdscript=openocd_scripts/SAML21J16B.cfg
+mattairtech_xeno.menu.cpu.saml21j16b.bootloader.file=zero/binaries/sam_ba_Xeno_SAML21J16B.bin
+mattairtech_xeno.menu.cpu.samc21j18a=SAMC21J18A
+mattairtech_xeno.menu.cpu.samc21j18a.upload.maximum_size=253952
+mattairtech_xeno.menu.cpu.samc21j18a.build.extra_flags=-D__SAMC21J18A__
+mattairtech_xeno.menu.cpu.samc21j18a.build.ldscript=flash_256KB.ld
+mattairtech_xeno.menu.cpu.samc21j18a.build.openocdscript=openocd_scripts/SAMC21J18A.cfg
+mattairtech_xeno.menu.cpu.samc21j18a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMC21J18A.bin
+mattairtech_xeno.menu.cpu.samc21j17a=SAMC21J17A
+mattairtech_xeno.menu.cpu.samc21j17a.upload.maximum_size=122880
+mattairtech_xeno.menu.cpu.samc21j17a.build.extra_flags=-D__SAMC21J17A__
+mattairtech_xeno.menu.cpu.samc21j17a.build.ldscript=flash_128KB.ld
+mattairtech_xeno.menu.cpu.samc21j17a.build.openocdscript=openocd_scripts/SAMC21J17A.cfg
+mattairtech_xeno.menu.cpu.samc21j17a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMC21J17A.bin
+mattairtech_xeno.menu.cpu.samc21j16a=SAMC21J16A
+mattairtech_xeno.menu.cpu.samc21j16a.upload.maximum_size=57344
+mattairtech_xeno.menu.cpu.samc21j16a.build.extra_flags=-D__SAMC21J16A__
+mattairtech_xeno.menu.cpu.samc21j16a.build.ldscript=flash_64KB.ld
+mattairtech_xeno.menu.cpu.samc21j16a.build.openocdscript=openocd_scripts/SAMC21J16A.cfg
+mattairtech_xeno.menu.cpu.samc21j16a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMC21J16A.bin
+mattairtech_xeno.menu.cpu.samc21j15a=SAMC21J15A
+mattairtech_xeno.menu.cpu.samc21j15a.upload.maximum_size=24576
+mattairtech_xeno.menu.cpu.samc21j15a.build.extra_flags=-D__SAMC21J15A__
+mattairtech_xeno.menu.cpu.samc21j15a.build.ldscript=flash_32KB.ld
+mattairtech_xeno.menu.cpu.samc21j15a.build.openocdscript=openocd_scripts/SAMC21J15A.cfg
+mattairtech_xeno.menu.cpu.samc21j15a.bootloader.file=zero/binaries/sam_ba_Xeno_SAMC21J15A.bin
+mattairtech_xeno.menu.bootloader.8kb=8KB_BOOTLOADER
+mattairtech_xeno.menu.bootloader.8kb.build.bootloader_size=__8KB_BOOTLOADER__
+mattairtech_xeno.menu.bootloader.8kb.build.ldscript_path=linker_scripts/gcc/8KB_Bootloader
+mattairtech_xeno.menu.bootloader.8kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_xeno.menu.bootloader.8kb.upload.use_1200bps_touch=true
+mattairtech_xeno.menu.bootloader.8kb.upload.wait_for_upload_port=true
+mattairtech_xeno.menu.bootloader.8kb.upload.native_usb=true
+mattairtech_xeno.menu.bootloader.16kb=16KB_BOOTLOADER
+mattairtech_xeno.menu.bootloader.16kb.build.bootloader_size=__16KB_BOOTLOADER__
+mattairtech_xeno.menu.bootloader.16kb.build.ldscript_path=linker_scripts/gcc/16KB_Bootloader
+mattairtech_xeno.menu.bootloader.16kb.upload.tool=MattairTech_Arduino:bossac
+mattairtech_xeno.menu.bootloader.16kb.upload.use_1200bps_touch=true
+mattairtech_xeno.menu.bootloader.16kb.upload.wait_for_upload_port=true
+mattairtech_xeno.menu.bootloader.16kb.upload.native_usb=true
+mattairtech_xeno.menu.bootloader.0kb=NO_BOOTLOADER
+mattairtech_xeno.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mattairtech_xeno.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mattairtech_xeno.menu.bootloader.0kb.upload.tool=arduino:openocd
+mattairtech_xeno.menu.bootloader.0kb.upload.use_1200bps_touch=false
+mattairtech_xeno.menu.bootloader.0kb.upload.wait_for_upload_port=false
+mattairtech_xeno.menu.bootloader.0kb.upload.native_usb=false
+mattairtech_xeno.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+mattairtech_xeno.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+mattairtech_xeno.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_xeno.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+mattairtech_xeno.menu.serial.one_uart_two_spi=ONE_UART_ONE_WIRE_TWO_SPI
+mattairtech_xeno.menu.serial.one_uart_two_spi.build.serialcom_uart=ONE_UART
+mattairtech_xeno.menu.serial.one_uart_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_xeno.menu.serial.one_uart_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_xeno.menu.serial.one_uart_two_wire=ONE_UART_TWO_WIRE_ONE_SPI
+mattairtech_xeno.menu.serial.one_uart_two_wire.build.serialcom_uart=ONE_UART
+mattairtech_xeno.menu.serial.one_uart_two_wire.build.serialcom_wire=TWO_WIRE
+mattairtech_xeno.menu.serial.one_uart_two_wire.build.serialcom_spi=ONE_SPI
+mattairtech_xeno.menu.serial.two_uart=TWO_UART_ONE_WIRE_ONE_SPI
+mattairtech_xeno.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+mattairtech_xeno.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_xeno.menu.serial.two_uart.build.serialcom_spi=ONE_SPI
+mattairtech_xeno.menu.serial.three_uart=THREE_UART_ONE_WIRE_ONE_SPI
+mattairtech_xeno.menu.serial.three_uart.build.serialcom_uart=THREE_UART
+mattairtech_xeno.menu.serial.three_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_xeno.menu.serial.three_uart.build.serialcom_spi=ONE_SPI
+mattairtech_xeno.menu.serial.three_uart_two_spi=THREE_UART_ONE_WIRE_TWO_SPI
+mattairtech_xeno.menu.serial.three_uart_two_spi.build.serialcom_uart=THREE_UART
+mattairtech_xeno.menu.serial.three_uart_two_spi.build.serialcom_wire=ONE_WIRE
+mattairtech_xeno.menu.serial.three_uart_two_spi.build.serialcom_spi=TWO_SPI
+mattairtech_xeno.menu.serial.three_uart_two_wire=THREE_UART_TWO_WIRE_ONE_SPI
+mattairtech_xeno.menu.serial.three_uart_two_wire.build.serialcom_uart=THREE_UART
+mattairtech_xeno.menu.serial.three_uart_two_wire.build.serialcom_wire=TWO_WIRE
+mattairtech_xeno.menu.serial.three_uart_two_wire.build.serialcom_spi=ONE_SPI
+mattairtech_xeno.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+mattairtech_xeno.menu.serial.no_uart.build.serialcom_uart=NO_UART
+mattairtech_xeno.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+mattairtech_xeno.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+mattairtech_xeno.menu.usb.cdc=CDC_ONLY
+mattairtech_xeno.menu.usb.cdc.build.usbcom=CDC_ONLY
+mattairtech_xeno.menu.usb.cdc.build.pid=0x0557
+mattairtech_xeno.menu.usb.cdc_hid=CDC_HID
+mattairtech_xeno.menu.usb.cdc_hid.build.usbcom=CDC_HID
+mattairtech_xeno.menu.usb.cdc_hid.build.pid=0x0856
+mattairtech_xeno.menu.usb.withcdc=WITH_CDC
+mattairtech_xeno.menu.usb.withcdc.build.usbcom=WITH_CDC
+mattairtech_xeno.menu.usb.withcdc.build.pid=0x0B41
+mattairtech_xeno.menu.usb.hid=HID_ONLY
+mattairtech_xeno.menu.usb.hid.build.usbcom=HID_ONLY
+mattairtech_xeno.menu.usb.hid.build.pid=0x0B40
+mattairtech_xeno.menu.usb.nocdc=WITHOUT_CDC
+mattairtech_xeno.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+mattairtech_xeno.menu.usb.nocdc.build.pid=0x0A0C
+mattairtech_xeno.menu.usb.none=USB_DISABLED
+mattairtech_xeno.menu.usb.none.build.usbcom=USB_DISABLED
+mattairtech_xeno.menu.usb.none.build.pid=0x0856
+
+
 # MattairTech MT-D21E (rev B)
 mattairtech_mt_d21e_revb.name=MattairTech MT-D21E (rev B)
 mattairtech_mt_d21e_revb.vid.0=0x16D0
diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index 1b2d0c3f9..0922d376a 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -25,7 +25,7 @@ SDCARD?=SDCARD_DISABLED
 
 # -----------------------------------------------------------------------------
 # Boards definitions:
-# MT_D21E_rev_A, MT_D21E_rev_B, MT_D11
+# Xeno, MT_D21E_rev_A, MT_D21E_rev_B, MT_D11
 # arduino_zero, arduino_mkrzero, arduino_mkr1000, arduino_mkrfox1200, genuino_mkr1000, genuino_zero, arduino_m0, arduino_m0_pro
 # Generic_x21E, Generic_x21G, Generic_x21J, Generic_D11D14AM, Generic_D11D14AS, Generic_D11C14A
 BOARD_ID?=MT_D21E_rev_B
diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAMC21J18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..1d34d96c43c5fb0a47a8dcf67d1afa9c553ddfe7
GIT binary patch
literal 3892
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAMD21J18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..6beceab18eb46e1f716c06fd54f3d18b33945b7d
GIT binary patch
literal 5192
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAML21J18B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..c81908bb08eb878dc290365f617a598f26b182d7
GIT binary patch
literal 5128
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
Q2v&Fv)xdYQ)`!3U0kC($1ONa4

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMC21J18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..456f32d176d821a52bfc5e2b39e5598f6e313ff7
GIT binary patch
literal 6828
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD21J18A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..d8f64bb02fee2b7a93123eea9435f52fe7ec5297
GIT binary patch
literal 8116
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
OemJXvZ=unKzyAeFus56l

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAML21J18B.bin
new file mode 100755
index 0000000000000000000000000000000000000000..2351bb148d40f046b8ade18c685ba82acde04166
GIT binary patch
literal 8056
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/board_definitions.h b/bootloaders/zero/board_definitions.h
index 65e984bd6..c74881b9d 100644
--- a/bootloaders/zero/board_definitions.h
+++ b/bootloaders/zero/board_definitions.h
@@ -32,6 +32,8 @@
   #include "board_definitions/board_definitions_arduino_mkrzero.h"
 #elif defined(BOARD_ID_arduino_mkrfox1200)
   #include "board_definitions/board_definitions_arduino_mkrfox1200.h"
+#elif defined(BOARD_ID_Xeno)
+  #include "board_definitions/board_definitions_Xeno.h"
 #elif defined(BOARD_ID_MT_D21E_rev_A)
   #include "board_definitions/board_definitions_MT_D21E_rev_A.h"
 #elif defined(BOARD_ID_MT_D21E_rev_B)
diff --git a/bootloaders/zero/board_definitions/board_definitions_Xeno.h b/bootloaders/zero/board_definitions/board_definitions_Xeno.h
new file mode 100644
index 000000000..310fea453
--- /dev/null
+++ b/bootloaders/zero/board_definitions/board_definitions_Xeno.h
@@ -0,0 +1,277 @@
+/*
+  Copyright (c) 2017 MattairTech LLC. All right reserved.
+  Copyright (c) 2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  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_
+
+#include <sam.h>
+
+/* The SAM-BA interface, which is used with both USB CDC and UART (TTL
+ * serial), can operate in either binary (default) or terminal mode. If
+ * TERMINAL_MODE_ENABLED is defined, additional terminal handling code
+ * (add prompt, add \n\r to EOL, number formatting, etc.) will be compiled
+ * in. To switch to terminal mode, type 'T#' (you should then see a prompt).
+ * Then, type 'V#' to show version information. See README.md for more commands.
+ * Size: ~228B. Enabled by default. Disable with 4KB bootloader.
+ */
+#define TERMINAL_MODE_ENABLED
+
+/* If SDCARD_ENABLED is defined, SD card bootloader support is compiled in.
+ * See "SD Card Bootloader" section. This define can also be set from the
+ * makefile (so it can be used with the build_all_bootloaders.sh script).
+ * Size: ~2788B. Disabled by default. Available with 4KB bootloader.
+ */
+#ifndef SDCARD_ENABLED
+//#define SDCARD_ENABLED
+#endif
+
+/* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
+ * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
+ * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
+ * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
+ * associated pins are only initialized if either pin is active.
+ */
+#define SDCARD_SPI_SERCOM_INSTANCE      5
+#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+#define SDCARD_SPI_PAD0                 PINMUX_PB30D_SERCOM5_PAD0
+#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+#define SDCARD_SPI_PAD2                 PINMUX_PB22D_SERCOM5_PAD2
+#define SDCARD_SPI_PAD3                 PINMUX_PB23D_SERCOM5_PAD3
+
+/* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
+ * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
+ */
+#define SDCARD_SPI_CS_PORT              (1)
+#define SDCARD_SPI_CS_PIN               (31)
+
+/* If SDCARD_ENABLED is defined, then SDCARD_USE_PIN1 and SDCARD_USE_PIN2 can
+ * optionally be defined. When SDCARD_USE_PIN2 is defined, SDCARD_USE_PIN1 must
+ * also be defined. See "SD Card External Pins" section for more information. PORT
+ * can be 0 (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~60B for SDCARD_USE_PIN1, ~92B for both pins. By default, only pin1 used.
+ */
+#define SDCARD_USE_PIN1
+#define SDCARD_PIN1_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN1_PORT          (0)
+#define SDCARD_PIN1_PIN           (3)
+#define SDCARD_PIN1_CONFIG        INPUT_PULLUP
+
+//#define SDCARD_USE_PIN2
+#define SDCARD_PIN2_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#define SDCARD_PIN2_PORT          (0)
+#define SDCARD_PIN2_PIN           (4)
+#define SDCARD_PIN2_CONFIG        INPUT_PULLUP
+
+/* If SDCARD_VERIFICATION_DISABLED is defined, then verification of the FLASH
+ * after programming will not occur, nor will the initial check to see if the
+ * FLASH contents are already the same as the file.
+ * Size: ~284B. By default, this is not defined, so verification will be enabled.
+ */
+//#define SDCARD_VERIFICATION_DISABLED
+
+/* If SDCARD_AUTORUN_DISABLED is defined, then the SD card bootloader will not
+ * automatically run the firmware that was just installed. Instead, the LED will
+ * blink with status code LED_STATUS_SUCCESS. This option also applies when the
+ * binary file on the SD card already matches the installed firmware. In this
+ * case, the LED will blink with status code LED_STATUS_FILE_ALREADY_MATCHES.
+ * By default, SDCARD_AUTORUN_DISABLED is defined.
+*/
+#define SDCARD_AUTORUN_DISABLED
+
+/* Two different binary files can be loaded, depending on external pin settings.
+ * By default, the filenames are UPDATE.BIN and UPDATE2.BIN, but these can be
+ * overridden by defining SDCARD_FILENAME_PRIMARY and SDCARD_FILENAME_SECONDARY.
+ * If both pins are configured, SDCARD_FILENAME_PRIMARY (UPDATE.BIN) will be
+ * loaded when PIN1 is enabled, and SDCARD_FILENAME_PRIMARY (UPDATE2.BIN) is
+ * loaded when PIN2 is enabled. If only one pin or no pin is configured, only
+ * SDCARD_FILENAME_PRIMARY is loaded.
+ */
+//#define SDCARD_FILENAME_PRIMARY        "UPDATE.BIN"
+//#define SDCARD_FILENAME_SECONDARY      "UPDATE2.BIN"
+
+/* Set SAM_BA_INTERFACE to SAM_BA_USBCDC_ONLY, SAM_BA_UART_ONLY, SAM_BA_NONE, or
+ * SAM_BA_BOTH_INTERFACES. With 4KB bootloaders, select only one interface (except
+ * when using SDCARD_ENABLED, then set SAM_BA_INTERFACE to SAM_BA_NONE). The C21
+ * lacks USB, so set to SAM_BA_UART_ONLY in this case. By default,
+ * SAM_BA_USBCDC_ONLY is set (SAM_BA_UART_ONLY with the C21).
+ */
+#if (SAMC21)
+  #define SAM_BA_INTERFACE              SAM_BA_UART_ONLY
+#else
+  #define SAM_BA_INTERFACE              SAM_BA_USBCDC_ONLY
+#endif
+
+/* If SAM_BA_INTERFACE_USE_PIN is defined, then the associated pin controls which
+ * SAM-BA interface is used (if SAM_BA_BOTH_INTERFACES is defined). If only one
+ * interface is used, then the pin acts as an enable. In both cases, the value of
+ * SAM_BA_INTERFACE_PIN_POLARITY controls the polarity, with values of
+ * PIN_POLARITY_ACTIVE_LOW or PIN_POLARITY_ACTIVE_HIGH for a single interface, and
+ * PIN_POLARITY_USBCDC_LOW or PIN_POLARITY_USBCDC_HIGH when both interfaces are
+ * enabled. PORT can be 0 (Port A) or 1 (Port B). Config can be INPUT, INPUT_PULLUP,
+ * or INPUT_PULLDOWN.The USB/UART peripheral and pins will not be setup if the
+ * device is not selected/enabled. If no interface is selected by the pin, the LED
+ * will blink with status code LED_STATUS_NO_SAM_BA_INTERFACE.
+ * Size: ~100B. By default, SAM_BA_INTERFACE_USE_PIN is not defined.
+ */
+//#define SAM_BA_INTERFACE_USE_PIN
+#if (SAM_BA_INTERFACE == SAM_BA_BOTH_INTERFACES)
+  // The pin functions as a toggle between the two interfaces
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_USBCDC_LOW
+#else
+  // The pin functions as an enable for the compiled interface
+  #define SAM_BA_INTERFACE_PIN_POLARITY      PIN_POLARITY_ACTIVE_LOW
+#endif
+#define SAM_BA_INTERFACE_PIN_PORT          (0)
+#define SAM_BA_INTERFACE_PIN_PIN           (5)
+#define SAM_BA_INTERFACE_PIN_CONFIG        INPUT_PULLUP
+
+/* If ARDUINO_EXTENDED_CAPABILITIES is defined and set to 1, 3 additional commands
+ * will become available which will speed up programming when using the Arduino
+ * IDE or the bossac tool standalone. Set to 0 with 4KB bootloaders.
+ * Size: ~904B. This is defined and set to 1 by default (except with 4KB).
+ */
+#define ARDUINO_EXTENDED_CAPABILITIES   1
+
+/* The clock source must be chosen by setting CLOCKCONFIG_CLOCK_SOURCE to
+ * CLOCKCONFIG_32768HZ_CRYSTAL, CLOCKCONFIG_HS_CRYSTAL, CLOCKCONFIG_INTERNAL,
+ * or CLOCKCONFIG_INTERNAL_USB. If CLOCKCONFIG_32768HZ_CRYSTAL or
+ * CLOCKCONFIG_HS_CRYSTAL is defined, then the PLL will be used. If
+ * CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ must
+ * also be defined with the crystal frequency in Hertz. CLOCKCONFIG_INTERNAL
+ * uses the DFLL in open-loop mode, except with the C21 which lacks a DFLL, so
+ * the internal 48MHz RC oscillator is used instead. CLOCKCONFIG_INTERNAL_USB
+ * can be defined for the D21, D11, or L21. It will also use the DFLL in
+ * open-loop mode, except when connected to a USB port with data lines (and
+ * not suspended), where it will calibrate against the USB SOF signal.
+ */
+#ifndef CLOCKCONFIG_CLOCK_SOURCE
+  #if (SAMC21)
+    #define CLOCKCONFIG_CLOCK_SOURCE    CLOCKCONFIG_INTERNAL
+  #else
+    #define CLOCKCONFIG_CLOCK_SOURCE    CLOCKCONFIG_INTERNAL_USB
+  #endif
+#endif
+
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ      16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* Master clock frequency (also Fcpu frequency) */
+#define VARIANT_MCK                       (48000000ul)
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
+/* If USB_VENDOR_STRINGS_ENABLED is defined, then STRING_MANUFACTURER and
+ * STRING_PRODUCT will be sent to the host.
+ * Size: ~228B. By default, USB_VENDOR_STRINGS_ENABLED is defined (including 4KB).
+ */
+#define USB_VENDOR_STRINGS_ENABLED
+#define STRING_MANUFACTURER "MattairTech LLC"
+#define STRING_PRODUCT "Xeno"
+
+/* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
+#define USB_VID_HIGH   0x16
+#define USB_VID_LOW    0xD0
+#define USB_PID_HIGH   0x05
+#define USB_PID_LOW    0x57
+
+/* BOOT_USART_SERCOM_INSTANCE must be a single digit representing the SERCOM number.
+ * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
+ * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
+ * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * if not used. By default, this interface is not enabled (except with the C21).
+ */
+#define BOOT_USART_SERCOM_INSTANCE        4
+#define BOOT_USART_PAD_SETTINGS           UART_RX_PAD1_TX_PAD0
+#define BOOT_USART_PAD3                   PINMUX_UNUSED
+#define BOOT_USART_PAD2                   PINMUX_UNUSED
+#define BOOT_USART_PAD1                   PINMUX_PB09D_SERCOM4_PAD1
+#define BOOT_USART_PAD0                   PINMUX_PB08D_SERCOM4_PAD0
+
+/*
+ * If BOOT_DOUBLE_TAP_ENABLED is defined the bootloader is started by quickly
+ * tapping two times on the reset button (within 1/2 second).
+ * Size: ~96B. Enabled by default.
+ */
+#define BOOT_DOUBLE_TAP_ENABLED
+
+/*
+ * If BOOT_LOAD_PIN_ENABLED is defined, the bootloader is started if the selected
+ * pin is active after reset. There is a 10ms delay before testing the pin to
+ * allow time for debouncing capacitors to charge (ie: button use). PORT can be 0
+ * (Port A) or 1 (Port B). Polarity can be PIN_POLARITY_ACTIVE_LOW or
+ * PIN_POLARITY_ACTIVE_HIGH. Config can be INPUT, INPUT_PULLUP, or INPUT_PULLDOWN.
+ * Size: ~84B. Disabled by default.
+ */
+//#define BOOT_LOAD_PIN_ENABLED
+#define BOOT_LOAD_PIN_POLARITY            PIN_POLARITY_ACTIVE_LOW
+#define BOOT_LOAD_PIN_PORT                (1)
+#define BOOT_LOAD_PIN                     (16)
+#define BOOT_LOAD_PIN_CONFIG              INPUT_PULLUP
+
+/*
+ * If BOARD_LED_FADE_ENABLED is defined, then the main LED produces a PWM fade in an
+ * "M-wave" pattern, otherwise, it simply turns on (if enabled). When the SD bootloader
+ * is running, the fading will be twice as fast as the SAM-BA interface (USB CDC or UART).
+ * Size: ~160B. Enabled by default.
+ */
+#define BOARD_LED_FADE_ENABLED
+
+/*
+ * If the LED PORT is defined, then the LED on the associated pin is enabled.
+ * Polarity can be either LED_POLARITY_HIGH_ON or LED_POLARITY_LOW_ON.
+ * By default, only BOARD_LED is enabled.
+ */
+#define BOARD_LED_PORT                    (1)
+#define BOARD_LED_PIN                     (2)
+#define BOARD_LED_POLARITY      LED_POLARITY_HIGH_ON
+
+//#define BOARD_LEDRX_PORT                  (0)
+//#define BOARD_LEDRX_PIN                   (22)
+//#define BOARD_LEDRX_POLARITY  LED_POLARITY_HIGH_ON
+
+//#define BOARD_LEDTX_PORT                  (0)
+//#define BOARD_LEDTX_PIN                   (23)
+//#define BOARD_LEDTX_POLARITY  LED_POLARITY_HIGH_ON
+
+#endif // _BOARD_DEFINITIONS_H_
diff --git a/bootloaders/zero/build_all_bootloaders.sh b/bootloaders/zero/build_all_bootloaders.sh
index 824835eaf..b72c46f24 100755
--- a/bootloaders/zero/build_all_bootloaders.sh
+++ b/bootloaders/zero/build_all_bootloaders.sh
@@ -3,17 +3,9 @@
 make clean
 
 # With SDCARD_DISABLED
-BOARD_ID=arduino_zero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
-
-BOARD_ID=genuino_zero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
-
-BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
-
-BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
-
-BOARD_ID=arduino_mkrzero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
-
-BOARD_ID=arduino_mkrfox1200 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAMD21J18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAML21J18B SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAMC21J18A SDCARD=SDCARD_DISABLED make all mostly_clean
 
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A SDCARD=SDCARD_DISABLED make all mostly_clean
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
@@ -66,22 +58,21 @@ BOARD_ID=Generic_D11D14AM MCU=SAMD11D14AM SDCARD=SDCARD_DISABLED make all mostly
 BOARD_ID=Generic_D11D14AS MCU=SAMD11D14AS SDCARD=SDCARD_DISABLED make all mostly_clean
 BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_DISABLED make all mostly_clean
 
+BOARD_ID=arduino_zero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=genuino_zero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=arduino_mkrzero MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=arduino_mkrfox1200 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
+
 BOARD_ID=arduino_m0 MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
 BOARD_ID=arduino_m0_pro MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_clean
 
 
 # With SDCARD_ENABLED
-BOARD_ID=arduino_zero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
-
-BOARD_ID=genuino_zero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
-
-BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
-
-BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
-
-BOARD_ID=arduino_mkrzero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
-
-BOARD_ID=arduino_mkrfox1200 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAMD21J18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAML21J18B SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAMC21J18A SDCARD=SDCARD_ENABLED make all mostly_clean
 
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A SDCARD=SDCARD_ENABLED make all mostly_clean
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
@@ -134,6 +125,13 @@ BOARD_ID=Generic_D11D14AM MCU=SAMD11D14AM SDCARD=SDCARD_ENABLED make all mostly_
 BOARD_ID=Generic_D11D14AS MCU=SAMD11D14AS SDCARD=SDCARD_ENABLED make all mostly_clean
 BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_ENABLED make all mostly_clean
 
+BOARD_ID=arduino_zero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=genuino_zero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=arduino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=genuino_mkr1000 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=arduino_mkrzero MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=arduino_mkrfox1200 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
+
 BOARD_ID=arduino_m0 MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
 BOARD_ID=arduino_m0_pro MCU=SAMD21G18A SDCARD=SDCARD_ENABLED make all mostly_clean
 
diff --git a/platform.txt b/platform.txt
index 5439983fb..9113b9d25 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=MattairTech SAM M0+ Boards
-version=1.6.8
+version=1.6.16
 
 # Compile variables
 # -----------------
diff --git a/variants/Xeno/README.md b/variants/Xeno/README.md
new file mode 100644
index 000000000..97c8b0a3f
--- /dev/null
+++ b/variants/Xeno/README.md
@@ -0,0 +1,293 @@
+# MattairTech Xeno (ATSAMx21Jxxx)
+
+```
+============================= MattairTech Xeno (ATSAMx21Jxxx) ===========================
+Other  COM   PWM  Analog  INT  Arduino*           Arduino*  INT  Analog  PWM   COM  Other
+=========================================================================================
+                                   -------------------
+         Board Variant:           | (no external pin) |
+ B=Basic, S=Standard, A=Advanced  |            |-- B3 | 49   I   O       VBAT(L)/SDCD(+B)
+    M=Memory device installed     |            |-- B5 | 48   I                   INT1(+B)
+                                  |            |-- B4 | 47                       3SEN(+B)
+                                  |                   |
+XBDS(B)                O        0 | B0            RST |                          BOOT(+B)
+MECS(+M)               O        1 | B1            A31 | 31            RX1  SWDIO/XBDO(+B)
+DAC0                   O   I    2 | A2            A30 | 30                     SWDCLK(+B)
+REFA(B)                O        3 | A3        A28(D/C)| 28                      SHCS(D/C)
+3SVO(S)/REFB           O        4 | A4            A27 | 27   I                       INT2
+DAC1(L)                O        5 | A5        X34 (B2)| 34       O   TC60~   LED(+B)/XBRT
+CMVO(S)                O        6 | B6        X33(B16)| 33   I               INT0(+B)/BTN
+ASEN(+A)               O        7 | B7        X32(B17)| 32   I       TC61~       MOPS(+S)
+          TX3          O   I    8 | B8            A23 | 23           TC41~
+          RX3          O   I    9 | B9            A22 | 22           TC40~
+VHDV(A)   MOSI1        O   I   10 | A10           A21 | 21           TC71~
+VBDV(+A)  SCK1         O   I   11 | A11           A20 | 20   I       TC70~
+XBCT(B) SDA1/MISO1 TCC20~  I   12 | A12           A19 | 19           TC31~        CMRI(S)
+        SCL1/SS1  TCC21~   I   13 | A13           A18 | 18           TC30~  TX1  XBDI(+B)
+HSEN(A)         TC50~      I   14 | B14           A17 | 17                  SCL   SCL(+B)
+BKFS(+A)        TC51~          15 | B15           A16 | 16                  SDA   SDA(+B)
+                                  | Vaux         3.3V |
+USB D- (D/L)+B, CAN TX (C)        | A24   _____  VccL |   ! VccL is 3.3V by default.
+USB D+ (D/L)+B, CAN RX (C)        | A25  |     | VccH |     DO NOT exceed 3.6V on VccL or
+                                  | Gnd  | USB |  Gnd |     on any IO pin with the D21 or
+       Chip Variant:               -------------------      L21 installed. 5V is allowed
+    D=D21, L=L21, C=C21                                     ONLY with the C21 installed.
+                                  1-------------------      By default, VccH is 5V.
+MISO(+B)                 43 (S43) | B30          Vcon |
+SCK(+B)                  44 (S44) | B23    SPI    B22 | 45 (S45)                 MOSI(+B)
+SHCS(D/C), SDCS(+B)  28, 46 (S46) | A28(B31)      Gnd |
+                                   -------------------
+
+                                  1-------------------
+LVL_0(+S) TX2    O   I   35 (L35) | A6             A7 | 36 (L36)  I  O    RX2   LVL_1(+S)
+LVL_2(+S) TCC12~ O  NMI  37 (L37) | A8    LEVEL    A9 | 38 (L38)     O  TCC13~  LVL_3(+S)
+                                  | VccH  SHIFT  VccH |
+                                  | Gnd           Gnd |
+MOTOR_B1(+S)    TCC04~   39 (M39) | B10           B11 | 40 (M40)   TCC05~    MOTOR_B2(+S)
+MOTOR_A1(+S)    TCC06~   41 (M41) | B12   MOTOR   B13 | 42 (M42)   TCC07~    MOTOR_A2(+S)
+                                  | Vmotor        Gnd |
+                                   -------------------
+
+* Most pins can be used for more than one function. The same port pin number printed on
+  the board is also used in Arduino (without the 'A') for all of the Arduino functions.
+
+* Different variants have different hardware installed onboard. The alternate functions
+  column shows for which board variant(s) the associated hardware is installed: B=Basic,
+  S=Standard, A=Advanced, and M=Memory device installed. The Advanced variant has all of
+  the hardware from the Standard, and the Standard has all of hardware from the Basic.
+
++ This function is enabled by default depending on the variant indicated by the letter.
+  Thus, the associated header pin cannot be used. In most cases (except most +A pins),
+  solder jumpers can be used to enable or disable the alternate onboard function.
+
+~ TC3, TC4, TC5, TC6, TC7 on the D21 are instead TC4, TC0, TC1, TC2, TC3 on the L21/C21.
+
+Silkscreen Legend:
+  Top: A circle around pin is analog function, '~' is timer, small 'I' is interrupt
+  Bottom: A box around pin means 'Other' function enabled by default depending on variant
+```
+
+
+# Pins descriptions for the MattairTech Xeno (ATSAMD21J/ATSAML21J/ATSAMC21J)
+```
+=====================================================================================================================================================
+Arduino	| Port	| Silk	| IC	| Peripheral functions			| Board functions (Silk)Variant	| Notes
+--------|-------|-------|-------|---------------------------------------|-------------------------------|--------------------------------------------
+0	| B0	| B0	| 61	| ADC					| XBee_DTR_SLEEP (XBDS)B	| 
+1	| B1	| B1	| 62	| ADC					| MEM_CS (MECS)+M		| 
+2	| A2	| A2	| 3	| ADC / DAC0 / EXTINT:2			| 				| 
+3	| A3	| A3	| 4	| ADC / VREFA				| REFA (REFA)B			| 
+4	| A4	| A4	| 13	| ADC / VREFB / AC			| 3.3Vsw_VOUT (3SVO)S		| 
+5	| A5	| A5	| 14	| ADC / DAC1 (L) / AC			| 				| 
+6	| B6	| B6	| 9	| ADC					| CURR_MON_VOUT (CMVO)A		| 
+7	| B7	| B7	| 10	| ADC					| AUX_SW_EN (ASEN)+A		| 
+8	| B8	| B8	| 11	| ADC / SERCOM4:0 / EXTINT:8		| TX3				| no I2C
+9	| B9	| B9	| 12	| ADC / SERCOM4:1 / EXTINT:9		| RX3				| no I2C
+10	| A10	| A10	| 19	| ADC / SERCOM2:2 / EXTINT:10		| VccH_DIVIDER (VHDV)A / MOSI1	| ADC on VDDIO
+11	| A11	| A11	| 20	| ADC / SERCOM2:3 / EXTINT:11		| Vbus_DIVIDER (VBDV)+A / SCK1	| ADC on VDDIO
+12	| A12	| A12	| 29	| SERCOM2:0 / TCC20 / EXTINT:12		| XBee_CTS (XBCT)B / SDA1	| also MISO1
+13	| A13	| A13	| 30	| SERCOM2:1 / TCC21 / EXTINT:13		| SCL1				| also SS1
+14	| B14	| B14	| 27	| SERCOM4:2 / TC5(TC1):0 /  EXTINT:13	| HOST_SW_EN / USB_ID (HSEN)A	| HOST_ENABLE (ID pin controls by default)
+15	| B15	| B15	| 28	| SERCOM4:3 / TC5(TC1):1		| BUCK_FSW (BKFS)+A		| 
+16	| A16	| A16	| 35	| SERCOM3:0				| I2C SDA (SDA)+B		| 4.7Kohm pullup to VccL
+17	| A17	| A17	| 36	| SERCOM3:1				| I2C SCL (SCL)+B		| 4.7Kohm pullup to VccL
+18	| A18	| A18	| 37	| SERCOM1:2 / TC3(TC4):0		| TX1 / XBee_Din (XBDI)+B	| 
+19	| A19	| A19	| 38	| TC3(TC4):1				| CURR_MON_READINT (CMRI)S	| 
+20	| A20	| A20	| 41	| SERCOM3:2 / TC7(TC3):0 / EXTINT:4	| 				| 
+21	| A21	| A21	| 42	| SERCOM3:3 / TC7(TC3):0		| 				| 
+22	| A22	| A22	| 43	| TC4(TC0):0				| 				| 
+23	| A23	| A23	| 44	| TC4(TC0):1				| 				| 
+24	| A24	| A24	| 45	| USB D- (D21/L21) / CAN TX (C21)	| USB Micro D-	(D-)+B		| 
+25	| A25	| A25	| 46	| USB D+ (D21/L21) / CAN RX (C21)	| USB Micro D+	(D+)+B		| 
+26	| ---	| ---	| --	| NOT_A_PIN				| NOT_A_PIN			| 
+27	| A27	| A27	| 51	| EXTINT:15				| INT2 (INT2)			| I2C_INT / XBee_ATTN
+28	| A28	| A28	| 53	| A28 exists only on D21 and C21	| SPI_HEADER_CS (SHCS)+B	| This is VDDCORE on the L21
+29	| ---	| ---	| --	| NOT_A_PIN				| NOT_A_PIN			| 
+30	| A30	| A30	| 57	| SWCLK					| SWCLK+B			| leave floating during reset
+31	| A31	| A31	| 58	| SWDIO / SERCOM1:3			| RX1 / XBee_Dout (XBDO)+B	| SWDIO enabled only when using external tool
+32	| B17	| X32	| 40	| EXTINT:1 / TC6(TC2):1			| MOTOR_PS (MOPS)+S		| 
+33	| B16	| X33	| 39	| EXTINT:0				| INT0 (INT0)+B			| Button / XBee_BTN
+34	| B2	| X34	| 63	| ADC / TC6(TC2):0			| LED (LED)+B / XBee_RTS (XBRT)	| RTS and ASSOC LED can be used at same time
+35	| A6	| L35	| 15	| ADC / SERCOM0:2 / EXTINT:6		| LVL_0 (L35)+S / TX2   	| 
+36	| A7	| L36	| 16	| ADC / SERCOM0:3 / EXTINT:7		| LVL_1 (L36)+S / RX2	        | 
+37	| A8	| L37	| 17	| ADC / SERCOM0:0 / TCC1:2 / EXTINT:NMI	| LVL_2 (L37)+S		        | ADC on VDDIO
+38	| A9	| L38	| 18	| ADC / SERCOM0:1 / TCC1:3		| LVL_3 (L38)+S		        | ADC on VDDIO
+39	| B10	| M39	| 23	| TCC0:4				| MOTOR_B1 (M39)+S		| Also maps to TCC0:0
+40	| B11	| M40	| 24	| TCC0:5				| MOTOR_B2 (M40)+S		| Also maps to TCC0:1
+41	| B12	| M41	| 25	| TCC0:6				| MOTOR_A1 (M41)+S		| Also maps to TCC0:2
+42	| B13	| M42	| 26	| TCC0:7				| MOTOR_A2 (M42)+S		| Also maps to TCC0:3
+43	| B30	| S43	| 59	| SERCOM5:0				| SPI MISO (S43)+B		| 
+44	| B23	| S44	| 50	| SERCOM5:3				| SPI SCK (S44)+B		| 
+45	| B22	| S45	| 49	| SERCOM5:2				| SPI MOSI (S45)+B		| 
+46	| B31	| S46	| 60	| SERCOM5:1				| SS / SD_CS (S46)+B		| or SPI_HEADER_CS (SHCS)
+47	| B4	| --	| 5	| 					| 3.3Vsw_EN (3SEN)+B		| 
+48	| B5	| --	| 6	| EXTINT:5				| INT1 (INT1)+B			| MOTOR_ERROR / IMU_INT / AUX_SW_ERROR
+49	| B3	| --	| 64	| ADC / VBAT(L) / EXTINT:3		| VBAT / SD_CardDetect (SDCD)+B	| 
+--	| RESETN| RST	| 52	| RESET					| RESET	(BOOT)+B		| Double-tap reset for bootloader entry
+=====================================================================================================================================================
+
+* Most pins can be used for more than one function. The same port pin number printed on the board is also used in Arduino (without the 'A')
+  for all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), attachInterrupt(), etc.).
+* Different variants have different hardware installed onboard. The alternate functions column shows for which board variant(s) the associated
+  hardware is installed: B=Basic, S=Standard, A=Advanced, and M=Memory device installed. The Advanced variant has all of the hardware that the
+  Standard and Basic have installed, and the Standard variant has all of the Basic hardware.
++ This function is enabled by default depending on the variant indicated by the letter. Thus, the associated header pin cannot be used.
+  In most cases (except most +A pins), solder jumpers can be used to enable or disable the alternate onboard function.
+* TC timers shown are for the D21 (the TC timers in parentheses are for the L21 and C21).
+* There is no header pin available for: A0 and A1 (32.768KHz crystal), A14 aand A15 (16MHz crystal), and B3, B4, & B5 (used by onboard hardware).
+```
+
+
+## Board Configuration Notes
+
+* **Crystals**
+  * Either the 32.768KHz crystal or the 16MHz crystal can be used. These pins do not route to headers.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
+
+* **LED (LED_BUILTIN)**
+  * Bring the pin HIGH to turn the LED on.
+  * The LED is enabled (solder jumper) by default.
+
+* **Button (BUTTON_BUILTIN)**
+  * Button is connected to the Reset pin by default, but can be connected to pin 33 (B16) via solder jumper J2.
+  * Pressing the button will bring the pin LOW. The pullup must be enabled first.
+  * A debouncing capacitor is connected, so delay reading the pin at least 10ms after turning on the pullup.
+
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * When PER_ATTR_DRIVE_STRONG is set for the pin (enabled by default), each pin can source or sink a maximum of:
+    * **D21:** 7mA high, 10mA low
+    * **L21:** 5mA high, 6mA low (8 high drive pins: 10mA high, 12mA low)
+    * **C21:** 6mA high, 10mA low (2 high drive pins (A10, A11): 12mA high, 20mA low)
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+
+* **Analog Inputs**
+  * Up to 18 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REFA. In this case, the capacitors should be enabled via solder jumper J33.
+
+* **DAC**
+  * D21/C21: One 10-bit 350Ksps analog output is available on pin 2.
+  * L21: Two 12-bit 1Msps analog outputs are available on pins 2 and 5.
+
+* **PWM**
+  * Up to 18 pins can be configured as PWM outputs.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+
+* **External Interrupts**
+  * Up to 16 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 6 SERCOM are available.
+  * Up to 3 UART instances. More in a future release.
+  * Up to 2 SPI instances.
+  * Up to 2 WIRE (I2C) instances.
+  * The WIRE pullup resistors are enabled by default.
+
+
+
+## PinDescription table format
+
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+### Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+### Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
+
+### Port
+This is the port (ie: PORTA).
+
+### Pin
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/Xeno/debug_scripts/SAMC21J15A.gdb b/variants/Xeno/debug_scripts/SAMC21J15A.gdb
new file mode 100644
index 000000000..e26cd21fb
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMC21J15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21j15" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMC21J16A.gdb b/variants/Xeno/debug_scripts/SAMC21J16A.gdb
new file mode 100644
index 000000000..6851f6b22
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMC21J16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21j16" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMC21J17A.gdb b/variants/Xeno/debug_scripts/SAMC21J17A.gdb
new file mode 100644
index 000000000..13dc5c5ed
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMC21J17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21j17" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMC21J18A.gdb b/variants/Xeno/debug_scripts/SAMC21J18A.gdb
new file mode 100644
index 000000000..81ea4cca2
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMC21J18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samc21j18" -f target/at91samcXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMD21J15A.gdb b/variants/Xeno/debug_scripts/SAMD21J15A.gdb
new file mode 100644
index 000000000..3e2147946
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMD21J15A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21j15" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMD21J16A.gdb b/variants/Xeno/debug_scripts/SAMD21J16A.gdb
new file mode 100644
index 000000000..45b07adf8
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMD21J16A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21j16" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMD21J17A.gdb b/variants/Xeno/debug_scripts/SAMD21J17A.gdb
new file mode 100644
index 000000000..bad81e6a4
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMD21J17A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21j17" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAMD21J18A.gdb b/variants/Xeno/debug_scripts/SAMD21J18A.gdb
new file mode 100644
index 000000000..12fd6a422
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAMD21J18A.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd21j18" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAML21J16B.gdb b/variants/Xeno/debug_scripts/SAML21J16B.gdb
new file mode 100644
index 000000000..063110e68
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAML21J16B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21j16" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAML21J17B.gdb b/variants/Xeno/debug_scripts/SAML21J17B.gdb
new file mode 100644
index 000000000..d400b5be5
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAML21J17B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21j17" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/debug_scripts/SAML21J18B.gdb b/variants/Xeno/debug_scripts/SAML21J18B.gdb
new file mode 100644
index 000000000..2eb86f9f3
--- /dev/null
+++ b/variants/Xeno/debug_scripts/SAML21J18B.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91saml21j18" -f target/at91samlXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..c541d8cd0
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_128KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00020000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..a0b9f951f
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_256KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00040000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
new file mode 100644
index 000000000..5d8d047a9
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_32KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00008000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..3f7223790
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/16KB_Bootloader/flash_64KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00010000-0x4000 /* First 16KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x4000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..07940acbd
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_128KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00020000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..825aee666
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_256KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00040000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
new file mode 100644
index 000000000..0d3aaf7a9
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_32KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00008000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..1c36f57e1
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/8KB_Bootloader/flash_64KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x2000, LENGTH = 0x00010000-0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x2000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_128KB.ld b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
new file mode 100644
index 000000000..941e0adee
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_128KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00020000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00004000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_256KB.ld b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
new file mode 100644
index 000000000..865514cbb
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_256KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00040000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00008000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_32KB.ld b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
new file mode 100644
index 000000000..407777c80
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_32KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00008000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_64KB.ld b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
new file mode 100644
index 000000000..6f3d4d3e8
--- /dev/null
+++ b/variants/Xeno/linker_scripts/gcc/No_Bootloader/flash_64KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00010000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00002000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __ram_end__
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM) ;
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Xeno/openocd_scripts/SAMC21J15A.cfg b/variants/Xeno/openocd_scripts/SAMC21J15A.cfg
new file mode 100644
index 000000000..1627bc1d1
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMC21J15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21j15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMC21J16A.cfg b/variants/Xeno/openocd_scripts/SAMC21J16A.cfg
new file mode 100644
index 000000000..f023da3f7
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMC21J16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21j16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMC21J17A.cfg b/variants/Xeno/openocd_scripts/SAMC21J17A.cfg
new file mode 100644
index 000000000..ab42301f6
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMC21J17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21j17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMC21J18A.cfg b/variants/Xeno/openocd_scripts/SAMC21J18A.cfg
new file mode 100644
index 000000000..6405303fe
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMC21J18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samc21j18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samcXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMD21J15A.cfg b/variants/Xeno/openocd_scripts/SAMD21J15A.cfg
new file mode 100644
index 000000000..62eaa7f81
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMD21J15A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21j15
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMD21J16A.cfg b/variants/Xeno/openocd_scripts/SAMD21J16A.cfg
new file mode 100644
index 000000000..8126a24ba
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMD21J16A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21j16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMD21J17A.cfg b/variants/Xeno/openocd_scripts/SAMD21J17A.cfg
new file mode 100644
index 000000000..4888424cf
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMD21J17A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21j17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAMD21J18A.cfg b/variants/Xeno/openocd_scripts/SAMD21J18A.cfg
new file mode 100644
index 000000000..083166bd0
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAMD21J18A.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd21j18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAML21J16B.cfg b/variants/Xeno/openocd_scripts/SAML21J16B.cfg
new file mode 100644
index 000000000..9d2a32500
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAML21J16B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21j16
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAML21J17B.cfg b/variants/Xeno/openocd_scripts/SAML21J17B.cfg
new file mode 100644
index 000000000..9791acb19
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAML21J17B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21j17
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/Xeno/openocd_scripts/SAML21J18B.cfg b/variants/Xeno/openocd_scripts/SAML21J18B.cfg
new file mode 100644
index 000000000..acf8883a6
--- /dev/null
+++ b/variants/Xeno/openocd_scripts/SAML21J18B.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91saml21j18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samlXX.cfg]
diff --git a/variants/Xeno/pins_arduino.h b/variants/Xeno/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/Xeno/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/Xeno/variant.cpp b/variants/Xeno/variant.cpp
new file mode 100644
index 000000000..70f4f9774
--- /dev/null
+++ b/variants/Xeno/variant.cpp
@@ -0,0 +1,215 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 4 June 2017 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+const PinDescription g_APinDescription[]=
+{
+	// 0..11 - Analog capable pins
+#if (SAMD || SAML)
+	{ PORTB,  0, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTB,  1, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#elif (SAMC)
+	{ PORTB,  0, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTB,  1, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#else
+  #error "variant.cpp: Unsupported chip"
+#endif
+	{ PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#if (SAMD || SAMC)
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#elif (SAML)
+	{ PORTA,  5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#endif
+#if (SAMD || SAML)
+	{ PORTB,  6, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel14, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTB,  7, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel15, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTB,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel2, EXTERNAL_INT_8, GCLK_CCL_NONE },
+	{ PORTB,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel3, EXTERNAL_INT_9, GCLK_CCL_NONE },
+	#if (SAMD)
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel18, EXTERNAL_INT_10, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel19, EXTERNAL_INT_11, GCLK_CCL_NONE },
+	#else
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel18, EXTERNAL_INT_10, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel19, EXTERNAL_INT_11, GCLK_CCL_NONE },
+	#endif
+#elif (SAMC)
+	{ PORTB,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel8, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTB,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel9, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTB,  8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel4, EXTERNAL_INT_8, GCLK_CCL_NONE },
+	{ PORTB,  9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel5, EXTERNAL_INT_9, GCLK_CCL_NONE },
+	{ PORTA, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel10, EXTERNAL_INT_10, GCLK_CCL_NONE },
+	{ PORTA, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel11, EXTERNAL_INT_11, GCLK_CCL_NONE },
+#endif
+	
+	// 12..Digital functions
+	{ PORTA, 12, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH0, No_ADC_Channel, EXTERNAL_INT_12, GCLK_CCL_NONE },
+	{ PORTA, 13, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC2_CH1, No_ADC_Channel, EXTERNAL_INT_13, GCLK_CCL_NONE },
+#if (SAMD)
+	{ PORTB, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC5_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE },
+	{ PORTB, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC5_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#elif (SAML)
+	{ PORTB, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE },
+	{ PORTB, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#elif (SAMC)
+	{ PORTB, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_14, GCLK_CCL_NONE },
+	{ PORTB, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TC1_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#endif
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+
+#if (SAMD)
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_COM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 20, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TC7_CH0, No_ADC_Channel, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TC7_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#elif (SAML || SAMC)
+	{ PORTA, 18, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC4_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 19, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC4_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 20, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC3_CH0, No_ADC_Channel, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA, 21, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC3_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC0_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC0_CH1, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#endif
+	
+	// 24..26 - USB_NEGATIVE and USB_POSITIVE, pin 26 does not exist
+	{ PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	
+	// 27..29 - Digital functions
+	{ PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_15, GCLK_CCL_NONE },
+#if (SAMD || SAMC)
+	{ PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+#elif (SAML)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+#endif
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	
+	// 30..31 Digital functions / Debug interface (SWD CLK and SWD IO)
+	{ PORTA, 30, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD IO
+	
+	// 32..34 - X pins
+#if (SAMD)
+	{ PORTB, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT|PIN_ATTR_COM), TC6_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // X32
+	{ PORTB, 16, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // X33
+	{ PORTB, 2, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC6_CH0, ADC_Channel10, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // X34, LED
+#elif (SAML || SAMC)
+	{ PORTB, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_1, GCLK_CCL_NONE }, // X32
+	{ PORTB, 16, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE }, // X33
+	#if (SAML)
+	{ PORTB, 2, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC2_CH0, ADC_Channel10, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // X34, LED
+	#elif (SAMC)
+	{ PORTB, 2, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TC2_CH0, ADC_Channel2, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // X34, LED
+	#endif
+#endif
+	
+	// 35..38 - Level Shifter Header
+	{ PORTA, 6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_6, GCLK_CCL_NONE }, // L35
+#if (SAMD)
+	{ PORTA, 7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_7, GCLK_CCL_NONE }, // L36
+	{ PORTA, 8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT|PIN_ATTR_COM), TCC1_CH2, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // L37
+	{ PORTA, 9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_COM), TCC1_CH3, ADC_Channel17, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // L38
+#elif (SAML)
+	{ PORTA, 7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_7, GCLK_CCL_NONE }, // L36
+	{ PORTA, 8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC1_CH2, ADC_Channel16, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // L37
+	{ PORTA, 9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC1_CH3, ADC_Channel17, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // L38
+#elif (SAMC)
+	{ PORTA, 7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel7, EXTERNAL_INT_7, GCLK_CCL_NONE }, // L36
+	{ PORTA, 8, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC1_CH2, ADC_Channel10, EXTERNAL_INT_NMI, GCLK_CCL_NONE }, // L37
+	{ PORTA, 9, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_STD|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC1_CH3, ADC_Channel11, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // L38
+#endif
+	
+	// 39..42 - Motor Controller Header
+	{ PORTB, 10, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH4, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // M39
+	{ PORTB, 11, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH5, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // M40
+	{ PORTB, 12, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH6, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // M41
+	{ PORTB, 13, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH7, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // M42
+	
+	// 43..46 - SPI Header
+	{ PORTB, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // S43
+	{ PORTB, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // S44
+	{ PORTB, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // S45
+	{ PORTB, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // S46
+	
+	// 47..49 - No header pins
+	{ PORTB, 4, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // 47
+	{ PORTB, 5, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_5, GCLK_CCL_NONE }, // 48
+#if (SAMD || SAML)
+	{ PORTB, 3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel11, EXTERNAL_INT_3, GCLK_CCL_NONE }, // 49
+#elif (SAMC)
+	{ PORTB, 3, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_ADC_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel3, EXTERNAL_INT_3, GCLK_CCL_NONE }, // 49
+#endif
+} ;
+
+#if (SAMD)
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC3, TC4, TC5, TC6, TC7 } ;
+#elif (SAMC || SAML)
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2, TC0, TC1, TC2, TC3, TC4 } ;
+#endif
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+SERCOM sercom3( SERCOM3 ) ;
+SERCOM sercom4( SERCOM4 ) ;
+SERCOM sercom5( SERCOM5 ) ;
+
+#if defined(ONE_UART) || defined(TWO_UART) || defined(THREE_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
+
+#if defined(TWO_UART) || defined(THREE_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial2.IrqHandler();
+}
+#endif
+
+#if defined(THREE_UART)
+Uart Serial3( SERCOM_INSTANCE_SERIAL3, PIN_SERIAL3_RX, PIN_SERIAL3_TX, PAD_SERIAL3_RX, PAD_SERIAL3_TX ) ;
+
+void SERCOM4_Handler()
+{
+  Serial3.IrqHandler();
+}
+#endif
diff --git a/variants/Xeno/variant.h b/variants/Xeno/variant.h
new file mode 100644
index 000000000..afed681b9
--- /dev/null
+++ b/variants/Xeno/variant.h
@@ -0,0 +1,412 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 4 June 2017 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+#ifndef _VARIANT_MATTAIRTECH_XENO_
+#define _VARIANT_MATTAIRTECH_XENO_
+
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
+/*----------------------------------------------------------------------------
+ *        Clock Configuration
+ *----------------------------------------------------------------------------*/
+
+/** Master clock frequency (also Fcpu frequency) */
+#define VARIANT_MCK             (48000000ul)
+
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ      16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+#include "sam.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define NUM_PIN_DESCRIPTION_ENTRIES     (50u)
+
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
+#define NUM_ANALOG_INPUTS    (18u)
+
+#if (SAMD || SAMC)
+#define NUM_ANALOG_OUTPUTS   (1u)
+#elif (SAML)
+#define NUM_ANALOG_OUTPUTS   (2u)
+#else
+#error "variant.h: Unsupported chip"
+#endif
+
+#define analogInputToDigitalPin(p)  (p)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ * The Xeno onboard LED is on pin 34.
+ * The RX and TX LEDs are not present.
+ * You may optionally add them to any free pins.
+ */
+#define PIN_LED_13           (34u)
+#define PIN_LED_RXL          (22u)
+#define PIN_LED_TXL          (23u)
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+/* Buttons
+ * Note that Button is connected to Reset by default.
+ * A solder jumper can be changed to route Button B to pin 33 instead.
+ * There is a debouncing capacitor connected, so delay reading the pin for
+ * at least 45ms after turning on the pullup to allow the capacitor to charge.
+ */
+#define BUTTON               (33u)
+#define BUTTON_BUILTIN       BUTTON
+
+
+/*
+ * Analog pins
+ */
+#define PIN_A0               (0ul)
+#define PIN_A1               (1ul)
+#define PIN_A2               (2ul)
+#define PIN_A3               (3ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A6               (6ul)
+#define PIN_A7               (7ul)
+#define PIN_A8               (8ul)
+#define PIN_A9               (9ul)
+#define PIN_A10              (10ul)
+#define PIN_A11              (11ul)
+#define PIN_A34              (34ul)
+#define PIN_A35              (35ul)
+#define PIN_A36              (36ul)
+#define PIN_A37              (37ul)
+#define PIN_A38              (38ul)
+#define PIN_A49              (49ul)
+#define PIN_DAC0             (2ul)
+#if (SAML)
+#define PIN_DAC1             (5ul)
+#endif
+
+static const uint8_t A0   = PIN_A0;
+static const uint8_t A1   = PIN_A1;
+static const uint8_t A2   = PIN_A2;
+static const uint8_t A3   = PIN_A3;
+static const uint8_t A4   = PIN_A4;
+static const uint8_t A5   = PIN_A5;
+static const uint8_t A6   = PIN_A6;
+static const uint8_t A7   = PIN_A7;
+static const uint8_t A8   = PIN_A8;
+static const uint8_t A9   = PIN_A9;
+static const uint8_t A10  = PIN_A10;
+static const uint8_t A11  = PIN_A11;
+static const uint8_t A34  = PIN_A34;
+static const uint8_t A35  = PIN_A35;
+static const uint8_t A36  = PIN_A36;
+static const uint8_t A37  = PIN_A37;
+static const uint8_t A38  = PIN_A38;
+static const uint8_t A49  = PIN_A49;
+static const uint8_t DAC0 = PIN_DAC0;
+#if (SAML)
+static const uint8_t DAC1 = PIN_DAC1;
+#endif
+
+#define ADC_RESOLUTION		12
+
+// #define REMAP_ANALOG_PIN_ID(pin)	if ( pin < A0 ) pin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#define REFA_PIN    (3ul)
+#define REFB_PIN    (4ul)
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#if (SAMD || SAMC)
+#define PIN_ATN              (28ul)
+#elif (SAML)
+#define PIN_ATN              (21ul)
+#endif
+static const uint8_t ATN = PIN_ATN;
+
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#define PIN_SERIAL1_RX       (31ul)
+#define PIN_SERIAL1_TX       (18ul)
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL1       &sercom1
+
+// Serial2
+#define PIN_SERIAL2_RX       (36ul)
+#define PIN_SERIAL2_TX       (35ul)
+#define PAD_SERIAL2_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_3)
+
+#define SERCOM_INSTANCE_SERIAL2       &sercom0
+
+// Serial3
+#define PIN_SERIAL3_RX       (9ul)
+#define PIN_SERIAL3_TX       (8ul)
+#define PAD_SERIAL3_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL3_RX       (SERCOM_RX_PAD_1)
+
+#define SERCOM_INSTANCE_SERIAL3       &sercom4
+
+
+/*
+ * SPI Interfaces
+ */
+#if defined(TWO_SPI)
+#define SPI_INTERFACES_COUNT 2
+#elif defined(THREE_SPI)
+#define SPI_INTERFACES_COUNT 3
+#else
+#define SPI_INTERFACES_COUNT 1
+#endif
+
+#define PIN_SPI_MISO         (43u)
+#define PIN_SPI_MOSI         (45u)
+#define PIN_SPI_SCK          (44u)
+#define PIN_SPI_SS           (46u)
+#define PERIPH_SPI           sercom5
+#define PAD_SPI_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI_RX           SERCOM_RX_PAD_0
+
+static const uint8_t SS   = PIN_SPI_SS ;        // The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+#define PIN_SPI1_MISO         (12u)
+#define PIN_SPI1_MOSI         (10u)
+#define PIN_SPI1_SCK          (11u)
+#define PIN_SPI1_SS           (13u)
+#define PERIPH_SPI1           sercom2
+#define PAD_SPI1_TX           SPI_PAD_2_SCK_3
+#define PAD_SPI1_RX           SERCOM_RX_PAD_0
+
+static const uint8_t SS1   = PIN_SPI1_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI1 = PIN_SPI1_MOSI ;
+static const uint8_t MISO1 = PIN_SPI1_MISO ;
+static const uint8_t SCK1  = PIN_SPI1_SCK ;
+
+
+/*
+ * Wire Interfaces
+ */
+#if defined(TWO_WIRE)
+#define WIRE_INTERFACES_COUNT 2
+#elif defined(THREE_WIRE)
+#define WIRE_INTERFACES_COUNT 3
+#else
+#define WIRE_INTERFACES_COUNT 1
+#endif
+
+#define PIN_WIRE_SDA         (16u)
+#define PIN_WIRE_SCL         (17u)
+#define PERIPH_WIRE          sercom3
+#define WIRE_IT_HANDLER      SERCOM3_Handler
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+#define PIN_WIRE1_SDA         (12u)
+#define PIN_WIRE1_SCL         (13u)
+#define PERIPH_WIRE1          sercom2
+#define WIRE1_IT_HANDLER      SERCOM2_Handler
+
+static const uint8_t SDA1 = PIN_WIRE1_SDA;
+static const uint8_t SCL1 = PIN_WIRE1_SCL;
+
+
+/*
+ * USB
+ */
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+#define PIN_USB_HOST_ENABLE             (14ul)
+#define PIN_USB_HOST_ENABLE_VALUE	0
+
+/*
+ * I2S Interfaces
+ */
+#define I2S_INTERFACES_COUNT 1
+
+#define I2S_DEVICE          0
+#define I2S_CLOCK_GENERATOR 3
+#define PIN_I2S_SD          (19u)
+#define PIN_I2S_SCK         (10u)
+#define PIN_I2S_FS          (11u)
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+extern SERCOM sercom3;
+extern SERCOM sercom4;
+extern SERCOM sercom5;
+
+extern Uart Serial1;
+extern Uart Serial2;
+extern Uart Serial3;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#if (!SAMC)
+  #define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#endif
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#if (SAMC)
+  #define SERIAL_PORT_MONITOR         Serial2
+#else
+  #define SERIAL_PORT_MONITOR         Serial1
+#endif
+
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#if (SAMC)
+  #define SERIAL_PORT_HARDWARE        Serial2
+  #define SERIAL_PORT_HARDWARE_OPEN   Serial2
+#else
+  #define SERIAL_PORT_HARDWARE        Serial1
+  #define SERIAL_PORT_HARDWARE_OPEN   Serial1
+#endif
+
+// The Xeno does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+#if (SAMC)
+  #define Serial                      Serial1
+#else
+  // When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+  #if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
+    #define Serial                      SerialUSB
+  #else
+    #define Serial                      Serial1
+  #endif
+#endif
+
+#endif /* _VARIANT_MATTAIRTECH_XENO_ */

From b180f33c30db65e9573884e6ce3b23230950226d Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 6 Oct 2017 23:16:35 +0000
Subject: [PATCH 105/124] fixed wrong location for call to mapResolution(), doc
 updates

---
 README.md                     | 8 ++++----
 bootloaders/zero/README.md    | 8 +++++---
 cores/arduino/wiring_analog.c | 4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index c77de64f2..6fdb5f80a 100644
--- a/README.md
+++ b/README.md
@@ -527,10 +527,10 @@ Vista, 7, 8, and 10. Note that the Windows 10 generic CDC drivers work as well.
 *OS X support was added in version 1.6.7-beta-b0.*
 
 0. No driver installation is needed.
-5. Plug in the board. You may get a dialog box asking if you wish to open the “Network Preferences�:
+1. Plug in the board. You may get a dialog box asking if you wish to open the “Network Preferences�:
    * Click the "Network Preferences..." button, then click "Apply".
    * The board will show up as “Not Configured�, but it will work fine.
-5. Continue with SAM M0+ Core Installation below.
+2. Continue with SAM M0+ Core Installation below.
 
 
 ### SAM M0+ Core Installation
@@ -539,14 +539,14 @@ Vista, 7, 8, and 10. Note that the Windows 10 generic CDC drivers work as well.
 
 * To update from a previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.
 
-1. The MattairTech SAM M0+ Core requires Arduino 1.6.7 or above (including 1.8.x).
+1. The MattairTech SAM M0+ Core requires Arduino IDE 1.6.7 or above (including 1.8.x).
 2. In the Arduino IDE, click File->Preferences.
 3. Click the button next to Additional Boards Manager URLs.
 4. Add https://www.mattairtech.com/software/arduino/package_MattairTech_index.json.
 5. Save preferences, then open the Boards Manager.
 6. Install the Arduino SAMD Boards package. Use version 1.6.2 or higher.
 7. Install the MattairTech SAM M0+ Boards package.
-8. Close Boards Manager, then click Tools->Board->MattairTech MT-D21E (or MT-D11).
+8. Close Boards Manager, then click Tools->Board->(choose board).
 9. Select the MCU with the now visible Tools->Microcontroller menu (if present).
 10. If you do not already have the bootloader or blink sketch installed, see SAM-BA USB CDC Bootloader below.
 11. Plug in the board. The blink sketch should be running.
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index c5e272a62..51a0e3a8c 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -254,13 +254,15 @@ This driver is the same as the one used by the MattairTech SAM M0+ Core.
 4. Continue with driver installation above.
 
 
-### Bossac Utility Installation
+### Bossac Utility
 
-This version of the bootloader requires bossac (1.7.0-mattairtech-1) from the package "MattairTech SAM M0+ Boards".
-If using the Arduino IDE to upload firmware, then download the core.
+This version of the bootloader requires bossac (1.7.0-mattairtech-1) or above.
 
 **See the MattairTech SAM M0+ Core [README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/README.md) "Driver Installation" for installation instructions.).**
 
+#### Bossac Utility Installation
+
+If using the Arduino IDE to upload firmware, then this will be installed automatically when intalling the core.
 If using Bossac standalone, download bossac directly at:
 
 * https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 93e32e87e..58c90f97e 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -354,6 +354,8 @@ void analogWrite(uint32_t pin, uint32_t value)
       timerIndex = (uint8_t)(((uint32_t)TCCx - (uint32_t)TCC0) >> 10);
     }
 
+    value = mapResolution(value, _writeResolution, 16);
+
     if (!tcEnabled[timerIndex]) {
       tcEnabled[timerIndex] = true;
 
@@ -365,8 +367,6 @@ void analogWrite(uint32_t pin, uint32_t value)
       while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
 #endif
 
-      value = mapResolution(value, _writeResolution, 16);
-
       // Set PORT
       if ( TCx )
       {

From 76de5a4a8a602c54c5b23e3ac46353327e794438 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 24 Nov 2017 10:25:09 +0000
Subject: [PATCH 106/124] Added SAM D51 (m4f) support to bootloader

---
 bootloaders/zero/Makefile                     |  25 +-
 bootloaders/zero/README.md                    |  50 ++-
 bootloaders/zero/SDCard/mmcbbp.c              |  22 +-
 bootloaders/zero/SDCard/sdBootloader.c        |   2 +-
 bootloaders/zero/binaries/README.md           |   2 +-
 .../sam_ba_Generic_D11C14A_SAMD11C14A.bin     | Bin 3872 -> 3904 bytes
 .../sam_ba_Generic_D11D14AM_SAMD11D14AM.bin   | Bin 3872 -> 3904 bytes
 .../sam_ba_Generic_D11D14AS_SAMD11D14AS.bin   | Bin 3872 -> 3904 bytes
 .../sam_ba_Generic_x21E_SAMC21E15A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMC21E16A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMC21E17A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMC21E18A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21E_SAMD21E15A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAMD21E16A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAMD21E17A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAMD21E18A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21E_SAML21E15B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21E_SAML21E16B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21E_SAML21E17B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21E_SAML21E18B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21G_SAMC21G15A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMC21G16A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMC21G17A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMC21G18A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21G_SAMD21G15A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAMD21G16A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAMD21G17A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAMD21G18A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21G_SAML21G16B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21G_SAML21G17B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21G_SAML21G18B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21J_SAMC21J15A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMC21J16A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMC21J17A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMC21J18A.bin        | Bin 3720 -> 3720 bytes
 .../sam_ba_Generic_x21J_SAMD21J15A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAMD21J16A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAMD21J17A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAMD21J18A.bin        | Bin 5028 -> 5028 bytes
 .../sam_ba_Generic_x21J_SAML21J16B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21J_SAML21J17B.bin        | Bin 4964 -> 4964 bytes
 .../sam_ba_Generic_x21J_SAML21J18B.bin        | Bin 4964 -> 4964 bytes
 .../binaries/sam_ba_MT_D11_SAMD11D14AM.bin    | Bin 4036 -> 4068 bytes
 .../sam_ba_MT_D21E_rev_A_SAMD21E17A.bin       | Bin 5204 -> 5204 bytes
 .../sam_ba_MT_D21E_rev_A_SAMD21E18A.bin       | Bin 5204 -> 5204 bytes
 .../sam_ba_MT_D21E_rev_B_SAMC21E18A.bin       | Bin 3888 -> 3888 bytes
 .../sam_ba_MT_D21E_rev_B_SAMD21E17A.bin       | Bin 5196 -> 5200 bytes
 .../sam_ba_MT_D21E_rev_B_SAMD21E18A.bin       | Bin 5196 -> 5200 bytes
 .../sam_ba_MT_D21E_rev_B_SAML21E18B.bin       | Bin 5132 -> 5136 bytes
 .../zero/binaries/sam_ba_Xeno_SAMC21J18A.bin  | Bin 3892 -> 3892 bytes
 .../zero/binaries/sam_ba_Xeno_SAMD21J18A.bin  | Bin 5192 -> 5196 bytes
 .../zero/binaries/sam_ba_Xeno_SAMD51J20A.bin  | Bin 0 -> 5216 bytes
 .../zero/binaries/sam_ba_Xeno_SAML21J18B.bin  | Bin 5128 -> 5132 bytes
 .../binaries/sam_ba_arduino_m0_SAMD21G18A.bin | Bin 5196 -> 5196 bytes
 .../sam_ba_arduino_m0_pro_SAMD21G18A.bin      | Bin 6304 -> 6304 bytes
 .../sam_ba_arduino_mkr1000_SAMD21G18A.bin     | Bin 6192 -> 6288 bytes
 .../sam_ba_arduino_mkrfox1200_SAMD21G18A.bin  | Bin 6292 -> 6292 bytes
 .../sam_ba_arduino_mkrzero_SAMD21G18A.bin     | Bin 6296 -> 6296 bytes
 .../sam_ba_arduino_zero_SAMD21G18A.bin        | Bin 6288 -> 6288 bytes
 .../sam_ba_genuino_mkr1000_SAMD21G18A.bin     | Bin 6288 -> 6288 bytes
 .../sam_ba_genuino_zero_SAMD21G18A.bin        | Bin 6288 -> 6288 bytes
 ...m_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin | Bin 4044 -> 4076 bytes
 ...ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin | Bin 4044 -> 4076 bytes
 ...ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin | Bin 4044 -> 4076 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E15B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E16B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E17B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21E_SAML21E18B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21G_SAML21G16B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21G_SAML21G17B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21G_SAML21G18B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin | Bin 6820 -> 6820 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin | Bin 8116 -> 8116 bytes
 .../sam_ba_sdcard_Generic_x21J_SAML21J16B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21J_SAML21J17B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_Generic_x21J_SAML21J18B.bin | Bin 8056 -> 8056 bytes
 .../sam_ba_sdcard_MT_D11_SAMD11D14AM.bin      | Bin 4044 -> 4076 bytes
 ...sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin | Bin 8128 -> 8128 bytes
 ...sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin | Bin 8128 -> 8128 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin | Bin 6820 -> 6820 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin | Bin 8116 -> 8120 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin | Bin 8116 -> 8120 bytes
 ...sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin | Bin 8056 -> 8060 bytes
 .../sam_ba_sdcard_Xeno_SAMC21J18A.bin         | Bin 6828 -> 6828 bytes
 .../sam_ba_sdcard_Xeno_SAMD21J18A.bin         | Bin 8116 -> 8120 bytes
 .../sam_ba_sdcard_Xeno_SAMD51J20A.bin         | Bin 0 -> 8000 bytes
 .../sam_ba_sdcard_Xeno_SAML21J18B.bin         | Bin 8056 -> 8060 bytes
 .../sam_ba_sdcard_arduino_m0_SAMD21G18A.bin   | Bin 8120 -> 8120 bytes
 ...am_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin | Bin 8124 -> 8124 bytes
 ...m_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin | Bin 8048 -> 8108 bytes
 ...a_sdcard_arduino_mkrfox1200_SAMD21G18A.bin | Bin 8112 -> 8112 bytes
 ...m_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin | Bin 8112 -> 8112 bytes
 .../sam_ba_sdcard_arduino_zero_SAMD21G18A.bin | Bin 8108 -> 8108 bytes
 ...m_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin | Bin 8108 -> 8108 bytes
 .../sam_ba_sdcard_genuino_zero_SAMD21G18A.bin | Bin 8108 -> 8108 bytes
 bootloaders/zero/board_definitions.h          |  63 ++-
 .../board_definitions_MT_D21E_rev_B.h         |   8 +-
 .../board_definitions_Xeno.h                  |  45 +-
 bootloaders/zero/board_driver_usb.c           |  34 +-
 bootloaders/zero/board_init.c                 | 407 ++++++++++++++----
 bootloaders/zero/board_startup.c              |  60 ++-
 bootloaders/zero/build_all_bootloaders.sh     |   2 +
 .../linker_scripts/bootloader_sam_m4f_1MB.ld  | 225 ++++++++++
 .../bootloader_sam_m4f_256KB.ld               | 225 ++++++++++
 .../bootloader_sam_m4f_512KB.ld               | 225 ++++++++++
 bootloaders/zero/main.c                       |   4 +-
 bootloaders/zero/sam_ba_monitor.c             |   2 +-
 bootloaders/zero/sam_ba_serial.c              |  24 +-
 bootloaders/zero/util.c                       |  55 ++-
 131 files changed, 1325 insertions(+), 155 deletions(-)
 create mode 100755 bootloaders/zero/binaries/sam_ba_Xeno_SAMD51J20A.bin
 create mode 100755 bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD51J20A.bin
 create mode 100644 bootloaders/zero/linker_scripts/bootloader_sam_m4f_1MB.ld
 create mode 100644 bootloaders/zero/linker_scripts/bootloader_sam_m4f_256KB.ld
 create mode 100644 bootloaders/zero/linker_scripts/bootloader_sam_m4f_512KB.ld

diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index 0922d376a..2aebe77dd 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -42,10 +42,14 @@ BOARD_ID?=MT_D21E_rev_B
 # SAMC21G: SAMC21G18A, SAMC21G17A, SAMC21G16A, SAMC21G15A
 # SAMC21E: SAMC21E18A, SAMC21E17A, SAMC21E16A, SAMC21E15A
 # SAMD11:  SAMD11D14AM, SAMD11C14A, SAMD11D14AS
+# SAMD51G: SAMD51G18A, SAMD51G19A
+# SAMD51J: SAMD51J18A, SAMD51J19A, SAMD51J20A
+# SAMD51N: SAMD51N19A, SAMD51N20A
+# SAMD51P: SAMD51P19A, SAMD51P20A
 MCU?=SAMD21E18A
 
-# Note that the makefile can be invoked with values that override the above two settings.
-# For example: BOARD_ID=Generic_D11C14A MCU=SAMD11C14A make
+# Note that the makefile can be invoked with values that override the above settings.
+# For example: BOARD_ID=Generic_D11C14A MCU=SAMD11C14A SDCARD=SDCARD_DISABLED make
 
 # End Config ###############################
 
@@ -55,6 +59,12 @@ else
 NAME=sam_ba_$(BOARD_ID)_$(MCU)
 endif
 
+ifeq ($(findstring 20,$(MCU)),20)
+FLASHSIZE=1MB
+endif
+ifeq ($(findstring 19,$(MCU)),19)
+FLASHSIZE=512KB
+endif
 ifeq ($(findstring 18,$(MCU)),18)
 FLASHSIZE=256KB
 endif
@@ -71,7 +81,13 @@ ifeq ($(findstring 14,$(MCU)),14)
 FLASHSIZE=16KB
 endif
 
+ifeq ($(findstring D51,$(MCU)),D51)
+LINKER_SCRIPT?=bootloader_sam_m4f_$(FLASHSIZE).ld
+MCPU=cortex-m4
+else
 LINKER_SCRIPT?=bootloader_sam_m0p_$(FLASHSIZE).ld
+MCPU=cortex-m0plus
+endif
 
 # CORE_VENDOR?=arduino
 CORE_VENDOR?=MattairTech_Arduino
@@ -125,7 +141,8 @@ SIZE=$(ARM_GCC_PATH)size
 # Compiler options
 # eliminate PARANOIA define to save a tiny amount of code (~40B)
 CFLAGS_EXTRA=-D$(SDCARD) -D__$(MCU)__ -DBOARD_ID_$(BOARD_ID) -DPARANOIA
-CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_DIR)/%.lst)
+CFLAGS=-mthumb -mcpu=$(MCPU) -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_DIR)/%.lst)
+
 ifdef DEBUG
   CFLAGS+=-g3 -O1 -DDEBUG=1
 else
@@ -141,7 +158,7 @@ INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE
 
 # -----------------------------------------------------------------------------
 # Linker options
-LDFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all
+LDFLAGS=-mthumb -mcpu=$(MCPU) -Wall -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--unresolved-symbols=report-all
 LDFLAGS+=-Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols --specs=nano.specs --specs=nosys.specs
 
 # -----------------------------------------------------------------------------
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index 51a0e3a8c..9ad074249 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -4,8 +4,8 @@ This bootloader is based on the Arduino Zero bootloader which is a part of the A
 provides a USB-CDC and/or TTL serial communications interface to a host running the bossac command
 line firmware programming utility (or the Arduino IDE) running on Windows, Linux, or OS X. Optionally,
 SD Card firmware loading is supported, using SDSC or SDHC cards with a FAT16 or FAT32 filesystem.
-This version adds support for the D11, L21, and C21 microcontrollers. It also adds support for four
-different clock sources (two external crystals and two internal oscillator options). There are
+This version adds support for the D11, L21, C21, and D51 microcontrollers. It also adds support for
+four different clock sources (two external crystals and two internal oscillator options). There are
 additional board definitions added, and binaries for most board/chip combinations are pre-built.
 
 ## Features
@@ -15,7 +15,7 @@ additional board definitions added, and binaries for most board/chip combination
 * Four different clock sources (two external crystals and two internal oscillator options)
 * Arduino IDE auto-reset and double-tap reset button support
 * Arduino extended commands for faster firmware loading
-* Supports the D21, L21, C21, and D11 SAM M0+ chips
+* Supports the D21, L21, C21, and D11 SAM M0+ chips. Also supports D51 M4F chips.
 * Bossac command line utility for Windows, Linux, and OS X
 
 
@@ -150,6 +150,20 @@ For more information on SAM-BA, see (especially pages 10 and 11):
 http://www.atmel.com/Images/Atmel-42438-SAM-BA-Overview-and-Customization-Process_ApplicationNote_AT09423.pdf
 
 
+## D51 Clock Configuration
+
+The D51 can run at either 120MHz or 48MHz. When running at 120MHz,
+two or three additional clock generators are used. Two of these
+generate 48MHz and 96MHz. The USB peripheral can only run at 48MHz,
+and many peripherals (ie: SERCOM) have a limit of 100MHz, so these
+generators are used for them. Because 120MHz cannot be divided down
+to 48MHz or 96MHz using the GCLK dividers, the second PLL is used.
+Thus, with all clock source configurations, when the cpu runs at
+120MHz both PLLs are enabled. When the cpu runs at 48MHz, only the
+first PLL is enabled and only when using an external crystal. Use
+48MHz to reduce power consumption.
+
+
 ## Bootloader Binaries
 
 The bootloaders/zero/binaries directory contains the SAM-BA m0+
@@ -256,7 +270,7 @@ This driver is the same as the one used by the MattairTech SAM M0+ Core.
 
 ### Bossac Utility
 
-This version of the bootloader requires bossac (1.7.0-mattairtech-1) or above.
+This version of the bootloader requires bossac (1.7.0-mattairtech-2) or above.
 
 **See the MattairTech SAM M0+ Core [README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/README.md) "Driver Installation" for installation instructions.).**
 
@@ -265,22 +279,22 @@ This version of the bootloader requires bossac (1.7.0-mattairtech-1) or above.
 If using the Arduino IDE to upload firmware, then this will be installed automatically when intalling the core.
 If using Bossac standalone, download bossac directly at:
 
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz (Windows 32 bit and 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz (Linux 32 bit)
-* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz (OS X 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-mingw32.tar.gz (Windows 32 bit and 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-x86_64-linux-gnu.tar.gz (Linux 64 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-i686-linux-gnu.tar.gz (Linux 32 bit)
+* https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-x86_64-apple-darwin.tar.gz (OS X 64 bit)
 
 Linux 64 bit users can also download Bossa (GUI) and bossash (shell) from:
 
-* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz (Linux 64 bit)
+* https://www.mattairtech.com/software/arduino/Bossa-1.7.0-mattairtech-2-x86_64-linux-gnu.tar.gz (Linux 64 bit)
 
 Note that the SAM-BA tools from Atmel will not work, and the version of bossac from the Arduino
-SAMD Core currently does not support the L21, C21, or D11 (but it does support the D21).
+SAMD Core currently only supports the D21.
 
 
 #### Using Bossac Standalone
 
-TODO: Update https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip with new chips (L21 and C21).
+TODO: Update https://www.mattairtech.com/software/SAM-BA-bootloader-test-firmware.zip with new chips (L21, C21 and D51).
 
 When using Bossac standalone, you will need to ensure that your application starts at 0x00002000 for 8 KB bootloaders,
 and 0x00001000 for 4 KB bootloaders. This is because the bootloader resides at 0x00000000. This can be accomplished
@@ -318,10 +332,10 @@ Arduino IDE Boards Manager. If you do not wish to install the MattairTech SAM M0
 arm-none-eabi-gcc, CMSIS, and openocd packages are included with the stock Arduino SAMD. However, you
 will still need to download bossac (see above) and CMSIS-Atmel from MattairTech:
 
-* https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz
+* https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz
 
 Then install to ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel (or similar based on your OS)
-and rename the folder in CMSIS-Atmel from CMSIS to 1.0.0-mattairtech-1.
+and rename the folder in CMSIS-Atmel from CMSIS to 1.0.0-mattairtech-2.
 
 This project uses a Makefile, which is in the root zero directory. However, you will need a make program:
 
@@ -373,6 +387,10 @@ allow the build_all_bootloaders.sh script to select SD Card support.
 * SAMC21G: SAMC21G18A, SAMC21G17A, SAMC21G16A, SAMC21G15A
 * SAMC21E: SAMC21E18A, SAMC21E17A, SAMC21E16A, SAMC21E15A
 * SAMD11:  SAMD11D14AM, SAMD11C14A, SAMD11D14AS
+* SAMD51G: SAMD51G18A, SAMD51G19A
+* SAMD51J: SAMD51J18A, SAMD51J19A, SAMD51J20A
+* SAMD51N: SAMD51N19A, SAMD51N20A
+* SAMD51P: SAMD51P19A, SAMD51P20A
 
 
 ### Board Configuration
@@ -538,7 +556,7 @@ CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ must
 also be defined with the crystal frequency in Hertz. CLOCKCONFIG_INTERNAL
 uses the DFLL in open-loop mode, except with the C21 which lacks a DFLL, so
 the internal 48MHz RC oscillator is used instead. CLOCKCONFIG_INTERNAL_USB
-can be defined for the D21, D11, or L21. It will also use the DFLL in
+can be defined for the D21, D11, L21, or D51. It will also use the DFLL in
 open-loop mode, except when connected to a USB port with data lines (and
 not suspended), where it will calibrate against the USB SOF signal.
 
@@ -546,6 +564,7 @@ not suspended), where it will calibrate against the USB SOF signal.
 
 If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
 must also be defined with the external crystal frequency in Hertz.
+Current MattairTech boards use 16MHz (12MHz or 24MHz on future boards).
 
 ### PLL_FRACTIONAL_ENABLED
 
@@ -566,7 +585,8 @@ characteristics.
 
 ### VARIANT_MCK
 
-Master clock frequency (also Fcpu frequency), set to 48000000ul only for now.
+Master clock frequency (also Fcpu frequency), set to 48000000ul for all MCUs,
+except the D51, which can be either 48000000ul or 120000000ul.
 
 ### NVM_SW_CALIB_DFLL48M_FINE_VAL
 
diff --git a/bootloaders/zero/SDCard/mmcbbp.c b/bootloaders/zero/SDCard/mmcbbp.c
index 90c17fccf..fd1450db2 100644
--- a/bootloaders/zero/SDCard/mmcbbp.c
+++ b/bootloaders/zero/SDCard/mmcbbp.c
@@ -34,8 +34,11 @@ void setBaud (uint32_t baud)
   while(SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.ENABLE);
 
   //Synchronous arithmetic
-  SDCARD_SPI_MODULE->SPI.BAUD.reg = ((VARIANT_MCK / (2 * baud)) - 1);
-
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    SDCARD_SPI_MODULE->SPI.BAUD.reg = ((96000000ul / (2 * baud)) - 1); // Use 96MHz SERCOM clock (100MHz maximum) when cpu running at 120MHz
+  #else
+    SDCARD_SPI_MODULE->SPI.BAUD.reg = ((VARIANT_MCK / (2 * baud)) - 1);
+  #endif
 
   SDCARD_SPI_MODULE->SPI.CTRLA.bit.ENABLE = 1;
   while(SDCARD_SPI_MODULE->SPI.SYNCBUSY.bit.ENABLE);
@@ -65,6 +68,13 @@ inline void init_spi (void)
   #elif (SAMC21G) || (SAMC21J)
   MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
   #endif
+#elif (SAMD51)
+  MCLK->APBAMASK.reg |= MCLK_APBAMASK_SERCOM0 | MCLK_APBAMASK_SERCOM1 ;
+  MCLK->APBBMASK.reg |= MCLK_APBBMASK_SERCOM2 | MCLK_APBBMASK_SERCOM3 ;
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM4 | MCLK_APBDMASK_SERCOM5 ;
+  #if (SAMD51N) || (SAMD51P)
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM6 | MCLK_APBDMASK_SERCOM7 ;
+  #endif
 #else
   #error "mmcbbp.c: Unsupported microcontroller"
 #endif
@@ -79,8 +89,12 @@ inline void init_spi (void)
 #if (SAMD21 || SAMD11)
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( SDCARD_SPI_PER_CLOCK_INDEX ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
   waitForSync();
-#elif (SAML21 || SAMC21)
-  GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+#elif (SAML21 || SAMC21 || SAMD51)
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK6 ); // Use 96MHz SERCOM clock (100MHz maximum) when cpu running at 120MHz
+  #else
+    GCLK->PCHCTRL[SDCARD_SPI_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  #endif
   waitForSync();
 #else
   #error "mmcbbp.c: Unsupported microcontroller"
diff --git a/bootloaders/zero/SDCard/sdBootloader.c b/bootloaders/zero/SDCard/sdBootloader.c
index 892ae8610..483825d0a 100644
--- a/bootloaders/zero/SDCard/sdBootloader.c
+++ b/bootloaders/zero/SDCard/sdBootloader.c
@@ -104,7 +104,7 @@ bool flashVerify (void)
     pf_read(Buff, FLASH_PAGE_SIZE, &br);       /* Load a page data */
 
     if (br) {
-      for (uint8_t i=0; i<br; i++) {
+      for (uint16_t i=0; i<br; i++) {
         if (Buff[i] != *((BYTE *)(fa + i))) {
           return (false);
         }
diff --git a/bootloaders/zero/binaries/README.md b/bootloaders/zero/binaries/README.md
index 51c3b23a5..dfdbe6c66 100644
--- a/bootloaders/zero/binaries/README.md
+++ b/bootloaders/zero/binaries/README.md
@@ -1,6 +1,6 @@
 # Arduino Zero Bootloader Binaries
 
-The bootloaders/zero/binaries directory contains the SAM-BA m0+
+The bootloaders/zero/binaries directory contains the SAM-BA
 bootloaders built by the build_all_bootloaders.sh script from
 the 'MattairTech SAM M0+ Boards' Arduino core, which is available
 at https://github.com/mattairtech/ArduinoCore-samd. Each board
diff --git a/bootloaders/zero/binaries/sam_ba_Generic_D11C14A_SAMD11C14A.bin b/bootloaders/zero/binaries/sam_ba_Generic_D11C14A_SAMD11C14A.bin
index 84805bd14a68f561aa727019f6f97321da339d69..4dd4ef78fb1f63691358ee4078043db13a83749d 100755
GIT binary patch
delta 593
zcmXwzUuaTM9LLYO{<(Vn)5I*9H@nwM<dQ*GsbDZ@Nn`BFqPNh8oFrX?(K1-}Fy=$B
zRz9SMU=fi+2o@}8a)Vly5D`&9L4(*577@{#5pu6hx&4ef@HyY_`F+3VaLWF=-`UxL
zxFsV(Mc}5f=<@AE2;G9i|8)oaY;kx${#;ClU@Kn6O=82xUBBA=7-}}#+&C}A^QbA1
zNu0qVd4toqMMP>Dm&qpeWlmEDq&y#&gD041JQ<h${Iw{>_xxJM5^zU_iM2^AM5ZIT
z4cfTQNr_xy6@}DIe=HxU6wp2rtz6O7kGfClm-9l&S)y(uceIl7N?%hYA%S}7OTAK{
z;H{p2t}98@e4@Fei=dB!THsut<UT5-3_=wK4>ZT$;J#)bcS!xo;p}X-mhEOWA{qD4
zdPmm{W=zf+m+%&`ni_b6d^gQoPjxw#mvwcNTr!W~>*TTdhwWZhyc(1jR&`Y&EA&Hp
z3_7}cx|+7kVOPP4kOd(w2YLpONz1x-u(3^V^-7tJ0TlDP8t<sJ`e+QAv|^HQ0N=pN
zUfB(uS7e0od2olz?Sh7#LR_Ch$9lJEa)BAdi{vij8Tj@a35&-}?>Sjy4?y;A+rWC+
z=~}O^DfXC&<ya@oKad8q8!M#6gmAga+g?zfr|_*$z%!r@yam=t+c6(G$sjZZEC4IO
h>wo$abOv!~;`|I34s+py;t?c<hYlSc3X`gH>JRm8(zXBq

delta 585
zcmXwzQD{<O6vxkZ)m^(+EHO88X7}o#mK$gef<Z8|Vt8GTV<>?R2G>|+#zLXk4Hi}`
zn0^lhi&zMeZ7*#ZLCJ(zFA)?mqQ<~6dMFBfiR+qjJ3@V&-}#^KJOA%+s;&i>xw#jF
z8+w4t$do>B>D~_jS-ku|*RejAKXI76&QEwT<+G$ld2-say(11oy|yESMJcL4-AWTA
zNksaNOptHX&y>g<-C(w+Q)Q2&h*8-+!iA#osO%E&gcz}1FD8v{Yv|zF#RTyLQi04@
zR=@6$Vwu=7c-0MiL~$2qX{b1(sq0#&<d79l!CYYG!5S)#Tcz#sf+q&;?pv)m%iyHq
z4D@K~s`fk%^`{M9x`O(+ufc_R$r0~MPo|gBKhvoS3_%d|m`#WghI--(D6hC{!0KpD
z|A<s+uVIt?plnBOkK7WRqO7T-^j=4h%+oI&-}x6U|E(kP?PX0}qwm>g>==49_0q~s
z<212MngM5mFot>x8KySwQ2(!8w$?Ufn>th?YU=r>TB)9ippz{dB;qD>q-2+^==n?&
zT(`~A6f&LYFfkzPE3=XI?=G6>`pFZz%Gr8<{{healZFq1>~|i;-sY~(X?Lb7ZGWR|
ziWr=N(~R$1w8eFiHEQF%L|F;)Zy4JHT<azB5LrN$kTN}B&ISA&zzC8=?jogs`VsXi
a2oRpSC>--)_>Y6%H|QG}9H5`f7ybe??84Xp

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_D11D14AM_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_Generic_D11D14AM_SAMD11D14AM.bin
index 6d68b1169453155c44d175eab49003daddd6f6f8..c0d4c4b5f9016682758624a6c0fab607cae7d0ca 100755
GIT binary patch
delta 593
zcmXwzUuaTM9LLYO{<(Vn)5I*9H@nwM<dQ*GsbDZ@Nn`BFqPNh8oFrX?(K1-}Fy=$B
zRz9SMU=fi+2o@}8a)Vly5D`&9L4(*577@{#5pu6hx&4ef@HyY_`F+3VaLWF=-`UxL
zxFsV(Mc}5f=<@AE2;G9i|8)oaY;kx${#;ClU@Kn6O=82xUBBA=7-}}#+&C}A^QbA1
zNu0qVd4toqMMP>Dm&qpeWlmEDq&y#&gD041JQ<h${Iw{>_xxJM5^zU_iM2^AM5ZIT
z4cfTQNr_xy6@}DIe=HxU6wp2rtz6O7kGfClm-9l&S)y(uceIl7N?%hYA%S}7OTAK{
z;H{p2t}98@e4@Fei=dB!THsut<UT5-3_=wK4>ZT$;J#)bcS!xo;p}X-mhEOWA{qD4
zdPmm{W=zf+m+%&`ni_b6d^gQoPjxw#mvwcNTr!W~>*TTdhwWZhyc(1jR&`Y&EA&Hp
z3_7}cx|+7kVOPP4kOd(w2YLpONz1x-u(3^V^-7tJ0TlDP8t<sJ`e+QAv|^HQ0N=pN
zUfB(uS7e0od2olz?Sh7#LR_Ch$9lJEa)BAdi{vij8Tj@a35&-}?>Sjy4?y;A+rWC+
z=~}O^DfXC&<ya@oKad8q8!M#6gmAga+g?zfr|_*$z%!r@yam=t+c6(G$sjZZEC4IO
h>wo$abOv!~;`|I34s+py;t?c<hYlSc3X`gH>JRm8(zXBq

delta 585
zcmXwzQD{<O6vxkZ)m^(+EHO88X7}o#mK$gef<Z8|Vt8GTV<>?R2G>|+#zLXk4Hi}`
zn0^lhi&zMeZ7*#ZLCJ(zFA)?mqQ<~6dMFBfiR+qjJ3@V&-}#^KJOA%+s;&i>xw#jF
z8+w4t$do>B>D~_jS-ku|*RejAKXI76&QEwT<+G$ld2-say(11oy|yESMJcL4-AWTA
zNksaNOptHX&y>g<-C(w+Q)Q2&h*8-+!iA#osO%E&gcz}1FD8v{Yv|zF#RTyLQi04@
zR=@6$Vwu=7c-0MiL~$2qX{b1(sq0#&<d79l!CYYG!5S)#Tcz#sf+q&;?pv)m%iyHq
z4D@K~s`fk%^`{M9x`O(+ufc_R$r0~MPo|gBKhvoS3_%d|m`#WghI--(D6hC{!0KpD
z|A<s+uVIt?plnBOkK7WRqO7T-^j=4h%+oI&-}x6U|E(kP?PX0}qwm>g>==49_0q~s
z<212MngM5mFot>x8KySwQ2(!8w$?Ufn>th?YU=r>TB)9ippz{dB;qD>q-2+^==n?&
zT(`~A6f&LYFfkzPE3=XI?=G6>`pFZz%Gr8<{{healZFq1>~|i;-sY~(X?Lb7ZGWR|
ziWr=N(~R$1w8eFiHEQF%L|F;)Zy4JHT<azB5LrN$kTN}B&ISA&zzC8=?jogs`VsXi
a2oRpSC>--)_>Y6%H|QG}9H5`f7ybe??84Xp

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_D11D14AS_SAMD11D14AS.bin b/bootloaders/zero/binaries/sam_ba_Generic_D11D14AS_SAMD11D14AS.bin
index d6952faefd3f19ac983ce8bc9d8a0da05a7d2465..f7984a8e69806be56a19ed49a62710a9c84959d1 100755
GIT binary patch
delta 594
zcmXwzUuaTM9LLYO{<(Vn)5I*9X7_rDTr%joRWKN|q%n47(Oc+4PLi%sv<#L#jQJ3(
zl@IA5SVZIyf&~kj-JsT%5D`&9L4(*577@{#5pu6hx&3a`fzSDV&+q#^hf@yJ0?zg}
z#LgQLDgrl+MVD_oLg*G8{;xaWr;3An@#kVX3|sLsZV($j>iX5<Mo^>CVn;bKo<|Ly
zjN=Rz$Qzu-O(IYWxJ)*vFVm{rBj&ld6gtL4<H@)b;I2g}PWQ_hOVAzV$Ck%2-#5{h
zTc?d{teD6pmQYyP2*mQiN&)R5(aIG~`KbBCZYj@~oF(cuaz`sEulO}p;uA<uUuu;C
z1#jv8xh5x3<EiQrFM>V}slhW{qWdtPGVoOxJWw5fgZrv|)FE~!2eVVzm24-g64AJe
z*4mn8Fk^DsIFC1p)l|pp<hyCcdZNSnIZ0E7$tCj;zD}N)f7tGIgsUNGc1crYvPeIq
zN1&rAC#z}8G<Fr72w4zfbD*aHi8QUdd+S^Dre4al4WO9Qlz3ZNsSU@VNy{b?2k{NO
z;Fa9ac}0d8p9i<u+zx2iDa3ZkbWFcZlM75Qo+Eb|PtUjCh@U%Rde2INe;;J;whVr+
ze_}=NtFk?2^0R&?%s-GivlGjt$%Jva%Gq8}o@el_Prxcr1Kt8_q~)0DKh7X@4wwZN
kf!F`^C+H+%(b)M(HWFbY`-MYDhzuM!I1uS4kDO=!0LQS>>i_@%

delta 586
zcmXwze`r!s6vxkf{&@BjOU%uj*?T&u<p$b}U=Yl#7(TZ@V<>?R2G5W(W1&#&1q&+{
zOz$5Bi&zMeZU3}o1SJz<{S!e!BWesBqd$rQ|B2_C@;X9Y&gXp3z2|!mr{-F4nOl2-
zzo7-Vj7(_@mY)3pki*OWa~<pRg_DQL>%ycLQz1v{)JV=)ws(XPXw-N3upmZdXjo~2
zB#A)ZkxBB6`k6ABqZ`cDbh_dZWg#lLN4Zcm9+h0eoe(2*>cynNZ4Dh9TTBqoV0tk7
zmDR30#8@`A3|?i!9+BOpSsE(MsLHz9B|0S8Q#2Qud9a2`6IOA1qUec1r~6hd%`!Nt
zGy}b=vZ_9hL*r@FC|*H*+~4HFM$r-P&!jR-nV*?-6^0=QTFfTI0K>g;8RS>oHDEO~
zuYE*nv`@E5eo$7Q-y^kory!}yIeJeYB=hu({=4x-+kfkbbbDD<*64fo89R<1Rk^fs
z(=bgeDKp?q;Kxx<BO}zt9UAzx%ho%lTuXyW1Xa1vQmVDH5p=Q@ok-kdj+E_^6+NG6
zg6pwaT70$(9VQ0&eHAv+`Q1$m+yHq(S2<hX??2$Ve@gd(m;BD7*xTIIIPK1Kwc~GA
zOc9-vcbf5ii?+FLvPNx2FOgS*#y5=Z0j~8Dd5A0^OGt$tFy{k)4qy~XB6pGUKmCY$
b6?h0wUF47XF#IRL?;G+3h62awCv)mA_b0;+

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E15A.bin
index e021e90491f0f8045e571a2c12ba9e7ddb033432..9bf03fdb00f4040d855cf04bad836ee6f03585a2 100755
GIT binary patch
delta 33
ocmeB>?U3DI!6V|AU#4JWq+n!VXwG10WMyh*WnjG7hsTBq0Fo>R;s5{u

delta 33
mcmeB>?U3DI!6V{Tnx|l707Qo742A|)1}0WUCYybDY?uI%FbC8C

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E16A.bin
index 64e9d62a071a2e51b9325a088e0e6ba15ae1f713..5bed8ee1b5e7fae645fe6174c20f50de2b0e33ba 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww6<s$Ce2Iig^dF

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0WUo4t8#nE;7~2cG}{

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E17A.bin
index 6473527f026e713b6a5678609e98f9a1d88dd8f8..88f11ffabb4216f322f18e15837b015cf7d8b67d 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww6<s$Ce2Iig^dF

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0WUo4t8#nE;7~2cG}{

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMC21E18A.bin
index c3422322068a96ceb47e4d7f4a5b20df5c37b98f..e4c5c2402ed097b2777a3fb57c70cb38b0bdf07a 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww6<s$Ce2Iig^dF

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0WUo4t8#nE;7~2cG}{

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E15A.bin
index df0b2ffecefc095577690daca5bb160c2863f267..e4bd732330657ed2194581ba95d9c6eb57b46e7d 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^bmFZ?_!A>Rsj|d0!

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZk878WC8$<`3K+t

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E16A.bin
index d3be23bf90782948ac520e522073fa60a6500368..a285e70165687fda77f53bcf2b063e716d441d79 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^bmFZ?_!A>Rsj|d0!

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZk878WC8$<`3K+t

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E17A.bin
index 1c379d56499eaefd79800f39fbd6b0b9ca7720fd..255f91e11b16c9843e89bdc3ea8da6f18918efcf 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^bmFZ?_!A>Rsj|d0!

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZk878WC8$<`3K+t

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAMD21E18A.bin
index 52b86be3ce2297e2e8b4dc98888816c170c45aa1..122d5caf79f6445e33fb6b0a42f4b10da1404c90 100755
GIT binary patch
delta 33
ocmZ3YzC?WkhoFdGewl)ik%Ezdp*e%0k(H^bm8s=s8Nm)F0G9*^E&u=k

delta 33
ncmZ3YzC?WkhoFd8X`X_S0T3CQGZ-3J8JJiZ8Elpj>|g=_m9hvD

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E15B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E15B.bin
index 5e7cf2d348e21c814ef221f325b46160ef087406..4ebf8235b6e0d323e64b2bc0b94d10c3ff8f686f 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8En2S(8&Y<9N-M3

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vT=Gy|DOaL2k43Pi;

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E16B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E16B.bin
index 7db3b3d8c9c2368555f4dbc557efbefcf03f9a05..bee695d671efe6b93a8e829e6a5e9a3c7844a2e8 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8En2S(8&Y<9N-M3

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vT=Gy|DOaL2k43Pi;

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E17B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E17B.bin
index 15732be6225dc1bf50081833d04cbebe9ceb579e..c1bc533aa7ca26fb5a5df6562ce67a7741e0eb52 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8En2S(8&Y<9N-M3

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vT=Gy|DOaL2k43Pi;

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21E_SAML21E18B.bin
index 22675b86e6ae1991c24edb251a0750f765f0b242..50ab886fecff7a44cc80b19345c9892de7440629 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8En2S(8&Y<9N-M3

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vT=Gy|DOaL2k43Pi;

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G15A.bin
index e55d9a2f13ff25e0cda5d8c878dc64e697815ab1..05d4c1f91df4fa527b5b238544e5f888bd6f15fd 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww_a!$Ce2Iihl>M

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0X<o4t8#nE;852cQ4|

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G16A.bin
index 8a746084da86134365c06c65e36e9714e0a0221d..04cf5ec8678c8fbaf4d0d5b02ef5010e8e12bcfd 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww_a!$Ce2Iihl>M

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0X<o4t8#nE;852cQ4|

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G17A.bin
index 318b0ecd9013c32656668cdbba5e8e6944bf5341..47c7b5b28ab86f0465b75b329365ceda65ad0fba 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww_a!$Ce2Iihl>M

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0X<o4t8#nE;852cQ4|

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMC21G18A.bin
index b83420741d828b58bf61f13a880c3f951239ca5d..0b3d9611e9326a5f69bdf05ca7194278843d4662 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*Ww_a!$Ce2Iihl>M

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0X<o4t8#nE;852cQ4|

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G15A.bin
index 62551791434ced85b3ad94d7aab417c07048c346..49706aefe9d0f46ecfc2aa37038c925dfefdaf2c 100755
GIT binary patch
delta 33
ocmZ3YzC?WkhoFdGewl)ik%Ezdp*e%0k(H^Lm4Vr28Nm)F0G8MYCjbBd

delta 33
ncmZ3YzC?WkhoFd8X`X_S0T3CQGZ-3J8JJiZnQxX6>|g=_mD~s!

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G16A.bin
index 8fbc1b2823728ebce3c70a33c7bedcba6580fc71..d59f6a7e59e6618ca662053f6f15b788dec4f88f 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmBD6d!A>Rsj`9ca

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZI%}7WC8$<{|Dg!

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G17A.bin
index 347bbb707443dcb7844be925e6b977e2919f9a4b..1ba4cbc2e8d7b592c172bc41202c8a35221f3e2b 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmBD6d!A>Rsj`9ca

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZI%}7WC8$<{|Dg!

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAMD21G18A.bin
index 3af67184ce848208a4dddffba844db19ce0d45c1..460450df5e498c457af5ebe30d565632bb5eceb5 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmBD6d!A>Rsj`9ca

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZI%}7WC8$<{|Dg!

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G16B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G16B.bin
index 77de884064128c459978deba023dee1d701f362f..5ef547df0bd3c8f1f90d8e6808b011235a389a1b 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8E(EU(8&Y<9OewA

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vz=Gy|DOaL2q43Yo<

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G17B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G17B.bin
index c745da26f39e267fa70d2079f804b2637341762e..520cbe521878067f5759925adb2786c509b4ef0e 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8E(EU(8&Y<9OewA

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vz=Gy|DOaL2q43Yo<

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G18B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21G_SAML21G18B.bin
index fe167d8d36ebf718025cbdef4c6f53deecc74c2b..250925e3fb9bc7d8e05b2b248f0c7bdf595de8ad 100755
GIT binary patch
delta 40
wcmaE&_C#&N6Gldb%}*I0^NIN7mnj$-DHs_Tnll(0S(%zy85(ZBBhbMF04Ssk*8l(j

delta 40
ucmaE&_C#&N6Gldv%}*I0^NDzs<|!B%0Fj|NgQ0<yfr*u|(dIh>9ZUcxC=A5_

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J15A.bin
index 8d25e8a459b72dba1cb93826e651d2f1d166da9d..fc54057880ec4e71c8920ecdc75cceb7a126ec6f 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*WwhCw$Ce2IiiHQT

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0V}o4t8#nE;8B2cZA}

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J16A.bin
index 5046e0f611665896771719edecc80213f2dd98d0..e70f2ab88291a68ba6d2723b234364bc3048e683 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*WwhCw$Ce2IiiHQT

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0V}o4t8#nE;8B2cZA}

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J17A.bin
index 799e0ecbdbba1fecdd5c9b468b63811f1defce95..a754ffcd9855dae1eba0fc58aa1c0ffb5028928c 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*WwhCw$Ce2IiiHQT

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0V}o4t8#nE;8B2cZA}

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMC21J18A.bin
index 4ebbc22797ebc6703b279bae151daf784169b8d2..1a7462e020ab408e3073a52b17356073ef0bdd3d 100755
GIT binary patch
delta 32
ncmeB>?U3DI!6WRKU#4JWq+n!VXwG10WMyh*WwhCw$Ce2IiiHQT

delta 32
lcmeB>?U3DI!6WQdnx|l707Qo742A|)1}0V}o4t8#nE;8B2cZA}

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J15A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J15A.bin
index 7612033472c38cdc952a927976c674e3d370e245..026b7e1ec3be4e449c4e36774393ad3f3620806d 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmEmS-!A>Rsj`#=h

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZ<ZG9WC8$=1qb2)

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J16A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J16A.bin
index 861ce62a6524e2ec2644402c0c4cc1f9cbab3cfa..289b4c25a4693b84cccac8ec526ae11107de8ade 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmEmS-!A>Rsj`#=h

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZ<ZG9WC8$=1qb2)

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J17A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J17A.bin
index 54ddb29c33f40c1464886b1e57e33c0ddcc7fbf5..f5f08b10cd502cf1fdf004f6b1eae66a45869960 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmEmS-!A>Rsj`#=h

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZ<ZG9WC8$=1qb2)

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAMD21J18A.bin
index 6b2981f370257f1da51a5c693877497b4397cf0d..633884c95f87074410389c10781a381f243fb9f1 100755
GIT binary patch
delta 32
ncmZ3YzC?WkhoG=uewl)ik%Ezdp*e%0k(H^LmEmS-!A>Rsj`#=h

delta 32
mcmZ3YzC?WkhoG=mX`X_S0T3CQGZ-3J8JJiZZ<ZG9WC8$=1qb2)

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J16B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J16B.bin
index 2ce7f1413133bbc89ff9c073752768a6150e157f..c0bb0da378070b8ef71344a361928c2aa0d30831 100755
GIT binary patch
delta 40
wcmaE&_C#&N6Gldb%}*I0^NIN7mnj$-DHs_Tnll(0S(%zy8Cq<<BhbMF04UB3-T(jq

delta 40
ucmaE&_C#&N6Gldv%}*I0^NDzs<|!B%0Fj|NgQ0<yfr*u|<>osA9ZUcxQVh%h

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J17B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J17B.bin
index 8731d94f1e5df92c869e8954b5ce3c1b0d5286de..8d811daa234f6ab65d04940e90d9e47f7a92a258 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8E(EU(8&Y<9OewA

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vz=Gy|DOaL2q43Yo<

diff --git a/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_Generic_x21J_SAML21J18B.bin
index 61f1be2868b10e72e2664bc628a4efd8e2eb169c..18e90500c4f22e9261bcad444acf13111aa424ad 100755
GIT binary patch
delta 39
vcmaE&_C#&N6Gldb%}*I0^9lRqmnj$-DHs_Tnll(0S(%zy8Ew8T(8&Y<9PA9H

delta 39
tcmaE&_C#&N6Gldv%}*I0^9g&E<|!B%0Fj|NgQ0<yfr*vL=Gy|DOaL2w43hu=

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D11_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_MT_D11_SAMD11D14AM.bin
index c79712f9077c989dbc47622c3c867463869af6e2..475e9fcb16dac21e0b90ce9615eb59da768f3a4f 100755
GIT binary patch
delta 614
zcmXwzUr19?9LIm>&g)&fx@mJZ+|+w_31>@i8zZz9)hfa}W-k#;q&1T6f=CvaQsN>X
zGAx?sC8!q}7AgcP6G}#bMNdIdy(mFZ5WOvWxYzyR^jp+{58v<k{l357Ij=gucUmhp
zkitAb58~&u&8`*z2;t@b=|kV04R?`DcEm?AD_I92CHjP%X#Tw;pMqj>M;egTcm|3J
zt&$WuNH20DgweO$B3Yu>Okbyre7BmB<C=HS5{W0`T8Dfm!pSwikurPi5hb>9o+!c5
z;P{qM_eoNR#)nqHr*C&eGoIWm?4^<1G}Avam)fRflsW4h_YmxnT+*q2OU@}nQ0u;C
zxmgZ()%**VPeAdx(X3uYUH2NEOHHc%h>|oZYgl+{H2!TY84UxCYFi?lo=g|g)wDr>
z)U^w&!kDR^P!m5-rs)FznQYNp^)s$#6(~-Y%!Q^rukukP!Sq;Fa?2Xi5792+D7i^f
z!cXy0)qmTo&8#wgnGTy*gu|F&`k6Jyt|_v+*9Kq)ki4iZh|@+NTRM6^l!Y&~)VYcY
zmB>s#UC|3KPew5+;A_M~?vq8QX2(o{{<64Q^|CbHiirjeq^7(OtxZ=;)FbXE_voPL
z=-w`Y^57W%PSX7Dec0SAo7_(KXrVS><Qt;ATXI{m{)XNa_mE|}Ao|GhwfEvC=Sbkk
zZXikI0y2tB&_(O@AQ1uDkv?P?nfRyksAC{O?8=xF2uOim{{ip^`a_}q5It+V{0BG*
B)GPo1

delta 582
zcmXw!O=uHA6vy9ex^9|nH;FMZO*ZXrHsD7pBt{Vm1x@^-yB4oaMAl+(3u;3|8<5fn
zJs9c1WG<p0!h%v;4{gn<1Pj_i4+TMrpa?DT;s+Q(*tAJlC!oXp_`jL=fAija?R(e9
zHSHh-Xn<~llP)^_`vAaA4*ypVi93sf2asA!hmpEabR+Z~zd&c4)gAFX)V6knAyH1|
zq2|IZG={?X8kI)B@CG%D9^(ni_Ee@U$$2rU1uxhVNj0hUiVqT$*pBDMtU*^IFg$k!
zNwG{U_lfD)^vS7QY7xT5XRneE>N7Z@Pn*W3>5+X}UMg`V>It|K`lw5;j+Uepw6klb
zK0}e0^l1p0#vAjs3bmJYR=!2_xub3yVr8G&pS_-)&;HD2u-Os7A^I7*idX3`<TLu7
zf`7dUwaHy;#ZjhZT9H)KxZDzWQ8Nt%pJPs;A}%oB*!foU{z0v<Xd26S(z?J56OU=6
zmyUN%p}h_}fE7Tn68*yg)H%Fn>pfC!Fk5Zcc+)}@iKd}8jmpYdg;*KV4F%CdH0#w|
z#Iu2&tlz^lg`9^tx+oAFWkzXNcQ<gH?MF}XIO{(2V;7`Har(WWMft-d`JrLqy?mz9
zE~uBg6q*-!j@*C5uh{))8LzTo6k7VtzNOqJ$#9nlal&cBMZySP=kCU~Z2&Do4+}6z
h82P97h~5DKhHl>!jz-9io`7g%AaZOViYM$h{sJ2q#cBWm

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E17A.bin
index ef01630b3217fb0d75b9997e4fa2579920432ace..5cccdd80a9234a4d06c481b7ecbafa4c5bc0062c 100755
GIT binary patch
delta 33
ocmcbjaYbXp4nYyW{4xb2BLyP^Lvsd0BP&x=D^tVGX9PQ#0J#zg=l}o!

delta 33
ncmcbjaYbXp4nYyG(mVwt10XUqXD~FdGBB|+u-tq`u!9KzxEKlB

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_A_SAMD21E18A.bin
index d4702ccf7fea01b02112cfdb9880c45aee044478..6b13fe35919a45d2575fb5818e18ffbbcf582f1e 100755
GIT binary patch
delta 33
ocmcbjaYbXp4nYyW{4xb2BLyP^Lvsd0BP&x=D^sJ*X9PQ#0J#_m=>Px#

delta 33
ncmcbjaYbXp4nYyG(mVwt10XUqXD~FdGBB|+G}wGbu!9Kzx9JJf

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMC21E18A.bin
index 1e0b59614595db218b44a5758017794d221b2951..84dc9a8c41eb735bcedc015d3fa1d3fea378998e 100755
GIT binary patch
delta 33
ncmdlWw?S^h10E5-{4xb2BLyP^Lvsd0BP&x=Alm$e$A$?2v5*Oh

delta 33
ncmdlWw?S^h10E5t(mVwt10XUqXD~FdGBB|+G~4`z$A$?2uyYA_

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E17A.bin
index b775aa60f14de025931e49b7e6184e2b4006a5db..0512e9375bd4bec67da7648a8c696f269496af2b 100755
GIT binary patch
delta 134
zcmX@3aY1833gerJsoIQhHcr%MW&E)DAZs!!W5Z@uZfi!yDVq~{xLFvlOwJV$*WDn<
zz;F|YHv#coAl?GR2Y~n_5KmxWP&f;uF9PvpAih3%qd+v{o5{R_IV=h;Muw9s1<i&1
c^2-#Aj1-Iv49yt~jjT*ftxPu`7VKmK0L5Y@yZ`_I

delta 129
zcmcbhaYkc83ge53soIP$Hcr%MWqh;wAZs!!W6fq&Zfi!y37ZpnxLFu4OwJV$*IgsX
zz;G3a*8%ZOAl?APdw}>T5KmxWP&f&s&jRszAig|#qd+v{i^;r#Ig@Jz&4s;6^AwB>
VfXL9C!O+0Uz{JXM^KrpWCIADrB%J^N

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAMD21E18A.bin
index f6b08a4d66b14f848834861d4095d6cee12b226b..858eca6f11f54a959e187599f9ef91b385fe239b 100755
GIT binary patch
delta 134
zcmX@3aY1833gerJsoIQhHcr%MW&E)DAZs!!W5Z@uZfi!yDVq~{xLFvlOwJV$*WDn<
zz;F|YHv#coAl?GR2Y~n_5KmxWP&f;uF9PvpAih3%qd+v{o5{R_IV=h;Muw9s1<i&1
c^2-#Aj1-Iv49yt~jjT*ftxPu`7VKmK0L5Y@yZ`_I

delta 129
zcmcbhaYkc83ge53soIP$Hcr%MWqh;wAZs!!W6fq&Zfi!y37ZpnxLFu4OwJV$*IgsX
zz;G3a*8%ZOAl?APdw}>T5KmxWP&f&s&jRszAig|#qd+v{i^;r#Ig@Jz&4s;6^AwB>
VfXL9C!O+0Uz{JXM^KrpWCIADrB%J^N

diff --git a/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_MT_D21E_rev_B_SAML21E18B.bin
index 711db2ce06248d7652234ab2bc29bb329b700fc8..4ecf17ebeb00a11e8f98858af31a090f49294172 100755
GIT binary patch
delta 142
zcmeCtn4mEsg>lWqRBgsJ8z;VIWK`H(%f!vhxM6cAYcwmP!{(=4){KlHn-zJuSs15G
z))f%fEf8d2m<hy1Ks*<SOMtimh&zF}hk-$%7f4S8;>kcfeR82dG~=4dX9aRt6nu;f
jCtC`di}>Z2DHs_k7#SFvGZ-3KnVMRenrv<n>|g=_bcrJj

delta 137
zcmbQB(W5aTg>l8iRBgr;8z;VIWR%%l%f!vhxMp)FYcwmP&E}_E){Kk+n-zJuSr{iw
z))f%f%@Jf^m<q&sKs*zO3xK!=h+BcUhk-$%6G-<0aX%1Go?Ivp&A4LnS%I9%wu0s&
cUZr^oMg~A+XwG10U}a!pWoWv&L$HGh0J^pz;s5{u

diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAMC21J18A.bin
index 1d34d96c43c5fb0a47a8dcf67d1afa9c553ddfe7..e2703b97fbdfd10115a08808807ce44c0a48bbb7 100755
GIT binary patch
delta 33
ocmdlYw?%Hl6CM%2{4xb2BLyP^Lvsd0BP&x=D-+AjKX`1I0J9+pod5s;

delta 33
ncmdlYw?%Hl6CM$-(mVwt10XUqXD~FdGBB|+G}`=w$A$?2vD*oQ

diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAMD21J18A.bin
index 6beceab18eb46e1f716c06fd54f3d18b33945b7d..b3ec264fa606322c08f0abbe91cb4bb76ba132ca 100755
GIT binary patch
delta 135
zcmX@1aYkc83ge53soIP$Hcr%MWqh;wAZt1+W6fqwZfi!y37b=SxLFu4OfD1<*IgsX
zz;G3a*8%ZOAl?APdw}>T5ce=JD4Yb+XMy-U5MQ3WRUn%2#biOjWEKS%Bg4rhf)*lv
d`DF@5MhZp-hUN^0MpmY#Rwm|~4+wTJ0RYrRC8huX

delta 130
zcmX@3aYAE43geTBsoIQBHcr%MWqh&uAZt1+W5s4oZfi!yp3SK|+$@Y|CKn2b>#h)F
zV7LgxtAO|_5U&B^9YA~#h<g|q6pjMvlR$hLh|f>nDiF>1WU`=O^5hCZ3lXo<JOv{I
WATl&(Ff_0-FtIW;+<Zi^g9!i<vLu24

diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAMD51J20A.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAMD51J20A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..99ac30b776dfe6637075cd2e8baf8e3e4fb9335e
GIT binary patch
literal 5216
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_Xeno_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_Xeno_SAML21J18B.bin
index c81908bb08eb878dc290365f617a598f26b182d7..71feed89595e61c8700d432081bee89a774d34ce 100755
GIT binary patch
delta 142
zcmeCs=+T&v!nk5$sy5?_jT2upGAeAYW#VRLT(h~8HJ+8xX7fufYevR^&8j@yEQ}K-
z8w!Z)<_Iz{Oa<aRAf5@t1wdQ_#H~O)fq_Ax6G-<0aX%1Go?I#r&A4LnMS)}%1s@~B
i$tHppB7XU03Pwf>Mh1rF42DKlrlwXV7MmLcJD31p^diat

delta 137
zcmeCt=+Kyu!nkB&sy5@2jT2upGRkbOW#VRLT(P;6HJ+8xV)IKbYeq(&&8j@yEQ~#q
z4F$w?GXxnJCIWF55Kjf-93ZX$;zl5zz`&r;3Zy%MxEqN3CzlFDGcK8YQ6PD;g`kCq
cS81MtkpU1Hnll(0SQ(gD85(VF5$s?B0H-e@ng9R*

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_m0_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_m0_SAMD21G18A.bin
index 564906554f1d909a4d990a5e95015ac7c124dbcf..7e5a6d6f7b932d05b7cc71f8adedd3c145c4ab6b 100755
GIT binary patch
delta 33
ocmX@3aYkdq20;<O{4xb2BLyP^Lvsd0BP&xgD`UgWM+7^V0JaSY#{d8T

delta 33
ncmX@3aYkdq20;<8(mVwt10XUqXD~FdGBB|+G247Zu!9KzwIT_;

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_m0_pro_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_m0_pro_SAMD21G18A.bin
index 43f456b79776b4d86c3848823f1567417b4a41c9..69114a5b6505a880977f5fb5572efe1c38fa59f6 100755
GIT binary patch
delta 33
ocmZ2rxWI4&i<pRCewl)ik%Ezdp*e%0k(H^Lm9f!g39$|)0GL+@Gynhq

delta 33
ncmZ2rxWI4&i<pR4X`X_S0T3CQGZ-3J8JJj^m~WO4>tF%^muv_r

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_mkr1000_SAMD21G18A.bin
index 342c88f00fbbc988af3ac522cbc4c139993951e4..e202db26291f0a83772f429e666fb95ab9a42734 100755
GIT binary patch
delta 886
zcmXYvYe*DP6vxk<eY@-G?x?%kh~rETA3b)rmq_ZSwU)C+1Q990Xc4m!v=NjQvG!#9
z5U97Hi~`Z1=u5S11tD4VErK<IJ`}NiG7)Ke*le?F)7j|5@BX>x{O6o==iUdtA^*@O
zro}qkx|~_*9X{BA>%)-=LN?Kj%x<!WUST3k<8PW}4v?>OpWz-EO<0U=MAWh`#hc82
z88Qpmz#*5!2G{l*#BtouXG^3)e3nK`&j_W<%r%V9OGD<jF|%~eTB(?&8|`G;A+&dZ
zNZUz@tj*0tJB<K59RA2KQtv?TBWTn<L_5I&!EDmk?c33ykU&jp4&&VP>aNvc&j1lT
zL6Q>XqO_niN~2hDh3rg=a{V@4eXXyMg)UY(|HB&B#akUUQc~_!ys=JQz5S>Eu^<f!
zy9}dpPaiMUcJ;{qLsNo{u@$+^MIC{D5JqK-P=zP>m4{4gwo)<*My@J4uJGLTPLBk2
zII>U`tr~y^QwoR9T+kr%Ma$1D8Gy#QX~+Z@p>8HcFmnPkA25S1fcX%ln~V_5$ADjd
z_LzkqvjA*?&82BbKR2KO|3D0}CUtcUww~0ilch<MWD1M2t~wTZu2#`iEl=~7AZep5
z)>(VcqCZ}zTz;gh5$d-+wB++Vr>ksY))phKiE;od*1L*&0g2O-_8N9LXGs@K)p-Ld
zsnt~{y>G9qKAj`Hb8;%=Wq@a~>*0`PomZ*lh@h)U`q|EsXLP~7sx6%3xzfpkE1I;1
z%^c4aW3?L^h}YXqDPHk&4Y)s>GjLum`p=h5I>ILOIWc~b_BlKxLQgu{Z0~TUYdGK2
z#0!VrKv?>wL?j;it>k^EtO7^I7I9=LGKdtc8T_OYbKg;`QGcQWstp;!d@-sEVG&OS
zb-H%4m$brZ&ueac7lWD$*E95}i!Hvdy%L<;O16&}{-}58u&bAh(Ro)r8KE9`AG5L|
zamxLP*;(!Y@FU&GQRK>hO`>jf14NL$$SvdvvY7?gUIuU+Z+yp*<9r~%2YmjG;14vf
O-_RUrO581vGk*a;M;)2~

delta 789
zcmW-eZAep57{{M;uXA_qs=K=^=epJ1orcYX%_Ji#&Dmz&1r<o4Mblnb61fk(_(8Cs
z4;BRKDd>eDurCpTx@JU-G$IiEuoWRD#UjKcibWspy3=mYg7Z6np6CDPJm+wR{o}sj
zUCbx*$ezv2T*b&4FYXhgj|kyuBhx|l(VNU!CZD4@<`j8FkF$?SZ`@qeL_FVeuRZsf
zlM%>%&DHk`s@S}(hxLqMy_hRk3;lU|*7TBGrPalom{bJ~7QY*0)UN)nNvPEqV<F(7
zxmvX)Dx*%RD%>t{DMJxkOzEq?xgi=Div*(1kfFW(+cULMy`mgu??pPhC3Qo4XT;q*
ztymaKiM_Zap!9%pFJe|)IPm8xWVh!WYLQYTxng5cS-KMvRj45;qPSwNemLzlr9g)4
zfDYM=zPh}=A8Nm+A-iJ@YL-(3oj!Elqk}1cACQ4o*lWu`<`s)IfINtB2}3)9qmnw8
zv?WZcDeQ?D+O9QOaz_o#yGD<3&7_Y$;8v_R*8D>?(d(0jc9)J=Cd^wgWN3l-{*pl=
zv^oGdJg)(@3aOzB)=lC}-kd3f4y>}M#BFGMsFknW@FY*<vgCBo$$%{4)N?^|gEQ)u
zh+=3<bT2QG@3e!jYZ}PQk}X+C#S&b&SdyhuJZ)A7&z%-iN{;#^FV+)zR&q+Q|G8X(
z51TMohW!Mc;VZ~py1+MCF5sPR<Nc1t-KAER1ZbVjLqhbBZ9e!6t!p@92&qD@Acg2K
z_Fo{QND{e)JVYKN!{|Rnoj~Hqa|b;y92BSY!fWHYz0J_ZbpiLMG%bjwv-%sQtgU?i
zDEn9YKz|8cBux+4w~*KLvb~#`bHqQ|KQjjtR)93}0}*(DI;5Z-$dUkHu><@;-Hmz#
i`GTy70GIHC+b^D%>wUQVjo|m~^fm1CHO9GhL(D&wSp^*c

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_mkrfox1200_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_mkrfox1200_SAMD21G18A.bin
index b34315b9e3fa582594a9dcd29e5ba025eee4fa90..bf54b8ae9b3d2e8d1baa40eb7556784e574de8ce 100755
GIT binary patch
delta 33
ocmbPYIK^<o4^a`n{4xb2BLyP^Lvsd0BP&xgD`SJrJYpS80I#qK0RR91

delta 33
ocmbPYIK^<o4^a`X(i{Z^GX*09LvscL6Dw0=D<h-LJYpS80Ik6Y>Hq)$

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_mkrzero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_mkrzero_SAMD21G18A.bin
index 195074f256cc7e7336c3b1ded5b1cea524428d85..eb92c57dc61e38759236e75719634f26c84b8026 100755
GIT binary patch
delta 33
ocmbPXIKyzmA5js%{4xb2BLyP^Lvsd0BP&xgD<jLz0%9FZ0I^>Q82|tP

delta 33
ncmbPXIKyzmA5jsn(mVwt10XUqXD~FdGBB|+u-Ggh*1-e-usaC_

diff --git a/bootloaders/zero/binaries/sam_ba_arduino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_arduino_zero_SAMD21G18A.bin
index fb022cbc4c8d718cb94311e506b505411b18dc06..b8d663f03a603e3e65782c6dfee6b767ffcfadac 100755
GIT binary patch
delta 33
ocmbPWIKgnk7f}(v{4xb2BLyP^Lvsd0BP&xgD<iYb9AX_z0Ip34_5c6?

delta 33
ncmbPWIKgnk7f}(f(mVwt10XUqXD~FdGBB|+Fx|`{*1-e-ttklN

diff --git a/bootloaders/zero/binaries/sam_ba_genuino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_genuino_mkr1000_SAMD21G18A.bin
index c6d038c290a7f953185137bfdbdfad68e38163e1..75bcc442f834b460a70df689d434b83dc08ddaf4 100755
GIT binary patch
delta 32
ncmbPWIKgnk7g1rq{4xb2BLyP^Lvsd0BP&xgE2GWqVx3F?rHKf?

delta 32
mcmbPWIKgnk7g1ra(mVwt10XUqXD~FdGBB|+*vu~0$piqTeh91p

diff --git a/bootloaders/zero/binaries/sam_ba_genuino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_genuino_zero_SAMD21G18A.bin
index a3d47ea9b372b44703134924d5a2a1b4a8d52428..e5fabf9d6af91b830acdf9e7cec83511c3d18fa5 100755
GIT binary patch
delta 33
ocmbPWIKgnk7f}(v{4xb2BLyP^Lvsd0BP&xgD<kvG9AX_z0IpLA_W%F@

delta 33
ncmbPWIKgnk7f}(f(mVwt10XUqXD~FdGBB|+Fx$)_*1-e-tuF}U

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11C14A_SAMD11C14A.bin
index 0326c5a04f5c5b5e3b6858410f6c3cc7f6d995be..26611fa363559f8a50557fb17358cb47834bfd34 100755
GIT binary patch
delta 326
zcmX>j|3;qg4?lxKAQJ<FBM`eXO%#+CVPIhJ1ae@&7s!4((N>*t&%{)1ATjY^eag@8
z&kwjUxBxYI-_E$j_WNpqJCM)8;P7Lsrgwv4RECB>mvdA?REC^lmot+hh`l?LLrK_K
z*>86uqq1><am6imma7Wh(G}5~7_`6Nmh)*)THM2+I@x(~%m43J{!4pHWi%*H;+w=Y
zn?cxlagv1h<D^N-(F`EjqfY-9_b>qs19A5M-<rViLGP!acQKIG`l*y9;4SQ+oW!iW
z8OT@q$qN>j`^n?Q>n)XFTU1-Lx9D%tkIBCoW!eA#`Tw7pjd8L#(?Z4rn|CrTWn`Q^
zIiAIt(Pr{u7Dq<u$xm6-IobdHQfOfK|DAcWD61zYW7*_*K4V6g$&>j^8E<bs$;ZqH
E0P)0h*Z=?k

delta 318
zcmaDOe@33~4?lx~Ark|GA`q)GO%#+CVPIg;1ae?N7sx(3(N>*t&csx0ATjY^eaO%6
z&kwjUxG*>}dEd^s#rFGZfjf}T!QfD^RoS~iF)BmJm&-XSAu2;ovCElB5yW1d$)P0d
zEbF&Akx|*Wz_{WTJIhrm@92u?O$^%KZ%g<zC@t=p?7X<;|M#o^#k{358k8sTO=6nO
zAnd$2N!a^w(j?_*29WHr|BKyvn1DttZedXQ|9$`eEeQ-C<bHB{7XxXjpIlzt-ckuV
zML9)liry3z>}7CZaAaTsk~}~Rbf8K?14F}Zt{Mh*=E>$v3mF$|zR9$dk@5EAdKPC!
zpUH<=92vDIv$CplivRni(7^EjyYOaHR!>gGw#oH;#*878H}jb?zTW(jkC_nwpGIk~

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AM_SAMD11D14AM.bin
index c349e2e00df8b1877310db7b9c1efebcd5eb132e..8cefe0b89e89e8193ff5bb6d33cfcfc407d92cf0 100755
GIT binary patch
delta 326
zcmX>j|3;qg4?lxKAQJ<FBM`eXO%#+CVPIhJ1ae@&7s!4((N>*t&%{)1ATjY^eag@8
z&kwjUxBxYI-_E$j_WNpqJCM)8;P7Lsrgwv4RECB>mvdA?REC^lmot+hh`l?LLrK_K
z*>86uqq1><am6imma7Wh(G}5~7_`6Nmh)*)THM2+I@x(~%m43J{!4pHWi%*H;+w=Y
zn?cxlagv1h<D^N-(F`EjqfY-9_b>qs19A5M-<rViLGP!acQKIG`l*y9;4SQ+oW!iW
z8OT@q$qN>j`^n?Q>n)XFTU1-Lx9D%tkIBCoW!eA#`Tw7pjd8L#(?Z4rn|CrTWn`Q^
zIiAIt(Pr{u7Dq<u$xm6-IobdHQfOfK|DAcWD61zYW7*_*K4V6g$&>j^8E<bs$;ZqH
E0P)0h*Z=?k

delta 318
zcmaDOe@33~4?lx~Ark|GA`q)GO%#+CVPIg;1ae?N7sx(3(N>*t&csx0ATjY^eaO%6
z&kwjUxG*>}dEd^s#rFGZfjf}T!QfD^RoS~iF)BmJm&-XSAu2;ovCElB5yW1d$)P0d
zEbF&Akx|*Wz_{WTJIhrm@92u?O$^%KZ%g<zC@t=p?7X<;|M#o^#k{358k8sTO=6nO
zAnd$2N!a^w(j?_*29WHr|BKyvn1DttZedXQ|9$`eEeQ-C<bHB{7XxXjpIlzt-ckuV
zML9)liry3z>}7CZaAaTsk~}~Rbf8K?14F}Zt{Mh*=E>$v3mF$|zR9$dk@5EAdKPC!
zpUH<=92vDIv$CplivRni(7^EjyYOaHR!>gGw#oH;#*878H}jb?zTW(jkC_nwpGIk~

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_D11D14AS_SAMD11D14AS.bin
index 0326c5a04f5c5b5e3b6858410f6c3cc7f6d995be..26611fa363559f8a50557fb17358cb47834bfd34 100755
GIT binary patch
delta 326
zcmX>j|3;qg4?lxKAQJ<FBM`eXO%#+CVPIhJ1ae@&7s!4((N>*t&%{)1ATjY^eag@8
z&kwjUxBxYI-_E$j_WNpqJCM)8;P7Lsrgwv4RECB>mvdA?REC^lmot+hh`l?LLrK_K
z*>86uqq1><am6imma7Wh(G}5~7_`6Nmh)*)THM2+I@x(~%m43J{!4pHWi%*H;+w=Y
zn?cxlagv1h<D^N-(F`EjqfY-9_b>qs19A5M-<rViLGP!acQKIG`l*y9;4SQ+oW!iW
z8OT@q$qN>j`^n?Q>n)XFTU1-Lx9D%tkIBCoW!eA#`Tw7pjd8L#(?Z4rn|CrTWn`Q^
zIiAIt(Pr{u7Dq<u$xm6-IobdHQfOfK|DAcWD61zYW7*_*K4V6g$&>j^8E<bs$;ZqH
E0P)0h*Z=?k

delta 318
zcmaDOe@33~4?lx~Ark|GA`q)GO%#+CVPIg;1ae?N7sx(3(N>*t&csx0ATjY^eaO%6
z&kwjUxG*>}dEd^s#rFGZfjf}T!QfD^RoS~iF)BmJm&-XSAu2;ovCElB5yW1d$)P0d
zEbF&Akx|*Wz_{WTJIhrm@92u?O$^%KZ%g<zC@t=p?7X<;|M#o^#k{358k8sTO=6nO
zAnd$2N!a^w(j?_*29WHr|BKyvn1DttZedXQ|9$`eEeQ-C<bHB{7XxXjpIlzt-ckuV
zML9)liry3z>}7CZaAaTsk~}~Rbf8K?14F}Zt{Mh*=E>$v3mF$|zR9$dk@5EAdKPC!
zpUH<=92vDIv$CplivRni(7^EjyYOaHR!>gGw#oH;#*878H}jb?zTW(jkC_nwpGIk~

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E15A.bin
index 338266a2ca79604e4c601c6d8e86d4eb7c151848..58f3a4052320fb0f1c2bbb2f4bf01c97286cab5e 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UOe{7BNQ5u}00rR-KL7v#

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jXY;%A_2onGdvI}Vd

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E16A.bin
index a6ab6abaadec1da0c91cb97962fbe6e4b6878997..a718a1d03eff07d530e41792b0edee4225581e43 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UOe{ACNQ5u}00rj@KmY&$

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jXd~<+A2onGdxC?3k

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E17A.bin
index b73a20a4127e76e2b3c431c05f3e79b5b6adcdad..bd8bf2d1adaed0cf55f5b23103aafa0d7fb48cc2 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UObs>%NQ5u}00p=UH~;_u

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jXVsn5*2onGdz6)yr

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMC21E18A.bin
index 0287ace262970442f47952a3fd4f235c9ea2103b..3e03b061ded76710d38ce5eafd58c9bbbec17ed4 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UObs>%NQ5u}00p=UH~;_u

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jXVsn5*2onGdz6)yr

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E15A.bin
index 252623f865e90fe61fd57e02569ff662f4360215..11c1fb564a5bcd54e322f9bdeec79a2ef4e135b4 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynHX&rkzK$901<-=k^lez

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^&!DbQJ1xx@KR13TS

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E16A.bin
index b7b5622bf3ee44724842818f9fad7c38c2cb9548..a92826833bb15525fcbe2629f5744719dea55d4a 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynHX&rkzK$901<-=k^lez

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^&;bsxp1xx@KS_{1Z

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E17A.bin
index 74a451d13dd81370730fba1546f7b8a6aa265876..2766d947c38162b083883e981ef0c857f6c8ad50 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynHX;tkzK$901=4`lK=n!

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^&;bsxp1xx@KS_{1Z

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAMD21E18A.bin
index 0df96614727aca1c71457378d33542c7c7a88019..c5d8cfe67e5efcf69b062f20f912c880f10bde1d 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynV4)AkzK$901=N1lmGw#

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^&(Pk0Z1xx@KU<<wg

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E15B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E15B.bin
index 4d0ef6bfd2c1e949f44c7708d1636f4e95e0ba21..a7440b12810cc9eefe9c7cc4692125f79cea5e86 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wol++V!HW;%mO9=
Di}?=E

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rd9^Vn{UW0U;+S=
CE)Mko

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E16B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E16B.bin
index 2c657dbfddc5c3506ea7270cf6e8470e799b3f69..5194a2e5a2ef9d3381cc213465c1460bd029d31e 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wol++Vz&8)%mO9=
Di~kPL

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rd9?fn{UW0U;+S=
CG!FIv

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E17B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E17B.bin
index bc47f8bc52c337cc71ccacf682e219dfcc8980e0..bc6bbaea62eb328a45f5de6704e45c9e4e69e0ab 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wol++V!ru?%mO9=
Dj0FzS

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!ra-j$hRgyc0FpWm
A_W%F@

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21E_SAML21E18B.bin
index e23f135c608310881d6e7364e15acb726199576e..308f2717e2c3ae0badd4a4362faa8e4f72e3f28b 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wol++VzK##%mO9=
Dj0+CZ

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rd9@Kn{UW0U;+S=
CKo0l-

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G15A.bin
index 64da336d16016a3e8bc567df5245014ebd3fdb49..7984f6ffd4d15a88f2f33dbf3b136304008ce2e3 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UOwBh3NQ5u}00rU;KL7v#

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jnbaQ}22onGdvkPee

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G16A.bin
index 9f09b2f67efd274841cff5501fbfd9462c247b35..32207320ad68ce472c31962f4fbc58a1638c5d69 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UOf5DCNQ5u}00rm^KmY&$

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jnY;%A_2onGdxeICl

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G17A.bin
index 1c2256e96e8e3e731592b1be7fc4f87023837f2d..dfee15a75f575499f32787b1b0de96342a969ae8 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UOf5DCNQ5u}00rm^KmY&$

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jnY;%A_2onGdxeICl

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMC21G18A.bin
index 72cc008828bbcc6767ef2ad89938ad67dba2ca11..69f457e72531ab389e21af5799aeaeae3908c7b1 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UOf5GDNQ5u}00r&~K>z>%

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jnd~<+A2onGdzYA*s

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G15A.bin
index 690dfe8a31bf5212ca2268772c12e664f865d407..7d6bbc2b1a9e074c159f97408de2412ab29ffe0e 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynHp{ukzK$901<=>k^lez

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^&<z^At1xx@KiVMX6

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G16A.bin
index 4529312cab4266224c0c51f28cd71d7be318ff85..cfe30b9102450efa9de1d324946d5fe09f34f4bc 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynHp^tkzK$901=7{lK=n!

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ_D!DbQJ1xx@KTMNAa

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G17A.bin
index 4ce924fee1030ffe2e2afcd643123c123ab919f7..dabdf123f3f660044866e868be5f5d56d9827a24 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynHp~vkzK$901=Q2lmGw#

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ_D;bsxp1xx@KVGF(h

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAMD21G18A.bin
index 18a98aa24df43c3f3411b2d6d2b261114a648f30..f0b405f9a5da95e33ff587a23726d6e10e87e437 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%zynVM`CkzK$901=i8l>h($

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ_D(Pk0Z1xx@KXA8do

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G16B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G16B.bin
index 34a3e27bd24e6112ae636d9d3e3eb947cc771cf1..a26ab27df2ac9d8fdc7ab694c438f37c4306a6fb 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wol++YP$J`%mO9=
Di~tVM

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rdEc=n{UW0U;+S=
CH4gRw

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G17B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G17B.bin
index 22c7b037cd09f3ab33ca8c771df52525d34a97bd..fe3cce90cd35dcfd190ab2937af12d0ae7ee000f 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wol++YP$J`%mO9=
Di~tVM

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rdEc=n{UW0U;+S=
CH4gRw

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21G_SAML21G18B.bin
index 9c04d4738b90ef47bdb6f6e97d2a4939bfdb7e8f..fce3b5b3302e79b3fcf85f9f0c32a399f3fbf3f3 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{WoiaQn{UW0U;+S)
C1`g2x

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rdEa~n{UW0U;+S=
CI}Y~%

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J15A.bin
index 1dc8d3364115798faf3100e553e863b1ad67499d..c6797f965c3635626b9e711a5fc49b2d619f5e49 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?V49qqMNQ5u}00qJeIsgCw

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jfWOIN-2onGdv<qnf

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J16A.bin
index 44f62141750e6dbc3ee68191692c231595af5b3a..fd76e56126a00d43b32f5c7194b7f5a3c70c521f 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?V49qqMNQ5u}00qJeIsgCw

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jfWOIN-2onGdv<qnf

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J17A.bin
index a1d9cc7ef4c3e8e661c182d3a03e7bed759448bb..8916dd16ed52c4143ec33d8cc7cb199316b40812 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?V49qtNNQ5u}00qbkI{*Lx

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jfbaQ}22onGdx(jLm

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMC21J18A.bin
index 0a7b7f8efed15e6a46989d677f050eee8415e157..c76d7026cee2cb165a168c00a799d6d1192d01ed 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?V3@kPWNQ5u}00qtqJOBUy

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz|_jfY;%A_2onGdzzb^t

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J15A.bin
index 7e47350631f9c8846e3c86ae7b69f19f0b839931..39497992243cc643abdc2d6bdbeab1ac65bb7d31 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%z!85nF9kzK$901;#hjQ{`u

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ_D#by!N1xx@Kiwng7

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J16A.bin
index 0eb2912cd524f3071c447da6ef9ae63bdb8860b6..112f23a9739282f8bd9c0b1d0e452006a93d1bc6 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%z!85nLBkzK$901;{njsO4v

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ_D<z^At1xx@KkqgEE

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J17A.bin
index 36db9320918f3bc726fa177976355d961692239f..8a86c85ba9033a9a20c286e5a3574524ebb74665 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%z!85nIAkzK$901<Etj{pDw

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^|!DbQJ1xx@KVhg?i

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAMD21J18A.bin
index 693e2f50dc0980bf5559fd9966a75090a83a9728..fc69c2bc434034ae84720094e26a860e28022d39 100755
GIT binary patch
delta 40
wcmdmDzr}vTGIqw<o0qdkii-H<mnj$-DHs_Tnll(0S(%z!85nIAkzK$901<Etj{pDw

delta 40
ucmdmDzr}vTGIqw>o0qdkii&uZ<|!B%0Fj|NgQ0<yfvJ^|!DbQJ1xx@KVhg?i

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J16B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J16B.bin
index d233117a987813663d4a6ec22916a5b1f7915b6e..9d9e77619d6d7050625c8f5a34b345fe93ab3c29 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wom9^V7&Q;%mO9=
Di`ov#

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rdCFVn{UW0U;+S=
CFb?$q

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J17B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J17B.bin
index bf46e00312c9ffb0185e88e73306cf697a9986ef..b11c060dc58d3eb281419ce5dbd768659ee7b87b 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wom9^V6yp!%mO9=
Di{K8+

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rdCEqn{UW0U;+S=
CHV*ax

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Generic_x21J_SAML21J18B.bin
index 71aaef5ec33dd1c7fe1ddd8d1b25ee57a89142af..cb6a8398988fa4e854a8b6fb481ee714a885d67d 100755
GIT binary patch
delta 47
zcmexi_rq?(3?@c}%`=(KvM|oxoX#FAD&m)4reI{GU}Ruu&R}R{Wom9^V7mE+%mO9=
Di{=i@

delta 47
zcmexi_rq?(3?@dI%`=(KvM}D>oX#FAD&kd|r(k3NM26-Jh6Yv!rdCGAn{UW0U;+S=
CJP!8&

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D11_SAMD11D14AM.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D11_SAMD11D14AM.bin
index c349e2e00df8b1877310db7b9c1efebcd5eb132e..8cefe0b89e89e8193ff5bb6d33cfcfc407d92cf0 100755
GIT binary patch
delta 326
zcmX>j|3;qg4?lxKAQJ<FBM`eXO%#+CVPIhJ1ae@&7s!4((N>*t&%{)1ATjY^eag@8
z&kwjUxBxYI-_E$j_WNpqJCM)8;P7Lsrgwv4RECB>mvdA?REC^lmot+hh`l?LLrK_K
z*>86uqq1><am6imma7Wh(G}5~7_`6Nmh)*)THM2+I@x(~%m43J{!4pHWi%*H;+w=Y
zn?cxlagv1h<D^N-(F`EjqfY-9_b>qs19A5M-<rViLGP!acQKIG`l*y9;4SQ+oW!iW
z8OT@q$qN>j`^n?Q>n)XFTU1-Lx9D%tkIBCoW!eA#`Tw7pjd8L#(?Z4rn|CrTWn`Q^
zIiAIt(Pr{u7Dq<u$xm6-IobdHQfOfK|DAcWD61zYW7*_*K4V6g$&>j^8E<bs$;ZqH
E0P)0h*Z=?k

delta 318
zcmaDOe@33~4?lx~Ark|GA`q)GO%#+CVPIg;1ae?N7sx(3(N>*t&csx0ATjY^eaO%6
z&kwjUxG*>}dEd^s#rFGZfjf}T!QfD^RoS~iF)BmJm&-XSAu2;ovCElB5yW1d$)P0d
zEbF&Akx|*Wz_{WTJIhrm@92u?O$^%KZ%g<zC@t=p?7X<;|M#o^#k{358k8sTO=6nO
zAnd$2N!a^w(j?_*29WHr|BKyvn1DttZedXQ|9$`eEeQ-C<bHB{7XxXjpIlzt-ckuV
zML9)liry3z>}7CZaAaTsk~}~Rbf8K?14F}Zt{Mh*=E>$v3mF$|zR9$dk@5EAdKPC!
zpUH<=92vDIv$CplivRni(7^EjyYOaHR!>gGw#oH;#*878H}jb?zTW(jkC_nwpGIk~

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E17A.bin
index d13db9e7111eb76d99dd7cb18c2c0c9621c2b98f..a9d7ac6a9bbaed84da1a9a307741c05d012ab7e0 100755
GIT binary patch
delta 40
wcmX?Lf53jjI(Ej{o7c0)ii-H<mnj$-DHs_Tnll(0S(%zy8JlfZkX^t802ky7%>V!Z

delta 40
ucmX?Lf53jjI(Ej}o7c0)ii&uZ<|!B%0Fj|NgQ0<yfr*u=(PjnN1xx@Q$_x4c

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_A_SAMD21E18A.bin
index f6baa4464b31dee219259e9204d2227d316b36b8..b522e98a12b176bf1125e856628336b7067336fb 100755
GIT binary patch
delta 40
wcmX?Lf53jjI(Ej{o7c0)ii-H<mnj$-DHs_Tnll(0S(%zy8JllbkX^t802k^D&Hw-a

delta 40
ucmX?Lf53jjI(Ej}o7c0)ii&uZ<|!B%0Fj|NgQ0<yfr*u=@n!|t1xx@Q&<pzj

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMC21E18A.bin
index af53b978f30c9b12d185653e14052844ae622e46..4a452f0fc549b81e1dea8bb96bbf421ea3f51c72 100755
GIT binary patch
delta 40
wcmZ2ty2Nxt5)0$(&B-h`g+=`G%M^@^6pRcE%^3`htW3?UObj*$NQ5u}00prNHvj+t

delta 40
ucmZ2ty2Nxt5)0$)&B-h`g+;td^AwB>fXL9C!O+0Uz{JYbVsn5*2onGd*b8p}

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E17A.bin
index 8187c0b03b4be4f012895b8c719f31db09c3a17c..d0f393e79d80d0f08f0955c68d71c07b19b3c658 100755
GIT binary patch
delta 143
zcmdmDzr%h)3Zu=$RBc9^jT60D867s?Wj)ErID7MQc3nQk3!ATsS~D^}*(@l|&BCZM
zSyozHmqC_+K@*6XfLIrZS%6poh$Vq|4FiLMERa?NVr3v!pPVQi&1kcEuQU%Mi-L=h
k;pCGt<|2OiWeP?{3PuKo<_v~LR;FfF#ul4JWEU_20JJL~EdT%j

delta 138
zcmdmCzr}t+3ZuouRBc9!jT60D8ErP-Wj)Erczg45c3nQkGn=o9S~D^}*eoc{&BCZK
zSyozH_m2z%gQ_e8!#^Oc38Wc-m<NbOfp`rAgMuWGmIY#YAXc87C>_mcv3ajF598#s
fGUg&)rFjZQ20&zJ&R}R@Wnf}uYPMNIb^#Lr(P1D@

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAMD21E18A.bin
index 03dbd7ef3d14663afedfbbfd221f05dec04c747d..70a6bf3f5465b8efeb2b17cddac5f16bda40e98f 100755
GIT binary patch
delta 143
zcmdmDzr%h)3Zu=$RBc9^jT60D867s?Wj)ErID7MQc3nQk3!ATsS~D^}*(@l|&BCZM
zSyozHmqC_+K@*6XfLIrZS%6poh$Vq|4FiLMERa?NVr3v!pPVQi&1kcEuQU%Mi-L=h
k;pCGt<|2OiWeP?{3PuKo<_v~LR;FfF#ul4JWEU_20JJL~EdT%j

delta 138
zcmdmCzr}t+3ZuouRBc9!jT60D8ErP-Wj)Erczg45c3nQkGn=o9S~D^}*eoc{&BCZK
zSyozH_m2z%gQ_e8!#^Oc38Wc-m<NbOfp`rAgMuWGmIY#YAXc87C>_mcv3ajF598#s
fGUg&)rFjZQ20&zJ&R}R@Wnf}uYQ9-Qb^#Lr(Ptn~

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_MT_D21E_rev_B_SAML21E18B.bin
index ce3d4b5ab0f61830786a85897a212f2ea55d0db4..ee5a7a9c283d18b25bff4d82fd62e6fe81de47c7 100755
GIT binary patch
delta 153
zcmexi_s4ER3KN6;#564+xp5L36QjcBnM~Zwj4Yd%vL0k)oV_`n-H?xQ%I2A(){KlR
zHeVIvW?_6W`Jt4!?hzRVhPOa`42VAh@d+Tl0>pQLcnt%C!b2ea6o{V#@$1Q|($P!|
uvYVTvxfxj$e2fey_sW=y_~n-=7#S%T85o)~7#dlbnpqiJZoVP2fC&IQX({Uf

delta 148
zcmexk_rq>N3ez9CiD_Cua^oa6CPtafGnu%V85uS&Wj)Bqczbg?yCEOrgv~QWtr;1Y
zY`!YS&BFL(@<S<c-2*ZV3@?HB5D>ow;v+zO0f=t`@frpOg}XrdArL<X;^&i9rK6et
o$ZT$s=4PBcQN~=vt29r+$N-28%^3_0tPD)7Of5Fwky*e50JhgG0RR91

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMC21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMC21J18A.bin
index 456f32d176d821a52bfc5e2b39e5598f6e313ff7..59e5e3e4b9f1b20b13cf2e9c2968bc9082522b09 100755
GIT binary patch
delta 40
wcmZ2uy2f-v5)0$(&B-heg+=`G%M^@^6pRcE%^3`htW3?Uj7>I2NQ5u}00}Y+S^xk5

delta 40
ucmZ2uy2f-v5)0$)&B-heg+;td^AwB>fXL9C!O+0Uz{JYbbaRA62onGhHVcdZ

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD21J18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD21J18A.bin
index d8f64bb02fee2b7a93123eea9435f52fe7ec5297..37d9dacc7a84d0a2acae15e70f14b2995037e5fe 100755
GIT binary patch
delta 160
zcmdmDzr%h)3Zu=$RBc9^jT60D867s?Wj)ErID7MQc2hpa3!CqXS~D^}*(@o}&El#e
z%fP_H%%C6u#A}!s6gYtNMg|522B5em5HkU>E)cT-u>cTD0`VH4yeyDb1Y%_%R-c?H
w9nEO7`KUBABa4EIk>TVMG8V#q`DF@5MhZp-hUN^0MpmX~R>qr!Wfw9509alikpKVy

delta 155
zcmdmCzr}t+3ZuouRBc9!jT60D8ErP-Wj)Erczg45c2hpaGn?;<S~D^}*eof|&El#c
z%fP_H%%C6u#A}!s6gYtNMg|6jKQasqszAAaKw1+>Gl0|qu_zF)0m@4PX;~na2V&*P
rnbOgW7MqVsGc!&;BV!@#Rhp+@WB^2l<_v}gRt6?krkllO7cv0=Z$BZm

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD51J20A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAMD51J20A.bin
new file mode 100755
index 0000000000000000000000000000000000000000..a95951f7eee4024317b7ac580f361185bfae209b
GIT binary patch
literal 8000
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

literal 0
HcmV?d00001

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAML21J18B.bin b/bootloaders/zero/binaries/sam_ba_sdcard_Xeno_SAML21J18B.bin
index 2351bb148d40f046b8ade18c685ba82acde04166..eff2d627a43c536a4a86d943e3c32fbbfeab8960 100755
GIT binary patch
delta 171
zcmexi_s4ER3KN6;#564+xp5L36QjcBnM~Zwj4Yd%vL0k)oV_`n-I9-S%I1Zl){KlR
zHs2NFW^sKX!@$79%%C6u#A}!s6gYtN1_lO&BS7)DKzs~{KLYUyAie^`cY$~fQ2rs1
zehS3Tf%x@gUFm2h2HDMB(oBpj3O+`LlY3+=MEvs06pV}%j0_CT84QiAOwFu}jW^$r
HS-=DU)VM0W

delta 166
zcmexk_rq>N3ez9CiD_Cua^oa6CPtafGnu%V85uS&Wj)Bqczbg?yComvgv|>@tr;1Y
zY`!bT&Eon*hJk^HnL$ASh}SSNC~yGj4Gatl2Y}))f%p&*zXjqWKzsp+Zvycep!{7R
z{Sb&B1M&08y3)~1e`GdyNi#7{o*-i(;#HcbU}OM9hUN^0237_pR;DJK@5n4*0swMt
BEY$!2

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_SAMD21G18A.bin
index da6366e6c793b67837eb62d5cc40a5a0372cc634..9f8ec856d5bc14ef8af5f27d38717d5ee7a17d73 100755
GIT binary patch
delta 40
wcmdmCzr%jRI(Ej{o7c04ii-H<mnj$-DHs_Tnll(0S(%z!8JcaDkX^t802FTvtN;K2

delta 40
ucmdmCzr%jRI(Ej}o7c04ii&uZ<|!B%0Fj|NgQ0<yfvJ^|<z@-l1xx@NcnjYE

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_m0_pro_SAMD21G18A.bin
index 64cf3afa9f61982b21789040040d8442bead58aa..57ea57743350895239d807a9a3843c93106069a0 100755
GIT binary patch
delta 40
wcmdmEzsG*VI(Ej{o7b~Pii-H<mnj$-DHs_Tnll(0S(%z!8JcgFkzK$902VC^y#N3J

delta 40
ucmdmEzsG*VI(Ej}o7b~Pii&uZ<|!B%0Fj|NgQ0<yfvJ_T!DboR1xx@P0So5<

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkr1000_SAMD21G18A.bin
index 1afe3eb3d56f3724e0c9141eb9e1ffaa642cbfa6..9388e0837112899a3a95d609669898f303232cc8 100755
GIT binary patch
delta 717
zcmXYtUr19?9LLYOck@n7o37oh?X2D11+%TCclj^L{Fhp883eu<!c{D8`OqMc3DJrk
zGD6S}p_r9XLV_=PTRkoJ5Y*#cg#|&Ze@KL|P`YcldpkmKKIa3!-}jvJ<7AI5wM-s`
zom0&|s>VHa-cR=BJGBtT@N2jVH}OsC9DIQ{s6{v=Pt(m5RqK}5jBg;khaWP7upUFx
zZ8$AYm^zJcOMX|z(52CWfZ${!0@)G#!#ontC4^H#uU~>8xAJQR1W>xVr#fPbLEhF1
z6|Y#5;iZG&*>;%riRBru=s%&WpYlG@+hdV#Y?{V(@BI!goDk1S_HJDr{yX&C8@|S$
zp=ZVZK~I?P0sH$!;bMv}rix1{i%L2|LkvGBa>yYTc_?0wt0Q?16?u51s}J(??Q9xk
z>vPtyfj1yW^s&UDnQluMR6zyuj;J#R0$U2;K=w)=WZ&nv*CD5?O8)zLs*6+s*Z`SE
z18Cij1Fr7+Wrlmi0B{_%nKK}>N|QbS+#JD_(A0nqvdej^DQQj^!^VhL)Ko?1kVn$g
zm)KX?25Eeu@@MJ3oG@M`-CEJrARe$RGbxhM)DN<CPaIafLgX^Co)JGGJjDxEcd$=m
zGCQF!8chs6n)+5#lc}y@l4QtZkcX3S(Jom?rUn1DI;~?G7h_3co&uaX!9;dW$FYYE
zLNh+iS`Q2qfOn?dsBn^i{G`{Z(a4UX$(?*Iu`6Ok94aUElX!x)!605>1Ms7qW_Q!n
zw*vmUm#5YXxX7_a*<JXvgFUoGW_7s$_(SX=&Ji1k%Lq$k$_ipD!A5YpFz@WAYFzSF
u=RR2LVgWcp=p&2~?*4a@c$9ob@1;>L6yicPLIV&&O?3@T!eLoK^VB~P#qU!9

delta 670
zcmXYtT}TvB7>3U`>+FnwxUM;_yT^5Q%rs5ejfG6KXe}jYyU4p1j8*#?DnjT7s|)ig
zBLeMQs9_{X7lJq2v=Y*icX`ppN+^U<E@aY$F_1B~<V@c}aGvvW-t(UGedo-dG)|1Q
zLH>Aq9k=TrztVtn;#n9V#y-G%SY?m6%P_@uxH&kjPdM5+ZqKi;@yh_~?4{5L9tPqQ
zxTilA&+xFOe<~Ing+2Qr3S%vl80XlQ>-z8^)s?K&JhV32O~tgWltuWJkze8{>zIvq
zXr3<Hy#J?vp;~>Y^f;c!V|`VszdIHWTw7A|x%>jRv!FxiCkF*(IxbUh+!^2$+Z@Tt
z)EQ8yZNACQM5GmBH1CzFc}gDj4$f*ao$M-6Nj;=N@zxIdhDhUXn#jbsoh8P{?B8vW
zZS#Bf+xAi?x`gbIO%`-}d}nQ9B(h@4mE=`ES`)X-pSDZ`nq_XV0rx2guvhLMg>8GG
z(R%IiYui-WR9Qm!f*H&Ft)D+I45g!#<gS#5P&MQR%am6)-LizuT*$T@s1UGB!!lD#
zotH2vU@=f&4CXvq8D@G}ljJL(u;d{L6Ehr<T}dIDJN<(7N=<dmmP}o#oIjWpqfRQ*
zV%&SMPiiJ3d|K8*v;o%xEFo1?UPZT#hUsLaAWe=4>BCf^E%+RjWu!)!){84j92{88
z?^QV7ViE6J=LR-i<iMiHJQfjA6WHck^fSmJvW2`umXQ@?9`{#KKO^hNSIRE>V%#p(
w7kz#RXUYlLM=B*k+K~(Ybp-V;{#N&$oAS{hj?gg@3bqErt>NQ(QPm9h5129GBme*a

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrfox1200_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrfox1200_SAMD21G18A.bin
index 78a872195887f4ccc97781c215202e221093e230..304f8f8eae603c1db7f34d6531059bfe39be955f 100755
GIT binary patch
delta 40
wcmdmBzrlXPJa)#}o9DB~ii-H<mnj$-DHs_Tnll(0S(%z!8JcbukX^t801l}OdjJ3c

delta 40
ucmdmBzrlXPJa)$0o9DB~ii&uZ<|rtbDHs_Tnll)fSeXKm`DOvx1xx@G-3zGz

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_mkrzero_SAMD21G18A.bin
index ec41692074ccf09e680780018e1ba11b7e7099c4..3af55636939d068dc2b6591af12da6297df7c73f 100755
GIT binary patch
delta 40
wcmdmBzrlXPJa)#}o9DB~ii-H<mnj$-DHs_Tnll(0S(%z!8JcVskX^t801l%IdH?_b

delta 40
ucmdmBzrlXPJa)$0o9DB~ii&uZ<|!B%0Fj|NgQ0<yfr*u=;bsBZ1xx@Hlnbc<

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_arduino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_arduino_zero_SAMD21G18A.bin
index d447131cba64548a3bcb0914e17fc7b81a90308d..eeef76fcb3d9b9722c97ab2167313ad3c6a13fd5 100755
GIT binary patch
delta 40
wcmZ2uzs7#UJa)#}o9DAfii-H<mnj$-DHs_Tnll(0S(%z!85(ZpkzK$901Vj+X8-^I

delta 40
ucmZ2uzs7#UJa)$0o9DAfii&uZ<|!B%0Fj|NgQ0<yfr*ug#bzGa1xx@F{|lc0

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_genuino_mkr1000_SAMD21G18A.bin
index b249103bb01de48bc7891a4333793a4db0b053fe..5e8afe21ad15f91452e8eb3ffba55618f7035b35 100755
GIT binary patch
delta 40
wcmZ2uzs7#UJa)#}o9DAfii-H<mnj$-DHs_Tnll(0S(%z!85(cqkzK$901V{|X#fBK

delta 40
ucmZ2uzs7#UJa)$0o9DAfii&uZ<|!B%0Fj|NgQ0<yfr*u=!Db%W1xx@F)(e;b

diff --git a/bootloaders/zero/binaries/sam_ba_sdcard_genuino_zero_SAMD21G18A.bin b/bootloaders/zero/binaries/sam_ba_sdcard_genuino_zero_SAMD21G18A.bin
index b7f09e2db644459c97443b74519e0b8829da1433..2f0388eca176a9a8d1a6ad20faa65add9ace3819 100755
GIT binary patch
delta 40
wcmZ2uzs7#UJa)#}o9DAfii-H<mnj$-DHs_Tnll(0S(%z!85(WokzK$901V#?XaE2J

delta 40
ucmZ2uzs7#UJa)$0o9DAfii&uZ<|!B%0Fj|NgQ0<yfr*ug<z^n)1xx@G1q+}6

diff --git a/bootloaders/zero/board_definitions.h b/bootloaders/zero/board_definitions.h
index c74881b9d..79c3d77d5 100644
--- a/bootloaders/zero/board_definitions.h
+++ b/bootloaders/zero/board_definitions.h
@@ -63,7 +63,7 @@
 // Common definitions
 // ------------------
 
-// These are undefined in CMSIS for L21 and C21
+// These are undefined in CMSIS for L21, C21, and D51
 #if (SAML21)
 #ifndef GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
   #define GCLK_CLKCTRL_ID_SERCOM0_CORE_Val	18
@@ -82,6 +82,17 @@
   #define GCLK_CLKCTRL_ID_SERCOM4_CORE_Val	23
   #define GCLK_CLKCTRL_ID_SERCOM5_CORE_Val	25
 #endif
+#elif (SAMD51)
+#ifndef GCLK_CLKCTRL_ID_SERCOM0_CORE_Val
+  #define GCLK_CLKCTRL_ID_SERCOM0_CORE_Val      7
+  #define GCLK_CLKCTRL_ID_SERCOM1_CORE_Val      8
+  #define GCLK_CLKCTRL_ID_SERCOM2_CORE_Val      23
+  #define GCLK_CLKCTRL_ID_SERCOM3_CORE_Val      24
+  #define GCLK_CLKCTRL_ID_SERCOM4_CORE_Val      34
+  #define GCLK_CLKCTRL_ID_SERCOM5_CORE_Val      35
+  #define GCLK_CLKCTRL_ID_SERCOM6_CORE_Val      36
+  #define GCLK_CLKCTRL_ID_SERCOM7_CORE_Val      37
+#endif
 #endif
 
 #define LED_POLARITY_LOW_ON             0
@@ -109,7 +120,7 @@
  */
 #if (SAMD21 || SAMD11)
   #define BOOT_DOUBLE_TAP_ADDRESS           (HMCRAMC0_ADDR + HMCRAMC0_SIZE - 4)
-#elif (SAML21 || SAMC21)
+#elif (SAML21 || SAMC21 || SAMD51)
   #define BOOT_DOUBLE_TAP_ADDRESS           (HSRAM_ADDR + HSRAM_SIZE - 4)
 #else
   #error "board_definitions.h: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
@@ -124,6 +135,8 @@
     #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
   #elif (SAML21 || SAMC21)
     #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM0
+  #elif (SAMD51)
+    #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBAMASK_SERCOM0
   #endif
 #elif (BOOT_USART_SERCOM_INSTANCE == 1)
   #define BOOT_USART_MODULE                   SERCOM1
@@ -132,6 +145,8 @@
     #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM1
   #elif (SAML21 || SAMC21)
     #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM1
+  #elif (SAMD51)
+    #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBAMASK_SERCOM1
   #endif
 #elif (BOOT_USART_SERCOM_INSTANCE == 2)
   #define BOOT_USART_MODULE                   SERCOM2
@@ -140,6 +155,8 @@
     #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM2
   #elif (SAML21 || SAMC21)
     #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM2
+  #elif (SAMD51)
+    #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBBMASK_SERCOM2
   #endif
 #elif (BOOT_USART_SERCOM_INSTANCE == 3)
   #define BOOT_USART_MODULE                   SERCOM3
@@ -148,6 +165,8 @@
     #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM3
   #elif (SAML21 || SAMC21)
     #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM3
+  #elif (SAMD51)
+    #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBBMASK_SERCOM3
   #endif
 #elif (BOOT_USART_SERCOM_INSTANCE == 4)
   #define BOOT_USART_MODULE                   SERCOM4
@@ -156,6 +175,8 @@
     #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM4
   #elif (SAML21 || SAMC21)
     #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM4
+  #elif (SAMD51)
+    #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM4
   #endif
 #elif (BOOT_USART_SERCOM_INSTANCE == 5)
   #define BOOT_USART_MODULE                   SERCOM5
@@ -164,6 +185,20 @@
     #define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM5
   #elif (SAML21 || SAMC21)
     #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM5
+  #elif (SAMD51)
+    #define BOOT_USART_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM5
+  #endif
+#elif (BOOT_USART_SERCOM_INSTANCE == 6)
+  #if (SAMD51)
+    #define BOOT_USART_MODULE                   SERCOM6
+    #define BOOT_USART_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM6_CORE_Val
+    #define BOOT_USART_BUS_CLOCK_INDEX          MCLK_APBDMASK_SERCOM6
+  #endif
+#elif (BOOT_USART_SERCOM_INSTANCE == 7)
+  #if (SAMD51)
+    #define BOOT_USART_MODULE                   SERCOM7
+    #define BOOT_USART_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM7_CORE_Val
+    #define BOOT_USART_BUS_CLOCK_INDEX          MCLK_APBDMASK_SERCOM7
   #endif
 #endif
 
@@ -174,6 +209,8 @@
     #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM0
   #elif (SAML21 || SAMC21)
     #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM0
+  #elif (SAMD51)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBAMASK_SERCOM0
   #endif
 #elif (SDCARD_SPI_SERCOM_INSTANCE == 1)
   #define SDCARD_SPI_MODULE                   SERCOM1
@@ -182,6 +219,8 @@
     #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM1
   #elif (SAML21 || SAMC21)
     #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM1
+  #elif (SAMD51)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBAMASK_SERCOM1
   #endif
 #elif (SDCARD_SPI_SERCOM_INSTANCE == 2)
   #define SDCARD_SPI_MODULE                   SERCOM2
@@ -190,6 +229,8 @@
     #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM2
   #elif (SAML21 || SAMC21)
     #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM2
+  #elif (SAMD51)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBBMASK_SERCOM2
   #endif
 #elif (SDCARD_SPI_SERCOM_INSTANCE == 3)
   #define SDCARD_SPI_MODULE                   SERCOM3
@@ -198,6 +239,8 @@
     #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM3
   #elif (SAML21 || SAMC21)
     #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM3
+  #elif (SAMD51)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBBMASK_SERCOM3
   #endif
 #elif (SDCARD_SPI_SERCOM_INSTANCE == 4)
   #define SDCARD_SPI_MODULE                   SERCOM4
@@ -206,6 +249,8 @@
     #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM4
   #elif (SAML21 || SAMC21)
     #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM4
+  #elif (SAMD51)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM4
   #endif
 #elif (SDCARD_SPI_SERCOM_INSTANCE == 5)
   #define SDCARD_SPI_MODULE                   SERCOM5
@@ -214,6 +259,20 @@
     #define SDCARD_SPI_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM5
   #elif (SAML21 || SAMC21)
     #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBCMASK_SERCOM5
+  #elif (SAMD51)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM5
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 6)
+  #define SDCARD_SPI_MODULE                   SERCOM6
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM6_CORE_Val
+  #if (SAMD51N) || (SAMD51P)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM6
+  #endif
+#elif (SDCARD_SPI_SERCOM_INSTANCE == 7)
+  #define SDCARD_SPI_MODULE                   SERCOM7
+  #define SDCARD_SPI_PER_CLOCK_INDEX          GCLK_CLKCTRL_ID_SERCOM7_CORE_Val
+  #if (SAMD51N) || (SAMD51P)
+    #define SDCARD_SPI_BUS_CLOCK_INDEX        MCLK_APBDMASK_SERCOM7
   #endif
 #endif
 
diff --git a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
index 9a0ea5571..253dcc164 100644
--- a/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
+++ b/bootloaders/zero/board_definitions/board_definitions_MT_D21E_rev_B.h
@@ -206,7 +206,13 @@
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
-#define STRING_PRODUCT "MT-D21E Rev B"
+#if (SAMD21)
+  #define STRING_PRODUCT "MT-D21E Rev B D21"
+#elif (SAML21)
+  #define STRING_PRODUCT "MT-D21E Rev B L21"
+#elif (SAMC21)
+  #define STRING_PRODUCT "MT-D21E Rev B C21"
+#endif
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
diff --git a/bootloaders/zero/board_definitions/board_definitions_Xeno.h b/bootloaders/zero/board_definitions/board_definitions_Xeno.h
index 310fea453..76bce7a81 100644
--- a/bootloaders/zero/board_definitions/board_definitions_Xeno.h
+++ b/bootloaders/zero/board_definitions/board_definitions_Xeno.h
@@ -45,17 +45,25 @@
 /* If SDCARD_ENABLED is defined, then all SDCARD_SPI_* defines must also be set.
  * When setting SDCARD_SPI_PADx defines, consult the appropriate header file
  * from CMSIS-Atmel (ie: ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-
- * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/
+ * Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/sam<d21|c21|l21|d11|d51>/include/
  * <YOUR_CHIP>.h). SDCARD_SPI_PAD_SETTINGS values are in SDCard/diskio.h.
  * When using SDCARD_USE_PIN1 or SDCARD_USE_PIN2, the SPI peripheral and
  * associated pins are only initialized if either pin is active.
  */
 #define SDCARD_SPI_SERCOM_INSTANCE      5
-#define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
-#define SDCARD_SPI_PAD0                 PINMUX_PB30D_SERCOM5_PAD0
-#define SDCARD_SPI_PAD1                 PINMUX_UNUSED
-#define SDCARD_SPI_PAD2                 PINMUX_PB22D_SERCOM5_PAD2
-#define SDCARD_SPI_PAD3                 PINMUX_PB23D_SERCOM5_PAD3
+#if (SAMD51)
+  #define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD3_TX_PAD0_SCK_PAD1
+  #define SDCARD_SPI_PAD0                 PINMUX_PA23D_SERCOM5_PAD0
+  #define SDCARD_SPI_PAD1                 PINMUX_PA22D_SERCOM5_PAD1
+  #define SDCARD_SPI_PAD2                 PINMUX_UNUSED
+  #define SDCARD_SPI_PAD3                 PINMUX_PA21C_SERCOM5_PAD3
+#else
+  #define SDCARD_SPI_PAD_SETTINGS         SPI_RX_PAD0_TX_PAD2_SCK_PAD3
+  #define SDCARD_SPI_PAD0                 PINMUX_PB30D_SERCOM5_PAD0
+  #define SDCARD_SPI_PAD1                 PINMUX_UNUSED
+  #define SDCARD_SPI_PAD2                 PINMUX_PB22D_SERCOM5_PAD2
+  #define SDCARD_SPI_PAD3                 PINMUX_PB23D_SERCOM5_PAD3
+#endif
 
 /* If SDCARD_ENABLED is defined, then SDCARD_SPI_CS_PORT and SDCARD_SPI_CS_PIN
  * must also be defined. PORT can be 0 (Port A) or 1 (Port B).
@@ -160,7 +168,7 @@
  * also be defined with the crystal frequency in Hertz. CLOCKCONFIG_INTERNAL
  * uses the DFLL in open-loop mode, except with the C21 which lacks a DFLL, so
  * the internal 48MHz RC oscillator is used instead. CLOCKCONFIG_INTERNAL_USB
- * can be defined for the D21, D11, or L21. It will also use the DFLL in
+ * can be defined for the D21, D11, L21, or D51. It will also use the DFLL in
  * open-loop mode, except when connected to a USB port with data lines (and
  * not suspended), where it will calibrate against the USB SOF signal.
  */
@@ -179,7 +187,7 @@
 
 /* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
  * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
- * a more accurate 48MHz output frequency at the expense of increased jitter.
+ * a more accurate output frequency at the expense of increased jitter.
  */
 //#define PLL_FRACTIONAL_ENABLED
 
@@ -192,8 +200,15 @@
  */
 //#define PLL_FAST_STARTUP
 
-/* Master clock frequency (also Fcpu frequency) */
+/* Master clock frequency (also Fcpu frequency). With the D51,
+ * this can be either 120000000ul or 48000000ul. See README.md.
+ */
+#if (SAMD51)
+#define VARIANT_MCK                       (120000000ul)
+//#define VARIANT_MCK                       (48000000ul)
+#else
 #define VARIANT_MCK                       (48000000ul)
+#endif
 
 /* The fine calibration value for DFLL open-loop mode is defined here.
  * The coarse calibration value is loaded from NVM OTP (factory calibration values).
@@ -206,7 +221,15 @@
  */
 #define USB_VENDOR_STRINGS_ENABLED
 #define STRING_MANUFACTURER "MattairTech LLC"
-#define STRING_PRODUCT "Xeno"
+#if (SAMD21)
+  #define STRING_PRODUCT "Xeno D21"
+#elif (SAML21)
+  #define STRING_PRODUCT "Xeno L21"
+#elif (SAMC21)
+  #define STRING_PRODUCT "Xeno C21"
+#elif (SAMD51)
+  #define STRING_PRODUCT "Xeno D51"
+#endif
 
 /* If USB CDC is used, then the USB vendor ID (VID) and product ID (PID) must be set. */
 #define USB_VID_HIGH   0x16
@@ -218,7 +241,7 @@
  * See board_driver_serial.h for BOOT_USART_PAD_SETTINGS values. When setting
  * BOOT_USART_PADx defines, consult the appropriate header file from CMSIS-Atmel (ie:
  * ~/arduino15/packages/MattairTech_Arduino/tools/CMSIS-Atmel/1.0.0-mattairtech-1/
- * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
+ * CMSIS/Device/ATMEL/sam<d21|c21|l21|d11|d51>/include/<YOUR_CHIP>.h). Use PINMUX_UNUSED
  * if not used. By default, this interface is not enabled (except with the C21).
  */
 #define BOOT_USART_SERCOM_INSTANCE        4
diff --git a/bootloaders/zero/board_driver_usb.c b/bootloaders/zero/board_driver_usb.c
index ee66620b1..53c5bb970 100644
--- a/bootloaders/zero/board_driver_usb.c
+++ b/bootloaders/zero/board_driver_usb.c
@@ -22,14 +22,22 @@
 #include "sam_ba_usb.h"
 #include "sam_ba_cdc.h"
 
+#if (SAMD51)
+  #define NVM_CALIBRATION_ADDRESS           NVMCTRL_SW0
+  #define NVM_USB_PAD_TRANSN_POS            (32)
+  #define NVM_USB_PAD_TRANSP_POS            (37)
+  #define NVM_USB_PAD_TRIM_POS              (42)
+#else
+  #define NVM_CALIBRATION_ADDRESS           NVMCTRL_OTP4
+  #define NVM_USB_PAD_TRANSN_POS            (45)
+  #define NVM_USB_PAD_TRANSP_POS            (50)
+  #define NVM_USB_PAD_TRIM_POS              (55)
+#endif
 #define USB_PAD_TRANSN_REG_POS            (6)
-#define NVM_USB_PAD_TRANSN_POS            (45)
 #define NVM_USB_PAD_TRANSN_SIZE           (5)
 #define USB_PAD_TRANSP_REG_POS            (0)
-#define NVM_USB_PAD_TRANSP_POS            (50)
 #define NVM_USB_PAD_TRANSP_SIZE           (5)
 #define USB_PAD_TRIM_REG_POS              (12)
-#define NVM_USB_PAD_TRIM_POS              (55)
 #define NVM_USB_PAD_TRIM_SIZE             (3)
 
 /* Generic Clock Multiplexer IDs */
@@ -37,6 +45,8 @@
   #define GCM_USB                   (0x06U)
 #elif (SAML21)
   #define GCM_USB                   (0x04U)
+#elif (SAMD51)
+  #define GCM_USB                   (0x0AU)
 #else
   #error "board_driver_usb.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
@@ -75,24 +85,30 @@ void USB_Init(void)
   /* Enable USB clock */
 #if (SAMD21 || SAMD11)
   PM->APBBMASK.reg |= PM_APBBMASK_USB;
-#elif (SAML21)
+#elif (SAML21 || SAMD51)
   MCLK->APBBMASK.reg |= MCLK_APBBMASK_USB;
 #endif
 
   /* Set up the USB DP/DN pins */
+#if (SAMD51)
+  pinMux(PINMUX_PA24H_USB_DM);
+  pinMux(PINMUX_PA25H_USB_DP);
+#else
   pinMux(PINMUX_PA24G_USB_DM);
   pinMux(PINMUX_PA25G_USB_DP);
+#endif
 
   /* ----------------------------------------------------------------------------------------------
    * Put Generic Clock Generator 0 as source for Generic Clock Multiplexer 6 (USB reference)
    */
 #if (SAMD21 || SAMD11)
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GCM_USB ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
-  waitForSync();
+#elif (SAMD51 && (VARIANT_MCK == 120000000ul))
+  GCLK->PCHCTRL[GCM_USB].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK5 );  // use 48MHz clock (required for USB) from GCLK5, which was setup in board_init.c
 #else
   GCLK->PCHCTRL[GCM_USB].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
-  waitForSync();
 #endif
+  waitForSync();
 
   /* Reset */
 #if defined(PARANOIA)
@@ -104,7 +120,7 @@ void USB_Init(void)
 #endif
 
   /* Load Pad Calibration */
-  pad_transn =(uint8_t)( *((uint32_t *)(NVMCTRL_OTP4)
+  pad_transn =(uint8_t)( *((uint32_t *)(NVM_CALIBRATION_ADDRESS)
       + (NVM_USB_PAD_TRANSN_POS / 32))
     >> (NVM_USB_PAD_TRANSN_POS % 32))
     & ((1 << NVM_USB_PAD_TRANSN_SIZE) - 1);
@@ -114,7 +130,7 @@ void USB_Init(void)
     pad_transn = 5;
   }
 
-  pad_transp =(uint8_t)( *((uint32_t *)(NVMCTRL_OTP4)
+  pad_transp =(uint8_t)( *((uint32_t *)(NVM_CALIBRATION_ADDRESS)
       + (NVM_USB_PAD_TRANSP_POS / 32))
       >> (NVM_USB_PAD_TRANSP_POS % 32))
       & ((1 << NVM_USB_PAD_TRANSP_SIZE) - 1);
@@ -124,7 +140,7 @@ void USB_Init(void)
     pad_transp = 29;
   }
 
-  pad_trim =(uint8_t)( *((uint32_t *)(NVMCTRL_OTP4)
+  pad_trim =(uint8_t)( *((uint32_t *)(NVM_CALIBRATION_ADDRESS)
       + (NVM_USB_PAD_TRIM_POS / 32))
       >> (NVM_USB_PAD_TRIM_POS % 32))
       & ((1 << NVM_USB_PAD_TRIM_SIZE) - 1);
diff --git a/bootloaders/zero/board_init.c b/bootloaders/zero/board_init.c
index 8e5eeefd7..08830fda9 100644
--- a/bootloaders/zero/board_init.c
+++ b/bootloaders/zero/board_init.c
@@ -29,59 +29,83 @@ extern uint32_t SystemCoreClock;
  */
 
 // Constants for Clock generators
-#define GENERIC_CLOCK_GENERATOR_MAIN      (0u)
-#define GENERIC_CLOCK_GENERATOR_XOSC      (1u)
-#define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT (D21/D11) */
-#define GENERIC_CLOCK_GENERATOR_OSC_HS    (3u)
+#define GENERIC_CLOCK_GENERATOR_MAIN      (0u) /* This is 48MHz (either 48MHz or 120MHz for D51) */
+#define GENERIC_CLOCK_GENERATOR_XOSC      (1u) /* High speed crystal */
+#define GENERIC_CLOCK_GENERATOR_OSCULP32K (2u) /* Initialized at reset for WDT (D21 and D11 only) */
+#define GENERIC_CLOCK_GENERATOR_OSC_HS    (3u) /* 8MHz internal RC oscillator (D21, D11, and L21 only) */
+#define GENERIC_CLOCK_GENERATOR_DFLL      (4u) /* Used by D51 for 48MHz DFLL output (only used when cpu is 120MHz) */
+#define GENERIC_CLOCK_GENERATOR_48MHz     (5u) /* Used by D51 for USB or any peripheral that has a 60MHz maximum peripheral clock (only used when cpu is 120MHz) */
+#define GENERIC_CLOCK_GENERATOR_96MHz     (6u) /* Used by D51 for any peripheral that has a 100MHz maximum peripheral clock (only used when cpu is 120MHz) */
 
 // Constants for Clock multiplexers
-#if (SAMD || SAML21)
+#if (SAMD21 || SAMD11 || SAML21)
   #define GENERIC_CLOCK_MULTIPLEXER_DFLL    (0u)
   #define GENERIC_CLOCK_MULTIPLEXER_FDPLL   (1u)
-  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL96M_32K (2u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL_32K (2u)
+#elif (SAMD51)
+  #define GENERIC_CLOCK_MULTIPLEXER_DFLL    (0u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL_0   (1u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL_1   (2u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL_0_32K (3u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL_1_32K (3u)
 #elif (SAMC21)
   #define GENERIC_CLOCK_MULTIPLEXER_FDPLL   (0u)
-  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL96M_32K (1u)
+  #define GENERIC_CLOCK_MULTIPLEXER_FDPLL_32K (1u)
 #else
   #error "startup.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
 
-#if (SAMD || SAML21)
+#if (SAMD21 || SAMD11 || SAML21 || SAMD51)
 void waitForDFLL( void )
 {
-#if (SAMD)
+#if (SAMD21 || SAMD11)
   while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_DFLLRDY) == 0 );
-#elif (SAML21)
+#elif (SAML21 || SAMD51)
   while ( (OSCCTRL->STATUS.reg & OSCCTRL_STATUS_DFLLRDY) == 0 );
 #endif
 }
 #endif
 
-#if (SAML21 || SAMC21)
+#if (SAML21 || SAMC21 || SAMD51)
 void waitForPLL( void )
 {
+#if (SAMD51)
+  while ( OSCCTRL->Dpll[0].DPLLSYNCBUSY.reg & OSCCTRL_DPLLSYNCBUSY_MASK );
+  while ( OSCCTRL->Dpll[1].DPLLSYNCBUSY.reg & OSCCTRL_DPLLSYNCBUSY_MASK );
+#else
   while ( OSCCTRL->DPLLSYNCBUSY.reg & OSCCTRL_DPLLSYNCBUSY_MASK );
+#endif
 }
 #endif
 
 void board_init( void )
 {
   /*
-   * Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21)
+   * Disable automatic NVM write operations (errata reference 13134, applies to D21/D11/L21, but not C21 or D51)
+   * Disable NVM cache on D51 (errata). Will be re-enabled after reset at and of programming.
    */
+#if (SAMD51)
+  NVMCTRL->CTRLA.reg = (NVMCTRL_CTRLA_CACHEDIS0 | NVMCTRL_CTRLA_CACHEDIS1 | NVMCTRL_CTRLA_WMODE_MAN | NVMCTRL_CTRLA_AUTOWS);
+#else
   NVMCTRL->CTRLB.bit.MANW = 1;
+#endif
 
-  /* Set 1 Flash Wait State for 48MHz (2 for the L21 and C21), cf tables 20.9 and 35.27 in SAMD21 Datasheet */
-#if (SAMD)
+  /* Set 1 Flash Wait State for 48MHz (2 for the L21 and C21), cf tables 20.9 and 35.27 in SAMD21 Datasheet
+   * The D51 runs at 120MHz with 5 wait states (automatic)
+   */
+#if (SAMD21 || SAMD11)
   NVMCTRL->CTRLB.bit.RWS = NVMCTRL_CTRLB_RWS_HALF_Val ;	// one wait state
 #elif (SAML21 || SAMC21)
   NVMCTRL->CTRLB.reg |= NVMCTRL_CTRLB_RWS_DUAL ; // two wait states
+#elif (SAMD51)
+  // automatic wait states handled above (I had problems using read-modify-write on NVMCTRL->CTRLA.reg here after disabling caches above (errata))
+  //NVMCTRL->CTRLA.bit.RWS = 5 ; // 5 wait states
 #endif
 
   /* Turn on the digital interface clock */
-#if (SAMD)
+#if (SAMD21 || SAMD11)
   PM->APBAMASK.reg |= PM_APBAMASK_GCLK ;
-#elif (SAML21 || SAMC21)
+#elif (SAML21 || SAMC21 || SAMD51)
   MCLK->APBAMASK.reg |= MCLK_APBAMASK_GCLK ;
 #endif
 
@@ -95,11 +119,11 @@ void board_init( void )
   /* ----------------------------------------------------------------------------------------------
    * Software reset the GCLK module to ensure it is re-initialized correctly
    */
-#if (SAMD)
+#if (SAMD21 || SAMD11)
   GCLK->CTRL.reg = GCLK_CTRL_SWRST ;
 
   while ( (GCLK->CTRL.reg & GCLK_CTRL_SWRST) && (GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY) );	/* Wait for reset to complete */
-#elif (SAML21 || SAMC21)
+#elif (SAML21 || SAMC21 || SAMD51)
   GCLK->CTRLA.reg = GCLK_CTRLA_SWRST ;
 
   while ( (GCLK->CTRLA.reg & GCLK_CTRLA_SWRST) && (GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK) );	/* Wait for reset to complete */
@@ -111,56 +135,117 @@ void board_init( void )
    */
 
 #if defined(PLL_FRACTIONAL_ENABLE)
-  #define DPLLRATIO_LDR		2928u
-  #define DPLLRATIO_LDRFRAC	11u
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    #define DPLLRATIO_LDR	3661u
+    #define DPLLRATIO_LDRFRAC	3u
+    #define DPLL1RATIO_LDR      2928u
+    #define DPLL1RATIO_LDRFRAC  22u
+  #else
+    #define DPLLRATIO_LDR       2928u
+    #if (SAMD51)
+      #define DPLLRATIO_LDRFRAC   22u
+    #else
+      #define DPLLRATIO_LDRFRAC   11u
+    #endif
+  #endif
 #else
-  #define DPLLRATIO_LDR		2929u
-  #define DPLLRATIO_LDRFRAC	0u
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    #define DPLLRATIO_LDR       3661u
+    #define DPLLRATIO_LDRFRAC   0u
+    #define DPLL1RATIO_LDR      2929u
+    #define DPLL1RATIO_LDRFRAC  0u
+  #else
+    #define DPLLRATIO_LDR       2929u
+    #define DPLLRATIO_LDRFRAC   0u
+  #endif
 #endif
 
-#if (SAMD)
-  SYSCTRL->XOSC32K.reg = (SYSCTRL_XOSC32K_STARTUP( 0x6u ) | SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K) ;
-  SYSCTRL->XOSC32K.bit.ENABLE = 1 ; /* separate call, as described in chapter 15.6.3 */
+#if (SAMD21 || SAMD11)
+  SYSCTRL->XOSC32K.reg = (SYSCTRL_XOSC32K_STARTUP( 0x6u ) | SYSCTRL_XOSC32K_XTALEN | SYSCTRL_XOSC32K_EN32K);
+  SYSCTRL->XOSC32K.bit.ENABLE = 1; /* separate call, as described in chapter 15.6.3 */
 
   while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSC32KRDY) == 0 );	/* Wait for oscillator stabilization */
-  
-  SYSCTRL->DPLLRATIO.reg = ( SYSCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | SYSCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
-  
-  SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK(0) ;  /* select 32KHz crystal input */
-  
-  SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE ;
-  
+
+  SYSCTRL->DPLLRATIO.reg = ( SYSCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | SYSCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) );  /* set PLL multiplier */
+
+  SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK(0);  /* select 32KHz crystal input */
+
+  SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE;
+
   while ( (SYSCTRL->DPLLSTATUS.reg & SYSCTRL_DPLLSTATUS_CLKRDY) != SYSCTRL_DPLLSTATUS_CLKRDY );
-  
+
   /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz */
-  GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENDIV_DIV(2) ) ;
+  GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENDIV_DIV(2) );
   waitForSync();
 
   GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
+
 #elif (SAML21 || SAMC21)
-  OSC32KCTRL->XOSC32K.reg = (OSC32KCTRL_XOSC32K_STARTUP( 0x4u ) | OSC32KCTRL_XOSC32K_XTALEN | OSC32KCTRL_XOSC32K_EN32K | OSC32KCTRL_XOSC32K_EN1K) ;
-  OSC32KCTRL->XOSC32K.bit.ENABLE = 1 ;
-  
+  OSC32KCTRL->XOSC32K.reg = (OSC32KCTRL_XOSC32K_STARTUP( 0x4u ) | OSC32KCTRL_XOSC32K_XTALEN | OSC32KCTRL_XOSC32K_EN32K | OSC32KCTRL_XOSC32K_EN1K);
+  OSC32KCTRL->XOSC32K.bit.ENABLE = 1;
+
   while ( (OSC32KCTRL->STATUS.reg & OSC32KCTRL_STATUS_XOSC32KRDY) == 0 );	/* Wait for oscillator stabilization */
-  
-  OSCCTRL->DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
+
+  OSCCTRL->DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) );  /* set PLL multiplier */
   waitForPLL();
-  
-  OSCCTRL->DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_REFCLK(0) ;  /* select 32KHz crystal input */
-  
+
+  OSCCTRL->DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_REFCLK(0);  /* select 32KHz crystal input */
+
   OSCCTRL->DPLLPRESC.reg = 0;
   waitForPLL();
-  
-  OSCCTRL->DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE ;
+
+  OSCCTRL->DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE;
   waitForPLL();
-  
+
   while ( (OSCCTRL->DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_CLKRDY) != OSCCTRL_DPLLSTATUS_CLKRDY );
-  
+
   /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz */
   GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
+
+#elif (SAMD51)
+  // Use high gain for 32.768KHz crystal
+  OSC32KCTRL->XOSC32K.reg = (OSC32KCTRL_XOSC32K_STARTUP( 0x4u ) | OSC32KCTRL_XOSC32K_XTALEN | OSC32KCTRL_XOSC32K_EN32K | OSC32KCTRL_XOSC32K_EN1K | OSC32KCTRL_XOSC32K_CGM_HS);
+  OSC32KCTRL->XOSC32K.bit.ENABLE = 1;
+
+  while ( (OSC32KCTRL->STATUS.reg & OSC32KCTRL_STATUS_XOSC32KRDY) == 0 );       /* Wait for oscillator stabilization */
+
+  OSCCTRL->Dpll[0].DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) );  /* set PLL multiplier */
+  waitForPLL();
+
+  OSCCTRL->Dpll[0].DPLLCTRLB.reg = (OSCCTRL_DPLLCTRLB_REFCLK(1) | OSCCTRL_DPLLCTRLB_LBYPASS);  /* select 32KHz crystal input, must use LBYPASS (see errata) */
+
+  OSCCTRL->Dpll[0].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE;
+  waitForPLL();
+
+  while ( (OSCCTRL->Dpll[0].DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_LOCK) != OSCCTRL_DPLLSTATUS_LOCK );
+
+  /* If the CPU will run at 120MHz using the first PLL, setup the second PLL to generate 96MHz, which is divided down to 48MHz for use by USB, etc. */
+  #if (VARIANT_MCK == 120000000ul)
+    OSCCTRL->Dpll[1].DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLL1RATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLL1RATIO_LDRFRAC) );  /* set PLL multiplier */
+    waitForPLL();
+
+    OSCCTRL->Dpll[1].DPLLCTRLB.reg = (OSCCTRL_DPLLCTRLB_REFCLK(1) | OSCCTRL_DPLLCTRLB_LBYPASS);  /* select 32KHz crystal input, must use LBYPASS (see errata) */
+
+    OSCCTRL->Dpll[1].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE;
+    waitForPLL();
+
+    while ( (OSCCTRL->Dpll[1].DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_LOCK) != OSCCTRL_DPLLSTATUS_LOCK );
+
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_96MHz].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DPLL1 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_48MHz].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL1 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+
+    /* Switch Generic Clock Generator 0 to PLL. The CPU will run at 120MHz. */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DPLL0 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+  #else
+    /* Switch Generic Clock Generator 0 to PLL. The CPU will run at 48MHz. */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL0 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+  #endif
 #endif
 
 #elif defined(CLOCKCONFIG_CLOCK_SOURCE) && (CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_HS_CRYSTAL)
@@ -168,8 +253,14 @@ void board_init( void )
    * Enable XOSC clock (External on-board high speed crystal oscillator)
    */
 
-#if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
-  #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 4000000UL and 32000000UL"
+#if (SAMD51)
+  #if ((HS_CRYSTAL_FREQUENCY_HERTZ < 8000000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 48000000UL))
+    #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 8000000UL and 48000000UL"
+  #endif
+#else
+  #if ((HS_CRYSTAL_FREQUENCY_HERTZ < 400000UL) || (HS_CRYSTAL_FREQUENCY_HERTZ > 32000000UL))
+    #error "board.init.c: HS_CRYSTAL_FREQUENCY_HERTZ must be between 400000UL and 32000000UL"
+  #endif
 #endif
 
 #if defined(PLL_FAST_STARTUP)
@@ -182,119 +273,191 @@ void board_init( void )
   #define HS_CRYSTAL_DIVISOR	32000UL
 #endif
 
+// All floating point math done by C preprocessor
 #define HS_CRYSTAL_DIVIDER	(HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVISOR)
-#define DPLLRATIO_FLOAT		(96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
+#if (SAMD51 && (VARIANT_MCK == 120000000ul))
+  #define DPLLRATIO_FLOAT	(120000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
+  #define DPLL1RATIO_FLOAT      (96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
+#else
+  #define DPLLRATIO_FLOAT       (96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
+#endif
 
 #if defined(PLL_FRACTIONAL_ENABLED)
   #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
-  #define DPLLRATIO_LDRFRAC	(uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
+  #if (SAMD51)
+    #define DPLLRATIO_LDRFRAC   (uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 32.0)
+    #if (VARIANT_MCK == 120000000ul)
+      #define DPLL1RATIO_LDRFRAC   (uint8_t)((DPLL1RATIO_FLOAT - (uint16_t)DPLL1RATIO_FLOAT) * 32.0)
+    #endif
+  #else
+    #define DPLLRATIO_LDRFRAC   (uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
+  #endif
 #else
   #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
   #define DPLLRATIO_LDRFRAC	0
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    #define DPLL1RATIO_LDR        (uint16_t)DPLLRATIO_FLOAT
+    #define DPLL1RATIO_LDRFRAC    0
+  #endif
 #endif
 
-#if (SAMD)
+#if (SAMD21 || SAMD11)
   SYSCTRL->XOSC.reg = (SYSCTRL_XOSC_STARTUP( 0x8u ) | SYSCTRL_XOSC_GAIN( 0x4u ) | SYSCTRL_XOSC_XTALEN | SYSCTRL_XOSC_ENABLE) ;	// startup time is 8ms
   while ( (SYSCTRL->PCLKSR.reg & SYSCTRL_PCLKSR_XOSCRDY) == 0 );	/* Wait for oscillator stabilization */
 
   SYSCTRL->XOSC.reg |= SYSCTRL_XOSC_AMPGC ;	// set only after startup time
-  
+
   /* Connect GCLK1 to XOSC and set prescaler */
   GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_XOSC ) | GCLK_GENDIV_DIV(HS_CRYSTAL_DIVIDER) ) ; // Set divider for generic clock generator 1
   waitForSync();
 
   GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_XOSC ) | GCLK_GENCTRL_SRC_XOSC | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
+
   /* Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 1 (FDPLL reference) */
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( GENERIC_CLOCK_MULTIPLEXER_FDPLL ) | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN );
   waitForSync();
-  
+
   /* Configure PLL */
   SYSCTRL->DPLLRATIO.reg = ( SYSCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | SYSCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
-  
+
   SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK(2) ;  /* select GCLK input */
-  
+
   SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE ;
-  
+
   while ( (SYSCTRL->DPLLSTATUS.reg & SYSCTRL_DPLLSTATUS_CLKRDY) != SYSCTRL_DPLLSTATUS_CLKRDY );
-  
+
   /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz */
   GCLK->GENDIV.reg = ( GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENDIV_DIV(2) ) ;
   waitForSync();
 
   GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
+
 #elif (SAML21 || SAMC21)
   OSCCTRL->XOSCCTRL.reg = (OSCCTRL_XOSCCTRL_STARTUP( 0x8u ) | OSCCTRL_XOSCCTRL_GAIN( 0x4u ) | OSCCTRL_XOSCCTRL_XTALEN | OSCCTRL_XOSCCTRL_ENABLE) ;	// startup time is 8ms
   while ( (OSCCTRL->STATUS.reg & OSCCTRL_STATUS_XOSCRDY) == 0 );	/* Wait for oscillator stabilization */
 
   OSCCTRL->XOSCCTRL.reg |= OSCCTRL_XOSCCTRL_AMPGC ;	// set only after startup time
-  
+
   /* Connect GCLK1 to XOSC and set prescaler */
   GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_XOSC].reg = ( GCLK_GENCTRL_DIV(HS_CRYSTAL_DIVIDER) | GCLK_GENCTRL_SRC_XOSC | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
+
   /* Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 1 (FDPLL reference) */
   GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK1 );
   while ( (GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );	// wait for sync
-  
+
   /* Configure PLL */
   OSCCTRL->DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
   waitForPLL();
-  
+
   OSCCTRL->DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_REFCLK(2) ;  /* select GCLK input */
-  
+
   OSCCTRL->DPLLPRESC.reg = 0;
   waitForPLL();
-  
+
   OSCCTRL->DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE ;
   waitForPLL();
-  
+
   while ( (OSCCTRL->DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_CLKRDY) != OSCCTRL_DPLLSTATUS_CLKRDY );
-  
+
   /* Switch Generic Clock Generator 0 to PLL. Divide by two and the CPU will run at 48MHz */
   GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
+
+#elif (SAMD51)
+  OSCCTRL->XOSCCTRL[0].reg = (OSCCTRL_XOSCCTRL_STARTUP( 0x8u ) | OSCCTRL_XOSCCTRL_IPTAT(3) | OSCCTRL_XOSCCTRL_IMULT(4) | OSCCTRL_XOSCCTRL_XTALEN | OSCCTRL_XOSCCTRL_ENABLE) ;      // startup time is 8ms
+  while ( (OSCCTRL->STATUS.reg & OSCCTRL_STATUS_XOSCRDY0) == 0 );        /* Wait for oscillator stabilization */
+
+  OSCCTRL->XOSCCTRL[0].reg |= OSCCTRL_XOSCCTRL_ENALC | OSCCTRL_XOSCCTRL_LOWBUFGAIN ;     // Enable automatic loop compensation
+
+  /* Connect GCLK1 to XOSC and set prescaler */
+  GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_XOSC].reg = ( GCLK_GENCTRL_DIV(HS_CRYSTAL_DIVIDER) | GCLK_GENCTRL_SRC_XOSC0 | GCLK_GENCTRL_GENEN );
+  waitForSync();
+
+  /* Put Generic Clock Generator 1 as source for Generic Clock Multiplexer 1 (FDPLL reference) */
+  GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_0].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK1 );
+  while ( (GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_0].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );      // wait for sync
+
+  /* Configure PLL */
+  OSCCTRL->Dpll[0].DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLLRATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLLRATIO_LDRFRAC) ) ;  /* set PLL multiplier */
+  waitForPLL();
+
+  OSCCTRL->Dpll[0].DPLLCTRLB.reg = (OSCCTRL_DPLLCTRLB_REFCLK_GCLK | OSCCTRL_DPLLCTRLB_LBYPASS) ;  /* select GCLK input, must use LBYPASS (see errata) */
+
+  OSCCTRL->Dpll[0].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE ;
+  waitForPLL();
+
+  while ( (OSCCTRL->Dpll[0].DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_LOCK) != OSCCTRL_DPLLSTATUS_LOCK );
+
+  /* If the CPU will run at 120MHz using the first PLL, setup the second PLL to generate 96MHz, which is divided down to 48MHz for use by USB, etc. */
+  #if (VARIANT_MCK == 120000000ul)
+    GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_1].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK1 );
+    while ( (GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_1].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );      // wait for sync
+
+    /* Configure PLL */
+    OSCCTRL->Dpll[1].DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(DPLL1RATIO_LDR) | OSCCTRL_DPLLRATIO_LDRFRAC(DPLL1RATIO_LDRFRAC) );  /* set PLL multiplier */
+    waitForPLL();
+
+    OSCCTRL->Dpll[1].DPLLCTRLB.reg = (OSCCTRL_DPLLCTRLB_REFCLK_GCLK | OSCCTRL_DPLLCTRLB_LBYPASS) ;  /* select GCLK input, must use LBYPASS (see errata) */
+
+    OSCCTRL->Dpll[1].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE;
+    waitForPLL();
+
+    while ( (OSCCTRL->Dpll[1].DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_LOCK) != OSCCTRL_DPLLSTATUS_LOCK );
+
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_96MHz].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DPLL1 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_48MHz].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL1 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+
+    /* Switch Generic Clock Generator 0 to PLL. The CPU will run at 120MHz. */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DPLL0 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+  #else
+    /* Switch Generic Clock Generator 0 to PLL. The CPU will run at 48MHz. */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(2) | GCLK_GENCTRL_SRC_DPLL0 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+  #endif
 #endif
 
 #elif defined(CLOCKCONFIG_CLOCK_SOURCE) && ((CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_INTERNAL) || (CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_INTERNAL_USB))
   /* ----------------------------------------------------------------------------------------------
-   * Enable DFLL48M clock (D21/L21) or RC oscillator (C21)
+   * Enable DFLL48M clock (D21/D11/L21/D51) or RC oscillator (C21)
    */
-#if (SAMD)
+#if (SAMD21 || SAMD11)
   /* Remove the OnDemand mode, Bug http://avr32.icgroup.norway.atmel.com/bugzilla/show_bug.cgi?id=9905 */
   SYSCTRL->DFLLCTRL.bit.ONDEMAND = 0 ;
   waitForDFLL();
-  
+
   /* Load NVM Coarse calibration value */
   uint32_t calib = (*((uint32_t *) FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk) >> FUSES_DFLL48M_COARSE_CAL_Pos;
   SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(calib) | SYSCTRL_DFLLVAL_FINE(512);
-  
+
   /* Write full configuration to DFLL control register */
   #if defined(CLOCKCONFIG_CLOCK_SOURCE) && (CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_INTERNAL_USB)
     SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
                            SYSCTRL_DFLLMUL_FSTEP( 0xA ) | // value from datasheet USB Characteristics
                            SYSCTRL_DFLLMUL_MUL( 0xBB80 ) ; // 1KHz USB SOF signal (48MHz Fcpu / 1KHz SOF)
-                         
+
     SYSCTRL->DFLLCTRL.reg =  SYSCTRL_DFLLCTRL_USBCRM | /* USB correction */
                              SYSCTRL_DFLLCTRL_MODE | /* Closed loop mode */
                              SYSCTRL_DFLLCTRL_CCDIS ;
     waitForDFLL();
   #endif
-  
+
   /* Enable the DFLL */
   SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_ENABLE ;
   waitForDFLL();
-  
+
   /* Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz */
   GCLK->GENDIV.reg = GCLK_GENDIV_ID( GENERIC_CLOCK_GENERATOR_MAIN ) ; // Generic Clock Generator 0
   waitForSync();
 
   GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_MAIN ) | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
+
 #elif (SAML21)
   /* Defines missing from CMSIS */
   #ifndef FUSES_DFLL48M_COARSE_CAL_ADDR
@@ -306,48 +469,117 @@ void board_init( void )
   #ifndef FUSES_DFLL48M_COARSE_CAL_Msk
     #define FUSES_DFLL48M_COARSE_CAL_Msk (0x3Ful << FUSES_DFLL48M_COARSE_CAL_Pos)
   #endif
-  
+
   OSCCTRL->DFLLCTRL.bit.ONDEMAND = 0 ;
   waitForDFLL();
-  
+
   /* Load NVM Coarse calibration value */
   uint32_t calib = (*((uint32_t *) FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk) >> FUSES_DFLL48M_COARSE_CAL_Pos;
   OSCCTRL->DFLLVAL.reg = OSCCTRL_DFLLVAL_COARSE(calib) | OSCCTRL_DFLLVAL_FINE(512);
-  
+
   /* Write full configuration to DFLL control register */
   #if defined(CLOCKCONFIG_CLOCK_SOURCE) && (CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_INTERNAL_USB)
     OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
                            OSCCTRL_DFLLMUL_FSTEP( 0xA ) | // value from datasheet USB Characteristics
                            OSCCTRL_DFLLMUL_MUL( 0xBB80 ) ; // 1KHz USB SOF signal (48MHz Fcpu / 1KHz SOF)
-                         
+
     OSCCTRL->DFLLCTRL.reg =  OSCCTRL_DFLLCTRL_USBCRM | /* USB correction */
                              OSCCTRL_DFLLCTRL_MODE | /* Closed loop mode */
                              OSCCTRL_DFLLCTRL_CCDIS ;
     waitForDFLL();
   #endif
-  
+
   /* Enable the DFLL */
   OSCCTRL->DFLLCTRL.reg |= OSCCTRL_DFLLCTRL_ENABLE ;
   waitForDFLL();
-  
+
   /* Switch Generic Clock Generator 0 to DFLL48M. CPU will run at 48MHz */
   GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
+
 #elif (SAMC21)
   #if defined(CLOCKCONFIG_CLOCK_SOURCE) && (CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_INTERNAL_USB)
     #error "startup.c: CLOCKCONFIG_INTERNAL_USB setting invalid for C21 chips as they lack USB."
   #endif
-  
+
   /* Change OSC48M divider to /1. CPU will run at 48MHz */
   OSCCTRL->OSC48MDIV.reg = OSCCTRL_OSC48MDIV_DIV(0);
   while ( OSCCTRL->OSC48MSYNCBUSY.reg & OSCCTRL_OSC48MSYNCBUSY_OSC48MDIV );
+
+#elif (SAMD51)
+  OSCCTRL->DFLLCTRLA.bit.ONDEMAND = 0 ;
+  waitForDFLL();
+
+  /* Write full configuration to DFLL control register */
+  #if defined(CLOCKCONFIG_CLOCK_SOURCE) && (CLOCKCONFIG_CLOCK_SOURCE == CLOCKCONFIG_INTERNAL_USB)
+    OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_CSTEP( 31 ) | // Coarse step is 31, half of the max value
+                           OSCCTRL_DFLLMUL_FSTEP( 0xA ) | // value from datasheet USB Characteristics
+                           OSCCTRL_DFLLMUL_MUL( 0xBB80 ) ; // 1KHz USB SOF signal (48MHz Fcpu / 1KHz SOF)
+
+    OSCCTRL->DFLLCTRLB.reg =  OSCCTRL_DFLLCTRLB_USBCRM | /* USB correction */
+                             OSCCTRL_DFLLCTRLB_MODE | /* Closed loop mode */
+                             OSCCTRL_DFLLCTRLB_CCDIS ;
+    waitForDFLL();
+  #endif
+
+  /* Enable the DFLL */
+  OSCCTRL->DFLLCTRLA.reg |= OSCCTRL_DFLLCTRLA_ENABLE ;
+  waitForDFLL();
+
+  /* If the CPU will run at 120MHz using the first PLL, setup the second PLL to generate 96MHz. */
+  #if (VARIANT_MCK == 120000000ul)
+    /* Switch Generic Clock Generator 4 to DFLL48M and divide down to 2MHz (to be used as PLL input) */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_DFLL].reg = ( GCLK_GENCTRL_DIV(24) | GCLK_GENCTRL_SRC_DFLL | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+
+    /* Configure PLL0 */
+    GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_0].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK4 );
+    while ( (GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_0].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );      // wait for sync
+
+    OSCCTRL->Dpll[0].DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(59) | OSCCTRL_DPLLRATIO_LDRFRAC(0) ) ;  /* set PLL multiplier */
+    waitForPLL();
+
+    OSCCTRL->Dpll[0].DPLLCTRLB.reg = (OSCCTRL_DPLLCTRLB_REFCLK_GCLK | OSCCTRL_DPLLCTRLB_LBYPASS) ;  /* select GCLK input, must use LBYPASS (see errata) */
+
+    OSCCTRL->Dpll[0].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE ;
+    waitForPLL();
+
+    while ( (OSCCTRL->Dpll[0].DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_LOCK) != OSCCTRL_DPLLSTATUS_LOCK );
+
+    /* Configure PLL1 */
+    GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_1].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK4 );
+    while ( (GCLK->PCHCTRL[GENERIC_CLOCK_MULTIPLEXER_FDPLL_1].reg & GCLK_PCHCTRL_CHEN) != GCLK_PCHCTRL_CHEN );      // wait for sync
+
+    OSCCTRL->Dpll[1].DPLLRATIO.reg = ( OSCCTRL_DPLLRATIO_LDR(47) | OSCCTRL_DPLLRATIO_LDRFRAC(0) );  /* set PLL multiplier */
+    waitForPLL();
+
+    OSCCTRL->Dpll[1].DPLLCTRLB.reg = (OSCCTRL_DPLLCTRLB_REFCLK_GCLK | OSCCTRL_DPLLCTRLB_LBYPASS) ;  /* select GCLK input, must use LBYPASS (see errata) */
+
+    OSCCTRL->Dpll[1].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE;
+    waitForPLL();
+
+    while ( (OSCCTRL->Dpll[1].DPLLSTATUS.reg & OSCCTRL_DPLLSTATUS_LOCK) != OSCCTRL_DPLLSTATUS_LOCK );
+
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_96MHz].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DPLL1 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_48MHz].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DFLL | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+
+    /* Switch Generic Clock Generator 0 to PLL. CPU will run at 120MHz */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DPLL0 | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+  #else
+    /* Switch Generic Clock Generator 0 to DFLL. CPU will run at 48MHz */
+    GCLK->GENCTRL[GENERIC_CLOCK_GENERATOR_MAIN].reg = ( GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_SRC_DFLL | GCLK_GENCTRL_IDC | GCLK_GENCTRL_GENEN );
+    waitForSync();
+  #endif
+
 #endif
 #else
   #error "board_init.c: CLOCKCONFIG_CLOCK_SOURCE must be defined in the board_definitions file"
 #endif
 
-#if (SAMD21)
+#if (SAMD21 || SAMD11)
   /* Modify PRESCaler value of OSC8M to have 8MHz */
   SYSCTRL->OSC8M.bit.PRESC = SYSCTRL_OSC8M_PRESC_0_Val ;  // recent versions of CMSIS from Atmel changed the prescaler defines
   //SYSCTRL->OSC8M.bit.ONDEMAND = 0 ;
@@ -358,7 +590,6 @@ void board_init( void )
 
   GCLK->GENCTRL.reg = ( GCLK_GENCTRL_ID( GENERIC_CLOCK_GENERATOR_OSC_HS ) | GCLK_GENCTRL_SRC_OSC8M | GCLK_GENCTRL_GENEN );
   waitForSync();
-  
 #elif (SAML21)
   /* Note that after reset, the L21 starts with the OSC16M set to 4MHz, NOT the DFLL@48MHz as stated in some documentation. */
   /* Modify FSEL value of OSC16M to have 8MHz */
@@ -372,12 +603,14 @@ void board_init( void )
   SystemCoreClock=VARIANT_MCK;
 
   /* Set CPU and APB dividers before switching the CPU/APB clocks to the new clock source */
-#if (SAMD)
+#if (SAMD21 || SAMD11)
   PM->CPUSEL.reg  = PM_CPUSEL_CPUDIV_DIV1 ;
   PM->APBASEL.reg = PM_APBASEL_APBADIV_DIV1_Val ;
   PM->APBBSEL.reg = PM_APBBSEL_APBBDIV_DIV1_Val ;
   PM->APBCSEL.reg = PM_APBCSEL_APBCDIV_DIV1_Val ;
 #elif (SAML21 || SAMC21)
   MCLK->CPUDIV.reg  = MCLK_CPUDIV_CPUDIV_DIV1 ;
+#elif (SAMD51)
+  MCLK->CPUDIV.reg  = MCLK_CPUDIV_DIV_DIV1 ;
 #endif
 }
diff --git a/bootloaders/zero/board_startup.c b/bootloaders/zero/board_startup.c
index 9a5315786..143be270d 100644
--- a/bootloaders/zero/board_startup.c
+++ b/bootloaders/zero/board_startup.c
@@ -28,15 +28,25 @@ struct ConstVectors
   void* pfnReset_Handler;
   void* pfnNMI_Handler;
   void* pfnHardFault_Handler;
+#if (SAMD51)
+  void* pfnMemManage_Handler;
+  void* pfnBusFault_Handler;
+  void* pfnUsageFault_Handler;
+#else
   void* pfnReservedM12;
   void* pfnReservedM11;
   void* pfnReservedM10;
+#endif
   void* pfnReservedM9;
   void* pfnReservedM8;
   void* pfnReservedM7;
   void* pfnReservedM6;
   void* pfnSVC_Handler;
+#if (SAMD51)
+  void* pfnDebugMon_Handler;
+#else
   void* pfnReservedM4;
+#endif
   void* pfnReservedM3;
   void* pfnPendSV_Handler;
   void* pfnSysTick_Handler;
@@ -63,15 +73,25 @@ const struct ConstVectors exception_table =
   .pfnReset_Handler      = (void*) Reset_Handler,
   .pfnNMI_Handler        = (void*) NMI_Handler,
   .pfnHardFault_Handler  = (void*) HardFault_Handler,
+#if (SAMD51)
+  .pfnMemManage_Handler  = (void*) MemManage_Handler,
+  .pfnBusFault_Handler   = (void*) BusFault_Handler,
+  .pfnUsageFault_Handler = (void*) UsageFault_Handler,
+#else
   .pfnReservedM12        = (void*) (0UL), /* Reserved */
   .pfnReservedM11        = (void*) (0UL), /* Reserved */
   .pfnReservedM10        = (void*) (0UL), /* Reserved */
+#endif
   .pfnReservedM9         = (void*) (0UL), /* Reserved */
   .pfnReservedM8         = (void*) (0UL), /* Reserved */
   .pfnReservedM7         = (void*) (0UL), /* Reserved */
   .pfnReservedM6         = (void*) (0UL), /* Reserved */
   .pfnSVC_Handler        = (void*) SVC_Handler,
+#if (SAMD51)
+  .pfnDebugMon_Handler  = (void*) DebugMon_Handler,
+#else
   .pfnReservedM4         = (void*) (0UL), /* Reserved */
+#endif
   .pfnReservedM3         = (void*) (0UL), /* Reserved */
   .pfnPendSV_Handler     = (void*) PendSV_Handler,
   .pfnSysTick_Handler    = (void*) SysTick_Handler,
@@ -106,18 +126,26 @@ void Reset_Handler( void )
     }
   }
 
-  /* Change default QOS values to have the best performance and correct USB behaviour (applies to D21/D11). From startup_samd21.c from ASF 3.32. */
+  /* Change default QOS values to have the best performance and correct USB behavior (applies to D21/D11). From startup_samd21.c from ASF 3.32. */
 #if (SAMD21_SERIES || SAMD11_SERIES)
   SBMATRIX->SFR[SBMATRIX_SLAVE_HMCRAMC0].reg = 2;
-  
+
   USB->DEVICE.QOSCTRL.bit.CQOS = 2;
   USB->DEVICE.QOSCTRL.bit.DQOS = 2;
-  
+
   DMAC->QOSCTRL.bit.DQOS = 2;
   DMAC->QOSCTRL.bit.FQOS = 2;
   DMAC->QOSCTRL.bit.WRBQOS = 2;
 #endif
 
+#if (SAMD51)
+  #if __FPU_USED
+    /* Enable FPU */
+    SCB->CPACR |=  (0xFu << 20);
+    __DSB();
+    __ISB();
+  #endif
+#endif
 //  board_init(); // will be done in main() after app check
 
   /* Initialize the C library */
@@ -151,3 +179,29 @@ void PendSV_Handler(void)
   __BKPT(2);
   while (1);
 }
+
+#if (SAMD51)
+void MemManage_Handler(void)
+{
+  __BKPT(3);
+  while (1);
+}
+
+void BusFault_Handler(void)
+{
+  __BKPT(4);
+  while (1);
+}
+
+void UsageFault_Handler(void)
+{
+  __BKPT(6);
+  while (1);
+}
+
+void DebugMon_Handler(void)
+{
+  __BKPT(7);
+  while (1);
+}
+#endif
diff --git a/bootloaders/zero/build_all_bootloaders.sh b/bootloaders/zero/build_all_bootloaders.sh
index b72c46f24..d09cbe6d9 100755
--- a/bootloaders/zero/build_all_bootloaders.sh
+++ b/bootloaders/zero/build_all_bootloaders.sh
@@ -6,6 +6,7 @@ make clean
 BOARD_ID=Xeno MCU=SAMD21J18A SDCARD=SDCARD_DISABLED make all mostly_clean
 BOARD_ID=Xeno MCU=SAML21J18B SDCARD=SDCARD_DISABLED make all mostly_clean
 BOARD_ID=Xeno MCU=SAMC21J18A SDCARD=SDCARD_DISABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAMD51J20A SDCARD=SDCARD_DISABLED make all mostly_clean
 
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A SDCARD=SDCARD_DISABLED make all mostly_clean
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A SDCARD=SDCARD_DISABLED make all mostly_clean
@@ -73,6 +74,7 @@ BOARD_ID=arduino_m0_pro MCU=SAMD21G18A SDCARD=SDCARD_DISABLED make all mostly_cl
 BOARD_ID=Xeno MCU=SAMD21J18A SDCARD=SDCARD_ENABLED make all mostly_clean
 BOARD_ID=Xeno MCU=SAML21J18B SDCARD=SDCARD_ENABLED make all mostly_clean
 BOARD_ID=Xeno MCU=SAMC21J18A SDCARD=SDCARD_ENABLED make all mostly_clean
+BOARD_ID=Xeno MCU=SAMD51J20A SDCARD=SDCARD_ENABLED make all mostly_clean
 
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E17A SDCARD=SDCARD_ENABLED make all mostly_clean
 BOARD_ID=MT_D21E_rev_A MCU=SAMD21E18A SDCARD=SDCARD_ENABLED make all mostly_clean
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m4f_1MB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m4f_1MB.ld
new file mode 100644
index 000000000..7944e544e
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m4f_1MB.ld
@@ -0,0 +1,225 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __sketch_vectors_ptr
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+  . = ORIGIN(FLASH);
+
+  .vectors :
+  {
+    KEEP(*(.isr_vector))
+  } > FLASH
+
+	.text :
+	{
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+  PROVIDE(__sketch_vectors_ptr = ORIGIN(FLASH) + LENGTH(FLASH));
+
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
+}
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m4f_256KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m4f_256KB.ld
new file mode 100644
index 000000000..c3bac0aaa
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m4f_256KB.ld
@@ -0,0 +1,225 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00020000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __sketch_vectors_ptr
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+  . = ORIGIN(FLASH);
+
+  .vectors :
+  {
+    KEEP(*(.isr_vector))
+  } > FLASH
+
+	.text :
+	{
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+  PROVIDE(__sketch_vectors_ptr = ORIGIN(FLASH) + LENGTH(FLASH));
+
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
+}
diff --git a/bootloaders/zero/linker_scripts/bootloader_sam_m4f_512KB.ld b/bootloaders/zero/linker_scripts/bootloader_sam_m4f_512KB.ld
new file mode 100644
index 000000000..d66121d4e
--- /dev/null
+++ b/bootloaders/zero/linker_scripts/bootloader_sam_m4f_512KB.ld
@@ -0,0 +1,225 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2015 Atmel Corporation/Thibaut VIARD.  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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x2000 /* First 8KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __sketch_vectors_ptr
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+  . = ORIGIN(FLASH);
+
+  .vectors :
+  {
+    KEEP(*(.isr_vector))
+  } > FLASH
+
+	.text :
+	{
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+  PROVIDE(__sketch_vectors_ptr = ORIGIN(FLASH) + LENGTH(FLASH));
+
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(4);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+        __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+        __BinarySize = (SIZEOF(.vectors) + SIZEOF(.text) + SIZEOF(.data));
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+        /* Check if vectors + text + data exceeds bootloader FLASH limit */
+        ASSERT(__BinarySize <= LENGTH(FLASH), "Bootloader exceeds 8KB (vectors + text + data). Please recompile with different options.")
+}
diff --git a/bootloaders/zero/main.c b/bootloaders/zero/main.c
index 427fb2239..d2c9ed65b 100644
--- a/bootloaders/zero/main.c
+++ b/bootloaders/zero/main.c
@@ -26,7 +26,7 @@
 #include "board_driver_led.h"
 #include "SDCard/sdBootloader.h"
 #include "util.h"
-#if (SAMD21 || SAMD11 || SAML21)
+#if (SAMD21 || SAMD11 || SAML21 || SAMD51)
   #include "sam_ba_usb.h"
   #include "sam_ba_cdc.h"
 #endif
@@ -100,7 +100,7 @@ uint32_t* pulSketch_Start_Address;
 
 #if (SAMD21 || SAMD11)
   if (PM->RCAUSE.bit.POR)
-#elif (SAML21 || SAMC21)
+#elif (SAML21 || SAMC21 || SAMD51)
   if (RSTC->RCAUSE.bit.POR)
 #else
   #error "main.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
diff --git a/bootloaders/zero/sam_ba_monitor.c b/bootloaders/zero/sam_ba_monitor.c
index 0d660f56d..58648cb76 100644
--- a/bootloaders/zero/sam_ba_monitor.c
+++ b/bootloaders/zero/sam_ba_monitor.c
@@ -22,7 +22,7 @@
 #include "sam_ba_monitor.h"
 #include "sam_ba_serial.h"
 #include "board_driver_serial.h"
-#if (SAMD21 || SAMD11 || SAML21)
+#if (SAMD21 || SAMD11 || SAML21 || SAMD51)
   #include "board_driver_usb.h"
   #include "sam_ba_usb.h"
   #include "sam_ba_cdc.h"
diff --git a/bootloaders/zero/sam_ba_serial.c b/bootloaders/zero/sam_ba_serial.c
index 8e87af0f4..19e854a2b 100644
--- a/bootloaders/zero/sam_ba_serial.c
+++ b/bootloaders/zero/sam_ba_serial.c
@@ -69,6 +69,13 @@ void serial_open(void)
   #elif (SAMC21G) || (SAMC21J)
   MCLK->APBCMASK.reg |= MCLK_APBCMASK_SERCOM0 | MCLK_APBCMASK_SERCOM1 | MCLK_APBCMASK_SERCOM2 | MCLK_APBCMASK_SERCOM3 | MCLK_APBCMASK_SERCOM4 | MCLK_APBCMASK_SERCOM5 ;
   #endif
+#elif (SAMD51)
+  MCLK->APBAMASK.reg |= MCLK_APBAMASK_SERCOM0 | MCLK_APBAMASK_SERCOM1 ;
+  MCLK->APBBMASK.reg |= MCLK_APBBMASK_SERCOM2 | MCLK_APBBMASK_SERCOM3 ;
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM4 | MCLK_APBDMASK_SERCOM5 ;
+  #if (SAMD51N) || (SAMD51P)
+  MCLK->APBDMASK.reg |= MCLK_APBDMASK_SERCOM6 | MCLK_APBDMASK_SERCOM7 ;
+  #endif
 #else
   #error "sam_ba_serial.c: Missing dependency or unsupported chip. Please install CMSIS-Atmel from MattairTech (see Prerequisites for Building in README.md)."
 #endif
@@ -77,13 +84,22 @@ void serial_open(void)
 #if (SAMD21 || SAMD11)
   GCLK->CLKCTRL.reg = ( GCLK_CLKCTRL_ID( BOOT_USART_PER_CLOCK_INDEX ) | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN );
   waitForSync();
-#elif (SAML21 || SAMC21)
-  GCLK->PCHCTRL[BOOT_USART_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+#elif (SAML21 || SAMC21 || SAMD51)
+  #if (SAMD51 && (VARIANT_MCK == 120000000ul))
+    GCLK->PCHCTRL[BOOT_USART_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK6 ); // Use 96MHz SERCOM clock (100MHz maximum) when cpu running at 120MHz
+  #else
+    GCLK->PCHCTRL[BOOT_USART_PER_CLOCK_INDEX].reg = ( GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0 );
+  #endif
   waitForSync();
 #endif
 
-	/* Baud rate 115200 - clock 48MHz -> BAUD value-63018 */
-	uart_basic_init(BOOT_USART_MODULE, 63018, BOOT_USART_PAD_SETTINGS);
+#if (SAMD51 && (VARIANT_MCK == 120000000ul))
+	/* Baud rate 115200 - clock 96MHz -> BAUD value-64278 */
+        uart_basic_init(BOOT_USART_MODULE, 64278, BOOT_USART_PAD_SETTINGS); // Use 96MHz SERCOM clock (100MHz maximum) when cpu running at 120MHz
+#else
+        /* Baud rate 115200 - clock 48MHz -> BAUD value-63018 */
+        uart_basic_init(BOOT_USART_MODULE, 63018, BOOT_USART_PAD_SETTINGS);
+#endif
 
 	//Initialize flag
 	b_sharp_received = false;
diff --git a/bootloaders/zero/util.c b/bootloaders/zero/util.c
index 46b382902..b3cf6c46e 100644
--- a/bootloaders/zero/util.c
+++ b/bootloaders/zero/util.c
@@ -25,12 +25,15 @@ extern uint32_t __sketch_vectors_ptr; // Exported value from linker script
 /*
  * The SAMD21 has a default 1MHz clock @ reset.
  * SAML21 and SAMC21 have a default 4MHz clock @ reset.
- * It is switched to 48MHz in board_init.c
+ * SAMD51 has a default 48MHz clock @ reset.
+ * It is switched to 48MHz (optionally to 120MHz for SAMD51) in board_init.c
  */
 #if (SAMD21 || SAMD11)
   #define CLOCK_DEFAULT 1000000ul
 #elif (SAML21 || SAMC21)
   #define CLOCK_DEFAULT 4000000ul
+#elif (SAMD51)
+  #define CLOCK_DEFAULT 48000000ul
 #endif
 uint32_t SystemCoreClock=CLOCK_DEFAULT;
 
@@ -39,20 +42,29 @@ void flashErase (uint32_t startAddress)
   // Syntax: X[ADDR]#
   // Erase the flash memory starting from ADDR to the end of flash.
 
-  // Note: the flash memory is erased in ROWS, that is in block of 4 pages.
-  //       Even if the starting address is the last byte of a ROW the entire
-  //       ROW is erased anyway.
+  // Note: the flash memory is erased in 4 page ROWS (16 page blocks for D51).
+  //       Even if the starting address is the last byte of a ROW/block the
+  //       entire ROW/block is erased anyway.
 
   uint32_t dst_addr = startAddress; // starting address
 
   while (dst_addr < FLASH_SIZE)
   {
+#if (SAMD51)
+    // Execute "EB" Erase Block
+    NVMCTRL->ADDR.reg = dst_addr;   // 8-bit hardware address
+    NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_CMDEX_KEY | NVMCTRL_CTRLB_CMD_EB;
+    while (NVMCTRL->STATUS.bit.READY == 0)
+      ;
+    dst_addr += FLASH_PAGE_SIZE * 16; // Skip a Block
+#else
     // Execute "ER" Erase Row
-    NVMCTRL->ADDR.reg = dst_addr / 2;
+    NVMCTRL->ADDR.reg = dst_addr / 2;   // 16-bit hardware address
     NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_ER;
     while (NVMCTRL->INTFLAG.bit.READY == 0)
       ;
     dst_addr += FLASH_PAGE_SIZE * 4; // Skip a ROW
+#endif
   }
 }
 
@@ -76,9 +88,15 @@ void flashWrite (uint32_t numBytes, uint32_t * buffer, uint32_t * ptr_data)
   while (size)
   {
     // Execute "PBC" Page Buffer Clear
+#if (SAMD51)
+    NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_CMDEX_KEY | NVMCTRL_CTRLB_CMD_PBC;
+    while (NVMCTRL->STATUS.bit.READY == 0)
+      ;
+#else
     NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_PBC;
     while (NVMCTRL->INTFLAG.bit.READY == 0)
       ;
+#endif
 
     // Fill page buffer
     uint32_t i;
@@ -88,10 +106,15 @@ void flashWrite (uint32_t numBytes, uint32_t * buffer, uint32_t * ptr_data)
     }
 
     // Execute "WP" Write Page
-    //NVMCTRL->ADDR.reg = ((uint32_t)dst_addr) / 2;
+#if (SAMD51)
+    NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_CMDEX_KEY | NVMCTRL_CTRLB_CMD_WP;
+    while (NVMCTRL->STATUS.bit.READY == 0)
+      ;
+#else
     NVMCTRL->CTRLA.reg = NVMCTRL_CTRLA_CMDEX_KEY | NVMCTRL_CTRLA_CMD_WP;
     while (NVMCTRL->INTFLAG.bit.READY == 0)
       ;
+#endif
 
     // Advance to next page
     dst_addr += i;
@@ -156,21 +179,33 @@ void delayUs (uint32_t delay)
 {
   /* The SAMD21 has a default 1MHz clock @ reset.
    * SAML21 and SAMC21 have a default 4MHz clock @ reset.
-   * It is switched to 48MHz in board_init.c
+   * SAMD51 has a default 48MHz clock @ reset.
+   * It is switched to 48MHz (optionally to 120MHz for SAMD51) in board_init.c.
+   * Note that the D51 CMCC cache is not used, and FLASH wait states limit access.
    */
   uint32_t numLoops;
 
   if (SystemCoreClock == VARIANT_MCK) {
+#if (SAMD51)
+  #if (VARIANT_MCK == 120000000ul)
+    numLoops = (12 * delay);
+  #else
+    numLoops = (9 * delay);
+  #endif
+#else
     numLoops = (12 * delay);
+#endif
   } else {
 #if (SAMD21 || SAMD11)
     numLoops = (delay >> 2);
 #elif (SAML21 || SAMC21)
     numLoops = delay;
+#elif (SAMD51)
+    numLoops = (9 * delay);
 #endif
   }
 
-  for (uint32_t i=0; i < numLoops; i++) /* 10ms */
+  for (uint32_t i=0; i < numLoops; i++)
     /* force compiler to not optimize this... */
     __asm__ __volatile__("");
 }
@@ -185,9 +220,9 @@ void systemReset (void)
 
 void waitForSync (void)
 {
-  #if (SAMD)
+  #if (SAMD21 || SAMD11)
   while ( GCLK->STATUS.reg & GCLK_STATUS_SYNCBUSY );
-  #elif (SAML21 || SAMC21)
+  #elif (SAML21 || SAMC21 || SAMD51)
   while ( GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_MASK );
   #endif
 }

From 15e26fa0a081d1d06456700bd1541d743ad0d3f8 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 24 Nov 2017 10:30:00 +0000
Subject: [PATCH 107/124] Improve accuracy of HS crystal (fixed off-by-one
 calculation)

---
 bootloaders/zero/board_init.c | 6 +++---
 cores/arduino/startup.c       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bootloaders/zero/board_init.c b/bootloaders/zero/board_init.c
index 08830fda9..84b7f8eff 100644
--- a/bootloaders/zero/board_init.c
+++ b/bootloaders/zero/board_init.c
@@ -283,7 +283,7 @@ void board_init( void )
 #endif
 
 #if defined(PLL_FRACTIONAL_ENABLED)
-  #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+  #define DPLLRATIO_LDR		((uint16_t)DPLLRATIO_FLOAT - 1)
   #if (SAMD51)
     #define DPLLRATIO_LDRFRAC   (uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 32.0)
     #if (VARIANT_MCK == 120000000ul)
@@ -293,10 +293,10 @@ void board_init( void )
     #define DPLLRATIO_LDRFRAC   (uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
   #endif
 #else
-  #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+  #define DPLLRATIO_LDR		((uint16_t)DPLLRATIO_FLOAT - 1)
   #define DPLLRATIO_LDRFRAC	0
   #if (SAMD51 && (VARIANT_MCK == 120000000ul))
-    #define DPLL1RATIO_LDR        (uint16_t)DPLLRATIO_FLOAT
+    #define DPLL1RATIO_LDR        ((uint16_t)DPLL1RATIO_FLOAT - 1)
     #define DPLL1RATIO_LDRFRAC    0
   #endif
 #endif
diff --git a/cores/arduino/startup.c b/cores/arduino/startup.c
index 63e4d80e4..1a9bc312f 100644
--- a/cores/arduino/startup.c
+++ b/cores/arduino/startup.c
@@ -189,10 +189,10 @@ void SystemInit( void )
 #define DPLLRATIO_FLOAT		(96000000.0 / ((float)HS_CRYSTAL_FREQUENCY_HERTZ / HS_CRYSTAL_DIVIDER))
 
 #if defined(PLL_FRACTIONAL_ENABLED)
-  #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+  #define DPLLRATIO_LDR		((uint16_t)DPLLRATIO_FLOAT - 1)
   #define DPLLRATIO_LDRFRAC	(uint8_t)((DPLLRATIO_FLOAT - (uint16_t)DPLLRATIO_FLOAT) * 16.0)
 #else
-  #define DPLLRATIO_LDR		(uint16_t)DPLLRATIO_FLOAT
+  #define DPLLRATIO_LDR		((uint16_t)DPLLRATIO_FLOAT - 1)
   #define DPLLRATIO_LDRFRAC	0
 #endif
 

From 2f448ead802a21e013adb44ac169d247ef02bb8a Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 24 Nov 2017 11:24:01 +0000
Subject: [PATCH 108/124] Fixed USB pad calibration values for L21 in
 bootloader and USB host mode

---
 bootloaders/zero/board_driver_usb.c |  5 ++++
 cores/arduino/USB/samd21_host.c     | 43 +++++++++++++++--------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/bootloaders/zero/board_driver_usb.c b/bootloaders/zero/board_driver_usb.c
index 53c5bb970..7479dd493 100644
--- a/bootloaders/zero/board_driver_usb.c
+++ b/bootloaders/zero/board_driver_usb.c
@@ -27,6 +27,11 @@
   #define NVM_USB_PAD_TRANSN_POS            (32)
   #define NVM_USB_PAD_TRANSP_POS            (37)
   #define NVM_USB_PAD_TRIM_POS              (42)
+#elif (SAML21)
+  #define NVM_CALIBRATION_ADDRESS           NVMCTRL_OTP5
+  #define NVM_USB_PAD_TRANSN_POS            (13)
+  #define NVM_USB_PAD_TRANSP_POS            (18)
+  #define NVM_USB_PAD_TRIM_POS              (23)
 #else
   #define NVM_CALIBRATION_ADDRESS           NVMCTRL_OTP4
   #define NVM_USB_PAD_TRANSN_POS            (45)
diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index 3522035d4..b4d6b7cb4 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -44,17 +44,23 @@ __attribute__((__aligned__(4))) volatile UsbHostDescriptor usb_pipe_table[USB_EP
 
 extern void (*gpf_isr)(void);
 
-
-// NVM Software Calibration Area Mapping
-// USB TRANSN calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRANSN_POS     45
-#define NVM_USB_PAD_TRANSN_SIZE    5
-// USB TRANSP calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRANSP_POS     50
-#define NVM_USB_PAD_TRANSP_SIZE    5
-// USB TRIM calibration value. Should be written to the USB PADCAL register.
-#define NVM_USB_PAD_TRIM_POS       55
-#define NVM_USB_PAD_TRIM_SIZE      3
+#if (SAML21)
+  #define NVM_CALIBRATION_ADDRESS           NVMCTRL_OTP5
+  #define NVM_USB_PAD_TRANSN_POS            (13)
+  #define NVM_USB_PAD_TRANSP_POS            (18)
+  #define NVM_USB_PAD_TRIM_POS              (23)
+#else
+  #define NVM_CALIBRATION_ADDRESS           NVMCTRL_OTP4
+  #define NVM_USB_PAD_TRANSN_POS            (45)
+  #define NVM_USB_PAD_TRANSP_POS            (50)
+  #define NVM_USB_PAD_TRIM_POS              (55)
+#endif
+#define USB_PAD_TRANSN_REG_POS            (6)
+#define NVM_USB_PAD_TRANSN_SIZE           (5)
+#define USB_PAD_TRANSP_REG_POS            (0)
+#define NVM_USB_PAD_TRANSP_SIZE           (5)
+#define USB_PAD_TRIM_REG_POS              (12)
+#define NVM_USB_PAD_TRIM_SIZE             (3)
 
 /**
  * \brief Initialize the SAMD21 host driver.
@@ -112,7 +118,7 @@ void UHD_Init(void)
 	while (USB->HOST.SYNCBUSY.reg == USB_SYNCBUSY_ENABLE);
 
 	/* Load Pad Calibration */
-	pad_transn = (*((uint32_t *)(NVMCTRL_OTP4)       // Non-Volatile Memory Controller
+        pad_transn = (*((uint32_t *)(NVM_CALIBRATION_ADDRESS)       // Non-Volatile Memory Controller
 					+ (NVM_USB_PAD_TRANSN_POS / 32))
 					>> (NVM_USB_PAD_TRANSN_POS % 32))
 				& ((1 << NVM_USB_PAD_TRANSN_SIZE) - 1);
@@ -122,9 +128,7 @@ void UHD_Init(void)
 		pad_transn = 5;
 	}
 
-	USB->HOST.PADCAL.bit.TRANSN = pad_transn;
-
-	pad_transp = (*((uint32_t *)(NVMCTRL_OTP4)
+	pad_transp = (*((uint32_t *)(NVM_CALIBRATION_ADDRESS)
 					+ (NVM_USB_PAD_TRANSP_POS / 32))
 					>> (NVM_USB_PAD_TRANSP_POS % 32))
 				& ((1 << NVM_USB_PAD_TRANSP_SIZE) - 1);
@@ -134,9 +138,7 @@ void UHD_Init(void)
 		pad_transp = 29;
 	}
 
-	USB->HOST.PADCAL.bit.TRANSP = pad_transp;
-
-	pad_trim = (*((uint32_t *)(NVMCTRL_OTP4)
+	pad_trim = (*((uint32_t *)(NVM_CALIBRATION_ADDRESS)
 					+ (NVM_USB_PAD_TRIM_POS / 32))
 				>> (NVM_USB_PAD_TRIM_POS % 32))
 				& ((1 << NVM_USB_PAD_TRIM_SIZE) - 1);
@@ -144,10 +146,9 @@ void UHD_Init(void)
 	if (pad_trim == 0x7)         // maximum value (7)
 	{
 		pad_trim = 3;
-	}
-
-	USB->HOST.PADCAL.bit.TRIM = pad_trim;
+        }
 
+        USB->HOST.PADCAL.reg = (uint16_t)((pad_trim << USB_PAD_TRIM_REG_POS) | (pad_transn << USB_PAD_TRANSN_REG_POS) | (pad_transp << USB_PAD_TRANSP_REG_POS));
 
 	/* Set the configuration */
 	uhd_run_in_standby();

From 76b4aa9369081d02695f3fde82df1a660b16b094 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 24 Nov 2017 11:46:54 +0000
Subject: [PATCH 109/124] Made PIN_USB_HOST_ENABLE optional. Readme updates for
 MT-D11 and Generic D11C14A.

---
 cores/arduino/USB/samd21_host.c    |  2 ++
 variants/Generic_D11C14A/README.md | 20 ++++++++++----------
 variants/Generic_D11C14A/variant.h |  7 ++++---
 variants/MT_D11/README.md          | 30 +++++++++++++++---------------
 variants/MT_D11/variant.h          |  7 ++++---
 variants/MT_D21E/variant.h         |  5 +++--
 variants/MT_D21E_revB/variant.h    |  5 +++--
 variants/Xeno/variant.h            |  5 +++--
 variants/arduino_mzero/variant.h   |  3 ++-
 variants/arduino_zero/variant.h    |  3 ++-
 10 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/cores/arduino/USB/samd21_host.c b/cores/arduino/USB/samd21_host.c
index b4d6b7cb4..e994e729a 100644
--- a/cores/arduino/USB/samd21_host.c
+++ b/cores/arduino/USB/samd21_host.c
@@ -161,8 +161,10 @@ void UHD_Init(void)
 	uhd_state = UHD_STATE_NO_VBUS;
 
 	// Put VBUS on USB port
+#if defined(PIN_USB_HOST_ENABLE)
 	pinMode( PIN_USB_HOST_ENABLE, OUTPUT );
 	digitalWrite( PIN_USB_HOST_ENABLE, PIN_USB_HOST_ENABLE_VALUE );
+#endif
 
 	uhd_enable_connection_int();
 
diff --git a/variants/Generic_D11C14A/README.md b/variants/Generic_D11C14A/README.md
index 44f087a81..75159db05 100644
--- a/variants/Generic_D11C14A/README.md
+++ b/variants/Generic_D11C14A/README.md
@@ -6,8 +6,8 @@ Other  COM   PWM  Analog  INT  Arduino*           Arduino*  INT  Analog  PWM   C
 =========================================================================================
                                   1-------------------
   SCK*/RX2  TCC01    *     *    5 | A5             A4 | 4    *    *  TCC00 MOSI*/TX2  REF
-    MOSI*   TCC02          *    8 | A8             A2 | 2    *    *                   DAC
-    SCK*    TCC03          *    9 | A9            Vdd |
+    MOSI*   TCC02          *    8 | A8 (XIN)       A2 | 2    *    *                   DAC
+    SCK*    TCC03          *    9 | A9 (XOUT)     Vdd |
   SDA/MISO*  TC10    *    NMI  14 | A14           Gnd |
    SCL/SS*   TC11    *     *   15 | A15           A25 | 25                    USB/DP
 BOOT                           28 | A28/RST       A24 | 24                    USB/DM
@@ -15,10 +15,10 @@ SWDCLK  TX1/MISO*              30 | A30           A31 | 31   *            RX1/SS
                                    -------------------
 
 * Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
-  pin number printed on the board is also used in Arduino (but without the 'A') for all
-  of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.). When
-  using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
-  left pin (A2). PIN_MAP_COMPACT uses less RAM.
+  pin number printed on the chip above is also used in Arduino (but without the 'A') for
+  all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.).
+  When using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the
+  top left pin (A5). PIN_MAP_COMPACT uses less RAM.
 * When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
 * When using ONE_UART_NO_WIRE_ONE_SPI, use SPI on pins 4, 5, 14, and 15.
   When using NO_UART_ONE_WIRE_ONE_SPI, use SPI on pins 8, 9, 30, and 31.
@@ -91,10 +91,10 @@ Arduino	| Port	| Alternate Function	| Comments (! means not used with this perip
 ====================================================================================================================================
 
 * Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
-  pin number printed on the board is also used in Arduino (but without the 'A') for all
-  of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.). When
-  using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the top
-  left pin (A2). PIN_MAP_COMPACT uses less RAM.
+  pin number printed on the chip above is also used in Arduino (but without the 'A') for
+  all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.).
+  When using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the
+  top left pin (A5). PIN_MAP_COMPACT uses less RAM.
 * NOT A PIN means the Arduino pin number is not mapped to a physical pin.
 * Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
 * The tone library uses TC2. TC2 is not routed to pins in the D11C14A (14-pin).
diff --git a/variants/Generic_D11C14A/variant.h b/variants/Generic_D11C14A/variant.h
index 1948e7e83..c43d96a68 100644
--- a/variants/Generic_D11C14A/variant.h
+++ b/variants/Generic_D11C14A/variant.h
@@ -296,16 +296,17 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #if defined PIN_MAP_STANDARD
 #define PIN_USB_DM                      (24ul)
 #define PIN_USB_DP                      (25ul)
-#define PIN_USB_HOST_ENABLE             (14ul)
+//#define PIN_USB_HOST_ENABLE             (14ul)
 #elif defined PIN_MAP_COMPACT
 #define PIN_USB_DM                      (7ul)
 #define PIN_USB_DP                      (8ul)
-#define PIN_USB_HOST_ENABLE             (5ul)
+//#define PIN_USB_HOST_ENABLE             (5ul)
 #endif
 
 #define PIN_USB_HOST_ENABLE_VALUE	HIGH
diff --git a/variants/MT_D11/README.md b/variants/MT_D11/README.md
index 68fceea34..dd2eff502 100644
--- a/variants/MT_D11/README.md
+++ b/variants/MT_D11/README.md
@@ -2,20 +2,20 @@
 
 ```
 =========================== MattairTech MT-D11 (ATsamD11D14AM) ==========================
-Other  COM    PWM   Analog  INT  Arduino*             Arduino*  INT   PWM     COM   Other
+Other  COM    PWM  Analog  INT  Arduino*             Arduino*  INT   PWM     COM    Other
 =========================================================================================
-                                    -------------------
-DAC                   *            | A2   | USB |  Gnd |
-REF                   *            | A3   |     |  Vcc |
-             TCC00    *      *     | A4    -----   A31 | 31     *    TC21     RX1   SWDIO
-             TCC01    *      *     | A5            A30 | 30          TC20     TX1  SWDCLK
-             TCC02    *            | A6            A27 | 27     *
-             TCC03    *            | A7            A23 | 23                   SCL
-   MOSI / TX2         *      *     | A10           A22 | 22     *             SDA
-   SCK / RX2          *            | A11           A17 | 17          TC11
-      MISO            *     NMI    | A14           A16 | 16     *    TC10             LED
-BTN   SS              *      *     | A15           RST |                             BOOT
-                                    -------------------
+                                     -------------------
+DAC                   *          2  | A2   | USB |  Gnd |
+REF                   *          3  | A3   |     |  Vcc |
+             TCC00    *     *    4  | A4    -----   A31 | 31    *    TC21    RX1    SWDIO
+             TCC01    *     *    5  | A5            A30 | 30         TC20    TX1   SWDCLK
+             TCC02    *          6  | A6            A27 | 27    *
+             TCC03    *          7  | A7            A23 | 23                 SCL
+   MOSI / TX2         *     *    10 | A10           A22 | 22    *            SDA
+   SCK / RX2          *          11 | A11           A17 | 17         TC11
+      MISO            *    NMI   14 | A14           A16 | 16    *    TC10             LED
+BTN   SS              *     *    15 | A15           RST |                            BOOT
+                                     -------------------
 
 * Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
   pin number printed on the board is also used in Arduino (but without the 'A') for all
@@ -59,7 +59,7 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 20	| ---	| ----	| NOT A PIN		| NOT A PIN
 21	| ---	| ----	| NOT A PIN		| NOT A PIN
 22	| A22	| PA22	| I2C/SDA w/pullup	| EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
-23	| A23	| PA23	| I2C/SCL w/pullup	| !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[0] !TC1/WO[1] !TCC0/WO[5]
+23	| A23	| PA23	| I2C/SCL w/pullup	| !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[5]
 24	| ---	| PA24	| USB_NEGATIVE		| USB/DM
 25	| ---	| PA25	| USB_POSITIVE		| USB/DP
 26	| ---	| ----	| NOT A PIN		| NOT A PIN
@@ -89,7 +89,7 @@ Arduino	| Silk	| Port	| Alternate Function	| Comments (! means not used with thi
 10	| A16	| PA16	| LED			| EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6] LED
 11	| A17	| PA17	| HOST_ENABLE		| !EIC/EXTINT[1] PTC/X[5] PTC/Y[11] !SERCOM1/PAD[3] !SERCOM2/PAD[3] TC1/WO[1] !TCC0/WO[7] HOST_ENABLE
 12	| A22	| PA22	| I2C/SDA w/pullup	| EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
-13	| A23	| PA23	| I2C/SCL w/pullup	| !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[0] !TC1/WO[1] !TCC0/WO[5]
+13	| A23	| PA23	| I2C/SCL w/pullup	| !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[5]
 14	| A27	| PA27	| 			| EIC/EXTINT[7] PTC/X[10]
 15	| A30	| PA30	| TX1 / SWD CLK		| !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
 16	| A31	| PA31	| RX1 / SWD IO		| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
diff --git a/variants/MT_D11/variant.h b/variants/MT_D11/variant.h
index bb0f807f7..5995938f4 100644
--- a/variants/MT_D11/variant.h
+++ b/variants/MT_D11/variant.h
@@ -310,17 +310,18 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #if defined PIN_MAP_STANDARD
 #define PIN_USB_DM                      (24ul)
 #define PIN_USB_DP                      (25ul)
-#define PIN_USB_HOST_ENABLE             (17ul)
+//#define PIN_USB_HOST_ENABLE             (17ul)
 #elif defined PIN_MAP_COMPACT
 // USB pins not directly accessible using PIN_MAP_COMPACT
 #define PIN_USB_DM                      (0ul)
 #define PIN_USB_DP                      (0ul)
-#define PIN_USB_HOST_ENABLE             (0ul)
+//#define PIN_USB_HOST_ENABLE             (0ul)
 #endif
 
 #define PIN_USB_HOST_ENABLE_VALUE	HIGH
diff --git a/variants/MT_D21E/variant.h b/variants/MT_D21E/variant.h
index b3e3148cd..4d14da5e9 100644
--- a/variants/MT_D21E/variant.h
+++ b/variants/MT_D21E/variant.h
@@ -280,11 +280,12 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
 
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #define PIN_USB_DM                      (24ul)
 #define PIN_USB_DP                      (25ul)
-#define PIN_USB_HOST_ENABLE             (14ul)
+//#define PIN_USB_HOST_ENABLE             (14ul)
 #define PIN_USB_HOST_ENABLE_VALUE	HIGH
 
 /*
diff --git a/variants/MT_D21E_revB/variant.h b/variants/MT_D21E_revB/variant.h
index 72ed8ee03..04ef9649f 100644
--- a/variants/MT_D21E_revB/variant.h
+++ b/variants/MT_D21E_revB/variant.h
@@ -368,11 +368,12 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
 
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #define PIN_USB_DM                      (24ul)
 #define PIN_USB_DP                      (25ul)
-#define PIN_USB_HOST_ENABLE             (14ul)
+//#define PIN_USB_HOST_ENABLE             (14ul)
 #define PIN_USB_HOST_ENABLE_VALUE	HIGH
 
 /*
diff --git a/variants/Xeno/variant.h b/variants/Xeno/variant.h
index afed681b9..fa75fe761 100644
--- a/variants/Xeno/variant.h
+++ b/variants/Xeno/variant.h
@@ -309,11 +309,12 @@ static const uint8_t SCL1 = PIN_WIRE1_SCL;
 
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #define PIN_USB_DM                      (24ul)
 #define PIN_USB_DP                      (25ul)
-#define PIN_USB_HOST_ENABLE             (14ul)
+//#define PIN_USB_HOST_ENABLE             (14ul)
 #define PIN_USB_HOST_ENABLE_VALUE	0
 
 /*
diff --git a/variants/arduino_mzero/variant.h b/variants/arduino_mzero/variant.h
index 72aa72ed0..b85c2525f 100644
--- a/variants/arduino_mzero/variant.h
+++ b/variants/arduino_mzero/variant.h
@@ -216,7 +216,8 @@ static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #define PIN_USB_DM          (33ul)
 #define PIN_USB_DP          (34ul)
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
index 115b7af6f..41a003c77 100644
--- a/variants/arduino_zero/variant.h
+++ b/variants/arduino_zero/variant.h
@@ -220,7 +220,8 @@ static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
 /*
- * USB
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
  */
 #define PIN_USB_DM          (28ul)
 #define PIN_USB_DP          (29ul)

From 67f8b5985de5b2d28b0420b685e27fb770ba3029 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Fri, 24 Nov 2017 12:36:49 +0000
Subject: [PATCH 110/124] Added Generic D11D14AS (20-pin SOIC) variant.

---
 boards.txt                                    |  85 ++++
 variants/Generic_D11D14AS/README.md           | 250 ++++++++++++
 .../debug_scripts/SAMD11D14AS.gdb             |  31 ++
 .../gcc/4KB_Bootloader/flash_16KB.ld          | 217 ++++++++++
 .../gcc/No_Bootloader/flash_16KB.ld           | 214 ++++++++++
 .../openocd_scripts/SAMD11D14AS.cfg           |  30 ++
 variants/Generic_D11D14AS/pins_arduino.h      |  21 +
 variants/Generic_D11D14AS/variant.cpp         | 115 ++++++
 variants/Generic_D11D14AS/variant.h           | 369 ++++++++++++++++++
 9 files changed, 1332 insertions(+)
 create mode 100644 variants/Generic_D11D14AS/README.md
 create mode 100644 variants/Generic_D11D14AS/debug_scripts/SAMD11D14AS.gdb
 create mode 100644 variants/Generic_D11D14AS/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
 create mode 100644 variants/Generic_D11D14AS/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
 create mode 100644 variants/Generic_D11D14AS/openocd_scripts/SAMD11D14AS.cfg
 create mode 100644 variants/Generic_D11D14AS/pins_arduino.h
 create mode 100644 variants/Generic_D11D14AS/variant.cpp
 create mode 100644 variants/Generic_D11D14AS/variant.h

diff --git a/boards.txt b/boards.txt
index b4b421e0c..f594f3601 100644
--- a/boards.txt
+++ b/boards.txt
@@ -691,6 +691,91 @@ d11c14a.menu.usb.none.build.usbcom=USB_DISABLED
 d11c14a.menu.usb.none.build.pid=0x0856
 
 
+# Generic D11D14AS (SOIC-20)
+d11d14as.name=Generic D11D14AS
+d11d14as.vid.0=0x16D0
+d11d14as.pid.0=0x0557
+d11d14as.vid.1=0x16D0
+d11d14as.pid.1=0x0856
+d11d14as.vid.2=0x16D0
+d11d14as.pid.2=0x0B41
+d11d14as.vid.3=0x16D0
+d11d14as.pid.3=0x0B40
+d11d14as.vid.4=0x16D0
+d11d14as.pid.4=0x0A0C
+d11d14as.vid.5=0x16D0
+d11d14as.pid.5=0x0856
+d11d14as.build.mcu=cortex-m0plus
+d11d14as.build.f_cpu=48000000L
+d11d14as.build.usb_product="D11D14AS"
+d11d14as.build.usb_manufacturer="MattairTech LLC"
+d11d14as.build.board=SAMD_ZERO
+d11d14as.build.core=arduino
+d11d14as.build.variant=Generic_D11D14AS
+d11d14as.build.variant_system_lib=
+d11d14as.build.vid=0x16D0
+d11d14as.upload.protocol=sam-ba
+d11d14as.bootloader.tool=arduino:openocd
+d11d14as.menu.clock.internal_usb=INTERNAL_USB_CALIBRATED_OSCILLATOR
+d11d14as.menu.clock.internal_usb.build.clockconfig=CLOCKCONFIG_INTERNAL_USB
+d11d14as.menu.clock.internal=INTERNAL_OSCILLATOR
+d11d14as.menu.clock.internal.build.clockconfig=CLOCKCONFIG_INTERNAL
+d11d14as.menu.clock.crystal_32k=32KHZ_CRYSTAL
+d11d14as.menu.clock.crystal_32k.build.clockconfig=CLOCKCONFIG_32768HZ_CRYSTAL
+d11d14as.menu.clock.crystal_hs=HIGH_SPEED_CRYSTAL
+d11d14as.menu.clock.crystal_hs.build.clockconfig=CLOCKCONFIG_HS_CRYSTAL
+d11d14as.build.extra_flags=-D__SAMD11D14AS__ {build.usb_flags}
+d11d14as.build.ldscript=flash_16KB.ld
+d11d14as.build.openocdscript=openocd_scripts/SAMD11D14AS.cfg
+d11d14as.bootloader.file=zero/binaries/sam_ba_Generic_D11D14AS_SAMD11D14AS.bin
+d11d14as.menu.bootloader.4kb=4KB_BOOTLOADER
+d11d14as.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
+d11d14as.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
+d11d14as.menu.bootloader.4kb.upload.tool=MattairTech_Arduino:bossac
+d11d14as.menu.bootloader.4kb.upload.use_1200bps_touch=true
+d11d14as.menu.bootloader.4kb.upload.wait_for_upload_port=true
+d11d14as.menu.bootloader.4kb.upload.native_usb=true
+d11d14as.menu.bootloader.4kb.upload.maximum_size=12288
+d11d14as.menu.bootloader.0kb=NO_BOOTLOADER
+d11d14as.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+d11d14as.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+d11d14as.menu.bootloader.0kb.upload.tool=arduino:openocd
+d11d14as.menu.bootloader.0kb.upload.use_1200bps_touch=false
+d11d14as.menu.bootloader.0kb.upload.wait_for_upload_port=false
+d11d14as.menu.bootloader.0kb.upload.native_usb=false
+d11d14as.menu.bootloader.0kb.upload.maximum_size=16384
+d11d14as.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
+d11d14as.menu.serial.one_uart.build.serialcom_uart=ONE_UART
+d11d14as.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
+d11d14as.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+d11d14as.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
+d11d14as.menu.serial.no_uart.build.serialcom_uart=NO_UART
+d11d14as.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
+d11d14as.menu.serial.no_uart.build.serialcom_spi=ONE_SPI
+d11d14as.menu.serial.two_uart=TWO_UART_ONE_WIRE_NO_SPI
+d11d14as.menu.serial.two_uart.build.serialcom_uart=TWO_UART
+d11d14as.menu.serial.two_uart.build.serialcom_wire=ONE_WIRE
+d11d14as.menu.serial.two_uart.build.serialcom_spi=NO_SPI
+d11d14as.menu.usb.cdc=CDC_ONLY
+d11d14as.menu.usb.cdc.build.usbcom=CDC_ONLY
+d11d14as.menu.usb.cdc.build.pid=0x0557
+d11d14as.menu.usb.cdc_hid=CDC_HID
+d11d14as.menu.usb.cdc_hid.build.usbcom=CDC_HID
+d11d14as.menu.usb.cdc_hid.build.pid=0x0856
+d11d14as.menu.usb.withcdc=WITH_CDC
+d11d14as.menu.usb.withcdc.build.usbcom=WITH_CDC
+d11d14as.menu.usb.withcdc.build.pid=0x0B41
+d11d14as.menu.usb.hid=HID_ONLY
+d11d14as.menu.usb.hid.build.usbcom=HID_ONLY
+d11d14as.menu.usb.hid.build.pid=0x0B40
+d11d14as.menu.usb.nocdc=WITHOUT_CDC
+d11d14as.menu.usb.nocdc.build.usbcom=WITHOUT_CDC
+d11d14as.menu.usb.nocdc.build.pid=0x0A0C
+d11d14as.menu.usb.none=USB_DISABLED
+d11d14as.menu.usb.none.build.usbcom=USB_DISABLED
+d11d14as.menu.usb.none.build.pid=0x0856
+
+
 # MattairTech Core for Arduino/Genuino Zero (Autodetect Port)
 arduino_zero.name=Arduino/Genuino Zero (Autodetect Port)
 arduino_zero.bootloader.file=zero/binaries/sam_ba_arduino_zero_SAMD21G18A.bin
diff --git a/variants/Generic_D11D14AS/README.md b/variants/Generic_D11D14AS/README.md
new file mode 100644
index 000000000..ca09728b4
--- /dev/null
+++ b/variants/Generic_D11D14AS/README.md
@@ -0,0 +1,250 @@
+# Generic ATsamD11D14AS
+
+```
+=====================================  ATsamD11D14AS  ===================================
+Other COM   PWM  Analog  INT  Arduino*            Arduino*  Analog  INT  PWM   COM  Other
+=========================================================================================
+                                   1-------------------
+            TCC01    *     *    5  | A5             A4 | 4    *     *   TCC00        REFB
+     SS     TCC02    *          6  | A6             A3 | 3    *                      REFA
+    MISO    TCC03    *     *    7  | A7             A2 | 2    *     *                 DAC
+Xin32/Xin                       8  | A8 (XIN)      Vdd |
+Xout32/Xout                     9  | A9 (XOUT)     Gnd |
+  MOSI/TX2           *    NMI   14 | A14           A25 | 25                  USB D+
+  SCK/RX2   TC11     *     *    15 | A15           A24 | 24                  USB D-
+            TC10           *    16 | A16           A31 | 31         *   TC21  RX1   SWDIO
+    SDA                    *    22 | A22           A30 | 30             TC20  TX1  SWDCLK
+    SCL                         23 | A23       RST/A28 | 28                          BOOT
+                                    -------------------
+
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the chip above is also used in Arduino (but without the 'A') for
+  all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.).
+  When using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the
+  top left pin (A5). PIN_MAP_COMPACT uses less RAM.
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+* Tone available on TC2.
+* Leave pin A30 floating (or use external pullup) during reset.
+* DO NOT connect voltages higher than 3.3V!
+```
+
+
+## Pins descriptions for Generic ATsamD11D14AS
+
+### PIN_MAP_STANDARD
+```
+============================================================================================================================================
+Arduino	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| ----	| NOT A PIN		| NOT A PIN
+1	| ----	| NOT A PIN		| NOT A PIN
+2	| PA02	| DAC			| EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+3	| PA03	| REFA			| !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+4	| PA04	| REFB / TCC00		| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+5	| PA05	| TCC01			| EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+6	| PA06	| SS (unused) / TCC02	| !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+7	| PA07	| MISO / TCC03		| EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+8	| PA08	| Xin32 / Xin		| Xin32
+9	| PA09	| Xout32 / Xout		| Xout32
+10	| ----	| NOT A PIN             | NOT A PIN
+11	| ----	| NOT A PIN             | NOT A PIN
+12	| ----	| NOT A PIN		| NOT A PIN
+13	| ----	| NOT A PIN		| NOT A PIN
+14	| PA14	| MOSI / TX2	        | EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+15	| PA15	| SCK / RX2 / TC11      | EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] TC1/WO[1] !TCC0/WO[1]
+16	| PA16	| TC10			| EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6]
+17	| ----  | NOT A PIN             | NOT A PIN
+18	| ----	| NOT A PIN		| NOT A PIN
+19	| ----	| NOT A PIN		| NOT A PIN
+20	| ----	| NOT A PIN		| NOT A PIN
+21	| ----	| NOT A PIN		| NOT A PIN
+22	| PA22	| SDA           	| EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+23	| PA23	| SCL	                | !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[5]
+24	| PA24	| USB_NEGATIVE		| USB/DM
+25	| PA25	| USB_POSITIVE		| USB/DP
+26	| ----	| NOT A PIN		| NOT A PIN
+27	| ----  | NOT A PIN             | NOT A PIN
+28	| PA28	| Reset			| Reset, BOOT (double tap bootloader entry)
+29	| ----	| NOT A PIN		| NOT A PIN
+30	| PA30	| TX1 / TC20 / SWD CLK	| !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+31	| PA31	| RX1 / TC21 / SWD IO	| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+============================================================================================================================================
+```
+
+### PIN_MAP_COMPACT
+```
+============================================================================================================================================
+Arduino | Port  | Alternate Function    | Comments (! means not used with this peripheral assignment)
+--------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0       | PA02  | DAC                   | EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+1       | PA03  | REFA                  | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+2       | PA04  | REFB / TCC00          | EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+3       | PA05  | TCC01                 | EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+4       | PA06  | SS (unused) / TCC02   | !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+5       | PA07  | MISO / TCC03          | EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+6       | PA08  | Xin32 / Xin           | Xin32
+7       | PA09  | Xout32 / Xout         | Xout32
+8       | PA14  | MOSI / TX2            | EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+9       | PA15  | SCK / RX2 / TC11      | EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] TC1/WO[1] !TCC0/WO[1]
+10      | PA16  | TC10                  | EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6]
+11      | PA22  | SDA                   | EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+12      | PA23  | SCL                   | !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[5]
+13      | PA24  | USB_NEGATIVE          | USB/DM
+14      | PA25  | USB_POSITIVE          | USB/DP
+15      | PA28  | Reset                 | Reset, BOOT (double tap bootloader entry)
+16      | PA30  | TX1 / TC20 / SWD CLK  | !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+17      | PA31  | RX1 / TC21 / SWD IO   | EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+============================================================================================================================================
+
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the chip above is also used in Arduino (but without the 'A') for
+  all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.).
+  When using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the
+  top left pin (A5). PIN_MAP_COMPACT uses less RAM.
+* NOT A PIN means the Arduino pin number is not mapped to a physical pin.
+* Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+* The tone library uses TC2.
+* Leave pin A30 floating (or use external pullup) during reset.
+```
+
+
+## Board Configuration Notes
+
+* **Crystals**
+  * Either a 32.768KHz crystal or a high speed crystal can be used.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
+
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin, enabled by default).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+
+* **Analog Inputs**
+  * 8 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REF.
+
+* **DAC**
+  * One analog output is available on pin 2.
+  * Provides a 10-bit voltage output with the analogWrite() function.
+
+* **PWM**
+  * 8 pins can be configured as PWM outputs.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+
+* **External Interrupts**
+  * 8 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 3 SERCOM are available.
+  * Up to 2 UART instances
+  * 1 SPI instance
+  * 1 WIRE (I2C) instance
+
+
+
+## PinDescription table format
+
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+### Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+### Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
+
+### Port
+This is the port (ie: PORTA).
+
+### Pin
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/Generic_D11D14AS/debug_scripts/SAMD11D14AS.gdb b/variants/Generic_D11D14AS/debug_scripts/SAMD11D14AS.gdb
new file mode 100644
index 000000000..1daf3ccc2
--- /dev/null
+++ b/variants/Generic_D11D14AS/debug_scripts/SAMD11D14AS.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11d14as" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/Generic_D11D14AS/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld b/variants/Generic_D11D14AS/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
new file mode 100644
index 000000000..1e2d5f052
--- /dev/null
+++ b/variants/Generic_D11D14AS/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x1000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Generic_D11D14AS/linker_scripts/gcc/No_Bootloader/flash_16KB.ld b/variants/Generic_D11D14AS/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
new file mode 100644
index 000000000..bd135b3dd
--- /dev/null
+++ b/variants/Generic_D11D14AS/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/Generic_D11D14AS/openocd_scripts/SAMD11D14AS.cfg b/variants/Generic_D11D14AS/openocd_scripts/SAMD11D14AS.cfg
new file mode 100644
index 000000000..2b1d4c72f
--- /dev/null
+++ b/variants/Generic_D11D14AS/openocd_scripts/SAMD11D14AS.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd11d14as
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/Generic_D11D14AS/pins_arduino.h b/variants/Generic_D11D14AS/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/Generic_D11D14AS/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/Generic_D11D14AS/variant.cpp b/variants/Generic_D11D14AS/variant.cpp
new file mode 100644
index 000000000..992a3fc1b
--- /dev/null
+++ b/variants/Generic_D11D14AS/variant.cpp
@@ -0,0 +1,115 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 23 November 2017 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+#if defined PIN_MAP_STANDARD
+const PinDescription g_APinDescription[]=
+{
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+        { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_7, GCLK_CCL_NONE },
+	{ PORTA,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+        { PORTA,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+        { NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+	{ PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+        { NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+        { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SWD IO
+} ;
+#elif defined PIN_MAP_COMPACT
+const PinDescription g_APinDescription[]=
+{
+  { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+  { PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+  { PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_7, GCLK_CCL_NONE },
+  { PORTA,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+  { PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+  { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+  { PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+  { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+  { PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+  { PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SWD IO
+} ;
+#endif
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TC1, TC2 } ;
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+
+#if defined(ONE_UART) || defined(TWO_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
+
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial2.IrqHandler();
+}
+#endif
diff --git a/variants/Generic_D11D14AS/variant.h b/variants/Generic_D11D14AS/variant.h
new file mode 100644
index 000000000..bbf24d539
--- /dev/null
+++ b/variants/Generic_D11D14AS/variant.h
@@ -0,0 +1,369 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+#ifndef _VARIANT_MATTAIRTECH_D11D14AS_
+#define _VARIANT_MATTAIRTECH_D11D14AS_
+
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
+/*----------------------------------------------------------------------------
+ *        Clock Configuration
+ *----------------------------------------------------------------------------*/
+
+/** Master clock frequency (also Fcpu frequency) */
+#define VARIANT_MCK             (48000000ul)
+
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ      16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+#include "sam.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#define PIN_MAP_STANDARD
+//#define PIN_MAP_COMPACT
+
+#if defined PIN_MAP_STANDARD
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
+#elif defined PIN_MAP_COMPACT
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (18u)
+#else
+  #error "variant.h: You must set PIN_MAP_STANDARD or PIN_MAP_COMPACT"
+#endif
+
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
+#define NUM_ANALOG_INPUTS    (8u)
+#define NUM_ANALOG_OUTPUTS   (1u)
+#define analogInputToDigitalPin(p)  (p)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_LED_13           (16u)
+#define PIN_LED_RXL          (22u)
+#define PIN_LED_TXL          (23u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_LED_13           (10u)
+#define PIN_LED_RXL          (11u)
+#define PIN_LED_TXL          (12u)
+#endif
+
+#define PIN_LED              PIN_LED_13
+#define PIN_LED2             PIN_LED_RXL
+#define PIN_LED3             PIN_LED_TXL
+#define LED_BUILTIN          PIN_LED_13
+
+
+/*
+ * Analog pins
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_A2               (2ul)
+#define PIN_A3               (3ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A6               (6ul)
+#define PIN_A7               (7ul)
+#define PIN_A14              (14ul)
+#define PIN_A15              (15ul)
+#define PIN_DAC0             (2ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_A2               (0ul)
+#define PIN_A3               (1ul)
+#define PIN_A4               (2ul)
+#define PIN_A5               (3ul)
+#define PIN_A6               (4ul)
+#define PIN_A7               (5ul)
+#define PIN_A14              (8ul)
+#define PIN_A15              (9ul)
+#define PIN_DAC0             (0ul)
+#endif
+
+static const uint8_t A2   = PIN_A2;
+static const uint8_t A3   = PIN_A3;
+static const uint8_t A4   = PIN_A4;
+static const uint8_t A5   = PIN_A5;
+static const uint8_t A6   = PIN_A6;
+static const uint8_t A7   = PIN_A7;
+static const uint8_t A14  = PIN_A14;
+static const uint8_t A15  = PIN_A15;
+static const uint8_t DAC0 = PIN_DAC0;
+
+#define ADC_RESOLUTION		12
+
+#define REMAP_ANALOG_PIN_ID	while(0)
+// #define REMAP_ANALOG_PIN_ID	if ( ulPin < A0 ) ulPin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#if defined PIN_MAP_STANDARD
+#define REFA_PIN    (3ul)
+#define REFB_PIN    (4ul)
+#elif defined PIN_MAP_COMPACT
+#define REFA_PIN    (1ul)
+#define REFB_PIN    (2ul)
+#endif
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#if defined PIN_MAP_STANDARD
+#define PIN_ATN              (6ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_ATN              (4ul)
+#endif
+static const uint8_t ATN = PIN_ATN;
+
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL1_RX       (31ul)
+#define PIN_SERIAL1_TX       (30ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL1_RX       (17ul)
+#define PIN_SERIAL1_TX       (16ul)
+#endif
+
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+#define SERCOM_INSTANCE_SERIAL1       &sercom1
+
+// Serial2
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL2_RX       (15ul)
+#define PIN_SERIAL2_TX       (14ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL2_RX       (9ul)
+#define PIN_SERIAL2_TX       (8ul)
+#endif
+
+#define PAD_SERIAL2_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_1)
+#define SERCOM_INSTANCE_SERIAL2       &sercom0
+
+
+/*
+ * SPI Interfaces
+ */
+#if defined(ONE_SPI)
+#define SPI_INTERFACES_COUNT 1
+#else
+#define SPI_INTERFACES_COUNT 0
+#endif
+
+#if defined PIN_MAP_STANDARD
+#define PIN_SPI_MISO         (7u)
+#define PIN_SPI_MOSI         (14u)
+#define PIN_SPI_SCK          (15u)
+#define PIN_SPI_SS           (6u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SPI_MISO         (5u)
+#define PIN_SPI_MOSI         (8u)
+#define PIN_SPI_SCK          (9u)
+#define PIN_SPI_SS           (4u)
+#endif
+
+#define PERIPH_SPI           sercom0
+#define PAD_SPI_TX           SPI_PAD_0_SCK_1
+#define PAD_SPI_RX           SERCOM_RX_PAD_3
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+
+
+/*
+ * Wire Interfaces
+ */
+#if defined(ONE_WIRE)
+#define WIRE_INTERFACES_COUNT 1
+#else
+#define WIRE_INTERFACES_COUNT 0
+#endif
+
+#if defined PIN_MAP_STANDARD
+#define PIN_WIRE_SDA         (22u)
+#define PIN_WIRE_SCL         (23u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_WIRE_SDA         (11u)
+#define PIN_WIRE_SCL         (12u)
+#endif
+
+#define PERIPH_WIRE          sercom2
+#define WIRE_IT_HANDLER      SERCOM2_Handler
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+
+/*
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+//#define PIN_USB_HOST_ENABLE             (28ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_USB_DM                      (13ul)
+#define PIN_USB_DP                      (14ul)
+//#define PIN_USB_HOST_ENABLE             (15ul)
+#endif
+
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+
+extern Uart Serial1;
+extern Uart Serial2;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#define SERIAL_PORT_MONITOR         Serial1
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D11 does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+
+// When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
+#define Serial                      SerialUSB
+#else
+#define Serial                      Serial1
+#endif
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */

From 1fb362806fec1646c238809ec8e0a22e2ce2978f Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 25 Nov 2017 09:02:34 +0000
Subject: [PATCH 111/124] Improved ISR response time. Thanks @joverbee

---
 cores/arduino/WInterrupts.c | 123 ++++++++++++++++++++++++------------
 1 file changed, 83 insertions(+), 40 deletions(-)

diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c
index 56c846991..f1667890a 100644
--- a/cores/arduino/WInterrupts.c
+++ b/cores/arduino/WInterrupts.c
@@ -23,12 +23,16 @@
 
 #include <string.h>
 
-static voidFuncPtr callbacksInt[EXTERNAL_NUM_INTERRUPTS];
+static voidFuncPtr ISRcallback[EXTERNAL_NUM_INTERRUPTS];
+static uint32_t    ISRlist[EXTERNAL_NUM_INTERRUPTS];
+static uint32_t nints; // Stores total number of attached interrupts
 
 /* Configure I/O interrupt sources */
 static void __initialize()
 {
-  memset(callbacksInt, 0, sizeof(callbacksInt));
+  memset(ISRlist,     0, sizeof(ISRlist));
+  memset(ISRcallback, 0, sizeof(ISRcallback));
+  nints = 0;
 
   NVIC_DisableIRQ(EIC_IRQn);
   NVIC_ClearPendingIRQ(EIC_IRQn);
@@ -86,47 +90,69 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
     return;
 #endif
 
-  // Assign pin to EIC
-  if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
-    return;
+  uint32_t inMask = 1 << in;
 
   // Enable wakeup capability on pin in case being used during sleep (WAKEUP always enabled on SAML and SAMC)
 #if (SAMD21 || SAMD11)
-  EIC->WAKEUP.reg |= (1 << in);
+  EIC->WAKEUP.reg |= (inMask);
 #endif
 
-  // Assign callback to interrupt
-  callbacksInt[in] = callback;
+  // Assign pin to EIC
+  if (pinPeripheral(pin, PIO_EXTINT) != RET_STATUS_OK)
+    return;
 
-  // Look for right CONFIG register to be addressed
-  if (in > EXTERNAL_INT_7) {
-    config = 1;
-  } else {
-    config = 0;
-  }
+  // Only store when there is really an ISR to call.
+  // This allow for calling attachInterrupt(pin, NULL, mode), we set up all needed register
+  // but won't service the interrupt, this way we also don't need to check it inside the ISR.
+  if (callback)
+  {
+    // Store interrupts to service in order of when they were attached
+    // to allow for first come first serve handler
+    uint32_t current = 0;
+
+    // Check if we already have this interrupt
+    for (current=0; current<nints; current++) {
+      if (ISRlist[current] == inMask) {
+        break;
+      }
+    }
+    if (current == nints) {
+      // Need to make a new entry
+      nints++;
+    }
+    ISRlist[current] = inMask;       // List of interrupt in order of when they were attached
+    ISRcallback[current] = callback; // List of callback adresses
+
+    // Look for right CONFIG register to be addressed
+    if (in > EXTERNAL_INT_7) {
+      config = 1;
+    } else {
+      config = 0;
+    }
 
-  // Configure the interrupt mode
-  pos = (in - (8 * config)) << 2;				// compute position (ie: 0, 4, 8, 12, ...)
+    // Configure the interrupt mode
+    pos = (in - (8 * config)) << 2;                               // compute position (ie: 0, 4, 8, 12, ...)
 
-#if (SAML21 || SAMC21)
-  EIC->CTRLA.reg = 0;	// disable EIC before changing CONFIG
-  while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
-#endif
+    #if (SAML21 || SAMC21)
+    EIC->CTRLA.reg = 0;   // disable EIC before changing CONFIG
+    while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
+    #endif
 
-  uint32_t regConfig = (~(EIC_CONFIG_SENSE0_Msk << pos) & EIC->CONFIG[config].reg);		// copy register to variable, clearing mode bits
-  // insert new mode and write to register (the hardware numbering for the 5 interrupt modes is in reverse order to the arduino numbering, so using '5-mode').
-  EIC->CONFIG[config].reg = (regConfig | ((5-mode) << pos));
+    uint32_t regConfig = (~(EIC_CONFIG_SENSE0_Msk << pos) & EIC->CONFIG[config].reg);             // copy register to variable, clearing mode bits
+    // insert new mode and write to register (the hardware numbering for the 5 interrupt modes is in reverse order to the arduino numbering, so using '5-mode').
+    EIC->CONFIG[config].reg = (regConfig | ((5-mode) << pos));
 
-#if (SAML21 || SAMC21)
-  EIC->CTRLA.reg = EIC_CTRLA_ENABLE;	// enable EIC
-  while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
-#endif
+    #if (SAML21 || SAMC21)
+    EIC->CTRLA.reg = EIC_CTRLA_ENABLE;    // enable EIC
+    while (EIC->SYNCBUSY.reg & EIC_SYNCBUSY_MASK) { }
+    #endif
+  }
 
   // Clear the interrupt flag
-  EIC->INTFLAG.reg = (1 << in);
+  EIC->INTFLAG.reg = (inMask);
 
   // Enable the interrupt
-  EIC->INTENSET.reg = (1 << in);
+  EIC->INTENSET.reg = (inMask);
 }
 
 /*
@@ -138,12 +164,29 @@ void detachInterrupt(uint32_t pin)
   if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
-  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
+  uint32_t inMask = 1 << in;
+  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(inMask);
 
   // Disable wakeup capability on pin during sleep (WAKEUP always enabled on SAML and SAMC)
 #if (SAMD21 || SAMD11)
-  EIC->WAKEUP.reg &= ~(1 << in);
+  EIC->WAKEUP.reg &= ~(inMask);
 #endif
+
+  // Remove callback from the ISR list
+  uint32_t current;
+  for (current=0; current<nints; current++) {
+    if (ISRlist[current] == inMask) {
+      break;
+    }
+  }
+  if (current == nints) return; // We didn't have it
+
+  // Shift the reminder down
+  for (; current<nints-1; current++) {
+    ISRlist[current]     = ISRlist[current+1];
+    ISRcallback[current] = ISRcallback[current+1];
+  }
+  nints--;
 }
 
 /*
@@ -151,18 +194,18 @@ void detachInterrupt(uint32_t pin)
  */
 void EIC_Handler(void)
 {
-  // Test the normal interrupts
- for (uint32_t i=EXTERNAL_INT_0; i<=EXTERNAL_INT_15; i++)
+  // Calling the routine directly from -here- takes about 1us
+  // Depending on where you are in the list it will take longer
+
+  // Loop over all enabled interrupts in the list
+  for (uint32_t i=0; i<nints; i++)
   {
-    if ((EIC->INTFLAG.reg & (1 << i)) != 0)
+    if ((EIC->INTFLAG.reg & ISRlist[i]) != 0)
     {
-      // Call the callback function if assigned
-      if (callbacksInt[i]) {
-        callbacksInt[i]();
-      }
-
+      // Call the callback function
+      ISRcallback[i]();
       // Clear the interrupt
-      EIC->INTFLAG.reg = 1 << i;
+      EIC->INTFLAG.reg = ISRlist[i];
     }
   }
 }

From 8a0633164e2b6fe4d0bd493c72b3782cd80d019f Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 25 Nov 2017 09:03:26 +0000
Subject: [PATCH 112/124] Update documentation and templates

---
 CHANGELOG                                  | 11 ++++
 README.md                                  | 38 ++++++++---
 bootloaders/zero/README.md                 |  2 +-
 extras/package_index.json.Beta.template    | 73 +++++++++++-----------
 extras/package_index.json.PR.template      | 73 +++++++++++-----------
 extras/package_index.json.Release.template | 15 +++--
 platform.txt                               |  2 +-
 7 files changed, 128 insertions(+), 86 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index af6699539..480bf34b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+1.6.17-beta-b0:
+* Added SAM D51 (m4f) support to bootloader
+* Added Generic D11D14AS (20-pin SOIC) variant
+* Made PIN_USB_HOST_ENABLE optional. Readme updates for MT-D11 and Generic D11C14A
+* Fixed USB pad calibration values for L21 in bootloader and USB host mode
+* Improve accuracy of HS crystal (fixed off-by-one calculation)
+* fixed wrong location for call to mapResolution(), doc updates
+* Documentation updates
+* Merged in changes from upstream SAMD CORE 1.6.17 (not released yet)
+  * Improved ISR response time. Thanks @joverbee
+
 1.6.16 (release version, same as 1.6.16-beta-b0):
 1.6.16-beta-b0:
 * Added MattairTech Xeno support (64-pin D21, L21, and C21)
diff --git a/README.md b/README.md
index 6fdb5f80a..991535725 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,9 @@ https://www.mattairtech.com/) as well as for "Generic" boards.
 
 * Supports the SAMD21, SAMD11, SAML21, and SAMC21.
 * Supports four clock sources (two crystals, internal oscillator, and USB calibrated).
-* USB CDC Bootloader with optional SDCard support
+* USB CDC Bootloader with optional SDCard support. See [bootloaders/zero/README.md](https://github.com/mattairtech/ArduinoCore-samd/tree/master/bootloaders/zero/README.md).
+
+**SAMD51 support coming December**
 
 *This core is intended to be installed using Boards Manager (see below). To update from a*
 *previous version, click on MattairTech SAM M0+ Boards in Boards Manager, then click Update.*
@@ -34,6 +36,18 @@ CHANGELOG for details on upstream commits and MattairTech additions that have be
 ## What's New - Beta Version (1.6.16-beta)
 **See Beta Builds section for installation instructions.**
 
+**1.6.17-beta-b0:**
+1.6.17-beta-b0:
+* Added SAM D51 (m4f) support to bootloader
+* Added Generic D11D14AS (20-pin SOIC) variant
+* Made PIN_USB_HOST_ENABLE optional. Readme updates for MT-D11 and Generic D11C14A
+* Fixed USB pad calibration values for L21 in bootloader and USB host mode
+* Improve accuracy of HS crystal (fixed off-by-one calculation)
+* fixed wrong location for call to mapResolution(), doc updates
+* Documentation updates
+* Merged in changes from upstream SAMD CORE 1.6.17 (not released yet)
+  * Improved ISR response time. Thanks @joverbee
+
 **1.6.16-beta-b0:**
 *Beta version 1.6.16-beta-b0 became release version 1.6.16. See above*
 
@@ -118,16 +132,24 @@ README.md also now includes technical information on the new PinDescription tabl
 
 * [MattairTech Generic D11C14A](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/Generic_D11C14A/README.md)
 
-* MattairTech Generic D11D14AS (future)
+* [MattairTech Generic D11D14AS](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/Generic_D11D14AS/README.md)
 
 * MattairTech Generic D11D14AM (future)
 
-* MattairTech Generic x21E (future)
+* MattairTech Generic x21E (soon)
 
 * MattairTech Generic x21G (future)
 
 * MattairTech Generic x21J (future)
 
+* MattairTech Generic D51G (soon)
+
+* MattairTech Generic D51J (future)
+
+* MattairTech Generic D51N (future)
+
+* MattairTech Generic D51P (future)
+
 * [Arduino Zero (arduino.cc)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/arduino_zero/README.md)
 
 * [Arduino M0 (arduino.org)](https://github.com/mattairtech/ArduinoCore-samd/tree/master/variants/arduino_mzero/README.md)
@@ -756,22 +778,24 @@ from the MT-D11 variant.
 
 ### Under Development
 
-* PlatformIO support
 * SAM D51 (M4F) support (pin compatible with D21, similar peripherals and pin mapping)
+* PlatformIO support
+* Features for lower power consumption (library?) Q1 2018?
+  * PM, clock system, SUPC, RTC, EVSYS, DMA, sleepwalking, battery backup
+* Reliability and security enhancements (library?) 2018?
+  * MPU (C21, D51), WDT, PAC, cryptography (AES, PKCC, TRNG), ICM, RAMECC, cache config (determinism)
 * Fix programming port for Arduino Zero and M0 board variants
 * Reduce SRAM usage by USB endpoint buffers by only allocating endpoints actually used (D11 especially)
 
 ### Possible Future
 
-* Features for lower power consumption (library?) Fall 2017?
-* Reliability and security enhancements
 * USB Host mode CDC ACM (partially complete; BSD-like license?)
 * SD card library? Port of FatFS and/or Petit FatFS?
 * Optional use of single on-board LED as USB activity LED
 * MSC (Mass Storage) USB Device Class
 * Polyphonic tone
 * Wired-AND, Wired-OR for port pins
-* High-speed port pin access (IOBUS)
+* High-speed port pin access (IOBUS, m0+ only)
 
 ### Feature Requests
 
diff --git a/bootloaders/zero/README.md b/bootloaders/zero/README.md
index 9ad074249..d985a9538 100644
--- a/bootloaders/zero/README.md
+++ b/bootloaders/zero/README.md
@@ -258,7 +258,7 @@ This driver is the same as the one used by the MattairTech SAM M0+ Core.
 
 #### Bootloader Installation Using Another Tool (ie: Atmel Studio, openocd)
 
-1. Download the bootloader from https://www.mattairtech.com/software/arduino/SAM-BA-bootloaders-zero-mattairtech.zip.
+1. Download the bootloader from **https://www.mattairtech.com/software/arduino/SAM-BA-bootloaders-zero-mattairtech.zip**.
 2. Unzip to any directory. Be sure that a bootloader is available for your particular MCU.
 3. Follow the procedures for your upload tool to upload the firmware.
    * Perform a chip erase first. Be sure no BOOTPROT bits are set.
diff --git a/extras/package_index.json.Beta.template b/extras/package_index.json.Beta.template
index 86b11968c..0d294ce61 100644
--- a/extras/package_index.json.Beta.template
+++ b/extras/package_index.json.Beta.template
@@ -22,6 +22,7 @@
           "checksum": "SHA-256:%%CHECKSUM%%",
           "size": "%%SIZE%%",
           "boards": [
+            {"name": "Xeno"},
             {"name": "MT-D21E"},
             {"name": "MT-D21E_revB"},
             {"name": "MT-D11"},
@@ -38,7 +39,7 @@
             {
               "packager": "MattairTech_Arduino",
               "name": "bossac",
-	      "version": "1.7.0-mattairtech-1"
+	      "version": "1.7.0-mattairtech-2"
             },
             {
               "packager": "arduino",
@@ -53,7 +54,7 @@
             {
               "packager": "MattairTech_Arduino",
               "name": "CMSIS-Atmel",
-	      "version": "1.0.0-mattairtech-1"
+	      "version": "1.0.0-mattairtech-2"
             },
             {
               "packager": "arduino",
@@ -66,69 +67,69 @@
       "tools": [
       {
         "name": "bossac",
-        "version": "1.7.0-mattairtech-1",
+        "version": "1.7.0-mattairtech-2",
         "systems": [
         {
           "host": "i686-mingw32",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-mingw32.tar.gz",
-	  "checksum": "SHA-256:1e1cf251fd4fd5260d9f000da5f2890b0f91c839fd1491af575f05339c0d136a",
-	  "size": "324086"
+	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-mingw32.tar.gz",
+	  "archiveFileName": "bossac-1.7.0-mattairtech-2-mingw32.tar.gz",
+          "checksum": "SHA-256:63e982f8ed9749277e6251e1f94f15e57a98cddd6902ccf98d7b006e9fd6761c",
+          "size": "325268"
         },
         {
           "host": "x86_64-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz",
-	  "checksum": "SHA-256:788315e2f8814db77efd2d32fc660471dda8336fe9341c72b60fb3052a986ebc",
-	  "size": "204696"
+	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-x86_64-linux-gnu.tar.gz",
+	  "archiveFileName": "bossac-1.7.0-mattairtech-2-x86_64-linux-gnu.tar.gz",
+          "checksum": "SHA-256:0d28b32bf10298a281472eeb8d3f2482adc251b276033e544196e5fd17c12111",
+          "size": "34223"
         },
         {
           "host": "i686-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz",
-	  "checksum": "SHA-256:07dcd2201831813e58e06ddc0c755c88754d2b766060626f8e51fc885dd6798c",
-	  "size": "194636"
+	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-i686-linux-gnu.tar.gz",
+	  "archiveFileName": "bossac-1.7.0-mattairtech-2-i686-linux-gnu.tar.gz",
+          "checksum": "SHA-256:b0399e20e15125c7cae9571b5102d77e632642fe07e27b86b90e14b5fa5a4e09",
+          "size": "34170"
         },
         {
           "host": "x86_64-apple-darwin",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz",
-	  "checksum": "SHA-256:ca57765d7c7ef94e43d316658c8b3012d888501d10ec58bc38dc2aaa173edadf",
-	  "size": "85071"
+	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-x86_64-apple-darwin.tar.gz",
+	  "archiveFileName": "bossac-1.7.0-mattairtech-2-x86_64-apple-darwin.tar.gz",
+          "checksum": "SHA-256:5a9125567ba2082f7791954cf7f717644decad5ab77392d9d35d0538ffe8ae76",
+          "size": "88668"
         }
         ]
       },
       {
         "name": "CMSIS-Atmel",
-        "version": "1.0.0-mattairtech-1",
+        "version": "1.0.0-mattairtech-2",
         "systems": [
         {
           "host": "i686-mingw32",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         },
         {
           "host": "x86_64-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         },
         {
           "host": "i686-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         },
         {
           "host": "x86_64-apple-darwin",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         }
         ]
       }
diff --git a/extras/package_index.json.PR.template b/extras/package_index.json.PR.template
index 14c0d839c..9aa554844 100644
--- a/extras/package_index.json.PR.template
+++ b/extras/package_index.json.PR.template
@@ -22,6 +22,7 @@
           "checksum": "SHA-256:%%CHECKSUM%%",
           "size": "%%SIZE%%",
           "boards": [
+            {"name": "Xeno"},
             {"name": "MT-D21E"},
             {"name": "MT-D21E_revB"},
             {"name": "MT-D11"},
@@ -38,7 +39,7 @@
             {
               "packager": "MattairTech_Arduino",
               "name": "bossac",
-	      "version": "1.7.0-mattairtech-1"
+	      "version": "1.7.0-mattairtech-2"
             },
             {
               "packager": "arduino",
@@ -53,7 +54,7 @@
             {
               "packager": "MattairTech_Arduino",
               "name": "CMSIS-Atmel",
-	      "version": "1.0.0-mattairtech-1"
+	      "version": "1.0.0-mattairtech-2"
             },
             {
               "packager": "arduino",
@@ -66,69 +67,69 @@
       "tools": [
       {
         "name": "bossac",
-        "version": "1.7.0-mattairtech-1",
+        "version": "1.7.0-mattairtech-2",
         "systems": [
         {
           "host": "i686-mingw32",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-mingw32.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-mingw32.tar.gz",
-	  "checksum": "SHA-256:1e1cf251fd4fd5260d9f000da5f2890b0f91c839fd1491af575f05339c0d136a",
-	  "size": "324086"
+          "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-mingw32.tar.gz",
+          "archiveFileName": "bossac-1.7.0-mattairtech-2-mingw32.tar.gz",
+          "checksum": "SHA-256:63e982f8ed9749277e6251e1f94f15e57a98cddd6902ccf98d7b006e9fd6761c",
+          "size": "325268"
         },
         {
           "host": "x86_64-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-x86_64-linux-gnu.tar.gz",
-	  "checksum": "SHA-256:788315e2f8814db77efd2d32fc660471dda8336fe9341c72b60fb3052a986ebc",
-	  "size": "204696"
+          "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-x86_64-linux-gnu.tar.gz",
+          "archiveFileName": "bossac-1.7.0-mattairtech-2-x86_64-linux-gnu.tar.gz",
+          "checksum": "SHA-256:0d28b32bf10298a281472eeb8d3f2482adc251b276033e544196e5fd17c12111",
+          "size": "34223"
         },
         {
           "host": "i686-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-i686-linux-gnu.tar.gz",
-	  "checksum": "SHA-256:07dcd2201831813e58e06ddc0c755c88754d2b766060626f8e51fc885dd6798c",
-	  "size": "194636"
+          "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-i686-linux-gnu.tar.gz",
+          "archiveFileName": "bossac-1.7.0-mattairtech-2-i686-linux-gnu.tar.gz",
+          "checksum": "SHA-256:b0399e20e15125c7cae9571b5102d77e632642fe07e27b86b90e14b5fa5a4e09",
+          "size": "34170"
         },
         {
           "host": "x86_64-apple-darwin",
-	  "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz",
-	  "archiveFileName": "bossac-1.7.0-mattairtech-1-x86_64-apple-darwin.tar.gz",
-	  "checksum": "SHA-256:ca57765d7c7ef94e43d316658c8b3012d888501d10ec58bc38dc2aaa173edadf",
-	  "size": "85071"
+          "url": "https://www.mattairtech.com/software/arduino/bossac-1.7.0-mattairtech-2-x86_64-apple-darwin.tar.gz",
+          "archiveFileName": "bossac-1.7.0-mattairtech-2-x86_64-apple-darwin.tar.gz",
+          "checksum": "SHA-256:5a9125567ba2082f7791954cf7f717644decad5ab77392d9d35d0538ffe8ae76",
+          "size": "88668"
         }
         ]
       },
       {
         "name": "CMSIS-Atmel",
-        "version": "1.0.0-mattairtech-1",
+        "version": "1.0.0-mattairtech-2",
         "systems": [
         {
           "host": "i686-mingw32",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+          "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         },
         {
           "host": "x86_64-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+          "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         },
         {
           "host": "i686-pc-linux-gnu",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+          "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         },
         {
           "host": "x86_64-apple-darwin",
-	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-1.tar.gz",
-	  "checksum": "SHA-256:ab100e3336b61f23f10759a9f0d0ffef6dd2af0615b02428ada9027dea3dba15",
-	  "size": "1386014"
+          "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
+          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
+          "size": "2009341"
         }
         ]
       }
diff --git a/extras/package_index.json.Release.template b/extras/package_index.json.Release.template
index ae5f4677e..71a249821 100644
--- a/extras/package_index.json.Release.template
+++ b/extras/package_index.json.Release.template
@@ -7,9 +7,14 @@
 	"archiveFileName": "%%FILENAME%%",
 	"checksum": "SHA-256:%%CHECKSUM%%",
 	"size": "%%SIZE%%",
-	"boards": [
-	{"name": "MT-D21E"},
-	{"name": "MT-D11"}
+        "boards": [
+            {"name": "Xeno"},
+            {"name": "MT-D21E"},
+            {"name": "MT-D21E_revB"},
+            {"name": "MT-D11"},
+            {"name": "Generic_D11C14A"},
+            {"name": "arduino_zero"},
+            {"name": "arduino_mzero"}
 	],
 	"toolsDependencies": [
 	{
@@ -20,7 +25,7 @@
 	{
 		"packager": "MattairTech_Arduino",
 		"name": "bossac",
-		"version": "1.7.0-mattairtech-1"
+		"version": "1.7.0-mattairtech-2"
 	},
 	{
 		"packager": "arduino",
@@ -35,7 +40,7 @@
 	{
 		"packager": "MattairTech_Arduino",
 		"name": "CMSIS-Atmel",
-		"version": "1.0.0-mattairtech-1"
+		"version": "1.0.0-mattairtech-2"
 	},
 	{
 		"packager": "arduino",
diff --git a/platform.txt b/platform.txt
index 9113b9d25..b115cb56c 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=MattairTech SAM M0+ Boards
-version=1.6.16
+version=1.6.17
 
 # Compile variables
 # -----------------

From c7fbf7e17641ecbe136d4746e33f5b8d5d7287f3 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 25 Nov 2017 09:14:39 +0000
Subject: [PATCH 113/124] Doc update

---
 CHANGELOG | 1 +
 README.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 480bf34b4..1cbc8e646 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@
 * Documentation updates
 * Merged in changes from upstream SAMD CORE 1.6.17 (not released yet)
   * Improved ISR response time. Thanks @joverbee
+  * No fixed value for USB power current.
 
 1.6.16 (release version, same as 1.6.16-beta-b0):
 1.6.16-beta-b0:
diff --git a/README.md b/README.md
index 991535725..d192ff011 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,7 @@ CHANGELOG for details on upstream commits and MattairTech additions that have be
 * Documentation updates
 * Merged in changes from upstream SAMD CORE 1.6.17 (not released yet)
   * Improved ISR response time. Thanks @joverbee
+  * No fixed value for USB power current.
 
 **1.6.16-beta-b0:**
 *Beta version 1.6.16-beta-b0 became release version 1.6.16. See above*

From bfd279a95d760f9f1ea999d827d283b4d8389941 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 25 Nov 2017 09:41:20 +0000
Subject: [PATCH 114/124] Update templates

---
 extras/package_index.json.Beta.template    | 1 +
 extras/package_index.json.PR.template      | 1 +
 extras/package_index.json.Release.template | 1 +
 3 files changed, 3 insertions(+)

diff --git a/extras/package_index.json.Beta.template b/extras/package_index.json.Beta.template
index 0d294ce61..503861af9 100644
--- a/extras/package_index.json.Beta.template
+++ b/extras/package_index.json.Beta.template
@@ -27,6 +27,7 @@
             {"name": "MT-D21E_revB"},
             {"name": "MT-D11"},
             {"name": "Generic_D11C14A"},
+            {"name": "Generic_D11D14AS"},
             {"name": "arduino_zero"},
             {"name": "arduino_mzero"}
           ],
diff --git a/extras/package_index.json.PR.template b/extras/package_index.json.PR.template
index 9aa554844..14bfa6bdf 100644
--- a/extras/package_index.json.PR.template
+++ b/extras/package_index.json.PR.template
@@ -27,6 +27,7 @@
             {"name": "MT-D21E_revB"},
             {"name": "MT-D11"},
             {"name": "Generic_D11C14A"},
+            {"name": "Generic_D11D14AS"},
             {"name": "arduino_zero"},
             {"name": "arduino_mzero"}
           ],
diff --git a/extras/package_index.json.Release.template b/extras/package_index.json.Release.template
index 71a249821..f6e55edb3 100644
--- a/extras/package_index.json.Release.template
+++ b/extras/package_index.json.Release.template
@@ -13,6 +13,7 @@
             {"name": "MT-D21E_revB"},
             {"name": "MT-D11"},
             {"name": "Generic_D11C14A"},
+            {"name": "Generic_D11D14AS"},
             {"name": "arduino_zero"},
             {"name": "arduino_mzero"}
 	],

From 7897585b0df66bf8c7b0d81e34589166ec40be6b Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 25 Nov 2017 10:26:15 +0000
Subject: [PATCH 115/124] Final doc and template updates for 1.6.17-beta-b0
 release

---
 README.md                               |  2 +-
 extras/package_index.json.Beta.template | 16 ++++++++--------
 extras/package_index.json.PR.template   | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index d192ff011..7f6d6e931 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ CHANGELOG for details on upstream commits and MattairTech additions that have be
 * Documentation updates
 
 
-## What's New - Beta Version (1.6.16-beta)
+## What's New - Beta Version (1.6.17-beta)
 **See Beta Builds section for installation instructions.**
 
 **1.6.17-beta-b0:**
diff --git a/extras/package_index.json.Beta.template b/extras/package_index.json.Beta.template
index 503861af9..9dfb54061 100644
--- a/extras/package_index.json.Beta.template
+++ b/extras/package_index.json.Beta.template
@@ -108,29 +108,29 @@
           "host": "i686-mingw32",
 	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
 	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         },
         {
           "host": "x86_64-pc-linux-gnu",
 	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
 	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         },
         {
           "host": "i686-pc-linux-gnu",
 	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
 	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         },
         {
           "host": "x86_64-apple-darwin",
 	  "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
 	  "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         }
         ]
       }
diff --git a/extras/package_index.json.PR.template b/extras/package_index.json.PR.template
index 14bfa6bdf..8c4d99512 100644
--- a/extras/package_index.json.PR.template
+++ b/extras/package_index.json.PR.template
@@ -108,29 +108,29 @@
           "host": "i686-mingw32",
           "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
           "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         },
         {
           "host": "x86_64-pc-linux-gnu",
           "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
           "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         },
         {
           "host": "i686-pc-linux-gnu",
           "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
           "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         },
         {
           "host": "x86_64-apple-darwin",
           "url": "https://www.mattairtech.com/software/arduino/CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
           "archiveFileName": "CMSIS-Atmel-1.0.0-mattairtech-2.tar.gz",
-          "checksum": "SHA-256:85a9d3e7d34b5272e46c4ad6943f7375a3bbff7ff2944d35fdfd0cf7778a3c2b",
-          "size": "2009341"
+          "checksum": "SHA-256:d10ca2a14c8db5757d2b1b4c1e52473ae5337f0762c6617a6074373f2f44540d",
+          "size": "2008479"
         }
         ]
       }

From 77bf7833add406f0ce6fa30c65bb2b0b7d2f7915 Mon Sep 17 00:00:00 2001
From: Justin Mattair <justin@mattair.net>
Date: Sat, 25 Nov 2017 10:38:16 +0000
Subject: [PATCH 116/124] Final platform.txt update for 1.6.17-beta-b0 release

---
 platform.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform.txt b/platform.txt
index b115cb56c..c957e0b31 100644
--- a/platform.txt
+++ b/platform.txt
@@ -58,11 +58,11 @@ compiler.readelf.cmd=arm-none-eabi-readelf
 build.extra_flags=
 
 # These can be overridden in platform.local.txt
-compiler.c.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.c.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-2.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
 compiler.c.elf.extra_flags=
 #compiler.c.elf.extra_flags=-v
-compiler.cpp.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
-compiler.S.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.cpp.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-2.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.S.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-2.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
@@ -139,7 +139,7 @@ tools.avrdude_remote.upload.pattern="openocd --version 2>&1 | grep 2016 && if op
 #
 # BOSSA
 #
-tools.bossac.path={runtime.tools.bossac-1.7.0-mattairtech-1.path}
+tools.bossac.path={runtime.tools.bossac-1.7.0-mattairtech-2.path}
 tools.bossac.cmd=bossac
 tools.bossac.cmd.windows=bossac.exe
 

From d053a818c3bb09c66b304f8e2cdcff7f538c38fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20=C3=81ngel=20Jim=C3=A9nez?=
 <jose.angel.jimenez@gmail.com>
Date: Sun, 17 Dec 2017 19:58:02 +0100
Subject: [PATCH 117/124] Incorrect condition checking in HID.h

I found an incorrect checking of the -D macros which prevents the compilation of a project with USD enabled. The compilation should stop with #error only if none of the macros are defined. The condition, as it was written previously, prevents compiling a project with USB enabled.
---
 libraries/HID/HID.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/HID/HID.h b/libraries/HID/HID.h
index 45900f99e..c312ebe6f 100644
--- a/libraries/HID/HID.h
+++ b/libraries/HID/HID.h
@@ -23,7 +23,7 @@
 #include <Arduino.h>
 #include "USB/PluggableUSB.h"
 
-#if !defined(CDC_HID) || !defined(HID_ONLY) || !defined(WITH_CDC)
+#if !defined(CDC_HID) && !defined(HID_ONLY) && !defined(WITH_CDC)
 #error Please select CDC_HID, HID_ONLY, or WITH_CDC in the Tools->USB menu.
 #endif
 

From 5876ab597d441a5c348545cabd67e9224d149dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20=C3=81ngel=20Jim=C3=A9nez?=
 <jose.angel.jimenez@gmail.com>
Date: Mon, 18 Dec 2017 09:37:10 +0100
Subject: [PATCH 118/124] Correction of include path for CMSIS-Atmel

This corrects the include path for the CMSIS-Atmel inside the MattairTech package. Without this correction the bootloader compilation fails.
---
 bootloaders/zero/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootloaders/zero/Makefile b/bootloaders/zero/Makefile
index 2aebe77dd..ee6720dc5 100644
--- a/bootloaders/zero/Makefile
+++ b/bootloaders/zero/Makefile
@@ -154,7 +154,7 @@ BIN=$(NAME).bin
 HEX=$(NAME).hex
 
 
-INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-1/CMSIS/Device/ATMEL/"
+INCLUDES=-I"$(MODULE_PATH_ARDUINO)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0-mattairtech-2/CMSIS/Device/ATMEL/"
 
 # -----------------------------------------------------------------------------
 # Linker options

From ed807f9bbb232c4517e8944128762f5000536367 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Fri, 5 Jan 2018 14:59:23 -0500
Subject: [PATCH 119/124] Initial SPI slave API

---
 cores/arduino/SERCOM.cpp   | 60 ++++++++++++++++++++++++---------
 cores/arduino/SERCOM.h     |  7 ++--
 libraries/SPI/SPI.cpp      | 69 +++++++++++++++++++++++++++++++++++---
 libraries/SPI/SPI.h        | 14 +++++++-
 libraries/SPI/keywords.txt |  3 ++
 5 files changed, 130 insertions(+), 23 deletions(-)

diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index a8b04a838..f38d0353d 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -232,22 +232,27 @@ void SERCOM::disableDataRegisterEmptyInterruptUART()
  *	===== Sercom SPI
  *	=========================
 */
-void SERCOM::initSPI(SercomSpiTXPad mosi, SercomRXPad miso, SercomSpiCharSize charSize, SercomDataOrder dataOrder)
+void SERCOM::initSPI(SercomSpiMode mode, SercomSpiTXPad txPad, SercomRXPad rxPad, SercomSpiCharSize charSize, SercomDataOrder dataOrder)
 {
   resetSPI();
   initClockNVIC();
 
   //Setting the CTRLA register
-  sercom->SPI.CTRLA.reg =	SERCOM_SPI_CTRLA_MODE_SPI_MASTER |
-                          SERCOM_SPI_CTRLA_DOPO(mosi) |
-                          SERCOM_SPI_CTRLA_DIPO(miso) |
+  sercom->SPI.CTRLA.reg =	((mode == SPI_SLAVE_OPERATION) ? SERCOM_SPI_CTRLA_MODE_SPI_SLAVE : SERCOM_SPI_CTRLA_MODE_SPI_MASTER) |
+                          SERCOM_SPI_CTRLA_DOPO(txPad) |
+                          SERCOM_SPI_CTRLA_DIPO(rxPad) |
                           dataOrder << SERCOM_SPI_CTRLA_DORD_Pos;
 
   //Setting the CTRLB register
   sercom->SPI.CTRLB.reg = SERCOM_SPI_CTRLB_CHSIZE(charSize) |
+                          SERCOM_SPI_CTRLB_SSDE |
                           SERCOM_SPI_CTRLB_RXEN;	//Active the SPI receiver.
 
 
+  if (mode == SPI_SLAVE_OPERATION) {
+    sercom->SPI.INTENSET.reg = SERCOM_SPI_INTENSET_RXC |
+                               SERCOM_SPI_INTENSET_SSL ;
+  }
 }
 
 void SERCOM::initSPIClock(SercomSpiClockMode clockMode, uint32_t baudrate)
@@ -367,6 +372,26 @@ uint8_t SERCOM::transferDataSPI(uint8_t data)
   return sercom->SPI.DATA.bit.DATA;  // Reading data
 }
 
+uint8_t SERCOM::readDataSPI()
+{
+  while( sercom->SPI.INTFLAG.bit.RXC == 0 )
+  {
+    // Waiting Complete Reception
+  }
+
+  return sercom->SPI.DATA.bit.DATA;  // Reading data
+}
+
+void SERCOM::writeDataSPI(uint8_t data)
+{
+  while( sercom->SPI.INTFLAG.bit.DRE == 0 )
+  {
+    // Waiting Data Register Empty
+  }
+
+  sercom->SPI.DATA.bit.DATA = data; // Writing data into Data register
+}
+
 bool SERCOM::isBufferOverflowErrorSPI()
 {
   return sercom->SPI.STATUS.bit.BUFOVF;
@@ -378,17 +403,22 @@ bool SERCOM::isDataRegisterEmptySPI()
   return sercom->SPI.INTFLAG.bit.DRE;
 }
 
-//bool SERCOM::isTransmitCompleteSPI()
-//{
-//	//TXC : Transmit complete
-//	return sercom->SPI.INTFLAG.bit.TXC;
-//}
-//
-//bool SERCOM::isReceiveCompleteSPI()
-//{
-//	//RXC : Receive complete
-//	return sercom->SPI.INTFLAG.bit.RXC;
-//}
+bool SERCOM::isReceiveCompleteSPI()
+{
+  //RXC : Receive complete
+  return sercom->SPI.INTFLAG.bit.RXC;
+}
+
+bool SERCOM::isSlaveSelectLowSPI()
+{
+  //SSL : Slave select low
+  return sercom->SPI.INTFLAG.bit.SSL;
+}
+
+void SERCOM::acknowledgeSPISlaveSelectLow()
+{
+  sercom->SPI.INTFLAG.bit.SSL = 1;
+}
 
 uint32_t SERCOM::calculateBaudrateSynchronous(uint32_t baudrate)
 {
diff --git a/cores/arduino/SERCOM.h b/cores/arduino/SERCOM.h
index 1962db0aa..73a67ca46 100644
--- a/cores/arduino/SERCOM.h
+++ b/cores/arduino/SERCOM.h
@@ -172,7 +172,7 @@ class SERCOM
 		void disableDataRegisterEmptyInterruptUART();
 
 		/* ========== SPI ========== */
-		void initSPI(SercomSpiTXPad mosi, SercomRXPad miso, SercomSpiCharSize charSize, SercomDataOrder dataOrder) ;
+		void initSPI(SercomSpiMode mode, SercomSpiTXPad txPad, SercomRXPad rxPad, SercomSpiCharSize charSize, SercomDataOrder dataOrder) ;
 		void initSPIClock(SercomSpiClockMode clockMode, uint32_t baudrate) ;
 
 		void resetSPI( void ) ;
@@ -183,10 +183,13 @@ class SERCOM
 		void setBaudrateSPI(uint8_t divider) ;
 		void setClockModeSPI(SercomSpiClockMode clockMode) ;
 		uint8_t transferDataSPI(uint8_t data) ;
+		uint8_t readDataSPI( void ) ;
+		void writeDataSPI(uint8_t data) ;
 		bool isBufferOverflowErrorSPI( void ) ;
 		bool isDataRegisterEmptySPI( void ) ;
-		bool isTransmitCompleteSPI( void ) ;
 		bool isReceiveCompleteSPI( void ) ;
+		bool isSlaveSelectLowSPI( void ) ;
+		void acknowledgeSPISlaveSelectLow ( void );
 
 		/* ========== WIRE ========== */
 		void initSlaveWIRE(uint8_t address) ;
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 3ccef9a07..330d245d0 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -28,7 +28,12 @@
 
 const SPISettings DEFAULT_SPI_SETTINGS = SPISettings();
 
-SPIClass::SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, SercomSpiTXPad PadTx, SercomRXPad PadRx)
+SPIClass::SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, SercomSpiTXPad PadTx, SercomRXPad PadRx) :
+  SPIClass(p_sercom, uc_pinMISO, uc_pinSCK, uc_pinMOSI, (uint8_t)-1, PadTx, PadRx)
+{
+}
+
+SPIClass::SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, uint8_t uc_pinSS, SercomSpiTXPad PadTx, SercomRXPad PadRx)
 {
   initialized = false;
   assert(p_sercom != NULL);
@@ -38,6 +43,7 @@ SPIClass::SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint
   _uc_pinMiso = uc_pinMISO;
   _uc_pinSCK = uc_pinSCK;
   _uc_pinMosi = uc_pinMOSI;
+  _uc_pinSS = uc_pinSS;
 
   // SERCOM pads
   _padTx=PadTx;
@@ -53,7 +59,26 @@ void SPIClass::begin()
   pinPeripheral(_uc_pinSCK, PIO_SERCOM);
   pinPeripheral(_uc_pinMosi, PIO_SERCOM);
 
-  config(DEFAULT_SPI_SETTINGS);
+  config(SPI_MASTER_OPERATION, DEFAULT_SPI_SETTINGS);
+}
+
+int SPIClass::beginSlave()
+{
+  if (_uc_pinSS == (uint8_t)-1) {
+    return 0;
+  }
+
+  init();
+
+  // PIO init
+  pinPeripheral(_uc_pinMiso, g_APinDescription[_uc_pinMiso].ulPinType);
+  pinPeripheral(_uc_pinSCK, g_APinDescription[_uc_pinSCK].ulPinType);
+  pinPeripheral(_uc_pinMosi, g_APinDescription[_uc_pinMosi].ulPinType);
+  pinPeripheral(_uc_pinSS, g_APinDescription[_uc_pinSS].ulPinType);
+
+  config(SPI_SLAVE_OPERATION, DEFAULT_SPI_SETTINGS);
+
+  return 1;
 }
 
 void SPIClass::init()
@@ -66,11 +91,11 @@ void SPIClass::init()
   initialized = true;
 }
 
-void SPIClass::config(SPISettings settings)
+void SPIClass::config(SercomSpiMode mode, SPISettings settings)
 {
   _p_sercom->disableSPI();
 
-  _p_sercom->initSPI(_padTx, _padRx, SPI_CHAR_SIZE_8_BITS, settings.bitOrder);
+  _p_sercom->initSPI(mode, _padTx, _padRx, SPI_CHAR_SIZE_8_BITS, settings.bitOrder);
   _p_sercom->initSPIClock(settings.dataMode, settings.clockFreq);
 
   _p_sercom->enableSPI();
@@ -125,7 +150,7 @@ void SPIClass::beginTransaction(SPISettings settings)
       EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(interruptMask);
   }
 
-  config(settings);
+  config(SPI_MASTER_OPERATION, settings);
 }
 
 void SPIClass::endTransaction(void)
@@ -223,6 +248,40 @@ void SPIClass::detachInterrupt() {
   // Should be disableInterrupt()
 }
 
+void SPIClass::onSelect(void(*function)(void))
+{
+  onSelectCallback = function;
+}
+
+void SPIClass::onReceive(byte(*function)(byte))
+{
+  onReceiveCallback = function;
+}
+
+void SPIClass::onService()
+{
+  if (_p_sercom->isReceiveCompleteSPI()) {
+    byte nextOut;
+    byte in = _p_sercom->readDataSPI();
+
+    if (onReceiveCallback) {
+      nextOut = onReceiveCallback(in);
+    } else {
+      nextOut = 0xff;
+    }
+
+    _p_sercom->writeDataSPI(nextOut);
+  }
+
+  if (_p_sercom->isSlaveSelectLowSPI()) {
+    if (onSelectCallback) {
+      onSelectCallback();
+    }
+
+    _p_sercom->acknowledgeSPISlaveSelectLow();
+  }
+}
+
 #if SPI_INTERFACES_COUNT > 0
   /* In case new variant doesn't define these macros,
    * we put here the ones for Arduino Zero.
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index 50eff71e0..9d208373f 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -96,6 +96,7 @@ class SPISettings {
 class SPIClass {
   public:
   SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, SercomSpiTXPad, SercomRXPad);
+  SPIClass(SERCOM *p_sercom, uint8_t uc_pinMISO, uint8_t uc_pinSCK, uint8_t uc_pinMOSI, uint8_t uc_pinSS, SercomSpiTXPad, SercomRXPad);
 
 
   byte transfer(uint8_t data);
@@ -112,20 +113,27 @@ class SPIClass {
   void detachInterrupt();
 
   void begin();
+  int beginSlave();
   void end();
 
   void setBitOrder(BitOrder order);
   void setDataMode(uint8_t uc_mode);
   void setClockDivider(uint8_t uc_div);
 
+  void onSelect(void(*)(void));
+  void onReceive(byte(*)(byte));
+
+  void onService(void);
+
   private:
   void init();
-  void config(SPISettings settings);
+  void config(SercomSpiMode mode, SPISettings settings);
 
   SERCOM *_p_sercom;
   uint8_t _uc_pinMiso;
   uint8_t _uc_pinMosi;
   uint8_t _uc_pinSCK;
+  uint8_t _uc_pinSS;
 
   SercomSpiTXPad _padTx;
   SercomRXPad _padRx;
@@ -134,6 +142,10 @@ class SPIClass {
   uint8_t interruptMode;
   char interruptSave;
   uint32_t interruptMask;
+
+  // Callback user functions
+  void (*onSelectCallback)(void);
+  byte (*onReceiveCallback)(byte);
 };
 
 #if SPI_INTERFACES_COUNT > 0
diff --git a/libraries/SPI/keywords.txt b/libraries/SPI/keywords.txt
index 47738f9fa..e1fe5b30a 100644
--- a/libraries/SPI/keywords.txt
+++ b/libraries/SPI/keywords.txt
@@ -12,11 +12,14 @@ SPI	KEYWORD1
 # Methods and Functions (KEYWORD2)
 #######################################
 begin			KEYWORD2
+beginSlave		KEYWORD2
 end				KEYWORD2
 transfer		KEYWORD2
 #setBitOrder	KEYWORD2
 setDataMode		KEYWORD2
 setClockDivider	KEYWORD2
+onSelect		KEYWORD2
+onReceive		KEYWORD2
 
 
 #######################################

From 234ff41d5f575ae74b118d344a7d386eb0636af1 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Fri, 5 Jan 2018 15:19:55 -0500
Subject: [PATCH 120/124] Only write byte if there is a receive callback

---
 libraries/SPI/SPI.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 330d245d0..e82055c91 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -261,16 +261,13 @@ void SPIClass::onReceive(byte(*function)(byte))
 void SPIClass::onService()
 {
   if (_p_sercom->isReceiveCompleteSPI()) {
-    byte nextOut;
     byte in = _p_sercom->readDataSPI();
 
     if (onReceiveCallback) {
-      nextOut = onReceiveCallback(in);
-    } else {
-      nextOut = 0xff;
-    }
+      byte out = onReceiveCallback(in);
 
-    _p_sercom->writeDataSPI(nextOut);
+      _p_sercom->writeDataSPI(out);
+    }
   }
 
   if (_p_sercom->isSlaveSelectLowSPI()) {

From 118b681894e9c61898951679bb506d5290c7c4d9 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Mon, 8 Jan 2018 12:43:51 -0500
Subject: [PATCH 121/124] Add SPI interrupt handlers

---
 libraries/SPI/SPI.cpp | 66 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 6 deletions(-)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index e82055c91..2ee1194e5 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -294,21 +294,75 @@ void SPIClass::onService()
     #define PAD_SPI_TX           SPI_PAD_2_SCK_3
     #define PAD_SPI_RX           SERCOM_RX_PAD_0
   #endif // PERIPH_SPI
-  SPIClass SPI (&PERIPH_SPI,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI,  PAD_SPI_TX,  PAD_SPI_RX);
+  #ifdef SPI_IT_HANDLER
+    // supports SPI slave mode
+    SPIClass SPI (&PERIPH_SPI,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI,  PIN_SPI_SS,  PAD_SPI_TX,  PAD_SPI_RX);
+
+    void SPI_IT_HANDLER(void) {
+      SPI.onService();
+    }
+  #else
+    SPIClass SPI (&PERIPH_SPI,  PIN_SPI_MISO,  PIN_SPI_SCK,  PIN_SPI_MOSI,  PAD_SPI_TX,  PAD_SPI_RX);
+  #endif
 #endif
 #if SPI_INTERFACES_COUNT > 1
-  SPIClass SPI1(&PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PAD_SPI1_TX, PAD_SPI1_RX);
+  #ifdef SPI1_IT_HANDLER
+    // supports SPI slave mode
+    SPIClass SPI1(&PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PIN_SPI1_SS, PAD_SPI1_TX, PAD_SPI1_RX);
+
+    void SPI1_IT_HANDLER(void) {
+      SPI1.onService();
+    }
+  #else
+    SPIClass SPI1(&PERIPH_SPI1, PIN_SPI1_MISO, PIN_SPI1_SCK, PIN_SPI1_MOSI, PAD_SPI1_TX, PAD_SPI1_RX);
+  #endif
 #endif
 #if SPI_INTERFACES_COUNT > 2
-  SPIClass SPI2(&PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PAD_SPI2_TX, PAD_SPI2_RX);
+  #ifdef SPI2_IT_HANDLER
+    // supports SPI slave mode
+    SPIClass SPI2(&PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PIN_SPI2_SS, PAD_SPI2_TX, PAD_SPI2_RX);
+
+    void SPI2_IT_HANDLER(void) {
+      SPI2.onService();
+    }
+  #else
+    SPIClass SPI2(&PERIPH_SPI2, PIN_SPI2_MISO, PIN_SPI2_SCK, PIN_SPI2_MOSI, PAD_SPI2_TX, PAD_SPI2_RX);
+  #endif
 #endif
 #if SPI_INTERFACES_COUNT > 3
-  SPIClass SPI3(&PERIPH_SPI3, PIN_SPI3_MISO, PIN_SPI3_SCK, PIN_SPI3_MOSI, PAD_SPI3_TX, PAD_SPI3_RX);
+  #ifdef SPI3_IT_HANDLER
+    // supports SPI slave mode
+    SPIClass SPI3(&PERIPH_SPI3, PIN_SPI3_MISO, PIN_SPI3_SCK, PIN_SPI3_MOSI, PIN_SPI3_SS, PAD_SPI3_TX, PAD_SPI3_RX);
+
+    void SPI3_IT_HANDLER(void) {
+      SPI3.onService();
+    }
+  #else
+    SPIClass SPI3(&PERIPH_SPI3, PIN_SPI3_MISO, PIN_SPI3_SCK, PIN_SPI3_MOSI, PAD_SPI3_TX, PAD_SPI3_RX);
+  #endif
 #endif
 #if SPI_INTERFACES_COUNT > 4
-  SPIClass SPI4(&PERIPH_SPI4, PIN_SPI4_MISO, PIN_SPI4_SCK, PIN_SPI4_MOSI, PAD_SPI4_TX, PAD_SPI4_RX);
+  #ifdef SPI4_IT_HANDLER
+    // supports SPI slave mode
+    SPIClass SPI4(&PERIPH_SPI4, PIN_SPI4_MISO, PIN_SPI4_SCK, PIN_SPI4_MOSI, PIN_SPI4_SS, PAD_SPI4_TX, PAD_SPI4_RX);
+
+    void SPI4_IT_HANDLER(void) {
+      SPI4.onService();
+    }
+  #else
+    SPIClass SPI4(&PERIPH_SPI4, PIN_SPI4_MISO, PIN_SPI4_SCK, PIN_SPI4_MOSI, PAD_SPI4_TX, PAD_SPI4_RX);
+  #endif
 #endif
 #if SPI_INTERFACES_COUNT > 5
-  SPIClass SPI5(&PERIPH_SPI5, PIN_SPI5_MISO, PIN_SPI5_SCK, PIN_SPI5_MOSI, PAD_SPI5_TX, PAD_SPI5_RX);
+  #ifdef SPI5_IT_HANDLER
+    // supports SPI slave mode
+    SPIClass SPI5(&PERIPH_SPI5, PIN_SPI5_MISO, PIN_SPI5_SCK, PIN_SPI5_MOSI, PIN_SPI5_SS, PAD_SPI5_TX, PAD_SPI5_RX);
+
+    void SPI5_IT_HANDLER(void) {
+      SPI5.onService();
+    }
+  #else
+    SPIClass SPI5(&PERIPH_SPI5, PIN_SPI5_MISO, PIN_SPI5_SCK, PIN_SPI5_MOSI, PAD_SPI5_TX, PAD_SPI5_RX);
+  #endif
 #endif
 

From 30a85c6eac6f580565d730b14c251bc62348fa11 Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Mon, 8 Jan 2018 13:05:24 -0500
Subject: [PATCH 122/124] Add SPI_HAS_SLAVE and SPI_HAS_ON_SELECT API's

---
 libraries/SPI/SPI.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h
index 9d208373f..0316eaeee 100644
--- a/libraries/SPI/SPI.h
+++ b/libraries/SPI/SPI.h
@@ -31,6 +31,14 @@
 //   - SPISetting(clock, bitOrder, dataMode)
 #define SPI_HAS_TRANSACTION 1
 
+// SPI_HAS_SLAVE means that SPI has
+//   - beginSlave()
+//   - onReceive(callback)
+#define SPI_HAS_SLAVE
+
+// SPI_HAS_ON_SELECT means that SPI has onSelect(callback) method
+#define SPI_HAS_ON_SELECT
+
 #define SPI_MODE0 0x02
 #define SPI_MODE1 0x00
 #define SPI_MODE2 0x03

From 95d08de05796517b63f09dd8760e8c004d219e0a Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Wed, 10 Jan 2018 14:56:26 -0500
Subject: [PATCH 123/124] Handle slave select low first

---
 libraries/SPI/SPI.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 2ee1194e5..c4cf2ec57 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -260,6 +260,14 @@ void SPIClass::onReceive(byte(*function)(byte))
 
 void SPIClass::onService()
 {
+  if (_p_sercom->isSlaveSelectLowSPI()) {
+    if (onSelectCallback) {
+      onSelectCallback();
+    }
+
+    _p_sercom->acknowledgeSPISlaveSelectLow();
+  }
+
   if (_p_sercom->isReceiveCompleteSPI()) {
     byte in = _p_sercom->readDataSPI();
 
@@ -269,14 +277,6 @@ void SPIClass::onService()
       _p_sercom->writeDataSPI(out);
     }
   }
-
-  if (_p_sercom->isSlaveSelectLowSPI()) {
-    if (onSelectCallback) {
-      onSelectCallback();
-    }
-
-    _p_sercom->acknowledgeSPISlaveSelectLow();
-  }
 }
 
 #if SPI_INTERFACES_COUNT > 0

From 5f36ae4fd4111b12f1c4fdecce384d75e872e4df Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Tue, 6 Mar 2018 10:44:06 +0100
Subject: [PATCH 124/124] Add MKR Motor Carrier variant

IMPORTANT: lto build is needed to fit both production bootloader and production firmware in 16KB; at the moment 7-2017q4 toolchain is unable to produce a proper build, so use the system gcc toolchain (on Arch Linux)

Marking the vector section as used allows us to use lto also on c files.
Necessary to compile the bootloader safely (we could also add a checksum strategy)
---
 boards.txt                                    |  52 +++
 cores/arduino/RingBuffer.h                    |   2 +-
 cores/arduino/WVariant.h                      |  14 +-
 cores/arduino/cortex_handlers.c               |   2 +-
 cores/arduino/wiring_analog.c                 |  30 +-
 cores/arduino/wiring_analog.h                 |   2 +
 cores/arduino/wiring_private.c                |   2 +
 libraries/SPI/SPI.cpp                         |   8 +-
 libraries/Wire/Wire.h                         |   9 +-
 platform.txt                                  |   7 +-
 variants/Generic_D11D14AS/variant.cpp         |  12 +-
 variants/MKRMotorShield/README.md             | 250 ++++++++++++
 .../debug_scripts/SAMD11D14AS.gdb             |  31 ++
 .../gcc/4KB_Bootloader/flash_16KB.ld          | 217 ++++++++++
 .../gcc/No_Bootloader/flash_16KB.ld           | 214 ++++++++++
 .../openocd_scripts/SAMD11D14AS.cfg           |  30 ++
 variants/MKRMotorShield/pins_arduino.h        |  21 +
 variants/MKRMotorShield/variant.cpp           | 128 ++++++
 variants/MKRMotorShield/variant.h             | 379 ++++++++++++++++++
 19 files changed, 1375 insertions(+), 35 deletions(-)
 create mode 100644 variants/MKRMotorShield/README.md
 create mode 100644 variants/MKRMotorShield/debug_scripts/SAMD11D14AS.gdb
 create mode 100644 variants/MKRMotorShield/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
 create mode 100644 variants/MKRMotorShield/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
 create mode 100644 variants/MKRMotorShield/openocd_scripts/SAMD11D14AS.cfg
 create mode 100644 variants/MKRMotorShield/pins_arduino.h
 create mode 100644 variants/MKRMotorShield/variant.cpp
 create mode 100644 variants/MKRMotorShield/variant.h

diff --git a/boards.txt b/boards.txt
index f594f3601..4af048da8 100644
--- a/boards.txt
+++ b/boards.txt
@@ -19,6 +19,8 @@ menu.clock=Clock Source
 menu.usb=USB Config
 menu.serial=Serial Config
 menu.bootloader=Bootloader Size
+menu.lto=Link time optimization
+menu.pinmap=Pinmap
 
 
 # MattairTech Xeno
@@ -748,6 +750,10 @@ d11d14as.menu.serial.one_uart=ONE_UART_ONE_WIRE_ONE_SPI
 d11d14as.menu.serial.one_uart.build.serialcom_uart=ONE_UART
 d11d14as.menu.serial.one_uart.build.serialcom_wire=ONE_WIRE
 d11d14as.menu.serial.one_uart.build.serialcom_spi=ONE_SPI
+d11d14as.menu.serial.one_uart_no_spi=ONE_UART_ONE_WIRE_NO_SPI
+d11d14as.menu.serial.one_uart_no_spi.build.serialcom_uart=ONE_UART
+d11d14as.menu.serial.one_uart_no_spi.build.serialcom_wire=ONE_WIRE
+d11d14as.menu.serial.one_uart_no_spi.build.serialcom_spi=NO_SPI
 d11d14as.menu.serial.no_uart=NO_UART_ONE_WIRE_ONE_SPI
 d11d14as.menu.serial.no_uart.build.serialcom_uart=NO_UART
 d11d14as.menu.serial.no_uart.build.serialcom_wire=ONE_WIRE
@@ -775,6 +781,52 @@ d11d14as.menu.usb.none=USB_DISABLED
 d11d14as.menu.usb.none.build.usbcom=USB_DISABLED
 d11d14as.menu.usb.none.build.pid=0x0856
 
+# MKR Motor Shield
+mkrmotorshield.name=MKR Motor Shield
+mkrmotorshield.vid.0=0x2341
+mkrmotorshield.pid.0=0x1337
+mkrmotorshield.build.mcu=cortex-m0plus
+mkrmotorshield.build.f_cpu=48000000L
+mkrmotorshield.build.usb_product="MKRMOTOR"
+mkrmotorshield.build.usb_manufacturer="Arduino LLC"
+mkrmotorshield.build.board=SAMD_ZERO
+mkrmotorshield.build.core=arduino
+mkrmotorshield.build.variant=MKRMotorShield
+mkrmotorshield.build.variant_system_lib=
+mkrmotorshield.build.vid=0x2341
+mkrmotorshield.build.pid=0x1337
+mkrmotorshield.upload.protocol=sam-ba
+mkrmotorshield.bootloader.tool=arduino:openocd
+mkrmotorshield.build.clockconfig=CLOCKCONFIG_INTERNAL
+mkrmotorshield.build.extra_flags=-D__SAMD11D14AS__ {build.usb_flags} {build.pinmap} {build.lto}
+mkrmotorshield.build.ldscript=flash_16KB.ld
+mkrmotorshield.build.openocdscript=openocd_scripts/SAMD11D14AS.cfg
+mkrmotorshield.bootloader.file=zero/binaries/sam_ba_Generic_D11D14AS_SAMD11D14AS.bin
+mkrmotorshield.menu.bootloader.4kb=4KB bootloader
+mkrmotorshield.menu.bootloader.4kb.build.bootloader_size=__4KB_BOOTLOADER__
+mkrmotorshield.menu.bootloader.4kb.build.ldscript_path=linker_scripts/gcc/4KB_Bootloader
+mkrmotorshield.menu.bootloader.4kb.upload.maximum_size=12288
+mkrmotorshield.menu.bootloader.0kb=No bootloader
+mkrmotorshield.menu.bootloader.0kb.build.bootloader_size=__NO_BOOTLOADER__
+mkrmotorshield.menu.bootloader.0kb.build.ldscript_path=linker_scripts/gcc/No_Bootloader
+mkrmotorshield.menu.bootloader.0kb.upload.maximum_size=16384
+mkrmotorshield.menu.pinmap.complete=Complete
+mkrmotorshield.menu.pinmap.complete.build.pinmap=
+mkrmotorshield.menu.pinmap.minimal=Minimal (bootloader)
+mkrmotorshield.menu.pinmap.minimal.build.pinmap=-DPIN_MAP_SUPER_COMPACT
+mkrmotorshield.menu.lto.enabled=Enabled
+mkrmotorshield.menu.lto.enabled.build.lto=-flto
+mkrmotorshield.menu.lto.disabled=Disabled
+mkrmotorshield.menu.lto.disabled.build.lto=
+mkrmotorshield.upload.tool=arduino:openocd
+mkrmotorshield.upload.use_1200bps_touch=false
+mkrmotorshield.upload.wait_for_upload_port=false
+mkrmotorshield.upload.native_usb=false
+mkrmotorshield.build.serialcom_uart=NO_UART
+mkrmotorshield.build.serialcom_wire=ONE_WIRE
+mkrmotorshield.build.serialcom_spi=NO_SPI
+mkrmotorshield.serialcom_spi=NO_SPI
+mkrmotorshield.build.usbcom=USB_DISABLED
 
 # MattairTech Core for Arduino/Genuino Zero (Autodetect Port)
 arduino_zero.name=Arduino/Genuino Zero (Autodetect Port)
diff --git a/cores/arduino/RingBuffer.h b/cores/arduino/RingBuffer.h
index c2ad3664a..f4970370d 100644
--- a/cores/arduino/RingBuffer.h
+++ b/cores/arduino/RingBuffer.h
@@ -25,7 +25,7 @@
 // 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 64
+#define SERIAL_BUFFER_SIZE 68
 
 class RingBuffer
 {
diff --git a/cores/arduino/WVariant.h b/cores/arduino/WVariant.h
index 999ea5a1c..41af7af6e 100644
--- a/cores/arduino/WVariant.h
+++ b/cores/arduino/WVariant.h
@@ -30,7 +30,7 @@ extern "C" {
 /* Definitions and types for pins */
 typedef enum _EAnalogChannel
 {
-  No_ADC_Channel=-1,
+  No_ADC_Channel=0xFF,
   ADC_Channel0=0,
   ADC_Channel1=1,
   ADC_Channel2=2,
@@ -59,7 +59,7 @@ typedef enum _EAnalogChannel
 // RESERVED (1 bit, used for negative) | Timer Number (3 bits: 0-7) | Timer Type (1 bit: 0=TCC, 1=TC) | Timer Channel (3 bits: 0-7)
 typedef enum _ETCChannel
 {
-  NOT_ON_TIMER=-1,
+  NOT_ON_TIMER=0xFF,
   TCC0_CH0 = (0<<4)|(0<<3)|(0),
   TCC0_CH1 = (0<<4)|(0<<3)|(1),
   TCC0_CH2 = (0<<4)|(0<<3)|(2),
@@ -111,12 +111,12 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
 // RESERVED (1 bit, used for negative) | GCLK (3 bits: 0-7) | CCL (4 bits: 2 for CCL number, 2 for pin)
 typedef enum _EGCLK_CCL
 {
-  GCLK_CCL_NONE=-1,
+  GCLK_CCL_NONE=0xFF,
 } EGCLK_CCL ;
 
 typedef enum _EPortType
 {
-  NOT_A_PORT=-1,
+  NOT_A_PORT=0xFF,
   PORTA=0,
   PORTB=1,
   PORTC=2,
@@ -142,7 +142,7 @@ typedef enum
   EXTERNAL_INT_15,
   EXTERNAL_INT_NMI,
   EXTERNAL_NUM_INTERRUPTS,
-  NOT_AN_INTERRUPT = -1,
+  NOT_AN_INTERRUPT = 0xFF,
   EXTERNAL_INT_NONE = NOT_AN_INTERRUPT,
 } EExt_Interrupts ;
 
@@ -154,7 +154,7 @@ typedef enum
 #define INPUT_PULLDOWN  (0x3)
 typedef enum _EPioType
 {
-  PIO_NOT_A_PIN=-1,                   /* Not under control of a peripheral. */
+  PIO_NOT_A_PIN=0xFF,                   /* Not under control of a peripheral. */
 
   PIO_INPUT=INPUT,                    /* The pin is controlled by PORT and is an input. */
   PIO_OUTPUT=OUTPUT,                  /* The pin is controlled by PORT and is an output. */
@@ -219,7 +219,7 @@ typedef enum _EPioType
 //EIC REF ADC AC PTC DAC SERCOM SERCOM_ALT TC/TCC TCC COM AC/GCLK CCL
 typedef enum _EPioPeripheral
 {
-	PER_PORT=-1,          /* The pin is controlled by PORT. */
+	PER_PORT=0xFF,          /* The pin is controlled by PORT. */
 	PER_EXTINT=0,         /* The pin is controlled by the associated signal of peripheral A. */
 	PER_ANALOG=1,         /* The pin is controlled by the associated signal of peripheral B. */
 	PER_SERCOM=2,         /* The pin is controlled by the associated signal of peripheral C. */
diff --git a/cores/arduino/cortex_handlers.c b/cores/arduino/cortex_handlers.c
index fa0b02f72..c239f25e7 100644
--- a/cores/arduino/cortex_handlers.c
+++ b/cores/arduino/cortex_handlers.c
@@ -94,7 +94,7 @@ extern uint32_t __bss_end__;
 extern uint32_t __StackTop;
 
 /* Exception Table */
-__attribute__ ((section(".isr_vector"))) const DeviceVectors exception_table =
+__attribute__ ((used,section(".isr_vector"))) const DeviceVectors exception_table =
 {
   /* Configure Initial Stack Pointer, using linker-generated symbols */
   (void*) (&__StackTop),
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 58c90f97e..7bc075feb 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -96,6 +96,12 @@ static void syncTC_16(Tc* TCx) {
 #endif
 }
 
+// Wait for synchronization of registers between the clock domains
+static __inline__ void syncTC_8(Tc* TCx) __attribute__((always_inline, unused));
+static void syncTC_8(Tc* TCx) {
+  while (TCx->COUNT8.STATUS.bit.SYNCBUSY);
+}
+
 // Wait for synchronization of registers between the clock domains
 static __inline__ void syncTCC(Tcc* TCCx) __attribute__((always_inline, unused));
 static void syncTCC(Tcc* TCCx) {
@@ -275,12 +281,15 @@ uint32_t analogRead( uint32_t pin )
   return mapResolution(valueRead, _ADCResolution, _readResolution);
 }
 
+void analogWrite(uint32_t pin, uint32_t value) {
+  analogWritePeriod(pin, value, 0xFFFF);
+}
 
 // Right now, PWM output only works on the pins with
 // hardware support.  These are defined in the appropriate
 // pins_*.c file.  For the rest of the pins, we default
 // to digital output.
-void analogWrite(uint32_t pin, uint32_t value)
+void analogWritePeriod(uint32_t pin, uint32_t value, uint32_t period)
 {
   if ( pinPeripheral(pin, PIO_ANALOG_DAC) == RET_STATUS_OK )
   {
@@ -370,12 +379,13 @@ void analogWrite(uint32_t pin, uint32_t value)
       // Set PORT
       if ( TCx )
       {
+
         // -- Configure TC
         // Disable TCx
         TCx->COUNT16.CTRLA.bit.ENABLE = 0;
         syncTC_16(TCx);
         // Set Timer counter Mode to 16 bits, normal PWM
-        TCx->COUNT16.CTRLA.reg |= TC_CTRLA_MODE_COUNT16;
+        TCx->COUNT16.CTRLA.reg |= TC_CTRLA_MODE_COUNT16 | TC_CTRLA_PRESCSYNC_RESYNC;
         syncTC_16(TCx);
         // Set TCx as normal PWM
 #if (SAMD)
@@ -395,6 +405,8 @@ void analogWrite(uint32_t pin, uint32_t value)
         // Disable TCCx
         TCCx->CTRLA.bit.ENABLE = 0;
         syncTCC(TCCx);
+        TCCx->CTRLA.reg |= TCC_CTRLA_PRESCALER_DIV16;
+        syncTCC(TCCx);
         // Set TCCx as normal PWM
         TCCx->WAVE.reg |= TCC_WAVE_WAVEGEN_NPWM;
         syncTCC(TCCx);
@@ -402,7 +414,7 @@ void analogWrite(uint32_t pin, uint32_t value)
         TCCx->CC[Channelx].reg = (uint32_t)value;
         syncTCC(TCCx);
         // Set PER to maximum counter value (resolution : 0xFFFF)
-        TCCx->PER.reg = 0xFFFF;
+        TCCx->PER.reg = (uint16_t)period;
         syncTCC(TCCx);
         // Enable TCCx
         TCCx->CTRLA.bit.ENABLE = 1;
@@ -421,13 +433,13 @@ void analogWrite(uint32_t pin, uint32_t value)
 #if (SAMD)
         TCCx->CTRLBSET.bit.LUPD = 1;
         syncTCC(TCCx);
-	TCCx->CCB[Channelx].reg = (uint32_t) value;
-	syncTCC(TCCx);
-	TCCx->CTRLBCLR.bit.LUPD = 1;
-// LUPD caused endless spinning in syncTCC() on SAML (and probably SAMC). Note that CCBUF writes are already
-// atomic. The LUPD bit is intended for updating several registers at once, which analogWrite() does not do.
+        TCCx->CCB[Channelx].reg = (uint32_t) value;
+        syncTCC(TCCx);
+        TCCx->CTRLBCLR.bit.LUPD = 1;
+        // LUPD caused endless spinning in syncTCC() on SAML (and probably SAMC). Note that CCBUF writes are already
+        // atomic. The LUPD bit is intended for updating several registers at once, which analogWrite() does not do.
 #elif (SAML21 || SAMC21)
-	TCCx->CCBUF[Channelx].reg = (uint32_t) value;
+        TCCx->CCBUF[Channelx].reg = (uint32_t) value;
 #endif
         syncTCC(TCCx);
       }
diff --git a/cores/arduino/wiring_analog.h b/cores/arduino/wiring_analog.h
index c5844ba75..f2ff2954b 100644
--- a/cores/arduino/wiring_analog.h
+++ b/cores/arduino/wiring_analog.h
@@ -95,6 +95,8 @@ extern void analogReference( eAnalogReference ulMode ) ;
  */
 extern void analogWrite( uint32_t ulPin, uint32_t ulValue ) ;
 
+extern void analogWritePeriod(uint32_t pin, uint32_t value, uint32_t period) ;
+
 /*
  * \brief Reads the value from the specified analog pin.
  *
diff --git a/cores/arduino/wiring_private.c b/cores/arduino/wiring_private.c
index 63a46cf48..f3cbc30ce 100644
--- a/cores/arduino/wiring_private.c
+++ b/cores/arduino/wiring_private.c
@@ -140,6 +140,7 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
   uint8_t pinNum = g_APinDescription[ulPin].ulPin;
   uint8_t pinCfg = PORT_PINCFG_INEN;	// INEN should be enabled for both input and output (but not analog)
 
+#if !defined PIN_MAP_SUPER_COMPACT
   // Disable DAC, if analogWrite() used previously the DAC is enabled
   // Note that on the L21, the DAC output would interfere with other peripherals if left enabled, even if the anaolog peripheral is not selected
   if ((pinAttribute & PIN_ATTR_DAC) && !((1UL << ulPeripheral) & PIN_ATTR_DAC))
@@ -179,6 +180,7 @@ int pinPeripheral( uint32_t ulPin, uint32_t ulPeripheral )
     }
 #endif
   }
+#endif
 
   noInterrupts(); // Avoid possible invalid interim pin state
 
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index c4cf2ec57..66386c67e 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -71,10 +71,10 @@ int SPIClass::beginSlave()
   init();
 
   // PIO init
-  pinPeripheral(_uc_pinMiso, g_APinDescription[_uc_pinMiso].ulPinType);
-  pinPeripheral(_uc_pinSCK, g_APinDescription[_uc_pinSCK].ulPinType);
-  pinPeripheral(_uc_pinMosi, g_APinDescription[_uc_pinMosi].ulPinType);
-  pinPeripheral(_uc_pinSS, g_APinDescription[_uc_pinSS].ulPinType);
+  pinPeripheral(_uc_pinMiso, PIO_SERCOM);
+  pinPeripheral(_uc_pinSCK, PIO_SERCOM);
+  pinPeripheral(_uc_pinMosi, PIO_SERCOM);
+  pinPeripheral(_uc_pinSS, PIO_SERCOM);
 
   config(SPI_SLAVE_OPERATION, DEFAULT_SPI_SETTINGS);
 
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h
index f845ba7dd..08af29244 100644
--- a/libraries/Wire/Wire.h
+++ b/libraries/Wire/Wire.h
@@ -56,10 +56,11 @@ class TwoWire : public Stream
     void onReceive(void(*)(int));
     void onRequest(void(*)(void));
 
-    inline size_t write(unsigned long n) { return write((uint8_t)n); }
-    inline size_t write(long n) { return write((uint8_t)n); }
-    inline size_t write(unsigned int n) { return write((uint8_t)n); }
-    inline size_t write(int n) { return write((uint8_t)n); }
+    inline size_t write(uint16_t n) { return write((const uint8_t *)&n, sizeof(uint16_t)); }
+    inline size_t write(unsigned long n) { return write((const uint8_t *)&n, sizeof(unsigned long)); }
+    inline size_t write(long n) { return write((const uint8_t *)&n, sizeof(long)); }
+    inline size_t write(unsigned int n) { return write((const uint8_t *)&n, sizeof(unsigned int)); }
+    inline size_t write(int n) { return write((const uint8_t *)&n, sizeof(int)); }
     using Print::write;
 
     void onService(void);
diff --git a/platform.txt b/platform.txt
index c957e0b31..d8aa81ac2 100644
--- a/platform.txt
+++ b/platform.txt
@@ -32,6 +32,7 @@ compiler.warning_flags.more=-Wall
 compiler.warning_flags.all=-Wall -Wextra
 
 compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
+#compiler.path=/bin/
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
 compiler.c.elf.cmd=arm-none-eabi-gcc
@@ -58,11 +59,11 @@ compiler.readelf.cmd=arm-none-eabi-readelf
 build.extra_flags=
 
 # These can be overridden in platform.local.txt
-compiler.c.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-2.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.c.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
 compiler.c.elf.extra_flags=
 #compiler.c.elf.extra_flags=-v
-compiler.cpp.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-2.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
-compiler.S.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-2.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.cpp.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
+compiler.S.extra_flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0-mattairtech-1.path}/CMSIS/Device/ATMEL/" -D{build.clockconfig} -D{build.usbcom} -D{build.serialcom_uart} -D{build.serialcom_wire} -D{build.serialcom_spi} -D{build.bootloader_size}
 compiler.ar.extra_flags=
 compiler.elf2hex.extra_flags=
 
diff --git a/variants/Generic_D11D14AS/variant.cpp b/variants/Generic_D11D14AS/variant.cpp
index 992a3fc1b..861e23e42 100644
--- a/variants/Generic_D11D14AS/variant.cpp
+++ b/variants/Generic_D11D14AS/variant.cpp
@@ -96,20 +96,20 @@ SERCOM sercom0( SERCOM0 ) ;
 SERCOM sercom1( SERCOM1 ) ;
 SERCOM sercom2( SERCOM2 ) ;
 
-#if defined(ONE_UART) || defined(TWO_UART)
-Uart Serial1( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
 
 void SERCOM1_Handler()
 {
-  Serial1.IrqHandler();
+  Serial2.IrqHandler();
 }
 #endif
 
-#if defined(TWO_UART)
-Uart Serial2( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+#if defined(ONE_UART) || defined(TWO_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
 
 void SERCOM0_Handler()
 {
-  Serial2.IrqHandler();
+  Serial1.IrqHandler();
 }
 #endif
diff --git a/variants/MKRMotorShield/README.md b/variants/MKRMotorShield/README.md
new file mode 100644
index 000000000..ca09728b4
--- /dev/null
+++ b/variants/MKRMotorShield/README.md
@@ -0,0 +1,250 @@
+# Generic ATsamD11D14AS
+
+```
+=====================================  ATsamD11D14AS  ===================================
+Other COM   PWM  Analog  INT  Arduino*            Arduino*  Analog  INT  PWM   COM  Other
+=========================================================================================
+                                   1-------------------
+            TCC01    *     *    5  | A5             A4 | 4    *     *   TCC00        REFB
+     SS     TCC02    *          6  | A6             A3 | 3    *                      REFA
+    MISO    TCC03    *     *    7  | A7             A2 | 2    *     *                 DAC
+Xin32/Xin                       8  | A8 (XIN)      Vdd |
+Xout32/Xout                     9  | A9 (XOUT)     Gnd |
+  MOSI/TX2           *    NMI   14 | A14           A25 | 25                  USB D+
+  SCK/RX2   TC11     *     *    15 | A15           A24 | 24                  USB D-
+            TC10           *    16 | A16           A31 | 31         *   TC21  RX1   SWDIO
+    SDA                    *    22 | A22           A30 | 30             TC20  TX1  SWDCLK
+    SCL                         23 | A23       RST/A28 | 28                          BOOT
+                                    -------------------
+
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the chip above is also used in Arduino (but without the 'A') for
+  all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.).
+  When using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the
+  top left pin (A5). PIN_MAP_COMPACT uses less RAM.
+* When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+* Tone available on TC2.
+* Leave pin A30 floating (or use external pullup) during reset.
+* DO NOT connect voltages higher than 3.3V!
+```
+
+
+## Pins descriptions for Generic ATsamD11D14AS
+
+### PIN_MAP_STANDARD
+```
+============================================================================================================================================
+Arduino	| Port	| Alternate Function	| Comments (! means not used with this peripheral assignment)
+--------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0	| ----	| NOT A PIN		| NOT A PIN
+1	| ----	| NOT A PIN		| NOT A PIN
+2	| PA02	| DAC			| EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+3	| PA03	| REFA			| !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+4	| PA04	| REFB / TCC00		| EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+5	| PA05	| TCC01			| EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+6	| PA06	| SS (unused) / TCC02	| !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+7	| PA07	| MISO / TCC03		| EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+8	| PA08	| Xin32 / Xin		| Xin32
+9	| PA09	| Xout32 / Xout		| Xout32
+10	| ----	| NOT A PIN             | NOT A PIN
+11	| ----	| NOT A PIN             | NOT A PIN
+12	| ----	| NOT A PIN		| NOT A PIN
+13	| ----	| NOT A PIN		| NOT A PIN
+14	| PA14	| MOSI / TX2	        | EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+15	| PA15	| SCK / RX2 / TC11      | EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] TC1/WO[1] !TCC0/WO[1]
+16	| PA16	| TC10			| EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6]
+17	| ----  | NOT A PIN             | NOT A PIN
+18	| ----	| NOT A PIN		| NOT A PIN
+19	| ----	| NOT A PIN		| NOT A PIN
+20	| ----	| NOT A PIN		| NOT A PIN
+21	| ----	| NOT A PIN		| NOT A PIN
+22	| PA22	| SDA           	| EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+23	| PA23	| SCL	                | !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[5]
+24	| PA24	| USB_NEGATIVE		| USB/DM
+25	| PA25	| USB_POSITIVE		| USB/DP
+26	| ----	| NOT A PIN		| NOT A PIN
+27	| ----  | NOT A PIN             | NOT A PIN
+28	| PA28	| Reset			| Reset, BOOT (double tap bootloader entry)
+29	| ----	| NOT A PIN		| NOT A PIN
+30	| PA30	| TX1 / TC20 / SWD CLK	| !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+31	| PA31	| RX1 / TC21 / SWD IO	| EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+============================================================================================================================================
+```
+
+### PIN_MAP_COMPACT
+```
+============================================================================================================================================
+Arduino | Port  | Alternate Function    | Comments (! means not used with this peripheral assignment)
+--------|-------|-----------------------|-------------------------------------------------------------------------------------------
+0       | PA02  | DAC                   | EIC/EXTINT[2] ADC/AIN[0] PTC/Y[0] DAC/VOUT
+1       | PA03  | REFA                  | !EIC/EXTINT[3] REF/ADC/VREFA REF/DAC/VREFA ADC/AIN[1] PTC/Y[1]
+2       | PA04  | REFB / TCC00          | EIC/EXTINT[4] REF/ADC/VREFB ADC/AIN[4] AC/AIN[0] PTC/Y[2] !SERCOM0/PAD[2] !SERCOM0/PAD[0] !TC1/WO[0] TCC0/WO[0]
+3       | PA05  | TCC01                 | EIC/EXTINT[5] ADC/AIN[3] AC/AIN[1] PTC/Y[3] !SERCOM0/PAD[3] !SERCOM0/PAD[1] !TC1/WO[1] TCC0/WO[1]
+4       | PA06  | SS (unused) / TCC02   | !EIC/EXTINT[6] ADC/AIN[4] AC/AIN[2] PTC/Y[4] SERCOM0/PAD[0] !SERCOM0/PAD[2] !TC2/WO[0] TCC0/WO[2]
+5       | PA07  | MISO / TCC03          | EIC/EXTINT[7] ADC/AIN[5] AC/AIN[3] PTC/Y[5] SERCOM0/PAD[1] !SERCOM0/PAD[3] !TC2/WO[1] TCC0/WO[3]
+6       | PA08  | Xin32 / Xin           | Xin32
+7       | PA09  | Xout32 / Xout         | Xout32
+8       | PA14  | MOSI / TX2            | EIC/NMI ADC/AIN[6] PTC/X[0] PTC/Y[6] SERCOM0/PAD[0] !SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[0]
+9       | PA15  | SCK / RX2 / TC11      | EIC/EXTINT[1] ADC/AIN[7] PTC/X[1] PTC/Y[7] SERCOM0/PAD[1] !SERCOM2/PAD[1] TC1/WO[1] !TCC0/WO[1]
+10      | PA16  | TC10                  | EIC/EXTINT[0] PTC/X[4] PTC/Y[10] !SERCOM1/PAD[2] !SERCOM2/PAD[2] TC1/WO[0] !TCC0/WO[6]
+11      | PA22  | SDA                   | EIC/EXTINT[6] PTC/X[6] PTC/Y[12] !SERCOM1/PAD[0] SERCOM2/PAD[0] !TC1/WO[0] !TCC0/WO[4]
+12      | PA23  | SCL                   | !EIC/EXTINT[7] PTC/X[7] PTC/Y[13] !SERCOM1/PAD[1] SERCOM2/PAD[1] !TC1/WO[1] !TCC0/WO[5]
+13      | PA24  | USB_NEGATIVE          | USB/DM
+14      | PA25  | USB_POSITIVE          | USB/DP
+15      | PA28  | Reset                 | Reset, BOOT (double tap bootloader entry)
+16      | PA30  | TX1 / TC20 / SWD CLK  | !EIC/EXTINT[2] !SERCOM1/PAD[0] SERCOM1/PAD[2] TC2/WO[0] !TCC0/WO[2] SWD CLK, leave floating during boot
+17      | PA31  | RX1 / TC21 / SWD IO   | EIC/EXTINT[3] !SERCOM1/PAD[1] SERCOM1/PAD[3] TC2/WO[1] !TCC0/WO[3] SWD IO
+============================================================================================================================================
+
+* Most pins can be used for more than one function. When using PIN_MAP_STANDARD, the port
+  pin number printed on the chip above is also used in Arduino (but without the 'A') for
+  all of the supported functions (ie: digitalRead(), analogRead(), analogWrite(), etc.).
+  When using PIN_MAP_COMPACT, the Arduino numbering is sequential starting from 0 at the
+  top left pin (A5). PIN_MAP_COMPACT uses less RAM.
+* NOT A PIN means the Arduino pin number is not mapped to a physical pin.
+* Pins 24 and 25 are in use by USB (USB_NEGATIVE and USB_POSITIVE).
+* The tone library uses TC2.
+* Leave pin A30 floating (or use external pullup) during reset.
+```
+
+
+## Board Configuration Notes
+
+* **Crystals**
+  * Either a 32.768KHz crystal or a high speed crystal can be used.
+  * The bootloader does not use an external crystal by default. Double-tap the reset button to enter manually.
+
+* **GPIO** 
+  * All pins (including analog) support INPUT, OUTPUT, INPUT_PULLUP, and INPUT_PULLDOWN.
+  * Each pin can source or sink a maximum of 7 mA (when PER_ATTR_DRIVE_STRONG is set for the pin, enabled by default).
+  * Internal pull-up and pull-down resistors of 20-60 Kohms (40Kohm typ., disconnected by default).
+
+* **Analog Inputs**
+  * 8 pins can be configured as ADC analog inputs.
+  * Each pin measures from ground to 3.3 volts by default.
+  * Each pin provides 10 bits of resolution (1024 values) by default.
+  * 12-bit resolution supported by using the analogReadResolution() function.
+  * The upper end of the measurement range can be changed using the analogReference() function.
+  * A reference voltage can be connected to REF.
+
+* **DAC**
+  * One analog output is available on pin 2.
+  * Provides a 10-bit voltage output with the analogWrite() function.
+
+* **PWM**
+  * 8 pins can be configured as PWM outputs.
+  * Each pin provides 8 bits of resolution (256 values) by default.
+  * 12-bit resolution supported by using the analogWriteResolution() function.
+
+* **External Interrupts**
+  * 8 pins can be configured with external interrupts.
+
+* **SERCOM**
+  * 3 SERCOM are available.
+  * Up to 2 UART instances
+  * 1 SPI instance
+  * 1 WIRE (I2C) instance
+
+
+
+## PinDescription table format
+
+### Note that a new column (GCLKCCL) was added for 1.6.8-beta-b0.
+MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE in variant.h is used to track versions.
+If using board variant files with the old format, the new core will still read the
+table the old way, losing any new features introduced by the new column. Additionally,
+new definitions have been added for L21 and C21 support.
+
+### Each pin can have multiple functions.
+The PinDescription table describes how each of the pins can be used by the Arduino
+core. Each pin can have multiple functions (ie: ADC input, digital output, PWM,
+communications, etc.), and the PinDescription table configures which functions can
+be used for each pin. This table is mainly accessed by the pinPeripheral function in
+wiring_private.c, which is used to attach a pin to a particular peripheral function.
+The communications drivers (ie: SPI, I2C, and UART), analogRead(), analogWrite(),
+analogReference(), attachInterrupt(), and pinMode() all call pinPeripheral() to
+verify that the pin can perform the function requested, and to configure the pin for
+that function. Most of the contents of pinMode() are now in pinPeripheral().
+
+### Pin Mapping
+There are different ways that pins can be mapped. Typically, there is no relation
+between the arduino pin number used, and the actual port pin designator. Thus, the 
+pcb must be printed with the arduino numbering, otherwise, if the port pin is printed,
+a cross reference table is needed to find the arduino pin number. However, this results
+in the least amount of space used by the table. Another method, used by default by the
+MT-D21E and MT-D11, maps Arduino pin numbers to the actual port pin number (ie: Arduino
+pin 28 = Port A28). This works well when there is only one port (or if the PORTB pins
+are used for onboard functions and not broken out). PIO_NOT_A_PIN entries must be added
+for pins that are used for other purposes or for pins that do not exist (especially the
+D11), so some FLASH space may be wasted. For an example of both types, see variant.cpp
+from the MT-D11 variant. The MT-D21J combines both methods, using the actual port pin 
+designators from both PORTA and PORTB for arduino numbers 0-31 (ie: B1=1, A2=2), then
+using arduino numbering only above 31. For 0-31 only one pin from PORTA or PORTB can be
+used, leaving the other pin for some number above 31.
+
+**See [WVariant.h](https://github.com/mattairtech/ArduinoCore-samd/tree/master/cores/arduino/WVariant.h) for the definitions used in the table.**
+
+### Port
+This is the port (ie: PORTA).
+
+### Pin
+This is the pin (bit) within the port. Valid values are 0-31.
+
+### PinType
+This indicates what peripheral function the pin can be attached to. In most cases,
+this is PIO_MULTI, which means that the pin can be anything listed in the PinAttribute
+field. It can also be set to a specific peripheral. In this case, any attempt to
+configure the pin (using pinPeripheral or pinMode) as anything else will fail (and
+pinPeripheral will return -1). This can be used to prevent accidental re-configuration
+of a pin that is configured for only one function (ie: USB D- and D+ pins). If a pin
+is not used or does not exist, PIO_NOT_A_PIN must be entered in this field. See
+WVariant.h for valid entries. These entries are also used as a parameter to
+pinPeripheral() with the exception of PIO_NOT_A_PIN and PIO_MULTI. The pinMode function
+now calls pinPeripheral() with the desired mode. Note that this field is not used to
+select between the two peripherals possible with each of the SERCOM and TIMER functions.
+PeripheralAttribute is now used for this.
+
+### PeripheralAttribute:
+This is an 8-bit bitfield used for various peripheral configuration. It is primarily
+used to select between the two peripherals possible with each of the SERCOM and TIMER
+functions. TIMER pins are individual, while SERCOM uses a group of two to four pins.
+This group of pins can span both peripherals. For example, pin 19 (SPI1 SCK) on the
+MT-D21E uses PER_ATTR_SERCOM_ALT while pin 22 (SPI1 MISO) uses PER_ATTR_SERCOM_STD.
+Both TIMER and SERCOM can exist for each pin. This bitfield is also used to set the
+pin drive strength. In the future, other attributes (like input buffer configuration)
+may be added. Starting with 1.6.8, the ADC instance on the C21 (there are two) is also
+selected here. See WVariant.h for valid entries.
+
+### PinAttribute
+This is a 32-bit bitfield used to list all of the valid peripheral functions that a
+pin can attach to. This includes GPIO functions like PIN_ATTR_OUTPUT. Certain
+attributes are shorthand for a combination of other attributes. PIN_ATTR_DIGITAL
+includes all of the GPIO functions, while PIN_ATTR_TIMER includes both
+PIN_ATTR_TIMER_PWM and PIN_ATTR_TIMER_CAPTURE (capture is not used yet).
+PIN_ATTR_ANALOG is an alias to PIN_ATTR_ANALOG_ADC. This bitfield is useful for
+limiting a pin to only input related functions or output functions. This allows a pin
+to have a more flexible configuration, while restricting the direction (ie: to avoid
+contention). See WVariant.h for valid entries.
+
+### TCChannel
+This is the TC/TCC channel (if any) assigned to the pin. Some TC channels are available
+on multiple pins. In general, only one pin should be configured in the pinDescription
+table per TC channel. Starting with 1.6.8, the timer type is now encoded in this column
+to support the L21 and C21, which use TC numbers starting at 0 (rather than 3 as on the
+D21). See WVariant.h for valid entries.
+
+### ADCChannelNumber
+This is the ADC channel (if any) assigned to the pin. The C21 has two ADC instances,
+which is selected in the PeripheralAttribute column. See WVariant.h for valid entries.
+
+### ExtInt
+This is the interrupt (if any) assigned to the pin. Some interrupt numbers are
+available on multiple pins. In general, only one pin should be configured in the
+pinDescription table per interrupt number. Thus, for example, if an interrupt was
+needed on pin 2, EXTERNAL_INT_2 can be moved from pin 18. See WVariant.h for valid
+entries.
+
+### GCLKCCL
+This column was added in 1.6.8-beta-b0. It is not yet used. It will eventually support
+the Analog Comparators (AC), the Configurable Custom Logic (CCL) units of the L21 and
+C21, and the GCLK outputs (inputs).
diff --git a/variants/MKRMotorShield/debug_scripts/SAMD11D14AS.gdb b/variants/MKRMotorShield/debug_scripts/SAMD11D14AS.gdb
new file mode 100644
index 000000000..1daf3ccc2
--- /dev/null
+++ b/variants/MKRMotorShield/debug_scripts/SAMD11D14AS.gdb
@@ -0,0 +1,31 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+# Define 'reset' command
+define reset
+
+info reg
+
+break main
+
+# End of 'reset' command
+end
+
+target remote | openocd -c "interface cmsis-dap" -c "set CHIPNAME at91samd11d14as" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/MKRMotorShield/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld b/variants/MKRMotorShield/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
new file mode 100644
index 000000000..1e2d5f052
--- /dev/null
+++ b/variants/MKRMotorShield/linker_scripts/gcc/4KB_Bootloader/flash_16KB.ld
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000+0x1000, LENGTH = 0x00004000-0x1000 /* First 4KB used by bootloader */
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.sketch_boot))
+		
+		. = ALIGN(0x1000);
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MKRMotorShield/linker_scripts/gcc/No_Bootloader/flash_16KB.ld b/variants/MKRMotorShield/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
new file mode 100644
index 000000000..bd135b3dd
--- /dev/null
+++ b/variants/MKRMotorShield/linker_scripts/gcc/No_Bootloader/flash_16KB.ld
@@ -0,0 +1,214 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/* Linker script to configure memory regions.
+ * Need modifying for a specific board.
+ *   FLASH.ORIGIN: starting address of flash
+ *   FLASH.LENGTH: length of flash
+ *   RAM.ORIGIN: starting address of RAM bank 0
+ *   RAM.LENGTH: length of RAM bank 0
+ */
+MEMORY
+{
+  FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x00004000
+  RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00001000
+}
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+	.text :
+	{
+		__text_start__ = .;
+		
+		KEEP(*(.isr_vector))
+		*(.text*)
+
+		KEEP(*(.init))
+		KEEP(*(.fini))
+
+		/* .ctors */
+		*crtbegin.o(.ctors)
+		*crtbegin?.o(.ctors)
+		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+		*(SORT(.ctors.*))
+		*(.ctors)
+
+		/* .dtors */
+ 		*crtbegin.o(.dtors)
+ 		*crtbegin?.o(.dtors)
+ 		*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ 		*(SORT(.dtors.*))
+ 		*(.dtors)
+
+		*(.rodata*)
+
+		KEEP(*(.eh_frame*))
+	} > FLASH
+
+	.ARM.extab :
+	{
+		*(.ARM.extab* .gnu.linkonce.armextab.*)
+	} > FLASH
+
+	__exidx_start = .;
+	.ARM.exidx :
+	{
+		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
+	} > FLASH
+	__exidx_end = .;
+
+	/* To copy multiple ROM to RAM sections,
+	 * uncomment .copy.table section and,
+	 * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.copy.table :
+	{
+		. = ALIGN(4);
+		__copy_table_start__ = .;
+		LONG (__etext)
+		LONG (__data_start__)
+		LONG (__data_end__ - __data_start__)
+		LONG (__etext2)
+		LONG (__data2_start__)
+		LONG (__data2_end__ - __data2_start__)
+		__copy_table_end__ = .;
+	} > FLASH
+	*/
+
+	/* To clear multiple BSS sections,
+	 * uncomment .zero.table section and,
+	 * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+	/*
+	.zero.table :
+	{
+		. = ALIGN(4);
+		__zero_table_start__ = .;
+		LONG (__bss_start__)
+		LONG (__bss_end__ - __bss_start__)
+		LONG (__bss2_start__)
+		LONG (__bss2_end__ - __bss2_start__)
+		__zero_table_end__ = .;
+	} > FLASH
+	*/
+
+	__etext = .;
+
+	.data : AT (__etext)
+	{
+		__data_start__ = .;
+		*(vtable)
+		*(.ramfunc*)
+		*(.data*)
+
+		. = ALIGN(4);
+		/* preinit data */
+		PROVIDE_HIDDEN (__preinit_array_start = .);
+		KEEP(*(.preinit_array))
+		PROVIDE_HIDDEN (__preinit_array_end = .);
+
+		. = ALIGN(4);
+		/* init data */
+		PROVIDE_HIDDEN (__init_array_start = .);
+		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array))
+		PROVIDE_HIDDEN (__init_array_end = .);
+
+
+		. = ALIGN(4);
+		/* finit data */
+		PROVIDE_HIDDEN (__fini_array_start = .);
+		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array))
+		PROVIDE_HIDDEN (__fini_array_end = .);
+
+		KEEP(*(.jcr*))
+		. = ALIGN(16);
+		/* All data end */
+		__data_end__ = .;
+
+	} > RAM
+
+	.bss :
+	{
+		. = ALIGN(4);
+		__bss_start__ = .;
+		*(.bss*)
+		*(COMMON)
+		. = ALIGN(4);
+		__bss_end__ = .;
+	} > RAM
+
+	.heap (COPY):
+	{
+		__end__ = .;
+		PROVIDE(end = .);
+		*(.heap*)
+		__HeapLimit = .;
+	} > RAM
+
+	/* .stack_dummy section doesn't contains any symbols. It is only
+	 * used for linker to calculate size of stack sections, and assign
+	 * values to stack symbols later */
+	.stack_dummy (COPY):
+	{
+		*(.stack*)
+	} > RAM
+
+	/* Set stack top to end of RAM, and stack limit move down by
+	 * size of stack_dummy section */
+	__StackTop = ORIGIN(RAM) + LENGTH(RAM);
+	__StackLimit = __StackTop - SIZEOF(.stack_dummy);
+	PROVIDE(__stack = __StackTop);
+
+	__ram_end__ = ORIGIN(RAM) + LENGTH(RAM) -1 ;
+
+	/* Check if data + heap + stack exceeds RAM limit */
+	ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+}
diff --git a/variants/MKRMotorShield/openocd_scripts/SAMD11D14AS.cfg b/variants/MKRMotorShield/openocd_scripts/SAMD11D14AS.cfg
new file mode 100644
index 000000000..2b1d4c72f
--- /dev/null
+++ b/variants/MKRMotorShield/openocd_scripts/SAMD11D14AS.cfg
@@ -0,0 +1,30 @@
+#
+#  Arduino Zero OpenOCD script.
+#
+#  Copyright (c) 2014-2015 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
+#
+
+source [find interface/cmsis-dap.cfg]
+
+# chip name
+set CHIPNAME at91samd11d14as
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/MKRMotorShield/pins_arduino.h b/variants/MKRMotorShield/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/MKRMotorShield/pins_arduino.h
@@ -0,0 +1,21 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+// API compatibility
+#include "variant.h"
+
diff --git a/variants/MKRMotorShield/variant.cpp b/variants/MKRMotorShield/variant.cpp
new file mode 100644
index 000000000..44b5796f8
--- /dev/null
+++ b/variants/MKRMotorShield/variant.cpp
@@ -0,0 +1,128 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 23 November 2017 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+extern "C" {
+
+#if defined PIN_MAP_STANDARD
+const PinDescription g_APinDescription[]=
+{
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+  { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+	{ PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+	{ PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+	{ PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, ADC_Channel5, EXTERNAL_INT_7, GCLK_CCL_NONE },
+  { PORTA,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE }, // Unused
+  { PORTA,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // Unused
+  { PORTA, 10, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_2, GCLK_CCL_NONE }, // Unused
+  { PORTA, 11, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+	{ PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+  { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH6, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+  { PORTA, 17, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH7, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH4, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+	{ PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER), TCC0_CH5, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+	{ PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+	{ PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+  { PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // Unused
+  { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+	{ NOT_A_PORT,  0, PIO_NOT_A_PIN, PER_ATTR_NONE, PIN_ATTR_NONE, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused
+	{ PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+	{ PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SWD IO
+} ;
+#elif defined PIN_MAP_COMPACT
+const PinDescription g_APinDescription[]=
+{
+  { PORTA,  2, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_DAC|PIN_ATTR_DIGITAL|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel0, EXTERNAL_INT_2, GCLK_CCL_NONE },
+  { PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA,  4, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH0, ADC_Channel2, EXTERNAL_INT_4, GCLK_CCL_NONE },
+  { PORTA,  5, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TCC0_CH1, ADC_Channel3, EXTERNAL_INT_5, GCLK_CCL_NONE },
+  { PORTA,  6, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TCC0_CH2, ADC_Channel4, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA,  7, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_ALT|PER_ATTR_SERCOM_ALT), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TCC0_CH3, ADC_Channel5, EXTERNAL_INT_7, GCLK_CCL_NONE },
+  { PORTA,  8, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA,  9, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+  { PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+  { PORTA, 16, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_EXTINT), TC1_CH0, No_ADC_Channel, EXTERNAL_INT_0, GCLK_CCL_NONE },
+  { PORTA, 22, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_6, GCLK_CCL_NONE },
+  { PORTA, 23, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA, 24, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DM
+  { PORTA, 25, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_DIGITAL|PIN_ATTR_COM), NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // USB/DP
+  { PORTA, 28, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // Unused (Reset)
+  { PORTA, 30, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM), TC2_CH0, No_ADC_Channel, EXTERNAL_INT_NONE, GCLK_CCL_NONE }, // SWD CLK
+  { PORTA, 31, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_ALT), (PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC2_CH1, No_ADC_Channel, EXTERNAL_INT_3, GCLK_CCL_NONE }, // SWD IO
+} ;
+#elif defined PIN_MAP_SUPER_COMPACT
+// bootloader only needs BOOT_PIN, LED and WIRE
+const PinDescription g_APinDescription[]=
+{
+  { PORTA,  3, PIO_MULTI, PER_ATTR_DRIVE_STRONG, (PIN_ATTR_ADC|PIN_ATTR_REF|PIN_ATTR_DIGITAL), NOT_ON_TIMER, ADC_Channel1, EXTERNAL_INT_NONE, GCLK_CCL_NONE },
+  { PORTA, 14, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), NOT_ON_TIMER, ADC_Channel6, EXTERNAL_INT_NMI, GCLK_CCL_NONE },
+  { PORTA, 15, PIO_MULTI, (PER_ATTR_DRIVE_STRONG|PER_ATTR_TIMER_STD|PER_ATTR_SERCOM_STD), (PIN_ATTR_ADC|PIN_ATTR_DIGITAL|PIN_ATTR_TIMER|PIN_ATTR_SERCOM|PIN_ATTR_EXTINT), TC1_CH1, ADC_Channel7, EXTERNAL_INT_1, GCLK_CCL_NONE },
+  { PORTA, 27, PIO_MULTI, PER_ATTR_DRIVE_STRONG, PIN_ATTR_DIGITAL, NOT_ON_TIMER, No_ADC_Channel, EXTERNAL_INT_7, GCLK_CCL_NONE }, // Unused
+} ;
+#endif
+
+}
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TC1, TC2 } ;
+
+// Multi-serial objects instantiation
+SERCOM sercom0( SERCOM0 ) ;
+SERCOM sercom1( SERCOM1 ) ;
+SERCOM sercom2( SERCOM2 ) ;
+
+#if defined(TWO_UART)
+Uart Serial2( SERCOM_INSTANCE_SERIAL1, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
+
+void SERCOM1_Handler()
+{
+  Serial2.IrqHandler();
+}
+#endif
+
+#if defined(ONE_UART) || defined(TWO_UART)
+Uart Serial1( SERCOM_INSTANCE_SERIAL2, PIN_SERIAL2_RX, PIN_SERIAL2_TX, PAD_SERIAL2_RX, PAD_SERIAL2_TX ) ;
+
+void SERCOM0_Handler()
+{
+  Serial1.IrqHandler();
+}
+#endif
diff --git a/variants/MKRMotorShield/variant.h b/variants/MKRMotorShield/variant.h
new file mode 100644
index 000000000..ed9a2536b
--- /dev/null
+++ b/variants/MKRMotorShield/variant.h
@@ -0,0 +1,379 @@
+/*
+  Copyright (c) 2014-2015 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
+*/
+
+/*
+ * Modified 9 December 2016 by Justin Mattair
+ *   for MattairTech boards (www.mattairtech.com)
+ *
+ * See README.md for documentation and pin mapping information
+ */
+
+#ifndef _VARIANT_MATTAIRTECH_D11D14AS_
+#define _VARIANT_MATTAIRTECH_D11D14AS_
+
+/* The definitions here need the MattairTech SAMD core >=1.6.8.
+ * The format is different than the stock Arduino SAMD core,
+ * which uses ARDUINO_SAMD_VARIANT_COMPLIANCE instead.
+ */
+#define MATTAIRTECH_ARDUINO_SAMD_VARIANT_COMPLIANCE 10608
+
+/*----------------------------------------------------------------------------
+ *        Clock Configuration
+ *----------------------------------------------------------------------------*/
+
+/** Master clock frequency (also Fcpu frequency) */
+#define VARIANT_MCK             (48000000ul)
+
+/* If CLOCKCONFIG_HS_CRYSTAL is defined, then HS_CRYSTAL_FREQUENCY_HERTZ
+ * must also be defined with the external crystal frequency in Hertz.
+ */
+#define HS_CRYSTAL_FREQUENCY_HERTZ      16000000UL
+
+/* If the PLL is used (CLOCKCONFIG_32768HZ_CRYSTAL, or CLOCKCONFIG_HS_CRYSTAL
+ * defined), then PLL_FRACTIONAL_ENABLED can be defined, which will result in
+ * a more accurate 48MHz output frequency at the expense of increased jitter.
+ */
+//#define PLL_FRACTIONAL_ENABLED
+
+/* If both PLL_FAST_STARTUP and CLOCKCONFIG_HS_CRYSTAL are defined, the crystal
+ * will be divided down to 1MHz - 2MHz, rather than 32KHz - 64KHz, before being
+ * multiplied by the PLL. This will result in a faster lock time for the PLL,
+ * however, it will also result in a less accurate PLL output frequency if the
+ * crystal is not divisible (without remainder) by 1MHz. In this case, define
+ * PLL_FRACTIONAL_ENABLED as well.
+ */
+//#define PLL_FAST_STARTUP
+
+/* The fine calibration value for DFLL open-loop mode is defined here.
+ * The coarse calibration value is loaded from NVM OTP (factory calibration values).
+ */
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (512)
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+#include "sam.h"
+
+#ifdef __cplusplus
+#include "SERCOM.h"
+#include "Uart.h"
+#endif // __cplusplus
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif // __cplusplus
+
+/*----------------------------------------------------------------------------
+ *        Pins
+ *----------------------------------------------------------------------------*/
+
+// Number of pins defined in PinDescription array
+#if !defined(PIN_MAP_STANDARD) && !defined(PIN_MAP_COMPACT) && !defined(PIN_MAP_SUPER_COMPACT)
+#define PIN_MAP_STANDARD
+#endif
+//#define PIN_MAP_COMPACT
+//#define PIN_MAP_SUPER_COMPACT
+
+#if defined PIN_MAP_STANDARD
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (32u)
+#elif defined PIN_MAP_COMPACT
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (18u)
+#elif defined PIN_MAP_SUPER_COMPACT
+  #define NUM_PIN_DESCRIPTION_ENTRIES     (4u)
+#else
+  #error "variant.h: You must set PIN_MAP_STANDARD or PIN_MAP_COMPACT"
+#endif
+
+#define PINS_COUNT           NUM_PIN_DESCRIPTION_ENTRIES
+#define NUM_DIGITAL_PINS     PINS_COUNT
+#define NUM_ANALOG_INPUTS    (8u)
+#define NUM_ANALOG_OUTPUTS   (1u)
+#define analogInputToDigitalPin(p)  (p)
+
+#define digitalPinToPort(P)        ( &(PORT->Group[g_APinDescription[P].ulPort]) )
+#define digitalPinToBitMask(P)     ( 1 << g_APinDescription[P].ulPin )
+//#define analogInPinToBit(P)        ( )
+#define portOutputRegister(port)   ( &(port->OUT.reg) )
+#define portInputRegister(port)    ( &(port->IN.reg) )
+#define portModeRegister(port)     ( &(port->DIR.reg) )
+#define digitalPinHasPWM(P)        ( (g_APinDescription[P].ulPinAttribute & PIN_ATTR_TIMER_PWM) == PIN_ATTR_TIMER_PWM )
+
+/*
+ * digitalPinToTimer(..) is AVR-specific and is not defined for SAMD
+ * architecture. If you need to check if a pin supports PWM you must
+ * use digitalPinHasPWM(..).
+ *
+ * https://github.com/arduino/Arduino/issues/1833
+ */
+// #define digitalPinToTimer(P)
+
+/* LEDs
+ * None of these defines are currently used by the core.
+ */
+
+
+/*
+ * Analog pins
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_A2               (2ul)
+#define PIN_A3               (3ul)
+#define PIN_A4               (4ul)
+#define PIN_A5               (5ul)
+#define PIN_A6               (6ul)
+#define PIN_A7               (7ul)
+#define PIN_A14              (14ul)
+#define PIN_A15              (15ul)
+#define PIN_DAC0             (2ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_A2               (0ul)
+#define PIN_A3               (1ul)
+#define PIN_A4               (2ul)
+#define PIN_A5               (3ul)
+#define PIN_A6               (4ul)
+#define PIN_A7               (5ul)
+#define PIN_A14              (8ul)
+#define PIN_A15              (9ul)
+#define PIN_DAC0             (0ul)
+#elif defined PIN_MAP_SUPER_COMPACT
+#define PIN_A2               (0ul)
+#define PIN_A3               (0ul)
+#define PIN_A4               (0ul)
+#define PIN_A5               (0ul)
+#define PIN_A6               (0ul)
+#define PIN_A7               (0ul)
+#define PIN_A14              (0ul)
+#define PIN_A15              (0ul)
+#define PIN_DAC0             (0ul)
+#endif
+
+static const uint8_t A2   = PIN_A2;
+static const uint8_t A3   = PIN_A3;
+static const uint8_t A4   = PIN_A4;
+static const uint8_t A5   = PIN_A5;
+static const uint8_t A6   = PIN_A6;
+static const uint8_t A7   = PIN_A7;
+static const uint8_t A14  = PIN_A14;
+static const uint8_t A15  = PIN_A15;
+static const uint8_t DAC0 = PIN_DAC0;
+
+#define ADC_RESOLUTION		12
+
+#define REMAP_ANALOG_PIN_ID	while(0)
+// #define REMAP_ANALOG_PIN_ID	if ( ulPin < A0 ) ulPin += A0
+
+/* Set default analog voltage reference */
+#define VARIANT_AR_DEFAULT	AR_DEFAULT
+
+/* Reference voltage pins (define even if not enabled with PIN_ATTR_REF in the PinDescription table) */
+#if defined PIN_MAP_STANDARD
+#define REFA_PIN    (3ul)
+#define REFB_PIN    (4ul)
+#elif defined PIN_MAP_COMPACT
+#define REFA_PIN    (1ul)
+#define REFB_PIN    (2ul)
+#elif defined PIN_MAP_SUPER_COMPACT
+#define REFA_PIN    (0ul)
+#define REFB_PIN    (0ul)
+#endif
+
+
+// The ATN pin may be used in the future as the first SPI chip select.
+// On boards that do not have the Arduino physical form factor, it can to set to any free pin.
+#if defined PIN_MAP_STANDARD
+#define PIN_ATN              (6ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_ATN              (4ul)
+#elif defined PIN_MAP_SUPER_COMPACT
+#define PIN_ATN              (0ul)
+#endif
+static const uint8_t ATN = PIN_ATN;
+
+
+/*
+ * Serial interfaces
+ */
+// Serial1
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL1_RX       (31ul)
+#define PIN_SERIAL1_TX       (30ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL1_RX       (17ul)
+#define PIN_SERIAL1_TX       (16ul)
+#endif
+
+#define PAD_SERIAL1_TX       (UART_TX_PAD_2)
+#define PAD_SERIAL1_RX       (SERCOM_RX_PAD_3)
+#define SERCOM_INSTANCE_SERIAL1       &sercom1
+
+// Serial2
+#if defined PIN_MAP_STANDARD
+#define PIN_SERIAL2_RX       (15ul)
+#define PIN_SERIAL2_TX       (14ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SERIAL2_RX       (9ul)
+#define PIN_SERIAL2_TX       (8ul)
+#endif
+
+#define PAD_SERIAL2_TX       (UART_TX_PAD_0)
+#define PAD_SERIAL2_RX       (SERCOM_RX_PAD_1)
+#define SERCOM_INSTANCE_SERIAL2       &sercom0
+
+
+/*
+ * SPI Interfaces
+ */
+#if defined(ONE_SPI)
+#define SPI_INTERFACES_COUNT 1
+#else
+#define SPI_INTERFACES_COUNT 0
+#endif
+
+#if defined PIN_MAP_STANDARD
+#define PIN_SPI_MISO         (7u)
+#define PIN_SPI_MOSI         (14u)
+#define PIN_SPI_SCK          (15u)
+#define PIN_SPI_SS           (6u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_SPI_MISO         (5u)
+#define PIN_SPI_MOSI         (8u)
+#define PIN_SPI_SCK          (9u)
+#define PIN_SPI_SS           (4u)
+#endif
+
+#if defined(ONE_SPI)
+#define PERIPH_SPI           sercom0
+#define PAD_SPI_TX           SPI_PAD_0_SCK_1
+#define PAD_SPI_RX           SERCOM_RX_PAD_3
+
+static const uint8_t SS	  = PIN_SPI_SS ;	// The SERCOM SS PAD is available on this pin but HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI = PIN_SPI_MOSI ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK  = PIN_SPI_SCK ;
+#endif
+
+/*
+ * Wire Interfaces
+ */
+#if defined(ONE_WIRE)
+#define WIRE_INTERFACES_COUNT 1
+#else
+#define WIRE_INTERFACES_COUNT 0
+#endif
+
+#if defined PIN_MAP_STANDARD
+#define PIN_WIRE_SDA         (14u)
+#define PIN_WIRE_SCL         (15u)
+#elif defined PIN_MAP_COMPACT
+#define PIN_WIRE_SDA         (11u)
+#define PIN_WIRE_SCL         (12u)
+#elif defined PIN_MAP_SUPER_COMPACT
+#define PIN_WIRE_SDA         (1u)
+#define PIN_WIRE_SCL         (2u)
+#endif
+
+#define PERIPH_WIRE          sercom0
+#define WIRE_IT_HANDLER      SERCOM0_Handler
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+
+/*
+ * USB - Define PIN_USB_HOST_ENABLE to assert the defined pin to
+ * PIN_USB_HOST_ENABLE_VALUE during startup. Leave undefined to disable this pin.
+ */
+#if defined PIN_MAP_STANDARD
+#define PIN_USB_DM                      (24ul)
+#define PIN_USB_DP                      (25ul)
+//#define PIN_USB_HOST_ENABLE             (28ul)
+#elif defined PIN_MAP_COMPACT
+#define PIN_USB_DM                      (13ul)
+#define PIN_USB_DP                      (14ul)
+//#define PIN_USB_HOST_ENABLE             (15ul)
+#endif
+
+#define PIN_USB_HOST_ENABLE_VALUE	HIGH
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*----------------------------------------------------------------------------
+ *        Arduino objects - C++ only
+ *----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+
+/*	=========================
+ *	===== SERCOM DEFINITION
+ *	=========================
+*/
+extern SERCOM sercom0;
+extern SERCOM sercom1;
+extern SERCOM sercom2;
+
+extern Uart Serial1;
+extern Uart Serial2;
+
+#endif
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+// SERIAL_PORT_MONITOR seems to be used only by the USB Host library (as of 1.6.5).
+// It normally allows debugging output on the USB programming port, while the USB host uses the USB native port.
+// The programming port is connected to a hardware UART through a USB-Serial bridge (EDBG chip) on the Zero.
+// Boards that do not have the EDBG chip will have to connect a USB-TTL serial adapter to 'Serial' to get
+// the USB Host debugging output.
+#define SERIAL_PORT_MONITOR         Serial1
+// Serial has no physical pins broken out, so it's not listed as HARDWARE port
+#define SERIAL_PORT_HARDWARE        Serial1
+#define SERIAL_PORT_HARDWARE_OPEN   Serial1
+
+// The MT-D11 does not have the EDBG support chip, which provides a USB-UART bridge
+// accessible using Serial (the Arduino serial monitor is normally connected to this).
+// So, the USB virtual serial port (SerialUSB) must be used to communicate with the host.
+// Because most sketches use Serial to print to the monitor, it is aliased to SerialUSB.
+// Remember to use while(!Serial); to wait for a connection before Serial printing.
+
+// When USB CDC is enabled, Serial refers to SerialUSB, otherwise it refers to Serial1.
+#if defined(CDC_ONLY) || defined(CDC_HID) || defined(WITH_CDC)
+#define Serial                      SerialUSB
+#else
+#define Serial                      Serial1
+#endif
+
+#endif /* _VARIANT_ARDUINO_ZERO_ */