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

1929 Commits

Author SHA1 Message Date
3ab35f7f8d gui: get rid of pyqtgraph.LayoutWidget 2016-02-15 00:05:30 +01:00
df16a1da73 gui: remove PyQt5 assertion (break mock modules) 2016-02-14 23:30:39 +01:00
e4918a6e19 Merge branch 'master' of github.com:m-labs/artiq 2016-02-14 23:29:24 +01:00
b24146e680 Merge branch 'qtdocks' 2016-02-14 23:28:44 +01:00
9797acc964 gui/applets: prevent size from shrinking to zero when docked 2016-02-14 23:27:59 +01:00
15515f33ef gui: better default placement of docks 2016-02-14 23:15:18 +01:00
cd732718ad gui: save/restore main window geometry 2016-02-14 23:08:14 +01:00
d81ce15869 gui: Qt wants a central widget in the main window, use explorer 2016-02-14 23:04:14 +01:00
579e789ad7 tools/QDockWidgetCloseDetect: simplify 2016-02-14 22:42:25 +01:00
055573a4af Merge branch 'subprocess-termination'
* subprocess-termination:
  test_ctlmgr: fix
  Client: add note about timeout sideeffects
  hardware_testbench: full shutdown sequence for controllers
  worker: flake8 style cleanup
  ctlmgr: fix import
  pc_rpc.Client: support socket timeouts
  subprocesses: unify termination logic
