Fix Wire::available() when ::requestFrom fails (#604)

earlephilhower · web-flow · commit 24583494c6df · 2022-06-01T17:58:54.000-07:00
Avoids returning 2^32 bytes in the case of a requestFrom read fails
due to timeout.
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
@@ -216,7 +216,7 @@ 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(_timeout));
-    if (_buffLen == PICO_ERROR_GENERIC) {
+    if ((_buffLen == PICO_ERROR_GENERIC) || (_buffLen == PICO_ERROR_TIMEOUT)) {
         _buffLen = 0;
     }
     _buffOff = 0;

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`_buffLen = i2c_read_blocking_until(_i2c, address, _buff, quantity, !stopBit, make_timeout_time_ms(_timeout));`
`219`		`- if (_buffLen == PICO_ERROR_GENERIC) {`
	`219`	`+ if ((_buffLen == PICO_ERROR_GENERIC) \|\| (_buffLen == PICO_ERROR_TIMEOUT)) {`
`220`	`220`	`_buffLen = 0;`
`221`	`221`	`}`
`222`	`222`	`_buffOff = 0;`