Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a618a6d03ab7
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 878ab9a39b6c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 10, 2016

  1. gui/moninj: fix datagram offset computation (#325)

    @sbourdeauducq
    sbourdeauducq committed Mar 10, 2016
    Copy the full SHA
    065cbfb View commit details

  2. manual: document DDS and SPI RTIO channels

    @sbourdeauducq
    sbourdeauducq committed Mar 10, 2016
    Copy the full SHA
    878ab9a View commit details
Showing with 11 additions and 2 deletions.
  1. +2 −2 artiq/gui/moninj.py
  2. +9 −0 doc/manual/core_device.rst
4 changes: 2 additions & 2 deletions artiq/gui/moninj.py
View file
Original file line number Diff line number Diff line change
@@ -296,8 +296,8 @@ def datagram_received(self, data, addr):
ndds = len(dds_data)//4
ftws = struct.unpack(">" + "I"*ndds, dds_data)
for w in self.dm.dds_widgets.values():
offset = (dds_channels_per_bus*w.bus_channel
+ w.channel-dds_rtio_first_channel)
bus_nr = w.bus_channel - dds_rtio_first_channel
offset = dds_channels_per_bus*bus_nr + w.channel
try:
ftw = ftws[offset]
except KeyError:
9 changes: 9 additions & 0 deletions doc/manual/core_device.rst
View file
Original file line number Diff line number Diff line change
@@ -50,6 +50,10 @@ With the QC1 hardware, the TTL lines are mapped as follows:
| 19 | TTL15 | Clock |
+--------------+------------+--------------+

There are no SPI channels.

The DDS bus is on channel 20.

NIST CLOCK
++++++++++

@@ -105,6 +109,9 @@ To avoid I/O contention, the startup kernel should first program the TCA6424A ex

See :mod:`artiq.coredevice.i2c` for more details.

There are no SPI channels.

The QC2 hardware has two DDS buses, on channels TODO for LPC and TODO for HPC.

Pipistrello
-----------
@@ -149,3 +156,5 @@ Interface Type 2 (SPI) and 2A (expanded SPI):
+==============+========+========+========+========+
| 23 | PMOD_0 | PMOD_1 | PMOD_2 | PMOD_3 |
+--------------+--------+--------+--------+--------+

The DDS bus is on channel 24.