From 49f0d6716127d58c80e46445e75484e6677349fe Mon Sep 17 00:00:00 2001 From: Sandeep Mistry <s.mistry@arduino.cc> Date: Wed, 6 Apr 2016 13:39:49 -0400 Subject: [PATCH] Bump ARDUINO_SAMD_VARIANT_COMPLIANCE to 100606 --- VARIANT_COMPLIANCE_CHANGELOG | 2 +- cores/arduino/Arduino.h | 2 +- cores/arduino/WInterrupts.c | 4 ++-- variants/arduino_zero/variant.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VARIANT_COMPLIANCE_CHANGELOG b/VARIANT_COMPLIANCE_CHANGELOG index 0b13a212..bf1c2fe2 100644 --- a/VARIANT_COMPLIANCE_CHANGELOG +++ b/VARIANT_COMPLIANCE_CHANGELOG @@ -1,4 +1,4 @@ -SAMD CORE 1.6.5 +SAMD CORE 1.6.6 * digitalPinToInterrupt #define moved to Arduino.h, variant.h must no longer define it diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index 97a1342f..3bafdb5f 100644 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -114,7 +114,7 @@ void loop( void ) ; #define bit(b) (1UL << (b)) -#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10605) +#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606) // Interrupts #define digitalPinToInterrupt(P) ( P ) #endif diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c index 430195ca..70d9acd0 100644 --- a/cores/arduino/WInterrupts.c +++ b/cores/arduino/WInterrupts.c @@ -57,7 +57,7 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode) uint32_t config; uint32_t pos; -#if ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10605 +#if ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606 EExt_Interrupts in = g_APinDescription[pin].ulExtInt; #else EExt_Interrupts in = digitalPinToInterrupt(pin); @@ -120,7 +120,7 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode) */ void detachInterrupt(uint32_t pin) { -#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10605) +#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606) EExt_Interrupts in = g_APinDescription[pin].ulExtInt; #else EExt_Interrupts in = digitalPinToInterrupt(pin); diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h index 8bfe71c5..cb88edb2 100644 --- a/variants/arduino_zero/variant.h +++ b/variants/arduino_zero/variant.h @@ -19,8 +19,8 @@ #ifndef _VARIANT_ARDUINO_ZERO_ #define _VARIANT_ARDUINO_ZERO_ -// The definitions here needs a SAMD core >=1.6.5 -#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10605 +// The definitions here needs a SAMD core >=1.6.6 +#define ARDUINO_SAMD_VARIANT_COMPLIANCE 10606 /*---------------------------------------------------------------------------- * Definitions -- GitLab