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

2488 Commits

Author SHA1 Message Date
whitequark 7f9a180946 Fix typo. 2016-01-26 23:23:35 +00: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
Robert Jördens 8cbb60b370 Merge branch 'master' into ppp2 
* master:
  add release notes/process
  targets/kc705: fix e664fe3
  targets/kc705: fix DDS_RTIO_CLK_RATIO for AD9914. Closes #238
  transforms.inferencer: give a suggestion on "raise Exception".
  pdq2/mediator: raise instances, not classes
  pdq2: wire up more of the pipeline
  doc: use actual version
  Fix formatting.
  doc: add artiq_flash
  versioneer: remote tag_prefix = v
 2016-01-20 19:29:00 -07:00
Sebastien Bourdeauducq 18f0ee814d gateware: add QC1 docstring 2016-01-20 21:27:22 -05:00
Sebastien Bourdeauducq db8ba8d6c1 gateware: add clock target from David 2016-01-20 21:23:49 -05:00
Sebastien Bourdeauducq b3ba97e431 gateware: clean up and integrate QC2 modifications from Daniel 2016-01-20 21:17:19 -05:00
Sebastien Bourdeauducq fa1afb7dd8 add information about CLOCK hardware 2016-01-20 21:06:02 -05:00
Sebastien Bourdeauducq 4dd0693f6a add release notes/process 2016-01-20 19:40:30 -05:00
Sebastien Bourdeauducq cb5fd08713 targets/kc705: fix e664fe3 2016-01-20 09:38:44 -05:00
Sebastien Bourdeauducq e664fe38b0 targets/kc705: fix DDS_RTIO_CLK_RATIO for AD9914. Closes #238 2016-01-20 09:18:50 -05:00
whitequark 3573a8750a transforms.inferencer: give a suggestion on "raise Exception". 2016-01-20 03:20:25 +00:00
Robert Jördens 641ef57458 pdq2/mediator: raise instances, not classes 2016-01-19 20:16:27 -07:00
Robert Jördens f0860beffd pdq2: wire up more of the pipeline 2016-01-19 20:09:10 -07:00
Robert Jördens e42fd9ca31 doc: use actual version 2016-01-19 18:25:31 -07:00
whitequark 1d7858c7bc Fix formatting. 2016-01-19 18:52:43 +00:00
Robert Jördens cf17be92e3 doc: add artiq_flash 2016-01-18 21:41:42 -07:00
Robert Jördens 8674875007 versioneer: remote tag_prefix = v 
does not seem to be stripped correctly
 2016-01-18 21:28:09 -07:00
Robert Jördens 2bc2cd0064 ppp: remove unneeded objects 2016-01-18 21:26:36 -07:00
Robert Jördens 7e3610c545 Merge branch 'pipistrello-analyzer' into ppp 
* pipistrello-analyzer:
  pipistrello: add rtio.Analyzer()
 2016-01-18 21:05:02 -07:00
Robert Jördens 1adeeabbed ppp: wait for connection 2016-01-18 21:04:51 -07:00
Sebastien Bourdeauducq dc709a77b8 PPP support (TCP broken) 2016-01-18 20:09:10 -07:00
Robert Jördens 57ce78c54d pipistrello: add rtio.Analyzer() 2016-01-18 19:17:44 -07:00
Robert Jördens 063e88d75a artiq/_version.py: update 2016-01-18 19:12:42 -07:00