Merge pull request #307 from luke-iqt/master

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

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
index e309e9ef6ac0ae3e5db041b616ca5fb2ba463105..1870dfc802eb28206a1bca6c8f3ddbd0fa10d124 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
@@ -1,30 +1,39 @@
+"""Generic Linux I2C class using PureIO's smbus class"""

 import Adafruit_PureIO.smbus as smbus
 import Adafruit_PureIO.smbus as smbus

-import time
+

 
 class I2C:
 
 class I2C:

+    """I2C class"""
+

     MASTER = 0
     SLAVE = 1
     _baudrate = None
     _mode = None
     _i2c_bus = None
 
     MASTER = 0
     SLAVE = 1
     _baudrate = None
     _mode = None
     _i2c_bus = None
 

+    # pylint: disable=unused-argument

     def __init__(self, bus_num, mode=MASTER, baudrate=None):
         if mode != self.MASTER:
             raise NotImplementedError("Only I2C Master supported!")
         _mode = self.MASTER
 
     def __init__(self, bus_num, mode=MASTER, baudrate=None):
         if mode != self.MASTER:
             raise NotImplementedError("Only I2C Master supported!")
         _mode = self.MASTER
 

-        #if baudrate != None:
+        # if baudrate != None:

         #    print("I2C frequency is not settable in python, ignoring!")
         #    print("I2C frequency is not settable in python, ignoring!")

-        
+

         try:
             self._i2c_bus = smbus.SMBus(bus_num)
         except FileNotFoundError:
         try:
             self._i2c_bus = smbus.SMBus(bus_num)
         except FileNotFoundError:

-            raise RuntimeError("I2C Bus #%d not found, check if enabled in config!" % bus_num)
+            raise RuntimeError(
+                "I2C Bus #%d not found, check if enabled in config!" % bus_num
+            )
+
+    # pylint: enable=unused-argument

 
     def scan(self):
 
     def scan(self):

-        """Try to read a byte from each address, if you get an OSError it means the device isnt there"""
+        """Try to read a byte from each address, if you get an OSError
+        it means the device isnt there"""

         found = []
         found = []

-        for addr in range(0,0x80):
+        for addr in range(0, 0x80):

             try:
                 self._i2c_bus.read_byte(addr)
             except OSError:
             try:
                 self._i2c_bus.read_byte(addr)
             except OSError:


@@ -32,24 +41,41 @@ class I2C:
             found.append(addr)
         return found
 
             found.append(addr)
         return found
 

+    # pylint: disable=unused-argument

     def writeto(self, address, buffer, *, start=0, end=None, stop=True):
     def writeto(self, address, buffer, *, start=0, end=None, stop=True):

+        """Write data from the buffer to an address"""

         if end is None:
             end = len(buffer)
         self._i2c_bus.write_bytes(address, buffer[start:end])
 
     def readfrom_into(self, address, buffer, *, start=0, end=None, stop=True):
         if end is None:
             end = len(buffer)
         self._i2c_bus.write_bytes(address, buffer[start:end])
 
     def readfrom_into(self, address, buffer, *, start=0, end=None, stop=True):

+        """Read data from an address and into the buffer"""

         if end is None:
             end = len(buffer)
         if end is None:
             end = len(buffer)

-        
-        readin = self._i2c_bus.read_bytes(address, end-start)
-        for i in range(end-start):
-            buffer[i+start] = readin[i]

 
 

-    def writeto_then_readfrom(self, address, buffer_out, buffer_in, *,
-                       out_start=0, out_end=None,
-                       in_start=0, in_end=None, stop=False):
+        readin = self._i2c_bus.read_bytes(address, end - start)
+        for i in range(end - start):
+            buffer[i + start] = readin[i]
+
+    # pylint: enable=unused-argument
+
+    def writeto_then_readfrom(
+        self,
+        address,
+        buffer_out,
+        buffer_in,
+        *,
+        out_start=0,
+        out_end=None,
+        in_start=0,
+        in_end=None,
+        stop=False
+    ):
+        """Write data from buffer_out to an address and then
+        read data from an address and into buffer_in
+        """

         if out_end is None:
         if out_end is None:

-            out_end = len(buffer_out)        
+            out_end = len(buffer_out)

         if in_end is None:
             in_end = len(buffer_in)
         if stop:
         if in_end is None:
             in_end = len(buffer_in)
         if stop:


@@ -58,9 +84,8 @@ class I2C:
             self.readfrom_into(address, buffer_in, start=in_start, end=in_end)
         else:
             # To generate without a stop, do in one block transaction
             self.readfrom_into(address, buffer_in, start=in_start, end=in_end)
         else:
             # To generate without a stop, do in one block transaction

-            if out_end-out_start != 1:
-                raise NotImplementedError("Currently can only write a single byte in writeto_then_readfrom")
-            readin = self._i2c_bus.read_i2c_block_data(address, buffer_out[out_start:out_end][0], in_end-in_start)
-            for i in range(in_end-in_start):
-                buffer_in[i+in_start] = readin[i]
-
+            readin = self._i2c_bus.read_i2c_block_data(
+                address, buffer_out[out_start:out_end], in_end - in_start
+            )
+            for i in range(in_end - in_start):
+                buffer_in[i + in_start] = readin[i]