Merge remote-tracking branch 'origin/master'

27 files changed, 12 insertions, 45 deletions

diff --git a/doc/poster/paragraphs.txt b/doc/poster/paragraphs.txt
deleted file mode 100644
index e715e7b..0000000
--- a/doc/poster/paragraphs.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-INTRODUCTION
-
-Nowadays smartphones, internet of things (IoT) and many other wireless
-devices are carried around by everyone and have to work in environments
-that from a technical perspective are very far from ideal. Wireless
-channels have many complex problems that need to be solved to guarantee
-a reliable communication link.
-
-Among the multitude of problems, a common issue that observed in
-wireless channels is what is called "multipath fading effect". Multipath
-refers to the fact electromagnetic waves (EMWs) radiated from a sender
-antenna may take different paths by reflecting on multiple surfaces
-before reaching the receiver (see figure). Because EMWs travel at a
-constant speed, and some paths are longer than others, the receiver sees
-multiple overlapped (superimposed) copies of the sent signal, each with
-a different phase shift. In practice only one path is desirable, thus
-the other delayed copies cause a degradation of the received signal
-(fading).
-
-TASK DESCRIPTION
-
-The goal of the project is to develop a platform to illustrate the
-impact of different fading effects on the received signal. The platform
-is thus built for pedagogical purposes and ought to show the various
-parts of the signal processing chain of a receiver.
-
-METHODS
-
-Two USRP B210 software defined radio (SDR) devices from Ettus Reasearch,
-together with the open source software libraries GNU Radio and Dear
-PyGUI were used to create a graphical user interface to display
-waveforms from either a simulated or real wireless links affected by
-multipath fading. The platform transmits a picture either using QPSK or
-16ary QAM over a 2.4 GHz carrier and computes the empirical bit error
-rate of the link.
-
-
diff --git a/doc/projectplan/ProjectPlan.pdf b/doc/projectplan/ProjectPlan.pdf
index 77c59ee..45d8407 100644
--- a/doc/projectplan/ProjectPlan.pdf
+++ b/doc/projectplan/ProjectPlan.pdf
diff --git a/doc/projectplan/ProjectPlan.tex b/doc/projectplan/ProjectPlan.tex
index 007706d..d309ad0 100644
--- a/doc/projectplan/ProjectPlan.tex
+++ b/doc/projectplan/ProjectPlan.tex
@@ -45,7 +45,7 @@
 \usepackage{pgfgantt}
 
 %% Landscape pages
-\usepackage{pdflscape}
+\usepackage{lscape}
 
 % Metadata
 \title{Fading illustration with SDR -- Project Plan}
@@ -288,13 +288,13 @@ If there will be some time left, we may also use a car to demonstrate some other
 			\ganttgroup{Research}{2021-09-21}{2021-11-28}
 			\ganttnewline
 			
-			\ganttbar[progress=20]{Theory}{2021-09-22}{2021-11-28}
+			\ganttbar[progress=0]{Theory}{2021-09-22}{2021-11-28}
 			\ganttnewline
 
-			\ganttbar [progress=25]{Software Toolboxes}{2021-09-27}{2021-10-31}
+			\ganttbar [progress=0]{Software Toolboxes}{2021-09-27}{2021-10-31}
 			\ganttnewline
 						
-			\ganttbar[progress=6]{Hardware}{2021-10-04}{2021-10-31}
+			\ganttbar[progress=0]{Hardware}{2021-10-04}{2021-10-31}
 			\ganttnewline			
 
 			\ganttgroup{Prototype}{2021-10-04}{2021-10-31}
@@ -312,7 +312,7 @@ If there will be some time left, we may also use a car to demonstrate some other
 			\ganttgroup{Documentation}{2021-09-21}{2021-12-20}
 			\ganttnewline
 			
-			\ganttbar{Project Plan}{2021-09-21}{2021-10-04}
+			\ganttbar[progress=0]{Project Plan}{2021-09-21}{2021-10-04}
 			\ganttmilestone{Submission}{2021-10-05}
 			\ganttbar[progress=0]{Elevator Pitch Video}{2021-11-08}{2021-11-28}
 			\ganttbar[progress=0]{Abstract}{2021-12-02}{2021-12-09}
