occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity
1,525 Commits 14 Branches 35 Tags 23 MiB
Commit Graph

1525 Commits

Author SHA1 Message Date
Sebastien Bourdeauducq 8d4ef479e5 runtime: test all DDS channels 2015-08-22 10:03:35 +08:00
Sebastien Bourdeauducq e0c35cabab runtime: fix onehot selection in ddstest_one 2015-08-22 09:56:40 +08:00
Yann Sionneau c9236870bd travis: do not upload conda package if branch is not master. fixes #55 2015-08-21 18:47:58 +02: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
Sebastien Bourdeauducq 8d8aa32aed runtime: fix AD9914 register read in bridge 2015-08-21 17:51:01 +08:00
Yann Sionneau 5fc5d0b672 artiq_flash: replace wrong wording 'carrier' with 'mezzanine' 2015-08-21 09:38:15 +02:00
Sebastien Bourdeauducq d4f42e33e6 doc: clarify hw support 2015-08-21 13:33:23 +08: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 c6bba4d5eb Revert "conda: give 10 more minutes to ISE to achieve routing" 
This reverts commit e6cc0419e5.
 2015-08-20 13:03:09 +02:00
Yann Sionneau e6cc0419e5 conda: give 10 more minutes to ISE to achieve routing 2015-08-20 12:33:55 +02:00
Yann Sionneau 3002b5be56 conda: update artiq pkg entry points 2015-08-19 13:20:25 +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 c3f3763af1 doc: units 2015-08-18 23:31:06 +08:00
Sebastien Bourdeauducq 9f0ada49e5 doc: environment 2015-08-18 23:30:50 +08:00
Sebastien Bourdeauducq c97c6e2b9a doc/ndsp_reference: reorganize 2015-08-18 22:34:22 +08:00
Sebastien Bourdeauducq 178816243c doc/core_device: update, add KC705 QC1 TTL table 2015-08-18 16:04:27 +08:00
Sebastien Bourdeauducq 2c15bd3e44 kc705: add TTL channel on SMA GPIO N 2015-08-18 15:20:42 +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 ed0a7632d9 Merge branch 'master' of github.com:m-labs/artiq 2015-08-18 09:59:54 +08:00
Sebastien Bourdeauducq 66b5ca99d8 influxdb: better filtering 2015-08-18 09:59:48 +08:00
Yann Sionneau 19a77b51f2 conda: make aiohttp testing not depend on gunicorn on Windows platform 2015-08-17 22:02:27 +02:00
Yann Sionneau c94dafdeca Revert "travis: use more recent libstdc++" 
This reverts commit 075bf331ac.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
 2015-08-17 17:51:36 +02:00
Yann Sionneau a0f1b02eb5 Revert "manual: llvmlite-artiq conda package needs a recent libstdc++6" 
This reverts commit 8669f1d61d.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
 2015-08-17 17:50:57 +02:00
Sebastien Bourdeauducq c625f2e7c9 ttl: minor docstring cleanup 2015-08-17 23:50:24 +08:00
Sebastien Bourdeauducq cd199f16ec doc: add note about setting core device IP 2015-08-17 23:41:55 +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
Sebastien Bourdeauducq 2410ef79e5 gui: display numpy scalars in parameters 2015-08-17 23:03:18 +08:00
Yann Sionneau a64c6a321b conda: add aiohttp dependency on artiq pkg + recipe for aiohttp pkg 2015-08-17 11:54:07 +02:00
Sebastien Bourdeauducq 324cafae3d rpctool: use pprint 2015-08-17 15:45:08 +08:00
Sebastien Bourdeauducq abbf5eb059 gui: minor cleanup 2015-08-17 15:44:54 +08:00
Sebastien Bourdeauducq fd3fefec52 add InfluxDB bridge 2015-08-17 15:44:40 +08:00
Sebastien Bourdeauducq dee844510c comm_tcp: enable TCP keepalive on host side as well 2015-08-15 16:03:00 +08:00
Sebastien Bourdeauducq 0be0b199c1 gui: save/restore state of pyqtgraph plots (closes #98) 2015-08-15 15:29:41 +08:00
Sebastien Bourdeauducq 34a9c8c12d artiq_run: add dummy pause method (closes #100) 2015-08-15 09:16:00 +08:00
Yann Sionneau 8669f1d61d manual: llvmlite-artiq conda package needs a recent libstdc++6 2015-08-14 21:44:28 +02:00
Yann Sionneau cf74cd0f38 travis: dont overwrite conda env PATH, escape dollar signs, fixes #84 2015-08-14 19:00:08 +02:00
Yann Sionneau e6f3285144 travis: use the new m-labs anaconda repository during CI 2015-08-14 18:19:01 +02:00
Yann Sionneau 4ac79fb100 conda: update libssh2 libgit2 pygit2 to use anaconda libs instead of system ones 2015-08-14 16:57:33 +02:00
Sebastien Bourdeauducq 74b9601644 Merge branch 'master' of github.com:m-labs/artiq 2015-08-14 22:46:33 +08:00
Yann Sionneau 966d0ee3f2 pxi6733: fix verification of the number of buffered sample values 2015-08-14 10:36:03 +02:00