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

3923 Commits

Author SHA1 Message Date
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
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
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
Robert Jördens 32fdacd95a Merge remote-tracking branch 'm-labs/master' into phaser2 
* m-labs/master:
  runtime: don't attempt to perform writeback if disabled in kernel.
  runtime: print trace level log messages to UART during startup.
  runtime: support for targets without RTIO log channel
  runtime: support for targets without I2C
  kc705: remove stale DDS definition
  runtime: show a prompt to erase startup/idle kernels.
 2016-11-23 14:56:29 +01:00
Robert Jördens fec34d605e runtime.rs/rtio.rs: style 2016-11-23 14:56:20 +01:00
whitequark 4df7941a97 runtime: don't attempt to perform writeback if disabled in kernel. 
Otherwise, the startup kernel session hangs.
 2016-11-23 13:53:40 +00:00
whitequark cd7527b701 runtime: print trace level log messages to UART during startup. 
There's no way to retrieve them otherwise if the startup kernel
hangs.
 2016-11-23 13:53:40 +00:00
Sebastien Bourdeauducq 0443f83d5e runtime: support for targets without RTIO log channel 2016-11-23 10:50:55 +08:00
Sebastien Bourdeauducq cd40d5b107 runtime: support for targets without I2C 2016-11-23 10:50:55 +08:00
Sebastien Bourdeauducq fbd83cf9ee kc705: remove stale DDS definition 2016-11-22 22:48:22 +08:00
whitequark 965fdd35e5 runtime: show a prompt to erase startup/idle kernels. 2016-11-22 14:45:40 +00:00
Robert Jördens 6799bb097a sawg: adapt to int32/int64 change 2016-11-22 11:57:34 +01:00
Robert Jördens 5e900cf42a runtime.rs: wide rtio data 2016-11-21 23:12:16 +01:00
Robert Jördens 4cd2b36995 Merge branch 'phaser' into phaser2 
* phaser:
  runtime: replace a (deliberate) memory leak with an interner.
  compiler: disable remarks.
  runtime: rewrite i2c support code in Rust.
  runtime: rewrite rtio support code in Rust.
 2016-11-21 23:11:52 +01:00