Merge remote-tracking branch 'origin/master'

3 files changed, 96 insertions, 9 deletions

diff --git a/doc/thesis/figures/tikz/qpsk-hardware.tex b/doc/thesis/figures/tikz/hardware.tex
index 68a31a6..d13926b 100644
--- a/doc/thesis/figures/tikz/qpsk-hardware.tex
+++ b/doc/thesis/figures/tikz/hardware.tex
@@ -13,7 +13,8 @@
 				#5
 			]
 
-			\addplot[only marks, scatter] table [x index = #2, y index = #3] {#1};
+			\addplot[only marks, scatter, point meta = \thisrow{samplenr}]
+				table [x index = #2, y index = #3] {#1};
 		\end{axis}
 	\end{tikzpicture}
 	\hfill
@@ -28,15 +29,15 @@
 		text width = 3em,
 		align = right,
 	},
-	title = {LOS, Indoors (Lab)},
+	title = {QPSK LOS, Indoors (Lab)},
 }
 %
 \makeplot{figures/data/qpsk_hw_lab.dat}{0}{1}{.25}{
-	title = {LOS, Indoors (Lab)},
+	title = {TODO},
 }
 %
-\makeplot{figures/data/qpsk_hw_lab.dat}{0}{1}{.25}{
-	title = {LOS, Indoors (Lab)},
+\makeplot{figures/data/qam_hw_lab.dat}{0}{1}{2}{
+	title = {QAM LOS, Indoors (Lab)},
 }
 \newline
 
@@ -51,7 +52,7 @@
 	},
 }
 \makeplot{figures/data/qpsk_hw_lab.dat}{2}{3}{.25}{}
-\makeplot{figures/data/qpsk_hw_lab.dat}{2}{3}{.25}{}
+\makeplot{figures/data/qam_hw_lab.dat}{2}{3}{2}{}
 \newline
 
 % -------------------------------------------------------------------
@@ -65,7 +66,7 @@
 	},
 }
 \makeplot{figures/data/qpsk_hw_lab.dat}{4}{5}{2}{}
-\makeplot{figures/data/qpsk_hw_lab.dat}{4}{5}{2}{}
+\makeplot{figures/data/qam_hw_lab.dat}{4}{5}{2}{}
 \newline
 
 % -------------------------------------------------------------------
@@ -79,5 +80,5 @@
 	},
 }
 \makeplot{figures/data/qpsk_hw_lab.dat}{6}{7}{2}{}
-\makeplot{figures/data/qpsk_hw_lab.dat}{6}{7}{2}{}
+\makeplot{figures/data/qam_hw_lab.dat}{6}{7}{2}{}
 \newline
diff --git a/doc/thesis/figures/tikz/qam-simulations-dynamic.tex b/doc/thesis/figures/tikz/qam-simulations-dynamic.tex
new file mode 100644
index 0000000..88bea4a
--- /dev/null
+++ b/doc/thesis/figures/tikz/qam-simulations-dynamic.tex
@@ -0,0 +1,85 @@
+% vim: set ts=2 sw=2 noet:
+
+\newcommand{\makeplot}[5]{%
+	\hfill
+	\tikzset{external/force remake}
+	\begin{tikzpicture}
+		\begin{axis}[
+				width  = {\linewidth / 3.3},
+				height = {\linewidth / 3.3},
+				grid = major,
+				xmin = {-#4}, xmax = {#4},
+				ymin = {-#4}, ymax = {#4},
+				colormap name=viridis,
+				#5
+			]
+
+			\addplot[only marks, scatter, point meta = \thisrow{samplenr}]
+				table [x index = #2, y index = #3] {#1};
+		\end{axis}
+	\end{tikzpicture}
+	\hfill
+}
+
+% -------------------------------------------------------------------
+
+\noindent
+\makeplot{figures/data/qam_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{0}{1}{4}{
+	ylabel = {Channel with ISI},
+	yticklabel style = {
+		text width = 3em,
+		align = right,
+	},
+	title = {NLOS, \(\Delta f = \SI{5}{\hertz}\)},
+}
+%
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{0}{1}{4}{
+	title = {LOS, \(\Delta f = \SI{5}{\hertz}, K = 5\)},
+}
+%
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{0}{1}{4}{
+	title = {LOS, \(\Delta f = \SI{70}{\hertz}, K = 5\)},
+}
+\newline
+
+% -------------------------------------------------------------------
+
+\noindent
+\makeplot{figures/data/qam_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{2}{3}{4}{%
+	ylabel = {Synchronized},
+	yticklabel style = {
+		text width = 3em,
+		align = right,
+	},
+}
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{2}{3}{4}{}
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{2}{3}{4}{}
+\newline
+
+% -------------------------------------------------------------------
+
+\noindent
+\makeplot{figures/data/qam_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{4}{5}{2}{%
+	ylabel = {Equalized},
+	yticklabel style = {
+		text width = 3em,
+		align = right,
+	},
+}
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{4}{5}{2}{}
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{4}{5}{2}{}
+\newline
+
+% -------------------------------------------------------------------
+
+\noindent
+\makeplot{figures/data/qam_sim_dynamic_grblock_nlos_etsi_doppler5.dat}{6}{7}{2}{%
+	ylabel = {Locked},
+	yticklabel style = {
+		text width = 3em,
+		align = right,
+	},
+}
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler5_k5.dat}{6}{7}{2}{}
+\makeplot{figures/data/qam_sim_dynamic_grblock_los_etsi_doppler70_k5.dat}{6}{7}{2}{}
+\newline
diff --git a/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex b/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex
index 4d01c92..0764c2a 100644
--- a/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex
+++ b/doc/thesis/figures/tikz/qpsk-simulations-dynamic.tex
@@ -13,7 +13,8 @@
 				#5
 			]
 
-			\addplot[only marks, scatter] table [x index = #2, y index = #3] {#1};
+			\addplot[only marks, scatter, point meta = \thisrow{samplenr}]
+				table [x index = #2, y index = #3] {#1};
 		\end{axis}
 	\end{tikzpicture}
 	\hfill