From 282b7bf2444969baa0e6153bf7c1be99ccd0f457 Mon Sep 17 00:00:00 2001 From: occheung Date: Fri, 7 Jan 2022 17:25:24 +0800 Subject: [PATCH] move drawings in front of ARTIQ examples And some additional reformatting. --- 2118-2128.tex | 24 ++++++++++++------------ 4410-4412.tex | 20 ++++++++++---------- 5432.tex | 18 ++++++++++-------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/2118-2128.tex b/2118-2128.tex index b56cb67..f077903 100644 --- a/2118-2128.tex +++ b/2118-2128.tex @@ -385,6 +385,16 @@ All specifications are in $0\degree C \leq T_A \leq 70\degree C$ unless otherwis \end{threeparttable} \end{table} +\section{Front Panel Drawings} +\begin{figure}[hbt!] + \centering + \includegraphics[height=2.5in]{DIO_SMA_drawings.jpg} + \includegraphics[height=2.5in]{DIO_SMA_assembly.jpg} + \caption{2128 SMA-TTL front panel drawings.} +\end{figure} + +\newpage + \section{Example ARTIQ code} The sections below demonstrate simple usage scenarios of the 2118 BNC-TTL/2128 SMA-TTL card with the ARTIQ control system. They do not exhaustively demonstrate all the features of the ARTIQ system. @@ -404,8 +414,6 @@ def run(self): delay(500*ms) \end{minted} -\newpage - \subsection{Morse code} This example demonstrates some basic algorithmic features of the ARTIQ-Python language. \begin{minted}{python} @@ -429,6 +437,8 @@ def run(self): delay(700*ms) \end{minted} +\newpage + \subsection{Counting rising edges in a 1ms window} The channel should be configured as input in both the gateware and hardware. @@ -452,8 +462,6 @@ def run(self): print(counts) \end{minted} -\newpage - \subsection{Responding to an external trigger} One channel needs to be configured as input, and the other as output. @@ -467,14 +475,6 @@ def run(self): self.ttlout.pulse(1*us) \end{minted} -\section{Front Panel Drawings} -\begin{figure}[hbt!] - \centering - \includegraphics[height=2.5in]{DIO_SMA_drawings.jpg} - \includegraphics[height=2.5in]{DIO_SMA_assembly.jpg} - \caption{2128 SMA-TTL front panel drawings.} -\end{figure} - \section{Ordering Information} To order, please visit \url{https://m-labs.hk} and select the 2118 BNC-TTL/2128 SMA-TTL in the ARTIQ Sinara crate configuration tool. The card may also be ordered separately by writing to \url{mailto:sales@m-labs.hk}. diff --git a/4410-4412.tex b/4410-4412.tex index 30758ac..28cf6bb 100644 --- a/4410-4412.tex +++ b/4410-4412.tex @@ -603,8 +603,6 @@ Harmonic content of the DDS signals from 4410 Urukul is tabulated below. An exte \caption{Nyquist rejection 400 MHz to 600 MHz} \end{figure} -\end{multicols} - \begin{figure}[H] \centering \includegraphics[width=3.3in]{nyquist_rejection_450mhz.png} @@ -623,6 +621,16 @@ Harmonic content of the DDS signals from 4410 Urukul is tabulated below. An exte \caption{Attenuator step from 31 to 32 digital\\(major carry glitch)} \end{figure} +\end{multicols} + +\section{Front Panel Drawings} +\begin{figure}[hbt!] + \centering + \includegraphics[height=2.5in]{Urukul_drawings.jpg} + \includegraphics[height=2.5in]{Urukul_assembly.jpg} + \caption{4410 Urukul front panel drawings.} +\end{figure} + \newpage \section{Example ARTIQ code} @@ -930,14 +938,6 @@ The DDS channel is terminated with 50\textOmega. Note: DDS signal should be attenuated. High output power may affect the linearity. -\section{Front Panel Drawings} -\begin{figure}[hbt!] - \centering - \includegraphics[height=2.5in]{Urukul_drawings.jpg} - \includegraphics[height=2.5in]{Urukul_assembly.jpg} - \caption{4410 Urukul front panel drawings.} -\end{figure} - \section{Ordering Information} To order, please visit \url{https://m-labs.hk} and select the 4410 Urukul in the ARTIQ Sinara crate configuration tool. The default chip is AD9910 (4410 Urukul), which supports more features. diff --git a/5432.tex b/5432.tex index 1c26e05..46b08b6 100644 --- a/5432.tex +++ b/5432.tex @@ -210,6 +210,14 @@ Output noise are measured after 15 cm IDC cable, IDC-SMA, 100 cm coax ($\sim$50 \newpage +\section{Front Panel Drawings} +\begin{figure}[hbt!] + \centering + \includegraphics[height=2.5in]{Zotino_drawings.jpg} + \includegraphics[height=2.5in]{Zotino_assembly.jpg} + \caption{5432 Zotino front panel drawings.} +\end{figure} + \section{Example ARTIQ code} The sections below demonstrate simple usage scenarios of the 5432 Zotino card with the ARTIQ control system. They do not exhaustively demonstrate all the features of the ARTIQ system. @@ -234,6 +242,8 @@ def run(self): self.zotino.set_dac(self.voltages, self.channels) \end{minted} +\newpage + \subsection{Triangular Wave} A triangular waveform at 10 Hz, 16 V peak-to-peak. Timing accuracy of the RTIO system can be demonstrated by the precision of the frequency. @@ -263,14 +273,6 @@ def run(self): delay(self.interval) \end{minted} -\section{Front Panel Drawings} -\begin{figure}[hbt!] - \centering - \includegraphics[height=2.5in]{Zotino_drawings.jpg} - \includegraphics[height=2.5in]{Zotino_assembly.jpg} - \caption{5432 Zotino front panel drawings.} -\end{figure} - \section{Ordering Information} To order, please visit \url{https://m-labs.hk} and select the 5432 Zotino in the ARTIQ Sinara crate configuration tool. The card may also be ordered separately by writing to \url{mailto:sales@m-labs.hk}.