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: 3933ff5cba6c
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: d646984471e2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 19, 2015

  1. Copy the full SHA
    188a9fb View commit details
  2. manual: link cleanup

    fallen committed Jun 19, 2015
    Copy the full SHA
    d646984 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 doc/manual/ndsp_reference.rst
6 changes: 5 additions & 1 deletion doc/manual/ndsp_reference.rst
Original file line number Diff line number Diff line change
@@ -101,12 +101,16 @@ First, run the TDC001 controller::
On Windows the serial port (the ``-d`` argument) will be of the form ``COMx``.

.. note::
Anything compatible `with serial_for_url <http://pyserial.sourceforge.net/pyserial_api.html#serial.serial_for_url>`_
Anything compatible with `serial_for_url <http://pyserial.sourceforge.net/pyserial_api.html#serial.serial_for_url>`_
can be given as a device in ``-d`` argument.

For instance, if you want to specify the Vendor/Product ID and the USB Serial Number, you can do:

``-d "hwgrep://<VID>:<PID> SNR=<serial_number>"``.
for instance:

``-d "hwgrep://0403:faf0 SNR=83852734"``

The hwgrep URL works on both Linux and Windows.

Then, send commands to it via the ``artiq_rpctool`` utility::