Commit Graph

1033 Commits

Author SHA1 Message Date
139072d402 Graceful experiment termination. Closes #76 2015-10-06 13:50:00 +08:00
d94f0211a6 test/scheduler: cleanup 2015-10-06 13:35:30 +08:00
66f82a13d3 language,gui: support scaling of number entries 2015-10-06 00:30:41 +08:00
e46ba83513 rtio/dds: use rio_phy domain to reset FTW tracker. Closes #120 2015-10-04 22:53:51 +08:00
b3584bc190 language,master,run: support raw access to DDB from experiments. Closes #123 2015-10-04 18:29:39 +08:00
512bc79484 master: consistent db function argument names 2015-10-04 18:27:44 +08:00
168af9589e gui/moninj: fix problems with dynamic modification of DDB 2015-10-04 17:55:57 +08:00
0e3927b01a master: support DDB rescan 2015-10-04 17:38:07 +08:00
50a5a3baf0 environment: attr_* -> setattr_* 2015-10-04 00:18:21 +08:00
090a7e5871 test/sync_struct: cleanup 2015-10-03 19:40:11 +08:00
f552d62b69 use Python 3.5 coroutines 2015-10-03 19:28:57 +08:00
b117b9320d asyncio.async -> asyncio.ensure_future 2015-10-03 14:37:02 +08:00
125503139e remove workaround for Python bug in asyncio process.wait(). Requires Python 3.5. Closes #58 2015-10-03 14:33:18 +08:00
cd3107ba75 do not use deprecated asyncio.JoinableQueue 2015-10-03 13:59:18 +08:00
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
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
2921bd6501 pxi6733: minor mediator fixes 2015-09-04 18:53:50 -06:00
Yann Sionneau
63d4907c65 pxi6733: replace print by logger.debug 2015-09-05 01:22:57 +02:00
Yann Sionneau
7dfd11e2f0 pxi6733: try to fix ping method 2015-09-05 00:07:58 +02:00
6e5b71a43e coredevice/comm_tcp: disable socket timeout after connect
Reads may block indefinitely.
2015-09-03 09:59:24 -06:00
136d44d9db gui/moninj: display comments 2015-09-01 14:25:20 -06:00
6dba0e94c5 gui/moninj: wrap DDS frequency 2015-09-01 13:26:49 -06:00
a059ebf36a tools/get_experiment: do not autodetect experiments starting with _ 2015-09-01 13:21:03 -06:00
a36a50ba0d comm_tcp: add connect timeout 2015-08-28 16:23:23 +08:00
c7d9bb7edd Merge branch 'master' of github.com:m-labs/artiq 2015-08-28 10:00:16 +08:00
ebfd8c937c language/environment: fix set_* with parent 2015-08-28 10:00:04 +08:00
Yann Sionneau
4a16ea111c worker, scheduler: fix unit tests on Windows 2015-08-27 18:23:26 +02:00
Yann Sionneau
7db0498a9a artiq_flash: dont prepend the runtime file with mezzanine board directory if using -d 2015-08-27 11:02:06 +02:00
90ce54d8d5 gateware/dds/monitor: support onehot selection, strip reset 2015-08-27 15:54:01 +08:00
0fe0f4d433 dds: fix phase computation. Closes #79. 2015-08-27 11:09:33 +08:00
1991b3c910 coredevice/TTLClockGen: fix attribute init 2015-08-27 09:48:11 +08:00
Yann Sionneau
977df7013d py2llvm: skip test_is_prime unit test on Windows
see http://irclog.whitequark.org/m-labs/2015-08-26#13821771;
2015-08-26 14:50:52 +02:00
8aec02dfcf Merge branch 'master' of github.com:m-labs/artiq 2015-08-26 20:43:12 +08:00
79ca0d50fa gui,environment: default step to 1.0 2015-08-26 20:43:00 +08:00
Yann Sionneau
92390cfbe6 py2llvm: allow the unit test to run on Windows 2015-08-26 11:12:48 +02:00
Joe Britton
b790fb093d add ping() to novatech driver 2015-08-26 12:05:10 +08:00
d5f2f5c062 gui: fix spinbox bounds 2015-08-25 00:56:19 +08:00
e043179120 language,gui: support ndecimals in scan and number arguments 2015-08-25 00:39:16 +08:00
718de9888b gui: disable parameter selection 2015-08-25 00:38:03 +08:00
1c96f258b1 gui: show server in window title 2015-08-25 00:37:49 +08:00
1ad8e65e42 language/environment: support parents 2015-08-25 00:03:36 +08:00
bb228b00ef gui,language,master: argument groups 2015-08-24 23:46:54 +08:00
7d4d92ec06 gui/explorer: use QTreeWidget for argument editor 2015-08-24 22:59:56 +08:00
84b07607ad gui: do not attempt moninj on windows 2015-08-24 20:20:33 +08:00
Yann Sionneau
34771ade67 artiq_flash.sh: fix runtime programming and allow usage of -d . -r 2015-08-22 15:28:55 +02:00
284e3ddb2b gui/scan: enforce min <= max 2015-08-22 21:05:24 +08:00
21a28a13c9 gui/explorer: less verbose error dialogs 2015-08-22 21:05:05 +08:00
42e87c060e protocols/pyon: use better object for empty builtins 2015-08-22 21:04:44 +08:00
72616f6f29 language: document HasEnvironment.dbs 2015-08-22 21:04:23 +08:00
d38f1e6796 ad9xxx: fix gpio signal length 2015-08-22 13:12:30 +08:00
094fc1cfd1 qc2: DDS selection is active low 2015-08-22 11:49:38 +08:00
7f613d17d1 Merge branch 'master' of github.com:m-labs/artiq 2015-08-21 17:51:30 +08:00
ac7e080c48 typo 2015-08-21 17:51:11 +08:00
Yann Sionneau
5fc5d0b672 artiq_flash: replace wrong wording 'carrier' with 'mezzanine' 2015-08-21 09:38:15 +02:00
ac5dd0a7e5 doc: scans 2015-08-21 13:32:53 +08:00
a8575fe2ac typo 2015-08-21 13:32:26 +08:00
Yann Sionneau
646721d3e9 artiq_flash: add missing semicolons 2015-08-20 18:28:00 +02:00
Yann Sionneau
df7489ff61 travis/conda: add automated builds for kc705 nist_qc2 subtarget 2015-08-20 16:31:48 +02:00
Yann Sionneau
da1398b183 pxi6733: fix crash when samples are all the same
When samples are all the same, min = max, which PyDAQmx does not like.
This avoids the following crash reported by Kathie:

