adafruit-mirror/arduino-pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set available() to 0 when Wire.requestFrom fails (#259)

Browse source 
Wire::requestFrom() returns the number of bytes read from the slave.  In
the case of error, the slave can end up returning a very large integer
for PICO_GENERIC_ERROR which would then be used as the # of bytes read
causing crashes and errors.

Running TalkingToMyself without connecting the I2C ports would show
this behavior.

Now, when PICO_GENERIC_ERROR is returned, set the read-back buffer len
to 0 explicitly.
This commit is contained in:
Earle F. Philhower, III 2021-07-21 18:59:24 -07:00 committed by GitHub
parent 6b6254e84a
commit cb9931f3e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/Wire/Wire.cpp
View file

@ -192,6 +192,7 @@ void TwoWire::beginTransmission(uint8_t addr) {
} }
_addr = addr; _addr = addr;
_buffLen = 0; _buffLen = 0;
_buffOff = 0;
_txBegun = true; _txBegun = true;
} }
@ -201,6 +202,9 @@ size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) {
} }
_buffLen = i2c_read_blocking_until(_i2c, address, _buff, quantity, !stopBit, make_timeout_time_ms(50)); _buffLen = i2c_read_blocking_until(_i2c, address, _buff, quantity, !stopBit, make_timeout_time_ms(50));
if (_buffLen == PICO_ERROR_GENERIC) {
_buffLen = 0;
}
_buffOff = 0; _buffOff = 0;
return _buffLen; return _buffLen;
} }