2016-02-14 22:28:11 +01:00
489f69f991 gui: reliable detection of dock close 2016-02-14 22:22:07 +01:00
b97be9c08d Merge branch 'newtesting' 2016-02-14 21:30:19 +01:00
ab1d85be53 gui: remove PyQt5 assertion (break mock modules) 2016-02-14 14:03:57 +01:00
3c12c13a67 gui: dock state save/restore 2016-02-14 13:46:15 +01:00
daf49efa04 gui: rough conversion to the Qt docking system 2016-02-14 12:15:57 +01:00
e68d0d1ec7 gui: do not crash when deleting selected hierarchical dataset and its parents 2016-02-13 23:22:59 +01:00
6b6393ff56 gui: remove console 2016-02-13 22:48:38 +01:00
fb2f53ea9b gui/datasets: support deleting datasets without console 2016-02-13 22:46:29 +01:00
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
29d4755567 gui/applets: prevent concurrent process start/stop 2016-02-11 16:25:44 +01:00
92c0ede689 applets: workaround for Qt window embedding initial size bug 2016-02-11 16:19:34 +01:00
cd9467a8df gui/applets: properly destroy container widget when process is terminated 2016-02-11 16:02:10 +01:00
c9a9d19182 test/serialization: fix syntax 2016-02-11 09:37:27 +01:00
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
97ba77f4b5 gui/log: top cell alignment 2016-02-10 06:34:11 +01:00
2ce1e6a1e9 master/log: do not break lines 2016-02-10 06:33:41 +01:00
d1e54c86b1 gui/applets: log warning if IPC address not in command 2016-02-08 22:39:47 +01:00
338e5fe3fc Merge branch 'applets_pipeipc' 2016-02-08 22:25:36 +01:00
44a1efa601 applets: make sure pyqtgraph imports qt5 2016-02-08 22:25:20 +01:00
67327b1e61 applets: avoid argparse subparser mess 2016-02-08 22:25:02 +01:00
4733c4ba1e gui/applets: save dock UID in state 2016-02-08 21:57:07 +01:00
d873c25b8b Use Qt5 2016-02-08 19:32:40 +01:00
7584b02d66 applets: fix error message text 2016-02-08 19:23:50 +01:00
de99e7f830 applets: handle dataset mutations 2016-02-08 19:20:07 +01:00
f25b5442e7 applets: properly name docks to support state save/restore 2016-02-08 16:26:02 +01:00
dc955d46c9 Merge branch 'applets' 2016-02-08 14:55:53 +01:00
8844fba4c9 applets: clean shutdown 2016-02-08 14:35:37 +01:00
8be0696b39 protocols/pyon: set support 2016-02-08 14:08:14 +01:00
8a912105cb protocols/pyon: remove FlatFileDB 2016-02-08 14:05:00 +01:00
741b11c26d applets: basic embedding OK 2016-02-08 09:59:15 +01:00
912274c6af test_ctlmgr: fix 2016-02-05 15:08:49 -07:00
70a67a0e38 Merge branch 'applets' into applets_pipeipc 2016-02-05 13:29:20 +01:00
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
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
c28b938471 Client: add note about timeout sideeffects 2016-02-02 15:42:47 -07:00
f7df393248 hardware_testbench: full shutdown sequence for controllers 2016-02-02 15:32:40 -07:00
53e5d0a7bb worker: flake8 style cleanup 2016-02-02 15:32:40 -07:00
7636952496 ctlmgr: fix import 2016-02-02 15:32:39 -07:00
c105949155 pc_rpc.Client: support socket timeouts
... and fix two flake8 errors.
2016-02-02 15:32:39 -07:00
55006119c8 subprocesses: unify termination logic 2016-02-02 15:32:36 -07:00
89f68f3470 style 2016-02-02 21:57:25 +01:00
9ca8b48bf9 assume 'import artiq' works before running tests 2016-02-02 21:52:33 +01:00
ca8a075f46 test/ctlmgr: use sys.executable, use default localhost binding 2016-02-02 21:08:51 +01:00
b7de92e96c remove pxi6733 support (now lives at https://github.com/m-labs/aq_ni6733 2016-02-02 18:41:57 +01:00
cf465dae0c tools/file_import: make sure sys.path is always restored 2016-01-31 20:33:17 +01:00
0d18942869 hardware_testbench: request controller termination 2016-01-30 20:04:32 -07:00
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
10d78a5d0b flash: grow runtime limit to 512 kB 2016-01-30 14:50:15 -07:00
68891493a3 analyzer: move common to artiq.protocols
migen was still pulled in through rtio.__init__.py
2016-01-29 20:26:48 -07:00
17ac64a65e ctlmgr: fix the fix (107e2fe) 2016-01-29 17:52:12 -07:00
d05d720b19 tests: misc fixes, cleanup 2016-01-29 17:32:59 -07:00
107e2fedf4 ctlmgr: reinstate lost changes 2016-01-29 17:20:07 -07:00
1d92c0874e gui/log: use QFontDatabase for fixed font 2016-01-29 23:21:22 +01:00
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
4a29f0702f test.ctlmgr: drop a redundant lambda 2016-01-28 16:59:59 -07:00
bb1db7d7fd test.ctlmgr: add basic test tooling 2016-01-28 16:54:14 -07:00
ab5e8fd8da hardware_testbench: fix timeout handling 2016-01-28 15:41:38 -07:00
982fbb0670 hardware_testbench: use plain subprocess to start controllers 2016-01-28 15:31:01 -07:00
1b7020dff3 hardware_testbench: run Crontrollers loop in thread, not the test 2016-01-27 18:45:08 -07:00
99f788965e Merge branch 'master' into testbench-controllers
* master:
  gui/experiments: float/bring into focus already open docks when opening experiments
  gui: reduce size of console dock
  protocols/logging,pc_rpc: do not print errors on Windows when clients disconnect
  gui: reduce size of schedule dock
  worker: Windows VMs are slow, increase send_timeout
  protocol/sync_struct: Windows also raises ConnectionAbortedError on disconnection
  gui: reduce size of log dock
  gui: reduce size of experiment dock
  protocols/logging/LogParser: handle Windows CRLF
  pyon: handle \r
  test/pipe_ipc: re-enable
  protocols/asyncio_server: minor cleanup
  protocols/pipe_ipc: Windows support
  Revert "Revert "test/pipe_ipc: temporarily skip test""
  Revert "try debugging weird unittest failure"
  try debugging weird unittest failure
  conda: restrict binutils-or1k-linux dependency to linux.
  transforms.iodelay_estimator: make diagnostics much more clear.
  Fix typo.
2016-01-27 14:26:35 -07:00
f78eecb81b hardware_testbench: run controllers 2016-01-27 14:24:32 -07:00
022a1ffd09 gui/experiments: float/bring into focus already open docks when opening experiments 2016-01-27 21:58:27 +01:00
ebb959cd50 gui: reduce size of console dock 2016-01-27 21:25:42 +01:00
27c12a5bf4 protocols/logging,pc_rpc: do not print errors on Windows when clients disconnect 2016-01-27 21:23:27 +01:00
7aaeb636e4 gui: reduce size of schedule dock 2016-01-27 21:18:47 +01:00
5076c85ed6 worker: Windows VMs are slow, increase send_timeout 2016-01-27 21:15:22 +01:00
a4fb8f3e53 protocol/sync_struct: Windows also raises ConnectionAbortedError on disconnection 2016-01-27 21:12:22 +01:00
cfa4f791e8 gui: reduce size of log dock 2016-01-27 20:51:34 +01:00
dca44ef501 gui: reduce size of experiment dock 2016-01-27 20:46:25 +01:00
170b438b98 protocols/logging/LogParser: handle Windows CRLF 2016-01-27 20:45:04 +01:00
590354dbc8 pyon: handle \r 2016-01-27 20:43:42 +01:00
b753306f12 Merge branch 'worker_pipeipc' 2016-01-27 19:37:06 +01:00
3d9fc7a51f test/pipe_ipc: re-enable 2016-01-27 19:20:04 +01:00
79c0488ff1 protocols/asyncio_server: minor cleanup 2016-01-27 19:19:47 +01:00
dce2aac475 protocols/pipe_ipc: Windows support 2016-01-27 19:18:03 +01:00
83fd160614 Revert "Revert "test/pipe_ipc: temporarily skip test""
This reverts commit 7a9864b260.
2016-01-27 10:26:53 +01:00
whitequark
0acc86b3b3 transforms.iodelay_estimator: make diagnostics much more clear. 2016-01-27 02:10:15 +00:00
whitequark
7f9a180946 Fix typo. 2016-01-26 23:23:35 +00:00
ccac8525d2 lda: test tweaks 2016-01-26 15:24:29 -07:00
cda4a0765d artiq_ctlmgr: refactor into artiq.devices.ctlmgr 2016-01-26 15:24:29 -07:00
be5162d60f worker: restore short exception info in first line of log 2016-01-26 22:07:54 +01:00
3cf67afeb1 generalize multiline logging to remote logs and controllers 2016-01-26 21:59:37 +01:00
1fed38a8dc worker: use MultilineFormatter 2016-01-26 21:30:28 +01:00
ded1e31567 protocols/logging: add MultilineFormatter 2016-01-26 21:30:09 +01:00
19c5e89b4d protocols/logging: support parsing multiline log messages 2016-01-26 21:06:44 +01:00
5aa4de8e89 refactor logging and implement in worker 2016-01-26 20:31:42 +01:00
a583a923d8 worker: use pipe_ipc (no log) 2016-01-26 14:59:36 +01:00
6383253e03 protocols/pipe_ipc: autoclose pipe fds on process exit in AsyncioParentComm 2016-01-26 14:55:52 +01:00
7a9864b260 Revert "test/pipe_ipc: temporarily skip test"
This reverts commit 3a73673e71.
2016-01-26 09:42:59 +01:00
3a73673e71 test/pipe_ipc: temporarily skip test 2016-01-25 19:21:03 -07:00