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
7ed8fe57fa
Git support
2015-08-07 15:51:56 +08:00
968760d48f
gui: save geometry of main window
2015-08-06 22:27:46 +08:00
e078dabd3c
tools/TaskObject: do not suppress exceptions raised by terminating task
2015-08-06 22:14:49 +08:00
9261254653
language/environment: support non-stored results
2015-08-06 18:43:27 +08:00
59a29ae04b
language/environment: remove attr_rtresult
...
This function has the typical side effect of clearing the result. When happening in build(), this caused minor trouble when using pipelined scheduling (no result displayed at all until run() proceeds).
2015-08-06 18:23:09 +08:00
fd795724f2
gui: better display of None
2015-08-06 18:03:05 +08:00
263ff86e66
gui: support X axis, fit, error bars in XY plot
2015-08-06 18:02:40 +08:00
7180552d24
gui: support setting histogram X axis
2015-08-06 15:34:58 +08:00
cddb5b9ae4
gui: save explorer state
2015-08-05 13:35:28 +08:00
c8db83b11f
gui: add verbosity args for debugging
2015-08-05 11:41:43 +08:00
whitequark
4a8e397a77
Fold llvmlite patches into m-labs/llvmlite repository.
2015-08-05 03:49:01 +03:00
whitequark
ad7cbc4394
Rename artiq_coreconfig → artiq_coretool; add log subcommand.
2015-08-02 16:40:58 +03:00
b2f720da67
gui: better state error handling
...
Remains limited by issue pyqtgraph/pyqtgraph#204
2015-08-01 19:52:13 +08:00
8ad88438c7
gui: save display state
2015-08-01 19:37:16 +08:00
a64766a10d
protocols/FlatFileDB: remove unneeded default_data
2015-08-01 16:49:05 +08:00
00cae1c23a
gui: save dock area state
2015-08-01 16:48:44 +08:00
9e24b56099
gui: add state manager
2015-08-01 16:48:27 +08:00
6b98f867de
import DDS phase modes at the top level
2015-07-29 23:32:33 +08:00
86fef7b53b
master: do not scan experiments starting with '_'
2015-07-29 23:29:07 +08:00
a8c13cb7de
gui: fix NumberEntry min/max
2015-07-29 23:28:34 +08:00
1d34c06d79
rtio: detect collision errors
2015-07-29 19:43:35 +08:00
b548d50a2f
test/coredevice: use ttl_out for PulseRate (loop is less available)
2015-07-29 19:42:43 +08:00
90368415a6
ttl: remove timestamp function
...
The general idea is that functions that work with absolute timestamps exist only in machine units versions, to help prevent floating point losses of precision. Time differences should be computed in machine units and then converted, e.g. mu_to_seconds(t2-t1).
This function would have had problems after ~50 days of running the device.
2015-07-29 11:11:16 +08:00
2640a57af3
test/coredevice: let output() settle longer
2015-07-28 16:20:05 -06:00
5f5227f01f
ttl: add timestamp()
2015-07-28 16:20:05 -06:00
e95b66f114
ttl: remove spurious _mu
2015-07-28 16:20:05 -06:00
fb339d294e
serdes_s6: no need to reset
2015-07-28 12:54:31 -06:00
9ac5bc52d4
rtio: add spartan6 serdes, 4x and 8x
2015-07-27 21:01:15 -06:00
b1d58bd4c8
rtio: fix replace/sequence_error when fine_ts_width > 0
2015-07-27 12:22:35 +08:00
959b7a7b46
rtio: resetless -> reset_less
2015-07-27 11:46:56 +08:00
fe6a5c42df
rtio: remove unused clk_freq argument
2015-07-27 10:57:15 +08:00
5b50f5fe05
rtio/ttl_serdes_7series: use recommended OSERDES T configuration
2015-07-27 10:50:50 +08:00
f68d5cbd73
rtio: forward rtio domain reset to rio and rio_phy domains
2015-07-27 01:52:47 +08:00
940aa815dd
rtio/ttl_serdes: cleanup/rewrite
2015-07-27 01:44:52 +08:00
Yann Sionneau
d90dff4ef1
rtio: add SERDES TTL (WIP)
2015-07-26 17:40:34 +08:00
d14a31f443
artiq_run: fix ELF running
2015-07-25 15:52:38 +08:00
696bceb406
gui: feedback on run deletion
2015-07-25 15:08:27 +08:00
61f45f505b
gui/short_format: show string values
2015-07-25 14:37:19 +08:00
05dd11a60d
protocols/pyon: support numpy scalars ( closes #53 )
2015-07-25 12:28:56 +08:00
8bc1dd9f9c
test/serialization: remove redundant test since Quantity was removed
2015-07-25 12:23:43 +08:00
9fe65769f2
gui: add console description
2015-07-25 12:01:47 +08:00
5979f85c1c
gui: use monospace font in log
2015-07-25 11:38:26 +08:00
ef8b09d9bc
gui: add console
2015-07-25 00:36:16 +08:00
928775f6ac
gui: fix default LinearScan/RandomScan
2015-07-25 00:35:21 +08:00
5b62b2452d
gui: get spinboxes to behave
2015-07-25 00:32:18 +08:00
7d81520827
protocols/pc_rpc: improve docstrings
2015-07-25 00:30:36 +08:00
6b0e120d75
wavesynth/Synthesizer: allow empty data
2015-07-23 12:34:54 -06:00
5b1165f413
gui: log autoscroll
2015-07-24 00:11:05 +08:00
1a4028ca92
gui: better log lookandfeel
2015-07-24 00:08:14 +08:00
3a06e22b67
master: handle logging while scanning repository
2015-07-23 23:06:15 +08:00
aa2acb9137
gui: auto resize of table columns
2015-07-23 22:36:52 +08:00
0b10f72c2b
Merge branch 'master' of https://github.com/m-labs/artiq
2015-07-22 10:44:49 +08:00
073e09ed36
gui: common format for results/params
2015-07-22 06:01:09 +08:00
bd2bd68a54
gui,client: do now show arguments
2015-07-22 05:47:14 +08:00
8402f1cdcd
master,gui: basic log support
2015-07-22 05:13:50 +08:00
e247fb5415
gui/tools: add ListSyncModel
2015-07-22 05:13:46 +08:00
179ca36d09
gui: basic scan support
2015-07-21 21:24:24 +02:00
47191eda91
dds monitor: relax timing (for pipistrello)
2015-07-19 21:36:51 -06:00
1a0dc499dd
gui: exit when main window is closed
2015-07-19 18:27:41 +02:00
bb05ed268e
language/scan: add argument processor
2015-07-19 16:47:35 +02:00
937ca853aa
language/scan: fix random scan, add explicit scan, specify what runs on host/device
2015-07-19 11:36:52 +02:00
deaa492566
language: add scan iterators
2015-07-18 19:26:41 +02:00
