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: 9880b1ebd03d
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: 370b05d263e4
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 12, 2016

  1. Copy the full SHA
    9c8b21b View commit details
  2. Copy the full SHA
    370b05d View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 README_PHASER.rst
  2. +1 −1 artiq/examples/phaser/repository/dac_setup.py
  3. +1 −1 conda/artiq-kc705-phaser/meta.yaml
8 changes: 4 additions & 4 deletions README_PHASER.rst
Original file line number Diff line number Diff line change
@@ -42,12 +42,12 @@ https://m-labs.hk/artiq/manual-release-2/index.html
* Install the standard ARTIQ build dependencies.
They are all available as conda packages in m-labs/main at least for linux-64:

- migen 0.4
- misoc 0.3
- llvm-or1k
- migen =0.4
- misoc =0.4
- llvm-or1k =3.8
- rust-core-or1k
- cargo
- binutils-or1k-linux
- binutils-or1k-linux >=2.27

* Install a recent version of Vivado (tested and developed with 2016.2).
* Checkout the ARTIQ phaser branch and the JESD204B core: ::
2 changes: 1 addition & 1 deletion artiq/examples/phaser/repository/dac_setup.py
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ def run(self):
self.busywait_us(10000)
self.ad9154.init()
self.dac_setup()
self.busywait_us(10000)
self.busywait_us(200000)
self.ad9154.jesd_enable(1)
while not self.ad9154.jesd_ready():
pass
2 changes: 1 addition & 1 deletion conda/artiq-kc705-phaser/meta.yaml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ build:
requirements:
build:
- migen 0.4
- misoc 0.3
- misoc 0.4
- llvm-or1k
- binutils-or1k-linux >=2.27
- rust-core-or1k