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: 8082bf14c167
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: 9f3f9255a2ab
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 21, 2015

  1. ddb: fix pdq comment

    sbourdeauducq committed Jun 21, 2015
    Copy the full SHA
    b7d976e View commit details
  2. Copy the full SHA
    9f3f925 View commit details
Showing with 7 additions and 3 deletions.
  1. +1 −1 examples/master/ddb.pyon
  2. +3 −1 soc/targets/artiq_kc705.py
  3. +3 −1 soc/targets/artiq_pipistrello.py
2 changes: 1 addition & 1 deletion examples/master/ddb.pyon
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@
"rtio_trigger": 7,
"rtio_frame": [2, 3, 4]
},
"comment": "Conflicts with dds2 and ttl0-2"
"comment": "Uses ttl 0, 1, 2 and 5"
},

"lda": {
4 changes: 3 additions & 1 deletion soc/targets/artiq_kc705.py
Original file line number Diff line number Diff line change
@@ -83,7 +83,9 @@ def __init__(self, platform, cpu_type="or1k", **kwargs):
self.add_constant("DDS_CHANNEL_COUNT", 8)
phy = dds.AD9858(platform.request("dds"))
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4))
rtio_channels.append(rtio.Channel.from_phy(phy,
ofifo_depth=512,
ififo_depth=4))

# RTIO core
self.submodules.rtio_crg = _RTIOCRG(platform, self.crg.pll_sys)
4 changes: 3 additions & 1 deletion soc/targets/artiq_pipistrello.py
Original file line number Diff line number Diff line change
@@ -118,7 +118,9 @@ def __init__(self, platform, cpu_type="or1k", **kwargs):
self.add_constant("DDS_CHANNEL_COUNT", 8)
phy = dds.AD9858(platform.request("dds"))
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=4))
rtio_channels.append(rtio.Channel.from_phy(phy,
ofifo_depth=512,
ififo_depth=4))

# RTIO core
self.submodules.rtio_crg = _RTIOCRG(platform)