Skip to content
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

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

Merged
merged 1 commit into from
Dec 10, 2020
Merged

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

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
4 changes: 2 additions & 2 deletions libraries/Wire/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ uint8_t arduino::MbedI2C::endTransmission(void) {
return endTransmission(true);
}

uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
char buf[256];
int ret = master->read(address << 1, buf, len, !stopBit);
if (ret != 0) {
Expand All @@ -84,7 +84,7 @@ uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit)
return len;
}

uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
return requestFrom(address, len, true);
}

Expand Down
4 changes: 2 additions & 2 deletions libraries/Wire/Wire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class MbedI2C : public HardwareI2C
virtual uint8_t endTransmission(bool stopBit);
virtual uint8_t endTransmission(void);

virtual uint8_t requestFrom(uint8_t address, size_t len, bool stopBit);
virtual uint8_t requestFrom(uint8_t address, size_t len);
virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit);
virtual size_t requestFrom(uint8_t address, size_t len);

virtual void onReceive(void(*)(int));
virtual void onRequest(void(*)(void));
Expand Down