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

2804 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq fb2f53ea9b gui/datasets: support deleting datasets without console 2016-02-13 22:46:29 +01:00
Sebastien Bourdeauducq 4a03335850 protocols/pipe_ipc: fix read transport resource leak 
This caused the "Exception ignored in:" message on exit.
 2016-02-11 17:12:05 +01:00
Sebastien Bourdeauducq 29d4755567 gui/applets: prevent concurrent process start/stop 2016-02-11 16:25:44 +01:00
Sebastien Bourdeauducq 92c0ede689 applets: workaround for Qt window embedding initial size bug 2016-02-11 16:19:34 +01:00
Sebastien Bourdeauducq cd9467a8df gui/applets: properly destroy container widget when process is terminated 2016-02-11 16:02:10 +01:00
Sebastien Bourdeauducq c9a9d19182 test/serialization: fix syntax 2016-02-11 09:37:27 +01:00
Robert Jördens 6434a9cd5f Merge branch 'master' into subprocess-termination 
* master: (44 commits)
  Revert "conda: restrict binutils-or1k-linux dependency to linux."
  manual/installing: refresh
  use https for m-labs.hk
  gui/log: top cell alignment
  master/log: do not break lines
  conda: fix pyqt package name
  gui/applets: log warning if IPC address not in command
  applets: make sure pyqtgraph imports qt5
  applets: avoid argparse subparser mess
  examples/histogram: artiq -> artiq.experiment
  gui/applets: save dock UID in state
  setup.py: give up trying to check for PyQt
  setup.py: fix PyQt5 package name
  Use Qt5
  applets: fix error message text
  applets: handle dataset mutations
  applets: properly name docks to support state save/restore
  applets: clean shutdown
  protocols/pyon: set support
  protocols/pyon: remove FlatFileDB
  ...
 2016-02-11 09:24:45 +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 b68035d162 manual/installing: refresh 2016-02-10 23:37:21 +01:00
Sebastien Bourdeauducq 64263b75d0 use https for m-labs.hk 2016-02-10 17:20:29 +01:00
Sebastien Bourdeauducq 97ba77f4b5 gui/log: top cell alignment 2016-02-10 06:34:11 +01:00
Sebastien Bourdeauducq 2ce1e6a1e9 master/log: do not break lines 2016-02-10 06:33:41 +01:00
Sebastien Bourdeauducq f3f667be5b conda: fix pyqt package name 2016-02-09 10:47:38 +01:00
Sebastien Bourdeauducq d1e54c86b1 gui/applets: log warning if IPC address not in command 2016-02-08 22:39:47 +01:00
Sebastien Bourdeauducq 338e5fe3fc Merge branch 'applets_pipeipc' 2016-02-08 22:25:36 +01:00
Sebastien Bourdeauducq 44a1efa601 applets: make sure pyqtgraph imports qt5 2016-02-08 22:25:20 +01:00
Sebastien Bourdeauducq 67327b1e61 applets: avoid argparse subparser mess 2016-02-08 22:25:02 +01:00
Sebastien Bourdeauducq 1a2596de8e examples/histogram: artiq -> artiq.experiment 2016-02-08 22:24:23 +01:00
Sebastien Bourdeauducq 4733c4ba1e gui/applets: save dock UID in state 2016-02-08 21:57:07 +01:00
Sebastien Bourdeauducq 13a8f9c7ca setup.py: give up trying to check for PyQt 2016-02-08 19:42:08 +01:00
Sebastien Bourdeauducq 1830d6a62e setup.py: fix PyQt5 package name 2016-02-08 19:33:35 +01:00
Sebastien Bourdeauducq d873c25b8b Use Qt5 2016-02-08 19:32:40 +01:00
Sebastien Bourdeauducq 7584b02d66 applets: fix error message text 2016-02-08 19:23:50 +01:00
Sebastien Bourdeauducq de99e7f830 applets: handle dataset mutations 2016-02-08 19:20:07 +01:00
Sebastien Bourdeauducq f25b5442e7 applets: properly name docks to support state save/restore 2016-02-08 16:26:02 +01:00
Sebastien Bourdeauducq dc955d46c9 Merge branch 'applets' 2016-02-08 14:55:53 +01:00
Sebastien Bourdeauducq 8844fba4c9 applets: clean shutdown 2016-02-08 14:35:37 +01:00
Sebastien Bourdeauducq 8be0696b39 protocols/pyon: set support 2016-02-08 14:08:14 +01:00
Sebastien Bourdeauducq 8a912105cb protocols/pyon: remove FlatFileDB 2016-02-08 14:05:00 +01:00
Sebastien Bourdeauducq 741b11c26d applets: basic embedding OK 2016-02-08 09:59:15 +01:00
Robert Jördens 912274c6af test_ctlmgr: fix 2016-02-05 15:08:49 -07:00
Sebastien Bourdeauducq 70a67a0e38 Merge branch 'applets' into applets_pipeipc 2016-02-05 13:29:20 +01:00
Robert Jördens c52081ca0d Merge remote-tracking branch 'm-labs/newtesting' into subprocess-termination 
* m-labs/newtesting:
  style
  assume 'import artiq' works before running tests
  test/ctlmgr: use sys.executable, use default localhost binding
 2016-02-03 15:00:00 -07:00
