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: b32217cc84c5
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: cb6c28006c55
Choose a head ref
  • 16 commits
  • 8 files changed
  • 1 contributor

Commits on Mar 8, 2016

  1. rtio: add RTIOBusy

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    2cb5859 View commit details

Commits on Mar 9, 2016

  1. Merge commit '9d1903a' into rtiobusy 

    * commit '9d1903a':
  coredevice/i2c,ttl,spi: consistent device get
  examples/device_db: remove --no-localhost-bind
  Monkey-patch asyncio create_server (fixes #253).
  pipistrello: drop ttls on pmod, add leds back in
  pipistrello: try with fewer leds/pmod ttl
    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    446dcfb View commit details

  2. coredevice: add RTIOBusy to __all__

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    b0de9ee View commit details

  3. hardware_testbench: don't allow unused *args

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    522ec60 View commit details

  4. spi: fix frequency_to_div()

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    0bd9add View commit details

  5. rtio: remove unused include

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    db52312 View commit details

  6. rtio: cleanup RTIOBusy message

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    bf188d0 View commit details

  7. tests: test spi business

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    58e0e67 View commit details

  8. hardware_testbench: also print artiq_core_exeption

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    b50e3fa View commit details

  9. hardware_testbench: clean up artiq_core_exeption printing

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    9a661bd View commit details

  10. test_spi: simplify test, add collision vs busy test

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    8f6653e View commit details

  11. Merge branch 'master' into rtiobusy 

    * master:
  coredevice: fix _DDSGeneric __init__ args
  rtio/core: fix syntax
  rtio: disable replace on rt2wb channels
  examples: dds_bus -> core_dds
  fix more multi-DDS-bus problems
  runtime: fix dds declarations
  support for multiple DDS buses (untested)
    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    349a661 View commit details

  12. test_spi: break_realtime

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    10a0912 View commit details

  13. gateware/rtio: factor _BlindTransfer

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    107e5cf View commit details

  14. exceptions: clarify RTIOBusy

    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    9edaf16 View commit details

  15. Merge branch 'rtiobusy' (closes #308) 

    * rtiobusy:
  exceptions: clarify RTIOBusy
  gateware/rtio: factor _BlindTransfer
  test_spi: break_realtime
  test_spi: simplify test, add collision vs busy test
  hardware_testbench: clean up artiq_core_exeption printing
  hardware_testbench: also print artiq_core_exeption
  tests: test spi business
  rtio: cleanup RTIOBusy message
  rtio: remove unused include
  spi: fix frequency_to_div()
  hardware_testbench: don't allow unused *args
  coredevice: add RTIOBusy to __all__
  rtio: add RTIOBusy
    @jordens
    jordens committed Mar 9, 2016
    Copy the full SHA
    cb6c280 View commit details
Loading