diff --git a/boards.txt b/boards.txt
index 6407a21cb..b243ccbd9 100644
--- a/boards.txt
+++ b/boards.txt
@@ -235,7 +235,7 @@ adafruit_metro_m4.build.mcu=cortex-m4
adafruit_metro_m4.build.f_cpu=48000000L
adafruit_metro_m4.build.usb_product="Adafruit Metro M4"
adafruit_metro_m4.build.usb_manufacturer="Adafruit LLC"
-adafruit_metro_m4.build.board=SAMD_METRO_M4
+adafruit_metro_m4.build.board=METRO_M4
adafruit_metro_m4.build.core=arduino
adafruit_metro_m4.build.extra_flags=-D__SAMD51J20A__ -D__SAMD51__ {build.usb_flags}
adafruit_metro_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
@@ -249,3 +249,35 @@ adafruit_metro_m4.bootloader.file=metroM4/samd51_sam_ba.bin
adafruit_metro_m4.compiler.c.elf.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
adafruit_metro_m4.compiler.c.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
adafruit_metro_m4.compiler.cpp.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+# Adafruit Feather M4 (SAMD51)
+# ------------------------------
+adafruit_feather_m4.name=Adafruit Feather M4 (SAMD51)
+adafruit_feather_m4.vid.0=0x239A
+adafruit_feather_m4.pid.0=0x8022
+adafruit_feather_m4.vid.1=0x239A
+adafruit_feather_m4.pid.1=0x0022
+adafruit_feather_m4.upload.tool=bossac
+adafruit_feather_m4.upload.protocol=sam-ba
+adafruit_feather_m4.upload.maximum_size=524288
+adafruit_feather_m4.upload.use_1200bps_touch=true
+adafruit_feather_m4.upload.wait_for_upload_port=true
+adafruit_feather_m4.upload.native_usb=true
+adafruit_feather_m4.build.mcu=cortex-m4
+adafruit_feather_m4.build.f_cpu=48000000L
+adafruit_feather_m4.build.usb_product="Adafruit Feather M4"
+adafruit_feather_m4.build.usb_manufacturer="Adafruit LLC"
+adafruit_feather_m4.build.board=FEATHER_M4
+adafruit_feather_m4.build.core=arduino
+adafruit_feather_m4.build.extra_flags=-D__SAMD51G19A__ -D__SAMD51__ {build.usb_flags}
+adafruit_feather_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_feather_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_feather_m4.build.variant=feather_m4
+adafruit_feather_m4.build.variant_system_lib=
+adafruit_feather_m4.build.vid=0x239A
+adafruit_feather_m4.build.pid=0x8022
+adafruit_feather_m4.bootloader.tool=openocd
+adafruit_feather_m4.bootloader.file=metroM4/samd51_sam_ba.bin
+adafruit_feather_m4.compiler.c.elf.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
+adafruit_feather_m4.compiler.c.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
+adafruit_feather_m4.compiler.cpp.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
diff --git a/bootloaders/metroM4/.vs/samdx1_sam_ba/v14/.atsuo b/bootloaders/metroM4/.vs/samdx1_sam_ba/v14/.atsuo
index 1637c3d06..aeb609e9d 100644
Binary files a/bootloaders/metroM4/.vs/samdx1_sam_ba/v14/.atsuo and b/bootloaders/metroM4/.vs/samdx1_sam_ba/v14/.atsuo differ
diff --git a/bootloaders/metroM4/Makefile b/bootloaders/metroM4/Makefile
index 63cec5e78..62898e82b 100644
--- a/bootloaders/metroM4/Makefile
+++ b/bootloaders/metroM4/Makefile
@@ -57,11 +57,11 @@ SIZE=$(ARM_GCC_PATH)size
# -----------------------------------------------------------------------------
# Boards definitions
-BOARD_ID?=METRO_M4
+BOARD_ID?=FEATHER_M4
# -----------------------------------------------------------------------------
# Compiler options
-CFLAGS_EXTRA=-D__SAMD51J20A__ -DBOARD_ID_$(BOARD_ID)
+CFLAGS_EXTRA=-D__SAMD51G19A__ -DBOARD_ID_$(BOARD_ID)
CFLAGS=-mthumb -mcpu=cortex-m4 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500
ifdef DEBUG
CFLAGS+=-g3 -O1 -DDEBUG=1
diff --git a/bootloaders/metroM4/board_definitions.h b/bootloaders/metroM4/board_definitions.h
index 6b23ee087..e350d4864 100644
--- a/bootloaders/metroM4/board_definitions.h
+++ b/bootloaders/metroM4/board_definitions.h
@@ -19,6 +19,8 @@
#if defined(BOARD_ID_METRO_M4)
#include "board_definitions_metro_m4.h"
+#elif defined(BOARD_ID_FEATHER_M4)
+ #include "board_definitions_feather_m4.h"
#else
#error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
#endif
diff --git a/bootloaders/metroM4/board_definitions_feather_m4.h b/bootloaders/metroM4/board_definitions_feather_m4.h
new file mode 100644
index 000000000..b43ed82c9
--- /dev/null
+++ b/bootloaders/metroM4/board_definitions_feather_m4.h
@@ -0,0 +1,82 @@
+/*
+ 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_
+
+/*
+ * USB device definitions
+ */
+#define STRING_PRODUCT "Feather M4"
+#define USB_VID_HIGH 0x23
+#define USB_VID_LOW 0x9A
+#define USB_PID_HIGH 0x00
+#define USB_PID_LOW 0x22
+
+/*
+ * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
+ * quickly tapping two times on the reset button.
+ * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
+ * be touched from the loaded application.
+ */
+#define BOOT_DOUBLE_TAP_ADDRESS (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_DATA (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
+
+/*
+ * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
+ * pin is tied LOW.
+ */
+//#define BOOT_LOAD_PIN PIN_PA21 // Pin 7
+//#define BOOT_LOAD_PIN PIN_PA15 // Pin 5
+
+#define GPIO(port, pin) ((((port)&0x7u) << 5) + ((pin)&0x1Fu))
+
+#define BOOK_USART_MASK APBAMASK
+#define BOOT_USART_MODULE SERCOM0
+#define BOOT_USART_BUS_CLOCK_INDEX MCLK_APBAMASK_SERCOM0
+#define BOOT_GCLK_ID_CORE SERCOM0_GCLK_ID_CORE
+#define BOOT_GCLK_ID_SLOW SERCOM0_GCLK_ID_SLOW
+#define BOOT_USART_PAD_SETTINGS UART_RX_PAD3_TX_PAD2
+#define BOOT_USART_PAD3 PINMUX_UNUSED
+#define BOOT_USART_PAD2 PINMUX_UNUSED
+
+#define BOOT_USART_PAD1 PINMUX_PA10C_SERCOM0_PAD2
+#define BOOT_USART_PAD0 PINMUX_PA11C_SERCOM0_PAD3
+
+/* Master clock frequency */
+#define CPU_FREQUENCY (48000000ul)
+#define VARIANT_MCK CPU_FREQUENCY
+
+/* Frequency of the board main oscillator */
+#define VARIANT_MAINOSC (32768ul)
+
+/* Calibration values for DFLL48 pll */
+#define NVM_SW_CALIB_DFLL48M_COARSE_VAL (58)
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL (64)
+
+#define BOARD_LED_PORT (0)
+#define BOARD_LED_PIN (17)
+
+#define BOARD_LEDRX_PORT (1)
+#define BOARD_LEDRX_PIN (3)
+
+#define BOARD_LEDTX_PORT (0)
+#define BOARD_LEDTX_PIN (27)
+
+#endif // _BOARD_DEFINITIONS_H_
diff --git a/bootloaders/metroM4/board_definitions_metro_m4.h b/bootloaders/metroM4/board_definitions_metro_m4.h
index f6af2b839..c75740bd9 100644
--- a/bootloaders/metroM4/board_definitions_metro_m4.h
+++ b/bootloaders/metroM4/board_definitions_metro_m4.h
@@ -19,7 +19,6 @@
#ifndef _BOARD_DEFINITIONS_H_
#define _BOARD_DEFINITIONS_H_
-
/*
* USB device definitions
*/
diff --git a/bootloaders/metroM4/samd51_sam_ba.bin b/bootloaders/metroM4/samd51_sam_ba.bin
index 6049ba8be..a21a64446 100644
Binary files a/bootloaders/metroM4/samd51_sam_ba.bin and b/bootloaders/metroM4/samd51_sam_ba.bin differ
diff --git a/bootloaders/metroM4/samd51_sam_ba.cproj b/bootloaders/metroM4/samd51_sam_ba.cproj
index ed41ecc5e..c33505a68 100644
--- a/bootloaders/metroM4/samd51_sam_ba.cproj
+++ b/bootloaders/metroM4/samd51_sam_ba.cproj
@@ -5,7 +5,7 @@
7.0
com.Atmel.ARMGCC.C
dce6c7e3-ee26-4d79-826b-08594b9ad897
- ATSAMD51J20A
+ ATSAMD51G19A
none
Executable
C
@@ -41,7 +41,7 @@
com.atmel.avrdbg.tool.edbg
00000000EZE000006352
- 0x60060004
+ 0x60060007
SWD
@@ -133,6 +133,9 @@
compile
board_definitions.h
+
+ compile
+
compile
diff --git a/bootloaders/metroM4/samd51_sam_ba.elf b/bootloaders/metroM4/samd51_sam_ba.elf
index a3fba7e2d..2a9ba83d8 100644
Binary files a/bootloaders/metroM4/samd51_sam_ba.elf and b/bootloaders/metroM4/samd51_sam_ba.elf differ
diff --git a/bootloaders/metroM4/samd51_sam_ba.hex b/bootloaders/metroM4/samd51_sam_ba.hex
index b50059d58..961fd8818 100644
--- a/bootloaders/metroM4/samd51_sam_ba.hex
+++ b/bootloaders/metroM4/samd51_sam_ba.hex
@@ -8,12 +8,12 @@
:1000700000800648036813B1054B03B1984708BDDB
:1000800000000000041C0000600000205800002058
:10009000000000001A4B1B7813F0FF0F0AD1194B18
-:1000A0001A78194909780A44D2B21A704FF400122A
+:1000A0001A78194909780A44D2B21A704FF400320A
:1000B000164BDA61124B1A780132D2B21A70114B18
:1000C0001B78DBB2F02B04D80E4B1B78DBB2092B6C
:1000D0000AD80D4B1A785242D2B21A70094A1178D6
:1000E0001B780B44DBB21370054B1A78054B1B7859
-:1000F000D2B29A4203D14FF40012044BDA61704736
+:1000F000D2B29A4203D14FF40032044BDA61704716
:100100007800002001000020000000200080004155
:1001100010B4C36913F0020FFBD104686FF34104FC
:100120000460C36913F0010FFBD1046844F00104BB
@@ -114,8 +114,8 @@
:100710002D4B19602E4B013BFDD100212A4B196056
:10072000254B1B6883F3088822F07F02294B9A60CF
:10073000234B1B681B681847FFF708FF62B600F0E1
-:10074000D1FE00F055F80546234B4FF400129A6095
-:100750004022C3F88820C3F898204FF000629A60C6
+:10074000D1FE00F055F80546234B4FF400329A6075
+:100750000822C3F88820C3F898204FF000629A60FE
:100760009A611E4B40F2E7325A60C021194A82F862
:10077000231000229A6007221A60194C0126AB68E8
:100780002846984700B12670237813F0FF0F05D054
@@ -173,10 +173,10 @@
:100AC000C2F34012C2F30012164B1A803068154967
:100AD00002220023FFF754FCFEE020460121FFF72D
:100AE000DDFCF9E020460121FFF7D8FCF4E02046C8
-:100AF000FFF7E4FCF0E000BF94000020830000203A
-:100B0000860000207C000020800000207E00002065
+:100AF000FFF7E4FCF0E000BF94000020810000203C
+:100B000084000020860000207C0000207E00002061
:100B10004C190000040000203019000034190000B6
-:100B20004019000084000020820000206B4B1988CF
+:100B20004019000082000020800000206B4B1988D3
:100B300089B221F07F01C9B2694A11701A8802F0A6
:100B40000F021A80674B1B889BB2DBB9634B1B8873
:100B50009BB2BBB1614B1B889BB2032B12D8604B7D
@@ -203,8 +203,8 @@
:100CA0000DFC19E03068104B1B889BB2082B9DBFD0
:100CB0000D4B1A8892B208220C490023FFF760FB03
:100CC0000AE0084B1B8873712046FFF7F7FB03E02F
-:100CD00020460121FFF7E2FB03B0F0BD80000020B9
-:100CE000820000207C0000207E00002048000020C0
+:100CD00020460121FFF7E2FB03B0F0BD7C000020BD
+:100CE00080000020860000207E00002048000020B8
:100CF00000B583B002A941F8040D054B1868012224
:100D00001346FFF73DFB012003B05DF804FB00BF75
:100D10001802002000B583B0054B18680DF10701DB
@@ -238,7 +238,7 @@
:100ED00043681847704700BF8C0200200E4B1B88E8
:100EE0009BB24BB10C4A1388013B9BB213801BB9D8
:100EF0004FF00062094B9A61094B1B889BB24BB1C2
-:100F0000074A1388013B9BB213801BB94022034B55
+:100F0000074A1388013B9BB213801BB90822034B8D
:100F1000C3F89820704700BF900000200080004177
:100F20008E0000202DE9F0438BB002AC894D0FCD2F
:100F30000FC495E80F0084E80F00874A9368C3F355
@@ -246,7 +246,7 @@
:100F5000926892B282490A6002FB03F381490B60F6
:100F60000022814B1A607A22804B1A707A4C7B4D9A
:100F70007F4B1B681B697F4840219847034630B16F
-:100F800040217D4AC2F8941064217C4A11807C4A39
+:100F800008217D4AC2F8941064217C4A11807C4A71
:100F9000136078497B4A116000217B4A1160002B65
:100FA000E6D0784B1B681B78FF2B00F06682232B62
:100FB00040F00482754B1B7813F0FF0F05D06C4B8B
@@ -258,7 +258,7 @@
:1010100011605C4A116819441160604A13705A4BA0
:101020001A68013A1A60574B1A68013A1A605B4B0A
:101030001B78584A11688B420ED24D4A1268926949
-:1010400049480068C91A904730B140224A4BC3F85A
+:1010400049480068C91A904730B108224A4BC3F892
:1010500094206422494B1A8000BF9DE1522B0FD18E
:10106000434B1B685B69404A10684A4A11689847BD
:101070004FF00062404B5A616422494B1A808BE169
@@ -402,14 +402,14 @@
:10191000181A013870470000F8B500BFF8BC08BCC1
:101920009E467047F8B500BFF8BC08BC9E4670479D
:101930000403090441726475696E6F204C4C4300C6
-:101940004D6574726F204D340000000012010002DA
-:10195000020000409A232000000201020001000062
+:1019400046656174686572204D3400001201000222
+:10195000020000409A232200000201020001000060
:1019600008000000100000002000000040000000FF
:1019700080000000000100000002000000040000E0
:1019800099150000BD150000AD150000F11500000F
:101990000D160000B1160000DD170000322E3000D9
:1019A0000A0D000076000000200000004F63742044
-:1019B000203420323031370031303A35353A313049
+:1019B000313320323031370031353A32343A33392D
:1019C00000000000580A0D00590A0D005A000000DE
:1019D000230A0D003E000000F10C0000150D000070
:1019E000350D0000550D0000710D0000550D000073
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index eb50264fb..9312cfc55 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -435,9 +435,11 @@ void analogWrite(uint32_t pin, uint32_t value)
TCC0_GCLK_ID,
TCC1_GCLK_ID,
TCC2_GCLK_ID,
+ #if defined(TCC3)
TCC3_GCLK_ID,
TCC4_GCLK_ID,
TC5_GCLK_ID,
+ #endif
};
GCLK->PCHCTRL[GCLK_CLKCTRL_IDs[tcNum]].reg = GCLK_PCHCTRL_GEN_GCLK0_Val | (1 << GCLK_PCHCTRL_CHEN_Pos); //use clock generator 0
diff --git a/variants/feather_m4/debug_scripts/variant.gdb b/variants/feather_m4/debug_scripts/variant.gdb
new file mode 100644
index 000000000..3c37ffde2
--- /dev/null
+++ b/variants/feather_m4/debug_scripts/variant.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 at91samd21g18" -f target/at91samdXX.cfg -c "gdb_port pipe; log_output openocd.log"
diff --git a/variants/feather_m4/libsamd21_qtouch_gcc.a b/variants/feather_m4/libsamd21_qtouch_gcc.a
new file mode 100644
index 000000000..5998b5820
Binary files /dev/null and b/variants/feather_m4/libsamd21_qtouch_gcc.a differ
diff --git a/variants/feather_m4/linker_scripts/gcc/flash_with_bootloader.ld b/variants/feather_m4/linker_scripts/gcc/flash_with_bootloader.ld
new file mode 100644
index 000000000..1bdea69ae
--- /dev/null
+++ b/variants/feather_m4/linker_scripts/gcc/flash_with_bootloader.ld
@@ -0,0 +1,216 @@
+/*
+ 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 = 0x00080000-0x4000 /* First 16KB used by bootloader */
+ RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000
+}
+
+/* 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)
+ *(.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/feather_m4/linker_scripts/gcc/flash_without_bootloader.ld b/variants/feather_m4/linker_scripts/gcc/flash_without_bootloader.ld
new file mode 100644
index 000000000..9c0c4e06d
--- /dev/null
+++ b/variants/feather_m4/linker_scripts/gcc/flash_without_bootloader.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 = 0x00080000
+ RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000
+}
+
+/* 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)
+ *(.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/feather_m4/openocd_scripts/arduino_zero.cfg b/variants/feather_m4/openocd_scripts/arduino_zero.cfg
new file mode 100644
index 000000000..36c65c32d
--- /dev/null
+++ b/variants/feather_m4/openocd_scripts/arduino_zero.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 at91samd21g18
+set ENDIAN little
+
+# choose a port here
+set telnet_port 0
+
+source [find target/at91samdXX.cfg]
diff --git a/variants/feather_m4/pins_arduino.h b/variants/feather_m4/pins_arduino.h
new file mode 100644
index 000000000..db0e40c3d
--- /dev/null
+++ b/variants/feather_m4/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/feather_m4/variant.cpp b/variants/feather_m4/variant.cpp
new file mode 100644
index 000000000..fa0e8c8a2
--- /dev/null
+++ b/variants/feather_m4/variant.cpp
@@ -0,0 +1,227 @@
+/*
+ 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
+*/
+/*
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * + Pin number + ZERO Board pin | PIN | Label/Name | Comments (* is for default peripheral in use)
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ * | | 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] SERCOM2/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[0] *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]
+ * +------------+------------------+--------+-----------------+--------------------------------------------------------------------------------------------------------
+ */
+
+
+#include "variant.h"
+
+/*
+ * Pins descriptions
+ */
+const PinDescription g_APinDescription[]=
+{
+ // 0..13 - Digital pins
+ // ----------------------
+ // 0/1 - SERCOM/UART (Serial1)
+ { PORTA, 11, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG), ADC_Channel11, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // RX: SERCOM0/PAD[3]
+ { PORTA, 10, PIO_SERCOM, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG), ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, 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|PIN_ATTR_ANALOG), ADC_Channel9, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
+ { PORTA, 8, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel8, 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_ALT), 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 },
+
+ // Digital High
+ { PORTA, 6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel8, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
+ { PORTA, 7, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel7, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // 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_ALT), No_ADC_Channel, PWM0_CH3, TCC0_CH3, EXTERNAL_INT_3 }, // TCC0/WO[3]
+
+ // 13 (LED)
+ { PORTA, 17, PIO_PWM, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_1 }, // TCC2/WO[1]
+
+ // 14..19 - Analog pins
+ // --------------------
+ { PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
+ { PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
+ { PORTB, 8, PIO_ANALOG, (PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel2, PWM4_CH0, TC4_CH0, EXTERNAL_INT_8 },
+ { PORTB, 9, PIO_ANALOG, (PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel3, PWM4_CH1, TC4_CH1, EXTERNAL_INT_9 },
+ { PORTA, 4, PIO_ANALOG, 0, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 },
+ { PORTB, 2, PIO_ANALOG, 0, ADC_Channel14, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
+
+
+ // Extra Analog pins! 20..25
+ { PORTA, 6, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel6, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // A6 same as D8
+ { PORTA, 7, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel7, PWM1_CH1, TCC1_CH1, EXTERNAL_INT_7 }, // A7 same as D9
+ { PORTA, 8, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel8, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI }, // A8 same as D4
+ { PORTA, 9, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel9, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // A9 same as D5
+ { PORTA, 11, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG), ADC_Channel11, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 }, // A10 same as D0
+ { PORTA, 10, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG), ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_10 }, // A11 same as D1
+
+ // 26..27 I2C pins (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]
+
+ // 28..30 - 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]
+
+ // 31..32 - RX/TX LEDS (PB03/PA27) -- unused
+ // --------------------
+ { 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
+
+ // 33..35 - USB
+ // --------------------
+ { PORTA, 28, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB Host enable DOES NOT EXIST ON THIS BOARD
+ { 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
+
+ // 36..38 - Secondary SPI
+ // ----------------------
+ { PORTA, 14, PIO_SERCOM, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SPI Flash MISO SERCOM2.2
+ { PORTA, 8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SPI Flash MOSI SERCOM2.0
+ { PORTA, 9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL), No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // SPI Flash SCK SERCOM2.1
+
+ // 39 Secondary SPI SS
+ { PORTA, 13, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_13 }, // SPI Flash SS
+
+ // 40 same as #8 - Internal NeoPixel (to match Metro M0)
+ { PORTA, 6, PIO_TIMER, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER|PIN_ATTR_ANALOG), ADC_Channel6, PWM1_CH0, TCC1_CH0, EXTERNAL_INT_6 }, // TCC1/WO[0]
+
+ // 41 (AREF)
+ { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // DAC/VREFP
+
+ // ----------------------
+ // 42 - 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/VOUT0
+ { PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // DAC/VOUT1
+} ;
+
+const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM]={ TCC0, TCC1, TCC2} ;
+
+// 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_0_Handler()
+{
+ Serial1.IrqHandler();
+}
+void SERCOM0_1_Handler()
+{
+ Serial1.IrqHandler();
+}
+void SERCOM0_2_Handler()
+{
+ Serial1.IrqHandler();
+}
+void SERCOM0_3_Handler()
+{
+ Serial1.IrqHandler();
+}
diff --git a/variants/feather_m4/variant.h b/variants/feather_m4/variant.h
new file mode 100644
index 000000000..726efe1cd
--- /dev/null
+++ b/variants/feather_m4/variant.h
@@ -0,0 +1,245 @@
+/*
+ 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
+*/
+
+#ifndef _VARIANT_MERTO_M4_
+#define _VARIANT_MERTO_M4_
+
+// The definitions here needs a SAMD core >=1.6.10
+#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10610
+
+/*----------------------------------------------------------------------------
+ * Definitions
+ *----------------------------------------------------------------------------*/
+
+/** Frequency of the board main oscillator */
+#define VARIANT_MAINOSC (32768ul)
+
+/** Master clock frequency */
+#define VARIANT_MCK (120000000ul)
+
+/*----------------------------------------------------------------------------
+ * 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 (26u)
+#define NUM_DIGITAL_PINS (20u)
+#define NUM_ANALOG_INPUTS (8u)
+#define NUM_ANALOG_OUTPUTS (1u)
+#define analogInputToDigitalPin(p) ((p < 6u) ? (p) + 14u : -1)
+
+#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)
+
+// LEDs
+#define PIN_LED_13 (13u)
+#define PIN_LED_RXL (29u)
+#define PIN_LED_TXL (30u)
+#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 (14ul)
+#define PIN_A1 (PIN_A0 + 1)
+#define PIN_A2 (PIN_A0 + 2)
+#define PIN_A3 (PIN_A0 + 3)
+#define PIN_A4 (PIN_A0 + 4)
+#define PIN_A5 (PIN_A0 + 5)
+#define PIN_A6 (PIN_A0 + 6)
+#define PIN_A7 (PIN_A0 + 7)
+#define PIN_A8 (PIN_A0 + 8)
+#define PIN_A9 (PIN_A0 + 9)
+#define PIN_DAC0 (14ul)
+#define PIN_DAC1 PIN_A1
+
+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 DAC0 = PIN_DAC0;
+static const uint8_t DAC1 = PIN_DAC1;
+
+#define ADC_RESOLUTION 12
+
+// Other pins
+#define PIN_ATN (38ul)
+static const uint8_t ATN = PIN_ATN;
+
+/*
+ * Serial interfaces
+ */
+
+// Serial1
+#define PIN_SERIAL1_RX (0ul)
+#define PIN_SERIAL1_TX (1ul)
+#define PAD_SERIAL1_TX (UART_TX_PAD_0)
+#define PAD_SERIAL1_RX (SERCOM_RX_PAD_3)
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 2
+
+#define PIN_SPI_MISO (28u)
+#define PIN_SPI_MOSI (30u)
+#define PIN_SPI_SCK (29u)
+#define PERIPH_SPI sercom4
+#define PAD_SPI_TX SPI_PAD_0_SCK_1
+#define PAD_SPI_RX SERCOM_RX_PAD_3
+
+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 ;
+static const uint8_t MISO = PIN_SPI_MISO ;
+static const uint8_t SCK = PIN_SPI_SCK ;
+
+//TODO: we may have to move SPI1 (SPI flash) to another sercom
+#define PIN_SPI1_MISO (34u)
+#define PIN_SPI1_MOSI (35u)
+#define PIN_SPI1_SCK (36u)
+#define PERIPH_SPI1 sercom5
+#define PAD_SPI1_TX SPI_PAD_0_SCK_1
+#define PAD_SPI1_RX SERCOM_RX_PAD_3
+
+static const uint8_t SS1 = 39 ; // HW SS isn't used. Set here only for reference.
+static const uint8_t MOSI1 = PIN_SPI_MOSI ;
+static const uint8_t MISO1 = PIN_SPI_MISO ;
+static const uint8_t SCK1 = PIN_SPI_SCK ;
+
+
+/*
+ * Wire Interfaces
+ */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (24u)
+#define PIN_WIRE_SCL (25u)
+#define PERIPH_WIRE sercom5
+#define WIRE_IT_HANDLER SERCOM5_Handler
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+/*
+ * USB
+ */
+#define PIN_USB_HOST_ENABLE (31ul)
+#define PIN_USB_DM (32ul)
+#define PIN_USB_DP (33ul)
+
+/*
+ * I2S Interfaces
+ */
+#define I2S_INTERFACES_COUNT 1
+
+#define I2S_DEVICE 0
+#define I2S_CLOCK_GENERATOR 3
+
+//TODO: these
+#define PIN_I2S_SD (13u)
+#define PIN_I2S_SCK (3u)
+#define PIN_I2S_FS (12u)
+
+#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 Serial
+#define SERIAL_PORT_MONITOR Serial
+// 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
+
+#endif /* _VARIANT_MERTO_M4_ */
+