Skip to content

Commit 2b41785

Browse files
committed
Updating links and general cleanup of Marble Test Guide.
1 parent a5bbfb3 commit 2b41785

3 files changed

Lines changed: 38 additions & 35 deletions

File tree

docs/marble_test_guide/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
all: Marble_Test_Guide.pdf
2+
3+
%.pdf: %.tex
4+
pdflatex -interaction nonstopmode -halt-on-error -file-line-error $<
5+
6+
clean:
7+
rm *.pdf
-433 Bytes
Binary file not shown.

docs/marble_test_guide/Marble_Test_Guide.tex

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747

4848
\clearpage
4949

50-
\section{Overview to Marble module}
50+
\section{Overview}
5151

5252
\begin{leftbar}
53-
Design files are open source and can be download from GitHub:
53+
Design files are open source and can be downloaded from GitHub:
5454

5555
https://github.com/BerkeleyLab/Marble
5656
\end{leftbar}
@@ -63,9 +63,9 @@ \section{Overview to Marble module}
6363
\end{leftbar}
6464

6565
\subsection{Hardware requirements}
66-
To perform all of the tests following hardware are required:
66+
To perform all tests the following hardware is required:
6767
\begin{enumerate}
68-
\item Lab bench power supply.
68+
\item Lab bench-top power supply.
6969
\item Micro USB cable.
7070
\item QSFP loopback module.
7171
\item FMC Tester module.
@@ -75,7 +75,7 @@ \subsection{Hardware requirements}
7575
\end{enumerate}
7676

7777
\subsection{Software requirements}
78-
To perform all of the tests following software are required:
78+
To perform all tests the following software is required:
7979
\begin{enumerate}
8080
\item Vivado 19.1.
8181
\item Serial port terminal.
@@ -107,23 +107,23 @@ \section{Microcontroller programing}
107107

108108
Download the latest version of the microcontroller testing code from GitHub:
109109
\begin{leftbar}
110-
https://https://gitlab.lbl.gov/spaiagua/marble\_mmc/-/tree/i2c\_rework
110+
https://gitlab.lbl.gov/spaiagua/marble\_mmc/-/tree/unified\_marble
111111
\end{leftbar}
112112

113113
A recent version of OpenOCD (v0.10.0 or later) is required.
114114
\begin{enumerate}
115-
\item Connect JTAG module to \textbf{J14} like it is shown on Figure \ref{23}.
116-
\item Connect the micro USB cable and using the serial terminal, connect to the last serial port for the new listed in the operating system. Use 115200 baudrate.
115+
\item Connect JTAG module to \textbf{J14} as shown on Figure \ref{23}.
116+
\item Connect the micro USB cable and using the serial terminal, connect to the last serial port for the new listed device in the operating system. Use 115200 baudrate.
117117
\item Power up the board.
118118
\item Program the microcontroller using the following commands:
119119
\begin{enumerate}
120120
\item Go to the main folder of the downloaded repository.
121-
\item Open command terminal and run command:
121+
\item From the command line, run the following:
122122
\begin{lstlisting}[backgroundcolor = \color{Gainsboro}, language=bash, frame=none]]
123123
$ make download
124124
\end{lstlisting}
125125
\end{enumerate}
126-
\item After the successful programming, a menu in the serial terminal should appeared and LEDs (LD15, LD11, LD12) should blink in the "snake" pattern.
126+
\item After successful programming, a menu in the serial terminal should appear and LEDs (LD15, LD11, LD12) should blink.
127127
\end{enumerate}
128128

129129
\begin{figure}[H]
@@ -136,7 +136,7 @@ \section{Microcontroller programing}
136136

137137

138138
\section{Power Supply programing}
139-
Before doing the steps below, it is highly recommended to measure if there are no shorts on power rails. Measure resistance between the test points:
139+
Before doing the steps below it is highly recommended to verify that there are no shorts on the power rails. This can be done by measuring the resistance between the test points:
140140

141141
\begin{enumerate}
142142
\item \textbf{TP12 (GND)} and \textbf{TP7 (+2V0)}.
@@ -158,15 +158,15 @@ \section{Power Supply programing}
158158
\end{center}
159159
\end{figure}
160160

161-
Perform the following steps only and exclusively when there are no shorts on the power rails!
161+
\textbf{Warning:} Only perform the following steps if there are no shorts on the power rails.
162162
\begin{enumerate}
163-
\item Connect the micro USB cable and using the serial terminal, connect to the last serial port for the new listed in the operating system. Use 115200 baudrate.
164-
\item Set up voltage to 12V and the current limit to 1A on lab power supply.
163+
\item Connect the micro USB cable and, using the serial terminal, connect to the last serial port for the new device listed in the operating system. Use 115200 baudrate.
164+
\item Set up voltage to 12V and the current limit to 1A on a lab power supply.
165165
\item Power up the board.
166166
\item From the menu displayed in the serial terminal, select the option \menu{g) XRP7724 go}.
167-
\item Make a power cycle by turning off and on the lab power supply.
168-
\item All power LED indicators should be on (Figure \ref{leds}).
169-
\item Using multimeter measure voltage between points:
167+
\item Power cycle by turning the lab power supply Off and then On.
168+
\item All power LED indicators should be On (Figure \ref{leds}).
169+
\item Using multimeter measure the voltage between the test points:
170170
\begin{enumerate}
171171
\item \textbf{TP12 (GND)} and \textbf{TP7 (+2V0)} - expected voltage: +2.0V.
172172
\item \textbf{TP12 (GND)} and \textbf{TP9 (+1V0)} - expected voltage: +1.0V.
@@ -191,7 +191,7 @@ \section{Power Supply programing}
191191
\section{FPGA programing}
192192
Download the latest version of the FPGA testing code from GitHub:
193193
\begin{leftbar}
194-
https://github.com/BerkeleyLab/Bedrock/tree/marblev2
194+
https://github.com/BerkeleyLab/Bedrock/
195195
\end{leftbar}
196196

