diff options
Diffstat (limited to 'electronics')
| -rw-r--r-- | electronics/cw2/writeup.tex | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/electronics/cw2/writeup.tex b/electronics/cw2/writeup.tex index eeb6a93..1ca6e17 100644 --- a/electronics/cw2/writeup.tex +++ b/electronics/cw2/writeup.tex @@ -161,6 +161,7 @@ To test this system, I can measure the current in and the current out, and see h Here is the full set of diagrams all put together, when used like this, my system should function as a radio receiver. % put a full design here (glue all the previous designs together) +<<<<<<< HEAD \subsection{Subsystem testing} % tables, tables and more tables, no need to show the actual testing, the next section is for that To test my system, I will put values into each subsystem individually, then put it all together, at the end to create my full project. @@ -282,16 +283,27 @@ This subsystem should be tested for the current it outputs and, unlike the rest, \end{center} \subsubsection{The speaker} - -\subsection{Subsystem results} -\subsubsection{The receiver} % might be able to cut this, or make it very short -\subsubsection{The initial amplifier} -\subsubsection{The demodulation system} -\subsubsection{The volume boost amplifier} -\subsubsection{The audio normalisation filter and dividing amplifier} -\subsubsection{The audio intensity meter} -\subsubsection{The push pull power amplifier} -\subsubsection{The speaker} % probably can cut this section +======= +\section{Subsystem testing} % tables, tables and more tables, no need to show the actual testing, the next section is for that +\subsection{The receiver} +\subsection{The initial amplifier} +\subsection{The demodulation system} +\subsection{The volume boost amplifier} +\subsection{The audio normalisation filter and dividing amplifier} +\subsection{The audio intensity meter} +\subsection{The push pull power amplifier} +\subsection{The speaker} +>>>>>>> 51febddd0d6da1ac3e19a27b0761672dda1a1f55 + +\section{Subsystem results} +\subsection{The receiver} % might be able to cut this, or make it very short +\subsection{The initial amplifier} +\subsection{The demodulation system} +\subsection{The volume boost amplifier} +\subsection{The audio normalisation filter and dividing amplifier} +\subsection{The audio intensity meter} +\subsection{The push pull power amplifier} +\subsection{The speaker} % probably can cut this section \section{System realisation} \subsection{Circuit diagram} % repeat of what was shown before |