2
0
mirror of https://github.com/m-labs/artiq.git synced 2024-12-29 05:03:34 +08:00
Commit Graph

8272 Commits

Author SHA1 Message Date
3543dc30c7 Revert "tools/file_import: use python 3.4 importlib API"
This reverts commit 614a96a3d7.

Conflicts:
	artiq/tools.py
2015-02-18 08:51:44 -07:00
e6d0fc2021 benchmarks: add copies of ddb/pdb 2015-02-18 08:48:00 -07:00
4c015d383d put benchmarks in separate folder 2015-02-17 16:14:18 -07:00
170a626c76 tools/file_import: support import of modules importing from their directory 2015-02-17 16:13:00 -07:00
656099a331 artiq_run: sort result output alphabetically 2015-02-17 16:12:21 -07:00
614a96a3d7 tools/file_import: use python 3.4 importlib API 2015-02-17 13:07:09 -07:00
4558fb3e33 clarify controller terminology 2015-02-16 08:57:15 -07:00
61dc177bce units: support direct float conversion 2015-02-16 07:48:05 -07:00
021d0d312e novatech409b: do not specify type info in docstrings 2015-02-16 04:43:30 -07:00
8c4fb2d534 novatech409b: add sim mode help 2015-02-16 04:39:41 -07:00
7ca895c14a manual: add novatech409b 2015-02-16 04:24:44 -07:00
17611e9899 lda_controller: add description 2015-02-15 17:32:08 -07:00
Joe Britton
a3494c57cc add Novatech 409B controller 2015-02-15 17:31:37 -07:00
e196ef9c48 lda_controller: style 2015-02-15 15:00:55 -07:00
17596f4ad8 tools,frontend: print default ports 2015-02-15 14:58:57 -07:00
79a5d8a12a tools,frontend: common network arguments 2015-02-15 14:55:43 -07:00
7299a2cf02 doc/manual/management: add short descriptions of tools 2015-02-15 14:55:15 -07:00
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
39dfbb4162 ddb: support for best effort RPC client 2015-02-12 00:54:54 +08:00
1b3603d8bf pc_rpc/BestEffortClient: add docstrings 2015-02-12 00:50:48 +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
6d11da3887 pc_rpc/BestEffortClient: add logging 2015-02-12 00:21:39 +08:00
a7405dea1c protocols/pc_rpc: add best effort client 2015-02-12 00:14:20 +08:00
c91705c5d1 ctlmgr: support hostnames in DDB 2015-02-09 20:03:34 +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
542e047f5a ctlmgr: clean shutdown 2015-02-08 21:44:49 +08:00
a50c74523f ctlmgr: split command arguments properly 2015-02-08 12:18:57 +08:00
abb7d9f911 ctlmgr: catch create_subprocess_exec errors and retry 2015-02-08 12:15:22 +08:00
96a01efc48 ctlmgr: wait for processes to terminate before starting new ones 2015-02-08 00:59:08 +08:00
e7d85c5b87 ctlmgr: basic working implementation 2015-02-07 23:52:05 +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
aba749093b ctlmgr: get local bind address, format commands 2015-02-07 01:14:27 +08:00
0d0a05a487 sync_struct/Subscriber: add before_receive_cb, export reader/writer 2015-02-07 01:13:15 +08:00
8979d9d5e7 Merge branch 'master' of https://github.com/m-labs/artiq 2015-02-06 21:57:08 +08:00
Yann Sionneau
5cec341f73 Add missing dependencies and their repositories
- By adding the dependency_links statement,
setup.py can now automatically fetch gbulb and cairoplot3
and install them. This makes users life easier.
2015-02-06 21:56:36 +08:00
f9d3bd107e ctlmgr: retry connection to master, print received ddb 2015-02-06 18:58:54 +08:00
c97946a71c travis.yml: don't build bitstream for pull requests 2015-02-05 22:50:55 -07:00
ef3804a471 travis: refactor get-misoc.sh 2015-02-05 22:50:55 -07:00
411f716960 travis.yml: reduce irc noise 2015-02-05 22:50:52 -07:00
a06164e4ce travis.yml: build bitstream only if [soc] in commit message 2015-02-05 22:10:46 -07:00
17685d1e98 controller manager skeleton 2015-02-06 12:17:51 +08:00
2f06574381 ddb: controller support 2015-02-05 22:53:31 +08:00
776381a332 Merge branch 'master' of github.com:m-labs/artiq 2015-02-05 20:09:39 +08:00
Yann Sionneau
02a71e7abf Add conda recipes for artiq and its dependencies 2015-02-05 19:57:32 +08:00
4167e669d2 gui/explib: add to artiq top-level import 2015-02-05 19:50:03 +08:00
50c14db17a doc/manual: mock up external modules for sphinx-autodoc 2015-02-05 04:31:35 -07:00
e029ebb23f README: coveralls badge needs branch name 2015-02-05 03:44:57 -07:00
1dd5c28005 travis: install h5py, pyserial, dateutil from conda 2015-02-05 03:06:39 -07:00