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

243 Commits

Author SHA1 Message Date
Robert Jördens 6d07a16c62 Merge branch 'master' into phaser 
* master: (72 commits)
  gateware: extend mailbox to 3 entries.
  master/worker_db: set default value for archive
  master: keep dataset manager consistent when set_dataset is called with contradictory attributes
  master: archive input datasets. Closes #587
  master: ensure same dataset is in broadcast and local when mutating
  scheduler: default submission arguments, closes #577
  pdq2: sync with pdq2
  doc: clarify usage of pause/check_pause, closes #571
  dashboard/datasets: use scientific spinbox and increase number of decimals, closes #572
  gateware/spi: fix import
  runtime: fix use of $(realpath) in Makefile.
  test: fix printf specifier.
  llvm_ir_generator: make sure RPC allocations are not underaligned.
  runtime: use i64 for watchdog timeout, not i32.
  runtime: port ksupport to Rust.
  runtime: remove some redundant libm functions copied inline.
  language: Add "A" (ampere) as well-known unit for arguments
  conda: misoc 0.4 (csr)
  runtime: cap log level at debug.
  runtime: discard unnecessary sections.
  ...
 2016-10-28 01:40:11 +02:00
Robert Jördens 062aca2a6b conda/phaser: build-depend on jesd204b 2016-10-19 14:44:54 +02:00
Robert Jördens 81511feab8 phaser: README: specify versions 2016-10-12 17:13:06 +02:00
Robert Jördens 290498aca0 conda: misoc 0.4 (csr) 2016-10-12 16:34:19 +02:00
Robert Jördens 4a0eaf0f95 phaser: add jesd204b rtio dds 
gateware: add jesd204b awg

gateware: copy phaser (df3825a)
dsp/tools: update satadd mixin
phaser: no DDS stubs
dsp: accu fix
phaser: cleanup/reduce

sawg: kernel support and docs

sawg: coredevice api fixes

sawg: example ddb/experiment

phaser: add conda package

examples/phaser: typo

sawg: adapt tests, fix accu stb

sawg: tweak dds parameters

sawg: move/adapt/extend tests

sawg: test phy, refactor

phaser: non-rtio spi

phaser: target cli update

phaser: ad9154-fmc-ebz pins

phaser: reorganize fmc signal naming

phaser: add test mode stubs

phaser: txen is LVTTL

phaser: clk spi xfer test

phaser: spi for ad9154 and ad9516

phaser: spi tweaks

ad9154: add register map from ad9144.xml

ad9516: add register map from ad9517.xml and manual adaptation

ad9154_reg: just generate getter/setter macros as well

ad9154: reg WIP

ad9154: check and fix registers

kc705: single ended rtio_external_clk

use single ended user_sma_clk_n instead of p/n to free up one clock sma

kc705: mirror clk200 at user_sma_clock_p

ad9516_regs.h: fix B_COUNTER_MSB

phase: wire up clocking differently

needs patched misoc

kc705: feed rtio_external_clock directly

kc705: remove rtio_external_clk for phaser

phaser: spi tweaks

ad9516: some startup

ad9516_reg fixes

phaser: setup ad9516 for supposed 500 MHz operation

ad9516: use full duplex spi

ad9154_reg: add CONFIG_REG_2

ad9154_reg: fixes

phaser: write some ad9154 config

ad9154_reg: fixes

ad9154: more init, and human readable setup

ad9154/ad9516: merge spi support

ad9154: status readout

Revert "kc705: remove rtio_external_clk for phaser"

This reverts commit d500288bb44f2bf2eeb0c2f237aa207b0a8b1366.

Revert "kc705: feed rtio_external_clock directly"

This reverts commit 8dc7825519e3e75b7d3d29c9abf10fc6e3a8b4c5.

Revert "phase: wire up clocking differently"

This reverts commit ad9cc450ffa35abb54b0842d56f6cf6c53c6fbcc.

Revert "kc705: mirror clk200 at user_sma_clock_p"

This reverts commit 7f0dffdcdd28e648af84725682f82ec6e5642eba.

Revert "kc705: single ended rtio_external_clk"

