41caec797e
flake: do not install ARTIQ itself in dev shell, only its dependencies
...
Otherwise, test runs take a long time when entering the shell, and failing tests stop entering the shell which is not what we want.
Also make jsonschema a regular dependency of ARTIQ, since users can now retrieve JSONs via AFWS.
2023-05-30 16:20:57 +08:00
953a8a9555
master: merge master_config and master_terminate
2023-05-30 15:55:19 +08:00
444bab2186
gui: datasets_sub -> dataset_sub (nfc)
2023-05-30 15:44:30 +08:00
0941d3a29a
flake: update dependencies
2023-05-30 11:50:30 +08:00
22e2514ce6
update configuration of IBUFDS_GTE2
...
Input clock is terminated internally with 50 Ohm on each leg and to 4/5 MGTAVCC.
2023-05-30 11:42:51 +08:00
a4895b591a
analyzer: fix satellite behavior
2023-05-29 13:13:24 +08:00
caee570c48
Merge branch 'master' into nac3
2023-05-27 19:08:36 +08:00
ef2cc2cc12
flake: buildFHSUserEnv -> buildFHSEnv
2023-05-27 18:03:18 +08:00
779810163f
flake: fix rustPlatform deprecation warnings
2023-05-27 17:40:36 +08:00
b9c7905b20
nixpkgs 23.05
2023-05-27 17:17:36 +08:00
Charles Baynham
c2b0c97640
worker: Wait until datasets are written before quitting
...
Avoids a race condition in worker_impl.py where HDF5 dataset saving was
cut off before it finished for large datasets.
2023-05-23 21:48:56 +01:00
58cc3b8d0a
kasli_generic: fix LooseVersion deprecation warning
2023-05-23 19:36:06 +08:00
598c7b1d25
flake: update qasync
2023-05-23 11:26:30 +08:00
ea9fe9b4e1
dma: fix off-by-one error in RawSlicer ( #2090 )
...
Signed-off-by: Jonathan Coates <jonathan.coates@oxionics.com>
2023-05-23 11:15:39 +08:00
c1d6fd4bbe
satman analyzer: remove forgotten comment
2023-05-19 11:39:14 +08:00
ab52748cac
analyzer sat: disarm on drop
2023-05-19 11:39:14 +08:00
ddfe51e7ac
analyzer: use transactions for data transmission
2023-05-19 11:39:14 +08:00
6c96033d41
analyzer: implement querying up satellites for data
2023-05-19 11:39:14 +08:00
0b03126038
satman: support analyzer packets
2023-05-19 11:39:14 +08:00
fdca1ab7fc
drtioaux: add analyzer related messages
2023-05-19 11:39:14 +08:00
c36b6b3b65
master: only local rtio events in analyzer
2023-05-19 11:39:14 +08:00
c0ca27e6cf
satellite: add rtio_analyzer, only for local rtio
2023-05-19 11:39:14 +08:00
3ca47537b8
Fix mismatched signatures for the wide interface
...
Lists are passed by-reference from python code, and so should be
&CSlice<_> not CSlice<_>.
Signed-off-by: Jonathan Coates <jonathan.coates@oxionics.com>
2023-05-19 10:18:06 +08:00
Hartmann Michael (IFAG PSS SIS SCE QSE)
df15f53ee9
doc: conda installation notes
2023-05-12 17:44:38 +08:00
e015483e48
RELEASE_NOTES: add LMDB migration script ( #1743 )
2023-05-09 14:56:43 +08:00
c53d333d46
almazny: fix parameter
2023-05-09 14:27:37 +08:00
5b94ce82e4
artiq_ddb_template: fix almazny
2023-05-09 14:27:15 +08:00
0edcd53c24
artiq_ddb_template: fix almazny
2023-05-09 14:26:59 +08:00
250d7e8f0f
examples/nac3devices: add almazny
2023-05-09 14:26:45 +08:00
60aa64b79e
Merge branch 'master' into nac3
2023-05-09 14:26:29 +08:00
cc41b70852
msys2: add lmdb dependency
2023-05-09 13:13:51 +08:00
45cd438fb8
Almazny v1.2 support
...
Based on PR #2060 by Robert Jördens.
2023-05-09 12:54:48 +08:00
42e42df43f
Merge branch 'master' into nac3
2023-04-30 17:18:05 +08:00
c139038022
flake: update dependencies
2023-04-30 17:17:39 +08:00
0e7e30d46e
test: fix hardware testbench trying to write to ARTIQ_ROOT
2023-04-30 17:16:36 +08:00
d5a7755584
test: improve tmpdir names
2023-04-30 17:15:34 +08:00
3ff0be6540
PEP440 compliant version numbers
2023-04-30 16:55:49 +08:00
8409a6bb94
update gitignore
2023-04-30 16:53:49 +08:00
730a00d210
flake: update dependencies
2023-04-30 16:53:14 +08:00
5d2b3dafe3
remove lit from gitignore
2023-04-30 16:46:35 +08:00
825c49a911
artiq_ddb_template: fix pll_en typing
2023-04-30 16:43:52 +08:00
2b73ca862e
Merge branch 'master' into nac3
2023-04-30 16:40:50 +08:00
2c1438c4b9
coredevice: add missing pattern to sampler_hw_rev
2023-04-30 16:07:56 +08:00
5199bea353
master: emit warning if datasets will not be stored
2023-04-30 15:22:21 +08:00
a533f2a0cd
rtio: SED, InputCollector use rio clock domain
2023-04-28 17:49:12 +08:00
0bf57f4ebd
Fix ADF3536 having RTIO channel names
...
The channel in this device refers to a channel on the mirny, not an RTIO
channel.
2023-04-24 20:05:14 +08:00
4417acd13b
flake: update dependencies
2023-04-24 17:36:13 +08:00
4056168875
master: store datasets in LMDB ( #1743 )
2023-04-24 17:34:30 +08:00
9331911139
add tests for client submit functionality
2023-04-24 11:43:24 +08:00
2f35869eb1
satman: fix PMP and L2 flush
2023-04-20 15:45:15 +08:00