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

308 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq e6b230b71c Merge branch 'master' of github.com:m-labs/artiq 2015-10-30 13:41:45 +08:00
Sebastien Bourdeauducq 2c77c80b4f master: expose more scheduler APIs to the experiments 2015-10-30 13:41:18 +08:00
whitequark ff93e3c149 manual: update installing.rst to elaborate QC1/QC2 differences. 2015-10-30 05:07:01 +03:00
whitequark 62419c0952 manual: update installing.rst. 2015-10-30 04:18:42 +03:00
Sebastien Bourdeauducq 3044a053e1 databases: assume empty dataset_db if file not present. Closes #156 2015-10-24 10:15:20 +08:00
whitequark f3e61e265c conda: move everything except artiq to conda-recipes (closes #138). 2015-10-16 07:06:22 +03:00
Sebastien Bourdeauducq cbda753f44 master: TCP server for remote logging 2015-10-16 00:53:35 +08:00
Sebastien Bourdeauducq ef487ee8b0 doc: more updates for dataset API 2015-10-13 18:45:04 +08:00
Sebastien Bourdeauducq fc4791bbbe doc: new dataset API 2015-10-13 18:11:17 +08:00
Sebastien Bourdeauducq ceb18d05b3 manual/management: add warning about setups that resolve the current hostname to localhost. closes #134 2015-10-13 01:47:18 +08:00
Sebastien Bourdeauducq 5f89d1a78f doc: document core device driver. Closes #119 2015-10-06 18:12:57 +08:00
Sebastien Bourdeauducq 50a5a3baf0 environment: attr_* -> setattr_* 2015-10-04 00:18:21 +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
Robert Jördens 01416bb0be copyright: claim contributions 
These are contributions of >= 30% or >= 20 lines (half-automated).

I hereby resubmit all my previous contributions to the ARTIQ project
under the following terms:

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

Closes #130

Signed-off-by: Robert Jordens <jordens@gmail.com>
 2015-09-06 16:08:57 -06:00
Sebastien Bourdeauducq 2bd27a3170 update copyright/license 2015-09-05 15:50:34 -06:00
Yann Sionneau f602928e89 manual: ARTIQ requires python 3.4.3 or above 2015-09-01 16:46:12 +02:00
Yann Sionneau 2056831c05 manual: add install instructions for pygit2 2015-08-28 17:50:39 +02:00
Sebastien Bourdeauducq 1cace1cd91 style 2015-08-28 16:30:33 +08:00
Sebastien Bourdeauducq 031d8d0890 doc/manual: add note about bidirectional TTL in tutorial 2015-08-28 16:29:56 +08:00
Yann Sionneau 241b7651a2 manual: fix typo in package name 2015-08-28 09:51:53 +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 4cb0d4589e manual: fix some typos 2015-08-26 16:14:16 +02:00
Sebastien Bourdeauducq 8aec02dfcf Merge branch 'master' of github.com:m-labs/artiq 2015-08-26 20:43:12 +08:00
Sebastien Bourdeauducq 2c893ba0a2 doc/manual: add results to mgmt tutorial 2015-08-26 20:40:37 +08:00
Sebastien Bourdeauducq 947acb1f90 manual: management system tutorial, Git integration 2015-08-26 20:23:50 +08:00
Yann Sionneau 7b0b1d6860 manual: Windows (32 and 64-bit) users should install 32-bit miniconda/anaconda 2015-08-26 14:22:13 +02:00
Sebastien Bourdeauducq d4f42e33e6 doc: clarify hw support 2015-08-21 13:33:23 +08:00
Sebastien Bourdeauducq ac5dd0a7e5 doc: scans 2015-08-21 13:32:53 +08:00
Sebastien Bourdeauducq c3f3763af1 doc: units 2015-08-18 23:31:06 +08:00
Sebastien Bourdeauducq 9f0ada49e5 doc: environment 2015-08-18 23:30:50 +08:00
Sebastien Bourdeauducq c97c6e2b9a doc/ndsp_reference: reorganize 2015-08-18 22:34:22 +08:00
Sebastien Bourdeauducq 178816243c doc/core_device: update, add KC705 QC1 TTL table 2015-08-18 16:04:27 +08:00
Yann Sionneau a0f1b02eb5 Revert "manual: llvmlite-artiq conda package needs a recent libstdc++6" 
This reverts commit 8669f1d61d.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
 2015-08-17 17:50:57 +02:00
Sebastien Bourdeauducq cd199f16ec doc: add note about setting core device IP 2015-08-17 23:41:55 +08:00
Sebastien Bourdeauducq fd3fefec52 add InfluxDB bridge 2015-08-17 15:44:40 +08:00
Yann Sionneau 8669f1d61d manual: llvmlite-artiq conda package needs a recent libstdc++6 2015-08-14 21:44:28 +02:00
Sebastien Bourdeauducq 12b3157009 doc: add precision about Git commit management 2015-08-14 10:37:45 +08:00
Sebastien Bourdeauducq a1c7efd0ae doc: use m-labs anaconda account 2015-08-13 14:47:05 +08:00
Sebastien Bourdeauducq a6ab066c87 ctlmgr: support immediate controller retry 2015-08-11 23:22:36 +08:00
Sebastien Bourdeauducq af230f6cf3 Merge branch 'master' of github.com:m-labs/artiq 2015-08-10 15:18:50 +08:00
Sebastien Bourdeauducq d9d74661c1 doc: scheduling 2015-08-10 15:17:02 +08:00
Sebastien Bourdeauducq 9772676f2d doc: cleanup shell prompts 2015-08-10 15:16:52 +08:00
whitequark 95b56e85a3 Add binutils patch. 2015-08-09 23:33:00 +03:00
Sebastien Bourdeauducq 799a58a442 doc: minor cleanup 2015-08-09 14:14:55 +08:00
Sebastien Bourdeauducq 16af80ca3e doc: add core device explanation 2015-08-08 22:59:53 +08:00
Sebastien Bourdeauducq e8aa825a9d doc: git integration 2015-08-08 22:27:57 +08:00
Sebastien Bourdeauducq c0030406c3 doc: core device page 2015-08-08 21:24:13 +08:00
Sebastien Bourdeauducq c6e5eaa73a doc/manual: fix confusing board config instructions 2015-08-07 20:48:48 +08:00
whitequark d0402243a0 Update installation instructions. 2015-08-04 18:00:10 +03:00
Sebastien Bourdeauducq 18f38e6242 doc/manual: make sure correct Clang is used 2015-08-04 20:20:56 +08:00
Sebastien Bourdeauducq 433cb948bc doc: artiq git clone needs --recursive to fetch lwIP 2015-08-04 17:01:12 +08:00
whitequark ad7cbc4394 Rename artiq_coreconfig → artiq_coretool; add log subcommand. 2015-08-02 16:40:58 +03:00
whitequark b179430f6b Specify correct llvmlite branch in installation instructions. 2015-07-28 23:43:07 +03:00
Sebastien Bourdeauducq 228f7c3d61 manual: update xc3sprog download 2015-07-28 00:38:20 +08:00
whitequark 163edc02c6 Fix Mock usage in sphinx configuration. 2015-07-26 09:49:39 +03:00
whitequark 95f7be0a88 Update install instructions to reflect that LLVM is always needed. 2015-07-26 09:38:43 +03:00
whitequark e5acdfe3fd Update manual install instructions. 2015-07-26 09:28:11 +03:00
Yann Sionneau 08eec40861 manual: building LLVM as shared libraries is not recommended on Linux and not supported on Windows 2015-07-15 17:34:06 +02:00
Yann Sionneau 774c66a209 manual: also build LLVM native target (needed for py2llvm test) 2015-07-15 17:32:32 +02:00
Yann Sionneau fa4f38b871 manual: add missing llvmlite patches 2015-07-15 17:31:57 +02:00
Sebastien Bourdeauducq a07f2473b0 manual: add core device moninj port 2015-07-14 20:06:29 +02:00
Sebastien Bourdeauducq 32d141f5ac refactor ddb/pdb/rdb 2015-07-13 22:21:32 +02:00
Yann Sionneau 01ca6ebb1c binstar.org is becoming anaconda.org 2015-07-10 16:30:14 +02:00
Sebastien Bourdeauducq 34aacd3c5f complete AD9914 support (no programmable modulus, untested) 2015-07-08 17:22:43 +02:00
Yann Sionneau 3471ef80fd manual: closes #63, tell to install xc3sprog before flashing 2015-07-04 14:48:55 +02:00
Sebastien Bourdeauducq 2881d5f00a gateware: add RTIO clock generator 2015-07-02 18:20:26 +02:00
Sebastien Bourdeauducq e5e035d031 doc/manual: add fire_and_forget 2015-07-01 22:37:12 +02:00
Robert Jördens d1c4cf0b78 pipistrello: update rtio channel doc 2015-06-29 12:21:54 -06:00
Yann Sionneau 515aa96819 controllers: use --simulation for simulation 2015-06-29 13:04:01 +02:00
Yann Sionneau c381102019 manual: fix faq item title about determining pyserial URL by serial number 2015-06-26 18:22:47 +02:00
Sebastien Bourdeauducq 064ddb48bd manual: minor fixes 2015-06-23 19:44:02 +00:00
Yann Sionneau f0dddd9f39 manual: hwgrep is the preferred way of specifying a serial device 2015-06-23 18:14:25 +02:00
Yann Sionneau 7821d0f7c8 manual: explain how to list attached serial devices on windows/linux 2015-06-23 17:05:57 +02:00
Yann Sionneau d646984471 manual: link cleanup 2015-06-19 23:09:19 +02:00
Yann Sionneau 188a9fb313 manual: add hwgrep example for TDC 2015-06-19 23:03:47 +02:00
Yann Sionneau 3933ff5cba manual: add missing quotes 2015-06-19 17:44:57 +02:00
Yann Sionneau b8bb3d8ca7 manual: explain how to select TCube device from serial number 2015-06-19 17:06:50 +02:00
Yann Sionneau 979f3522cb manual: style 2015-06-19 17:06:14 +02:00
Yann Sionneau 4cdf1c4b81 manual: serial number explanations + udev rule for LDA 2015-06-19 16:41:44 +02:00
Florent Kermarrec 1d052095ee doc/manual/installing: minor cleanups 2015-06-19 08:10:33 +02:00
Yann Sionneau 77ca8bbf0f artiq_coreconfig: better arg parsing 2015-06-18 17:07:20 +02:00
Yann Sionneau 250f9e0bc0 manual: update artiq_coreconfig parameter's syntax 2015-06-17 16:46:39 +02:00
Yann Sionneau a3f0663823 manual: flash proxies are installed via conda, don't tell to install them 2015-06-16 02:32:22 +02:00
Yann Sionneau a5b34beffa manual: linux-32 conda pkg contains binaries + use only dev channel 2015-06-14 23:27:36 +02:00
Yann Sionneau 00c4101f12 manual: install flash proxy before flashing bitstream/bios/runtime 2015-06-14 22:23:55 +02:00
Yann Sionneau b14ca2ecc9 manual: remove reference to ppro board 2015-06-14 22:05:06 +02:00
Yann Sionneau 23116420d7 manual: add instructions to install from conda 2015-06-14 21:02:37 +02:00
Sebastien Bourdeauducq 398940f5ac fix doc build 2015-06-06 00:55:48 +08:00
Sebastien Bourdeauducq 82a2beaa32 style fixes 2015-06-04 10:42:37 +08:00
Yann Sionneau a84f76bf09 manual: cleanup, removing Gtk GUI related instructions 2015-05-29 17:45:13 +02:00
Yann Sionneau d5fb50b497 manual: after artiq is installed, frontends can be used without path prefix 
except non-python frontends like artiq_flash.sh
 2015-05-29 17:44:20 +02:00
Yann Sionneau 7ec0bc0470 manual: explain how to compile and flash the idle kernel 2015-05-29 17:38:23 +02:00
Yann Sionneau 4bf7875b87 flash_storage: refactor + unit tests + artiq_coreconfig.py CLI + doc 2015-05-27 18:06:12 +08:00
Sebastien Bourdeauducq cff999f259 doc: update mock modules 2015-05-22 22:39:26 +08:00
Sebastien Bourdeauducq 2adf9d91df recover_underflow -> break_realtime 2015-05-03 20:45:28 +08:00
Sebastien Bourdeauducq 65b4b7bb12 coredevice: rename rtio to ttl, integrated in+out driver, loopback on the same pin in tests 2015-05-02 10:35:21 +08:00
Sebastien Bourdeauducq 109dfab76c frontend: add artiq_mkfs 2015-04-30 20:03:11 +08:00
Sebastien Bourdeauducq e61368e897 doc/manual: list core device port 2015-04-28 00:00:00 +08:00
Sebastien Bourdeauducq 938e1c2842 Remove UP support. 
The only advantage of UP is to support the Papilio Pro, but that port is also very limited in other ways and the Pipistrello provides a more reasonable platform that also supports AMP.

On the other hand, RPCs on UP are difficult to implement with the session.c protocol system (without an operating system or coroutines), along with many other minor difficulties and maintainance issues. Planned features such as watchdogs in the core device are also difficult on UP.
 2015-04-27 20:43:45 +08:00
Yann Sionneau 9b87933287 pxi6733: add ndsp documentation 2015-04-21 16:19:12 +08:00
Yann Sionneau e19f8896f0 artiq_rpctool: document numpy availability in RPC call cmd line arguments 2015-04-21 15:57:29 +08:00
Yann Sionneau 5805240df6 manual: update runtime flashing instructions 2015-04-18 00:33:09 +08:00
Sebastien Bourdeauducq c1ece33e6d manual: adapt to LED on RTIO 2015-04-17 10:43:50 +08:00
Sebastien Bourdeauducq efd1c24ed7 frontend: add artiq_compile tool to build default experiment 2015-04-07 15:41:32 +08:00
Sebastien Bourdeauducq c8039e9dd2 doc: update Papilio Pro info 2015-04-07 00:09:08 +08:00
Sebastien Bourdeauducq 6973c0f8d5 move patches into misc 2015-04-02 17:06:19 +08:00
Sebastien Bourdeauducq 2d1bbdf22a doc/manual/faq: more minor details 2015-03-25 16:37:17 +01:00
Sebastien Bourdeauducq bc307abc7a doc/manual/faq: fix minor details 2015-03-25 16:17:49 +01:00
Yann Sionneau 7482921f81 ndsp_reference: give example of thorlabs_controller usage 2015-03-25 16:11:15 +01:00
Robert Jördens a6316c8fee faq: clarifications 2015-03-24 13:12:40 -06:00
Robert Jördens bba434e951 README/manual: refactor intro 2015-03-23 18:49:07 -06:00
Robert Jördens 8340516801 doc/manual: add faq (edited from artiq-log) 2015-03-23 18:49:07 -06:00
Sebastien Bourdeauducq 1b7f71bda9 controllers: consistent device/simulation specification 2015-03-22 00:48:15 +01:00
whitequark f26486e4cb Improve installation instructions. 2015-03-21 17:01:09 +03:00
Sebastien Bourdeauducq 330e7e1b18 doc/manual: add note about avoiding __del__ 2015-03-12 15:15:56 +01:00
Sebastien Bourdeauducq f2e3dfb848 Experiment base class, replace __artiq_unit__ with docstring 2015-03-08 15:55:30 +01:00
Sebastien Bourdeauducq 0f007cb1a7 language/db: remove implicit_core 2015-03-08 11:37:53 +01:00
Yann Sionneau 14c759ff89 add Thorlabs T-Cube NDSP 2015-03-04 14:30:49 +00:00
Sebastien Bourdeauducq da917f768e initial kc705 support 2015-02-26 21:50:52 -07:00
Sebastien Bourdeauducq 65555a3a09 artiq_run,master: introduce __artiq_unit__ attribute to mark and name experiments 2015-02-20 14:01:34 -07:00
Sebastien Bourdeauducq 5bb6a3d8a6 style 2015-02-18 11:34:00 -07:00
Sebastien Bourdeauducq 4558fb3e33 clarify controller terminology 2015-02-16 08:57:15 -07:00
Sebastien Bourdeauducq 7ca895c14a manual: add novatech409b 2015-02-16 04:24:44 -07:00
Joe Britton a3494c57cc add Novatech 409B controller 2015-02-15 17:31:37 -07:00
Sebastien Bourdeauducq 7299a2cf02 doc/manual/management: add short descriptions of tools 2015-02-15 14:55:15 -07:00
Sebastien Bourdeauducq 6d4b9e5fca frontend: remove lda_client (use artiq_rpctool instead) 2015-02-12 09:34:17 +08:00
Yann Sionneau af4be9a2e2 rpctool: change call syntax 2015-02-12 09:31:04 +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 d2619eb78b Add documentation about ARTIQ_GUI environment variable 
Also adds "python-gi" as Ubuntu dependency as this is needed
for the GUI.
 2015-02-09 19:48:22 +08:00
Sebastien Bourdeauducq 17685d1e98 controller manager skeleton 2015-02-06 12:17:51 +08:00
Robert Jördens 50c14db17a doc/manual: mock up external modules for sphinx-autodoc 2015-02-05 04:31:35 -07:00
Sebastien Bourdeauducq f308bf6c12 doc/manual/installing: add python3-h5py for Xubuntu 2015-02-04 18:43:18 +08:00
Sebastien Bourdeauducq 3a784e3382 doc/writing_a_driver: use logging.getLogger 2015-02-03 10:07:37 +08:00
Sebastien Bourdeauducq 3a2bd02efd doc/manual/installing: add dateutil xubuntu package 2015-01-31 16:55:44 +08:00
Yann Sionneau 526887140d Set WARNING as default log level + update documentation 2015-01-30 19:04:04 +08:00
Sebastien Bourdeauducq 0088f48607 manual/writing_a_driver: logging 2015-01-26 14:38:02 +08:00
Sebastien Bourdeauducq 2954c28e47 manual/writing_a_driver: add more details according to recent discussions 2015-01-26 12:44:46 +08:00
Sebastien Bourdeauducq 9fb42e4952 doc: use sphinx-argparse 2015-01-23 00:52:13 +08:00
Sebastien Bourdeauducq f94aa49276 doc: flterm compilation 2015-01-21 10:31:50 +08:00
Sebastien Bourdeauducq 56ea62b936 doc: fixes and add sync_struct docstrings 2015-01-19 19:20:14 +08:00
Sebastien Bourdeauducq 3e22fe86b5 reorganize files as per discussion with Robert 2015-01-17 19:38:20 +08:00
Robert Jördens 0bd54921af move default TCP ports from 8887... to 3250... 
* 8888 is busy: IPython default among others
* 3250 seems less so and is the house number times ten here
 2015-01-13 10:56:44 +08:00
Sebastien Bourdeauducq 891c0d12f2 refactor device/parameter management, immediate parameter updates, start introducing results 2015-01-12 18:51:23 +08:00
Sebastien Bourdeauducq f695715d56 doc: minor fixes 2015-01-05 16:12:35 +08:00
Sebastien Bourdeauducq d2a5dfa1ec pc_rpc: multiple target support 2014-12-31 20:13:10 +08:00
Sebastien Bourdeauducq f033810e04 management: add sync_struct 2014-12-27 23:27:35 +08:00
Sebastien Bourdeauducq 8ea21f544d update dependencies 2014-12-20 12:14:27 +08:00
Sebastien Bourdeauducq f3b727b59d py2llvm: replace array with list 2014-12-17 21:54:10 +08:00
Sebastien Bourdeauducq d315268ddb move controllers/clients to frontend 2014-12-11 14:10:15 +08:00