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: ngscopeclient/scopehal-docs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1f1953654a64
Choose a base ref
...
head repository: ngscopeclient/scopehal-docs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab008c184c9f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Dec 16, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ab008c1 View commit details
Showing with 20 additions and 9 deletions.
  1. +6 −0 section-decodes.tex
  2. +14 −9 section-drivers.tex
6 changes: 6 additions & 0 deletions section-decodes.tex
Original file line number Diff line number Diff line change
@@ -763,6 +763,12 @@ \section{Fall}
\pagebreak
\section{FFT}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\pagebreak
\section{FIR}

Applies a finite-impulse-response filter to a signal.

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\pagebreak
\section{Frequency}
23 changes: 14 additions & 9 deletions section-drivers.tex
Original file line number Diff line number Diff line change
@@ -228,23 +228,28 @@ \subsection{lecroy}

\section{Tektronix}

This driver is being primarily developed on a MSO64. It supports raw SCPI over TCP using the ``lan" transport,
using port 4000 by default rather than the IANA standard of 5025, as well as LXI VXI-11. It may also work via USBTMC,
but this have never been tested.

Note that the default settings for raw SCPI access on the MSO6 series use a full terminal emulator rather than raw SCPI
commands. To remove the prompts and help text, go to Utility | I/O, then under the Socket Server panel select protocol
``None" rather than the default of ``Terminal". Alternatively, use the LXI transport rather than raw SCPI.
This driver is being primarily developed on a MSO64. It supports raw SCPI over LXI VXI-11. It may also work via USBTMC,
but this have never been tested. Use of the ``lan" transport is not recommended due to observed stability issues.

\begin{tabularx}{16cm}{lllX}
\thickhline
\textbf{Device Family} & \textbf{Driver} & \textbf{Transport} & \textbf{Notes} \\
\thickhline
MSO5 series & tektronix & lan, lxi & \\
MSO5 series & tektronix & lxi & \\
\thickhline
MSO6 series & tektronix & lan, lxi & \\
MSO6 series & tektronix & lxi & \\
\thickhline
\end{tabularx}

\subsection{Note regarding ``lan" transport on MSO5/6}

The default settings for raw SCPI access on the MSO6 series use a full terminal emulator rather than raw SCPI
commands. To remove the prompts and help text, go to Utility | I/O, then under the Socket Server panel select protocol
``None" rather than the default of ``Terminal".

Additionally, we have seen some stability issues with the ``lan" transport which appear to be due to synchronization
bugs in the firmware when multiple commands (especially enabling/disabling channels) are batched into the same TCP
segment or sent closely enough that they are processed concurrently on the instrument.

\section{Xilinx}
TODO (scopehal:40)