Commit fad5b210 authored by Theodor-Adrian Stana's avatar Theodor-Adrian Stana

doc: Corrected things in user guide

- corrected small errors (readreg instead of writereg in "Remote reset"
  section, various typos
- added a little bit of info
- made "Revision history", "List of abbreviations" and "References"
  sections appear in the Contents and the bookmarks of the .pdf
- also made Contents appear in bookmarks, without it appearing in the
  actual Contents
parent 86e7cd48
conv-ttl-rs485-gw @ c1f2d83b
Subproject commit 0eb92bce369caf898f90a30db30da7d00d8ffc32 Subproject commit c1f2d83b47ec44058c303d409ac20fca6402b878
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
\noindent \rule{\textwidth}{.1cm} \noindent \rule{\textwidth}{.1cm}
\hfill August 8, 2014 \hfill August 12, 2014
\vspace*{3cm} \vspace*{3cm}
......
This diff is collapsed.
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="1.4" inkscape:zoom="2.8"
inkscape:cx="188.59632" inkscape:cx="123.49192"
inkscape:cy="222.30013" inkscape:cy="120.21815"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
...@@ -533,23 +533,6 @@ ...@@ -533,23 +533,6 @@
y="52.362183" y="52.362183"
style="font-size:6px;font-weight:normal;text-align:center;text-anchor:middle" style="font-size:6px;font-weight:normal;text-align:center;text-anchor:middle"
id="tspan4600">out[3]</tspan></text> id="tspan4600">out[3]</tspan></text>
<path
inkscape:connector-curvature="0"
id="path4602"
d="m 203,57.362183 0,20"
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutM)" />
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
x="203"
y="55.362183"
id="text4604"
sodipodi:linespacing="125%"><tspan
id="tspan4606"
sodipodi:role="line"
x="203"
y="55.362183"
style="font-size:6px;font-weight:normal;text-align:center;text-anchor:middle">in</tspan></text>
<path <path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutM)" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutM)"
d="m 230,79.420183 0,-20" d="m 230,79.420183 0,-20"
...@@ -577,23 +560,6 @@ ...@@ -577,23 +560,6 @@
y="52.362183" y="52.362183"
x="230" x="230"
sodipodi:role="line">out[6]</tspan></text> sodipodi:role="line">out[6]</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutM)"
d="m 394,57.362183 0,20"
id="path4618"
inkscape:connector-curvature="0" />
<text
sodipodi:linespacing="125%"
id="text4620"
y="55.362183"
x="394"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan
style="font-size:6px;font-weight:normal;text-align:center;text-anchor:middle"
y="55.362183"
x="394"
sodipodi:role="line"
id="tspan4622">in</tspan></text>
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path4624" id="path4624"
...@@ -689,23 +655,6 @@ ...@@ -689,23 +655,6 @@
y="89.546265" y="89.546265"
style="font-size:6px;font-weight:bold">3x OUT</tspan></text> style="font-size:6px;font-weight:bold">3x OUT</tspan></text>
</g> </g>
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#TriangleOutM)"
d="m 273,57.362183 0,20"
id="path5408"
inkscape:connector-curvature="0" />
<text
sodipodi:linespacing="125%"
id="text5410"
y="55.362183"
x="273"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan
style="font-size:6px;font-weight:normal;text-align:center;text-anchor:middle"
y="55.362183"
x="273"
sodipodi:role="line"
id="tspan5412">in</tspan></text>
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path5414" id="path5414"
......
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
% Revision history % Revision history
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
\thispagestyle{empty} \pagebreak
\addcontentsline{toc}{section}{Revision history}
\section*{Revision history} \section*{Revision history}
\centerline \centerline
...@@ -59,18 +60,19 @@ ...@@ -59,18 +60,19 @@
\multicolumn{1}{c}{\textbf{Date}} & \multicolumn{1}{c}{\textbf{Version}} & \multicolumn{1}{c}{\textbf{Change}} \\ \multicolumn{1}{c}{\textbf{Date}} & \multicolumn{1}{c}{\textbf{Version}} & \multicolumn{1}{c}{\textbf{Change}} \\
\hline \hline
08-08-2014 & 0.1 & First draft, gateware release v0.0 \\ 08-08-2014 & 0.1 & First draft, gateware release v0.0 \\
12-08-2014 & 1.0 & First release, after small error corrections (\textit{writereg} instead of \textit{readreg}
in Section~\ref{sec:diag-remote-reset}, and typo in Section~\ref{sec:reprog-bitstreams}), and
addition of how to read gateware version in Section~\ref{sec:reprog-bitstreams} \\
\hline \hline
\end{tabular} \end{tabular}
} }
\pagebreak
\pagenumbering{roman}
\setcounter{page}{1}
\tableofcontents
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
% List of figs, tables % List of figs, tables
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
\pagebreak
\pdfbookmark[1]{\contentsname}{toc}
\tableofcontents
\listoffigures \listoffigures
\listoftables \listoftables
...@@ -78,7 +80,7 @@ ...@@ -78,7 +80,7 @@
% List of abbreviations % List of abbreviations
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
\pagebreak \pagebreak
\section*{List of Abbreviations} \section*{List of abbreviations}
\begin{tabular}{l l} \begin{tabular}{l l}
FPGA & Field-Programmable Gate Array \\ FPGA & Field-Programmable Gate Array \\
FM & Front Module (VME board) \\ FM & Front Module (VME board) \\
...@@ -93,14 +95,12 @@ ...@@ -93,14 +95,12 @@
VME & VERSAmodule Eurocard \\ VME & VERSAmodule Eurocard \\
WR & White Rabbit \\ WR & White Rabbit \\
\end{tabular} \end{tabular}
\addcontentsline{toc}{section}{List of abbreviations}
\pagebreak
\pagenumbering{arabic}
\setcounter{page}{1}
%============================================================================== %==============================================================================
% SEC: Intro % SEC: Intro
%============================================================================== %==============================================================================
\pagebreak
\section{Introduction} \section{Introduction}
\label{sec:intro} \label{sec:intro}
...@@ -159,7 +159,7 @@ on gateware release v0.0 (see the gateware releases page~\cite{conv-ttl-rs485-gw ...@@ -159,7 +159,7 @@ on gateware release v0.0 (see the gateware releases page~\cite{conv-ttl-rs485-gw
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
\subsection*{Additional documentation} \subsection{Additional documentation}
%------------------------------------------------------------------------------ %------------------------------------------------------------------------------
\begin{itemize} \begin{itemize}
...@@ -748,7 +748,7 @@ An example of resetting a card in slot 11 using the Telnet commands is given bel ...@@ -748,7 +748,7 @@ An example of resetting a card in slot 11 using the Telnet commands is given bel
\begin{verbatim} \begin{verbatim}
%>writereg 11 8 1 %>writereg 11 8 1
Done! Done!
%>readreg 11 8 2 %>writereg 11 8 2
Not acknoledged! Not acknoledged!
\end{verbatim} \end{verbatim}
...@@ -906,7 +906,7 @@ The FPGA on-board the CONV-TTL-RS485 is configured by bitstreams downloaded from ...@@ -906,7 +906,7 @@ The FPGA on-board the CONV-TTL-RS485 is configured by bitstreams downloaded from
on-board flash chip. There are two bitstreams relevant to the user. on-board flash chip. There are two bitstreams relevant to the user.
The first is the application bitstream, which is the bitstream that runs when the The first is the application bitstream, which is the bitstream that runs when the
card is powered up. It is also the bitstream that the user loads loads to the card is powered up. It is also the bitstream that the user loads to the
CONV-TTL-RS485 flash when using remote reprogramming. CONV-TTL-RS485 flash when using remote reprogramming.
The second bitstream is the Golden bitstream, which is a bitstream known to be safe in The second bitstream is the Golden bitstream, which is a bitstream known to be safe in
...@@ -920,6 +920,9 @@ Note however that if the FPGA falls back to this Golden bitstream, even ...@@ -920,6 +920,9 @@ Note however that if the FPGA falls back to this Golden bitstream, even
if a new application bitstream is correctly loaded to the CONV-TTL-RS485 flash chip, if a new application bitstream is correctly loaded to the CONV-TTL-RS485 flash chip,
a power-cycle will be needed to run this new bitstream. a power-cycle will be needed to run this new bitstream.
To detect which bitstream is currently running, read the GWVERS field in the
board's status register (SR -- see Appendix~\ref{app:conv-regs-sr}).
%-------------------------------------------------------------------------------------- %--------------------------------------------------------------------------------------
% SUBSEC: Don't program bitstreams w/o the ICAP % SUBSEC: Don't program bitstreams w/o the ICAP
%-------------------------------------------------------------------------------------- %--------------------------------------------------------------------------------------
...@@ -998,9 +1001,9 @@ MultiBoot-enabled design. ...@@ -998,9 +1001,9 @@ MultiBoot-enabled design.
\subsection{Timing distribution} \subsection{Timing distribution}
Due to the channel pass-through architecture of the pulse repetition logic, the Due to the channel pass-through architecture of the pulse repetition logic, the
CONV-TTL-RS485 can be used as a timing distribution system. Figure~\ref{fig:ex-timing} CONV-TTL-RS485 can be used as a timing distribution system, to distribute up to 18
shows an example setup for this. Up to 18 timing signals can be distributed by the timing signals out of one CONV-TTL-RS485 system. Figure~\ref{fig:ex-timing}
CONV-TTL-RS485 to up to 256 nodes on the network. shows an example setup for this.
\begin{figure}[h] \begin{figure}[h]
\centerline{\includegraphics[width=\textwidth]{fig/ex-timing}} \centerline{\includegraphics[width=\textwidth]{fig/ex-timing}}
...@@ -1025,8 +1028,6 @@ general-purpose inverter channels can be used. Figure~\ref{fig:ex-invert-ttl} sh ...@@ -1025,8 +1028,6 @@ general-purpose inverter channels can be used. Figure~\ref{fig:ex-invert-ttl} sh
setup for inverting TTL pulses into TTL-BAR on inverting channel A and repeating them setup for inverting TTL pulses into TTL-BAR on inverting channel A and repeating them
on front panel channel 6. on front panel channel 6.
The inverter channel will add a 30~ns delay to the input TTL signal.
%============================================================================== %==============================================================================
% APP: Memmap % APP: Memmap
%============================================================================== %==============================================================================
...@@ -1082,5 +1083,6 @@ $reg. index = \frac{addr}{4} + 1$ ...@@ -1082,5 +1083,6 @@ $reg. index = \frac{addr}{4} + 1$
\pagebreak \pagebreak
\bibliographystyle{ieeetr} \bibliographystyle{ieeetr}
\bibliography{ug-conv-ttl-rs485} \bibliography{ug-conv-ttl-rs485}
\addcontentsline{toc}{section}{References}
\end{document} \end{document}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment