From 03b2c978a4b2d033b91098c1c3c9052313132ce5 Mon Sep 17 00:00:00 2001 From: lady ada Date: Sat, 30 May 2020 20:21:42 -0400 Subject: [PATCH] make ifdef for SPI defs from over-greedy --- Adafruit_SPIDevice.h | 10 +++------- library.properties | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Adafruit_SPIDevice.h b/Adafruit_SPIDevice.h index 65fd2e5..5485114 100644 --- a/Adafruit_SPIDevice.h +++ b/Adafruit_SPIDevice.h @@ -13,22 +13,18 @@ typedef enum _BitOrder { SPI_BITORDER_MSBFIRST = MSBFIRST, SPI_BITORDER_LSBFIRST = LSBFIRST, } BitOrder; -#endif + +#elif defined(ESP32) // some modern SPI definitions don't have BitOrder enum and have different SPI // mode defines -#if defined(ESP32) typedef enum _BitOrder { SPI_BITORDER_MSBFIRST = SPI_MSBFIRST, SPI_BITORDER_LSBFIRST = SPI_LSBFIRST, } BitOrder; -#endif +#else // Some platforms have a BitOrder enum but its named MSBFIRST/LSBFIRST -#if defined(ARDUINO_ARCH_SAMD) || defined(__SAM3X8E__) || \ - defined(NRF52_SERIES) || defined(ARDUINO_ARCH_ARDUINO_CORE_STM32) || \ - defined(ARDUINO_ARCH_MEGAAVR) || defined(_STM32_DEF_) || \ - defined(XMC_BOARD) #define SPI_BITORDER_MSBFIRST MSBFIRST #define SPI_BITORDER_LSBFIRST LSBFIRST #endif diff --git a/library.properties b/library.properties index 1f3e19a..c693a5f 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit BusIO -version=1.3.1 +version=1.3.2 author=Adafruit maintainer=Adafruit sentence=This is a library for abstracting away UART, I2C and SPI interfacing