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: 4cdf1c4b8178
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: b8bb3d8ca7fc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 19, 2015

  1. manual: style

    fallen committed Jun 19, 2015
    Copy the full SHA
    979f352 View commit details
  2. 3
    Copy the full SHA
    b8bb3d8 View commit details
Showing with 23 additions and 5 deletions.
  1. +3 −1 artiq/frontend/thorlabs_tcube_controller.py
  2. +20 −4 doc/manual/ndsp_reference.rst
4 changes: 3 additions & 1 deletion artiq/frontend/thorlabs_tcube_controller.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,9 @@ def get_argparser():
help="type of the Thorlabs T-Cube device to control",
choices=["TDC001", "TPZ001"])
parser.add_argument("-d", "--device", default=None,
help="serial port. Omit for simulation mode.")
help="serial device. See documentation for how to "
"specify a USB Serial Number. Omit for simulation "
"mode.")
simple_network_args(parser, 3255)
verbosity_args(parser)
return parser
24 changes: 20 additions & 4 deletions doc/manual/ndsp_reference.rst
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@ Lab Brick Digital Attenuator (LDA)

On Linux, you need to give your user access to the usb device.

You can do that by creating a file under /etc/udev/rules.d/ named 99-lda.rules
with the following content::
You can do that by creating a file under ``/etc/udev/rules.d/`` named
``99-lda.rules`` with the following content::

SUBSYSTEM=="usb", ATTR{idVendor}=="041f", MODE="0666"

@@ -52,9 +52,9 @@ Then, to run the Lab Brick Digital Attenuator (LDA) controller::
$ lda_controller -d SN:xxxxx

The serial number must contain 5 digits, prepend any number of 0 necessary.
Also, the "SN:" prefix is mandatory.
Also, the ``SN:`` prefix is mandatory.

You can chose the exact LDA model with the -P parameter. The default being LDA-102.
You can chose the exact LDA model with the ``-P`` parameter. The default being LDA-102.

Driver
++++++
@@ -88,6 +88,8 @@ Controller
Thorlabs T-Cube
---------------

.. _tdc001-controller-usage-example:

TDC001 controller usage example
+++++++++++++++++++++++++++++++

@@ -98,6 +100,15 @@ First, run the TDC001 controller::
.. note::
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>`_
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>``.
The hwgrep URL works on both Linux and Windows.

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

$ artiq_rpctool ::1 3255 list-targets
@@ -118,6 +129,11 @@ First, run the TPZ001 controller::
.. note::
On Windows the serial port (the ``-d`` argument) will be of the form ``COMx``.

.. note::
See the :ref:`TDC001 documentation <tdc001-controller-usage-example>` for
how to specify the USB Serial Number of the device instead of the
/dev/ttyUSBx (or the COMx name).

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

$ artiq_rpctool ::1 3255 list-targets