lemonkey
diff --git a/‎libraries/Wire/src/Wire.cpp
Copy file name to clipboardExpand all lines: libraries/Wire/src/Wire.cpp
+20-15Lines changed: 20 additions & 15 deletions b/‎libraries/Wire/src/Wire.cpp
Copy file name to clipboardExpand all lines: libraries/Wire/src/Wire.cpp
+20-15Lines changed: 20 additions & 15 deletions
diff --git a/‎libraries/Wire/src/Wire.h
Copy file name to clipboardExpand all lines: libraries/Wire/src/Wire.h
+1Lines changed: 1 addition & 0 deletions b/‎libraries/Wire/src/Wire.h
Copy file name to clipboardExpand all lines: libraries/Wire/src/Wire.h
+1Lines changed: 1 addition & 0 deletions
@@ -354,7 +354,7 @@ uint8_t TwoWire::endTransmission(bool sendStop)
     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){
         log_e("Bus is in Slave Mode");
@@ -445,42 +445,47 @@ void TwoWire::flush(void)
     //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(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 quantity, uint8_t sendStop)
+uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, uint8_t sendStop)
 {
-    return requestFrom(address, static_cast<uint8_t>(quantity), static_cast<bool>(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
 */
-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)
 
@@ -93,6 +93,7 @@ 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);
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ uint8_t TwoWire::endTransmission(bool sendStop)`
`354`	`354`	`return 4;`
`355`	`355`	`}`
`356`	`356`
`357`		`-uint8_t TwoWire::requestFrom(uint16_t address, uint8_t size, bool sendStop)`
	`357`	`+size_t TwoWire::requestFrom(uint16_t address, size_t size, bool sendStop)`
`358`	`358`	`{`
`359`	`359`	`if(is_slave){`
`360`	`360`	`log_e("Bus is in Slave Mode");`
`@@ -445,42 +445,47 @@ void TwoWire::flush(void)`
`445`	`445`	`//i2cFlush(num); // cleanup`
`446`	`446`	`}`
`447`	`447`
`448`		`-uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop)`
	`448`	`+size_t TwoWire::requestFrom(uint8_t address, size_t len, bool sendStop)`
`449`	`449`	`{`
`450`		`- return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), static_cast<bool>(sendStop));`
	`450`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop));`
	`451`	`+}`
	`452`	`+`
	`453`	`+uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len, uint8_t sendStop)`
	`454`	`+{`
	`455`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop));`
`451`	`456`	`}`
`452`	`457`
`453`		`-uint8_t TwoWire::requestFrom(uint16_t address, uint8_t quantity, uint8_t sendStop)`
	`458`	`+uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, uint8_t sendStop)`
`454`	`459`	`{`
`455`		`- return requestFrom(address, static_cast<uint8_t>(quantity), static_cast<bool>(sendStop));`
	`460`	`+ return requestFrom(address, static_cast<size_t>(len), static_cast<bool>(sendStop));`
`456`	`461`	`}`
`457`	`462`
`458`	`463`	`/* Added to match the Arduino function definition: https://github.com/arduino/ArduinoCore-API/blob/173e8eadced2ad32eeb93bcbd5c49f8d6a055ea6/api/HardwareI2C.h#L39`
`459`	`464`	`* See: https://github.com/arduino-libraries/ArduinoECCX08/issues/25`
`460`	`465`	`*/`
`461`		`-size_t TwoWire::requestFrom(uint8_t address, size_t len, bool stopBit)`
	`466`	`+uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len, bool stopBit)`
`462`	`467`	`{`
`463`		`- return requestFrom((uint16_t)address, (uint8_t)len, stopBit);`
	`468`	`+ return requestFrom((uint16_t)address, (size_t)len, stopBit);`
`464`	`469`	`}`
`465`	`470`
`466`		`-uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity)`
	`471`	`+uint8_t TwoWire::requestFrom(uint8_t address, uint8_t len)`
`467`	`472`	`{`
`468`		`- return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), true);`
	`473`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);`
`469`	`474`	`}`
`470`	`475`
`471`		`-uint8_t TwoWire::requestFrom(uint16_t address, uint8_t quantity)`
	`476`	`+uint8_t TwoWire::requestFrom(uint16_t address, uint8_t len)`
`472`	`477`	`{`
`473`		`- return requestFrom(address, static_cast<uint8_t>(quantity), true);`
	`478`	`+ return requestFrom(address, static_cast<size_t>(len), true);`
`474`	`479`	`}`
`475`	`480`
`476`		`-uint8_t TwoWire::requestFrom(int address, int quantity)`
	`481`	`+uint8_t TwoWire::requestFrom(int address, int len)`
`477`	`482`	`{`
`478`		`- return requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), true);`
	`483`	`+ return requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), true);`
`479`	`484`	`}`
`480`	`485`
`481`		`-uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)`
	`486`	`+uint8_t TwoWire::requestFrom(int address, int len, int sendStop)`
`482`	`487`	`{`
`483`		`- return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<uint8_t>(quantity), static_cast<bool>(sendStop)));`
	`488`	`+ return static_cast<uint8_t>(requestFrom(static_cast<uint16_t>(address), static_cast<size_t>(len), static_cast<bool>(sendStop)));`
`484`	`489`	`}`
`485`	`490`
`486`	`491`	`void TwoWire::beginTransmission(int address)`