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

411 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 4bf0db32be master: publish repository status 2016-03-18 00:40:17 +08:00
Sebastien Bourdeauducq a142d403ea gui: handle better changing MDI area background colors 2016-03-15 18:36:34 +08:00
Sebastien Bourdeauducq ea523c765b frontend/coreanalyzer: do not attempt to print obsolete decoded_dump attribute. Closes #324 2016-03-10 11:33:21 +08:00
Sebastien Bourdeauducq 763a4d3011 rpctool: use pprint in interactive mode 2016-03-02 11:47:34 +08:00
Sebastien Bourdeauducq d0d50d74eb rpctool: interactive mode 2016-03-02 11:45:51 +08:00
Robert Jördens 6dd1eb2e92 artiq_flash: use term 'gateware' 2016-02-29 20:45:41 +01:00
Sebastien Bourdeauducq 572c49f475 use m-labs setup for defaults 2016-02-29 21:35:23 +08:00
whitequark 914bc9f360 artiq_run: allow running LLVM IR/bitcode files, even with trivial RPCs. 2016-02-24 22:50:45 +00:00
Sebastien Bourdeauducq c3cdce9d02 style 2016-02-25 01:22:43 +08:00
Robert Jördens 1b410abc2c pdq2: move initialization and park/unpark to driver 2016-02-22 15:29:27 +01:00
Sebastien Bourdeauducq e177bbd480 frontend/client: fix screen clear on Windows 2016-02-22 01:25:48 +08:00
Sebastien Bourdeauducq ac6e31d655 frontend/rpctool: fix -t/--target. Closes #283 2016-02-22 00:55:45 +08:00
Robert Jördens d713c62b50 pdq2 frontends: adapt to new program, cleanup 2016-02-21 17:35:10 +01:00
Sebastien Bourdeauducq 95dbafd662 gui: add logo to MDI area 2016-02-21 08:06:52 +08:00
Sebastien Bourdeauducq 3b81dd5adc gui: workaround for Qt failing to embed applets in hidden and detached QDockWidgets 2016-02-19 18:13:25 +01:00
Robert Jördens 6830703ec6 artiq_master: directly log, explicit imports 2016-02-18 15:35:02 +01:00
Robert Jördens 0edde9f4d3 master: inform when running 2016-02-18 14:13:40 +01:00
Sebastien Bourdeauducq 87574193d4 gui: autoscroll MDI area 2016-02-16 00:19:50 +01:00
Sebastien Bourdeauducq aa5f6a5aba gui: basic MDI area 2016-02-15 23:58:44 +01:00
Sebastien Bourdeauducq b9bce92bbb Revert "gui: Qt wants a central widget in the main window, use explorer" 
This reverts commit d81ce15869.
 2016-02-15 23:20:06 +01:00
