From 40370c4d457f5038d107fe57ad55e8a67d8b6974 Mon Sep 17 00:00:00 2001 From: Drew Date: Tue, 8 Jan 2019 22:39:23 -0500 Subject: [PATCH] Docs: fix build warnings (#1234) * ad9910: finish CONT_RECIRCULATE -> CONT_RAMPUP Found while building docs. Forgot to refactor strings. Signed-off-by: Drew Risinger * spi2: reformat update_xfer_duration_mu docstring update_xfer_duration_mu docstring threw warning while building docs, didn't use consistent indent in warning. Signed-off-by: Drew Risinger --- artiq/coredevice/ad9910.py | 2 +- artiq/coredevice/spi2.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artiq/coredevice/ad9910.py b/artiq/coredevice/ad9910.py index 53073db3c..2021b2830 100644 --- a/artiq/coredevice/ad9910.py +++ b/artiq/coredevice/ad9910.py @@ -441,7 +441,7 @@ class AD9910: :param mode: Profile RAM mode (:const:`RAM_MODE_DIRECTSWITCH`, :const:`RAM_MODE_RAMPUP`, :const:`RAM_MODE_BIDIR_RAMP`, :const:`RAM_MODE_CONT_BIDIR_RAMP`, or - :const:`RAM_MODE_CONT_RECIRCULATE`, default: + :const:`RAM_MODE_CONT_RAMPUP`, default: :const:`RAM_MODE_RAMPUP`) """ hi = (step << 8) | (end >> 2) diff --git a/artiq/coredevice/spi2.py b/artiq/coredevice/spi2.py index d6024b607..aa1045973 100644 --- a/artiq/coredevice/spi2.py +++ b/artiq/coredevice/spi2.py @@ -187,10 +187,10 @@ class SPIMaster: :meth:`__init__`. .. warning:: If this method is called while recording a DMA - sequence, the playback of the sequence will not update the - driver state. - When required, update the driver state manually (by calling - this method) after playing back a DMA sequence. + sequence, the playback of the sequence will not update the + driver state. + When required, update the driver state manually (by calling + this method) after playing back a DMA sequence. :param div: SPI clock divider (see: :meth:`set_config_mu`) :param length: SPI transfer length (see: :meth:`set_config_mu`)