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: b85ab712a9c7
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: 99104499f998
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 20, 2016

  1. gui: 2.0 -> 2 in logo

    sbourdeauducq committed Nov 20, 2016
    Copy the full SHA
    2513511 View commit details
  2. Copy the full SHA
    9910449 View commit details
Showing with 17 additions and 26 deletions.
  1. +4 −4 artiq/gateware/targets/kc705.py
  2. +13 −22 artiq/gui/logo20.svg
8 changes: 4 additions & 4 deletions artiq/gateware/targets/kc705.py
Original file line number Diff line number Diff line change
@@ -248,16 +248,16 @@ def __init__(self, cpu_type="or1k", **kwargs):
if i % 4 == 3:
phy = ttl_serdes_7series.Inout_8X(platform.request("ttl", i))
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=1024))
else:
phy = ttl_serdes_7series.Output_8X(platform.request("ttl", i))
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy))
rtio_channels.append(rtio.Channel.from_phy(phy, ofifo_depth=1024))

for i in range(2):
phy = ttl_serdes_7series.Inout_8X(platform.request("pmt", i))
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=16384))

phy = ttl_serdes_7series.Inout_8X(platform.request("user_sma_gpio_n_33"))
self.submodules += phy
@@ -297,7 +297,7 @@ def __init__(self, cpu_type="or1k", **kwargs):
phy = dds.AD9914(platform.request("dds"), 11, onehot=True)
self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy,
ofifo_depth=512,
ofifo_depth=16384,
ififo_depth=4))

self.config["RTIO_LOG_CHANNEL"] = len(rtio_channels)
35 changes: 13 additions & 22 deletions artiq/gui/logo20.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.