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

1580 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 97accd2540 merge parameters and results into datasets 2015-10-12 17:18:23 +08:00
Sebastien Bourdeauducq 36c3f022aa devices/novatech409b: remove unwanted calls to set_simultaneous_update 2015-10-12 16:15:04 +08:00
Joe Britton b5cc680fdb devices/novatech409b: improve simultaneous update API 2015-10-12 16:13:51 +08:00
Sebastien Bourdeauducq 7414b90da3 language/scan: add len() support 2015-10-12 16:06:12 +08:00
Sebastien Bourdeauducq cd3b590962 language/scan: add missing attributes to RandomScan 
Reported by Joe
 2015-10-11 10:05:27 +08:00
Sebastien Bourdeauducq 3768c87bed Merge branch 'master' of github.com:m-labs/artiq 2015-10-10 23:34:20 +08:00
whitequark 6d0ec2f01d travis: export llvm-or1k lib/ in LD_LIBRARY_PATH. 
The llvm-or1k build that is currently used is dynamically linked,
and in case llvmlite-artiq is linked with this llvm-or1k,
this is necessary to run ARTIQ.
 2015-10-10 03:50:58 +03:00
whitequark a05d04b016 conda: add missing recipes. 
[ci skip]
 2015-10-09 22:50:51 +03:00
whitequark db061bc43d Revert "travis: use main conda m-labs channel." 
This reverts commit 87b573c813.
 2015-10-09 20:21:25 +03:00
whitequark a9230d33f2 conda: skip bitstream builds if BUILD_SOC=0. 2015-10-09 16:52:30 +03:00
whitequark 0cc8f19b6b travis: expand matrix to run a build with BUILD_SOC=0. 
BUILD_SOC=1 build takes over 40 minutes, most of them spent
in Xilinx tools, which means all the other changes cannot
be tested quickly.
 2015-10-09 16:14:13 +03:00
whitequark 87b573c813 travis: use main conda m-labs channel. 2015-10-09 15:21:50 +03:00
whitequark 06d5a0f58d conda: add README. 2015-10-09 15:06:06 +03:00
whitequark 354c3c8244 conda: fix pyelftools dependencies. 2015-10-09 15:01:03 +03:00
whitequark 6e3c411d1e conda: add pyelftools recipe. 2015-10-09 14:26:31 +03:00
Sebastien Bourdeauducq 37e873d5ae gitignore: add results created during tests 2015-10-09 12:35:10 +08:00
Sebastien Bourdeauducq 566af5499d conda: update pyqtgraph, fix version string. closes #132 2015-10-09 11:46:07 +08:00
Sebastien Bourdeauducq 5f89d1a78f doc: document core device driver. Closes #119 2015-10-06 18:12:57 +08:00
Sebastien Bourdeauducq 3cf53667c8 examples: add RunForever experiment to demonstrate graceful termination 2015-10-06 13:50:29 +08:00
Sebastien Bourdeauducq 139072d402 Graceful experiment termination. Closes #76 2015-10-06 13:50:00 +08:00
Sebastien Bourdeauducq d94f0211a6 test/scheduler: cleanup 2015-10-06 13:35:30 +08:00
Sebastien Bourdeauducq 66f82a13d3 language,gui: support scaling of number entries 2015-10-06 00:30:41 +08:00
Sebastien Bourdeauducq 342e72bed6 more travis fixing attempts 2015-10-05 00:09:36 +08:00
Sebastien Bourdeauducq 322cf54aeb travis: yet another attempt at fixing py35 installation (4)... 2015-10-04 23:33:50 +08:00
Sebastien Bourdeauducq 0279e2110a travis: yet another attempt at fixing py35 installation (3)... 2015-10-04 23:29:01 +08:00
Sebastien Bourdeauducq 8db4d7a5f9 travis: yet another attempt at fixing py35 installation (2)... 2015-10-04 23:25:02 +08:00
Sebastien Bourdeauducq 3dfbceb5c6 travis: yet another attempt at fixing py35 installation... 2015-10-04 23:19:56 +08:00
Sebastien Bourdeauducq eaa317e08f travis: switch to py3.5 sooner 2015-10-04 23:16:40 +08:00
Sebastien Bourdeauducq fcb668f465 travis,conda: python 3.5 2015-10-04 23:03:31 +08:00
Sebastien Bourdeauducq e46ba83513 rtio/dds: use rio_phy domain to reset FTW tracker. Closes #120 2015-10-04 22:53:51 +08:00
Sebastien Bourdeauducq 078a37bf1f examples: add basic DDS frequency setter with dynamic DDB scan 2015-10-04 18:30:29 +08:00
Sebastien Bourdeauducq b3584bc190 language,master,run: support raw access to DDB from experiments. Closes #123 2015-10-04 18:29:39 +08:00
Sebastien Bourdeauducq 512bc79484 master: consistent db function argument names 2015-10-04 18:27:44 +08:00
Sebastien Bourdeauducq 168af9589e gui/moninj: fix problems with dynamic modification of DDB 2015-10-04 17:55:57 +08:00
Sebastien Bourdeauducq 0e3927b01a master: support DDB rescan 2015-10-04 17:38:07 +08:00
Sebastien Bourdeauducq 50a5a3baf0 environment: attr_* -> setattr_* 2015-10-04 00:18:21 +08:00
Sebastien Bourdeauducq 090a7e5871 test/sync_struct: cleanup 2015-10-03 19:40:11 +08:00
Sebastien Bourdeauducq f552d62b69 use Python 3.5 coroutines 2015-10-03 19:28:57 +08:00
Sebastien Bourdeauducq b117b9320d asyncio.async -> asyncio.ensure_future 2015-10-03 14:37:02 +08:00
Sebastien Bourdeauducq 125503139e remove workaround for Python bug in asyncio process.wait(). Requires Python 3.5. Closes #58 2015-10-03 14:33:18 +08:00
Sebastien Bourdeauducq 4b2a99b090 indent 2015-10-03 14:00:48 +08:00
Sebastien Bourdeauducq cd3107ba75 do not use deprecated asyncio.JoinableQueue 2015-10-03 13:59:18 +08:00
Sebastien Bourdeauducq 34b9f7e901 examples/speed_benchmark: remove decimals on nruns 2015-10-03 13:55:57 +08:00
whitequark 75c94b40d9 CONTRIBUTING: s/real name/legal name/. 2015-09-09 16:08:58 +08:00
Robert Jördens 01416bb0be copyright: claim contributions 
These are contributions of >= 30% or >= 20 lines (half-automated).

I hereby resubmit all my previous contributions to the ARTIQ project
under the following terms:

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

Closes #130

Signed-off-by: Robert Jordens <jordens@gmail.com>
 2015-09-06 16:08:57 -06:00
Sebastien Bourdeauducq 2bd27a3170 update copyright/license 2015-09-05 15:50:34 -06:00
Sebastien Bourdeauducq eb554f86f9 dds: do not reset AD9914 2015-09-05 14:52:25 -06:00
Sebastien Bourdeauducq d621780206 language/scan: mark scan objects 2015-09-05 14:42:19 -06:00
Raghavendra Srinivas b3831d3387 dds: support amplitude tuning on AD9914 
Closes #108
 2015-09-05 13:15:09 -06:00
Sebastien Bourdeauducq 2921bd6501 pxi6733: minor mediator fixes 2015-09-04 18:53:50 -06:00