srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
6,358 Commits 63 Branches 34 Tags 19 MiB
Commit Graph

510 Commits

Author SHA1 Message Date
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
Sebastien Bourdeauducq badbd72beb manual: update example to use DMA handle API 2017-04-19 11:07:41 +08:00
Sebastien Bourdeauducq 99196986c0 conda: use conda-forge and depend on pyqtgraph 0.10.0 (#704) 2017-04-13 00:55:16 +08:00
Sebastien Bourdeauducq c5cd77f177 manual: add DRTIO intro 2017-04-12 00:43:35 +08:00
Sebastien Bourdeauducq 598533adba manual: add DMA to tutorial 2017-04-12 00:43:09 +08:00
Robert Jördens 1ce1b7cd71 doc: pdq2 spi backend 2017-04-08 17:16:19 +02:00
whitequark 948ed6fb0a Extract core device management interface from session interface (#691). 2017-03-29 03:36:21 +00:00
Sébastien Bourdeauducq 0cda1a3d34 manual: add note about git branches 
Closes #695
 2017-03-29 09:56:09 +08:00
Sebastien Bourdeauducq b74d6fb9ba make collision and busy asynchronous errors, and simplify CPU/gateware handshake for output errors and reads 2017-03-27 16:32:23 +08:00
Robert Jördens 3f556a3f58 doc: remove qt5 note 2017-02-28 13:22:47 +01:00
Sebastien Bourdeauducq dff23293c7 Merge branch 'master' of github.com:m-labs/artiq 2017-02-27 01:05:40 +08:00
whitequark 5d3b00cf12 Implement recording of DMA traces on the core device. 2017-02-26 02:50:20 +00:00
Sebastien Bourdeauducq 1486a945d9 manual: update moninj network info 2017-02-25 12:06:35 +08:00
whitequark b468959e14 doc: manual/developing: update binutils patch URL. 2017-02-21 05:28:19 +00:00
Robert Jördens 9c646801e3 doc: fix verbatim sections 2017-02-02 20:03:15 +01:00
Robert Jördens 02917aae62 doc: newline after label 2017-02-02 19:58:26 +01:00
Robert Jördens 5a30536d59 doc: write section on developing with a conda env 2017-02-02 19:53:18 +01:00
Sebastien Bourdeauducq 43aad0914e python3.5 -> python3 
Many things also work with Python 3.6.
 2017-01-30 09:24:43 +08:00
Robert Jördens 8a13c8c195 doc: use minimal conda environment to build 2017-01-26 18:12:10 +01:00
Robert Jördens 86bde74cd4 doc: fix autodoc search path 2017-01-26 17:56:18 +01:00
Robert Jördens c155fd3849 doc: minimize dependencies for manual 2017-01-26 17:54:10 +01:00
Robert Jördens 591268a193 doc: use napoleon (for pdq2) 2017-01-25 23:25:01 +01:00
Robert Jördens 37fc7d58eb doc: remove non-existent modules 2017-01-25 23:23:01 +01:00
Robert Jördens d1be2f1a7d doc: fix table 2017-01-25 23:22:26 +01:00
whitequark de17908b38 Revert "Globally update UART baudrate to 921600." 
This reverts commit b29e2d5bfe.

This broke flterm firmware upload, which was the entire point
of the whole exercise.
 2017-01-25 00:31:28 +00:00
whitequark b29e2d5bfe Globally update UART baudrate to 921600. 2017-01-24 22:25:58 +00:00
whitequark e5085c063f doc: test mode was removed, clean up. 2017-01-24 22:25:21 +00:00
Sebastien Bourdeauducq b4f3be7e1b doc: fix table formatting problem, add 'string constant' as supported compiler type 2017-01-16 13:58:09 -06:00
Sebastien Bourdeauducq c2bddd62e1 doc: fix llvmlite installation instructions 2017-01-05 19:10:12 +01:00
Sebastien Bourdeauducq fe53bab953 targets: kc705 -> kc705_dds 2017-01-05 18:40:56 +01:00
Sebastien Bourdeauducq 52fda27cb5 update copyright year 2017-01-04 11:29:10 +01:00
Sebastien Bourdeauducq a3041fb23f manual: fix Rust installation instructions 2017-01-01 16:56:01 +01:00
whitequark c45a170bb4 firmware: update for Rust 1.16.0. 2016-12-26 17:20:29 +00:00
jboulder baac555f96 add device for Korad KA3005P programmable DC power supply 2016-12-19 09:31:21 +01:00
Robert Jördens c63fa46430 Merge branch 'phaser2' 
* phaser2: (157 commits)
  sawg/hbf: tweak pipeline for timing
  fir: register multiplier output
  conda/phaser: build-depend on numpy
  sawg: reduce coefficient width
  sawg: fix latency
  test/fir: needs mpl. don't run by default
  test/sawg: patch spline
  sawg: use ParallelHBFCascade to AA [WIP]
  fir: add ParallelHBFCascade
  fir: add ParallelFIR and test
  gateware/dsp: add FIR and test
  README_PHASER: update
  sawg: documentation
  sawg: extract spline
  sawg: document
  sawg: demo_2tone
  sawg: round to int64
  gateware/phaser -> gateware/ad9154_fmc_ebz
  phaser: fix typo
  sawg: merge set/set64
  ...
 2016-12-12 17:31:39 +01:00
Sebastien Bourdeauducq 5accb7a0ac manual: add missing quote 2016-12-09 14:16:32 +08:00
Robert Jördens 5efd0fcea5 sawg: documentation 2016-12-06 19:25:40 +01:00
Sebastien Bourdeauducq 35200387b5 manual: precisions about TTL sampling 2016-12-03 11:24:40 +08: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
whitequark 2ec6d43441 doc: update LLVM configure command (fixes #628). 2016-11-26 07:26:06 +00:00
Robert Jördens f7e8961ab0 Merge branch 'master' into phaser 
* master: (23 commits)
  RELEASE_NOTES: update
  pipistrello: add some inputs
  Remove last vestiges of nist_qc1.
  Fully drop AD9858 and kc705-nist_qc1 support (closes #576).
  coredevice.dds: reimplement fully in ARTIQ Python.
  compiler: unbreak casts to int32/int64.
  analyses.constness: fix false positive on x[...].
  inferencer: significantly improve the op-assignment diagnostic.
  Fix tests.
  Move mu_to_seconds, seconds_to_mu to Core.
  artiq_devtool: don't crash on invalid utf-8.
  artiq_devtool: detect a race condition during connect.
  llvm_ir_generator: handle no-op coercions.
  conda: use development version of migen/misoc
  Revert accidentally committed code.
  Revert "gateware: increase RTIO FIFO sizes for NIST_CLOCK. Closes #623"
  analyses.invariant_detection: implement (#622).
  Fix whitespace.
  coredevice.dds: work around the round(numpy.float64()) snafu.
  coredevice.dds: update from obsolete int(width=) syntax (fixes #621).
  ...
 2016-11-21 17:29:39 +01:00
Sebastien Bourdeauducq 93c310dfa5 pipistrello: add some inputs 2016-11-21 23:43:41 +08:00
whitequark 6aa5d9f6c6 Remove last vestiges of nist_qc1. 2016-11-21 15:36:22 +00:00
whitequark 5e8888d5f3 Fully drop AD9858 and kc705-nist_qc1 support (closes #576). 2016-11-21 15:14:17 +00:00
whitequark 009d396740 Move mu_to_seconds, seconds_to_mu to Core. 2016-11-21 05:37:30 +00:00
whitequark abf2b32b20 coredevice.dds: work around the round(numpy.float64()) snafu. 2016-11-20 09:49:58 +00:00
whitequark 2015fe9de0 doc: update installing_from_source for LLVM 3.9 transitionl 2016-11-18 10:35:36 +00:00
Robert Jördens aedb6747f2 Merge branch 'master' into phaser 
* master: (47 commits)
  runtime: disable the Nagle algorithm entirely.
  runtime: buffer RPC send packets.
  runtime: don't print debug messages to the UART.
  runtime: print microsecond timestamps in debug messages.
  artiq_devtool: abort if build failed.
  conda: bump llvmlite-artiq dep.
  conda: bump llvmlite-artiq dep.
  llvm_ir_generator: use !{→unconditionally.}invariant.load metadata.
  artiq_devtool: more robust port forwarding.
  setup: remove paramiko dependency (optional and developer-only)
  artiq_devtool: implement.
  artiq_compile: actually disable attribute writeback.
  conda: use pythonparser 1.0.
  conda: tighten pythonparser dependency (fixes #600).
  doc: clarify kernel_invariant doc (fixes #609).
  compiler: Emit all-kernel_invariant objects as LLVM constants
  conda: update for LLVM 3.9.
  add has_dds, use config flags
  Revert "Revert "Revert "Revert "Update for LLVM 3.9.""""
  Revert "Revert "Revert "Update for LLVM 3.9."""
  ...
 2016-11-13 16:54:28 +01:00
whitequark eee8d05398 doc: clarify kernel_invariant doc (fixes #609). 2016-11-09 14:59:57 +00:00
whitequark f102f2d4e6 manual: fix rustc invocation. 2016-11-04 09:11:45 +00:00
Sebastien Bourdeauducq 9d58b4516c manual: Vivado is now default 2016-11-04 11:54:04 +08:00
whitequark 208f3f8568 manual: fix Rust installation instructions. 2016-11-04 03:35:59 +00:00