From 14d496015e1b1c656eca2a5a4eac34b905163bef Mon Sep 17 00:00:00 2001
From: sara <sara.halter@gmx.ch>
Date: Mon, 20 Dec 2021 22:22:48 +0100
Subject: small changes conclusion

---
 doc/thesis/chapters/conclusions.tex | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/thesis/chapters/conclusions.tex b/doc/thesis/chapters/conclusions.tex
index 8100949..a5d7b4f 100644
--- a/doc/thesis/chapters/conclusions.tex
+++ b/doc/thesis/chapters/conclusions.tex
@@ -2,13 +2,13 @@
 
 \chapter{Conclusions}
 
-The goal to build a functional demonstrator could be realized, unfortunately not with all futures as originally planned. A functional receiver and transmitter chain, for QPSK were implemented.
-
+The goal to build a functional demonstrator could be realized, unfortunately not with all futures as originally planned. A functional receiver and transmitter chain, for QPSK were implemented,
+but the 16-QAM dosent work as hoped.
 Some different typ of multiple fading model were tested and illustrated.
-Two different Models for the simulation options are build. One discrete time model whish is  basicly a FIR filter in the channel, the other with a statistical model which is based on a GR block.
-One other file to implement the hardware with. Unfortunately it wasent possible to measure those in a meaningful way. For that a least square approximation could be used as described in the further steps. An other difficulty is to reproduce the same effect in a simulation compare with the hardware, because of al the side effect of the environment, which cant be predicted in a simulation.
+Two different Models for the simulation options are build. One discrete time model whish is basicly a FIR filter in the channel, the other with a statistical model which is based on a GR block.
+And another file to implement the hardware with. Unfortunately it wasent possible to measure those models in a meaningful way. For that a least square approximation could be used as described in the further steps. An other difficulty is to reproduce the same effect in a simulation compare with the hardware, because of al the side effect of an environment, which cant be predicted in a simulation.
+
 
-%TODo :Mention QAM16 
 
 
 \section{Further Steps}
-- 
cgit v1.2.1


From 3e35131c3636a03e8e6229f522e99db2620c18a8 Mon Sep 17 00:00:00 2001
From: sara <sara.halter@gmx.ch>
Date: Tue, 21 Dec 2021 16:09:53 +0100
Subject: Slides angepasst

---
 doc/slides/slides.tex                              | 159 +++++++++++++++++++--
 .../figures/tikz/qam-simulations-dynamic.tex       |   2 +-
 2 files changed, 149 insertions(+), 12 deletions(-)

diff --git a/doc/slides/slides.tex b/doc/slides/slides.tex
index 5ec08bc..ae1e81b 100644
--- a/doc/slides/slides.tex
+++ b/doc/slides/slides.tex
@@ -1,3 +1,5 @@
+% !TeX program = xelatex
+% !TeX encoding = utf8
 \documentclass[xetex, onlymath, handout]{beamer}
 \usefonttheme{serif}
 \usetheme{hsr}
@@ -5,6 +7,26 @@
 % use lmodern for math
 \usepackage{lmodern}
 
+%% Pretty figures
+\usepackage{circuitikz}  % Electric diagrams
+\usepackage{pgfplots}    % Pretty plots
+\usepackage{tikz}        % Pretty drawings
+\usepackage{tikz-3dplot} % More dimensions!
+
+\usetikzlibrary{
+	external,
+	calc,
+	positioning,
+	backgrounds,
+	decorations.pathreplacing,
+	calligraphy,
+	decorations.markings,
+	matrix,
+	arrows,
+	patterns,
+}
+\pgfplotsset{compat=newest}
+
 % math packages
 \usepackage{amsmath}
 \usepackage{amssymb}
@@ -37,31 +59,146 @@
 
 \section{Multipath Fading}
 