This reverts commit a9426d983fbf5c1cb768da8f1da26d9b7335e9cf.

ad9516: 2000 MHz clock

phaser: test clock dist

phaser: test freqs

ad9154: iostandards

phaser: drop clock monitor

phaser: no separate i2c

phaser: drive rtio from refclk, wire up sysref

phaser: ttl channel for sync

ad9154: 4x interp, status, tweaks

phaser: sync/sysref 33V banks

phaser: sync/sysref LVDS_25 inputs are VCCO tolerant

phaser: user input-only ttls

phaser: rtio fully from refclk

ad9154: reg name usage fix

ad9154: check register modifications

Revert "ad9154: check register modifications"

This reverts commit 45121d90edf89f7bd8703503f9f317ad050f9564.

ad9154: fix status code

ad9154: addrinc, recal serdes pll

phaser: coredevice, example tweaks

sawg: missing import

sawg: type fixes

ad9514: move setup functions

ad9154: msb first also decreasing addr

phaser: use sys4x for rtio internal ref

phaser: move init code to main

phaser: naming cleanup

phaser: cleanup pins

phaser: move spi to kernel cpu

phaser: kernel support for ad9154 spi

ad9154: add r/w methods

ad9154: need return annotations

ad9154: r/w methods are kernels

ad9154_reg: portable helpers

phaser: cleanup startup kernel

ad9154: status test

ad9154: prbs test

ad9154: move setup, document

phaser: more documentation
 2016-10-05 16:17:50 +02:00
Sebastien Bourdeauducq 2701b914e2 conda: update migen version requirements 2016-09-24 21:02:19 +08:00
Robert Jördens 5b713ea385 conda: fix nist_clock summary 2016-09-02 19:06:36 +02:00
Robert Jördens 91b59cd584 conda: misoc 0.3 2016-08-26 14:01:00 +02:00
Robert Jördens 0a4d4e30ef doc: use sphinx_rtd_theme 2016-08-25 21:52:46 +02:00
Robert Jördens 60919c2ea7 doc: use wavedrom to visualize stuff 2016-08-25 12:17:05 +02:00
whitequark 4c6cad2977 Add a Rust component in the runtime. 2016-08-17 09:07:19 +00:00
whitequark 6c2ca69d4f conda: require misoc 0.2. 2016-08-16 07:08:35 +00:00
whitequark 5f5975844a Revert "Update for LLVM 3.9." 
This reverts commit 3aa7b99b8f.
 2016-08-13 04:43:19 +00:00
whitequark 3aa7b99b8f Update for LLVM 3.9. 2016-08-13 03:28:04 +00:00
Sebastien Bourdeauducq c065b5866f require Python 3.5.2, remove monkey patches 2016-07-07 14:55:21 +08:00
Sebastien Bourdeauducq 4e241f10c5 conda: try lowercase package name 2016-06-19 09:59:42 +08:00
Sebastien Bourdeauducq b97ad69135 conda: install lit and OutputCheck 2016-06-19 09:58:02 +08:00
Sebastien Bourdeauducq 6500d3fc63 conda: use setuptools entry_points 
Conda entry_points doesn't support gui_scripts
 2016-06-19 09:31:23 +08:00
Sebastien Bourdeauducq 4d6f53ce67 conda: obviously, platform-specific dependencies are broken 2016-05-27 22:45:01 -05:00
Sebastien Bourdeauducq 16063ff8fb conda: another attempt at platform-specific dependencies 2016-05-27 22:25:19 -05:00
Sebastien Bourdeauducq 8c1f1d8f2a rpctool: make readline optional, add to conda dependencies. Closes #442 2016-05-25 11:11:59 -05:00
Robert Jördens 6686383378 artiq_browser: add entry points 2016-04-05 17:22:16 +08:00
Sebastien Bourdeauducq ed1c368e73 gateware: name targets consistently. Closes #290 2016-04-05 16:07:29 +08:00
whitequark e908a5fceb conda: update llvmlite-artiq dependency. 
Build 24 includes addc optimizations.
 2016-04-05 00:48:41 +00:00
