src/Aunit{,Verbose}.h: Re-add support for arduino:samd, once 1.8.12 i…

…s released (see #66)
bxparks · Apr 2, 2021 · 64e446a · 64e446a
1 parent a648173
commit 64e446a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/AUnit.h b/src/AUnit.h
@@ -46,12 +46,15 @@ SOFTWARE.
 #define AUNIT_AUNIT_H
 
 // Blacklist boards using new Arduino API due to incompatibilities. This
-// currently includes all megaAVR boards and SAMD21 boards using arduino::samd
-// >= 1.8.10. Boards using arduino:samd <= 1.8.9 or SparkFun:samd are fine.
+// currently includes all megaAVR boards, and SAMD21 boards using arduino:samd
+// versions in [1.8.10, 1.8.11]. Boards using arduino:samd <= 1.8.9, >= 1.8.12,
+// or SparkFun:samd are fine.
 #if defined(ARDUINO_ARCH_MEGAAVR)
 #error MegaAVR not supported, https://github.com/bxparks/AUnit/issues/56
-#elif defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_API_VERSION)
-#error SAMD21 with arduino:samd >= 1.8.10 not supported, https://github.com/bxparks/AUnit/issues/66
+#elif defined(ARDUINO_ARCH_SAMD) \
+  && defined(ARDUINO_API_VERSION) \
+  && ARDUINO_API_VERSION <= 10200
+#error SAMD21 with arduino:samd versions [1.8.10, 1.8.11] not supported, https://github.com/bxparks/AUnit/issues/66
 #endif
 
 #include "aunit/print64.h"

diff --git a/src/AUnitVerbose.h b/src/AUnitVerbose.h
@@ -36,12 +36,15 @@ SOFTWARE.
 #define AUNIT_AUNIT_VERBOSE_H
 
 // Blacklist boards using new Arduino API due to incompatibilities. This
-// currently includes all megaAVR boards and SAMD21 boards using arduino::samd
-// >= 1.8.10. Boards using arduino:samd <= 1.8.9 or SparkFun:samd are fine.
+// currently includes all megaAVR boards, and SAMD21 boards using arduino:samd
+// versions in [1.8.10, 1.8.11]. Boards using arduino:samd <= 1.8.9, >= 1.8.12,
+// or SparkFun:samd are fine.
 #if defined(ARDUINO_ARCH_MEGAAVR)
-#error MegaAVR not supported https://github.com/bxparks/AUnit/issues/56
-#elif defined(ARDUINO_ARCH_SAMD) && defined(ARDUINO_API_VERSION)
-#error SAMD21 with arduino:samd >= 1.8.10 not supported, see https://github.com/bxparks/AUnit/issues/66
+#error MegaAVR not supported, https://github.com/bxparks/AUnit/issues/56
+#elif defined(ARDUINO_ARCH_SAMD) \
+  && defined(ARDUINO_API_VERSION) \
+  && ARDUINO_API_VERSION <= 10200
+#error SAMD21 with arduino:samd versions [1.8.10, 1.8.11] not supported, https://github.com/bxparks/AUnit/issues/66
 #endif
 
 #include "aunit/print64.h"