fixed for pi2 device tree

piface · Feb 9, 2015 · 63025bb · 63025bb
1 parent a319522
commit 63025bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,16 +1,24 @@
 Change Log
 ==========
+
+v4.1.1
+------
+- Fixed bug with new Device Tree (Pi2) by changing GPIO_INTERRUPT_DEVICE
+  from `/sys/devices/virtual/gpio/` to `/sys/class/gpio/` and changing udev
+  rule.
+
+
 v4.1.0
 ------
 - Added deregister to interrupts
 
 
-
 v4.0.1
 ------
 - Fixed SPI file descriptor bug when closing.
 - Fixed issue #14.
 
+
 v4.0.0
 ------
 - Ignored "Interrupted system call" error in `watch_port_events`.

diff --git a/pifacecommon/interrupts.py b/pifacecommon/interrupts.py
@@ -15,7 +15,7 @@
 # IN_EVENT_DIR_BOTH = INPUT_DIRECTION_BOTH = None
 
 GPIO_INTERRUPT_PIN = 25
-GPIO_INTERRUPT_DEVICE = "/sys/devices/virtual/gpio/gpio%d" % GPIO_INTERRUPT_PIN
+GPIO_INTERRUPT_DEVICE = "/sys/class/gpio/gpio%d" % GPIO_INTERRUPT_PIN
 GPIO_INTERRUPT_DEVICE_EDGE = '%s/edge' % GPIO_INTERRUPT_DEVICE
 GPIO_INTERRUPT_DEVICE_VALUE = '%s/value' % GPIO_INTERRUPT_DEVICE
 GPIO_EXPORT_FILE = "/sys/class/gpio/export"

diff --git a/pifacecommon/spi.py b/pifacecommon/spi.py
@@ -31,9 +31,9 @@ def __init__(self, bus=0, chip_select=0, spi_callback=None):
         spi_device = "%s%d.%d" % (SPIDEV, self.bus, self.chip_select)
         self.open_fd(spi_device)
 
-    def __del__(self):
-        if self.fd is not None:
-            self.close_fd()
+    # def __del__(self):
+    #     if self.fd is not None:
+    #         self.close_fd()
 
     def open_fd(self, spi_device):
         try:

diff --git a/pifacecommon/version.py b/pifacecommon/version.py
@@ -1 +1 @@
-__version__ = '4.1.0'
+__version__ = '4.1.1'