Skip to content

Commit

Permalink
Merge #428
Browse files Browse the repository at this point in the history
428: docs: the Keithley 2000 feed:control command is part of the trace sub… r=MatthieuDartiailh a=MatthieuDartiailh

…command group

Co-authored-by: MatthieuDartiailh <marul@laposte.net>
  • Loading branch information
bors[bot] and MatthieuDartiailh committed Jul 17, 2019
2 parents dc27950 + e082fb7 commit db85a9d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/source/introduction/example.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ SCPI and/or Keithley 2000 manual.
>>> keithley.write("trigger:source bus")
>>> keithley.write("trigger:delay %f" % (interval_in_ms / 1000.0))
>>> keithley.write("trace:points %d" % number_of_readings)
>>> keithley.write("trace:feed sense1; feed:control next")
>>> keithley.write("trace:feed sense1; trace:feed:control next")
Okay, now the instrument is prepared to do the measurement. The next
three lines make the instrument waiting for a trigger pulse, trigger
Expand Down Expand Up @@ -66,7 +66,7 @@ register, so that it's ready for a new run. Again, this is explained
in detail in the instrument's manual::

>>> keithley.query("status:measurement?")
>>> keithley.write("trace:clear; feed:control next")
>>> keithley.write("trace:clear; trace:feed:control next")

That's it. 18 lines of lucid code. (Well, SCPI is awkward, but
that's another story.)
2 changes: 1 addition & 1 deletion pyvisa/resources/messagebased.py
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ def read_bytes(self, count, chunk_size=None, break_on_termchar=False):
:type chunk_size: int
:param break_on_termchar: Should the reading stop when a termination
character is encountered.
:type brak_on_termchar: bool
:type break_on_termchar: bool
:rtype: bytes
Expand Down

0 comments on commit db85a9d

Please sign in to comment.