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.

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

Remove TwoWire::begin(int) overload #8818

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
84 changes: 42 additions & 42 deletions libraries/Wire/src/Wire.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -588,48 +588,48 @@ void TwoWire::flush(void)
//i2cFlush(num); // cleanup
}

size_t TwoWire::requestFrom(uint8_t address, size_t len, bool sendStop)
{
return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop));
}

uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len, uint8_t 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
* See: https://github.com/arduino-libraries/ArduinoECCX08/issues/25
*/
uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, bool stopBit)
{
return requestFrom((uint16_t)address, (size_t)len, stopBit);
}

uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len)
{
return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);
}

uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len)
{
return requestFrom(address, static_cast<size_t>(len), true);
}

uint8_t TwoWire::requestFrom(int address, int len)
{
return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);
}

uint8_t TwoWire::requestFrom(int address, int len, int sendStop)
{
return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop)));
}
// size_t TwoWire::requestFrom(uint8_t address, size_t len, bool sendStop)
// {
// return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop));
// }
//
// uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len, uint8_t 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
// * See: https://github.com/arduino-libraries/ArduinoECCX08/issues/25
// */
// uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, bool stopBit)
// {
// return requestFrom((uint16_t)address, (size_t)len, stopBit);
// }
//
// uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len)
// {
// return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);
// }
//
// uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len)
// {
// return requestFrom(address, static_cast<size_t>(len), true);
// }
//
// uint8_t TwoWire::requestFrom(int address, int len)
// {
// return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);
// }
//
// uint8_t TwoWire::requestFrom(int address, int len, int 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)
{
Expand Down
24 changes: 10 additions & 14 deletions libraries/Wire/src/Wire.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,7 @@ class TwoWire: public Stream
{
return begin(addr, -1, -1, 0);
}
inline bool begin(int addr)
{
return begin(static_cast<uint8_t>(addr), -1, -1, 0);
}
bool end();
bool end();

size_t setBufferSize(size_t bSize);

Expand All @@ -121,15 +117,15 @@ class TwoWire: public Stream
uint8_t endTransmission(bool sendStop);
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, uint8_t sendStop);
size_t requestFrom(uint8_t address, size_t len, bool stopBit);
uint8_t requestFrom(uint16_t address, uint8_t size);
uint8_t requestFrom(uint8_t address, uint8_t size, uint8_t sendStop);
uint8_t requestFrom(uint8_t address, uint8_t size);
uint8_t requestFrom(int address, int size, int sendStop);
uint8_t requestFrom(int address, int size);
size_t requestFrom(uint16_t address, size_t size, bool sendStop = true);
// uint8_t requestFrom(uint16_t address, uint8_t size, bool sendStop);
// uint8_t requestFrom(uint16_t address, uint8_t size, uint8_t sendStop);
// size_t requestFrom(uint8_t address, size_t len, bool stopBit);
// uint8_t requestFrom(uint16_t address, uint8_t size);
// uint8_t requestFrom(uint8_t address, uint8_t size, uint8_t sendStop);
// uint8_t requestFrom(uint8_t address, uint8_t size);
// uint8_t requestFrom(int address, int size, int sendStop);
// uint8_t requestFrom(int address, int size);

size_t write(uint8_t);
size_t write(const uint8_t *, size_t);
Expand Down