@@ -362,7 +362,7 @@ If there will be some time left, we may also use a car to demonstrate some other
 			milestone height = .3,
 			% colored elements
 			bar/.append style={
-				fill = teal!30!white,
+				fill = cyan!30!white,
 			},
 			bar incomplete/.append style={
 				fill = white
@@ -404,7 +404,7 @@ If there will be some time left, we may also use a car to demonstrate some other
 			\ganttgroup{Demonstration}{2021-11-03}{2021-12-05}
 			\ganttnewline
 			
-			\ganttbar[progress=100]{Simulation}{2021-10-13}{2021-10-18}
+			\ganttbar[progress=100]{Sim}{2021-10-13}{2021-10-18}
 			\ganttbar[progress=100]{Hardware}{2021-10-18}{2021-10-31}
 			\ganttmilestone{Working SDR TX -- RX}{2021-11-01}
 			\ganttbar[progress=100]{Fading model}{2021-11-03}{2021-12-19}
diff --git a/doc/thesis/Fading.tex b/doc/thesis/Fading.tex
index 4be6d1d..62791cb 100644
--- a/doc/thesis/Fading.tex
+++ b/doc/thesis/Fading.tex
@@ -64,6 +64,8 @@
 \usepackage{subcaption}
 % Frames around includegraphics
 \usepackage[export]{adjustbox}
+% Include PDF
+\usepackage{pdfpages}
 
 %% Placeholders
 \usepackage{skeldoc}
@@ -243,5 +245,7 @@
 		\item Task Description
 		\item Project Plan
 	\end{itemize}
-	%TODO Projectplan
+
+	\includepdf[openright, pages=-]{appendix/SA_HS2021_Fading}
+	\includepdf[openright, pages=-]{appendix/ProjectPlan}
 \end{document}
diff --git a/doc/thesis/appendix/ProjectPlan.pdf b/doc/thesis/appendix/ProjectPlan.pdf
new file mode 100644
index 0000000..45d8407
--- /dev/null
+++ b/doc/thesis/appendix/ProjectPlan.pdf
diff --git a/doc/SA_HS2021_Fading.pdf b/doc/thesis/appendix/SA_HS2021_Fading.pdf
index 3193ee8..3193ee8 100644
--- a/doc/SA_HS2021_Fading.pdf
+++ b/doc/thesis/appendix/SA_HS2021_Fading.pdf
diff --git a/simulation/QAM/qam.grc b/old_simulation/QAM/qam.grc
index e5409e3..e5409e3 100644
--- a/simulation/QAM/qam.grc
+++ b/old_simulation/QAM/qam.grc
diff --git a/simulation/QAM/qam.py b/old_simulation/QAM/qam.py
index 0ccc88f..0ccc88f 100755
--- a/simulation/QAM/qam.py
+++ b/old_simulation/QAM/qam.py
diff --git a/simulation/QAM/qam_nogui.grc b/old_simulation/QAM/qam_nogui.grc
index e1d0277..e1d0277 100644
--- a/simulation/QAM/qam_nogui.grc
+++ b/old_simulation/QAM/qam_nogui.grc
diff --git a/simulation/QAM/qam_nogui.py b/old_simulation/QAM/qam_nogui.py
index 67ee236..67ee236 100755
--- a/simulation/QAM/qam_nogui.py
+++ b/old_simulation/QAM/qam_nogui.py
diff --git a/simulation/QAM_Fading/Alte_versionen/qam_fading.grc b/old_simulation/QAM_Fading/Alte_versionen/qam_fading.grc
index 4911cce..4911cce 100644
--- a/simulation/QAM_Fading/Alte_versionen/qam_fading.grc
+++ b/old_simulation/QAM_Fading/Alte_versionen/qam_fading.grc
diff --git a/simulation/QAM_Fading/Alte_versionen/qam_fading.py b/old_simulation/QAM_Fading/Alte_versionen/qam_fading.py
index e3b2574..e3b2574 100755
--- a/simulation/QAM_Fading/Alte_versionen/qam_fading.py
+++ b/old_simulation/QAM_Fading/Alte_versionen/qam_fading.py
diff --git a/simulation/QAM_Fading/Alte_versionen/qam_fading_FIR_Filter_v1.grc b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_FIR_Filter_v1.grc
index ffc47f6..ffc47f6 100644
--- a/simulation/QAM_Fading/Alte_versionen/qam_fading_FIR_Filter_v1.grc
+++ b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_FIR_Filter_v1.grc
diff --git a/simulation/QAM_Fading/Alte_versionen/qam_fading_V2.grc b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_V2.grc
index 16fa2e3..16fa2e3 100644
--- a/simulation/QAM_Fading/Alte_versionen/qam_fading_V2.grc
+++ b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_V2.grc
diff --git a/simulation/QAM_Fading/Alte_versionen/qam_fading_V2_mehrere.grc b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_V2_mehrere.grc
index d5444ad..d5444ad 100644
--- a/simulation/QAM_Fading/Alte_versionen/qam_fading_V2_mehrere.grc
+++ b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_V2_mehrere.grc
diff --git a/simulation/QAM_Fading/Alte_versionen/qam_fading_frequency_selectiv.grc b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_frequency_selectiv.grc
index fc3cebd..fc3cebd 100644
--- a/simulation/QAM_Fading/Alte_versionen/qam_fading_frequency_selectiv.grc
+++ b/old_simulation/QAM_Fading/Alte_versionen/qam_fading_frequency_selectiv.grc
diff --git a/simulation/QAM_Fading/qam_fading.py b/old_simulation/QAM_Fading/qam_fading.py
index ea8917c..ea8917c 100755
--- a/simulation/QAM_Fading/qam_fading.py
+++ b/old_simulation/QAM_Fading/qam_fading.py
diff --git a/simulation/QAM_Fading/qam_fading_V2_1611.pdf b/old_simulation/QAM_Fading/qam_fading_V2_1611.pdf
index 1c77eed..1c77eed 100644
--- a/simulation/QAM_Fading/qam_fading_V2_1611.pdf
+++ b/old_simulation/QAM_Fading/qam_fading_V2_1611.pdf
diff --git a/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc b/old_simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc
index 8983c27..8983c27 100644
--- a/simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc
+++ b/old_simulation/QAM_Fading/qam_fading_V2_eigerner_block.grc
diff --git a/simulation/QAM_Fading/qam_fading_block.py b/old_simulation/QAM_Fading/qam_fading_block.py
index 10af927..10af927 100755
--- a/simulation/QAM_Fading/qam_fading_block.py
+++ b/old_simulation/QAM_Fading/qam_fading_block.py
diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc b/old_simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
index 6ee63b3..6ee63b3 100644
--- a/simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
+++ b/old_simulation/QAM_Fading/qam_fading_frequency_selectiv.grc
diff --git a/simulation/QAM_Fading/qam_fading_frequency_selectiv.py b/old_simulation/QAM_Fading/qam_fading_frequency_selectiv.py
index 9b682e9..9b682e9 100755
--- a/simulation/QAM_Fading/qam_fading_frequency_selectiv.py
+++ b/old_simulation/QAM_Fading/qam_fading_frequency_selectiv.py
diff --git a/simulation/QAM_Fading/tx_bytes2chunks.8b b/old_simulation/QAM_Fading/tx_bytes2chunks.8b
index 2d40afd..2d40afd 100644
--- a/simulation/QAM_Fading/tx_bytes2chunks.8b
+++ b/old_simulation/QAM_Fading/tx_bytes2chunks.8b
diff --git a/simulation/QAM_Fading/tx_chunks2symbols.32fc b/old_simulation/QAM_Fading/tx_chunks2symbols.32fc
index 9d3057c..9d3057c 100644
--- a/simulation/QAM_Fading/tx_chunks2symbols.32fc
+++ b/old_simulation/QAM_Fading/tx_chunks2symbols.32fc
diff --git a/simulation/QAM_Fading/tx_diffenc.8b b/old_simulation/QAM_Fading/tx_diffenc.8b
index e8b9ca5..e8b9ca5 100644
--- a/simulation/QAM_Fading/tx_diffenc.8b
+++ b/old_simulation/QAM_Fading/tx_diffenc.8b
diff --git a/simulation/QAM_Fading/tx_rrc_filter.32fc b/old_simulation/QAM_Fading/tx_rrc_filter.32fc
index 09c4adf..09c4adf 100644
--- a/simulation/QAM_Fading/tx_rrc_filter.32fc
+++ b/old_simulation/QAM_Fading/tx_rrc_filter.32fc
diff --git a/simulation/QAM_Fading/tx_symbol_mapper.8b b/old_simulation/QAM_Fading/tx_symbol_mapper.8b
index 9e0ba12..9e0ba12 100644
--- a/simulation/QAM_Fading/tx_symbol_mapper.8b
+++ b/old_simulation/QAM_Fading/tx_symbol_mapper.8b