2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-19 16:36:29 +08:00
Commit Graph

3645 Commits

Author SHA1 Message Date
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
8f6653ef72 test_spi: simplify test, add collision vs busy test 2016-03-09 17:58:42 +01:00
9a661bd273 hardware_testbench: clean up artiq_core_exeption printing 2016-03-09 17:30:41 +01:00
b32217cc84 coredevice: fix _DDSGeneric __init__ args 2016-03-09 17:23:02 +01:00
b50e3fabb0 hardware_testbench: also print artiq_core_exeption 2016-03-09 17:16:55 +01:00
3f8e431de6 rtio/core: fix syntax 2016-03-09 17:10:21 +01:00
03b53c3af9 rtio: disable replace on rt2wb channels 2016-03-09 23:37:04 +08:00
1c706fae49 examples: dds_bus -> core_dds 2016-03-09 23:27:41 +08:00
58e0e670fc tests: test spi business 2016-03-09 15:40:26 +01:00
bf188d05bf rtio: cleanup RTIOBusy message 2016-03-09 13:42:32 +01:00
db5231216d rtio: remove unused include 2016-03-09 13:42:15 +01:00
0bd9add95e spi: fix frequency_to_div() 2016-03-09 12:32:31 +01:00
522ec60f6e hardware_testbench: don't allow unused *args 2016-03-09 12:28:07 +01:00
b0de9ee90a coredevice: add RTIOBusy to __all__ 2016-03-09 12:27:45 +01:00
861c4a9ae5 fix more multi-DDS-bus problems 2016-03-09 19:03:05 +08:00
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
de37487a5c runtime: fix dds declarations 2016-03-09 18:27:51 +08:00
f0b0b1bac7 support for multiple DDS buses (untested) 2016-03-09 17:12:50 +08:00
9d1903a4e2 coredevice/i2c,ttl,spi: consistent device get 2016-03-09 13:01:34 +08:00
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
f33baf339f pipistrello: drop ttls on pmod, add leds back in 2016-03-08 23:34:51 +01:00
f39208c95a pipistrello: try with fewer leds/pmod ttl 2016-03-08 22:10:47 +01:00
2cb58592ff rtio: add RTIOBusy 2016-03-08 18:04:34 +01:00
0d431cb019 pipistrello: make pmod extension header, cleanup 2016-03-08 17:07:44 +01:00
81bc99905c missing parts of 59ac567 2016-03-08 16:49:23 +01:00
59ac567048 scanwidget: disable unmodified wheel on axis and slider 2016-03-08 16:43:04 +01:00
285979cab6 Merge branch 'master' into scanwidget
* master:
  pipistrello: grow fifos a bit (may make ise happier)
  gui: don't scroll experiment editor on modified wheel (closes #303)
  gui: ignore only unmodified wheelevents
  pipistrello: shrink fifos a bit (may make ise happier)
  pipistrello: use ttl_simple for pmod[4:8]
  pipistrello: move the spi channel like kc705
  doc: kc705.clock: add spi bus mappings (closes #321)
  doc: add pipistrello spi bus
  doc: add pipistrello pmod ttl channels
  pipistrello: make pmod[4:8] available as ttls
  pipistrello: adhere to pmod interface type 2 layout
2016-03-08 16:18:50 +01:00
a8fe3f50c3 pipistrello: grow fifos a bit (may make ise happier) 2016-03-08 16:17:37 +01:00
c08881de5d gui: don't scroll experiment editor on modified wheel (closes #303)
If you try to target e.g. spinbox with a ctrl- or shift-wheel to change the value
and you don't aim well, the tree widget will scroll. We already have tree
scroll on unmodified wheel. Let's have the modified wheel events exclusively
target the smaller widgets.
2016-03-08 16:12:38 +01:00
41ca223c45 gui: ignore only unmodified wheelevents 2016-03-08 15:53:27 +01:00
00d4775da5 pipistrello: shrink fifos a bit (may make ise happier) 2016-03-08 15:40:12 +01:00
9c11cda7dc pipistrello: use ttl_simple for pmod[4:8] 2016-03-08 13:52:52 +01:00
104d641c59 pipistrello: move the spi channel like kc705 2016-03-08 13:30:05 +01:00
40c1cde2e2 doc: kc705.clock: add spi bus mappings (closes #321) 2016-03-08 13:28:32 +01:00
9898cb14db doc: add pipistrello spi bus 2016-03-08 13:18:55 +01:00
e23e91f8ac doc: add pipistrello pmod ttl channels 2016-03-08 13:13:33 +01:00
2180c5af7c pipistrello: make pmod[4:8] available as ttls 2016-03-08 13:07:58 +01:00
e809e89571 pipistrello: adhere to pmod interface type 2 layout 2016-03-08 13:01:52 +01:00
7e99780891 scanwidget: wire up signals better, set values late, take scanwidget from 7aa6397 2016-03-08 12:35:13 +01:00
ef217f7fe2 Merge branch 'master' into scanwidget
* master: (125 commits)
  rtio: when rtlink addresses are different, issue collision not replace (fixes #320)
  rtio: collision_error -> collision
  test/coredevice/time_keeps_running: start new session to prevent now_mu save/restore
  runtime: fix sloppy memory management in cache_put.
  test_loopback: bump RTT limit to 60ns.
  soc: use add_extra_software_packages, factor builder code
  doc/PCA9548: clarify channel selection
  doc: I2C/QC2
  test: I2C/PCA9548 unittest
  examples/device_db: add PCA9548
  runtime/i2c_read: fix MSB
  ad5360: add documentation and an example
  ad5360: t16 is a max
  ad5360: un-factor write_channels
  ad5360: add busy and update timings
  ad5360: style
  ad5360: add batched zero-length multi-channel set()
  spi/ad5360: refactor, small fixes
  coredevice/i2c: fix exception message
  coredevice/PCA9548: fix I2C address
  ...
2016-03-08 11:14:57 +01:00
2953b069dc rtio: when rtlink addresses are different, issue collision not replace (fixes #320) 2016-03-08 15:58:25 +08:00
71105fd0d7 rtio: collision_error -> collision 2016-03-08 15:38:35 +08:00
59d7f5f1e3 test/coredevice/time_keeps_running: start new session to prevent now_mu save/restore 2016-03-08 14:04:51 +08:00
whitequark
739568fcb8 runtime: fix sloppy memory management in cache_put. 2016-03-07 21:12:03 +00:00
whitequark
9ffa8cbb11 test_loopback: bump RTT limit to 60ns.
Turns out a short jumper wire on a backplane leads to RTT of 50ns
exactly.
2016-03-07 20:27:22 +00:00
e8b59b00f6 soc: use add_extra_software_packages, factor builder code 2016-03-07 00:18:47 +08:00
c73b080019 doc/PCA9548: clarify channel selection 2016-03-07 00:17:45 +08:00
2770d9c729 doc: I2C/QC2 2016-03-05 19:02:03 +08:00
683716017b test: I2C/PCA9548 unittest 2016-03-05 19:01:35 +08:00