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

proper return types

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-11-03 19:02:30 +01:00
parent c9ca6f199b
commit f607edea13
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@ void TwoWire::beginTransmission(uint16_t address)
/*stickbreaker isr /*stickbreaker isr
*/ */
uint8_t TwoWire::endTransmission(bool sendStop) // Assumes Wire.beginTransaction(), Wire.write() i2c_err_t TwoWire::endTransmission(bool sendStop) // Assumes Wire.beginTransaction(), Wire.write()
{ {
if(transmitting == 1) { if(transmitting == 1) {
// txlength is howmany bytes in txbuffer have been use // txlength is howmany bytes in txbuffer have been use
@ -299,7 +299,7 @@ void TwoWire::beginTransmission(uint8_t address)
beginTransmission(static_cast<uint16_t>(address)); beginTransmission(static_cast<uint16_t>(address));
} }
uint8_t TwoWire::endTransmission(void) i2c_err_t TwoWire::endTransmission(void)
{ {
return endTransmission(true); return endTransmission(true);
} }

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

@ -90,8 +90,8 @@ public:
void beginTransmission(uint8_t address); void beginTransmission(uint8_t address);
void beginTransmission(int address); void beginTransmission(int address);
uint8_t endTransmission(bool sendStop); i2c_err_t endTransmission(bool sendStop);
uint8_t endTransmission(void); i2c_err_t endTransmission(void);
uint8_t requestFrom(uint16_t address, uint8_t size, bool sendStop=true); uint8_t requestFrom(uint16_t address, uint8_t size, bool sendStop=true);
@ -128,6 +128,8 @@ public:
uint32_t setDebugFlags( uint32_t setBits, uint32_t resetBits); uint32_t setDebugFlags( uint32_t setBits, uint32_t resetBits);
bool busy(); bool busy();
i2c_err_t getLastError() const { return last_error; }
}; };
extern TwoWire Wire; extern TwoWire Wire;