M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

gateware/phaser -> gateware/ad9154_fmc_ebz

This commit is contained in:
Robert Jördens 2016-12-02 10:31:59 +01:00
parent 6e9bc7c05d
commit cbf1004df3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/gateware/phaser.py → artiq/gateware/ad9154_fmc_ebz.py
View File

@ -1,7 +1,7 @@
from migen.build.generic_platform import * from migen.build.generic_platform import *
fmc_adapter_io = [ ad9154_fmc_ebz = [
("ad9154_spi", 0, ("ad9154_spi", 0,
# AD9154 should give control of SPI to FMC when USB cable is unplugged, # AD9154 should give control of SPI to FMC when USB cable is unplugged,
# It's the case, but the PIC18F24J50 is introducing noise on SPI SCK # It's the case, but the PIC18F24J50 is introducing noise on SPI SCK

4
artiq/gateware/targets/phaser.py
View File

@ -23,7 +23,7 @@ from misoc.integration.builder import builder_args, builder_argdict
from artiq.gateware.soc import AMPSoC, build_artiq_soc from artiq.gateware.soc import AMPSoC, build_artiq_soc
from artiq.gateware import rtio from artiq.gateware import rtio
from artiq.gateware.phaser import fmc_adapter_io from artiq.gateware.ad9154_fmc_ebz import ad9154_fmc_ebz
from artiq.gateware.rtio.phy import (ttl_simple, ttl_serdes_7series, from artiq.gateware.rtio.phy import (ttl_simple, ttl_serdes_7series,
sawg) sawg)
from artiq import __version__ as artiq_version from artiq import __version__ as artiq_version
@ -173,7 +173,7 @@ class Phaser(MiniSoC, AMPSoC):
]) ])
platform = self.platform platform = self.platform
platform.add_extension(fmc_adapter_io) platform.add_extension(ad9154_fmc_ebz)
self.submodules.leds = gpio.GPIOOut(Cat( self.submodules.leds = gpio.GPIOOut(Cat(
platform.request("user_led", 0), platform.request("user_led", 0),