diff options
| -rw-r--r-- | rapport/annexe.tex | 135 | ||||
| -rw-r--r-- | rapport/assets/img/graph-appcombitop.png | bin | 0 -> 50570 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-bin2dualbcd-signed.png | bin | 0 -> 26827 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-bin2dualbcd-unsigned.png | bin | 0 -> 26575 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-bin2dualbcd.png | bin | 0 -> 49920 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-dec-2-a-8.png | bin | 0 -> 15634 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-moins5.png | bin | 0 -> 15845 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-mult-2-3.png | bin | 0 -> 15042 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-mux.png | bin | 0 -> 62797 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-parite-pressed.png | bin | 0 -> 14800 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-parite-unpressed.png | bin | 0 -> 14729 bytes | |||
| -rw-r--r-- | rapport/assets/img/graph-thermo2bin.png | bin | 0 -> 44805 bytes | |||
| -rw-r--r-- | rapport/main.tex | 1 |
13 files changed, 91 insertions, 45 deletions
diff --git a/rapport/annexe.tex b/rapport/annexe.tex index 66d1e69..face98d 100644 --- a/rapport/annexe.tex +++ b/rapport/annexe.tex @@ -1,49 +1,106 @@ \newpage \appendix -\section{Code VHDL} -\todo{Finish this this} \begin{figure}[H] - \tiny - \centering - \begin{varwidth}{\linewidth} - \input{assets/code/thermo2bin.tex} - \end{varwidth} - \caption{Module Thermo2bin} + + \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} \end{figure} \begin{figure}[H] - \tiny \centering - \begin{varwidth}{\linewidth} - \input{assets/code/add4bits.tex} - \end{varwidth} - \caption{Module Add4Bits} + \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} \end{figure} + + +\section{Code VHDL} + \begin{figure}[H] \tiny \centering \begin{varwidth}{\linewidth} - \input{assets/code/add1bita.tex} + \input{assets/code/thermo2bin.tex} \end{varwidth} - \caption{Module Add1BitA} + \caption{Module Thermo2bin} \end{figure} \begin{figure}[H] \tiny \centering \begin{varwidth}{\linewidth} - \input{assets/code/add1bitb.tex} + \input{assets/code/add4bits.tex} \end{varwidth} - \caption{Module Add1BitB} + \caption{Module Add4Bits} \end{figure} \section{Schémas Bloc} -\todo{Simulations} - - \begin{figure}[H] \centering \includegraphics[width=\textwidth]{assets/img/schematic-thermo2bin.png} @@ -58,37 +115,24 @@ \begin{figure}[H] \centering - \includegraphics[width=.6\textwidth]{assets/img/schematic-add1bita.png} - \caption{Module Add1BitA} -\end{figure} - -\begin{figure}[H] - \centering - \includegraphics[width=.6\textwidth]{assets/img/schematic-add1bitb.png} - \caption{Module Add1BitB} + \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} + \caption{Additionneurs 1 bit} \end{figure} \newpage \section{Tables de Vérité et 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} @@ -136,3 +180,4 @@ \caption{Karnaugh pour le bit $G$} \label{tab:karnaugh-bit-G} \end{figure} + diff --git a/rapport/assets/img/graph-appcombitop.png b/rapport/assets/img/graph-appcombitop.png Binary files differnew file mode 100644 index 0000000..854961a --- /dev/null +++ b/rapport/assets/img/graph-appcombitop.png diff --git a/rapport/assets/img/graph-bin2dualbcd-signed.png b/rapport/assets/img/graph-bin2dualbcd-signed.png Binary files differnew file mode 100644 index 0000000..3307e2a --- /dev/null +++ b/rapport/assets/img/graph-bin2dualbcd-signed.png diff --git a/rapport/assets/img/graph-bin2dualbcd-unsigned.png b/rapport/assets/img/graph-bin2dualbcd-unsigned.png Binary files differnew file mode 100644 index 0000000..64c483d --- /dev/null +++ b/rapport/assets/img/graph-bin2dualbcd-unsigned.png diff --git a/rapport/assets/img/graph-bin2dualbcd.png b/rapport/assets/img/graph-bin2dualbcd.png Binary files differnew file mode 100644 index 0000000..aec2da2 --- /dev/null +++ b/rapport/assets/img/graph-bin2dualbcd.png diff --git a/rapport/assets/img/graph-dec-2-a-8.png b/rapport/assets/img/graph-dec-2-a-8.png Binary files differnew file mode 100644 index 0000000..768c30a --- /dev/null +++ b/rapport/assets/img/graph-dec-2-a-8.png diff --git a/rapport/assets/img/graph-moins5.png b/rapport/assets/img/graph-moins5.png Binary files differnew file mode 100644 index 0000000..7b48264 --- /dev/null +++ b/rapport/assets/img/graph-moins5.png diff --git a/rapport/assets/img/graph-mult-2-3.png b/rapport/assets/img/graph-mult-2-3.png Binary files differnew file mode 100644 index 0000000..02551c3 --- /dev/null +++ b/rapport/assets/img/graph-mult-2-3.png diff --git a/rapport/assets/img/graph-mux.png b/rapport/assets/img/graph-mux.png Binary files differnew file mode 100644 index 0000000..58d787b --- /dev/null +++ b/rapport/assets/img/graph-mux.png diff --git a/rapport/assets/img/graph-parite-pressed.png b/rapport/assets/img/graph-parite-pressed.png Binary files differnew file mode 100644 index 0000000..2693e9a --- /dev/null +++ b/rapport/assets/img/graph-parite-pressed.png diff --git a/rapport/assets/img/graph-parite-unpressed.png b/rapport/assets/img/graph-parite-unpressed.png Binary files differnew file mode 100644 index 0000000..6465c0e --- /dev/null +++ b/rapport/assets/img/graph-parite-unpressed.png diff --git a/rapport/assets/img/graph-thermo2bin.png b/rapport/assets/img/graph-thermo2bin.png Binary files differnew file mode 100644 index 0000000..00ca342 --- /dev/null +++ b/rapport/assets/img/graph-thermo2bin.png diff --git a/rapport/main.tex b/rapport/main.tex index 5caa557..501d265 100644 --- a/rapport/main.tex +++ b/rapport/main.tex @@ -1,6 +1,7 @@ \documentclass[a11paper]{article} \usepackage{karnaugh-map} +\usepackage{subcaption} \usepackage{tabularx} \usepackage{titlepage} \usepackage{document} |
