diff --git a/Adafruit_SPIDevice.cpp b/Adafruit_SPIDevice.cpp index 44d80ec..f39627a 100644 --- a/Adafruit_SPIDevice.cpp +++ b/Adafruit_SPIDevice.cpp @@ -16,8 +16,8 @@ * @param theSPI The SPI bus to use, defaults to &theSPI */ Adafruit_SPIDevice::Adafruit_SPIDevice(int8_t cspin, uint32_t freq, - BitOrder dataOrder, uint8_t dataMode, - SPIClass *theSPI) { + BusIOBitOrder dataOrder, + uint8_t dataMode, SPIClass *theSPI) { _cs = cspin; _sck = _mosi = _miso = -1; _spi = theSPI; @@ -43,7 +43,7 @@ Adafruit_SPIDevice::Adafruit_SPIDevice(int8_t cspin, uint32_t freq, */ Adafruit_SPIDevice::Adafruit_SPIDevice(int8_t cspin, int8_t sckpin, int8_t misopin, int8_t mosipin, - uint32_t freq, BitOrder dataOrder, + uint32_t freq, BusIOBitOrder dataOrder, uint8_t dataMode) { _cs = cspin; _sck = sckpin; diff --git a/Adafruit_SPIDevice.h b/Adafruit_SPIDevice.h index 3dbddec..ff4a4c0 100644 --- a/Adafruit_SPIDevice.h +++ b/Adafruit_SPIDevice.h @@ -14,11 +14,12 @@ defined(ARDUINO_AVR_ATmega4808) || defined(ARDUINO_AVR_ATmega3209) || \ defined(ARDUINO_AVR_ATmega3208) || defined(ARDUINO_AVR_ATmega1609) || \ defined(ARDUINO_AVR_ATmega1608) || defined(ARDUINO_AVR_ATmega809) || \ - defined(ARDUINO_AVR_ATmega808) + defined(ARDUINO_AVR_ATmega808) || defined(ARDUINO_ARCH_ARC32) + typedef enum _BitOrder { SPI_BITORDER_MSBFIRST = MSBFIRST, SPI_BITORDER_LSBFIRST = LSBFIRST, -} BitOrder; +} BusIOBitOrder; #elif defined(ESP32) || defined(__ASR6501__) @@ -27,7 +28,7 @@ typedef enum _BitOrder { typedef enum _BitOrder { SPI_BITORDER_MSBFIRST = SPI_MSBFIRST, SPI_BITORDER_LSBFIRST = SPI_LSBFIRST, -} BitOrder; +} BusIOBitOrder; #else // Some platforms have a BitOrder enum but its named MSBFIRST/LSBFIRST @@ -62,12 +63,12 @@ typedef uint32_t BusIO_PortMask; class Adafruit_SPIDevice { public: Adafruit_SPIDevice(int8_t cspin, uint32_t freq = 1000000, - BitOrder dataOrder = SPI_BITORDER_MSBFIRST, + BusIOBitOrder dataOrder = SPI_BITORDER_MSBFIRST, uint8_t dataMode = SPI_MODE0, SPIClass *theSPI = &SPI); Adafruit_SPIDevice(int8_t cspin, int8_t sck, int8_t miso, int8_t mosi, uint32_t freq = 1000000, - BitOrder dataOrder = SPI_BITORDER_MSBFIRST, + BusIOBitOrder dataOrder = SPI_BITORDER_MSBFIRST, uint8_t dataMode = SPI_MODE0); ~Adafruit_SPIDevice(); @@ -88,7 +89,7 @@ private: SPIClass *_spi; SPISettings *_spiSetting; uint32_t _freq; - BitOrder _dataOrder; + BusIOBitOrder _dataOrder; uint8_t _dataMode; int8_t _cs, _sck, _mosi, _miso;