-\begin{frame}{Multipath fading}
-  \begin{itemize}
-    \item Hello
-  \end{itemize}
+\begin{frame}{Multipath Fading sketch}
+	\begin{figure}
+		\centering
+		\input{figures/tikz/multipath-sketch}
+	\end{figure}
+	\begin{equation} \label{eqn:multipath-impulse-response}
+		h(\tau, t) = \sum_k c_k(t) \delta(\tau - \tau_k(t)),
+	\end{equation}
+\end{frame}
+
+\begin{frame}{Spectrum of a multipath fading channel}
+	\begin{figure}
+		\centering
+		\resizebox{\linewidth}{!}{
+			\input{figures/tikz/multipath-frequency-response-plots}
+			% \skelfig[width = .8 \linewidth, height = 3cm]{}
+		}
+	\end{figure}
+	\begin{equation} 
+		H(f, t) = \int_\mathbb{R} \sum_k c_k(t) \delta(\tau - \tau_k(t)) e^{-2\pi jf\tau} \, d\tau
+		= \sum_k c_k(t) e^{-2\pi jf \tau_k(t)}.
+	\end{equation}
+\end{frame}
+
+
+
+\subsection{Discrete-time model}
+
+\begin{frame}{Discrete-time model}
+	\begin{figure}
+		\centering
+		\input{figures/tikz/tapped-delay-line}
+	\end{figure}
+	\begin{equation} 
+		h_l(m) = \sum_k c_k(mT) \sinc(l - \tau(mT)/T)
+	\end{equation}
 \end{frame}
 
-\begin{frame}{Multipath fading}
+
+\subsection{Statistical model}
+
+\begin{frame}[fragile]{Statistical model}
   \begin{columns}
     \begin{column}{.5\linewidth}
       \begin{itemize}
-        \item Hello
-      \end{itemize}
+        \item Raileigh distribution (NLOS)
+        \item Rician distribution (LOS) 
+     \end{itemize}
     \end{column}
     \begin{column}{.5\linewidth}
-      \begin{itemize}
-        \item Hello
-      \end{itemize}
+  	  \begin{figure}
+  		\centering
+  		\resizebox{!}{4cm}{%
+  			\input{figures/tikz/ring-of-scattering-objects}
+  		}
+  	 \end{figure}
     \end{column}
   \end{columns}
 \end{frame}
 
-\section{Channel model}
+
+
+
 
 \section{Implementation}
 
+%TODO: Mabe picture Hardware, Bicture GR.
+
+\begin{frame}{Tools}
+  \begin{columns}
+	\begin{column}{.5\linewidth}
+		\begin{itemize}
+			\item Software Stack
+				\begin{itemize}
+					\item GNU Radio
+					\item Dear PyGUI
+				\end{itemize}
+			\item Hardware
+			\begin{itemize}
+				\item USRP B210
+			\end{itemize}
+		\end{itemize}
+	\end{column}
+	\begin{column}{.5\linewidth}
+		\begin{figure}
+		\centering
+		\includegraphics[frame, width = \linewidth]{figures/screenshots/gui_screenshot}
+		\end{figure}
+	\end{column}
+\end{columns}
+\end{frame}
+
+
+\begin{frame}{Blockdiagram}
+	\begin{figure}
+		\centering
+		\resizebox{.9\linewidth}{!}{
+			\input{figures/tikz/overview}
+		}
+		
+	\end{figure}
+\end{frame}
+
+
+
+\subsection{Transmitter and Receiver chain}
+
+\begin{frame}{Transmitter chain}
+	
+\end{frame}
+
+\begin{frame}{Receiver chain}
+	
+\end{frame}
+
+\subsection{Channel model}
+
+\begin{frame}{Discrete-time model}
+	\begin{figure}
+		\centering
+		\input{figures/tikz/qpsk-simulations-static}
+	\end{figure}
+	the 1 tap model the fading tap was \(0.2\delta(n - 0.25)\), and for the 4 tap model uses \(0.2 \delta(n - 0.25) + 0.08 \delta(n - 3.25) + 0.5 \delta(n - 4) + 0.4 \delta(n - 6.3)\). In both cases the delays are given in samples.
+\end{frame}
+
+\begin{frame}{Statistical model}
+	
+\end{frame}
+
+\section{Conclusion}
+
+\begin{frame}{Further steps}
+	
+\end{frame}
+
+\section{Measurement/Demonstration}
+
+%%Tools
+
+
 \end{document}
 
 % vim:et:ts=2:sw=2:wrap:nolinebreak:
diff --git a/doc/thesis/figures/tikz/qam-simulations-dynamic.tex b/doc/thesis/figures/tikz/qam-simulations-dynamic.tex
index 88bea4a..c1be5f2 100644
--- a/doc/thesis/figures/tikz/qam-simulations-dynamic.tex
+++ b/doc/thesis/figures/tikz/qam-simulations-dynamic.tex
@@ -2,7 +2,7 @@
 
 \newcommand{\makeplot}[5]{%
 	\hfill
-	\tikzset{external/force remake}
+	% \tikzset{external/force remake}
 	\begin{tikzpicture}
 		\begin{axis}[
 				width  = {\linewidth / 3.3},
-- 
cgit v1.2.1