Skip to content

Commit

Permalink
ad9914: minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sbourdeauducq committed May 14, 2018
1 parent 194d646 commit 56a1868
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions artiq/coredevice/ad9914.py
Expand Up @@ -11,6 +11,12 @@
from numpy import int32, int64


__all__ = [
"AD9914",
"PHASE_MODE_CONTINUOUS", "PHASE_MODE_ABSOLUTE", "PHASE_MODE_TRACKING"
]


_PHASE_MODE_DEFAULT = -1
PHASE_MODE_CONTINUOUS = 0
PHASE_MODE_ABSOLUTE = 1
Expand Down Expand Up @@ -54,7 +60,7 @@ class AD9914:
kernel_invariants = {"core", "sysclk", "bus_channel", "channel",
"rtio_period_mu", "sysclk_per_mu", "write_duration_mu",
"dac_cal_duration_mu", "init_duration_mu", "init_sync_duration_mu",
"set_duration_mu", "set_x_duration_mu"
"set_duration_mu", "set_x_duration_mu", "exit_x_duration_mu",
"continuous_phase_comp"}

def __init__(self, dmgr, sysclk, bus_channel, channel, core_device="core"):
Expand Down Expand Up @@ -179,7 +185,8 @@ def set_mu(self, ftw, pow=0, phase_mode=_PHASE_MODE_DEFAULT,
"""Sets the DDS channel to the specified frequency and phase.
This uses machine units (FTW and POW). The frequency tuning word width
is 32, and the phase offset word width is 16.
is 32, the phase offset word width is 16, and the amplitude scale factor
width is 12.
The "frequency update" pulse is sent to the DDS with a fixed latency
with respect to the current position of the time cursor.
Expand Down

0 comments on commit 56a1868

Please sign in to comment.