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: 9a6354b959ff
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: 4946a53456e0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 22, 2016

  1. doc: fix conda install instructions

    @sbourdeauducq
    sbourdeauducq committed Feb 22, 2016
    Copy the full SHA
    be6b64a View commit details

  2. Revert "targets/kc705: pre-divide input RTIO clock to improve non-50%… 

    … duty cycle tolerance"

This reverts commit 04b0db1.
    @sbourdeauducq
    sbourdeauducq committed Feb 22, 2016
    Copy the full SHA
    4946a53 View commit details
Showing with 6 additions and 20 deletions.
  1. +4 −18 artiq/gateware/targets/kc705.py
  2. +2 −2 doc/manual/installing.rst
22 changes: 4 additions & 18 deletions artiq/gateware/targets/kc705.py
View file
Original file line number Diff line number Diff line change
@@ -45,18 +45,6 @@ def __init__(self, platform, rtio_internal_clk):
i_I=user_sma_clock.p, i_IB=user_sma_clock.n,
o_O=rtio_external_clk)

rtio_half_internal_clk = Signal()
self.specials += Instance("BUFR",
p_BUFR_DIVIDE="2", i_CE=1, i_CLR=0,
i_I=rtio_internal_clk,
o_O=rtio_half_internal_clk)

rtio_half_external_clk = Signal()
self.specials += Instance("BUFR",
p_BUFR_DIVIDE="2", i_CE=1, i_CLR=0,
i_I=rtio_external_clk,
o_O=rtio_half_external_clk)

pll_locked = Signal()
rtio_clk = Signal()
rtiox4_clk = Signal()
@@ -66,15 +54,13 @@ def __init__(self, platform, rtio_internal_clk):
p_STARTUP_WAIT="FALSE", o_LOCKED=pll_locked,

p_REF_JITTER1=0.01,
p_CLKIN1_PERIOD=16.0, p_CLKIN2_PERIOD=16.0,
i_CLKIN1=rtio_half_internal_clk,
i_CLKIN2=rtio_half_external_clk,
p_CLKIN1_PERIOD=8.0, p_CLKIN2_PERIOD=8.0,
i_CLKIN1=rtio_internal_clk, i_CLKIN2=rtio_external_clk,
# Warning: CLKINSEL=0 means CLKIN2 is selected
i_CLKINSEL=~self._clock_sel.storage,

# VCO @ 1GHz when using 62.5MHz input at the PLL
# (125MHz on SMA)
p_CLKFBOUT_MULT=16, p_DIVCLK_DIVIDE=1,
# VCO @ 1GHz when using 125MHz input
p_CLKFBOUT_MULT=8, p_DIVCLK_DIVIDE=1,
i_CLKFBIN=self.cd_rtio.clk,
i_RST=self._pll_reset.storage,

4 changes: 2 additions & 2 deletions doc/manual/installing.rst
View file
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ If not, then make sure your ``$PATH`` environment variable contains the path to
$ echo $PATH
/home/.../miniconda3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin

If your ``$PATH`` misses reference the miniconda3/bin or anaconda3/bin you can fix this by typing::
If your ``$PATH`` misses reference the ``miniconda3/bin`` or ``anaconda3/bin`` you can fix this by typing::

$ export PATH=$HOME/miniconda3:$PATH
$ export PATH=$HOME/miniconda3/bin:$PATH

Installing the host side software
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^