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: 95559e3d045c
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: 9fbd7f4480dc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 22, 2020

  1. Build instructions now specify "make -j4" rather than no limit, which…

    … should be reasonable on most systems.
    azonenberg committed Oct 22, 2020
    Copy the full SHA
    549cf1e View commit details
  2. Copy the full SHA
    9fbd7f4 View commit details
Showing with 22 additions and 5 deletions.
  1. +18 −1 section-drivers.tex
  2. +4 −4 section-gettingstarted.tex
19 changes: 18 additions & 1 deletion section-drivers.tex
Original file line number Diff line number Diff line change
@@ -59,10 +59,27 @@ \subsection{aklabs}

\section{Demo}

The ``demo" driver is a simulation-only driver for development purposes and does not connect to any hardware.
The ``demo" driver is a simulation-only driver for development and training purposes, and does not connect to any
hardware.

It ignores any transport provided, and is normally used with the ``null" transport.

The demo instrument is intended to illustrate the usage of glscopeclient for various types of analysis and to aid in
automated testing on computers which do not have a connection to a real oscilloscope, and is not intended to accurately
model the response or characteristics of real world scope frontends or signals.

It supports memory depths of 10K, 100K, 1M, and 10M points per waveform at rates of 1, 5, 10, 25, 50, and 100 Gsps.
Four test signals are provided, each with 10 mV of Gaussian noise added. As of now, there is no way to configure the
simulated signal generator.

Test signals:
\begin{itemize}
\item 1.000 GHz tone
\item 1.000 GHz tone mixed with a second tone, which sweeps from 1.100 to 1.500 GHz
\item 10.3125 Gbps PRBS-31
\item 1.25 Gbps repeating two 8B/10B symbols (K28.5 D16.2)
\end{itemize}

\begin{tabularx}{16cm}{lllX}
\thickhline
\textbf{Device Family} & \textbf{Driver} & \textbf{Transport} & \textbf{Notes} \\
8 changes: 4 additions & 4 deletions section-gettingstarted.tex
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ \subsection{Linux}
mkdir build
cd build
cmake ../
make -j
make -j4
sudo make install
\end{lstlisting}

@@ -82,7 +82,7 @@ \subsection{Linux}
mkdir build
cd build
cmake ../
make -j
make -j4
\end{lstlisting}

\item Install scopehal and scopehal-apps: right now, you don't. As of now, glscopeclient is intended to be run from the
@@ -121,7 +121,7 @@ \subsection{Windows}
mkdir build
cd build
cmake -G"MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$MSYSTEM_PREFIX ..
mingw32-make -j
mingw32-make -j4
mingw32-make install
\end{lstlisting}

@@ -133,7 +133,7 @@ \subsection{Windows}
cd build
cmake -G"MinGW Makefiles" -DLIBFFTS_INCLUDE_DIR=/mingw64/include/ \
-DLIBFFTS_LIBRARIES=/mingw64/lib/libffts_static.a ./..
mingw32-make -j
mingw32-make -j4
\end{lstlisting}

\item Copying binaries and running glscopeclient \\