Robert Jördens ab81dbbd19 Merge remote-tracking branch 'm-labs/master' into subprocess-termination 
* m-labs/master:
  remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733
  setup.py: remove stale import
  remove stale dependency on pyelftools
 2016-02-02 23:34:37 -07:00
Robert Jördens c28b938471 Client: add note about timeout sideeffects 2016-02-02 15:42:47 -07:00
Robert Jördens f7df393248 hardware_testbench: full shutdown sequence for controllers 2016-02-02 15:32:40 -07:00
Robert Jördens 53e5d0a7bb worker: flake8 style cleanup 2016-02-02 15:32:40 -07:00
Robert Jördens 7636952496 ctlmgr: fix import 2016-02-02 15:32:39 -07:00
Robert Jördens c105949155 pc_rpc.Client: support socket timeouts 
... and fix two flake8 errors.
 2016-02-02 15:32:39 -07:00
Robert Jördens 55006119c8 subprocesses: unify termination logic 2016-02-02 15:32:36 -07:00
Sebastien Bourdeauducq 89f68f3470 style 2016-02-02 21:57:25 +01:00
Sebastien Bourdeauducq 9ca8b48bf9 assume 'import artiq' works before running tests 2016-02-02 21:52:33 +01:00
Sebastien Bourdeauducq ca8a075f46 test/ctlmgr: use sys.executable, use default localhost binding 2016-02-02 21:08:51 +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 c639860331 setup.py: remove stale import 2016-02-02 17:30:07 +01:00
Sebastien Bourdeauducq 55b31244ed remove stale dependency on pyelftools 2016-02-02 17:27:29 +01:00
Sebastien Bourdeauducq cf465dae0c tools/file_import: make sure sys.path is always restored 2016-01-31 20:33:17 +01:00
Robert Jördens 0d18942869 hardware_testbench: request controller termination 2016-01-30 20:04:32 -07:00
Robert Jördens 9fb5ef4d86 Merge branch 'increase-runtime-size' 
closes #250

* increase-runtime-size:
  flash: grow runtime limit to 512 kB
  RELEASE_NOTES: update
  flash storage: move to flash + 0x70000
 2016-01-30 18:58:32 -07:00
Robert Jördens f14fed5912 examples: add an IPython notebook showcase 
This is a small example on how to use the artiq functionality in
an IPython notebook. This can be expanded and provides a much more
powerful shell than the one integrated in the GUI. Potentially,
some shared functionality between this and artiq_client could be
factored out.
 2016-01-30 18:56:28 -07:00