Skip to content

Commit

Permalink
Add speed as spi parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
avishayp committed Sep 16, 2018
1 parent ff3cd93 commit 25dcca1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea

dpkg-files
makedebpkg.sh
*.deb
Expand Down
4 changes: 2 additions & 2 deletions pifacecommon/mcp23s17.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ class MCP23S17(SPIDevice):
:attribute: olata/olatb -- The OLAT register provides access to the
output latches.
"""
def __init__(self, hardware_addr=0, bus=0, chip_select=0):
super(MCP23S17, self).__init__(bus, chip_select)
def __init__(self, hardware_addr=0, bus=0, chip_select=0, speed_hz=100000):
super(MCP23S17, self).__init__(bus, chip_select, speed_hz=speed_hz)
self.hardware_addr = hardware_addr

self.iodira = MCP23S17Register(IODIRA, self)
Expand Down
5 changes: 3 additions & 2 deletions pifacecommon/spi.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class SPIInitError(Exception):

class SPIDevice(object):
"""An SPI Device at /dev/spi<bus>.<chip_select>."""
def __init__(self, bus=0, chip_select=0, spi_callback=None):
def __init__(self, bus=0, chip_select=0, spi_callback=None, speed_hz=100000):
"""Initialises the SPI device file descriptor.
:param bus: The SPI device bus number
Expand All @@ -27,6 +27,7 @@ def __init__(self, bus=0, chip_select=0, spi_callback=None):
self.bus = bus
self.chip_select = chip_select
self.spi_callback = spi_callback
self.speed_hz = speed_hz
self.fd = None
spi_device = "%s%d.%d" % (SPIDEV, self.bus, self.chip_select)
self.open_fd(spi_device)
Expand Down Expand Up @@ -66,7 +67,7 @@ def spisend(self, bytes_to_send):
tx_buf=ctypes.addressof(wbuffer),
rx_buf=ctypes.addressof(rbuffer),
len=ctypes.sizeof(wbuffer),
speed_hz=ctypes.c_uint32(100000)
speed_hz=ctypes.c_uint32(self.speed_hz)
)

if self.spi_callback is not None:
Expand Down

0 comments on commit 25dcca1

Please sign in to comment.