Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update FS2021 #12

Draft
wants to merge 17 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

24 changes: 0 additions & 24 deletions .project

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/org.eclipse.core.runtime.prefs

This file was deleted.

14 changes: 0 additions & 14 deletions .texlipse

This file was deleted.

1 change: 1 addition & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Matthias Diethelm (mdiethel)
Damian Koeppel (dkoeppel)
Christian Gwerder (cgwerder)
Sven Körner (skoerner)
Naoki Pross (npross)
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,24 @@ Da dieser Kurs ständig aktualisiert wird, sind Aenderungen jederzeit möglich.
## Lizenz
Diese Zusammenfassung steht unter einer Creative Commons BY-NC-SA Lizenz.

[![Foo](http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png)](http://creativecommons.org/licenses/by-nc-sa/3.0/)
[![Foo](http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png)](http://creativecommons.org/licenses/by-nc-sa/3.0/)

Sie dürfen:

* Das Werk bzw. den Inhalt vervielfältigen, verbreiten und öffentlich
zugänglich machen.
* Abwandlungen und Bearbeitungen des Werkes bzw. Inhaltes anfertigen.

Zu den folgenden Bedingungen:

* Namensnennung: Sie müssen den Namen des Autors/Rechteinhabers in der von ihm
festgelegten Weise nennen.
* Keine kommerzielle Nutzung: Dieses Werk bzw. dieser Inhalt darf nicht für
kommerzielle Zwecke verwendet werden.
* Weitergabe unter gleichen Bedingungen: Wenn Sie das lizenzierte Werk bzw. den
lizenzierten Inhalt bearbeiten oder in anderer Weise erkennbar als Grundlage
für eigenes Schaffen verwenden, dürfen Sie die daraufhin neu entstandenen
Werke bzw. Inhalte nur unter Verwendung von Lizenzbedingungen weitergeben,
die mit denen dieses Lizenzvertrages identisch oder vergleichbar sind.

Weitere Details: http://creativecommons.org/licenses/by-nc-sa/3.0/ch/
69 changes: 42 additions & 27 deletions RegT2.tex
Original file line number Diff line number Diff line change
@@ -1,38 +1,53 @@
%%%%%%%%%%%%%%%%%%%%%%%%%
% Dokumentinformationen %
%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand{\titleinfo}{Regelungstechnik 2 - Formelsammlung}
\newcommand{\authorinfo}{Braun \& Co., J. Rast, K\"orner, Gwerder}
\newcommand{\versioninfo}{$Revision: 2.0 $ - gem\"ass Unterricht Markus Kottmann/FS2013}

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Standard projektübergreifender Header für
% - Makros
% - Farben
% - Mathematische Operatoren
%
% DORT NUR ERGÄNZEN, NICHTS LÖSCHEN
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\include{header/header}
\documentclass[margin=small]{tex/hsrzf}

\usepackage{tex/hsrstud}
\usepackage{tex/regtec}

\usepackage{polyglossia}
\setdefaultlanguage[variant=swiss]{german}

\usepackage[
type={CC},
modifier={by-nc-sa},
version={4.0},
lang={german},
]{doclicense}

\usepackage{pdflscape}
\usepackage{tabularx}
\usepackage{ltablex}
\usepackage{booktabs}
\usepackage{multicol}
\usepackage{enumitem}
\usepackage{longtable}
\usepackage{tikz}
\usepackage{float}

\newcommand\formelbuch[1]{\texttt{\textcolor{red!60!black}{\small S#1}}}

\usepackage{enumitem}
\setlist{noitemsep,topsep=1pt,parsep=1pt,partopsep=1pt}
\title{Regelungstechnik 2 -- Formelsammlung}
\author{Braun \& Co., J. Rast, K\"orner, Gwerder, Pross}
% \versioninfo}{$Revision: 2.0 $ - gem\"ass Unterricht Markus Kottmann/FS2013}

\raggedbottom
% Möglichst keine Ergänzungen hier, sondern in header.tex
\begin{document}


%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\input{sections/GegenkopplungStabilitaet}
\maketitle
\tableofcontents

\section*{Lizenz}
\doclicenseThis{}

\newpage
\input{sections/PidRegler}
\input{sections/Diverses}

\input{tex/grundglieder}
\twocolumn
\input{tex/stabilitaet}
\input{tex/pid}
\onecolumn

\newgeometry{hmargin = 1.2cm, vmargin = 2cm}
\input{tex/bode}
\restoregeometry



\end{document}
22 changes: 0 additions & 22 deletions cc_by_nc_sa.txt

This file was deleted.

1 change: 0 additions & 1 deletion header
Submodule header deleted from bb706d
62 changes: 0 additions & 62 deletions sections/Diverses.tex

This file was deleted.

Loading