C:\Users\rabi\artiq\artiq\frontend [master]> python .\artiq_rpctool.py ::1 3256
call load_sample_values 100000 'np.array([0.0,0.0],dtype=float)'
Traceback (most recent call last):
  File ".\artiq_rpctool.py", line 112, in <module>
    main()
  File ".\artiq_rpctool.py", line 107, in main
    call_method(remote, args.method, args.args)
  File ".\artiq_rpctool.py", line 79, in call_method
    ret = method(*[eval(arg) for arg in args])
  File "C:\Users\rabi\AppData\Local\Continuum\Anaconda3\lib\site-packages\artiq-
0.0+dev-py3.4.egg\artiq\protocols\pc_rpc.py", line 142, in proxy
    return self.__do_rpc(name, args, kwargs)
  File "C:\Users\rabi\AppData\Local\Continuum\Anaconda3\lib\site-packages\artiq-
0.0+dev-py3.4.egg\artiq\protocols\pc_rpc.py", line 134, in __do_rpc
    return self.__do_action(obj)
  File "C:\Users\rabi\AppData\Local\Continuum\Anaconda3\lib\site-packages\artiq-
0.0+dev-py3.4.egg\artiq\protocols\pc_rpc.py", line 128, in __do_action
    raise RemoteError(obj["message"])
artiq.protocols.pc_rpc.RemoteError: Traceback (most recent call last):
  File "C:\Users\rabi\AppData\Local\Continuum\Anaconda3\lib\site-packages\artiq-
0.0+dev-py3.4.egg\artiq\protocols\pc_rpc.py", line 476, in _handle_connection_cr

    ret = method(*obj["args"], **obj["kwargs"])
  File "C:\Users\rabi\AppData\Local\Continuum\Anaconda3\lib\site-packages\artiq-
0.0+dev-py3.4.egg\artiq\devices\pxi6733\driver.py", line 117, in load_sample_val
ues
    byref(num_samps_written), None)
  File "<string>", line 3, in WriteAnalogF64
  File "<string>", line 2, in function
  File "C:\Users\rabi\AppData\Local\Continuum\Anaconda3\lib\site-packages\pydaqm
x-1.3.1-py3.4.egg\PyDAQmx\DAQmxFunctions.py", line 28, in mafunction
    raise DAQError(error,errBuff.value.decode("utf-8"), f.__name__)
