Merge branch 'master' of chausse.xyz:s4-app1

1 files changed, 95 insertions, 35 deletions

diff --git a/rapport/annexe.tex b/rapport/annexe.tex
index 3b87539..f2602c5 100644
--- a/rapport/annexe.tex
+++ b/rapport/annexe.tex
@@ -4,39 +4,39 @@
 \todo{Finish this this}
 
 \begin{figure}[H]
-  \tiny
-\centering
-\begin{varwidth}{\linewidth}
-  \input{assets/code/thermo2bin.tex}
-\end{varwidth}
-\caption{Module Thermo2bin}
+	\tiny
+	\centering
+	\begin{varwidth}{\linewidth}
+		\input{assets/code/thermo2bin.tex}
+	\end{varwidth}
+	\caption{Module Thermo2bin}
 \end{figure}
 
 \begin{figure}[H]
-  \tiny
-\centering
-\begin{varwidth}{\linewidth}
-  \input{assets/code/add4bits.tex}
-\end{varwidth}
-\caption{Module Add4Bits}
+	\tiny
+	\centering
+	\begin{varwidth}{\linewidth}
+		\input{assets/code/add4bits.tex}
+	\end{varwidth}
+	\caption{Module Add4Bits}
 \end{figure}
 
 \begin{figure}[H]
-  \tiny
-\centering
-\begin{varwidth}{\linewidth}
-  \input{assets/code/add1bita.tex}
-\end{varwidth}
-\caption{Module Add1BitA}
+	\tiny
+	\centering
+	\begin{varwidth}{\linewidth}
+		\input{assets/code/add1bita.tex}
+	\end{varwidth}
+	\caption{Module Add1BitA}
 \end{figure}
 
 \begin{figure}[H]
-  \tiny
-\centering
-\begin{varwidth}{\linewidth}
-  \input{assets/code/add1bitb.tex}
-\end{varwidth}
-\caption{Module Add1BitB}
+	\tiny
+	\centering
+	\begin{varwidth}{\linewidth}
+		\input{assets/code/add1bitb.tex}
+	\end{varwidth}
+	\caption{Module Add1BitB}
 \end{figure}
 
 \section{Schémas}
@@ -46,24 +46,84 @@
 
 
 \begin{figure}[H]
-\centering
-  \includegraphics[width=.7\textwidth]{assets/img/schematic-thermo2bin.png}
-\caption{Module Thermo2bin}
+	\centering
+	\includegraphics[width=.7\textwidth]{assets/img/schematic-thermo2bin.png}
+	\caption{Module Thermo2bin}
 \end{figure}
 
 \begin{figure}[H]
-\centering
-  \includegraphics[width=.7\textwidth]{assets/img/schematic-add4bits.png}
-\caption{Module Add4Bits}
+	\centering
+	\includegraphics[width=.7\textwidth]{assets/img/schematic-add4bits.png}
+	\caption{Module Add4Bits}
 \end{figure}
 
 \begin{figure}[H]
-\centering
-  \includegraphics[width=.7\textwidth]{assets/img/schematic-add1bit.png}
-\caption{Module Add1Bit}
+	\centering
+	\includegraphics[width=.7\textwidth]{assets/img/schematic-add1bit.png}
+	\caption{Module Add1Bit}
 \end{figure}
 
+\newpage
 \section{Tables de Vérité et Karnaugh}
 
-\todo{Verite}\\
-\todo{Karnaugh}
+% \begin{figure}[H]
+% \centering
+% \begin{karnaugh-map}[4][4][1][$D$][$C$][$B$][$A$]
+% \manualterms{
+% 	0,1,2,3,
+% 	4,5,6,7,
+% 	8,9,10,11,
+% 	12,13,14,15}
+% \implicant{2}{10}
+% \implicant{4}{13}
+% \implicant{12}{10}
+% \implicantedge{3}{2}{11}{10}
+% \end{karnaugh-map}
+% \caption{TEMPLATE NOT GOOD}
+% \end{figure}
+
+
+\begin{table}[H]
+	\centering
+	\caption{Table de vérité des Bits}
+	\vspace{.2cm}
+	\begin{tabular}{llllllll}
+		\toprule
+		A & B & C & D & E & F & G & H \\
+		\midrule
+		0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+		0 & 0 & 0 & 1 & 0 & 0 & 0 & 1 \\
+		0 & 0 & 1 & 1 & 0 & 0 & 1 & 0 \\
+		0 & 1 & 1 & 1 & 0 & 0 & 1 & 1 \\
+		1 & 1 & 1 & 1 & 0 & 1 & 0 & 0 \\
+		\bottomrule
+	\end{tabular}
+
+\end{table}
+
+\begin{figure}[H]
+\centering
+\begin{karnaugh-map}[4][4][1][$D$][$C$][$B$][$A$]
+\manualterms{
+	0,1,X,0,
+	X,X,X,1,
+	X,X,X,X,
+	X,X,X,0}
+\implicant{1}{9}
+\implicant{4}{6}
+\end{karnaugh-map}
+\caption{Karnaugh pour le bit $H$}
+\end{figure}
+
+\begin{figure}[H]
+\centering
+\begin{karnaugh-map}[4][4][1][$D$][$C$][$B$][$A$]
+\manualterms{
+	0,0,X,1,
+	X,X,X,1,
+	X,X,X,X,
+	X,X,X,0}
+\implicant{3}{6}
+\end{karnaugh-map}
+\caption{Karnaugh pour le bit $G$}
+\end{figure}