M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

spi2: fixes

This commit is contained in:
Robert Jördens 2018-02-21 18:26:51 +00:00 committed by Robert Jordens
parent 5eda894db4
commit 898bad5abc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artiq/coredevice/spi2.py
View File

@ -7,9 +7,7 @@ Output event replacement is not supported and issuing commands at the same
time is an error. time is an error.
""" """
from numpy import int64
from artiq.language.core import syscall, kernel, portable, now_mu, delay_mu from artiq.language.core import syscall, kernel, portable, now_mu, delay_mu
from artiq.language.types import TInt32, TNone
from artiq.coredevice.rtio import rtio_output, rtio_input_data from artiq.coredevice.rtio import rtio_output, rtio_input_data
@ -72,11 +70,10 @@ class SPIMaster:
@portable @portable
def frequency_to_div(self, f): def frequency_to_div(self, f):
"""Convert a SPI clock frequency to the closest SPI clock divider.""" """Convert a SPI clock frequency to the closest SPI clock divider."""
return int64(round( return int(round(1/(f*self.core.mu_to_seconds(self.ref_period_mu))))
1/(f*self.core.mu_to_seconds(self.ref_period_mu))))
@kernel @kernel
def set_config(self, flags, length, freq, c): def set_config(self, flags, length, freq, cs):
"""Set the configuration register. """Set the configuration register.
* If ``SPI_CS_POLARITY`` is cleared (``cs`` active low, the default), * If ``SPI_CS_POLARITY`` is cleared (``cs`` active low, the default),
@ -140,8 +137,7 @@ class SPIMaster:
Or number of the chip select to assert if ``cs`` is decoded Or number of the chip select to assert if ``cs`` is decoded
downstream. (reset=0) downstream. (reset=0)
""" """
self.set_config_mu( self.set_config_mu(flags, length, self.frequency_to_div(freq), cs)
flags, length, self.frequency_to_div(write_freq), cs)
@kernel @kernel
def set_config_mu(self, flags, length, div, cs): def set_config_mu(self, flags, length, div, cs):