Skip to content

Commit

Permalink
Alle Packages in Header verschoben
Browse files Browse the repository at this point in the history
Nicht benötigte Packages eliminiert
CC BY-NC-SA wieder eingefügt
  • Loading branch information
m-giger committed Mar 20, 2018
1 parent 4a66b08 commit 5e00f87
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
18 changes: 2 additions & 16 deletions Elo2.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,14 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\titleinfo}{Elektronik 2 - Formelsammlung}
\newcommand{\authorinfo}{A.Sch\"alle, D.Wright, A.Waldvogel, C.Gwerder, S.Koerner, M. Ehrler, L. Leuenberger, M.Giger}
\newcommand{\versioninfo}{$Revision: 3.0$ - gem\"ass Unterricht Guido Keel/FS2018}
\newcommand{\versioninfo}{$Revision: 3.0\quad$ FS2018}

% Header
\include{header/header}
% \input macht keine neue Seiteß
% \input macht keine neue Seite
% \include macht eine neue Seite

\usepackage{tikz}
\usetikzlibrary{fit}
\usepackage{circuitikz}
\usepackage{enumitem}
\setlist{noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt}
\usepackage{textcomp} % Für Grad zeichen

\usepackage{graphicx}
\usepackage{caption}
\usepackage{subcaption}
\usepackage{etex}
\usepackage{arydshln} % Für horizontale und vertikale punktierte Linien

\setlength{\mathindent}{0pt}
\raggedbottom
\begin{document}
\belowdisplayskip0pt plus0pt minus0pt
\belowdisplayshortskip0pt plus0pt minus0pt
Expand Down
20 changes: 16 additions & 4 deletions header/header.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,28 @@
\usepackage[ngerman]{babel,varioref}
\usepackage{amssymb,amsmath,graphicx,xcolor,lastpage,wrapfig,verbatim}
\usepackage{tabularx,longtable}
\usepackage{multicol}
\usepackage{rotating}
\usepackage{floatflt}
\usepackage{array}
\usepackage{scrlayer-scrpage}
\usepackage{multirow,multicol}
\usepackage{trfsigns, trsym}
\usepackage{tikz}
\usetikzlibrary{fit}
\usepackage{circuitikz}
\usepackage{afterpage}


\usepackage{enumitem}
\setlist{noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt}
\usepackage{textcomp} % Für Grad zeichen

\usepackage{graphicx}

\usepackage{arydshln} % Für horizontale und vertikale punktierte Linien

\setlength{\mathindent}{0pt}
\raggedbottom


% Zum Bilder einfach in Tabellen einfügen (valign=t)
\usepackage[export]{adjustbox}
%
Expand Down Expand Up @@ -82,7 +93,8 @@
%
%Kopf- und Fusszeile
%
\lohead*{\titleinfo}
\lohead*{\titleinfo\quad \versioninfo}
\cohead*{\includegraphics[width=1.6cm]{header/small.png}}
\rohead*{\today}
\lofoot*{\authorinfo}
\cofoot*{}
Expand Down
Binary file added header/small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions sections/ADWandler.tex
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ \subsubsection{Dual Slope \hartl{492}}
$ t_{abint} = \frac{T_{int}\cdot (V_{AGND}-V_{in})}{V_{Ref}-V_{AGND}} $ &
$ n = \log _2 (\text{max Taktzyklen von Abintegration}) $ \\
\end{tabular}
\[ V_{in} = \frac{n}{N} \cdot V_{ref} \]
\[ \frac{-V_{In}}{V_{Ref}} = \frac{n}{N} \]

Sinusschwingungen mit einer Periodendauer gleich der Integrationszeit, werden herausgefiltert!\\

Expand Down Expand Up @@ -192,11 +192,11 @@ \subsubsection{Sigma-Delta Wandler \hartl{500}}
\includegraphics[width=6cm, valign=t]{pictures/deltaSigma1} \newline
\includegraphics[width=6cm]{pictures/deltaSigma3} &
\[Y(s)=\frac{X(s)-Y(s)}{s}+Q(s)\Rightarrow Y(s)=X(s)\frac{1}{1+s}+Q(s)\frac{s}{1+s}\] \newline
\begin{tabular}{p{3cm}p{9cm}}
\begin{tabular}{p{5cm}p{7cm}}
\textbf{Signal UTF:} &
\textbf{Noise UTF:} \\
\[ H_s(s) = \frac{1}{1+sT} \] &
\[ H_s(s) = \frac{1}{1+sT} = \frac{1}{1+sRC} \] &
\[ H_n(s) = \frac{sT}{1+sT} \] \\ \\
SNR-Erhöhung: &
Expand Down

0 comments on commit 5e00f87

Please sign in to comment.