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: 0b6739663066
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: 591268a193f3
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 25, 2017

  1. doc: fix table

    jordens committed Jan 25, 2017
    Copy the full SHA
    d1be2f1 View commit details
  2. Copy the full SHA
    37fc7d5 View commit details
  3. doc: use napoleon (for pdq2)

    jordens committed Jan 25, 2017
    Copy the full SHA
    591268a View commit details
Showing with 2 additions and 10 deletions.
  1. +1 −0 doc/manual/conf.py
  2. +0 −9 doc/manual/core_drivers_reference.rst
  3. +1 −1 doc/manual/default_network_ports.rst
1 change: 1 addition & 0 deletions doc/manual/conf.py
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ def __getattr__(cls, name):
'sphinx.ext.autodoc',
'sphinx.ext.mathjax',
'sphinx.ext.viewcode',
'sphinx.ext.napoleon',
'sphinxarg.ext',
'sphinxcontrib.wavedrom', # see also below for config
]
9 changes: 0 additions & 9 deletions doc/manual/core_drivers_reference.rst
Original file line number Diff line number Diff line change
@@ -18,9 +18,6 @@ These drivers are for the core device and the peripherals closely integrated int
:mod:`artiq.coredevice.dds` module
----------------------------------

.. autoclass:: artiq.coredevice.dds._DDSGeneric
:members:

.. automodule:: artiq.coredevice.dds
:members:

@@ -65,9 +62,3 @@ These drivers are for the core device and the peripherals closely integrated int

.. automodule:: artiq.coredevice.sawg
:members:

:mod:`artiq.coredevice.ad9154` module
-------------------------------------

.. automodule:: artiq.coredevice.ad9154
:members:
2 changes: 1 addition & 1 deletion doc/manual/default_network_ports.rst
Original file line number Diff line number Diff line change
@@ -31,5 +31,5 @@ Default network ports
| Thorlabs T-Cube | 3255 |
+--------------------------+--------------+
| Korad KA3005P | 3256 |
-------------------------------------------
+--------------------------+--------------+