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: 32c642c5a128
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: c283bd9e9d10
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on May 25, 2020

  1. Copy the full SHA
    c283bd9 View commit details
Showing with 28 additions and 9 deletions.
  1. +12 −7 section-drivers.tex
  2. +6 −2 section-legal.tex
  3. +10 −0 section-transports.tex
19 changes: 12 additions & 7 deletions section-drivers.tex
Original file line number Diff line number Diff line change
@@ -30,13 +30,13 @@ \subsubsection{agilent}

\subsection{Antikernel Labs}

So far only the ILA IP is supported.

\begin{tabularx}{16cm}{llX}
\thickhline
\textbf{Device Family} & \textbf{Driver} & \textbf{Notes} \\
\thickhline
Internal Logic Analyzer & akila & \\
Internal Logic Analyzer IP & akila & \\
\thickhline
BLONDEL Oscilloscope Prototype & aklabs & \\
\thickhline
\end{tabularx}

@@ -48,6 +48,11 @@ \subsubsection{akila}
system. Since there's no UART support in scopehal yet, socat must be used to bridge the UART to a TCP socket using
the ``lan" transport.

\subsubsection{aklabs}

This driver uses two TCP sockets. Port 5025 is used for SCPI control plane traffic, and port 50101 is used for waveform
data using a raw binary protocol.

\subsection{Enjoy Digital}
TODO (scopehal:79)

@@ -78,12 +83,12 @@ \subsection{Siglent}
\thickhline
\textbf{Device Family} & \textbf{Driver} & \textbf{Notes} \\
\thickhline
SDS-1000X-E series & siglent & Base functionality present.\\
SDS-1000X-E series & siglent & Base functionality present, tested on SDS-1204X-E.\\
\thickhline
SDS3000 series & siglent & Requires LXI transport \\
\thickhline
\end{tabularx}

Tested on SDS-1204X-E.

\subsection{Teledyne LeCroy / LeCroy}

Teledyne LeCroy (and older LeCroy) devices use the same driver, but two different transports for LAN connections.
@@ -134,7 +139,7 @@ \subsubsection{lecroy}

This driver has been tested on a wide range of Teledyne LeCroy / LeCroy hardware including DDA 5005, DDA 5005A,
WaveSurfer 3034, WaveRunner 8104, and HDO9204. It should be compatible with any Teledyne LeCroy or LeCroy oscilloscope
running Windows XP or newer and the MAUI or XStream software.d!
running Windows XP or newer and the MAUI or XStream software.

\subsection{Tektronix}
TODO (scopehal:73, scopehal:13)
8 changes: 6 additions & 2 deletions section-legal.tex
Original file line number Diff line number Diff line change
@@ -39,5 +39,9 @@ \subsection{Trademarks}
\subsection{Third Party Licenses}

TODO:
yaml-cpp (shared, MIT license)
gtkmm (shared, LGPL)
\begin{itemize}
\item yaml-cpp (shared, MIT license)
\item gtkmm (shared, LGPL)
\item FFTS (shared, BSD-3)
\item liblxi (shared, BSD-3/EPICS)
\end{itemize}
10 changes: 10 additions & 0 deletions section-transports.tex
Original file line number Diff line number Diff line change
@@ -10,6 +10,16 @@ \subsection{lan}
If port number is not specified, uses TCP port 5025 (IANA assigned) by default. Note that Rigol oscilloscopes use the
non-standard port 5555, not 5025, so the port number must always be specified when using a Rigol instrument.

\subsection{lxi}

SCPI over LXI VXI-11.

Note that due to the remote procedure call paradigm used by LXI, it is not possible to batch multiple outstanding
requests to an instrument when using this transport. Some instruments may experience reduced performance when using LXI
as the transport.

TODO: document this more completely.

\subsection{vicp}

SCPI over Teledyne LeCroy Virtual Instrument Control Protocol.