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

Author: deanm1278

boards.txt

@@ -35,7 +35,7 @@ adafruit_feather_m0.build.core=arduino
 adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ {build.usb_flags}
 adafruit_feather_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
 adafruit_feather_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
-adafruit_feather_m0.build.variant=arduino_zero
+adafruit_feather_m0.build.variant=feather_m0
 adafruit_feather_m0.build.variant_system_lib=
 adafruit_feather_m0.build.vid=0x239A
 adafruit_feather_m0.build.pid=0x800B
@@ -121,7 +121,7 @@ adafruit_metro_m0.build.variant_system_lib=
 adafruit_metro_m0.build.vid=0x239A
 adafruit_metro_m0.build.pid=0x8013
 adafruit_metro_m0.bootloader.tool=openocd
-adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin
+adafruit_metro_m0.bootloader.file=metro/bootloader_uf2.bin
 
 # Adafruit Circuit Playground M0
 # ------------------------------
@@ -150,4 +150,115 @@ adafruit_circuitplayground_m0.build.variant_system_lib=
 adafruit_circuitplayground_m0.build.vid=0x239A
 adafruit_circuitplayground_m0.build.pid=0x8018
 adafruit_circuitplayground_m0.bootloader.tool=openocd
-adafruit_circuitplayground_m0.bootloader.file=circuitplay/circuitplay_m0_samd21g18_sam_ba.bin
+adafruit_circuitplayground_m0.bootloader.file=circuitplay/bootloader_uf2.bin
+
+adafruit_gemma_m0.name=Adafruit Gemma M0
+adafruit_gemma_m0.vid.0=0x239A
+adafruit_gemma_m0.pid.0=0x801C
+adafruit_gemma_m0.vid.1=0x239A
+adafruit_gemma_m0.pid.1=0x001C
+adafruit_gemma_m0.upload.tool=bossac
+adafruit_gemma_m0.upload.protocol=sam-ba
+adafruit_gemma_m0.upload.maximum_size=262144
+adafruit_gemma_m0.upload.use_1200bps_touch=true
+adafruit_gemma_m0.upload.wait_for_upload_port=true
+adafruit_gemma_m0.upload.native_usb=true
+adafruit_gemma_m0.build.mcu=cortex-m0plus
+adafruit_gemma_m0.build.f_cpu=48000000L
+adafruit_gemma_m0.build.usb_product="Gemma M0"
+adafruit_gemma_m0.build.usb_manufacturer="Adafruit"
+adafruit_gemma_m0.build.board=GEMMA_M0
+adafruit_gemma_m0.build.core=arduino
+adafruit_gemma_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_GEMMA_M0 -D__SAMD21E18A__ {build.usb_flags}
+adafruit_gemma_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_gemma_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_gemma_m0.build.variant=gemma_m0
+adafruit_gemma_m0.build.variant_system_lib=
+adafruit_gemma_m0.build.vid=0x239A
+adafruit_gemma_m0.build.pid=0x801C
+adafruit_gemma_m0.bootloader.tool=openocd
+adafruit_gemma_m0.bootloader.file=gemma/bootloader_uf2.bin
+
+adafruit_trinket_m0.name=Adafruit Trinket M0
+adafruit_trinket_m0.vid.0=0x239A
+adafruit_trinket_m0.pid.0=0x801E
+adafruit_trinket_m0.vid.1=0x239A
+adafruit_trinket_m0.pid.1=0x001E
+adafruit_trinket_m0.upload.tool=bossac
+adafruit_trinket_m0.upload.protocol=sam-ba
+adafruit_trinket_m0.upload.maximum_size=262144
+adafruit_trinket_m0.upload.use_1200bps_touch=true
+adafruit_trinket_m0.upload.wait_for_upload_port=true
+adafruit_trinket_m0.upload.native_usb=true
+adafruit_trinket_m0.build.mcu=cortex-m0plus
+adafruit_trinket_m0.build.f_cpu=48000000L
+adafruit_trinket_m0.build.usb_product="Trinket M0"
+adafruit_trinket_m0.build.usb_manufacturer="Adafruit"
+adafruit_trinket_m0.build.board=TRINKET_M0
+adafruit_trinket_m0.build.core=arduino
+adafruit_trinket_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_TRINKET_M0 -D__SAMD21E18A__ {build.usb_flags}
+adafruit_trinket_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_trinket_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_trinket_m0.build.variant=trinket_m0
+adafruit_trinket_m0.build.variant_system_lib=
+adafruit_trinket_m0.build.vid=0x239A
+adafruit_trinket_m0.build.pid=0x801E
+adafruit_trinket_m0.bootloader.tool=openocd
+adafruit_trinket_m0.bootloader.file=trinket/bootloader_uf2.bin
+
+adafruit_itsybitsy_m0.name=Adafruit ItsyBitsy M0
+adafruit_itsybitsy_m0.vid.0=0x239A
+adafruit_itsybitsy_m0.pid.0=0x800F
+adafruit_itsybitsy_m0.vid.1=0x239A
+adafruit_itsybitsy_m0.pid.1=0x000F
+adafruit_itsybitsy_m0.vid.2=0x239A
+adafruit_itsybitsy_m0.pid.2=0x8012
+adafruit_itsybitsy_m0.upload.tool=bossac
+adafruit_itsybitsy_m0.upload.protocol=sam-ba
+adafruit_itsybitsy_m0.upload.maximum_size=262144
+adafruit_itsybitsy_m0.upload.use_1200bps_touch=true
+adafruit_itsybitsy_m0.upload.wait_for_upload_port=true
+adafruit_itsybitsy_m0.upload.native_usb=true
+adafruit_itsybitsy_m0.build.mcu=cortex-m0plus
+adafruit_itsybitsy_m0.build.f_cpu=48000000L
+adafruit_itsybitsy_m0.build.usb_product="ItsyBitsy M0 Express"
+adafruit_itsybitsy_m0.build.usb_manufacturer="Adafruit"
+adafruit_itsybitsy_m0.build.board=ITSYBITSY_M0
+adafruit_itsybitsy_m0.build.core=arduino
+adafruit_itsybitsy_m0.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_ITSYBITSY_M0 -D__SAMD21G18A__ {build.usb_flags}
+adafruit_itsybitsy_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_itsybitsy_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_itsybitsy_m0.build.variant=itsybitsy_m0
+adafruit_itsybitsy_m0.build.variant_system_lib=
+adafruit_itsybitsy_m0.build.vid=0x239A
+adafruit_itsybitsy_m0.build.pid=0x800F
+adafruit_itsybitsy_m0.bootloader.tool=openocd
+adafruit_itsybitsy_m0.bootloader.file=itsybitsy/samd21_sam_ba.bin
+
+
+adafruit_pirkey.name=Adafruit pIRkey
+adafruit_pirkey.vid.0=0x239A
+adafruit_pirkey.pid.0=0x801E
+adafruit_pirkey.vid.1=0x239A
+adafruit_pirkey.pid.1=0x001E
+adafruit_pirkey.upload.tool=bossac
+adafruit_pirkey.upload.protocol=sam-ba
+adafruit_pirkey.upload.maximum_size=262144
+adafruit_pirkey.upload.use_1200bps_touch=true
+adafruit_pirkey.upload.wait_for_upload_port=true
+adafruit_pirkey.upload.native_usb=true
+adafruit_pirkey.build.mcu=cortex-m0plus
+adafruit_pirkey.build.f_cpu=48000000L
+adafruit_pirkey.build.usb_product="pIRKey"
+adafruit_pirkey.build.usb_manufacturer="Adafruit"
+adafruit_pirkey.build.board=PIRKEY
+adafruit_pirkey.build.core=arduino
+adafruit_pirkey.build.extra_flags=-DCRYSTALLESS -DADAFRUIT_PIRKEY -D__SAMD21E18A__ {build.usb_flags}
+adafruit_pirkey.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_pirkey.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_pirkey.build.variant=pirkey
+adafruit_pirkey.build.variant_system_lib=
+adafruit_pirkey.build.vid=0x239A
+adafruit_pirkey.build.pid=0x801E
+adafruit_pirkey.bootloader.tool=openocd
+adafruit_pirkey.bootloader.file=pirkey/bootloader_uf2.bin