PyDAQmx.DAQmxFunctions.DAQError: Minimum is greater than or equal to the maximum
. Ensure the maximum value is greater than the minimum value. If using a custom
scale, ensure that the scaled maximum is greater than the scaled minimum.
Property: DAQmx_AO_Min
Corresponding Value:  0.0

Property: DAQmx_AO_Max
Corresponding Value:  0.0

Channel Name: Dev1/ao1

Task Name: _unnamedTask<4>

Status Code: -200082
 in function DAQmxWriteAnalogF64
2015-08-19 12:49:33 +02:00
9f0ada49e5 doc: environment 2015-08-18 23:30:50 +08:00
600e8335f2 influxdb: tag-based schema, better type support 2015-08-18 14:49:23 +08:00
ed00ca1485 influxdb: do not crash on parameter deletion 2015-08-18 13:35:05 +08:00
2ac8c53bbe influxdb: use types 2015-08-18 13:34:42 +08:00
2275017651 influxdb: better error reporting 2015-08-18 13:34:15 +08:00
66b5ca99d8 influxdb: better filtering 2015-08-18 09:59:48 +08:00
c625f2e7c9 ttl: minor docstring cleanup 2015-08-17 23:50:24 +08:00
c71d207e90 core/break_realtime: only increase now 2015-08-17 23:41:21 +08:00
278adf193d test/pc_rpc: use builtin_terminate 2015-08-17 23:17:13 +08:00
e7d495cf2c gui/tools: better detection of scalar types 2015-08-17 23:14:18 +08:00
21b170ed32 pc_rpc/Server: show builtin terminate in method list 2015-08-17 23:03:43 +08:00
2410ef79e5 gui: display numpy scalars in parameters 2015-08-17 23:03:18 +08:00
324cafae3d rpctool: use pprint 2015-08-17 15:45:08 +08:00
abbf5eb059 gui: minor cleanup 2015-08-17 15:44:54 +08:00
fd3fefec52 add InfluxDB bridge 2015-08-17 15:44:40 +08:00
dee844510c comm_tcp: enable TCP keepalive on host side as well 2015-08-15 16:03:00 +08:00
0be0b199c1 gui: save/restore state of pyqtgraph plots (closes #98) 2015-08-15 15:29:41 +08:00
34a9c8c12d artiq_run: add dummy pause method (closes #100) 2015-08-15 09:16:00 +08:00
Yann Sionneau
966d0ee3f2 pxi6733: fix verification of the number of buffered sample values 2015-08-14 10:36:03 +02:00
f073dfaee5 ttl: add input/output doc 2015-08-13 12:20:12 +08:00
998db5121b pc_rpc: id_parameters -> description 2015-08-11 23:29:52 +08:00
a6ab066c87 ctlmgr: support immediate controller retry 2015-08-11 23:22:36 +08:00
06badd1dc1 scheduler: refactor, fix pipeline hazards 2015-08-10 21:58:11 +08:00
b700f591f1 protocols/pc_rpc: add missing import 2015-08-10 20:07:39 +08:00
52de6311a4 test/scheduler: add repo_msg 2015-08-10 20:07:24 +08:00
54b11a392a ctlmgr: graceful controller termination 2015-08-09 20:41:11 +08:00
4b195663f6 pc_rpc/Server: add built-in terminate 2015-08-09 20:40:15 +08:00
a21049d779 ctlmgr: exponential backoff 2015-08-09 18:28:56 +08:00
3f68d0ba8f ctlmgr: ping controllers 2015-08-09 17:30:46 +08:00
479175870f pdq2/driver: implement ping 2015-08-09 17:30:01 +08:00
f81b2eba43 master: better repo scan error handling 2015-08-08 23:36:12 +08:00
400b414885 master,client: support scanning specific repo revisions 2015-08-08 23:23:25 +08:00
671a3f1833 doc: precision about dds batch time 2015-08-08 23:05:00 +08:00
0a6fcd9fa0 Revert "comm_generic: cleanup"
This reverts commit be55487d2d.
2015-08-08 21:24:23 +08:00
1818e8173b client: log display support 2015-08-08 18:02:42 +08:00
c80f0fa07a master: delete head repository checkout on exit 2015-08-08 11:44:19 +08:00
42010fcd4b gui: regenerate argument setter when modified from repository 2015-08-08 11:38:07 +08:00
585bb236f8 master: add ddb/pdb args 2015-08-08 11:13:36 +08:00
54d85efc2a master,gui: show Git commit messages in schedule 2015-08-08 11:08:04 +08:00
be55487d2d comm_generic: cleanup 2015-08-07 21:12:00 +08:00