Skip to content

Commit 7f8867b

Browse files
jrowbergaentinger
authored andcommitted
Fix requestFrom() return type for 16-bit lengths
1 parent 56e13aa commit 7f8867b

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
@@ -64,7 +64,7 @@ void TwoWire::end() {
6464
sercom->disableWIRE();
6565
}
6666

67-
uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
67+
size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
6868
{
6969
if(quantity == 0)
7070
{
@@ -105,7 +105,7 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit)
105105
return byteRead;
106106
}
107107

108-
uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity)
108+
size_t TwoWire::requestFrom(uint8_t address, size_t quantity)
109109
{
110110
return requestFrom(address, quantity, true);
111111
}
@@ -336,4 +336,3 @@ void TwoWire::onService(void)
336336
Wire5.onService();
337337
}
338338
#endif
339-

Diff for: libraries/Wire/Wire.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class TwoWire : public HardwareI2C
4545
uint8_t endTransmission(bool stopBit);
4646
uint8_t endTransmission(void);
4747

48-
uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit);
49-
uint8_t requestFrom(uint8_t address, size_t quantity);
48+
size_t requestFrom(uint8_t address, size_t quantity, bool stopBit);
49+
size_t requestFrom(uint8_t address, size_t quantity);
5050

5151
size_t write(uint8_t data);
5252
size_t write(const uint8_t * data, size_t quantity);

0 commit comments

Comments
 (0)