Renaming timeout variables to explicitly states that the timeout is in micro seconds

Author: maidnl

libraries/Wire/Wire.cpp

@@ -191,7 +191,7 @@ TwoWire::TwoWire(int scl, int sda, WireAddressMode_t am /*= ADDRESS_MODE_7_BITS*
   is_master(true),
   is_sci(false),
   address_mode(am),
-  timeout(1000),
+  timeout_us(1000),
   transmission_begun(false),
   data_too_long(false),
   rx_index(0),
@@ -642,7 +642,7 @@ void TwoWire::beginTransmission(int address) {
 /* -------------------------------------------------------------------------- */
 uint8_t TwoWire::endTransmission(bool sendStop) {
 /* -------------------------------------------------------------------------- */  
-  uint8_t ret = write_to(master_tx_address, tx_buffer, tx_index, timeout, sendStop);
+  uint8_t ret = write_to(master_tx_address, tx_buffer, tx_index, timeout_us, sendStop);
   transmission_begun = false;
   return ret;
 }
@@ -687,7 +687,7 @@ size_t TwoWire::requestFrom(uint8_t address, size_t quantity, uint32_t iaddress,
       quantity = I2C_BUFFER_LENGTH;
     }
     // perform blocking read into buffer
-    uint8_t read = read_from(address, rx_buffer, quantity, timeout, sendStop);
+    uint8_t read = read_from(address, rx_buffer, quantity, timeout_us, sendStop);
     // set rx buffer iterator vars
     rx_index = read;
     rx_extract_index = 0;
@@ -836,10 +836,10 @@ void TwoWire::flush(void) {
 }
 
 /* -------------------------------------------------------------------------- */
-void TwoWire::setWireTimeout(unsigned int t, bool reset_on_timeout) {
+void TwoWire::setWireTimeout(unsigned int _timeout_us, bool reset_on_timeout) {
 /* -------------------------------------------------------------------------- */
   (void)reset_on_timeout;
-  timeout = t;
+  timeout_us = _timeout_us;
 }
 
 

libraries/Wire/Wire.h

@@ -126,7 +126,7 @@ class TwoWire : public arduino::HardwareI2C {
     void setBusStatus(WireStatus_t);
     /* set timeout in us for I2C communication (default is 1000 us) 
        the second parameter has been added for compatibility but it has no effect*/
-    void setWireTimeout(unsigned int t = 1000, bool reset_on_timeout = false);
+    void setWireTimeout(unsigned int _timeout_us = 1000, bool reset_on_timeout = false);
 
     inline size_t write(unsigned long n) { return write((uint8_t)n); }
     inline size_t write(long n) { return write((uint8_t)n); }
@@ -171,8 +171,8 @@ class TwoWire : public arduino::HardwareI2C {
     int channel;
     bool is_sci;
     WireAddressMode_t address_mode;
-
-    unsigned int timeout;
+    /* I2C timeout in micro seconds */
+    unsigned int timeout_us;
     bool transmission_begun;
     bool data_too_long;