From 2b4a2ce67b19e2a91795b0baae23d5f229dfba58 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 14 Dec 2017 18:23:53 +0100 Subject: [PATCH] update demo ecc83 --- demos/ecc83/ecc83-pp-cache.lib | 65 +- demos/ecc83/ecc83-pp.kicad_pcb | 998 ++++++++++++++++++------------ demos/ecc83/ecc83-pp.net | 76 ++- demos/ecc83/ecc83-pp.sch | 115 ++-- demos/ecc83/ecc83-pp_v2-cache.lib | 65 +- demos/ecc83/ecc83-pp_v2.kicad_pcb | 784 ++++++++++++----------- demos/ecc83/ecc83-pp_v2.net | 146 +++-- demos/ecc83/ecc83-pp_v2.sch | 58 +- demos/ecc83/ecc83_schlib.dcm | 5 + demos/ecc83/ecc83_schlib.lib | 73 ++- demos/ecc83/fp-lib-table | 4 +- 11 files changed, 1383 insertions(+), 1006 deletions(-) diff --git a/demos/ecc83/ecc83-pp-cache.lib b/demos/ecc83/ecc83-pp-cache.lib index 0e96fbf76b..14254a37db 100644 --- a/demos/ecc83/ecc83-pp-cache.lib +++ b/demos/ecc83/ecc83-pp-cache.lib @@ -1,11 +1,11 @@ EESchema-LIBRARY Version 2.4 #encoding utf-8 # -# C +# ecc83_schlib:C # -DEF C C 0 10 N Y 1 F N +DEF ecc83_schlib: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 +F1 "ecc83_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 @@ -23,11 +23,11 @@ X ~ 2 0 -150 110 U 40 40 1 1 P ENDDRAW ENDDEF # -# CONN_1 +# ecc83_schlib:CONN_1 # -DEF ~CONN_1 P 0 30 N N 1 F N +DEF ~ecc83_schlib:CONN_1 P 0 30 N N 1 F N F0 "P" 80 0 40 H V L CNN -F1 "CONN_1" 0 55 30 H I C CNN +F1 "ecc83_schlib:CONN_1" 0 55 30 H I C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW @@ -37,11 +37,11 @@ X 1 1 -150 0 100 R 60 60 1 1 P ENDDRAW ENDDEF # -# CONN_2 +# ecc83_schlib:CONN_2 # -DEF CONN_2 P 0 40 Y N 1 F N +DEF ecc83_schlib: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 +F1 "ecc83_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 @@ -51,11 +51,34 @@ X PM 2 -350 -100 250 R 60 60 1 1 P I ENDDRAW ENDDEF # -# ECC81 +# ecc83_schlib:CP # -DEF ECC81 U 0 0 Y Y 3 L N +DEF ecc83_schlib:CP C 0 10 N Y 1 F N +F0 "C" 25 100 50 H V L CNN +F1 "ecc83_schlib:CP" 25 -100 50 H V L CNN +F2 "" 38 -150 50 H I C CNN +F3 "" 0 0 50 H I C CNN +$FPLIST + CP_* +$ENDFPLIST +DRAW +S -90 20 -90 40 0 1 0 N +S -90 20 90 20 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 +P 2 0 1 0 -70 90 -30 90 N +P 2 0 1 0 -50 110 -50 70 N +X ~ 1 0 150 110 D 50 50 1 1 P +X ~ 2 0 -150 110 U 50 50 1 1 P +ENDDRAW +ENDDEF +# +# ecc83_schlib:ECC83 +# +DEF ecc83_schlib:ECC83 U 0 0 Y Y 3 L N F0 "U" 130 310 50 H V C CNN -F1 "ECC81" 350 -300 50 H V C CNN +F1 "ecc83_schlib:ECC83" 350 -300 50 H V C CNN F2 "VALVE-NOVAL_P" 400 -350 30 H I C CNN F3 "" 0 0 60 H V C CNN ALIAS ECC83 @@ -94,11 +117,11 @@ X F2 9 0 -450 200 U 40 40 3 1 I ENDDRAW ENDDEF # -# GND +# ecc83_schlib:GND # -DEF GND #PWR 0 0 Y Y 1 F P +DEF ecc83_schlib:GND #PWR 0 0 Y Y 1 F P F0 "#PWR" 0 -250 50 H I C CNN -F1 "GND" 0 -150 50 H V C CNN +F1 "ecc83_schlib:GND" 0 -150 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW @@ -107,11 +130,11 @@ X GND 1 0 0 0 D 50 50 1 1 W N ENDDRAW ENDDEF # -# PWR_FLAG +# ecc83_schlib:PWR_FLAG # -DEF PWR_FLAG #FLG 0 0 N N 1 F P +DEF ecc83_schlib: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 +F1 "ecc83_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 @@ -120,11 +143,11 @@ X pwr 1 0 0 0 U 20 20 0 0 w ENDDRAW ENDDEF # -# R +# ecc83_schlib:R # -DEF R R 0 0 N Y 1 F N +DEF ecc83_schlib: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 +F1 "ecc83_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 diff --git a/demos/ecc83/ecc83-pp.kicad_pcb b/demos/ecc83/ecc83-pp.kicad_pcb index 02facb1607..7e30199cd0 100644 --- a/demos/ecc83/ecc83-pp.kicad_pcb +++ b/demos/ecc83/ecc83-pp.kicad_pcb @@ -1,9 +1,9 @@ -(kicad_pcb (version 20170922) (host pcbnew "(2017-11-14 revision 1b57196)-master") +(kicad_pcb (version 20171130) (host pcbnew "(2017-12-14 revision dee93e5)-master") (general (thickness 1.6002) (drawings 4) - (tracks 57) + (tracks 66) (zones 0) (modules 15) (nets 14) @@ -13,6 +13,8 @@ (layers (0 Composant signal) (31 Cuivre signal) + (32 B.Adhes user) + (33 F.Adhes user) (34 B.Paste user) (35 F.Paste user) (36 B.SilkS user) @@ -24,6 +26,11 @@ (42 Eco1.User user) (43 Eco2.User user) (44 Edge.Cuts user) + (45 Margin user) + (46 B.CrtYd user) + (47 F.CrtYd user) + (48 B.Fab user) + (49 F.Fab user) ) (setup @@ -119,8 +126,329 @@ (add_net "Net-(R2-Pad1)") ) + (module Valve:Valve_ECC-83-1 (layer Composant) (tedit 5A32B2BA) (tstamp 5A334CCC) + (at 149.225 113.665) + (descr "Valve ECC-83-1 round pins") + (tags "Valve ECC-83-1 round pins") + (path /48B4F266) + (fp_text reference U1 (at -3.45 -16) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value ECC83 (at -3.45 6.68) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text user %R (at 0 0.05) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_circle (center 0 0.05) (end 0 -10.55) (layer F.CrtYd) (width 0.05)) + (fp_circle (center 0 0.05) (end 0 -10.1) (layer F.Fab) (width 0.1)) + (fp_circle (center 0 0.05) (end 10.16 1.32) (layer F.SilkS) (width 0.12)) + (pad 1 thru_hole circle (at 3.45 4.8) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 8 "Net-(R1-Pad1)")) + (pad 2 thru_hole circle (at 5.6 1.87) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 5 "Net-(P1-Pad2)")) + (pad 3 thru_hole circle (at 5.6 -1.78) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 9 "Net-(R2-Pad1)")) + (pad 4 thru_hole circle (at 3.45 -4.71) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 7 "Net-(P4-Pad2)")) + (pad 5 thru_hole circle (at 0 -5.85) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 7 "Net-(P4-Pad2)")) + (pad 6 thru_hole circle (at -3.46 -4.71) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 2 "Net-(C1-Pad1)")) + (pad 7 thru_hole circle (at -5.61 -1.78) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 8 "Net-(R1-Pad1)")) + (pad 8 thru_hole circle (at -5.61 1.83) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 4 "Net-(C2-Pad2)")) + (pad 9 thru_hole circle (at -3.46 4.8) (size 2.03 2.03) (drill 1.02) (layers *.Cu *.Mask) + (net 6 "Net-(P4-Pad1)")) + (model ${KISYS3DMOD}/Valve.3dshapes/Valve-ECC-83-1.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 5A33370F) + (at 130.048 123.825 180) + (descr "Resitance 3 pas") + (tags R) + (path /4549F3AD) + (autoplace_cost180 10) + (fp_text reference R3 (at 0 0.127 180) (layer F.SilkS) hide + (effects (font (size 1.397 1.27) (thickness 0.2032))) + ) + (fp_text value 100K (at 0 0.127 180) (layer F.SilkS) + (effects (font (size 1.397 1.27) (thickness 0.2032))) + ) + (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032)) + (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032)) + (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032)) + (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032)) + (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032)) + (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032)) + (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032)) + (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032)) + (pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) + (net 3 "Net-(C2-Pad1)")) + (pad 2 thru_hole circle (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) + (net 1 GND)) + (model Discret.3dshapes/R3.wrl + (at (xyz 0 0 0)) + (scale (xyz 0.3 0.3 0.3)) + (rotate (xyz 0 0 0)) + ) + ) + + (module TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal (layer Composant) (tedit 5A082035) (tstamp 5A332F3A) + (at 145.542 131.191) + (descr "Terminal Block Phoenix MKDS-1,5-2, 2 pins, pitch 05mm, size 10.0x9.8mm^2, drill diamater 1.3mm, pad diameter 2.6mm, see http://www.farnell.com/datasheets/100425.pdf, script-generated using https://github.com/pointhi/kicad-footprint-generator/scripts/TerminalBlock_Phoenix") + (tags "THT Terminal Block Phoenix MKDS-1.5-2 pitch 05mm size 10.0x9.8mm^2 drill 1.3mm pad 2.6mm") + (path /456A8ACC) + (fp_text reference P4 (at 2.5 -6.26) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value CONN_2 (at 2.5 5.66) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text user %R (at 2.5 3.2) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start 8 -5.75) (end -3 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start 8 5.1) (end 8 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3 -5.75) (end -3 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12)) + (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12)) + (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12)) + (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12)) + (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1)) + (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1)) + (fp_arc (start 0 0) (end -0.684 1.535) (angle -25) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end -1.535 -0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 0.684 -1.535) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 1.535 0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 0 1.68) (angle -24) (layer F.SilkS) (width 0.12)) + (pad 2 thru_hole circle (at 5 0) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 7 "Net-(P4-Pad2)")) + (pad 1 thru_hole rect (at 0 0) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 6 "Net-(P4-Pad1)")) + (model ${KISYS3DMOD}/Terminal_Blocks.3dshapes/TerminalBlock_Pheonix_MKDS1.5-2pol.wrl + (offset (xyz 2.54 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal (layer Composant) (tedit 5A082035) (tstamp 5A332F0F) + (at 128.27 100.711 270) + (descr "Terminal Block Phoenix MKDS-1,5-2, 2 pins, pitch 05mm, size 10.0x9.8mm^2, drill diamater 1.3mm, pad diameter 2.6mm, see http://www.farnell.com/datasheets/100425.pdf, script-generated using https://github.com/pointhi/kicad-footprint-generator/scripts/TerminalBlock_Phoenix") + (tags "THT Terminal Block Phoenix MKDS-1.5-2 pitch 05mm size 10.0x9.8mm^2 drill 1.3mm pad 2.6mm") + (path /4549F4A5) + (fp_text reference P3 (at 2.5 -6.26 270) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value POWER (at 2.5 5.66 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_arc (start 0 0) (end 0 1.68) (angle -24) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 1.535 0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 0.684 -1.535) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end -1.535 -0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end -0.684 1.535) (angle -25) (layer F.SilkS) (width 0.12)) + (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1)) + (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1)) + (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12)) + (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start -3 -5.75) (end -3 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start 8 5.1) (end 8 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start 8 -5.75) (end -3 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_text user %R (at 2.5 3.2 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (pad 1 thru_hole rect (at 0 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 2 "Net-(C1-Pad1)")) + (pad 2 thru_hole circle (at 5 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 1 GND)) + (model ${KISYS3DMOD}/Terminal_Blocks.3dshapes/TerminalBlock_Pheonix_MKDS1.5-2pol.wrl + (offset (xyz 2.54 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal (layer Composant) (tedit 5A082035) (tstamp 5A332EE4) + (at 128.27 112.776 270) + (descr "Terminal Block Phoenix MKDS-1,5-2, 2 pins, pitch 05mm, size 10.0x9.8mm^2, drill diamater 1.3mm, pad diameter 2.6mm, see http://www.farnell.com/datasheets/100425.pdf, script-generated using https://github.com/pointhi/kicad-footprint-generator/scripts/TerminalBlock_Phoenix") + (tags "THT Terminal Block Phoenix MKDS-1.5-2 pitch 05mm size 10.0x9.8mm^2 drill 1.3mm pad 2.6mm") + (path /4549F46C) + (fp_text reference P2 (at 2.5 -6.26 270) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value OUT (at 2.5 5.66 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text user %R (at 2.5 3.2 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start 8 -5.75) (end -3 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start 8 5.1) (end 8 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3 -5.75) (end -3 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12)) + (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12)) + (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12)) + (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12)) + (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1)) + (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1)) + (fp_arc (start 0 0) (end -0.684 1.535) (angle -25) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end -1.535 -0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 0.684 -1.535) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 1.535 0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 0 1.68) (angle -24) (layer F.SilkS) (width 0.12)) + (pad 2 thru_hole circle (at 5 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 1 GND)) + (pad 1 thru_hole rect (at 0 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 3 "Net-(C2-Pad1)")) + (model ${KISYS3DMOD}/Terminal_Blocks.3dshapes/TerminalBlock_Pheonix_MKDS1.5-2pol.wrl + (offset (xyz 2.54 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal (layer Composant) (tedit 5A082035) (tstamp 5A332EB9) + (at 164.592 105.283 90) + (descr "Terminal Block Phoenix MKDS-1,5-2, 2 pins, pitch 05mm, size 10.0x9.8mm^2, drill diamater 1.3mm, pad diameter 2.6mm, see http://www.farnell.com/datasheets/100425.pdf, script-generated using https://github.com/pointhi/kicad-footprint-generator/scripts/TerminalBlock_Phoenix") + (tags "THT Terminal Block Phoenix MKDS-1.5-2 pitch 05mm size 10.0x9.8mm^2 drill 1.3mm pad 2.6mm") + (path /4549F464) + (fp_text reference P1 (at 2.5 -6.26 90) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value IN (at 2.5 5.66 90) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_arc (start 0 0) (end 0 1.68) (angle -24) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 1.535 0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end 0.684 -1.535) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end -1.535 -0.684) (angle -48) (layer F.SilkS) (width 0.12)) + (fp_arc (start 0 0) (end -0.684 1.535) (angle -25) (layer F.SilkS) (width 0.12)) + (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1)) + (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1)) + (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1)) + (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1)) + (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12)) + (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1)) + (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1)) + (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12)) + (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12)) + (fp_line (start -3 -5.75) (end -3 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05)) + (fp_line (start 8 5.1) (end 8 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_line (start 8 -5.75) (end -3 -5.75) (layer F.CrtYd) (width 0.05)) + (fp_text user %R (at 2.5 3.2 90) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (pad 1 thru_hole rect (at 0 0 90) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 1 GND)) + (pad 2 thru_hole circle (at 5 0 90) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask) + (net 5 "Net-(P1-Pad2)")) + (model ${KISYS3DMOD}/Terminal_Blocks.3dshapes/TerminalBlock_Pheonix_MKDS1.5-2pol.wrl + (offset (xyz 2.54 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (module discret:C2V10 (layer Composant) (tedit 54A57B4C) (tstamp 54A581E5) - (at 138.43 98.425 90) + (at 139.446 97.282 90) (descr "Condensateur polarise") (tags CP) (path /4549F4BE) @@ -169,114 +497,6 @@ ) ) - (module connect:bornier2 (layer Composant) (tedit 54A588D7) (tstamp 54A581EF) - (at 164.465 110.49 270) - (descr "Bornier d'alimentation 2 pins") - (tags DEV) - (path /4549F464) - (fp_text reference P1 (at -6.05 -0.775) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_text value IN (at 0 5 270) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole rect (at -2 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (pad 2 thru_hole circle (at 2 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 5 "Net-(P1-Pad2)")) - (model Connect.3dshapes/bornier2.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (module connect:bornier2 (layer Composant) (tedit 54A588C9) (tstamp 54A581F4) - (at 128.27 116.84 90) - (descr "Bornier d'alimentation 2 pins") - (tags DEV) - (path /4549F46C) - (fp_text reference P2 (at 5.81 0.14) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_text value OUT (at 0 5 90) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole rect (at -2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 3 "Net-(C2-Pad1)")) - (pad 2 thru_hole circle (at 2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (model Connect.3dshapes/bornier2.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (module connect:bornier2 (layer Composant) (tedit 54A588D1) (tstamp 54A581F9) - (at 128.27 102.87 90) - (descr "Bornier d'alimentation 2 pins") - (tags DEV) - (path /4549F4A5) - (fp_text reference P3 (at -6.1 0.09) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_text value POWER (at 0 5 90) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole rect (at -2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 2 "Net-(C1-Pad1)")) - (pad 2 thru_hole circle (at 2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (model Connect.3dshapes/bornier2.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (module connect:bornier2 (layer Composant) (tedit 54A58902) (tstamp 54A581FE) - (at 147.955 129.54 180) - (descr "Bornier d'alimentation 2 pins") - (tags DEV) - (path /456A8ACC) - (fp_text reference P4 (at 6.605 0.46) (layer F.SilkS) - (effects (font (thickness 0.15))) - ) - (fp_text value CONN_2 (at -8.509 -0.254) (layer F.SilkS) hide - (effects (font (thickness 0.15))) - ) - (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15)) - (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole rect (at -2 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 6 "Net-(P4-Pad1)")) - (pad 2 thru_hole circle (at 2 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS) - (net 7 "Net-(P4-Pad2)")) - (model Connect.3dshapes/bornier2.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - (module connect:1pin (layer Composant) (tedit 54A588DF) (tstamp 54A58203) (at 127 93.98) (descr "module 1 pin (ou trou mecanique de percage)") @@ -310,7 +530,7 @@ ) (module connect:1pin (layer Composant) (tedit 54A588EE) (tstamp 54A5820B) - (at 165.1 129.54) + (at 165.1 133.731) (descr "module 1 pin (ou trou mecanique de percage)") (tags DEV) (path /54A58C8A) @@ -326,7 +546,7 @@ ) (module connect:1pin (layer Composant) (tedit 54A588F3) (tstamp 54A5820F) - (at 127 129.54) + (at 127 133.731) (descr "module 1 pin (ou trou mecanique de percage)") (tags DEV) (path /54A58CA3) @@ -373,7 +593,7 @@ ) (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A58218) - (at 149.86 97.79 180) + (at 151.257 97.79 180) (descr "Resitance 3 pas") (tags R) (path /4549F39D) @@ -403,37 +623,6 @@ ) ) - (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A5821D) - (at 133.985 122.555 90) - (descr "Resitance 3 pas") - (tags R) - (path /4549F3AD) - (autoplace_cost180 10) - (fp_text reference R3 (at 0 0.127 90) (layer F.SilkS) hide - (effects (font (size 1.397 1.27) (thickness 0.2032))) - ) - (fp_text value 100K (at 0 0.127 90) (layer F.SilkS) - (effects (font (size 1.397 1.27) (thickness 0.2032))) - ) - (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032)) - (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032)) - (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032)) - (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032)) - (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032)) - (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032)) - (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032)) - (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032)) - (pad 1 thru_hole circle (at -3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 3 "Net-(C2-Pad1)")) - (pad 2 thru_hole circle (at 3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (model Discret.3dshapes/R3.wrl - (at (xyz 0 0 0)) - (scale (xyz 0.3 0.3 0.3)) - (rotate (xyz 0 0 0)) - ) - ) - (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A58222) (at 164.465 121.285 270) (descr "Resitance 3 pas") @@ -465,103 +654,77 @@ ) ) - (module Valves:VALVE-ECC-83-1 (layer Composant) (tedit 54A57B25) (tstamp 54A58227) - (at 149.225 113.665) - (path /48B4F266) - (fp_text reference U1 (at 1.27 -11.43) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) - ) - (fp_text value ECC83 (at 0 11.43) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) - ) - (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole circle (at 3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 8 "Net-(R1-Pad1)")) - (pad 2 thru_hole circle (at 5.60832 1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 5 "Net-(P1-Pad2)")) - (pad 3 thru_hole circle (at 5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 9 "Net-(R2-Pad1)")) - (pad 4 thru_hole circle (at 3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 6 "Net-(P4-Pad1)")) - (pad 5 thru_hole circle (at 0 -5.8928) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 6 "Net-(P4-Pad1)")) - (pad 6 thru_hole circle (at -3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 2 "Net-(C1-Pad1)")) - (pad 7 thru_hole circle (at -5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 8 "Net-(R1-Pad1)")) - (pad 8 thru_hole circle (at -5.60832 1.78816) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 4 "Net-(C2-Pad2)")) - (pad 9 thru_hole circle (at -3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 7 "Net-(P4-Pad2)")) - (model Valves.3dshapes/VALVE-ECC-83-1.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (gr_line (start 123.825 132.715) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.127)) + (gr_line (start 123.825 136.525) (end 168.275 136.525) (angle 90) (layer Edge.Cuts) (width 0.127)) (gr_line (start 168.275 90.805) (end 123.825 90.805) (angle 90) (layer Edge.Cuts) (width 0.127)) - (gr_line (start 168.275 90.805) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.127)) - (gr_line (start 123.825 90.805) (end 123.825 132.715) (angle 90) (layer Edge.Cuts) (width 0.127)) + (gr_line (start 168.275 90.805) (end 168.275 136.525) (angle 90) (layer Edge.Cuts) (width 0.127) (tstamp 5A3345B3)) + (gr_line (start 123.825 90.805) (end 123.825 136.525) (angle 90) (layer Edge.Cuts) (width 0.127)) (segment (start 142.24 95.25) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1)) (segment (start 164.465 125.095) (end 164.465 124.46) (width 0.8636) (layer Cuivre) (net 1) (status 800)) - (segment (start 146.05 97.79) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1)) + (segment (start 147.447 97.79) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 10)) (segment (start 139.065 95.25) (end 142.24 95.25) (width 0.8636) (layer Cuivre) (net 1)) - (segment (start 138.43 95.885) (end 139.065 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 800)) - (segment (start 164.465 107.95) (end 165.735 107.95) (width 0.8636) (layer Cuivre) (net 1) (status 800)) - (segment (start 136.525 100.965) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2)) - (segment (start 138.43 100.965) (end 136.525 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 800)) - (segment (start 145.7706 103.8606) (end 142.875 100.965) (width 0.8636) (layer Cuivre) (net 2)) - (segment (start 142.875 100.965) (end 138.43 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 400)) - (segment (start 145.7706 108.91012) (end 145.7706 103.8606) (width 0.8636) (layer Cuivre) (net 2) (status 800)) - (segment (start 132.08 105.41) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2)) - (segment (start 128.27 105.41) (end 132.08 105.41) (width 0.8636) (layer Cuivre) (net 2) (status 800)) + (segment (start 139.446 94.742) (end 139.065 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 810)) + (segment (start 139.446 99.822) (end 129.159 99.822) (width 0.8636) (layer Cuivre) (net 2)) + (segment (start 129.159 99.822) (end 128.27 100.711) (width 0.8636) (layer Cuivre) (net 2)) + (segment (start 145.7706 108.91012) (end 145.7706 103.8606) (width 0.8636) (layer Cuivre) (net 2)) + (segment (start 145.7706 103.8606) (end 141.732 99.822) (width 0.8636) (layer Cuivre) (net 2)) + (segment (start 141.732 99.822) (end 139.446 99.822) (width 0.8636) (layer Cuivre) (net 2)) + (segment (start 132.08 121.059172) (end 132.08 114.4224) (width 0.8636) (layer Cuivre) (net 3)) + (segment (start 132.08 114.4224) (end 130.4336 112.776) (width 0.8636) (layer Cuivre) (net 3)) + (segment (start 130.4336 112.776) (end 128.27 112.776) (width 0.8636) (layer Cuivre) (net 3)) + (segment (start 133.858 123.825) (end 133.858 122.837172) (width 0.8636) (layer Cuivre) (net 3)) + (segment (start 133.858 122.837172) (end 132.08 121.059172) (width 0.8636) (layer Cuivre) (net 3)) + (segment (start 133.985 125.095) (end 133.858 124.968) (width 0.8636) (layer Cuivre) (net 3)) + (segment (start 133.858 124.968) (end 133.858 123.825) (width 0.8636) (layer Cuivre) (net 3)) (segment (start 137.16 125.095) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3)) - (segment (start 133.985 126.365) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3)) - (segment (start 133.985 125.095) (end 128.27 119.38) (width 0.8636) (layer Cuivre) (net 3)) (segment (start 137.16 120.015) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4)) (segment (start 135.89 115.57) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4)) (segment (start 137.16 115.57) (end 143.49984 115.57) (width 0.8636) (layer Cuivre) (net 4)) (segment (start 143.49984 115.57) (end 143.61668 115.45316) (width 0.8636) (layer Cuivre) (net 4)) + (segment (start 162.450001 101.582999) (end 161.417 102.616) (width 0.8636) (layer Cuivre) (net 5)) + (segment (start 161.417 102.616) (end 161.417 106.506) (width 0.8636) (layer Cuivre) (net 5)) + (segment (start 164.592 100.283) (end 163.292001 101.582999) (width 0.8636) (layer Cuivre) (net 5)) + (segment (start 163.292001 101.582999) (end 162.450001 101.582999) (width 0.8636) (layer Cuivre) (net 5)) + (segment (start 161.417 106.506) (end 161.417 111.4806) (width 0.8636) (layer Cuivre) (net 5)) + (segment (start 161.417 111.4806) (end 157.4038 115.4938) (width 0.8636) (layer Cuivre) (net 5)) (segment (start 159.385 117.475) (end 164.465 117.475) (width 0.8636) (layer Cuivre) (net 5) (status 400)) (segment (start 154.83332 115.4938) (end 157.4038 115.4938) (width 0.8636) (layer Cuivre) (net 5) (status 800)) - (segment (start 164.465 117.475) (end 164.465 113.03) (width 0.8636) (layer Cuivre) (net 5) (status C00)) (segment (start 157.4038 115.4938) (end 159.385 117.475) (width 0.8636) (layer Cuivre) (net 5)) - (segment (start 149.86 128.905) (end 150.495 129.54) (width 0.8636) (layer Cuivre) (net 6) (status 400)) - (segment (start 149.86 111.125) (end 149.86 128.905) (width 0.8636) (layer Cuivre) (net 6)) - (segment (start 149.225 110.49) (end 149.86 111.125) (width 0.8636) (layer Cuivre) (net 6)) - (segment (start 149.225 107.7722) (end 151.54148 107.7722) (width 0.8636) (layer Cuivre) (net 6) (status 800)) - (segment (start 151.54148 107.7722) (end 152.6794 108.91012) (width 0.8636) (layer Cuivre) (net 6) (status 400)) - (segment (start 149.225 107.7722) (end 149.225 110.49) (width 0.8636) (layer Cuivre) (net 6) (status 800)) - (segment (start 145.7706 129.1844) (end 145.415 129.54) (width 0.8636) (layer Cuivre) (net 7) (status 400)) - (segment (start 145.7706 118.41988) (end 145.7706 129.1844) (width 0.8636) (layer Cuivre) (net 7) (status 800)) - (segment (start 153.289 131.826) (end 154.94 130.175) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 140.716 131.826) (end 153.289 131.826) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 145.7706 118.41988) (end 145.7706 124.587) (width 0.8636) (layer Cuivre) (net 6)) + (segment (start 145.7706 124.587) (end 145.7706 126.492) (width 0.8636) (layer Cuivre) (net 6)) + (segment (start 149.86 111.125) (end 149.86 124.841) (width 0.8636) (layer Cuivre) (net 7)) + (segment (start 150.542 131.191) (end 150.542 125.523) (width 0.8636) (layer Cuivre) (net 7)) + (segment (start 150.542 125.523) (end 149.86 124.841) (width 0.8636) (layer Cuivre) (net 7)) + (segment (start 149.225 110.49) (end 149.86 111.125) (width 0.8636) (layer Cuivre) (net 7)) + (segment (start 149.225 107.7722) (end 149.225 110.49) (width 0.8636) (layer Cuivre) (net 7) (status 800)) + (segment (start 145.368 129.54) (end 145.368 127.701523) (width 0.8636) (layer Cuivre) (net 6)) + (segment (start 145.368 127.701523) (end 145.7706 127.298923) (width 0.8636) (layer Cuivre) (net 6)) + (segment (start 145.7706 127.298923) (end 145.7706 126.492) (width 0.8636) (layer Cuivre) (net 6)) + (segment (start 149.225 107.7722) (end 151.54148 107.7722) (width 0.8636) (layer Cuivre) (net 7) (status 800)) + (segment (start 151.54148 107.7722) (end 152.6794 108.91012) (width 0.8636) (layer Cuivre) (net 7) (status 400)) + (segment (start 139.065 132.240853) (end 140.879459 134.055312) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 135.509 121.031) (end 136.398 121.92) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 139.065 124.46) (end 139.065 132.240853) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 135.89 107.95) (end 135.255 107.95) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 136.525 121.92) (end 139.065 124.46) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 135.255 107.95) (end 133.985 109.22) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 136.398 121.92) (end 136.525 121.92) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 135.509 117.729) (end 135.509 121.031) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 133.985 109.22) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 133.985 116.205) (end 135.509 117.729) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 140.879459 134.055312) (end 152.250834 134.055312) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 152.250834 134.055312) (end 154.94 131.366146) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 154.94 131.366146) (end 154.94 120.68048) (width 0.8636) (layer Cuivre) (net 8)) + (segment (start 154.94 120.68048) (end 152.6794 118.41988) (width 0.8636) (layer Cuivre) (net 8)) (segment (start 143.61668 111.8362) (end 141.6812 111.8362) (width 0.8636) (layer Cuivre) (net 8) (status 800)) (segment (start 141.6812 111.8362) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 154.94 121.31548) (end 154.94 120.68048) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 154.94 120.68048) (end 152.6794 118.41988) (width 0.8636) (layer Cuivre) (net 8) (status 400)) - (segment (start 136.398 121.92) (end 135.509 121.031) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 135.509 121.031) (end 135.509 117.729) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 135.509 117.729) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 136.525 121.92) (end 136.398 121.92) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 136.525 121.92) (end 139.065 124.46) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 139.065 124.46) (end 139.065 130.175) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 139.065 130.175) (end 140.335 131.445) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 135.89 107.95) (end 135.255 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800)) - (segment (start 133.985 109.22) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 135.255 107.95) (end 133.985 109.22) (width 0.8636) (layer Cuivre) (net 8)) (segment (start 135.89 107.95) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800)) - (segment (start 140.335 131.445) (end 140.716 131.826) (width 0.8636) (layer Cuivre) (net 8)) (segment (start 154.94 121.31548) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8)) - (segment (start 154.94 130.175) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8)) (segment (start 154.83332 111.8362) (end 154.83332 111.23168) (width 0.8636) (layer Cuivre) (net 9) (status 800)) (segment (start 159.385 106.68) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9)) (segment (start 154.83332 111.23168) (end 159.385 106.68) (width 0.8636) (layer Cuivre) (net 9)) (segment (start 157.48 97.79) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9)) - (segment (start 153.67 97.79) (end 157.48 97.79) (width 0.8636) (layer Cuivre) (net 9) (status 800)) + (segment (start 155.067 97.79) (end 157.48 97.79) (width 0.8636) (layer Cuivre) (net 9) (status 810)) (zone (net 1) (net_name GND) (layer Cuivre) (tstamp 4EED97A2) (hatch edge 0.508) (connect_pads (clearance 0.635)) @@ -569,7 +732,7 @@ (fill yes (arc_segments 32) (thermal_gap 0.254) (thermal_bridge_width 0.50038)) (polygon (pts - (xy 167.64 132.08) (xy 167.64 91.44) (xy 124.46 91.44) (xy 124.46 132.08) + (xy 167.513 136.525) (xy 167.894 91.313) (xy 124.714 91.313) (xy 124.333 136.525) ) ) (filled_polygon @@ -577,80 +740,179 @@ (xy 163.320965 91.767326) (xy 162.925069 92.155016) (xy 162.612015 92.612219) (xy 162.393729 93.12152) (xy 162.278523 93.663521) (xy 162.270786 94.217576) (xy 162.370814 94.762582) (xy 162.574795 95.277779) (xy 162.87496 95.743545) (xy 163.259877 96.142137) (xy 163.714883 96.458375) (xy 164.222648 96.680212) (xy 164.763831 96.799199) (xy 165.317818 96.810803) (xy 165.863509 96.714583) - (xy 166.380118 96.514204) (xy 166.847968 96.217297) (xy 167.249238 95.835173) (xy 167.386 95.641301) (xy 167.386 127.8747) - (xy 167.3002 127.745561) (xy 166.909756 127.352381) (xy 166.450378 127.042527) (xy 165.939566 126.827801) (xy 165.396774 126.716382) - (xy 164.842679 126.712514) (xy 164.298384 126.816344) (xy 163.784623 127.023916) (xy 163.320965 127.327326) (xy 162.925069 127.715016) - (xy 162.612015 128.172219) (xy 162.393729 128.68152) (xy 162.278523 129.223521) (xy 162.270786 129.777576) (xy 162.370814 130.322582) - (xy 162.574795 130.837779) (xy 162.87496 131.303545) (xy 163.259877 131.702137) (xy 163.438092 131.826) (xy 155.067091 131.826) - (xy 155.829046 131.064045) (xy 155.902757 130.974307) (xy 155.977415 130.885333) (xy 155.9806 130.87954) (xy 155.984797 130.87443) - (xy 156.039691 130.772054) (xy 156.095629 130.670303) (xy 156.097627 130.664003) (xy 156.100753 130.658174) (xy 156.13472 130.547073) - (xy 156.169825 130.436407) (xy 156.170562 130.429838) (xy 156.172495 130.423515) (xy 156.184237 130.307918) (xy 156.197177 130.192555) - (xy 156.197267 130.179639) (xy 156.197293 130.179388) (xy 156.197271 130.179154) (xy 156.1973 130.175) (xy 156.1973 125.869548) - (xy 163.774867 125.869548) (xy 163.839114 126.058009) (xy 164.039013 126.16161) (xy 164.255283 126.224221) (xy 164.479613 126.243438) - (xy 164.703382 126.21852) (xy 164.91799 126.150426) (xy 165.090886 126.058009) (xy 165.155133 125.869548) (xy 164.465 125.179414) - (xy 163.774867 125.869548) (xy 156.1973 125.869548) (xy 156.1973 125.109613) (xy 163.316562 125.109613) (xy 163.34148 125.333382) - (xy 163.409574 125.54799) (xy 163.501991 125.720886) (xy 163.690452 125.785133) (xy 164.380586 125.095) (xy 164.549414 125.095) - (xy 165.239548 125.785133) (xy 165.428009 125.720886) (xy 165.53161 125.520987) (xy 165.594221 125.304717) (xy 165.613438 125.080387) - (xy 165.58852 124.856618) (xy 165.520426 124.64201) (xy 165.428009 124.469114) (xy 165.239548 124.404867) (xy 164.549414 125.095) - (xy 164.380586 125.095) (xy 163.690452 124.404867) (xy 163.501991 124.469114) (xy 163.39839 124.669013) (xy 163.335779 124.885283) - (xy 163.316562 125.109613) (xy 156.1973 125.109613) (xy 156.1973 124.320452) (xy 163.774867 124.320452) (xy 164.465 125.010586) - (xy 165.155133 124.320452) (xy 165.090886 124.131991) (xy 164.890987 124.02839) (xy 164.674717 123.965779) (xy 164.450387 123.946562) - (xy 164.226618 123.97148) (xy 164.01201 124.039574) (xy 163.839114 124.131991) (xy 163.774867 124.320452) (xy 156.1973 124.320452) - (xy 156.1973 120.68048) (xy 156.185963 120.564858) (xy 156.175844 120.449198) (xy 156.174001 120.442853) (xy 156.173355 120.436269) - (xy 156.139771 120.325033) (xy 156.107385 120.213559) (xy 156.104344 120.207692) (xy 156.102432 120.20136) (xy 156.04789 120.098782) - (xy 155.99446 119.995705) (xy 155.990336 119.990539) (xy 155.987232 119.984701) (xy 155.913817 119.894685) (xy 155.841372 119.803935) - (xy 155.832301 119.794737) (xy 155.832143 119.794543) (xy 155.831964 119.794395) (xy 155.829045 119.791435) (xy 154.517618 118.480008) - (xy 154.520979 118.239312) (xy 154.450834 117.885053) (xy 154.313215 117.551165) (xy 154.113365 117.250367) (xy 154.005587 117.141833) - (xy 154.261512 117.253644) (xy 154.614224 117.331193) (xy 154.975282 117.338756) (xy 155.330932 117.276046) (xy 155.667628 117.14545) - (xy 155.972546 116.951943) (xy 156.183452 116.7511) (xy 156.88301 116.7511) (xy 158.495955 118.364045) (xy 158.585663 118.437732) - (xy 158.674667 118.512415) (xy 158.680461 118.5156) (xy 158.68557 118.519797) (xy 158.787946 118.574691) (xy 158.889697 118.630629) - (xy 158.895997 118.632627) (xy 158.901826 118.635753) (xy 159.012927 118.66972) (xy 159.123593 118.704825) (xy 159.130162 118.705562) - (xy 159.136485 118.707495) (xy 159.252037 118.719232) (xy 159.367445 118.732177) (xy 159.380371 118.732268) (xy 159.380612 118.732292) - (xy 159.380836 118.732271) (xy 159.385 118.7323) (xy 163.603562 118.7323) (xy 163.717904 118.81177) (xy 163.991779 118.931423) - (xy 164.283679 118.995602) (xy 164.582486 119.001861) (xy 164.876817 118.949962) (xy 165.155462 118.841883) (xy 165.407808 118.681739) - (xy 165.624243 118.475631) (xy 165.796522 118.23141) (xy 165.918084 117.958377) (xy 165.984299 117.666932) (xy 165.989065 117.325564) - (xy 165.931014 117.032384) (xy 165.817123 116.756063) (xy 165.7223 116.613343) (xy 165.7223 113.813608) (xy 165.853581 113.688591) - (xy 166.059943 113.396054) (xy 166.205555 113.069005) (xy 166.284869 112.719903) (xy 166.290578 112.311) (xy 166.221043 111.959819) - (xy 166.08462 111.628833) (xy 165.886506 111.330648) (xy 165.634248 111.076622) (xy 165.337453 110.876432) (xy 165.007427 110.737701) - (xy 164.65674 110.665716) (xy 164.29875 110.663216) (xy 163.947092 110.730299) (xy 163.615161 110.864408) (xy 163.3156 111.060435) - (xy 163.059819 111.310913) (xy 162.857562 111.606303) (xy 162.716531 111.935353) (xy 162.642099 112.285529) (xy 162.6371 112.643493) - (xy 162.701726 112.995611) (xy 162.833514 113.32847) (xy 163.027445 113.629392) (xy 163.2077 113.816052) (xy 163.2077 116.2177) - (xy 159.90579 116.2177) (xy 158.292845 114.604755) (xy 158.203137 114.531068) (xy 158.114133 114.456385) (xy 158.108339 114.4532) - (xy 158.10323 114.449003) (xy 158.000835 114.394099) (xy 157.899103 114.338171) (xy 157.892806 114.336173) (xy 157.886975 114.333047) - (xy 157.775858 114.299076) (xy 157.665207 114.263975) (xy 157.658638 114.263238) (xy 157.652315 114.261305) (xy 157.536763 114.249568) - (xy 157.421355 114.236623) (xy 157.408429 114.236532) (xy 157.408188 114.236508) (xy 157.407964 114.236529) (xy 157.4038 114.2365) - (xy 156.180109 114.2365) (xy 156.012816 114.068035) (xy 155.71342 113.866089) (xy 155.380501 113.726143) (xy 155.075367 113.663508) - (xy 155.330932 113.618446) (xy 155.667628 113.48785) (xy 155.972546 113.294343) (xy 156.234071 113.045296) (xy 156.442242 112.750195) - (xy 156.58913 112.42028) (xy 156.669139 112.068118) (xy 156.674899 111.655632) (xy 156.604754 111.301373) (xy 156.586355 111.256735) - (xy 159.182275 108.660815) (xy 163.0205 108.660815) (xy 163.0205 109.533779) (xy 163.037582 109.619655) (xy 163.071089 109.700549) - (xy 163.119734 109.773352) (xy 163.181647 109.835265) (xy 163.25445 109.883911) (xy 163.335344 109.917418) (xy 163.42122 109.9345) - (xy 164.294185 109.9345) (xy 164.40531 109.823375) (xy 164.40531 108.54969) (xy 164.52469 108.54969) (xy 164.52469 109.823375) - (xy 164.635815 109.9345) (xy 165.50878 109.9345) (xy 165.594656 109.917418) (xy 165.67555 109.883911) (xy 165.748353 109.835265) - (xy 165.810266 109.773352) (xy 165.858911 109.700549) (xy 165.892418 109.619655) (xy 165.9095 109.533779) (xy 165.9095 108.660815) - (xy 165.798375 108.54969) (xy 164.52469 108.54969) (xy 164.40531 108.54969) (xy 163.131625 108.54969) (xy 163.0205 108.660815) - (xy 159.182275 108.660815) (xy 160.274046 107.569045) (xy 160.347757 107.479307) (xy 160.375519 107.446221) (xy 163.0205 107.446221) - (xy 163.0205 108.319185) (xy 163.131625 108.43031) (xy 164.40531 108.43031) (xy 164.40531 107.156625) (xy 164.52469 107.156625) - (xy 164.52469 108.43031) (xy 165.798375 108.43031) (xy 165.9095 108.319185) (xy 165.9095 107.446221) (xy 165.892418 107.360345) - (xy 165.858911 107.279451) (xy 165.810266 107.206648) (xy 165.748353 107.144735) (xy 165.67555 107.096089) (xy 165.594656 107.062582) - (xy 165.50878 107.0455) (xy 164.635815 107.0455) (xy 164.52469 107.156625) (xy 164.40531 107.156625) (xy 164.294185 107.0455) - (xy 163.42122 107.0455) (xy 163.335344 107.062582) (xy 163.25445 107.096089) (xy 163.181647 107.144735) (xy 163.119734 107.206648) - (xy 163.071089 107.279451) (xy 163.037582 107.360345) (xy 163.0205 107.446221) (xy 160.375519 107.446221) (xy 160.422415 107.390333) - (xy 160.4256 107.38454) (xy 160.429797 107.37943) (xy 160.484691 107.277054) (xy 160.540629 107.175303) (xy 160.542627 107.169003) - (xy 160.545753 107.163174) (xy 160.57972 107.052073) (xy 160.614825 106.941407) (xy 160.615562 106.934838) (xy 160.617495 106.928515) - (xy 160.629237 106.812918) (xy 160.642177 106.697555) (xy 160.642267 106.684639) (xy 160.642293 106.684388) (xy 160.642271 106.684154) - (xy 160.6423 106.68) (xy 160.6423 99.695) (xy 160.630972 99.579473) (xy 160.620845 99.463718) (xy 160.619 99.457368) + (xy 166.380118 96.514204) (xy 166.847968 96.217297) (xy 167.249238 95.835173) (xy 167.386 95.641301) (xy 167.386 128.988908) + (xy 167.360397 132.027164) (xy 167.3002 131.936561) (xy 166.909756 131.543381) (xy 166.450378 131.233527) (xy 165.939566 131.018801) + (xy 165.396774 130.907382) (xy 164.842679 130.903514) (xy 164.298384 131.007344) (xy 163.784623 131.214916) (xy 163.320965 131.518326) + (xy 162.925069 131.906016) (xy 162.612015 132.363219) (xy 162.393729 132.87252) (xy 162.278523 133.414521) (xy 162.270786 133.968576) + (xy 162.370814 134.513582) (xy 162.574795 135.028779) (xy 162.87496 135.494545) (xy 163.011562 135.636) (xy 129.096914 135.636) + (xy 129.149238 135.586173) (xy 129.468645 135.133385) (xy 129.694021 134.627182) (xy 129.816783 134.086842) (xy 129.825621 133.453945) + (xy 129.717994 132.910389) (xy 129.506839 132.39809) (xy 129.2002 131.936561) (xy 128.809756 131.543381) (xy 128.350378 131.233527) + (xy 127.839566 131.018801) (xy 127.296774 130.907382) (xy 126.742679 130.903514) (xy 126.198384 131.007344) (xy 125.684623 131.214916) + (xy 125.220965 131.518326) (xy 124.825069 131.906016) (xy 124.714 132.068228) (xy 124.714 124.599548) (xy 125.547867 124.599548) + (xy 125.612114 124.788009) (xy 125.812013 124.89161) (xy 126.028283 124.954221) (xy 126.252613 124.973438) (xy 126.476382 124.94852) + (xy 126.69099 124.880426) (xy 126.863886 124.788009) (xy 126.928133 124.599548) (xy 126.238 123.909414) (xy 125.547867 124.599548) + (xy 124.714 124.599548) (xy 124.714 123.839613) (xy 125.089562 123.839613) (xy 125.11448 124.063382) (xy 125.182574 124.27799) + (xy 125.274991 124.450886) (xy 125.463452 124.515133) (xy 126.153586 123.825) (xy 126.322414 123.825) (xy 127.012548 124.515133) + (xy 127.201009 124.450886) (xy 127.30461 124.250987) (xy 127.367221 124.034717) (xy 127.386438 123.810387) (xy 127.36152 123.586618) + (xy 127.293426 123.37201) (xy 127.201009 123.199114) (xy 127.012548 123.134867) (xy 126.322414 123.825) (xy 126.153586 123.825) + (xy 125.463452 123.134867) (xy 125.274991 123.199114) (xy 125.17139 123.399013) (xy 125.108779 123.615283) (xy 125.089562 123.839613) + (xy 124.714 123.839613) (xy 124.714 123.050452) (xy 125.547867 123.050452) (xy 126.238 123.740586) (xy 126.928133 123.050452) + (xy 126.863886 122.861991) (xy 126.663987 122.75839) (xy 126.447717 122.695779) (xy 126.223387 122.676562) (xy 125.999618 122.70148) + (xy 125.78501 122.769574) (xy 125.612114 122.861991) (xy 125.547867 123.050452) (xy 124.714 123.050452) (xy 124.714 118.978379) + (xy 127.152035 118.978379) (xy 127.288535 119.228421) (xy 127.590747 119.391987) (xy 127.919061 119.493452) (xy 128.260863 119.528916) + (xy 128.603015 119.497017) (xy 128.93237 119.398979) (xy 129.236271 119.238572) (xy 129.251465 119.228421) (xy 129.387965 118.978379) + (xy 128.27 117.860414) (xy 127.152035 118.978379) (xy 124.714 118.978379) (xy 124.714 117.766863) (xy 126.517084 117.766863) + (xy 126.548983 118.109015) (xy 126.647021 118.43837) (xy 126.807428 118.742271) (xy 126.817579 118.757465) (xy 127.067621 118.893965) + (xy 128.185586 117.776) (xy 128.354414 117.776) (xy 129.472379 118.893965) (xy 129.722421 118.757465) (xy 129.885987 118.455253) + (xy 129.987452 118.126939) (xy 130.022916 117.785137) (xy 129.991017 117.442985) (xy 129.892979 117.11363) (xy 129.732572 116.809729) + (xy 129.722421 116.794535) (xy 129.472379 116.658035) (xy 128.354414 117.776) (xy 128.185586 117.776) (xy 127.067621 116.658035) + (xy 126.817579 116.794535) (xy 126.654013 117.096747) (xy 126.552548 117.425061) (xy 126.517084 117.766863) (xy 124.714 117.766863) + (xy 124.714 116.573621) (xy 127.152035 116.573621) (xy 128.27 117.691586) (xy 129.387965 116.573621) (xy 129.251465 116.323579) + (xy 128.949253 116.160013) (xy 128.620939 116.058548) (xy 128.279137 116.023084) (xy 127.936985 116.054983) (xy 127.60763 116.153021) + (xy 127.303729 116.313428) (xy 127.288535 116.323579) (xy 127.152035 116.573621) (xy 124.714 116.573621) (xy 124.714 113.919771) + (xy 124.773042 106.913379) (xy 127.152035 106.913379) (xy 127.288535 107.163421) (xy 127.590747 107.326987) (xy 127.919061 107.428452) + (xy 128.260863 107.463916) (xy 128.603015 107.432017) (xy 128.93237 107.333979) (xy 129.236271 107.173572) (xy 129.251465 107.163421) + (xy 129.387965 106.913379) (xy 128.27 105.795414) (xy 127.152035 106.913379) (xy 124.773042 106.913379) (xy 124.783252 105.701863) + (xy 126.517084 105.701863) (xy 126.548983 106.044015) (xy 126.647021 106.37337) (xy 126.807428 106.677271) (xy 126.817579 106.692465) + (xy 127.067621 106.828965) (xy 128.185586 105.711) (xy 128.354414 105.711) (xy 129.472379 106.828965) (xy 129.722421 106.692465) + (xy 129.885987 106.390253) (xy 129.987452 106.061939) (xy 130.022916 105.720137) (xy 129.991017 105.377985) (xy 129.892979 105.04863) + (xy 129.732572 104.744729) (xy 129.722421 104.729535) (xy 129.472379 104.593035) (xy 128.354414 105.711) (xy 128.185586 105.711) + (xy 127.067621 104.593035) (xy 126.817579 104.729535) (xy 126.654013 105.031747) (xy 126.552548 105.360061) (xy 126.517084 105.701863) + (xy 124.783252 105.701863) (xy 124.793307 104.508621) (xy 127.152035 104.508621) (xy 128.27 105.626586) (xy 129.387965 104.508621) + (xy 129.251465 104.258579) (xy 128.949253 104.095013) (xy 128.620939 103.993548) (xy 128.279137 103.958084) (xy 127.936985 103.989983) + (xy 127.60763 104.088021) (xy 127.303729 104.248428) (xy 127.288535 104.258579) (xy 127.152035 104.508621) (xy 124.793307 104.508621) + (xy 124.836265 99.411) (xy 126.140506 99.411) (xy 126.140506 102.011) (xy 126.156444 102.172826) (xy 126.203647 102.328434) + (xy 126.280301 102.471842) (xy 126.383459 102.597541) (xy 126.509158 102.700699) (xy 126.652566 102.777353) (xy 126.808174 102.824556) + (xy 126.97 102.840494) (xy 129.57 102.840494) (xy 129.731826 102.824556) (xy 129.887434 102.777353) (xy 130.030842 102.700699) + (xy 130.156541 102.597541) (xy 130.259699 102.471842) (xy 130.336353 102.328434) (xy 130.383556 102.172826) (xy 130.399494 102.011) + (xy 130.399494 101.0793) (xy 137.817836 101.0793) (xy 137.867301 101.171842) (xy 137.970459 101.297541) (xy 138.096158 101.400699) + (xy 138.239566 101.477353) (xy 138.395174 101.524556) (xy 138.557 101.540494) (xy 140.335 101.540494) (xy 140.496826 101.524556) + (xy 140.652434 101.477353) (xy 140.795842 101.400699) (xy 140.921541 101.297541) (xy 141.024699 101.171842) (xy 141.074164 101.0793) + (xy 141.21121 101.0793) (xy 144.5133 104.38139) (xy 144.5133 107.563823) (xy 144.353104 107.720699) (xy 144.149073 108.018678) + (xy 144.006806 108.350612) (xy 143.931722 108.703857) (xy 143.92668 109.064958) (xy 143.991872 109.420162) (xy 144.124815 109.755939) + (xy 144.320446 110.059498) (xy 144.442147 110.185523) (xy 144.163861 110.068543) (xy 143.810101 109.995927) (xy 143.448973 109.993406) + (xy 143.094233 110.061076) (xy 142.759392 110.19636) (xy 142.457206 110.394105) (xy 142.2685 110.5789) (xy 142.201991 110.5789) + (xy 138.684045 107.060955) (xy 138.594337 106.987268) (xy 138.505333 106.912585) (xy 138.499539 106.9094) (xy 138.49443 106.905203) + (xy 138.392035 106.850299) (xy 138.290303 106.794371) (xy 138.284006 106.792373) (xy 138.278175 106.789247) (xy 138.167058 106.755276) + (xy 138.056407 106.720175) (xy 138.049838 106.719438) (xy 138.043515 106.717505) (xy 137.927963 106.705768) (xy 137.812555 106.692823) + (xy 137.799629 106.692732) (xy 137.799388 106.692708) (xy 137.799164 106.692729) (xy 137.795 106.6927) (xy 136.75145 106.6927) + (xy 136.618359 106.602929) (xy 136.34284 106.487112) (xy 136.050072 106.427015) (xy 135.751208 106.424929) (xy 135.45763 106.480932) + (xy 135.18052 106.592891) (xy 134.974799 106.727511) (xy 134.899553 106.750229) (xy 134.788079 106.782615) (xy 134.782212 106.785656) + (xy 134.77588 106.787568) (xy 134.673302 106.84211) (xy 134.570225 106.89554) (xy 134.565059 106.899664) (xy 134.559221 106.902768) + (xy 134.469175 106.976208) (xy 134.378455 107.048629) (xy 134.369254 107.057701) (xy 134.369063 107.057857) (xy 134.368917 107.058033) + (xy 134.365954 107.060955) (xy 133.095955 108.330955) (xy 133.022268 108.420663) (xy 132.947585 108.509667) (xy 132.9444 108.515461) + (xy 132.940203 108.52057) (xy 132.885299 108.622965) (xy 132.829371 108.724697) (xy 132.827373 108.730994) (xy 132.824247 108.736825) + (xy 132.790276 108.847942) (xy 132.755175 108.958593) (xy 132.754438 108.965162) (xy 132.752505 108.971485) (xy 132.740768 109.087037) + (xy 132.727823 109.202445) (xy 132.727732 109.215371) (xy 132.727708 109.215612) (xy 132.727729 109.215836) (xy 132.7277 109.22) + (xy 132.7277 113.292009) (xy 131.322645 111.886955) (xy 131.232937 111.813268) (xy 131.143933 111.738585) (xy 131.138139 111.7354) + (xy 131.13303 111.731203) (xy 131.030635 111.676299) (xy 130.928903 111.620371) (xy 130.922606 111.618373) (xy 130.916775 111.615247) + (xy 130.805658 111.581276) (xy 130.695007 111.546175) (xy 130.688438 111.545438) (xy 130.682115 111.543505) (xy 130.566563 111.531768) + (xy 130.451155 111.518823) (xy 130.438229 111.518732) (xy 130.437988 111.518708) (xy 130.437764 111.518729) (xy 130.4336 111.5187) + (xy 130.399494 111.5187) (xy 130.399494 111.476) (xy 130.383556 111.314174) (xy 130.336353 111.158566) (xy 130.259699 111.015158) + (xy 130.156541 110.889459) (xy 130.030842 110.786301) (xy 129.887434 110.709647) (xy 129.731826 110.662444) (xy 129.57 110.646506) + (xy 126.97 110.646506) (xy 126.808174 110.662444) (xy 126.652566 110.709647) (xy 126.509158 110.786301) (xy 126.383459 110.889459) + (xy 126.280301 111.015158) (xy 126.203647 111.158566) (xy 126.156444 111.314174) (xy 126.140506 111.476) (xy 126.140506 114.076) + (xy 126.156444 114.237826) (xy 126.203647 114.393434) (xy 126.280301 114.536842) (xy 126.383459 114.662541) (xy 126.509158 114.765699) + (xy 126.652566 114.842353) (xy 126.808174 114.889556) (xy 126.97 114.905494) (xy 129.57 114.905494) (xy 129.731826 114.889556) + (xy 129.887434 114.842353) (xy 130.030842 114.765699) (xy 130.156541 114.662541) (xy 130.259699 114.536842) (xy 130.314266 114.434756) + (xy 130.8227 114.943191) (xy 130.8227 121.059172) (xy 130.834032 121.174749) (xy 130.844156 121.290454) (xy 130.845999 121.296799) + (xy 130.846645 121.303383) (xy 130.880229 121.414619) (xy 130.912615 121.526093) (xy 130.915656 121.53196) (xy 130.917568 121.538292) + (xy 130.97211 121.64087) (xy 131.02554 121.743947) (xy 131.029664 121.749113) (xy 131.032768 121.754951) (xy 131.106183 121.844967) + (xy 131.178628 121.935717) (xy 131.187699 121.944915) (xy 131.187857 121.945109) (xy 131.188036 121.945257) (xy 131.190955 121.948217) + (xy 132.460228 123.217491) (xy 132.398309 123.361959) (xy 132.33617 123.654299) (xy 132.331997 123.953142) (xy 132.385949 124.247104) + (xy 132.495971 124.524988) (xy 132.6007 124.687496) (xy 132.6007 124.968) (xy 132.612032 125.083577) (xy 132.622156 125.199282) + (xy 132.623999 125.205627) (xy 132.624645 125.212211) (xy 132.658229 125.323447) (xy 132.690615 125.434921) (xy 132.693656 125.440788) + (xy 132.695568 125.44712) (xy 132.75011 125.549698) (xy 132.80354 125.652775) (xy 132.807664 125.657941) (xy 132.810768 125.663779) + (xy 132.884183 125.753795) (xy 132.956628 125.844545) (xy 132.965699 125.853743) (xy 132.965857 125.853937) (xy 132.966036 125.854085) + (xy 132.968955 125.857045) (xy 133.095955 125.984045) (xy 133.185685 126.057751) (xy 133.274667 126.132415) (xy 133.280458 126.135598) + (xy 133.285569 126.139797) (xy 133.38795 126.194693) (xy 133.489697 126.250629) (xy 133.495999 126.252628) (xy 133.501825 126.255752) + (xy 133.612896 126.28971) (xy 133.723593 126.324825) (xy 133.730162 126.325562) (xy 133.736485 126.327495) (xy 133.852037 126.339232) + (xy 133.967445 126.352177) (xy 133.980371 126.352268) (xy 133.980612 126.352292) (xy 133.980836 126.352271) (xy 133.985 126.3523) + (xy 136.298562 126.3523) (xy 136.412904 126.43177) (xy 136.686779 126.551423) (xy 136.978679 126.615602) (xy 137.277486 126.621861) + (xy 137.571817 126.569962) (xy 137.8077 126.478469) (xy 137.8077 132.240853) (xy 137.819032 132.35643) (xy 137.829156 132.472135) + (xy 137.830999 132.47848) (xy 137.831645 132.485064) (xy 137.865229 132.5963) (xy 137.897615 132.707774) (xy 137.900656 132.713641) + (xy 137.902568 132.719973) (xy 137.95711 132.822551) (xy 138.01054 132.925628) (xy 138.014664 132.930794) (xy 138.017768 132.936632) + (xy 138.091183 133.026648) (xy 138.163628 133.117398) (xy 138.172699 133.126596) (xy 138.172857 133.12679) (xy 138.173036 133.126938) + (xy 138.175955 133.129898) (xy 139.990414 134.944358) (xy 140.080152 135.018069) (xy 140.169126 135.092727) (xy 140.174919 135.095912) + (xy 140.180029 135.100109) (xy 140.282405 135.155003) (xy 140.384156 135.210941) (xy 140.390456 135.212939) (xy 140.396285 135.216065) + (xy 140.507374 135.250028) (xy 140.618052 135.285137) (xy 140.624622 135.285874) (xy 140.630945 135.287807) (xy 140.746536 135.299549) + (xy 140.861904 135.312489) (xy 140.87482 135.312579) (xy 140.875071 135.312605) (xy 140.875305 135.312583) (xy 140.879459 135.312612) + (xy 152.250834 135.312612) (xy 152.366411 135.30128) (xy 152.482116 135.291156) (xy 152.488461 135.289313) (xy 152.495045 135.288667) + (xy 152.606281 135.255083) (xy 152.717755 135.222697) (xy 152.723622 135.219656) (xy 152.729954 135.217744) (xy 152.832532 135.163202) + (xy 152.935609 135.109772) (xy 152.940775 135.105648) (xy 152.946613 135.102544) (xy 153.036629 135.029129) (xy 153.127379 134.956684) + (xy 153.136577 134.947613) (xy 153.136771 134.947455) (xy 153.136919 134.947276) (xy 153.139879 134.944357) (xy 155.829045 132.255191) + (xy 155.902732 132.165483) (xy 155.977415 132.076479) (xy 155.9806 132.070685) (xy 155.984797 132.065576) (xy 156.039701 131.963181) + (xy 156.095629 131.861449) (xy 156.097627 131.855152) (xy 156.100753 131.849321) (xy 156.134724 131.738204) (xy 156.169825 131.627553) + (xy 156.170562 131.620984) (xy 156.172495 131.614661) (xy 156.184232 131.499109) (xy 156.197177 131.383701) (xy 156.197268 131.370775) + (xy 156.197292 131.370534) (xy 156.197271 131.37031) (xy 156.1973 131.366146) (xy 156.1973 125.869548) (xy 163.774867 125.869548) + (xy 163.839114 126.058009) (xy 164.039013 126.16161) (xy 164.255283 126.224221) (xy 164.479613 126.243438) (xy 164.703382 126.21852) + (xy 164.91799 126.150426) (xy 165.090886 126.058009) (xy 165.155133 125.869548) (xy 164.465 125.179414) (xy 163.774867 125.869548) + (xy 156.1973 125.869548) (xy 156.1973 125.109613) (xy 163.316562 125.109613) (xy 163.34148 125.333382) (xy 163.409574 125.54799) + (xy 163.501991 125.720886) (xy 163.690452 125.785133) (xy 164.380586 125.095) (xy 164.549414 125.095) (xy 165.239548 125.785133) + (xy 165.428009 125.720886) (xy 165.53161 125.520987) (xy 165.594221 125.304717) (xy 165.613438 125.080387) (xy 165.58852 124.856618) + (xy 165.520426 124.64201) (xy 165.428009 124.469114) (xy 165.239548 124.404867) (xy 164.549414 125.095) (xy 164.380586 125.095) + (xy 163.690452 124.404867) (xy 163.501991 124.469114) (xy 163.39839 124.669013) (xy 163.335779 124.885283) (xy 163.316562 125.109613) + (xy 156.1973 125.109613) (xy 156.1973 124.320452) (xy 163.774867 124.320452) (xy 164.465 125.010586) (xy 165.155133 124.320452) + (xy 165.090886 124.131991) (xy 164.890987 124.02839) (xy 164.674717 123.965779) (xy 164.450387 123.946562) (xy 164.226618 123.97148) + (xy 164.01201 124.039574) (xy 163.839114 124.131991) (xy 163.774867 124.320452) (xy 156.1973 124.320452) (xy 156.1973 120.68048) + (xy 156.185963 120.564858) (xy 156.175844 120.449198) (xy 156.174001 120.442853) (xy 156.173355 120.436269) (xy 156.139771 120.325033) + (xy 156.107385 120.213559) (xy 156.104344 120.207692) (xy 156.102432 120.20136) (xy 156.04789 120.098782) (xy 155.99446 119.995705) + (xy 155.990336 119.990539) (xy 155.987232 119.984701) (xy 155.913817 119.894685) (xy 155.841372 119.803935) (xy 155.832301 119.794737) + (xy 155.832143 119.794543) (xy 155.831964 119.794395) (xy 155.829045 119.791435) (xy 154.517618 118.480008) (xy 154.520979 118.239312) + (xy 154.450834 117.885053) (xy 154.313215 117.551165) (xy 154.113365 117.250367) (xy 154.005587 117.141833) (xy 154.261512 117.253644) + (xy 154.614224 117.331193) (xy 154.975282 117.338756) (xy 155.330932 117.276046) (xy 155.667628 117.14545) (xy 155.972546 116.951943) + (xy 156.183452 116.7511) (xy 156.88301 116.7511) (xy 158.495955 118.364045) (xy 158.585663 118.437732) (xy 158.674667 118.512415) + (xy 158.680461 118.5156) (xy 158.68557 118.519797) (xy 158.787946 118.574691) (xy 158.889697 118.630629) (xy 158.895997 118.632627) + (xy 158.901826 118.635753) (xy 159.012927 118.66972) (xy 159.123593 118.704825) (xy 159.130162 118.705562) (xy 159.136485 118.707495) + (xy 159.252037 118.719232) (xy 159.367445 118.732177) (xy 159.380371 118.732268) (xy 159.380612 118.732292) (xy 159.380836 118.732271) + (xy 159.385 118.7323) (xy 163.603562 118.7323) (xy 163.717904 118.81177) (xy 163.991779 118.931423) (xy 164.283679 118.995602) + (xy 164.582486 119.001861) (xy 164.876817 118.949962) (xy 165.155462 118.841883) (xy 165.407808 118.681739) (xy 165.624243 118.475631) + (xy 165.796522 118.23141) (xy 165.918084 117.958377) (xy 165.984299 117.666932) (xy 165.989065 117.325564) (xy 165.931014 117.032384) + (xy 165.817123 116.756063) (xy 165.65173 116.507127) (xy 165.441135 116.295056) (xy 165.193359 116.127929) (xy 164.91784 116.012112) + (xy 164.625072 115.952015) (xy 164.326208 115.949929) (xy 164.03263 116.005932) (xy 163.75552 116.117891) (xy 163.602996 116.2177) + (xy 159.90579 116.2177) (xy 159.18189 115.4938) (xy 162.306045 112.369645) (xy 162.379732 112.279937) (xy 162.454415 112.190933) + (xy 162.4576 112.185139) (xy 162.461797 112.18003) (xy 162.516691 112.077654) (xy 162.572629 111.975903) (xy 162.574627 111.969603) + (xy 162.577753 111.963774) (xy 162.61172 111.852673) (xy 162.646825 111.742007) (xy 162.647562 111.735438) (xy 162.649495 111.729115) + (xy 162.661237 111.613518) (xy 162.674177 111.498155) (xy 162.674267 111.485239) (xy 162.674293 111.484988) (xy 162.674271 111.484754) + (xy 162.6743 111.4806) (xy 162.6743 105.453815) (xy 162.8475 105.453815) (xy 162.8475 106.626779) (xy 162.864582 106.712655) + (xy 162.898089 106.793549) (xy 162.946734 106.866352) (xy 163.008647 106.928265) (xy 163.08145 106.976911) (xy 163.162344 107.010418) + (xy 163.24822 107.0275) (xy 164.421185 107.0275) (xy 164.53231 106.916375) (xy 164.53231 105.34269) (xy 164.65169 105.34269) + (xy 164.65169 106.916375) (xy 164.762815 107.0275) (xy 165.93578 107.0275) (xy 166.021656 107.010418) (xy 166.10255 106.976911) + (xy 166.175353 106.928265) (xy 166.237266 106.866352) (xy 166.285911 106.793549) (xy 166.319418 106.712655) (xy 166.3365 106.626779) + (xy 166.3365 105.453815) (xy 166.225375 105.34269) (xy 164.65169 105.34269) (xy 164.53231 105.34269) (xy 162.958625 105.34269) + (xy 162.8475 105.453815) (xy 162.6743 105.453815) (xy 162.6743 103.939221) (xy 162.8475 103.939221) (xy 162.8475 105.112185) + (xy 162.958625 105.22331) (xy 164.53231 105.22331) (xy 164.53231 103.649625) (xy 164.65169 103.649625) (xy 164.65169 105.22331) + (xy 166.225375 105.22331) (xy 166.3365 105.112185) (xy 166.3365 103.939221) (xy 166.319418 103.853345) (xy 166.285911 103.772451) + (xy 166.237266 103.699648) (xy 166.175353 103.637735) (xy 166.10255 103.589089) (xy 166.021656 103.555582) (xy 165.93578 103.5385) + (xy 164.762815 103.5385) (xy 164.65169 103.649625) (xy 164.53231 103.649625) (xy 164.421185 103.5385) (xy 163.24822 103.5385) + (xy 163.162344 103.555582) (xy 163.08145 103.589089) (xy 163.008647 103.637735) (xy 162.946734 103.699648) (xy 162.898089 103.772451) + (xy 162.864582 103.853345) (xy 162.8475 103.939221) (xy 162.6743 103.939221) (xy 162.6743 103.13679) (xy 162.970791 102.840299) + (xy 163.292001 102.840299) (xy 163.407578 102.828967) (xy 163.523283 102.818843) (xy 163.529628 102.817) (xy 163.536212 102.816354) + (xy 163.647448 102.78277) (xy 163.758922 102.750384) (xy 163.764789 102.747343) (xy 163.771121 102.745431) (xy 163.873699 102.690889) + (xy 163.976776 102.637459) (xy 163.981942 102.633335) (xy 163.98778 102.630231) (xy 164.077796 102.556816) (xy 164.168546 102.484371) + (xy 164.177744 102.4753) (xy 164.177938 102.475142) (xy 164.178086 102.474963) (xy 164.181046 102.472044) (xy 164.265513 102.387577) + (xy 164.339115 102.40376) (xy 164.755855 102.412489) (xy 165.166355 102.340107) (xy 165.554977 102.189371) (xy 165.90692 101.966021) + (xy 166.208778 101.678565) (xy 166.449053 101.337953) (xy 166.618594 100.957158) (xy 166.710943 100.550685) (xy 166.717591 100.074584) + (xy 166.636628 99.665691) (xy 166.477785 99.28031) (xy 166.247114 98.933122) (xy 165.9534 98.63735) (xy 165.607831 98.404261) + (xy 165.223569 98.242732) (xy 164.81525 98.158916) (xy 164.398428 98.156006) (xy 163.98898 98.234113) (xy 163.6025 98.390261) + (xy 163.25371 98.618502) (xy 162.955895 98.910145) (xy 162.720398 99.254078) (xy 162.556191 99.637203) (xy 162.469526 100.044926) + (xy 162.465605 100.325699) (xy 162.450001 100.325699) (xy 162.334424 100.337031) (xy 162.218719 100.347155) (xy 162.212374 100.348998) + (xy 162.20579 100.349644) (xy 162.094554 100.383228) (xy 161.98308 100.415614) (xy 161.977213 100.418655) (xy 161.970881 100.420567) + (xy 161.868303 100.475109) (xy 161.765226 100.528539) (xy 161.76006 100.532663) (xy 161.754222 100.535767) (xy 161.664206 100.609182) + (xy 161.573456 100.681627) (xy 161.564258 100.690698) (xy 161.564064 100.690856) (xy 161.563916 100.691035) (xy 161.560956 100.693954) + (xy 160.6423 101.61261) (xy 160.6423 99.695) (xy 160.630972 99.579473) (xy 160.620845 99.463718) (xy 160.619 99.457368) (xy 160.618355 99.450789) (xy 160.584784 99.339595) (xy 160.552385 99.228079) (xy 160.549344 99.222212) (xy 160.547432 99.21588) (xy 160.49289 99.113302) (xy 160.43946 99.010225) (xy 160.435336 99.005059) (xy 160.432232 98.999221) (xy 160.358817 98.909205) (xy 160.286372 98.818455) (xy 160.277301 98.809257) (xy 160.277143 98.809063) (xy 160.276964 98.808915) (xy 160.274045 98.805955) (xy 158.369045 96.900955) (xy 158.279337 96.827268) (xy 158.190333 96.752585) (xy 158.184539 96.7494) (xy 158.17943 96.745203) (xy 158.077035 96.690299) (xy 157.975303 96.634371) (xy 157.969006 96.632373) (xy 157.963175 96.629247) (xy 157.852058 96.595276) (xy 157.741407 96.560175) (xy 157.734838 96.559438) (xy 157.728515 96.557505) (xy 157.612963 96.545768) (xy 157.497555 96.532823) - (xy 157.484629 96.532732) (xy 157.484388 96.532708) (xy 157.484164 96.532729) (xy 157.48 96.5327) (xy 154.53145 96.5327) - (xy 154.398359 96.442929) (xy 154.12284 96.327112) (xy 153.830072 96.267015) (xy 153.531208 96.264929) (xy 153.23763 96.320932) - (xy 152.96052 96.432891) (xy 152.710435 96.596542) (xy 152.496899 96.805652) (xy 152.328047 97.052255) (xy 152.210309 97.326959) - (xy 152.14817 97.619299) (xy 152.143997 97.918142) (xy 152.197949 98.212104) (xy 152.307971 98.489988) (xy 152.469872 98.74121) - (xy 152.677486 98.9562) (xy 152.922904 99.12677) (xy 153.196779 99.246423) (xy 153.488679 99.310602) (xy 153.787486 99.316861) - (xy 154.081817 99.264962) (xy 154.360462 99.156883) (xy 154.533137 99.0473) (xy 156.95921 99.0473) (xy 158.1277 100.21579) + (xy 157.484629 96.532732) (xy 157.484388 96.532708) (xy 157.484164 96.532729) (xy 157.48 96.5327) (xy 155.92845 96.5327) + (xy 155.795359 96.442929) (xy 155.51984 96.327112) (xy 155.227072 96.267015) (xy 154.928208 96.264929) (xy 154.63463 96.320932) + (xy 154.35752 96.432891) (xy 154.107435 96.596542) (xy 153.893899 96.805652) (xy 153.725047 97.052255) (xy 153.607309 97.326959) + (xy 153.54517 97.619299) (xy 153.540997 97.918142) (xy 153.594949 98.212104) (xy 153.704971 98.489988) (xy 153.866872 98.74121) + (xy 154.074486 98.9562) (xy 154.319904 99.12677) (xy 154.593779 99.246423) (xy 154.885679 99.310602) (xy 155.184486 99.316861) + (xy 155.478817 99.264962) (xy 155.757462 99.156883) (xy 155.930137 99.0473) (xy 156.95921 99.0473) (xy 158.1277 100.21579) (xy 158.1277 106.159209) (xy 154.168184 110.118726) (xy 154.016172 110.180142) (xy 154.080151 110.119216) (xy 154.288322 109.824115) (xy 154.43521 109.4942) (xy 154.515219 109.142038) (xy 154.520979 108.729552) (xy 154.450834 108.375293) (xy 154.313215 108.041405) (xy 154.113365 107.740607) (xy 153.858896 107.484355) (xy 153.5595 107.282409) (xy 153.226581 107.142463) (xy 152.872821 107.069847) @@ -664,127 +926,41 @@ (xy 147.204565 107.740607) (xy 147.0279 107.562704) (xy 147.0279 103.8606) (xy 147.016572 103.745073) (xy 147.006445 103.629318) (xy 147.0046 103.622968) (xy 147.003955 103.616389) (xy 146.970384 103.505195) (xy 146.937985 103.393679) (xy 146.934944 103.387812) (xy 146.933032 103.38148) (xy 146.87849 103.278902) (xy 146.82506 103.175825) (xy 146.820936 103.170659) (xy 146.817832 103.164821) - (xy 146.744417 103.074805) (xy 146.671972 102.984055) (xy 146.662897 102.974852) (xy 146.662743 102.974663) (xy 146.662568 102.974518) - (xy 146.659646 102.971555) (xy 143.764045 100.075955) (xy 143.674337 100.002268) (xy 143.585333 99.927585) (xy 143.579539 99.9244) - (xy 143.57443 99.920203) (xy 143.472035 99.865299) (xy 143.370303 99.809371) (xy 143.364006 99.807373) (xy 143.358175 99.804247) - (xy 143.247058 99.770276) (xy 143.136407 99.735175) (xy 143.129838 99.734438) (xy 143.123515 99.732505) (xy 143.007963 99.720768) - (xy 142.892555 99.707823) (xy 142.879629 99.707732) (xy 142.879388 99.707708) (xy 142.879164 99.707729) (xy 142.875 99.7077) - (xy 140.058164 99.7077) (xy 140.008699 99.615158) (xy 139.905541 99.489459) (xy 139.779842 99.386301) (xy 139.636434 99.309647) - (xy 139.480826 99.262444) (xy 139.319 99.246506) (xy 137.541 99.246506) (xy 137.379174 99.262444) (xy 137.223566 99.309647) - (xy 137.080158 99.386301) (xy 136.954459 99.489459) (xy 136.851301 99.615158) (xy 136.801836 99.7077) (xy 136.525 99.7077) - (xy 136.409378 99.719037) (xy 136.293718 99.729156) (xy 136.287373 99.730999) (xy 136.280789 99.731645) (xy 136.169553 99.765229) - (xy 136.058079 99.797615) (xy 136.052212 99.800656) (xy 136.04588 99.802568) (xy 135.943302 99.85711) (xy 135.840225 99.91054) - (xy 135.835059 99.914664) (xy 135.829221 99.917768) (xy 135.739175 99.991208) (xy 135.648455 100.063629) (xy 135.639254 100.072701) - (xy 135.639063 100.072857) (xy 135.638917 100.073033) (xy 135.635954 100.075955) (xy 134.365955 101.345955) (xy 131.55921 104.1527) - (xy 130.099494 104.1527) (xy 130.099494 103.87) (xy 130.083556 103.708174) (xy 130.036353 103.552566) (xy 129.959699 103.409158) - (xy 129.856541 103.283459) (xy 129.730842 103.180301) (xy 129.587434 103.103647) (xy 129.431826 103.056444) (xy 129.27 103.040506) - (xy 127.27 103.040506) (xy 127.108174 103.056444) (xy 126.952566 103.103647) (xy 126.809158 103.180301) (xy 126.683459 103.283459) - (xy 126.580301 103.409158) (xy 126.503647 103.552566) (xy 126.456444 103.708174) (xy 126.440506 103.87) (xy 126.440506 105.87) - (xy 126.456444 106.031826) (xy 126.503647 106.187434) (xy 126.580301 106.330842) (xy 126.683459 106.456541) (xy 126.809158 106.559699) - (xy 126.952566 106.636353) (xy 127.108174 106.683556) (xy 127.27 106.699494) (xy 129.27 106.699494) (xy 129.431826 106.683556) - (xy 129.485415 106.6673) (xy 132.08 106.6673) (xy 132.195577 106.655968) (xy 132.311282 106.645844) (xy 132.317627 106.644001) - (xy 132.324211 106.643355) (xy 132.435457 106.609768) (xy 132.546921 106.577385) (xy 132.552788 106.574344) (xy 132.55912 106.572432) - (xy 132.661698 106.51789) (xy 132.764775 106.46446) (xy 132.769941 106.460336) (xy 132.775779 106.457232) (xy 132.865795 106.383817) - (xy 132.956545 106.311372) (xy 132.965743 106.302301) (xy 132.965937 106.302143) (xy 132.966085 106.301964) (xy 132.969045 106.299045) - (xy 136.897254 102.370836) (xy 136.954459 102.440541) (xy 137.080158 102.543699) (xy 137.223566 102.620353) (xy 137.379174 102.667556) - (xy 137.541 102.683494) (xy 139.319 102.683494) (xy 139.480826 102.667556) (xy 139.636434 102.620353) (xy 139.779842 102.543699) - (xy 139.905541 102.440541) (xy 140.008699 102.314842) (xy 140.058164 102.2223) (xy 142.35421 102.2223) (xy 144.5133 104.381391) - (xy 144.5133 107.563823) (xy 144.353104 107.720699) (xy 144.149073 108.018678) (xy 144.006806 108.350612) (xy 143.931722 108.703857) - (xy 143.92668 109.064958) (xy 143.991872 109.420162) (xy 144.124815 109.755939) (xy 144.320446 110.059498) (xy 144.442147 110.185523) - (xy 144.163861 110.068543) (xy 143.810101 109.995927) (xy 143.448973 109.993406) (xy 143.094233 110.061076) (xy 142.759392 110.19636) - (xy 142.457206 110.394105) (xy 142.2685 110.5789) (xy 142.201991 110.5789) (xy 138.684045 107.060955) (xy 138.594337 106.987268) - (xy 138.505333 106.912585) (xy 138.499539 106.9094) (xy 138.49443 106.905203) (xy 138.392035 106.850299) (xy 138.290303 106.794371) - (xy 138.284006 106.792373) (xy 138.278175 106.789247) (xy 138.167058 106.755276) (xy 138.056407 106.720175) (xy 138.049838 106.719438) - (xy 138.043515 106.717505) (xy 137.927963 106.705768) (xy 137.812555 106.692823) (xy 137.799629 106.692732) (xy 137.799388 106.692708) - (xy 137.799164 106.692729) (xy 137.795 106.6927) (xy 136.75145 106.6927) (xy 136.618359 106.602929) (xy 136.34284 106.487112) - (xy 136.050072 106.427015) (xy 135.751208 106.424929) (xy 135.45763 106.480932) (xy 135.18052 106.592891) (xy 134.974799 106.727511) - (xy 134.899553 106.750229) (xy 134.788079 106.782615) (xy 134.782212 106.785656) (xy 134.77588 106.787568) (xy 134.673302 106.84211) - (xy 134.570225 106.89554) (xy 134.565059 106.899664) (xy 134.559221 106.902768) (xy 134.469175 106.976208) (xy 134.378455 107.048629) - (xy 134.369254 107.057701) (xy 134.369063 107.057857) (xy 134.368917 107.058033) (xy 134.365954 107.060955) (xy 133.095955 108.330955) - (xy 133.022268 108.420663) (xy 132.947585 108.509667) (xy 132.9444 108.515461) (xy 132.940203 108.52057) (xy 132.885299 108.622965) - (xy 132.829371 108.724697) (xy 132.827373 108.730994) (xy 132.824247 108.736825) (xy 132.790276 108.847942) (xy 132.755175 108.958593) - (xy 132.754438 108.965162) (xy 132.752505 108.971485) (xy 132.740768 109.087037) (xy 132.727823 109.202445) (xy 132.727732 109.215371) - (xy 132.727708 109.215612) (xy 132.727729 109.215836) (xy 132.7277 109.22) (xy 132.7277 116.205) (xy 132.739032 116.320577) - (xy 132.749156 116.436282) (xy 132.750999 116.442627) (xy 132.751645 116.449211) (xy 132.785229 116.560447) (xy 132.817615 116.671921) - (xy 132.820656 116.677788) (xy 132.822568 116.68412) (xy 132.87711 116.786698) (xy 132.93054 116.889775) (xy 132.934664 116.894941) - (xy 132.937768 116.900779) (xy 133.011183 116.990795) (xy 133.083628 117.081545) (xy 133.092699 117.090743) (xy 133.092857 117.090937) - (xy 133.093036 117.091085) (xy 133.095955 117.094045) (xy 133.653071 117.651162) (xy 133.53201 117.689574) (xy 133.359114 117.781991) - (xy 133.294867 117.970452) (xy 133.985 118.660586) (xy 133.999143 118.646444) (xy 134.083557 118.730858) (xy 134.069414 118.745) - (xy 134.083557 118.759143) (xy 133.999143 118.843557) (xy 133.985 118.829414) (xy 133.294867 119.519548) (xy 133.359114 119.708009) - (xy 133.559013 119.81161) (xy 133.775283 119.874221) (xy 133.999613 119.893438) (xy 134.223382 119.86852) (xy 134.2517 119.859535) - (xy 134.2517 121.031) (xy 134.263032 121.146577) (xy 134.273156 121.262282) (xy 134.274999 121.268627) (xy 134.275645 121.275211) - (xy 134.309229 121.386447) (xy 134.341615 121.497921) (xy 134.344656 121.503788) (xy 134.346568 121.51012) (xy 134.40111 121.612698) - (xy 134.45454 121.715775) (xy 134.458664 121.720941) (xy 134.461768 121.726779) (xy 134.535183 121.816795) (xy 134.607628 121.907545) - (xy 134.616699 121.916743) (xy 134.616857 121.916937) (xy 134.617036 121.917085) (xy 134.619955 121.920045) (xy 135.508955 122.809045) - (xy 135.598663 122.882732) (xy 135.687667 122.957415) (xy 135.693461 122.9606) (xy 135.69857 122.964797) (xy 135.800946 123.019691) - (xy 135.902346 123.075436) (xy 136.531915 123.705005) (xy 136.45052 123.737891) (xy 136.297996 123.8377) (xy 134.505791 123.8377) - (xy 130.099494 119.431404) (xy 130.099494 118.759613) (xy 132.836562 118.759613) (xy 132.86148 118.983382) (xy 132.929574 119.19799) - (xy 133.021991 119.370886) (xy 133.210452 119.435133) (xy 133.900586 118.745) (xy 133.210452 118.054867) (xy 133.021991 118.119114) - (xy 132.91839 118.319013) (xy 132.855779 118.535283) (xy 132.836562 118.759613) (xy 130.099494 118.759613) (xy 130.099494 117.84) - (xy 130.083556 117.678174) (xy 130.036353 117.522566) (xy 129.959699 117.379158) (xy 129.856541 117.253459) (xy 129.730842 117.150301) - (xy 129.587434 117.073647) (xy 129.431826 117.026444) (xy 129.27 117.010506) (xy 127.27 117.010506) (xy 127.108174 117.026444) - (xy 126.952566 117.073647) (xy 126.809158 117.150301) (xy 126.683459 117.253459) (xy 126.580301 117.379158) (xy 126.503647 117.522566) - (xy 126.456444 117.678174) (xy 126.440506 117.84) (xy 126.440506 119.84) (xy 126.456444 120.001826) (xy 126.503647 120.157434) - (xy 126.580301 120.300842) (xy 126.683459 120.426541) (xy 126.809158 120.529699) (xy 126.952566 120.606353) (xy 127.108174 120.653556) - (xy 127.27 120.669494) (xy 127.781404 120.669494) (xy 132.682112 125.570202) (xy 132.643047 125.627255) (xy 132.525309 125.901959) - (xy 132.46317 126.194299) (xy 132.458997 126.493142) (xy 132.512949 126.787104) (xy 132.622971 127.064988) (xy 132.784872 127.31621) - (xy 132.992486 127.5312) (xy 133.237904 127.70177) (xy 133.511779 127.821423) (xy 133.803679 127.885602) (xy 134.102486 127.891861) - (xy 134.396817 127.839962) (xy 134.675462 127.731883) (xy 134.927808 127.571739) (xy 135.144243 127.365631) (xy 135.316522 127.12141) - (xy 135.438084 126.848377) (xy 135.504299 126.556932) (xy 135.507156 126.3523) (xy 136.298562 126.3523) (xy 136.412904 126.43177) - (xy 136.686779 126.551423) (xy 136.978679 126.615602) (xy 137.277486 126.621861) (xy 137.571817 126.569962) (xy 137.8077 126.478469) - (xy 137.8077 130.175) (xy 137.819032 130.290577) (xy 137.829156 130.406282) (xy 137.830999 130.412627) (xy 137.831645 130.419211) - (xy 137.865229 130.530447) (xy 137.897615 130.641921) (xy 137.900656 130.647788) (xy 137.902568 130.65412) (xy 137.95711 130.756698) - (xy 138.01054 130.859775) (xy 138.014664 130.864941) (xy 138.017768 130.870779) (xy 138.091183 130.960795) (xy 138.163628 131.051545) - (xy 138.172699 131.060743) (xy 138.172857 131.060937) (xy 138.173036 131.061085) (xy 138.175955 131.064045) (xy 138.937909 131.826) - (xy 128.671224 131.826) (xy 128.747968 131.777297) (xy 129.149238 131.395173) (xy 129.468645 130.942385) (xy 129.694021 130.436182) - (xy 129.816783 129.895842) (xy 129.825621 129.262945) (xy 129.717994 128.719389) (xy 129.506839 128.20709) (xy 129.2002 127.745561) - (xy 128.809756 127.352381) (xy 128.350378 127.042527) (xy 127.839566 126.827801) (xy 127.296774 126.716382) (xy 126.742679 126.712514) - (xy 126.198384 126.816344) (xy 125.684623 127.023916) (xy 125.220965 127.327326) (xy 124.825069 127.715016) (xy 124.714 127.877228) - (xy 124.714 115.829047) (xy 127.365367 115.829047) (xy 127.465848 116.048371) (xy 127.717042 116.182034) (xy 127.989485 116.264124) - (xy 128.272708 116.291486) (xy 128.555827 116.263068) (xy 128.827962 116.179962) (xy 129.074152 116.048371) (xy 129.174633 115.829047) - (xy 128.27 114.924414) (xy 127.365367 115.829047) (xy 124.714 115.829047) (xy 124.714 114.842708) (xy 126.818514 114.842708) - (xy 126.846932 115.125827) (xy 126.930038 115.397962) (xy 127.061629 115.644152) (xy 127.280953 115.744633) (xy 128.185586 114.84) - (xy 128.354414 114.84) (xy 129.259047 115.744633) (xy 129.478371 115.644152) (xy 129.612034 115.392958) (xy 129.694124 115.120515) - (xy 129.721486 114.837292) (xy 129.693068 114.554173) (xy 129.609962 114.282038) (xy 129.478371 114.035848) (xy 129.259047 113.935367) - (xy 128.354414 114.84) (xy 128.185586 114.84) (xy 127.280953 113.935367) (xy 127.061629 114.035848) (xy 126.927966 114.287042) - (xy 126.845876 114.559485) (xy 126.818514 114.842708) (xy 124.714 114.842708) (xy 124.714 113.850953) (xy 127.365367 113.850953) - (xy 128.27 114.755586) (xy 129.174633 113.850953) (xy 129.074152 113.631629) (xy 128.822958 113.497966) (xy 128.550515 113.415876) - (xy 128.267292 113.388514) (xy 127.984173 113.416932) (xy 127.712038 113.500038) (xy 127.465848 113.631629) (xy 127.365367 113.850953) - (xy 124.714 113.850953) (xy 124.714 101.859047) (xy 127.365367 101.859047) (xy 127.465848 102.078371) (xy 127.717042 102.212034) - (xy 127.989485 102.294124) (xy 128.272708 102.321486) (xy 128.555827 102.293068) (xy 128.827962 102.209962) (xy 129.074152 102.078371) - (xy 129.174633 101.859047) (xy 128.27 100.954414) (xy 127.365367 101.859047) (xy 124.714 101.859047) (xy 124.714 100.872708) - (xy 126.818514 100.872708) (xy 126.846932 101.155827) (xy 126.930038 101.427962) (xy 127.061629 101.674152) (xy 127.280953 101.774633) - (xy 128.185586 100.87) (xy 128.354414 100.87) (xy 129.259047 101.774633) (xy 129.478371 101.674152) (xy 129.612034 101.422958) - (xy 129.694124 101.150515) (xy 129.721486 100.867292) (xy 129.693068 100.584173) (xy 129.609962 100.312038) (xy 129.478371 100.065848) - (xy 129.259047 99.965367) (xy 128.354414 100.87) (xy 128.185586 100.87) (xy 127.280953 99.965367) (xy 127.061629 100.065848) - (xy 126.927966 100.317042) (xy 126.845876 100.589485) (xy 126.818514 100.872708) (xy 124.714 100.872708) (xy 124.714 99.880953) - (xy 127.365367 99.880953) (xy 128.27 100.785586) (xy 129.174633 99.880953) (xy 129.074152 99.661629) (xy 128.822958 99.527966) - (xy 128.550515 99.445876) (xy 128.267292 99.418514) (xy 127.984173 99.446932) (xy 127.712038 99.530038) (xy 127.465848 99.661629) - (xy 127.365367 99.880953) (xy 124.714 99.880953) (xy 124.714 98.564548) (xy 145.359867 98.564548) (xy 145.424114 98.753009) - (xy 145.624013 98.85661) (xy 145.840283 98.919221) (xy 146.064613 98.938438) (xy 146.288382 98.91352) (xy 146.50299 98.845426) - (xy 146.675886 98.753009) (xy 146.740133 98.564548) (xy 146.05 97.874414) (xy 145.359867 98.564548) (xy 124.714 98.564548) - (xy 124.714 97.804613) (xy 144.901562 97.804613) (xy 144.92648 98.028382) (xy 144.994574 98.24299) (xy 145.086991 98.415886) - (xy 145.275452 98.480133) (xy 145.965586 97.79) (xy 146.134414 97.79) (xy 146.824548 98.480133) (xy 147.013009 98.415886) - (xy 147.11661 98.215987) (xy 147.179221 97.999717) (xy 147.198438 97.775387) (xy 147.17352 97.551618) (xy 147.105426 97.33701) - (xy 147.013009 97.164114) (xy 146.824548 97.099867) (xy 146.134414 97.79) (xy 145.965586 97.79) (xy 145.275452 97.099867) - (xy 145.086991 97.164114) (xy 144.98339 97.364013) (xy 144.920779 97.580283) (xy 144.901562 97.804613) (xy 124.714 97.804613) - (xy 124.714 95.648953) (xy 124.77496 95.743545) (xy 125.159877 96.142137) (xy 125.614883 96.458375) (xy 126.122648 96.680212) - (xy 126.663831 96.799199) (xy 127.217818 96.810803) (xy 127.306913 96.795093) (xy 137.604321 96.795093) (xy 137.691468 97.003053) - (xy 137.92378 97.125651) (xy 138.175546 97.200571) (xy 138.43709 97.224934) (xy 138.698363 97.197805) (xy 138.949321 97.120224) - (xy 139.145335 97.015452) (xy 145.359867 97.015452) (xy 146.05 97.705586) (xy 146.740133 97.015452) (xy 146.675886 96.826991) - (xy 146.475987 96.72339) (xy 146.259717 96.660779) (xy 146.035387 96.641562) (xy 145.811618 96.66648) (xy 145.59701 96.734574) - (xy 145.424114 96.826991) (xy 145.359867 97.015452) (xy 139.145335 97.015452) (xy 139.168532 97.003053) (xy 139.255679 96.795093) - (xy 138.43 95.969414) (xy 137.604321 96.795093) (xy 127.306913 96.795093) (xy 127.763509 96.714583) (xy 128.280118 96.514204) - (xy 128.747968 96.217297) (xy 129.089469 95.89209) (xy 137.090066 95.89209) (xy 137.117195 96.153363) (xy 137.194776 96.404321) - (xy 137.311947 96.623532) (xy 137.519907 96.710679) (xy 138.345586 95.885) (xy 138.514414 95.885) (xy 139.340093 96.710679) - (xy 139.548053 96.623532) (xy 139.670651 96.39122) (xy 139.745571 96.139454) (xy 139.769934 95.87791) (xy 139.742805 95.616637) - (xy 139.665224 95.365679) (xy 139.548053 95.146468) (xy 139.340093 95.059321) (xy 138.514414 95.885) (xy 138.345586 95.885) - (xy 137.519907 95.059321) (xy 137.311947 95.146468) (xy 137.189349 95.37878) (xy 137.114429 95.630546) (xy 137.090066 95.89209) - (xy 129.089469 95.89209) (xy 129.149238 95.835173) (xy 129.468645 95.382385) (xy 129.650065 94.974907) (xy 137.604321 94.974907) - (xy 138.43 95.800586) (xy 139.255679 94.974907) (xy 139.168532 94.766947) (xy 138.93622 94.644349) (xy 138.684454 94.569429) - (xy 138.42291 94.545066) (xy 138.161637 94.572195) (xy 137.910679 94.649776) (xy 137.691468 94.766947) (xy 137.604321 94.974907) - (xy 129.650065 94.974907) (xy 129.694021 94.876182) (xy 129.816783 94.335842) (xy 129.825621 93.702945) (xy 129.717994 93.159389) - (xy 129.506839 92.64709) (xy 129.2002 92.185561) (xy 128.809756 91.792381) (xy 128.6639 91.694) (xy 163.433019 91.694) + (xy 146.744417 103.074805) (xy 146.671972 102.984055) (xy 146.662901 102.974857) (xy 146.662743 102.974663) (xy 146.662564 102.974515) + (xy 146.659645 102.971555) (xy 142.621045 98.932955) (xy 142.531337 98.859268) (xy 142.442333 98.784585) (xy 142.436539 98.7814) + (xy 142.43143 98.777203) (xy 142.329035 98.722299) (xy 142.227303 98.666371) (xy 142.221006 98.664373) (xy 142.215175 98.661247) + (xy 142.104058 98.627276) (xy 141.993407 98.592175) (xy 141.986838 98.591438) (xy 141.980515 98.589505) (xy 141.864963 98.577768) + (xy 141.749555 98.564823) (xy 141.736629 98.564732) (xy 141.736388 98.564708) (xy 141.736164 98.564729) (xy 141.732 98.5647) + (xy 141.074164 98.5647) (xy 141.074083 98.564548) (xy 146.756867 98.564548) (xy 146.821114 98.753009) (xy 147.021013 98.85661) + (xy 147.237283 98.919221) (xy 147.461613 98.938438) (xy 147.685382 98.91352) (xy 147.89999 98.845426) (xy 148.072886 98.753009) + (xy 148.137133 98.564548) (xy 147.447 97.874414) (xy 146.756867 98.564548) (xy 141.074083 98.564548) (xy 141.024699 98.472158) + (xy 140.921541 98.346459) (xy 140.795842 98.243301) (xy 140.652434 98.166647) (xy 140.496826 98.119444) (xy 140.335 98.103506) + (xy 138.557 98.103506) (xy 138.395174 98.119444) (xy 138.239566 98.166647) (xy 138.096158 98.243301) (xy 137.970459 98.346459) + (xy 137.867301 98.472158) (xy 137.817836 98.5647) (xy 129.159 98.5647) (xy 129.043473 98.576028) (xy 128.980855 98.581506) + (xy 126.97 98.581506) (xy 126.808174 98.597444) (xy 126.652566 98.644647) (xy 126.509158 98.721301) (xy 126.383459 98.824459) + (xy 126.280301 98.950158) (xy 126.203647 99.093566) (xy 126.156444 99.249174) (xy 126.140506 99.411) (xy 124.836265 99.411) + (xy 124.849802 97.804613) (xy 146.298562 97.804613) (xy 146.32348 98.028382) (xy 146.391574 98.24299) (xy 146.483991 98.415886) + (xy 146.672452 98.480133) (xy 147.362586 97.79) (xy 147.531414 97.79) (xy 148.221548 98.480133) (xy 148.410009 98.415886) + (xy 148.51361 98.215987) (xy 148.576221 97.999717) (xy 148.595438 97.775387) (xy 148.57052 97.551618) (xy 148.502426 97.33701) + (xy 148.410009 97.164114) (xy 148.221548 97.099867) (xy 147.531414 97.79) (xy 147.362586 97.79) (xy 146.672452 97.099867) + (xy 146.483991 97.164114) (xy 146.38039 97.364013) (xy 146.317779 97.580283) (xy 146.298562 97.804613) (xy 124.849802 97.804613) + (xy 124.856452 97.015452) (xy 146.756867 97.015452) (xy 147.447 97.705586) (xy 148.137133 97.015452) (xy 148.072886 96.826991) + (xy 147.872987 96.72339) (xy 147.656717 96.660779) (xy 147.432387 96.641562) (xy 147.208618 96.66648) (xy 146.99401 96.734574) + (xy 146.821114 96.826991) (xy 146.756867 97.015452) (xy 124.856452 97.015452) (xy 124.866373 95.838205) (xy 125.159877 96.142137) + (xy 125.614883 96.458375) (xy 126.122648 96.680212) (xy 126.663831 96.799199) (xy 127.217818 96.810803) (xy 127.763509 96.714583) + (xy 128.280118 96.514204) (xy 128.747968 96.217297) (xy 129.149238 95.835173) (xy 129.278386 95.652093) (xy 138.620321 95.652093) + (xy 138.707468 95.860053) (xy 138.93978 95.982651) (xy 139.191546 96.057571) (xy 139.45309 96.081934) (xy 139.714363 96.054805) + (xy 139.965321 95.977224) (xy 140.184532 95.860053) (xy 140.271679 95.652093) (xy 139.446 94.826414) (xy 138.620321 95.652093) + (xy 129.278386 95.652093) (xy 129.468645 95.382385) (xy 129.694021 94.876182) (xy 129.722895 94.74909) (xy 138.106066 94.74909) + (xy 138.133195 95.010363) (xy 138.210776 95.261321) (xy 138.327947 95.480532) (xy 138.535907 95.567679) (xy 139.361586 94.742) + (xy 139.530414 94.742) (xy 140.356093 95.567679) (xy 140.564053 95.480532) (xy 140.686651 95.24822) (xy 140.761571 94.996454) + (xy 140.785934 94.73491) (xy 140.758805 94.473637) (xy 140.681224 94.222679) (xy 140.564053 94.003468) (xy 140.356093 93.916321) + (xy 139.530414 94.742) (xy 139.361586 94.742) (xy 138.535907 93.916321) (xy 138.327947 94.003468) (xy 138.205349 94.23578) + (xy 138.130429 94.487546) (xy 138.106066 94.74909) (xy 129.722895 94.74909) (xy 129.816783 94.335842) (xy 129.82382 93.831907) + (xy 138.620321 93.831907) (xy 139.446 94.657586) (xy 140.271679 93.831907) (xy 140.184532 93.623947) (xy 139.95222 93.501349) + (xy 139.700454 93.426429) (xy 139.43891 93.402066) (xy 139.177637 93.429195) (xy 138.926679 93.506776) (xy 138.707468 93.623947) + (xy 138.620321 93.831907) (xy 129.82382 93.831907) (xy 129.825621 93.702945) (xy 129.717994 93.159389) (xy 129.506839 92.64709) + (xy 129.2002 92.185561) (xy 128.809756 91.792381) (xy 128.6639 91.694) (xy 163.433019 91.694) ) ) ) diff --git a/demos/ecc83/ecc83-pp.net b/demos/ecc83/ecc83-pp.net index 06bed3ae22..9eb602b1bb 100644 --- a/demos/ecc83/ecc83-pp.net +++ b/demos/ecc83/ecc83-pp.net @@ -1,8 +1,8 @@ (export (version D) (design - (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch) - (date "17/05/2015 17:07:31") - (tool "Eeschema (2015-05-13 BZR 5653)-product") + (source F:\kicad-launchpad\git_testing\demos\ecc83\ecc83-pp.sch) + (date "14/12/2017 18:08:42") + (tool "Eeschema (2017-12-14 revision dee93e5)-master") (sheet (number 1) (name /) (tstamps /) (title_block (title "ECC Push-Pull") @@ -23,31 +23,31 @@ (tstamp 48B4F266)) (comp (ref P4) (value CONN_2) - (footprint connect:bornier2) + (footprint TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 456A8ACC)) (comp (ref C1) (value 10uF) (footprint discret:C2V10) - (libsource (lib ecc83_schlib) (part C)) + (libsource (lib ecc83_schlib) (part CP)) (sheetpath (names /) (tstamps /)) (tstamp 4549F4BE)) (comp (ref P3) (value POWER) - (footprint connect:bornier2) + (footprint TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 4549F4A5)) (comp (ref P2) (value OUT) - (footprint connect:bornier2) + (footprint TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 4549F46C)) (comp (ref P1) (value IN) - (footprint connect:bornier2) + (footprint TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 4549F464)) @@ -132,6 +132,16 @@ (pins (pin (num 1) (name P1) (type passive)) (pin (num 2) (name PM) (type passive)))) + (libpart (lib ecc83_schlib) (part CP) + (description "Polarised capacitor") + (footprints + (fp CP_*)) + (fields + (field (name Reference) C) + (field (name Value) CP)) + (pins + (pin (num 1) (name ~) (type passive)) + (pin (num 2) (name ~) (type passive)))) (libpart (lib ecc83_schlib) (part ECC81) (aliases (alias ECC83)) @@ -161,51 +171,51 @@ (pin (num 2) (name ~) (type passive))))) (libraries (library (logical ecc83_schlib) - (uri ecc83_schlib.lib))) + (uri F:\kicad-launchpad\git_testing\demos\ecc83/ecc83_schlib.lib))) (nets - (net (code 1) (name "Net-(P1-Pad2)") - (node (ref U1) (pin 2)) - (node (ref P1) (pin 2)) - (node (ref R4) (pin 1))) + (net (code 1) (name "Net-(R1-Pad1)") + (node (ref U1) (pin 1)) + (node (ref U1) (pin 7)) + (node (ref R1) (pin 1))) (net (code 2) (name GND) - (node (ref P2) (pin 2)) (node (ref R2) (pin 2)) (node (ref R4) (pin 2)) (node (ref R3) (pin 2)) (node (ref P1) (pin 1)) + (node (ref P2) (pin 1)) (node (ref P3) (pin 2)) (node (ref C1) (pin 2))) (net (code 3) (name "Net-(C1-Pad1)") - (node (ref C1) (pin 1)) (node (ref P3) (pin 1)) + (node (ref C1) (pin 1)) (node (ref U1) (pin 6))) (net (code 4) (name "Net-(C2-Pad2)") - (node (ref C2) (pin 2)) (node (ref U1) (pin 8)) + (node (ref C2) (pin 2)) (node (ref R1) (pin 2))) (net (code 5) (name "Net-(C2-Pad1)") (node (ref R3) (pin 1)) - (node (ref C2) (pin 1)) - (node (ref P2) (pin 1))) - (net (code 6) (name "Net-(P8-Pad1)") + (node (ref P2) (pin 2)) + (node (ref C2) (pin 1))) + (net (code 6) (name "Net-(P1-Pad2)") + (node (ref P1) (pin 2)) + (node (ref R4) (pin 1)) + (node (ref U1) (pin 2))) + (net (code 7) (name "Net-(P8-Pad1)") (node (ref P8) (pin 1))) - (net (code 7) (name "Net-(P7-Pad1)") + (net (code 8) (name "Net-(P7-Pad1)") (node (ref P7) (pin 1))) - (net (code 8) (name "Net-(P6-Pad1)") + (net (code 9) (name "Net-(P6-Pad1)") (node (ref P6) (pin 1))) - (net (code 9) (name "Net-(P5-Pad1)") + (net (code 10) (name "Net-(P5-Pad1)") (node (ref P5) (pin 1))) - (net (code 10) (name "Net-(P4-Pad2)") - (node (ref P4) (pin 2)) - (node (ref U1) (pin 9))) (net (code 11) (name "Net-(R2-Pad1)") - (node (ref U1) (pin 3)) - (node (ref R2) (pin 1))) - (net (code 12) (name "Net-(R1-Pad1)") - (node (ref R1) (pin 1)) - (node (ref U1) (pin 1)) - (node (ref U1) (pin 7))) + (node (ref R2) (pin 1)) + (node (ref U1) (pin 3))) + (net (code 12) (name "Net-(P4-Pad2)") + (node (ref U1) (pin 9)) + (node (ref P4) (pin 2))) (net (code 13) (name "Net-(P4-Pad1)") + (node (ref U1) (pin 4)) (node (ref U1) (pin 5)) - (node (ref P4) (pin 1)) - (node (ref U1) (pin 4))))) \ No newline at end of file + (node (ref P4) (pin 1))))) \ No newline at end of file diff --git a/demos/ecc83/ecc83-pp.sch b/demos/ecc83/ecc83-pp.sch index e727ccfc5c..82446c5629 100644 --- a/demos/ecc83/ecc83-pp.sch +++ b/demos/ecc83/ecc83-pp.sch @@ -19,25 +19,25 @@ Wire Wire Line Wire Wire Line 6100 4650 6100 4850 Wire Wire Line - 2000 2000 6300 2000 + 2000 2000 3000 2000 Connection ~ 3400 2000 Wire Wire Line - 7050 3000 7800 3000 + 7050 3000 7300 3000 Wire Wire Line 7300 3000 7300 3200 Wire Wire Line - 2000 3500 2600 3500 + 2000 3500 2400 3500 Wire Wire Line 2400 3500 2400 3400 Wire Wire Line - 6200 3500 6200 3850 + 6200 3500 6200 3700 $Comp L ecc83_schlib:ECC83 U1 U 3 1 48B4F266 P 2500 2950 F 0 "U1" H 2500 3400 50 0000 C CNN F 1 "ECC83" H 2500 3300 50 0000 C CNN -F 2 "Valves:VALVE-ECC-83-1" V 2250 2950 30 0000 C CNN +F 2 "" V 2250 2950 30 0000 C CNN F 3 "" H 2500 2950 60 0001 C CNN 3 2500 2950 1 0 0 -1 @@ -48,7 +48,7 @@ U 2 1 48B4F263 P 6200 4250 F 0 "U1" H 6350 4600 50 0000 C CNN F 1 "ECC83" H 6400 3900 50 0000 C CNN -F 2 "Valves:VALVE-ECC-83-1" H 6400 3850 30 0000 C CNN +F 2 "" H 6400 3850 30 0000 C CNN F 3 "" H 6200 4250 60 0001 C CNN 2 6200 4250 1 0 0 -1 @@ -59,7 +59,7 @@ U 1 1 48B4F256 P 6300 2550 F 0 "U1" H 6450 2900 50 0000 C CNN F 1 "ECC83" H 6050 2250 50 0000 C CNN -F 2 "Valves:VALVE-ECC-83-1" H 6570 2150 50 0001 C CNN +F 2 "Valve:Valve_ECC-83-1" V 6550 2550 30 0000 C CNN F 3 "" H 6300 2550 60 0001 C CNN 1 6300 2550 1 0 0 -1 @@ -111,13 +111,13 @@ $EndComp $Comp L ecc83_schlib:PWR_FLAG #FLG05 U 1 1 457DBAC0 -P 3000 2350 -F 0 "#FLG05" H 3000 2620 30 0001 C CNN -F 1 "PWR_FLAG" H 3000 2580 30 0000 C CNN -F 2 "" H 3000 2350 60 0001 C CNN -F 3 "" H 3000 2350 60 0001 C CNN - 1 3000 2350 - 1 0 0 -1 +P 2100 2200 +F 0 "#FLG05" H 2100 2470 30 0001 C CNN +F 1 "PWR_FLAG" H 2100 2430 30 0000 C CNN +F 2 "" H 2100 2200 60 0001 C CNN +F 3 "" H 2100 2200 60 0001 C CNN + 1 2100 2200 + 0 1 1 0 $EndComp $Comp L ecc83_schlib:CONN_2 P4 @@ -125,18 +125,18 @@ U 1 1 456A8ACC P 1650 3600 F 0 "P4" V 1600 3600 40 0000 C CNN F 1 "CONN_2" V 1700 3600 40 0000 C CNN -F 2 "connect:bornier2" H 1650 3600 60 0001 C CNN +F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal" H 1600 3800 15 0000 C CNN F 3 "" H 1650 3600 60 0001 C CNN 1 1650 3600 - -1 0 0 -1 + -1 0 0 1 $EndComp $Comp -L ecc83_schlib:C C1 +L ecc83_schlib:CP C1 U 1 1 4549F4BE P 3400 2250 -F 0 "C1" H 3450 2350 50 0000 L CNN -F 1 "10uF" H 3150 2350 50 0000 L CNN -F 2 "discret:C2V10" H 3400 2250 60 0001 C CNN +F 0 "C1" H 3150 2300 50 0000 L CNN +F 1 "10uF" H 3100 2200 50 0000 L CNN +F 2 "discret:C2V10" H 3200 2150 30 0000 C CNN F 3 "" H 3400 2250 60 0001 C CNN 1 3400 2250 -1 0 0 -1 @@ -145,9 +145,9 @@ $Comp L ecc83_schlib:CONN_2 P3 U 1 1 4549F4A5 P 1650 2100 -F 0 "P3" V 1600 2100 40 0000 C CNN +F 0 "P3" H 1650 2300 40 0000 C CNN F 1 "POWER" V 1700 2100 40 0000 C CNN -F 2 "connect:bornier2" H 1650 2100 60 0001 C CNN +F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal" H 1650 1900 15 0000 C CNN F 3 "" H 1650 2100 60 0001 C CNN 1 1650 2100 -1 0 0 -1 @@ -156,9 +156,9 @@ $Comp L ecc83_schlib:CONN_2 P2 U 1 1 4549F46C P 8150 3100 -F 0 "P2" V 8100 3100 40 0000 C CNN +F 0 "P2" H 8150 3300 40 0000 C CNN F 1 "OUT" V 8200 3100 40 0000 C CNN -F 2 "connect:bornier2" H 8150 3100 60 0001 C CNN +F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal" H 8150 2900 15 0000 C CNN F 3 "" H 8150 3100 60 0001 C CNN 1 8150 3100 1 0 0 -1 @@ -167,9 +167,9 @@ $Comp L ecc83_schlib:CONN_2 P1 U 1 1 4549F464 P 5000 4350 -F 0 "P1" V 4950 4350 40 0000 C CNN -F 1 "IN" V 5050 4350 40 0000 C CNN -F 2 "connect:bornier2" H 5000 4600 50 0000 C CNN +F 0 "P1" H 5000 4150 40 0000 C CNN +F 1 "IN" H 5000 4350 40 0000 C CNN +F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal" H 5000 4550 15 0000 C CNN F 3 "" H 5000 4350 60 0001 C CNN 1 5000 4350 -1 0 0 1 @@ -180,7 +180,7 @@ U 1 1 4549F3BE P 6900 3000 F 0 "C2" V 6750 3000 50 0000 C CNN F 1 "680nF" V 7050 3000 50 0000 C CNN -F 2 "discret:C2" H 6900 3000 60 0001 C CNN +F 2 "discret:C2" V 7100 3000 30 0000 C CNN F 3 "" H 6900 3000 60 0001 C CNN 1 6900 3000 0 1 1 0 @@ -189,9 +189,9 @@ $Comp L ecc83_schlib:R R3 U 1 1 4549F3AD P 7300 3350 -F 0 "R3" H 7200 3550 50 0000 C CNN +F 0 "R3" H 7200 3350 50 0000 C CNN F 1 "100K" V 7300 3350 50 0000 C CNN -F 2 "discret:R3" H 7300 3350 60 0001 C CNN +F 2 "discret:R3" V 7379 3350 30 0000 C CNN F 3 "" H 7300 3350 60 0001 C CNN 1 7300 3350 1 0 0 -1 @@ -200,9 +200,9 @@ $Comp L ecc83_schlib:R R4 U 1 1 4549F3A2 P 5700 5000 -F 0 "R4" H 5600 5200 50 0000 C CNN +F 0 "R4" H 5600 5050 50 0000 C CNN F 1 "47K" V 5700 5000 50 0000 C CNN -F 2 "discret:R3" H 5700 5000 60 0001 C CNN +F 2 "discret:R3" V 5776 4998 30 0000 C CNN F 3 "" H 5700 5000 60 0001 C CNN 1 5700 5000 1 0 0 -1 @@ -211,9 +211,9 @@ $Comp L ecc83_schlib:R R2 U 1 1 4549F39D P 6100 5000 -F 0 "R2" H 6000 5200 50 0000 C CNN +F 0 "R2" H 6000 5000 50 0000 C CNN F 1 "1.5K" V 6100 5000 50 0000 C CNN -F 2 "discret:R3" H 6100 5000 60 0001 C CNN +F 2 "discret:R3" V 6174 5000 30 0000 C CNN F 3 "" H 6100 5000 60 0001 C CNN 1 6100 5000 1 0 0 -1 @@ -222,9 +222,9 @@ $Comp L ecc83_schlib:R R1 U 1 1 4549F38A P 6200 3350 -F 0 "R1" H 6300 3150 50 0000 C CNN +F 0 "R1" H 6300 3350 50 0000 C CNN F 1 "1.5K" V 6200 3350 50 0000 C CNN -F 2 "discret:R3" H 6200 3350 60 0001 C CNN +F 2 "discret:R3" V 6120 3348 30 0000 C CNN F 3 "" H 6200 3350 60 0001 C CNN 1 6200 3350 -1 0 0 1 @@ -290,12 +290,12 @@ Wire Wire Line Wire Wire Line 2600 3500 2600 3400 Wire Wire Line - 5350 4250 5900 4250 + 5350 4250 5700 4250 Wire Wire Line 5700 4250 5700 4850 Connection ~ 5700 4250 Wire Wire Line - 6200 2950 6200 3200 + 6200 2950 6200 3000 Connection ~ 6200 3700 Wire Wire Line 6000 2550 5900 2550 @@ -330,23 +330,14 @@ Connection ~ 3000 2000 $Comp L ecc83_schlib:GND #PWR08 U 1 1 550EAB37 -P 3000 2550 -F 0 "#PWR08" H 3000 2550 30 0001 C CNN -F 1 "GND" H 3000 2480 30 0001 C CNN -F 2 "" H 3000 2550 60 0001 C CNN -F 3 "" H 3000 2550 60 0001 C CNN - 1 3000 2550 +P 2000 2250 +F 0 "#PWR08" H 2000 2250 30 0001 C CNN +F 1 "GND" H 2000 2180 30 0001 C CNN +F 2 "" H 2000 2250 60 0001 C CNN +F 3 "" H 2000 2250 60 0001 C CNN + 1 2000 2250 -1 0 0 -1 $EndComp -Wire Wire Line - 3000 2350 3000 2550 -Wire Wire Line - 2000 2200 2800 2200 -Wire Wire Line - 2800 2200 2800 2450 -Wire Wire Line - 2800 2450 3000 2450 -Connection ~ 3000 2450 $Comp L ecc83_schlib:GND #PWR09 U 1 1 550EAF5A @@ -376,4 +367,22 @@ NoConn ~ 6100 7000 NoConn ~ 6100 7100 NoConn ~ 6100 7200 NoConn ~ 6100 7300 +Wire Wire Line + 3400 2000 6300 2000 +Wire Wire Line + 2400 3500 2600 3500 +Wire Wire Line + 5700 4250 5900 4250 +Wire Wire Line + 6200 3700 6200 3850 +Wire Wire Line + 7300 3000 7800 3000 +Wire Wire Line + 6200 3000 6200 3200 +Wire Wire Line + 3000 2000 3400 2000 +Wire Wire Line + 2100 2200 2000 2200 +Wire Wire Line + 2000 2250 2000 2200 $EndSCHEMATC diff --git a/demos/ecc83/ecc83-pp_v2-cache.lib b/demos/ecc83/ecc83-pp_v2-cache.lib index 0e96fbf76b..14254a37db 100644 --- a/demos/ecc83/ecc83-pp_v2-cache.lib +++ b/demos/ecc83/ecc83-pp_v2-cache.lib @@ -1,11 +1,11 @@ EESchema-LIBRARY Version 2.4 #encoding utf-8 # -# C +# ecc83_schlib:C # -DEF C C 0 10 N Y 1 F N +DEF ecc83_schlib: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 +F1 "ecc83_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 @@ -23,11 +23,11 @@ X ~ 2 0 -150 110 U 40 40 1 1 P ENDDRAW ENDDEF # -# CONN_1 +# ecc83_schlib:CONN_1 # -DEF ~CONN_1 P 0 30 N N 1 F N +DEF ~ecc83_schlib:CONN_1 P 0 30 N N 1 F N F0 "P" 80 0 40 H V L CNN -F1 "CONN_1" 0 55 30 H I C CNN +F1 "ecc83_schlib:CONN_1" 0 55 30 H I C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW @@ -37,11 +37,11 @@ X 1 1 -150 0 100 R 60 60 1 1 P ENDDRAW ENDDEF # -# CONN_2 +# ecc83_schlib:CONN_2 # -DEF CONN_2 P 0 40 Y N 1 F N +DEF ecc83_schlib: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 +F1 "ecc83_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 @@ -51,11 +51,34 @@ X PM 2 -350 -100 250 R 60 60 1 1 P I ENDDRAW ENDDEF # -# ECC81 +# ecc83_schlib:CP # -DEF ECC81 U 0 0 Y Y 3 L N +DEF ecc83_schlib:CP C 0 10 N Y 1 F N +F0 "C" 25 100 50 H V L CNN +F1 "ecc83_schlib:CP" 25 -100 50 H V L CNN +F2 "" 38 -150 50 H I C CNN +F3 "" 0 0 50 H I C CNN +$FPLIST + CP_* +$ENDFPLIST +DRAW +S -90 20 -90 40 0 1 0 N +S -90 20 90 20 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 +P 2 0 1 0 -70 90 -30 90 N +P 2 0 1 0 -50 110 -50 70 N +X ~ 1 0 150 110 D 50 50 1 1 P +X ~ 2 0 -150 110 U 50 50 1 1 P +ENDDRAW +ENDDEF +# +# ecc83_schlib:ECC83 +# +DEF ecc83_schlib:ECC83 U 0 0 Y Y 3 L N F0 "U" 130 310 50 H V C CNN -F1 "ECC81" 350 -300 50 H V C CNN +F1 "ecc83_schlib:ECC83" 350 -300 50 H V C CNN F2 "VALVE-NOVAL_P" 400 -350 30 H I C CNN F3 "" 0 0 60 H V C CNN ALIAS ECC83 @@ -94,11 +117,11 @@ X F2 9 0 -450 200 U 40 40 3 1 I ENDDRAW ENDDEF # -# GND +# ecc83_schlib:GND # -DEF GND #PWR 0 0 Y Y 1 F P +DEF ecc83_schlib:GND #PWR 0 0 Y Y 1 F P F0 "#PWR" 0 -250 50 H I C CNN -F1 "GND" 0 -150 50 H V C CNN +F1 "ecc83_schlib:GND" 0 -150 50 H V C CNN F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW @@ -107,11 +130,11 @@ X GND 1 0 0 0 D 50 50 1 1 W N ENDDRAW ENDDEF # -# PWR_FLAG +# ecc83_schlib:PWR_FLAG # -DEF PWR_FLAG #FLG 0 0 N N 1 F P +DEF ecc83_schlib: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 +F1 "ecc83_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 @@ -120,11 +143,11 @@ X pwr 1 0 0 0 U 20 20 0 0 w ENDDRAW ENDDEF # -# R +# ecc83_schlib:R # -DEF R R 0 0 N Y 1 F N +DEF ecc83_schlib: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 +F1 "ecc83_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 diff --git a/demos/ecc83/ecc83-pp_v2.kicad_pcb b/demos/ecc83/ecc83-pp_v2.kicad_pcb index 890c85f035..65e4a18040 100644 --- a/demos/ecc83/ecc83-pp_v2.kicad_pcb +++ b/demos/ecc83/ecc83-pp_v2.kicad_pcb @@ -1,9 +1,6 @@ -(kicad_pcb (version 4) (host pcbnew "(2015-03-04 BZR 5478)-product") +(kicad_pcb (version 20171130) (host pcbnew "(2017-12-14 revision b47a06e)-master") (general - (links 21) - (no_connects 1) - (area 119.824499 90.614499 168.465501 132.905501) (thickness 1.6002) (drawings 4) (tracks 49) @@ -29,6 +26,10 @@ (42 Eco1.User user) (43 Eco2.User user) (44 Edge.Cuts user) + (46 B.CrtYd user) + (47 F.CrtYd user) + (48 B.Fab user) + (49 F.Fab user) ) (setup @@ -58,14 +59,17 @@ (mod_edge_width 0.381) (mod_text_size 1.524 1.524) (mod_text_width 0.3048) - (pad_size 4.50088 4.50088) - (pad_drill 3.0988) + (pad_size 4.064 4.064) + (pad_drill 3.048) (pad_to_mask_clearance 0.1) (aux_axis_origin 0 0) (visible_elements 7FFFFFFF) (pcbplotparams (layerselection 0x00030_80000001) (usegerberextensions true) + (usegerberattributes false) + (usegerberadvancedattributes false) + (creategerberjobfile false) (excludeedgelayer true) (linewidth 0.150000) (plotframeref false) @@ -75,7 +79,6 @@ (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) - (hpglpenoverlay 2) (psnegative false) (psa4output false) (plotreference true) @@ -127,12 +130,328 @@ (add_net "Net-(R2-Pad1)") ) + (module connect:1pin (layer Dessus) (tedit 5A325A26) (tstamp 54A583DE) + (at 123.19 129.54) + (descr "module 1 pin (ou trou mecanique de percage)") + (tags DEV) + (path /54A58391) + (fp_text reference P8 (at 0 -3.048) (layer F.SilkS) + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) + (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.15)) + (fp_circle (center 0 0) (end 3 0) (layer B.CrtYd) (width 0.15)) + (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 13 "Net-(P8-Pad1)")) + ) + + (module connect:1pin (layer Dessus) (tedit 5A325A0B) (tstamp 54A583DA) + (at 165.1 129.54) + (descr "module 1 pin (ou trou mecanique de percage)") + (tags DEV) + (path /54A5837A) + (fp_text reference P7 (at 0 -3.048) (layer F.SilkS) + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) + (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.15)) + (fp_circle (center 0 0) (end 3 0) (layer B.CrtYd) (width 0.15)) + (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 12 "Net-(P7-Pad1)")) + ) + + (module connect:1pin (layer Dessus) (tedit 5A325A37) (tstamp 54A583D6) + (at 165.1 93.98) + (descr "module 1 pin (ou trou mecanique de percage)") + (tags DEV) + (path /54A58363) + (fp_text reference P6 (at 0 -3.048) (layer F.SilkS) + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) + (fp_circle (center 0 0) (end 3 0) (layer F.CrtYd) (width 0.15)) + (fp_circle (center 0 0) (end 3 0) (layer B.CrtYd) (width 0.15)) + (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 11 "Net-(P6-Pad1)")) + ) + + (module connect:1pin (layer Dessus) (tedit 5A325A31) (tstamp 54A583D2) + (at 123.19 93.98) + (descr "module 1 pin (ou trou mecanique de percage)") + (tags DEV) + (path /54A5830A) + (fp_text reference P5 (at 0 -3.048) (layer F.SilkS) + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide + (effects (font (size 1.016 1.016) (thickness 0.254))) + ) + (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) + (fp_circle (center 0 0) (end 3 0.2) (layer F.CrtYd) (width 0.15)) + (fp_circle (center 0 0) (end 3 0) (layer B.CrtYd) (width 0.15)) + (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask) + (net 10 "Net-(P5-Pad1)")) + ) + + (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer Dessus) (tedit 59FED5CC) (tstamp 5A38C77F) + (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") + (path /4549F464) + (fp_text reference P1 (at 0 -2.33) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value IN (at 0 4.87) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_text user %R (at 0 1.27 90) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 1 GND)) + (pad 2 thru_hole oval (at 0 2.54) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 5 "Net-(P1-Pad2)")) + (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer Dessus) (tedit 59FED5CC) (tstamp 5A38C89B) + (at 150.495 128.905 270) + (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x02 2.54mm single row") + (path /456A8ACC) + (fp_text reference P4 (at 0 -2.33 270) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value CONN_2 (at 0 4.87 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_text user %R (at 0 1.27) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 6 "Net-(P4-Pad1)")) + (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)")) + (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer Dessus) (tedit 59FED5CC) (tstamp 5A3805EE) + (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") + (path /4549F4A5) + (fp_text reference P3 (at 0 -2.33 180) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value POWER (at 0 4.87 180) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text user %R (at 0 1.27 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) + (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) + (pad 2 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 1 GND)) + (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 2 "Net-(C1-Pad1)")) + (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer Dessus) (tedit 59FED5CC) (tstamp 5A3805D9) + (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") + (path /4549F46C) + (fp_text reference P2 (at 0 -2.33 180) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value OUT (at 0 4.87 180) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1)) + (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1)) + (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05)) + (fp_text user %R (at 0 1.27 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 3 "Net-(C2-Pad1)")) + (pad 2 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask) + (net 1 GND)) + (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Capacitors_THT:C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal (layer Dessus) (tedit 5A142A3B) (tstamp 5A34CCF9) + (at 131.445 108.585 270) + (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") + (path /4549F3BE) + (fp_text reference C2 (at 10 -4.31 270) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value 680nF (at 10 4.31 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_line (start 4 -3.25) (end 4 3.25) (layer F.Fab) (width 0.1)) + (fp_line (start 4 3.25) (end 16 3.25) (layer F.Fab) (width 0.1)) + (fp_line (start 16 3.25) (end 16 -3.25) (layer F.Fab) (width 0.1)) + (fp_line (start 16 -3.25) (end 4 -3.25) (layer F.Fab) (width 0.1)) + (fp_line (start 0 0) (end 4 0) (layer F.Fab) (width 0.1)) + (fp_line (start 20 0) (end 16 0) (layer F.Fab) (width 0.1)) + (fp_line (start 3.94 -3.31) (end 3.94 3.31) (layer F.SilkS) (width 0.12)) + (fp_line (start 3.94 3.31) (end 16.06 3.31) (layer F.SilkS) (width 0.12)) + (fp_line (start 16.06 3.31) (end 16.06 -3.31) (layer F.SilkS) (width 0.12)) + (fp_line (start 16.06 -3.31) (end 3.94 -3.31) (layer F.SilkS) (width 0.12)) + (fp_line (start 0.98 0) (end 3.94 0) (layer F.SilkS) (width 0.12)) + (fp_line (start 19.02 0) (end 16.06 0) (layer F.SilkS) (width 0.12)) + (fp_line (start -1.05 -3.6) (end -1.05 3.6) (layer F.CrtYd) (width 0.05)) + (fp_line (start -1.05 3.6) (end 21.05 3.6) (layer F.CrtYd) (width 0.05)) + (fp_line (start 21.05 3.6) (end 21.05 -3.6) (layer F.CrtYd) (width 0.05)) + (fp_line (start 21.05 -3.6) (end -1.05 -3.6) (layer F.CrtYd) (width 0.05)) + (fp_text user %R (at 10 0 270) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (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)")) + (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)")) + (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (module Valve:Valve_ECC-83-2 (layer Dessus) (tedit 5A3250E4) (tstamp 54A5A6B2) + (at 149.28 109.23) + (descr "Valve ECC-83-2 flat pins") + (tags "Valve ECC-83-2 flat pins") + (path /48B4F266) + (fp_text reference U1 (at -3.45 -16.18) (layer F.SilkS) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_text value ECC83 (at -3.45 6.68) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.12)) + (fp_circle (center 0 0) (end 0 -10.5) (layer F.CrtYd) (width 0.05)) + (fp_circle (center 0 0) (end 0 -10.25) (layer F.Fab) (width 0.1)) + (fp_text user %R (at 0 -8.5) (layer F.Fab) + (effects (font (size 1 1) (thickness 0.15))) + ) + (pad "" thru_hole circle (at 0 0) (size 4.5 4.5) (drill 3.1) (layers *.Cu *.Mask)) + (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)")) + (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)")) + (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)")) + (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)")) + (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)")) + (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)")) + (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)")) + (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)")) + (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)")) + (model ${KISYS3DMOD}/Valve.3dshapes/Valve-ECC-83-2.wrl + (at (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (module discret:C2V10 (layer Dessus) (tedit 54A58223) (tstamp 54A58357) (at 131.445 99.06 90) (descr "Condensateur polarise") (tags CP) (path /4549F4BE) - (fp_text reference C1 (at 0 2.54 90) (layer F.SilkS) + (fp_text reference C1 (at 0 2.54 180) (layer F.SilkS) (effects (font (size 1.27 1.27) (thickness 0.254))) ) (fp_text value 10uF (at 0 -2.54 90) (layer F.SilkS) @@ -150,143 +469,6 @@ ) ) - (module discret:CP8 (layer Dessus) (tedit 54A58223) (tstamp 54A5835C) - (at 131.445 118.745 270) - (descr "Condensateur polarise") - (tags CP) - (path /4549F3BE) - (fp_text reference C2 (at 1.27 1.27 270) (layer F.SilkS) - (effects (font (thickness 0.3048))) - ) - (fp_text value 680nF (at 1.27 -1.27 270) (layer F.SilkS) - (effects (font (thickness 0.3048))) - ) - (fp_line (start -10.16 0) (end -8.89 0) (layer F.SilkS) (width 0.3048)) - (fp_line (start -7.62 1.27) (end -8.89 1.27) (layer F.SilkS) (width 0.3048)) - (fp_line (start -8.89 1.27) (end -8.89 -1.27) (layer F.SilkS) (width 0.3048)) - (fp_line (start -8.89 -1.27) (end -7.62 -1.27) (layer F.SilkS) (width 0.3048)) - (fp_line (start -7.62 2.54) (end -7.62 -2.54) (layer F.SilkS) (width 0.3048)) - (fp_line (start -7.62 -2.54) (end 8.89 -2.54) (layer F.SilkS) (width 0.3048)) - (fp_line (start 8.89 -2.54) (end 8.89 2.54) (layer F.SilkS) (width 0.3048)) - (fp_line (start 8.89 2.54) (end -7.62 2.54) (layer F.SilkS) (width 0.3048)) - (fp_line (start 8.89 0) (end 10.16 0) (layer F.SilkS) (width 0.3048)) - (fp_line (start -5.08 -2.54) (end -5.08 2.54) (layer F.SilkS) (width 0.3048)) - (fp_line (start -6.35 2.54) (end -6.35 -2.54) (layer F.SilkS) (width 0.3048)) - (pad 1 thru_hole rect (at -10.16 0 270) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 3 "Net-(C2-Pad1)")) - (pad 2 thru_hole circle (at 10.16 0 270) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS) - (net 4 "Net-(C2-Pad2)")) - (model Discret.3dshapes/CP6.wrl - (at (xyz 0 0 0)) - (scale (xyz 0.8 0.8 0.8)) - (rotate (xyz 0 0 0)) - ) - ) - - (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58361) - (at 165.1 111.76 270) - (descr "Connecteurs 2 pins") - (tags "CONN DEV") - (path /4549F464) - (fp_text reference P1 (at 0 -1.905 270) (layer F.SilkS) - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_text value IN (at 0 -1.905 270) (layer F.SilkS) hide - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524)) - (pad 1 thru_hole rect (at -1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 5 "Net-(P1-Pad2)")) - (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58366) - (at 123.19 109.855 90) - (descr "Connecteurs 2 pins") - (tags "CONN DEV") - (path /4549F46C) - (fp_text reference P2 (at 0 -1.905 90) (layer F.SilkS) - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_text value OUT (at 0 -1.905 90) (layer F.SilkS) hide - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524)) - (pad 1 thru_hole rect (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 3 "Net-(C2-Pad1)")) - (pad 2 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A5836B) - (at 123.19 101.6 90) - (descr "Connecteurs 2 pins") - (tags "CONN DEV") - (path /4549F4A5) - (fp_text reference P3 (at 0 -1.905 90) (layer F.SilkS) - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_text value POWER (at 0 -1.905 90) (layer F.SilkS) hide - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524)) - (pad 1 thru_hole rect (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 2 "Net-(C1-Pad1)")) - (pad 2 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 1 GND)) - (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - - (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58370) - (at 149.225 128.905 180) - (descr "Connecteurs 2 pins") - (tags "CONN DEV") - (path /456A8ACC) - (fp_text reference P4 (at 0 -1.905 180) (layer F.SilkS) - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_text value CONN_2 (at 0 -1.905 180) (layer F.SilkS) hide - (effects (font (size 0.762 0.762) (thickness 0.1524))) - ) - (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524)) - (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524)) - (pad 1 thru_hole rect (at -1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 6 "Net-(P4-Pad1)")) - (pad 2 thru_hole circle (at 1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS) - (net 7 "Net-(P4-Pad2)")) - (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - (module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58389) (at 140.97 125.095 270) (descr "Resitance 3 pas") @@ -411,106 +593,6 @@ ) ) - (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583D2) - (at 123.19 93.98) - (descr "module 1 pin (ou trou mecanique de percage)") - (tags DEV) - (path /54A5830A) - (fp_text reference P5 (at 0 -3.048) (layer F.SilkS) - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) - (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS) - (net 10 "Net-(P5-Pad1)")) - ) - - (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583D6) - (at 165.1 93.98) - (descr "module 1 pin (ou trou mecanique de percage)") - (tags DEV) - (path /54A58363) - (fp_text reference P6 (at 0 -3.048) (layer F.SilkS) - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) - (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS) - (net 11 "Net-(P6-Pad1)")) - ) - - (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583DA) - (at 165.1 129.54) - (descr "module 1 pin (ou trou mecanique de percage)") - (tags DEV) - (path /54A5837A) - (fp_text reference P7 (at 0 -3.048) (layer F.SilkS) - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) - (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS) - (net 12 "Net-(P7-Pad1)")) - ) - - (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583DE) - (at 123.19 129.54) - (descr "module 1 pin (ou trou mecanique de percage)") - (tags DEV) - (path /54A58391) - (fp_text reference P8 (at 0 -3.048) (layer F.SilkS) - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide - (effects (font (size 1.016 1.016) (thickness 0.254))) - ) - (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381)) - (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS) - (net 13 "Net-(P8-Pad1)")) - ) - - (module Valves:VALVE-ECC-83-2 (layer Dessus) (tedit 54FC7E9D) (tstamp 54A5A6B2) - (at 149.3 109.2) - (path /48B4F266) - (fp_text reference U1 (at 0 -11.43) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) - ) - (fp_text value ECC83 (at 0 11.43) (layer F.SilkS) - (effects (font (size 1 1) (thickness 0.15))) - ) - (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.15)) - (pad 1 thru_hole oval (at 3.4544 4.75488 306) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 8 "Net-(R1-Pad1)")) - (pad 2 thru_hole oval (at 5.60832 1.8288 342) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 5 "Net-(P1-Pad2)")) - (pad 3 thru_hole oval (at 5.60832 -1.8288 18) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 9 "Net-(R2-Pad1)")) - (pad 4 thru_hole oval (at 3.4544 -4.75488 54) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 6 "Net-(P4-Pad1)")) - (pad 5 thru_hole oval (at 0 -5.8928 90) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 6 "Net-(P4-Pad1)")) - (pad 6 thru_hole oval (at -3.4544 -4.75488 306) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 2 "Net-(C1-Pad1)")) - (pad 7 thru_hole oval (at -5.60832 -1.8288 342) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 8 "Net-(R1-Pad1)")) - (pad 8 thru_hole oval (at -5.60832 1.78816 18) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 4 "Net-(C2-Pad2)")) - (pad 9 thru_hole oval (at -3.4544 4.75488 54) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS) - (net 7 "Net-(P4-Pad2)")) - (pad 0 thru_hole circle (at 0 0) (size 4.50088 4.50088) (drill 3.0988) (layers *.Cu *.Mask F.SilkS)) - (model Valves.3dshapes/VALVE-ECC-83-2.wrl - (at (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - (gr_line (start 168.275 132.715) (end 120.015 132.715) (angle 90) (layer Edge.Cuts) (width 0.381)) (gr_line (start 168.275 90.805) (end 120.015 90.805) (angle 90) (layer Edge.Cuts) (width 0.381)) (gr_line (start 168.275 90.805) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.381)) @@ -526,7 +608,7 @@ (segment (start 123.19 114.3) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 20)) (segment (start 123.825 114.935) (end 123.19 114.3) (width 0.8636) (layer Dessous) (net 3) (status 10)) (segment (start 131.445 108.585) (end 128.905 111.125) (width 0.8636) (layer Dessous) (net 3) (status 810)) - (segment (start 128.905 111.125) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 420)) + (segment (start 128.905 111.125) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (tstamp 5A380672) (status 420)) (segment (start 142.875 116.205) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4)) (segment (start 142.875 112.395) (end 142.875 116.205) (width 0.8636) (layer Dessous) (net 4)) (segment (start 143.61668 111.65332) (end 142.875 112.395) (width 0.8636) (layer Dessous) (net 4) (status 10)) @@ -577,113 +659,109 @@ ) (filled_polygon (pts - (xy 167.3225 127.811617) (xy 166.68474 127.172743) (xy 166.192271 126.968252) (xy 166.192271 123.96054) (xy 166.160996 123.532229) - (xy 166.057258 123.281783) (xy 165.892676 123.206541) (xy 165.718459 123.380758) (xy 165.718459 123.032324) (xy 165.643217 122.867742) - (xy 165.23554 122.732729) (xy 164.807229 122.764004) (xy 164.556783 122.867742) (xy 164.481541 123.032324) (xy 165.1 123.650783) - (xy 165.718459 123.032324) (xy 165.718459 123.380758) (xy 165.274217 123.825) (xy 165.892676 124.443459) (xy 166.057258 124.368217) - (xy 166.192271 123.96054) (xy 166.192271 126.968252) (xy 165.718459 126.771508) (xy 165.718459 124.617676) (xy 165.1 123.999217) - (xy 164.925783 124.173434) (xy 164.925783 123.825) (xy 164.307324 123.206541) (xy 164.142742 123.281783) (xy 164.007729 123.68946) - (xy 164.039004 124.117771) (xy 164.142742 124.368217) (xy 164.307324 124.443459) (xy 164.925783 123.825) (xy 164.925783 124.173434) - (xy 164.481541 124.617676) (xy 164.556783 124.782258) (xy 164.96446 124.917271) (xy 165.392771 124.885996) (xy 165.643217 124.782258) - (xy 165.718459 124.617676) (xy 165.718459 126.771508) (xy 165.658199 126.746486) (xy 164.546677 126.745516) (xy 163.519394 127.169981) - (xy 162.732743 127.95526) (xy 162.306486 128.981801) (xy 162.305516 130.093323) (xy 162.729981 131.120606) (xy 163.370755 131.7625) - (xy 155.040788 131.7625) (xy 155.784144 131.019144) (xy 156.042927 130.631848) (xy 156.042927 130.631847) (xy 156.1338 130.175) - (xy 156.1338 116.23548) (xy 156.042927 115.778633) (xy 156.042927 115.778632) (xy 155.784144 115.391336) (xy 154.780713 114.387905) - (xy 154.957722 113.908101) (xy 154.934257 113.3109) (xy 155.544695 113.13874) (xy 156.089502 112.709248) (xy 156.350837 112.2426) - (xy 159.449312 112.2426) (xy 161.080856 113.874144) (xy 161.468153 114.132927) (xy 161.925 114.2238) (xy 163.9062 114.2238) - (xy 163.9062 115.333059) (xy 163.86257 115.376613) (xy 163.639754 115.913214) (xy 163.639247 116.494237) (xy 163.861126 117.031226) - (xy 164.271613 117.44243) (xy 164.808214 117.665246) (xy 165.389237 117.665753) (xy 165.926226 117.443874) (xy 166.33743 117.033387) - (xy 166.560246 116.496786) (xy 166.560753 115.915763) (xy 166.338874 115.378774) (xy 166.2938 115.333621) (xy 166.2938 113.991665) - (xy 166.391231 113.894404) (xy 166.623735 113.334472) (xy 166.624264 112.728188) (xy 166.392738 112.167851) (xy 165.964404 111.738769) - (xy 165.709683 111.633) (xy 165.786214 111.633) (xy 165.937785 111.633) (xy 166.077819 111.574996) (xy 166.184996 111.46782) - (xy 166.243 111.327786) (xy 166.243 110.70844) (xy 166.243 110.27156) (xy 166.243 109.652214) (xy 166.184996 109.51218) - (xy 166.077819 109.405004) (xy 165.937785 109.347) (xy 165.786214 109.347) (xy 165.31844 109.347) (xy 165.22319 109.44225) - (xy 165.22319 110.36681) (xy 166.14775 110.36681) (xy 166.243 110.27156) (xy 166.243 110.70844) (xy 166.14775 110.61319) - (xy 165.22319 110.61319) (xy 165.22319 110.63319) (xy 164.97681 110.63319) (xy 164.97681 110.61319) (xy 164.97681 110.36681) - (xy 164.97681 109.44225) (xy 164.88156 109.347) (xy 164.413786 109.347) (xy 164.262215 109.347) (xy 164.122181 109.405004) - (xy 164.015004 109.51218) (xy 163.957 109.652214) (xy 163.957 110.27156) (xy 164.05225 110.36681) (xy 164.97681 110.36681) - (xy 164.97681 110.61319) (xy 164.05225 110.61319) (xy 163.957 110.70844) (xy 163.957 111.327786) (xy 164.015004 111.46782) - (xy 164.122181 111.574996) (xy 164.262215 111.633) (xy 164.413786 111.633) (xy 164.490184 111.633) (xy 164.237851 111.737262) - (xy 164.13874 111.8362) (xy 162.419488 111.8362) (xy 160.787944 110.204656) (xy 160.400648 109.945873) (xy 159.9438 109.855) - (xy 156.708227 109.855) (xy 156.66335 109.695875) (xy 156.272432 109.2) (xy 156.66335 108.704125) (xy 156.696946 108.585) - (xy 164.35005 108.585) (xy 164.808214 108.775246) (xy 165.389237 108.775753) (xy 165.926226 108.553874) (xy 166.33743 108.143387) - (xy 166.560246 107.606786) (xy 166.560753 107.025763) (xy 166.338874 106.488774) (xy 166.192271 106.341914) (xy 166.192271 99.83054) - (xy 166.160996 99.402229) (xy 166.057258 99.151783) (xy 165.892676 99.076541) (xy 165.718459 99.250758) (xy 165.718459 98.902324) - (xy 165.643217 98.737742) (xy 165.23554 98.602729) (xy 164.807229 98.634004) (xy 164.556783 98.737742) (xy 164.481541 98.902324) - (xy 165.1 99.520783) (xy 165.718459 98.902324) (xy 165.718459 99.250758) (xy 165.274217 99.695) (xy 165.892676 100.313459) - (xy 166.057258 100.238217) (xy 166.192271 99.83054) (xy 166.192271 106.341914) (xy 165.928387 106.07757) (xy 165.718459 105.9904) - (xy 165.718459 100.487676) (xy 165.1 99.869217) (xy 164.925783 100.043434) (xy 164.925783 99.695) (xy 164.307324 99.076541) - (xy 164.142742 99.151783) (xy 164.007729 99.55946) (xy 164.039004 99.987771) (xy 164.142742 100.238217) (xy 164.307324 100.313459) - (xy 164.925783 99.695) (xy 164.925783 100.043434) (xy 164.481541 100.487676) (xy 164.556783 100.652258) (xy 164.96446 100.787271) - (xy 165.392771 100.755996) (xy 165.643217 100.652258) (xy 165.718459 100.487676) (xy 165.718459 105.9904) (xy 165.391786 105.854754) - (xy 164.810763 105.854247) (xy 164.273774 106.076126) (xy 164.152288 106.1974) (xy 156.373238 106.1974) (xy 156.089502 105.690752) - (xy 155.544695 105.26126) (xy 154.934257 105.089099) (xy 154.957722 104.491899) (xy 154.717607 103.841037) (xy 154.246695 103.331607) - (xy 153.352271 102.681769) (xy 152.722255 102.391327) (xy 152.218734 102.371543) (xy 152.218733 102.371543) (xy 151.998328 102.224273) - (xy 151.54148 102.1334) (xy 151.165771 102.1334) (xy 151.110021 102.049964) (xy 150.533196 101.664542) (xy 149.852785 101.5292) - (xy 148.747215 101.5292) (xy 148.066804 101.664542) (xy 147.489979 102.049964) (xy 147.13985 102.573968) (xy 146.570951 102.364091) - (xy 145.877744 102.391328) (xy 145.540546 102.546778) (xy 143.749624 100.755856) (xy 143.362328 100.497073) (xy 142.90548 100.4062) - (xy 133.045192 100.4062) (xy 132.886808 100.165087) (xy 132.727151 100.057317) (xy 132.727151 96.701126) (xy 132.698867 96.196681) - (xy 132.560239 95.862003) (xy 132.375891 95.763326) (xy 132.201674 95.937543) (xy 132.201674 95.589109) (xy 132.102997 95.404761) - (xy 131.626126 95.237849) (xy 131.121681 95.266133) (xy 130.787003 95.404761) (xy 130.688326 95.589109) (xy 131.445 96.345783) - (xy 132.201674 95.589109) (xy 132.201674 95.937543) (xy 131.619217 96.52) (xy 132.375891 97.276674) (xy 132.560239 97.177997) - (xy 132.727151 96.701126) (xy 132.727151 100.057317) (xy 132.633568 99.994148) (xy 132.334 99.934072) (xy 132.201674 99.934072) - (xy 132.201674 97.450891) (xy 131.445 96.694217) (xy 131.270783 96.868434) (xy 131.270783 96.52) (xy 130.514109 95.763326) - (xy 130.329761 95.862003) (xy 130.162849 96.338874) (xy 130.191133 96.843319) (xy 130.329761 97.177997) (xy 130.514109 97.276674) - (xy 131.270783 96.52) (xy 131.270783 96.868434) (xy 130.688326 97.450891) (xy 130.787003 97.635239) (xy 131.263874 97.802151) - (xy 131.768319 97.773867) (xy 132.102997 97.635239) (xy 132.201674 97.450891) (xy 132.201674 99.934072) (xy 130.556 99.934072) - (xy 130.265452 99.990445) (xy 130.010087 100.158192) (xy 129.842679 100.4062) (xy 125.73 100.4062) (xy 125.273152 100.497073) - (xy 124.885856 100.755856) (xy 124.345603 101.296108) (xy 124.345603 100.480745) (xy 124.315325 100.02704) (xy 124.19995 99.7485) - (xy 124.028783 99.665433) (xy 123.854567 99.839649) (xy 123.854567 99.491217) (xy 123.7715 99.32005) (xy 123.340745 99.174397) - (xy 122.88704 99.204675) (xy 122.6085 99.32005) (xy 122.525433 99.491217) (xy 123.19 100.155783) (xy 123.854567 99.491217) - (xy 123.854567 99.839649) (xy 123.364217 100.33) (xy 124.028783 100.994567) (xy 124.19995 100.9115) (xy 124.345603 100.480745) - (xy 124.345603 101.296108) (xy 124.250731 101.39098) (xy 123.952 101.331072) (xy 123.775808 101.331072) (xy 123.854567 101.168783) - (xy 123.19 100.504217) (xy 123.015783 100.678433) (xy 123.015783 100.33) (xy 122.351217 99.665433) (xy 122.18005 99.7485) - (xy 122.034397 100.179255) (xy 122.064675 100.63296) (xy 122.18005 100.9115) (xy 122.351217 100.994567) (xy 123.015783 100.33) - (xy 123.015783 100.678433) (xy 122.525433 101.168783) (xy 122.604191 101.331072) (xy 122.428 101.331072) (xy 122.137452 101.387445) - (xy 121.882087 101.555192) (xy 121.711148 101.808432) (xy 121.651072 102.108) (xy 121.651072 103.632) (xy 121.707445 103.922548) - (xy 121.875192 104.177913) (xy 122.128432 104.348852) (xy 122.428 104.408928) (xy 123.952 104.408928) (xy 124.242548 104.352555) - (xy 124.497913 104.184808) (xy 124.598142 104.036321) (xy 124.916847 103.972927) (xy 124.916848 103.972927) (xy 125.304144 103.714144) - (xy 126.224488 102.7938) (xy 129.844807 102.7938) (xy 130.003192 103.034913) (xy 130.256432 103.205852) (xy 130.556 103.265928) - (xy 132.334 103.265928) (xy 132.624548 103.209555) (xy 132.879913 103.041808) (xy 133.04732 102.7938) (xy 142.410992 102.7938) - (xy 143.768082 104.15089) (xy 143.642278 104.4919) (xy 143.665741 105.089099) (xy 143.055305 105.261261) (xy 142.510498 105.690752) - (xy 142.226761 106.1974) (xy 142.1638 106.1974) (xy 141.706952 106.288273) (xy 141.319656 106.547056) (xy 140.125856 107.740856) - (xy 139.867073 108.128152) (xy 139.7762 108.585) (xy 139.7762 120.413059) (xy 139.73257 120.456613) (xy 139.509754 120.993214) - (xy 139.509247 121.574237) (xy 139.731126 122.111226) (xy 139.7762 122.156378) (xy 139.7762 123.330512) (xy 138.570512 124.5362) - (xy 133.110928 124.5362) (xy 133.110928 109.474) (xy 133.110928 107.696) (xy 133.054555 107.405452) (xy 132.886808 107.150087) - (xy 132.633568 106.979148) (xy 132.334 106.919072) (xy 130.556 106.919072) (xy 130.265452 106.975445) (xy 130.010087 107.143192) - (xy 129.839148 107.396432) (xy 129.779072 107.696) (xy 129.779072 108.56264) (xy 128.410512 109.9312) (xy 124.579767 109.9312) - (xy 124.504808 109.817087) (xy 124.345603 109.709622) (xy 124.345603 108.735745) (xy 124.315325 108.28204) (xy 124.19995 108.0035) - (xy 124.028783 107.920433) (xy 123.854567 108.094649) (xy 123.854567 107.746217) (xy 123.7715 107.57505) (xy 123.340745 107.429397) - (xy 122.88704 107.459675) (xy 122.6085 107.57505) (xy 122.525433 107.746217) (xy 123.19 108.410783) (xy 123.854567 107.746217) - (xy 123.854567 108.094649) (xy 123.364217 108.585) (xy 124.028783 109.249567) (xy 124.19995 109.1665) (xy 124.345603 108.735745) - (xy 124.345603 109.709622) (xy 124.251568 109.646148) (xy 123.952 109.586072) (xy 123.775808 109.586072) (xy 123.854567 109.423783) - (xy 123.19 108.759217) (xy 123.015783 108.933433) (xy 123.015783 108.585) (xy 122.351217 107.920433) (xy 122.18005 108.0035) - (xy 122.034397 108.434255) (xy 122.064675 108.88796) (xy 122.18005 109.1665) (xy 122.351217 109.249567) (xy 123.015783 108.585) - (xy 123.015783 108.933433) (xy 122.525433 109.423783) (xy 122.604191 109.586072) (xy 122.428 109.586072) (xy 122.137452 109.642445) - (xy 121.882087 109.810192) (xy 121.711148 110.063432) (xy 121.651072 110.363) (xy 121.651072 111.887) (xy 121.707445 112.177548) - (xy 121.875192 112.432913) (xy 121.9962 112.514594) (xy 121.9962 114.3) (xy 122.087073 114.756848) (xy 122.345856 115.144144) - (xy 122.980856 115.779144) (xy 123.368153 116.037927) (xy 123.529353 116.069991) (xy 123.631613 116.17243) (xy 124.168214 116.395246) - (xy 124.749237 116.395753) (xy 125.286226 116.173874) (xy 125.69743 115.763387) (xy 125.920246 115.226786) (xy 125.920753 114.645763) - (xy 125.698874 114.108774) (xy 125.288387 113.69757) (xy 124.751786 113.474754) (xy 124.3838 113.474432) (xy 124.3838 112.514767) - (xy 124.497913 112.439808) (xy 124.579594 112.3188) (xy 128.905 112.3188) (xy 129.361847 112.227927) (xy 129.361848 112.227927) - (xy 129.749144 111.969144) (xy 131.46736 110.250928) (xy 132.334 110.250928) (xy 132.624548 110.194555) (xy 132.879913 110.026808) - (xy 133.050852 109.773568) (xy 133.110928 109.474) (xy 133.110928 124.5362) (xy 130.175 124.5362) (xy 129.718152 124.627073) - (xy 129.330856 124.885856) (xy 128.060856 126.155856) (xy 127.802073 126.543152) (xy 127.7112 127) (xy 127.7112 130.175) - (xy 127.802073 130.631848) (xy 128.060856 131.019144) (xy 128.804212 131.7625) (xy 124.918382 131.7625) (xy 125.557257 131.12474) - (xy 125.983514 130.098199) (xy 125.984484 128.986677) (xy 125.560019 127.959394) (xy 125.552271 127.951632) (xy 125.552271 122.69054) - (xy 125.520996 122.262229) (xy 125.417258 122.011783) (xy 125.252676 121.936541) (xy 125.078459 122.110758) (xy 125.078459 121.762324) - (xy 125.003217 121.597742) (xy 124.59554 121.462729) (xy 124.167229 121.494004) (xy 123.916783 121.597742) (xy 123.841541 121.762324) - (xy 124.46 122.380783) (xy 125.078459 121.762324) (xy 125.078459 122.110758) (xy 124.634217 122.555) (xy 125.252676 123.173459) - (xy 125.417258 123.098217) (xy 125.552271 122.69054) (xy 125.552271 127.951632) (xy 125.078459 127.476992) (xy 125.078459 123.347676) - (xy 124.46 122.729217) (xy 124.285783 122.903434) (xy 124.285783 122.555) (xy 123.667324 121.936541) (xy 123.502742 122.011783) - (xy 123.367729 122.41946) (xy 123.399004 122.847771) (xy 123.502742 123.098217) (xy 123.667324 123.173459) (xy 124.285783 122.555) - (xy 124.285783 122.903434) (xy 123.841541 123.347676) (xy 123.916783 123.512258) (xy 124.32446 123.647271) (xy 124.752771 123.615996) - (xy 125.003217 123.512258) (xy 125.078459 123.347676) (xy 125.078459 127.476992) (xy 124.77474 127.172743) (xy 123.748199 126.746486) - (xy 122.636677 126.745516) (xy 121.609394 127.169981) (xy 120.9675 127.810755) (xy 120.9675 95.708382) (xy 121.60526 96.347257) - (xy 122.631801 96.773514) (xy 123.743323 96.774484) (xy 124.770606 96.350019) (xy 125.557257 95.56474) (xy 125.983514 94.538199) - (xy 125.984484 93.426677) (xy 125.560019 92.399394) (xy 124.919244 91.7575) (xy 163.371617 91.7575) (xy 162.732743 92.39526) - (xy 162.306486 93.421801) (xy 162.305516 94.533323) (xy 162.729981 95.560606) (xy 163.51526 96.347257) (xy 164.541801 96.773514) - (xy 165.653323 96.774484) (xy 166.680606 96.350019) (xy 167.3225 95.709244) (xy 167.3225 127.811617) + (xy 162.732743 92.39526) (xy 162.306486 93.421801) (xy 162.305516 94.533323) (xy 162.729981 95.560606) (xy 163.51526 96.347257) + (xy 164.541801 96.773514) (xy 165.653323 96.774484) (xy 166.680606 96.350019) (xy 167.3225 95.709245) (xy 167.3225 127.811617) + (xy 166.68474 127.172743) (xy 165.658199 126.746486) (xy 164.546677 126.745516) (xy 163.519394 127.169981) (xy 162.732743 127.95526) + (xy 162.306486 128.981801) (xy 162.305516 130.093323) (xy 162.729981 131.120606) (xy 163.370755 131.7625) (xy 155.040788 131.7625) + (xy 155.784144 131.019144) (xy 156.042927 130.631848) (xy 156.1338 130.175) (xy 156.1338 124.617676) (xy 164.481541 124.617676) + (xy 164.556783 124.782258) (xy 164.96446 124.917271) (xy 165.392771 124.885996) (xy 165.643217 124.782258) (xy 165.718459 124.617676) + (xy 165.1 123.999217) (xy 164.481541 124.617676) (xy 156.1338 124.617676) (xy 156.1338 123.68946) (xy 164.007729 123.68946) + (xy 164.039004 124.117771) (xy 164.142742 124.368217) (xy 164.307324 124.443459) (xy 164.925783 123.825) (xy 165.274217 123.825) + (xy 165.892676 124.443459) (xy 166.057258 124.368217) (xy 166.192271 123.96054) (xy 166.160996 123.532229) (xy 166.057258 123.281783) + (xy 165.892676 123.206541) (xy 165.274217 123.825) (xy 164.925783 123.825) (xy 164.307324 123.206541) (xy 164.142742 123.281783) + (xy 164.007729 123.68946) (xy 156.1338 123.68946) (xy 156.1338 123.032324) (xy 164.481541 123.032324) (xy 165.1 123.650783) + (xy 165.718459 123.032324) (xy 165.643217 122.867742) (xy 165.23554 122.732729) (xy 164.807229 122.764004) (xy 164.556783 122.867742) + (xy 164.481541 123.032324) (xy 156.1338 123.032324) (xy 156.1338 116.23548) (xy 156.062126 115.875153) (xy 156.042927 115.778632) + (xy 155.784144 115.391336) (xy 154.769769 114.376961) (xy 154.933969 113.931879) (xy 154.910383 113.331573) (xy 155.515298 113.16097) + (xy 156.059798 112.731719) (xy 156.333718 112.2426) (xy 159.449312 112.2426) (xy 161.080856 113.874144) (xy 161.468153 114.132927) + (xy 161.925 114.2238) (xy 163.9062 114.2238) (xy 163.9062 115.333059) (xy 163.86257 115.376613) (xy 163.639754 115.913214) + (xy 163.639247 116.494237) (xy 163.861126 117.031226) (xy 164.271613 117.44243) (xy 164.808214 117.665246) (xy 165.389237 117.665753) + (xy 165.926226 117.443874) (xy 166.33743 117.033387) (xy 166.560246 116.496786) (xy 166.560753 115.915763) (xy 166.338874 115.378774) + (xy 166.2938 115.333621) (xy 166.2938 114.136387) (xy 166.620875 113.646886) (xy 166.743581 113.03) (xy 166.620875 112.413114) + (xy 166.271437 111.890144) (xy 166.018296 111.721) (xy 166.025786 111.721) (xy 166.16582 111.662996) (xy 166.272996 111.555819) + (xy 166.331 111.415785) (xy 166.331 110.70844) (xy 166.23575 110.61319) (xy 165.22319 110.61319) (xy 165.22319 111.436222) + (xy 165.131581 111.418) (xy 165.068419 111.418) (xy 164.97681 111.436222) (xy 164.97681 110.61319) (xy 163.96425 110.61319) + (xy 163.869 110.70844) (xy 163.869 111.415785) (xy 163.927004 111.555819) (xy 164.03418 111.662996) (xy 164.174214 111.721) + (xy 164.181704 111.721) (xy 164.009296 111.8362) (xy 162.419488 111.8362) (xy 160.787944 110.204656) (xy 160.400648 109.945873) + (xy 159.9438 109.855) (xy 156.674076 109.855) (xy 156.634763 109.715607) (xy 156.515415 109.564215) (xy 163.869 109.564215) + (xy 163.869 110.27156) (xy 163.96425 110.36681) (xy 164.97681 110.36681) (xy 164.97681 109.35425) (xy 165.22319 109.35425) + (xy 165.22319 110.36681) (xy 166.23575 110.36681) (xy 166.331 110.27156) (xy 166.331 109.564215) (xy 166.272996 109.424181) + (xy 166.16582 109.317004) (xy 166.025786 109.259) (xy 165.31844 109.259) (xy 165.22319 109.35425) (xy 164.97681 109.35425) + (xy 164.88156 109.259) (xy 164.174214 109.259) (xy 164.03418 109.317004) (xy 163.927004 109.424181) (xy 163.869 109.564215) + (xy 156.515415 109.564215) (xy 156.247998 109.225) (xy 156.634763 108.734393) (xy 156.676896 108.585) (xy 164.35005 108.585) + (xy 164.808214 108.775246) (xy 165.389237 108.775753) (xy 165.926226 108.553874) (xy 166.33743 108.143387) (xy 166.560246 107.606786) + (xy 166.560753 107.025763) (xy 166.338874 106.488774) (xy 165.928387 106.07757) (xy 165.391786 105.854754) (xy 164.810763 105.854247) + (xy 164.273774 106.076126) (xy 164.152288 106.1974) (xy 156.328118 106.1974) (xy 156.059798 105.718281) (xy 155.515298 105.28903) + (xy 154.910383 105.118427) (xy 154.933969 104.518121) (xy 154.693987 103.867625) (xy 154.22334 103.358482) (xy 153.325646 102.70627) + (xy 152.695985 102.415993) (xy 152.259597 102.398847) (xy 151.998328 102.224273) (xy 151.54148 102.1334) (xy 151.131377 102.1334) + (xy 151.091334 102.073471) (xy 150.514833 101.688266) (xy 149.834805 101.553) (xy 148.725195 101.553) (xy 148.045167 101.688266) + (xy 147.468666 102.073471) (xy 147.117353 102.599249) (xy 146.546832 102.388772) (xy 145.854015 102.415993) (xy 145.549941 102.556173) + (xy 143.749624 100.755856) (xy 143.362328 100.497073) (xy 143.315087 100.487676) (xy 164.481541 100.487676) (xy 164.556783 100.652258) + (xy 164.96446 100.787271) (xy 165.392771 100.755996) (xy 165.643217 100.652258) (xy 165.718459 100.487676) (xy 165.1 99.869217) + (xy 164.481541 100.487676) (xy 143.315087 100.487676) (xy 142.90548 100.4062) (xy 133.046788 100.4062) (xy 132.883371 100.161629) + (xy 132.631317 99.993212) (xy 132.334 99.934072) (xy 130.556 99.934072) (xy 130.258683 99.993212) (xy 130.006629 100.161629) + (xy 129.843212 100.4062) (xy 125.73 100.4062) (xy 125.273152 100.497073) (xy 124.885856 100.755856) (xy 124.338626 101.303086) + (xy 124.337317 101.302212) (xy 124.04 101.243072) (xy 123.994213 101.243072) (xy 124.253318 100.950275) (xy 124.380469 100.643277) + (xy 124.319049 100.45319) (xy 123.31319 100.45319) (xy 123.31319 101.243072) (xy 123.06681 101.243072) (xy 123.06681 100.45319) + (xy 122.060951 100.45319) (xy 121.999531 100.643277) (xy 122.126682 100.950275) (xy 122.385787 101.243072) (xy 122.34 101.243072) + (xy 122.042683 101.302212) (xy 121.790629 101.470629) (xy 121.622212 101.722683) (xy 121.563072 102.02) (xy 121.563072 103.72) + (xy 121.622212 104.017317) (xy 121.790629 104.269371) (xy 122.042683 104.437788) (xy 122.34 104.496928) (xy 124.04 104.496928) + (xy 124.337317 104.437788) (xy 124.589371 104.269371) (xy 124.757788 104.017317) (xy 124.760429 104.004041) (xy 124.916848 103.972927) + (xy 125.304144 103.714144) (xy 126.224488 102.7938) (xy 129.843212 102.7938) (xy 130.006629 103.038371) (xy 130.258683 103.206788) + (xy 130.556 103.265928) (xy 132.334 103.265928) (xy 132.631317 103.206788) (xy 132.883371 103.038371) (xy 133.046788 102.7938) + (xy 142.410992 102.7938) (xy 143.755976 104.138784) (xy 143.616031 104.518121) (xy 143.639617 105.118427) (xy 143.034702 105.28903) + (xy 142.490202 105.718281) (xy 142.221882 106.1974) (xy 142.1638 106.1974) (xy 141.706952 106.288273) (xy 141.319656 106.547056) + (xy 140.125856 107.740856) (xy 139.867073 108.128152) (xy 139.864043 108.143387) (xy 139.7762 108.585) (xy 139.7762 120.413059) + (xy 139.73257 120.456613) (xy 139.509754 120.993214) (xy 139.509247 121.574237) (xy 139.731126 122.111226) (xy 139.7762 122.156379) + (xy 139.7762 123.330512) (xy 138.570512 124.5362) (xy 130.175 124.5362) (xy 129.718152 124.627073) (xy 129.330856 124.885856) + (xy 128.060856 126.155856) (xy 127.802073 126.543152) (xy 127.744433 126.832927) (xy 127.7112 127) (xy 127.7112 130.175) + (xy 127.802073 130.631848) (xy 128.060856 131.019144) (xy 128.804212 131.7625) (xy 124.918383 131.7625) (xy 125.557257 131.12474) + (xy 125.983514 130.098199) (xy 125.984484 128.986677) (xy 125.560019 127.959394) (xy 124.77474 127.172743) (xy 123.748199 126.746486) + (xy 122.636677 126.745516) (xy 121.609394 127.169981) (xy 120.9675 127.810755) (xy 120.9675 123.347676) (xy 123.841541 123.347676) + (xy 123.916783 123.512258) (xy 124.32446 123.647271) (xy 124.752771 123.615996) (xy 125.003217 123.512258) (xy 125.078459 123.347676) + (xy 124.46 122.729217) (xy 123.841541 123.347676) (xy 120.9675 123.347676) (xy 120.9675 122.41946) (xy 123.367729 122.41946) + (xy 123.399004 122.847771) (xy 123.502742 123.098217) (xy 123.667324 123.173459) (xy 124.285783 122.555) (xy 124.634217 122.555) + (xy 125.252676 123.173459) (xy 125.417258 123.098217) (xy 125.552271 122.69054) (xy 125.520996 122.262229) (xy 125.417258 122.011783) + (xy 125.252676 121.936541) (xy 124.634217 122.555) (xy 124.285783 122.555) (xy 123.667324 121.936541) (xy 123.502742 122.011783) + (xy 123.367729 122.41946) (xy 120.9675 122.41946) (xy 120.9675 121.762324) (xy 123.841541 121.762324) (xy 124.46 122.380783) + (xy 125.078459 121.762324) (xy 125.003217 121.597742) (xy 124.59554 121.462729) (xy 124.167229 121.494004) (xy 123.916783 121.597742) + (xy 123.841541 121.762324) (xy 120.9675 121.762324) (xy 120.9675 110.275) (xy 121.563072 110.275) (xy 121.563072 111.975) + (xy 121.622212 112.272317) (xy 121.790629 112.524371) (xy 121.9962 112.661729) (xy 121.9962 114.3) (xy 122.087073 114.756848) + (xy 122.345856 115.144144) (xy 122.980856 115.779144) (xy 123.368153 116.037927) (xy 123.529354 116.069992) (xy 123.631613 116.17243) + (xy 124.168214 116.395246) (xy 124.749237 116.395753) (xy 125.286226 116.173874) (xy 125.69743 115.763387) (xy 125.920246 115.226786) + (xy 125.920753 114.645763) (xy 125.698874 114.108774) (xy 125.288387 113.69757) (xy 124.751786 113.474754) (xy 124.3838 113.474433) + (xy 124.3838 112.661729) (xy 124.589371 112.524371) (xy 124.726729 112.3188) (xy 128.905 112.3188) (xy 129.361848 112.227927) + (xy 129.749144 111.969144) (xy 131.571178 110.14711) (xy 131.754338 110.14727) (xy 132.328646 109.909971) (xy 132.768427 109.470957) + (xy 133.006728 108.897064) (xy 133.00727 108.275662) (xy 132.769971 107.701354) (xy 132.330957 107.261573) (xy 131.757064 107.023272) + (xy 131.135662 107.02273) (xy 130.561354 107.260029) (xy 130.121573 107.699043) (xy 129.883272 108.272936) (xy 129.88311 108.458602) + (xy 128.410512 109.9312) (xy 124.726729 109.9312) (xy 124.589371 109.725629) (xy 124.337317 109.557212) (xy 124.04 109.498072) + (xy 123.994213 109.498072) (xy 124.253318 109.205275) (xy 124.380469 108.898277) (xy 124.319049 108.70819) (xy 123.31319 108.70819) + (xy 123.31319 109.498072) (xy 123.06681 109.498072) (xy 123.06681 108.70819) (xy 122.060951 108.70819) (xy 121.999531 108.898277) + (xy 122.126682 109.205275) (xy 122.385787 109.498072) (xy 122.34 109.498072) (xy 122.042683 109.557212) (xy 121.790629 109.725629) + (xy 121.622212 109.977683) (xy 121.563072 110.275) (xy 120.9675 110.275) (xy 120.9675 108.271723) (xy 121.999531 108.271723) + (xy 122.060951 108.46181) (xy 123.06681 108.46181) (xy 123.06681 107.455418) (xy 123.31319 107.455418) (xy 123.31319 108.46181) + (xy 124.319049 108.46181) (xy 124.380469 108.271723) (xy 124.253318 107.964725) (xy 123.935009 107.605026) (xy 123.503279 107.394519) + (xy 123.31319 107.455418) (xy 123.06681 107.455418) (xy 122.876721 107.394519) (xy 122.444991 107.605026) (xy 122.126682 107.964725) + (xy 121.999531 108.271723) (xy 120.9675 108.271723) (xy 120.9675 100.016723) (xy 121.999531 100.016723) (xy 122.060951 100.20681) + (xy 123.06681 100.20681) (xy 123.06681 99.200418) (xy 123.31319 99.200418) (xy 123.31319 100.20681) (xy 124.319049 100.20681) + (xy 124.380469 100.016723) (xy 124.253318 99.709725) (xy 124.120344 99.55946) (xy 164.007729 99.55946) (xy 164.039004 99.987771) + (xy 164.142742 100.238217) (xy 164.307324 100.313459) (xy 164.925783 99.695) (xy 165.274217 99.695) (xy 165.892676 100.313459) + (xy 166.057258 100.238217) (xy 166.192271 99.83054) (xy 166.160996 99.402229) (xy 166.057258 99.151783) (xy 165.892676 99.076541) + (xy 165.274217 99.695) (xy 164.925783 99.695) (xy 164.307324 99.076541) (xy 164.142742 99.151783) (xy 164.007729 99.55946) + (xy 124.120344 99.55946) (xy 123.935009 99.350026) (xy 123.503279 99.139519) (xy 123.31319 99.200418) (xy 123.06681 99.200418) + (xy 122.876721 99.139519) (xy 122.444991 99.350026) (xy 122.126682 99.709725) (xy 121.999531 100.016723) (xy 120.9675 100.016723) + (xy 120.9675 98.902324) (xy 164.481541 98.902324) (xy 165.1 99.520783) (xy 165.718459 98.902324) (xy 165.643217 98.737742) + (xy 165.23554 98.602729) (xy 164.807229 98.634004) (xy 164.556783 98.737742) (xy 164.481541 98.902324) (xy 120.9675 98.902324) + (xy 120.9675 97.450891) (xy 130.688326 97.450891) (xy 130.787003 97.635239) (xy 131.263874 97.802151) (xy 131.768319 97.773867) + (xy 132.102997 97.635239) (xy 132.201674 97.450891) (xy 131.445 96.694217) (xy 130.688326 97.450891) (xy 120.9675 97.450891) + (xy 120.9675 95.708383) (xy 121.60526 96.347257) (xy 122.631801 96.773514) (xy 123.743323 96.774484) (xy 124.770606 96.350019) + (xy 124.78177 96.338874) (xy 130.162849 96.338874) (xy 130.191133 96.843319) (xy 130.329761 97.177997) (xy 130.514109 97.276674) + (xy 131.270783 96.52) (xy 131.619217 96.52) (xy 132.375891 97.276674) (xy 132.560239 97.177997) (xy 132.727151 96.701126) + (xy 132.698867 96.196681) (xy 132.560239 95.862003) (xy 132.375891 95.763326) (xy 131.619217 96.52) (xy 131.270783 96.52) + (xy 130.514109 95.763326) (xy 130.329761 95.862003) (xy 130.162849 96.338874) (xy 124.78177 96.338874) (xy 125.532845 95.589109) + (xy 130.688326 95.589109) (xy 131.445 96.345783) (xy 132.201674 95.589109) (xy 132.102997 95.404761) (xy 131.626126 95.237849) + (xy 131.121681 95.266133) (xy 130.787003 95.404761) (xy 130.688326 95.589109) (xy 125.532845 95.589109) (xy 125.557257 95.56474) + (xy 125.983514 94.538199) (xy 125.984484 93.426677) (xy 125.560019 92.399394) (xy 124.919245 91.7575) (xy 163.371617 91.7575) ) ) ) diff --git a/demos/ecc83/ecc83-pp_v2.net b/demos/ecc83/ecc83-pp_v2.net index ddd48a84ff..839a1edd81 100644 --- a/demos/ecc83/ecc83-pp_v2.net +++ b/demos/ecc83/ecc83-pp_v2.net @@ -1,8 +1,8 @@ (export (version D) (design - (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch) - (date "17/05/2015 17:06:56") - (tool "Eeschema (2015-05-13 BZR 5653)-product") + (source F:\kicad-launchpad\git_testing\demos\ecc83\ecc83-pp_v2.sch) + (date "14/12/2017 11:57:57") + (tool "Eeschema (2017-12-14 revision b47a06e)-master") (sheet (number 1) (name /) (tstamps /) (title_block (title "ECC Push-Pull") @@ -17,43 +17,43 @@ (components (comp (ref U1) (value ECC83) - (footprint Valves:VALVE-ECC-83-2) + (footprint Valve:Valve_ECC-83-2) (libsource (lib ecc83_schlib) (part ECC83)) (sheetpath (names /) (tstamps /)) (tstamp 48B4F266)) (comp (ref P4) (value CONN_2) - (footprint pin_array:pin_array_1x02) + (footprint Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 456A8ACC)) (comp (ref C1) (value 10uF) (footprint discret:C2V10) - (libsource (lib ecc83_schlib) (part C)) + (libsource (lib ecc83_schlib) (part CP)) (sheetpath (names /) (tstamps /)) (tstamp 4549F4BE)) (comp (ref P3) (value POWER) - (footprint pin_array:pin_array_1x02) + (footprint Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 4549F4A5)) (comp (ref P2) (value OUT) - (footprint pin_array:pin_array_1x02) + (footprint Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 4549F46C)) (comp (ref P1) (value IN) - (footprint pin_array:pin_array_1x02) + (footprint Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical) (libsource (lib ecc83_schlib) (part CONN_2)) (sheetpath (names /) (tstamps /)) (tstamp 4549F464)) (comp (ref C2) (value 680nF) - (footprint discret:CP8) + (footprint Capacitors_THT:C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal) (libsource (lib ecc83_schlib) (part C)) (sheetpath (names /) (tstamps /)) (tstamp 4549F3BE)) @@ -106,13 +106,39 @@ (sheetpath (names /) (tstamps /)) (tstamp 54A58391))) (libparts - (libpart (lib ecc83_schlib) (part R) + (libpart (lib ecc83_schlib) (part C) (footprints - (fp R_*) - (fp Resistor_*)) + (fp C?) + (fp C_????_*) + (fp C_????) + (fp SMD*_c) + (fp Capacitor*)) (fields - (field (name Reference) R) - (field (name Value) R)) + (field (name Reference) C) + (field (name Value) C)) + (pins + (pin (num 1) (name ~) (type passive)) + (pin (num 2) (name ~) (type passive)))) + (libpart (lib ecc83_schlib) (part CONN_1) + (fields + (field (name Reference) P) + (field (name Value) CONN_1)) + (pins + (pin (num 1) (name 1) (type passive)))) + (libpart (lib ecc83_schlib) (part CONN_2) + (fields + (field (name Reference) P) + (field (name Value) CONN_2)) + (pins + (pin (num 1) (name P1) (type passive)) + (pin (num 2) (name PM) (type passive)))) + (libpart (lib ecc83_schlib) (part CP) + (description "Polarised capacitor") + (footprints + (fp CP_*)) + (fields + (field (name Reference) C) + (field (name Value) CP)) (pins (pin (num 1) (name ~) (type passive)) (pin (num 2) (name ~) (type passive)))) @@ -133,74 +159,58 @@ (pin (num 7) (name G) (type input)) (pin (num 8) (name K) (type passive)) (pin (num 9) (name F2) (type input)))) - (libpart (lib ecc83_schlib) (part CONN_2) - (fields - (field (name Reference) P) - (field (name Value) CONN_2)) - (pins - (pin (num 1) (name P1) (type passive)) - (pin (num 2) (name PM) (type passive)))) - (libpart (lib ecc83_schlib) (part CONN_1) - (fields - (field (name Reference) P) - (field (name Value) CONN_1)) - (pins - (pin (num 1) (name 1) (type passive)))) - (libpart (lib ecc83_schlib) (part C) + (libpart (lib ecc83_schlib) (part R) (footprints - (fp C?) - (fp C_????_*) - (fp C_????) - (fp SMD*_c) - (fp Capacitor*)) + (fp R_*) + (fp Resistor_*)) (fields - (field (name Reference) C) - (field (name Value) C)) + (field (name Reference) R) + (field (name Value) R)) (pins (pin (num 1) (name ~) (type passive)) (pin (num 2) (name ~) (type passive))))) (libraries (library (logical ecc83_schlib) - (uri ecc83_schlib.lib))) + (uri F:\kicad-launchpad\git_testing\demos\ecc83/ecc83_schlib.lib))) (nets (net (code 1) (name "Net-(C2-Pad2)") (node (ref C2) (pin 2)) - (node (ref U1) (pin 8)) - (node (ref R1) (pin 2))) - (net (code 2) (name "Net-(R1-Pad1)") - (node (ref R1) (pin 1)) + (node (ref R1) (pin 2)) + (node (ref U1) (pin 8))) + (net (code 2) (name "Net-(C1-Pad1)") + (node (ref U1) (pin 6)) + (node (ref C1) (pin 1)) + (node (ref P3) (pin 1))) + (net (code 3) (name "Net-(R1-Pad1)") (node (ref U1) (pin 1)) + (node (ref R1) (pin 1)) (node (ref U1) (pin 7))) - (net (code 3) (name "Net-(P4-Pad1)") + (net (code 4) (name "Net-(P4-Pad1)") + (node (ref U1) (pin 5)) (node (ref U1) (pin 4)) - (node (ref P4) (pin 1)) - (node (ref U1) (pin 5))) - (net (code 4) (name "Net-(R2-Pad1)") - (node (ref R2) (pin 1)) - (node (ref U1) (pin 3))) - (net (code 5) (name "Net-(P4-Pad2)") + (node (ref P4) (pin 1))) + (net (code 5) (name "Net-(C2-Pad1)") + (node (ref R3) (pin 1)) + (node (ref P2) (pin 1)) + (node (ref C2) (pin 1))) + (net (code 6) (name "Net-(R2-Pad1)") + (node (ref U1) (pin 3)) + (node (ref R2) (pin 1))) + (net (code 7) (name GND) + (node (ref P2) (pin 2)) + (node (ref R3) (pin 2)) + (node (ref R4) (pin 2)) + (node (ref P1) (pin 1)) + (node (ref R2) (pin 2)) + (node (ref P3) (pin 2)) + (node (ref C1) (pin 2))) + (net (code 8) (name "Net-(P1-Pad2)") + (node (ref P1) (pin 2)) + (node (ref R4) (pin 1)) + (node (ref U1) (pin 2))) + (net (code 9) (name "Net-(P4-Pad2)") (node (ref P4) (pin 2)) (node (ref U1) (pin 9))) - (net (code 6) (name "Net-(C2-Pad1)") - (node (ref P2) (pin 1)) - (node (ref R3) (pin 1)) - (node (ref C2) (pin 1))) - (net (code 7) (name "Net-(P1-Pad2)") - (node (ref U1) (pin 2)) - (node (ref P1) (pin 2)) - (node (ref R4) (pin 1))) - (net (code 8) (name "Net-(C1-Pad1)") - (node (ref C1) (pin 1)) - (node (ref P3) (pin 1)) - (node (ref U1) (pin 6))) - (net (code 9) (name GND) - (node (ref R2) (pin 2)) - (node (ref R4) (pin 2)) - (node (ref R3) (pin 2)) - (node (ref P1) (pin 1)) - (node (ref P2) (pin 2)) - (node (ref C1) (pin 2)) - (node (ref P3) (pin 2))) (net (code 10) (name "Net-(P8-Pad1)") (node (ref P8) (pin 1))) (net (code 11) (name "Net-(P7-Pad1)") diff --git a/demos/ecc83/ecc83-pp_v2.sch b/demos/ecc83/ecc83-pp_v2.sch index 3c3f772b00..9ef41d356f 100644 --- a/demos/ecc83/ecc83-pp_v2.sch +++ b/demos/ecc83/ecc83-pp_v2.sch @@ -18,9 +18,9 @@ $Comp L ecc83_schlib:ECC83 U1 U 3 1 48B4F266 P 3900 3050 -F 0 "U1" H 4400 3150 50 0000 C CNN -F 1 "ECC83" H 4400 3050 50 0000 C CNN -F 2 "Valves:VALVE-ECC-83-2" H 4400 2950 30 0000 C CNN +F 0 "U1" H 4200 3150 50 0000 C CNN +F 1 "ECC83" H 4250 3050 50 0000 C CNN +F 2 "" H 4400 2950 30 0000 C CNN F 3 "" H 3900 3050 60 0001 C CNN 3 3900 3050 1 0 0 -1 @@ -31,7 +31,7 @@ U 2 1 48B4F263 P 6500 4200 F 0 "U1" H 7000 4300 50 0000 C CNN F 1 "ECC83" H 7000 4200 50 0000 C CNN -F 2 "Valves:VALVE-ECC-83-2" H 7000 4100 30 0000 C CNN +F 2 "" H 7000 4100 30 0000 C CNN F 3 "" H 6500 4200 60 0001 C CNN 2 6500 4200 1 0 0 -1 @@ -42,7 +42,7 @@ U 1 1 48B4F256 P 6600 2300 F 0 "U1" H 7100 2400 50 0000 C CNN F 1 "ECC83" H 7100 2300 50 0000 C CNN -F 2 "Valves:VALVE-ECC-83-2" H 7100 2200 30 0000 C CNN +F 2 "Valve:Valve_ECC-83-2" H 7100 2200 30 0000 C CNN F 3 "" H 6600 2300 60 0001 C CNN 1 6600 2300 1 0 0 -1 @@ -108,13 +108,13 @@ U 1 1 456A8ACC P 3050 3700 F 0 "P4" V 3000 3700 40 0000 C CNN F 1 "CONN_2" V 3100 3700 40 0000 C CNN -F 2 "pin_array:pin_array_1x02" H 3050 3500 30 0000 C CNN +F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 3050 3500 30 0000 C CNN F 3 "" H 3050 3700 60 0001 C CNN 1 3050 3700 -1 0 0 -1 $EndComp $Comp -L ecc83_schlib:C C1 +L ecc83_schlib:CP C1 U 1 1 4549F4BE P 4100 2100 F 0 "C1" H 4250 2150 50 0000 L CNN @@ -130,7 +130,7 @@ U 1 1 4549F4A5 P 3050 1900 F 0 "P3" V 3000 1900 40 0000 C CNN F 1 "POWER" V 3100 1900 40 0000 C CNN -F 2 "pin_array:pin_array_1x02" H 3050 1700 30 0000 C CNN +F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 3050 1700 30 0000 C CNN F 3 "" H 3050 1900 60 0001 C CNN 1 3050 1900 -1 0 0 -1 @@ -141,7 +141,7 @@ U 1 1 4549F46C P 8350 3000 F 0 "P2" V 8300 3000 40 0000 C CNN F 1 "OUT" V 8400 3000 40 0000 C CNN -F 2 "pin_array:pin_array_1x02" H 8350 2800 30 0000 C CNN +F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 8350 2800 30 0000 C CNN F 3 "" H 8350 3000 60 0001 C CNN 1 8350 3000 1 0 0 -1 @@ -152,7 +152,7 @@ U 1 1 4549F464 P 5350 4300 F 0 "P1" V 5300 4300 40 0000 C CNN F 1 "IN" V 5400 4300 40 0000 C CNN -F 2 "pin_array:pin_array_1x02" H 5350 4500 30 0000 C CNN +F 2 "Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical" H 5350 4500 30 0000 C CNN F 3 "" H 5350 4300 60 0001 C CNN 1 5350 4300 -1 0 0 1 @@ -162,8 +162,8 @@ L ecc83_schlib:C C2 U 1 1 4549F3BE P 7300 2900 F 0 "C2" V 7150 2900 50 0000 C CNN -F 1 "680nF" V 7500 2900 50 0000 C CNN -F 2 "discret:CP8" V 7600 2900 30 0000 C CNN +F 1 "680nF" V 7450 2900 50 0000 C CNN +F 2 "Capacitors_THT:C_Axial_L12.0mm_D6.5mm_P20.00mm_Horizontal" V 7500 2900 10 0000 C CNN F 3 "" H 7300 2900 60 0001 C CNN 1 7300 2900 0 1 1 0 @@ -289,19 +289,19 @@ Wire Wire Line Wire Wire Line 6400 4600 6400 5150 Wire Wire Line - 7450 2900 8000 2900 + 7450 2900 7600 2900 Wire Wire Line - 3400 3600 4000 3600 + 3400 3600 3800 3600 Wire Wire Line 3800 3600 3800 3500 Wire Wire Line - 6500 3400 6500 3800 + 6500 3400 6500 3600 Connection ~ 3800 3600 Wire Wire Line 4000 3600 4000 3500 Connection ~ 6500 3600 Wire Wire Line - 6500 2700 6500 3100 + 6500 2700 6500 2900 Wire Wire Line 6500 3600 6100 3600 Wire Wire Line @@ -310,7 +310,7 @@ Wire Wire Line 6100 2300 6300 2300 Connection ~ 6500 2900 Wire Wire Line - 3400 1800 6600 1800 + 3400 1800 3700 1800 Wire Wire Line 6600 1800 6600 1900 Wire Wire Line @@ -321,12 +321,12 @@ Wire Wire Line Wire Wire Line 3500 2000 3500 2400 Wire Wire Line - 3500 2400 4100 2400 + 3500 2400 3700 2400 Connection ~ 3700 2400 Wire Wire Line 3700 2400 3700 2200 Wire Wire Line - 4100 2250 4100 2500 + 4100 2250 4100 2400 Connection ~ 4100 2400 Wire Wire Line 4100 1950 4100 1800 @@ -343,7 +343,7 @@ Wire Wire Line Wire Wire Line 7850 3100 7850 3250 Wire Wire Line - 5700 4200 6200 4200 + 5700 4200 6000 4200 Wire Wire Line 6000 5150 6000 4200 Connection ~ 6000 4200 @@ -366,4 +366,22 @@ Wire Wire Line 6400 5450 6400 5500 Wire Wire Line 6000 5450 6000 5500 +Wire Wire Line + 3800 3600 4000 3600 +Wire Wire Line + 6500 3600 6500 3800 +Wire Wire Line + 6500 2900 6500 3100 +Wire Wire Line + 3700 1800 4100 1800 +Wire Wire Line + 3700 2400 4100 2400 +Wire Wire Line + 4100 2400 4100 2500 +Wire Wire Line + 4100 1800 6600 1800 +Wire Wire Line + 7600 2900 8000 2900 +Wire Wire Line + 6000 4200 6200 4200 $EndSCHEMATC diff --git a/demos/ecc83/ecc83_schlib.dcm b/demos/ecc83/ecc83_schlib.dcm index 5f3ed79b79..217790539b 100644 --- a/demos/ecc83/ecc83_schlib.dcm +++ b/demos/ecc83/ecc83_schlib.dcm @@ -1,3 +1,8 @@ EESchema-DOCLIB Version 2.0 # +$CMP CP +D Polarised capacitor +K cap capacitor +$ENDCMP +# #End Doc Library diff --git a/demos/ecc83/ecc83_schlib.lib b/demos/ecc83/ecc83_schlib.lib index f862be2468..e69aae0375 100644 --- a/demos/ecc83/ecc83_schlib.lib +++ b/demos/ecc83/ecc83_schlib.lib @@ -1,4 +1,4 @@ -EESchema-LIBRARY Version 2.3 +EESchema-LIBRARY Version 2.4 #encoding utf-8 # # C @@ -16,8 +16,8 @@ $FPLIST Capacitor* $ENDFPLIST DRAW -P 2 0 1 20 -80 -30 80 -30 N -P 2 0 1 20 -80 30 80 30 N +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 @@ -32,7 +32,7 @@ F2 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN DRAW C 0 0 31 0 1 0 N -P 2 0 1 0 -30 0 -50 0 N +P 2 0 1 0 -30 0 -50 0 N X 1 1 -150 0 100 R 60 60 1 1 P ENDDRAW ENDDEF @@ -51,6 +51,29 @@ 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 50 H I C CNN +F3 "" 0 0 50 H I C CNN +$FPLIST + CP_* +$ENDFPLIST +DRAW +S -90 20 -90 40 0 1 0 N +S -90 20 90 20 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 +P 2 0 1 0 -70 90 -30 90 N +P 2 0 1 0 -50 110 -50 70 N +X ~ 1 0 150 110 D 50 50 1 1 P +X ~ 2 0 -150 110 U 50 50 1 1 P +ENDDRAW +ENDDEF +# # ECC81 # DEF ECC81 U 0 0 Y Y 3 L N @@ -60,34 +83,34 @@ F2 "VALVE-NOVAL_P" 400 -350 30 H I C CNN F3 "" 0 0 60 H V C CNN ALIAS ECC83 DRAW -P 2 1 0 0 -100 -200 -100 -300 N -P 2 1 0 0 0 200 0 300 N -P 2 2 0 0 -100 -200 -100 -300 N -P 2 2 0 0 0 200 0 300 N A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100 A 0 100 200 1 1799 0 1 0 N 200 100 -200 100 -P 2 0 1 0 200 100 200 -100 N -P 3 0 1 0 -200 100 -200 -100 -200 -100 N A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200 -P 2 1 1 0 -200 0 -125 0 N -P 2 1 1 6 -75 0 -125 0 N -P 2 1 1 6 -25 0 25 0 N -P 2 1 1 6 75 0 125 0 N -P 3 1 1 10 -100 200 110 200 110 200 N +A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200 +A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250 +A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250 +P 2 1 0 0 -100 -200 -100 -300 N +P 2 1 0 0 0 200 0 300 N +P 2 2 0 0 -100 -200 -100 -300 N +P 2 2 0 0 0 200 0 300 N +P 2 0 1 0 200 100 200 -100 N +P 3 0 1 0 -200 100 -200 -100 -200 -100 N +P 2 1 1 0 -200 0 -125 0 N +P 2 1 1 6 -75 0 -125 0 N +P 2 1 1 6 -25 0 25 0 N +P 2 1 1 6 75 0 125 0 N +P 3 1 1 10 -100 200 110 200 110 200 N +P 2 2 1 0 -200 0 -125 0 N +P 2 2 1 6 -75 0 -125 0 N +P 2 2 1 6 -25 0 25 0 N +P 2 2 1 6 75 0 125 0 N +P 3 2 1 10 -100 200 110 200 110 200 N X A 6 0 400 100 D 40 40 1 1 P X G 7 -300 0 100 R 40 40 1 1 I X K 8 -100 -400 100 U 40 40 1 1 P -A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200 -P 2 2 1 0 -200 0 -125 0 N -P 2 2 1 6 -75 0 -125 0 N -P 2 2 1 6 -25 0 25 0 N -P 2 2 1 6 75 0 125 0 N -P 3 2 1 10 -100 200 110 200 110 200 N X A 1 0 400 100 D 40 40 2 1 P X G 2 -300 0 100 R 40 40 2 1 I X K 3 -100 -400 100 U 40 40 2 1 P -A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250 -A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250 X F1 4 -100 -450 200 U 40 40 3 1 I X F1 5 100 -450 200 U 40 40 3 1 I X F2 9 0 -450 200 U 40 40 3 1 I @@ -102,7 +125,7 @@ F1 "GND" 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 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N +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 50 50 1 1 W N ENDDRAW ENDDEF @@ -115,8 +138,8 @@ 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 -P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N ENDDRAW ENDDEF # diff --git a/demos/ecc83/fp-lib-table b/demos/ecc83/fp-lib-table index e28e8a13b1..ab6e22a47f 100644 --- a/demos/ecc83/fp-lib-table +++ b/demos/ecc83/fp-lib-table @@ -1,3 +1,5 @@ (fp_lib_table - (lib (name Valves)(type KiCad)(uri ${KISYSMOD}/Valves.pretty)(options "")(descr "")) + (lib (name Valve)(type KiCad)(uri ${KISYSMOD}/Valve.pretty)(options "")(descr "")) + (lib (name Connector_PinHeader_2.54mm)(type KiCad)(uri "$(KISYSMOD)/Connector_PinHeader_2.54mm.pretty")(options "")(descr "")) + (lib (name TerminalBlock_Phoenix)(type KiCad)(uri "$(KISYSMOD)/TerminalBlock_Phoenix.pretty")(options "")(descr "")) )