Commit 712cf1d

leg0ahtilego

authored and

committed

Fix compile errors

1 parent 06df3bb commit 712cf1dCopy full SHA for 712cf1d

File tree

-20

lines changed

-20

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ typedef uint8_t rx_buffer_index_t;`
`113`	`113`	`#define SERIAL_7O2 0x3C`
`114`	`114`	`#define SERIAL_8O2 0x3E`
`115`	`115`
`116`		`-class UartClass : public HardwareSerial`
	`116`	`+class UartClass : public arduino::HardwareSerial`
`117`	`117`	`{`
`118`	`118`	`protected:`
`119`	`119`	`volatile uint8_t * const _ubrrh;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ int main(void)`
`44`	`44`
`45`	`45`	`for (;;) {`
`46`	`46`	`loop();`
`47`		`- if (serialEventRun) serialEventRun();`
	`47`	`+ if (arduino::serialEventRun) arduino::serialEventRun();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return 0;`

Lines changed: 2 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -119,25 +119,15 @@ uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddres`
`119`	`119`	`return read;`
`120`	`120`	`}`
`121`	`121`
`122`		`-uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {`
	`122`	`+size_t TwoWire::requestFrom(uint8_t address, size_t quantity, bool sendStop) {`
`123`	`123`	`return requestFrom((uint8_t)address, (uint8_t)quantity, (uint32_t)0, (uint8_t)0, (uint8_t)sendStop);`
`124`	`124`	`}`
`125`	`125`
`126`		`-uint8_t TwoWire::requestFrom(uint8_t address, size_t quantity)`
	`126`	`+size_t TwoWire::requestFrom(uint8_t address, size_t quantity)`
`127`	`127`	`{`
`128`	`128`	`return requestFrom(address, quantity, true);`
`129`	`129`	`}`
`130`	`130`
`131`		`-uint8_t TwoWire::requestFrom(int address, int quantity)`
`132`		`-{`
`133`		`- return requestFrom((uint8_t)address, (size_t)quantity, true);`
`134`		`-}`
`135`		`-`
`136`		`-uint8_t TwoWire::requestFrom(int address, int quantity, int sendStop)`
`137`		`-{`
`138`		`- return requestFrom((uint8_t)address, (size_t)quantity, (bool)sendStop);`
`139`		`-}`
`140`		`-`
`141`	`131`	`void TwoWire::beginTransmission(uint8_t address)`
`142`	`132`	`{`
`143`	`133`	`// indicate that we are transmitting`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,14 @@`
`23`	`23`	`#define TwoWire_h`
`24`	`24`
`25`	`25`	`#include <Arduino.h>`
	`26`	`+#include <api/HardwareI2C.h>`
`26`	`27`
`27`	`28`	`#define BUFFER_LENGTH 32`
`28`	`29`
`29`	`30`	`// WIRE_HAS_END means Wire has end()`
`30`	`31`	`#define WIRE_HAS_END 1`
`31`	`32`
`32`		`-class TwoWire : public HardwareI2C`
	`33`	`+class TwoWire : public arduino::HardwareI2C`
`33`	`34`	`{`
`34`	`35`	`private:`
`35`	`36`	`static uint8_t rxBuffer[];`
`@@ -57,11 +58,9 @@ class TwoWire : public HardwareI2C`
`57`	`58`	`void beginTransmission(int);`
`58`	`59`	`uint8_t endTransmission(void);`
`59`	`60`	`uint8_t endTransmission(bool);`
`60`		`- uint8_t requestFrom(uint8_t, size_t);`
`61`		`- uint8_t requestFrom(uint8_t, size_t, bool);`
	`61`	`+ size_t requestFrom(uint8_t, size_t);`
	`62`	`+ size_t requestFrom(uint8_t, size_t, bool);`
`62`	`63`	`uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t);`
`63`		`- uint8_t requestFrom(int, int);`
`64`		`- uint8_t requestFrom(int, int, int);`
`65`	`64`	`virtual size_t write(uint8_t);`
`66`	`65`	`virtual size_t write(const uint8_t *, size_t);`
`67`	`66`	`virtual int available(void);`
`@@ -75,7 +74,7 @@ class TwoWire : public HardwareI2C`
`75`	`74`	`inline size_t write(long n) { return write((uint8_t)n); }`
`76`	`75`	`inline size_t write(unsigned int n) { return write((uint8_t)n); }`
`77`	`76`	`inline size_t write(int n) { return write((uint8_t)n); }`
`78`		`- using Print::write;`
	`77`	`+ using arduino::Print::write;`
`79`	`78`	`};`
`80`	`79`
`81`	`80`	`extern TwoWire Wire;`

Comments

(0)