Merge remote-tracking branch 'origin/master'

2 files changed, 11 insertions, 40 deletions

diff --git a/doc/thesis/chapters/implementation.tex b/doc/thesis/chapters/implementation.tex
index 3150b66..c22f6d3 100644
--- a/doc/thesis/chapters/implementation.tex
+++ b/doc/thesis/chapters/implementation.tex
@@ -293,24 +293,6 @@ Thus, they will be distributed among the other whole numbers. A window function
 	
 \end{lstlisting}
 
-%
-%\begin{figure}
-%	\centering
-%	\input{figures/tikz/qpsk-sim-constellations-static}
-%	\caption{
-%		Constellation diagrams for a simulated link using QPSK with AWGN and Rayleighan fading.
-%	}
-%\end{figure}
-%
-% \begin{figure}
-% 	\centering
-% 	\input{figures/tikz/qpsk-sim-constellations-dynamic}
-% 	\caption{
-% 		Constellation diagrams for a simulated link using QPSK with AWGN and Rayleighan fading. The paramters are: frequency offset of 0.2 \%, \SI{100}{\milli\volt} noise, dopper shift for \(v = \SI{2}{\meter\per\second}\), and a NLOS urban PDP.
-% 	}
-% 	\label{fig:dynamic-exp}
-% \end{figure}
-
 \subsection{Fading with statistical model}
 
 In order to represent the effect of the multipaht fading not only statically, a second model was created using the Frequency Selective Fading Model from Gnu Radio, according to \ref{sec:statistical-model},which was implemented after the algorithm from the paper \cite{Alimohammad2009}, with the help of the sum-of sinusoid principal (SOS). The algorithm in this block is implemented with the aim that only a small number of sinusoids are needed. 
@@ -370,16 +352,6 @@ The numbers of tags used in this case are similar to the number of given values.
 	\caption{Extended Typical Urban model (ETU) ETSI Standard PDP values for multipath fading propagation conditions \cite{ETSI}. \label{tab:etsi-tap-values}}
 \end{table}
 
-% \begin{figure}
-% 	\centering
-% 	\input{figures/tikz/qpsk-sim-constellations-dynamic-exp-NLOS-5}
-% 	\caption{
-% 		Constellation diagrams for a simulated link using QPSK and Rayleighan fading. With the ETU model and a Doppler frequency of \(\SI{5}{\hertz}\).
-% 	}
-% 	\label{fig:dynamic-exp-real}
-% \end{figure}
-
-
 \subsection{Measurements/Demonstration}
 
 \skelpar[5]{
@@ -447,15 +419,6 @@ As in \ref{sec:GUI} described the GUI was implemented, but unfortunately the par
 
 The second part which is missing is to be able to change the timing plot for the different scattering plots.
 
-%\begin{figure}
-%	\centering
-%	\label{fig:GUI}
-%	\input{figures/screenshots/gui_screenshot.png}
-%	\caption{
-%		Screenshot from the GUI
-%	}
-%\end{figure}
-
 % TODO : Piczure of the setup
 %TODO: Plots from the Hardware 
 \subsection{Incomplete parts}
@@ -484,18 +447,26 @@ Without those only the amplitudes could be seen in the Plots, with all the noise
 \newpage
 \begin{figure}
 	\centering
-	\label{fig:qpsk-simulations-dynamic}
 	\input{figures/tikz/qpsk-simulations-dynamic}
 	\caption{
 		Simulations with a dynamic fading channel model using PDP values of the Extended Typical Urban model (ETU) of the ETSI standard normative Annex B.2 in \cite{ETSI}. The color gradient represents progression in time.
+		\label{fig:qpsk-simulations-dynamic}
 	}
 \end{figure}
 \newpage
 \begin{figure}
 	\centering
-	\input{figures/tikz/qpsk-hardware}
+	\input{figures/tikz/qam-simulations-dynamic}
+	\caption{
+		TODO QAM simulation
+	}
+\end{figure}
+\begin{figure}
+	\centering
+	\input{figures/tikz/hardware}
 	\caption{
 		TODO QPSK hardware
 	}
 \end{figure}
+\newpage
 \restoregeometry
diff --git a/doc/thesis/chapters/theory.tex b/doc/thesis/chapters/theory.tex
index c73f94d..dfea46d 100644
--- a/doc/thesis/chapters/theory.tex
+++ b/doc/thesis/chapters/theory.tex
@@ -69,7 +69,7 @@ Before explaining how the two carrier signals are generated, we first need to di
 			= 0, \text{ and } \label{eqn:orthogonal-condition} \\
 		\langle \phi_k, \phi_k \rangle
 			&= \int_T \phi_k \phi_k^*  \,dt = 1,
-			\text{ where } k \text{ is either } i \text{ or } q. \label{eqn:orthonormal-condition}
+			\text{ where } k \text{ is either } i \text{ or } q \,\text{\cite{Gallager}}. \label{eqn:orthonormal-condition}
 	\end{align}
 \end{subequations}
 Provided these rather abstract conditions, let's define a new signal