feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

Refactoring TwoWire::requestFrom() headers in Wire.cpp (#5935)

Browse Source 
* Refactoring function headers

Changing the header so the main TwoWire::requestFrom() definition uses a `size_t` instead of a `uint8_t`, removing the 255 bytes limit on I2C requests.

Co-authored-by: Flaviu Tamas <me@flaviutamas.com>
Co-authored-by: Me No Dev <me-no-dev@users.noreply.github.com>
This commit is contained in:
Alexandre-Jacques St-Jacques
2021-12-14 09:25:01 -05:00
committed by GitHub
parent 4b638de19d
commit 7bb30b3cf8
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/Wire/src/Wire.cpp
View File

@ -354,7 +354,7 @@ uint8_t TwoWire::endTransmission(bool sendStop)
return 4; return 4;
} }
uint8_t TwoWire::requestFrom(uint16_t address, uint8_t size, bool sendStop) size_t TwoWire::requestFrom(uint16_t address, size_t size, bool sendStop)
{ {
if(is_slave){ if(is_slave){
log_e("Bus is in Slave Mode"); log_e("Bus is in Slave Mode");
@ -445,42 +445,47 @@ void TwoWire::flush(void)
//i2cFlush(num); // cleanup //i2cFlush(num); // cleanup
} }
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop) size_t TwoWire::requestFrom(uint8_t address, size_t len, bool sendStop)
{ {
return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), static_cast<bool>(sendStop)); return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop));
} }
uint8_t TwoWire::requestFrom(uint16_t address, uint8_t quantity, uint8_t sendStop) uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len, uint8_t sendStop)
{ {
return requestFrom(address, static_cast<uint8_t>(quantity), static_cast<bool>(sendStop)); return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop));
}
uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, uint8_t sendStop)
{
return requestFrom(address, static_cast<size_t>(len), static_cast<bool>(sendStop));
} }
/* Added to match the Arduino function definition: https://github.com/arduino/ArduinoCore-API/blob/173e8eadced2ad32eeb93bcbd5c49f8d6a055ea6/api/HardwareI2C.h#L39 /* Added to match the Arduino function definition: https://github.com/arduino/ArduinoCore-API/blob/173e8eadced2ad32eeb93bcbd5c49f8d6a055ea6/api/HardwareI2C.h#L39
* See: https://github.com/arduino-libraries/ArduinoECCX08/issues/25 * See: https://github.com/arduino-libraries/ArduinoECCX08/issues/25
*/ */
size_t TwoWire::requestFrom(uint8_t address, size_t len, bool stopBit) uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, bool stopBit)
{ {
return requestFrom((uint16_t)address, (uint8_t)len, stopBit); return requestFrom((uint16_t)address, (size_t)len, stopBit);
} }
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity) uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len)
{ {
return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), true); return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);
} }
uint8_t TwoWire::requestFrom(uint16_t address, uint8_t quantity) uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len)
{ {
return requestFrom(address, static_cast<uint8_t>(quantity), true); return requestFrom(address, static_cast<size_t>(len), true);
} }
uint8_t TwoWire::requestFrom(int address, int quantity) uint8_t TwoWire::requestFrom(int address, int len)
{ {
return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), true); return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);
} }
uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop) uint8_t TwoWire::requestFrom(int address, int len, int sendStop)
{ {
return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), static_cast<bool>(sendStop))); return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop)));
} }
void TwoWire::beginTransmission(int address) void TwoWire::beginTransmission(int address)

1
libraries/Wire/src/Wire.h
View File

@ -93,6 +93,7 @@ public:
uint8_t endTransmission(bool sendStop); uint8_t endTransmission(bool sendStop);
uint8_t endTransmission(void); uint8_t endTransmission(void);
size_t requestFrom(uint16_t address, size_t size, bool sendStop);
uint8_t requestFrom(uint16_t address, uint8_t size, bool sendStop); uint8_t requestFrom(uint16_t address, uint8_t size, bool sendStop);
uint8_t requestFrom(uint16_t address, uint8_t size, uint8_t sendStop); uint8_t requestFrom(uint16_t address, uint8_t size, uint8_t sendStop);
size_t requestFrom(uint8_t address, size_t len, bool stopBit); size_t requestFrom(uint8_t address, size_t len, bool stopBit);