Sebastien Bourdeauducq 7453d85d5e GUI -> dashboard 2016-04-04 22:12:45 +08:00
whitequark ce30045dd4 conda: update llvmlite-artiq dependency. 
Build 22 includes debug information support.
 2016-04-02 18:40:06 +00:00
whitequark 6a34a75b99 conda: require llvmlite-artiq built for LLVM 3.8. 2016-04-01 09:35:28 +00:00
whitequark 2c04979727 compiler: update for LLVM 3.7. 2016-03-31 11:23:47 +00:00
Sebastien Bourdeauducq d9e9b66494 depend on asyncserial 2016-03-22 21:56:09 +08:00
Sebastien Bourdeauducq 129927490b conda: pyqt -> pyqt5 2016-02-21 17:14:59 +08:00
whitequark 1cfca74fcb conda: remove spurious artiq dep from gateware packages. 2016-02-14 13:35:40 +00:00
Robert Jördens 734fa593e4 conda bitstreams: depend on artiq 0.1 2016-02-14 14:21:31 +01:00
Robert Jördens ed36a96f8f conda/artiq: pyqt (not 5, to be revisited) 2016-02-14 02:24:46 +01:00
Robert Jördens 801b256d67 conda: use git_url 
needed for conda-build >= 0.19.0
 2016-02-14 02:21:07 +01:00
Sebastien Bourdeauducq fcf7a6be2e Revert "conda: restrict binutils-or1k-linux dependency to linux." 
This reverts commit 5bead8b83f.
 2016-02-10 23:42:24 +01:00
Sebastien Bourdeauducq 64263b75d0 use https for m-labs.hk 2016-02-10 17:20:29 +01:00
Sebastien Bourdeauducq f3f667be5b conda: fix pyqt package name 2016-02-09 10:47:38 +01:00
Sebastien Bourdeauducq d873c25b8b Use Qt5 2016-02-08 19:32:40 +01:00
Sebastien Bourdeauducq b7de92e96c remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733 2016-02-02 18:41:57 +01:00
Sebastien Bourdeauducq 55b31244ed remove stale dependency on pyelftools 2016-02-02 17:27:29 +01:00
whitequark 5bead8b83f conda: restrict binutils-or1k-linux dependency to linux. 2016-01-27 09:24:54 +00:00
Sebastien Bourdeauducq dae63bd10c conda: add artiq-kc705-nist_clock 2016-01-20 21:36:21 -05:00
Robert Jördens 25ce0928bd build/doc: simplify proxy bitstream locations 2016-01-05 10:23:50 -07:00
whitequark 400999f6ad Revert "conda: use BUILDNUMBER from environment." 
This reverts commit ff09a982c5.
 2016-01-05 16:06:05 +00:00
