Cansat
/
esp32_Adafruit_BusIO
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56 from adafruit/renamebitorder 

Renamebitorder
This commit is contained in:
Limor "Ladyada" Fried 2021-07-17 16:18:34 -04:00 committed by GitHub
parent 0ba57611c6 d33a16468f
commit 14f6a3940b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Adafruit_SPIDevice.cpp
View File

@ -16,8 +16,8 @@
* @param theSPI The SPI bus to use, defaults to &theSPI * @param theSPI The SPI bus to use, defaults to &theSPI
*/ */
Adafruit_SPIDevice::Adafruit_SPIDevice(int8_t cspin, uint32_t freq, Adafruit_SPIDevice::Adafruit_SPIDevice(int8_t cspin, uint32_t freq,
BitOrder dataOrder, uint8_t dataMode, BusIOBitOrder dataOrder,
SPIClass *theSPI) { uint8_t dataMode, SPIClass *theSPI) {
_cs = cspin; _cs = cspin;
_sck = _mosi = _miso = -1; _sck = _mosi = _miso = -1;
_spi = theSPI; _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, Adafruit_SPIDevice::Adafruit_SPIDevice(int8_t cspin, int8_t sckpin,
int8_t misopin, int8_t mosipin, int8_t misopin, int8_t mosipin,
uint32_t freq, BitOrder dataOrder, uint32_t freq, BusIOBitOrder dataOrder,
uint8_t dataMode) { uint8_t dataMode) {
_cs = cspin; _cs = cspin;
_sck = sckpin; _sck = sckpin;

14
Adafruit_SPIDevice.h
View File

@ -14,11 +14,12 @@
defined(ARDUINO_AVR_ATmega4808) || defined(ARDUINO_AVR_ATmega3209) || \ defined(ARDUINO_AVR_ATmega4808) || defined(ARDUINO_AVR_ATmega3209) || \
defined(ARDUINO_AVR_ATmega3208) || defined(ARDUINO_AVR_ATmega1609) || \ defined(ARDUINO_AVR_ATmega3208) || defined(ARDUINO_AVR_ATmega1609) || \
defined(ARDUINO_AVR_ATmega1608) || defined(ARDUINO_AVR_ATmega809) || \ defined(ARDUINO_AVR_ATmega1608) || defined(ARDUINO_AVR_ATmega809) || \
defined(ARDUINO_AVR_ATmega808) defined(ARDUINO_AVR_ATmega808) || defined(ARDUINO_ARCH_ARC32)
typedef enum _BitOrder { typedef enum _BitOrder {
SPI_BITORDER_MSBFIRST = MSBFIRST, SPI_BITORDER_MSBFIRST = MSBFIRST,
SPI_BITORDER_LSBFIRST = LSBFIRST, SPI_BITORDER_LSBFIRST = LSBFIRST,
} BitOrder; } BusIOBitOrder;
#elif defined(ESP32) || defined(__ASR6501__) #elif defined(ESP32) || defined(__ASR6501__)
@ -27,12 +28,13 @@ typedef enum _BitOrder {
typedef enum _BitOrder { typedef enum _BitOrder {
SPI_BITORDER_MSBFIRST = SPI_MSBFIRST, SPI_BITORDER_MSBFIRST = SPI_MSBFIRST,
SPI_BITORDER_LSBFIRST = SPI_LSBFIRST, SPI_BITORDER_LSBFIRST = SPI_LSBFIRST,
} BitOrder; } BusIOBitOrder;
#else #else
// Some platforms have a BitOrder enum but its named MSBFIRST/LSBFIRST // Some platforms have a BitOrder enum but its named MSBFIRST/LSBFIRST
#define SPI_BITORDER_MSBFIRST MSBFIRST #define SPI_BITORDER_MSBFIRST MSBFIRST
#define SPI_BITORDER_LSBFIRST LSBFIRST #define SPI_BITORDER_LSBFIRST LSBFIRST
typedef BitOrder BusIOBitOrder;
#endif #endif
#if defined(__AVR__) || defined(TEENSYDUINO) #if defined(__AVR__) || defined(TEENSYDUINO)
@ -62,12 +64,12 @@ typedef uint32_t BusIO_PortMask;
class Adafruit_SPIDevice { class Adafruit_SPIDevice {
public: public:
Adafruit_SPIDevice(int8_t cspin, uint32_t freq = 1000000, 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); uint8_t dataMode = SPI_MODE0, SPIClass *theSPI = &SPI);
Adafruit_SPIDevice(int8_t cspin, int8_t sck, int8_t miso, int8_t mosi, Adafruit_SPIDevice(int8_t cspin, int8_t sck, int8_t miso, int8_t mosi,
uint32_t freq = 1000000, uint32_t freq = 1000000,
BitOrder dataOrder = SPI_BITORDER_MSBFIRST, BusIOBitOrder dataOrder = SPI_BITORDER_MSBFIRST,
uint8_t dataMode = SPI_MODE0); uint8_t dataMode = SPI_MODE0);
~Adafruit_SPIDevice(); ~Adafruit_SPIDevice();
@ -88,7 +90,7 @@ private:
SPIClass *_spi; SPIClass *_spi;
SPISettings *_spiSetting; SPISettings *_spiSetting;
uint32_t _freq; uint32_t _freq;
BitOrder _dataOrder; BusIOBitOrder _dataOrder;
uint8_t _dataMode; uint8_t _dataMode;
int8_t _cs, _sck, _mosi, _miso; int8_t _cs, _sck, _mosi, _miso;