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

7528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harry Ho
9daf77bd58 kc705: add multichannel support on satellite 
* Two DRTIO channels (i.e. satellite and repeater) are enabled by default.
* User can choose either the SFP or SMA as the satellite channel (by passing `--drtio-sat sfp` or --drtio-sat sma` to the argparser), and the unchosen would become the repeater channel.
 2021-01-20 15:05:32 +08:00
Harry Ho
52afd4ef6b kc705: add GTX multilane support, add multichannel support on master 
* One DRTIO master channel is enabled by default.
* User can set the SMA as the 2nd master channel (by passing --drtio-sma to the argparser).
* Multi-channel (i.e. with repeaters) on KC705 satellite is supported but has not been implemented yet.
 2021-01-20 15:05:32 +08:00
Harry Ho
f6d39fd6ba kc705: revive DRTIO master with updated syntax 
* KC705 master variant now uses Si5324 as synthesiser.
* Multi-channel has not been implemented yet.
 2021-01-20 15:05:31 +08:00
Harry Ho
f25e86e934 kc705: revive DRTIO satellite with updated syntax, update GTX 
* Multi-channel has not been implemented yet.
 2021-01-20 11:25:38 +08:00
Harry Ho
cff7bcc122 Merge branch 'master' (43be383c86) into k7-drtio 2020-12-31 13:30:46 +08:00
Harry Ho
dc7addf394 Revert "drtio: remove KC705/GTX support" 
This reverts commit ebdbaaad32.
 2020-12-31 13:29:50 +08:00
Chris Ballance
43be383c86 kasli v2.0: drive TX_DISABLE low on all SFPs (fixes #1570) 
This was the same problem as #1508 but on SFP1..3
 2020-12-23 00:10:12 +08:00
Harry Ho
43ecb3fea6 sayma: add comments about CPLL line rate on KU GTH 2020-12-19 17:05:20 +08:00
Harry Ho
8cd794e9f4 jesd204_tools: use new syntax from jesd204b core 
* requires jesd204b changes as in https://github.com/HarryMakes/jesd204b/tree/gth
 2020-12-19 17:05:20 +08:00
Aadit Rahul Kamat
19f75f1cfd artiq_browser: update h5py api call 
Signed-off-by: Aadit Rahul Kamat <aadit.k12@gmail.com>
 2020-12-17 14:23:16 +08:00
Aadit Rahul Kamat
0a14cc5855 Update link to Release Notes doc in PR template 
Signed-off-by: Aadit Rahul Kamat <aadit.k12@gmail.com>
 2020-12-17 14:21:25 +08:00
occheung
a017dafee6 ddb_template: mirny_cpld: add default value 
Signed-off-by: Oi Chee Cheung <dc@m-labs.hk>
 2020-12-15 11:00:59 +08:00
Harry Ho
73271600a1 jdcg: STPL tests now perform after DAC initialization 2020-12-14 18:03:31 +08:00
occheung
3f631c417d artiq_ddb_template: mirny_cpld: add refclk, clk_sel args 
Signed-off-by: occheung <occheung@connect.ust.hk>
 2020-12-14 13:38:20 +08:00
occheung
33d39b261a artiq_ddb_template: mirny_cpld: rename adf5355 to adf5356 
Signed-off-by: occheung <occheung@connect.ust.hk>
 2020-12-14 13:38:20 +08:00
Sebastien Bourdeauducq
4b10273a2d gui: quamash -> qasync 2020-12-12 21:59:25 +08:00
Sebastien Bourdeauducq
1ce505c547 coredevice: remove obsolete watchdog code (#1458) 2020-12-08 13:25:39 +08:00
Sebastien Bourdeauducq
072053c3b2 compiler: remove obsolete watchdog code (#1458) 2020-12-08 13:25:08 +08:00
Sebastien Bourdeauducq
ccdc741e73 sayma_amc: fix --sfp argument 2020-12-07 18:02:36 +08:00
Robert Jördens
33285253fb
Merge pull request #1558 from quartiq/phased_ddb_fix 
Phased ddb fix
 2020-12-04 16:38:40 +01:00
Leon Riesebos
3b2c225fc4 allow dashboard to close if no connection can be made to moninj 
Signed-off-by: Leon Riesebos <leon.riesebos@duke.edu>
 2020-12-04 23:00:23 +08:00
Leon Riesebos
94271504dd Added RuntimeError to prelude to make the name available in kernels 
closes #1477

Signed-off-by: Leon Riesebos <leon.riesebos@duke.edu>
 2020-12-04 22:59:08 +08:00
SingularitySurfer
9b4b550f76 5 is correct. 2020-12-04 14:49:30 +00:00
SingularitySurfer
cba631610c fixed phaser number of rtio channels 2020-12-04 14:40:59 +00:00
Robert Jördens
6ceb3f3095
Merge pull request #1551 from quartiq/tester_tweaks 
modified urukul instructions in sinara tester script
 2020-11-26 16:22:44 +01:00
Harry Ho
d51d4e6ce0 doc: fix missing instructions for bypassing Si5324 on Kasli 2020-11-26 12:03:28 +08:00
Sebastien Bourdeauducq
eda4850f64 Revert "fixes with statement with multiple items" 
This reverts commit 88d346fa26.
 2020-11-22 11:57:22 +08:00
Sebastien Bourdeauducq
8e46c3c1fd Revert "compiler: fix incorrect with behavior" 
This reverts commit fe6115bcbb.
 2020-11-22 11:57:21 +08:00
SingularitySurfer
0605267424 modified urukul instructions 2020-11-19 12:20:34 +00:00
Marius Weber
3e38833020 ad9910: fix turns_to_pow return-type on host 
When run on the host, the `turns_to_pow` retrun-type is numpy.int64.
Sensibly, the compiler does not attempt to convert `numpy.int64` to `int32`.

Signed-off-by: Marius Weber <marius.weber@physics.ox.ac.uk>
 2020-11-13 18:54:47 +01:00
David Nadlinger
9ff47bacab compiler: Provide libm special functions (erf, Bessel functions, …) 
Tests hard-depend on SciPy to make sure this is exercised
during CI.
 2020-11-11 19:15:30 +01:00
David Nadlinger
a5dcd86fb8 test/lit: Rename array to avoid conflict with standard library 
The old name created problems if a test dependency (e.g. NumPy/SciPy)
ends up importing the system `array` module internally somewhere.
 2020-11-11 17:42:53 +01:00
David Nadlinger
d95e619567 compiler: Implement binary NumPy math functions (arctan2, …) 
The bulk of the diff is just factoring out the implementation
for binary arithmetic implementations, to be reused for binary
function calls.
 2020-11-11 01:35:28 +01:00
David Nadlinger
fcf4763ae7 RELEASE_NOTES: Expand information on ndarrays 2020-11-10 20:40:18 +01:00
David Nadlinger
bc6fbecbda compiler, firmware: Do not expose abort() to kernels 
This was only exposed for the assert implementation, and
does not exist on Zynq.
 2020-11-10 20:40:18 +01:00
David Nadlinger
292043a0a7 compiler: Raise AssertionErrors instead of abort()ing on all targets 2020-11-10 20:40:18 +01:00
Leon Riesebos
d8a5a8f568 fixed value scaling issue for the center scan gui widget 
Signed-off-by: Leon Riesebos <leon.riesebos@duke.edu>
 2020-11-10 18:42:18 +01:00
Etienne Wodey
dbcac62fd0 coredevice: adf5356: fix/adjust docs 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
Etienne Wodey
e8730a7e14 coredevice: adf5356: add test for failed PLL lock 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
Etienne Wodey
3844123c13 coredevice: adf5356: add enable/disable and power setting for outA 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
Etienne Wodey
61dc2b8b64 coredevice: adf5356: add some tests 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
Etienne Wodey
b200465cce coredevice: adf5355: rename to adf5356 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
Etienne Wodey
d433f6e86d coredevice: adf5355: more general PLL parameters calculation 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
Etienne Wodey
b856df7c35 coredevice: adf5355: cleanup, style 2020-11-10 10:49:22 +08:00
Etienne Wodey
211500089f coredevice: mirny/adf5355: add basic high-level interface 
Signed-off-by: Etienne Wodey <wodey@iqo.uni-hannover.de>
 2020-11-10 10:49:22 +08:00
David Nadlinger
4f311e7448 compiler: Raise exception on failed assert()s rather than panic 
This allows assert() to be used on Zynq, where abort() is not
currently implemented for kernels. Furthermore, this is arguably
the more natural implementation of assertions on all kernel targets
(i.e. where embedding into host Python is used), as it matches host
Python behavior, and the exception information actually makes it to
the user rather than leading to a ConnectionClosed error.

Since this does not implement printing of the subexpressions, I
left the old print+abort implementation as default for the time
being.

The lit/integration/instance.py diff isn't just a spurious change;
the exception-based assert implementation exposes a limitation in
the existing closure lifetime tracking algorithm (which is not
supposed to be what is tested there).

GitHub: Fixes #1539.
 2020-11-10 00:51:24 +01:00
David Nadlinger
f0ec987d23 test/coredevice: Avoid NumPy deprecation warning 
Jagged arrays are no longer silently inferred as dtype=object,
as per NEP-34.

The compiler ndarray (re)implementation is unchanged, so the
test still fails.
 2020-11-09 23:53:50 +01:00
Sebastien Bourdeauducq
ea95d91428 wrpll: separate collector reset 2020-11-09 17:57:13 +08:00
David Nadlinger
a97b4633cb compiler: Add math_fns module docstring [nfc] 2020-10-31 19:06:00 +01:00
Robert Jördens
19bd1e38d4
Merge pull request #1540 from airwoodix/fix-typo-phaser-doc 
coredevice/phaser: fix typo in docstring
 2020-10-29 22:55:06 +01:00