Skip to content

Commit

Permalink
Merge pull request #9 from n04hk/short
Browse files Browse the repository at this point in the history
Korrekturen
  • Loading branch information
n04hk authored Oct 6, 2019
2 parents 8073344 + b1f72cb commit 9f2a327
Show file tree
Hide file tree
Showing 275 changed files with 424 additions and 367 deletions.
219 changes: 211 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,215 @@
/Elo2.pdf
*.synctex
*.synctex.gz
/tmp


#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.user
*.pdb
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*

## Core latex/pdflatex auxiliary files:
*.aux
*.lof
*.log
*.lot
*.fls
*.out
*.toc
# Ignore preview files of TikzEdt
*.preview.*
/Elo2.tcp
/Elo2.tps
*.fmt
*.fot
*.cb
*.cb2

*.txss

## Intermediate documents:
*.dvi
*-converted-to.*
# these rules might exclude image files for figures etc.
*.ps
*.eps
*.pdf
*.doc

## Bibliography auxiliary files (bibtex/biblatex/biber):
*.bbl
*.bcf
*.blg
*-blx.aux
*-blx.bib
*.brf
*.run.xml

## Build tool auxiliary files:
*.fdb_latexmk
*.synctex
*.synctex.gz
*.synctex.gz(busy)
*.pdfsync

## Auxiliary and intermediate files from other packages:
# algorithms
*.alg
*.loa

# achemso
acs-*.bib

# amsthm
*.thm

# beamer
*.nav
*.snm
*.vrb

# cprotect
*.cpt

# fixme
*.lox

#(r)(e)ledmac/(r)(e)ledpar
*.end
*.?end
*.[1-9]
*.[1-9][0-9]
*.[1-9][0-9][0-9]
*.[1-9]R
*.[1-9][0-9]R
*.[1-9][0-9][0-9]R
*.eledsec[1-9]
*.eledsec[1-9]R
*.eledsec[1-9][0-9]
*.eledsec[1-9][0-9]R
*.eledsec[1-9][0-9][0-9]
*.eledsec[1-9][0-9][0-9]R

# glossaries
*.acn
*.acr
*.glg
*.glo
*.gls
*.glsdefs

# gnuplottex
*-gnuplottex-*

# hyperref
*.brf

# knitr
*-concordance.tex
# TODO Comment the next line if you want to keep your tikz graphics files
*.tikz
*-tikzDictionary

# listings
*.lol

# makeidx
*.idx
*.ilg
*.ind
*.ist

# minitoc
*.maf
*.mlf
*.mlt
*.mtc
*.mtc[0-9]
*.mtc[1-9][0-9]

# minted
_minted*
*.pyg

# morewrites
*.mw

# mylatexformat
*.fmt

# nomencl
*.nlo

# sagetex
*.sagetex.sage
*.sagetex.py
*.sagetex.scmd

# sympy
*.sout
*.sympy
sympy-plots-for-*.tex/

# pdfcomment
*.upa
*.upb

# pythontex
*.pytxcode
pythontex-files-*/

# thmtools
*.loe

# TikZ & PGF
*.dpth
*.md5
*.auxlock

# todonotes
*.tdo

# xindy
*.xdy

# xypic precompiled matrices
*.xyc

# endfloat
*.ttt
*.fff

# Latexian
TSWLatexianTemp*

## Editors:
# WinEdt
*.bak
*.sav

# Texpad
.texpadtmp

# Kile
*.backup

# KBibTeX
*~[0-9]*
*.pdf
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "idiotenseite"]
path = idiotenseite
url = https://github.com/HSR-Stud/idiotenseite.git
[submodule "Travis"]
path = Travis
url = https://github.com/HSR-Stud/Travis.git
24 changes: 0 additions & 24 deletions .project

This file was deleted.

3 changes: 0 additions & 3 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.

