5e074f83ac
examples: update kasli sysu
2018-03-02 16:05:12 +08:00
a9daaad77b
kasli: add SYSU variant and device_db
2018-03-02 14:44:31 +08:00
a7720d05cd
firmware, sayma: port converter_spi to spi2
...
* ksupport/nrt_bus
* port ad9154, hmc830, hmc7043
* port local_spi and drtio_spi
* port kernel_proto libdrtioaux, satman
* change sayma_rtm gateware over
* add spi2 NRTSPIMaster
* remove spi NRTSPIMaster
* change sayma device_db
* change HMC830 to open mode and explicitly sequence open mode
2018-03-01 11:19:18 +01:00
f97163cdee
examples/master: sync device_db with kc705_nist_clock
2018-02-27 19:40:00 +01:00
whitequark
916b10ca94
examples: spi → spi2.
2018-02-27 18:36:45 +00:00
760724c500
kasli/device_db: fix i2c switch addr
2018-02-26 11:37:12 +01:00
771bf87b56
kc705: port amc101_dac/spi0 and sma_spi to spi2
2018-02-22 17:19:51 +01:00
d4a10dcbd4
urukul: fix example
2018-02-22 11:28:50 +01:00
f8e6b4f4e3
ad5360: port to spi2
...
* kc705 nist_clock target gateware
* coredevice driver
* moninj code
* test/example/device_db
This is untested as we don't have a AD5360 board right now.
Will be tested with Zotino v1.1
m-labs/artiq#926
2018-02-22 10:25:46 +01:00
0d8145084d
test_spi: move to new spi2 core
2018-02-21 19:41:05 +01:00
a63fd306af
urukul: use spi2
...
* switch kc705 and kasli targets to spi2 gateware on urukul
* rewrite urukul, ad9912, ad9910
* update example experiments, device_dbs
2018-02-21 15:00:28 +00:00
01fa6c1c2e
reorganize examples
2018-02-19 15:46:08 +08:00
7002bea0ab
kasli: clean up urukul example more
2018-02-15 14:21:17 +01:00
b6395a809b
kasli: remove old urukul test code
2018-02-13 22:16:57 +01:00
be693bc8a9
opticlock: examples
2018-02-13 22:13:40 +01:00
e67a289e2b
examples: add SAWG sines (DAC synchronization test)
2018-02-13 20:02:51 +08:00
6f90a43df2
examples: reorganize for new hardware
2018-01-28 02:11:45 +08:00
cb0016ceee
examples/sayma: fix ref_multiplier
...
SAWG is working, whoohoo!
2018-01-23 15:26:03 +08:00
74b7baa8c5
urukul example: mmcx clock input
2018-01-22 20:30:08 +01:00
a86b28def2
urukul: example additions
...
* relax timings for faster spi xfers
* continuous readback test to explore spi speed limit
2018-01-22 20:29:30 +01:00
whitequark
bfceef439f
Add missing parts of f317d1a2.
2018-01-17 01:14:16 +00:00
dc593ec0f0
Merge branch 'rtio-sed' into sed-merge
2018-01-10 12:04:54 +08:00
67746cc7a0
urukul: raise instead of assert, clean up
2018-01-03 19:22:36 +00:00
e3d66d286d
urukul: ad9910 examples
2018-01-03 18:43:04 +00:00
d8dbab024d
urukul: don't deal with dds_reset for now
2018-01-03 18:43:04 +00:00
e8608d12f5
device_db.py: whitespace
2018-01-03 18:43:04 +00:00
a940550e47
urukul: add CPLD and AD9912 driver [wip]
2018-01-02 19:59:24 +01:00
94b84ebe7c
kc705_dds: add urukul spi/ttl channels
2018-01-02 13:20:48 +01:00
69d7e93e99
drtio: adapt examples to Sayma
2017-12-21 23:09:19 +08:00
4fbc8772a5
sayma: allocate all user LEDs to RTIO, make one TTL SMA input
2017-12-21 19:27:38 +08:00
2e74ce25d8
examples/sayma: make LED blink pattern more peculiar
2017-12-14 19:10:34 +08:00
100c2b1769
add Sayma LED blinker example
2017-12-14 18:49:50 +08:00
569484f888
remove phaser, adapt SAWG example to Sayma
2017-12-14 18:49:27 +08:00
8407b2c400
examples/ad5360: set FMC DIO directions
2017-10-31 23:15:03 +08:00
d80cf8d59d
kc705: add TTLs and shift register driver for FMC DIO
2017-10-31 23:14:39 +08:00
0695afec37
examples/dma_blink: use handle
2017-10-31 00:07:34 +08:00
00a2e51f99
examples/ad5360: adapt for Zotino
2017-10-26 11:58:15 +08:00
bb6e7618bb
examples/device_db: update DAC entry for Zotino, add sections
2017-10-26 02:26:19 +08:00
5803ac9998
gateware: add Zotino SPI to NIST CLOCK target
2017-10-23 15:04:30 +08:00
471605ec1e
pdq: move to https://github.com/m-labs/pdq
2017-07-19 17:35:28 +02:00
377c776ec8
examples/dma_blink: replay → playback
2017-07-18 14:01:08 +08:00
mntng
40ca951750
kc705: add SPI bus for memory card
...
This will be useful for SPI unit tests using a SD card as victim.
2017-07-12 00:27:44 +08:00
f369cb97f7
sawg/examples: add a bit more slack
2017-06-22 10:26:29 +02:00
c2cc29142d
drtio: remove misleading comment from device_db
2017-06-21 18:34:53 +08:00
64ce85445c
drtio: add remote converter SPI example ( #740 )
2017-06-21 17:08:12 +08:00
c74de6ae96
phaser: reintroduce test_ad9154_status
2017-06-20 00:49:57 +08:00
39ddb66f0f
phaser: add AD9154 SPI access driver to example ddb
2017-06-20 00:49:21 +08:00
b5772f478a
sawg: add channel reset ( closes #751 )
2017-06-16 19:31:57 +02:00
6c54c0f834
sawg: update example
2017-06-10 11:52:48 +02:00
f3c7a7de3b
phaser: remove non-functional SPI examples
...
Those will be reimplemented after we have converter SPI access, but this will not be part of the 3.0 release.
2017-06-06 17:37:13 +08:00
2458da1ade
pdq: get new host driver, adapt
2017-05-31 00:20:10 +02:00
06721c19c4
sawg: work around bool->int
2017-05-22 18:50:58 +02:00
1562f79101
sawg: expose config channel
2017-05-22 18:27:42 +02:00
6bdb76e9ea
core device logging controller WIP ( #691 )
2017-05-22 16:48:00 +08:00
5ccca74a3f
fold comm device into core device
2017-05-22 15:45:45 +08:00
3ed70afaa1
Use commandline prefix for controllers
...
This keeps them better organized and consistent with the artiq_* naming scheme.
Tab completion from aqctl_ also lists all the controllers installed on a machine.
2017-05-22 00:22:10 +08:00
b7a94d466d
fix experiment name conflict in phaser example
2017-05-18 23:14:55 +08:00
cd757c0f16
generate device database from executable python file
2017-05-18 23:14:55 +08:00
Florent Kermarrec
db3e1aef77
examples/phaser: adapt test_ad9154_prbs to new prbs in fabric
2017-05-15 16:12:02 +02:00
7ec14f26c2
examples: fix after introduction of RangeScan
2017-03-31 16:54:07 +08:00
856a64f6d2
drtio: use TTLInOut in device_db
2017-03-14 14:13:52 +08:00
553b8046ff
examples: add DMA LED blinker
2017-03-01 18:37:58 +08:00
7d6ebabc1b
reorganize core device communication code
2017-02-27 18:37:30 +08:00
f402b4af3f
drtio: fix typo in example device_db
2017-02-27 17:51:55 +08:00
fc0ce310a8
examples: fix dds_test RTIO underflow
2017-02-27 11:45:18 +08:00
dff23293c7
Merge branch 'master' of github.com:m-labs/artiq
2017-02-27 01:05:40 +08:00
whitequark
5d3b00cf12
Implement recording of DMA traces on the core device.
2017-02-26 02:50:20 +00:00
360be0098f
drtio: map local RTIO core on lower channels
2017-02-24 18:15:27 +08:00
43aad0914e
python3.5 -> python3
...
Many things also work with Python 3.6.
2017-01-30 09:24:43 +08:00
394ffd827e
phaser/demo_2tone: add ttl and led pulse
2017-01-11 21:45:34 +01:00
318dbb699b
fix phaser device_db SAWG channel numbers
2017-01-03 21:22:16 +01:00
8e9be41c73
reset core device in phaser examples
2017-01-03 20:05:22 +01:00
d29ec22497
remove stale phaser startup kernel
2017-01-03 20:03:55 +01:00
7ff77bceac
move AD9616 and AD9154 initialization to firmware
2017-01-03 16:11:38 +01:00
fb35336389
typo
2016-12-31 14:48:43 +01:00
708c25b83a
phaser: don't init rtio in startup_kernel
2016-12-14 19:16:07 +01:00
c63fa46430
Merge branch 'phaser2'
...
* phaser2: (157 commits)
sawg/hbf: tweak pipeline for timing
fir: register multiplier output
conda/phaser: build-depend on numpy
sawg: reduce coefficient width
sawg: fix latency
test/fir: needs mpl. don't run by default
test/sawg: patch spline
sawg: use ParallelHBFCascade to AA [WIP]
fir: add ParallelHBFCascade
fir: add ParallelFIR and test
gateware/dsp: add FIR and test
README_PHASER: update
sawg: documentation
sawg: extract spline
sawg: document
sawg: demo_2tone
sawg: round to int64
gateware/phaser -> gateware/ad9154_fmc_ebz
phaser: fix typo
sawg: merge set/set64
...
2016-12-12 17:31:39 +01:00
d6f6ebf066
sawg: demo_2tone
2016-12-02 18:18:47 +01:00
82c651c17a
phaser: remove trivial sawg demo
2016-11-29 15:40:23 +01:00
7816078d6b
phaser/demo: update
2016-11-29 15:11:18 +01:00
c419c422fa
drtio: support for local RTIO core
2016-11-28 14:33:26 +08:00
07f2d84275
drtio: remote resets
2016-11-23 23:19:31 +08:00
5a2edef422
drtio: adapt example to new mu/second API
2016-11-23 12:43:17 +08:00
3459793586
Merge branch 'master' into drtio
2016-11-22 15:15:22 +08:00
4160490e0a
Merge branch 'phaser' into phaser2
...
* phaser: (23 commits)
RELEASE_NOTES: update
pipistrello: add some inputs
Remove last vestiges of nist_qc1.
Fully drop AD9858 and kc705-nist_qc1 support (closes #576 ).
coredevice.dds: reimplement fully in ARTIQ Python.
compiler: unbreak casts to int32/int64.
analyses.constness: fix false positive on x[...].
inferencer: significantly improve the op-assignment diagnostic.
Fix tests.
Move mu_to_seconds, seconds_to_mu to Core.
artiq_devtool: don't crash on invalid utf-8.
artiq_devtool: detect a race condition during connect.
llvm_ir_generator: handle no-op coercions.
conda: use development version of migen/misoc
Revert accidentally committed code.
Revert "gateware: increase RTIO FIFO sizes for NIST_CLOCK. Closes #623 "
analyses.invariant_detection: implement (#622 ).
Fix whitespace.
coredevice.dds: work around the round(numpy.float64()) snafu.
coredevice.dds: update from obsolete int(width=) syntax (fixes #621 ).
...
2016-11-21 17:29:46 +01:00
f7e8961ab0
Merge branch 'master' into phaser
...
* master: (23 commits)
RELEASE_NOTES: update
pipistrello: add some inputs
Remove last vestiges of nist_qc1.
Fully drop AD9858 and kc705-nist_qc1 support (closes #576 ).
coredevice.dds: reimplement fully in ARTIQ Python.
compiler: unbreak casts to int32/int64.
analyses.constness: fix false positive on x[...].
inferencer: significantly improve the op-assignment diagnostic.
Fix tests.
Move mu_to_seconds, seconds_to_mu to Core.
artiq_devtool: don't crash on invalid utf-8.
artiq_devtool: detect a race condition during connect.
llvm_ir_generator: handle no-op coercions.
conda: use development version of migen/misoc
Revert accidentally committed code.
Revert "gateware: increase RTIO FIFO sizes for NIST_CLOCK. Closes #623 "
analyses.invariant_detection: implement (#622 ).
Fix whitespace.
coredevice.dds: work around the round(numpy.float64()) snafu.
coredevice.dds: update from obsolete int(width=) syntax (fixes #621 ).
...
2016-11-21 17:29:39 +01:00
ad264ac070
phaser: 300 MHz sample rate clock/dac
2016-11-21 16:58:07 +01:00
whitequark
f4b7666768
coredevice.dds: reimplement fully in ARTIQ Python.
...
This commit also drops AD9858 support from software.
2016-11-21 15:13:26 +00:00
b3e4a1df03
sawg: adapt basic example
2016-11-21 13:17:01 +01:00
whitequark
009d396740
Move mu_to_seconds, seconds_to_mu to Core.
2016-11-21 05:37:30 +00:00
9221a275cb
sawg: kernel support (wip)
2016-11-20 16:39:53 +01:00
b714137f76
phaser: 150 MHz rtio/jesd clock
2016-11-19 13:16:30 +01:00
c92ccd3b5b
drtio: add pulse rate example
2016-11-09 15:29:15 +08:00
60e748eabe
drtio: better LED demo
2016-11-09 14:53:45 +08:00
d547c5d922
drtio: fix example ref_period
2016-11-09 14:44:01 +08:00
8c86920364
drtio: add examples
2016-11-08 16:11:10 +08:00
6d07a16c62
Merge branch 'master' into phaser
...
* master: (72 commits)
gateware: extend mailbox to 3 entries.
master/worker_db: set default value for archive
master: keep dataset manager consistent when set_dataset is called with contradictory attributes
master: archive input datasets. Closes #587
master: ensure same dataset is in broadcast and local when mutating
scheduler: default submission arguments, closes #577
pdq2: sync with pdq2
doc: clarify usage of pause/check_pause, closes #571
dashboard/datasets: use scientific spinbox and increase number of decimals, closes #572
gateware/spi: fix import
runtime: fix use of $(realpath) in Makefile.
test: fix printf specifier.
llvm_ir_generator: make sure RPC allocations are not underaligned.
runtime: use i64 for watchdog timeout, not i32.
runtime: port ksupport to Rust.
runtime: remove some redundant libm functions copied inline.
language: Add "A" (ampere) as well-known unit for arguments
conda: misoc 0.4 (csr)
runtime: cap log level at debug.
runtime: discard unnecessary sections.
...
2016-10-28 01:40:11 +02:00
69d96b0158
master: archive input datasets. Closes #587
2016-10-18 17:11:07 +08:00
1908339d4e
scheduler: default submission arguments, closes #577
2016-10-18 17:11:06 +08:00
6a683c712b
phaser: work around for unreliable transciever init
2016-10-16 16:01:23 +02:00
9ba6be8796
phaser: speed up ad9154_test_status
2016-10-14 13:23:14 +02:00
4b4fd32e3d
phaser: add another sawg demo
2016-10-14 13:21:42 +02:00
9b43f09c1d
phaser: cleanup prbs
2016-10-14 11:56:10 +02:00
b9de621557
phaser: fix comment
2016-10-14 02:18:58 +02:00
2b5a69a80c
phaser: rm idle_kernel
2016-10-14 02:18:15 +02:00
89150c9817
phaser: 10G line rate
2016-10-14 00:53:38 +02:00
b1137563b3
phaser: cleanup dac_setup
2016-10-13 15:02:42 +02:00
01bfe54dde
phaser: actually enable stpl
2016-10-13 14:09:29 +02:00
9c8b21b3f4
phaser: let link settle a bit longer before starting
2016-10-12 16:13:34 +02:00
0d1ed247e2
phaser: tweak sawg example
2016-10-12 16:01:07 +02:00
2d14864c6d
Revert "phaser: 500 MHz dacclock"
...
This reverts commit 5f737bef76
2016-10-12 16:01:07 +02:00
Florent Kermarrec
12b8598b84
stpl: fix byte ordering
2016-10-12 15:59:27 +02:00
9644a3a362
ad9154: mix mode addr, digital gain must be on
2016-10-12 15:00:53 +02:00
3f1d96b68d
phaser: tweak dac_setup
2016-10-12 14:22:57 +02:00
466d1e8304
phaser: update stpl
2016-10-12 14:22:21 +02:00
5f737bef76
phaser: 500 MHz dacclock
2016-10-12 14:03:08 +02:00
3b1d5d7eb6
phaser: verify flags in dac_setup
2016-10-12 12:19:08 +02:00
2b1cca2e7e
phaser: stpl
2016-10-11 19:29:27 +02:00
18d18b6685
phaser: add sync ttl input for monitoring
2016-10-10 17:13:23 +02:00
e27228fdd5
ad9516: duty cycle correction
2016-10-10 17:13:23 +02:00
5f7229ef92
ad9154: tweak jesd prbs test
2016-10-09 20:34:15 +02:00
1f93658724
phaser/dac_setup: clear sticky bits, use syncmode=9
2016-10-07 18:54:21 +02:00
89a30b6f7c
phaser: error on startup kernel
2016-10-08 00:02:38 +08:00
4e60a6ac71
phaser: tweak sawg example
2016-10-08 00:02:24 +08:00
1157a3a54b
ad9514_status: more info
2016-10-07 15:42:46 +02:00
72932fccec
phaser: fix sysref for 250 MHz sample rate
2016-10-07 15:40:00 +02:00
cfd2fe8627
phaser: fix fpga deviceclock divider
2016-10-07 13:40:45 +02:00
c846e758f1
phaser: fix startup_kernel/ceil
2016-10-07 12:57:38 +02:00
Florent Kermarrec
e998a980b3
phaser/startup: use get_configuration_checksum()
2016-10-07 09:00:01 +02:00
Florent Kermarrec
b02a7234f6
phaser: use 125MHz refclk for jesd
2016-10-07 08:59:34 +02:00
4390fea437
phaser status: add statusmode stuff for serdes pll
2016-10-06 17:36:54 +02:00
01bc7faacc
dac_setup: cleanup, add doc
2016-10-06 17:27:50 +02:00
fee7831573
phaser: split setup
2016-10-06 16:48:03 +02:00
1193ba4bf4
ad9154: merge csr spaces
2016-10-06 16:21:15 +02:00
4d87f0e9e0
phaser: instantiate jesd204b core, wire up
2016-10-06 14:44:22 +02:00
4a0eaf0f95
phaser: add jesd204b rtio dds
...
gateware: add jesd204b awg
gateware: copy phaser (df3825a)
dsp/tools: update satadd mixin
phaser: no DDS stubs
dsp: accu fix
phaser: cleanup/reduce
sawg: kernel support and docs
sawg: coredevice api fixes
sawg: example ddb/experiment
phaser: add conda package
examples/phaser: typo
sawg: adapt tests, fix accu stb
sawg: tweak dds parameters
sawg: move/adapt/extend tests
sawg: test phy, refactor
phaser: non-rtio spi
phaser: target cli update
phaser: ad9154-fmc-ebz pins
phaser: reorganize fmc signal naming
phaser: add test mode stubs
phaser: txen is LVTTL
phaser: clk spi xfer test
phaser: spi for ad9154 and ad9516
phaser: spi tweaks
ad9154: add register map from ad9144.xml
ad9516: add register map from ad9517.xml and manual adaptation
ad9154_reg: just generate getter/setter macros as well
ad9154: reg WIP
ad9154: check and fix registers
kc705: single ended rtio_external_clk
use single ended user_sma_clk_n instead of p/n to free up one clock sma
kc705: mirror clk200 at user_sma_clock_p
ad9516_regs.h: fix B_COUNTER_MSB
phase: wire up clocking differently
needs patched misoc
kc705: feed rtio_external_clock directly
kc705: remove rtio_external_clk for phaser
phaser: spi tweaks
ad9516: some startup
ad9516_reg fixes
phaser: setup ad9516 for supposed 500 MHz operation
ad9516: use full duplex spi
ad9154_reg: add CONFIG_REG_2
ad9154_reg: fixes
phaser: write some ad9154 config
ad9154_reg: fixes
ad9154: more init, and human readable setup
ad9154/ad9516: merge spi support
ad9154: status readout
Revert "kc705: remove rtio_external_clk for phaser"
This reverts commit d500288bb44f2bf2eeb0c2f237aa207b0a8b1366.
Revert "kc705: feed rtio_external_clock directly"
This reverts commit 8dc7825519e3e75b7d3d29c9abf10fc6e3a8b4c5.
Revert "phase: wire up clocking differently"
This reverts commit ad9cc450ffa35abb54b0842d56f6cf6c53c6fbcc.
Revert "kc705: mirror clk200 at user_sma_clock_p"
This reverts commit 7f0dffdcdd28e648af84725682f82ec6e5642eba.
Revert "kc705: single ended rtio_external_clk"
This reverts commit a9426d983fbf5c1cb768da8f1da26d9b7335e9cf.
ad9516: 2000 MHz clock
phaser: test clock dist
phaser: test freqs
ad9154: iostandards
phaser: drop clock monitor
phaser: no separate i2c
phaser: drive rtio from refclk, wire up sysref
phaser: ttl channel for sync
ad9154: 4x interp, status, tweaks
phaser: sync/sysref 33V banks
phaser: sync/sysref LVDS_25 inputs are VCCO tolerant
phaser: user input-only ttls
phaser: rtio fully from refclk
ad9154: reg name usage fix
ad9154: check register modifications
Revert "ad9154: check register modifications"
This reverts commit 45121d90edf89f7bd8703503f9f317ad050f9564.
ad9154: fix status code
ad9154: addrinc, recal serdes pll
phaser: coredevice, example tweaks
sawg: missing import
sawg: type fixes
ad9514: move setup functions
ad9154: msb first also decreasing addr
phaser: use sys4x for rtio internal ref
phaser: move init code to main
phaser: naming cleanup
phaser: cleanup pins
phaser: move spi to kernel cpu
phaser: kernel support for ad9154 spi
ad9154: add r/w methods
ad9154: need return annotations
ad9154: r/w methods are kernels
ad9154_reg: portable helpers
phaser: cleanup startup kernel
ad9154: status test
ad9154: prbs test
ad9154: move setup, document
phaser: more documentation
2016-10-05 16:17:50 +02:00
b7b6e7b9db
examples: code applet
2016-09-07 00:56:39 +08:00
e45c089428
master, dashboard: support applet requests from experiments
2016-09-05 00:53:44 +08:00
209934485f
examples/handover: put slack after reset. Closes #520
2016-07-20 11:52:30 +08:00
0744620787
examples/device_db: explain where comments are shown ( #518 )
2016-07-18 21:43:57 +02:00
c065b5866f
require Python 3.5.2, remove monkey patches
2016-07-07 14:55:21 +08:00
2d1a47ca98
fix indentation
2016-07-01 15:19:52 +08:00
c8dc6ca07c
inter-experiment smooth handover
2016-06-29 02:37:50 +08:00
03a69ec5b7
scheduler: add check_pause function
2016-06-27 14:37:29 +08:00
ec3e7792dc
add MultiScanManager
2016-06-18 16:30:34 +08:00
765e3f0b5d
gui/entries/_RangeScan: set range before setting value. Fixes clamping to 99.99
2016-06-11 17:25:46 -06:00
ec3641551c
examples: run should not return a value
2016-06-03 22:55:50 -04:00
9ec142e4f6
examples/histograms: convert to mutate_dataset API. Closes #459
2016-05-31 20:25:15 -05:00
0faa2d56b4
language/environment: autoset scale for common units. Closes #448
2016-05-28 13:37:18 -05:00
43081b4f64
language,gui: support setting unselected scan default values. Closes #417
2016-05-23 15:03:05 -07:00
