fix merge conflict in branch

[hackapet/Adafruit_Blinka.git] / src / adafruit_blinka / microcontroller / mcp2221 / i2c.py

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/i2c.py b/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
index ef7f7849cc9cfccfcb109bf75383d9fbd05a6e27..9ebb5b6dbb666e4c410d247ca027043647132414 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
@@ -1,24 +1,23 @@
-from adafruit_blinka.microcontroller.mcp2221.pin import Pin
 from .mcp2221 import mcp2221
 
 class I2C:
 
-    def __init__(self, *, baudrate=100000):
-        mcp2221.i2c_configure(baudrate)
+    def __init__(self, *, frequency=100000):
+        self._mcp2221 = mcp2221
+        self._mcp2221.i2c_configure(frequency)
 
     def scan(self):
-        return mcp2221.i2c_scan()
+        return self._mcp2221.i2c_scan()
 
     def writeto(self, address, buffer, *, start=0, end=None, stop=True):
-        mcp2221.i2c_writeto(address, buffer, start=start, end=end)
+        self._mcp2221.i2c_writeto(address, buffer, start=start, end=end)
 
     def readfrom_into(self, address, buffer, *, start=0, end=None, stop=True):
-        mcp2221.i2c_readfrom_into(address, buffer, start=start, end=end)
+        self._mcp2221.i2c_readfrom_into(address, buffer, start=start, end=end)
 
     def writeto_then_readfrom(self, address, buffer_out, buffer_in, *,
                               out_start=0, out_end=None,
                               in_start=0, in_end=None, stop=False):
-        mcp2221.i2c_writeto_then_readfrom(address, buffer_out, buffer_in,
+        self._mcp2221.i2c_writeto_then_readfrom(address, buffer_out, buffer_in,
                                           out_start=out_start, out_end=out_end,
                                           in_start=in_start, in_end=in_end)
-