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: 14ddcd2e30bf
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: 342b9e977ee5
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 18, 2016

  1. phaser/conda: bump jesd204b

    jordens committed Nov 18, 2016
    Copy the full SHA
    7664b22 View commit details
  2. Copy the full SHA
    342b9e9 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 artiq/gateware/rtio/phy/sawg.py
  2. +1 −1 conda/artiq-kc705-phaser/meta.yaml
3 changes: 2 additions & 1 deletion artiq/gateware/rtio/phy/sawg.py
Original file line number Diff line number Diff line change
@@ -16,7 +16,8 @@ def __init__(self, *args, **kwargs):
_ChannelPHY.__init__(self, *args, **kwargs)
self.phys = []
for i in self.i:
rl = rtlink.Interface(rtlink.OInterface(len(i.payload)))
rl = rtlink.Interface(rtlink.OInterface(
min(64, len(i.payload)))) # FIXME
self.comb += [
i.stb.eq(rl.o.stb),
rl.o.busy.eq(~i.ack),
2 changes: 1 addition & 1 deletion conda/artiq-kc705-phaser/meta.yaml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ requirements:
build:
- migen 0.4
- misoc 0.4
- jesd204b 0.1
- jesd204b 0.2
- llvm-or1k
- binutils-or1k-linux >=2.27
- rust-core-or1k