Skip to content

Commit 6f4ff66

Browse files
committed
Docs bugfixes
1 parent 45b30d3 commit 6f4ff66

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.pylintdict

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,3 +425,6 @@ bifi
425425
wavemeters
426426
bitflow
427427
Elliptec
428+
autoloop
429+
minsamp
430+
chandim

pylablib/devices/NI/daq.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ def set_voltage_outputs(self, names, values, minsamp=1, force_restart=True, sing
648648
In this case, if the supplied waveform is shorter than the number of samples, it gets repeated; if it's longer, it gets cut off.
649649
minsamp: in non-autoloop mode, specifies the minimal number of samples to write to the output buffer; if the length of `values` is
650650
less than this number, than the waveform is repeated by a required integer number of times to produce at least `minsamp` samples
651-
force_restart: if ``True``, restart the output after writing to immediately start otuputting the new waveforms;
651+
force_restart: if ``True``, restart the output after writing to immediately start outputting the new waveforms;
652652
otherwise, add it to the end of the buffer; only applies in non-autoloop mode (autoloop mode always restarts)
653653
single_shot: specifies some number of samples from the start as "single-shot", so whenever the waveform is repeated
654654
(either to reach `minsamp` samples, or when :meth:`fill_voltage_output_buffer` is called), this part is ignored, and only the rest is repeated
@@ -713,10 +713,10 @@ def setup_voltage_output_clock(self, rate=0, sync_with_ai=False, continuous=True
713713
samps_per_chan: if ``continuous==False``, it determines number of samples to output before stopping;
714714
otherwise, it determines the size of the output buffer
715715
autoloop: if it is ``True``, then the specified output waveforms are automatically repeated to create a periodic output signal
716-
(referred to as "regeneration mode" in NI DAQ terminology); otherwise, written output data is "exhausted" onse sent to the output,
716+
(referred to as "regeneration mode" in NI DAQ terminology); otherwise, written output data is "exhausted" once sent to the output,
717717
so the application needs to continuously write output waveforms to avoid output buffer from running empty (which causes an error).
718-
This mode gives better control over the output and allows to seamlesly adjust it in real time, but it is more demanding on the application.
719-
minsamp: if the waveform has been specified before, this argument sets th minimal number of samples to write to the output buffer
718+
This mode gives better control over the output and allows to seamlessly adjust it in real time, but it is more demanding on the application.
719+
minsamp: if the waveform has been specified before, this argument sets the minimal number of samples to write to the output buffer
720720
after the clock is set up and the output is restarted
721721
"""
722722
if not len(self.ao_task.ao_channels):

pylablib/devices/Thorlabs/kinesis.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ def _model_match(self, model_no, port_model_no):
195195
def get_device_info(self, dest="host"):
196196
"""
197197
Get device info.
198+
199+
Return tuple ``(serial_no, model_no, fw_ver, hw_type, hw_ver, mod_state, nchannels, notes)``.
198200
"""
199201
data=self.query(0x0005,dest=dest).data
200202
serial_no,=struct.unpack("<I",data[:4])

0 commit comments

Comments
 (0)