occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
6,830 Commits 14 Branches 35 Tags 23 MiB
Commit Graph

561 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 1b841805f6 Merge branch 'master' into new 2018-11-16 15:20:32 +08:00
Robert Jördens e927551827 manual: add highfinesse-net port 2018-11-09 19:39:25 +01:00
Robert Jördens fe3d6661eb manual: kasli device name for zadig on windows 
Signed-off-by: Robert Jördens <rj@quartiq.de>
 2018-11-09 15:00:59 +01:00
Sebastien Bourdeauducq ad0254c17b Merge branch 'switching125' into new 2018-11-07 22:03:18 +08:00
David Nadlinger e7d3f36b91 doc: Fix ancient trigger code in slides 
These examples were already broken before my recent changes to the
artiq.coredevice.ttl API.
 2018-11-03 20:33:19 +08:00
David Nadlinger cbdef0225c ttl: Add target RTIO time argument to timestamp/count functions 
Software-based tracking of timestamps is problematic (e.g. when
using DMA, see GitHub #1113).
 2018-11-03 20:33:19 +08:00
Sebastien Bourdeauducq 969a305c5a Merge branch 'master' into switching125 2018-10-04 10:08:42 +08:00
Drew Risinger 0fef2afccb make.bat: fix typo 2018-09-27 23:22:19 +08:00
Drew Risinger fad7128a52 Create Docs Makefile for Windows. #1159 
Allows building Sphinx documentation on Windows,
(not just Linux as previously).
Closes #1159.
 2018-09-27 23:22:19 +08:00
Sebastien Bourdeauducq c71e442929 documentation improvements 
Based on PR #1101 by @drewrisinger
 2018-09-26 12:12:37 +08:00
Sebastien Bourdeauducq c8cd830118 drtio: implement get_rtio_destination_status for kernels 2018-09-15 19:11:22 +08:00
whitequark a5cd7d2761 doc: update manual/developing.rst. 2018-08-28 20:00:32 +00:00
Sebastien Bourdeauducq fb96c1140e grabber: add coredevice driver 2018-07-24 18:06:44 +08:00
Sebastien Bourdeauducq 766d87f626 doc: artiq_coreconfig → artiq_coremgmt config. Closes #1111 2018-07-20 11:59:07 +08:00
Sebastien Bourdeauducq 3168b193e6 kc705: remove Zotino and Urukul 
* use Kasli instead for using EEMs
* code required outdated VHDCI adapter 1.0
 2018-07-17 17:48:57 +08:00
Sebastien Bourdeauducq 16b917be5d doc: add reminder of what positive slack means. Closes #1084 2018-07-02 16:23:12 +08:00
apatura-iris e9a1e10221 Update installing.rst 
Added comment to clarify that ``artiq-main`` is the conda environment.
 2018-06-27 08:18:50 +02:00
apatura-iris 5e5cdf0e67 Update installing.rst 
The file 99-openocd.rules as downloaded from githubusercontent.com seems to be outdated and does now work on Ubuntu 16.04. The version that ships with OpenOCD has an additional ``TAG+="uaccess"`` in the rules file and works fine. Thus I suggest to use the file that is bundled with OpenOCD.
 2018-06-27 08:18:50 +02:00
whitequark f1a80f12f8 doc: note that coreanalyzer lacks SAWG support. 
Closes #1035.
 2018-06-01 18:47:37 +00:00
Robert Jördens b56d37eb63 manual: fix table 2018-06-01 14:22:15 +02:00
Robert Jördens 58f71e34fc doc: add hut2 and lasersdk controller default ports 2018-05-31 14:23:57 +00:00
whitequark dfb4a437f5 manual: mention TRACE log level. 2018-05-22 21:32:00 +00:00
whitequark 0c6f618056 manual: update to reflect the new artiq_coremgmt tool. 2018-05-22 18:56:04 +00:00
Sebastien Bourdeauducq b10d3ee4b4 make RTIO clock switch optional and simplify 
Kasli no longer has an internal RTIO clock.
Switching clocks dynamically is no longer supported.
 2018-05-18 17:41:34 +08:00
Sebastien Bourdeauducq 826a85950b manual: add warning about developing section being for developers 2018-05-18 14:18:36 +08:00
Sebastien Bourdeauducq 019c92aa02 manual: fix title underline warning 2018-05-14 23:49:01 +08:00
Sebastien Bourdeauducq 3027951dd8 integrate new AD9914 driver 
moninj, analyzer, docs, examples, tests.
 2018-05-13 23:29:35 +08:00
Robert Jördens 73fa572275 suservo: documentation, small API changes 2018-04-27 16:53:22 +02:00
Sebastien Bourdeauducq 28ccca412a doc: automatic artiq_flash proxy 2018-04-26 10:50:23 +08:00
Robert Jördens 1b2a4bcbab doc: add out-of-tree controller ports 
* newfocus8742 (https://github.com/quartiq/newfocus8742)
* ptb-drivers (https://github.com/quartiq/ptb-drivers)
* picam (https://github.com/quartiq/picam)
 2018-04-17 23:26:00 +02:00
Sebastien Bourdeauducq f96f597ecb doc: update Sinara information 2018-04-12 15:16:33 +08:00
Robert Jördens 774030698e doc: title underline 2018-03-24 16:07:53 +01:00
Robert Jördens 9bc2ce84fc doc: ad5360 -> ad53xx, add zotino 2018-03-24 15:18:08 +01:00
Sebastien Bourdeauducq 40e2ced85e manual: fix core_drivers_reference 2018-03-22 13:26:45 +08:00
Sebastien Bourdeauducq 102e3983b5 manual: reorganize core drivers 2018-03-22 12:06:01 +08:00
Sebastien Bourdeauducq 1b91339865 manual: fix text role 2018-03-22 12:05:47 +08:00
Robert Jördens 97918447a3 sampler: add coredevice driver 2018-03-21 12:21:53 +00:00
Sebastien Bourdeauducq 2caeea6f25 update copyright year 2018-03-13 00:09:13 +08:00
Robert Jördens f4dad87fd9 coredevice: add pcf8574a driver 
I2C IO expander with 8 quasi-bidirectional pins
 2018-03-06 14:27:19 +01:00
Sebastien Bourdeauducq 432e61bbb4 drtio: add kernel API to check for link status. Closes #941 2018-03-05 00:23:55 +08:00
Robert Jördens cc70578f1f remove old spi RTIO Phy 2018-03-01 11:19:18 +01:00
Robert Jördens 1452cd7447 novogorny: add coredevice driver and test with Kasli 
m-labs/artiq#687
 2018-02-22 17:19:51 +01:00
Robert Jördens 37a0d6580b spi2: add RTIO gateware and coredevice driver 
1006218997
 2018-02-21 13:37:36 +00:00
Sebastien Bourdeauducq 7986391422 manual: update Kasli section 2018-02-21 12:04:14 +08:00
Sebastien Bourdeauducq 6c4681e7d2 manual: fix minor errors 2018-02-21 11:57:57 +08:00
Sebastien Bourdeauducq e4db84e214 doc: fix typo 2018-02-17 00:11:48 +08:00
Robert Jördens 0ef33dd0d8 manual: add note about the "correct" vivado version 
close #910
 2018-02-15 14:21:17 +01:00
Robert Jördens 2adba3ed33 urukul: document ad9912, and cpld, fix api 2018-02-14 09:45:17 +01:00
Sebastien Bourdeauducq 25f3feeda8 refactor targets 2018-01-22 18:25:10 +08:00
whitequark bdf41cd574 doc: mention that ARTIQ can only be developed on Linux. (fixes #896). 2018-01-18 20:29:24 +00:00
Robert Jördens 21cd24fe80 manual: add section on Kasli/opticlock 2018-01-15 15:13:24 +01:00
Sebastien Bourdeauducq 6d58c4390b Merge branch 'sed-merge' 2018-01-10 13:14:39 +08:00
Sebastien Bourdeauducq dc593ec0f0 Merge branch 'rtio-sed' into sed-merge 2018-01-10 12:04:54 +08:00
whitequark 0ce63e7f4a doc: Rust uses recursive submodules (brrr). 
[ci skip]
 2018-01-10 01:27:18 +00:00
whitequark 16832291eb doc: update Rust version. 
[ci skip]
 2018-01-10 01:27:18 +00:00
Robert Jördens 94b84ebe7c kc705_dds: add urukul spi/ttl channels 2018-01-02 13:20:48 +01:00
whitequark c939c6183e Update to LLVM 4.0. 2017-12-26 14:09:17 +00:00
whitequark fa4dc1bf0e doc: developing: show how to make clang source builds faster. 2017-12-24 16:27:54 +00:00
Sebastien Bourdeauducq 569484f888 remove phaser, adapt SAWG example to Sayma 2017-12-14 18:49:27 +08:00
Robert Jördens 63f65b6e53 doc: clean up artiq-dev installation instructions 
Add a heading to the openocd setup instruction so that it is
clearly distinguishable from the openocd installation. Otherwise people
"re-install" openocd the wrong way.
 2017-12-07 12:31:30 +01:00
Robert Jördens 69b2d1abfc conda/artiq-dev: fix channel list 
Now, with conda 4.1 packages are sorted by channel, version, build
number in decreasing priority. The highest matching package is
taken. https://conda.io/docs/user-guide/tasks/manage-channels.html

For the artiq-dev environment, the m-labs/label/dev channel should be
first, then the main channel, then defaults, and then conda-forge
(community supported packages).

closes #864
 2017-12-07 12:31:30 +01:00
Sebastien Bourdeauducq b89929565c manual: fix formatting problem 2017-11-25 14:46:31 +08:00
Sebastien Bourdeauducq 14e4e1cf22 Hack-patch Sphinx so that ARTIQ-Python types are correctly printed. 
Modification proposed to Sphinx but my issue is getting ignored.

Closes #741
 2017-11-25 14:45:31 +08:00
Sebastien Bourdeauducq 33d339947c doc: add information on how to connect Zotino 2017-11-01 20:20:42 +08:00
Sebastien Bourdeauducq d80cf8d59d kc705: add TTLs and shift register driver for FMC DIO 2017-10-31 23:14:39 +08:00
Robert Jördens a6b45caefa conda: new openocd 
* new jtagspi protocol
* new proxy bitstreams
 2017-10-23 12:39:27 +02:00
Sebastien Bourdeauducq 5803ac9998 gateware: add Zotino SPI to NIST CLOCK target 2017-10-23 15:04:30 +08:00
Sebastien Bourdeauducq c7cdd2016a doc: no more win32 packages 2017-09-30 00:30:22 +08:00
Sebastien Bourdeauducq 5437f0e3e3 rtio: make sequence errors consistently asychronous 2017-09-29 14:40:06 +08:00
whitequark 7799413a41 firmware: update Rust from 1.18.0 to 1.20.0. 2017-09-24 22:51:44 +00:00
Sébastien Bourdeauducq 57b12abf1e manual: remove reference to Spartan-6 proxy bitstream 
Pipistrello is no longer supported
 2017-09-23 11:31:17 +08:00
Sebastien Bourdeauducq 629827f573 doc/slides: minor fixes 2017-09-06 19:25:38 +08:00
Robert Jördens c0eb2ad0b7 developing.rst: stress artiq-dev setup 
closes #814
 2017-08-29 16:22:57 +02:00
Robert Jördens 43d551f1d8 README_PHASER: integrate into board port docs 
* rewrite setup commands for usage of artiq-dev metapackage
* integrate with rest of installation documentation
* move contents of README_PHASER to core_device.rst
* closes #815
 2017-08-29 16:15:51 +02:00
Robert Jördens 32aac9c70d doc: use pip as artiq dev mechanism 
Seems to be much less prone to installing packages using non-conda
mechanisms and much less prone to mess up conda.
 2017-08-22 17:44:37 -04:00
Robert Jördens 2a91b6996f doc: update proxy bitstream url 2017-08-15 14:34:27 -06:00
Sebastien Bourdeauducq 3778f93991 README: update credits/roles 2017-07-25 13:34:00 +08:00
Sebastien Bourdeauducq 3ae1c4f7f7 manual: add note about updating conda (#785) 2017-07-25 13:05:43 +08:00
Sebastien Bourdeauducq 7eed4e7b6c synchronize introduction.rst with README 2017-07-22 00:41:59 +08:00
Robert Jördens 471605ec1e pdq: move to https://github.com/m-labs/pdq 2017-07-19 17:35:28 +02:00
Robert Jördens 5c66b63768 setup.py etc: update license 2017-07-18 11:31:43 +02:00
Robert Jördens 94ee48860a doc: fix phaser channel number statement 
closes #781
 2017-07-15 20:24:50 +02:00
mntng 40ca951750 kc705: add SPI bus for memory card 
This will be useful for SPI unit tests using a SD card as victim.
 2017-07-12 00:27:44 +08:00
Sebastien Bourdeauducq d7ad72efa2 doc: point to artiq_flash hardware selection options when writing flash storage. Closes #766 2017-07-02 10:40:52 +08:00
Robert Jördens 566ff73dff pdq: unify spi-PDQ and usb-PDQ protocols 2017-06-10 15:03:25 +02:00
Sebastien Bourdeauducq de11b3b7c7 manual: fix table formatting 2017-06-05 17:39:54 +08:00
Sebastien Bourdeauducq d3ac21f6fb manual: minor fixes to DRTIO doc 2017-06-05 13:26:56 +08:00
Sebastien Bourdeauducq 9d56cd43e6 manual: document DRTIO 2017-06-05 00:48:16 +08:00
Sebastien Bourdeauducq 92307d1f9c fix some missing pdq2→pdq renames 2017-06-03 18:35:36 +08:00
Sebastien Bourdeauducq e845de2ff2 remove aqcli_pdq2 2017-05-22 19:17:23 +08:00
Sebastien Bourdeauducq cf746cee5b fix documentation formatting problems 2017-05-22 19:08:20 +08:00
Sebastien Bourdeauducq a649408304 manual: add core device logging controller reference 2017-05-22 17:59:39 +08:00
Sebastien Bourdeauducq 6bdb76e9ea core device logging controller WIP (#691) 2017-05-22 16:48:00 +08:00
Sebastien Bourdeauducq 3ed70afaa1 Use commandline prefix for controllers 
This keeps them better organized and consistent with the artiq_* naming scheme.
Tab completion from aqctl_ also lists all the controllers installed on a machine.
 2017-05-22 00:22:10 +08:00
Sebastien Bourdeauducq cd757c0f16 generate device database from executable python file 2017-05-18 23:14:55 +08:00
Sebastien Bourdeauducq 9ab63920e0 Remove Pipistrello support 
Closes #658
Closes #381
 2017-05-15 17:17:44 +08:00
Sebastien Bourdeauducq ad85a0cee3 add session manager (#691) 2017-05-15 17:05:22 +08:00
Robert Jördens 170d2886fd Merge branch 'pdq' 
* pdq:
  pdq: documentation
  pdq2 -> pdq
  pdq2: use 16 bit data, buffered read_mem()
  spi: style
  pdq2: mem_read
  pdq2: align subsequent writes to end
  sma_spi: undo cri_con
  pdq2: memory write, kernel_invariants
  sma_spi: cri/cd changes
  sma_spi: LVCMOS25
  coredevice.spi: kernel invariants and style
  sma_spi: free up user_sma pins
  sma_spi: add demo target with SPI on four SMA
  pdq2: memory write
  pdq2: crc/frame register accessors
  doc: pdq2 spi backend
  pdq2: config writes
 2017-05-12 11:46:45 +02:00
Robert Jördens 1a1edb13bf pdq2 -> pdq 2017-05-02 18:05:41 +02:00
whitequark db494967c5 firmware use Rust 0.18.0. 2017-04-19 09:38:24 +00:00