Use standard library and remove keyboard project library

This commit is contained in:
Thomas Schwery 2018-08-10 13:19:09 +02:00
parent f5bd7444ea
commit aa7e022dbd
2 changed files with 240 additions and 206 deletions

View file

@ -17,7 +17,7 @@
(33 F.Adhes user)
(34 B.Paste user)
(35 F.Paste user)
(36 B.SilkS user hide)
(36 B.SilkS user)
(37 F.SilkS user)
(38 B.Mask user)
(39 F.Mask user)
@ -214,6 +214,94 @@
(add_net GND)
)
(module Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB (layer F.Cu) (tedit 59ECAF15) (tstamp 5B8FC7A1)
(at 49.35 104.7)
(descr "Cherry MX keyswitch, MX1A, 1u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
(tags "cherry mx keyswitch MX1A 1u PCB")
(path /5AA59B0B)
(fp_text reference K_2 (at -2.54 -2.794) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_text value KEYSW (at -2.54 12.954) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -9.525 12.065) (end -9.525 -1.905) (layer F.SilkS) (width 0.12))
(fp_line (start 4.445 12.065) (end -9.525 12.065) (layer F.SilkS) (width 0.12))
(fp_line (start 4.445 -1.905) (end 4.445 12.065) (layer F.SilkS) (width 0.12))
(fp_line (start -9.525 -1.905) (end 4.445 -1.905) (layer F.SilkS) (width 0.12))
(fp_line (start -12.065 14.605) (end -12.065 -4.445) (layer Dwgs.User) (width 0.15))
(fp_line (start 6.985 14.605) (end -12.065 14.605) (layer Dwgs.User) (width 0.15))
(fp_line (start 6.985 -4.445) (end 6.985 14.605) (layer Dwgs.User) (width 0.15))
(fp_line (start -12.065 -4.445) (end 6.985 -4.445) (layer Dwgs.User) (width 0.15))
(fp_line (start -9.78 -2.16) (end 4.7 -2.16) (layer F.CrtYd) (width 0.05))
(fp_line (start 4.7 -2.16) (end 4.7 12.32) (layer F.CrtYd) (width 0.05))
(fp_line (start 4.7 12.32) (end -9.78 12.32) (layer F.CrtYd) (width 0.05))
(fp_line (start -9.78 12.32) (end -9.78 -2.16) (layer F.CrtYd) (width 0.05))
(fp_line (start -8.89 11.43) (end -8.89 -1.27) (layer F.Fab) (width 0.15))
(fp_line (start 3.81 11.43) (end -8.89 11.43) (layer F.Fab) (width 0.15))
(fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.15))
(fp_line (start -8.89 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.15))
(fp_text user %R (at -2.54 -2.794) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
(pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
(pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers *.Cu *.Mask))
(pad 2 thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
(net 45 "Net-(D_2-Pad2)"))
(pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
(net 3 /col0))
(model ${KISYS3DMOD}/Buttons_Switches_Keyboard.3dshapes/SW_Cherry_MX1A_1.00u_PCB.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
)
)
(module Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB (layer F.Cu) (tedit 59ECAF15) (tstamp 5B7B74A0)
(at 49.34 123.77)
(descr "Cherry MX keyswitch, MX1A, 1u, PCB mount, http://cherryamericas.com/wp-content/uploads/2014/12/mx_cat.pdf")
(tags "cherry mx keyswitch MX1A 1u PCB")
(path /5AA598B3)
(fp_text reference K_1 (at -2.54 -2.794) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_text value KEYSW (at -2.54 12.954) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -9.525 12.065) (end -9.525 -1.905) (layer F.SilkS) (width 0.12))
(fp_line (start 4.445 12.065) (end -9.525 12.065) (layer F.SilkS) (width 0.12))
(fp_line (start 4.445 -1.905) (end 4.445 12.065) (layer F.SilkS) (width 0.12))
(fp_line (start -9.525 -1.905) (end 4.445 -1.905) (layer F.SilkS) (width 0.12))
(fp_line (start -12.065 14.605) (end -12.065 -4.445) (layer Dwgs.User) (width 0.15))
(fp_line (start 6.985 14.605) (end -12.065 14.605) (layer Dwgs.User) (width 0.15))
(fp_line (start 6.985 -4.445) (end 6.985 14.605) (layer Dwgs.User) (width 0.15))
(fp_line (start -12.065 -4.445) (end 6.985 -4.445) (layer Dwgs.User) (width 0.15))
(fp_line (start -9.78 -2.16) (end 4.7 -2.16) (layer F.CrtYd) (width 0.05))
(fp_line (start 4.7 -2.16) (end 4.7 12.32) (layer F.CrtYd) (width 0.05))
(fp_line (start 4.7 12.32) (end -9.78 12.32) (layer F.CrtYd) (width 0.05))
(fp_line (start -9.78 12.32) (end -9.78 -2.16) (layer F.CrtYd) (width 0.05))
(fp_line (start -8.89 11.43) (end -8.89 -1.27) (layer F.Fab) (width 0.15))
(fp_line (start 3.81 11.43) (end -8.89 11.43) (layer F.Fab) (width 0.15))
(fp_line (start 3.81 -1.27) (end 3.81 11.43) (layer F.Fab) (width 0.15))
(fp_line (start -8.89 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.15))
(fp_text user %R (at -2.54 -2.794) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(pad "" np_thru_hole circle (at 2.54 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
(pad "" np_thru_hole circle (at -7.62 5.08) (size 1.7 1.7) (drill 1.7) (layers *.Cu *.Mask))
(pad "" np_thru_hole circle (at -2.54 5.08) (size 4 4) (drill 4) (layers *.Cu *.Mask))
(pad 2 thru_hole circle (at -6.35 2.54) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
(net 46 "Net-(D_1-Pad2)"))
(pad 1 thru_hole circle (at 0 0) (size 2.2 2.2) (drill 1.5) (layers *.Cu *.Mask)
(net 3 /col0))
(model ${KISYS3DMOD}/Buttons_Switches_Keyboard.3dshapes/SW_Cherry_MX1A_1.00u_PCB.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
)
)
(module divers:USB_Micro_B_Female_AE (layer F.Cu) (tedit 5B6B20C8) (tstamp 5B79A0C5)
(at 47.2 73.95 180)
(descr http://portal.fciconnect.com/Comergent//fci/drawing/10118194.pdf)
@ -698,47 +786,6 @@
)
)
(module Keyboard:CHERRY_PCB_100H (layer F.Cu) (tedit 549A0505) (tstamp 5B67CA34)
(at 46.75 129.1)
(path /5AA598B3)
(fp_text reference K_1 (at 0 3.175) (layer F.SilkS)
(effects (font (size 1.27 1.524) (thickness 0.2032)))
)
(fp_text value KEYSW (at 0 5.08) (layer F.SilkS) hide
(effects (font (size 1.27 1.524) (thickness 0.2032)))
)
(fp_line (start -6.985 6.985) (end -6.985 -6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start 6.985 6.985) (end -6.985 6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start 6.985 -6.985) (end 6.985 6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start -6.985 -6.985) (end 6.985 -6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start -6.35 -4.572) (end -6.35 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -6.35 6.35) (end -6.35 4.572) (layer F.SilkS) (width 0.381))
(fp_line (start -4.572 6.35) (end -6.35 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 6.35 6.35) (end 4.572 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 6.35 4.572) (end 6.35 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 6.35 -6.35) (end 6.35 -4.572) (layer F.SilkS) (width 0.381))
(fp_line (start 4.572 -6.35) (end 6.35 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -6.35 -6.35) (end -4.572 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -9.398 9.398) (end -9.398 -9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start 9.398 9.398) (end -9.398 9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start 9.398 -9.398) (end 9.398 9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start -9.398 -9.398) (end 9.398 -9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start -6.35 6.35) (end -6.35 -6.35) (layer Cmts.User) (width 0.1524))
(fp_line (start 6.35 6.35) (end -6.35 6.35) (layer Cmts.User) (width 0.1524))
(fp_line (start 6.35 -6.35) (end 6.35 6.35) (layer Cmts.User) (width 0.1524))
(fp_line (start -6.35 -6.35) (end 6.35 -6.35) (layer Cmts.User) (width 0.1524))
(fp_text user 1.00u (at -5.715 8.255) (layer Dwgs.User)
(effects (font (size 1.524 1.524) (thickness 0.3048)))
)
(pad HOLE np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu))
(pad HOLE np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu))
(pad HOLE np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu))
(pad 2 thru_hole circle (at -3.81 -2.54) (size 2.286 2.286) (drill 1.4986) (layers *.Cu *.SilkS *.Mask)
(net 46 "Net-(D_1-Pad2)"))
(pad 1 thru_hole circle (at 2.54 -5.08) (size 2.286 2.286) (drill 1.4986) (layers *.Cu *.SilkS *.Mask)
(net 3 /col0))
)
(module Buttons_Switches_SMD:SW_DIP_x1_W5.08mm_Slide_Copal_CHS-A (layer F.Cu) (tedit 59ACAC86) (tstamp 5B66BAEC)
(at 51.39 98.55 180)
(descr "1x-dip-switch, Slide, row spacing 5.08 mm (200 mils), Copal_CHS-A")
@ -933,47 +980,6 @@
)
)
(module Keyboard:CHERRY_PCB_100H (layer F.Cu) (tedit 549A0505) (tstamp 5B67CA16)
(at 46.75 109.75)
(path /5AA59B0B)
(fp_text reference K_2 (at 0 3.175) (layer F.SilkS)
(effects (font (size 1.27 1.524) (thickness 0.2032)))
)
(fp_text value KEYSW (at 0 5.08) (layer F.SilkS) hide
(effects (font (size 1.27 1.524) (thickness 0.2032)))
)
(fp_line (start -6.985 6.985) (end -6.985 -6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start 6.985 6.985) (end -6.985 6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start 6.985 -6.985) (end 6.985 6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start -6.985 -6.985) (end 6.985 -6.985) (layer Eco2.User) (width 0.1524))
(fp_line (start -6.35 -4.572) (end -6.35 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -6.35 6.35) (end -6.35 4.572) (layer F.SilkS) (width 0.381))
(fp_line (start -4.572 6.35) (end -6.35 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 6.35 6.35) (end 4.572 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 6.35 4.572) (end 6.35 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 6.35 -6.35) (end 6.35 -4.572) (layer F.SilkS) (width 0.381))
(fp_line (start 4.572 -6.35) (end 6.35 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -6.35 -6.35) (end -4.572 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -9.398 9.398) (end -9.398 -9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start 9.398 9.398) (end -9.398 9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start 9.398 -9.398) (end 9.398 9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start -9.398 -9.398) (end 9.398 -9.398) (layer Dwgs.User) (width 0.1524))
(fp_line (start -6.35 6.35) (end -6.35 -6.35) (layer Cmts.User) (width 0.1524))
(fp_line (start 6.35 6.35) (end -6.35 6.35) (layer Cmts.User) (width 0.1524))
(fp_line (start 6.35 -6.35) (end 6.35 6.35) (layer Cmts.User) (width 0.1524))
(fp_line (start -6.35 -6.35) (end 6.35 -6.35) (layer Cmts.User) (width 0.1524))
(fp_text user 1.00u (at -5.715 8.255) (layer Dwgs.User)
(effects (font (size 1.524 1.524) (thickness 0.3048)))
)
(pad HOLE np_thru_hole circle (at 5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu))
(pad HOLE np_thru_hole circle (at -5.08 0) (size 1.7018 1.7018) (drill 1.7018) (layers *.Cu))
(pad HOLE np_thru_hole circle (at 0 0) (size 3.9878 3.9878) (drill 3.9878) (layers *.Cu))
(pad 2 thru_hole circle (at -3.81 -2.54) (size 2.286 2.286) (drill 1.4986) (layers *.Cu *.SilkS *.Mask)
(net 45 "Net-(D_2-Pad2)"))
(pad 1 thru_hole circle (at 2.54 -5.08) (size 2.286 2.286) (drill 1.4986) (layers *.Cu *.SilkS *.Mask)
(net 3 /col0))
)
(module Connector_PinHeader_2.54mm:PinHeader_1x08_P2.54mm_Vertical (layer F.Cu) (tedit 59FED5CC) (tstamp 5B67BF09)
(at 38.7 71.35)
(descr "Through hole straight pin header, 1x08, 2.54mm pitch, single row")
@ -1202,7 +1208,7 @@
(gr_text STM32 (at 47.6 86.7) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
(gr_text "SMT32 test board\nJul 2018 - v0.1\nThomas Schwery" (at 47.05 116.35) (layer B.SilkS)
(gr_text "SMT32 test board\nJul 2018 - v0.1\nThomas Schwery" (at 47.05 116.35) (layer B.SilkS) (tstamp 5B8FC7D6)
(effects (font (size 1 1) (thickness 0.15)) (justify mirror))
)
(dimension 68.5 (width 0.15) (layer Eco1.User)
@ -1542,27 +1548,27 @@
(xy 44.077 71.323) (xy 45.085 71.323) (xy 45.085 71.048) (xy 44.977555 70.71) (xy 49.422445 70.71)
(xy 49.315 71.048) (xy 49.315 71.323) (xy 50.323 71.323) (xy 50.323 71.303) (xy 50.577 71.303)
(xy 50.577 71.323) (xy 51.585 71.323) (xy 51.585 71.048) (xy 51.477555 70.71) (xy 55.54 70.71)
(xy 55.540001 137.79) (xy 38.06 137.79) (xy 38.06 128.804436) (xy 40.1841 128.804436) (xy 40.1841 129.395564)
(xy 40.410314 129.941695) (xy 40.828305 130.359686) (xy 41.374436 130.5859) (xy 41.965564 130.5859) (xy 42.511695 130.359686)
(xy 42.929686 129.941695) (xy 43.1559 129.395564) (xy 43.1559 128.804436) (xy 43.061727 128.577079) (xy 44.1211 128.577079)
(xy 44.1211 129.622921) (xy 44.521326 130.589152) (xy 45.260848 131.328674) (xy 46.227079 131.7289) (xy 47.272921 131.7289)
(xy 48.239152 131.328674) (xy 48.978674 130.589152) (xy 49.3789 129.622921) (xy 49.3789 128.804436) (xy 50.3441 128.804436)
(xy 50.3441 129.395564) (xy 50.570314 129.941695) (xy 50.988305 130.359686) (xy 51.534436 130.5859) (xy 52.125564 130.5859)
(xy 52.671695 130.359686) (xy 53.089686 129.941695) (xy 53.3159 129.395564) (xy 53.3159 128.804436) (xy 53.089686 128.258305)
(xy 52.671695 127.840314) (xy 52.125564 127.6141) (xy 51.534436 127.6141) (xy 50.988305 127.840314) (xy 50.570314 128.258305)
(xy 50.3441 128.804436) (xy 49.3789 128.804436) (xy 49.3789 128.577079) (xy 48.978674 127.610848) (xy 48.239152 126.871326)
(xy 47.272921 126.4711) (xy 46.227079 126.4711) (xy 45.260848 126.871326) (xy 44.521326 127.610848) (xy 44.1211 128.577079)
(xy 43.061727 128.577079) (xy 42.962697 128.338) (xy 43.293666 128.338) (xy 43.947156 128.067316) (xy 44.447316 127.567156)
(xy 44.718 126.913666) (xy 44.718 126.206334) (xy 44.447316 125.552844) (xy 43.947156 125.052684) (xy 43.293666 124.782)
(xy 42.586334 124.782) (xy 41.932844 125.052684) (xy 41.432684 125.552844) (xy 41.162 126.206334) (xy 41.162 126.913666)
(xy 41.432684 127.567156) (xy 41.479628 127.6141) (xy 41.374436 127.6141) (xy 40.828305 127.840314) (xy 40.410314 128.258305)
(xy 40.1841 128.804436) (xy 38.06 128.804436) (xy 38.06 109.454436) (xy 40.1841 109.454436) (xy 40.1841 110.045564)
(xy 40.410314 110.591695) (xy 40.828305 111.009686) (xy 41.374436 111.2359) (xy 41.965564 111.2359) (xy 42.511695 111.009686)
(xy 42.929686 110.591695) (xy 43.1559 110.045564) (xy 43.1559 109.454436) (xy 42.962697 108.988) (xy 43.293666 108.988)
(xy 43.947156 108.717316) (xy 44.447316 108.217156) (xy 44.718 107.563666) (xy 44.718 106.856334) (xy 44.447316 106.202844)
(xy 43.947156 105.702684) (xy 43.293666 105.432) (xy 42.586334 105.432) (xy 41.932844 105.702684) (xy 41.432684 106.202844)
(xy 41.162 106.856334) (xy 41.162 107.563666) (xy 41.432684 108.217156) (xy 41.479628 108.2641) (xy 41.374436 108.2641)
(xy 40.828305 108.490314) (xy 40.410314 108.908305) (xy 40.1841 109.454436) (xy 38.06 109.454436) (xy 38.06 99.57744)
(xy 55.540001 137.79) (xy 38.06 137.79) (xy 38.06 128.554615) (xy 40.235 128.554615) (xy 40.235 129.145385)
(xy 40.461078 129.691185) (xy 40.878815 130.108922) (xy 41.424615 130.335) (xy 42.015385 130.335) (xy 42.561185 130.108922)
(xy 42.978922 129.691185) (xy 43.205 129.145385) (xy 43.205 128.554615) (xy 43.110249 128.325866) (xy 44.165 128.325866)
(xy 44.165 129.374134) (xy 44.566155 130.342608) (xy 45.307392 131.083845) (xy 46.275866 131.485) (xy 47.324134 131.485)
(xy 48.292608 131.083845) (xy 49.033845 130.342608) (xy 49.435 129.374134) (xy 49.435 128.554615) (xy 50.395 128.554615)
(xy 50.395 129.145385) (xy 50.621078 129.691185) (xy 51.038815 130.108922) (xy 51.584615 130.335) (xy 52.175385 130.335)
(xy 52.721185 130.108922) (xy 53.138922 129.691185) (xy 53.365 129.145385) (xy 53.365 128.554615) (xy 53.138922 128.008815)
(xy 52.721185 127.591078) (xy 52.175385 127.365) (xy 51.584615 127.365) (xy 51.038815 127.591078) (xy 50.621078 128.008815)
(xy 50.395 128.554615) (xy 49.435 128.554615) (xy 49.435 128.325866) (xy 49.033845 127.357392) (xy 48.292608 126.616155)
(xy 47.324134 126.215) (xy 46.275866 126.215) (xy 45.307392 126.616155) (xy 44.566155 127.357392) (xy 44.165 128.325866)
(xy 43.110249 128.325866) (xy 42.99391 128.045) (xy 43.335113 128.045) (xy 43.972799 127.780862) (xy 44.460862 127.292799)
(xy 44.725 126.655113) (xy 44.725 125.964887) (xy 44.460862 125.327201) (xy 43.972799 124.839138) (xy 43.335113 124.575)
(xy 42.644887 124.575) (xy 42.007201 124.839138) (xy 41.519138 125.327201) (xy 41.255 125.964887) (xy 41.255 126.655113)
(xy 41.519138 127.292799) (xy 41.591339 127.365) (xy 41.424615 127.365) (xy 40.878815 127.591078) (xy 40.461078 128.008815)
(xy 40.235 128.554615) (xy 38.06 128.554615) (xy 38.06 109.484615) (xy 40.245 109.484615) (xy 40.245 110.075385)
(xy 40.471078 110.621185) (xy 40.888815 111.038922) (xy 41.434615 111.265) (xy 42.025385 111.265) (xy 42.571185 111.038922)
(xy 42.988922 110.621185) (xy 43.215 110.075385) (xy 43.215 109.484615) (xy 43.00391 108.975) (xy 43.345113 108.975)
(xy 43.982799 108.710862) (xy 44.470862 108.222799) (xy 44.735 107.585113) (xy 44.735 106.894887) (xy 44.470862 106.257201)
(xy 43.982799 105.769138) (xy 43.345113 105.505) (xy 42.654887 105.505) (xy 42.017201 105.769138) (xy 41.529138 106.257201)
(xy 41.265 106.894887) (xy 41.265 107.585113) (xy 41.529138 108.222799) (xy 41.601339 108.295) (xy 41.434615 108.295)
(xy 40.888815 108.521078) (xy 40.471078 108.938815) (xy 40.245 109.484615) (xy 38.06 109.484615) (xy 38.06 99.57744)
(xy 39.56 99.57744) (xy 39.807765 99.528157) (xy 40.017809 99.387809) (xy 40.158157 99.177765) (xy 40.20744 98.93)
(xy 40.20744 98.17) (xy 42.39256 98.17) (xy 42.39256 98.93) (xy 42.441843 99.177765) (xy 42.582191 99.387809)
(xy 42.792235 99.528157) (xy 43.04 99.57744) (xy 44.64 99.57744) (xy 44.887765 99.528157) (xy 45.097809 99.387809)
@ -1607,20 +1613,20 @@
(xy 47.70529 97.09744) (xy 47.368033 97.434697) (xy 47.308653 97.474374) (xy 47.268977 97.533753) (xy 47.268975 97.533755)
(xy 47.197916 97.640102) (xy 47.151463 97.709624) (xy 47.110199 97.917074) (xy 47.110199 97.917078) (xy 47.096267 97.987119)
(xy 47.110199 98.057161) (xy 47.1102 103.131353) (xy 47.096267 103.201399) (xy 47.151464 103.478895) (xy 47.268975 103.654763)
(xy 47.268978 103.654766) (xy 47.308654 103.714145) (xy 47.368033 103.753821) (xy 47.634589 104.020377) (xy 47.512 104.316334)
(xy 47.512 105.023666) (xy 47.782684 105.677156) (xy 48.282844 106.177316) (xy 48.5788 106.299905) (xy 48.5788 107.860974)
(xy 48.239152 107.521326) (xy 47.272921 107.1211) (xy 46.227079 107.1211) (xy 45.260848 107.521326) (xy 44.521326 108.260848)
(xy 44.1211 109.227079) (xy 44.1211 110.272921) (xy 44.521326 111.239152) (xy 45.260848 111.978674) (xy 46.227079 112.3789)
(xy 47.272921 112.3789) (xy 48.239152 111.978674) (xy 48.5788 111.639026) (xy 48.578801 122.390095) (xy 48.282844 122.512684)
(xy 47.782684 123.012844) (xy 47.512 123.666334) (xy 47.512 124.373666) (xy 47.782684 125.027156) (xy 48.282844 125.527316)
(xy 48.936334 125.798) (xy 49.643666 125.798) (xy 50.297156 125.527316) (xy 50.797316 125.027156) (xy 51.068 124.373666)
(xy 51.068 123.666334) (xy 50.797316 123.012844) (xy 50.297156 122.512684) (xy 50.0012 122.390095) (xy 50.0012 109.454436)
(xy 50.3441 109.454436) (xy 50.3441 110.045564) (xy 50.570314 110.591695) (xy 50.988305 111.009686) (xy 51.534436 111.2359)
(xy 52.125564 111.2359) (xy 52.671695 111.009686) (xy 53.089686 110.591695) (xy 53.3159 110.045564) (xy 53.3159 109.454436)
(xy 53.089686 108.908305) (xy 52.671695 108.490314) (xy 52.125564 108.2641) (xy 51.534436 108.2641) (xy 50.988305 108.490314)
(xy 50.570314 108.908305) (xy 50.3441 109.454436) (xy 50.0012 109.454436) (xy 50.0012 106.299905) (xy 50.297156 106.177316)
(xy 50.797316 105.677156) (xy 51.068 105.023666) (xy 51.068 104.316334) (xy 50.797316 103.662844) (xy 50.297156 103.162684)
(xy 49.643666 102.892) (xy 48.936334 102.892) (xy 48.640377 103.014589) (xy 48.532599 102.906811) (xy 48.532599 99.57744)
(xy 47.268978 103.654766) (xy 47.308654 103.714145) (xy 47.368033 103.753821) (xy 47.718713 104.104501) (xy 47.615 104.354887)
(xy 47.615 105.045113) (xy 47.879138 105.682799) (xy 48.367201 106.170862) (xy 48.5788 106.258509) (xy 48.5788 107.822347)
(xy 48.302608 107.546155) (xy 47.334134 107.145) (xy 46.285866 107.145) (xy 45.317392 107.546155) (xy 44.576155 108.287392)
(xy 44.175 109.255866) (xy 44.175 110.304134) (xy 44.576155 111.272608) (xy 45.317392 112.013845) (xy 46.285866 112.415)
(xy 47.334134 112.415) (xy 48.302608 112.013845) (xy 48.5788 111.737653) (xy 48.578801 122.207348) (xy 48.357201 122.299138)
(xy 47.869138 122.787201) (xy 47.605 123.424887) (xy 47.605 124.115113) (xy 47.869138 124.752799) (xy 48.357201 125.240862)
(xy 48.994887 125.505) (xy 49.685113 125.505) (xy 50.322799 125.240862) (xy 50.810862 124.752799) (xy 51.075 124.115113)
(xy 51.075 123.424887) (xy 50.810862 122.787201) (xy 50.322799 122.299138) (xy 50.0012 122.165927) (xy 50.0012 109.484615)
(xy 50.405 109.484615) (xy 50.405 110.075385) (xy 50.631078 110.621185) (xy 51.048815 111.038922) (xy 51.594615 111.265)
(xy 52.185385 111.265) (xy 52.731185 111.038922) (xy 53.148922 110.621185) (xy 53.375 110.075385) (xy 53.375 109.484615)
(xy 53.148922 108.938815) (xy 52.731185 108.521078) (xy 52.185385 108.295) (xy 51.594615 108.295) (xy 51.048815 108.521078)
(xy 50.631078 108.938815) (xy 50.405 109.484615) (xy 50.0012 109.484615) (xy 50.0012 106.308215) (xy 50.332799 106.170862)
(xy 50.820862 105.682799) (xy 51.085 105.045113) (xy 51.085 104.354887) (xy 50.820862 103.717201) (xy 50.332799 103.229138)
(xy 49.695113 102.965) (xy 49.004887 102.965) (xy 48.712075 103.086287) (xy 48.532599 102.906811) (xy 48.532599 99.57744)
(xy 49.65 99.57744) (xy 49.897765 99.528157) (xy 50.107809 99.387809) (xy 50.248157 99.177765) (xy 50.29744 98.93)
(xy 50.29744 98.83575) (xy 52.495 98.83575) (xy 52.495 99.05631) (xy 52.591673 99.289699) (xy 52.770302 99.468327)
(xy 53.003691 99.565) (xy 53.64425 99.565) (xy 53.803 99.40625) (xy 53.803 98.677) (xy 54.057 98.677)
@ -1780,74 +1786,74 @@
)
(filled_polygon
(pts
(xy 55.540001 137.79) (xy 38.06 137.79) (xy 38.06 128.804436) (xy 40.1841 128.804436) (xy 40.1841 129.395564)
(xy 40.410314 129.941695) (xy 40.828305 130.359686) (xy 41.374436 130.5859) (xy 41.965564 130.5859) (xy 42.511695 130.359686)
(xy 42.929686 129.941695) (xy 43.1559 129.395564) (xy 43.1559 128.804436) (xy 43.061727 128.577079) (xy 44.1211 128.577079)
(xy 44.1211 129.622921) (xy 44.521326 130.589152) (xy 45.260848 131.328674) (xy 46.227079 131.7289) (xy 47.272921 131.7289)
(xy 48.239152 131.328674) (xy 48.978674 130.589152) (xy 49.3789 129.622921) (xy 49.3789 128.804436) (xy 50.3441 128.804436)
(xy 50.3441 129.395564) (xy 50.570314 129.941695) (xy 50.988305 130.359686) (xy 51.534436 130.5859) (xy 52.125564 130.5859)
(xy 52.671695 130.359686) (xy 53.089686 129.941695) (xy 53.3159 129.395564) (xy 53.3159 128.804436) (xy 53.089686 128.258305)
(xy 52.671695 127.840314) (xy 52.125564 127.6141) (xy 51.534436 127.6141) (xy 50.988305 127.840314) (xy 50.570314 128.258305)
(xy 50.3441 128.804436) (xy 49.3789 128.804436) (xy 49.3789 128.577079) (xy 48.978674 127.610848) (xy 48.239152 126.871326)
(xy 47.272921 126.4711) (xy 46.227079 126.4711) (xy 45.260848 126.871326) (xy 44.521326 127.610848) (xy 44.1211 128.577079)
(xy 43.061727 128.577079) (xy 42.962697 128.338) (xy 43.293666 128.338) (xy 43.947156 128.067316) (xy 44.447316 127.567156)
(xy 44.718 126.913666) (xy 44.718 126.206334) (xy 44.447316 125.552844) (xy 43.947156 125.052684) (xy 43.665766 124.936129)
(xy 43.857809 124.807809) (xy 43.998157 124.597765) (xy 44.04744 124.35) (xy 44.04744 123.15) (xy 43.998157 122.902235)
(xy 43.857809 122.692191) (xy 43.647765 122.551843) (xy 43.4 122.50256) (xy 42.5 122.50256) (xy 42.252235 122.551843)
(xy 42.042191 122.692191) (xy 41.901843 122.902235) (xy 41.85256 123.15) (xy 41.85256 124.35) (xy 41.901843 124.597765)
(xy 42.042191 124.807809) (xy 42.22658 124.931015) (xy 41.932844 125.052684) (xy 41.432684 125.552844) (xy 41.162 126.206334)
(xy 41.162 126.913666) (xy 41.432684 127.567156) (xy 41.479628 127.6141) (xy 41.374436 127.6141) (xy 40.828305 127.840314)
(xy 40.410314 128.258305) (xy 40.1841 128.804436) (xy 38.06 128.804436) (xy 38.06 109.454436) (xy 40.1841 109.454436)
(xy 40.1841 110.045564) (xy 40.410314 110.591695) (xy 40.828305 111.009686) (xy 41.374436 111.2359) (xy 41.965564 111.2359)
(xy 42.511695 111.009686) (xy 42.929686 110.591695) (xy 43.1559 110.045564) (xy 43.1559 109.454436) (xy 43.061727 109.227079)
(xy 44.1211 109.227079) (xy 44.1211 110.272921) (xy 44.521326 111.239152) (xy 45.260848 111.978674) (xy 46.227079 112.3789)
(xy 47.272921 112.3789) (xy 48.239152 111.978674) (xy 48.978674 111.239152) (xy 49.3789 110.272921) (xy 49.3789 109.454436)
(xy 50.3441 109.454436) (xy 50.3441 110.045564) (xy 50.570314 110.591695) (xy 50.988305 111.009686) (xy 51.534436 111.2359)
(xy 52.125564 111.2359) (xy 52.671695 111.009686) (xy 53.089686 110.591695) (xy 53.3159 110.045564) (xy 53.3159 109.454436)
(xy 53.089686 108.908305) (xy 52.671695 108.490314) (xy 52.125564 108.2641) (xy 51.534436 108.2641) (xy 50.988305 108.490314)
(xy 50.570314 108.908305) (xy 50.3441 109.454436) (xy 49.3789 109.454436) (xy 49.3789 109.227079) (xy 48.978674 108.260848)
(xy 48.239152 107.521326) (xy 47.272921 107.1211) (xy 46.227079 107.1211) (xy 45.260848 107.521326) (xy 44.521326 108.260848)
(xy 44.1211 109.227079) (xy 43.061727 109.227079) (xy 42.962697 108.988) (xy 43.293666 108.988) (xy 43.947156 108.717316)
(xy 44.447316 108.217156) (xy 44.718 107.563666) (xy 44.718 106.856334) (xy 44.447316 106.202844) (xy 43.955731 105.711259)
(xy 55.540001 137.79) (xy 38.06 137.79) (xy 38.06 128.554615) (xy 40.235 128.554615) (xy 40.235 129.145385)
(xy 40.461078 129.691185) (xy 40.878815 130.108922) (xy 41.424615 130.335) (xy 42.015385 130.335) (xy 42.561185 130.108922)
(xy 42.978922 129.691185) (xy 43.205 129.145385) (xy 43.205 128.554615) (xy 43.110249 128.325866) (xy 44.165 128.325866)
(xy 44.165 129.374134) (xy 44.566155 130.342608) (xy 45.307392 131.083845) (xy 46.275866 131.485) (xy 47.324134 131.485)
(xy 48.292608 131.083845) (xy 49.033845 130.342608) (xy 49.435 129.374134) (xy 49.435 128.554615) (xy 50.395 128.554615)
(xy 50.395 129.145385) (xy 50.621078 129.691185) (xy 51.038815 130.108922) (xy 51.584615 130.335) (xy 52.175385 130.335)
(xy 52.721185 130.108922) (xy 53.138922 129.691185) (xy 53.365 129.145385) (xy 53.365 128.554615) (xy 53.138922 128.008815)
(xy 52.721185 127.591078) (xy 52.175385 127.365) (xy 51.584615 127.365) (xy 51.038815 127.591078) (xy 50.621078 128.008815)
(xy 50.395 128.554615) (xy 49.435 128.554615) (xy 49.435 128.325866) (xy 49.033845 127.357392) (xy 48.292608 126.616155)
(xy 47.324134 126.215) (xy 46.275866 126.215) (xy 45.307392 126.616155) (xy 44.566155 127.357392) (xy 44.165 128.325866)
(xy 43.110249 128.325866) (xy 42.99391 128.045) (xy 43.335113 128.045) (xy 43.972799 127.780862) (xy 44.460862 127.292799)
(xy 44.725 126.655113) (xy 44.725 125.964887) (xy 44.460862 125.327201) (xy 43.972799 124.839138) (xy 43.86634 124.795041)
(xy 43.998157 124.597765) (xy 44.04744 124.35) (xy 44.04744 123.15) (xy 43.998157 122.902235) (xy 43.857809 122.692191)
(xy 43.647765 122.551843) (xy 43.4 122.50256) (xy 42.5 122.50256) (xy 42.252235 122.551843) (xy 42.042191 122.692191)
(xy 41.901843 122.902235) (xy 41.85256 123.15) (xy 41.85256 124.35) (xy 41.901843 124.597765) (xy 42.042191 124.807809)
(xy 42.057745 124.818202) (xy 42.007201 124.839138) (xy 41.519138 125.327201) (xy 41.255 125.964887) (xy 41.255 126.655113)
(xy 41.519138 127.292799) (xy 41.591339 127.365) (xy 41.424615 127.365) (xy 40.878815 127.591078) (xy 40.461078 128.008815)
(xy 40.235 128.554615) (xy 38.06 128.554615) (xy 38.06 109.484615) (xy 40.245 109.484615) (xy 40.245 110.075385)
(xy 40.471078 110.621185) (xy 40.888815 111.038922) (xy 41.434615 111.265) (xy 42.025385 111.265) (xy 42.571185 111.038922)
(xy 42.988922 110.621185) (xy 43.215 110.075385) (xy 43.215 109.484615) (xy 43.120249 109.255866) (xy 44.175 109.255866)
(xy 44.175 110.304134) (xy 44.576155 111.272608) (xy 45.317392 112.013845) (xy 46.285866 112.415) (xy 47.334134 112.415)
(xy 48.302608 112.013845) (xy 49.043845 111.272608) (xy 49.445 110.304134) (xy 49.445 109.484615) (xy 50.405 109.484615)
(xy 50.405 110.075385) (xy 50.631078 110.621185) (xy 51.048815 111.038922) (xy 51.594615 111.265) (xy 52.185385 111.265)
(xy 52.731185 111.038922) (xy 53.148922 110.621185) (xy 53.375 110.075385) (xy 53.375 109.484615) (xy 53.148922 108.938815)
(xy 52.731185 108.521078) (xy 52.185385 108.295) (xy 51.594615 108.295) (xy 51.048815 108.521078) (xy 50.631078 108.938815)
(xy 50.405 109.484615) (xy 49.445 109.484615) (xy 49.445 109.255866) (xy 49.043845 108.287392) (xy 48.302608 107.546155)
(xy 47.334134 107.145) (xy 46.285866 107.145) (xy 45.317392 107.546155) (xy 44.576155 108.287392) (xy 44.175 109.255866)
(xy 43.120249 109.255866) (xy 43.00391 108.975) (xy 43.345113 108.975) (xy 43.982799 108.710862) (xy 44.470862 108.222799)
(xy 44.735 107.585113) (xy 44.735 106.894887) (xy 44.470862 106.257201) (xy 43.982799 105.769138) (xy 43.931309 105.74781)
(xy 43.998157 105.647765) (xy 44.04744 105.4) (xy 44.04744 104.2) (xy 43.998157 103.952235) (xy 43.857809 103.742191)
(xy 43.647765 103.601843) (xy 43.4 103.55256) (xy 42.5 103.55256) (xy 42.252235 103.601843) (xy 42.042191 103.742191)
(xy 41.901843 103.952235) (xy 41.85256 104.2) (xy 41.85256 105.4) (xy 41.901843 105.647765) (xy 41.937304 105.700836)
(xy 41.932844 105.702684) (xy 41.432684 106.202844) (xy 41.162 106.856334) (xy 41.162 107.563666) (xy 41.432684 108.217156)
(xy 41.479628 108.2641) (xy 41.374436 108.2641) (xy 40.828305 108.490314) (xy 40.410314 108.908305) (xy 40.1841 109.454436)
(xy 38.06 109.454436) (xy 38.06 90.488359) (xy 38.120582 90.528839) (xy 38.553744 90.615) (xy 38.846256 90.615)
(xy 39.279418 90.528839) (xy 39.770625 90.200625) (xy 40.098839 89.709418) (xy 40.214092 89.13) (xy 40.129759 88.706029)
(xy 40.39236 88.443428) (xy 40.520977 88.753936) (xy 40.796064 89.029023) (xy 41.155484 89.1779) (xy 41.322112 89.1779)
(xy 42.997578 90.853367) (xy 43.037254 90.912746) (xy 43.096633 90.952422) (xy 43.096635 90.952424) (xy 43.272502 91.069935)
(xy 43.272503 91.069935) (xy 43.272504 91.069936) (xy 43.479954 91.1112) (xy 43.479957 91.1112) (xy 43.549999 91.125132)
(xy 43.620041 91.1112) (xy 47.155542 91.1112) (xy 47.273365 91.229023) (xy 47.632785 91.3779) (xy 47.799413 91.3779)
(xy 49.869277 93.447764) (xy 49.820977 93.496064) (xy 49.6721 93.855484) (xy 49.6721 94.244516) (xy 49.820977 94.603936)
(xy 50.096064 94.879023) (xy 50.455484 95.0279) (xy 50.717146 95.0279) (xy 48.032449 97.712598) (xy 44.195559 97.712598)
(xy 44.153936 97.670975) (xy 43.794516 97.522098) (xy 43.405484 97.522098) (xy 43.046064 97.670975) (xy 42.770977 97.946062)
(xy 42.6221 98.305482) (xy 42.6221 98.694514) (xy 42.770977 99.053934) (xy 43.046064 99.329021) (xy 43.405484 99.477898)
(xy 43.794516 99.477898) (xy 44.153936 99.329021) (xy 44.195559 99.287398) (xy 48.281049 99.287398) (xy 48.3586 99.302824)
(xy 48.436151 99.287398) (xy 48.436152 99.287398) (xy 48.665828 99.241713) (xy 48.926284 99.067682) (xy 48.970216 99.001933)
(xy 53.254152 94.717998) (xy 53.254152 96.037659) (xy 45.796634 103.495178) (xy 45.737255 103.534854) (xy 45.713993 103.569668)
(xy 45.552235 103.601843) (xy 45.342191 103.742191) (xy 45.201843 103.952235) (xy 45.15256 104.2) (xy 45.15256 105.4)
(xy 45.201843 105.647765) (xy 45.342191 105.857809) (xy 45.552235 105.998157) (xy 45.8 106.04744) (xy 46.7 106.04744)
(xy 46.947765 105.998157) (xy 47.157809 105.857809) (xy 47.298157 105.647765) (xy 47.34744 105.4) (xy 47.34744 104.316334)
(xy 47.512 104.316334) (xy 47.512 105.023666) (xy 47.782684 105.677156) (xy 48.282844 106.177316) (xy 48.936334 106.448)
(xy 49.643666 106.448) (xy 50.297156 106.177316) (xy 50.797316 105.677156) (xy 51.068 105.023666) (xy 51.068 104.316334)
(xy 50.797316 103.662844) (xy 50.297156 103.162684) (xy 49.643666 102.892) (xy 48.936334 102.892) (xy 48.282844 103.162684)
(xy 47.782684 103.662844) (xy 47.512 104.316334) (xy 47.34744 104.316334) (xy 47.34744 104.2) (xy 47.30695 103.996439)
(xy 53.85418 97.449209) (xy 53.854179 114.387632) (xy 45.796634 122.445178) (xy 45.737255 122.484854) (xy 45.713993 122.519668)
(xy 45.552235 122.551843) (xy 45.342191 122.692191) (xy 45.201843 122.902235) (xy 45.15256 123.15) (xy 45.15256 124.35)
(xy 45.201843 124.597765) (xy 45.342191 124.807809) (xy 45.552235 124.948157) (xy 45.8 124.99744) (xy 46.7 124.99744)
(xy 46.947765 124.948157) (xy 47.157809 124.807809) (xy 47.298157 124.597765) (xy 47.34744 124.35) (xy 47.34744 123.666334)
(xy 47.512 123.666334) (xy 47.512 124.373666) (xy 47.782684 125.027156) (xy 48.282844 125.527316) (xy 48.936334 125.798)
(xy 49.643666 125.798) (xy 50.297156 125.527316) (xy 50.797316 125.027156) (xy 51.068 124.373666) (xy 51.068 123.666334)
(xy 50.797316 123.012844) (xy 50.297156 122.512684) (xy 49.643666 122.242) (xy 48.936334 122.242) (xy 48.282844 122.512684)
(xy 47.782684 123.012844) (xy 47.512 123.666334) (xy 47.34744 123.666334) (xy 47.34744 123.15) (xy 47.30695 122.946439)
(xy 55.018748 115.234641) (xy 55.078124 115.194967) (xy 55.117799 115.13559) (xy 55.117803 115.135586) (xy 55.235314 114.959718)
(xy 55.235315 114.959717) (xy 55.276579 114.752267) (xy 55.276579 114.752263) (xy 55.290511 114.682221) (xy 55.276579 114.612179)
(xy 55.276579 86.61294) (xy 55.290511 86.542898) (xy 55.276579 86.472856) (xy 55.276579 86.472853) (xy 55.235315 86.265403)
(xy 55.20038 86.213119) (xy 55.20038 86.005484) (xy 55.051503 85.646064) (xy 54.776416 85.370977) (xy 54.416996 85.2221)
(xy 54.1874 85.2221) (xy 54.1874 82.14744) (xy 54.925 82.14744) (xy 55.172765 82.098157) (xy 55.382809 81.957809)
(xy 55.523157 81.747765) (xy 55.54 81.663088)
(xy 41.901843 103.952235) (xy 41.85256 104.2) (xy 41.85256 105.4) (xy 41.901843 105.647765) (xy 41.996665 105.789674)
(xy 41.529138 106.257201) (xy 41.265 106.894887) (xy 41.265 107.585113) (xy 41.529138 108.222799) (xy 41.601339 108.295)
(xy 41.434615 108.295) (xy 40.888815 108.521078) (xy 40.471078 108.938815) (xy 40.245 109.484615) (xy 38.06 109.484615)
(xy 38.06 90.488359) (xy 38.120582 90.528839) (xy 38.553744 90.615) (xy 38.846256 90.615) (xy 39.279418 90.528839)
(xy 39.770625 90.200625) (xy 40.098839 89.709418) (xy 40.214092 89.13) (xy 40.129759 88.706029) (xy 40.39236 88.443428)
(xy 40.520977 88.753936) (xy 40.796064 89.029023) (xy 41.155484 89.1779) (xy 41.322112 89.1779) (xy 42.997578 90.853367)
(xy 43.037254 90.912746) (xy 43.096633 90.952422) (xy 43.096635 90.952424) (xy 43.272502 91.069935) (xy 43.272503 91.069935)
(xy 43.272504 91.069936) (xy 43.479954 91.1112) (xy 43.479957 91.1112) (xy 43.549999 91.125132) (xy 43.620041 91.1112)
(xy 47.155542 91.1112) (xy 47.273365 91.229023) (xy 47.632785 91.3779) (xy 47.799413 91.3779) (xy 49.869277 93.447764)
(xy 49.820977 93.496064) (xy 49.6721 93.855484) (xy 49.6721 94.244516) (xy 49.820977 94.603936) (xy 50.096064 94.879023)
(xy 50.455484 95.0279) (xy 50.717146 95.0279) (xy 48.032449 97.712598) (xy 44.195559 97.712598) (xy 44.153936 97.670975)
(xy 43.794516 97.522098) (xy 43.405484 97.522098) (xy 43.046064 97.670975) (xy 42.770977 97.946062) (xy 42.6221 98.305482)
(xy 42.6221 98.694514) (xy 42.770977 99.053934) (xy 43.046064 99.329021) (xy 43.405484 99.477898) (xy 43.794516 99.477898)
(xy 44.153936 99.329021) (xy 44.195559 99.287398) (xy 48.281049 99.287398) (xy 48.3586 99.302824) (xy 48.436151 99.287398)
(xy 48.436152 99.287398) (xy 48.665828 99.241713) (xy 48.926284 99.067682) (xy 48.970216 99.001933) (xy 53.254152 94.717998)
(xy 53.254152 96.037659) (xy 45.796634 103.495178) (xy 45.737255 103.534854) (xy 45.713993 103.569668) (xy 45.552235 103.601843)
(xy 45.342191 103.742191) (xy 45.201843 103.952235) (xy 45.15256 104.2) (xy 45.15256 105.4) (xy 45.201843 105.647765)
(xy 45.342191 105.857809) (xy 45.552235 105.998157) (xy 45.8 106.04744) (xy 46.7 106.04744) (xy 46.947765 105.998157)
(xy 47.157809 105.857809) (xy 47.298157 105.647765) (xy 47.34744 105.4) (xy 47.34744 104.354887) (xy 47.615 104.354887)
(xy 47.615 105.045113) (xy 47.879138 105.682799) (xy 48.367201 106.170862) (xy 49.004887 106.435) (xy 49.695113 106.435)
(xy 50.332799 106.170862) (xy 50.820862 105.682799) (xy 51.085 105.045113) (xy 51.085 104.354887) (xy 50.820862 103.717201)
(xy 50.332799 103.229138) (xy 49.695113 102.965) (xy 49.004887 102.965) (xy 48.367201 103.229138) (xy 47.879138 103.717201)
(xy 47.615 104.354887) (xy 47.34744 104.354887) (xy 47.34744 104.2) (xy 47.30695 103.996439) (xy 53.85418 97.449209)
(xy 53.854179 114.387632) (xy 45.796634 122.445178) (xy 45.737255 122.484854) (xy 45.713993 122.519668) (xy 45.552235 122.551843)
(xy 45.342191 122.692191) (xy 45.201843 122.902235) (xy 45.15256 123.15) (xy 45.15256 124.35) (xy 45.201843 124.597765)
(xy 45.342191 124.807809) (xy 45.552235 124.948157) (xy 45.8 124.99744) (xy 46.7 124.99744) (xy 46.947765 124.948157)
(xy 47.157809 124.807809) (xy 47.298157 124.597765) (xy 47.34744 124.35) (xy 47.34744 123.424887) (xy 47.605 123.424887)
(xy 47.605 124.115113) (xy 47.869138 124.752799) (xy 48.357201 125.240862) (xy 48.994887 125.505) (xy 49.685113 125.505)
(xy 50.322799 125.240862) (xy 50.810862 124.752799) (xy 51.075 124.115113) (xy 51.075 123.424887) (xy 50.810862 122.787201)
(xy 50.322799 122.299138) (xy 49.685113 122.035) (xy 48.994887 122.035) (xy 48.357201 122.299138) (xy 47.869138 122.787201)
(xy 47.605 123.424887) (xy 47.34744 123.424887) (xy 47.34744 123.15) (xy 47.30695 122.946439) (xy 55.018748 115.234641)
(xy 55.078124 115.194967) (xy 55.117799 115.13559) (xy 55.117803 115.135586) (xy 55.235314 114.959718) (xy 55.235315 114.959717)
(xy 55.276579 114.752267) (xy 55.276579 114.752263) (xy 55.290511 114.682221) (xy 55.276579 114.612179) (xy 55.276579 86.61294)
(xy 55.290511 86.542898) (xy 55.276579 86.472856) (xy 55.276579 86.472853) (xy 55.235315 86.265403) (xy 55.20038 86.213119)
(xy 55.20038 86.005484) (xy 55.051503 85.646064) (xy 54.776416 85.370977) (xy 54.416996 85.2221) (xy 54.1874 85.2221)
(xy 54.1874 82.14744) (xy 54.925 82.14744) (xy 55.172765 82.098157) (xy 55.382809 81.957809) (xy 55.523157 81.747765)
(xy 55.54 81.663088)
)
)
(filled_polygon

View file

@ -21,15 +21,15 @@ row1
Text Label 8650 5600 0 60 ~ 0
col0
$Comp
L keyboard_parts:KEYSW K_1
L Switch:SW_Push K_1
U 1 1 5AA598B3
P 8250 5600
F 0 "K_1" H 8200 5600 60 0000 C CNN
F 1 "KEYSW" H 8250 5500 60 0001 C CNN
F 2 "Keyboard:CHERRY_PCB_100H" H 8250 5600 60 0001 C CNN
F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8250 5600 60 0001 C CNN
F 3 "" H 8250 5600 60 0000 C CNN
1 8250 5600
1 0 0 -1
-1 0 0 1
$EndComp
$Comp
L Device:D D_1
@ -42,22 +42,18 @@ F 3 "1N4148WTPMSCT-ND" H 7900 5750 60 0001 C CNN
1 7900 5750
0 -1 -1 0
$EndComp
Wire Wire Line
8550 5600 8650 5600
Wire Wire Line
7650 5900 7900 5900
Wire Wire Line
7900 5600 7950 5600
$Comp
L keyboard_parts:KEYSW K_2
L Switch:SW_Push K_2
U 1 1 5AA59B0B
P 8250 6050
F 0 "K_2" H 8200 6050 60 0000 C CNN
F 1 "KEYSW" H 8250 5950 60 0001 C CNN
F 2 "Keyboard:CHERRY_PCB_100H" H 8250 6050 60 0001 C CNN
F 2 "Buttons_Switches_Keyboard:SW_Cherry_MX1A_1.00u_PCB" H 8250 6050 60 0001 C CNN
F 3 "" H 8250 6050 60 0000 C CNN
1 8250 6050
1 0 0 -1
-1 0 0 1
$EndComp
$Comp
L Device:D D_2
@ -70,10 +66,6 @@ F 3 "~" H 7900 6200 60 0001 C CNN
1 7900 6200
0 -1 -1 0
$EndComp
Wire Wire Line
8550 6050 8650 6050
Wire Wire Line
7900 6050 7950 6050
Wire Wire Line
7650 6350 7900 6350
Wire Wire Line
@ -158,12 +150,12 @@ $EndComp
$Comp
L power:GND #PWR013
U 1 1 5BC192AB
P 10350 3500
F 0 "#PWR013" H 10350 3250 50 0001 C CNN
F 1 "GND" H 10355 3327 50 0000 C CNN
F 2 "" H 10350 3500 50 0001 C CNN
F 3 "" H 10350 3500 50 0001 C CNN
1 10350 3500
P 10350 3400
F 0 "#PWR013" H 10350 3150 50 0001 C CNN
F 1 "GND" H 10355 3227 50 0000 C CNN
F 2 "" H 10350 3400 50 0001 C CNN
F 3 "" H 10350 3400 50 0001 C CNN
1 10350 3400
-1 0 0 1
$EndComp
Wire Wire Line
@ -621,7 +613,7 @@ Wire Wire Line
Wire Wire Line
8200 4000 9300 4000
Wire Wire Line
9400 4300 9400 4700
9400 4300 9400 4550
Text Label 800 2900 2 50 ~ 0
row0
Text Label 800 3000 2 50 ~ 0
@ -655,4 +647,40 @@ Wire Wire Line
Wire Wire Line
9600 4000 9800 4000
NoConn ~ 9950 4000
$Comp
L power:PWR_FLAG #FLG0101
U 1 1 5B6D7A43
P 9400 4550
F 0 "#FLG0101" H 9400 4625 50 0001 C CNN
F 1 "PWR_FLAG" V 9400 4678 50 0000 L CNN
F 2 "" H 9400 4550 50 0001 C CNN
F 3 "" H 9400 4550 50 0001 C CNN
1 9400 4550
0 1 1 0
$EndComp
Connection ~ 9400 4550
Wire Wire Line
9400 4550 9400 4700
Wire Wire Line
7900 6050 8050 6050
Wire Wire Line
8450 6050 8650 6050
Wire Wire Line
8450 5600 8650 5600
Wire Wire Line
7900 5600 8050 5600
$Comp
L power:PWR_FLAG #FLG0102
U 1 1 5B6DD82D
P 10350 3400
F 0 "#FLG0102" H 10350 3475 50 0001 C CNN
F 1 "PWR_FLAG" V 10350 3528 50 0000 L CNN
F 2 "" H 10350 3400 50 0001 C CNN
F 3 "" H 10350 3400 50 0001 C CNN
1 10350 3400
0 1 1 0
$EndComp
Wire Wire Line
10350 3400 10350 3500
Connection ~ 10350 3400
$EndSCHEMATC