From f607edea133e05aae39f67e24aee266ab2a21039 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Wed, 3 Nov 2021 19:02:30 +0100 Subject: [PATCH] proper return types --- libraries/Wire/src/Wire.cpp | 4 ++-- libraries/Wire/src/Wire.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp index 7640aa09..5cdf5349 100644 --- a/libraries/Wire/src/Wire.cpp +++ b/libraries/Wire/src/Wire.cpp @@ -169,7 +169,7 @@ void TwoWire::beginTransmission(uint16_t address) /*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) { // txlength is howmany bytes in txbuffer have been use @@ -299,7 +299,7 @@ void TwoWire::beginTransmission(uint8_t address) beginTransmission(static_cast(address)); } -uint8_t TwoWire::endTransmission(void) +i2c_err_t TwoWire::endTransmission(void) { return endTransmission(true); } diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h index 956d2900..9a100a57 100644 --- a/libraries/Wire/src/Wire.h +++ b/libraries/Wire/src/Wire.h @@ -90,8 +90,8 @@ public: void beginTransmission(uint8_t address); void beginTransmission(int address); - uint8_t endTransmission(bool sendStop); - uint8_t endTransmission(void); + i2c_err_t endTransmission(bool sendStop); + i2c_err_t endTransmission(void); 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); bool busy(); + + i2c_err_t getLastError() const { return last_error; } }; extern TwoWire Wire;