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

pipistrello: update rtio channel doc

This commit is contained in:
Robert Jördens 2015-06-29 12:21:54 -06:00
parent f0ac8cb354
commit d1c4cf0b78
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/manual/fpga_board_ports.rst
View File

@ -13,20 +13,24 @@ The low-cost Pipistrello FPGA board can be used as a lower-cost but slower alter
When plugged to an adapter, the NIST QC1 hardware can be used. The TTL lines are mapped to RTIO channels as follows: When plugged to an adapter, the NIST QC1 hardware can be used. The TTL lines are mapped to RTIO channels as follows:
+--------------+----------+-----------------+ +--------------+----------+------------+
| RTIO channel | TTL line | Capability | | RTIO channel | TTL line | Capability |
+==============+==========+=================+ +==============+==========+============+
| 0 | PMT0 | Input only | | 0 | PMT0 | Input |
+--------------+----------+-----------------+ +--------------+----------+------------+
| 1 | PMT1 | Input only | | 1 | PMT1 | Input |
+--------------+----------+-----------------+ +--------------+----------+------------+
| 2-18 | TTL0-16 | Output only | | 2-17 | TTL0-15 | Output |
+--------------+----------+-----------------+ +--------------+----------+------------+
| 19-21 | LEDs | Output only | | 18 | EXT_LED | Output |
+--------------+----------+-----------------+ +--------------+----------+------------+
| 22 | TTL2 | Output only | | 19 | USER_LED | Output |
+--------------+----------+-----------------+ +--------------+----------+------------+
| 20 | DDS | Output |
+--------------+----------+------------+
The input only limitation on channels 0 and 1 comes from the QC-DAQ adapter. When the adapter is not used (and physically unplugged from the Pipistrello board), the corresponding pins on the Pipistrello can be used as outputs. Do not configure these channels as outputs when the adapter is plugged, as this would cause electrical contention. The input only limitation on channels 0 and 1 comes from the QC-DAQ adapter. When the adapter is not used (and physically unplugged from the Pipistrello board), the corresponding pins on the Pipistrello can be used as outputs. Do not configure these channels as outputs when the adapter is plugged, as this would cause electrical contention.
The board can accept an external RTIO clock connected to PMT2. The board can accept an external RTIO clock connected to PMT2. If the DDS box
does not drive the PMT2 pair, use XTRIG and patch the XTRIG transciever output
on the adapter board onto C:15 disconnecting PMT2.

4
soc/targets/artiq_pipistrello.py
View File

@ -83,6 +83,8 @@ trce -v 12 -fastpaths -tsi {build_name}.tsi -o {build_name}.twr {build_name}.ncd
self.submodules.leds = gpio.GPIOOut(Cat( self.submodules.leds = gpio.GPIOOut(Cat(
platform.request("user_led", 0), platform.request("user_led", 0),
platform.request("user_led", 1), platform.request("user_led", 1),
platform.request("user_led", 2),
platform.request("user_led", 3),
)) ))
self.comb += [ self.comb += [
@ -107,7 +109,7 @@ trce -v 12 -fastpaths -tsi {build_name}.tsi -o {build_name}.twr {build_name}.ncd
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ofifo_depth=4)) rtio_channels.append(rtio.Channel.from_phy(phy, ofifo_depth=4))
phy = ttl_simple.Output(platform.request("user_led", 2)) phy = ttl_simple.Output(platform.request("user_led", 4))
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ofifo_depth=4)) rtio_channels.append(rtio.Channel.from_phy(phy, ofifo_depth=4))