mirror of https://github.com/m-labs/artiq.git
Merge branch 'master' into drtio-coremgmt
This commit is contained in:
commit
1ed04ebc91
|
@ -24,6 +24,7 @@ ARTIQ-9 (Unreleased)
|
||||||
* New core device driver for the AD9834 DDS, tested with the ZonRi Technology Co., Ltd. AD9834-Module.
|
* New core device driver for the AD9834 DDS, tested with the ZonRi Technology Co., Ltd. AD9834-Module.
|
||||||
* Support for coredevice reflashing through the new ``flash`` tool in ``artiq_coremgmt``.
|
* Support for coredevice reflashing through the new ``flash`` tool in ``artiq_coremgmt``.
|
||||||
* ``artiq_coremgmt`` now supports configuring satellites.
|
* ``artiq_coremgmt`` now supports configuring satellites.
|
||||||
|
* artiq.coredevice.fmcdio_vhdci_eem has been removed.
|
||||||
|
|
||||||
ARTIQ-8
|
ARTIQ-8
|
||||||
-------
|
-------
|
||||||
|
|
|
@ -1,51 +0,0 @@
|
||||||
# Definitions for using the "FMC DIO 32ch LVDS a" card with the VHDCI-EEM breakout v1.1
|
|
||||||
|
|
||||||
eem_fmc_connections = {
|
|
||||||
0: [0, 8, 2, 3, 4, 5, 6, 7],
|
|
||||||
1: [1, 9, 10, 11, 12, 13, 14, 15],
|
|
||||||
2: [17, 16, 24, 19, 20, 21, 22, 23],
|
|
||||||
3: [18, 25, 26, 27, 28, 29, 30, 31],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def shiftreg_bits(eem, out_pins):
|
|
||||||
"""
|
|
||||||
Returns the bits that have to be set in the FMC card direction
|
|
||||||
shift register for the given EEM.
|
|
||||||
|
|
||||||
Takes a set of pin numbers (0-7) at the EEM. Return values
|
|
||||||
of this function for different EEMs should be ORed together.
|
|
||||||
"""
|
|
||||||
r = 0
|
|
||||||
for i in range(8):
|
|
||||||
if i not in out_pins:
|
|
||||||
lvds_line = eem_fmc_connections[eem][i]
|
|
||||||
# lines are swapped in pairs to ease PCB routing
|
|
||||||
# at the shift register
|
|
||||||
shift = lvds_line ^ 1
|
|
||||||
r |= 1 << shift
|
|
||||||
return r
|
|
||||||
|
|
||||||
|
|
||||||
dio_bank0_out_pins = set(range(4))
|
|
||||||
dio_bank1_out_pins = set(range(4, 8))
|
|
||||||
urukul_out_pins = {
|
|
||||||
0, # clk
|
|
||||||
1, # mosi
|
|
||||||
3, 4, 5, # cs_n
|
|
||||||
6, # io_update
|
|
||||||
7, # dds_reset
|
|
||||||
}
|
|
||||||
urukul_aux_out_pins = {
|
|
||||||
4, # sw0
|
|
||||||
5, # sw1
|
|
||||||
6, # sw2
|
|
||||||
7, # sw3
|
|
||||||
}
|
|
||||||
zotino_out_pins = {
|
|
||||||
0, # clk
|
|
||||||
1, # mosi
|
|
||||||
3, 4, # cs_n
|
|
||||||
5, # ldac_n
|
|
||||||
7, # clr_n
|
|
||||||
}
|
|
Loading…
Reference in New Issue