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

3181 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq dca44ef501 gui: reduce size of experiment dock 2016-01-27 20:46:25 +01:00
Sebastien Bourdeauducq 170b438b98 protocols/logging/LogParser: handle Windows CRLF 2016-01-27 20:45:04 +01:00
Sebastien Bourdeauducq 590354dbc8 pyon: handle \r 2016-01-27 20:43:42 +01:00
Sebastien Bourdeauducq b753306f12 Merge branch 'worker_pipeipc' 2016-01-27 19:37:06 +01:00
Sebastien Bourdeauducq 3d9fc7a51f test/pipe_ipc: re-enable 2016-01-27 19:20:04 +01:00
Sebastien Bourdeauducq 79c0488ff1 protocols/asyncio_server: minor cleanup 2016-01-27 19:19:47 +01:00
Sebastien Bourdeauducq dce2aac475 protocols/pipe_ipc: Windows support 2016-01-27 19:18:03 +01:00
Sebastien Bourdeauducq 83fd160614 Revert "Revert "test/pipe_ipc: temporarily skip test"" 
This reverts commit 7a9864b260.
 2016-01-27 10:26:53 +01:00
Sebastien Bourdeauducq 9f9a23b89b Revert "try debugging weird unittest failure" 
This reverts commit 000794e786.
 2016-01-27 10:25:15 +01:00
Sebastien Bourdeauducq 000794e786 try debugging weird unittest failure 2016-01-27 10:23:56 +01:00
whitequark 5bead8b83f conda: restrict binutils-or1k-linux dependency to linux. 2016-01-27 09:24:54 +00: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
Robert Jördens ccac8525d2 lda: test tweaks 2016-01-26 15:24:29 -07:00
Robert Jördens cda4a0765d artiq_ctlmgr: refactor into artiq.devices.ctlmgr 2016-01-26 15:24:29 -07:00
Sebastien Bourdeauducq be5162d60f worker: restore short exception info in first line of log 2016-01-26 22:07:54 +01:00
Sebastien Bourdeauducq 3cf67afeb1 generalize multiline logging to remote logs and controllers 2016-01-26 21:59:37 +01:00
Sebastien Bourdeauducq 1fed38a8dc worker: use MultilineFormatter 2016-01-26 21:30:28 +01:00
Sebastien Bourdeauducq ded1e31567 protocols/logging: add MultilineFormatter 2016-01-26 21:30:09 +01:00
Sebastien Bourdeauducq 19c5e89b4d protocols/logging: support parsing multiline log messages 2016-01-26 21:06:44 +01:00
Sebastien Bourdeauducq 5aa4de8e89 refactor logging and implement in worker 2016-01-26 20:31:42 +01:00
Sebastien Bourdeauducq a583a923d8 worker: use pipe_ipc (no log) 2016-01-26 14:59:36 +01:00
Sebastien Bourdeauducq 6383253e03 protocols/pipe_ipc: autoclose pipe fds on process exit in AsyncioParentComm 2016-01-26 14:55:52 +01:00
Sebastien Bourdeauducq 7a9864b260 Revert "test/pipe_ipc: temporarily skip test" 
This reverts commit 3a73673e71.
 2016-01-26 09:42:59 +01:00
Robert Jördens 3a73673e71 test/pipe_ipc: temporarily skip test 2016-01-25 19:21:03 -07:00
Robert Jördens 5444cd3ca2 Merge branch 'namespace-experiment' 
closes #189

* namespace-experiment:
  artiq_dir: move out of tools to unlink dependencies
  refactor Analyzer constants to unlink dependencies
  CoreException: store at 'py_exn.artiq_core_exception'
  doc: update Underflow catching example
  coredevice: remove some print()s
  language...ARTIQException -> coredevice...CoreException
  artiq.experiment: update examples
  artiq.experiment: merge language and coredevice namespaces
  artiq: move namespace artiq.* -> artiq.language.*
 2016-01-25 18:22:47 -07: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 cbb60337ae refactor Analyzer constants to unlink dependencies 2016-01-25 18:03:48 -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 0d7dc7b144 doc: update Underflow catching example 2016-01-25 17:24:00 -07:00
