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

dds: fix phase computation. Closes #79.

This commit is contained in:
Sebastien Bourdeauducq 2015-08-27 11:09:33 +08:00
parent f07c7e9c6f
commit 0fe0f4d433
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/dds.py
View File

@ -131,11 +131,11 @@ class _DDSGeneric:
""" """
if phase_mode == _PHASE_MODE_DEFAULT: if phase_mode == _PHASE_MODE_DEFAULT:
phase_mode = self.phase_mode phase_mode = self.phase_mode
syscall("dds_set", now_mu(), self.channel, syscall("dds_set", now_mu(), self.channel, frequency,
frequency, round(phase*2**self.pow_width), phase_mode) phase, phase_mode)
@kernel @kernel
def set(self, frequency, phase=0, phase_mode=_PHASE_MODE_DEFAULT): def set(self, frequency, phase=0.0, phase_mode=_PHASE_MODE_DEFAULT):
"""Like ``set_mu``, but uses Hz and turns.""" """Like ``set_mu``, but uses Hz and turns."""
self.set_mu(self.frequency_to_ftw(frequency), self.set_mu(self.frequency_to_ftw(frequency),
self.turns_to_pow(phase), phase_mode) self.turns_to_pow(phase), phase_mode)