Skip to content

Commit 3f09252

Browse files
committed
Fix requestFrom() return type for 16-bit lengths
1 parent dbd25c6 commit 3f09252

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Diff for: libraries/Wire/Wire.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void TwoWire::end() {
6262
sercom->disableWIRE();
6363
}
6464

65-
uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
65+
size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
6666
{
6767
if(quantity == 0)
6868
{
@@ -103,7 +103,7 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
103103
return byteRead;
104104
}
105105

106-
uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity)
106+
size_t TwoWire::requestFrom(uint8_t address, size_t quantity)
107107
{
108108
return requestFrom(address, quantity, true);
109109
}
@@ -334,4 +334,3 @@ void TwoWire::onService(void)
334334
Wire5.onService();
335335
}
336336
#endif
337-

Diff for: libraries/Wire/Wire.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class TwoWire : public Stream
4242
uint8_t endTransmission(bool stopBit);
4343
uint8_t endTransmission(void);
4444

45-
uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit);
46-
uint8_t requestFrom(uint8_t address, size_t quantity);
45+
size_t requestFrom(uint8_t address, size_t quantity, bool stopBit);
46+
size_t requestFrom(uint8_t address, size_t quantity);
4747

4848
size_t write(uint8_t data);
4949
size_t write(const uint8_t * data, size_t quantity);

0 commit comments

Comments
 (0)