whitequark 07ef8906f4 conda: fix buildscripts to get bscan bitstreams correctly. 2016-01-05 15:47:41 +00:00
whitequark ff09a982c5 conda: use BUILDNUMBER from environment. 2016-01-05 15:46:42 +00:00
Sebastien Bourdeauducq 57ae630c5c conda: package new, openocd-compatible flash proxy bitstreams 2016-01-05 21:02:13 +08:00
whitequark 407a7d7bf8 conda: remove flterm dependency (#185). 2016-01-05 04:31:02 +00:00
Robert Jördens d64d962c3e remove redundant udev rules, update entry points 2016-01-05 10:20:54 +08:00
Sebastien Bourdeauducq 179c50480f frontend: split coretool into coreconfig, corelog and coreanalyzer 2015-12-24 18:51:11 +08:00
Sebastien Bourdeauducq 183e855229 remove workaround_asyncio263 2015-12-20 23:26:48 +08:00
whitequark 272480cd26 Revert "conda: give up on build strings in dependencies." 
This reverts commit c0e040c4b9.
 2015-12-02 21:58:33 +08:00
whitequark a66b3d9bee conda: add levenshtein dependency. 2015-12-02 19:12:58 +08:00
whitequark c2ad949d85 conda: add pythonparser dependency. 2015-12-02 18:53:58 +08:00
whitequark 09647940a6 conda: use source from the current checkout. 2015-12-02 18:50:48 +08:00
Sebastien Bourdeauducq d4747a85f3 conda: use vivado for kc705 builds 2015-11-04 18:36:34 +08:00
Sebastien Bourdeauducq 4d0f500301 conda: update migen/misoc dependencies 2015-11-04 16:49:35 +08:00
Sebastien Bourdeauducq 649069980a conda,travis: use new SoC build system 2015-11-04 16:01:03 +08:00
whitequark c0e040c4b9 conda: give up on build strings in dependencies. 2015-10-29 01:24:39 +03:00
whitequark 372bc906c1 Revert "conda: work around conda/conda#1740." 
This just made conda recurse forever.

This reverts commit f384142869.
 2015-10-26 15:10:46 +03:00
whitequark f384142869 conda: work around conda/conda@1740. 2015-10-26 14:27:23 +03:00
Sebastien Bourdeauducq fd910faa38 change license to GPL in scripts 2015-10-23 09:09:45 +08:00
whitequark 30842a7174 conda: include udev rules and artiq_flash.sh in artiq package. 2015-10-22 17:18:59 +03:00
whitequark 026504e578 conda: add artiq-kc705-nist_qc[12]. 2015-10-22 16:01:12 +03:00
whitequark 8374e8d33e conda: add artiq-pipistrello-nist_qc1. 2015-10-22 15:43:41 +03:00
whitequark 8b78fe492a conda: build noarch package without bitstreams. 2015-10-22 13:42:05 +03:00
whitequark 237959b1f2 conda: include git hash in build string. 2015-10-22 13:18:24 +03:00
whitequark 7dea097279 conda: reformat. 2015-10-22 13:18:24 +03:00
Sebastien Bourdeauducq eb546bf4a0 conda: make package noarch 2015-10-20 18:49:27 +08:00
whitequark f3e61e265c conda: move everything except artiq to conda-recipes (closes #138). 2015-10-16 07:06:22 +03:00
whitequark da4a6a2e64 conda: llvmlite-artiq: test by importing binding. 2015-10-14 16:01:36 +03:00
whitequark d033745f42 conda: llvmdev-or1k: bump. 2015-10-14 15:57:15 +03:00
whitequark ca3a0fd73b conda: llvmlite-artiq: do not use LLVM from /usr/local/llvm-or1k. 2015-10-14 14:49:40 +03:00
whitequark 760ecb5308 conda: add lit package. 2015-10-14 14:49:40 +03:00
whitequark fa9cbab77a conda: fix README. 2015-10-14 14:49:40 +03:00
whitequark a05d04b016 conda: add missing recipes. 
[ci skip]
 2015-10-09 22:50:51 +03:00
whitequark db061bc43d Revert "travis: use main conda m-labs channel." 
This reverts commit 87b573c813.
 2015-10-09 20:21:25 +03:00
whitequark a9230d33f2 conda: skip bitstream builds if BUILD_SOC=0. 2015-10-09 16:52:30 +03:00
whitequark 06d5a0f58d conda: add README. 2015-10-09 15:06:06 +03:00
whitequark 354c3c8244 conda: fix pyelftools dependencies. 2015-10-09 15:01:03 +03:00
whitequark 6e3c411d1e conda: add pyelftools recipe. 2015-10-09 14:26:31 +03:00
Sebastien Bourdeauducq 566af5499d conda: update pyqtgraph, fix version string. closes #132 2015-10-09 11:46:07 +08:00
Sebastien Bourdeauducq fcb668f465 travis,conda: python 3.5 2015-10-04 23:03:31 +08:00
Sebastien Bourdeauducq 125503139e remove workaround for Python bug in asyncio process.wait(). Requires Python 3.5. Closes #58 2015-10-03 14:33:18 +08:00
Sebastien Bourdeauducq cd3107ba75 do not use deprecated asyncio.JoinableQueue 2015-10-03 13:59:18 +08:00
Yann Sionneau fde6f42454 conda: add conda package recipe for pythonparser. Closes #122 2015-09-01 16:13:30 +02:00
Yann Sionneau 4a907dcb33 conda: add binutils-or1k-linux dependency to artiq package 2015-09-01 12:13:24 +02:00
Yann Sionneau 93a2e7fd85 conda: add binutils-or1k-linux package recipe 2015-09-01 12:08:43 +02:00
Yann Sionneau 8dcec8a997 llvmlite: update conda pkg and fix Windows build 2015-08-31 16:21:15 +02:00
Yann Sionneau 4d84ec7742 update lx45 bscan bitstream url which wget could not fetch on some systems 2015-08-27 21:38:00 +02:00
Yann Sionneau 92390cfbe6 py2llvm: allow the unit test to run on Windows 2015-08-26 11:12:48 +02:00
Sebastien Bourdeauducq 45a90bf272 conda: remove stale ARTIQ_GUI env variable 2015-08-24 20:28:39 +08:00
Yann Sionneau 34771ade67 artiq_flash.sh: fix runtime programming and allow usage of -d . -r 2015-08-22 15:28:55 +02:00
Yann Sionneau df7489ff61 travis/conda: add automated builds for kc705 nist_qc2 subtarget 2015-08-20 16:31:48 +02:00
Yann Sionneau 3002b5be56 conda: update artiq pkg entry points 2015-08-19 13:20:25 +02:00
Yann Sionneau 19a77b51f2 conda: make aiohttp testing not depend on gunicorn on Windows platform 2015-08-17 22:02:27 +02:00
Yann Sionneau a64c6a321b conda: add aiohttp dependency on artiq pkg + recipe for aiohttp pkg 2015-08-17 11:54:07 +02:00
Yann Sionneau 4ac79fb100 conda: update libssh2 libgit2 pygit2 to use anaconda libs instead of system ones 2015-08-14 16:57:33 +02:00
Yann Sionneau 1ce8bbe3ae conda: add recipe for libssh2 package 2015-08-13 18:51:10 +02:00
Yann Sionneau 80805407bf conda: add Windows support for pygit2 and libgit2 packages 2015-08-11 16:44:22 +02:00
Yann Sionneau b70b2252d5 conda: add pygit2+libgit2 recipes + pygit2 dependency in artiq pkg 2015-08-11 12:55:53 +02:00
Yann Sionneau 80e8928c70 conda: llvmlite-artiq has been rebuilt with an updated version 2015-08-10 20:34:06 +02:00
Yann Sionneau c57ce6d750 conda: llvmdev should be built in Release mode with assertions enabled 2015-08-10 12:25:05 +02:00
Yann Sionneau 393576fc01 conda: add missing build.sh for llvmdev-or1k pkg 2015-08-10 12:13:07 +02:00
Sebastien Bourdeauducq 54a568c510 conda/llvmdev-or1k: cleanup, bump version number 2015-08-07 20:49:13 +08:00
whitequark 8f2dfcd08e Rename conda package llvmlite-{or1k → artiq}. 2015-08-05 04:17:59 +03:00
whitequark 4a8e397a77 Fold llvmlite patches into m-labs/llvmlite repository. 2015-08-05 03:49:01 +03:00
Sebastien Bourdeauducq 4a7a4acf07 conda: remove unnecessary pixman package 2015-08-01 00:16:26 +08:00
Sebastien Bourdeauducq b4e1d1b074 conda/artiq: use $PYTHON 2015-07-31 15:03:54 +08:00
Sebastien Bourdeauducq a118d03ac6 even more travis debugging 2015-07-31 14:57:26 +08:00
Sebastien Bourdeauducq feb2c4d0c4 more travis debugging 2015-07-31 14:52:15 +08:00
Sebastien Bourdeauducq 36d92c72df travis: try export 2015-07-31 14:10:14 +08:00
Sebastien Bourdeauducq 53f55a7502 try to workaround travis problem 2015-07-31 14:01:39 +08:00
Sebastien Bourdeauducq f3c38005d3 i hate travis-ci 2015-07-31 13:58:28 +08:00
Yann Sionneau 78ee4bdb99 pyqtgraph: use more up to date revision a6d5e28 on develop branch 2015-07-16 20:00:08 +02:00
Yann Sionneau 511d51977e llvmlite: split patch to be cleaner. close #72 2015-07-15 17:28:05 +02:00
Yann Sionneau af20efafa5 conda: update llvmlite-or1k package and up the build number 2015-07-15 17:28:05 +02:00
Yann Sionneau 90ba9f7bbf llvmlite: rename our package to be llvmlite_or1k to avoid collision with llvmlite package needed for numba 2015-07-14 01:01:56 +02:00
Yann Sionneau 813a2a2edf conda: add missing udev rules files in the package 2015-07-04 12:50:12 +02:00
Yann Sionneau 2f8a67c8b6 conda: fix missing runtime for KC705 in previous commit 2015-06-16 18:14:26 +02:00
Yann Sionneau 4bad5e464f conda: fix KC705 BIOS and runtime 2015-06-16 18:12:38 +02:00
Yann Sionneau 2bdf5f3ba9 conda: embed flash proxies in the artiq package 2015-06-16 02:18:42 +02:00
Sébastien Bourdeauducq 56f0a82c54 conda: install .bit file instead of .bin 2015-06-15 17:31:33 -06:00
Yann Sionneau ea04c981bb conda: add flterm package 2015-06-15 16:16:12 +02:00
Yann Sionneau 2ed81f75a7 conda: remove recipes we dont need anymore since the switch to Qt 2015-06-12 18:16:19 +02:00
Yann Sionneau 0bf3b7a32b conda/setuptools: artiq needs python >= 3.4.3 2015-06-03 15:56:54 +02:00
Yann Sionneau 4da377eef0 setup/conda: update frontends 2015-05-27 21:42:49 +02:00
Yann Sionneau 82ec931003 conda: add pyqtgraph+quamash dependencies/recipes and remove gbulb and cairoplot3 2015-05-22 17:35:21 +02:00
Yann Sionneau 1530f9f457 travis: generate kc705 and pipistrello binaries in container env 2015-05-21 00:19:06 +08:00
Sebastien Bourdeauducq 5413242587 minor cleanups 2015-04-22 10:00:56 +08:00
Yann Sionneau 979cd14547 pxi6733: add pydaqmx dependency + controller in entry points 2015-04-22 09:59:37 +08:00
Yann Sionneau a642a6bf01 conda: add recipe for pydaqmx 2015-04-22 09:59:24 +08:00
Yann Sionneau 8a3be4eca0 artiq_flash: add support for kc705 2015-04-11 22:38:11 +08:00
Sebastien Bourdeauducq efd1c24ed7 frontend: add artiq_compile tool to build default experiment 2015-04-07 15:41:32 +08:00
Sebastien Bourdeauducq 2456e795dd conda: add missing entry_points 2015-04-07 11:17:47 +08:00
Sebastien Bourdeauducq 1ddcfc13fb conda: fix bitstream name 2015-04-07 11:17:25 +08:00
Sebastien Bourdeauducq 6973c0f8d5 move patches into misc 2015-04-02 17:06:19 +08:00
Yann Sionneau e7be00baa8 Add support for automatic build and upload of dev conda artiq packages to binstar by travis-ci 
- SoC+BIOS are also built and integrated in the conda package
- artiq_flash.sh script is embedded to allow flashing ppro board
 2015-03-30 19:51:52 +08:00
Sebastien Bourdeauducq 6d4b9e5fca frontend: remove lda_client (use artiq_rpctool instead) 2015-02-12 09:34:17 +08:00
Yann Sionneau b396f5dd43 pc_rpc: support for method listing, frontend: artiq_rpctool, +fixes by SB 2015-02-12 00:38:30 +08:00
Yann Sionneau 291ca0bf8d artiq conda recipe: add missing dependencies h5py and dateutil 2015-02-07 12:07:39 +08:00
Yann Sionneau 9420554d2b WIP: let GUI be optional at install time 2015-02-07 12:07:39 +08:00
Yann Sionneau 02a71e7abf Add conda recipes for artiq and its dependencies 2015-02-05 19:57:32 +08:00