hihihahaHEADmaster

2 files changed, 34 insertions, 79 deletions

diff --git a/rapport/annexe.tex b/rapport/annexe.tex
index face98d..fdaddf2 100644
--- a/rapport/annexe.tex
+++ b/rapport/annexe.tex
@@ -1,102 +1,43 @@
 \newpage
 \appendix
+\input{chronographe-bigmama.tex}
 
-\begin{figure}[H]
+\section{Code VHDL}
 
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-bin2dualbcd.png}
-		\caption{graph-bin2dualbcd}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-bin2dualbcd-signed.png}
-		\caption{graph-bin2dualbcd-signed}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-bin2dualbcd-unsigned.png}
-		\caption{graph-bin2dualbcd-unsigned}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-dec-2-a-8.png}
-		\caption{graph-dec-2-a-8}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-moins5.png}
-		\caption{graph-moins5}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-mult-2-3.png}
-		\caption{graph-mult-2-3}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-parite-pressed.png}
-		\caption{graph-parite-pressed}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-parite-unpressed.png}
-		\caption{graph-parite-unpressed}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-mux.png}
-		\caption{graph-mux}
-	\end{subfigure}
-	\begin{subfigure}{.496\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-thermo2bin.png}
-		\caption{graph-thermo2bin}
-	\end{subfigure}
-	\caption{Chronogrames des simulations Vivado}
+\begin{figure}[H]
+	\tiny
+	\centering
+	\begin{varwidth}{\linewidth}
+		\input{assets/code/thermo2bin.tex}
+	\end{varwidth}
+	\caption{Module Thermo2bin}
 \end{figure}
 
 \begin{figure}[H]
+	\tiny
 	\centering
-	\begin{subfigure}{0.60 \linewidth}
-		\centering
-		\vfill
-		\includegraphics[width=\textwidth]{assets/img/schematic-add1bita.png}
-		\caption{Add1BitA: Conception parallèle}
-	\end{subfigure} \hfill
-	\begin{subfigure}{0.39 \linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/schematic-add1bitb.png}
-		\caption{Conception séquentielle avec \textit{CASE}}
-	\end{subfigure}
-	\begin{subfigure}{.49\linewidth}
-		\centering
-		\includegraphics[width=\textwidth]{assets/img/graph-appcombitop.png}
-		\caption{graph-appcombitop}
-	\end{subfigure}
-	\caption{Additionneurs 1 bit}
+	\begin{varwidth}{\linewidth}
+		\input{assets/code/add4bits.tex}
+	\end{varwidth}
+	\caption{Module Add4Bits}
 \end{figure}
 
-
-
-\section{Code VHDL}
-
 \begin{figure}[H]
 	\tiny
 	\centering
 	\begin{varwidth}{\linewidth}
-		\input{assets/code/thermo2bin.tex}
+		\input{assets/code/add1bita.tex}
 	\end{varwidth}
-	\caption{Module Thermo2bin}
+	\caption{Module Add1BitA}
 \end{figure}
 
 \begin{figure}[H]
 	\tiny
 	\centering
 	\begin{varwidth}{\linewidth}
-		\input{assets/code/add4bits.tex}
+		\input{assets/code/add1bitb.tex}
 	\end{varwidth}
-	\caption{Module Add4Bits}
+	\caption{Module Add1BitB}
 \end{figure}
 
 \section{Schémas Bloc}
@@ -130,7 +71,6 @@
 \end{figure}
 
 
-\newpage
 \section{Tables de Vérité et Karnaugh}
 
 \begin{table}[H]
@@ -152,6 +92,21 @@
 
 \end{table}
 
+% \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{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$]
diff --git a/rapport/chronographe-bigmama.tex b/rapport/chronographe-bigmama.tex
index 6a26b70..799dd44 100644
--- a/rapport/chronographe-bigmama.tex
+++ b/rapport/chronographe-bigmama.tex
@@ -3,7 +3,7 @@
 	\begin{subfigure}{.496\linewidth}
 		\centering
 		\includegraphics[width=\textwidth]{assets/img/graph-bin2dualbcd.png}
-		\caption{graph-bin2dualbcd}
+		\caption{Bin2DualBCD}
 	\end{subfigure}
 	\begin{subfigure}{.496\linewidth}
 		\centering