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

3934 Commits

Author SHA1 Message Date
Robert Jördens 3d4723353e Merge branch 'master' into phaser2 
* master:
  dashboard: mention disable in CCB policies
  runtime: clear async RPC queue when kernel stops (fixes #631).
  artiq_devtool: fix incorrect use of nargs in argparse.
 2016-12-02 14:12:04 +01:00
Robert Jördens e747696aaa Merge remote-tracking branch 'm-labs/phaser2' into phaser2 
* m-labs/phaser2:
  phaser: fix typo
 2016-12-02 14:11:56 +01:00
Robert Jördens cbf1004df3 gateware/phaser -> gateware/ad9154_fmc_ebz 2016-12-02 14:11:41 +01:00
Sebastien Bourdeauducq 3cee269afe phaser: fix typo 2016-12-02 11:06:45 +08:00
Robert Jördens 6e9bc7c05d sawg: merge set/set64 2016-12-01 16:45:54 +01:00
Robert Jördens 93a853a0e0 test/sawg: non trivial coarse_ref_period 2016-12-01 16:00:06 +01:00
Sébastien Bourdeauducq 696db32603 dashboard: mention disable in CCB policies 2016-12-01 11:47:04 +08:00
Robert Jördens 01057dfb6d test/sawg: check 48 bit frequency 2016-11-30 11:21:25 +01:00
Robert Jördens ea04fb2704 test/sawg: skip 2tone demo test 2016-11-30 11:02:41 +01:00
Robert Jördens ed6d1e73cc sawg: cleanup 2016-11-30 10:52:35 +01:00
Robert Jördens fb58f31c9d Revert "sawg: test w/o discrete_compensate" 
This reverts commit b736dd0df7.
 2016-11-29 20:56:04 +01:00
Robert Jördens dbf72f5fde sawg: extend unittests 2016-11-29 20:52:51 +01:00
Robert Jördens b736dd0df7 sawg: test w/o discrete_compensate 2016-11-29 20:52:02 +01:00
Robert Jördens d8b5eac856 sawg: style 2016-11-29 20:51:40 +01:00
Robert Jördens 4f813c4977 test/sawg: rtio_output_wide fixes 2016-11-29 18:11:38 +01:00
Robert Jördens d9dd79fb1a sawg: int32 artiq python 2016-11-29 17:36:03 +01:00
Robert Jördens 4a03e3fce0 sawg: rtio_output_wide 2016-11-29 17:23:06 +01:00
Robert Jördens f6fc7f9216 rtio: rtio_output_{list->wide} 2016-11-29 17:22:55 +01:00
Robert Jördens 313aa32779 sawg: artiq-python list scoping 2016-11-29 17:20:02 +01:00
Robert Jördens c53040e1e4 sawg: work around #632 2016-11-29 17:01:39 +01:00
Robert Jördens a3d9e21b8c sawg: artiq-python changes 2016-11-29 16:58:26 +01:00
Robert Jördens 82c651c17a phaser: remove trivial sawg demo 2016-11-29 15:40:23 +01:00
Robert Jördens 27160f5912 phaser: make sysref input only for timing 2016-11-29 15:28:10 +01:00
Robert Jördens 7816078d6b phaser/demo: update 2016-11-29 15:11:18 +01:00
whitequark 5b7e068157 runtime: clear async RPC queue when kernel stops (fixes #631). 2016-11-29 14:00:43 +00:00
Robert Jördens 7657cf1264 phaser: bump misoc/migen 2016-11-29 14:55:15 +01:00
Robert Jördens d5d17aca9e Merge remote-tracking branch 'm-labs/master' into phaser2 
* m-labs/master:
  applets: compatibility with older Qt. Closes #629
  doc: update LLVM configure command (fixes #628).
  runtime: match argument signedness between ARTIQ Python and ksupport.
  runtime: refactor rtio_output_list.
  runtime: use correct ABI when accepting ARTIQ lists.
 2016-11-29 14:49:30 +01:00
Robert Jördens 23fd225947 sawg: spline knot packing/conversion, unittest 2016-11-29 14:49:07 +01:00
whitequark 852598c491 artiq_devtool: fix incorrect use of nargs in argparse. 2016-11-29 13:09:26 +00:00
Sebastien Bourdeauducq c5b55c1dfe applets: compatibility with older Qt. Closes #629 2016-11-29 10:45:07 +08:00
whitequark 2ec6d43441 doc: update LLVM configure command (fixes #628). 2016-11-26 07:26:06 +00:00
whitequark ea25856d92 runtime: match argument signedness between ARTIQ Python and ksupport. 
This is only required when reading the ABI very strictly, but better
be conservative here than spend time debugging silly stuff.
 2016-11-26 07:25:22 +00:00
whitequark cf12a888e7 runtime: refactor rtio_output_list. 2016-11-26 07:25:22 +00:00
whitequark 79e70fa465 runtime: use correct ABI when accepting ARTIQ lists. 2016-11-26 07:25:22 +00:00
Robert Jördens 41779367b5 phaser: adapt conda recipe 2016-11-24 16:04:13 +01:00
Robert Jördens 55e37b41ec phaser: use ttl_simple.Input for sync 2016-11-24 15:55:26 +01:00
Robert Jördens 6fa2a6ebd8 phaser: move ad9154 spi/jesd api to rust 2016-11-24 15:53:14 +01:00
Robert Jördens 8060652913 phaser: use Inout_8X 2016-11-24 15:21:03 +01:00
Robert Jördens 617650f3b2 phaser: extract target 2016-11-24 15:20:51 +01:00
Robert Jördens 1c84d1ee59 Merge branch 'master' into phaser2 
* master:
  rtio: support differential ttl
  RELEASE_NOTES: int(a, width=b) removal, use int32/64
  pc_rpc: use ProactorEventLoop on Windows (#627)
 2016-11-24 15:05:49 +01:00
Robert Jördens 95c885b580 rtio: support differential ttl 2016-11-24 15:04:12 +01:00
Robert Jördens d0a55e5c9b RELEASE_NOTES: int(a, width=b) removal, use int32/64 2016-11-24 14:32:51 +01:00
Sebastien Bourdeauducq 7d4297b9bb pc_rpc: use ProactorEventLoop on Windows (#627) 2016-11-24 10:19:13 +08:00
Robert Jördens 54235e5743 Merge branch 'master' into phaser2 
* master:
  runtime: support rtio data wider than 64 bit
  moninj.rs: force u32 dds_ftws
 2016-11-23 21:09:21 +01:00
Robert Jördens dab19d23cc runtime: support rtio data wider than 64 bit 2016-11-23 16:40:52 +01:00
Robert Jördens fbf60108a8 moninj.rs: force u32 dds_ftws 2016-11-23 16:39:08 +01:00
Robert Jördens e7d588f612 Merge branch 'master' into phaser2 
* master:
  runtime.rs/rtio.rs: style
  runtime.rs: wide rtio data
  rtio: auto clear output event data and address
 2016-11-23 15:09:09 +01:00
Robert Jördens a964cf24f2 runtime.rs/rtio.rs: style 2016-11-23 15:03:36 +01:00
Robert Jördens 8cce5d2fcd runtime.rs: wide rtio data 2016-11-23 15:03:36 +01:00
Robert Jördens 347609d765 rtio: auto clear output event data and address 
This is to support channels where variable length
event data is well-defined through zero-padding.
E.g. in the case of `Spline` zero-padding of events naturally
corresponds to low-order knots.

Use timestamp change as trigger. This assumes that writes to the
timestamp register always precede address and data writes.
It does not break support for ganged writes of the same event
timestamp and data/address to multiple channels or
channel-addresses.
 2016-11-23 15:03:36 +01:00