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

ad9914: set_mu_x -> set_x_mu

pull/1017/head
Sebastien Bourdeauducq 2018-05-14 23:28:14 +08:00
parent 09617c9f5e
commit 80df86f700
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/coredevice/ad9914.py
View File

@ -277,7 +277,7 @@ class AD9914:
# Extended-resolution functions
@kernel
def set_mu_x(self, xftw, amplitude=0x0fff):
def set_x_mu(self, xftw, amplitude=0x0fff):
"""Set the DDS frequency and amplitude with an extended-resolution
(63-bit) frequency tuning word.
@ -323,10 +323,10 @@ class AD9914:
@kernel
def set_x(self, frequency, amplitude=1.0):
"""Like ``set_mu_x``, but uses Hz and turns.
"""Like ``set_x_mu``, but uses Hz and turns.
Note that the precision of ``float`` is less than the precision
of the extended frequency tuning word.
"""
self.set_mu_x(self.frequency_to_xftw(frequency),
self.set_x_mu(self.frequency_to_xftw(frequency),
self.amplitude_to_asf(amplitude))