From e2237ec32c29d845f280299eeb5e61fd12dcbbc3 Mon Sep 17 00:00:00 2001 From: ladyada Date: Sat, 18 May 2019 03:10:14 -0400 Subject: [PATCH] swap around args for mixed use register --- Adafruit_BusIO_Register.cpp | 2 +- Adafruit_BusIO_Register.h | 2 +- examples/i2corspi_register/i2corspi_register.ino | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Adafruit_BusIO_Register.cpp b/Adafruit_BusIO_Register.cpp index 9887c17..d46f252 100644 --- a/Adafruit_BusIO_Register.cpp +++ b/Adafruit_BusIO_Register.cpp @@ -23,7 +23,7 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice, } Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice, Adafruit_SPIDevice *spidevice, - uint16_t reg_addr, Adafruit_BusIO_SPIRegType type, + Adafruit_BusIO_SPIRegType type, uint16_t reg_addr, uint8_t width, uint8_t bitorder, uint8_t address_width) { _spidevice = spidevice; _i2cdevice = i2cdevice; diff --git a/Adafruit_BusIO_Register.h b/Adafruit_BusIO_Register.h index 0fdb122..8ae2325 100644 --- a/Adafruit_BusIO_Register.h +++ b/Adafruit_BusIO_Register.h @@ -22,8 +22,8 @@ class Adafruit_BusIO_Register { Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice, Adafruit_SPIDevice *spidevice, - uint16_t reg_addr, Adafruit_BusIO_SPIRegType type, + uint16_t reg_addr, uint8_t width=1, uint8_t bitorder=LSBFIRST, uint8_t address_width=1); diff --git a/examples/i2corspi_register/i2corspi_register.ino b/examples/i2corspi_register/i2corspi_register.ino index 1e3e070..555cf3b 100644 --- a/examples/i2corspi_register/i2corspi_register.ino +++ b/examples/i2corspi_register/i2corspi_register.ino @@ -27,7 +27,7 @@ void setup() { } } - Adafruit_BusIO_Register id_reg = Adafruit_BusIO_Register(i2c_dev, spi_dev, 0x0F, ADDRBIT8_HIGH_TOREAD); + Adafruit_BusIO_Register id_reg = Adafruit_BusIO_Register(i2c_dev, spi_dev, ADDRBIT8_HIGH_TOREAD, 0x0F); uint8_t id; id_reg.read(&id); Serial.print("ID register = 0x"); Serial.println(id, HEX);