KevinMidboe/python-gpiozero
1
0
Fork 0
mirror of https://github.com/KevinMidboe/python-gpiozero.git synced 2025-10-29 17:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pigpiod SPI conflicts

Browse Source 
Wrong classname in the software implementation and for some reason I'd
reverted a change on spi_flags somewhere... Also removed the clause
skipping remote pigpiod tests

Tested this commit with hardware and software SPI remotely - working
nicely
This commit is contained in:
Dave Jones
2016-11-01 10:03:04 +00:00
parent 4944849a30
commit 5487124f74
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gpiozero/pins/pigpiod.py
View File

@@ -297,6 +297,7 @@ class PiGPIOHardwareSPI(SPI, Device):
self._port = port
self._device = device
self._factory = proxy(factory)
self._handle = None
super(PiGPIOHardwareSPI, self).__init__()
self._reserve_pins(*(
factory.address + ('GPIO%d' % pin,)
@@ -305,7 +306,7 @@ class PiGPIOHardwareSPI(SPI, Device):
self._spi_flags = 8 << 16
self._baud = 500000
self._handle = self._factory.connection.spi_open(
device, self._baud, self._spi_flags())
device, self._baud, self._spi_flags)
def _conflicts_with(self, other):
return not (
@@ -413,7 +414,7 @@ class PiGPIOSoftwareSPI(SPI, Device):
def _conflicts_with(self, other):
return not (
isinstance(other, PiGPIOHardwareSPI) and
isinstance(other, PiGPIOSoftwareSPI) and
(self._select_pin) != (other._select_pin)
)