More stuff

1 files changed, 37 insertions, 14 deletions

diff --git a/main.tex b/main.tex
index 3d5147b..17844bb 100644
--- a/main.tex
+++ b/main.tex
@@ -14,10 +14,10 @@
 \usepackage{csquotes}
 \usepackage[french]{babel}
 
-\newcommand{\todo}[1]{\begin{color}{Red}\textbf{TODO:} #1\end{color}\\}
-  \newcommand{\note}[1]{\begin{color}{Orange}\textbf{NOTE:} #1\end{color}\\}
-    \newcommand{\fixme}[1]{\begin{color}{Fuchsia}\textbf{FIXME:} #1\end{color}\\}
-      \newcommand{\question}[1]{\begin{color}{ForestGreen}\textbf{QUESTION:} #1\end{color}\\}
+\newcommand{\todo}[1]{\begin{color}{Red}\textbf{TODO:} #1\end{color}}
+\newcommand{\note}[1]{\begin{color}{Orange}\textbf{NOTE:} #1\end{color}}
+\newcommand{\fixme}[1]{\begin{color}{Fuchsia}\textbf{FIXME:} #1\end{color}}
+\newcommand{\question}[1]{\begin{color}{ForestGreen}\textbf{QUESTION:} #1\end{color}}
 
 
 % \addbibresource{bibliography.bib}
@@ -135,6 +135,16 @@
 	\label{circ:sum}
 \end{figure}
 
+\begin{gather}
+	I_{\textrm{out}}     = \SI{0}{\ampere},
+	R_{13} = \SI{10}{\kilo\ohm}, R_{14} = \SI{20}{\kilo\ohm}, R_{15} = \SI{40}{\kilo\ohm} \\
+	I_{\textrm{total}}   = I_1 + I_2 + I_3    \\
+	I_1                  = \frac{V_1}{R_{13}},
+	I_2                  = \frac{V_2}{R_{14}},
+	I_3                  = \frac{V_3}{R_{15}} \\
+	I_{\textrm{total}}   = \frac{V_1}{R_{13}} + \frac{V_2}{R_{14}} + \frac{V_3}{R_{15}} \\
+\end{gather}
+
 \todo{This shit\ldots}
 
 
@@ -149,24 +159,37 @@
 	\centering
 	% \todo{8 possibilités de tension (V+ de $U_{1D}$) calculées, simulées et réelles}
 	\begin{tabular}{lllll}
-		\toprule $V_1$ & $V_2$      & $V_3$      & $V_{\textrm{out}}$ simulé & $V_{\textrm{out}}$ calculé \\
+		\toprule
+		$V_1$(\si{\V})                      &
+		$V_2$(\si{\V})                      &
+		$V_3$(\si{\V})                      &
+		$V_{\textrm{out}}$ simulé (\si{\V}) &
+		$V_{\textrm{out}}$ calculé (\si{\V})                                      \\
 		\midrule\midrule
-		\SI{0}{\V}     & \SI{0}{\V} & \SI{5}{\V} &                           &                            \\
-		\SI{0}{\V}     & \SI{5}{\V} & \SI{0}{\V} &                           &                            \\
-		\SI{0}{\V}     & \SI{5}{\V} & \SI{5}{\V} &                           &                            \\
-		\SI{0}{\V}     & \SI{0}{\V} & \SI{0}{\V} &                           &                            \\
-		\SI{5}{\V}     & \SI{0}{\V} & \SI{5}{\V} & $3.\overline{33}$         &                            \\
-		\SI{5}{\V}     & \SI{5}{\V} & \SI{0}{\V} &                           &                            \\
-		\SI{5}{\V}     & \SI{5}{\V} & \SI{5}{\V} &                           &                            \\
+		$0$                                 & $0$ & $0$ & $0$ & $0.00$            \\
+		$0$                                 & $0$ & $5$ & $$  & $0.\overline{66}$ \\
+		$0$                                 & $5$ & $0$ & $$  & $1.\overline{33}$ \\
+		$0$                                 & $5$ & $5$ & $$  & $2.00$            \\
+		$5$                                 & $0$ & $0$ & $$  & $2.\overline{66}$ \\
+		$5$                                 & $0$ & $5$ & $$  & $3.\overline{33}$ \\
+		$5$                                 & $5$ & $0$ & $$  & $4.00$            \\
+		$5$                                 & $5$ & $5$ & $$  & $4.\overline{66}$ \\
 		\bottomrule
 	\end{tabular}
 \end{table}
 
 \begin{table}[H]
-	\caption{Pièces choisies}
+	\caption{Choix des pièces}
 	\label{tab:parts}
 	\centering
-	\todo{Tableau des 8 pièces calculées et choisies}
+	\begin{tabular}{lll}
+		\toprule Pièce & Valeur Calculé      & Valeur Choisie      \\
+		\midrule\midrule
+		$R_3$          & \SI{140}{\ohm}      & \SI{150}{\ohm}      \\
+		$R_{18}$       & \SI{7.1}{\kilo\ohm} & \SI{7.5}{\kilo\ohm} \\
+		\bottomrule
+	\end{tabular}
+	% \todo{Tableau des 8 pièces calculées et choisies}
 \end{table}
 
 \section{Conclusion}