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

Merge pull request #16 from AnHardt/ByteOrder 

Rename **bit**order -> **byte**order
This commit is contained in:
Limor "Ladyada" Fried 2020-03-12 07:20:13 -04:00 committed by GitHub
parent 626b1a8e6d 1a2af57ab4
commit 2381c86fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Adafruit_BusIO_Register.cpp
View File

@ -7,7 +7,7 @@
* @param reg_addr The address pointer value for the I2C/SMBus register, can * @param reg_addr The address pointer value for the I2C/SMBus register, can
* be 8 or 16 bits * be 8 or 16 bits
* @param width The width of the register data itself, defaults to 1 byte * @param width The width of the register data itself, defaults to 1 byte
* @param bitorder The bit order of the register (used when width is > 1), * @param byteorder The byte order of the register (used when width is > 1),
* defaults to LSBFIRST * defaults to LSBFIRST
* @param address_width The width of the register address itself, defaults * @param address_width The width of the register address itself, defaults
* to 1 byte * to 1 byte
@ -15,26 +15,26 @@
Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice, Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice,
uint16_t reg_addr, uint16_t reg_addr,
uint8_t width, uint8_t width,
uint8_t bitorder, uint8_t byteorder,
uint8_t address_width) { uint8_t address_width) {
_i2cdevice = i2cdevice; _i2cdevice = i2cdevice;
_spidevice = NULL; _spidevice = NULL;
_addrwidth = address_width; _addrwidth = address_width;
_address = reg_addr; _address = reg_addr;
_bitorder = bitorder; _byteorder = byteorder;
_width = width; _width = width;
} }
/*! /*!
* @brief Create a register we access over an SPI Device (which defines the * @brief Create a register we access over an SPI Device (which defines the
* bus and CS pin) * bus and CS pin)
* @param spidevice The SPIDevice to use for underlying I2C access * @param spidevice The SPIDevice to use for underlying SPI access
* @param reg_addr The address pointer value for the I2C/SMBus register, can * @param reg_addr The address pointer value for the SPI register, can
* be 8 or 16 bits * be 8 or 16 bits
* @param type The method we use to read/write data to SPI (which is not * @param type The method we use to read/write data to SPI (which is not
* as well defined as I2C) * as well defined as I2C)
* @param width The width of the register data itself, defaults to 1 byte * @param width The width of the register data itself, defaults to 1 byte
* @param bitorder The bit order of the register (used when width is > 1), * @param byteorder The byte order of the register (used when width is > 1),
* defaults to LSBFIRST * defaults to LSBFIRST
* @param address_width The width of the register address itself, defaults * @param address_width The width of the register address itself, defaults
* to 1 byte * to 1 byte
@ -43,14 +43,14 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice,
uint16_t reg_addr, uint16_t reg_addr,
Adafruit_BusIO_SPIRegType type, Adafruit_BusIO_SPIRegType type,
uint8_t width, uint8_t width,
uint8_t bitorder, uint8_t byteorder,
uint8_t address_width) { uint8_t address_width) {
_spidevice = spidevice; _spidevice = spidevice;
_spiregtype = type; _spiregtype = type;
_i2cdevice = NULL; _i2cdevice = NULL;
_addrwidth = address_width; _addrwidth = address_width;
_address = reg_addr; _address = reg_addr;
_bitorder = bitorder; _byteorder = byteorder;
_width = width; _width = width;
} }
@ -60,14 +60,14 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice,
* libraries to mass-define all the registers * libraries to mass-define all the registers
* @param i2cdevice The I2CDevice to use for underlying I2C access, if NULL * @param i2cdevice The I2CDevice to use for underlying I2C access, if NULL
* we use SPI * we use SPI
* @param spidevice The SPIDevice to use for underlying I2C access, if NULL * @param spidevice The SPIDevice to use for underlying SPI access, if NULL
* we use I2C * we use I2C
* @param reg_addr The address pointer value for the I2C/SMBus register, can * @param reg_addr The address pointer value for the I2C/SMBus/SPI register,
* be 8 or 16 bits * can be 8 or 16 bits
* @param type The method we use to read/write data to SPI (which is not * @param type The method we use to read/write data to SPI (which is not
* as well defined as I2C) * as well defined as I2C)
* @param width The width of the register data itself, defaults to 1 byte * @param width The width of the register data itself, defaults to 1 byte
* @param bitorder The bit order of the register (used when width is > 1), * @param byteorder The byte order of the register (used when width is > 1),
* defaults to LSBFIRST * defaults to LSBFIRST
* @param address_width The width of the register address itself, defaults * @param address_width The width of the register address itself, defaults
* to 1 byte * to 1 byte
@ -75,13 +75,13 @@ Adafruit_BusIO_Register::Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice,
Adafruit_BusIO_Register::Adafruit_BusIO_Register( Adafruit_BusIO_Register::Adafruit_BusIO_Register(
Adafruit_I2CDevice *i2cdevice, Adafruit_SPIDevice *spidevice, Adafruit_I2CDevice *i2cdevice, Adafruit_SPIDevice *spidevice,
Adafruit_BusIO_SPIRegType type, uint16_t reg_addr, uint8_t width, Adafruit_BusIO_SPIRegType type, uint16_t reg_addr, uint8_t width,
uint8_t bitorder, uint8_t address_width) { uint8_t byteorder, uint8_t address_width) {
_spidevice = spidevice; _spidevice = spidevice;
_i2cdevice = i2cdevice; _i2cdevice = i2cdevice;
_spiregtype = type; _spiregtype = type;
_addrwidth = address_width; _addrwidth = address_width;
_address = reg_addr; _address = reg_addr;
_bitorder = bitorder; _byteorder = byteorder;
_width = width; _width = width;
} }
@ -132,7 +132,7 @@ bool Adafruit_BusIO_Register::write(uint32_t value, uint8_t numbytes) {
} }
for (int i = 0; i < numbytes; i++) { for (int i = 0; i < numbytes; i++) {
if (_bitorder == LSBFIRST) { if (_byteorder == LSBFIRST) {
_buffer[i] = value & 0xFF; _buffer[i] = value & 0xFF;
} else { } else {
_buffer[numbytes - i - 1] = value & 0xFF; _buffer[numbytes - i - 1] = value & 0xFF;
@ -156,7 +156,7 @@ uint32_t Adafruit_BusIO_Register::read(void) {
for (int i = 0; i < _width; i++) { for (int i = 0; i < _width; i++) {
value <<= 8; value <<= 8;
if (_bitorder == LSBFIRST) { if (_byteorder == LSBFIRST) {
value |= _buffer[_width - i - 1]; value |= _buffer[_width - i - 1];
} else { } else {
value |= _buffer[i]; value |= _buffer[i];
@ -206,7 +206,7 @@ bool Adafruit_BusIO_Register::read(uint16_t *value) {
return false; return false;
} }
if (_bitorder == LSBFIRST) { if (_byteorder == LSBFIRST) {
*value = _buffer[1]; *value = _buffer[1];
*value <<= 8; *value <<= 8;
*value |= _buffer[0]; *value |= _buffer[0];

8
Adafruit_BusIO_Register.h
View File

@ -18,17 +18,17 @@ typedef enum _Adafruit_BusIO_SPIRegType {
class Adafruit_BusIO_Register { class Adafruit_BusIO_Register {
public: public:
Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice, uint16_t reg_addr, Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice, uint16_t reg_addr,
uint8_t width = 1, uint8_t bitorder = LSBFIRST, uint8_t width = 1, uint8_t byteorder = LSBFIRST,
uint8_t address_width = 1); uint8_t address_width = 1);
Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice, uint16_t reg_addr, Adafruit_BusIO_Register(Adafruit_SPIDevice *spidevice, uint16_t reg_addr,
Adafruit_BusIO_SPIRegType type, uint8_t width = 1, Adafruit_BusIO_SPIRegType type, uint8_t width = 1,
uint8_t bitorder = LSBFIRST, uint8_t byteorder = LSBFIRST,
uint8_t address_width = 1); uint8_t address_width = 1);
Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice, Adafruit_BusIO_Register(Adafruit_I2CDevice *i2cdevice,
Adafruit_SPIDevice *spidevice, Adafruit_SPIDevice *spidevice,
Adafruit_BusIO_SPIRegType type, uint16_t reg_addr, Adafruit_BusIO_SPIRegType type, uint16_t reg_addr,
uint8_t width = 1, uint8_t bitorder = LSBFIRST, uint8_t width = 1, uint8_t byteorder = LSBFIRST,
uint8_t address_width = 1); uint8_t address_width = 1);
bool read(uint8_t *buffer, uint8_t len); bool read(uint8_t *buffer, uint8_t len);
@ -48,7 +48,7 @@ private:
Adafruit_SPIDevice *_spidevice; Adafruit_SPIDevice *_spidevice;
Adafruit_BusIO_SPIRegType _spiregtype; Adafruit_BusIO_SPIRegType _spiregtype;
uint16_t _address; uint16_t _address;
uint8_t _width, _addrwidth, _bitorder; uint8_t _width, _addrwidth, _byteorder;
uint8_t _buffer[4]; // we wont support anything larger than uint32 for uint8_t _buffer[4]; // we wont support anything larger than uint32 for
// non-buffered read // non-buffered read
}; };