Sebastien Bourdeauducq 72a993afe0 master: cache last RID. Closes #234 2016-02-15 18:20:50 +01:00
Sebastien Bourdeauducq d30fe60edd gui: remove pyqtgraph 2016-02-15 00:23:47 +01:00
Sebastien Bourdeauducq 3ab35f7f8d gui: get rid of pyqtgraph.LayoutWidget 2016-02-15 00:05:30 +01:00
Sebastien Bourdeauducq df16a1da73 gui: remove PyQt5 assertion (break mock modules) 2016-02-14 23:30:39 +01:00
Sebastien Bourdeauducq 15515f33ef gui: better default placement of docks 2016-02-14 23:15:18 +01:00
Sebastien Bourdeauducq cd732718ad gui: save/restore main window geometry 2016-02-14 23:08:14 +01:00
Sebastien Bourdeauducq d81ce15869 gui: Qt wants a central widget in the main window, use explorer 2016-02-14 23:04:14 +01:00
Sebastien Bourdeauducq 3c12c13a67 gui: dock state save/restore 2016-02-14 13:46:15 +01:00
Sebastien Bourdeauducq daf49efa04 gui: rough conversion to the Qt docking system 2016-02-14 12:15:57 +01:00
Sebastien Bourdeauducq 6b6393ff56 gui: remove console 2016-02-13 22:48:38 +01:00
Sebastien Bourdeauducq fb2f53ea9b gui/datasets: support deleting datasets without console 2016-02-13 22:46:29 +01:00
Sebastien Bourdeauducq 338e5fe3fc Merge branch 'applets_pipeipc' 2016-02-08 22:25:36 +01:00
Sebastien Bourdeauducq d873c25b8b Use Qt5 2016-02-08 19:32:40 +01:00
Sebastien Bourdeauducq de99e7f830 applets: handle dataset mutations 2016-02-08 19:20:07 +01:00
Sebastien Bourdeauducq dc955d46c9 Merge branch 'applets' 2016-02-08 14:55:53 +01:00
Sebastien Bourdeauducq 741b11c26d applets: basic embedding OK 2016-02-08 09:59:15 +01:00
Sebastien Bourdeauducq 70a67a0e38 Merge branch 'applets' into applets_pipeipc 2016-02-05 13:29:20 +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
Robert Jördens 10d78a5d0b flash: grow runtime limit to 512 kB 2016-01-30 14:50:15 -07:00
Robert Jördens e92d52314b flash storage: move to flash + 0x70000 
This requires recompiling and flashing the runtime and the entire
storage area file system (ip address and idle kernel).

* with ppp the runtime is larger than 0x40000 now
* 0x60000 for the runtime should give enough space for a while,
  even including a fatter scheduler or runtime components
  in other languages
* for both pipistrello and kc705 this leaves the unused space
  starting at a nice round number
* the relevant flashes nowadays are 0x1000000 large
 2016-01-28 18:08:30 -07:00
Robert Jördens cda4a0765d artiq_ctlmgr: refactor into artiq.devices.ctlmgr 2016-01-26 15:24:29 -07:00
Sebastien Bourdeauducq 5aa4de8e89 refactor logging and implement in worker 2016-01-26 20:31:42 +01:00
Robert Jördens d1119d7747 artiq_dir: move out of tools to unlink dependencies 2016-01-25 18:15:50 -07:00
Robert Jördens f4c7f02127 CoreException: store at 'py_exn.artiq_core_exception' 
... and fix a few imports
 2016-01-25 17:24:00 -07:00
Robert Jördens 2beaf23e6c language...ARTIQException -> coredevice...CoreException 
gets rid of a cross import
is only used there
 2016-01-25 17:24:00 -07:00
