Commit 0060d193 authored by Michael J. Lyons's avatar Michael J. Lyons

Making SPI bitrate configurable when initializing spi object

parent 679dcdb6
...@@ -6,7 +6,6 @@ class SpiComm: ...@@ -6,7 +6,6 @@ class SpiComm:
_port = 0 # Change if using multiple Cheetahs _port = 0 # Change if using multiple Cheetahs
_mode = 3 # spiifc SPI mode _mode = 3 # spiifc SPI mode
_bitrate = 22000 # kbps
handle = None # handle to Cheetah SPI handle = None # handle to Cheetah SPI
...@@ -15,14 +14,14 @@ class SpiComm: ...@@ -15,14 +14,14 @@ class SpiComm:
def __init__(self, msg): def __init__(self, msg):
self.msg = msg self.msg = msg
def __init__(self): def __init__(self, kbpsBitrate=9000):
self.handle = ch_open(self._port) self.handle = ch_open(self._port)
if (self.handle <= 0): if (self.handle <= 0):
raise SpiCommError("Unable to open Cheetah device on port %d.\nError code = %d (%s)" % (self._port, self.handle, ch_status_string(self.handle))) raise SpiCommError("Unable to open Cheetah device on port %d.\nError code = %d (%s)" % (self._port, self.handle, ch_status_string(self.handle)))
ch_host_ifce_speed(self.handle) ch_host_ifce_speed(self.handle)
ch_spi_configure(self.handle, (self._mode >> 1), self._mode & 1, ch_spi_configure(self.handle, (self._mode >> 1), self._mode & 1,
CH_SPI_BITORDER_MSB, 0x0) CH_SPI_BITORDER_MSB, 0x0)
ch_spi_bitrate(self.handle, self._bitrate) ch_spi_bitrate(self.handle, kbpsBitrate)
def __del__(self): def __del__(self):
ch_close(self.handle) ch_close(self.handle)
......
...@@ -236,7 +236,7 @@ Valid tests (case sensitive): ...@@ -236,7 +236,7 @@ Valid tests (case sensitive):
- MemLoopback - MemLoopback
- RegLoopback - RegLoopback
- ReadRegs - ReadRegs
- WriteRegsTest - WriteRegs
- XpsLoopback - XpsLoopback
""" """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment