Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cbf28c861674
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5b607de69c3e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 19, 2015

  1. DDS monitor fixes

    sbourdeauducq committed Jun 19, 2015
    Copy the full SHA
    f47c2e5 View commit details
  2. Copy the full SHA
    5b607de View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 artiq/gateware/rtio/phy/dds.py
  2. +1 −1 artiq/gui/moninj.py
6 changes: 3 additions & 3 deletions artiq/gateware/rtio/phy/dds.py
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ def __init__(self, pads, nchannels=8, **kwargs):

# keep track of frequency tuning words, before they are FUDed
ftws = [Signal(32) for i in range(nchannels)]
for i in range(4):
for c, ftw in enumerate(ftws):
for c, ftw in enumerate(ftws):
for i in range(4):
self.sync.rio += \
If(self.rtlink.o.stb & \
(self.rtlink.o.address == 0x0a+i) & \
@@ -31,6 +31,6 @@ def __init__(self, pads, nchannels=8, **kwargs):
)

# FTW to probe on FUD
for c, (probe, ftw) in enumerate(zip(self.probes, ftw)):
for c, (probe, ftw) in enumerate(zip(self.probes, ftws)):
fud = self.rtlink.o.stb & (self.rtlink.o.address == 64)
self.sync.rio += If(fud & (current_channel == c), probe.eq(ftw))
2 changes: 1 addition & 1 deletion artiq/gui/moninj.py
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ def __init__(self, send_to_device, channel, sysclk, name):
def set_value(self, ftw):
frequency = ftw*self.sysclk/2**32
self._value.setText("<font size=\"9\">{:.3f} MHz</font>"
.format(float(frequency)))
.format(float(frequency)/1e6))


class _DeviceManager: