4 files changed, 51 insertions, 16 deletions
diff --git a/doc/thesis/figures/tikz/qam-constellation.tex b/doc/thesis/figures/tikz/qam-constellation.tex
new file mode 100644
index 0000000..e9a7778
--- /dev/null
+++ b/doc/thesis/figures/tikz/qam-constellation.tex
@@ -0,0 +1,25 @@
+% vim: set ts=2 sw=2 noet:
+\begin{tikzpicture}[
+		axis/.style = {
+			thick, -latex, black,
+		},
+		star/.style = {
+			draw = black, thick, fill = red!50,
+			circle, outer sep = 1mm, inner sep = 0,
+			minimum size = 1.5mm,
+		},
+	]
+	\draw[axis] (-25mm,0) to (25mm,0) node[right] {\(\phi_i\)};
+	\draw[axis] (0,-25mm) to (0,25mm) node[above] {\(\phi_q\)};
+
+	\foreach \i in {0,1,...,3}{
+		\foreach \q in {0,1,...,3}{
+			\node[star] (s\i\q) at ({\i*10mm - 15mm},{\q*10mm - 15mm}) {};
+		}
+	}
+
+	\foreach \i/\l in {0/00,1/01,2/11,3/10}{
+		\node[lightgray, below = 3mm] at (s\i0) {\texttt{\l}};
+		\node[lightgray, left = 2mm] at (s0\i) {\texttt{\l}};
+	}
+\end{tikzpicture}
diff --git a/doc/thesis/figures/tikz/qam-modulator.tex b/doc/thesis/figures/tikz/qam-modulator.tex
index c792fae..6eb60ea 100644
--- a/doc/thesis/figures/tikz/qam-modulator.tex
+++ b/doc/thesis/figures/tikz/qam-modulator.tex
@@ -72,7 +72,7 @@
 	\node[below] at (mq) {\(m_q(t)\)};
 
 	\node[above right] at (phii) {\(\phi_i\)};
-	\node[right] at (phiq) {\(\phi_q\)};
+	\node[right, yshift = 1mm] at (phiq) {\(\phi_q\)};
 
 	\node[above left] at (si) {\(s_i(t)\)};
 	\node[below left] at (sq) {\(s_q(t)\)};
@@ -83,7 +83,7 @@
 		\fill[right color = white, left color = red!20, draw = white]
 			($(B2Li.north) + (0,1)$) coordinate (A) rectangle ($(B2Lq.south) + (9,-1)$);
 
-		\node[blue!50, anchor = south east] at (D) {\bfseries\ttfamily Digital bits};
-		\node[red!50, anchor = south west]  at (A) {\bfseries\ttfamily Analog waveform};
+		\node[blue!50, anchor = south east, xshift = -4mm] at (D) {\bfseries\ttfamily Digital bits};
+		\node[red!50, anchor = south west, xshift = 4mm]  at (A) {\bfseries\ttfamily Analog waveform};
 	\end{pgfonlayer}
 \end{circuitikz}
diff --git a/doc/thesis/figures/tikz/qpks-constellation.tex b/doc/thesis/figures/tikz/qpks-constellation.tex
deleted file mode 100644
index 5ccad1a..0000000
--- a/doc/thesis/figures/tikz/qpks-constellation.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-% vim: set ts=2 sw=2 noet spell:
-
-\begin{tikzpicture}
-	\begin{axis}[
-		axis lines = middle,
-		colormap/cool,
-	]
-		\pgfmathsetmacro{\fc}{10}
-
-		\addplot3[]
-			{sin(x) + 1};
-	\end{axis}
-\end{tikzpicture}
diff --git a/doc/thesis/figures/tikz/qpsk-constellation.tex b/doc/thesis/figures/tikz/qpsk-constellation.tex
new file mode 100644
index 0000000..d927b19
--- /dev/null
+++ b/doc/thesis/figures/tikz/qpsk-constellation.tex
@@ -0,0 +1,23 @@
+% vim: set ts=2 sw=2 noet:
+\begin{tikzpicture}[
+		axis/.style = {
+			thick, -latex, black,
+		},
+		star/.style = {
+			draw = black, thick, fill = red!50,
+			circle, outer sep = 1mm, inner sep = 0,
+			minimum size = 1.5mm,
+		},
+	]
+	\draw[axis] (-25mm,0) to (25mm,0) node[right] {\(\phi_i\)};
+	\draw[axis] (0,-25mm) to (0,25mm) node[above] {\(\phi_q\)};
+
+	\draw[lightgray, densely dotted, thick] (0,0) circle (15mm);
+	\foreach \a in {0,1,...,8}{
+		\node[star] (s\a) at ({360/8*(.5 + \a)}:15mm) {};
+	}
+
+	\foreach \i/\l in {0/000,1/001,2/011,3/010,4/110,5/111,6/101,7/100}{
+		\node[lightgray] at ($(s\i) + ({360/8*(.5 + \i)}:5mm)$) {\texttt{\l}};
+	}
+\end{tikzpicture}