Sync from upstream master

Author: dplanella

Adafruit_BBIO/README.md

@@ -94,6 +94,8 @@ To add user `userName` to the `eqep` group (run this command as root):
 usermod -a -G eqep userName
 ```
 
+Note: you will need to log out and log back in for the group membership change to take effect.
+
 ### Capes
 
 In order to use all eQEP pins the BeagleBone must boot with the [cape-universal](https://github.com/beagleboard/bb.org-overlays/tree/master/tools/beaglebone-universal-io) enabled, and load the `cape-universal` overlay.

Adafruit_I2C.py

@@ -1,123 +1,13 @@
 #!/usr/bin/python
 
-import smbus
-
-# ===========================================================================
-# Adafruit_I2C Class
-# Adafruit_I2C.py is essentially a fork of the Adafruit Raspberry Pi I2C module.
-# Any pull requests for this module should be directed to the following, and I
-# can pull them. I'd rather not deviate from the original:
-# https://github.com/adafruit/Adafruit-Raspberry-Pi-Python-Code/tree/master/Adafruit_I2C
-# ===========================================================================
+# WARNING: THIS MODULE IS DEPRECATED!
+# use Adafruit_GPIO.I2C instead:
+# https://github.com/adafruit/Adafruit_Python_GPIO/blob/master/Adafruit_GPIO/I2C.py
 
 class Adafruit_I2C :
 
   def __init__(self, address, busnum=-1, debug=False):
-    self.address = address
-    self.bus = smbus.SMBus(busnum if busnum >= 0 else 1)
-    self.debug = debug
-
-  def reverseByteOrder(self, data):
-    "Reverses the byte order of an int (16-bit) or long (32-bit) value"
-    # Courtesy Vishal Sapre
-    byteCount = len(hex(data)[2:].replace('L','')[::2])
-    val       = 0
-    for i in range(byteCount):
-      val    = (val << 8) | (data & 0xff)
-      data >>= 8
-    return val
-
-  def errMsg(self):
-    print("Error accessing 0x%02X: Check your I2C address" % self.address)
-    return -1
-
-  def write8(self, reg, value):
-    "Writes an 8-bit value to the specified register/address"
-    try:
-      self.bus.write_byte_data(self.address, reg, value)
-      if self.debug:
-        print("I2C: Wrote 0x%02X to register 0x%02X" % (value, reg))
-    except IOError as err:
-      return self.errMsg()
-
-  def write16(self, reg, value):
-    "Writes a 16-bit value to the specified register/address pair"
-    try:
-      self.bus.write_word_data(self.address, reg, value)
-      if self.debug:
-        print("I2C: Wrote 0x%02X to register pair 0x%02X,0x%02X" %
-         (value, reg, reg+1))
-    except IOError as err:
-      return self.errMsg()
-
-  def writeList(self, reg, list):
-    "Writes an array of bytes using I2C format"
-    try:
-      if self.debug:
-        print("I2C: Writing list to register 0x%02X:" % reg)
-        print(list)
-      self.bus.write_i2c_block_data(self.address, reg, list)
-    except IOError as err:
-      return self.errMsg()
-
-  def readList(self, reg, length):
-    "Read a list of bytes from the I2C device"
-    try:
-      results = self.bus.read_i2c_block_data(self.address, reg, length)
-      if self.debug:
-        print("I2C: Device 0x%02X returned the following from reg 0x%02X" %
-         (self.address, reg))
-        print(results)
-      return results
-    except IOError as err:
-      return self.errMsg()
-
-  def readU8(self, reg):
-    "Read an unsigned byte from the I2C device"
-    try:
-      result = self.bus.read_byte_data(self.address, reg)
-      if self.debug:
-        print("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" %
-         (self.address, result & 0xFF, reg))
-      return result
-    except IOError as err:
-      return self.errMsg()
-
-  def readS8(self, reg):
-    "Reads a signed byte from the I2C device"
-    try:
-      result = self.bus.read_byte_data(self.address, reg)
-      if result > 127: result -= 256
-      if self.debug:
-        print("I2C: Device 0x%02X returned 0x%02X from reg 0x%02X" %
-         (self.address, result & 0xFF, reg))
-      return result
-    except IOError as err:
-      return self.errMsg()
-
-  def readU16(self, reg):
-    "Reads an unsigned 16-bit value from the I2C device"
-    try:
-      result = self.bus.read_word_data(self.address,reg)
-      if (self.debug):
-        print("I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg))
-      return result
-    except IOError as err:
-      return self.errMsg()
-
-  def readS16(self, reg):
-    "Reads a signed 16-bit value from the I2C device"
-    try:
-      result = self.bus.read_word_data(self.address,reg)
-      if (self.debug):
-        print("I2C: Device 0x%02X returned 0x%04X from reg 0x%02X" % (self.address, result & 0xFFFF, reg))
-      return result
-    except IOError as err:
-      return self.errMsg()
+    print("WARNING: THIS MODULE IS DEPRECATED. Use Adafruit_GPIO.I2C instead.\n");
 
 if __name__ == '__main__':
-  try:
-    bus = Adafruit_I2C(address=0)
-    print("Default I2C bus is accessible")
-  except:
-    print("Error accessing default I2C bus")
+  print("WARNING: THIS MODULE IS DEPRECATED. Use Adafruit_GPIO.I2C instead.\n");

README.md

@@ -4,7 +4,7 @@
 [![PyPI version](https://badge.fury.io/py/Adafruit_BBIO.svg)](https://badge.fury.io/py/Adafruit_BBIO)
 [![PyPI pyversions](https://img.shields.io/pypi/pyversions/Adafruit_BBIO.svg)](https://pypi.python.org/pypi/Adafruit_BBIO/)
 
-Adafruit BBIO is an API to enable [GPIO](README.md#gpio-setup), [PWM](README.md#pwm), [ADC](README.md#adc), [UART](README.md#uart), SPI and eQEP hardware access from Python applications running on the Beaglebone. 
+Adafruit BBIO is an API to enable [GPIO](README.md#gpio-setup), [PWM](README.md#pwm), [ADC](README.md#adc), [UART](README.md#uart), [SPI](README.md#spi) and [eQEP](README.md#eqep) (Quadrature Encoder) hardware access from Python applications running on the Beaglebone. 
 
 * It is recommended to use an [official BeagleBoard.org Debian image](https://beagleboard.org/latest-images)
   * **Currently recommended image: [Debian 9.2 "Stretch" iot (2017-10-29)](https://elinux.org/Beagleboard:BeagleBoneBlack_Debian#microSD.2FStandalone:_.28stretch-iot.29_.28All_BeagleBone_Variants_.26_PocketBeagle.29)**
@@ -250,6 +250,10 @@ print(spi.xfer2([32, 11, 110, 22, 220]))
 spi.close() 
 ```
 
