M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests 1 Releases Wiki Activity

117_rtio_channels #147

Merged
sb10q merged 10 commits from mwojcik/artiq-zynq:117_rtio_channels into master 2021-10-13 17:20:25 +08:00
Conversation 0 Commits 10 Files Changed 1 +20 -7
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bbb8c59ade - Show all commits

27
src/gateware/zc706.py
View File

@ -88,6 +88,17 @@ si5324_fmc33 = [
), ),
] ]
pmod1_33 = [
("pmod1_33", 0, Pins("AJ21"), IOStandard("LVCMOS33")),
("pmod1_33", 1, Pins("AK21"), IOStandard("LVCMOS33")),
("pmod1_33", 2, Pins("AB21"), IOStandard("LVCMOS33")),
("pmod1_33", 3, Pins("AB16"), IOStandard("LVCMOS33")),
("pmod1_33", 4, Pins("Y20"), IOStandard("LVCMOS33")),
("pmod1_33", 5, Pins("AA20"), IOStandard("LVCMOS33")),
("pmod1_33", 6, Pins("AC18"), IOStandard("LVCMOS33")),
("pmod1_33", 7, Pins("AC19"), IOStandard("LVCMOS33")),
]
def prepare_zc706_platform(platform): def prepare_zc706_platform(platform):
platform.toolchain.bitstream_commands.extend([ platform.toolchain.bitstream_commands.extend([
@ -464,6 +475,7 @@ class _NIST_CLOCK_RTIO:
platform = self.platform platform = self.platform
platform.add_extension(nist_clock.fmc_adapter_io) platform.add_extension(nist_clock.fmc_adapter_io)
platform.add_extension(leds_fmc33) platform.add_extension(leds_fmc33)
platform.add_extension(pmod1_33)
platform.add_extension(_ams101_dac) platform.add_extension(_ams101_dac)
platform.add_extension(_sdcard_spi_33) platform.add_extension(_sdcard_spi_33)
@ -484,10 +496,10 @@ class _NIST_CLOCK_RTIO:
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512)) rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
# todo: figure out what to do since zc706 has no SMA I/O # no SMA GPIO, replaced with PMOD1_0
# phy = ttl_serdes_7series.InOut_8X(platform.request("user_sma_gpio_n_33")) phy = ttl_serdes_7series.InOut_8X(platform.request("pmod1_33", 0))
# self.submodules += phy self.submodules += phy
# rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512)) rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
# could check the LED # # could check the LED #
sb10q commented 2021-10-13 16:07:21 +08:00
Outdated
Review
Copy Link

What does this mean?

What does this mean?
mwojcik commented 2021-10-13 16:15:32 +08:00
Outdated
Review
Copy Link

I was wondering if the exact LED that gets controlled on board really matters. The index 2 of the user LED here was copied from kc705, maybe a different one would be any better?

I was wondering if the exact LED that gets controlled on board really matters. The index 2 of the user LED here was copied from kc705, maybe a different one would be any better?
sb10q commented 2021-10-13 16:16:55 +08:00
Outdated
Review
Copy Link

Can't recall why it's 2 on KC705. I suggest using the same LED index as in the former Simple target.

Can't recall why it's 2 on KC705. I suggest using the same LED index as in the former Simple target.
mwojcik commented 2021-10-13 16:25:20 +08:00
Outdated
Review
Copy Link

Former Simple target used all of them:

src/gateware/zc706.py Line 510 in ab0c205dd2
phy = ttl_simple.Output(platform.request("user_led_33", i))

Former Simple target used all of them: https://git.m-labs.hk/M-Labs/artiq-zynq/src/commit/ab0c205dd23c8baa7070053e7f53cfa81e1755ed/src/gateware/zc706.py#L510
sb10q commented 2021-10-13 16:25:49 +08:00
Outdated
Review
Copy Link

Okay, then the example kernel used 0 :)

Okay, then the example kernel used 0 :)
phy = ttl_simple.Output(platform.request("user_led_33", 2)) phy = ttl_simple.Output(platform.request("user_led_33", 2))
@ -548,9 +560,10 @@ class _NIST_QC2_RTIO:
self.submodules += phy self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512)) rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
# phy = ttl_serdes_7series.InOut_8X(platform.request("user_sma_gpio_n_33")) # no SMA GPIO, replaced with PMOD1_0
# self.submodules += phy phy = ttl_serdes_7series.InOut_8X(platform.request("pmod1_33", 0))
# rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512)) self.submodules += phy
rtio_channels.append(rtio.Channel.from_phy(phy, ififo_depth=512))
phy = ttl_simple.Output(platform.request("user_led_33", 2)) phy = ttl_simple.Output(platform.request("user_led_33", 2))
self.submodules += phy self.submodules += phy