diff --git a/.gitattributes b/.gitattributes index 0a15183..8c2f6dd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,4 +20,4 @@ Makefile text eol=lf #*.kicad_sym merge=ours #*.kicad_sch merge=ours -#*.kicad_pcb merge=ours +#*.kicad_pcb merge=ours \ No newline at end of file diff --git a/.gitignore b/.gitignore index 624fed4..7d880ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,72 @@ -# .gitignore für: Standart PLC Programmierung mit CODESYS -# Hier fuer Projekt: Umbau 1000T Presse Fa. Lorenz Industrietechnik GmbH -# -# (C) 2024-2025 - Adam Skotarczak (adam@skotarczak.net) -# +# .gitignore für: KiCAD + +# ------------------------------ +# KiCad Projekt .gitignore +# ------------------------------ +# Ziel: Nur die wirklich relevanten Quelldateien versionieren +# (Schaltpläne, PCB, Symbole, Footprints, Projektdateien). +# Alle automatisch generierten Dateien und Caches werden ignoriert. +# ------------------------------ + +# Projekt-Caches und temporäre Dateien +*.bak # Backup-Dateien von KiCad +*.kicad_prl # Project local settings (z.B. letzte Fensterpositionen) +*.kicad_sch-bak # Backup-Dateien von Schaltplänen +*.kicad_pcb-bak # Backup-Dateien von PCB +*.tmp # Temporäre Dateien + +# KiCad Cache Library (automatisch generiert, nicht versionieren) +*.kicad_sym-bak # Symbol-Backup +*-cache.lib # Altes Cache-Format (KiCad 5.x) +*-rescue.lib # Rescue Libraries (automatisch erzeugt) + +# Output-Dateien (Simulation, Gerber, Plot, BoM, etc.) +*.dcm # DCM-Kommentardateien (veraltet, nicht nötig im Repo) +*.gbr # Gerber-Files für Fertigung +*.gbl +*.gbs +*.gtl +*.gto +*.gts +*.drl # Bohrdaten +*.map # Mapping-Dateien +*.pos # Pick-and-Place Dateien +*.csv # BOM-Exports +*.xml # BOM-Exports +*.pdf # geplottete PDFs (werden bei Bedarf neu erzeugt) + +# Simulation (Ngspice etc.) +*.raw +*.log +*.out +*.cir +*.sp + +# Von KiCad erzeugte Ordner für Outputs +/fabrication/ # eigener Export-Ordner (falls angelegt) +/plots/ # Plot-Ausgaben +/simulation/ # Simulationsergebnisse +*-backups/ # automatisches Backup + +# Betriebssystem-spezifische Dateien +.DS_Store # macOS Finder +Thumbs.db # Windows Explorer + +# ------------------------------ +# Empfehlung: +# Folgende Dateien sollten im Repo bleiben: +# *.kicad_pro -> Projektdatei +# *.kicad_sch -> Schaltplan +# *.kicad_pcb -> Layout +# *.kicad_sym -> eigene Symbollibs +# *.kicad_mod -> eigene Footprintlibs +# ------------------------------ + +# Archive +*.zip + +# IDEs +*.vscode # LibreOffice .~lock.* @@ -22,17 +86,6 @@ Thumbs.db *.temp *.~* -# IDE- und Debug-Artefakte -*.trc -*.trace - -# Andere OS-spezifische Dateien -.DS_Store - -# CoDeSys generierte Arbeitsverzeichnisse -output/ -temp/ - # Custom Dokumentation/Work/** #.vscode @@ -64,4 +117,4 @@ _autosave-* *-save.pro *-save.kicad_pcb fp-info-cache -~*.lck \ No newline at end of file +~*.lck diff --git a/.gitignore.kicad-template b/.gitignore.kicad-template new file mode 100644 index 0000000..657f027 --- /dev/null +++ b/.gitignore.kicad-template @@ -0,0 +1,64 @@ +# ------------------------------ +# KiCad Projekt .gitignore +# ------------------------------ +# Ziel: Nur die wirklich relevanten Quelldateien versionieren +# (Schaltpläne, PCB, Symbole, Footprints, Projektdateien). +# Alle automatisch generierten Dateien und Caches werden ignoriert. +# ------------------------------ + +# Projekt-Caches und temporäre Dateien +*.bak # Backup-Dateien von KiCad +*.kicad_prl # Project local settings (z.B. letzte Fensterpositionen) +*.kicad_sch-bak # Backup-Dateien von Schaltplänen +*.kicad_pcb-bak # Backup-Dateien von PCB +*.tmp # Temporäre Dateien + +# KiCad Cache Library (automatisch generiert, nicht versionieren) +*.kicad_sym-bak # Symbol-Backup +*-cache.lib # Altes Cache-Format (KiCad 5.x) +*-rescue.lib # Rescue Libraries (automatisch erzeugt) + +# Output-Dateien (Simulation, Gerber, Plot, BoM, etc.) +*.dcm # DCM-Kommentardateien (veraltet, nicht nötig im Repo) +*.gbr # Gerber-Files für Fertigung +*.gbl +*.gbs +*.gtl +*.gto +*.gts +*.drl # Bohrdaten +*.map # Mapping-Dateien +*.pos # Pick-and-Place Dateien +*.csv # BOM-Exports +*.xml # BOM-Exports +*.pdf # geplottete PDFs (werden bei Bedarf neu erzeugt) + +# Simulation (Ngspice etc.) +*.raw +*.log +*.out +*.cir +*.sp + +# Von KiCad erzeugte Ordner für Outputs +/fabrication/ # eigener Export-Ordner (falls angelegt) +/plots/ # Plot-Ausgaben +/simulation/ # Simulationsergebnisse +*-backups/ # automatisches Backup + +# Betriebssystem-spezifische Dateien +.DS_Store # macOS Finder +Thumbs.db # Windows Explorer + +# ------------------------------ +# Empfehlung: +# Folgende Dateien sollten im Repo bleiben: +# *.kicad_pro -> Projektdatei +# *.kicad_sch -> Schaltplan +# *.kicad_pcb -> Layout +# *.kicad_sym -> eigene Symbollibs +# *.kicad_mod -> eigene Footprintlibs +# ------------------------------ + +# Backups +*.zip diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 53dcdd9..7f7f508 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -6,6 +6,8 @@ "streetsidesoftware.code-spell-checker-german", "davidanson.vscode-markdownlint", "yzane.markdown-pdf", - "yzhang.markdown-all-in-one" + "yzhang.markdown-all-in-one", + "sajadghorbani.kicode", + "jessejabezarendse.kicanvas-viewer" ] } diff --git a/.vscode/keybindings.json b/.vscode/keybindings.json deleted file mode 100644 index 18e7ad1..0000000 --- a/.vscode/keybindings.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "key": "ctrl+alt+p", - "command": "workbench.action.tasks.runTask", - "args": "Markdown → PDF (Pandoc via WSL)", - "when": "editorLangId == markdown" - } -] diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 45ea062..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "Markdown → PDF (Pandoc via WSL)", - "type": "shell", - "command": "wsl make pdf", - "group": { - "kind": "build", - "isDefault": true - }, - "problemMatcher": [], - "presentation": { - "reveal": "always", - "panel": "shared" - } - } - ] -} diff --git a/Betriebsmittelkennzeichnung.md b/Betriebsmittelkennzeichnung.md index 750f270..9727cd3 100644 --- a/Betriebsmittelkennzeichnung.md +++ b/Betriebsmittelkennzeichnung.md @@ -1,6 +1,7 @@ # Betriebsmittelkennzeichnung in der Elektrotechnik – Alt vs. Neu -> von Adam Skotarczak +> von Adam Skotarczak +> Dokument Aktuell in Bearbeitung ## Inhalt diff --git a/README.md b/README.md index e139bec..a4bcdc7 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,6 @@ Diese Bibliothek enthält Symbole für Bauteile aus dem Schaltschrankbau. ## Betriebsmittelkennzeichnung Industrie -Du hast recht: **„H = Lampe“** stammt aus älteren/betrieblichen Konventionen (z. B. nach DIN 40719/Herstellerpraxis). **Nach aktueller DIN EN IEC 81346-2:2019 (DIN-Übernahme 2020-10)** gehören **Leuchten/Lampen zur Klasse „E“ (Aussenden)** – oft mit Unterklasse **EA**; **„H“** steht heute für **Behandlung von Stoffen**. ([Wikipedia][1], [Elektropraktiker][2]) - ### Kennbuchstaben (A1) nach DIN EN IEC 81346-2 2019 / DIN EN IEC 81346-2 2020-10 | Kennbuchstabe | Verwendung / Funktion (Kurzfassung) | Quelle | diff --git a/VERSION b/VERSION index 341cf11..9325c3c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 \ No newline at end of file +0.3.0 \ No newline at end of file diff --git a/symlib/elektronik.kicad_sym b/symlib/elektronik.kicad_sym index 70c1c1a..88a9a00 100644 --- a/symlib/elektronik.kicad_sym +++ b/symlib/elektronik.kicad_sym @@ -3,15 +3,16 @@ (generator "kicad_symbol_editor") (generator_version "9.0") (symbol "Batterie_Akku_DC" + (power) (pin_numbers (hide yes) ) (pin_names (offset 0) ) - (exclude_from_sim no) - (in_bom yes) - (on_board yes) + (exclude_from_sim yes) + (in_bom no) + (on_board no) (property "Reference" "-G" (at -7.366 5.08 0) (effects @@ -20,12 +21,13 @@ ) ) ) - (property "Value" "" - (at 0 0 0) + (property "Value" "Batterie_Akku_DC" + (at -0.254 -7.112 0) (effects (font (size 1.27 1.27) ) + (hide yes) ) ) (property "Footprint" "" diff --git a/symlib/hydraulik_pneumatic.kicad_sym b/symlib/hydraulik_pneumatic.kicad_sym index a76db84..2592499 100644 --- a/symlib/hydraulik_pneumatic.kicad_sym +++ b/symlib/hydraulik_pneumatic.kicad_sym @@ -552,6 +552,9 @@ (embedded_fonts no) ) (symbol "Zylinder_Doppelt_(M)" + (pin_numbers + (hide yes) + ) (pin_names (offset 0) ) diff --git a/symlib/lorenz-industrietechnik-wasserhydraulik.kicad_sym b/symlib/lomix-industrietechnik-wasserhydraulik.kicad_sym similarity index 96% rename from symlib/lorenz-industrietechnik-wasserhydraulik.kicad_sym rename to symlib/lomix-industrietechnik-wasserhydraulik.kicad_sym index d2660c3..6f3a9fd 100644 --- a/symlib/lorenz-industrietechnik-wasserhydraulik.kicad_sym +++ b/symlib/lomix-industrietechnik-wasserhydraulik.kicad_sym @@ -3,9 +3,12 @@ (generator "kicad_symbol_editor") (generator_version "9.0") (symbol "Ventil_(Y)" - (pin_names + (pin_numbers (hide yes) ) + (pin_names + (offset 0) + ) (exclude_from_sim no) (in_bom yes) (on_board yes) @@ -51,6 +54,7 @@ (font (size 1.27 1.27) ) + (hide yes) ) ) (symbol "Ventil_(Y)_0_1" @@ -103,14 +107,14 @@ (pin input line (at 0 5.08 270) (length 2.54) - (name "" + (name "A1" (effects (font (size 0.762 0.762) ) ) ) - (number "1" + (number "A1" (effects (font (size 0.508 0.508) @@ -121,14 +125,14 @@ (pin output line (at 0 -5.08 90) (length 2.54) - (name "" + (name "A2" (effects (font (size 0.762 0.762) ) ) ) - (number "2" + (number "A2" (effects (font (size 0.508 0.508) @@ -176,9 +180,12 @@ (embedded_fonts no) ) (symbol "Ventil_Sicherheit_(Y)" - (pin_names + (pin_numbers (hide yes) ) + (pin_names + (offset 0) + ) (exclude_from_sim no) (in_bom yes) (on_board yes) @@ -224,6 +231,7 @@ (font (size 1.27 1.27) ) + (hide yes) ) ) (symbol "Ventil_Sicherheit_(Y)_0_1" @@ -292,14 +300,14 @@ (pin input line (at 0 5.08 270) (length 2.54) - (name "" + (name "A1" (effects (font (size 0.762 0.762) ) ) ) - (number "1" + (number "A1" (effects (font (size 0.508 0.508) @@ -310,14 +318,14 @@ (pin output line (at 0 -5.08 90) (length 2.54) - (name "" + (name "A2" (effects (font (size 0.762 0.762) ) ) ) - (number "2" + (number "A2" (effects (font (size 0.508 0.508) diff --git a/symlib/standart.kicad_sym b/symlib/standart.kicad_sym index a778a32..f0b69c5 100644 --- a/symlib/standart.kicad_sym +++ b/symlib/standart.kicad_sym @@ -948,7 +948,6 @@ (embedded_fonts no) ) (symbol "Regler_(S)" - (power) (pin_names (hide yes) ) @@ -1086,7 +1085,7 @@ (in_bom yes) (on_board yes) (property "Reference" "-K" - (at -7.366 0 0) + (at -4.572 5.842 0) (effects (font (size 1.524 1.524) @@ -1129,6 +1128,15 @@ (hide yes) ) ) + (property "XREF" "" + (at -6.604 4.064 0) + (show_name) + (effects + (font + (size 0.508 0.508) + ) + ) + ) (property "ki_keywords" "K, Relais" (at 0 0 0) (effects @@ -1202,7 +1210,7 @@ (in_bom yes) (on_board yes) (property "Reference" "-K" - (at -4.318 0 0) + (at -4.572 4.318 0) (effects (font (size 1.27 1.27) @@ -1244,6 +1252,24 @@ (hide yes) ) ) + (property "XREF" "" + (at -4.318 2.794 0) + (show_name) + (effects + (font + (size 0.508 0.508) + ) + ) + ) + (property "ki_keywords" "Relais, NC" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) (symbol "Relais_(K)_NC_0_1" (polyline (pts @@ -1333,7 +1359,7 @@ (in_bom yes) (on_board yes) (property "Reference" "-K" - (at -4.318 0 0) + (at -4.318 4.318 0) (effects (font (size 1.27 1.27) @@ -1375,6 +1401,15 @@ (hide yes) ) ) + (property "XREF" "" + (at -4.318 2.794 0) + (show_name) + (effects + (font + (size 0.508 0.508) + ) + ) + ) (symbol "Relais_(K)_NO_0_1" (polyline (pts @@ -6008,13 +6043,14 @@ (embedded_fonts no) ) (symbol "Steckdose_W_(X)" + (power) (pin_names (offset 0) (hide yes) ) - (exclude_from_sim no) - (in_bom yes) - (on_board yes) + (exclude_from_sim yes) + (in_bom no) + (on_board no) (property "Reference" "-X" (at -6.604 3.302 0) (effects @@ -6023,7 +6059,7 @@ ) ) ) - (property "Value" "" + (property "Value" "Steckdose_W_(X)" (at 0 0 0) (effects (font @@ -6296,8 +6332,12 @@ (embedded_fonts no) ) (symbol "TCP_(X)" + (pin_numbers + (hide yes) + ) (pin_names (offset 0) + (hide yes) ) (exclude_from_sim no) (in_bom yes) @@ -6462,6 +6502,9 @@ (embedded_fonts no) ) (symbol "Taster_(S)_NO" + (pin_numbers + (hide yes) + ) (pin_names (offset 0) ) @@ -6602,9 +6645,12 @@ (embedded_fonts no) ) (symbol "Ventil_(Y)" - (pin_names + (pin_numbers (hide yes) ) + (pin_names + (offset 0) + ) (exclude_from_sim no) (in_bom yes) (on_board yes) @@ -6703,14 +6749,14 @@ (pin input line (at 0 5.08 270) (length 2.54) - (name "" + (name "A1" (effects (font (size 0.762 0.762) ) ) ) - (number "1" + (number "A1" (effects (font (size 0.508 0.508) @@ -6721,14 +6767,14 @@ (pin output line (at 0 -5.08 90) (length 2.54) - (name "" + (name "A2" (effects (font (size 0.762 0.762) ) ) ) - (number "2" + (number "A2" (effects (font (size 0.508 0.508) diff --git a/zeichnungsblaetter/A3_ISO5457-ISO7200-2004_DE_edited.kicad_wks b/zeichnungsblaetter/A3_DE_landscape.kicad_wks similarity index 100% rename from zeichnungsblaetter/A3_ISO5457-ISO7200-2004_DE_edited.kicad_wks rename to zeichnungsblaetter/A3_DE_landscape.kicad_wks diff --git a/zeichnungsblaetter/A4_ISO5457-ISO7200-2004_DE_edited.kicad_wks b/zeichnungsblaetter/A4_DE_landscape.kicad_wks similarity index 100% rename from zeichnungsblaetter/A4_ISO5457-ISO7200-2004_DE_edited.kicad_wks rename to zeichnungsblaetter/A4_DE_landscape.kicad_wks