Merge remote-tracking branch 'adafruit/main'

[hackapet/Adafruit_Blinka.git] / src / busio.py

diff --git a/src/busio.py b/src/busio.py
index 458f5745401097cc431e2b48660eafead3452427..9d2199633823138705bee76229b901b598389f5a 100644 (file)
--- a/src/busio.py
+++ b/src/busio.py
@@ -29,6 +29,8 @@ class I2C(Lockable):
     """
     Busio I2C Class for CircuitPython Compatibility. Used
     for both MicroPython and Linux.
     """
     Busio I2C Class for CircuitPython Compatibility. Used
     for both MicroPython and Linux.

+
+    NOTE: Frequency has no effect on Linux systems. The argument is only there for compatibility.

     """
 
     def __init__(self, scl, sda, frequency=100000):
     """
 
     def __init__(self, scl, sda, frequency=100000):


@@ -136,6 +138,9 @@ class I2C(Lockable):
 
         if detector.board.any_embedded_linux:
             from adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C
 
         if detector.board.any_embedded_linux:
             from adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C

+
+            if frequency == 100000:
+                frequency = None  # Set to None if default to avoid triggering warning

         elif detector.board.ftdi_ft2232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.i2c import I2C as _I2C
         else:
         elif detector.board.ftdi_ft2232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.i2c import I2C as _I2C
         else:


@@ -323,7 +328,9 @@ class SPI(Lockable):
             self._pins = (clock, clock, clock)  # will determine MOSI/MISO from clock
             return
         if detector.board.kb2040_u2if:
             self._pins = (clock, clock, clock)  # will determine MOSI/MISO from clock
             return
         if detector.board.kb2040_u2if:

-            from adafruit_blinka.microcontroller.rp2040_u2if.spi import SPI_KB2040 as _SPI
+            from adafruit_blinka.microcontroller.rp2040_u2if.spi import (
+                SPI_KB2040 as _SPI,
+            )

 
             self._spi = _SPI(clock)  # this is really all that's needed
             self._pins = (clock, clock, clock)  # will determine MOSI/MISO from clock
 
             self._spi = _SPI(clock)  # this is really all that's needed
             self._pins = (clock, clock, clock)  # will determine MOSI/MISO from clock