occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #832 from mntng/master 

set range for divider values
This commit is contained in:
Robert Jördens 2017-09-21 08:43:43 +02:00 committed by GitHub
parent 9ccd95e10d e94d2d3779
commit 0a43815956
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/coredevice/spi.py
View File

@ -155,6 +155,8 @@ class SPIMaster:
by one RTIO clock cycle. by one RTIO clock cycle.
:param read_div: Ditto for the read clock. :param read_div: Ditto for the read clock.
""" """
if write_div > 257 or write_div < 2 or read_div > 257 or read_div < 2:
raise ValueError('Divider values out of range')
rtio_output(now_mu(), self.channel, SPI_CONFIG_ADDR, flags | rtio_output(now_mu(), self.channel, SPI_CONFIG_ADDR, flags |
((write_div - 2) << 16) | ((read_div - 2) << 24)) ((write_div - 2) << 16) | ((read_div - 2) << 24))
self.write_period_mu = int(write_div*self.ref_period_mu) self.write_period_mu = int(write_div*self.ref_period_mu)