M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

taaccs slides: fix spelling, get rid of lab_hardware.jpg

This commit is contained in:
Robert Jördens 2014-10-30 16:06:22 -06:00 committed by Sebastien Bourdeauducq
parent 397f37311c
commit 29cd34079d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/slides/fig/lab_hardware.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 339 KiB

18
doc/slides/taaccs.tex
View File

@ -57,11 +57,19 @@ inner sep=.3mm] at (current page.south east) {%
\end{frame} \end{frame}
\begin{frame} \begin{frame}
\includegraphics[width=\columnwidth]{lab} \begin{tikzpicture}[box/.style={rectangle,fill=white}]
\end{frame} \node[inner sep=0] {\includegraphics[width=\columnwidth]{lab}};\pause
%\draw[help lines,white] (-4, -3) grid (4, 3);
\begin{frame} \node[box] at (-4, -2) {FPGA};
\includegraphics[width=\columnwidth]{lab_hardware} \node[box] at (3.5, 0) {ion trap};
\node[box] at (-3, 3) {$\sim$10 attenuators};
\node[box] at (2, 2) {$\sim$50 DAC};
\node[box] at (-4, 0) {$\sim$20 DDS};
\node[box] at (-2, 1) {$\sim$50 GPIO};
\node[box] at (.5, 0) {$\sim$10 motors};
\node[box] at (2, -2) {$\sim$10 power supplies};
\node[box] at (4, -3) {$\sim$10 lasers};
\end{tikzpicture}
\end{frame} \end{frame}
\begin{frame} \begin{frame}