Skip to content

Fix: Allow HardwareI2C::requestFrom to return values > 256 #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2020
Merged

Fix: Allow HardwareI2C::requestFrom to return values > 256 #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void TwoWire::setClock(uint32_t clock)
TWI_MasterSetBaud(clock);
}

uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {
size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {
if(quantity > BUFFER_LENGTH){
quantity = BUFFER_LENGTH;
}
Expand All @@ -109,17 +109,17 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {
return bytes_read;
}

uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity)
size_t TwoWire::requestFrom(uint8_t address, size_t quantity)
{
return requestFrom(address, quantity, true);
}

uint8_t TwoWire::requestFrom(int address, int quantity)
size_t TwoWire::requestFrom(int address, int quantity)
{
return requestFrom((uint8_t)address, (size_t)quantity, true);
}

uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)
size_t TwoWire::requestFrom(int address, int quantity, int sendStop)
{
return requestFrom((uint8_t)address, (size_t)quantity, (bool)sendStop);
}
Expand Down
8 changes: 4 additions & 4 deletions libraries/Wire/src/Wire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ class TwoWire : public HardwareI2C
void beginTransmission(int);
uint8_t endTransmission(void);
uint8_t endTransmission(bool);
uint8_t requestFrom(uint8_t, size_t);
uint8_t requestFrom(uint8_t, size_t, bool);
uint8_t requestFrom(int, int);
uint8_t requestFrom(int, int, int);
size_t requestFrom(uint8_t, size_t);
size_t requestFrom(uint8_t, size_t, bool);
size_t requestFrom(int, int);
size_t requestFrom(int, int, int);
virtual size_t write(uint8_t);
virtual size_t write(const uint8_t *, size_t);
virtual int available(void);
Expand Down