35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
notifications:
email: false
sudo: required
dist: trusty
install:
- dir
- pwd
- source ./Travis/texlive_install.sh
cache:
directories:
- /tmp/texlive
- $HOME/.texlive
# Change working directory so including files will work
before_script:
- dir
- pwd
script:
# Prefix command with travis_wait x so it times out after 3 mins, because when the LaTeX doesn't compile pdflatex just hangs instead of quitting.
- travis_wait 3 pdflatex -interaction=nonstopmode -halt-on-error ./Elo2.tex
- travis_wait 3 pdflatex -interaction=nonstopmode -halt-on-error ./Elo2.tex
- travis_wait 3 pdflatex -interaction=nonstopmode -halt-on-error ./Elo2.tex

before_deploy:
- dir
deploy:
provider: releases
api_key:
secure: $GITHUB_RELEASE_TOKEN
file:
- ./Elo2.pdf
skip_cleanup: true
on:
tags: true
all_branches: true

3 changes: 2 additions & 1 deletion CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jürg Rast (jrast)
Jürg Rast (jrast)
Anina Schälle (aschaelle)
Raphael Nestler (rnestler)
Mathias Diethelm (mdiethelm)
Expand All @@ -10,3 +10,4 @@ Christian Gwerder (cgwerder)
Sven Körner (skoerner)
Hannes Badertscher (hbaderts)
Marcel Giger (mgiger)
Noah Kälin (n1kaelin)
6 changes: 2 additions & 4 deletions Elo2.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
% Dokumentinformationen %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\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\quad$ FS2018}
\newcommand{\authorinfo}{A.Sch\"alle, D.Wright, A.Waldvogel, C.Gwerder, S.Koerner, M. Ehrler, L. Leuenberger, M.Giger, N.Kaelin}
\newcommand{\versioninfo}{$Revision: 3.0\quad$ FS2019}

% Header
\include{header/header}
Expand Down Expand Up @@ -32,8 +32,6 @@

\newpage
\input{sections/rauschen}

\input{sections/spannungsreferenzen}
\input{sections/referenzspannungen}
\newpage

Expand Down
20 changes: 5 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
# Elo2 - Elektronik 2

Verantwortlich: Anina Schälle
[![Build Status](https://travis-ci.org/n04hk/Elo2.svg?branch=short)](https://travis-ci.org/n04hk/Elo2)

## Plan und Lerninhlat
## License
CC by-nc-sa

Nach unterricht.hsr.ch:
* Bipolar-Transistoren
* Feldeffekt-Transistoren
* Ideale und reale Transistormodelle
* Katalog wichtiger Schaltungen mit Transistoren
* Entwurf und Dimensionierung von praktischen Schaltungen
* Grundsätze des praktischen Schaltungsaufbaus
* Praktischer Einsatz von SPICE

Achtung, nach Gido Keel sieht das ganz anders aus!

## Braches in diesem Repo:
## Branches in diesem Repo:
* **master**: Lange Version der Zusammenfassung
* **short**: Kurze Version der Zusammenfassung, für die Prüfung
* **short**: Kurze Version der Zusammenfassung, für die Prüfung
1 change: 1 addition & 0 deletions Travis
Submodule Travis added at f8fce5
4 changes: 2 additions & 2 deletions header/header.tex
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%Schriftgr"osse, Layout, Papierformat, Art des Dokumentes
\documentclass[10pt,a4paper,fleqn,headsepline,footsepline]{scrartcl}
%Einstellungen der Seitenränder
\usepackage[left=0.5cm,right=0.5cm,top=0.3cm,bottom=0.3cm,includeheadfoot]{geometry}
\usepackage[left=0.5cm,right=0.5cm,top=0.3cm,bottom=0.3cm,includeheadfoot,headsep=0.2cm,footskip=0.6cm]{geometry}
% Sprache, Zeichensatz, packages
\usepackage[UTF8]{inputenc}
\usepackage[utf8]{inputenc}
\usepackage[ngerman]{babel,varioref}
\usepackage{amssymb,amsmath,graphicx,xcolor,lastpage,wrapfig,verbatim}
\usepackage{tabularx,longtable}
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed pictures/3-eingaenge.png
Diff not rendered.
Binary file removed pictures/AolAcl.jpg
Diff not rendered.
Binary file removed pictures/BipTraBasissch.png
Diff not rendered.
Binary file removed pictures/BipTraDiffAmp.png
Diff not rendered.
Binary file removed pictures/BipTraEmitterschSpGk.png
Diff not rendered.
Binary file removed pictures/BipTraEmitterschStGk.png
Diff not rendered.
Binary file removed pictures/BipTraKennlinien.png
Diff not rendered.
Binary file removed pictures/BipTraKollektorsch.png
Diff not rendered.
Binary file removed pictures/ClosedLoopFreqGang.png
Diff not rendered.
Binary file removed pictures/DNL_ADC.png
Diff not rendered.
Binary file removed pictures/Diode-GS-ESB.png
Diff not rendered.
Binary file removed pictures/Diode-KS-ESB.png
Diff not rendered.
Binary file removed pictures/Diode-Kennlinie-2.png
Diff not rendered.
Binary file removed pictures/Diode-Kennlinie.png
Diff not rendered.
Binary file removed pictures/EndstufenAP.png
Diff not rendered.
Binary file removed pictures/Instrumentationsverstaerker.png
Diff not rendered.
Binary file removed pictures/JFETCCQuelle.png
Diff not rendered.
Binary file removed pictures/JFETKennlinie.png
Diff not rendered.
Binary file removed pictures/KlassAB_Amp.png
Diff not rendered.
Binary file removed pictures/KlassA_Amp.png
Diff not rendered.
Binary file removed pictures/KlassB_Amp.png
Diff not rendered.
Binary file removed pictures/MOSFET.png
Diff not rendered.
Binary file removed pictures/MOSFETAusgangsKennlinie.png
Diff not rendered.
Binary file removed pictures/MOSFETLinBereich.png
Diff not rendered.
Binary file removed pictures/MOSFETSaettBereich.png
Diff not rendered.
Binary file removed pictures/MOSFETSperrbereich.png
Diff not rendered.
Binary file removed pictures/MOSFETSteuerKennlinie.png
Diff not rendered.
Binary file removed pictures/MOSFETSteuerkennlinien.png
Diff not rendered.
Binary file removed pictures/MOSFET_Aufbau.png
Diff not rendered.
Binary file removed pictures/MOSFET_Diffamp.png
Diff not rendered.
Binary file removed pictures/MOSFET_Ersatzsch.png
Diff not rendered.
Binary file removed pictures/MOSFET_IU_Kennlinie.png
Diff not rendered.
Binary file removed pictures/OP-aus-Transistoren.png
Diff not rendered.
Binary file removed pictures/OPInv.png
Diff not rendered.
Binary file removed pictures/OPnichtInv.png
Diff not rendered.
Binary file removed pictures/Spannungsgegenkopplung.png
Diff not rendered.
Binary file removed pictures/Stromgegenkopplung.png
Diff not rendered.
Binary file removed pictures/Transistortypen.png
Diff not rendered.
Binary file removed pictures/bip-basissch.png
Diff not rendered.
Binary file removed pictures/bip-emittersch.png
Diff not rendered.
Binary file removed pictures/bip-frequenz-cs.png
Diff not rendered.
Binary file removed pictures/bip-frequenz.png
Diff not rendered.
Binary file removed pictures/bip-kleinsignal.png
Diff not rendered.
Binary file removed pictures/bip-kollektorsch.png
Diff not rendered.
Binary file removed pictures/bip-schalter-ap.png
Diff not rendered.
Binary file removed pictures/bipolar-EbersMoll.png
Diff not rendered.
Binary file removed pictures/bipolarAusgangsKennlinie.png
Diff not rendered.
Binary file removed pictures/bipolarEingangsKennlinie.png
Diff not rendered.
Binary file removed pictures/bipolarTransistor-Aufbau.png
Diff not rendered.
Binary file removed pictures/bipolarVerstaerkungsKennlinie.png
Diff not rendered.
Binary file removed pictures/boost-verhalten.png
Diff not rendered.
Binary file removed pictures/boostConv.png
Diff not rendered.
Binary file removed pictures/buck-Verhalten.png
Diff not rendered.
Binary file removed pictures/buckConv.png
Diff not rendered.
Binary file removed pictures/cccs-schaltung.png
Diff not rendered.
Binary file removed pictures/cccs.png
Diff not rendered.
Binary file removed pictures/ccvs.png
Diff not rendered.
Binary file removed pictures/cmosDynPrinzip.png
Diff not rendered.
Binary file removed pictures/cmosDynSchema.png
Diff not rendered.
Binary file removed pictures/cmosDynSignal.png
Diff not rendered.
Binary file removed pictures/cmosInverterSchema.png
Diff not rendered.
Binary file removed pictures/cmosInverterSignal.png
Diff not rendered.
Binary file removed pictures/cmosOverview.png
Diff not rendered.
Binary file removed pictures/cmosPrinzip.png
Diff not rendered.
Binary file removed pictures/dc-kleinsignal-ersatz-LC.png
Diff not rendered.
Binary file removed pictures/dc-kleinsignal-ersatz-beispiel.png
Diff not rendered.
Binary file removed pictures/dc-kleinsignal-ersatz-dc.png
Diff not rendered.
Binary file removed pictures/dc-kleinsignal-ersatz-ohneLC.png
Diff not rendered.
Binary file removed pictures/differentiator.png
Diff not rendered.
Binary file removed pictures/differenzver.png
Diff not rendered.
Binary file removed pictures/dualSlope1.png
Diff not rendered.
Binary file removed pictures/early-effekt.png
Diff not rendered.
Binary file removed pictures/effizient2.png
Diff not rendered.
Binary file removed pictures/eingangsstromfehler.png
Diff not rendered.
Binary file removed pictures/emittersch-esb.png
Diff not rendered.
Binary file removed pictures/flybackConv.png
Diff not rendered.
Binary file removed pictures/gewichtsub.png
Diff not rendered.
Binary file removed pictures/gleichrichter-bruecke.png
Diff not rendered.
Binary file removed pictures/gleichrichter-einweg-glaettung.png
Diff not rendered.
Binary file removed pictures/gleichrichter-einweg.png
Diff not rendered.
Binary file removed pictures/i-schmitt-kennlinie.png
Diff not rendered.
Binary file removed pictures/i-schmitt.png
Diff not rendered.
Binary file removed pictures/i-schmittFreieSchwellen.png
Diff not rendered.
Binary file removed pictures/i-verstaerker.png
Diff not rendered.
Binary file removed pictures/instramp.png
Diff not rendered.
Binary file removed pictures/integrator.png
Diff not rendered.
Binary file removed pictures/invConv.png
Diff not rendered.
Binary file removed pictures/invWandler-Verhalten.png
Diff not rendered.
Binary file removed pictures/inver.png
Diff not rendered.
Binary file removed pictures/invertadd.png
Diff not rendered.
Binary file removed pictures/jFET.png
Diff not rendered.
Binary file removed pictures/jFetAusgangsKennlinie.png
Diff not rendered.
Binary file removed pictures/jFetSteuerKennlinie.png
Diff not rendered.
Binary file removed pictures/kippschaltung.png
Diff not rendered.
Binary file removed pictures/komparator.png
Diff not rendered.
Binary file removed pictures/ladungspumpe-inv.png
Diff not rendered.
Binary file removed pictures/ladungspumpe-normal.png
Diff not rendered.
Binary file removed pictures/lcOszillator.png
Diff not rendered.
Binary file removed pictures/linearRegler.png
Diff not rendered.
Binary file removed pictures/lsg1.png
Diff not rendered.
Binary file removed pictures/lsg2.png
Diff not rendered.
Binary file removed pictures/margins.jpg
Diff not rendered.
Binary file removed pictures/mehrfach-addierer-subtrahierer.png
Diff not rendered.
Binary file removed pictures/multiVibrator.png
Diff not rendered.
Binary file removed pictures/multiplizierendeWandler.png
Diff not rendered.
Binary file removed pictures/n-schmitt-kennlinie.png
Diff not rendered.
Binary file removed pictures/n-schmitt.png
Diff not rendered.
Binary file removed pictures/neg-imp-conv.png
Diff not rendered.
Binary file removed pictures/ni-verstaerker.png
Diff not rendered.
Binary file removed pictures/nichtinver.png
Diff not rendered.
Binary file removed pictures/ntc.png
Diff not rendered.
Binary file removed pictures/op-buffer.png
Diff not rendered.
Binary file removed pictures/opAmpBlock.pdf
Binary file not shown.
Binary file removed pictures/opAmpBlock.png
Diff not rendered.
Binary file removed pictures/opAmpCL.pdf
Binary file not shown.
Binary file removed pictures/opAmpInv.png
Diff not rendered.
Binary file removed pictures/opAmpNI.png
Diff not rendered.
Binary file removed pictures/opAmpOL.pdf
Binary file not shown.
Binary file removed pictures/opOffset.png
Diff not rendered.
Binary file removed pictures/osciVCO.png
Diff not rendered.
Binary file removed pictures/osziCrystal.png
Diff not rendered.
Binary file removed pictures/osziDreieckRechteck.png
Diff not rendered.
Binary file removed pictures/osziDreieckRechteckBlock.png
Diff not rendered.
Binary file removed pictures/osziDreieckRechteckSignal.png
Diff not rendered.
Binary file removed pictures/osziLC.png
Diff not rendered.
Binary file removed pictures/osziRechteck.png
Diff not rendered.
Binary file removed pictures/osziRechteckSignal.png
Diff not rendered.
Binary file removed pictures/osziRing.png
Diff not rendered.
Binary file removed pictures/osziRingCMOS.png
Diff not rendered.
Binary file removed pictures/osziRingSignal.png
Diff not rendered.
Binary file removed pictures/osziTypen.png
Diff not rendered.
Binary file removed pictures/pipelined.png
Diff not rendered.
Binary file removed pictures/ptc.png
Diff not rendered.
Binary file removed pictures/quarz-kennl.png
Diff not rendered.
Binary file removed pictures/quarz-schaltung.png
Diff not rendered.
Binary file removed pictures/seriewiderstand.png
Diff not rendered.
Binary file removed pictures/sfu_kurven.png
Diff not rendered.
Binary file removed pictures/sfu_schaltung.jpg
Diff not rendered.
Binary file removed pictures/singleSlope.png
Diff not rendered.
Binary file removed pictures/slew-rate.png
Diff not rendered.
Binary file removed pictures/spannungsfolger.png
Diff not rendered.
Binary file removed pictures/stromspiegel-kaskode.png
Diff not rendered.
Binary file removed pictures/stromspiegel-widlar.png
Diff not rendered.
Binary file removed pictures/stromspiegel.png
Diff not rendered.
Binary file removed pictures/stromsummierung.png
Diff not rendered.
Binary file removed pictures/temperaturabhaengigkeit.png
Diff not rendered.
Binary file removed pictures/tglied.png
Diff not rendered.
Binary file removed pictures/thermisches_schema.png
Diff not rendered.
Binary file removed pictures/thermisches_schema2.png
Diff not rendered.
Binary file removed pictures/thermisches_schema3.png
Diff not rendered.
Binary file removed pictures/tia.png
Diff not rendered.
Binary file removed pictures/uebertragungsfaktoren.png
Diff not rendered.
Binary file removed pictures/vccs.png
Diff not rendered.
Binary file removed pictures/vccs_schaltung.png
Diff not rendered.
Binary file removed pictures/vco.png
Diff not rendered.
Binary file removed pictures/vcvs.png
Diff not rendered.
Binary file removed pictures/verstaerkertypen.png
Diff not rendered.
Binary file removed pictures/verstaerkungsfaktor.png
Diff not rendered.
Binary file removed pictures/zdiode-kennlinie.png
Diff not rendered.
Binary file removed pictures/zener-gs.png
Diff not rendered.
Binary file removed pictures/zener-ks.png
Diff not rendered.
Loading

0 comments on commit 9f2a327

Please sign in to comment.