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

2562 Commits

Author SHA1 Message Date
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
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
Robert Jördens 10d78a5d0b flash: grow runtime limit to 512 kB 2016-01-30 14:50:15 -07:00
Robert Jördens 68891493a3 analyzer: move common to artiq.protocols 
migen was still pulled in through rtio.__init__.py
 2016-01-29 20:26:48 -07:00
Robert Jördens 17ac64a65e ctlmgr: fix the fix (107e2fe) 2016-01-29 17:52:12 -07:00
Robert Jördens d05d720b19 tests: misc fixes, cleanup 2016-01-29 17:32:59 -07:00
Robert Jördens 107e2fedf4 ctlmgr: reinstate lost changes 2016-01-29 17:20:07 -07:00
Sebastien Bourdeauducq 1d92c0874e gui/log: use QFontDatabase for fixed font 2016-01-29 23:21:22 +01:00
Robert Jördens 3df67526b9 RELEASE_NOTES: update 2016-01-28 21:55:03 -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 4a29f0702f test.ctlmgr: drop a redundant lambda 2016-01-28 16:59:59 -07:00
Robert Jördens 627221a5cd Merge branch 'testbench-controllers' 
closes #69

* testbench-controllers:
  test.ctlmgr: add basic test tooling
  hardware_testbench: fix timeout handling
  hardware_testbench: use plain subprocess to start controllers
  hardware_testbench: run Crontrollers loop in thread, not the test
  hardware_testbench: run controllers
  lda: test tweaks
  artiq_ctlmgr: refactor into artiq.devices.ctlmgr
 2016-01-28 16:54:49 -07:00
Robert Jördens bb1db7d7fd test.ctlmgr: add basic test tooling 2016-01-28 16:54:14 -07:00
Robert Jördens ab5e8fd8da hardware_testbench: fix timeout handling 2016-01-28 15:41:38 -07:00
Robert Jördens 982fbb0670 hardware_testbench: use plain subprocess to start controllers 2016-01-28 15:31:01 -07:00
Robert Jördens 1b7020dff3 hardware_testbench: run Crontrollers loop in thread, not the test 2016-01-27 18:45:08 -07:00
Robert Jördens 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
Robert Jördens f78eecb81b hardware_testbench: run controllers 2016-01-27 14:24:32 -07:00
Sebastien Bourdeauducq 022a1ffd09 gui/experiments: float/bring into focus already open docks when opening experiments 2016-01-27 21:58:27 +01:00
Sebastien Bourdeauducq ebb959cd50 gui: reduce size of console dock 2016-01-27 21:25:42 +01:00
Sebastien Bourdeauducq 27c12a5bf4 protocols/logging,pc_rpc: do not print errors on Windows when clients disconnect 2016-01-27 21:23:27 +01:00
Sebastien Bourdeauducq 7aaeb636e4 gui: reduce size of schedule dock 2016-01-27 21:18:47 +01:00
Sebastien Bourdeauducq 5076c85ed6 worker: Windows VMs are slow, increase send_timeout 2016-01-27 21:15:22 +01:00
Sebastien Bourdeauducq a4fb8f3e53 protocol/sync_struct: Windows also raises ConnectionAbortedError on disconnection 2016-01-27 21:12:22 +01:00
Sebastien Bourdeauducq cfa4f791e8 gui: reduce size of log dock 2016-01-27 20:51:34 +01:00
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