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: 381e58434f28
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: 02adae7397f2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 19, 2016

  1. Copy the full SHA
    abd1b2a View commit details
  2. Copy the full SHA
    02adae7 View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 artiq/gateware/drtio/link_layer.py
  2. +1 −1 artiq/runtime.rs/src/drtio.rs
3 changes: 2 additions & 1 deletion artiq/gateware/drtio/link_layer.py
Original file line number Diff line number Diff line change
@@ -273,5 +273,6 @@ def __init__(self, encoder, decoders):
If(wait_scrambler.done, NextState("READY"))
)
fsm.act("READY",
ready.eq(1)
ready.eq(1),
If(~self.rx_ready, NextState("WAIT_RX_READY"))
)
2 changes: 1 addition & 1 deletion artiq/runtime.rs/src/drtio.rs
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ pub fn link_thread(waiter: Waiter, _spawner: Spawner) {
waiter.until(drtio_link_is_up).unwrap();
info!("link RX is up");

waiter.sleep(300).unwrap();
waiter.sleep(500).unwrap();
info!("wait for remote side done");

drtio_sync_tsc();