bootloaders/circuitplay/bootloader_uf2.bin

@@ -652,16 +652,20 @@ void SERCOM::initClockNVIC( void )
     clockId = GCM_SERCOM3_CORE;
     IdNvic = SERCOM3_IRQn;
   }
+#if defined(SERCOM4)
   else if(sercom == SERCOM4)
   {
     clockId = GCM_SERCOM4_CORE;
     IdNvic = SERCOM4_IRQn;
   }
+#endif
+#if defined(SERCOM5)
   else if(sercom == SERCOM5)
   {
     clockId = GCM_SERCOM5_CORE;
     IdNvic = SERCOM5_IRQn;
   }
+#endif
 
   if ( IdNvic == PendSV_IRQn )
   {

bootloaders/circuitplay/update-bootloader.bin

@@ -62,57 +62,86 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
 #else
   EExt_Interrupts in = digitalPinToInterrupt(pin);
 #endif
-  if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
-    return;
+  if (in == NOT_AN_INTERRUPT) return;
 
   if (!enabled) {
     __initialize();
     enabled = 1;
   }
 
-  // Enable wakeup capability on pin in case being used during sleep
-  EIC->WAKEUP.reg |= (1 << in);
+  if (in == EXTERNAL_INT_NMI) {
+    EIC->NMIFLAG.bit.NMI = 1; // Clear flag
+    switch (mode) {
+      case LOW:
+        EIC->NMICTRL.bit.NMISENSE = EIC_NMICTRL_NMISENSE_LOW;
+        break;
 
-  // Assign pin to EIC
-  pinPeripheral(pin, PIO_EXTINT);
+      case HIGH:
+        EIC->NMICTRL.bit.NMISENSE = EIC_NMICTRL_NMISENSE_HIGH;
+        break;
 
-  // Assign callback to interrupt
-  callbacksInt[in] = callback;
+      case CHANGE:
+        EIC->NMICTRL.bit.NMISENSE = EIC_NMICTRL_NMISENSE_BOTH;
+        break;
 
-  // Look for right CONFIG register to be addressed
-  if (in > EXTERNAL_INT_7) {
-    config = 1;
-  } else {
-    config = 0;
-  }
+      case FALLING:
+        EIC->NMICTRL.bit.NMISENSE = EIC_NMICTRL_NMISENSE_FALL;
+        break;
 
-  // Configure the interrupt mode
-  pos = (in - (8 * config)) << 2;
-  switch (mode)
-  {
-    case LOW:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_LOW_Val << pos;
-      break;
+      case RISING:
+        EIC->NMICTRL.bit.NMISENSE = EIC_NMICTRL_NMISENSE_RISE;
+        break;
+    }
 
-    case HIGH:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_HIGH_Val << pos;
-      break;
+    // Assign callback to interrupt
+    callbacksInt[EXTERNAL_INT_NMI] = callback;
 
-    case CHANGE:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_BOTH_Val << pos;
-      break;
+  } else { // Not NMI, is external interrupt
 
-    case FALLING:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_FALL_Val << pos;
-      break;
+    // Enable wakeup capability on pin in case being used during sleep
+    EIC->WAKEUP.reg |= (1 << in);
 
-    case RISING:
-      EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_RISE_Val << pos;
-      break;
-  }
+    // Assign pin to EIC
+    pinPeripheral(pin, PIO_EXTINT);
+
+    // Look for right CONFIG register to be addressed
+    if (in > EXTERNAL_INT_7) {
+      config = 1;
+    } else {
+      config = 0;
+    }
+
+    // Configure the interrupt mode
+    pos = (in - (8 * config)) << 2;
+    switch (mode)
+    {
+      case LOW:
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_LOW_Val << pos;
+        break;
+
+      case HIGH:
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_HIGH_Val << pos;
+        break;
+
+      case CHANGE:
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_BOTH_Val << pos;
+        break;
+
+      case FALLING:
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_FALL_Val << pos;
+        break;
 
-  // Enable the interrupt
-  EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << in);
+      case RISING:
+        EIC->CONFIG[config].reg |= EIC_CONFIG_SENSE0_RISE_Val << pos;
+        break;
+    }
+
+    // Enable the interrupt
+    EIC->INTENSET.reg = EIC_INTENSET_EXTINT(1 << in);
+
+    // Assign callback to interrupt
+    callbacksInt[in] = callback;
+  }
 }
 
 /*
@@ -125,13 +154,16 @@ void detachInterrupt(uint32_t pin)
 #else
   EExt_Interrupts in = digitalPinToInterrupt(pin);
 #endif 
-  if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
-    return;
+  if (in == NOT_AN_INTERRUPT) return;
 
-  EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
+  if(in == EXTERNAL_INT_NMI) {
+    EIC->NMICTRL.bit.NMISENSE = 0; // Turn off detection
+  } else {
+    EIC->INTENCLR.reg = EIC_INTENCLR_EXTINT(1 << in);
 
-  // Disable wakeup capability on pin during sleep
-  EIC->WAKEUP.reg &= ~(1 << in);
+    // Disable wakeup capability on pin during sleep
+    EIC->WAKEUP.reg &= ~(1 << in);
+  }
 }
 
 /*
@@ -154,3 +186,12 @@ void EIC_Handler(void)
     }
   }
 }
+
+/*
+ * NMI Interrupt Handler
+ */
+void NMI_Handler(void)
+{
+  if (callbacksInt[EXTERNAL_INT_NMI]) callbacksInt[EXTERNAL_INT_NMI]();
+  EIC->NMIFLAG.bit.NMI = 1; // Clear interrupt
+}