41 changed files with 117 additions and 2646 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,95 +0,0 @@
-name: Bug Report
-description: Report a problem
-labels: 'Bug'
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this bug report!
-        It's okay to leave some blank if it doesn't apply to your problem.
-
-  - type: dropdown
-    attributes:
-      label: Operating System
-      options:
-              - Linux
-              - MacOS
-              - RaspberryPi OS
-              - Windows 7
-              - Windows 10
-              - Windows 11
-              - Others
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Arduino IDE version
-      placeholder: e.g Arduino 1.8.15
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Board
-      placeholder: e.g Metro M4 Express
-    validations:
-      required: true
-      
-  - type: input
-    attributes:
-      label: ArduinoCore version
-      description: Can be found under "Board Manager" menu
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Sketch as ATTACHED TXT
-      placeholder: |
-        e.g examples/MassStorage/msc_ramdisk.
-        If it is custom sketch, please provide it as **ATTACHED** files or link to it.
-        Pasting raw long code that hurts readability can get your issue **closed**
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Compiled Log as ATTACHED TXT
-      placeholder: |
-        Compiled log from Arduino IDE as **ATTACHED** txt.
-        Pasting raw long log that hurts readability can get your issue **closed**
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: What happened ?
-      placeholder: A clear and concise description of what the bug is.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: How to reproduce ?
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. See error      
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Debug Log as ATTACHED TXT
-      placeholder: |
-        Debug log where the issue occurred as attached txt file, best with comments to explain the actual events.
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Screenshots
-      description: If applicable, add screenshots to help explain your problem.
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Adafruit Support Forum
-    url: https://forums.adafruit.com
-    about: If you have other questions or need help, post it here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: Feature
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/workflows/githubci.yml
+++ b/.github/workflows/githubci.yml
@ -9,25 +9,29 @@ jobs:
      matrix:
        board:
          # Alphabetical order
-          - 'circuitplayground_m0'
-          - 'feather_m4_can'
-          - 'hallowing'
-          - 'hallowing_m4'
          - 'metro_m0'
+          - 'hallowing'
+          - 'circuitplayground_m0'
          - 'metro_m4'
          - 'pybadge_m4'
          - 'pygamer_m4'
+          - 'hallowing_m4'
          - 'pyportal_m4'
          - 'pyportal_m4_titano'
-          # with TinyUSB
+          - 'feather_m4_can'
          - 'metro_m0:usbstack=tinyusb'
          - 'metro_m4:speed=120,usbstack=tinyusb'

    runs-on: ubuntu-latest
    
    steps:
+    - name: Setup Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+        
    - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
      with:
        submodules: 'true'

--- a/boards.txt
+++ b/boards.txt
@ -817,192 +817,6 @@ adafruit_sht4xtrinkey_m0.menu.debug.on=On
 adafruit_sht4xtrinkey_m0.menu.debug.on.build.flags.debug=-g


