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

Merge pull request #65 from caternuson/busio_better_chunk 

Update chunk
This commit is contained in:
Carter Nelson 2021-09-27 12:15:59 -07:00 committed by GitHub
parent b903c7e015 418887036b
commit cb21cf5979
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Adafruit_I2CDevice.cpp
View File

@ -77,10 +77,19 @@ bool Adafruit_I2CDevice::detected(void) {
bool Adafruit_I2CDevice::write(const uint8_t *buffer, size_t len, bool stop,
const uint8_t *prefix_buffer,
size_t prefix_len) {
if ((len + prefix_len) > maxBufferSize()) {
// currently not guaranteed to work if more than 32 bytes!
// we will need to find out if some platforms have larger
// I2C buffer sizes :/
#ifdef DEBUG_SERIAL
DEBUG_SERIAL.println(F("\tI2CDevice could not write such a large buffer"));
#endif
return false;
}
_wire->beginTransmission(_addr);
// Write the prefix data (usually an address)
// This is required to be less than _maxBufferSize, so no need to chunkify
if ((prefix_len != 0) && (prefix_buffer != NULL)) {
if (_wire->write(prefix_buffer, prefix_len) != prefix_len) {
#ifdef DEBUG_SERIAL
@ -90,32 +99,14 @@ bool Adafruit_I2CDevice::write(const uint8_t *buffer, size_t len, bool stop,
}
}
// Write the data itself, chunkify if needed
size_t bufferSize = maxBufferSize();
if (bufferSize >= len) {
// can just write
// Write the data itself
if (_wire->write(buffer, len) != len) {
#ifdef DEBUG_SERIAL
DEBUG_SERIAL.println(F("\tI2CDevice failed to write"));
#endif
return false;
}
} else {
// must chunkify
size_t pos = 0;
uint8_t write_buffer[bufferSize];
while (pos < len) {
size_t write_len = len - pos > bufferSize ? bufferSize : len - pos;
for (size_t i = 0; i < write_len; i++)
write_buffer[i] = buffer[pos++];
if (_wire->write(write_buffer, write_len) != write_len) {
#ifdef DEBUG_SERIAL
DEBUG_SERIAL.println(F("\tI2CDevice failed to write"));
#endif
return false;
}
}
}
#ifdef DEBUG_SERIAL
DEBUG_SERIAL.print(F("\tI2CWRITE @ 0x"));
@ -146,7 +137,7 @@ bool Adafruit_I2CDevice::write(const uint8_t *buffer, size_t len, bool stop,
if (_wire->endTransmission(stop) == 0) {
#ifdef DEBUG_SERIAL
DEBUG_SERIAL.println("Sent!");
// DEBUG_SERIAL.println("Sent!");
#endif
return true;
} else {
@ -166,25 +157,17 @@ bool Adafruit_I2CDevice::write(const uint8_t *buffer, size_t len, bool stop,
* @return True if read was successful, otherwise false.
*/
bool Adafruit_I2CDevice::read(uint8_t *buffer, size_t len, bool stop) {
size_t bufferSize = maxBufferSize();
if (bufferSize >= len) {
// can just read
return _read(buffer, len, stop);
} else {
// must chunkify
size_t pos = 0;
uint8_t read_buffer[bufferSize];
while (pos < len) {
size_t read_len = len - pos > bufferSize ? bufferSize : len - pos;
if (!_read(read_buffer, read_len, false)) {
size_t read_len =
((len - pos) > maxBufferSize()) ? maxBufferSize() : (len - pos);
bool read_stop = (pos < (len - read_len)) ? false : stop;
if (!_read(buffer + pos, read_len, read_stop))
return false;
}
for (size_t i = 0; i < read_len; i++)
buffer[pos++] = read_buffer[i];
pos += read_len;
}
return true;
}
}
bool Adafruit_I2CDevice::_read(uint8_t *buffer, size_t len, bool stop) {
#if defined(TinyWireM_h)

2
library.properties
View File

@ -1,5 +1,5 @@
name=Adafruit BusIO
version=1.9.1
version=1.9.2
author=Adafruit
maintainer=Adafruit <info@adafruit.com>
sentence=This is a library for abstracting away UART, I2C and SPI interfacing