Robert Jördens cf17be92e3 doc: add artiq_flash 2016-01-18 21:41:42 -07:00
whitequark e0d5b77e27 Commit missing parts of 127b117. 2016-01-15 17:11:26 +00:00
whitequark 127b117113 Add @host_only function decorator (#172). 2016-01-15 16:42:08 +00:00
Sebastien Bourdeauducq e6e6b27ba9 gui: remove displays (use applets instead) 2016-01-10 18:32:46 +08:00
Sebastien Bourdeauducq 597c2e4b17 gui/applets: startup and embedding working 2016-01-08 13:04:36 +08:00
Sebastien Bourdeauducq e106ee3f90 gui: basic applet dock editing 2016-01-07 20:23:17 +08:00
Robert Jördens 358ad2e927 artiq_flash: drop redundant instruction, tweak doc 2016-01-06 11:24:05 -07:00
Robert Jördens 9aff99568d artiq_flash: use openocd, python 2016-01-05 10:20:41 +08:00
Robert Jördens b10da212ab bit2bin: add small bitstream conversion tool 2016-01-05 10:20:24 +08:00
whitequark 03dd1c3a43 Refactor the logic of printing diagnostics to solely rely on Engine. 2016-01-04 22:11:54 +08:00
Sebastien Bourdeauducq e41b9db787 gui: minor cleanup 2016-01-03 00:47:43 +08:00
whitequark 8aa34ee952 compiler: don't require exceptions to inherit ARTIQException. 2015-12-31 21:54:54 +08:00
Sebastien Bourdeauducq c9da5f4ecb frontend: bind v4 and v6 localhost addresses by default, support multiple bind 2015-12-27 18:03:13 +08:00
Sebastien Bourdeauducq 5f3b69dd19 frontend/coreconfig: simplify action names 2015-12-24 18:54:23 +08:00
Sebastien Bourdeauducq 179c50480f frontend: split coretool into coreconfig, corelog and coreanalyzer 2015-12-24 18:51:11 +08:00
Sebastien Bourdeauducq e41e2c088d analyzer: encapsulate decoded dump, get onehot sel from header 2015-12-24 00:31:21 +08:00
Sebastien Bourdeauducq 4be5df9802 coredevice/analyzer: DDS decoding 2015-12-23 18:57:53 +08:00
whitequark ac5c86bfdc artiq_compile: add missing import. 2015-12-21 21:15:18 +08:00
Sebastien Bourdeauducq 2ae63570dd frontend/coretool: verbosity control 2015-12-20 23:17:31 +08:00
Sebastien Bourdeauducq cdcb57effe coredevice/analyzer: basic VCD writing 2015-12-20 19:32:52 +08:00
Sebastien Bourdeauducq 46f59b673f coredevice: analyzer message decoding 2015-12-20 14:34:16 +08:00
Sebastien Bourdeauducq 10d4bfba38 frontend/coretool: basic analyzer dump 2015-12-18 18:23:16 +08:00
Sebastien Bourdeauducq 80172f9548 frontend/coretool: minor cleanup 2015-12-18 00:18:39 +08:00
Sebastien Bourdeauducq 93317d48c9 gui/explorer: file selector for experiments outside repos 2015-12-09 19:13:57 +08:00
Sebastien Bourdeauducq 7b2580583a master: allow remote listing of directories 2015-12-08 19:24:04 +08:00
Sebastien Bourdeauducq 5e14afde3e scheduler: use current (last scanned) repo revision instead of HEAD 2015-12-06 19:00:41 +08:00
Sebastien Bourdeauducq f99c53d179 client: block until end of repository scan 2015-12-06 18:41:20 +08:00
Sebastien Bourdeauducq ea6dcb2743 master: repository -> experiment_db 2015-12-06 18:39:27 +08:00
Sebastien Bourdeauducq 8467013160 master,gui: support recomputation+reset of arguments 2015-12-06 17:27:15 +08:00
Sebastien Bourdeauducq f73c967b3e gui/shortcuts: fix status bar usage 2015-12-01 18:22:12 +08:00
Sebastien Bourdeauducq ff4c03014c gui/shortcuts: integrate with experiment manager 2015-12-01 17:10:44 +08:00
Sebastien Bourdeauducq afa8148b2b gui/experiments: save/restore state 2015-11-30 11:40:50 +08:00
Sebastien Bourdeauducq c382fac8f2 gui: experiment docks (WIP) 2015-11-27 19:30:05 +08:00
whitequark c14299dca8 Merge branch 'new-py2llvm' 2015-11-24 03:01:54 +08:00
whitequark af43c66149 artiq_compile: set file_import prefix, like in artiq_run. 2015-11-21 17:37:14 +08:00
whitequark 28fa68730a Merge branch 'master' into new-py2llvm 2015-11-20 15:55:29 +08:00
Sebastien Bourdeauducq 3cbd7c4c13 gui: support multiple log docks 2015-11-12 01:13:57 +08:00
Sebastien Bourdeauducq 62c0eb85b1 gui/console: use network clients directly 2015-11-11 17:02:51 +08:00
Sebastien Bourdeauducq 4166f4e928 frontend: use atexit_register_coroutine in other tools 2015-11-11 16:22:12 +08:00
Sebastien Bourdeauducq c3f99eda8f gui: centralize subscribers 2015-11-11 12:13:19 +08:00
whitequark 51f04f6311 Explicitly use the python3.5 binary everywhere. 2015-11-07 13:39:39 +03:00
whitequark 0b5e1d174c Unbreak artiq_flash.sh. 2015-11-07 13:26:14 +03:00
whitequark d6d0a3e3e9 Merge branch 'master' into new-py2llvm 2015-11-07 12:57:18 +03:00
whitequark da622937f6 Merge commit 'd0b5c3ba7fb' into new-py2llvm 2015-11-07 09:41:34 +03:00
Sebastien Bourdeauducq a7c9c95085 gui/explorer: support requesting termination of all instances 2015-11-05 19:04:10 +08:00
Sebastien Bourdeauducq 3404a6565b frontend/artiq_flash: reorganize device binaries 2015-11-04 10:40:46 +08:00
Sebastien Bourdeauducq e26147b2ac gateware,runtime: use new migen/misoc 2015-11-04 00:35:03 +08:00
Sebastien Bourdeauducq 644a410c90 thorlabs_tcube: fix -P case handling 2015-11-03 17:55:00 +08:00
Sebastien Bourdeauducq a2c074cc33 gui: fix RPC client teardown 2015-11-01 00:03:46 +08:00
Sebastien Bourdeauducq f57145c4f3 gui: support triggering repository rescan 2015-10-31 23:58:39 +08:00
Sebastien Bourdeauducq 58f55fc630 artiq_flash: check that xc3sprog is found. closes #162 2015-10-30 15:52:03 +08:00
Sebastien Bourdeauducq 2c77c80b4f master: expose more scheduler APIs to the experiments 2015-10-30 13:41:18 +08:00
whitequark f70f7fb89b Merge branch 'master' into new-py2llvm 2015-10-30 04:29:35 +03:00
Sebastien Bourdeauducq 0d53f7ab0d ignore ProcessLookupError when killing subprocesses. Closes #167 2015-10-28 20:57:28 +08:00
Sebastien Bourdeauducq 4e35a247d1 pdq2_client: remove unnecessary calls 2015-10-28 09:48:14 +08:00
Sebastien Bourdeauducq 3789273e29 pdq2_client: remove init call 2015-10-28 09:47:01 +08:00
whitequark 30842a7174 conda: include udev rules and artiq_flash.sh in artiq package. 2015-10-22 17:18:59 +03:00
Sebastien Bourdeauducq ec02bea054 controllers/thorlabs_tcube: accept any case for -P. Closes #150 2015-10-21 09:17:39 +08:00
Sebastien Bourdeauducq d13b368a65 build logging into worker 2015-10-20 18:11:50 +08:00
Sebastien Bourdeauducq 5947f54855 pc_rpc: autotarget support 2015-10-18 14:34:30 +08:00
Sebastien Bourdeauducq 7f5e264971 ctlmgr: add hostname to log source 2015-10-17 10:58:15 +08:00
Sebastien Bourdeauducq f332c1d3cc ctlmgr: forward controller logs 2015-10-16 20:08:11 +08:00
Sebastien Bourdeauducq 9e96a687e2 ctlmgr: forward log to master 2015-10-16 18:35:58 +08:00
Sebastien Bourdeauducq cbda753f44 master: TCP server for remote logging 2015-10-16 00:53:35 +08:00
Sebastien Bourdeauducq f3b3bf3036 gui: log filtering 2015-10-14 21:21:19 +08:00
whitequark e9adfd639e Merge branch 'master' into new-py2llvm 2015-10-14 16:09:57 +03:00
Sebastien Bourdeauducq c00bce3967 master,client,gui: logging sources, timestamps, levels 2015-10-14 01:06:57 +08:00
whitequark bd5b324fc2 Merge branch 'master' into new-py2llvm 2015-10-13 19:24:45 +03:00
Sebastien Bourdeauducq 3cec176318 get_ddb -> get_device_db 2015-10-12 19:46:31 +08:00
Sebastien Bourdeauducq b51910fa42 compile,coretool: use new dataset API 2015-10-12 19:32:16 +08:00
Sebastien Bourdeauducq a83ffb3dce protocols: move FlatFileDB into pyon 2015-10-12 18:19:28 +08:00
Sebastien Bourdeauducq 22bffa98b5 client: use short_format in dataset display 2015-10-12 18:10:58 +08:00
Sebastien Bourdeauducq 97accd2540 merge parameters and results into datasets 2015-10-12 17:18:23 +08:00
Sebastien Bourdeauducq 139072d402 Graceful experiment termination. Closes #76 2015-10-06 13:50:00 +08:00
Sebastien Bourdeauducq b3584bc190 language,master,run: support raw access to DDB from experiments. Closes #123 2015-10-04 18:29:39 +08:00
Sebastien Bourdeauducq 0e3927b01a master: support DDB rescan 2015-10-04 17:38:07 +08:00
Sebastien Bourdeauducq 50a5a3baf0 environment: attr_* -> setattr_* 2015-10-04 00:18:21 +08:00
Sebastien Bourdeauducq f552d62b69 use Python 3.5 coroutines 2015-10-03 19:28:57 +08:00
Sebastien Bourdeauducq b117b9320d asyncio.async -> asyncio.ensure_future 2015-10-03 14:37:02 +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
whitequark 3e1348a084 Merge branch 'master' of github.com:m-labs/artiq into new-py2llvm 2015-09-27 18:22:28 +03: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
whitequark 2df8b946f9 Factor out the code to pretty-print diagnostics. 2015-08-31 22:52:39 -06:00
whitequark 98bb570aec log.c: fix off-by-one error. 2015-08-28 03:06:40 -05:00
whitequark 6b8ef8c490 artiq_run: use "artiq_run_" as user code module prefix, not "file_import_". 2015-08-28 02:22:59 -05:00
whitequark ed236eb7f2 artiq_run: pretty-print diagnostics. 2015-08-28 01:54:51 -05:00
whitequark d473d58b41 artiq_{compile,run}: adapt to new compiler. 2015-08-28 01:43:46 -05:00
Yann Sionneau 7db0498a9a artiq_flash: dont prepend the runtime file with mezzanine board directory if using -d 2015-08-27 11:02:06 +02:00
Sebastien Bourdeauducq 1c96f258b1 gui: show server in window title 2015-08-25 00:37:49 +08:00
Sebastien Bourdeauducq 84b07607ad gui: do not attempt moninj on windows 2015-08-24 20:20:33 +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 5fc5d0b672 artiq_flash: replace wrong wording 'carrier' with 'mezzanine' 2015-08-21 09:38:15 +02:00
Yann Sionneau 646721d3e9 artiq_flash: add missing semicolons 2015-08-20 18:28:00 +02:00
Yann Sionneau df7489ff61 travis/conda: add automated builds for kc705 nist_qc2 subtarget 2015-08-20 16:31:48 +02:00
Sebastien Bourdeauducq 600e8335f2 influxdb: tag-based schema, better type support 2015-08-18 14:49:23 +08:00
Sebastien Bourdeauducq ed00ca1485 influxdb: do not crash on parameter deletion 2015-08-18 13:35:05 +08:00
Sebastien Bourdeauducq 2ac8c53bbe influxdb: use types 2015-08-18 13:34:42 +08:00
Sebastien Bourdeauducq 2275017651 influxdb: better error reporting 2015-08-18 13:34:15 +08:00
Sebastien Bourdeauducq 66b5ca99d8 influxdb: better filtering 2015-08-18 09:59:48 +08:00
Sebastien Bourdeauducq 324cafae3d rpctool: use pprint 2015-08-17 15:45:08 +08:00
Sebastien Bourdeauducq abbf5eb059 gui: minor cleanup 2015-08-17 15:44:54 +08:00
Sebastien Bourdeauducq fd3fefec52 add InfluxDB bridge 2015-08-17 15:44:40 +08:00
Sebastien Bourdeauducq 34a9c8c12d artiq_run: add dummy pause method (closes #100) 2015-08-15 09:16:00 +08:00
Sebastien Bourdeauducq 998db5121b pc_rpc: id_parameters -> description 2015-08-11 23:29:52 +08:00
Sebastien Bourdeauducq a6ab066c87 ctlmgr: support immediate controller retry 2015-08-11 23:22:36 +08:00