-# -----------------------------------
-# Adafruit Pixel Trinkey M0 (SAMD21)
-# -----------------------------------
-adafruit_pixeltrinkey_m0.name=Adafruit Pixel Trinkey M0 (SAMD21)
-
-# VID/PID for Bootloader, Arduino & CircuitPython
-adafruit_pixeltrinkey_m0.vid.0=0x239A
-adafruit_pixeltrinkey_m0.pid.0=0x8155
-adafruit_pixeltrinkey_m0.vid.1=0x239A
-adafruit_pixeltrinkey_m0.pid.1=0x0155
-adafruit_pixeltrinkey_m0.vid.2=0x239A
-adafruit_pixeltrinkey_m0.pid.2=0x8156
-
-# Upload
-adafruit_pixeltrinkey_m0.upload.tool=bossac18
-adafruit_pixeltrinkey_m0.upload.protocol=sam-ba
-adafruit_pixeltrinkey_m0.upload.maximum_size=262144
-adafruit_pixeltrinkey_m0.upload.offset=0x2000
-adafruit_pixeltrinkey_m0.upload.use_1200bps_touch=true
-adafruit_pixeltrinkey_m0.upload.wait_for_upload_port=true
-adafruit_pixeltrinkey_m0.upload.native_usb=true
-
-# Build
-adafruit_pixeltrinkey_m0.build.mcu=cortex-m0plus
-adafruit_pixeltrinkey_m0.build.f_cpu=48000000L
-adafruit_pixeltrinkey_m0.build.usb_product="Pixel Trinkey M0"
-adafruit_pixeltrinkey_m0.build.usb_manufacturer="Adafruit"
-adafruit_pixeltrinkey_m0.build.board=PIXELTRINKEY_M0
-adafruit_pixeltrinkey_m0.build.core=arduino
-adafruit_pixeltrinkey_m0.build.extra_flags=-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_PIXELTRINKEY_M0 -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS {build.usb_flags}
-adafruit_pixeltrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_pixeltrinkey_m0.build.openocdscript=scripts/openocd/daplink_samd21.cfg
-adafruit_pixeltrinkey_m0.build.variant=pixeltrinkey_m0
-adafruit_pixeltrinkey_m0.build.variant_system_lib=
-adafruit_pixeltrinkey_m0.build.vid=0x239A
-adafruit_pixeltrinkey_m0.build.pid=0x8155
-adafruit_pixeltrinkey_m0.bootloader.tool=openocd
-adafruit_pixeltrinkey_m0.bootloader.file=pixeltrinkey_m0/bootloader-pixeltrinkey_m0.bin
-
-# Menu: Optimization
-adafruit_pixeltrinkey_m0.menu.opt.small=Small (-Os) (standard)
-adafruit_pixeltrinkey_m0.menu.opt.small.build.flags.optimize=-Os
-adafruit_pixeltrinkey_m0.menu.opt.fast=Fast (-O2)
-adafruit_pixeltrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
-adafruit_pixeltrinkey_m0.menu.opt.faster=Faster (-O3)
-adafruit_pixeltrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
-adafruit_pixeltrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
-adafruit_pixeltrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
-adafruit_pixeltrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
-adafruit_pixeltrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
-
-# Menu: USB Stack
-adafruit_pixeltrinkey_m0.menu.usbstack.arduino=Arduino
-adafruit_pixeltrinkey_m0.menu.usbstack.tinyusb=TinyUSB
-adafruit_pixeltrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
-
-# Menu: Debug
-adafruit_pixeltrinkey_m0.menu.debug.off=Off
-adafruit_pixeltrinkey_m0.menu.debug.on=On
-adafruit_pixeltrinkey_m0.menu.debug.on.build.flags.debug=-g
-
-
-# -----------------------------------
-# Adafruit TRRS Trinkey M0 (SAMD21)
-# -----------------------------------
-adafruit_TRRStrinkey_m0.name=Adafruit TRRS Trinkey M0 (SAMD21)
-
-# VID/PID for Bootloader, Arduino & CircuitPython
-adafruit_TRRStrinkey_m0.vid.0=0x239A
-adafruit_TRRStrinkey_m0.pid.0=0x8157
-adafruit_TRRStrinkey_m0.vid.1=0x239A
-adafruit_TRRStrinkey_m0.pid.1=0x0157
-adafruit_TRRStrinkey_m0.vid.2=0x239A
-adafruit_TRRStrinkey_m0.pid.2=0x8158
-
-# Upload
-adafruit_TRRStrinkey_m0.upload.tool=bossac18
-adafruit_TRRStrinkey_m0.upload.protocol=sam-ba
-adafruit_TRRStrinkey_m0.upload.maximum_size=262144
-adafruit_TRRStrinkey_m0.upload.offset=0x2000
-adafruit_TRRStrinkey_m0.upload.use_1200bps_touch=true
-adafruit_TRRStrinkey_m0.upload.wait_for_upload_port=true
-adafruit_TRRStrinkey_m0.upload.native_usb=true
-
-# Build
-adafruit_TRRStrinkey_m0.build.mcu=cortex-m0plus
-adafruit_TRRStrinkey_m0.build.f_cpu=48000000L
-adafruit_TRRStrinkey_m0.build.usb_product="TRRS Trinkey M0"
-adafruit_TRRStrinkey_m0.build.usb_manufacturer="Adafruit"
-adafruit_TRRStrinkey_m0.build.board=TRRSTRINKEY_M0
-adafruit_TRRStrinkey_m0.build.core=arduino
-adafruit_TRRStrinkey_m0.build.extra_flags=-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_TRRSTRINKEY_M0 -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS {build.usb_flags}
-adafruit_TRRStrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_TRRStrinkey_m0.build.openocdscript=scripts/openocd/daplink_samd21.cfg
-adafruit_TRRStrinkey_m0.build.variant=trrstrinkey_m0
-adafruit_TRRStrinkey_m0.build.variant_system_lib=
-adafruit_TRRStrinkey_m0.build.vid=0x239A
-adafruit_TRRStrinkey_m0.build.pid=0x8157
-adafruit_TRRStrinkey_m0.bootloader.tool=openocd
-adafruit_TRRStrinkey_m0.bootloader.file=trrstrinkey_m0/bootloader-TRRStrinkey_m0.bin
-
-# Menu: Optimization
-adafruit_TRRStrinkey_m0.menu.opt.small=Small (-Os) (standard)
-adafruit_TRRStrinkey_m0.menu.opt.small.build.flags.optimize=-Os
-adafruit_TRRStrinkey_m0.menu.opt.fast=Fast (-O2)
-adafruit_TRRStrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
-adafruit_TRRStrinkey_m0.menu.opt.faster=Faster (-O3)
-adafruit_TRRStrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
-adafruit_TRRStrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
-adafruit_TRRStrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
-adafruit_TRRStrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
-adafruit_TRRStrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
-
-# Menu: USB Stack
-adafruit_TRRStrinkey_m0.menu.usbstack.arduino=Arduino
-adafruit_TRRStrinkey_m0.menu.usbstack.tinyusb=TinyUSB
-adafruit_TRRStrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
-
-# Menu: Debug
-adafruit_TRRStrinkey_m0.menu.debug.off=Off
-adafruit_TRRStrinkey_m0.menu.debug.on=On
-adafruit_TRRStrinkey_m0.menu.debug.on.build.flags.debug=-g
-
-
-# -----------------------------------
-# Adafruit Thumbstick Trinkey M0 (SAMD21)
-# -----------------------------------
-adafruit_thumbsticktrinkey_m0.name=Adafruit Thumbstick Trinkey M0 (SAMD21)
-
-# VID/PID for Bootloader, Arduino & CircuitPython
-adafruit_thumbsticktrinkey_m0.vid.0=0x239A
-adafruit_thumbsticktrinkey_m0.pid.0=0x8159
-adafruit_thumbsticktrinkey_m0.vid.1=0x239A
-adafruit_thumbsticktrinkey_m0.pid.1=0x0159
-adafruit_thumbsticktrinkey_m0.vid.2=0x239A
-adafruit_thumbsticktrinkey_m0.pid.2=0x8160
-
-# Upload
-adafruit_thumbsticktrinkey_m0.upload.tool=bossac18
-adafruit_thumbsticktrinkey_m0.upload.protocol=sam-ba
-adafruit_thumbsticktrinkey_m0.upload.maximum_size=262144
-adafruit_thumbsticktrinkey_m0.upload.offset=0x2000
-adafruit_thumbsticktrinkey_m0.upload.use_1200bps_touch=true
-adafruit_thumbsticktrinkey_m0.upload.wait_for_upload_port=true
-adafruit_thumbsticktrinkey_m0.upload.native_usb=true
-
-# Build
-adafruit_thumbsticktrinkey_m0.build.mcu=cortex-m0plus
-adafruit_thumbsticktrinkey_m0.build.f_cpu=48000000L
-adafruit_thumbsticktrinkey_m0.build.usb_product="Thumbstick Trinkey M0"
-adafruit_thumbsticktrinkey_m0.build.usb_manufacturer="Adafruit"
-adafruit_thumbsticktrinkey_m0.build.board=THUMBSTICKTRINKEY_M0
-adafruit_thumbsticktrinkey_m0.build.core=arduino
-adafruit_thumbsticktrinkey_m0.build.extra_flags=-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_THUMBSTICKTRINKEY_M0 -DARDUINO_SAMD_ZERO -DARM_MATH_CM0PLUS {build.usb_flags}
-adafruit_thumbsticktrinkey_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_thumbsticktrinkey_m0.build.openocdscript=scripts/openocd/daplink_samd21.cfg
-adafruit_thumbsticktrinkey_m0.build.variant=thumbsticktrinkey_m0
-adafruit_thumbsticktrinkey_m0.build.variant_system_lib=
-adafruit_thumbsticktrinkey_m0.build.vid=0x239A
-adafruit_thumbsticktrinkey_m0.build.pid=0x8159
-adafruit_thumbsticktrinkey_m0.bootloader.tool=openocd
-adafruit_thumbsticktrinkey_m0.bootloader.file=thumbsticktrinkey_m0/bootloader-thumbsticktrinkey_m0.bin
-
-# Menu: Optimization
-adafruit_thumbsticktrinkey_m0.menu.opt.small=Small (-Os) (standard)
-adafruit_thumbsticktrinkey_m0.menu.opt.small.build.flags.optimize=-Os
-adafruit_thumbsticktrinkey_m0.menu.opt.fast=Fast (-O2)
-adafruit_thumbsticktrinkey_m0.menu.opt.fast.build.flags.optimize=-O2
-adafruit_thumbsticktrinkey_m0.menu.opt.faster=Faster (-O3)
-adafruit_thumbsticktrinkey_m0.menu.opt.faster.build.flags.optimize=-O3
-adafruit_thumbsticktrinkey_m0.menu.opt.fastest=Fastest (-Ofast)
-adafruit_thumbsticktrinkey_m0.menu.opt.fastest.build.flags.optimize=-Ofast
-adafruit_thumbsticktrinkey_m0.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
-adafruit_thumbsticktrinkey_m0.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
-
-# Menu: USB Stack
-adafruit_thumbsticktrinkey_m0.menu.usbstack.arduino=Arduino
-adafruit_thumbsticktrinkey_m0.menu.usbstack.tinyusb=TinyUSB
-adafruit_thumbsticktrinkey_m0.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
-
-# Menu: Debug
-adafruit_thumbsticktrinkey_m0.menu.debug.off=Off
-adafruit_thumbsticktrinkey_m0.menu.debug.on=On
-adafruit_thumbsticktrinkey_m0.menu.debug.on.build.flags.debug=-g
-
-
 # -----------------------------------
 # Adafruit ItsyBitsy M0 Express (SAMD21)
 # -----------------------------------
