M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity
3,370 Commits 13 Branches 35 Tags 25 MiB
Commit Graph

3370 Commits

Author SHA1 Message Date
Robert Jördens d34d83f35c Merge branch 'scanwidget' (closes #128) 
* scanwidget:
  gui: fix scanwidget usage
  scanwidget: apply changes as of 10439cb
  scanwidget: apply changes as of 98f0a56
  missing parts of 59ac567
  scanwidget: disable unmodified wheel on axis and slider
  scanwidget: wire up signals better, set values late, take scanwidget from 7aa6397
  gui: use scanwidget
  scanwidget: add from current git
 2016-03-11 18:31:25 +01:00
Robert Jördens 22b072699f gui: fix scanwidget usage 2016-03-11 18:30:27 +01:00
Robert Jördens 7f3e1c989d scanwidget: apply changes as of 10439cb 2016-03-11 18:29:21 +01:00
Robert Jördens e4b854b8bf scanwidget: apply changes as of 98f0a56 2016-03-11 15:38:22 +01:00
Robert Jördens 01e919dad8 novatech409b: log sim commands, style 2016-03-10 16:50:18 +01:00
Sebastien Bourdeauducq 878ab9a39b manual: document DDS and SPI RTIO channels 2016-03-10 22:38:49 +08:00
Sebastien Bourdeauducq 065cbfbb8a gui/moninj: fix datagram offset computation (#325) 2016-03-10 22:34:22 +08:00
Robert Jördens bc9203457e Merge branch 'master' into scanwidget 
* master: (38 commits)
  hardware_testbench: better message when skipping
  test_spi: drain errors and be more strict on where we expect errors
  monkey-patch asyncio.proactor_events to handle ConnectionAbortedError on Windows. Closes #247
  test/rtio/Loopback: ensure loop_out is low before starting test
  test/rtio: raise exception when pulse is not received
  rtio: fix different address collision detection
  frontend/coreanalyzer: do not attempt to print obsolete decoded_dump attribute. Closes #324
  coredevice: put cache into separate file/device
  gui: delete log/applet docks instead of hiding them
  gui/moninj: make DDS widgets look less like buttons
  rtio: remove NOP suppression capability
  rtio/wishbone: make replace configurable
  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
  coredevice: fix _DDSGeneric __init__ args
  hardware_testbench: also print artiq_core_exeption
  rtio/core: fix syntax
  ...
 2016-03-10 12:46:07 +01:00
Robert Jördens a618a6d03a hardware_testbench: better message when skipping 2016-03-10 12:34:06 +01:00
Robert Jördens f68c24094f test_spi: drain errors and be more strict on where we expect errors 2016-03-10 12:25:10 +01:00
Sebastien Bourdeauducq 579168f06f monkey-patch asyncio.proactor_events to handle ConnectionAbortedError on Windows. Closes #247 2016-03-10 15:11:10 +08:00
Sebastien Bourdeauducq d0cf589229 test/rtio/Loopback: ensure loop_out is low before starting test 2016-03-10 13:24:00 +08:00
Sebastien Bourdeauducq f3a2b3a67e test/rtio: raise exception when pulse is not received 2016-03-10 12:16:18 +08:00
Sebastien Bourdeauducq de718fc819 rtio: fix different address collision detection 2016-03-10 12:15:36 +08:00
Sebastien Bourdeauducq ea523c765b frontend/coreanalyzer: do not attempt to print obsolete decoded_dump attribute. Closes #324 2016-03-10 11:33:21 +08:00
Sebastien Bourdeauducq f4f95d330b Merge branch 'master' of github.com:m-labs/artiq 2016-03-10 11:15:30 +08:00
Sebastien Bourdeauducq 1739e0f2f8 coredevice: put cache into separate file/device 2016-03-10 10:46:19 +08:00
Sebastien Bourdeauducq 7f501820de gui: delete log/applet docks instead of hiding them 2016-03-10 10:35:44 +08:00
Sebastien Bourdeauducq c5552f9009 gui/moninj: make DDS widgets look less like buttons 2016-03-10 10:20:26 +08:00
Sebastien Bourdeauducq 542a375305 rtio: remove NOP suppression capability 
Back when RTIO was driving TTLs, this functionality made it simpler to use by removing some irrelevant underflows.

The same technique is not applicable to DDS and SPI, so the user will have to deal with such underflows.

This patch makes the behavior of RTIO more consistent and the code simpler.
 2016-03-10 09:47:29 +08:00
Sebastien Bourdeauducq 2e39802a61 rtio/wishbone: make replace configurable 2016-03-10 09:44:05 +08:00
Robert Jördens cb6c28006c 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
 2016-03-09 22:12:24 +01:00
Robert Jördens 9edaf16735 exceptions: clarify RTIOBusy 2016-03-09 22:11:32 +01:00
Robert Jördens 107e5cfbd4 gateware/rtio: factor _BlindTransfer 2016-03-09 19:07:46 +01:00
Robert Jördens 10a09122ea test_spi: break_realtime 2016-03-09 18:23:27 +01:00
Robert Jördens 349a66124b 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)
 2016-03-09 17:58:58 +01:00
Robert Jördens 8f6653ef72 test_spi: simplify test, add collision vs busy test 2016-03-09 17:58:42 +01:00
Robert Jördens 9a661bd273 hardware_testbench: clean up artiq_core_exeption printing 2016-03-09 17:30:41 +01:00
Robert Jördens b32217cc84 coredevice: fix _DDSGeneric __init__ args 2016-03-09 17:23:02 +01:00
Robert Jördens b50e3fabb0 hardware_testbench: also print artiq_core_exeption 2016-03-09 17:16:55 +01:00
Robert Jördens 3f8e431de6 rtio/core: fix syntax 2016-03-09 17:10:21 +01:00
Sebastien Bourdeauducq 03b53c3af9 rtio: disable replace on rt2wb channels 2016-03-09 23:37:04 +08:00
Sebastien Bourdeauducq 1c706fae49 examples: dds_bus -> core_dds 2016-03-09 23:27:41 +08:00
Robert Jördens 58e0e670fc tests: test spi business 2016-03-09 15:40:26 +01:00
Robert Jördens bf188d05bf rtio: cleanup RTIOBusy message 2016-03-09 13:42:32 +01:00
Robert Jördens db5231216d rtio: remove unused include 2016-03-09 13:42:15 +01:00
Robert Jördens 0bd9add95e spi: fix frequency_to_div() 2016-03-09 12:32:31 +01:00
Robert Jördens 522ec60f6e hardware_testbench: don't allow unused *args 2016-03-09 12:28:07 +01:00
Robert Jördens b0de9ee90a coredevice: add RTIOBusy to __all__ 2016-03-09 12:27:45 +01:00
Sebastien Bourdeauducq 861c4a9ae5 fix more multi-DDS-bus problems 2016-03-09 19:03:05 +08:00
Robert Jördens 446dcfbfbc 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
 2016-03-09 11:55:08 +01:00
Sebastien Bourdeauducq de37487a5c runtime: fix dds declarations 2016-03-09 18:27:51 +08:00
Sebastien Bourdeauducq f0b0b1bac7 support for multiple DDS buses (untested) 2016-03-09 17:12:50 +08:00
Sebastien Bourdeauducq 9d1903a4e2 coredevice/i2c,ttl,spi: consistent device get 2016-03-09 13:01:34 +08:00
Sebastien Bourdeauducq 2e4e251877 examples/device_db: remove --no-localhost-bind 2016-03-09 10:34:58 +08:00
whitequark 80e1cf5d78 Monkey-patch asyncio create_server (fixes #253). 2016-03-09 02:37:16 +00:00
Robert Jördens f33baf339f pipistrello: drop ttls on pmod, add leds back in 2016-03-08 23:34:51 +01:00
Robert Jördens f39208c95a pipistrello: try with fewer leds/pmod ttl 2016-03-08 22:10:47 +01:00
Robert Jördens 2cb58592ff rtio: add RTIOBusy 2016-03-08 18:04:34 +01:00
Robert Jördens 0d431cb019 pipistrello: make pmod extension header, cleanup 2016-03-08 17:07:44 +01:00