move drawings in front of ARTIQ examples

And some additional reformatting.
This commit is contained in:
occheung 2022-01-07 17:25:24 +08:00
parent 3c21ccd4a0
commit 282b7bf244
3 changed files with 32 additions and 30 deletions

View File

@ -385,6 +385,16 @@ All specifications are in $0\degree C \leq T_A \leq 70\degree C$ unless otherwis
\end{threeparttable} \end{threeparttable}
\end{table} \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} \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. 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. They do not exhaustively demonstrate all the features of the ARTIQ system.
@ -404,8 +414,6 @@ def run(self):
delay(500*ms) delay(500*ms)
\end{minted} \end{minted}
\newpage
\subsection{Morse code} \subsection{Morse code}
This example demonstrates some basic algorithmic features of the ARTIQ-Python language. This example demonstrates some basic algorithmic features of the ARTIQ-Python language.
\begin{minted}{python} \begin{minted}{python}
@ -429,6 +437,8 @@ def run(self):
delay(700*ms) delay(700*ms)
\end{minted} \end{minted}
\newpage
\subsection{Counting rising edges in a 1ms window} \subsection{Counting rising edges in a 1ms window}
The channel should be configured as input in both the gateware and hardware. The channel should be configured as input in both the gateware and hardware.
@ -452,8 +462,6 @@ def run(self):
print(counts) print(counts)
\end{minted} \end{minted}
\newpage
\subsection{Responding to an external trigger} \subsection{Responding to an external trigger}
One channel needs to be configured as input, and the other as output. 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) self.ttlout.pulse(1*us)
\end{minted} \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} \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}. 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}.

View File

@ -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} \caption{Nyquist rejection 400 MHz to 600 MHz}
\end{figure} \end{figure}
\end{multicols}
\begin{figure}[H] \begin{figure}[H]
\centering \centering
\includegraphics[width=3.3in]{nyquist_rejection_450mhz.png} \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)} \caption{Attenuator step from 31 to 32 digital\\(major carry glitch)}
\end{figure} \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 \newpage
\section{Example ARTIQ code} \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. 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} \section{Ordering Information}
To order, please visit \url{https://m-labs.hk} and select the 4410 Urukul in the ARTIQ Sinara crate configuration tool. 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. The default chip is AD9910 (4410 Urukul), which supports more features.

View File

@ -210,6 +210,14 @@ Output noise are measured after 15 cm IDC cable, IDC-SMA, 100 cm coax ($\sim$50
\newpage \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} \section{Example ARTIQ code}
The sections below demonstrate simple usage scenarios of the 5432 Zotino card with the ARTIQ control system. 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. 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) self.zotino.set_dac(self.voltages, self.channels)
\end{minted} \end{minted}
\newpage
\subsection{Triangular Wave} \subsection{Triangular Wave}
A triangular waveform at 10 Hz, 16 V peak-to-peak. 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. 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) delay(self.interval)
\end{minted} \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} \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}. 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}.