Merge pull request #184 from caternuson/mcp2221

Add MCP2221 support.

diff --git a/src/adafruit_blinka/board/raspi_1b_rev1.py b/src/adafruit_blinka/board/raspi_1b_rev1.py
index 817e91193cb0cb691a7cdd4cbf5efe3f46cc6fde..59168dc6004b8dd0467a4c118717599e65d8c7ce 100644 (file)
--- a/src/adafruit_blinka/board/raspi_1b_rev1.py
+++ b/src/adafruit_blinka/board/raspi_1b_rev1.py
@@ -24,6 +24,9 @@ D14 = pin.D14
 TXD = pin.D14
 D15 = pin.D15
 RXD = pin.D15
+# create alias for most of the examples
+TX = pin.D14
+RX = pin.D15
 
 D17 = pin.D17
 D18 = pin.D18

diff --git a/src/adafruit_blinka/board/raspi_1b_rev2.py b/src/adafruit_blinka/board/raspi_1b_rev2.py
index 05dd69d5d679175c3b2665d2781d567126ad9952..47fc39b32b3708c074166ecef1ba4b84b8f5cbce 100644 (file)
--- a/src/adafruit_blinka/board/raspi_1b_rev2.py
+++ b/src/adafruit_blinka/board/raspi_1b_rev2.py
@@ -24,6 +24,9 @@ D14 = pin.D14
 TXD = pin.D14
 D15 = pin.D15
 RXD = pin.D15
+# create alias for most of the examples
+TX = pin.D14
+RX = pin.D15
 
 D17 = pin.D17
 D18 = pin.D18

diff --git a/src/adafruit_blinka/board/raspi_40pin.py b/src/adafruit_blinka/board/raspi_40pin.py
index acfa5d14396b015cfb66c7312e5b87bcc2dc8c3b..91347e04a9548be453d281070be0ee494029d5d2 100644 (file)
--- a/src/adafruit_blinka/board/raspi_40pin.py
+++ b/src/adafruit_blinka/board/raspi_40pin.py
@@ -33,6 +33,9 @@ D14 = pin.D14
 TXD = pin.D14
 D15 = pin.D15
 RXD = pin.D15
+# create alias for most of the examples
+TX = pin.D14
+RX = pin.D15
 
 D16 = pin.D16
 D17 = pin.D17

diff --git a/src/adafruit_blinka/board/raspi_cm.py b/src/adafruit_blinka/board/raspi_cm.py
index eff7f9691d5a52111349354ddd014946ae17f48c..338017875acf1b6b0540975a4d6bdc18cbff9bb0 100644 (file)
--- a/src/adafruit_blinka/board/raspi_cm.py
+++ b/src/adafruit_blinka/board/raspi_cm.py
@@ -30,6 +30,9 @@ D14 = pin.D14
 TXD = pin.D14
 D15 = pin.D15
 RXD = pin.D15
+# create alias for most of the examples
+TX = pin.D14
+RX = pin.D15
 
 D16 = pin.D16
 D17 = pin.D17

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
index e309e9ef6ac0ae3e5db041b616ca5fb2ba463105..ed8c8b8f7ed0860694d8a6e9200034b519e7e854 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
@@ -58,9 +58,7 @@ 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
-            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)
+            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]