+### eQEP
+
+To use the enhanced Quadrature Encoder Pulse (eQEP) module, please refer to the [`Encoder` module's documentation](https://github.com/adafruit/adafruit-beaglebone-io-python/tree/master/Adafruit_BBIO#usage).
+
 ## Running tests
 
 Install py.test to run the tests. You'll also need the python compiler package for pytest:

source/spimodule.c

@@ -703,7 +703,6 @@ static PyObject *
 SPI_open(SPI *self, PyObject *args, PyObject *kwds)
 {
 	int bus, device;
-	int bus_path;
 	int max_dt_length = 15;
 	char device_tree_name[max_dt_length];
 	char path[MAXPATH];
@@ -722,14 +721,7 @@ SPI_open(SPI *self, PyObject *args, PyObject *kwds)
 		return NULL;
 	}
 
-	bus_path = get_spi_bus_path_number(bus);
-	if (bus_path == -1) {
-		PyErr_SetString(PyExc_OverflowError,
-			"Unable to find loaded spi bus path.");
-		return NULL;
-	}
-
-	if (snprintf(path, MAXPATH, "/dev/spidev%d.%d", bus_path, device) >= MAXPATH) {
+	if (snprintf(path, MAXPATH, "/dev/spidev%d.%d", bus, device) >= MAXPATH) {
 		PyErr_SetString(PyExc_OverflowError,
 			"Bus and/or device number is invalid.");
 		return NULL;