diff options
author | David Madison <dmadison@users.noreply.github.com> | 2022-02-22 02:11:13 -0500 |
---|---|---|
committer | David Madison <dmadison@users.noreply.github.com> | 2022-02-22 02:11:13 -0500 |
commit | 65f1968b755855315b931b4b8fa45747576d6536 (patch) | |
tree | 77f4cf88950d90182f57c73f69027b4d39375d64 /libraries/Wire/src/Wire.cpp | |
parent | f47a97522dc28c16c432422e3085035de69cfaf6 (diff) | |
parent | a1c76c0651192587f495d88b419553edd12a4881 (diff) |
Merge tag '1.8.4' into upstream-1.8.4
Diffstat (limited to 'libraries/Wire/src/Wire.cpp')
-rw-r--r-- | libraries/Wire/src/Wire.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp index c407776..001d924 100644 --- a/libraries/Wire/src/Wire.cpp +++ b/libraries/Wire/src/Wire.cpp @@ -100,7 +100,7 @@ void TwoWire::setClock(uint32_t clock) * when `clearWireTimeoutFlag()` or `setWireTimeoutUs()` is called. * * Note that this timeout can also trigger while waiting for clock stretching or waiting for a second master - * to complete its transaction. So make sure to adapt the timeout to accomodate for those cases if needed. + * to complete its transaction. So make sure to adapt the timeout to accommodate for those cases if needed. * A typical timeout would be 25ms (which is the maximum clock stretching allowed by the SMBus protocol), * but (much) shorter values will usually also work. * @@ -120,7 +120,7 @@ void TwoWire::setWireTimeout(uint32_t timeout, bool reset_with_timeout){ /*** * Returns the TWI timeout flag. * - * @return true if timeout has occured since the flag was last cleared. + * @return true if timeout has occurred since the flag was last cleared. */ bool TwoWire::getWireTimeoutFlag(void){ return(twi_manageTimeoutFlag(false)); |