Commit 16a9cf7

authored

Add another Wire requestFrom function signature (#5768)

* Re-add with clean master * Address @me-no-dev's comments * static_cast<size_t> to static_cast<uint8_t>

1 parent b1497fb commit 16a9cf7Copy full SHA for 16a9cf7

File tree

2 files changed

+15

-6

lines changed

libraries/Wire/src
- Wire.cpp
- Wire.h

2 files changed

+15

-6

lines changed

`‎libraries/Wire/src/Wire.cpp‎`

Lines changed: 14 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -447,32 +447,40 @@ void TwoWire::flush(void)`
`447`	`447`
`448`	`448`	`uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop)`
`449`	`449`	`{`
`450`		`- return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(quantity), static_cast<bool>(sendStop));`
	`450`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), static_cast<bool>(sendStop));`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`uint8_t TwoWire::requestFrom(uint16_t address, uint8_t quantity, uint8_t sendStop)`
`454`	`454`	`{`
`455`		`- return requestFrom(address, static_cast<size_t>(quantity), static_cast<bool>(sendStop));`
	`455`	`+ return requestFrom(address, static_cast<uint8_t>(quantity), static_cast<bool>(sendStop));`
	`456`	`+}`
	`457`	`+`
	`458`	`+/* Added to match the Arduino function definition: https://github.com/arduino/ArduinoCore-API/blob/173e8eadced2ad32eeb93bcbd5c49f8d6a055ea6/api/HardwareI2C.h#L39`
	`459`	`+ * See: https://github.com/arduino-libraries/ArduinoECCX08/issues/25`
	`460`	`+*/`
	`461`	`+size_t TwoWire::requestFrom(uint8_t address, size_t len, bool stopBit)`
	`462`	`+{`
	`463`	`+ return requestFrom((uint16_t)address, (uint8_t)len, stopBit);`
`456`	`464`	`}`
`457`	`465`
`458`	`466`	`uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity)`
`459`	`467`	`{`
`460`		`- return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(quantity), true);`
	`468`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), true);`
`461`	`469`	`}`
`462`	`470`
`463`	`471`	`uint8_t TwoWire::requestFrom(uint16_t address, uint8_t quantity)`
`464`	`472`	`{`
`465`		`- return requestFrom(address, static_cast<size_t>(quantity), true);`
	`473`	`+ return requestFrom(address, static_cast<uint8_t>(quantity), true);`
`466`	`474`	`}`
`467`	`475`
`468`	`476`	`uint8_t TwoWire::requestFrom(int address, int quantity)`
`469`	`477`	`{`
`470`		`- return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(quantity), true);`
	`478`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), true);`
`471`	`479`	`}`
`472`	`480`
`473`	`481`	`uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)`
`474`	`482`	`{`
`475`		`- return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(quantity), static_cast<bool>(sendStop)));`
	`483`	`+ return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), static_cast<bool>(sendStop)));`
`476`	`484`	`}`
`477`	`485`
`478`	`486`	`void TwoWire::beginTransmission(int address)`

`‎libraries/Wire/src/Wire.h‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ class TwoWire: public Stream`
`95`	`95`
`96`	`96`	`uint8_t requestFrom(uint16_t address, uint8_t size, bool sendStop);`
`97`	`97`	`uint8_t requestFrom(uint16_t address, uint8_t size, uint8_t sendStop);`
	`98`	`+ size_t requestFrom(uint8_t address, size_t len, bool stopBit);`
`98`	`99`	`uint8_t requestFrom(uint16_t address, uint8_t size);`
`99`	`100`	`uint8_t requestFrom(uint8_t address, uint8_t size, uint8_t sendStop);`
`100`	`101`	`uint8_t requestFrom(uint8_t address, uint8_t size);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 16a9cf7

File tree

2 files changed

2 files changed

`‎libraries/Wire/src/Wire.cpp‎`

`‎libraries/Wire/src/Wire.h‎`

0 commit comments