197197
\begin{leftbar}
@@ -202,13 +202,13 @@ \subsection{FMC test}
202202
Board power should be turned off when inserting and removing the FMC module.
203203
\end{leftbar}
204204
\begin{enumerate}
205-
\item Plug FMC Tester module to one of the FMC connector as it is shown on Figure \ref{fig:example}.
206-
\item Connect the micro USB cable and using the serial terminal, connect to the last serial port for the new listed in the operating system. Use 115200 baudrate.
207-
\item Change the network adapter settings to connect with static \textbf{192.168.9.10} IP address.
205+
\item Plug FMC Tester module to one of the FMC connectors as shown on Figure \ref{fig:example}.
206+
\item Connect the micro USB cable and, using the serial terminal, connect to the last serial port for the new device listed in the operating system. Use 115200 baudrate.
207+
\item Change the network adapter settings to connect with static IP address \textbf{192.168.9.10}.
208208
\item Connect Marble to the computer using an Ethernet cable.
209209
\item Power up the board.
210210
\item In the serial terminal menu choose \menu{4) GPIO control
211-
>a) FMC power} to turn on power for FMCs.
211+
>a) FMC power} to turn on power to the FMCs.
212212
\item Program the FPGA using the following steps:
213213
\begin{enumerate}
214214
\item Go to the folder \textbf{Bedrock/projects/test\_marble\_family/}
@@ -217,7 +217,7 @@ \subsection{FMC test}
217217
$ mutil usb
218218
\end{lstlisting}
219219
\end{enumerate}
220-
\item To make a test do the following steps:
220+
\item To run a test do the following steps:
221221
\begin{enumerate}
222222
\item Go to the folder \textbf{Bedrock/projects/test\_marble\_family/}
223223
\item To test P1 FMC connector run the following command:
@@ -236,7 +236,7 @@ \subsection{FMC test}
236236
\begin{figure}[H]
237237
\begin{center}
238238
\includegraphics[width=0.9\linewidth]{fmc_tester.png}
239-
\caption{FMC connectors with plugged FMC Tester board.}
239+
\caption{FMC connectors FMC Tester board plugged in.}
240240
\end{center}
241241
\end{figure}
242242

@@ -247,18 +247,18 @@ \subsection{QSFP test}
247247
\end{leftbar}
248248
\begin{enumerate}
249249
\item Plug QSFP loopback module to one of the ports.
250-
\item Plug FPGA JTAG module.
250+
\item Connect FPGA JTAG programmer.
251251
\item Configure FPGA using \texttt{marble\_ibert.bit} bit file.
252252
\begin{enumerate}
253253
\item Run Vivado
254254
\item Go to \menu{Flow>Open Hardware Manager} and then \menu{Tools>Auto Connect}
255255
\item Click \menu{Tools>Program Device>xc7k160t\_0} to open the programming window.
256256
\item Choose the \textit{bitstream file} and click \menu{Program}
257257
\end{enumerate}
258-
\item After the successful programming, the Dashboard should start automatically.
258+
\item After successful programming, the Dashboard should start automatically.
259259
\item Detect links by clicking \menu{Serial I/O Links>Auto-detect links}
260-
\item Correct detected and working links should look like in figure \ref{links}.
261-
\item Connect the QSFP loopback module to the other QSFP connector and repeat the above steps.
260+
\item Correctly detected and working links should appear as shown in figure \ref{links}.
261+
\item Connect the QSFP loopback module to the other QSFP connector and repeat the steps above.
262262
\end{enumerate}
263263

264264
\begin{figure}[H]
@@ -279,9 +279,9 @@ \subsection{Ethernet test}
279279
$ mutil usb
280280
\end{lstlisting}
281281
\end{enumerate}
282-
\item Change the network adapter settings to connect with static \textbf{192.168.9.10} IP address.
282+
\item Change the network adapter settings to connect with static IP address \textbf{192.168.9.10}.
283283
\item Connect Marble to the computer using an Ethernet cable.
284-
\item In Linux command terminal run:
284+
\item Ping the board:
285285
\begin{lstlisting}[backgroundcolor = \color{Gainsboro}, language=bash, frame=none]]
286286
$ ping 192.168.9.10
287287
\end{lstlisting}
@@ -314,10 +314,6 @@ \subsection{An alternative way to program FPGA}
314314
\item Click \menu{Tools>Program Device>xc7k160t\_0} to open the programming window.
315315
\item Choose the \textit{bitstream file} and click \menu{Program}
316316

317-
\item After the successful programming, the Dashboard should start automatically.
317+
\item After successful programming, the Dashboard should start automatically.
318318
\end{enumerate}
319-
\begin{thebibliography}{99}
320-
%\bibitem{web1} \url{http://bit.ly/PhysLab_Link01}
321-
%\bibitem{web2} \url{http://bit.ly/PhysLab_Link02}
322-
\end{thebibliography}
323319
\end{document}

0 commit comments

Comments
 (0)