Skip to content

Commit ad77648

Browse files
committed
Merge branch 'master' of github.com:adafruit/Adafruit_BusIO
2 parents fbba479 + ee0faec commit ad77648

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Adafruit_I2CDevice.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Adafruit_I2CDevice::Adafruit_I2CDevice(uint8_t addr, TwoWire *theWire) {
2323
/*!
2424
* @brief Initializes and does basic address detection
2525
* @param addr_detect Whether we should attempt to detect the I2C address
26-
* with a scan. 99% of sensors/devices don't mind but once in a while, they spaz
27-
* on a scan!
26+
* with a scan. 99% of sensors/devices don't mind, but once in a while they
27+
* don't respond well to a scan!
2828
* @return True if I2C initialized and a device with the addr found
2929
*/
3030
bool Adafruit_I2CDevice::begin(bool addr_detect) {

Adafruit_SPIDevice.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ typedef uint8_t SPIClass;
2222
defined(ARDUINO_AVR_ATmega4808) || defined(ARDUINO_AVR_ATmega3209) || \
2323
defined(ARDUINO_AVR_ATmega3208) || defined(ARDUINO_AVR_ATmega1609) || \
2424
defined(ARDUINO_AVR_ATmega1608) || defined(ARDUINO_AVR_ATmega809) || \
25-
defined(ARDUINO_AVR_ATmega808) || defined(ARDUINO_ARCH_ARC32)
25+
defined(ARDUINO_AVR_ATmega808) || defined(ARDUINO_ARCH_ARC32) || \
26+
defined(ARDUINO_ARCH_XMC)
2627

2728
typedef enum _BitOrder {
2829
SPI_BITORDER_MSBFIRST = MSBFIRST,
@@ -57,6 +58,9 @@ typedef BitOrder BusIOBitOrder;
5758
// typedef uint32_t BusIO_PortMask;
5859
//#define BUSIO_USE_FAST_PINIO
5960

61+
#elif defined(ARDUINO_ARCH_XMC)
62+
#undef BUSIO_USE_FAST_PINIO
63+
6064
#elif defined(__AVR__) || defined(TEENSYDUINO)
6165
typedef volatile uint8_t BusIO_PortReg;
6266
typedef uint8_t BusIO_PortMask;

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Adafruit BusIO
2-
version=1.14.3
2+
version=1.14.4
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=This is a library for abstracting away UART, I2C and SPI interfacing

0 commit comments

Comments
 (0)