Merge branch 'next' into lvgl-grid

Author: clydebarrow

content/components/i2c.md

@@ -10,9 +10,10 @@ params:
 {{< anchor "i2c" >}}
 
 This component sets up the I²C bus for your ESP32, ESP8266, RP2040 or NRF52. In order for these components
-to work correctly, you need to define the I²C bus in your configuration. Please note the ESP
-will enable its internal 10kΩ pullup resistors for these pins, so you usually don't need to
-put on external ones. You can use multiple devices on one I²C bus as each device is given a
+to work correctly, you need to define the I²C bus in your configuration. On ESP32 (both Arduino and ESP-IDF
+frameworks), internal pullup resistors are enabled by default. On ESP8266, the internal 10kΩ pullup resistors
+are always enabled. External pullups are still recommended for longer wire runs or multiple devices.
+You can use multiple devices on one I²C bus as each device is given a
 unique address for communicating between it and the ESP. You can do this by hopping
 wires from the two lines (SDA and SCL) from each device board to the next device board or by
 connecting the wires from each device back to the two I²C pins on the ESP.
@@ -43,8 +44,14 @@ i2c:
   NRF52 supports only `100kHz` and `400kHz`.
 
 - **timeout** (*Optional*, [Time](/guides/configuration-types#time)): Set the I²C bus timeout.
-  Defaults to the framework defaults (`100us` on `esp32` with `esp-idf`, `50ms` on `esp32` with `Arduino`,
-  `1s` on `esp8266` and `1s` on `rp2040`  ). Maximum on `esp-idf` is 13ms.
+  Defaults to the framework defaults (`100us` on `esp32`, `1s` on `esp8266` and `1s` on `rp2040`).
+  Maximum on `esp32` is 13ms.
+
+- **sda_pullup_enabled** (*Optional*, boolean): Enable the internal pullup resistor for the SDA pin.
+  Defaults to `true`. Only available on ESP32.
+
+- **scl_pullup_enabled** (*Optional*, boolean): Enable the internal pullup resistor for the SCL pin.
+  Defaults to `true`. Only available on ESP32.
 
 - **id** (*Optional*, [ID](/guides/configuration-types#id)): Manually specify the ID for this I²C bus if you need multiple I²C buses.