From 7f8867b6e81dd53695a5acb7728555d1f0b81082 Mon Sep 17 00:00:00 2001 From: Jeff Rowberg Date: Wed, 14 Aug 2019 22:52:58 -0400 Subject: [PATCH] Fix requestFrom() return type for 16-bit lengths --- libraries/Wire/Wire.cpp | 5 ++--- libraries/Wire/Wire.h | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp index cfc621616..bae7b9e6e 100644 --- a/libraries/Wire/Wire.cpp +++ b/libraries/Wire/Wire.cpp @@ -64,7 +64,7 @@ void TwoWire::end() { sercom->disableWIRE(); } -uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) +size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) { if(quantity == 0) { @@ -105,7 +105,7 @@ uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool stopBit) return byteRead; } -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); } @@ -336,4 +336,3 @@ void TwoWire::onService(void) Wire5.onService(); } #endif - diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h index 6474eb37c..aea241b8c 100644 --- a/libraries/Wire/Wire.h +++ b/libraries/Wire/Wire.h @@ -45,8 +45,8 @@ class TwoWire : public HardwareI2C uint8_t endTransmission(bool stopBit); uint8_t endTransmission(void); - uint8_t requestFrom(uint8_t address, size_t quantity, bool stopBit); - uint8_t requestFrom(uint8_t address, size_t quantity); + size_t requestFrom(uint8_t address, size_t quantity, bool stopBit); + size_t requestFrom(uint8_t address, size_t quantity); size_t write(uint8_t data); size_t write(const uint8_t * data, size_t quantity);