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: 71721a152ed9
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: 064ddb48bd16
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 23, 2015

  1. rpc: fix indentation of class docstring

    @sbourdeauducq
    sbourdeauducq committed Jun 23, 2015
    Copy the full SHA
    4ba8951 View commit details

  2. manual: minor fixes

    @sbourdeauducq
    sbourdeauducq committed Jun 23, 2015
    Copy the full SHA
    064ddb4 View commit details
Showing with 5 additions and 4 deletions.
  1. +1 −0 artiq/frontend/artiq_rpctool.py
  2. +1 −1 artiq/protocols/pc_rpc.py
  3. +3 −3 doc/manual/ndsp_reference.rst
1 change: 1 addition & 0 deletions artiq/frontend/artiq_rpctool.py
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ def list_methods(remote):
doc = remote.get_rpc_method_list()
if doc["docstring"] is not None:
print(doc["docstring"])
print()
for name, (argspec, docstring) in sorted(doc["methods"].items()):
args = ""
for arg in argspec["args"]:
2 changes: 1 addition & 1 deletion artiq/protocols/pc_rpc.py
View file
Original file line number Diff line number Diff line change
@@ -443,7 +443,7 @@ def _handle_connection_cr(self, reader, writer):
if obj["action"] == "get_rpc_method_list":
members = inspect.getmembers(target, inspect.ismethod)
doc = {
"docstring": target.__doc__,
"docstring": inspect.getdoc(target),
"methods": {}
}
for name, method in members:
6 changes: 3 additions & 3 deletions doc/manual/ndsp_reference.rst
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ Client
Lab Brick Digital Attenuator (LDA)
----------------------------------

On Linux, you need to give your user access to the usb device.
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::
@@ -51,10 +51,10 @@ 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.
The serial number must contain exactly 5 digits, prepend it with the necessary number of 0s.
Also, the ``SN:`` prefix is mandatory.

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

Driver
++++++