Skip to content

Commit

Permalink
Merge branch 'master' of https://github.jpl.nasa.gov/ejunkins/osr
Browse files Browse the repository at this point in the history
  • Loading branch information
ericjunkins committed Jun 29, 2018
2 parents 27633ad + 47f5a63 commit 1ab9716
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 4 deletions.
Binary file modified Electrical/Latex Docs/PCB Testing/PCB Testing.pdf
Binary file not shown.
Binary file modified Electrical/PCB Testing.pdf
Binary file not shown.
Binary file modified Mechanical/Body Assembly/Body Build Doc.pdf
Binary file not shown.
Binary file modified Mechanical/Body Assembly/Latex Doc/Body Build Doc.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion Mechanical/Body Assembly/Latex Doc/Body Build Doc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ \subsection{Electronics Board}
\end{figure}
\end{enumerate}

Figure \ref{vm} shows how we mounted the volt meter, helping you check your pieces fitting together. If the voltmeter does not fit in this gap you can add additional washer to space the electronics board farther from the top plate.
Figure \ref{vm} shows how we mounted the volt meter as an example of how the pieces should fit together. If the volt meter does not fit in this gap, you can add additional washers from the previous step to space the electronics board farther from the top plate.
\begin{figure}[H]
\centering
\includegraphics[width=0.6\textwidth]{"Pictures/Body/voltmeter".PNG}
Expand Down
Binary file modified Mechanical/Head Assembly/Head Assembly Build Doc.pdf
Binary file not shown.
Binary file modified Mechanical/Head Assembly/Latex Docs/Head Assembly Build Doc.pdf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ \section{3D printing}
(If you decide to use a 3D printing service, we recommend sending them the files \textit{without} the printing pads.)

\section{Machining/Fabrication}
\subsection{PVC Pipe Cutting}
\subsection{Cutting the PVC Pipe}

\begin{figure}[H]
\centering
\includegraphics[width=1\textwidth]{"Pictures/Parts-Cutting".png}
\end{figure}


Take the PVC pipe \textbf{S29} and cut it to your desired length of neck height for your rover head. When we made ours we made it roughly 6 inches long
Take the PVC pipe \textbf{S29} (this will be the "neck" of the rover) and cut it to your desired length. For reference, we cut our "neck" PVC pipe to be roughly 6 inches long.


\section{Mechanical Assembly}
Expand Down
Binary file modified Software/Latex Docs/Software Steps/Software Steps.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion Software/Latex Docs/Software Steps/Software Steps.tex
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ \subsection{Setting up serial communication}
\begin{itemize}
\item[] \colorbox{lightgray}{ls -l /dev/serial*}
\end{itemize}
Make sure that this shows serial0 -$>$ ttyS0 . If it does not then follow the above steps again making sure to select the correct settings at each step. Next, edit the /boot/cmdline.txt file:
Make sure that this shows serial0 -$>$ ttyS0 . If it does not, ensure that you have followed every step in this tutorial in order. Next, edit the /boot/cmdline.txt file:
\begin{itemize}
\item [] \colorbox{lightgray}{sudo nano /boot/cmdline.txt}
\end{itemize}
Expand Down
Binary file modified Software/Software Steps.pdf
Binary file not shown.

0 comments on commit 1ab9716

Please sign in to comment.