From d802b4a7afde9e24691609ee08380fe63c18d334 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 7 Mar 2021 15:58:18 +0100 Subject: [PATCH] Update demos --- .../complex_hierarchy-cache.lib | 302 --- .../complex_hierarchy_schlib.lib | 324 --- demos/ecc83/ecc83-pp.kicad_pcb | 1961 +++++++++-------- demos/ecc83/ecc83-pp.kicad_pro | 17 +- demos/ecc83/ecc83-pp_v2.kicad_pcb | 277 ++- demos/ecc83/ecc83-pp_v2.kicad_pro | 68 +- demos/ecc83/ecc83-pp_v2.kicad_sch | 226 +- demos/test_pads_inside_pads/sym-lib-table | 2 +- .../test_pads_inside_pads.kicad_pcb | 39 +- .../test_pads_inside_pads.kicad_pro | 40 +- .../test_pads_inside_pads.kicad_sch | 21 +- 11 files changed, 1444 insertions(+), 1833 deletions(-) delete mode 100644 demos/complex_hierarchy/complex_hierarchy-cache.lib delete mode 100644 demos/complex_hierarchy/complex_hierarchy_schlib.lib diff --git a/demos/complex_hierarchy/complex_hierarchy-cache.lib b/demos/complex_hierarchy/complex_hierarchy-cache.lib deleted file mode 100644 index 2b0979493f..0000000000 --- a/demos/complex_hierarchy/complex_hierarchy-cache.lib +++ /dev/null @@ -1,302 +0,0 @@ -EESchema-LIBRARY Version 2.4 -#encoding utf-8 -# -# complex_hierarchy_schlib_+12C -# -DEF complex_hierarchy_schlib_+12C #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "complex_hierarchy_schlib_+12C" 0 150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 -30 50 0 100 N -P 2 0 1 0 0 0 0 100 N -P 2 0 1 0 0 100 30 50 N -X +12C 1 0 0 0 U 50 50 1 1 W N -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_+12V -# -DEF complex_hierarchy_schlib_+12V #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "complex_hierarchy_schlib_+12V" 0 140 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 -30 50 0 100 N -P 2 0 1 0 0 0 0 100 N -P 2 0 1 0 0 100 30 50 N -X +12V 1 0 0 0 U 50 50 1 1 W N -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_-VAA -# -DEF complex_hierarchy_schlib_-VAA #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 100 20 H I C CNN -F1 "complex_hierarchy_schlib_-VAA" 0 100 30 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 3 0 1 0 0 0 0 50 0 50 N -P 7 0 1 0 0 80 30 50 -20 50 -30 50 0 80 0 80 0 80 F -X -VAA 1 0 0 0 U 20 20 0 0 W N -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_7805 -# -DEF complex_hierarchy_schlib_7805 U 0 20 Y Y 1 F N -F0 "U" 150 -196 60 H V C CNN -F1 "complex_hierarchy_schlib_7805" 0 200 60 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -200 -150 200 150 0 1 0 N -X VO 1 400 50 200 L 30 40 1 1 w -X GND 2 0 -250 100 U 30 40 1 1 I -X VI 3 -400 50 200 R 30 40 1 1 I -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_C -# -DEF complex_hierarchy_schlib_C C 0 10 N Y 1 F N -F0 "C" 25 100 50 H V L CNN -F1 "complex_hierarchy_schlib_C" 25 -100 50 H V L CNN -F2 "" 38 -150 30 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - C? - C_????_* - C_???? - SMD*_c - Capacitor* -$ENDFPLIST -DRAW -P 2 0 1 20 -80 -30 80 -30 N -P 2 0 1 20 -80 30 80 30 N -X ~ 1 0 150 110 D 40 40 1 1 P -X ~ 2 0 -150 110 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_CONN_2 -# -DEF complex_hierarchy_schlib_CONN_2 P 0 40 Y N 1 F N -F0 "P" -50 0 40 V V C CNN -F1 "complex_hierarchy_schlib_CONN_2" 50 0 40 V V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -100 150 100 -150 0 1 0 N -X P1 1 -350 100 250 R 60 60 1 1 P I -X PM 2 -350 -100 250 R 60 60 1 1 P I -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_CP -# -DEF complex_hierarchy_schlib_CP C 0 10 N Y 1 F N -F0 "C" 25 100 50 H V L CNN -F1 "complex_hierarchy_schlib_CP" 25 -100 50 H V L CNN -F2 "" 38 -150 30 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - CP* - Elko* - TantalC* - C*elec - c_elec* - SMD*_Pol -$ENDFPLIST -DRAW -S -90 20 -90 40 0 1 0 N -S -90 20 90 20 0 1 0 N -S -70 90 -30 90 0 1 0 N -S -50 70 -50 110 0 1 0 N -S 90 -20 -90 -40 0 1 0 F -S 90 40 -90 40 0 1 0 N -S 90 40 90 20 0 1 0 N -X ~ 1 0 150 110 D 40 40 1 1 P -X ~ 2 0 -150 110 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_D_Small -# -DEF complex_hierarchy_schlib_D_Small D 0 10 N N 1 F N -F0 "D" -50 80 50 H V L CNN -F1 "complex_hierarchy_schlib_D_Small" -150 -80 50 H V L CNN -F2 "" 0 0 60 V V C CNN -F3 "" 0 0 60 V V C CNN -$FPLIST - Diode_* - D-Pak_TO252AA - *SingleDiode - *SingleDiode* - *_Diode_* -$ENDFPLIST -DRAW -P 2 0 1 0 -30 -40 -30 40 N -P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F -X K 1 -100 0 70 R 50 50 1 1 P -X A 2 100 0 70 L 50 50 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_GND -# -DEF complex_hierarchy_schlib_GND #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "complex_hierarchy_schlib_GND" 0 -123 30 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N -X GND 1 0 0 0 D 20 30 1 1 W N -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_HT -# -DEF complex_hierarchy_schlib_HT #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 120 50 H I C CNN -F1 "complex_hierarchy_schlib_HT" 0 90 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 3 0 1 0 0 0 0 40 0 40 N -P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N -X HT 1 0 0 0 U 20 20 0 0 W N -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_ICL7660 -# -DEF complex_hierarchy_schlib_ICL7660 U 0 40 Y Y 1 F N -F0 "U" 200 400 70 H V L CNN -F1 "complex_hierarchy_schlib_ICL7660" 50 -450 70 H V L CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -550 -350 550 350 0 1 0 N -X CAP+ 2 -850 250 300 R 60 60 1 1 I -X GND 3 -50 -650 300 U 60 60 1 1 W -X CAP- 4 -850 50 300 R 60 60 1 1 I -X VOUT 5 850 150 300 L 60 60 1 1 w -X LV 6 850 -150 300 L 60 60 1 1 I -X OSC 7 -850 -150 300 R 60 60 1 1 I -X V+ 8 -50 650 300 D 60 60 1 1 W -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_MPSA42 -# -DEF complex_hierarchy_schlib_MPSA42 Q 0 0 Y Y 1 F N -F0 "Q" 150 -150 60 H V L CNN -F1 "complex_hierarchy_schlib_MPSA42" 150 150 60 H V L CNN -F2 "TO92-CBE" 150 0 30 H I C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - TO92-CBE -$ENDFPLIST -DRAW -C 50 0 111 0 1 10 N -P 2 0 1 0 0 0 100 100 N -P 3 0 1 10 0 75 0 -75 0 -75 N -P 3 0 1 0 50 -50 0 0 0 0 N -P 3 0 1 0 90 -90 100 -100 100 -100 N -P 5 0 1 0 90 -90 70 -30 30 -70 90 -90 90 -90 F -X E 1 100 -200 100 U 20 20 1 1 P -X B 2 -200 0 200 R 20 20 1 1 I -X C 3 100 200 100 D 20 20 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_MPSA92 -# -DEF complex_hierarchy_schlib_MPSA92 Q 0 0 Y Y 1 F N -F0 "Q" 150 -150 60 H V L CNN -F1 "complex_hierarchy_schlib_MPSA92" 150 150 60 H V L CNN -F2 "TO92-CBE" 150 0 30 H I C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - TO92-CBE -$ENDFPLIST -DRAW -C 50 0 111 0 1 10 N -P 2 0 1 0 0 0 100 100 N -P 3 0 1 10 0 75 0 -75 0 -75 F -P 3 0 1 0 25 -25 0 0 0 0 N -P 3 0 1 0 100 -100 65 -65 65 -65 N -P 5 0 1 0 25 -25 50 -75 75 -50 25 -25 25 -25 F -X E 1 100 -200 100 U 20 20 1 1 P -X B 2 -200 0 200 R 20 20 1 1 I -X C 3 100 200 100 D 20 20 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_POT -# -DEF complex_hierarchy_schlib_POT RV 0 40 Y N 1 F N -F0 "RV" 0 -100 50 H V C CNN -F1 "complex_hierarchy_schlib_POT" 0 0 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -150 50 150 -50 0 1 0 N -P 3 0 1 0 0 50 -20 70 20 70 F -X 1 1 -250 0 100 R 40 40 1 1 P -X 2 2 0 150 80 D 40 40 1 1 P -X 3 3 250 0 100 L 40 40 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_PWR_FLAG -# -DEF complex_hierarchy_schlib_PWR_FLAG #FLG 0 0 N N 1 F P -F0 "#FLG" 0 95 50 H I C CNN -F1 "complex_hierarchy_schlib_PWR_FLAG" 0 180 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N -X pwr 1 0 0 0 U 20 20 0 0 w -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_R -# -DEF complex_hierarchy_schlib_R R 0 0 N Y 1 F N -F0 "R" 80 0 50 V V C CNN -F1 "complex_hierarchy_schlib_R" 0 0 50 V V C CNN -F2 "" -70 0 30 V V C CNN -F3 "" 0 0 30 H V C CNN -$FPLIST - R_* - Resistor_* -$ENDFPLIST -DRAW -S -40 -100 40 100 0 1 10 N -X ~ 1 0 150 50 D 60 60 1 1 P -X ~ 2 0 -150 50 U 60 60 1 1 P -ENDDRAW -ENDDEF -# -# complex_hierarchy_schlib_VCC -# -DEF complex_hierarchy_schlib_VCC #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "complex_hierarchy_schlib_VCC" 0 150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C 0 75 25 0 1 0 N -P 2 0 1 0 0 0 0 50 N -X VCC 1 0 0 0 U 50 50 1 1 W N -ENDDRAW -ENDDEF -# -#End Library diff --git a/demos/complex_hierarchy/complex_hierarchy_schlib.lib b/demos/complex_hierarchy/complex_hierarchy_schlib.lib deleted file mode 100644 index 62cbb7ed3d..0000000000 --- a/demos/complex_hierarchy/complex_hierarchy_schlib.lib +++ /dev/null @@ -1,324 +0,0 @@ -EESchema-LIBRARY Version 2.4 -#encoding utf-8 -# -# +12C -# -DEF +12C #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "+12C" 0 150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 -30 50 0 100 N -P 2 0 1 0 0 0 0 100 N -P 2 0 1 0 0 100 30 50 N -X +12C 1 0 0 0 U 50 50 1 1 W N -ENDDRAW -ENDDEF -# -# +12V -# -DEF +12V #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "+12V" 0 140 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 2 0 1 0 -30 50 0 100 N -P 2 0 1 0 0 0 0 100 N -P 2 0 1 0 0 100 30 50 N -X +12V 1 0 0 0 U 50 50 1 1 W N -ENDDRAW -ENDDEF -# -# -VAA -# -DEF -VAA #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 100 20 H I C CNN -F1 "-VAA" 0 100 30 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 3 0 1 0 0 0 0 50 0 50 N -P 7 0 1 0 0 80 30 50 -20 50 -30 50 0 80 0 80 0 80 F -X -VAA 1 0 0 0 U 20 20 0 0 W N -ENDDRAW -ENDDEF -# -# 7805 -# -DEF 7805 U 0 20 Y Y 1 F N -F0 "U" 150 -196 60 H V C CNN -F1 "7805" 0 200 60 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -ALIAS 78L05 LM7805 LM7812 -DRAW -S -200 -150 200 150 0 1 0 N -X VO 1 400 50 200 L 30 40 1 1 w -X GND 2 0 -250 100 U 30 40 1 1 I -X VI 3 -400 50 200 R 30 40 1 1 I -ENDDRAW -ENDDEF -# -# C -# -DEF C C 0 10 N Y 1 F N -F0 "C" 25 100 50 H V L CNN -F1 "C" 25 -100 50 H V L CNN -F2 "" 38 -150 30 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - C? - C_????_* - C_???? - SMD*_c - Capacitor* -$ENDFPLIST -DRAW -P 2 0 1 20 -80 -30 80 -30 N -P 2 0 1 20 -80 30 80 30 N -X ~ 1 0 150 110 D 40 40 1 1 P -X ~ 2 0 -150 110 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# CONN_2 -# -DEF CONN_2 P 0 40 Y N 1 F N -F0 "P" -50 0 40 V V C CNN -F1 "CONN_2" 50 0 40 V V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -100 150 100 -150 0 1 0 N -X P1 1 -350 100 250 R 60 60 1 1 P I -X PM 2 -350 -100 250 R 60 60 1 1 P I -ENDDRAW -ENDDEF -# -# CP -# -DEF CP C 0 10 N Y 1 F N -F0 "C" 25 100 50 H V L CNN -F1 "CP" 25 -100 50 H V L CNN -F2 "" 38 -150 30 H V C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - CP* - Elko* - TantalC* - C*elec - c_elec* - SMD*_Pol -$ENDFPLIST -DRAW -S -90 20 -90 40 0 1 0 N -S -90 20 90 20 0 1 0 N -S -70 90 -30 90 0 1 0 N -S -50 70 -50 110 0 1 0 N -S 90 -20 -90 -40 0 1 0 F -S 90 40 -90 40 0 1 0 N -S 90 40 90 20 0 1 0 N -X ~ 1 0 150 110 D 40 40 1 1 P -X ~ 2 0 -150 110 U 40 40 1 1 P -ENDDRAW -ENDDEF -# -# D_Small -# -DEF D_Small D 0 10 N N 1 F N -F0 "D" -50 80 50 H V L CNN -F1 "D_Small" -150 -80 50 H V L CNN -F2 "" 0 0 60 V V C CNN -F3 "" 0 0 60 V V C CNN -$FPLIST - Diode_* - D-Pak_TO252AA - *SingleDiode - *SingleDiode* - *_Diode_* -$ENDFPLIST -DRAW -P 2 0 1 0 -30 -40 -30 40 N -P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F -X K 1 -100 0 70 R 50 50 1 1 P -X A 2 100 0 70 L 50 50 1 1 P -ENDDRAW -ENDDEF -# -# GND -# -DEF GND #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "GND" 0 -123 30 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N -X GND 1 0 0 0 D 20 30 1 1 W N -ENDDRAW -ENDDEF -# -# HT -# -DEF HT #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 120 50 H I C CNN -F1 "HT" 0 90 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 3 0 1 0 0 0 0 40 0 40 N -P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N -X HT 1 0 0 0 U 20 20 0 0 W N -ENDDRAW -ENDDEF -# -# ICL7660 -# -DEF ICL7660 U 0 40 Y Y 1 F N -F0 "U" 200 400 70 H V L CNN -F1 "ICL7660" 50 -450 70 H V L CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -550 -350 550 350 0 1 0 N -X CAP+ 2 -850 250 300 R 60 60 1 1 I -X GND 3 -50 -650 300 U 60 60 1 1 W -X CAP- 4 -850 50 300 R 60 60 1 1 I -X VOUT 5 850 150 300 L 60 60 1 1 w -X LV 6 850 -150 300 L 60 60 1 1 I -X OSC 7 -850 -150 300 R 60 60 1 1 I -X V+ 8 -50 650 300 D 60 60 1 1 W -ENDDRAW -ENDDEF -# -# LM358 -# -DEF LM358 U 0 20 Y Y 2 F N -F0 "U" -50 200 60 H V L CNN -F1 "LM358" -50 -250 60 H V L CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -ALIAS LM358N LMC6062 LMC6082 TL072 TL082 -DRAW -P 4 0 1 6 -200 200 200 0 -200 -200 -200 200 f -X V- 4 -100 -400 250 U 40 40 0 1 W -X V+ 8 -100 400 250 D 40 40 0 1 W -X ~ 1 500 0 300 L 40 40 1 1 O -X - 2 -500 -100 300 R 40 40 1 1 I -X + 3 -500 100 300 R 40 40 1 1 I -X + 5 -500 100 300 R 40 40 2 1 I -X - 6 -500 -100 300 R 40 40 2 1 I -X ~ 7 500 0 300 L 40 40 2 1 O -ENDDRAW -ENDDEF -# -# MPSA42 -# -DEF MPSA42 Q 0 0 Y Y 1 F N -F0 "Q" 150 -150 60 H V L CNN -F1 "MPSA42" 150 150 60 H V L CNN -F2 "TO92-CBE" 150 0 30 H I C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - TO92-CBE -$ENDFPLIST -DRAW -C 50 0 111 0 1 10 N -P 2 0 1 0 0 0 100 100 N -P 3 0 1 10 0 75 0 -75 0 -75 N -P 3 0 1 0 50 -50 0 0 0 0 N -P 3 0 1 0 90 -90 100 -100 100 -100 N -P 5 0 1 0 90 -90 70 -30 30 -70 90 -90 90 -90 F -X E 1 100 -200 100 U 20 20 1 1 P -X B 2 -200 0 200 R 20 20 1 1 I -X C 3 100 200 100 D 20 20 1 1 P -ENDDRAW -ENDDEF -# -# MPSA92 -# -DEF MPSA92 Q 0 0 Y Y 1 F N -F0 "Q" 150 -150 60 H V L CNN -F1 "MPSA92" 150 150 60 H V L CNN -F2 "TO92-CBE" 150 0 30 H I C CNN -F3 "" 0 0 60 H V C CNN -$FPLIST - TO92-CBE -$ENDFPLIST -DRAW -C 50 0 111 0 1 10 N -P 2 0 1 0 0 0 100 100 N -P 3 0 1 10 0 75 0 -75 0 -75 F -P 3 0 1 0 25 -25 0 0 0 0 N -P 3 0 1 0 100 -100 65 -65 65 -65 N -P 5 0 1 0 25 -25 50 -75 75 -50 25 -25 25 -25 F -X E 1 100 -200 100 U 20 20 1 1 P -X B 2 -200 0 200 R 20 20 1 1 I -X C 3 100 200 100 D 20 20 1 1 P -ENDDRAW -ENDDEF -# -# POT -# -DEF POT RV 0 40 Y N 1 F N -F0 "RV" 0 -100 50 H V C CNN -F1 "POT" 0 0 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -S -150 50 150 -50 0 1 0 N -P 3 0 1 0 0 50 -20 70 20 70 F -X 1 1 -250 0 100 R 40 40 1 1 P -X 2 2 0 150 80 D 40 40 1 1 P -X 3 3 250 0 100 L 40 40 1 1 P -ENDDRAW -ENDDEF -# -# PWR_FLAG -# -DEF PWR_FLAG #FLG 0 0 N N 1 F P -F0 "#FLG" 0 95 50 H I C CNN -F1 "PWR_FLAG" 0 180 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N -X pwr 1 0 0 0 U 20 20 0 0 w -ENDDRAW -ENDDEF -# -# R -# -DEF R R 0 0 N Y 1 F N -F0 "R" 80 0 50 V V C CNN -F1 "R" 0 0 50 V V C CNN -F2 "" -70 0 30 V V C CNN -F3 "" 0 0 30 H V C CNN -$FPLIST - R_* - Resistor_* -$ENDFPLIST -DRAW -S -40 -100 40 100 0 1 10 N -X ~ 1 0 150 50 D 60 60 1 1 P -X ~ 2 0 -150 50 U 60 60 1 1 P -ENDDRAW -ENDDEF -# -# VCC -# -DEF VCC #PWR 0 0 Y Y 1 F P -F0 "#PWR" 0 -150 50 H I C CNN -F1 "VCC" 0 150 50 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN -DRAW -C 0 75 25 0 1 0 N -P 2 0 1 0 0 0 0 50 N -X VCC 1 0 0 0 U 50 50 1 1 W N -ENDDRAW -ENDDEF -# -#End Library diff --git a/demos/ecc83/ecc83-pp.kicad_pcb b/demos/ecc83/ecc83-pp.kicad_pcb index cf9b54e261..ca96635727 100644 --- a/demos/ecc83/ecc83-pp.kicad_pcb +++ b/demos/ecc83/ecc83-pp.kicad_pcb @@ -1,7 +1,7 @@ -(kicad_pcb (version 20201002) (generator pcbnew) +(kicad_pcb (version 20210228) (generator pcbnew) (general - (thickness 1.6002) + (thickness 1.6) ) (paper "A4") @@ -42,6 +42,7 @@ (copper_finish "None") (dielectric_constraints no) ) + (pad_to_mask_clearance 0) (pcbplotparams (layerselection 0x00000f0_80000001) (disableapertmacros false) @@ -59,6 +60,9 @@ (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15.000000) + (dxfpolygonmode true) + (dxfimperialunits true) + (dxfusepcbnewfont true) (psnegative false) (psa4output false) (plotreference true) @@ -86,7 +90,8 @@ (net 8 "Net-(R1-Pad1)") (net 9 "Net-(R2-Pad1)") - (module "Capacitor_THT:CP_Radial_D10.0mm_P5.00mm" (layer "F.Cu") (tedit 5AE50EF1) (tstamp 00000000-0000-0000-0000-000054a581e5) + (footprint "Capacitor_THT:CP_Radial_D10.0mm_P5.00mm" (layer "F.Cu") + (tedit 5AE50EF1) (tstamp 00000000-0000-0000-0000-000054a581e5) (at 141.605 99.695 90) (descr "CP, Radial series, Radial, pin pitch=5.00mm, , diameter=10mm, Electrolytic Capacitor") (tags "CP Radial series Radial pin pitch 5.00mm diameter 10mm Electrolytic Capacitor") @@ -296,14 +301,14 @@ (fp_line (start 4.261 1.241) (end 4.261 4.768) (layer "F.SilkS") (width 0.12) (tstamp fe0ac277-56e5-40e3-8c12-76ff5c246f3b)) (fp_line (start 4.621 -4.621) (end 4.621 -1.241) (layer "F.SilkS") (width 0.12) (tstamp ff1fb7a9-d975-4f49-83e2-8b3fdeb6b578)) (fp_line (start 5.941 1.241) (end 5.941 3.753) (layer "F.SilkS") (width 0.12) (tstamp ff4ee673-ffd3-48d6-9d2b-29227c5a6fe3)) - (fp_circle (center 2.5 0) (end 7.62 0) (layer "F.SilkS") (width 0.12) (tstamp 258ecd5d-ba52-4323-a896-a66a2aadf72e)) - (fp_circle (center 2.5 0) (end 7.75 0) (layer "F.CrtYd") (width 0.05) (tstamp 4fd5af4b-4245-4f95-90e1-8dc724dc4e4c)) + (fp_circle (center 2.5 0) (end 7.62 0) (layer "F.SilkS") (width 0.12) (fill none) (tstamp 258ecd5d-ba52-4323-a896-a66a2aadf72e)) + (fp_circle (center 2.5 0) (end 7.75 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 4fd5af4b-4245-4f95-90e1-8dc724dc4e4c)) (fp_line (start -1.788861 -2.1875) (end -0.788861 -2.1875) (layer "F.Fab") (width 0.1) (tstamp 5b4531fa-7c33-4ff3-9e87-6f9331da321a)) (fp_line (start -1.288861 -2.6875) (end -1.288861 -1.6875) (layer "F.Fab") (width 0.1) (tstamp 645a2082-1a9a-4e2f-a8af-38e05b33ded1)) - (fp_circle (center 2.5 0) (end 7.5 0) (layer "F.Fab") (width 0.1) (tstamp bdde8555-0701-4481-85f3-e3e4c405ff73)) - (pad "1" thru_hole rect (at 0 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask) + (fp_circle (center 2.5 0) (end 7.5 0) (layer "F.Fab") (width 0.1) (fill none) (tstamp bdde8555-0701-4481-85f3-e3e4c405ff73)) + (pad "1" thru_hole rect (at 0 0 90) (locked) (size 2 2) (drill 1) (layers *.Cu *.Mask) (net 2 "Net-(C1-Pad1)") (tstamp aeded7e3-b278-4188-a018-5517ed785333)) - (pad "2" thru_hole circle (at 5 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5 0 90) (locked) (size 2 2) (drill 1) (layers *.Cu *.Mask) (net 1 "GND") (tstamp ddeafcc4-fac1-48aa-a9d5-a388bf01a059)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_THT.3dshapes/CP_Radial_D10.0mm_P5.00mm.wrl" (offset (xyz 0 0 0)) @@ -312,7 +317,8 @@ ) ) - (module "Capacitor_THT:C_Disc_D4.7mm_W2.5mm_P5.00mm" (layer "F.Cu") (tedit 5AE50EF0) (tstamp 00000000-0000-0000-0000-000054a581ea) + (footprint "Capacitor_THT:C_Disc_D4.7mm_W2.5mm_P5.00mm" (layer "F.Cu") + (tedit 5AE50EF0) (tstamp 00000000-0000-0000-0000-000054a581ea) (at 137.16 125.095 90) (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=4.7*2.5mm^2, Capacitor, http://www.vishay.com/docs/45233/krseries.pdf") (tags "C Disc series Radial pin pitch 5.00mm diameter 4.7mm width 2.5mm Capacitor") @@ -344,9 +350,9 @@ (fp_line (start 0.15 1.25) (end 4.85 1.25) (layer "F.Fab") (width 0.1) (tstamp 2fd11e17-c05e-4f62-8076-2d4106f99124)) (fp_line (start 0.15 -1.25) (end 0.15 1.25) (layer "F.Fab") (width 0.1) (tstamp 3a69d3bc-0889-4f5c-8697-3a52dd39e2a0)) (fp_line (start 4.85 -1.25) (end 0.15 -1.25) (layer "F.Fab") (width 0.1) (tstamp aebabbe2-ab4f-4049-8483-f9cec2223177)) - (pad "1" thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "1" thru_hole circle (at 0 0 90) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 3 "Net-(C2-Pad1)") (tstamp 87622d23-7d7a-471d-bcd4-c13eacfb9e91)) - (pad "2" thru_hole circle (at 5 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5 0 90) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 4 "Net-(C2-Pad2)") (tstamp 434f4a07-999c-4c64-a829-a4342b3a5aca)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_THT.3dshapes/C_Disc_D4.7mm_W2.5mm_P5.00mm.wrl" (offset (xyz 0 0 0)) @@ -355,7 +361,8 @@ ) ) - (module "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-000054a58203) + (footprint "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") + (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-000054a58203) (at 125.095 93.98) (descr "Mounting Hole 3.2mm, M3, DIN965") (tags "mounting hole 3.2mm m3 din965") @@ -373,12 +380,13 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp 9328bcef-4950-4499-842e-ca5bf0f96031) ) - (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (tstamp 35a3359a-d6e6-4d05-9f53-a18fce7d5f0b)) - (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (tstamp adfd5c60-a17c-4b2e-9064-f538eb2fa818)) - (pad "1" thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp 7d25e3e3-1d53-4a05-91fe-7ca4f6e60863)) + (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp 35a3359a-d6e6-4d05-9f53-a18fce7d5f0b)) + (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp adfd5c60-a17c-4b2e-9064-f538eb2fa818)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp 7d25e3e3-1d53-4a05-91fe-7ca4f6e60863)) ) - (module "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-000054a58207) + (footprint "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") + (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-000054a58207) (at 169.545 93.98) (descr "Mounting Hole 3.2mm, M3, DIN965") (tags "mounting hole 3.2mm m3 din965") @@ -396,12 +404,13 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp 5da7d4e1-9d4b-4849-a00c-ae84773e2f7f) ) - (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (tstamp 7ecd61ba-cdab-4eae-9c7e-b3c46b216b45)) - (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (tstamp 8e3db3b3-08b7-4d2a-bcfe-c60a24503599)) - (pad "1" thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp 2a7830e0-48e5-4ba2-8e18-ddd31025a526)) + (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp 7ecd61ba-cdab-4eae-9c7e-b3c46b216b45)) + (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 8e3db3b3-08b7-4d2a-bcfe-c60a24503599)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp 2a7830e0-48e5-4ba2-8e18-ddd31025a526)) ) - (module "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-000054a5820b) + (footprint "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") + (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-000054a5820b) (at 169.545 132.715) (descr "Mounting Hole 3.2mm, M3, DIN965") (tags "mounting hole 3.2mm m3 din965") @@ -419,12 +428,13 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp 28365bbd-d8ec-4c05-999c-97a7661615fa) ) - (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (tstamp ae557ddc-ce5c-4ad2-b776-b2b9837aedd5)) - (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (tstamp a0a9090f-4f43-4497-8fab-ae2a3b111870)) - (pad "1" thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp 89821e3b-093e-4b14-ae05-5131b082bb80)) + (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp ae557ddc-ce5c-4ad2-b776-b2b9837aedd5)) + (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp a0a9090f-4f43-4497-8fab-ae2a3b111870)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp 89821e3b-093e-4b14-ae05-5131b082bb80)) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-000054a58213) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-000054a58213) (at 136.271 107.95 -90) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") @@ -458,9 +468,9 @@ (fp_line (start 7.62 0) (end 6.96 0) (layer "F.Fab") (width 0.1) (tstamp a8dcd0dc-1ebc-4dc5-ad17-5ef07f6bce70)) (fp_line (start 0 0) (end 0.66 0) (layer "F.Fab") (width 0.1) (tstamp f658f8bf-7893-4ff9-8692-a617dd7a9519)) (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer "F.Fab") (width 0.1) (tstamp fd9a9384-80fd-4444-800e-e19f218ee312)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "1" thru_hole circle (at 0 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 8 "Net-(R1-Pad1)") (tstamp feb2f18d-24ad-4008-aa5c-b444c01530ed)) - (pad "2" thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "2" thru_hole oval (at 7.62 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 4 "Net-(C2-Pad2)") (tstamp 58fbc74c-6eca-4aaa-9941-3e7756811e38)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) @@ -469,7 +479,8 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-000054a58218) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-000054a58218) (at 156.21 95.885 180) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") @@ -503,9 +514,9 @@ (fp_line (start 7.62 0) (end 6.96 0) (layer "F.Fab") (width 0.1) (tstamp 70a4ed21-df38-44fd-a165-ce6eb7543bee)) (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer "F.Fab") (width 0.1) (tstamp 799715ab-b0aa-4df6-8403-99a24ed6c743)) (fp_line (start 0 0) (end 0.66 0) (layer "F.Fab") (width 0.1) (tstamp b97b5e36-1246-4bf5-b482-485b1726dcfb)) - (pad "1" thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "1" thru_hole circle (at 0 0 180) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 9 "Net-(R2-Pad1)") (tstamp 66512dbb-55f5-4672-8f38-a2db5bbb6679)) - (pad "2" thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "2" thru_hole oval (at 7.62 0 180) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 1 "GND") (tstamp d5df32dc-6c81-4b69-bdcb-79b78c9cb647)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) @@ -514,7 +525,8 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-000054a58222) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-000054a58222) (at 164.465 117.475 -90) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") @@ -548,9 +560,9 @@ (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer "F.Fab") (width 0.1) (tstamp bf6372b9-425f-45f2-8620-77950accd504)) (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer "F.Fab") (width 0.1) (tstamp bf67eef9-837f-4631-beca-1d09daea9ead)) (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer "F.Fab") (width 0.1) (tstamp d9c68f54-a333-47d1-98ea-333a85fefa15)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "1" thru_hole circle (at 0 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 5 "Net-(P1-Pad2)") (tstamp 3cceafde-73f6-4420-81bc-b45ba5ef5d9d)) - (pad "2" thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "2" thru_hole oval (at 7.62 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 1 "GND") (tstamp 237d5d44-fd22-4dab-93dd-3f87c398aeaf)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) @@ -559,7 +571,8 @@ ) ) - (module "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005a332ee4) + (footprint "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") + (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005a332ee4) (at 128.27 112.776 -90) (descr "Altech AK300 serie terminal block (Script generated with StandardBox.py) (http://www.altechcorp.com/PDFS/PCBMETRC.PDF)") (tags "Altech AK300 serie connector") @@ -596,9 +609,9 @@ (fp_line (start 7.5 -6) (end 7.5 6.5) (layer "F.Fab") (width 0.1) (tstamp bc655df5-6323-42d1-9fe0-9f14aa191ed6)) (fp_line (start -2.5 6.5) (end -2.5 -5.5) (layer "F.Fab") (width 0.1) (tstamp eb7e55fc-54f8-4006-90dd-07da8cac4986)) (fp_line (start 7.5 6.5) (end -2.5 6.5) (layer "F.Fab") (width 0.1) (tstamp fe557d64-4e96-48df-880f-c60decbf6bca)) - (pad "1" thru_hole rect (at 0 0 270) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "1" thru_hole rect (at 0 0 270) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 3 "Net-(C2-Pad1)") (tstamp 64fa2c3c-cf53-4756-8c15-dbd4d0a56751)) - (pad "2" thru_hole circle (at 5 0 270) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5 0 270) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 1 "GND") (tstamp fcafdf4e-325c-4dff-94c3-2f82524d2a8d)) (model "${KICAD6_3DMODEL_DIR}/TerminalBlock_Altech.3dshapes/Altech_AK300_1x02_P5.00mm_45-Degree.wrl" (offset (xyz 0 0 0)) @@ -607,7 +620,8 @@ ) ) - (module "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005a332f0f) + (footprint "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") + (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005a332f0f) (at 128.27 100.711 -90) (descr "Altech AK300 serie terminal block (Script generated with StandardBox.py) (http://www.altechcorp.com/PDFS/PCBMETRC.PDF)") (tags "Altech AK300 serie connector") @@ -644,9 +658,9 @@ (fp_line (start 7.5 -6) (end 7.5 6.5) (layer "F.Fab") (width 0.1) (tstamp 387c47af-6df4-4379-bc97-89d98445817f)) (fp_line (start -2 -6) (end 7.5 -6) (layer "F.Fab") (width 0.1) (tstamp 9e28aa12-895d-4ca3-b289-2e38392222f8)) (fp_line (start -2.5 -5.5) (end -2 -6) (layer "F.Fab") (width 0.1) (tstamp b8b4f8f5-41a7-40c5-b8fe-df089d91ee94)) - (pad "1" thru_hole rect (at 0 0 270) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "1" thru_hole rect (at 0 0 270) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 2 "Net-(C1-Pad1)") (tstamp f0d2b6fe-a6af-4c5b-8e09-64ce9d131da6)) - (pad "2" thru_hole circle (at 5 0 270) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5 0 270) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 1 "GND") (tstamp 38edf51a-3917-4c5e-85e2-b9f7eded7cd4)) (model "${KICAD6_3DMODEL_DIR}/TerminalBlock_Altech.3dshapes/Altech_AK300_1x02_P5.00mm_45-Degree.wrl" (offset (xyz 0 0 0)) @@ -655,7 +669,8 @@ ) ) - (module "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005a332f3a) + (footprint "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") + (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005a332f3a) (at 145.542 131.191) (descr "Altech AK300 serie terminal block (Script generated with StandardBox.py) (http://www.altechcorp.com/PDFS/PCBMETRC.PDF)") (tags "Altech AK300 serie connector") @@ -692,9 +707,9 @@ (fp_line (start -2 -6) (end 7.5 -6) (layer "F.Fab") (width 0.1) (tstamp a3f362bd-f28c-49a2-8b32-fd57a0a8ce07)) (fp_line (start 7.5 6.5) (end -2.5 6.5) (layer "F.Fab") (width 0.1) (tstamp eb8f8f85-bab9-447d-8368-3360e19cdf4c)) (fp_line (start -2.5 6.5) (end -2.5 -5.5) (layer "F.Fab") (width 0.1) (tstamp fe810b3e-7a03-4ec1-a06d-ed4988ad965a)) - (pad "1" thru_hole rect (at 0 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "1" thru_hole rect (at 0 0) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 6 "Net-(P4-Pad1)") (tstamp 9ab869f6-b2a7-4a32-b76c-d749641805a9)) - (pad "2" thru_hole circle (at 5 0) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5 0) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 7 "Net-(P4-Pad2)") (tstamp 41450b75-3636-4586-bd4c-716d87743e02)) (model "${KICAD6_3DMODEL_DIR}/TerminalBlock_Altech.3dshapes/Altech_AK300_1x02_P5.00mm_45-Degree.wrl" (offset (xyz 0 0 0)) @@ -703,7 +718,8 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-00005a33370f) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5AE5139B) (tstamp 00000000-0000-0000-0000-00005a33370f) (at 133.985 125.095 180) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") @@ -737,9 +753,9 @@ (fp_line (start 7.62 0) (end 6.96 0) (layer "F.Fab") (width 0.1) (tstamp 43aa7b18-09de-4f40-bc0e-86350383a69d)) (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer "F.Fab") (width 0.1) (tstamp 67ddc8a2-cdc3-4709-8b2f-1a7615bf9e27)) (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer "F.Fab") (width 0.1) (tstamp f99ae0bf-293b-46ee-9e27-a02ecdec5629)) - (pad "1" thru_hole circle (at 0 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "1" thru_hole circle (at 0 0 180) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 3 "Net-(C2-Pad1)") (tstamp 61e29ef0-01c0-4612-860d-df6b334f1798)) - (pad "2" thru_hole oval (at 7.62 0 180) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (pad "2" thru_hole oval (at 7.62 0 180) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) (net 1 "GND") (tstamp 587d6891-33ea-463a-b75d-744f879246c9)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) @@ -748,7 +764,8 @@ ) ) - (module "Valve:Valve_ECC-83-1" (layer "F.Cu") (tedit 5A32B2BA) (tstamp 00000000-0000-0000-0000-00005a334ccc) + (footprint "Valve:Valve_ECC-83-1" (layer "F.Cu") + (tedit 5A32B2BA) (tstamp 00000000-0000-0000-0000-00005a334ccc) (at 149.225 113.665) (descr "Valve ECC-83-1 round pins") (tags "Valve ECC-83-1 round pins") @@ -766,26 +783,26 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp 67bb8027-b2de-4625-8aad-a05d67ba54b8) ) - (fp_circle (center 0 0.05) (end 10.16 1.32) (layer "F.SilkS") (width 0.12) (tstamp 29ee6bf7-c2e9-4fba-ba0f-ea87affa3ccf)) - (fp_circle (center 0 0.05) (end 0 -10.55) (layer "F.CrtYd") (width 0.05) (tstamp 09eb36de-3159-44b0-8f49-05f89fe3c1e1)) - (fp_circle (center 0 0.05) (end 0 -10.1) (layer "F.Fab") (width 0.1) (tstamp 2e54d5e9-9233-4344-9c0c-bd45a4879c94)) - (pad "1" thru_hole circle (at 3.45 4.8) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (fp_circle (center 0 0.05) (end 10.16 1.32) (layer "F.SilkS") (width 0.12) (fill none) (tstamp 29ee6bf7-c2e9-4fba-ba0f-ea87affa3ccf)) + (fp_circle (center 0 0.05) (end 0 -10.55) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 09eb36de-3159-44b0-8f49-05f89fe3c1e1)) + (fp_circle (center 0 0.05) (end 0 -10.1) (layer "F.Fab") (width 0.1) (fill none) (tstamp 2e54d5e9-9233-4344-9c0c-bd45a4879c94)) + (pad "1" thru_hole circle (at 3.45 4.8) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 8 "Net-(R1-Pad1)") (tstamp 8b5a337d-0a31-4370-84f2-440f4a427ddb)) - (pad "2" thru_hole circle (at 5.6 1.87) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5.6 1.87) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 5 "Net-(P1-Pad2)") (tstamp 31eb3e29-d60f-4419-8ad2-5b48cffcd9f0)) - (pad "3" thru_hole circle (at 5.6 -1.78) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "3" thru_hole circle (at 5.6 -1.78) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 9 "Net-(R2-Pad1)") (tstamp c85a90e7-d146-4b0f-a27b-a6f116d059f4)) - (pad "4" thru_hole circle (at 3.45 -4.71) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "4" thru_hole circle (at 3.45 -4.71) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 7 "Net-(P4-Pad2)") (tstamp a292dca0-f868-4259-ae62-47a13f3b9de6)) - (pad "5" thru_hole circle (at 0 -5.85) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "5" thru_hole circle (at 0 -5.85) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 7 "Net-(P4-Pad2)") (tstamp 7667b313-567c-4a80-9c49-05e661961b1f)) - (pad "6" thru_hole circle (at -3.46 -4.71) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "6" thru_hole circle (at -3.46 -4.71) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 2 "Net-(C1-Pad1)") (tstamp 918fedad-450e-43dd-8ed9-396aa11aae34)) - (pad "7" thru_hole circle (at -5.61 -1.78) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "7" thru_hole circle (at -5.61 -1.78) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 8 "Net-(R1-Pad1)") (tstamp aae507ee-3fe1-4b00-ab88-1946eb547ff5)) - (pad "8" thru_hole circle (at -5.61 1.83) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "8" thru_hole circle (at -5.61 1.83) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 4 "Net-(C2-Pad2)") (tstamp 977dfcaa-9577-4226-a8d8-2abfc510097e)) - (pad "9" thru_hole circle (at -3.46 4.8) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (pad "9" thru_hole circle (at -3.46 4.8) (locked) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) (net 6 "Net-(P4-Pad1)") (tstamp 0360e68f-c3b3-4d8e-abb5-ff075757b1c1)) (model "${KIPRJMOD}/3d_shapes/ecc83.wrl" (offset (xyz 0 0 0)) @@ -794,7 +811,8 @@ ) ) - (module "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005d888bc3) + (footprint "TerminalBlock_Altech:Altech_AK300_1x02_P5.00mm_45-Degree" (layer "F.Cu") + (tedit 5C27907F) (tstamp 00000000-0000-0000-0000-00005d888bc3) (at 166.37 105.41 90) (descr "Altech AK300 serie terminal block (Script generated with StandardBox.py) (http://www.altechcorp.com/PDFS/PCBMETRC.PDF)") (tags "Altech AK300 serie connector") @@ -831,9 +849,9 @@ (fp_line (start 7.5 6.5) (end -2.5 6.5) (layer "F.Fab") (width 0.1) (tstamp ae8a9713-d327-4bd7-adc1-bf7e12905f50)) (fp_line (start -2.5 -5.5) (end -2 -6) (layer "F.Fab") (width 0.1) (tstamp cb11da69-75d1-46a9-a087-21c496831866)) (fp_line (start -2.5 6.5) (end -2.5 -5.5) (layer "F.Fab") (width 0.1) (tstamp e91e271d-78ae-44a7-ac29-146e8db6cc4c)) - (pad "1" thru_hole rect (at 0 0 90) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "1" thru_hole rect (at 0 0 90) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 1 "GND") (tstamp 8cfed677-bcc6-4731-8666-ac6469a1b78b)) - (pad "2" thru_hole circle (at 5 0 90) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) + (pad "2" thru_hole circle (at 5 0 90) (locked) (size 3 3) (drill 1.5) (layers *.Cu *.Mask) (net 5 "Net-(P1-Pad2)") (tstamp e07422cc-c731-421a-8571-b1fa0373f3e9)) (model "${KICAD6_3DMODEL_DIR}/TerminalBlock_Altech.3dshapes/Altech_AK300_1x02_P5.00mm_45-Degree.wrl" (offset (xyz 0 0 0)) @@ -842,7 +860,8 @@ ) ) - (module "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-00005d88946b) + (footprint "MountingHole:MountingHole_3.2mm_M3_DIN965_Pad" (layer "F.Cu") + (tedit 56D1B4CB) (tstamp 00000000-0000-0000-0000-00005d88946b) (at 125.095 132.715) (descr "Mounting Hole 3.2mm, M3, DIN965") (tags "mounting hole 3.2mm m3 din965") @@ -860,9 +879,9 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp fa8ae85c-033d-41c4-b718-729dfd96a1ff) ) - (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (tstamp c06677bb-55f0-4017-a153-4d3034a5e3e0)) - (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (tstamp c444214d-3424-4c19-8c06-d4097ffad24f)) - (pad "1" thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp c1d529e4-8439-470c-b813-055832ea88e8)) + (fp_circle (center 0 0) (end 2.8 0) (layer "Cmts.User") (width 0.15) (fill none) (tstamp c06677bb-55f0-4017-a153-4d3034a5e3e0)) + (fp_circle (center 0 0) (end 3.05 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp c444214d-3424-4c19-8c06-d4097ffad24f)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask) (tstamp c1d529e4-8439-470c-b813-055832ea88e8)) ) (gr_line (start 173.355 90.17) (end 173.355 136.525) (angle 90) (layer "Edge.Cuts") (width 0.127) (tstamp 00000000-0000-0000-0000-00005a3345b3)) @@ -985,8 +1004,6 @@ (xy 166.59261 95.745943) (xy 166.69925 95.904639) (xy 166.797295 96.050545) - (xy 166.800596 96.054465) - (xy 166.993118 96.283092) (xy 167.036983 96.335184) (xy 167.040685 96.338722) (xy 167.04069 96.338727) @@ -1098,13 +1115,13 @@ (xy 166.288053 131.606245) (xy 166.286666 131.611178) (xy 166.286664 131.611185) - (xy 166.188808 131.95932) + (xy 166.188744 131.959546) (xy 166.187358 131.964478) (xy 166.186514 131.969524) (xy 166.186512 131.969531) - (xy 166.144474 132.220744) + (xy 166.170676 132.064166) (xy 166.125941 132.331491) - (xy 166.120131 132.432254) + (xy 166.119514 132.442954) (xy 166.105127 132.692486) (xy 166.104521 132.70299) (xy 166.123347 133.07463) @@ -1119,6 +1136,8 @@ (xy 166.59261 134.480943) (xy 166.607447 134.503022) (xy 166.797295 134.785545) + (xy 166.836387 134.831968) + (xy 166.997405 135.023183) (xy 167.036983 135.070184) (xy 167.040685 135.073722) (xy 167.04069 135.073727) @@ -1148,6 +1167,9 @@ (xy 127.574476 135.099819) (xy 127.578216 135.096319) (xy 127.820873 134.814204) + (xy 127.866618 134.747645) + (xy 128.028739 134.511758) + (xy 128.02874 134.511757) (xy 128.031642 134.507534) (xy 128.034067 134.50303) (xy 128.034072 134.503022) @@ -1167,7 +1189,7 @@ (xy 128.515653 132.348542) (xy 128.515653 132.348541) (xy 128.515376 132.343428) - (xy 128.514073 132.335467) + (xy 128.514087 132.335552) (xy 128.45607 131.981266) (xy 128.455241 131.976203) (xy 128.355797 131.61762) @@ -1225,11 +1247,11 @@ (xy 122.630605 130.100566) (xy 122.576171 130.03615) (xy 122.555 129.949112) - (xy 122.555 125.348978) - (xy 125.345072 125.348978) - (xy 125.345072 125.361757) - (xy 125.377812 125.475932) - (xy 125.384606 125.493092) + (xy 122.555 125.348979) + (xy 125.345073 125.348979) + (xy 125.345073 125.361759) + (xy 125.377812 125.475933) + (xy 125.384605 125.49309) (xy 125.470601 125.660422) (xy 125.480599 125.675935) (xy 125.597463 125.823381) @@ -1241,10 +1263,12 @@ (xy 126.094504 126.115295) (xy 126.111463 126.116821) (xy 126.11481 126.106519) - (xy 126.11481 126.09805) - (xy 126.615189 126.09805) - (xy 126.618978 126.11465) - (xy 126.632205 126.11465) + (xy 126.11481 125.366541) + (xy 126.112436 125.35614) + (xy 126.61519 125.35614) + (xy 126.61519 126.09805) + (xy 126.618979 126.11465) + (xy 126.632206 126.11465) (xy 126.739027 126.084825) (xy 126.756237 126.07815) (xy 126.924167 125.993323) @@ -1258,30 +1282,30 @@ (xy 127.385764 125.36545) (xy 127.387409 125.348502) (xy 127.377453 125.34519) - (xy 126.636541 125.345189) - (xy 126.618478 125.349312) + (xy 126.636541 125.34519) + (xy 126.618478 125.349313) (xy 126.61519 125.35614) - (xy 126.615189 126.09805) - (xy 126.11481 126.09805) - (xy 126.114811 125.366541) - (xy 126.110688 125.348478) + (xy 126.112436 125.35614) + (xy 126.110687 125.348478) (xy 126.10386 125.34519) - (xy 125.361672 125.345189) - (xy 125.345072 125.348978) - (xy 122.555 125.348978) + (xy 125.361673 125.34519) + (xy 125.345073 125.348979) + (xy 122.555 125.348979) (xy 122.555 124.841427) (xy 125.34371 124.841427) (xy 125.354374 124.84481) - (xy 126.093459 124.844811) - (xy 126.111522 124.840688) + (xy 126.093459 124.84481) + (xy 126.111522 124.840687) (xy 126.11481 124.83386) - (xy 126.11481 124.823459) - (xy 126.615189 124.823459) - (xy 126.619312 124.841522) + (xy 126.11481 124.091341) + (xy 126.113414 124.085226) + (xy 126.61519 124.085226) + (xy 126.61519 124.823459) + (xy 126.619313 124.841522) (xy 126.62614 124.84481) - (xy 127.369047 124.844811) - (xy 127.385647 124.841022) - (xy 127.385647 124.829075) + (xy 127.369047 124.84481) + (xy 127.385647 124.841021) + (xy 127.385647 124.829074) (xy 127.346771 124.700314) (xy 127.339745 124.683267) (xy 127.251416 124.517143) @@ -1295,13 +1319,11 @@ (xy 126.635587 124.075474) (xy 126.618608 124.074184) (xy 126.61519 124.085226) - (xy 126.615189 124.823459) - (xy 126.11481 124.823459) - (xy 126.114811 124.09134) - (xy 126.111022 124.07474) - (xy 126.098669 124.07474) - (xy 125.977179 124.110497) - (xy 125.960081 124.117405) + (xy 126.113414 124.085226) + (xy 126.111021 124.074741) + (xy 126.098667 124.074741) + (xy 125.977186 124.110494) + (xy 125.960075 124.117408) (xy 125.793344 124.204573) (xy 125.77791 124.214673) (xy 125.631282 124.332564) @@ -1359,7 +1381,7 @@ (xy 126.867333 118.821569) (xy 126.877764 118.814414) (xy 127.901082 117.791096) - (xy 127.910196 117.77659) + (xy 127.910197 117.77659) (xy 128.629062 117.77659) (xy 128.631565 117.783743) (xy 129.662685 118.814863) @@ -1389,7 +1411,7 @@ (xy 129.663517 116.736305) (xy 128.638918 117.760904) (xy 128.629062 117.77659) - (xy 127.910196 117.77659) + (xy 127.910197 117.77659) (xy 127.910938 117.77541) (xy 127.908435 117.768257) (xy 126.878835 116.738657) @@ -1481,7 +1503,7 @@ (xy 126.867333 106.756569) (xy 126.877764 106.749414) (xy 127.901082 105.726096) - (xy 127.910196 105.71159) + (xy 127.910197 105.71159) (xy 128.629062 105.71159) (xy 128.631565 105.718743) (xy 129.662685 106.749863) @@ -1511,7 +1533,7 @@ (xy 129.663517 104.671305) (xy 128.638918 105.695904) (xy 128.629062 105.71159) - (xy 127.910196 105.71159) + (xy 127.910197 105.71159) (xy 127.910938 105.71041) (xy 127.908435 105.703257) (xy 126.878835 104.673657) @@ -1585,28 +1607,30 @@ (xy 130.481849 100.898843) (xy 130.557832 100.862251) (xy 130.6 100.8575) - (xy 139.379338 100.8575) - (xy 139.399804 100.858608) - (xy 139.435105 100.862443) - (xy 139.487039 100.857899) - (xy 139.492903 100.8575) + (xy 139.379337 100.8575) + (xy 139.3998 100.858608) + (xy 139.435104 100.862443) + (xy 139.444339 100.861635) + (xy 139.44434 100.861635) + (xy 139.487013 100.857902) + (xy 139.492905 100.8575) (xy 139.496994 100.8575) - (xy 139.501587 100.85705) - (xy 139.501601 100.857049) - (xy 139.540694 100.853216) - (xy 139.542665 100.853033) - (xy 139.628169 100.845552) - (xy 139.628172 100.845551) - (xy 139.637401 100.844744) - (xy 139.642653 100.843218) + (xy 139.51491 100.855743) + (xy 139.540699 100.853215) + (xy 139.542673 100.853032) + (xy 139.56593 100.850997) + (xy 139.637402 100.844744) + (xy 139.642654 100.843218) (xy 139.648101 100.842684) - (xy 139.735609 100.816264) - (xy 139.739233 100.81517) - (xy 139.741068 100.814626) - (xy 139.777371 100.804079) - (xy 139.861559 100.79916) - (xy 139.939547 100.831257) - (xy 139.995886 100.894014) + (xy 139.656972 100.840006) + (xy 139.656975 100.840005) + (xy 139.739176 100.815187) + (xy 139.741077 100.814624) + (xy 139.769579 100.806343) + (xy 139.777369 100.80408) + (xy 139.86156 100.799161) + (xy 139.939548 100.831259) + (xy 139.995887 100.894016) (xy 140.001701 100.905362) (xy 140.064208 101.038197) (xy 140.166548 101.161904) @@ -1621,7 +1645,7 @@ (xy 142.802925 101.304152) (xy 142.948197 101.235792) (xy 143.071904 101.133452) - (xy 143.134436 101.047385) + (xy 143.085661 101.114518) (xy 143.159268 101.013206) (xy 143.166274 101.003563) (xy 143.225378 100.854286) @@ -1629,12 +1653,12 @@ (xy 143.257684 100.797906) (xy 143.325011 100.747116) (xy 143.402609 100.7305) - (xy 144.272589 100.7305) - (xy 144.35481 100.749266) - (xy 144.406586 100.786004) - (xy 144.679598 101.059017) - (xy 144.724467 101.130425) - (xy 144.735101 101.193013) + (xy 144.272588 100.7305) + (xy 144.354809 100.749266) + (xy 144.406585 100.786003) + (xy 144.679597 101.059015) + (xy 144.724466 101.130424) + (xy 144.7351 101.193012) (xy 144.7351 107.576843) (xy 144.716334 107.659064) (xy 144.668671 107.720939) @@ -1647,6 +1671,8 @@ (xy 144.287091 108.210295) (xy 144.250519 108.298588) (xy 144.190526 108.443422) + (xy 144.188789 108.450657) + (xy 144.144066 108.636944) (xy 144.129882 108.696023) (xy 144.1095 108.955) (xy 144.129882 109.213977) @@ -1656,7 +1682,7 @@ (xy 144.190526 109.466578) (xy 144.289939 109.706581) (xy 144.425672 109.928078) - (xy 144.547809 110.071081) + (xy 144.550993 110.074809) (xy 144.582242 110.111397) (xy 144.62137 110.186106) (xy 144.624208 110.270394) @@ -1679,13 +1705,13 @@ (xy 143.103422 110.310526) (xy 143.096552 110.313372) (xy 143.096548 110.313373) - (xy 142.975042 110.363703) + (xy 142.941706 110.377511) (xy 142.863419 110.409939) - (xy 142.75055 110.479105) - (xy 142.665803 110.531038) + (xy 142.782218 110.459699) + (xy 142.69548 110.512852) (xy 142.641922 110.545672) - (xy 142.548983 110.62505) - (xy 142.460097 110.700966) + (xy 142.62725 110.558203) + (xy 142.465292 110.696529) (xy 142.444385 110.714385) (xy 142.427402 110.73427) (xy 142.359736 110.784603) @@ -1693,52 +1719,52 @@ (xy 142.188612 110.8007) (xy 142.106391 110.781934) (xy 142.054615 110.745197) - (xy 138.574349 107.264932) - (xy 138.560661 107.249676) - (xy 138.559372 107.248073) + (xy 138.574345 107.264927) + (xy 138.560657 107.249671) + (xy 138.544218 107.229225) (xy 138.538409 107.222) - (xy 138.529153 107.214233) - (xy 138.498471 107.188487) - (xy 138.494025 107.184608) - (xy 138.49115 107.181733) - (xy 138.487591 107.17881) - (xy 138.487586 107.178805) - (xy 138.457318 107.153942) - (xy 138.455795 107.152677) - (xy 138.389954 107.097431) - (xy 138.38995 107.097428) + (xy 138.498482 107.188497) + (xy 138.494046 107.184628) + (xy 138.491151 107.181733) + (xy 138.487565 107.178787) + (xy 138.487559 107.178782) + (xy 138.457189 107.153835) + (xy 138.455663 107.152568) + (xy 138.389953 107.09743) + (xy 138.389948 107.097426) (xy 138.382848 107.091469) - (xy 138.378049 107.088831) - (xy 138.373825 107.085361) - (xy 138.290036 107.040434) - (xy 138.288311 107.039497) - (xy 138.275849 107.032646) + (xy 138.378056 107.088835) + (xy 138.373826 107.08536) + (xy 138.310537 107.051425) + (xy 138.289976 107.0404) + (xy 138.288233 107.039454) + (xy 138.213021 106.998106) + (xy 138.21302 106.998105) (xy 138.204897 106.99364) - (xy 138.199678 106.991984) - (xy 138.194858 106.9894) - (xy 138.103939 106.961603) - (xy 138.102045 106.961013) - (xy 138.020168 106.93504) + (xy 138.19968 106.991985) + (xy 138.194859 106.9894) + (xy 138.185093 106.986414) + (xy 138.103812 106.961564) + (xy 138.101917 106.960973) + (xy 138.020165 106.935039) + (xy 138.020164 106.935039) (xy 138.011332 106.932237) - (xy 138.005891 106.931627) - (xy 138.000662 106.930028) - (xy 137.906111 106.920424) - (xy 137.904143 106.920214) - (xy 137.858456 106.915089) - (xy 137.858452 106.915089) + (xy 138.005898 106.931627) + (xy 138.000663 106.930027) + (xy 137.905986 106.920411) + (xy 137.904136 106.920213) (xy 137.853203 106.9145) - (xy 137.84908 106.9145) - (xy 137.843362 106.91405) - (xy 137.811725 106.910837) - (xy 137.798631 106.909507) - (xy 137.789406 106.910379) - (xy 137.789403 106.910379) - (xy 137.754706 106.913659) - (xy 137.736873 106.9145) + (xy 137.849071 106.9145) + (xy 137.843382 106.914052) + (xy 137.798632 106.909507) + (xy 137.789407 106.910379) + (xy 137.789404 106.910379) + (xy 137.754707 106.913659) + (xy 137.736874 106.9145) (xy 137.342035 106.9145) (xy 137.259814 106.895734) (xy 137.224587 106.873715) - (xy 137.221943 106.871627) + (xy 137.17717 106.836267) (xy 137.068161 106.750177) (xy 137.058202 106.744679) (xy 136.886786 106.650053) @@ -1754,16 +1780,16 @@ (xy 135.503392 106.731059) (xy 135.497173 106.735729) (xy 135.497172 106.735729) - (xy 135.469119 106.756792) + (xy 135.328195 106.8626) (xy 135.314614 106.872797) (xy 135.313736 106.871627) (xy 135.24804 106.90765) - (xy 135.206391 106.9145) + (xy 135.206393 106.9145) (xy 135.204006 106.9145) - (xy 135.19941 106.914951) - (xy 135.199383 106.914952) - (xy 135.160287 106.918786) - (xy 135.158337 106.918967) + (xy 135.178957 106.916956) + (xy 135.160301 106.918785) + (xy 135.158327 106.918968) + (xy 135.13507 106.921003) (xy 135.063598 106.927256) (xy 135.058346 106.928782) (xy 135.052899 106.929316) @@ -1775,108 +1801,105 @@ (xy 134.868592 106.983911) (xy 134.863737 106.986428) (xy 134.858496 106.98801) - (xy 134.774403 107.032722) - (xy 134.772792 107.033568) - (xy 134.696529 107.073099) - (xy 134.696525 107.073101) - (xy 134.688302 107.077364) + (xy 134.850309 106.992363) + (xy 134.774488 107.032677) + (xy 134.772732 107.033599) + (xy 134.688303 107.077363) (xy 134.684028 107.080776) (xy 134.679196 107.083345) - (xy 134.672011 107.089205) - (xy 134.672005 107.089209) - (xy 134.605448 107.143492) - (xy 134.604029 107.144638) - (xy 134.563946 107.176636) - (xy 134.561029 107.179553) - (xy 134.556682 107.183265) + (xy 134.67202 107.089198) + (xy 134.672009 107.089205) + (xy 134.605459 107.143483) + (xy 134.60404 107.144629) + (xy 134.563947 107.176635) + (xy 134.561033 107.179549) + (xy 134.556681 107.183266) (xy 134.529014 107.205831) (xy 134.521828 107.211692) - (xy 134.507329 107.229218) (xy 134.493704 107.245688) (xy 134.481689 107.258893) - (xy 133.299932 108.440651) - (xy 133.284676 108.454339) + (xy 133.299927 108.440655) + (xy 133.284671 108.454343) (xy 133.257 108.476591) - (xy 133.249233 108.485847) - (xy 133.223487 108.516529) - (xy 133.219608 108.520975) - (xy 133.216733 108.52385) - (xy 133.21381 108.527409) - (xy 133.213805 108.527414) - (xy 133.188942 108.557682) - (xy 133.187677 108.559205) - (xy 133.132431 108.625046) - (xy 133.132428 108.62505) + (xy 133.223497 108.516518) + (xy 133.219628 108.520954) + (xy 133.216733 108.523849) + (xy 133.213787 108.527435) + (xy 133.213782 108.527441) + (xy 133.188835 108.557811) + (xy 133.187568 108.559337) + (xy 133.13243 108.625047) + (xy 133.132426 108.625052) (xy 133.126469 108.632152) - (xy 133.123831 108.636951) - (xy 133.120361 108.641175) - (xy 133.086971 108.703448) - (xy 133.075432 108.724968) - (xy 133.074486 108.72671) - (xy 133.044238 108.781732) - (xy 133.02864 108.810104) - (xy 133.026985 108.815321) - (xy 133.0244 108.820142) - (xy 133.02169 108.829007) - (xy 132.996585 108.911121) - (xy 132.99602 108.912934) - (xy 132.967237 109.003669) - (xy 132.966627 109.009108) - (xy 132.965028 109.014338) - (xy 132.964092 109.023557) - (xy 132.964091 109.02356) - (xy 132.955424 109.108893) - (xy 132.955214 109.11086) - (xy 132.9495 109.161798) - (xy 132.9495 109.16592) - (xy 132.94905 109.171637) - (xy 132.94735 109.188375) - (xy 132.944507 109.216369) - (xy 132.945379 109.225594) - (xy 132.945379 109.225597) - (xy 132.948659 109.260294) - (xy 132.9495 109.278127) - (xy 132.949501 111.553917) - (xy 132.949501 113.369989) - (xy 132.930735 113.45221) - (xy 132.878152 113.518146) - (xy 132.802169 113.554738) - (xy 132.717833 113.554738) - (xy 132.64185 113.518146) - (xy 132.626004 113.503986) - (xy 131.212949 112.090932) - (xy 131.199261 112.075676) - (xy 131.196184 112.071849) + (xy 133.123835 108.636944) + (xy 133.12036 108.641174) + (xy 133.094835 108.688779) + (xy 133.0754 108.725024) + (xy 133.074456 108.726763) + (xy 133.02864 108.810103) + (xy 133.026985 108.81532) + (xy 133.0244 108.820141) + (xy 133.021689 108.829007) + (xy 133.021689 108.829008) + (xy 132.996564 108.911188) + (xy 132.995975 108.913077) + (xy 132.967237 109.003668) + (xy 132.966627 109.009102) + (xy 132.965027 109.014337) + (xy 132.96138 109.050248) + (xy 132.955416 109.108963) + (xy 132.955213 109.110864) + (xy 132.9495 109.161797) + (xy 132.9495 109.165929) + (xy 132.949052 109.171618) + (xy 132.944507 109.216368) + (xy 132.945379 109.225593) + (xy 132.945379 109.225596) + (xy 132.948659 109.260293) + (xy 132.9495 109.278126) + (xy 132.9495 113.369988) + (xy 132.930734 113.452209) + (xy 132.878151 113.518145) + (xy 132.802168 113.554737) + (xy 132.717832 113.554737) + (xy 132.641849 113.518145) + (xy 132.626003 113.503985) + (xy 131.212945 112.090927) + (xy 131.199257 112.075671) + (xy 131.182818 112.055225) (xy 131.177009 112.048) - (xy 131.167753 112.040233) - (xy 131.137071 112.014487) - (xy 131.132625 112.010608) - (xy 131.12975 112.007733) - (xy 131.126191 112.00481) - (xy 131.126186 112.004805) - (xy 131.095918 111.979942) - (xy 131.094395 111.978677) - (xy 131.028554 111.923431) - (xy 131.02855 111.923428) + (xy 131.137082 112.014497) + (xy 131.132646 112.010628) + (xy 131.129751 112.007733) + (xy 131.126165 112.004787) + (xy 131.126159 112.004782) + (xy 131.095789 111.979835) + (xy 131.094263 111.978568) + (xy 131.028553 111.92343) + (xy 131.028548 111.923426) (xy 131.021448 111.917469) - (xy 131.016649 111.914831) - (xy 131.012425 111.911361) - (xy 130.928636 111.866434) - (xy 130.926911 111.865497) + (xy 131.016656 111.914835) + (xy 131.012426 111.91136) + (xy 130.949426 111.87758) + (xy 130.928576 111.8664) + (xy 130.926833 111.865454) + (xy 130.851621 111.824106) + (xy 130.85162 111.824105) (xy 130.843497 111.81964) - (xy 130.838278 111.817984) - (xy 130.833458 111.8154) - (xy 130.742539 111.787603) - (xy 130.740645 111.787013) - (xy 130.658768 111.76104) + (xy 130.83828 111.817985) + (xy 130.833459 111.8154) + (xy 130.742406 111.787562) + (xy 130.740517 111.786973) + (xy 130.658765 111.761039) + (xy 130.658764 111.761039) (xy 130.649932 111.758237) - (xy 130.644491 111.757627) - (xy 130.639262 111.756028) - (xy 130.58085 111.750095) - (xy 130.500947 111.723116) - (xy 130.440662 111.66414) + (xy 130.644498 111.757627) + (xy 130.639263 111.756027) + (xy 130.580851 111.750094) + (xy 130.500947 111.723115) + (xy 130.440662 111.664139) (xy 130.411936 111.584847) - (xy 130.4105 111.561565) + (xy 130.4105 111.561564) (xy 130.4105 111.276) (xy 130.409236 111.235783) (xy 130.379152 111.078075) @@ -1893,11 +1916,13 @@ (xy 126.737224 110.63653) (xy 126.729783 110.636764) (xy 126.572075 110.666848) + (xy 126.56129 110.671923) + (xy 126.556266 110.674287) (xy 126.426803 110.735208) (xy 126.303096 110.837548) (xy 126.29609 110.847191) (xy 126.296089 110.847192) - (xy 126.229884 110.938315) + (xy 126.229903 110.938289) (xy 126.208726 110.967437) (xy 126.149622 111.116714) (xy 126.1295 111.276) @@ -1908,6 +1933,9 @@ (xy 126.17016 114.493715) (xy 126.229208 114.619197) (xy 126.331548 114.742904) + (xy 126.341191 114.74991) + (xy 126.341192 114.749911) + (xy 126.422784 114.809191) (xy 126.461437 114.837274) (xy 126.610714 114.896378) (xy 126.77 114.9165) @@ -1927,60 +1955,57 @@ (xy 130.472589 114.421465) (xy 130.556707 114.415415) (xy 130.63512 114.446462) - (xy 130.661896 114.468714) - (xy 130.856645 114.663464) - (xy 130.988998 114.795817) - (xy 131.033867 114.867226) - (xy 131.044501 114.929814) - (xy 131.0445 117.983341) - (xy 131.0445 120.99251) - (xy 131.043392 121.012976) - (xy 131.039557 121.048277) - (xy 131.040365 121.05751) - (xy 131.044099 121.100187) - (xy 131.0445 121.106075) - (xy 131.0445 121.110165) - (xy 131.048794 121.153967) - (xy 131.048959 121.155746) - (xy 131.057256 121.250573) - (xy 131.058782 121.255825) - (xy 131.059316 121.261272) - (xy 131.061993 121.270138) - (xy 131.086807 121.352326) - (xy 131.08737 121.354229) - (xy 131.111322 121.436672) - (xy 131.111327 121.436684) - (xy 131.113911 121.445579) - (xy 131.116428 121.450434) - (xy 131.11801 121.455675) - (xy 131.159749 121.534176) - (xy 131.162697 121.53972) - (xy 131.163619 121.541476) - (xy 131.197482 121.606804) - (xy 131.207364 121.625869) - (xy 131.210774 121.630141) + (xy 130.661898 114.468716) + (xy 130.988997 114.795815) + (xy 131.033866 114.867224) + (xy 131.0445 114.929812) + (xy 131.0445 120.992509) + (xy 131.043392 121.012972) + (xy 131.039557 121.048276) + (xy 131.040365 121.057511) + (xy 131.040365 121.057512) + (xy 131.044098 121.100185) + (xy 131.0445 121.106077) + (xy 131.0445 121.110166) + (xy 131.044952 121.114775) + (xy 131.048785 121.153871) + (xy 131.048968 121.155845) + (xy 131.057256 121.250574) + (xy 131.058782 121.255826) + (xy 131.059316 121.261273) + (xy 131.061994 121.270144) + (xy 131.061995 121.270147) + (xy 131.086813 121.352348) + (xy 131.087377 121.354252) + (xy 131.111324 121.43668) + (xy 131.11391 121.44558) + (xy 131.116429 121.45044) + (xy 131.11801 121.455676) + (xy 131.162727 121.539778) + (xy 131.16356 121.541366) + (xy 131.203097 121.617641) + (xy 131.203102 121.617648) + (xy 131.207363 121.625869) + (xy 131.210776 121.630144) (xy 131.213345 121.634976) - (xy 131.273563 121.708809) - (xy 131.274761 121.710295) - (xy 131.303332 121.746087) - (xy 131.303339 121.746095) - (xy 131.306636 121.750225) - (xy 131.309549 121.753138) - (xy 131.313255 121.757477) + (xy 131.219198 121.642152) + (xy 131.219205 121.642163) + (xy 131.273483 121.708713) + (xy 131.274629 121.710132) + (xy 131.306635 121.750225) + (xy 131.309549 121.753139) + (xy 131.313266 121.757491) (xy 131.341692 121.792344) - (xy 131.348831 121.79825) - (xy 131.348835 121.798254) - (xy 131.375694 121.820473) - (xy 131.388899 121.832488) - (xy 132.766998 123.210587) - (xy 132.811867 123.281996) - (xy 132.822501 123.344584) - (xy 132.8225 123.875993) - (xy 132.822501 123.876011) - (xy 132.822501 124.193051) - (xy 132.803735 124.275272) - (xy 132.789547 124.299839) - (xy 132.746219 124.363356) + (xy 131.348834 121.798252) + (xy 131.375688 121.820468) + (xy 131.388893 121.832483) + (xy 132.766997 123.210587) + (xy 132.811866 123.281996) + (xy 132.8225 123.344584) + (xy 132.8225 124.193052) + (xy 132.803734 124.275273) + (xy 132.789546 124.29984) + (xy 132.760184 124.342884) (xy 132.732493 124.383477) (xy 132.633101 124.597598) (xy 132.631023 124.605092) @@ -1989,7 +2014,7 @@ (xy 132.54493 125.059805) (xy 132.545377 125.067559) (xy 132.545377 125.067562) - (xy 132.555405 125.241466) + (xy 132.555648 125.245682) (xy 132.558519 125.295479) (xy 132.610417 125.525768) (xy 132.69923 125.744489) @@ -2058,127 +2083,130 @@ (xy 137.987358 126.45242) (xy 138.024461 126.528155) (xy 138.0295 126.571566) - (xy 138.029501 132.174182) - (xy 138.028393 132.194648) - (xy 138.024557 132.229958) - (xy 138.025365 132.239191) - (xy 138.029101 132.281891) - (xy 138.029501 132.287764) - (xy 138.029501 132.291847) - (xy 138.029952 132.296444) - (xy 138.029952 132.296449) - (xy 138.033778 132.335467) - (xy 138.033961 132.337443) - (xy 138.042256 132.432254) - (xy 138.043783 132.437511) - (xy 138.044317 132.442954) - (xy 138.046994 132.451819) - (xy 138.071794 132.533961) - (xy 138.072358 132.535864) - (xy 138.098911 132.62726) - (xy 138.101429 132.632119) - (xy 138.103011 132.637357) - (xy 138.107362 132.64554) - (xy 138.147669 132.721347) - (xy 138.148591 132.723103) - (xy 138.192364 132.80755) - (xy 138.195777 132.811825) - (xy 138.198346 132.816657) - (xy 138.204199 132.823833) - (xy 138.204206 132.823844) - (xy 138.258484 132.890394) - (xy 138.25963 132.891813) - (xy 138.291636 132.931906) - (xy 138.29455 132.93482) - (xy 138.298267 132.939172) - (xy 138.320833 132.966841) - (xy 138.320838 132.966846) - (xy 138.326693 132.974025) - (xy 138.333832 132.979931) - (xy 138.360693 133.002153) - (xy 138.373896 133.014167) - (xy 140.100114 134.740385) - (xy 140.113802 134.755641) + (xy 138.0295 132.17419) + (xy 138.028392 132.194653) + (xy 138.024557 132.229957) + (xy 138.025365 132.239192) + (xy 138.025365 132.239193) + (xy 138.029098 132.281866) + (xy 138.0295 132.287758) + (xy 138.0295 132.291847) + (xy 138.029952 132.296456) + (xy 138.033785 132.335552) + (xy 138.033968 132.337526) + (xy 138.042256 132.432255) + (xy 138.043782 132.437507) + (xy 138.044316 132.442954) + (xy 138.046994 132.451825) + (xy 138.046995 132.451828) + (xy 138.071813 132.534029) + (xy 138.072377 132.535933) + (xy 138.09891 132.627261) + (xy 138.101429 132.632121) + (xy 138.10301 132.637357) + (xy 138.147727 132.721459) + (xy 138.14856 132.723047) + (xy 138.188097 132.799322) + (xy 138.188102 132.799329) + (xy 138.192363 132.80755) + (xy 138.195776 132.811825) + (xy 138.198345 132.816657) + (xy 138.204198 132.823833) + (xy 138.204205 132.823844) + (xy 138.258483 132.890394) + (xy 138.259629 132.891813) + (xy 138.291635 132.931906) + (xy 138.294549 132.93482) + (xy 138.298266 132.939172) + (xy 138.320832 132.966841) + (xy 138.320837 132.966846) + (xy 138.326692 132.974025) + (xy 138.333831 132.979931) + (xy 138.360692 133.002153) + (xy 138.373895 133.014167) + (xy 140.100118 134.74039) + (xy 140.113806 134.755646) (xy 140.13605 134.783312) - (xy 140.175977 134.816815) - (xy 140.180413 134.820684) - (xy 140.183308 134.823579) - (xy 140.186894 134.826525) - (xy 140.1869 134.82653) - (xy 140.217197 134.851417) - (xy 140.218723 134.852683) + (xy 140.175986 134.816822) + (xy 140.18041 134.820682) + (xy 140.183308 134.82358) + (xy 140.217245 134.851456) + (xy 140.21872 134.852681) + (xy 140.28451 134.907886) + (xy 140.284519 134.907892) (xy 140.291611 134.913843) - (xy 140.296407 134.916479) - (xy 140.300633 134.919951) - (xy 140.384492 134.964915) - (xy 140.386127 134.965803) + (xy 140.296406 134.916479) + (xy 140.300634 134.919952) + (xy 140.3088 134.92433) + (xy 140.308799 134.92433) + (xy 140.384431 134.964884) + (xy 140.386172 134.965829) + (xy 140.421091 134.985025) (xy 140.469562 135.011672) - (xy 140.474779 135.013327) - (xy 140.4796 135.015912) - (xy 140.570579 135.043727) - (xy 140.572392 135.044292) + (xy 140.474774 135.013325) + (xy 140.4796 135.015913) + (xy 140.488459 135.018621) + (xy 140.488465 135.018624) + (xy 140.570621 135.043741) + (xy 140.572517 135.044332) + (xy 140.654294 135.070274) + (xy 140.654304 135.070276) (xy 140.663127 135.073075) - (xy 140.668566 135.073685) - (xy 140.673796 135.075284) - (xy 140.683015 135.07622) - (xy 140.683018 135.076221) - (xy 140.768351 135.084888) - (xy 140.770326 135.085099) - (xy 140.816003 135.090223) - (xy 140.816007 135.090223) + (xy 140.668563 135.073685) + (xy 140.673797 135.075285) + (xy 140.768488 135.084903) + (xy 140.770399 135.085108) (xy 140.821256 135.090812) - (xy 140.825378 135.090812) - (xy 140.831095 135.091262) - (xy 140.861298 135.094329) - (xy 140.875827 135.095805) - (xy 140.885052 135.094933) - (xy 140.885055 135.094933) - (xy 140.919752 135.091653) - (xy 140.937585 135.090812) - (xy 152.184172 135.090812) - (xy 152.204638 135.09192) - (xy 152.239939 135.095755) - (xy 152.291873 135.091211) - (xy 152.297737 135.090812) + (xy 140.825384 135.090812) + (xy 140.831057 135.091258) + (xy 140.875828 135.095806) + (xy 140.885053 135.094934) + (xy 140.885057 135.094934) + (xy 140.919764 135.091653) + (xy 140.937597 135.090812) + (xy 152.184171 135.090812) + (xy 152.204634 135.09192) + (xy 152.239938 135.095755) + (xy 152.249173 135.094947) + (xy 152.249174 135.094947) + (xy 152.291847 135.091214) + (xy 152.297739 135.090812) (xy 152.301828 135.090812) - (xy 152.306421 135.090362) - (xy 152.306435 135.090361) - (xy 152.345528 135.086528) - (xy 152.347499 135.086345) - (xy 152.433003 135.078864) - (xy 152.433006 135.078863) - (xy 152.442235 135.078056) - (xy 152.447487 135.07653) + (xy 152.319744 135.089055) + (xy 152.345533 135.086527) + (xy 152.347507 135.086344) + (xy 152.370764 135.084309) + (xy 152.442236 135.078056) + (xy 152.447488 135.07653) (xy 152.452935 135.075996) - (xy 152.510505 135.058615) - (xy 152.544067 135.048482) - (xy 152.545968 135.047919) - (xy 152.628342 135.023987) - (xy 152.628347 135.023985) - (xy 152.637241 135.021401) - (xy 152.642095 135.018885) + (xy 152.461806 135.073318) + (xy 152.461809 135.073317) + (xy 152.54401 135.048499) + (xy 152.545914 135.047935) + (xy 152.628342 135.023988) + (xy 152.628345 135.023987) + (xy 152.637242 135.021402) + (xy 152.642102 135.018883) (xy 152.647338 135.017302) - (xy 152.655519 135.012952) - (xy 152.655529 135.012948) - (xy 152.731482 134.972563) - (xy 152.733238 134.971641) - (xy 152.809307 134.932211) - (xy 152.809308 134.93221) - (xy 152.817531 134.927948) - (xy 152.821803 134.924538) + (xy 152.73144 134.972585) + (xy 152.733028 134.971752) + (xy 152.809303 134.932215) + (xy 152.80931 134.93221) + (xy 152.817531 134.927949) + (xy 152.821806 134.924536) (xy 152.826638 134.921967) - (xy 152.900471 134.861749) - (xy 152.901957 134.860551) - (xy 152.937749 134.83198) - (xy 152.937757 134.831973) - (xy 152.941887 134.828676) - (xy 152.9448 134.825763) - (xy 152.949139 134.822057) + (xy 152.833814 134.916114) + (xy 152.833825 134.916107) + (xy 152.900375 134.861829) + (xy 152.901794 134.860683) + (xy 152.941887 134.828677) + (xy 152.944801 134.825763) + (xy 152.949153 134.822046) + (xy 152.97682 134.799481) + (xy 152.976821 134.79948) (xy 152.984006 134.79362) - (xy 152.989912 134.786481) - (xy 152.989916 134.786477) - (xy 153.012135 134.759618) - (xy 153.02415 134.746413) + (xy 153.012131 134.759623) + (xy 153.024145 134.746419) (xy 155.625073 132.145491) (xy 155.640329 132.131803) (xy 155.660775 132.115364) @@ -2187,42 +2215,43 @@ (xy 155.705372 132.065192) (xy 155.708267 132.062297) (xy 155.711218 132.058705) - (xy 155.736105 132.028408) - (xy 155.737371 132.026882) - (xy 155.792568 131.9611) + (xy 155.736165 132.028335) + (xy 155.737432 132.026809) + (xy 155.79257 131.961099) + (xy 155.792574 131.961094) (xy 155.798531 131.953994) - (xy 155.801167 131.949198) - (xy 155.804639 131.944972) - (xy 155.849612 131.861098) - (xy 155.850557 131.859359) - (xy 155.891893 131.784168) + (xy 155.801165 131.949202) + (xy 155.80464 131.944972) + (xy 155.833129 131.891839) + (xy 155.8496 131.861122) + (xy 155.850546 131.859379) + (xy 155.891894 131.784167) + (xy 155.891895 131.784166) (xy 155.89636 131.776043) - (xy 155.898014 131.770829) - (xy 155.9006 131.766006) - (xy 155.908956 131.738677) - (xy 155.92841 131.675044) - (xy 155.929 131.67315) - (xy 155.95496 131.591315) - (xy 155.95496 131.591313) + (xy 155.898015 131.770826) + (xy 155.9006 131.766005) + (xy 155.928438 131.674952) + (xy 155.929027 131.673063) + (xy 155.954961 131.591311) + (xy 155.954961 131.59131) (xy 155.957763 131.582478) - (xy 155.958373 131.577039) - (xy 155.959972 131.571809) - (xy 155.969577 131.477247) - (xy 155.969787 131.475279) - (xy 155.974911 131.429602) - (xy 155.974911 131.429598) + (xy 155.958373 131.577044) + (xy 155.959973 131.571809) + (xy 155.969589 131.477132) + (xy 155.969795 131.475209) + (xy 155.970872 131.465612) (xy 155.9755 131.424349) - (xy 155.9755 131.420227) - (xy 155.97595 131.41451) - (xy 155.979556 131.379002) + (xy 155.9755 131.420217) + (xy 155.975949 131.414513) + (xy 155.979556 131.378999) (xy 155.980493 131.369778) (xy 155.976341 131.325853) (xy 155.9755 131.30802) - (xy 155.9755 125.348978) - (xy 163.445072 125.348978) - (xy 163.445072 125.361757) - (xy 163.477812 125.475932) - (xy 163.484606 125.493092) + (xy 155.9755 125.348979) + (xy 163.445073 125.348979) + (xy 163.445073 125.361759) + (xy 163.477812 125.475933) + (xy 163.484605 125.49309) (xy 163.570601 125.660422) (xy 163.580599 125.675935) (xy 163.697463 125.823381) @@ -2234,10 +2263,12 @@ (xy 164.194504 126.115295) (xy 164.211463 126.116821) (xy 164.21481 126.106519) - (xy 164.21481 126.09805) - (xy 164.715189 126.09805) - (xy 164.718978 126.11465) - (xy 164.732205 126.11465) + (xy 164.21481 125.366541) + (xy 164.212436 125.35614) + (xy 164.71519 125.35614) + (xy 164.71519 126.09805) + (xy 164.718979 126.11465) + (xy 164.732206 126.11465) (xy 164.839027 126.084825) (xy 164.856237 126.07815) (xy 165.024167 125.993323) @@ -2251,30 +2282,30 @@ (xy 165.485764 125.36545) (xy 165.487409 125.348502) (xy 165.477453 125.34519) - (xy 164.736541 125.345189) - (xy 164.718478 125.349312) + (xy 164.736541 125.34519) + (xy 164.718478 125.349313) (xy 164.71519 125.35614) - (xy 164.715189 126.09805) - (xy 164.21481 126.09805) - (xy 164.214811 125.366541) - (xy 164.210688 125.348478) + (xy 164.212436 125.35614) + (xy 164.210687 125.348478) (xy 164.20386 125.34519) - (xy 163.461672 125.345189) - (xy 163.445072 125.348978) - (xy 155.9755 125.348978) + (xy 163.461673 125.34519) + (xy 163.445073 125.348979) + (xy 155.9755 125.348979) (xy 155.9755 124.841427) (xy 163.44371 124.841427) (xy 163.454374 124.84481) - (xy 164.193459 124.844811) - (xy 164.211522 124.840688) + (xy 164.193459 124.84481) + (xy 164.211522 124.840687) (xy 164.21481 124.83386) - (xy 164.21481 124.823459) - (xy 164.715189 124.823459) - (xy 164.719312 124.841522) + (xy 164.21481 124.091341) + (xy 164.213414 124.085226) + (xy 164.71519 124.085226) + (xy 164.71519 124.823459) + (xy 164.719313 124.841522) (xy 164.72614 124.84481) - (xy 165.469047 124.844811) - (xy 165.485647 124.841022) - (xy 165.485647 124.829075) + (xy 165.469047 124.84481) + (xy 165.485647 124.841021) + (xy 165.485647 124.829074) (xy 165.446771 124.700314) (xy 165.439745 124.683267) (xy 165.351416 124.517143) @@ -2288,13 +2319,11 @@ (xy 164.735587 124.075474) (xy 164.718608 124.074184) (xy 164.71519 124.085226) - (xy 164.715189 124.823459) - (xy 164.21481 124.823459) - (xy 164.214811 124.09134) - (xy 164.211022 124.07474) - (xy 164.198669 124.07474) - (xy 164.077179 124.110497) - (xy 164.060081 124.117405) + (xy 164.213414 124.085226) + (xy 164.211021 124.074741) + (xy 164.198667 124.074741) + (xy 164.077186 124.110494) + (xy 164.060075 124.117408) (xy 163.893344 124.204573) (xy 163.87791 124.214673) (xy 163.731282 124.332564) @@ -2313,18 +2342,16 @@ (xy 155.980475 121.322744) (xy 155.97628 121.276649) (xy 155.9755 121.259475) - (xy 155.9755 120.747142) - (xy 155.976608 120.726676) + (xy 155.9755 120.747143) + (xy 155.976608 120.726677) (xy 155.979442 120.700589) - (xy 155.980443 120.691375) - (xy 155.979635 120.682138) - (xy 155.975902 120.639464) - (xy 155.9755 120.633573) + (xy 155.980443 120.691376) + (xy 155.979635 120.68214) + (xy 155.975902 120.639467) + (xy 155.9755 120.633575) (xy 155.9755 120.629486) - (xy 155.975048 120.624872) - (xy 155.975047 120.62486) - (xy 155.971214 120.585767) - (xy 155.97103 120.58379) + (xy 155.971215 120.585781) + (xy 155.971032 120.583807) (xy 155.963551 120.498305) (xy 155.962744 120.489078) (xy 155.961218 120.483826) @@ -2336,20 +2363,19 @@ (xy 155.906089 120.294072) (xy 155.903572 120.289217) (xy 155.90199 120.283976) - (xy 155.857278 120.199883) - (xy 155.856432 120.198272) - (xy 155.816901 120.122009) - (xy 155.816899 120.122005) - (xy 155.812636 120.113782) + (xy 155.857323 120.199968) + (xy 155.856401 120.198212) + (xy 155.816902 120.122011) + (xy 155.812637 120.113783) (xy 155.809224 120.109508) (xy 155.806655 120.104676) - (xy 155.800795 120.097491) - (xy 155.800791 120.097485) - (xy 155.746508 120.030928) - (xy 155.745362 120.029509) - (xy 155.713364 119.989426) - (xy 155.710447 119.986509) - (xy 155.706735 119.982162) + (xy 155.800802 120.0975) + (xy 155.800795 120.097489) + (xy 155.746517 120.030939) + (xy 155.745371 120.02952) + (xy 155.713365 119.989427) + (xy 155.710451 119.986513) + (xy 155.706734 119.982161) (xy 155.684169 119.954494) (xy 155.684168 119.954493) (xy 155.678308 119.947308) @@ -2401,9 +2427,9 @@ (xy 156.089467 116.595729) (xy 156.157136 116.545396) (xy 156.233564 116.5293) - (xy 156.896389 116.5293) - (xy 156.97861 116.548066) - (xy 157.030386 116.584803) + (xy 156.896388 116.5293) + (xy 156.978609 116.548066) + (xy 157.030385 116.584803) (xy 158.605655 118.160073) (xy 158.619343 118.175329) (xy 158.641591 118.203) @@ -2412,36 +2438,36 @@ (xy 158.688849 118.243267) (xy 158.692435 118.246213) (xy 158.692441 118.246218) - (xy 158.722738 118.271105) - (xy 158.724264 118.272371) + (xy 158.722811 118.271165) + (xy 158.724337 118.272432) + (xy 158.790047 118.32757) + (xy 158.790052 118.327574) (xy 158.797152 118.333531) - (xy 158.801948 118.336167) - (xy 158.806174 118.339639) - (xy 158.890033 118.384603) - (xy 158.891668 118.385491) + (xy 158.801944 118.336165) + (xy 158.806174 118.33964) + (xy 158.859307 118.368129) + (xy 158.890024 118.3846) + (xy 158.891763 118.385544) (xy 158.975103 118.43136) (xy 158.98032 118.433015) (xy 158.985141 118.4356) - (xy 159.07612 118.463415) - (xy 159.077933 118.46398) + (xy 158.994007 118.438311) + (xy 158.994008 118.438311) + (xy 159.076188 118.463436) + (xy 159.078077 118.464025) (xy 159.168668 118.492763) - (xy 159.174107 118.493373) - (xy 159.179337 118.494972) - (xy 159.188556 118.495908) - (xy 159.188559 118.495909) - (xy 159.273892 118.504576) - (xy 159.275867 118.504787) - (xy 159.321544 118.509911) - (xy 159.321548 118.509911) + (xy 159.174102 118.493373) + (xy 159.179337 118.494973) + (xy 159.274038 118.504592) + (xy 159.275949 118.504797) (xy 159.326797 118.5105) - (xy 159.330919 118.5105) - (xy 159.336636 118.51095) - (xy 159.366839 118.514017) - (xy 159.381368 118.515493) - (xy 159.390593 118.514621) - (xy 159.390596 118.514621) - (xy 159.425293 118.511341) - (xy 159.443126 118.5105) + (xy 159.330924 118.5105) + (xy 159.336601 118.510947) + (xy 159.381368 118.515494) + (xy 159.390593 118.514622) + (xy 159.390596 118.514622) + (xy 159.425301 118.511341) + (xy 159.443135 118.5105) (xy 163.396314 118.5105) (xy 163.478535 118.529266) (xy 163.517361 118.554199) @@ -2475,11 +2501,11 @@ (xy 165.388453 118.579763) (xy 165.388457 118.579759) (xy 165.394782 118.575248) - (xy 165.538253 118.432277) + (xy 165.534919 118.4356) (xy 165.556491 118.414103) (xy 165.556492 118.414102) (xy 165.561996 118.408617) - (xy 165.611561 118.339639) + (xy 165.608414 118.344019) (xy 165.695213 118.223225) (xy 165.695215 118.223222) (xy 165.699749 118.216912) @@ -2496,7 +2522,7 @@ (xy 165.886157 117.239729) (xy 165.828648 117.010776) (xy 165.734518 116.794291) - (xy 165.722443 116.775625) + (xy 165.705311 116.749143) (xy 165.610517 116.602615) (xy 165.610516 116.602613) (xy 165.606293 116.596086) @@ -2523,53 +2549,52 @@ (xy 159.892412 116.4395) (xy 159.810191 116.420734) (xy 159.758415 116.383997) - (xy 159.380996 116.006578) - (xy 159.002214 115.627797) - (xy 158.957345 115.556388) - (xy 158.947903 115.472583) - (xy 158.975757 115.39298) - (xy 159.002214 115.359803) - (xy 160.502136 113.859882) + (xy 159.002215 115.627797) + (xy 158.957346 115.556388) + (xy 158.947904 115.472583) + (xy 158.975758 115.39298) + (xy 159.002215 115.359803) (xy 162.102073 112.259945) (xy 162.117329 112.246257) (xy 162.137775 112.229818) (xy 162.145 112.224009) (xy 162.178503 112.184082) - (xy 162.182372 112.179646) + (xy 162.182373 112.179645) (xy 162.185267 112.176751) - (xy 162.188218 112.173159) - (xy 162.213105 112.142862) - (xy 162.214371 112.141336) - (xy 162.225077 112.128577) + (xy 162.188205 112.173174) + (xy 162.188216 112.173162) + (xy 162.213122 112.142841) + (xy 162.21439 112.141314) + (xy 162.269573 112.075549) + (xy 162.269575 112.075546) (xy 162.275531 112.068448) - (xy 162.278167 112.063652) - (xy 162.281639 112.059426) - (xy 162.326603 111.975567) - (xy 162.327503 111.97391) - (xy 162.355254 111.923431) + (xy 162.278167 112.063653) + (xy 162.28164 112.059425) + (xy 162.326657 111.975468) + (xy 162.327458 111.973993) (xy 162.37336 111.890497) (xy 162.375015 111.88528) (xy 162.3776 111.880459) - (xy 162.40542 111.789464) - (xy 162.406005 111.787586) - (xy 162.414426 111.76104) + (xy 162.382041 111.865935) + (xy 162.405436 111.789412) + (xy 162.406027 111.787517) + (xy 162.431961 111.705765) + (xy 162.431961 111.705764) (xy 162.434763 111.696932) - (xy 162.435373 111.691493) - (xy 162.436972 111.686263) - (xy 162.442337 111.633448) - (xy 162.446576 111.591708) - (xy 162.446787 111.589733) - (xy 162.451911 111.544056) - (xy 162.451911 111.544052) + (xy 162.435373 111.691498) + (xy 162.436973 111.686263) + (xy 162.446592 111.591562) + (xy 162.4468 111.58962) + (xy 162.447336 111.584847) (xy 162.4525 111.538803) - (xy 162.4525 111.534681) - (xy 162.45295 111.528964) - (xy 162.456556 111.493456) - (xy 162.457493 111.484232) - (xy 162.453341 111.440307) - (xy 162.4525 111.422474) - (xy 162.4525 105.671139) - (xy 164.611 105.671139) + (xy 162.4525 111.534676) + (xy 162.452948 111.528984) + (xy 162.456557 111.493452) + (xy 162.457494 111.484232) + (xy 162.453341 111.440298) + (xy 162.4525 111.422465) + (xy 162.4525 105.67114) + (xy 164.611 105.67114) (xy 164.611 106.900686) (xy 164.612817 106.919135) (xy 164.627074 106.990812) @@ -2583,10 +2608,12 @@ (xy 166.098459 107.169) (xy 166.116522 107.164877) (xy 166.11981 107.15805) - (xy 166.11981 107.147649) - (xy 166.620189 107.147649) - (xy 166.624312 107.165712) - (xy 166.631139 107.169) + (xy 166.11981 105.681541) + (xy 166.117436 105.67114) + (xy 166.62019 105.67114) + (xy 166.62019 107.147649) + (xy 166.624313 107.165712) + (xy 166.63114 107.169) (xy 167.860686 107.169) (xy 167.879135 107.167183) (xy 167.950812 107.152926) @@ -2600,33 +2627,33 @@ (xy 168.129 105.681541) (xy 168.124877 105.663478) (xy 168.11805 105.66019) - (xy 166.641541 105.660189) - (xy 166.623478 105.664312) - (xy 166.62019 105.671139) - (xy 166.620189 107.147649) - (xy 166.11981 107.147649) - (xy 166.119811 105.681541) - (xy 166.115688 105.663478) - (xy 166.108861 105.66019) - (xy 164.632351 105.660189) - (xy 164.614288 105.664312) - (xy 164.611 105.671139) - (xy 162.4525 105.671139) + (xy 166.641541 105.66019) + (xy 166.623478 105.664313) + (xy 166.62019 105.67114) + (xy 166.117436 105.67114) + (xy 166.115687 105.663478) + (xy 166.10886 105.66019) + (xy 164.632351 105.66019) + (xy 164.614288 105.664313) + (xy 164.611 105.67114) + (xy 162.4525 105.67114) (xy 162.4525 103.919314) (xy 164.611 103.919314) (xy 164.611 105.138459) (xy 164.615123 105.156522) (xy 164.62195 105.15981) - (xy 166.098459 105.159811) - (xy 166.116522 105.155688) - (xy 166.11981 105.148861) - (xy 166.11981 105.138459) - (xy 166.620189 105.138459) - (xy 166.624312 105.156522) - (xy 166.631139 105.15981) - (xy 168.107649 105.159811) - (xy 168.125712 105.155688) - (xy 168.129 105.148861) + (xy 166.098459 105.15981) + (xy 166.116522 105.155687) + (xy 166.11981 105.14886) + (xy 166.11981 103.672351) + (xy 166.117436 103.66195) + (xy 166.62019 103.66195) + (xy 166.62019 105.138459) + (xy 166.624313 105.156522) + (xy 166.63114 105.15981) + (xy 168.107649 105.15981) + (xy 168.125712 105.155687) + (xy 168.129 105.14886) (xy 168.129 103.919314) (xy 168.127183 103.900865) (xy 168.112926 103.829188) @@ -2640,11 +2667,9 @@ (xy 166.641541 103.651) (xy 166.623478 103.655123) (xy 166.62019 103.66195) - (xy 166.620189 105.138459) - (xy 166.11981 105.138459) - (xy 166.119811 103.672351) - (xy 166.115688 103.654288) - (xy 166.108861 103.651) + (xy 166.117436 103.66195) + (xy 166.115687 103.654288) + (xy 166.10886 103.651) (xy 164.879314 103.651) (xy 164.860865 103.652817) (xy 164.789188 103.667074) @@ -2656,70 +2681,69 @@ (xy 164.612817 103.900865) (xy 164.611 103.919314) (xy 162.4525 103.919314) - (xy 162.4525 103.123411) - (xy 162.471266 103.04119) - (xy 162.508003 102.989414) + (xy 162.4525 103.123412) + (xy 162.471266 103.041191) + (xy 162.508003 102.989415) (xy 162.823416 102.674002) (xy 162.894825 102.629133) (xy 162.957413 102.618499) - (xy 163.225339 102.618499) - (xy 163.245805 102.619607) - (xy 163.281106 102.623442) - (xy 163.33304 102.618898) - (xy 163.338904 102.618499) + (xy 163.225338 102.618499) + (xy 163.245801 102.619607) + (xy 163.281105 102.623442) + (xy 163.29034 102.622634) + (xy 163.290341 102.622634) + (xy 163.333014 102.618901) + (xy 163.338906 102.618499) (xy 163.342995 102.618499) - (xy 163.347588 102.618049) - (xy 163.347602 102.618048) - (xy 163.386695 102.614215) - (xy 163.388666 102.614032) - (xy 163.47417 102.606551) - (xy 163.474173 102.60655) - (xy 163.483402 102.605743) - (xy 163.488654 102.604217) + (xy 163.360911 102.616742) + (xy 163.3867 102.614214) + (xy 163.388674 102.614031) + (xy 163.411931 102.611996) + (xy 163.483403 102.605743) + (xy 163.488655 102.604217) (xy 163.494102 102.603683) - (xy 163.551672 102.586302) - (xy 163.585234 102.576169) - (xy 163.587135 102.575606) - (xy 163.669509 102.551674) - (xy 163.669514 102.551672) - (xy 163.678408 102.549088) - (xy 163.683262 102.546572) + (xy 163.502973 102.601005) + (xy 163.502976 102.601004) + (xy 163.585177 102.576186) + (xy 163.587081 102.575622) + (xy 163.669509 102.551675) + (xy 163.669512 102.551674) + (xy 163.678409 102.549089) + (xy 163.683269 102.54657) (xy 163.688505 102.544989) - (xy 163.696686 102.540639) - (xy 163.696696 102.540635) - (xy 163.772649 102.50025) - (xy 163.774405 102.499328) - (xy 163.850474 102.459898) - (xy 163.850475 102.459897) - (xy 163.858698 102.455635) - (xy 163.86297 102.452225) + (xy 163.772607 102.500272) + (xy 163.774195 102.499439) + (xy 163.85047 102.459902) + (xy 163.850477 102.459897) + (xy 163.858698 102.455636) + (xy 163.862973 102.452223) (xy 163.867805 102.449654) - (xy 163.941638 102.389436) - (xy 163.943124 102.388238) - (xy 163.978906 102.359675) - (xy 163.978914 102.359668) - (xy 163.983054 102.356363) - (xy 163.985969 102.353448) - (xy 163.990309 102.349742) + (xy 163.874981 102.443801) + (xy 163.874992 102.443794) + (xy 163.941542 102.389516) + (xy 163.942961 102.38837) + (xy 163.983054 102.356364) + (xy 163.985968 102.35345) + (xy 163.99032 102.349733) (xy 164.017987 102.327168) (xy 164.017988 102.327167) (xy 164.025173 102.321307) - (xy 164.053302 102.287305) - (xy 164.065316 102.274101) - (xy 164.343351 101.996066) - (xy 164.507899 101.831519) - (xy 164.579306 101.786651) - (xy 164.663111 101.777209) - (xy 164.742714 101.805063) - (xy 164.782054 101.837981) - (xy 164.813547 101.872591) + (xy 164.053298 102.28731) + (xy 164.065312 102.274106) + (xy 164.507898 101.83152) + (xy 164.579307 101.786651) + (xy 164.663112 101.777209) + (xy 164.742715 101.805063) + (xy 164.782055 101.837982) + (xy 164.884118 101.950149) + (xy 164.884129 101.95016) (xy 164.888468 101.954928) (xy 164.893409 101.95906) (xy 164.893416 101.959066) - (xy 165.089133 102.12271) + (xy 165.089201 102.122767) (xy 165.111846 102.141701) - (xy 165.222318 102.211) - (xy 165.332977 102.280416) + (xy 165.231728 102.216903) + (xy 165.322918 102.274106) (xy 165.358505 102.29643) (xy 165.364379 102.299082) (xy 165.364386 102.299086) @@ -2731,8 +2755,7 @@ (xy 165.896878 102.497118) (xy 165.896883 102.497119) (xy 165.903064 102.49895) - (xy 165.909437 102.499925) - (xy 165.909436 102.499925) + (xy 165.95526 102.506937) (xy 166.184522 102.542019) (xy 166.184524 102.542019) (xy 166.190888 102.542993) @@ -2743,16 +2766,16 @@ (xy 166.77109 102.512586) (xy 166.777336 102.510947) (xy 166.777338 102.510947) - (xy 166.981128 102.457483) + (xy 167.004445 102.451366) (xy 167.052732 102.438698) - (xy 167.217894 102.370286) + (xy 167.254033 102.355317) (xy 167.315777 102.329742) (xy 167.31578 102.329741) (xy 167.321742 102.327271) (xy 167.573139 102.180366) (xy 167.802274 102.000701) - (xy 167.847093 101.954452) - (xy 167.954219 101.843906) + (xy 167.847031 101.954516) + (xy 167.926421 101.872591) (xy 168.004905 101.791602) (xy 168.177284 101.556937) (xy 168.31622 101.301049) @@ -2761,23 +2784,20 @@ (xy 168.416862 101.034708) (xy 168.419142 101.028673) (xy 168.484147 100.744848) - (xy 168.486275 100.721008) + (xy 168.487225 100.710362) (xy 168.5097 100.458538) (xy 168.5097 100.458533) (xy 168.510031 100.454827) (xy 168.5105 100.41) - (xy 168.496535 100.205148) + (xy 168.496416 100.203406) (xy 168.491135 100.125934) (xy 168.491134 100.125928) (xy 168.490696 100.119501) - (xy 168.464027 99.990722) + (xy 168.457585 99.959614) (xy 168.432957 99.840691) (xy 168.432955 99.840685) (xy 168.431649 99.834377) (xy 168.334454 99.559905) - (xy 168.220518 99.339159) - (xy 168.203863 99.30689) - (xy 168.203863 99.306889) (xy 168.200907 99.301163) (xy 168.033481 99.06294) (xy 167.835273 98.849643) @@ -2811,6 +2831,8 @@ (xy 165.153923 98.649017) (xy 165.153919 98.64902) (xy 165.148388 98.65233) + (xy 165.033845 98.744096) + (xy 164.931636 98.825981) (xy 164.921147 98.834384) (xy 164.906667 98.849643) (xy 164.725162 99.040908) @@ -2822,109 +2844,102 @@ (xy 164.409833 99.259448) (xy 164.400598 99.260256) (xy 164.205592 99.316911) - (xy 164.025302 99.410364) - (xy 164.018064 99.416142) - (xy 164.018061 99.416144) - (xy 163.977214 99.448752) - (xy 163.900946 99.509636) - (xy 163.897208 99.513374) - (xy 162.918587 100.491996) - (xy 162.847178 100.536865) - (xy 162.78459 100.547499) - (xy 162.516663 100.547499) - (xy 162.496197 100.546391) - (xy 162.47011 100.543557) - (xy 162.460896 100.542556) - (xy 162.45166 100.543364) - (xy 162.451659 100.543364) - (xy 162.408985 100.547097) - (xy 162.403094 100.547499) + (xy 164.197358 99.321179) + (xy 164.033536 99.406095) + (xy 164.033532 99.406097) + (xy 164.025303 99.410363) + (xy 163.900947 99.509635) + (xy 162.918586 100.491996) + (xy 162.847177 100.536865) + (xy 162.784589 100.547499) + (xy 162.516664 100.547499) + (xy 162.496201 100.546391) + (xy 162.460897 100.542556) + (xy 162.451662 100.543364) + (xy 162.451661 100.543364) + (xy 162.408988 100.547097) + (xy 162.403096 100.547499) (xy 162.399007 100.547499) - (xy 162.394393 100.547951) - (xy 162.394381 100.547952) - (xy 162.355288 100.551785) - (xy 162.353338 100.551966) + (xy 162.381091 100.549256) + (xy 162.355302 100.551784) + (xy 162.353328 100.551967) + (xy 162.330071 100.554002) (xy 162.258599 100.560255) (xy 162.253347 100.561781) (xy 162.2479 100.562315) - (xy 162.179976 100.582822) - (xy 162.156794 100.589821) - (xy 162.154893 100.590384) - (xy 162.072496 100.614323) - (xy 162.072493 100.614324) - (xy 162.063593 100.61691) - (xy 162.058738 100.619427) + (xy 162.239029 100.564993) + (xy 162.239026 100.564994) + (xy 162.156825 100.589812) + (xy 162.154921 100.590376) + (xy 162.072493 100.614323) + (xy 162.07249 100.614324) + (xy 162.063593 100.616909) + (xy 162.058733 100.619428) (xy 162.053497 100.621009) - (xy 161.969404 100.665721) - (xy 161.967793 100.666567) - (xy 161.89153 100.706098) - (xy 161.891526 100.7061) - (xy 161.883303 100.710363) + (xy 161.969395 100.665726) + (xy 161.967807 100.666559) + (xy 161.891532 100.706096) + (xy 161.891525 100.706101) + (xy 161.883304 100.710362) (xy 161.879029 100.713775) (xy 161.874197 100.716344) - (xy 161.867012 100.722204) - (xy 161.867006 100.722208) - (xy 161.800449 100.776491) - (xy 161.79903 100.777637) - (xy 161.758947 100.809635) - (xy 161.75603 100.812552) - (xy 161.751683 100.816264) - (xy 161.724015 100.83883) + (xy 161.867021 100.722197) + (xy 161.86701 100.722204) + (xy 161.80046 100.776482) + (xy 161.799041 100.777628) + (xy 161.758948 100.809634) + (xy 161.756034 100.812548) + (xy 161.751682 100.816265) + (xy 161.733298 100.831259) (xy 161.716829 100.844691) (xy 161.702812 100.861635) (xy 161.688705 100.878687) (xy 161.67669 100.891892) - (xy 160.731932 101.836651) - (xy 160.716676 101.850339) + (xy 160.731927 101.836655) + (xy 160.716671 101.850343) (xy 160.689 101.872591) - (xy 160.683045 101.879688) - (xy 160.655487 101.912529) - (xy 160.651608 101.916975) - (xy 160.648733 101.91985) - (xy 160.64581 101.923409) - (xy 160.645805 101.923414) - (xy 160.620942 101.953682) - (xy 160.619677 101.955205) - (xy 160.564431 102.021046) - (xy 160.564428 102.02105) + (xy 160.655497 101.912518) + (xy 160.651628 101.916954) + (xy 160.648733 101.919849) + (xy 160.645787 101.923435) + (xy 160.645782 101.923441) + (xy 160.620835 101.953811) + (xy 160.619568 101.955337) + (xy 160.56443 102.021047) + (xy 160.564426 102.021052) (xy 160.558469 102.028152) - (xy 160.555831 102.032951) - (xy 160.552361 102.037175) - (xy 160.547981 102.045344) - (xy 160.507432 102.120968) - (xy 160.506486 102.12271) - (xy 160.47479 102.180366) - (xy 160.46064 102.206104) - (xy 160.458985 102.211321) - (xy 160.4564 102.216142) - (xy 160.428585 102.307121) - (xy 160.42802 102.308934) - (xy 160.399237 102.399669) - (xy 160.398627 102.405108) - (xy 160.397028 102.410338) - (xy 160.396092 102.419557) - (xy 160.396091 102.41956) - (xy 160.387424 102.504893) - (xy 160.387213 102.506868) - (xy 160.382277 102.550874) - (xy 160.3815 102.557798) - (xy 160.3815 102.56192) - (xy 160.38105 102.567637) - (xy 160.380184 102.576169) - (xy 160.376507 102.612369) - (xy 160.377379 102.621594) - (xy 160.377379 102.621597) - (xy 160.380659 102.656294) - (xy 160.3815 102.674127) - (xy 160.381501 106.447789) - (xy 160.3815 106.447798) - (xy 160.381501 108.72671) - (xy 160.381501 110.973187) - (xy 160.362735 111.055408) - (xy 160.325998 111.107184) - (xy 157.030386 114.402797) - (xy 156.958977 114.447666) - (xy 156.896389 114.4583) + (xy 160.555835 102.032944) + (xy 160.55236 102.037174) + (xy 160.523871 102.090307) + (xy 160.5074 102.121024) + (xy 160.506456 102.122763) + (xy 160.46064 102.206103) + (xy 160.458985 102.21132) + (xy 160.4564 102.216141) + (xy 160.453689 102.225007) + (xy 160.453689 102.225008) + (xy 160.428564 102.307188) + (xy 160.427975 102.309077) + (xy 160.399237 102.399668) + (xy 160.398627 102.405102) + (xy 160.397027 102.410337) + (xy 160.387928 102.499925) + (xy 160.387416 102.504963) + (xy 160.387213 102.506864) + (xy 160.3815 102.557797) + (xy 160.3815 102.561929) + (xy 160.381052 102.567618) + (xy 160.376507 102.612368) + (xy 160.377379 102.621593) + (xy 160.377379 102.621596) + (xy 160.380659 102.656293) + (xy 160.3815 102.674126) + (xy 160.3815 110.973188) + (xy 160.362734 111.055409) + (xy 160.325997 111.107185) + (xy 157.030385 114.402797) + (xy 156.958976 114.447666) + (xy 156.896388 114.4583) (xy 156.163186 114.4583) (xy 156.080965 114.439534) (xy 156.01909 114.39187) @@ -2962,6 +2977,8 @@ (xy 155.798078 113.224328) (xy 155.995615 113.055615) (xy 156.164328 112.858078) + (xy 156.201238 112.797847) + (xy 156.233153 112.745765) (xy 156.300061 112.636581) (xy 156.399474 112.396578) (xy 156.435563 112.246257) @@ -2974,42 +2991,44 @@ (xy 156.528332 111.646086) (xy 156.895073 111.279345) (xy 156.910329 111.265657) - (xy 156.921101 111.256996) + (xy 156.930775 111.249218) (xy 156.938 111.243409) (xy 156.971503 111.203482) - (xy 156.975372 111.199046) + (xy 156.975373 111.199045) (xy 156.978267 111.196151) - (xy 156.981954 111.191663) - (xy 157.006105 111.162262) - (xy 157.007371 111.160736) - (xy 157.028214 111.135896) + (xy 156.981205 111.192574) + (xy 156.981216 111.192562) + (xy 157.006122 111.162241) + (xy 157.00739 111.160714) + (xy 157.062573 111.094949) + (xy 157.062575 111.094946) (xy 157.068531 111.087848) - (xy 157.071167 111.083052) - (xy 157.074639 111.078826) - (xy 157.119603 110.994967) - (xy 157.120503 110.99331) - (xy 157.132081 110.97225) + (xy 157.071167 111.083053) + (xy 157.07464 111.078825) + (xy 157.119657 110.994868) + (xy 157.120458 110.993393) (xy 157.16636 110.909897) (xy 157.168015 110.90468) (xy 157.1706 110.899859) - (xy 157.19842 110.808864) - (xy 157.199005 110.806986) + (xy 157.179176 110.87181) + (xy 157.198436 110.808812) + (xy 157.199027 110.806917) + (xy 157.224961 110.725165) + (xy 157.224961 110.725164) (xy 157.227763 110.716332) - (xy 157.228373 110.710893) - (xy 157.229972 110.705663) - (xy 157.231809 110.687584) - (xy 157.239576 110.611108) - (xy 157.239787 110.609133) - (xy 157.244911 110.563456) - (xy 157.244911 110.563452) + (xy 157.228373 110.710898) + (xy 157.229973 110.705663) + (xy 157.239592 110.610962) + (xy 157.2398 110.60902) + (xy 157.24242 110.585666) (xy 157.2455 110.558203) - (xy 157.2455 110.554081) - (xy 157.24595 110.548364) - (xy 157.249556 110.512856) - (xy 157.250493 110.503632) - (xy 157.249048 110.488338) - (xy 157.246341 110.459707) - (xy 157.2455 110.441874) + (xy 157.2455 110.554076) + (xy 157.245948 110.548384) + (xy 157.246215 110.545756) + (xy 157.250494 110.503632) + (xy 157.249436 110.492434) + (xy 157.246341 110.459699) + (xy 157.2455 110.441865) (xy 157.2455 96.958586) (xy 157.264266 96.876365) (xy 157.29692 96.830429) @@ -3025,7 +3044,7 @@ (xy 157.444749 96.626912) (xy 157.549343 96.415283) (xy 157.617968 96.189413) - (xy 157.622439 96.15545) + (xy 157.624608 96.138979) (xy 157.648122 95.960369) (xy 157.648123 95.960362) (xy 157.64878 95.955368) @@ -3073,9 +3092,9 @@ (xy 155.128236 96.828887) (xy 155.167883 96.903318) (xy 155.1745 96.952957) - (xy 155.174501 109.992587) - (xy 155.155735 110.074808) - (xy 155.118998 110.126584) + (xy 155.1745 109.992588) + (xy 155.155734 110.074809) + (xy 155.118997 110.126585) (xy 155.063914 110.181668) (xy 154.992505 110.226537) (xy 154.91505 110.236587) @@ -3094,7 +3113,7 @@ (xy 153.815032 110.26621) (xy 153.819761 110.182008) (xy 153.857758 110.111397) - (xy 153.892192 110.071081) + (xy 153.889008 110.074809) (xy 154.014328 109.928078) (xy 154.150061 109.706581) (xy 154.249474 109.466578) @@ -3104,6 +3123,8 @@ (xy 154.310118 109.213977) (xy 154.3305 108.955) (xy 154.310118 108.696023) + (xy 154.295935 108.636944) + (xy 154.251211 108.450657) (xy 154.249474 108.443422) (xy 154.189482 108.298588) (xy 154.152909 108.210295) @@ -3122,49 +3143,49 @@ (xy 152.933977 107.319882) (xy 152.675 107.2995) (xy 152.630635 107.302992) - (xy 152.547197 107.290735) - (xy 152.48177 107.248073) - (xy 152.320829 107.087132) - (xy 152.307141 107.071876) - (xy 152.300341 107.063419) + (xy 152.547198 107.290735) + (xy 152.481771 107.248073) + (xy 152.320825 107.087127) + (xy 152.307137 107.071871) + (xy 152.290698 107.051425) (xy 152.284889 107.0442) - (xy 152.271727 107.033156) - (xy 152.244951 107.010687) - (xy 152.240505 107.006808) - (xy 152.23763 107.003933) - (xy 152.234071 107.00101) - (xy 152.234066 107.001005) - (xy 152.203798 106.976142) - (xy 152.202275 106.974877) - (xy 152.136434 106.919631) - (xy 152.13643 106.919628) + (xy 152.244962 107.010697) + (xy 152.240526 107.006828) + (xy 152.237631 107.003933) + (xy 152.234045 107.000987) + (xy 152.234039 107.000982) + (xy 152.203669 106.976035) + (xy 152.202143 106.974768) + (xy 152.136433 106.91963) + (xy 152.136428 106.919626) (xy 152.129328 106.913669) - (xy 152.124529 106.911031) - (xy 152.120305 106.907561) - (xy 152.036516 106.862634) - (xy 152.034791 106.861697) + (xy 152.124536 106.911035) + (xy 152.120306 106.90756) + (xy 152.053291 106.871627) + (xy 152.036456 106.8626) + (xy 152.034713 106.861654) + (xy 151.959501 106.820306) + (xy 151.9595 106.820305) (xy 151.951377 106.81584) - (xy 151.946158 106.814184) - (xy 151.941338 106.8116) - (xy 151.850419 106.783803) - (xy 151.848525 106.783213) - (xy 151.766648 106.75724) + (xy 151.94616 106.814185) + (xy 151.941339 106.8116) + (xy 151.850286 106.783762) + (xy 151.848397 106.783173) + (xy 151.766645 106.757239) + (xy 151.766644 106.757239) (xy 151.757812 106.754437) - (xy 151.752371 106.753827) - (xy 151.747142 106.752228) - (xy 151.652591 106.742624) - (xy 151.650623 106.742414) - (xy 151.604936 106.737289) - (xy 151.604932 106.737289) + (xy 151.752378 106.753827) + (xy 151.747143 106.752227) + (xy 151.652466 106.742611) + (xy 151.650616 106.742413) (xy 151.599683 106.7367) - (xy 151.59556 106.7367) - (xy 151.589842 106.73625) - (xy 151.560647 106.733285) - (xy 151.545111 106.731707) - (xy 151.535886 106.732579) - (xy 151.535883 106.732579) - (xy 151.501186 106.735859) - (xy 151.483353 106.7367) + (xy 151.595551 106.7367) + (xy 151.589862 106.736252) + (xy 151.545112 106.731707) + (xy 151.535887 106.732579) + (xy 151.535884 106.732579) + (xy 151.501187 106.735859) + (xy 151.483354 106.7367) (xy 150.561821 106.7367) (xy 150.4796 106.717934) (xy 150.417725 106.670271) @@ -3196,9 +3217,9 @@ (xy 147.885672 106.841922) (xy 147.881784 106.848266) (xy 147.881783 106.848268) - (xy 147.845394 106.90765) + (xy 147.848133 106.903181) (xy 147.749939 107.063419) - (xy 147.73636 107.096201) + (xy 147.742665 107.080981) (xy 147.665384 107.267553) (xy 147.650526 107.303422) (xy 147.648789 107.310657) @@ -3226,90 +3247,89 @@ (xy 146.872529 107.730503) (xy 146.822196 107.662835) (xy 146.8061 107.586407) - (xy 146.8061 100.752262) - (xy 146.807208 100.731796) - (xy 146.810042 100.705709) - (xy 146.811043 100.696495) - (xy 146.808344 100.665645) - (xy 146.806502 100.644584) - (xy 146.8061 100.638693) + (xy 146.8061 100.752263) + (xy 146.807208 100.731797) + (xy 146.809537 100.710362) + (xy 146.811043 100.696496) + (xy 146.808343 100.665637) + (xy 146.806502 100.644587) + (xy 146.8061 100.638695) (xy 146.8061 100.634606) - (xy 146.805648 100.629992) - (xy 146.805647 100.62998) - (xy 146.801814 100.590887) - (xy 146.80163 100.58891) - (xy 146.799303 100.562315) + (xy 146.801815 100.590901) + (xy 146.801632 100.588927) + (xy 146.798398 100.551967) (xy 146.793344 100.494198) (xy 146.791818 100.488946) (xy 146.791284 100.483499) - (xy 146.763778 100.392393) - (xy 146.763215 100.390492) - (xy 146.739276 100.308095) - (xy 146.739275 100.308092) - (xy 146.736689 100.299192) - (xy 146.734172 100.294337) + (xy 146.783748 100.458538) + (xy 146.763787 100.392424) + (xy 146.763223 100.39052) + (xy 146.739276 100.308092) + (xy 146.739275 100.308089) + (xy 146.73669 100.299192) + (xy 146.734171 100.294332) (xy 146.73259 100.289096) - (xy 146.687878 100.205003) - (xy 146.687032 100.203392) - (xy 146.647501 100.127129) - (xy 146.647499 100.127125) - (xy 146.643236 100.118902) + (xy 146.687873 100.204994) + (xy 146.68704 100.203406) + (xy 146.647503 100.127131) + (xy 146.647498 100.127124) + (xy 146.643237 100.118903) (xy 146.639824 100.114628) (xy 146.637255 100.109796) - (xy 146.631395 100.102611) - (xy 146.631391 100.102605) - (xy 146.577108 100.036048) - (xy 146.575962 100.034629) - (xy 146.543964 99.994546) - (xy 146.541047 99.991629) - (xy 146.537335 99.987282) + (xy 146.631402 100.10262) + (xy 146.631395 100.102609) + (xy 146.577117 100.036059) + (xy 146.575971 100.03464) + (xy 146.543965 99.994547) + (xy 146.541051 99.991633) + (xy 146.537334 99.987281) (xy 146.514769 99.959614) (xy 146.514768 99.959613) (xy 146.508908 99.952428) (xy 146.474911 99.924303) (xy 146.461707 99.912289) - (xy 145.559349 99.009932) - (xy 145.545661 98.994676) - (xy 145.529212 98.974218) + (xy 145.559345 99.009927) + (xy 145.545657 98.994671) + (xy 145.529218 98.974225) (xy 145.523409 98.967) - (xy 145.514153 98.959233) - (xy 145.483471 98.933487) - (xy 145.479025 98.929608) - (xy 145.47615 98.926733) - (xy 145.472591 98.92381) - (xy 145.472586 98.923805) - (xy 145.442318 98.898942) - (xy 145.440795 98.897677) - (xy 145.374954 98.842431) - (xy 145.37495 98.842428) + (xy 145.483482 98.933497) + (xy 145.479046 98.929628) + (xy 145.476151 98.926733) + (xy 145.472565 98.923787) + (xy 145.472559 98.923782) + (xy 145.442189 98.898835) + (xy 145.440663 98.897568) + (xy 145.374953 98.84243) + (xy 145.374948 98.842426) (xy 145.367848 98.836469) - (xy 145.363049 98.833831) - (xy 145.358825 98.830361) - (xy 145.275036 98.785434) - (xy 145.273311 98.784497) - (xy 145.261815 98.778177) + (xy 145.363056 98.833835) + (xy 145.358826 98.83036) + (xy 145.277027 98.7865) + (xy 145.274976 98.7854) + (xy 145.273233 98.784454) + (xy 145.198021 98.743106) + (xy 145.19802 98.743105) (xy 145.189897 98.73864) - (xy 145.184678 98.736984) - (xy 145.179858 98.7344) - (xy 145.088939 98.706603) - (xy 145.087045 98.706013) - (xy 145.005168 98.68004) + (xy 145.18468 98.736985) + (xy 145.179859 98.7344) + (xy 145.170142 98.731429) + (xy 145.088812 98.706564) + (xy 145.086917 98.705973) + (xy 145.005165 98.680039) + (xy 145.005164 98.680039) (xy 144.996332 98.677237) - (xy 144.990891 98.676627) - (xy 144.985662 98.675028) - (xy 144.891111 98.665424) - (xy 144.889143 98.665214) - (xy 144.843456 98.660089) - (xy 144.843452 98.660089) + (xy 144.990898 98.676627) + (xy 144.985663 98.675027) + (xy 144.890986 98.665411) + (xy 144.889136 98.665213) (xy 144.838203 98.6595) - (xy 144.83408 98.6595) - (xy 144.828362 98.65905) - (xy 144.793978 98.655558) - (xy 144.783631 98.654507) - (xy 144.774406 98.655379) - (xy 144.774403 98.655379) - (xy 144.739706 98.658659) - (xy 144.721873 98.6595) + (xy 144.834071 98.6595) + (xy 144.828382 98.659052) + (xy 144.783632 98.654507) + (xy 144.774407 98.655379) + (xy 144.774404 98.655379) + (xy 144.739707 98.658659) + (xy 144.721874 98.6595) (xy 143.401905 98.6595) (xy 143.319684 98.640734) (xy 143.253748 98.588151) @@ -3339,33 +3359,32 @@ (xy 139.952316 98.592094) (xy 139.884989 98.642884) (xy 139.807391 98.6595) - (xy 139.639662 98.6595) - (xy 139.619196 98.658392) - (xy 139.593109 98.655558) - (xy 139.583895 98.654557) - (xy 139.531961 98.659101) - (xy 139.526097 98.6595) + (xy 139.639663 98.6595) + (xy 139.6192 98.658392) + (xy 139.583896 98.654557) + (xy 139.574661 98.655365) + (xy 139.57466 98.655365) + (xy 139.531987 98.659098) + (xy 139.526095 98.6595) (xy 139.522006 98.6595) - (xy 139.517413 98.65995) - (xy 139.517399 98.659951) - (xy 139.478306 98.663784) - (xy 139.476335 98.663967) - (xy 139.390831 98.671448) - (xy 139.390828 98.671449) - (xy 139.381599 98.672256) - (xy 139.376347 98.673782) + (xy 139.50409 98.661257) + (xy 139.478301 98.663785) + (xy 139.476327 98.663968) + (xy 139.45307 98.666003) + (xy 139.381598 98.672256) + (xy 139.376346 98.673782) (xy 139.370899 98.674316) - (xy 139.313329 98.691697) - (xy 139.279767 98.70183) - (xy 139.277866 98.702393) - (xy 139.195492 98.726325) - (xy 139.195487 98.726327) - (xy 139.186593 98.728911) - (xy 139.181739 98.731427) + (xy 139.362028 98.676994) + (xy 139.362025 98.676995) + (xy 139.279824 98.701813) + (xy 139.27792 98.702377) + (xy 139.195492 98.726324) + (xy 139.195489 98.726325) + (xy 139.186592 98.72891) + (xy 139.181732 98.731429) (xy 139.176496 98.73301) - (xy 139.168312 98.737362) - (xy 139.168306 98.737364) - (xy 139.117611 98.764319) + (xy 139.168309 98.737363) + (xy 139.11761 98.764319) (xy 139.028647 98.7865) (xy 130.326453 98.7865) (xy 130.244232 98.767734) @@ -3385,7 +3404,7 @@ (xy 126.303096 98.772548) (xy 126.29609 98.782191) (xy 126.296089 98.782192) - (xy 126.252323 98.842431) + (xy 126.252324 98.84243) (xy 126.208726 98.902437) (xy 126.149622 99.051714) (xy 126.1295 99.211) @@ -3437,11 +3456,11 @@ (xy 127.574472 96.364823) (xy 127.574476 96.364819) (xy 127.578216 96.361319) - (xy 127.769459 96.138978) - (xy 147.570072 96.138978) - (xy 147.570072 96.151757) - (xy 147.602812 96.265932) - (xy 147.609606 96.283092) + (xy 127.769458 96.138979) + (xy 147.570073 96.138979) + (xy 147.570073 96.151759) + (xy 147.602812 96.265933) + (xy 147.609605 96.28309) (xy 147.695601 96.450422) (xy 147.705599 96.465935) (xy 147.822463 96.613381) @@ -3453,10 +3472,12 @@ (xy 148.319504 96.905295) (xy 148.336463 96.906821) (xy 148.33981 96.896519) - (xy 148.33981 96.88805) - (xy 148.840189 96.88805) - (xy 148.843978 96.90465) - (xy 148.857205 96.90465) + (xy 148.33981 96.156541) + (xy 148.337436 96.14614) + (xy 148.84019 96.14614) + (xy 148.84019 96.88805) + (xy 148.843979 96.90465) + (xy 148.857206 96.90465) (xy 148.964027 96.874825) (xy 148.981237 96.86815) (xy 149.149167 96.783323) @@ -3470,22 +3491,20 @@ (xy 149.610764 96.15545) (xy 149.612409 96.138502) (xy 149.602453 96.13519) - (xy 148.861541 96.135189) - (xy 148.843478 96.139312) + (xy 148.861541 96.13519) + (xy 148.843478 96.139313) (xy 148.84019 96.14614) - (xy 148.840189 96.88805) - (xy 148.33981 96.88805) - (xy 148.339811 96.156541) - (xy 148.335688 96.138478) + (xy 148.337436 96.14614) + (xy 148.335687 96.138478) (xy 148.32886 96.13519) - (xy 147.586672 96.135189) - (xy 147.570072 96.138978) - (xy 127.769459 96.138978) + (xy 147.586673 96.13519) + (xy 147.570073 96.138979) + (xy 127.769458 96.138979) (xy 127.820873 96.079204) (xy 128.031642 95.772534) (xy 128.034067 95.76803) (xy 128.034072 95.768022) - (xy 128.048682 95.740887) + (xy 128.048683 95.740887) (xy 140.918047 95.740887) (xy 140.931361 95.75378) (xy 141.061662 95.829922) @@ -3506,16 +3525,18 @@ (xy 142.187605 95.631427) (xy 147.56871 95.631427) (xy 147.579374 95.63481) - (xy 148.318459 95.634811) - (xy 148.336522 95.630688) + (xy 148.318459 95.63481) + (xy 148.336522 95.630687) (xy 148.33981 95.62386) - (xy 148.33981 95.613459) - (xy 148.840189 95.613459) - (xy 148.844312 95.631522) + (xy 148.33981 94.881341) + (xy 148.338414 94.875226) + (xy 148.84019 94.875226) + (xy 148.84019 95.613459) + (xy 148.844313 95.631522) (xy 148.85114 95.63481) - (xy 149.594047 95.634811) - (xy 149.610647 95.631022) - (xy 149.610647 95.619075) + (xy 149.594047 95.63481) + (xy 149.610647 95.631021) + (xy 149.610647 95.619074) (xy 149.571771 95.490314) (xy 149.564745 95.473267) (xy 149.476416 95.307143) @@ -3529,13 +3550,11 @@ (xy 148.860587 94.865474) (xy 148.843608 94.864184) (xy 148.84019 94.875226) - (xy 148.840189 95.613459) - (xy 148.33981 95.613459) - (xy 148.339811 94.88134) - (xy 148.336022 94.86474) - (xy 148.323669 94.86474) - (xy 148.202179 94.900497) - (xy 148.185081 94.907405) + (xy 148.338414 94.875226) + (xy 148.336021 94.864741) + (xy 148.323667 94.864741) + (xy 148.202186 94.900494) + (xy 148.185075 94.907408) (xy 148.018344 94.994573) (xy 148.00291 95.004673) (xy 147.856282 95.122564) @@ -3552,7 +3571,7 @@ (xy 141.597257 95.056565) (xy 140.926689 95.727133) (xy 140.918047 95.740887) - (xy 128.048682 95.740887) + (xy 128.048683 95.740887) (xy 128.120461 95.607579) (xy 128.208057 95.444894) (xy 128.214788 95.428318) @@ -3560,8 +3579,8 @@ (xy 128.346129 95.104864) (xy 128.348057 95.100117) (xy 128.372983 95.012615) - (xy 128.410377 94.88134) - (xy 128.44334 94.76562) + (xy 128.404921 94.900494) + (xy 128.443341 94.76562) (xy 140.348705 94.76562) (xy 140.34976 94.782389) (xy 140.381066 94.986974) @@ -3572,7 +3591,7 @@ (xy 140.557486 95.383698) (xy 140.568748 95.37743) (xy 141.236082 94.710096) - (xy 141.245196 94.69559) + (xy 141.245197 94.69559) (xy 141.964062 94.69559) (xy 141.966565 94.702743) (xy 142.639218 95.375396) @@ -3597,7 +3616,7 @@ (xy 142.63848 94.015342) (xy 141.973918 94.679904) (xy 141.964062 94.69559) - (xy 141.245196 94.69559) + (xy 141.245197 94.69559) (xy 141.245938 94.69441) (xy 141.243435 94.687257) (xy 140.574021 94.017843) @@ -3610,7 +3629,7 @@ (xy 140.356054 94.542035) (xy 140.354123 94.558727) (xy 140.348705 94.76562) - (xy 128.44334 94.76562) + (xy 128.443341 94.76562) (xy 128.450001 94.742238) (xy 128.450864 94.737191) (xy 128.511836 94.380493) @@ -3621,7 +3640,7 @@ (xy 128.535416 94.004019) (xy 128.5355 93.98) (xy 128.535128 93.973117) - (xy 128.517535 93.648274) + (xy 128.517534 93.648274) (xy 140.915945 93.648274) (xy 140.916203 93.649511) (xy 140.92276 93.658938) @@ -3646,7 +3665,7 @@ (xy 140.937891 93.628122) (xy 140.926822 93.635145) (xy 140.915945 93.648274) - (xy 128.517535 93.648274) + (xy 128.517534 93.648274) (xy 128.515653 93.613542) (xy 128.515653 93.613541) (xy 128.515376 93.608428) diff --git a/demos/ecc83/ecc83-pp.kicad_pro b/demos/ecc83/ecc83-pp.kicad_pro index 0be61309c2..b99f642001 100644 --- a/demos/ecc83/ecc83-pp.kicad_pro +++ b/demos/ecc83/ecc83-pp.kicad_pro @@ -57,7 +57,7 @@ ], "drc_exclusions": [], "meta": { - "version": 1 + "version": 2 }, "rule_severities": { "annular_width": "error", @@ -66,7 +66,7 @@ "courtyards_overlap": "error", "diff_pair_gap_out_of_range": "error", "diff_pair_uncoupled_length_too_long": "error", - "drill_too_small": "error", + "drill_out_of_range": "error", "duplicate_footprints": "warning", "extra_footprint": "warning", "hole_clearance": "error", @@ -74,10 +74,9 @@ "invalid_outline": "error", "item_on_disabled_layer": "error", "items_not_allowed": "error", - "keepout": "error", "length_out_of_range": "error", "malformed_courtyard": "error", - "microvia_drill_too_small": "error", + "microvia_drill_out_of_range": "error", "missing_courtyard": "ignore", "missing_footprint": "warning", "net_conflict": "warning", @@ -95,7 +94,6 @@ "unconnected_items": "error", "unresolved_variable": "error", "via_dangling": "warning", - "via_hole_larger_than_pad": "error", "zone_has_empty_net": "error", "zones_intersect": "error" }, @@ -105,6 +103,7 @@ "max_error": 0.005, "min_clearance": 0.0, "min_copper_edge_clearance": 0.01, + "min_hole_clearance": 0.0, "min_hole_to_hole": 0.25, "min_microvia_diameter": 0.19999999999999998, "min_microvia_drill": 0.09999999999999999, @@ -112,11 +111,7 @@ "min_through_hole_diameter": 0.3, "min_track_width": 0.19999999999999998, "min_via_annular_width": 0.049999999999999996, - "min_via_diameter": 0.39999999999999997, - "solder_mask_clearance": 0.09999999999999999, - "solder_mask_min_width": 0.0, - "solder_paste_clearance": 0.0, - "solder_paste_margin_ratio": -0.0 + "min_via_diameter": 0.39999999999999997 }, "track_widths": [ 0.0 @@ -127,7 +122,7 @@ "drill": 0.0 } ], - "zones_allow_external_fillets": true, + "zones_allow_external_fillets": false, "zones_use_no_outline": true }, "layer_presets": [] diff --git a/demos/ecc83/ecc83-pp_v2.kicad_pcb b/demos/ecc83/ecc83-pp_v2.kicad_pcb index c8fabebd44..d185a530fc 100644 --- a/demos/ecc83/ecc83-pp_v2.kicad_pcb +++ b/demos/ecc83/ecc83-pp_v2.kicad_pcb @@ -1,7 +1,7 @@ -(kicad_pcb (version 20201002) (generator pcbnew) +(kicad_pcb (version 20210228) (generator pcbnew) (general - (thickness 1.6002) + (thickness 1.6) ) (paper "A4") @@ -21,6 +21,7 @@ (42 "Eco1.User" user "User.Eco1") (43 "Eco2.User" user "User.Eco2") (44 "Edge.Cuts" user) + (45 "Margin" user) (46 "B.CrtYd" user "B.Courtyard") (47 "F.CrtYd" user "F.Courtyard") (48 "B.Fab" user) @@ -28,6 +29,20 @@ ) (setup + (stackup + (layer "F.SilkS" (type "Top Silk Screen") (color "White")) + (layer "F.Paste" (type "Top Solder Paste")) + (layer "F.Mask" (type "Top Solder Mask") (color "Green") (thickness 0.01)) + (layer "F.Cu" (type "copper") (thickness 0.035)) + (layer "dielectric 1" (type "core") (thickness 1.51) (material "FR4") (epsilon_r 4.5) (loss_tangent 0.02)) + (layer "B.Cu" (type "copper") (thickness 0.035)) + (layer "B.Mask" (type "Bottom Solder Mask") (color "Green") (thickness 0.01)) + (layer "B.Paste" (type "Bottom Solder Paste")) + (layer "B.SilkS" (type "Bottom Silk Screen") (color "White")) + (copper_finish "None") + (dielectric_constraints no) + ) + (pad_to_mask_clearance 0) (pcbplotparams (layerselection 0x0000030_80000001) (disableapertmacros false) @@ -45,6 +60,9 @@ (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15.000000) + (dxfpolygonmode true) + (dxfimperialunits true) + (dxfusepcbnewfont true) (psnegative false) (psa4output false) (plotreference true) @@ -71,15 +89,18 @@ (net 7 "Net-(P4-Pad2)") (net 8 "Net-(R1-Pad1)") (net 9 "Net-(R2-Pad1)") - (net 10 "Net-(P5-Pad1)") - (net 11 "Net-(P6-Pad1)") - (net 12 "Net-(P7-Pad1)") - (net 13 "Net-(P8-Pad1)") + (net 10 "unconnected-(P5-Pad1)") + (net 11 "unconnected-(P6-Pad1)") + (net 12 "unconnected-(P7-Pad1)") + (net 13 "unconnected-(P8-Pad1)") - (module "Capacitor_THT:CP_Radial_D12.5mm_P7.50mm" (layer "F.Cu") (tedit 5A533290) (tstamp 00000000-0000-0000-0000-000054a58357) + (footprint "Capacitor_THT:CP_Radial_D12.5mm_P7.50mm" (layer "F.Cu") + (tedit 5A533290) (tstamp 00000000-0000-0000-0000-000054a58357) (at 133.1 102.9 90) (descr "CP, Radial series, Radial, pin pitch=7.50mm, , diameter=12.5mm, Electrolytic Capacitor") (tags "CP Radial series Radial pin pitch 7.50mm diameter 12.5mm Electrolytic Capacitor") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f4be") (attr through_hole) (fp_text reference "C1" (at 3.75 -7.62 90) (layer "F.SilkS") @@ -328,15 +349,15 @@ (fp_line (start 10.031 -1.028) (end 10.031 1.028) (layer "F.SilkS") (width 0.12) (tstamp f8f5b5b2-ebd0-47f0-adf8-c0aac7de445a)) (fp_line (start 7.791 -4.885) (end 7.791 -1.44) (layer "F.SilkS") (width 0.12) (tstamp fe8d7800-e2d8-4be5-a642-a8e893e21b21)) (fp_line (start 4.991 -6.209) (end 4.991 6.209) (layer "F.SilkS") (width 0.12) (tstamp ff64fe53-3971-4951-9bdd-404f47e34093)) - (fp_circle (center 3.75 0) (end 10.12 0) (layer "F.SilkS") (width 0.12) (tstamp e9e2165f-3ef6-4063-9acb-ca11d867f123)) - (fp_circle (center 3.75 0) (end 10.25 0) (layer "F.CrtYd") (width 0.05) (tstamp 50b445d7-f419-41f7-bf7f-199fec8b9e9f)) + (fp_circle (center 3.75 0) (end 10.12 0) (layer "F.SilkS") (width 0.12) (fill none) (tstamp e9e2165f-3ef6-4063-9acb-ca11d867f123)) + (fp_circle (center 3.75 0) (end 10.25 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 50b445d7-f419-41f7-bf7f-199fec8b9e9f)) (fp_line (start -1.616489 -2.7375) (end -0.366489 -2.7375) (layer "F.Fab") (width 0.1) (tstamp 497dbfde-313d-4b71-9c8f-dde6571d345a)) (fp_line (start -0.991489 -3.3625) (end -0.991489 -2.1125) (layer "F.Fab") (width 0.1) (tstamp f2dcf5f2-86e8-41d1-a674-c4bde417449d)) - (fp_circle (center 3.75 0) (end 10 0) (layer "F.Fab") (width 0.1) (tstamp b597ff9d-da4e-4c00-9b79-cdf3a1cf1e01)) - (pad "1" thru_hole rect (at 0 0 90) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask) - (net 2 "Net-(C1-Pad1)") (tstamp f194fb04-aacf-4ad7-a4b8-9bc113a374a3)) - (pad "2" thru_hole circle (at 7.5 0 90) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp cbfb8a2e-bf7a-4a42-bd86-43b1d51269e9)) + (fp_circle (center 3.75 0) (end 10 0) (layer "F.Fab") (width 0.1) (fill none) (tstamp b597ff9d-da4e-4c00-9b79-cdf3a1cf1e01)) + (pad "1" thru_hole rect (at 0 0 90) (locked) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask) + (net 2 "Net-(C1-Pad1)") (pintype "passive") (tstamp f194fb04-aacf-4ad7-a4b8-9bc113a374a3)) + (pad "2" thru_hole circle (at 7.5 0 90) (locked) (size 2.4 2.4) (drill 1.2) (layers *.Cu *.Mask) + (net 1 "GND") (pintype "passive") (tstamp cbfb8a2e-bf7a-4a42-bd86-43b1d51269e9)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_THT.3dshapes/CP_Radial_D12.5mm_P7.50mm.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -344,10 +365,13 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a58389) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a58389) (at 141 121.3 -90) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f38a") (attr through_hole) (fp_text reference "R1" (at 3.81 -2.37 -90) (layer "F.SilkS") @@ -378,10 +402,10 @@ (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer "F.Fab") (width 0.1) (tstamp d1d5fae8-8a99-4eba-97ce-9aedded75224)) (fp_line (start 0 0) (end 0.66 0) (layer "F.Fab") (width 0.1) (tstamp d8177eee-2b05-4411-8f9f-a9f324e46efb)) (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer "F.Fab") (width 0.1) (tstamp f813cf43-e5ad-407d-ae60-1b3b97cd22d7)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 8 "Net-(R1-Pad1)") (tstamp 14ad4d27-f719-448a-b78b-8719838388d9)) - (pad "2" thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 4 "Net-(C2-Pad2)") (tstamp d6d04fff-9ade-455b-a565-08e12ae14f54)) + (pad "1" thru_hole circle (at 0 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 8 "Net-(R1-Pad1)") (pintype "passive") (tstamp 14ad4d27-f719-448a-b78b-8719838388d9)) + (pad "2" thru_hole oval (at 7.62 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 4 "Net-(C2-Pad2)") (pintype "passive") (tstamp d6d04fff-9ade-455b-a565-08e12ae14f54)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -389,10 +413,13 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a5838e) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a5838e) (at 165.2 107.3 90) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f39d") (attr through_hole) (fp_text reference "R2" (at 3.81 -2.37 90) (layer "F.SilkS") @@ -423,10 +450,10 @@ (fp_line (start 0.66 1.25) (end 6.96 1.25) (layer "F.Fab") (width 0.1) (tstamp 8c8329d7-4029-449d-850c-12386695fa5a)) (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer "F.Fab") (width 0.1) (tstamp a343f036-5001-4e71-86eb-23fb23ecabdc)) (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer "F.Fab") (width 0.1) (tstamp b2e227df-19a5-40f0-9473-848999fce317)) - (pad "1" thru_hole circle (at 0 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 9 "Net-(R2-Pad1)") (tstamp 7df81f87-f003-479f-8372-1c18a0aed507)) - (pad "2" thru_hole oval (at 7.62 0 90) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp 35450c87-6900-40db-9086-7067174c1ffe)) + (pad "1" thru_hole circle (at 0 0 90) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 9 "Net-(R2-Pad1)") (pintype "passive") (tstamp 7df81f87-f003-479f-8372-1c18a0aed507)) + (pad "2" thru_hole oval (at 7.62 0 90) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 1 "GND") (pintype "passive") (tstamp 35450c87-6900-40db-9086-7067174c1ffe)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -434,10 +461,13 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a58393) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a58393) (at 124.46 115 -90) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f3ad") (attr through_hole) (fp_text reference "R3" (at 3.81 -2.37 -90) (layer "F.SilkS") @@ -468,10 +498,10 @@ (fp_line (start 6.96 -1.25) (end 0.66 -1.25) (layer "F.Fab") (width 0.1) (tstamp 8a80334f-706c-4453-8a7c-4d5df47b20be)) (fp_line (start 6.96 1.25) (end 6.96 -1.25) (layer "F.Fab") (width 0.1) (tstamp 9d8e2d56-9786-4879-9556-549b8c260f7d)) (fp_line (start 0 0) (end 0.66 0) (layer "F.Fab") (width 0.1) (tstamp cadec15d-b2c6-4e15-bcd2-84260729aeec)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 3 "Net-(C2-Pad1)") (tstamp 461d64e3-dde8-4d38-a59f-82eed34cf89e)) - (pad "2" thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp 9af90d1a-b749-4c88-9557-560344512e7a)) + (pad "1" thru_hole circle (at 0 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 3 "Net-(C2-Pad1)") (pintype "passive") (tstamp 461d64e3-dde8-4d38-a59f-82eed34cf89e)) + (pad "2" thru_hole oval (at 7.62 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 1 "GND") (pintype "passive") (tstamp 9af90d1a-b749-4c88-9557-560344512e7a)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -479,10 +509,13 @@ ) ) - (module "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a58398) + (footprint "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (layer "F.Cu") + (tedit 5A24F4B6) (tstamp 00000000-0000-0000-0000-000054a58398) (at 165.1 116.2 -90) (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f3a2") (attr through_hole) (fp_text reference "R4" (at 3.81 -2.37 -90) (layer "F.SilkS") @@ -513,10 +546,10 @@ (fp_line (start 0.66 -1.25) (end 0.66 1.25) (layer "F.Fab") (width 0.1) (tstamp bd3b6f65-3c10-4b96-8e59-d1e5ec5acffc)) (fp_line (start 0 0) (end 0.66 0) (layer "F.Fab") (width 0.1) (tstamp ddccf29c-c750-4de2-9323-bc58e4576538)) (fp_line (start 7.62 0) (end 6.96 0) (layer "F.Fab") (width 0.1) (tstamp efa57364-46ab-4bf4-a28c-921882d5e8b5)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 5 "Net-(P1-Pad2)") (tstamp 8c9f36ed-17ef-4bca-865f-50bb610ef811)) - (pad "2" thru_hole oval (at 7.62 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp a1fb3569-3e1f-4a78-b6d8-1ca67443d211)) + (pad "1" thru_hole circle (at 0 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 5 "Net-(P1-Pad2)") (pintype "passive") (tstamp 8c9f36ed-17ef-4bca-865f-50bb610ef811)) + (pad "2" thru_hole oval (at 7.62 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 1 "GND") (pintype "passive") (tstamp a1fb3569-3e1f-4a78-b6d8-1ca67443d211)) (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -524,10 +557,13 @@ ) ) - (module "connect:1pin" (layer "F.Cu") (tedit 5A325A31) (tstamp 00000000-0000-0000-0000-000054a583d2) + (footprint "connect:1pin" (layer "F.Cu") + (tedit 5A325A31) (tstamp 00000000-0000-0000-0000-000054a583d2) (at 123.19 93.98) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-000054a5830a") (attr through_hole) (fp_text reference "P5" (at 3.937 -1.778) (layer "F.SilkS") @@ -538,20 +574,23 @@ (effects (font (size 1.016 1.016) (thickness 0.254))) (tstamp e696c356-2061-462c-bdea-e9bc61029a5b) ) - (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (tstamp a7e11ba5-85cf-48c4-98db-bfe87bb57cf4)) - (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (tstamp 81070544-5943-4b6a-9cf4-01d51f35661f)) - (fp_circle (center 0 0) (end 3 0.2) (layer "F.CrtYd") (width 0.15) (tstamp 03415675-bf37-49d2-8368-b4a82e10cbaa)) - (pad "1" thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 10 "Net-(P5-Pad1)") (tstamp 9f00211e-7c11-4feb-985e-d968f0feb736)) + (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp a7e11ba5-85cf-48c4-98db-bfe87bb57cf4)) + (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (fill none) (tstamp 81070544-5943-4b6a-9cf4-01d51f35661f)) + (fp_circle (center 0 0) (end 3 0.2) (layer "F.CrtYd") (width 0.15) (fill none) (tstamp 03415675-bf37-49d2-8368-b4a82e10cbaa)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 10 "unconnected-(P5-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp 9f00211e-7c11-4feb-985e-d968f0feb736)) ) - (module "connect:1pin" (layer "F.Cu") (tedit 5A325A37) (tstamp 00000000-0000-0000-0000-000054a583d6) + (footprint "connect:1pin" (layer "F.Cu") + (tedit 5A325A37) (tstamp 00000000-0000-0000-0000-000054a583d6) (at 165.1 93.98) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-000054a58363") (attr through_hole) - (fp_text reference "P6" (at 0 -3.048) (layer "F.SilkS") + (fp_text reference "P6" (at -5.1 0.02) (layer "F.SilkS") (effects (font (size 1.016 1.016) (thickness 0.254))) (tstamp 398fcf8f-43c7-479c-9af0-8c04b3442e2c) ) @@ -559,17 +598,20 @@ (effects (font (size 1.016 1.016) (thickness 0.254))) (tstamp c79804d9-765a-4355-b78a-fb442aecbc1d) ) - (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (tstamp a5670ea8-6a3c-420b-af4c-78d7ab8149ab)) - (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (tstamp 9036b120-2531-4180-9e13-4261d0330491)) - (fp_circle (center 0 0) (end 3 0) (layer "F.CrtYd") (width 0.15) (tstamp 26787f7f-1396-4c34-a3fc-5c3355f0dbde)) - (pad "1" thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 11 "Net-(P6-Pad1)") (tstamp a548345f-f59f-4a9d-ac6f-c08354533629)) + (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp a5670ea8-6a3c-420b-af4c-78d7ab8149ab)) + (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (fill none) (tstamp 9036b120-2531-4180-9e13-4261d0330491)) + (fp_circle (center 0 0) (end 3 0) (layer "F.CrtYd") (width 0.15) (fill none) (tstamp 26787f7f-1396-4c34-a3fc-5c3355f0dbde)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 11 "unconnected-(P6-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp a548345f-f59f-4a9d-ac6f-c08354533629)) ) - (module "connect:1pin" (layer "F.Cu") (tedit 5A325A0B) (tstamp 00000000-0000-0000-0000-000054a583da) + (footprint "connect:1pin" (layer "F.Cu") + (tedit 5A325A0B) (tstamp 00000000-0000-0000-0000-000054a583da) (at 165.1 129.54) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-000054a5837a") (attr through_hole) (fp_text reference "P7" (at 0 -3.048) (layer "F.SilkS") @@ -580,17 +622,20 @@ (effects (font (size 1.016 1.016) (thickness 0.254))) (tstamp 1e249832-e21b-440e-b34c-66a825b64ba8) ) - (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (tstamp 2678c991-9edb-4a1a-b413-c31c539722e2)) - (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (tstamp ffaa86a6-6ba2-4f2d-a179-a83f9b94ae1d)) - (fp_circle (center 0 0) (end 3 0) (layer "F.CrtYd") (width 0.15) (tstamp 25f17e90-e5ac-4b08-811b-92b85a3b51cf)) - (pad "1" thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 12 "Net-(P7-Pad1)") (tstamp af9d591f-0415-4ad8-a696-74c269c9ad0d)) + (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp 2678c991-9edb-4a1a-b413-c31c539722e2)) + (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (fill none) (tstamp ffaa86a6-6ba2-4f2d-a179-a83f9b94ae1d)) + (fp_circle (center 0 0) (end 3 0) (layer "F.CrtYd") (width 0.15) (fill none) (tstamp 25f17e90-e5ac-4b08-811b-92b85a3b51cf)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 12 "unconnected-(P7-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp af9d591f-0415-4ad8-a696-74c269c9ad0d)) ) - (module "connect:1pin" (layer "F.Cu") (tedit 5A325A26) (tstamp 00000000-0000-0000-0000-000054a583de) + (footprint "connect:1pin" (layer "F.Cu") + (tedit 5A325A26) (tstamp 00000000-0000-0000-0000-000054a583de) (at 123.19 129.54) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-000054a58391") (attr through_hole) (fp_text reference "P8" (at 0 -3.048) (layer "F.SilkS") @@ -601,17 +646,20 @@ (effects (font (size 1.016 1.016) (thickness 0.254))) (tstamp 30cef7a2-d8f3-4aa4-9fa3-72c592a95671) ) - (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (tstamp 057a2208-96ae-4562-a656-a82d1ac5fd6f)) - (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (tstamp 0d622f2f-ae81-487a-b690-dc62e3952248)) - (fp_circle (center 0 0) (end 3 0) (layer "F.CrtYd") (width 0.15) (tstamp 0a46e0ef-1660-410c-b104-f1e8206115b6)) - (pad "1" thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 13 "Net-(P8-Pad1)") (tstamp 0007f412-d8d5-4673-8989-364d5628b62c)) + (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp 057a2208-96ae-4562-a656-a82d1ac5fd6f)) + (fp_circle (center 0 0) (end 3 0) (layer "B.CrtYd") (width 0.15) (fill none) (tstamp 0d622f2f-ae81-487a-b690-dc62e3952248)) + (fp_circle (center 0 0) (end 3 0) (layer "F.CrtYd") (width 0.15) (fill none) (tstamp 0a46e0ef-1660-410c-b104-f1e8206115b6)) + (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 13 "unconnected-(P8-Pad1)") (pinfunction "1") (pintype "passive+no_connect") (tstamp 0007f412-d8d5-4673-8989-364d5628b62c)) ) - (module "Valve:Valve_ECC-83-2" (layer "F.Cu") (tedit 5A3250E4) (tstamp 00000000-0000-0000-0000-000054a5a6b2) + (footprint "Valve:Valve_ECC-83-2" (layer "F.Cu") + (tedit 5A3250E4) (tstamp 00000000-0000-0000-0000-000054a5a6b2) (at 149.28 109.23) (descr "Valve ECC-83-2 flat pins") (tags "Valve ECC-83-2 flat pins") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-000048b4f266") (attr through_hole) (fp_text reference "U1" (at 1.596 -11.694) (layer "F.SilkS") @@ -626,28 +674,28 @@ (effects (font (size 1 1) (thickness 0.15))) (tstamp 8fb8ece7-c282-468c-a4a9-2be556997ae8) ) - (fp_circle (center 0 0) (end 10.16 1.27) (layer "F.SilkS") (width 0.12) (tstamp ba281968-674d-49a0-92da-7652c92a3b88)) - (fp_circle (center 0 0) (end 0 -10.5) (layer "F.CrtYd") (width 0.05) (tstamp d40f0c8d-db27-4086-84ad-f8b42c577e04)) - (fp_circle (center 0 0) (end 0 -10.25) (layer "F.Fab") (width 0.1) (tstamp 4188d294-6029-4f47-8c68-bb87e9af318f)) - (pad "" thru_hole circle (at 0 0) (size 4.5 4.5) (drill 3.1) (layers *.Cu *.Mask) (tstamp 05c98d9a-484f-4578-91c0-9d513d65c0ec)) - (pad "1" thru_hole oval (at 3.45 4.75 306) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 8 "Net-(R1-Pad1)") (tstamp a203d9be-406f-42d3-954b-a79f7aafcd44)) - (pad "2" thru_hole oval (at 5.6 1.82 342) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 5 "Net-(P1-Pad2)") (tstamp 7c77bf2b-6611-4af0-9095-5974c51144a6)) - (pad "3" thru_hole oval (at 5.6 -1.83 18) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 9 "Net-(R2-Pad1)") (tstamp 1f4d0fd4-0f01-4116-b0ef-e45203dd0ed6)) - (pad "4" thru_hole oval (at 3.45 -4.76 54) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 6 "Net-(P4-Pad1)") (tstamp ee99b7dd-801f-4d16-9eb2-e93c50a62801)) - (pad "5" thru_hole oval (at 0 -5.9 90) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 6 "Net-(P4-Pad1)") (tstamp c62d9096-5572-44b3-b08a-91e586ee6f4c)) - (pad "6" thru_hole oval (at -3.46 -4.76 306) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 2 "Net-(C1-Pad1)") (tstamp 92400a8b-880c-4013-8336-f84a0c50e13c)) - (pad "7" thru_hole oval (at -5.61 -1.83 342) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 8 "Net-(R1-Pad1)") (tstamp c8966ea7-279b-4852-b017-1b56fa6fbfc9)) - (pad "8" thru_hole oval (at -5.61 1.78 18) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 4 "Net-(C2-Pad2)") (tstamp 0a26786b-732a-4f8e-824e-7a7738c54b74)) - (pad "9" thru_hole oval (at -3.46 4.75 54) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) - (net 7 "Net-(P4-Pad2)") (tstamp b066f43c-0da5-4e8c-b322-eabc263849e7)) + (fp_circle (center 0 0) (end 10.16 1.27) (layer "F.SilkS") (width 0.12) (fill none) (tstamp ba281968-674d-49a0-92da-7652c92a3b88)) + (fp_circle (center 0 0) (end 0 -10.5) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp d40f0c8d-db27-4086-84ad-f8b42c577e04)) + (fp_circle (center 0 0) (end 0 -10.25) (layer "F.Fab") (width 0.1) (fill none) (tstamp 4188d294-6029-4f47-8c68-bb87e9af318f)) + (pad "" thru_hole circle (at 0 0) (locked) (size 4.5 4.5) (drill 3.1) (layers *.Cu *.Mask) (tstamp 05c98d9a-484f-4578-91c0-9d513d65c0ec)) + (pad "1" thru_hole oval (at 3.45 4.75 306) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 8 "Net-(R1-Pad1)") (pinfunction "A") (pintype "passive") (tstamp a203d9be-406f-42d3-954b-a79f7aafcd44)) + (pad "2" thru_hole oval (at 5.6 1.82 342) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 5 "Net-(P1-Pad2)") (pinfunction "G") (pintype "input") (tstamp 7c77bf2b-6611-4af0-9095-5974c51144a6)) + (pad "3" thru_hole oval (at 5.6 -1.83 18) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 9 "Net-(R2-Pad1)") (pinfunction "K") (pintype "passive") (tstamp 1f4d0fd4-0f01-4116-b0ef-e45203dd0ed6)) + (pad "4" thru_hole oval (at 3.45 -4.76 54) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 6 "Net-(P4-Pad1)") (pinfunction "F1") (pintype "input") (tstamp ee99b7dd-801f-4d16-9eb2-e93c50a62801)) + (pad "5" thru_hole oval (at 0 -5.9 90) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 6 "Net-(P4-Pad1)") (pinfunction "F1") (pintype "input") (tstamp c62d9096-5572-44b3-b08a-91e586ee6f4c)) + (pad "6" thru_hole oval (at -3.46 -4.76 306) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 2 "Net-(C1-Pad1)") (pinfunction "A") (pintype "passive") (tstamp 92400a8b-880c-4013-8336-f84a0c50e13c)) + (pad "7" thru_hole oval (at -5.61 -1.83 342) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 8 "Net-(R1-Pad1)") (pinfunction "G") (pintype "input") (tstamp c8966ea7-279b-4852-b017-1b56fa6fbfc9)) + (pad "8" thru_hole oval (at -5.61 1.78 18) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 4 "Net-(C2-Pad2)") (pinfunction "K") (pintype "passive") (tstamp 0a26786b-732a-4f8e-824e-7a7738c54b74)) + (pad "9" thru_hole oval (at -3.46 4.75 54) (locked) (size 2.03 3.05) (drill oval 1.02 2.03) (layers *.Cu *.Mask) + (net 7 "Net-(P4-Pad2)") (pinfunction "F2") (pintype "input") (tstamp b066f43c-0da5-4e8c-b322-eabc263849e7)) (model "${KIPRJMOD}/3d_shapes/ecc83.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -655,10 +703,13 @@ ) ) - (module "Capacitors_THT:C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal" (layer "F.Cu") (tedit 5A142A3B) (tstamp 00000000-0000-0000-0000-00005a34ccf9) + (footprint "Capacitors_THT:C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal" (layer "F.Cu") + (tedit 5A142A3B) (tstamp 00000000-0000-0000-0000-00005a34ccf9) (at 131.445 108.585 -90) (descr "C, Axial series, Axial, Horizontal, pin pitch=20mm, http://cdn-reichelt.de/documents/datenblatt/B300/STYROFLEX.pdf") (tags "C Axial series Axial Horizontal pin pitch 20mm length 12mm diameter 6.5mm") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f3be") (attr through_hole) (fp_text reference "C2" (at 10 -4.31 -90) (layer "F.SilkS") @@ -689,10 +740,10 @@ (fp_line (start 4 3.25) (end 16 3.25) (layer "F.Fab") (width 0.1) (tstamp a706d152-3a90-4d5c-aba3-a42dda5a69e6)) (fp_line (start 4 -3.25) (end 4 3.25) (layer "F.Fab") (width 0.1) (tstamp b379b196-d91c-48c7-b54f-005e74d34178)) (fp_line (start 0 0) (end 4 0) (layer "F.Fab") (width 0.1) (tstamp f926ac9a-aac2-409f-ae20-4191783c93fa)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 3 "Net-(C2-Pad1)") (tstamp 5702babf-5203-41a2-ae19-799bcc92d81c)) - (pad "2" thru_hole oval (at 20 0 270) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) - (net 4 "Net-(C2-Pad2)") (tstamp 6aaced28-2767-4763-b9fd-3d001814e3aa)) + (pad "1" thru_hole circle (at 0 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 3 "Net-(C2-Pad1)") (pintype "passive") (tstamp 5702babf-5203-41a2-ae19-799bcc92d81c)) + (pad "2" thru_hole oval (at 20 0 270) (locked) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask) + (net 4 "Net-(C2-Pad2)") (pintype "passive") (tstamp 6aaced28-2767-4763-b9fd-3d001814e3aa)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -700,10 +751,13 @@ ) ) - (module "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a3805d9) + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") + (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a3805d9) (at 123.19 111.125 180) (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x02 2.54mm single row") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f46c") (attr through_hole) (fp_text reference "P2" (at 0 -2.33 180) (layer "F.SilkS") @@ -733,10 +787,10 @@ (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp a176cb4e-0000-41d9-bd57-523795ce4a53)) (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp b4cd2fc5-4d6f-463a-9ee1-b16bec676672)) (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp ca9bd0ed-ccad-4593-9819-70d448bedd81)) - (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 3 "Net-(C2-Pad1)") (tstamp e683ae31-6af3-424c-a55a-a5a6b9f7c9af)) - (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp 9b073810-2889-46ca-b4cb-a3f9829bfcba)) + (pad "1" thru_hole rect (at 0 0 180) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 3 "Net-(C2-Pad1)") (pinfunction "P1") (pintype "passive") (tstamp e683ae31-6af3-424c-a55a-a5a6b9f7c9af)) + (pad "2" thru_hole oval (at 0 2.54 180) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 1 "GND") (pinfunction "PM") (pintype "passive") (tstamp 9b073810-2889-46ca-b4cb-a3f9829bfcba)) (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -744,10 +798,13 @@ ) ) - (module "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a3805ee) + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") + (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a3805ee) (at 123.19 102.87 180) (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x02 2.54mm single row") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f4a5") (attr through_hole) (fp_text reference "P3" (at 0 -2.33 180) (layer "F.SilkS") @@ -777,10 +834,10 @@ (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 5783b2ae-ad8f-4310-90af-54355def2d0f)) (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp 708702a9-563d-4a35-b58c-2aa8e6fdc058)) (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer "F.Fab") (width 0.1) (tstamp aededc3a-6d02-4ff0-871f-73f6bc157828)) - (pad "1" thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 2 "Net-(C1-Pad1)") (tstamp ac77d90f-cff2-459a-bb97-8f5e1cced5b9)) - (pad "2" thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp 459dddf8-2cc2-44c0-af8a-ea6b905c3dd1)) + (pad "1" thru_hole rect (at 0 0 180) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 2 "Net-(C1-Pad1)") (pinfunction "P1") (pintype "passive") (tstamp ac77d90f-cff2-459a-bb97-8f5e1cced5b9)) + (pad "2" thru_hole oval (at 0 2.54 180) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 1 "GND") (pinfunction "PM") (pintype "passive") (tstamp 459dddf8-2cc2-44c0-af8a-ea6b905c3dd1)) (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -788,10 +845,13 @@ ) ) - (module "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a38c77f) + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") + (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a38c77f) (at 165.1 110.49) (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x02 2.54mm single row") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004549f464") (attr through_hole) (fp_text reference "P1" (at -2.794 -0.254) (layer "F.SilkS") @@ -821,10 +881,10 @@ (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 3d9d8d78-92a5-43a6-887c-f628ad680943)) (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp bd2b7bcb-51b4-455a-abec-ab2ceda6af94)) (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp cca83b7b-71ff-4ed0-b4d3-14e172e23a8f)) - (pad "1" thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 1 "GND") (tstamp d79aa92f-b959-43f9-9f3b-4e7a77b4ad37)) - (pad "2" thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 5 "Net-(P1-Pad2)") (tstamp aeb94703-7bc4-4268-a31e-4cc35fc4c0e9)) + (pad "1" thru_hole rect (at 0 0) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 1 "GND") (pinfunction "P1") (pintype "passive") (tstamp d79aa92f-b959-43f9-9f3b-4e7a77b4ad37)) + (pad "2" thru_hole oval (at 0 2.54) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 5 "Net-(P1-Pad2)") (pinfunction "PM") (pintype "passive") (tstamp aeb94703-7bc4-4268-a31e-4cc35fc4c0e9)) (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -832,10 +892,13 @@ ) ) - (module "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a38c89b) + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" (layer "F.Cu") + (tedit 59FED5CC) (tstamp 00000000-0000-0000-0000-00005a38c89b) (at 150.495 128.905 -90) (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") (tags "Through hole pin header THT 1x02 2.54mm single row") + (property "Sheetfile" "ecc83-pp_v2.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-0000456a8acc") (attr through_hole) (fp_text reference "P4" (at 0 -2.33 -90) (layer "F.SilkS") @@ -865,10 +928,10 @@ (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer "F.Fab") (width 0.1) (tstamp 648c48d7-e2ab-46f9-90c7-64164e6b2219)) (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer "F.Fab") (width 0.1) (tstamp 81c8cd40-33e5-49a2-837a-4d63f551c852)) (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer "F.Fab") (width 0.1) (tstamp b694854e-7646-4c43-8be9-4f4227c24ea7)) - (pad "1" thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 6 "Net-(P4-Pad1)") (tstamp dc6778f5-9e75-4962-b82f-05bc7f8fd796)) - (pad "2" thru_hole oval (at 0 2.54 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) - (net 7 "Net-(P4-Pad2)") (tstamp 8e05bb2b-7b13-43a2-a0db-8f4efa2b4a5d)) + (pad "1" thru_hole rect (at 0 0 270) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 6 "Net-(P4-Pad1)") (pinfunction "P1") (pintype "passive") (tstamp dc6778f5-9e75-4962-b82f-05bc7f8fd796)) + (pad "2" thru_hole oval (at 0 2.54 270) (locked) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 7 "Net-(P4-Pad2)") (pinfunction "PM") (pintype "passive") (tstamp 8e05bb2b-7b13-43a2-a0db-8f4efa2b4a5d)) (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) diff --git a/demos/ecc83/ecc83-pp_v2.kicad_pro b/demos/ecc83/ecc83-pp_v2.kicad_pro index 5ee4be60e8..744dd2a2bc 100644 --- a/demos/ecc83/ecc83-pp_v2.kicad_pro +++ b/demos/ecc83/ecc83-pp_v2.kicad_pro @@ -48,10 +48,16 @@ "min_clearance": 0.508 } }, - "diff_pair_dimensions": [], + "diff_pair_dimensions": [ + { + "gap": 0.0, + "via_gap": 0.0, + "width": 0.0 + } + ], "drc_exclusions": [], "meta": { - "version": 1 + "version": 2 }, "rule_severities": { "annular_width": "error", @@ -60,7 +66,7 @@ "courtyards_overlap": "error", "diff_pair_gap_out_of_range": "error", "diff_pair_uncoupled_length_too_long": "error", - "drill_too_small": "error", + "drill_out_of_range": "error", "duplicate_footprints": "warning", "extra_footprint": "warning", "hole_clearance": "error", @@ -68,10 +74,9 @@ "invalid_outline": "error", "item_on_disabled_layer": "error", "items_not_allowed": "error", - "keepout": "error", "length_out_of_range": "error", "malformed_courtyard": "error", - "microvia_drill_too_small": "error", + "microvia_drill_out_of_range": "error", "missing_courtyard": "ignore", "missing_footprint": "warning", "net_conflict": "warning", @@ -89,7 +94,6 @@ "unconnected_items": "error", "unresolved_variable": "error", "via_dangling": "warning", - "via_hole_larger_than_pad": "error", "zone_has_empty_net": "error", "zones_intersect": "error" }, @@ -97,8 +101,9 @@ "allow_blind_buried_vias": false, "allow_microvias": false, "max_error": 0.005, - "min_clearance": 0.0, + "min_clearance": 0.19999999999999998, "min_copper_edge_clearance": 0.01, + "min_hole_clearance": 0.0, "min_hole_to_hole": 0.25, "min_microvia_diameter": 0.19999999999999998, "min_microvia_drill": 0.09999999999999999, @@ -106,14 +111,17 @@ "min_through_hole_diameter": 0.3, "min_track_width": 0.19999999999999998, "min_via_annular_width": 0.049999999999999996, - "min_via_diameter": 0.39999999999999997, - "solder_mask_clearance": 0.254, - "solder_mask_min_width": 0.0, - "solder_paste_clearance": 0.0, - "solder_paste_margin_ratio": 0.0 + "min_via_diameter": 0.39999999999999997 }, - "track_widths": [], - "via_dimensions": [], + "track_widths": [ + 0.0 + ], + "via_dimensions": [ + { + "diameter": 0.0, + "drill": 0.0 + } + ], "zones_allow_external_fillets": false, "zones_use_no_outline": true }, @@ -124,6 +132,7 @@ "equivalence_files": [] }, "erc": { + "erc_exclusions": [], "meta": { "version": 0 }, @@ -134,6 +143,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -147,6 +157,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -160,6 +171,7 @@ 0, 0, 0, + 0, 1, 0, 1, @@ -173,6 +185,7 @@ 0, 0, 0, + 0, 1, 1, 2, @@ -186,6 +199,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -193,12 +207,27 @@ 0, 2 ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], [ 1, 1, 1, 1, 1, + 0, 1, 1, 1, @@ -212,6 +241,7 @@ 0, 1, 0, + 0, 1, 0, 0, @@ -225,6 +255,7 @@ 1, 2, 0, + 0, 1, 0, 2, @@ -238,6 +269,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -251,6 +283,7 @@ 1, 1, 0, + 0, 1, 0, 2, @@ -269,6 +302,7 @@ 2, 2, 2, + 2, 2 ] ], @@ -279,7 +313,9 @@ "bus_to_net_conflict": "error", "different_unit_footprint": "error", "different_unit_net": "error", + "duplicate_reference": "error", "duplicate_sheet_names": "error", + "extra_units": "error", "global_label_dangling": "warning", "hier_label_mismatch": "error", "label_dangling": "error", @@ -293,6 +329,8 @@ "pin_to_pin": "warning", "power_pin_not_driven": "error", "similar_labels": "warning", + "unannotated": "error", + "unit_value_mismatch": "error", "unresolved_variable": "error", "wire_dangling": "error" } @@ -372,7 +410,7 @@ }, "sheets": [ [ - "13f868ae-89e7-4d33-969f-c77976a05076", + "388c2d0e-ea8f-4a92-add6-03b9c5f0ccbe", "" ] ], diff --git a/demos/ecc83/ecc83-pp_v2.kicad_sch b/demos/ecc83/ecc83-pp_v2.kicad_sch index be160da677..d1f247b95e 100644 --- a/demos/ecc83/ecc83-pp_v2.kicad_sch +++ b/demos/ecc83/ecc83-pp_v2.kicad_sch @@ -1,6 +1,4 @@ -(kicad_sch (version 20201015) (generator eeschema) - - (page 1 1) +(kicad_sch (version 20210126) (generator eeschema) (paper "A4") @@ -142,15 +140,15 @@ (rectangle (start -2.286 0.508) (end 2.286 0.508) (stroke (width 0)) (fill (type none)) ) - (rectangle (start 2.286 -0.508) (end -2.286 -1.016) - (stroke (width 0)) (fill (type outline)) - ) (rectangle (start 2.286 1.016) (end -2.286 1.016) (stroke (width 0)) (fill (type none)) ) (rectangle (start 2.286 1.016) (end 2.286 0.508) (stroke (width 0)) (fill (type none)) ) + (rectangle (start 2.286 -0.508) (end -2.286 -1.016) + (stroke (width 0)) (fill (type outline)) + ) (polyline (pts (xy -1.778 2.286) @@ -216,6 +214,22 @@ (stroke (width 0)) (fill (type none)) ) ) + (symbol "ECC83_1_0" + (polyline + (pts + (xy -2.54 -5.08) + (xy -2.54 -7.62) + ) + (stroke (width 0)) (fill (type none)) + ) + (polyline + (pts + (xy 0 5.08) + (xy 0 7.62) + ) + (stroke (width 0)) (fill (type none)) + ) + ) (symbol "ECC83_1_1" (arc (start 2.54 -5.08) (end -2.54 -5.08) (radius (at 0 -5.715) (length 2.6162) (angles 14.2 165.9)) (stroke (width 0.254)) (fill (type none)) @@ -269,6 +283,22 @@ (number "8" (effects (font (size 1.016 1.016)))) ) ) + (symbol "ECC83_2_0" + (polyline + (pts + (xy -2.54 -5.08) + (xy -2.54 -7.62) + ) + (stroke (width 0)) (fill (type none)) + ) + (polyline + (pts + (xy 0 5.08) + (xy 0 7.62) + ) + (stroke (width 0)) (fill (type none)) + ) + ) (symbol "ECC83_2_1" (arc (start 2.54 -5.08) (end -2.54 -5.08) (radius (at 0 -5.715) (length 2.6162) (angles 14.2 165.9)) (stroke (width 0.254)) (fill (type none)) @@ -342,38 +372,6 @@ (number "9" (effects (font (size 1.016 1.016)))) ) ) - (symbol "ECC83_1_0" - (polyline - (pts - (xy -2.54 -5.08) - (xy -2.54 -7.62) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy 0 5.08) - (xy 0 7.62) - ) - (stroke (width 0)) (fill (type none)) - ) - ) - (symbol "ECC83_2_0" - (polyline - (pts - (xy -2.54 -5.08) - (xy -2.54 -7.62) - ) - (stroke (width 0)) (fill (type none)) - ) - (polyline - (pts - (xy 0 5.08) - (xy 0 7.62) - ) - (stroke (width 0)) (fill (type none)) - ) - ) ) (symbol "ecc83_schlib:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes) (property "Reference" "#PWR" (id 0) (at 0 -6.35 0) @@ -421,6 +419,12 @@ (property "Datasheet" "" (id 3) (at 0 0 0) (effects (font (size 1.524 1.524))) ) + (symbol "PWR_FLAG_0_0" + (pin power_out line (at 0 0 90) (length 0) + (name "pwr" (effects (font (size 0.508 0.508)))) + (number "1" (effects (font (size 0.508 0.508)))) + ) + ) (symbol "PWR_FLAG_0_1" (polyline (pts @@ -434,12 +438,6 @@ (stroke (width 0)) (fill (type none)) ) ) - (symbol "PWR_FLAG_0_0" - (pin power_out line (at 0 0 90) (length 0) - (name "pwr" (effects (font (size 0.508 0.508)))) - (number "1" (effects (font (size 0.508 0.508)))) - ) - ) ) (symbol "ecc83_schlib:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes) (property "Reference" "R" (id 0) (at 2.032 0 90) @@ -485,138 +483,179 @@ (junction (at 165.1 91.44) (diameter 1.016) (color 0 0 0 0)) (junction (at 193.04 73.66) (diameter 1.016) (color 0 0 0 0)) - (no_connect (at 156.21 167.64)) - (no_connect (at 156.21 175.26)) - (no_connect (at 156.21 170.18)) - (no_connect (at 156.21 172.72)) + (no_connect (at 156.21 167.64) (uuid a5db1355-fe4a-4c3c-a82d-f38a3d282136)) + (no_connect (at 156.21 170.18) (uuid f1b6dea4-dd0b-4c23-aae8-3325c75d996b)) + (no_connect (at 156.21 172.72) (uuid ad74168f-8405-4312-8a91-1e0090a0d9dd)) + (no_connect (at 156.21 175.26) (uuid 733bbfbe-3398-4f47-841f-790c957f86cd)) (wire (pts (xy 86.36 45.72) (xy 93.98 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid de6d444b-6e86-40a8-bb57-d1b413027938) ) (wire (pts (xy 86.36 50.8) (xy 88.9 50.8)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 3691e44b-d6e4-4b5a-8fb0-cac92ec3abe5) ) (wire (pts (xy 86.36 91.44) (xy 96.52 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid d9bb6459-3cf0-4e32-8e6a-ac8a7713681b) ) (wire (pts (xy 86.36 96.52) (xy 99.06 96.52)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4b6bfd28-2e80-41ea-9dd7-92319ed97c3f) ) (wire (pts (xy 88.9 50.8) (xy 88.9 60.96)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0ce3197e-ef54-4e97-ab41-ded2fdf7aa2f) ) (wire (pts (xy 88.9 60.96) (xy 93.98 60.96)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4c89961b-70b4-4fb3-b1dc-abdb0256a7f4) ) (wire (pts (xy 93.98 43.18) (xy 93.98 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 63e3fb02-cc39-4751-883d-fd008a8febd3) ) (wire (pts (xy 93.98 45.72) (xy 104.14 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid df92b041-e90a-48c8-88cf-b47752e427f3) ) (wire (pts (xy 93.98 60.96) (xy 93.98 55.88)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 92c2a095-d374-4914-a64f-c182d82e1d36) ) (wire (pts (xy 93.98 60.96) (xy 104.14 60.96)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid bfdfa10f-b25b-42ad-83b4-728164453a28) ) (wire (pts (xy 96.52 91.44) (xy 96.52 88.9)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 964513f3-b27e-45af-9fac-86b1f5d2bbc6) ) (wire (pts (xy 96.52 91.44) (xy 101.6 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4b79567a-a26c-46dd-8d14-00adcb95641c) ) (wire (pts (xy 99.06 96.52) (xy 99.06 88.9)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f3416a28-abb4-415b-927f-fe3e7a7c7229) ) (wire (pts (xy 101.6 91.44) (xy 101.6 88.9)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 134c1269-a712-4334-a7c8-d4fbdede6641) ) (wire (pts (xy 104.14 45.72) (xy 167.64 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid ed6c22b5-f198-4771-87c9-793e065a44c5) ) (wire (pts (xy 104.14 49.53) (xy 104.14 45.72)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 8507b378-802a-43c6-a4d6-e16adfa519a7) ) (wire (pts (xy 104.14 57.15) (xy 104.14 60.96)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 1ac7902c-0b5c-476d-b03f-50839fd43072) ) (wire (pts (xy 104.14 60.96) (xy 104.14 63.5)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a28789e4-0f51-4c34-9781-8cecb643aae7) ) (wire (pts (xy 144.78 106.68) (xy 152.4 106.68)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0725a3dc-2443-419f-83c4-069dd85fa150) ) (wire (pts (xy 147.32 111.76) (xy 144.78 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 0d774d68-b56a-4c77-ba6d-acdaafdfe602) ) (wire (pts (xy 147.32 115.57) (xy 147.32 111.76)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a08b1d66-b044-4e17-8f5d-e8505e90521b) ) (wire (pts (xy 152.4 106.68) (xy 157.48 106.68)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f1b186d3-5bac-45ce-8bca-ccb067869716) ) (wire (pts (xy 152.4 130.81) (xy 152.4 106.68)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a7508ca4-2fc4-4c23-a593-a2fcc2fbd15d) ) (wire (pts (xy 152.4 138.43) (xy 152.4 139.7)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c578340f-d716-444f-9449-cc561d3df4e6) ) (wire (pts (xy 154.94 58.42) (xy 160.02 58.42)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a6f40b23-b659-4c96-bdf9-78a9c6dc96d5) ) (wire (pts (xy 154.94 91.44) (xy 154.94 58.42)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 86c097c9-ec0d-4841-90fb-614d7a7ae209) ) (wire (pts (xy 162.56 116.84) (xy 162.56 130.81)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid e8c5608e-2990-4db4-ad17-f1e095d417be) ) (wire (pts (xy 162.56 138.43) (xy 162.56 139.7)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 627ccf5c-2907-4f22-b4bc-e9644df942ad) ) (wire (pts (xy 165.1 68.58) (xy 165.1 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f8e03794-c689-4595-98ea-97c11378efd7) ) (wire (pts (xy 165.1 73.66) (xy 165.1 78.74)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid a4b91b77-b8c6-45eb-9263-15b66e476866) ) (wire (pts (xy 165.1 73.66) (xy 181.61 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 390ed33f-c64c-43ee-9a6b-683770c96584) ) (wire (pts (xy 165.1 86.36) (xy 165.1 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 429cc701-2cfc-4b8a-b9af-698ec5d746a1) ) (wire (pts (xy 165.1 91.44) (xy 154.94 91.44)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 06239462-039c-4948-aab5-480b1a34d337) ) (wire (pts (xy 165.1 91.44) (xy 165.1 96.52)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid dce6bc0b-847d-46e3-be14-2335681c94a1) ) (wire (pts (xy 167.64 45.72) (xy 167.64 48.26)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4c0869d1-dd9f-4c5f-9642-a61ef5bc6145) ) (wire (pts (xy 189.23 73.66) (xy 193.04 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 4c83946b-3d5b-4aa1-b991-fb87d2e84f7c) ) (wire (pts (xy 193.04 73.66) (xy 203.2 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid f5aee0af-40ca-4aa4-ae80-e72b3e61c97e) ) (wire (pts (xy 193.04 86.36) (xy 193.04 73.66)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid b880cd40-35ab-49b3-bbca-6038077d23d1) ) (wire (pts (xy 193.04 93.98) (xy 193.04 96.52)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 866c12bd-4d37-4973-b091-516689e9c5fb) ) (wire (pts (xy 199.39 78.74) (xy 199.39 82.55)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 85762b06-5501-4a25-afe9-0adc1b234f6c) ) (wire (pts (xy 203.2 78.74) (xy 199.39 78.74)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 49e84295-936a-4083-9110-b43922d36cab) ) (symbol (lib_id "ecc83_schlib:CONN_1") (at 160.02 167.64 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000054a5830a") + (uuid 00000000-0000-0000-0000-000054a5830a) (property "Reference" "P5" (id 0) (at 162.052 167.64 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -629,11 +668,12 @@ (property "Datasheet" "" (id 3) (at 160.02 167.64 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid ea5e96cd-2c68-4ff5-9adf-bfc3ac8a3424)) ) (symbol (lib_id "ecc83_schlib:CONN_1") (at 160.02 170.18 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000054a58363") + (uuid 00000000-0000-0000-0000-000054a58363) (property "Reference" "P6" (id 0) (at 162.052 170.18 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -646,11 +686,12 @@ (property "Datasheet" "" (id 3) (at 160.02 170.18 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid fdfd088c-7ae1-42ab-b1c5-d0bd94558ede)) ) (symbol (lib_id "ecc83_schlib:CONN_1") (at 160.02 172.72 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000054a5837a") + (uuid 00000000-0000-0000-0000-000054a5837a) (property "Reference" "P7" (id 0) (at 162.052 172.72 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -663,11 +704,12 @@ (property "Datasheet" "" (id 3) (at 160.02 172.72 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid d1e31115-7215-464f-aafd-c73790df2cda)) ) (symbol (lib_id "ecc83_schlib:CONN_1") (at 160.02 175.26 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000054a58391") + (uuid 00000000-0000-0000-0000-000054a58391) (property "Reference" "P8" (id 0) (at 162.052 175.26 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -680,11 +722,12 @@ (property "Datasheet" "" (id 3) (at 160.02 175.26 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid 8d0d99fc-4a93-41a8-b5a7-4cb0ae92248d)) ) (symbol (lib_id "ecc83_schlib:GND") (at 104.14 63.5 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000550e42c4") + (uuid 00000000-0000-0000-0000-0000550e42c4) (property "Reference" "#PWR07" (id 0) (at 104.14 63.5 0) (effects (font (size 0.762 0.762)) hide) ) @@ -697,11 +740,12 @@ (property "Datasheet" "" (id 3) (at 104.14 63.5 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid bdae119a-f9f2-4840-911f-c0af4dfaff9b)) ) (symbol (lib_id "ecc83_schlib:GND") (at 147.32 115.57 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000550e4c85") + (uuid 00000000-0000-0000-0000-0000550e4c85) (property "Reference" "#PWR08" (id 0) (at 147.32 115.57 0) (effects (font (size 0.762 0.762)) hide) ) @@ -714,11 +758,12 @@ (property "Datasheet" "" (id 3) (at 147.32 115.57 0) (effects (font (size 1.524 1.524))) ) + (pin "1" (uuid 159a3362-85c7-438c-b3e0-a295baf080c1)) ) (symbol (lib_id "ecc83_schlib:GND") (at 152.4 139.7 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000457dbaef") + (uuid 00000000-0000-0000-0000-0000457dbaef) (property "Reference" "#PWR04" (id 0) (at 152.4 139.7 0) (effects (font (size 0.762 0.762)) hide) ) @@ -731,11 +776,12 @@ (property "Datasheet" "" (id 3) (at 152.4 139.7 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid f2f38bea-12a5-4413-bc32-ebf03b3ce43a)) ) (symbol (lib_id "ecc83_schlib:GND") (at 162.56 139.7 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000457dbaf1") + (uuid 00000000-0000-0000-0000-0000457dbaf1) (property "Reference" "#PWR03" (id 0) (at 162.56 139.7 0) (effects (font (size 0.762 0.762)) hide) ) @@ -748,11 +794,12 @@ (property "Datasheet" "" (id 3) (at 162.56 139.7 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 6c1f0667-50bd-4fcb-8d76-e9535e5e7681)) ) (symbol (lib_id "ecc83_schlib:GND") (at 193.04 96.52 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000457dbaf5") + (uuid 00000000-0000-0000-0000-0000457dbaf5) (property "Reference" "#PWR02" (id 0) (at 193.04 96.52 0) (effects (font (size 0.762 0.762)) hide) ) @@ -765,11 +812,12 @@ (property "Datasheet" "" (id 3) (at 193.04 96.52 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 1f4ba74b-a003-4c32-8d9d-8b153b9e3d45)) ) (symbol (lib_id "ecc83_schlib:GND") (at 199.39 82.55 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000457dbaf8") + (uuid 00000000-0000-0000-0000-0000457dbaf8) (property "Reference" "#PWR01" (id 0) (at 199.39 82.55 0) (effects (font (size 0.762 0.762)) hide) ) @@ -782,11 +830,12 @@ (property "Datasheet" "" (id 3) (at 199.39 82.55 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 2d549ceb-e4e8-4062-850f-b0d20bf1f7a8)) ) (symbol (lib_id "ecc83_schlib:PWR_FLAG") (at 93.98 43.18 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000550e41d9") + (uuid 00000000-0000-0000-0000-0000550e41d9) (property "Reference" "#FLG06" (id 0) (at 93.98 36.322 0) (effects (font (size 0.762 0.762)) hide) ) @@ -799,11 +848,12 @@ (property "Datasheet" "" (id 3) (at 93.98 43.18 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid b467d6b1-67b1-4131-9ab2-d582a6bcab00)) ) (symbol (lib_id "ecc83_schlib:PWR_FLAG") (at 93.98 55.88 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000457dbac0") + (uuid 00000000-0000-0000-0000-0000457dbac0) (property "Reference" "#FLG05" (id 0) (at 93.98 49.022 0) (effects (font (size 0.762 0.762)) hide) ) @@ -816,11 +866,12 @@ (property "Datasheet" "" (id 3) (at 93.98 55.88 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 613846cd-6b50-4a64-a07a-2d645ddbeeb7)) ) (symbol (lib_id "ecc83_schlib:R") (at 152.4 134.62 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f3a2") + (uuid 00000000-0000-0000-0000-00004549f3a2) (property "Reference" "R4" (id 0) (at 149.86 129.54 0)) (property "Value" "47K" (id 1) (at 152.4 134.62 90)) (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 154.94 134.62 90) @@ -829,11 +880,13 @@ (property "Datasheet" "" (id 3) (at 152.4 134.62 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 44003cdb-dc62-4e28-a0f1-677c091977a7)) + (pin "2" (uuid 3f5cfcf2-d56b-4975-b94c-10a3bbaf41c1)) ) (symbol (lib_id "ecc83_schlib:R") (at 162.56 134.62 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f39d") + (uuid 00000000-0000-0000-0000-00004549f39d) (property "Reference" "R2" (id 0) (at 160.02 129.54 0)) (property "Value" "1.5K" (id 1) (at 162.56 134.62 90)) (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 165.1 134.62 90) @@ -842,11 +895,13 @@ (property "Datasheet" "" (id 3) (at 162.56 134.62 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 9c6c5300-302c-484d-88e2-9772619279c7)) + (pin "2" (uuid 43495766-e380-42df-b457-df886310d093)) ) (symbol (lib_id "ecc83_schlib:R") (at 165.1 82.55 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f38a") + (uuid 00000000-0000-0000-0000-00004549f38a) (property "Reference" "R1" (id 0) (at 162.56 77.47 0)) (property "Value" "1.5K" (id 1) (at 165.1 82.55 90)) (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 167.64 82.55 90) @@ -855,11 +910,13 @@ (property "Datasheet" "" (id 3) (at 165.1 82.55 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid f760fa01-be9c-4fa4-8fc4-293a593f5054)) + (pin "2" (uuid a95d61bc-0f20-4e8e-aa23-cb302481e8e7)) ) (symbol (lib_id "ecc83_schlib:R") (at 193.04 90.17 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f3ad") + (uuid 00000000-0000-0000-0000-00004549f3ad) (property "Reference" "R3" (id 0) (at 190.5 85.09 0)) (property "Value" "100K" (id 1) (at 193.04 90.17 90)) (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" (id 2) (at 195.58 90.17 90) @@ -868,11 +925,13 @@ (property "Datasheet" "" (id 3) (at 193.04 90.17 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c920157b-b297-43e0-9e6a-447089abf100)) + (pin "2" (uuid d1d8db8c-bd5a-4978-bfa6-139d27d84e8e)) ) (symbol (lib_id "ecc83_schlib:CP") (at 104.14 53.34 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f4be") + (uuid 00000000-0000-0000-0000-00004549f4be) (property "Reference" "C1" (id 0) (at 107.95 52.07 0) (effects (font (size 1.27 1.27)) (justify left)) ) @@ -885,11 +944,13 @@ (property "Datasheet" "" (id 3) (at 104.14 53.34 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid c78022a3-bb29-45bf-a73a-61277b294726)) + (pin "2" (uuid 42b6b902-4f69-4dc7-be29-5b490fc26021)) ) (symbol (lib_id "ecc83_schlib:C") (at 185.42 73.66 270) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f3be") + (uuid 00000000-0000-0000-0000-00004549f3be) (property "Reference" "C2" (id 0) (at 185.42 69.85 90)) (property "Value" "680nF" (id 1) (at 185.42 77.47 90)) (property "Footprint" "Capacitors_THT:C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal" (id 2) (at 185.42 78.74 90) @@ -898,11 +959,13 @@ (property "Datasheet" "" (id 3) (at 185.42 73.66 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid bd495094-4c44-4d1b-b6da-dfe21668ebfb)) + (pin "2" (uuid c0bd8c0e-ec10-4b79-8f71-40a865790994)) ) (symbol (lib_id "ecc83_schlib:CONN_2") (at 77.47 48.26 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f4a5") + (uuid 00000000-0000-0000-0000-00004549f4a5) (property "Reference" "P3" (id 0) (at 78.74 48.26 90) (effects (font (size 1.016 1.016))) ) @@ -915,11 +978,13 @@ (property "Datasheet" "" (id 3) (at 77.47 48.26 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid d24a7210-8ec9-4ecf-a9b8-0fde3306da0f)) + (pin "2" (uuid 156d475d-e037-4767-ab2d-e90a3b82f815)) ) (symbol (lib_id "ecc83_schlib:CONN_2") (at 77.47 93.98 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-0000456a8acc") + (uuid 00000000-0000-0000-0000-0000456a8acc) (property "Reference" "P4" (id 0) (at 78.74 93.98 90) (effects (font (size 1.016 1.016))) ) @@ -932,11 +997,13 @@ (property "Datasheet" "" (id 3) (at 77.47 93.98 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 4c52893f-4d6c-44f1-92fc-ed75fdd55054)) + (pin "2" (uuid 1add56fa-6cda-481d-aee1-5d15bb30854d)) ) (symbol (lib_id "ecc83_schlib:CONN_2") (at 135.89 109.22 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f464") + (uuid 00000000-0000-0000-0000-00004549f464) (property "Reference" "P1" (id 0) (at 137.16 109.22 90) (effects (font (size 1.016 1.016))) ) @@ -949,11 +1016,13 @@ (property "Datasheet" "" (id 3) (at 135.89 109.22 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid ebd73573-2de7-4684-88e1-e0683a020874)) + (pin "2" (uuid 2c7bc651-bce3-43d4-aab4-1721e0037dc4)) ) (symbol (lib_id "ecc83_schlib:CONN_2") (at 212.09 76.2 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004549f46c") + (uuid 00000000-0000-0000-0000-00004549f46c) (property "Reference" "P2" (id 0) (at 210.82 76.2 90) (effects (font (size 1.016 1.016))) ) @@ -966,11 +1035,13 @@ (property "Datasheet" "" (id 3) (at 212.09 76.2 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid fa6e86eb-e691-4697-91d4-797e3d3c2512)) + (pin "2" (uuid d1891dd4-b247-42e0-b938-83fc56f110e7)) ) (symbol (lib_id "ecc83_schlib:ECC83") (at 99.06 77.47 0) (unit 3) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000048b4f266") + (uuid 00000000-0000-0000-0000-000048b4f266) (property "Reference" "U1" (id 0) (at 106.68 74.93 0)) (property "Value" "ECC83" (id 1) (at 107.95 77.47 0)) (property "Footprint" "Valve:Valve_ECC-83-2" (id 2) (at 111.76 80.01 0) @@ -979,11 +1050,14 @@ (property "Datasheet" "" (id 3) (at 99.06 77.47 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "4" (uuid bda56675-082d-4070-989b-8e723dbc3423)) + (pin "5" (uuid a5e343f8-9f9e-47ea-88bd-b48b4bf5c3df)) + (pin "9" (uuid f6f71937-43f1-4bc1-a453-c30747edb772)) ) (symbol (lib_id "ecc83_schlib:ECC83") (at 165.1 106.68 0) (unit 2) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000048b4f263") + (uuid 00000000-0000-0000-0000-000048b4f263) (property "Reference" "U1" (id 0) (at 177.8 104.14 0)) (property "Value" "ECC83" (id 1) (at 177.8 106.68 0)) (property "Footprint" "Valve:Valve_ECC-83-2" (id 2) (at 177.8 109.22 0) @@ -992,11 +1066,14 @@ (property "Datasheet" "" (id 3) (at 165.1 106.68 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid a38cee20-beb3-4da7-9afe-b300c681d803)) + (pin "2" (uuid d3c3590b-bcda-43ad-bc9f-340b915c5922)) + (pin "3" (uuid bd9efb57-1a6e-4371-9298-bd4742e61bc7)) ) (symbol (lib_id "ecc83_schlib:ECC83") (at 167.64 58.42 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-000048b4f256") + (uuid 00000000-0000-0000-0000-000048b4f256) (property "Reference" "U1" (id 0) (at 180.34 55.88 0)) (property "Value" "ECC83" (id 1) (at 180.34 58.42 0)) (property "Footprint" "Valve:Valve_ECC-83-2" (id 2) (at 180.34 60.96 0) @@ -1005,6 +1082,9 @@ (property "Datasheet" "" (id 3) (at 167.64 58.42 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "6" (uuid afde033c-2b5d-46a7-938b-84faf447fe0d)) + (pin "7" (uuid 84b1224c-3dea-41e8-9b87-0f77096f0bc6)) + (pin "8" (uuid 0ec9cec2-46e4-4170-b1d0-ad437c0bfa86)) ) (sheet_instances diff --git a/demos/test_pads_inside_pads/sym-lib-table b/demos/test_pads_inside_pads/sym-lib-table index a43572f7f1..1f8edb05e6 100644 --- a/demos/test_pads_inside_pads/sym-lib-table +++ b/demos/test_pads_inside_pads/sym-lib-table @@ -1,3 +1,3 @@ (sym_lib_table - (lib (name test_pads_inside_pads_schlib)(type Legacy)(uri ${KIPRJMOD}/test_pads_inside_pads_schlib.lib)(options "")(descr "")) + (lib (name "test_pads_inside_pads_schlib")(type "KiCad")(uri "${KIPRJMOD}/test_pads_inside_pads_schlib.kicad_sym")(options "")(descr "")) ) diff --git a/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb b/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb index 2021380663..b9f3b39fd4 100644 --- a/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb +++ b/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb @@ -1,4 +1,4 @@ -(kicad_pcb (version 20210108) (generator pcbnew) +(kicad_pcb (version 20210228) (generator pcbnew) (general (thickness 1.6002) @@ -29,6 +29,7 @@ ) (setup + (pad_to_mask_clearance 0) (pcbplotparams (layerselection 0x0000030_80000001) (disableapertmacros false) @@ -74,6 +75,8 @@ (at 89.535 45.593) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "test_pads_inside_pads.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004edf7cc5") (attr through_hole) (fp_text reference "P1" (at 0 -12) (layer "F.SilkS") @@ -89,27 +92,27 @@ (fp_line (start 11 -11) (end 11 11) (layer "F.SilkS") (width 0.15) (tstamp 9ecc6a7f-6316-4fb1-9a6d-877714694934)) (fp_line (start 11 11) (end -11 11) (layer "F.SilkS") (width 0.15) (tstamp d3505e79-4ca0-4c1a-8116-65df111647be)) (pad "1" thru_hole circle (at 3.81 -7.62) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp 1d1c91af-2430-49bb-aa10-c85e31465067)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp 1d1c91af-2430-49bb-aa10-c85e31465067)) (pad "1" thru_hole circle (at -8.255 -7.62) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp 2d5ff131-583f-4b35-bf9c-4c69fb359fd5)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp 2d5ff131-583f-4b35-bf9c-4c69fb359fd5)) (pad "1" smd rect (at 0 0) (locked) (size 20.32 20.32) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "/NET2") (tstamp 524ddc9b-4a8e-40f1-bab5-c794faaad669)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp 524ddc9b-4a8e-40f1-bab5-c794faaad669)) (pad "1" thru_hole circle (at -3.81 -4.445) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp 642daf42-cf9b-4f31-b756-055f16342b54)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp 642daf42-cf9b-4f31-b756-055f16342b54)) (pad "1" thru_hole circle (at -3.81 -7.62) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp 78e511dc-d8f6-474a-8d1c-6a42560cb938)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp 78e511dc-d8f6-474a-8d1c-6a42560cb938)) (pad "1" thru_hole circle (at 3.81 -4.445) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp 7a2b20ed-df5e-4d40-ae20-5c178b193123)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp 7a2b20ed-df5e-4d40-ae20-5c178b193123)) (pad "1" thru_hole circle (at 8.255 -4.445) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp b1686322-1603-418b-834a-588ad11bf569)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp b1686322-1603-418b-834a-588ad11bf569)) (pad "1" thru_hole circle (at -8.255 -4.445) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp c162bfa2-ed71-444d-8ec1-15faab5a8aeb)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp c162bfa2-ed71-444d-8ec1-15faab5a8aeb)) (pad "1" thru_hole circle (at 0 -4.445) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp c41e3352-fe7e-4f1f-9a7f-dacef92b31c2)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp c41e3352-fe7e-4f1f-9a7f-dacef92b31c2)) (pad "1" thru_hole circle (at 0 -7.62) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp c465f930-44c6-4eef-9fcb-d2319aeb3b0a)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp c465f930-44c6-4eef-9fcb-d2319aeb3b0a)) (pad "1" thru_hole circle (at 8.255 -7.62) (locked) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp e15db349-8c4a-41d5-b95a-fb3865840e97)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp e15db349-8c4a-41d5-b95a-fb3865840e97)) ) (footprint "1pin" (layer "F.Cu") @@ -117,6 +120,8 @@ (at 107.696 45.593) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "test_pads_inside_pads.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004edf7cc0") (attr through_hole) (fp_text reference "P2" (at 0.214 -3.163) (layer "F.SilkS") @@ -129,7 +134,7 @@ ) (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp 0e9c7ae8-ec29-4404-a610-c989c9302588)) (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 2 "/NET2") (tstamp feddcea1-e2f4-4733-980c-c44e9074b886)) + (net 2 "/NET2") (pinfunction "1") (pintype "passive") (tstamp feddcea1-e2f4-4733-980c-c44e9074b886)) ) (footprint "1pin" (layer "F.Cu") @@ -137,6 +142,8 @@ (at 87.122 61.468) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "test_pads_inside_pads.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004ee5056c") (attr through_hole) (fp_text reference "P3" (at -2.312 -2.858) (layer "F.SilkS") @@ -149,7 +156,7 @@ ) (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp 13c78dfe-e522-4715-8ab5-867071caa69e)) (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 1 "/NET1") (tstamp 63e3e6f8-8b69-4903-a59f-e56ceec010ab)) + (net 1 "/NET1") (pinfunction "1") (pintype "passive") (tstamp 63e3e6f8-8b69-4903-a59f-e56ceec010ab)) ) (footprint "1pin" (layer "F.Cu") @@ -157,6 +164,8 @@ (at 107.061 61.468) (descr "module 1 pin (ou trou mecanique de percage)") (tags "DEV") + (property "Sheetfile" "test_pads_inside_pads.kicad_sch") + (property "Sheetname" "") (path "/00000000-0000-0000-0000-00004ee5056d") (attr through_hole) (fp_text reference "P4" (at 0 -3.048) (layer "F.SilkS") @@ -169,7 +178,7 @@ ) (fp_circle (center 0 0) (end 0 -2.286) (layer "F.SilkS") (width 0.381) (fill none) (tstamp 0f5d77d2-850f-4ebd-a4ba-437a96ef97e7)) (pad "1" thru_hole circle (at 0 0) (locked) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) - (net 1 "/NET1") (die_length 7.62) (tstamp e62dcc93-6e23-4dcc-a1d1-9cc59c15b145)) + (net 1 "/NET1") (pinfunction "1") (pintype "passive") (die_length 7.62) (tstamp e62dcc93-6e23-4dcc-a1d1-9cc59c15b145)) ) (gr_rect (start 68.05 23.5) (end 125.23 71.36) (layer "Edge.Cuts") (width 0.381) (fill none) (tstamp a9cd5f86-b613-4436-a03d-d2c5e50ff2cf)) diff --git a/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro b/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro index 0665ca92ca..4f929027bd 100644 --- a/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro +++ b/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pro @@ -51,7 +51,7 @@ "diff_pair_dimensions": [], "drc_exclusions": [], "meta": { - "version": 1 + "version": 2 }, "rule_severities": { "annular_width": "error", @@ -105,11 +105,7 @@ "min_through_hole_diameter": 0.508, "min_track_width": 0.2032, "min_via_annular_width": 0.049999999999999996, - "min_via_diameter": 0.889, - "solder_mask_clearance": 0.254, - "solder_mask_min_width": 0.0, - "solder_paste_clearance": 0.0, - "solder_paste_margin_ratio": 0.0 + "min_via_diameter": 0.889 }, "track_widths": [], "via_dimensions": [], @@ -123,6 +119,7 @@ "equivalence_files": [] }, "erc": { + "erc_exclusions": [], "meta": { "version": 0 }, @@ -133,6 +130,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -146,6 +144,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -159,6 +158,7 @@ 0, 0, 0, + 0, 1, 0, 1, @@ -172,6 +172,7 @@ 0, 0, 0, + 0, 1, 1, 2, @@ -185,6 +186,7 @@ 0, 0, 0, + 0, 1, 0, 0, @@ -192,12 +194,27 @@ 0, 2 ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], [ 1, 1, 1, 1, 1, + 0, 1, 1, 1, @@ -211,6 +228,7 @@ 0, 1, 0, + 0, 1, 0, 0, @@ -224,6 +242,7 @@ 1, 2, 0, + 0, 1, 0, 2, @@ -237,6 +256,7 @@ 0, 1, 0, + 0, 1, 0, 2, @@ -250,6 +270,7 @@ 1, 1, 0, + 0, 1, 0, 2, @@ -268,6 +289,7 @@ 2, 2, 2, + 2, 2 ] ], @@ -278,7 +300,9 @@ "bus_to_net_conflict": "error", "different_unit_footprint": "error", "different_unit_net": "error", + "duplicate_reference": "error", "duplicate_sheet_names": "error", + "extra_units": "error", "global_label_dangling": "warning", "hier_label_mismatch": "error", "label_dangling": "error", @@ -292,6 +316,8 @@ "pin_to_pin": "warning", "power_pin_not_driven": "error", "similar_labels": "warning", + "unannotated": "error", + "unit_value_mismatch": "error", "unresolved_variable": "error", "wire_dangling": "error" } @@ -371,7 +397,7 @@ }, "sheets": [ [ - "d83edf3e-df9e-48d3-b50a-87ddee1bc3a6", + "c2971e40-9f03-4308-8999-e3e2a004a35a", "" ] ], diff --git a/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_sch b/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_sch index b7e9c7dad1..4a0e13b7ee 100644 --- a/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_sch +++ b/demos/test_pads_inside_pads/test_pads_inside_pads.kicad_sch @@ -1,6 +1,4 @@ -(kicad_sch (version 20201015) (generator eeschema) - - (page 1 1) +(kicad_sch (version 20210126) (generator eeschema) (paper "A4") @@ -42,23 +40,28 @@ ) + (wire (pts (xy 105.41 36.83) (xy 95.25 36.83)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid 719f2e63-0c2b-4a58-bc69-9318855f4e18) ) (wire (pts (xy 105.41 44.45) (xy 95.25 44.45)) (stroke (width 0) (type solid) (color 0 0 0 0)) + (uuid c31b3cc5-1c8c-46f3-ab75-f3a70657abb8) ) (label "NET1" (at 97.79 36.83 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid c0edb6bc-5da8-4326-9ea4-e4ba367b41a6) ) (label "NET2" (at 97.79 44.45 0) (effects (font (size 1.524 1.524)) (justify left bottom)) + (uuid 5f95b744-6a08-47f9-b294-13b17e9d2ed4) ) (symbol (lib_id "test_pads_inside_pads_schlib:CONN_1") (at 91.44 36.83 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004ee5056c") + (uuid 00000000-0000-0000-0000-00004ee5056c) (property "Reference" "P3" (id 0) (at 89.408 36.83 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -71,11 +74,12 @@ (property "Datasheet" "" (id 3) (at 91.44 36.83 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid b8ad4eef-d6ed-4840-ae33-c063c8bdbb53)) ) (symbol (lib_id "test_pads_inside_pads_schlib:CONN_1") (at 91.44 44.45 180) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004edf7cc5") + (uuid 00000000-0000-0000-0000-00004edf7cc5) (property "Reference" "P1" (id 0) (at 89.408 44.45 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -88,11 +92,12 @@ (property "Datasheet" "" (id 3) (at 91.44 44.45 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 9adf6b14-a8d6-45d3-89c7-a5c3bd7770c9)) ) (symbol (lib_id "test_pads_inside_pads_schlib:CONN_1") (at 109.22 36.83 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004ee5056d") + (uuid 00000000-0000-0000-0000-00004ee5056d) (property "Reference" "P4" (id 0) (at 111.252 36.83 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -105,11 +110,12 @@ (property "Datasheet" "" (id 3) (at 109.22 36.83 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 89815e55-a712-4edd-8370-bdd10c92726d)) ) (symbol (lib_id "test_pads_inside_pads_schlib:CONN_1") (at 109.22 44.45 0) (unit 1) (in_bom yes) (on_board yes) - (uuid "00000000-0000-0000-0000-00004edf7cc0") + (uuid 00000000-0000-0000-0000-00004edf7cc0) (property "Reference" "P2" (id 0) (at 111.252 44.45 0) (effects (font (size 1.016 1.016)) (justify left)) ) @@ -122,6 +128,7 @@ (property "Datasheet" "" (id 3) (at 109.22 44.45 0) (effects (font (size 1.524 1.524)) hide) ) + (pin "1" (uuid 445c5ef2-f52e-4b79-ab7e-4feec4e7af63)) ) (sheet_instances