@ -1736,6 +1550,90 @@ adafruit_feather_m4_can.menu.debug.on=On
 adafruit_feather_m4_can.menu.debug.on.build.flags.debug=-g


+# -----------------------------------
+# Adafruit Feather M4 Adalogger (SAMD51)
+# -----------------------------------
+#adafruit_feather_m4_log.name=Adafruit Feather M4 Adalogger (SAMD51)
+
+# VID/PID for Bootloader, Arduino & CircuitPython
+#adafruit_feather_m4_log.vid.0=0x239A
+#adafruit_feather_m4_log.pid.0=0x8115
+#adafruit_feather_m4_log.vid.1=0x239A
+#adafruit_feather_m4_log.pid.1=0x0115
+#adafruit_feather_m4_log.vid.2=0x239A
+#adafruit_feather_m4_log.pid.2=0x8116
+
+# Upload
+#adafruit_feather_m4_log.upload.tool=bossac18
+#adafruit_feather_m4_log.upload.protocol=sam-ba
+#adafruit_feather_m4_log.upload.maximum_size=1032192
+#adafruit_feather_m4_log.upload.offset=0x4000
+#adafruit_feather_m4_log.upload.use_1200bps_touch=true
+#adafruit_feather_m4_log.upload.wait_for_upload_port=true
+#adafruit_feather_m4_log.upload.native_usb=true
+
+# Build
+#adafruit_feather_m4_log.build.mcu=cortex-m4
+#adafruit_feather_m4_log.build.f_cpu=120000000L
+#adafruit_feather_m4_log.build.usb_product="Feather M4 Adalogger"
+#adafruit_feather_m4_log.build.usb_manufacturer="Adafruit"
+#adafruit_feather_m4_log.build.board=FEATHER_M4_ADALOGGER
+#adafruit_feather_m4_log.build.core=arduino
+#adafruit_feather_m4_log.build.extra_flags=-D__SAMD51J20A__ -DADAFRUIT_FEATHER_M4_ADALOGGER -D__SAMD51__ -D__FPU_PRESENT -DARM_MATH_CM4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 {build.usb_flags}
+#adafruit_feather_m4_log.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+#adafruit_feather_m4_log.build.openocdscript=scripts/openocd/daplink_samd51.cfg
+#adafruit_feather_m4_log.build.variant=feather_m4
+#adafruit_feather_m4_log.build.variant_system_lib=
+#adafruit_feather_m4_log.build.vid=0x239A
+#adafruit_feather_m4_log.build.pid=0x8115
+#adafruit_feather_m4_log.bootloader.tool=openocd
+#adafruit_feather_m4_log.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
+#adafruit_feather_m4_log.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+# Menu: Cache
+#adafruit_feather_m4_log.menu.cache.on=Enabled
+#adafruit_feather_m4_log.menu.cache.on.build.cache_flags=-DENABLE_CACHE
+#adafruit_feather_m4_log.menu.cache.off=Disabled
+#adafruit_feather_m4_log.menu.cache.off.build.cache_flags=
+
+# Menu: Speed
+#adafruit_feather_m4_log.menu.speed.120=120 MHz (standard)
+#adafruit_feather_m4_log.menu.speed.120.build.f_cpu=120000000L
+#adafruit_feather_m4_log.menu.speed.150=150 MHz (overclock)
+#adafruit_feather_m4_log.menu.speed.150.build.f_cpu=150000000L
+#adafruit_feather_m4_log.menu.speed.180=180 MHz (overclock)
+#adafruit_feather_m4_log.menu.speed.180.build.f_cpu=180000000L
+#adafruit_feather_m4_log.menu.speed.200=200 MHz (overclock)
+#adafruit_feather_m4_log.menu.speed.200.build.f_cpu=200000000L
+
+# Menu: Optimization
+#adafruit_feather_m4_log.menu.opt.small=Small (-Os) (standard)
+#adafruit_feather_m4_log.menu.opt.small.build.flags.optimize=-Os
+#adafruit_feather_m4_log.menu.opt.fast=Fast (-O2)
+#adafruit_feather_m4_log.menu.opt.fast.build.flags.optimize=-O2
+#adafruit_feather_m4_log.menu.opt.faster=Faster (-O3)
+#adafruit_feather_m4_log.menu.opt.faster.build.flags.optimize=-O3
+#adafruit_feather_m4_log.menu.opt.fastest=Fastest (-Ofast)
+#adafruit_feather_m4_log.menu.opt.fastest.build.flags.optimize=-Ofast
+#adafruit_feather_m4_log.menu.opt.dragons=Here be dragons (-Ofast -funroll-loops)
+#adafruit_feather_m4_log.menu.opt.dragons.build.flags.optimize=-Ofast -funroll-loops
+
+# Menu: QSPI Speed
+#adafruit_feather_m4_log.menu.maxqspi.50=50 MHz (standard)
+#adafruit_feather_m4_log.menu.maxqspi.50.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=50000000
+#adafruit_feather_m4_log.menu.maxqspi.fcpu=CPU Speed / 2
+#adafruit_feather_m4_log.menu.maxqspi.fcpu.build.flags.maxqspi=-DVARIANT_QSPI_BAUD_DEFAULT=({build.f_cpu})
+
+# Menu: USB Stack
+#adafruit_feather_m4_log.menu.usbstack.arduino=Arduino
+#adafruit_feather_m4_log.menu.usbstack.tinyusb=TinyUSB
+#adafruit_feather_m4_log.menu.usbstack.tinyusb.build.flags.usbstack=-DUSE_TINYUSB
+
+# Menu: Debug
+#adafruit_feather_m4_log.menu.debug.off=Off
+#adafruit_feather_m4_log.menu.debug.on=On
+#adafruit_feather_m4_log.menu.debug.on.build.flags.debug=-g
+
 # -----------------------------------
 # Adafruit Trellis M4 (SAMD51)
 # -----------------------------------
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@ -556,35 +556,29 @@ bool SERCOM::startTransmissionWIRE(uint8_t address, SercomWireReadWriteFlag flag
  // Address Transmitted
  if ( flag == WIRE_WRITE_FLAG ) // Write mode
  {
-    while( !sercom->I2CM.INTFLAG.bit.MB ) {
+    while( !sercom->I2CM.INTFLAG.bit.MB )
+    {
      // Wait transmission complete
-
-      // If certain errors occur, the MB bit may never be set (RFTM: SAMD21 sec:28.10.6; SAMD51 sec:36.10.7).
-      // The data transfer errors that can occur (including BUSERR) are all
-      // rolled up into INTFLAG.bit.ERROR from STATUS.reg
-      if (sercom->I2CM.INTFLAG.bit.ERROR) {
-        return false;
-      }
    }
  }
  else  // Read mode
  {
-    while( !sercom->I2CM.INTFLAG.bit.SB ) {
+    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
-
-      // If the slave NACKS the address, the MB bit will be set.
-      // A variety of errors in the STATUS register can set the ERROR bit in the INTFLAG register
-      // In that case, send a stop condition and return false.
-      if (sercom->I2CM.INTFLAG.bit.MB || sercom->I2CM.INTFLAG.bit.ERROR) {
-        sercom->I2CM.CTRLB.bit.CMD = 3; // Stop condition
-        return false;
-      }
    }

    // Clean the 'Slave on Bus' flag, for further usage.
    //sercom->I2CM.INTFLAG.bit.SB = 0x1ul;
  }

+
  //ACK received (0: ACK, 1: NACK)
  if(sercom->I2CM.STATUS.bit.RXNACK)
  {
@ -603,11 +597,10 @@ bool SERCOM::sendDataMasterWIRE(uint8_t data)

  //Wait transmission successful
  while(!sercom->I2CM.INTFLAG.bit.MB) {
-    // If a data transfer error occurs, the MB bit may never be set.
-    // Check the error bit and bail if it's set.
-    // The data transfer errors that can occur (including BUSERR) are all
-    // rolled up into INTFLAG.bit.ERROR from STATUS.reg
-    if (sercom->I2CM.INTFLAG.bit.ERROR) {
+
+    // 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;
    }
  }
@ -708,17 +701,9 @@ uint8_t SERCOM::readDataWIRE( void )
 {
  if(isMasterWIRE())
  {
-    while (sercom->I2CM.INTFLAG.bit.SB == 0) {
+    while( sercom->I2CM.INTFLAG.bit.SB == 0 )
+    {
      // Waiting complete receive
-      // A variety of errors in the STATUS register can set the ERROR bit in the INTFLAG register
-      // In that case, send a stop condition and return false.
-      // readDataWIRE should really be able to indicate an error (which would never be used
-      // because the readDataWIRE callers (in Wire.cpp) should have checked availableWIRE() first and timed it
-      // out if the data never showed up
-      if (sercom->I2CM.INTFLAG.bit.MB || sercom->I2CM.INTFLAG.bit.ERROR) {
-        sercom->I2CM.CTRLB.bit.CMD = 3; // Stop condition
-        return 0xFF;
-      }
    }

    return sercom->I2CM.DATA.bit.DATA ;
--- a/libraries/Adafruit_TinyUSB_Arduino
+++ b/libraries/Adafruit_TinyUSB_Arduino
@ -1 +1 @@
-Subproject commit c953968c468218d8968138b5ed8482fa565373df
+Subproject commit 633fa06aaf6b3713baaede491c586a578567062c
--- a/platform.txt
+++ b/platform.txt
@ -20,7 +20,7 @@
 # https://arduino.github.io/arduino-cli/0.33/platform-specification/

 name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
-version=1.7.16
+version=1.7.13

 # Compile variables
 # -----------------
@ -195,7 +195,7 @@ tools.openocd.erase.pattern=

 tools.openocd.bootloader.params.verbose=-d2
 tools.openocd.bootloader.params.quiet=-d0
-tools.openocd.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; $_FLASHDRIVER 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}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"

 #
 # OpenOCD sketch upload - version with configurable bootloader size
@ -221,7 +221,7 @@ tools.openocd-withbootsize.erase.pattern=

 tools.openocd-withbootsize.bootloader.params.verbose=-d2
 tools.openocd-withbootsize.bootloader.params.quiet=-d0
-tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; $_FLASHDRIVER bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"
+tools.openocd-withbootsize.bootloader.pattern="{path}/{cmd}" {bootloader.verbose} -s "{path}/share/openocd/scripts/" -f "{runtime.platform.path}/{build.openocdscript}" -c "telnet_port disabled; init; halt; at91samd bootloader 0; program {{runtime.platform.path}/bootloaders/{bootloader.file}} verify reset; shutdown"

 # ----------------------------------------
 # Debugger configuration (general options)
--- a/scripts/openocd/daplink_samd21.cfg
+++ b/scripts/openocd/daplink_samd21.cfg
@ -24,6 +24,4 @@ transport select swd
 # chip name
 set CHIPNAME samd21

-set _FLASHDRIVER at91samd
-
 source [find target/at91samdXX.cfg]
--- a/scripts/openocd/daplink_samd51.cfg
+++ b/scripts/openocd/daplink_samd51.cfg
@ -24,6 +24,4 @@ transport select swd
 # chip name
 set CHIPNAME samd51

-set _FLASHDRIVER atsame5
-
 source [find target/atsame5x.cfg]
--- a/scripts/openocd/jlink_samd21.cfg
+++ b/scripts/openocd/jlink_samd21.cfg
@ -24,6 +24,4 @@ transport select swd
 # chip name
 set CHIPNAME samd21

-set _FLASHDRIVER at91samd
-
 source [find target/at91samdXX.cfg]
--- a/scripts/openocd/jlink_samd51.cfg
+++ b/scripts/openocd/jlink_samd51.cfg
@ -24,6 +24,4 @@ transport select swd
 # chip name
 set CHIPNAME samd51

-set _FLASHDRIVER atsame5
-
 source [find target/atsame5x.cfg]
--- a/tools/makeboards.py
+++ b/tools/makeboards.py
@ -275,21 +275,6 @@ d21_board_list = [
     "SHT4XTRINKEY_M0", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_SHT4XTRINKEY_M0",
     "sht4xtrinkey_m0/bootloader-sht4xtrinkey_m0.bin"],

-    ["adafruit_pixeltrinkey_m0", "pixeltrinkey_m0", "Adafruit", "Pixel Trinkey M0",
-     "0x239A", ["0x8155", "0x0155", "0x8156"],
-     "PIXELTRINKEY_M0", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_PIXELTRINKEY_M0",
-     "pixeltrinkey_m0/bootloader-pixeltrinkey_m0.bin"],
-
-    ["adafruit_TRRStrinkey_m0", "trrstrinkey_m0", "Adafruit", "TRRS Trinkey M0",
-     "0x239A", ["0x8157", "0x0157", "0x8158"],
-     "TRRSTRINKEY_M0", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_TRRSTRINKEY_M0",
-     "trrstrinkey_m0/bootloader-TRRStrinkey_m0.bin"],
-
-    ["adafruit_thumbsticktrinkey_m0", "thumbsticktrinkey_m0", "Adafruit", "Thumbstick Trinkey M0",
-     "0x239A", ["0x8159", "0x0159", "0x8160"],
-     "THUMBSTICKTRINKEY_M0", "-D__SAMD21E18A__ -DCRYSTALLESS -DADAFRUIT_THUMBSTICKTRINKEY_M0",
-     "thumbsticktrinkey_m0/bootloader-thumbsticktrinkey_m0.bin"],
-
    ["adafruit_itsybitsy_m0", "itsybitsy_m0", "Adafruit", "ItsyBitsy M0 Express",
     "0x239A", ["0x800F", "0x000F", "0x8012"],
     "ITSYBITSY_M0", "-D__SAMD21G18A__ -DCRYSTALLESS -DADAFRUIT_ITSYBITSY_M0",
--- a/variants/feather_m4/linker_scripts/gcc/flash_with_bootloader.ld
+++ b/variants/feather_m4/linker_scripts/gcc/flash_with_bootloader.ld
@ -170,10 +170,6 @@ SECTIONS
 		KEEP(*(.fini_array))
 		PROVIDE_HIDDEN (__fini_array_end = .);

-		. = ALIGN(4);
-		/* Keep .ramfunc functions in RAM */
-		KEEP(*(.ramfunc))
-
 		KEEP(*(.jcr*))
 		. = ALIGN(16);
 		/* All data end */
--- a/variants/gemma_m0/variant.h
+++ b/variants/gemma_m0/variant.h
@ -89,7 +89,6 @@ extern "C"
 #define INTERNAL_DS_CLK      (4u)
 #define PIN_DOTSTAR_DATA     (3u)
 #define PIN_DOTSTAR_CLK      (4u)
-#define PIN_DOTSTAR_CLOCK    PIN_DOTSTAR_CLK
 #define DOTSTAR_NUM          (1u)

 /*
--- a/variants/itsybitsy_m0/variant.h
+++ b/variants/itsybitsy_m0/variant.h
@ -83,7 +83,6 @@ extern "C"
 // DotStar LED
 #define PIN_DOTSTAR_DATA     (41u)
 #define PIN_DOTSTAR_CLK      (40u)
-#define PIN_DOTSTAR_CLOCK    PIN_DOTSTAR_CLK
 #define DOTSTAR_NUM          (1u)

 /*
--- a/variants/itsybitsy_m4/variant.h
+++ b/variants/itsybitsy_m4/variant.h
@ -87,7 +87,6 @@ extern "C"
 // DotStar LED
 #define PIN_DOTSTAR_DATA     (8u)
 #define PIN_DOTSTAR_CLK      (6u)
-#define PIN_DOTSTAR_CLOCK    PIN_DOTSTAR_CLK
 #define DOTSTAR_NUM          (1u)

 /*
--- a/variants/pixeltrinkey_m0/debug_scripts/variant.gdb
+++ b/variants/pixeltrinkey_m0/debug_scripts/variant.gdb
@ -1,31 +0,0 @@
-#
-#  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"
--- a/variants/pixeltrinkey_m0/linker_scripts/gcc/flash_with_bootloader.ld
+++ b/variants/pixeltrinkey_m0/linker_scripts/gcc/flash_with_bootloader.ld
@ -1,216 +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
-*/
-
-/* 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)
-		*(.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")
-}
--- a/variants/pixeltrinkey_m0/linker_scripts/gcc/flash_without_bootloader.ld
+++ b/variants/pixeltrinkey_m0/linker_scripts/gcc/flash_without_bootloader.ld
@ -1,214 +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
-*/
-
-/* 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)
-		*(.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")
-}
--- a/variants/pixeltrinkey_m0/openocd_scripts/sht4xtrinkey_m0.cfg
+++ b/variants/pixeltrinkey_m0/openocd_scripts/sht4xtrinkey_m0.cfg
@ -1,28 +0,0 @@
-#
-#  Adafruit ItsyBitsy M0 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
-#
-
-# chip name
-set CHIPNAME at91samd21e18
-set ENDIAN little
-
-# choose a port here
-set telnet_port 0
-
-source [find target/at91samdXX.cfg]
--- a/variants/pixeltrinkey_m0/pins_arduino.h
+++ b/variants/pixeltrinkey_m0/pins_arduino.h
@ -1,21 +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
-*/
-
-// API compatibility
-#include "variant.h"
-
--- a/variants/pixeltrinkey_m0/variant.cpp
+++ b/variants/pixeltrinkey_m0/variant.cpp
@ -1,52 +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
-*/
-
-#include "variant.h"
-#include "Arduino.h"
-/*
- * Pins descriptions
- */
-const PinDescription g_APinDescription[]=
-{
-  // DAC / A0 for monitoring 5V
-  { PORTA,  2, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel0, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_2 }, // A0 / D0 / DAC  
-
-  // Internal NeoPixel / D1
-  { PORTA, 1, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
-
-  // SPI MOSI/SCK
-  { PORTA, 4, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // D2 / MOSI
-  { PORTA, 5, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // D3 / SCK
-
-  // A6 / MISO
-  { PORTA, 6, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // A6 / MISO
-
-  // USB pins D5, D6, D7
-  { 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
-
-} ;
-
-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 ) ;
--- a/variants/pixeltrinkey_m0/variant.h
+++ b/variants/pixeltrinkey_m0/variant.h
@ -1,189 +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
-*/
-
-#ifndef _VARIANT_PIXELTRINKEY_ZERO_
-#define _VARIANT_PIXELTRINKEY_ZERO_
-
-// 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	(F_CPU)
-
-/*----------------------------------------------------------------------------
- *        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           (7u)
-#define NUM_DIGITAL_PINS     (4u)
-#define NUM_ANALOG_INPUTS    (1u)
-#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].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_NEOPIXEL         (1u)
-#define NUM_NEOPIXEL         (1u)
-
-#define PIN_DATA             (2u)
-#define PIN_CLOCK            (3u)
-
-/*
- * Analog pins
- */
-#define PIN_A0               (0ul)
-#define PIN_DAC0             PIN_A0
-
-#define PIN_A6               (4ul)
-
-static const uint8_t A0  = PIN_A0;
-
-static const uint8_t A6  = PIN_A6;
-
-#define ADC_RESOLUTION		12
-
-
-/*
- * SPI Interfaces
- */
-#define SPI_INTERFACES_COUNT 1
-
-#define PIN_SPI_MISO         (4ul) // off 3-pin JST, broken out
-#define PIN_SPI_MOSI         (2ul)
-#define PIN_SPI_SCK          (3ul)
-#define PERIPH_SPI           sercom0
-#define PAD_SPI_TX           SPI_PAD_0_SCK_1
-#define PAD_SPI_RX           SERCOM_RX_PAD_2
-
-static const uint8_t SS	  = (5ul); // not actually broken out
-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, fake just for compilation
- */
-#define WIRE_INTERFACES_COUNT 1
-
-#define PIN_WIRE_SDA         (2u)
-#define PIN_WIRE_SCL         (3u)
-#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 (5ul)
-#define PIN_USB_DM          (6ul)
-#define PIN_USB_DP          (7ul)
-/*
- * I2S Interfaces
- */
-#define I2S_INTERFACES_COUNT 0
-
-
-#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;
-
-
-#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_ARDUINO_ZERO_ */
-
--- a/variants/pyportal_m4/variant.h
+++ b/variants/pyportal_m4/variant.h
@ -160,7 +160,7 @@ static const uint8_t ATN = PIN_ATN;
 #define PAD_SPI_TX           SPI_PAD_0_SCK_1
 #define PAD_SPI_RX           SERCOM_RX_PAD_2

-static const uint8_t SS	  = 32;
+static const uint8_t SS	  = PIN_A2;       // ???
 static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK  = PIN_SPI_SCK;
--- a/variants/pyportal_m4_titano/variant.h
+++ b/variants/pyportal_m4_titano/variant.h
@ -160,7 +160,7 @@ static const uint8_t ATN = PIN_ATN;
 #define PAD_SPI_TX           SPI_PAD_0_SCK_1
 #define PAD_SPI_RX           SERCOM_RX_PAD_2

-static const uint8_t SS	  = 32;
+static const uint8_t SS	  = PIN_A2;       // ???
 static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK  = PIN_SPI_SCK;
--- a/variants/thumbsticktrinkey_m0/debug_scripts/variant.gdb
+++ b/variants/thumbsticktrinkey_m0/debug_scripts/variant.gdb
@ -1,31 +0,0 @@
-#
-#  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"
--- a/variants/thumbsticktrinkey_m0/linker_scripts/gcc/flash_with_bootloader.ld
+++ b/variants/thumbsticktrinkey_m0/linker_scripts/gcc/flash_with_bootloader.ld
@ -1,216 +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
-*/
-
-/* 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)
-		*(.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")
-}
--- a/variants/thumbsticktrinkey_m0/linker_scripts/gcc/flash_without_bootloader.ld
+++ b/variants/thumbsticktrinkey_m0/linker_scripts/gcc/flash_without_bootloader.ld
@ -1,214 +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
-*/
-
-/* 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)
-		*(.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")
-}
--- a/variants/thumbsticktrinkey_m0/openocd_scripts/sht4xtrinkey_m0.cfg
+++ b/variants/thumbsticktrinkey_m0/openocd_scripts/sht4xtrinkey_m0.cfg
@ -1,28 +0,0 @@
-#
-#  Adafruit ItsyBitsy M0 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
-#
-
-# chip name
-set CHIPNAME at91samd21e18
-set ENDIAN little
-
-# choose a port here
-set telnet_port 0
-
-source [find target/at91samdXX.cfg]
--- a/variants/thumbsticktrinkey_m0/pins_arduino.h
+++ b/variants/thumbsticktrinkey_m0/pins_arduino.h
@ -1,21 +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
-*/
-
-// API compatibility
-#include "variant.h"
-
--- a/variants/thumbsticktrinkey_m0/variant.cpp
+++ b/variants/thumbsticktrinkey_m0/variant.cpp
@ -1,52 +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
-*/
-
-#include "variant.h"
-#include "Arduino.h"
-/*
- * Pins descriptions
- */
-const PinDescription g_APinDescription[]=
-{
-  // X (D0)
-  { PORTA,  9, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG), ADC_Channel17, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 },
-  // Y (D1)
-  { PORTA, 11, PIO_ANALOG, (PIN_ATTR_DIGITAL|PIN_ATTR_ANALOG), ADC_Channel19, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 },
-
-  // Button 1 (D2)
-  { 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 },
-  // Button 2 (D3)
-  { 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 },
-
-  // NeoPixel (D4)
-  { PORTA,  0, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // TCC1/WO[0]
-
-  // USB pins D5, D6, D7
-  { 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
-
-} ;
-
-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 ) ;
--- a/variants/thumbsticktrinkey_m0/variant.h
+++ b/variants/thumbsticktrinkey_m0/variant.h
@ -1,171 +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
-*/
-
-#ifndef _VARIANT_THUMBSTICKTRINKEY_ZERO_
-#define _VARIANT_THUMBSTICKTRINKEY_ZERO_
-
-// 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	(F_CPU)
-
-/*----------------------------------------------------------------------------
- *        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           (10u)
-#define NUM_DIGITAL_PINS     (7u)
-#define NUM_ANALOG_INPUTS    (6u)
-#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].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_NEOPIXEL         (4u)
-#define NUM_NEOPIXEL         (1u)
-
-#define PIN_JOY_X            (0ul)
-#define PIN_JOY_Y            (1ul)
-#define PIN_BUTTON1          (2ul)
-#define PIN_BUTTON2          (3ul)
-
-/*
- * Analog pins
- */
-#define PIN_A0               (0ul)
-#define PIN_A1               (1ul)
-#define PIN_DAC0             PIN_A0
-
-static const uint8_t A0  = PIN_A0;
-static const uint8_t A1  = PIN_A1;
-
-#define ADC_RESOLUTION		12
-
-
-/*
- * SPI Interfaces
- */
-#define SPI_INTERFACES_COUNT 0
-
-
-/*
- * Wire Interfaces
- */
-#define WIRE_INTERFACES_COUNT 0
-
-
-/*
- * USB
- */
-#define PIN_USB_HOST_ENABLE (5ul)
-#define PIN_USB_DM          (6ul)
-#define PIN_USB_DP          (7ul)
-/*
- * I2S Interfaces
- */
-#define I2S_INTERFACES_COUNT 0
-
-
-#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;
-
-
-#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_ARDUINO_ZERO_ */
-
--- a/variants/trinket_m0/variant.h
+++ b/variants/trinket_m0/variant.h
@ -89,7 +89,6 @@ extern "C"
 #define INTERNAL_DS_CLK      (8u)
 #define PIN_DOTSTAR_DATA     (7u)
 #define PIN_DOTSTAR_CLK      (8u)
-#define PIN_DOTSTAR_CLOCK    PIN_DOTSTAR_CLK
 #define DOTSTAR_NUM          (1u)

 /*
--- a/variants/trrstrinkey_m0/debug_scripts/variant.gdb
+++ b/variants/trrstrinkey_m0/debug_scripts/variant.gdb
@ -1,31 +0,0 @@
-#
-#  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"
--- a/variants/trrstrinkey_m0/linker_scripts/gcc/flash_with_bootloader.ld
+++ b/variants/trrstrinkey_m0/linker_scripts/gcc/flash_with_bootloader.ld
@ -1,216 +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
-*/
-
-/* 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)
-		*(.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")
-}
--- a/variants/trrstrinkey_m0/linker_scripts/gcc/flash_without_bootloader.ld
+++ b/variants/trrstrinkey_m0/linker_scripts/gcc/flash_without_bootloader.ld
@ -1,214 +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
-*/
-
-/* 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)
-		*(.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")
-}
--- a/variants/trrstrinkey_m0/openocd_scripts/sht4xtrinkey_m0.cfg
+++ b/variants/trrstrinkey_m0/openocd_scripts/sht4xtrinkey_m0.cfg
@ -1,28 +0,0 @@
-#
-#  Adafruit ItsyBitsy M0 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
-#
-
-# chip name
-set CHIPNAME at91samd21e18
-set ENDIAN little
-
-# choose a port here
-set telnet_port 0
-
-source [find target/at91samdXX.cfg]
--- a/variants/trrstrinkey_m0/pins_arduino.h
+++ b/variants/trrstrinkey_m0/pins_arduino.h
@ -1,21 +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
-*/
-
-// API compatibility
-#include "variant.h"
-
--- a/variants/trrstrinkey_m0/variant.cpp
+++ b/variants/trrstrinkey_m0/variant.cpp
@ -1,64 +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
-*/
-
-#include "variant.h"
-#include "Arduino.h"
-/*
- * Pins descriptions
- */
-const PinDescription g_APinDescription[]=
-{
-  // TRRS Tip, D0 / DAC / A0
-  { PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
-  // TRRS Tip Switch, D1, A1
-  { PORTA, 3, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel1, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_3 },
-
-  // TRRS Ring 1, D2, A2
-  { 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 },
-  // TRRS Ring 1 Switch, D3, A3
-  { 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 },
-
-  // TRRS Ring2, D4, A4
-  { PORTA, 4, PIO_ANALOG, PIN_ATTR_DIGITAL, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 },
-
-  // TRRS Sleeve, D5, A5
-  { PORTA, 5, PIO_ANALOG, PIN_ATTR_DIGITAL, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
-
-  // Internal NeoPixel / D6
-  { PORTA, 1, PIO_ANALOG, PIN_ATTR_ANALOG, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
-
-  // QT SDA D7
-  { PORTA,  8, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel16, PWM0_CH0, TCC0_CH0, EXTERNAL_INT_NMI },  // TCC0/WO[0]
-
-  // QT SCL D8
-  { PORTA,  9, PIO_SERCOM_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), ADC_Channel17, PWM0_CH1, TCC0_CH1, EXTERNAL_INT_9 }, // TCC0/WO[1]
-
-  // USB pins D9, D10, D11
-  { 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
-
-} ;
-
-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 ) ;
--- a/variants/trrstrinkey_m0/variant.h
+++ b/variants/trrstrinkey_m0/variant.h
@ -1,207 +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
-*/
-
-#ifndef _VARIANT_TRRSTRINKEY_ZERO_
-#define _VARIANT_TRRSTRINKEY_ZERO_
-
-// 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	(F_CPU)
-
-/*----------------------------------------------------------------------------
- *        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           (10u)
-#define NUM_DIGITAL_PINS     (7u)
-#define NUM_ANALOG_INPUTS    (6u)
-#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].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_NEOPIXEL         (6u)
-#define NUM_NEOPIXEL         (1u)
-
-#define PIN_TIP              (0ul)
-#define PIN_TIP_SWITCH       (1ul)
-#define PIN_RING1            (2ul)
-#define PIN_RING1_SWITCH     (3ul)
-#define PIN_RING2            (4ul)
-#define PIN_SLEEVE           (5ul)
-
-/*
- * 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_DAC0             PIN_A0
-
-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;
-
-#define ADC_RESOLUTION		12
-
-
-/*
- * SPI Interfaces
- */
-#define SPI_INTERFACES_COUNT 1
-
-#define PIN_SPI_MISO         PIN_RING1
-#define PIN_SPI_MOSI         PIN_RING2
-#define PIN_SPI_SCK          PIN_SLEEVE
-#define PERIPH_SPI           sercom0
-#define PAD_SPI_TX           SPI_PAD_0_SCK_1
-#define PAD_SPI_RX           SERCOM_RX_PAD_2
-
-static const uint8_t SS	  = PIN_TIP;
-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, fake just for compilation
- */
-#define WIRE_INTERFACES_COUNT 2
-
-// QT Port
-#define PIN_WIRE_SDA         (7ul)
-#define PIN_WIRE_SCL         (8ul)
-#define PERIPH_WIRE          sercom2
-#define WIRE_IT_HANDLER      SERCOM2_Handler
-
-// second, sekret I2C on the headphone jack
-#define PIN_WIRE1_SDA         PIN_RING2
-#define PIN_WIRE1_SCL         PIN_SLEEVE
-#define PERIPH_WIRE1          sercom0
-#define WIRE1_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 (9ul)
-#define PIN_USB_DM          (10ul)
-#define PIN_USB_DP          (11ul)
-/*
- * I2S Interfaces
- */
-#define I2S_INTERFACES_COUNT 0
-
-
-#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;
-
-
-#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_ARDUINO_ZERO_ */
-