Robert Jördens e0f2d94191 coredevice: remove some print()s 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 905063c1b1 artiq.experiment: update examples 2016-01-25 17:24:00 -07:00
Robert Jördens 765001054d artiq.experiment: merge language and coredevice namespaces 
perl -i -pe 's/^from artiq import \*$/from artiq.experiment import */' your_experiments/*.py

(assuming you skipped the changes form the previous commit)
 2016-01-25 17:24:00 -07:00
Robert Jördens fbe4d96572 artiq: move namespace artiq.* -> artiq.language.* 
perl -i -pe 's/^from artiq import \*$/from artiq.language import */' your_experiments/*.py
 2016-01-25 17:24:00 -07:00
Robert Jördens ea3bb27029 doc/manual: cleanup commented out variables 2016-01-25 17:23:49 -07:00
Robert Jördens 0bbed9bcb6 RELEASING.rst, doc: show release notes in manual 2016-01-25 17:20:15 -07:00
Robert Jördens 893ffb04c9 update release notes 2016-01-25 17:20:00 -07:00
Robert Jördens b56c55a90d manual: __version__ cleanup 2016-01-25 17:04:56 -07:00
Sebastien Bourdeauducq dcea6780c6 protocols/pipe_ipc: implement AsyncioChildComm for Unix (affected by python/asyncio#314) 2016-01-26 00:48:12 +01:00
Sebastien Bourdeauducq 8befc6a8fc protocols: add pipe_ipc (incomplete) 2016-01-25 22:49:32 +01:00
Robert Jördens 0079aa4037 runtime/main: style, wording, 1s ppp holdoff 2016-01-25 13:38:58 -07:00
Robert Jördens 2c847b3d16 Merge branch 'ppp2' 
The command to establish the PP link to the core device is:

  pppd /dev/ttyUSB1 115200 noauth nodetach local nocrtscts novj \
    10.0.0.1:10.0.0.2

The "novj" can be dropped once lwip fixes VJ IP header compression.
Current LWIP (4beacc4) may have fixed that but breaks something else (crashes).

* ppp2:
  ppp: update documentation
  ppp: remove unneeded objects
  ppp: wait for connection
  PPP support (TCP broken)
  pipistrello: add rtio.Analyzer()
 2016-01-25 12:30:20 -07:00
Robert Jördens 0151ac55ff ppp: update documentation 2016-01-25 12:29:05 -07:00
Robert Jördens 2832d200f2 Merge remote-tracking branch 'm-labs/master' into ppp2 
* m-labs/master:
  test/worker: update
  gui/log: display level and date information in tooltips
  master: add filename in worker log entries. Closes #226
  master: finer control of worker exception reporting. Closes #233
  conda: add artiq-kc705-nist_clock
  gateware: add QC1 docstring
  gateware: add clock target from David
  gateware: clean up and integrate QC2 modifications from Daniel
  add information about CLOCK hardware
 2016-01-25 12:17:04 -07:00
Sebastien Bourdeauducq a4dffaac26 test/worker: update 2016-01-24 15:32:37 +01:00
Sebastien Bourdeauducq 56cbf261b0 gui/log: display level and date information in tooltips 2016-01-23 22:17:08 -05:00
Sebastien Bourdeauducq ae19f1c75d master: add filename in worker log entries. Closes #226 2016-01-23 21:43:24 -05:00
Sebastien Bourdeauducq cc6b808bf8 master: finer control of worker exception reporting. Closes #233 2016-01-23 21:23:02 -05:00
Sebastien Bourdeauducq dae63bd10c conda: add artiq-kc705-nist_clock 2016-01-20 21:36:21 -05:00