srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
1,526 Commits 63 Branches 34 Tags 19 MiB
Commit Graph

962 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 136d44d9db gui/moninj: display comments 2015-09-01 14:25:20 -06:00
Sebastien Bourdeauducq 6dba0e94c5 gui/moninj: wrap DDS frequency 2015-09-01 13:26:49 -06:00
Sebastien Bourdeauducq a059ebf36a tools/get_experiment: do not autodetect experiments starting with _ 2015-09-01 13:21:03 -06:00
Sebastien Bourdeauducq a36a50ba0d comm_tcp: add connect timeout 2015-08-28 16:23:23 +08:00
Sebastien Bourdeauducq c7d9bb7edd Merge branch 'master' of github.com:m-labs/artiq 2015-08-28 10:00:16 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 90ce54d8d5 gateware/dds/monitor: support onehot selection, strip reset 2015-08-27 15:54:01 +08:00
Sebastien Bourdeauducq 0fe0f4d433 dds: fix phase computation. Closes #79. 2015-08-27 11:09:33 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 8aec02dfcf Merge branch 'master' of github.com:m-labs/artiq 2015-08-26 20:43:12 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq d5f2f5c062 gui: fix spinbox bounds 2015-08-25 00:56:19 +08:00
Sebastien Bourdeauducq e043179120 language,gui: support ndecimals in scan and number arguments 2015-08-25 00:39:16 +08:00
Sebastien Bourdeauducq 718de9888b gui: disable parameter selection 2015-08-25 00:38:03 +08:00
Sebastien Bourdeauducq 1c96f258b1 gui: show server in window title 2015-08-25 00:37:49 +08:00
Sebastien Bourdeauducq 1ad8e65e42 language/environment: support parents 2015-08-25 00:03:36 +08:00
Sebastien Bourdeauducq bb228b00ef gui,language,master: argument groups 2015-08-24 23:46:54 +08:00
Sebastien Bourdeauducq 7d4d92ec06 gui/explorer: use QTreeWidget for argument editor 2015-08-24 22:59:56 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 284e3ddb2b gui/scan: enforce min <= max 2015-08-22 21:05:24 +08:00
Sebastien Bourdeauducq 21a28a13c9 gui/explorer: less verbose error dialogs 2015-08-22 21:05:05 +08:00
Sebastien Bourdeauducq 42e87c060e protocols/pyon: use better object for empty builtins 2015-08-22 21:04:44 +08:00
Sebastien Bourdeauducq 72616f6f29 language: document HasEnvironment.dbs 2015-08-22 21:04:23 +08:00
Sebastien Bourdeauducq d38f1e6796 ad9xxx: fix gpio signal length 2015-08-22 13:12:30 +08:00
Sebastien Bourdeauducq 094fc1cfd1 qc2: DDS selection is active low 2015-08-22 11:49:38 +08:00
Sebastien Bourdeauducq 7f613d17d1 Merge branch 'master' of github.com:m-labs/artiq 2015-08-21 17:51:30 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq ac5dd0a7e5 doc: scans 2015-08-21 13:32:53 +08:00
Sebastien Bourdeauducq 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
Sebastien Bourdeauducq 9f0ada49e5 doc: environment 2015-08-18 23:30:50 +08:00
Sebastien Bourdeauducq 600e8335f2 influxdb: tag-based schema, better type support 2015-08-18 14:49:23 +08:00
Sebastien Bourdeauducq ed00ca1485 influxdb: do not crash on parameter deletion 2015-08-18 13:35:05 +08:00
Sebastien Bourdeauducq 2ac8c53bbe influxdb: use types 2015-08-18 13:34:42 +08:00
Sebastien Bourdeauducq 2275017651 influxdb: better error reporting 2015-08-18 13:34:15 +08:00
Sebastien Bourdeauducq 66b5ca99d8 influxdb: better filtering 2015-08-18 09:59:48 +08:00
Sebastien Bourdeauducq c625f2e7c9 ttl: minor docstring cleanup 2015-08-17 23:50:24 +08:00
Sebastien Bourdeauducq c71d207e90 core/break_realtime: only increase now 2015-08-17 23:41:21 +08:00
Sebastien Bourdeauducq 278adf193d test/pc_rpc: use builtin_terminate 2015-08-17 23:17:13 +08:00
Sebastien Bourdeauducq e7d495cf2c gui/tools: better detection of scalar types 2015-08-17 23:14:18 +08:00
Sebastien Bourdeauducq 21b170ed32 pc_rpc/Server: show builtin terminate in method list 2015-08-17 23:03:43 +08:00