From deea9293201dbab724b6b0519c35ddba3e6b92d9 Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Wed, 28 Feb 2018 20:59:45 +0000 Subject: Introduce non compulsory Wire timeout move timout handling into its own function change timeout from milliseconds to microseconds don't forget operating slave address or the bitrate when we reset because of a timeout Co-Authored-By: Witold Markowski fix delay datatype uint16_t --> uint32_t Update libraries/Wire/src/utility/twi.c fix mix up using TWBR instea of TWAR! Co-Authored-By: Matthijs Kooijman Update libraries/Wire/src/utility/twi.c fix 2nd TWBR/TWAR mixup Co-Authored-By: Matthijs Kooijman twi_stop() should use the same timeout as everywhere else all while loops are now protected by timeouts Revert "twi_stop() should use the same timeout as everywhere else" This reverts commit 68fe5f1dae1bb41183bb37eeda3fb453394a580c. make timeout counter volatile rename timeout function for improved clarity - resetting the twi interface on timeouts is now optional - timeouts in the ISR are no longer hardcoded and now obey the set timeout value - a user-readable flag is now set whenever a timeout occurs - the user can clear this flag whenever they like --- libraries/Wire/src/Wire.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libraries/Wire/src/Wire.h') diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h index 702f37d..c8b9a3e 100644 --- a/libraries/Wire/src/Wire.h +++ b/libraries/Wire/src/Wire.h @@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts + Modified 2020 by Greyson Christoforo (grey@christoforo.net) to implement timeouts */ #ifndef TwoWire_h @@ -54,13 +55,16 @@ class TwoWire : public Stream void begin(int); void end(); void setClock(uint32_t); + void setWireTimeoutUs(uint32_t, bool); + bool getWireTimeoutFlag(void); + void clearWireTimeoutFlag(void); void beginTransmission(uint8_t); void beginTransmission(int); uint8_t endTransmission(void); uint8_t endTransmission(uint8_t); uint8_t requestFrom(uint8_t, uint8_t); uint8_t requestFrom(uint8_t, uint8_t, uint8_t); - uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t); + uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t); uint8_t requestFrom(int, int); uint8_t requestFrom(int, int, int); virtual size_t write(uint8_t); -- cgit v1.2.3-18-g5258 From 38ff552087efdbe0d98a88e9f74bfeb5e1504997 Mon Sep 17 00:00:00 2001 From: Martino Facchin Date: Thu, 11 Jun 2020 15:36:44 +0200 Subject: Wire: add sensible defaults to setWireTimeout --- libraries/Wire/src/Wire.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libraries/Wire/src/Wire.h') diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h index c8b9a3e..e70d72e 100644 --- a/libraries/Wire/src/Wire.h +++ b/libraries/Wire/src/Wire.h @@ -55,7 +55,7 @@ class TwoWire : public Stream void begin(int); void end(); void setClock(uint32_t); - void setWireTimeoutUs(uint32_t, bool); + void setWireTimeout(uint32_t timeout = 25000, bool reset_with_timeout = false); bool getWireTimeoutFlag(void); void clearWireTimeoutFlag(void); void beginTransmission(uint8_t); -- cgit v1.2.3-18-g5258