summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Palsson <karlp@tweak.net.au>2017-12-17 22:28:07 +0000
committerKarl Palsson <karlp@tweak.net.au>2017-12-17 22:28:07 +0000
commitb33de16ac9c63e85785802a04737ea7abaed07b2 (patch)
tree5b9c02b442761997b2eaabe0ad54b6f69f6c9f3f
parent74b958c599fb52e71d4246cd8bd4736370c424d6 (diff)
downloadolsndot-b33de16ac9c63e85785802a04737ea7abaed07b2.tar.gz
olsndot-b33de16ac9c63e85785802a04737ea7abaed07b2.tar.bz2
olsndot-b33de16ac9c63e85785802a04737ea7abaed07b2.zip
"fix" grounds by tracks into pour
"finish" routing, ignore DRC violations from disconnected usb shield on pin 6. Add boot0 jumper pad "just in case" but really kinda dumb, we've got a debug header on it. Why bother with this? Change paper size in schema to get more space. TODO: add silk? TODO: replace "arduino" shape with just the pinpoints.
-rw-r--r--hw1/hw1.kicad_pcb956
-rw-r--r--hw1/hw1.net361
-rw-r--r--hw1/hw1.sch1218
3 files changed, 1380 insertions, 1155 deletions
diff --git a/hw1/hw1.kicad_pcb b/hw1/hw1.kicad_pcb
index 87ba225..ecb45c8 100644
--- a/hw1/hw1.kicad_pcb
+++ b/hw1/hw1.kicad_pcb
@@ -1,15 +1,15 @@
(kicad_pcb (version 4) (host pcbnew 4.0.6)
(general
- (links 77)
- (no_connects 12)
- (area 104.572999 71.542 186.303001 127.694)
+ (links 78)
+ (no_connects 1)
+ (area 110.922999 72.949999 179.653001 126.440001)
(thickness 1.6)
(drawings 27)
- (tracks 219)
+ (tracks 246)
(zones 0)
- (modules 28)
- (nets 27)
+ (modules 31)
+ (nets 29)
)
(page A4)
@@ -21,7 +21,7 @@
(layers
(0 F.Cu signal)
- (31 B.Cu signal hide)
+ (31 B.Cu signal)
(32 B.Adhes user)
(33 F.Adhes user)
(34 B.Paste user)
@@ -43,7 +43,7 @@
)
(setup
- (last_trace_width 0.4)
+ (last_trace_width 0.25)
(user_trace_width 0.152)
(user_trace_width 0.25)
(user_trace_width 0.4)
@@ -69,8 +69,8 @@
(mod_edge_width 0.15)
(mod_text_size 1 1)
(mod_text_width 0.15)
- (pad_size 4.064 4.064)
- (pad_drill 3.048)
+ (pad_size 1.2 1.2)
+ (pad_drill 0.8001)
(pad_to_mask_clearance 0)
(aux_axis_origin 110.998 126.365)
(grid_origin 110.998 126.365)
@@ -129,6 +129,8 @@
(net 24 /VLCD)
(net 25 "Net-(C9-Pad1)")
(net 26 "Net-(C10-Pad1)")
+ (net 27 "Net-(JP3-Pad2)")
+ (net 28 "Net-(J2-Pad1)")
(net_class Default "This is the default net class."
(clearance 0.2)
@@ -158,8 +160,10 @@
(add_net GND)
(add_net "Net-(C10-Pad1)")
(add_net "Net-(C9-Pad1)")
+ (add_net "Net-(J2-Pad1)")
(add_net "Net-(JP1-Pad2)")
(add_net "Net-(JP2-Pad2)")
+ (add_net "Net-(JP3-Pad2)")
(add_net "Net-(P10-Pad6)")
)
@@ -200,9 +204,8 @@
(pad 2 thru_hole oval (at 2.54 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 3 thru_hole oval (at 5.08 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 4 thru_hole oval (at 7.62 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
- (net 3 +3V3))
- (pad 5 thru_hole oval (at 10.16 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
- (net 1 +5V))
+ (net 27 "Net-(JP3-Pad2)"))
+ (pad 5 thru_hole oval (at 10.16 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(pad 6 thru_hole oval (at 12.7 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 2 GND))
(pad 7 thru_hole oval (at 15.24 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
@@ -290,10 +293,8 @@
(pad 7 thru_hole oval (at 15.24 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 2 GND))
(pad 8 thru_hole oval (at 17.78 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
- (pad 9 thru_hole oval (at 20.32 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
- (net 6 /I2C_SDA))
- (pad 10 thru_hole oval (at 22.86 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
- (net 7 /I2C_SCL))
+ (pad 9 thru_hole oval (at 20.32 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
+ (pad 10 thru_hole oval (at 22.86 0) (size 1.7272 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(model ${KIPRJMOD}/Socket_Arduino_Uno.3dshapes/Socket_header_Arduino_1x10.wrl
(at (xyz 0.45 0 0))
(scale (xyz 1 1 1))
@@ -399,18 +400,18 @@
)
(module Capacitors_SMD:C_0603_HandSoldering (layer F.Cu) (tedit 58AA848B) (tstamp 59F7BF21)
- (at 152.273 108.966 270)
+ (at 152.3365 108.966 90)
(descr "Capacitor SMD 0603, hand soldering")
(tags "capacitor 0603")
(path /58CF4B65)
(attr smd)
- (fp_text reference C1 (at 0 -1.25 270) (layer F.SilkS)
+ (fp_text reference C1 (at 0 -1.25 90) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
- (fp_text value 100n (at 0 1.5 270) (layer F.Fab)
+ (fp_text value 100n (at 0 1.5 90) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
- (fp_text user %R (at 0 -1.25 270) (layer F.Fab)
+ (fp_text user %R (at 0 -1.25 90) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
@@ -423,10 +424,10 @@
(fp_line (start -1.8 -0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.8 0.65) (end 1.8 -0.65) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.8 0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
- (pad 1 smd rect (at -0.95 0 270) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
- (net 4 /NRST))
- (pad 2 smd rect (at 0.95 0 270) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+ (pad 1 smd rect (at -0.95 0 90) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
(net 2 GND))
+ (pad 2 smd rect (at 0.95 0 90) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+ (net 4 /NRST))
(model Capacitors_SMD.3dshapes/C_0603.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
@@ -762,7 +763,8 @@
(pad 41 smd rect (at 0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask))
(pad 42 smd rect (at 0.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask))
(pad 43 smd rect (at -0.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask))
- (pad 44 smd rect (at -0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask))
+ (pad 44 smd rect (at -0.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
+ (net 28 "Net-(J2-Pad1)"))
(pad 45 smd rect (at -1.25 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
(net 7 /I2C_SCL))
(pad 46 smd rect (at -1.75 -4.35 180) (size 1.3 0.25) (layers F.Cu F.Paste F.Mask)
@@ -1111,18 +1113,18 @@
)
(module Capacitors_SMD:C_0603_HandSoldering (layer F.Cu) (tedit 58AA848B) (tstamp 5A0F67DC)
- (at 146.177 107.442 180)
+ (at 146.4335 107.2515)
(descr "Capacitor SMD 0603, hand soldering")
(tags "capacitor 0603")
(path /5A0FB867)
(attr smd)
- (fp_text reference C6 (at 0 -1.25 180) (layer F.SilkS)
+ (fp_text reference C6 (at 0 -1.25) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
- (fp_text value 100n (at 0 1.5 180) (layer F.Fab)
+ (fp_text value 100n (at 0 1.5) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
- (fp_text user %R (at 0 -1.25 180) (layer F.Fab)
+ (fp_text user %R (at 0 -1.25) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -0.8 0.4) (end -0.8 -0.4) (layer F.Fab) (width 0.1))
@@ -1135,10 +1137,10 @@
(fp_line (start -1.8 -0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.8 0.65) (end 1.8 -0.65) (layer F.CrtYd) (width 0.05))
(fp_line (start 1.8 0.65) (end -1.8 0.65) (layer F.CrtYd) (width 0.05))
- (pad 1 smd rect (at -0.95 0 180) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
- (net 24 /VLCD))
- (pad 2 smd rect (at 0.95 0 180) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+ (pad 1 smd rect (at -0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
(net 2 GND))
+ (pad 2 smd rect (at 0.95 0) (size 1.2 0.75) (layers F.Cu F.Paste F.Mask)
+ (net 24 /VLCD))
(model Capacitors_SMD.3dshapes/C_0603.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
@@ -1291,15 +1293,15 @@
)
(module Crystals:Crystal_SMD_SeikoEpson_FA238-4pin_3.2x2.5mm (layer F.Cu) (tedit 5873B462) (tstamp 5A1B1F94)
- (at 149.479 112.268 90)
+ (at 149.479 112.268 270)
(descr "crystal Epson Toyocom FA-238 series http://www.mouser.com/ds/2/137/1721499-465440.pdf, 3.2x2.5mm^2 package")
(tags "SMD SMT crystal")
(path /5A137095)
(attr smd)
- (fp_text reference Y1 (at 0 -2.45 90) (layer F.SilkS)
+ (fp_text reference Y1 (at 0 -2.45 270) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
- (fp_text value Crystal_GND24_Small (at 0 2.45 90) (layer F.Fab)
+ (fp_text value Crystal_GND24_Small (at 0 2.45 270) (layer F.Fab)
(effects (font (size 1 1) (thickness 0.15)))
)
(fp_line (start -1.5 -1.25) (end 1.5 -1.25) (layer F.Fab) (width 0.1))
@@ -1317,12 +1319,12 @@
(fp_line (start -2.1 1.7) (end 2.1 1.7) (layer F.CrtYd) (width 0.05))
(fp_line (start 2.1 1.7) (end 2.1 -1.7) (layer F.CrtYd) (width 0.05))
(fp_line (start 2.1 -1.7) (end -2.1 -1.7) (layer F.CrtYd) (width 0.05))
- (pad 1 smd rect (at -1.1 0.8 90) (size 1.4 1.2) (layers F.Cu F.Mask)
- (net 26 "Net-(C10-Pad1)"))
- (pad 2 smd rect (at 1.1 0.8 90) (size 1.4 1.2) (layers F.Cu F.Mask))
- (pad 3 smd rect (at 1.1 -0.8 90) (size 1.4 1.2) (layers F.Cu F.Mask)
+ (pad 1 smd rect (at -1.1 0.8 270) (size 1.4 1.2) (layers F.Cu F.Mask)
(net 25 "Net-(C9-Pad1)"))
- (pad 4 smd rect (at -1.1 -0.8 90) (size 1.4 1.2) (layers F.Cu F.Mask))
+ (pad 2 smd rect (at 1.1 0.8 270) (size 1.4 1.2) (layers F.Cu F.Mask))
+ (pad 3 smd rect (at 1.1 -0.8 270) (size 1.4 1.2) (layers F.Cu F.Mask)
+ (net 26 "Net-(C10-Pad1)"))
+ (pad 4 smd rect (at -1.1 -0.8 270) (size 1.4 1.2) (layers F.Cu F.Mask))
(model Crystals.3dshapes/Crystal_SMD_SeikoEpson_FA238-4pin_3.2x2.5mm.wrl
(at (xyz 0 0 0))
(scale (xyz 0.24 0.24 0.24))
@@ -1330,6 +1332,93 @@
)
)
+ (module Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm (layer F.Cu) (tedit 588DE958) (tstamp 5A36EA3E)
+ (at 148.082 118.999)
+ (descr "Through hole straight socket strip, 2x01, 2.54mm pitch, double rows")
+ (tags "Through hole socket strip THT 2x01 2.54mm double row")
+ (path /5A36E60E)
+ (fp_text reference JP3 (at -1.27 -2.33) (layer F.SilkS)
+ (effects (font (size 1 1) (thickness 0.15)))
+ )
+ (fp_text value Jumper_NC_Small (at -1.27 2.33) (layer F.Fab)
+ (effects (font (size 1 1) (thickness 0.15)))
+ )
+ (fp_line (start -3.81 -1.27) (end -3.81 1.27) (layer F.Fab) (width 0.1))
+ (fp_line (start -3.81 1.27) (end 1.27 1.27) (layer F.Fab) (width 0.1))
+ (fp_line (start 1.27 1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+ (fp_line (start 1.27 -1.27) (end -3.81 -1.27) (layer F.Fab) (width 0.1))
+ (fp_line (start 1.33 1.27) (end 1.33 1.33) (layer F.SilkS) (width 0.12))
+ (fp_line (start 1.33 1.33) (end -3.87 1.33) (layer F.SilkS) (width 0.12))
+ (fp_line (start -3.87 1.33) (end -3.87 -1.33) (layer F.SilkS) (width 0.12))
+ (fp_line (start -3.87 -1.33) (end -1.27 -1.33) (layer F.SilkS) (width 0.12))
+ (fp_line (start -1.27 -1.33) (end -1.27 1.27) (layer F.SilkS) (width 0.12))
+ (fp_line (start -1.27 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.06 -1.33) (layer F.SilkS) (width 0.12))
+ (fp_line (start -4.1 -1.55) (end -4.1 1.55) (layer F.CrtYd) (width 0.05))
+ (fp_line (start -4.1 1.55) (end 1.55 1.55) (layer F.CrtYd) (width 0.05))
+ (fp_line (start 1.55 1.55) (end 1.55 -1.55) (layer F.CrtYd) (width 0.05))
+ (fp_line (start 1.55 -1.55) (end -4.1 -1.55) (layer F.CrtYd) (width 0.05))
+ (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+ (net 3 +3V3))
+ (pad 2 thru_hole oval (at -2.54 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+ (net 27 "Net-(JP3-Pad2)"))
+ (model Socket_Strips.3dshapes/Socket_Strip_Straight_2x01_Pitch2.54mm.wrl
+ (at (xyz -0.05 0 0))
+ (scale (xyz 1 1 1))
+ (rotate (xyz 0 0 270))
+ )
+ )
+
+ (module Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm (layer F.Cu) (tedit 5862ED52) (tstamp 5A386601)
+ (at 123.571 91.8845 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 /5A36EBE0)
+ (fp_text reference J3 (at 0 -2.39 180) (layer F.SilkS)
+ (effects (font (size 1 1) (thickness 0.15)))
+ )
+ (fp_text value CONN_01X02 (at 0 4.93 180) (layer F.Fab)
+ (effects (font (size 1 1) (thickness 0.15)))
+ )
+ (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 -1.27) (layer F.Fab) (width 0.1))
+ (fp_line (start 1.27 -1.27) (end -1.27 -1.27) (layer F.Fab) (width 0.1))
+ (fp_line (start -1.39 1.27) (end -1.39 3.93) (layer F.SilkS) (width 0.12))
+ (fp_line (start -1.39 3.93) (end 1.39 3.93) (layer F.SilkS) (width 0.12))
+ (fp_line (start 1.39 3.93) (end 1.39 1.27) (layer F.SilkS) (width 0.12))
+ (fp_line (start 1.39 1.27) (end -1.39 1.27) (layer F.SilkS) (width 0.12))
+ (fp_line (start -1.39 0) (end -1.39 -1.39) (layer F.SilkS) (width 0.12))
+ (fp_line (start -1.39 -1.39) (end 0 -1.39) (layer F.SilkS) (width 0.12))
+ (fp_line (start -1.6 -1.6) (end -1.6 4.1) (layer F.CrtYd) (width 0.05))
+ (fp_line (start -1.6 4.1) (end 1.6 4.1) (layer F.CrtYd) (width 0.05))
+ (fp_line (start 1.6 4.1) (end 1.6 -1.6) (layer F.CrtYd) (width 0.05))
+ (fp_line (start 1.6 -1.6) (end -1.6 -1.6) (layer F.CrtYd) (width 0.05))
+ (pad 1 thru_hole rect (at 0 0 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+ (net 13 /USB_DP))
+ (pad 2 thru_hole oval (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+ (net 12 /USB_DM))
+ (model Pin_Headers.3dshapes/Pin_Header_Straight_1x02_Pitch2.54mm.wrl
+ (at (xyz 0 -0.05 0))
+ (scale (xyz 1 1 1))
+ (rotate (xyz 0 0 90))
+ )
+ )
+
+ (module Wire_Pads:SolderWirePad_single_0-8mmDrill (layer F.Cu) (tedit 5A36EAB4) (tstamp 5A3B5E52)
+ (at 145.161 100.9015)
+ (path /5A36F13B)
+ (fp_text reference J2 (at 0 -2.54) (layer F.SilkS)
+ (effects (font (size 1 1) (thickness 0.15)))
+ )
+ (fp_text value CONN_01X01_MALE (at 0 2.54) (layer F.Fab)
+ (effects (font (size 1 1) (thickness 0.15)))
+ )
+ (pad 1 thru_hole circle (at 0 0) (size 1.2 1.2) (drill 0.8001) (layers *.Cu *.Mask)
+ (net 28 "Net-(J2-Pad1)"))
+ )
+
(gr_text 1 (at 138.938 121.285 90) (layer F.SilkS)
(effects (font (size 1 1) (thickness 0.15)))
)
@@ -1372,8 +1461,23 @@
(segment (start 116.967 85.725) (end 117.536 85.156) (width 0.4) (layer F.Cu) (net 1) (tstamp 5A2EFAB7))
(segment (start 116.967 87.884) (end 116.967 85.725) (width 0.4) (layer F.Cu) (net 1) (tstamp 5A2EFAB5))
(segment (start 115.219 89.632) (end 116.967 87.884) (width 0.4) (layer F.Cu) (net 1) (tstamp 5A2EFAB4))
- (segment (start 147.254 95.25) (end 147.193 95.311) (width 0.4) (layer F.Cu) (net 3) (status C00000))
- (segment (start 147.193 95.311) (end 147.193 97.028) (width 0.4) (layer F.Cu) (net 3) (tstamp 5A2EFC90) (status 400000))
+ (segment (start 146.3635 103.247) (end 145.9865 102.87) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 147.435 103.247) (end 146.3635 103.247) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 149.535 95.2425) (end 149.225 94.9325) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 149.535 96.647) (end 149.535 95.2425) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 156.7905 98.7425) (end 157.861 98.7425) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 156.135 98.747) (end 156.786 98.747) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 156.786 98.747) (end 156.7905 98.7425) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 152.535 105.347) (end 152.535 106.561) (width 0.25) (layer F.Cu) (net 2))
+ (segment (start 152.535 106.561) (end 152.7175 106.7435) (width 0.25) (layer F.Cu) (net 2) (tstamp 5A2EFE83))
+ (segment (start 153.924 108.016) (end 155.1965 108.016) (width 0.4) (layer F.Cu) (net 3))
+ (segment (start 158.115 111.887) (end 158.115 118.999) (width 0.4) (layer B.Cu) (net 3) (tstamp 5A2EFE2F))
+ (segment (start 156.5275 110.2995) (end 158.115 111.887) (width 0.4) (layer B.Cu) (net 3) (tstamp 5A2EFE2E))
+ (via (at 156.5275 110.2995) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+ (segment (start 156.5275 109.347) (end 156.5275 110.2995) (width 0.4) (layer F.Cu) (net 3) (tstamp 5A2EFE2B))
+ (segment (start 155.1965 108.016) (end 156.5275 109.347) (width 0.4) (layer F.Cu) (net 3) (tstamp 5A2EFE23))
+ (segment (start 147.254 95.25) (end 147.193 95.311) (width 0.4) (layer F.Cu) (net 3))
+ (segment (start 147.193 95.311) (end 147.193 97.028) (width 0.4) (layer F.Cu) (net 3) (tstamp 5A2EFC90))
(via (at 147.193 97.028) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 3))
(segment (start 147.193 97.028) (end 146.939 97.028) (width 0.4) (layer B.Cu) (net 3) (tstamp 5A1B4A5C))
(segment (start 126.1745 85.3465) (end 127.32 85.3465) (width 0.5) (layer F.Cu) (net 3))
@@ -1387,11 +1491,11 @@
(segment (start 171.366 114.681) (end 169.9055 113.2205) (width 0.5) (layer F.Cu) (net 3))
(segment (start 169.9055 113.2205) (end 166.751 113.2205) (width 0.5) (layer F.Cu) (net 3) (tstamp 5A2EF172))
(segment (start 158.115 118.999) (end 163.8935 113.2205) (width 0.5) (layer B.Cu) (net 3))
- (segment (start 163.8935 113.2205) (end 166.751 113.2205) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A2EF15A))
(via (at 166.751 113.2205) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 3))
+ (segment (start 163.8935 113.2205) (end 166.751 113.2205) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A2EF15A))
(segment (start 137.541 101.219) (end 137.541 108.458) (width 0.5) (layer B.Cu) (net 3))
- (segment (start 148.082 118.999) (end 158.115 118.999) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A2EEADC))
(segment (start 137.541 108.458) (end 148.082 118.999) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A2EEAC7))
+ (segment (start 148.082 118.999) (end 158.115 118.999) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A2EEADC))
(segment (start 166.751 113.2205) (end 166.751 114.638) (width 0.5) (layer F.Cu) (net 3) (tstamp 5A2EF16D))
(segment (start 166.751 114.638) (end 166.794 114.681) (width 0.5) (layer F.Cu) (net 3) (tstamp 5A2EF16E))
(segment (start 156.21 97.028) (end 156.779 97.597) (width 0.25) (layer F.Cu) (net 3))
@@ -1404,30 +1508,30 @@
(segment (start 146.939 97.028) (end 145.923 97.028) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A1B4A5F))
(segment (start 145.923 97.028) (end 141.732 101.219) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A1B4A2D))
(segment (start 137.541 101.219) (end 140.3985 101.219) (width 0.5) (layer B.Cu) (net 3))
- (segment (start 140.3985 101.219) (end 143.0655 101.219) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A1B4A41))
(segment (start 144.46 102.6135) (end 144.46 103.759) (width 0.4) (layer F.Cu) (net 3) (tstamp 5A1B49F6) (status 20))
(segment (start 144.399 102.5525) (end 144.46 102.6135) (width 0.4) (layer F.Cu) (net 3) (tstamp 5A1B49F5))
(via (at 144.399 102.5525) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 3))
- (segment (start 143.0655 101.219) (end 144.399 102.5525) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A1B49EE))
(segment (start 126.0475 85.2195) (end 126.1745 85.3465) (width 0.4) (layer F.Cu) (net 3) (status 30))
- (segment (start 149.035 96.647) (end 149.035 95.949) (width 0.25) (layer F.Cu) (net 3) (status 400000))
- (segment (start 148.336 95.25) (end 147.254 95.25) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B2431) (status 800020))
+ (segment (start 149.035 96.647) (end 149.035 95.949) (width 0.25) (layer F.Cu) (net 3))
+ (segment (start 148.336 95.25) (end 147.254 95.25) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B2431) (status 20))
(segment (start 149.035 95.949) (end 148.336 95.25) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B242F))
(segment (start 147.435 103.747) (end 144.472 103.747) (width 0.25) (layer F.Cu) (net 3) (status 20))
(segment (start 144.472 103.747) (end 144.46 103.759) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B2429) (status 30))
- (segment (start 153.035 105.347) (end 153.035 106.426) (width 0.25) (layer F.Cu) (net 3))
- (segment (start 153.924 107.315) (end 153.924 108.016) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B240E))
- (segment (start 153.035 106.426) (end 153.924 107.315) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B240A))
+ (segment (start 153.035 105.347) (end 153.035 106.172) (width 0.25) (layer F.Cu) (net 3))
+ (segment (start 153.924 107.061) (end 153.924 108.016) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B240E))
+ (segment (start 153.035 106.172) (end 153.924 107.061) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1B240A))
(segment (start 147.425 95.079) (end 147.254 95.25) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A1191BA) (status 30))
(segment (start 144.48 103.739) (end 144.46 103.759) (width 0.25) (layer F.Cu) (net 3) (tstamp 5A10BD95) (status 30))
+ (segment (start 140.3985 101.219) (end 143.0655 101.219) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A1B4A41))
+ (segment (start 143.0655 101.219) (end 144.399 102.5525) (width 0.5) (layer B.Cu) (net 3) (tstamp 5A1B49EE))
+ (segment (start 152.035 105.347) (end 152.035 107.7145) (width 0.25) (layer F.Cu) (net 4))
+ (segment (start 152.035 107.7145) (end 152.3365 108.016) (width 0.25) (layer F.Cu) (net 4))
(segment (start 152.035 105.347) (end 152.035 104.156) (width 0.25) (layer F.Cu) (net 4))
(segment (start 128.397 105.664) (end 127.381 104.648) (width 0.25) (layer F.Cu) (net 4) (tstamp 5A1B2495))
(segment (start 147.193 105.664) (end 128.397 105.664) (width 0.25) (layer F.Cu) (net 4) (tstamp 5A1B248D))
(segment (start 148.971 103.886) (end 147.193 105.664) (width 0.25) (layer F.Cu) (net 4) (tstamp 5A1B2489))
(segment (start 151.765 103.886) (end 148.971 103.886) (width 0.25) (layer F.Cu) (net 4) (tstamp 5A1B2484))
(segment (start 152.035 104.156) (end 151.765 103.886) (width 0.25) (layer F.Cu) (net 4) (tstamp 5A1B2481))
- (segment (start 152.035 105.347) (end 152.035 107.778) (width 0.25) (layer F.Cu) (net 4))
- (segment (start 152.035 107.778) (end 152.273 108.016) (width 0.25) (layer F.Cu) (net 4) (tstamp 5A1B2411))
(segment (start 127.381 101.219) (end 127.381 104.648) (width 0.25) (layer B.Cu) (net 4))
(via (at 127.381 104.648) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 4))
(segment (start 166.878 123.825) (end 162.687 119.634) (width 0.25) (layer F.Cu) (net 5))
@@ -1509,12 +1613,19 @@
(segment (start 169.037 96.393) (end 166.116 99.314) (width 0.25) (layer B.Cu) (net 11) (tstamp 5A1B2386))
(segment (start 142.494 75.565) (end 154.035 87.106) (width 0.25) (layer F.Cu) (net 11))
(segment (start 154.035 87.106) (end 154.035 96.647) (width 0.25) (layer F.Cu) (net 11) (tstamp 5A119485))
- (segment (start 114.38 90.282) (end 149.845 90.282) (width 0.25) (layer F.Cu) (net 12))
+ (segment (start 114.38 90.282) (end 123.571 90.282) (width 0.25) (layer F.Cu) (net 12))
+ (segment (start 123.571 90.282) (end 149.845 90.282) (width 0.25) (layer F.Cu) (net 12))
+ (segment (start 123.571 89.3445) (end 123.571 90.282) (width 0.25) (layer F.Cu) (net 12))
(segment (start 151.035 91.472) (end 151.035 96.647) (width 0.25) (layer F.Cu) (net 12) (tstamp 5A11F090))
(segment (start 149.845 90.282) (end 151.035 91.472) (width 0.25) (layer F.Cu) (net 12) (tstamp 5A11F089))
+ (segment (start 149.479 90.932) (end 123.6345 90.932) (width 0.25) (layer F.Cu) (net 13))
+ (segment (start 123.6345 90.932) (end 114.38 90.932) (width 0.25) (layer F.Cu) (net 13))
+ (segment (start 123.571 91.8845) (end 123.571 90.9955) (width 0.25) (layer F.Cu) (net 13))
+ (segment (start 123.571 90.9955) (end 123.6345 90.932) (width 0.25) (layer F.Cu) (net 13))
(segment (start 150.535 96.647) (end 150.535 91.988) (width 0.25) (layer F.Cu) (net 13))
- (segment (start 149.479 90.932) (end 114.38 90.932) (width 0.25) (layer F.Cu) (net 13) (tstamp 5A11F09C))
(segment (start 150.535 91.988) (end 149.479 90.932) (width 0.25) (layer F.Cu) (net 13) (tstamp 5A11F094))
+ (segment (start 114.38 93.582) (end 114.38 93.432) (width 0.25) (layer F.Cu) (net 14))
+ (segment (start 114.38 88.282) (end 114.38 88.432) (width 0.25) (layer F.Cu) (net 14))
(segment (start 147.435 98.247) (end 136.322 98.247) (width 0.25) (layer F.Cu) (net 15))
(segment (start 135.001 99.568) (end 135.001 101.219) (width 0.25) (layer F.Cu) (net 15) (tstamp 5A121212))
(segment (start 136.322 98.247) (end 135.001 99.568) (width 0.25) (layer F.Cu) (net 15) (tstamp 5A121211))
@@ -1522,9 +1633,9 @@
(segment (start 150.035 94.663) (end 150.035 96.647) (width 0.25) (layer F.Cu) (net 16) (tstamp 5A121224))
(segment (start 148.463 93.091) (end 150.035 94.663) (width 0.25) (layer F.Cu) (net 16) (tstamp 5A121221))
(segment (start 138.049 93.091) (end 148.463 93.091) (width 0.25) (layer F.Cu) (net 16) (tstamp 5A121218))
- (segment (start 147.435 99.247) (end 143.958 99.247) (width 0.25) (layer F.Cu) (net 17))
(segment (start 127 103.378) (end 124.841 101.219) (width 0.25) (layer F.Cu) (net 17) (tstamp 5A121257))
(segment (start 139.827 103.378) (end 127 103.378) (width 0.25) (layer F.Cu) (net 17) (tstamp 5A12124F))
+ (segment (start 147.435 99.247) (end 143.958 99.247) (width 0.25) (layer F.Cu) (net 17))
(segment (start 143.958 99.247) (end 139.827 103.378) (width 0.25) (layer F.Cu) (net 17) (tstamp 5A121246))
(segment (start 161.798 123.825) (end 160.782 122.809) (width 0.25) (layer F.Cu) (net 18))
(segment (start 159.127 103.247) (end 156.135 103.247) (width 0.25) (layer F.Cu) (net 18) (tstamp 5A11F050))
@@ -1567,18 +1678,23 @@
(segment (start 172.339 117.475) (end 172.339 117.094) (width 0.25) (layer F.Cu) (net 23))
(segment (start 172.339 117.094) (end 173.566 115.867) (width 0.25) (layer F.Cu) (net 23) (tstamp 5A1B245B))
(segment (start 173.566 115.867) (end 173.566 114.681) (width 0.25) (layer F.Cu) (net 23) (tstamp 5A1B245C))
- (segment (start 149.035 105.347) (end 149.035 106.108) (width 0.25) (layer F.Cu) (net 24))
- (segment (start 149.035 106.108) (end 147.701 107.442) (width 0.25) (layer F.Cu) (net 24) (tstamp 5A1B2423))
- (segment (start 147.701 107.442) (end 147.127 107.442) (width 0.25) (layer F.Cu) (net 24) (tstamp 5A1B2426))
+ (segment (start 149.035 105.347) (end 149.035 106.489) (width 0.25) (layer F.Cu) (net 24))
+ (segment (start 149.035 106.489) (end 148.2725 107.2515) (width 0.25) (layer F.Cu) (net 24))
+ (segment (start 148.2725 107.2515) (end 147.3835 107.2515) (width 0.25) (layer F.Cu) (net 24))
+ (segment (start 148.679 108.623) (end 148.679 111.168) (width 0.25) (layer F.Cu) (net 25))
(segment (start 148.679 111.168) (end 146.708 111.168) (width 0.25) (layer F.Cu) (net 25))
(segment (start 146.708 111.168) (end 146.685 111.191) (width 0.25) (layer F.Cu) (net 25) (tstamp 5A1B23FE))
(segment (start 151.035 105.347) (end 151.035 106.267) (width 0.25) (layer F.Cu) (net 25))
- (segment (start 148.679 108.623) (end 148.679 111.168) (width 0.25) (layer F.Cu) (net 25) (tstamp 5A1B23DB))
(segment (start 151.035 106.267) (end 148.679 108.623) (width 0.25) (layer F.Cu) (net 25) (tstamp 5A1B23D8))
(segment (start 150.279 113.368) (end 150.279 115.166) (width 0.25) (layer F.Cu) (net 26))
- (segment (start 150.279 115.166) (end 150.429 115.316) (width 0.25) (layer F.Cu) (net 26) (tstamp 5A1B2401))
+ (segment (start 150.279 115.166) (end 150.429 115.316) (width 0.25) (layer F.Cu) (net 26))
+ (segment (start 151.535 112.112) (end 150.279 113.368) (width 0.25) (layer F.Cu) (net 26))
(segment (start 151.535 105.347) (end 151.535 112.112) (width 0.25) (layer F.Cu) (net 26))
- (segment (start 151.535 112.112) (end 150.279 113.368) (width 0.25) (layer F.Cu) (net 26) (tstamp 5A1B23DF))
+ (segment (start 146.558 123.825) (end 146.558 122.309) (width 0.5) (layer F.Cu) (net 27))
+ (segment (start 146.558 122.309) (end 145.542 121.293) (width 0.5) (layer F.Cu) (net 27))
+ (segment (start 145.542 121.293) (end 145.542 118.999) (width 0.5) (layer F.Cu) (net 27))
+ (segment (start 147.435 101.747) (end 146.0065 101.747) (width 0.25) (layer F.Cu) (net 28))
+ (segment (start 146.0065 101.747) (end 145.161 100.9015) (width 0.25) (layer F.Cu) (net 28))
(zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5A1C824E) (hatch edge 0.508)
(connect_pads (clearance 0.508))
@@ -1670,58 +1786,76 @@
(xy 115.405506 92.832536) (xy 115.164889 92.472426) (xy 114.804779 92.231809) (xy 114.38 92.147315) (xy 113.955221 92.231809)
(xy 113.595111 92.472426) (xy 113.354494 92.832536) (xy 113.27 93.257315) (xy 113.03 93.257315) (xy 113.03 88.257315)
(xy 113.27 88.257315) (xy 113.27 88.606685) (xy 113.354494 89.031464) (xy 113.595111 89.391574) (xy 113.955221 89.632191)
- (xy 114.38 89.716685) (xy 114.804779 89.632191) (xy 115.164889 89.391574) (xy 115.405506 89.031464) (xy 115.49 88.606685)
- (xy 115.49 88.257315) (xy 115.405506 87.832536) (xy 115.164889 87.472426) (xy 114.804779 87.231809) (xy 114.38 87.147315)
- (xy 113.955221 87.231809) (xy 113.595111 87.472426) (xy 113.354494 87.832536) (xy 113.27 88.257315) (xy 113.03 88.257315)
- (xy 113.03 87.868182) (xy 113.031227 87.866346) (xy 113.117624 87.432) (xy 113.031227 86.997654) (xy 113.03 86.995818)
- (xy 113.03 86.989667) (xy 127.842838 86.989667) (xy 127.984883 87.333443) (xy 128.247673 87.596692) (xy 128.260394 87.601974)
- (xy 136.656 95.997579) (xy 136.656 99.728146) (xy 136.455683 99.765838) (xy 136.239559 99.90491) (xy 136.094569 100.11711)
- (xy 136.080914 100.184541) (xy 136.051054 100.139853) (xy 135.569285 99.817946) (xy 135.001 99.704907) (xy 134.432715 99.817946)
- (xy 133.950946 100.139853) (xy 133.723298 100.480553) (xy 133.656183 100.337642) (xy 133.227924 99.947355) (xy 132.81789 99.777524)
- (xy 132.588 99.898845) (xy 132.588 101.092) (xy 132.608 101.092) (xy 132.608 101.346) (xy 132.588 101.346)
- (xy 132.588 102.539155) (xy 132.81789 102.660476) (xy 133.227924 102.490645) (xy 133.656183 102.100358) (xy 133.723298 101.957447)
- (xy 133.950946 102.298147) (xy 134.432715 102.620054) (xy 135.001 102.733093) (xy 135.569285 102.620054) (xy 136.051054 102.298147)
- (xy 136.07885 102.256548) (xy 136.087838 102.304317) (xy 136.22691 102.520441) (xy 136.43911 102.665431) (xy 136.656 102.709352)
- (xy 136.656 108.457995) (xy 136.655999 108.458) (xy 136.71219 108.740484) (xy 136.723367 108.796675) (xy 136.91521 109.08379)
- (xy 147.456208 119.624787) (xy 147.45621 119.62479) (xy 147.743325 119.816633) (xy 148.082 119.884001) (xy 148.082005 119.884)
- (xy 158.114995 119.884) (xy 158.115 119.884001) (xy 158.397484 119.82781) (xy 158.453675 119.816633) (xy 158.74079 119.62479)
- (xy 158.740791 119.624789) (xy 159.200579 119.165) (xy 167.53956 119.165) (xy 167.53956 120.865) (xy 167.583838 121.100317)
- (xy 167.72291 121.316441) (xy 167.93511 121.461431) (xy 168.187 121.51244) (xy 169.887 121.51244) (xy 170.122317 121.468162)
- (xy 170.338441 121.32909) (xy 170.483431 121.11689) (xy 170.53444 120.865) (xy 170.53444 119.165) (xy 170.490162 118.929683)
- (xy 170.35109 118.713559) (xy 170.13889 118.568569) (xy 170.082546 118.557159) (xy 170.087054 118.554147) (xy 170.408961 118.072378)
- (xy 170.522 117.504093) (xy 170.522 117.445907) (xy 170.408961 116.877622) (xy 170.087054 116.395853) (xy 169.605285 116.073946)
- (xy 169.037 115.960907) (xy 168.468715 116.073946) (xy 167.986946 116.395853) (xy 167.665039 116.877622) (xy 167.552 117.445907)
- (xy 167.552 117.504093) (xy 167.665039 118.072378) (xy 167.986946 118.554147) (xy 167.988179 118.554971) (xy 167.951683 118.561838)
- (xy 167.735559 118.70091) (xy 167.590569 118.91311) (xy 167.53956 119.165) (xy 159.200579 119.165) (xy 164.260079 114.1055)
- (xy 166.444178 114.1055) (xy 166.564201 114.155338) (xy 166.936167 114.155662) (xy 167.279943 114.013617) (xy 167.543192 113.750827)
- (xy 167.685838 113.407299) (xy 167.686162 113.035333) (xy 167.544117 112.691557) (xy 167.281327 112.428308) (xy 166.937799 112.285662)
- (xy 166.565833 112.285338) (xy 166.444431 112.3355) (xy 163.893505 112.3355) (xy 163.8935 112.335499) (xy 163.611016 112.39169)
- (xy 163.554825 112.402867) (xy 163.26771 112.59471) (xy 163.267708 112.594713) (xy 157.74842 118.114) (xy 148.448579 118.114)
- (xy 138.426 108.09142) (xy 138.426 106.293667) (xy 157.306838 106.293667) (xy 157.448883 106.637443) (xy 157.711673 106.900692)
- (xy 158.055201 107.043338) (xy 158.427167 107.043662) (xy 158.770943 106.901617) (xy 158.804118 106.8685) (xy 165.4175 106.8685)
- (xy 165.708339 106.810648) (xy 165.954901 106.645901) (xy 167.27168 105.329122) (xy 167.317167 105.329162) (xy 167.660943 105.187117)
- (xy 167.924192 104.924327) (xy 168.066838 104.580799) (xy 168.067162 104.208833) (xy 167.925117 103.865057) (xy 167.662327 103.601808)
- (xy 167.424372 103.503) (xy 168.093537 103.503) (xy 168.125673 103.535192) (xy 168.469201 103.677838) (xy 168.841167 103.678162)
- (xy 169.184943 103.536117) (xy 169.448192 103.273327) (xy 169.590838 102.929799) (xy 169.591162 102.557833) (xy 169.449117 102.214057)
- (xy 169.186327 101.950808) (xy 168.842799 101.808162) (xy 168.470833 101.807838) (xy 168.127057 101.949883) (xy 168.093882 101.983)
- (xy 165.862 101.983) (xy 165.571161 102.040852) (xy 165.324599 102.205599) (xy 163.515198 104.015) (xy 159.248963 104.015)
- (xy 159.216827 103.982808) (xy 158.873299 103.840162) (xy 158.501333 103.839838) (xy 158.157557 103.981883) (xy 157.894308 104.244673)
- (xy 157.751662 104.588201) (xy 157.751338 104.960167) (xy 157.871124 105.250071) (xy 157.713057 105.315383) (xy 157.449808 105.578173)
- (xy 157.307162 105.921701) (xy 157.306838 106.293667) (xy 138.426 106.293667) (xy 138.426 102.709854) (xy 138.626317 102.672162)
- (xy 138.842441 102.53309) (xy 138.987431 102.32089) (xy 139.031352 102.104) (xy 141.731995 102.104) (xy 141.732 102.104001)
- (xy 141.732005 102.104) (xy 142.69892 102.104) (xy 143.556255 102.961334) (xy 143.605883 103.081443) (xy 143.868673 103.344692)
- (xy 144.212201 103.487338) (xy 144.584167 103.487662) (xy 144.927943 103.345617) (xy 145.191192 103.082827) (xy 145.333838 102.739299)
- (xy 145.334162 102.367333) (xy 145.192117 102.023557) (xy 144.929327 101.760308) (xy 144.808013 101.709934) (xy 143.69129 100.59321)
- (xy 143.642182 100.560397) (xy 146.289579 97.913) (xy 146.886178 97.913) (xy 147.006201 97.962838) (xy 147.378167 97.963162)
- (xy 147.499569 97.913) (xy 155.903178 97.913) (xy 156.023201 97.962838) (xy 156.395167 97.963162) (xy 156.738943 97.821117)
- (xy 157.002192 97.558327) (xy 157.144838 97.214799) (xy 157.145162 96.842833) (xy 157.003117 96.499057) (xy 156.740327 96.235808)
- (xy 156.396799 96.093162) (xy 156.024833 96.092838) (xy 155.903431 96.143) (xy 147.499822 96.143) (xy 147.379799 96.093162)
- (xy 147.007833 96.092838) (xy 146.886431 96.143) (xy 145.923005 96.143) (xy 145.923 96.142999) (xy 145.671634 96.193)
- (xy 145.584325 96.210367) (xy 145.29721 96.40221) (xy 145.297208 96.402213) (xy 141.36542 100.334) (xy 139.031854 100.334)
- (xy 138.994162 100.133683) (xy 138.85509 99.917559) (xy 138.64289 99.772569) (xy 138.426 99.728648) (xy 138.426 95.631)
- (xy 138.358633 95.292325) (xy 138.16679 95.00521) (xy 138.166787 95.005208) (xy 129.665456 86.503876) (xy 129.571117 86.275557)
- (xy 129.308327 86.012308) (xy 128.964799 85.869662) (xy 128.592833 85.869338) (xy 128.249057 86.011383) (xy 127.985808 86.274173)
- (xy 127.843162 86.617701) (xy 127.842838 86.989667) (xy 113.03 86.989667) (xy 113.03 73.914) (xy 124.11688 73.914)
+ (xy 114.38 89.716685) (xy 114.804779 89.632191) (xy 115.164889 89.391574) (xy 115.196342 89.3445) (xy 122.056907 89.3445)
+ (xy 122.169946 89.912785) (xy 122.491853 90.394554) (xy 122.533452 90.42235) (xy 122.485683 90.431338) (xy 122.269559 90.57041)
+ (xy 122.124569 90.78261) (xy 122.07356 91.0345) (xy 122.07356 92.7345) (xy 122.117838 92.969817) (xy 122.25691 93.185941)
+ (xy 122.46911 93.330931) (xy 122.721 93.38194) (xy 124.421 93.38194) (xy 124.656317 93.337662) (xy 124.872441 93.19859)
+ (xy 125.017431 92.98639) (xy 125.06844 92.7345) (xy 125.06844 91.0345) (xy 125.024162 90.799183) (xy 124.88509 90.583059)
+ (xy 124.67289 90.438069) (xy 124.605459 90.424414) (xy 124.650147 90.394554) (xy 124.972054 89.912785) (xy 125.085093 89.3445)
+ (xy 124.972054 88.776215) (xy 124.650147 88.294446) (xy 124.168378 87.972539) (xy 123.600093 87.8595) (xy 123.541907 87.8595)
+ (xy 122.973622 87.972539) (xy 122.491853 88.294446) (xy 122.169946 88.776215) (xy 122.056907 89.3445) (xy 115.196342 89.3445)
+ (xy 115.405506 89.031464) (xy 115.49 88.606685) (xy 115.49 88.257315) (xy 115.405506 87.832536) (xy 115.164889 87.472426)
+ (xy 114.804779 87.231809) (xy 114.38 87.147315) (xy 113.955221 87.231809) (xy 113.595111 87.472426) (xy 113.354494 87.832536)
+ (xy 113.27 88.257315) (xy 113.03 88.257315) (xy 113.03 87.868182) (xy 113.031227 87.866346) (xy 113.117624 87.432)
+ (xy 113.031227 86.997654) (xy 113.03 86.995818) (xy 113.03 86.989667) (xy 127.842838 86.989667) (xy 127.984883 87.333443)
+ (xy 128.247673 87.596692) (xy 128.260394 87.601974) (xy 136.656 95.997579) (xy 136.656 99.728146) (xy 136.455683 99.765838)
+ (xy 136.239559 99.90491) (xy 136.094569 100.11711) (xy 136.080914 100.184541) (xy 136.051054 100.139853) (xy 135.569285 99.817946)
+ (xy 135.001 99.704907) (xy 134.432715 99.817946) (xy 133.950946 100.139853) (xy 133.723298 100.480553) (xy 133.656183 100.337642)
+ (xy 133.227924 99.947355) (xy 132.81789 99.777524) (xy 132.588 99.898845) (xy 132.588 101.092) (xy 132.608 101.092)
+ (xy 132.608 101.346) (xy 132.588 101.346) (xy 132.588 102.539155) (xy 132.81789 102.660476) (xy 133.227924 102.490645)
+ (xy 133.656183 102.100358) (xy 133.723298 101.957447) (xy 133.950946 102.298147) (xy 134.432715 102.620054) (xy 135.001 102.733093)
+ (xy 135.569285 102.620054) (xy 136.051054 102.298147) (xy 136.07885 102.256548) (xy 136.087838 102.304317) (xy 136.22691 102.520441)
+ (xy 136.43911 102.665431) (xy 136.656 102.709352) (xy 136.656 108.457995) (xy 136.655999 108.458) (xy 136.71219 108.740484)
+ (xy 136.723367 108.796675) (xy 136.91521 109.08379) (xy 145.373209 117.541788) (xy 144.944622 117.627039) (xy 144.462853 117.948946)
+ (xy 144.140946 118.430715) (xy 144.027907 118.999) (xy 144.140946 119.567285) (xy 144.462853 120.049054) (xy 144.944622 120.370961)
+ (xy 145.512907 120.484) (xy 145.571093 120.484) (xy 146.139378 120.370961) (xy 146.621147 120.049054) (xy 146.621971 120.047821)
+ (xy 146.628838 120.084317) (xy 146.76791 120.300441) (xy 146.98011 120.445431) (xy 147.232 120.49644) (xy 148.932 120.49644)
+ (xy 149.167317 120.452162) (xy 149.383441 120.31309) (xy 149.528431 120.10089) (xy 149.572352 119.884) (xy 158.114995 119.884)
+ (xy 158.115 119.884001) (xy 158.397484 119.82781) (xy 158.453675 119.816633) (xy 158.74079 119.62479) (xy 158.740791 119.624789)
+ (xy 159.200579 119.165) (xy 167.53956 119.165) (xy 167.53956 120.865) (xy 167.583838 121.100317) (xy 167.72291 121.316441)
+ (xy 167.93511 121.461431) (xy 168.187 121.51244) (xy 169.887 121.51244) (xy 170.122317 121.468162) (xy 170.338441 121.32909)
+ (xy 170.483431 121.11689) (xy 170.53444 120.865) (xy 170.53444 119.165) (xy 170.490162 118.929683) (xy 170.35109 118.713559)
+ (xy 170.13889 118.568569) (xy 170.082546 118.557159) (xy 170.087054 118.554147) (xy 170.408961 118.072378) (xy 170.522 117.504093)
+ (xy 170.522 117.445907) (xy 170.408961 116.877622) (xy 170.087054 116.395853) (xy 169.605285 116.073946) (xy 169.037 115.960907)
+ (xy 168.468715 116.073946) (xy 167.986946 116.395853) (xy 167.665039 116.877622) (xy 167.552 117.445907) (xy 167.552 117.504093)
+ (xy 167.665039 118.072378) (xy 167.986946 118.554147) (xy 167.988179 118.554971) (xy 167.951683 118.561838) (xy 167.735559 118.70091)
+ (xy 167.590569 118.91311) (xy 167.53956 119.165) (xy 159.200579 119.165) (xy 164.260079 114.1055) (xy 166.444178 114.1055)
+ (xy 166.564201 114.155338) (xy 166.936167 114.155662) (xy 167.279943 114.013617) (xy 167.543192 113.750827) (xy 167.685838 113.407299)
+ (xy 167.686162 113.035333) (xy 167.544117 112.691557) (xy 167.281327 112.428308) (xy 166.937799 112.285662) (xy 166.565833 112.285338)
+ (xy 166.444431 112.3355) (xy 163.893505 112.3355) (xy 163.8935 112.335499) (xy 163.611016 112.39169) (xy 163.554825 112.402867)
+ (xy 163.26771 112.59471) (xy 163.267708 112.594713) (xy 158.95 116.91242) (xy 158.95 111.887) (xy 158.886439 111.567459)
+ (xy 158.705434 111.296566) (xy 157.420035 110.011167) (xy 157.320617 109.770557) (xy 157.057827 109.507308) (xy 156.714299 109.364662)
+ (xy 156.342333 109.364338) (xy 155.998557 109.506383) (xy 155.735308 109.769173) (xy 155.592662 110.112701) (xy 155.592338 110.484667)
+ (xy 155.734383 110.828443) (xy 155.997173 111.091692) (xy 156.23941 111.192278) (xy 157.28 112.232868) (xy 157.28 118.114)
+ (xy 149.572854 118.114) (xy 149.535162 117.913683) (xy 149.39609 117.697559) (xy 149.18389 117.552569) (xy 148.932 117.50156)
+ (xy 147.836139 117.50156) (xy 138.426 108.09142) (xy 138.426 106.293667) (xy 157.306838 106.293667) (xy 157.448883 106.637443)
+ (xy 157.711673 106.900692) (xy 158.055201 107.043338) (xy 158.427167 107.043662) (xy 158.770943 106.901617) (xy 158.804118 106.8685)
+ (xy 165.4175 106.8685) (xy 165.708339 106.810648) (xy 165.954901 106.645901) (xy 167.27168 105.329122) (xy 167.317167 105.329162)
+ (xy 167.660943 105.187117) (xy 167.924192 104.924327) (xy 168.066838 104.580799) (xy 168.067162 104.208833) (xy 167.925117 103.865057)
+ (xy 167.662327 103.601808) (xy 167.424372 103.503) (xy 168.093537 103.503) (xy 168.125673 103.535192) (xy 168.469201 103.677838)
+ (xy 168.841167 103.678162) (xy 169.184943 103.536117) (xy 169.448192 103.273327) (xy 169.590838 102.929799) (xy 169.591162 102.557833)
+ (xy 169.449117 102.214057) (xy 169.186327 101.950808) (xy 168.842799 101.808162) (xy 168.470833 101.807838) (xy 168.127057 101.949883)
+ (xy 168.093882 101.983) (xy 165.862 101.983) (xy 165.571161 102.040852) (xy 165.324599 102.205599) (xy 163.515198 104.015)
+ (xy 159.248963 104.015) (xy 159.216827 103.982808) (xy 158.873299 103.840162) (xy 158.501333 103.839838) (xy 158.157557 103.981883)
+ (xy 157.894308 104.244673) (xy 157.751662 104.588201) (xy 157.751338 104.960167) (xy 157.871124 105.250071) (xy 157.713057 105.315383)
+ (xy 157.449808 105.578173) (xy 157.307162 105.921701) (xy 157.306838 106.293667) (xy 138.426 106.293667) (xy 138.426 102.709854)
+ (xy 138.626317 102.672162) (xy 138.842441 102.53309) (xy 138.987431 102.32089) (xy 139.031352 102.104) (xy 141.731995 102.104)
+ (xy 141.732 102.104001) (xy 141.732005 102.104) (xy 142.69892 102.104) (xy 143.556255 102.961334) (xy 143.605883 103.081443)
+ (xy 143.868673 103.344692) (xy 144.212201 103.487338) (xy 144.584167 103.487662) (xy 144.927943 103.345617) (xy 145.191192 103.082827)
+ (xy 145.333838 102.739299) (xy 145.334162 102.367333) (xy 145.238812 102.136568) (xy 145.405579 102.136714) (xy 145.859657 101.949092)
+ (xy 146.207371 101.601985) (xy 146.395785 101.148234) (xy 146.396214 100.656921) (xy 146.208592 100.202843) (xy 145.861485 99.855129)
+ (xy 145.407734 99.666715) (xy 144.916421 99.666286) (xy 144.462343 99.853908) (xy 144.114629 100.201015) (xy 143.926215 100.654766)
+ (xy 143.926064 100.827984) (xy 143.69129 100.59321) (xy 143.642182 100.560397) (xy 146.289579 97.913) (xy 146.886178 97.913)
+ (xy 147.006201 97.962838) (xy 147.378167 97.963162) (xy 147.499569 97.913) (xy 155.903178 97.913) (xy 156.023201 97.962838)
+ (xy 156.395167 97.963162) (xy 156.738943 97.821117) (xy 157.002192 97.558327) (xy 157.144838 97.214799) (xy 157.145162 96.842833)
+ (xy 157.003117 96.499057) (xy 156.740327 96.235808) (xy 156.396799 96.093162) (xy 156.024833 96.092838) (xy 155.903431 96.143)
+ (xy 147.499822 96.143) (xy 147.379799 96.093162) (xy 147.007833 96.092838) (xy 146.886431 96.143) (xy 145.923005 96.143)
+ (xy 145.923 96.142999) (xy 145.671634 96.193) (xy 145.584325 96.210367) (xy 145.29721 96.40221) (xy 145.297208 96.402213)
+ (xy 141.36542 100.334) (xy 139.031854 100.334) (xy 138.994162 100.133683) (xy 138.85509 99.917559) (xy 138.64289 99.772569)
+ (xy 138.426 99.728648) (xy 138.426 95.631) (xy 138.358633 95.292325) (xy 138.16679 95.00521) (xy 138.166787 95.005208)
+ (xy 129.665456 86.503876) (xy 129.571117 86.275557) (xy 129.308327 86.012308) (xy 128.964799 85.869662) (xy 128.592833 85.869338)
+ (xy 128.249057 86.011383) (xy 127.985808 86.274173) (xy 127.843162 86.617701) (xy 127.842838 86.989667) (xy 113.03 86.989667)
+ (xy 113.03 73.914) (xy 124.11688 73.914)
)
)
(filled_polygon
@@ -1958,137 +2092,142 @@
(xy 152.535 87.585902) (xy 152.535 95.614654) (xy 152.41 95.614654) (xy 152.280411 95.639038) (xy 152.16 95.614654)
(xy 151.91 95.614654) (xy 151.780411 95.639038) (xy 151.66 95.614654) (xy 151.535 95.614654) (xy 151.535 91.472)
(xy 151.49694 91.280658) (xy 151.388553 91.118447) (xy 150.198553 89.928447) (xy 150.036342 89.82006) (xy 150.012919 89.815401)
- (xy 149.845 89.782) (xy 115.882172 89.782) (xy 117.373586 88.290587) (xy 117.498231 88.104043) (xy 117.51276 88.031)
- (xy 117.542 87.884) (xy 117.542 87.17475) (xy 117.868 87.17475) (xy 117.868 87.730592) (xy 117.92509 87.86842)
- (xy 118.030579 87.97391) (xy 118.168408 88.031) (xy 118.49925 88.031) (xy 118.593 87.93725) (xy 118.593 87.081)
- (xy 118.643 87.081) (xy 118.643 87.93725) (xy 118.73675 88.031) (xy 119.067592 88.031) (xy 119.205421 87.97391)
- (xy 119.31091 87.86842) (xy 119.368 87.730592) (xy 119.368 87.17475) (xy 119.27425 87.081) (xy 118.643 87.081)
- (xy 118.593 87.081) (xy 117.96175 87.081) (xy 117.868 87.17475) (xy 117.542 87.17475) (xy 117.542 85.963172)
- (xy 117.774173 85.731) (xy 117.860654 85.731) (xy 117.860654 85.756) (xy 117.886802 85.894966) (xy 117.968931 86.022599)
- (xy 118.094246 86.108223) (xy 118.099914 86.109371) (xy 118.030579 86.13809) (xy 117.92509 86.24358) (xy 117.868 86.381408)
- (xy 117.868 86.93725) (xy 117.96175 87.031) (xy 118.593 87.031) (xy 118.593 87.011) (xy 118.643 87.011)
- (xy 118.643 87.031) (xy 119.27425 87.031) (xy 119.368 86.93725) (xy 119.368 86.381408) (xy 119.31091 86.24358)
- (xy 119.205421 86.13809) (xy 119.136252 86.10944) (xy 119.259599 86.030069) (xy 119.345223 85.904754) (xy 119.375346 85.756)
- (xy 119.375346 85.6675) (xy 119.7325 85.6675) (xy 119.7325 85.92375) (xy 119.82625 86.0175) (xy 120.8625 86.0175)
- (xy 120.8625 85.9975) (xy 120.9125 85.9975) (xy 120.9125 86.0175) (xy 120.9325 86.0175) (xy 120.9325 86.0675)
- (xy 120.9125 86.0675) (xy 120.9125 86.0875) (xy 120.8625 86.0875) (xy 120.8625 86.0675) (xy 119.82625 86.0675)
- (xy 119.7325 86.16125) (xy 119.7325 86.442092) (xy 119.760864 86.510569) (xy 119.755277 86.518746) (xy 119.725154 86.6675)
- (xy 119.725154 87.3175) (xy 119.751302 87.456466) (xy 119.833431 87.584099) (xy 119.958746 87.669723) (xy 120.1075 87.699846)
- (xy 121.6675 87.699846) (xy 121.806466 87.673698) (xy 121.934099 87.591569) (xy 122.019723 87.466254) (xy 122.049653 87.318453)
- (xy 122.425154 86.942953) (xy 122.425154 87.3175) (xy 122.451302 87.456466) (xy 122.533431 87.584099) (xy 122.658746 87.669723)
- (xy 122.8075 87.699846) (xy 124.3675 87.699846) (xy 124.506466 87.673698) (xy 124.634099 87.591569) (xy 124.719723 87.466254)
- (xy 124.740176 87.36525) (xy 125.4245 87.36525) (xy 125.4245 87.921092) (xy 125.48159 88.05892) (xy 125.587079 88.16441)
- (xy 125.724908 88.2215) (xy 126.05575 88.2215) (xy 126.1495 88.12775) (xy 126.1495 87.2715) (xy 126.1995 87.2715)
- (xy 126.1995 88.12775) (xy 126.29325 88.2215) (xy 126.624092 88.2215) (xy 126.761921 88.16441) (xy 126.86741 88.05892)
- (xy 126.9245 87.921092) (xy 126.9245 87.36525) (xy 126.83075 87.2715) (xy 126.1995 87.2715) (xy 126.1495 87.2715)
- (xy 125.51825 87.2715) (xy 125.4245 87.36525) (xy 124.740176 87.36525) (xy 124.749846 87.3175) (xy 124.749846 86.6675)
- (xy 124.723698 86.528534) (xy 124.641569 86.400901) (xy 124.516254 86.315277) (xy 124.3675 86.285154) (xy 122.8075 86.285154)
- (xy 122.7375 86.298325) (xy 122.7375 85.785671) (xy 122.8075 85.799846) (xy 124.3675 85.799846) (xy 124.506466 85.773698)
- (xy 124.593801 85.7175) (xy 125.417154 85.7175) (xy 125.417154 85.9465) (xy 125.443302 86.085466) (xy 125.525431 86.213099)
- (xy 125.650746 86.298723) (xy 125.656414 86.299871) (xy 125.587079 86.32859) (xy 125.48159 86.43408) (xy 125.4245 86.571908)
- (xy 125.4245 87.12775) (xy 125.51825 87.2215) (xy 126.1495 87.2215) (xy 126.1495 87.2015) (xy 126.1995 87.2015)
- (xy 126.1995 87.2215) (xy 126.83075 87.2215) (xy 126.9245 87.12775) (xy 126.9245 86.571908) (xy 126.86741 86.43408)
- (xy 126.761921 86.32859) (xy 126.692752 86.29994) (xy 126.816099 86.220569) (xy 126.901723 86.095254) (xy 126.926783 85.9715)
- (xy 127.061116 85.9715) (xy 128.155756 87.066139) (xy 128.205429 87.186357) (xy 128.395144 87.376403) (xy 128.643145 87.479383)
- (xy 128.911677 87.479617) (xy 129.159857 87.377071) (xy 129.349903 87.187356) (xy 129.452883 86.939355) (xy 129.453117 86.670823)
- (xy 129.350571 86.422643) (xy 129.160856 86.232597) (xy 129.039651 86.182268) (xy 127.761942 84.904558) (xy 127.559177 84.769075)
- (xy 127.32 84.7215) (xy 126.927142 84.7215) (xy 126.905698 84.607534) (xy 126.823569 84.479901) (xy 126.698254 84.394277)
- (xy 126.5495 84.364154) (xy 125.7995 84.364154) (xy 125.660534 84.390302) (xy 125.540564 84.4675) (xy 124.592685 84.4675)
- (xy 124.516254 84.415277) (xy 124.3675 84.385154) (xy 122.8075 84.385154) (xy 122.668534 84.411302) (xy 122.540901 84.493431)
- (xy 122.455277 84.618746) (xy 122.425154 84.7675) (xy 122.425154 84.951547) (xy 122.212553 84.738947) (xy 122.050342 84.63056)
- (xy 122.021282 84.62478) (xy 121.941569 84.500901) (xy 121.816254 84.415277) (xy 121.6675 84.385154) (xy 120.1075 84.385154)
- (xy 119.968534 84.411302) (xy 119.840901 84.493431) (xy 119.824455 84.5175) (xy 119.368102 84.5175) (xy 119.349198 84.417034)
- (xy 119.267069 84.289401) (xy 119.141754 84.203777) (xy 118.993 84.173654) (xy 118.243 84.173654) (xy 118.104034 84.199802)
- (xy 117.976401 84.281931) (xy 117.890777 84.407246) (xy 117.860654 84.556) (xy 117.860654 84.581) (xy 117.536 84.581)
- (xy 117.315957 84.624769) (xy 117.129414 84.749413) (xy 116.560414 85.318414) (xy 116.435769 85.504957) (xy 116.392 85.725)
- (xy 116.392 87.645827) (xy 115.178791 88.859037) (xy 115.23 88.601591) (xy 115.23 88.262409) (xy 115.165298 87.937128)
- (xy 114.981041 87.661368) (xy 114.705281 87.477111) (xy 114.38 87.412409) (xy 114.054719 87.477111) (xy 113.778959 87.661368)
- (xy 113.594702 87.937128) (xy 113.53 88.262409) (xy 113.53 88.601591) (xy 113.594702 88.926872) (xy 113.679898 89.054377)
- (xy 113.566034 89.075802) (xy 113.438401 89.157931) (xy 113.352777 89.283246) (xy 113.322654 89.432) (xy 113.322654 89.832)
- (xy 113.347038 89.961589) (xy 113.322654 90.082) (xy 113.322654 90.482) (xy 113.347038 90.611589) (xy 113.322654 90.732)
- (xy 113.322654 91.132) (xy 113.347038 91.261589) (xy 113.322654 91.382) (xy 113.322654 91.782) (xy 113.347644 91.914811)
- (xy 113.33 91.957408) (xy 113.33 92.11325) (xy 113.42375 92.207) (xy 114.355 92.207) (xy 114.355 92.187)
- (xy 114.405 92.187) (xy 114.405 92.207) (xy 115.33625 92.207) (xy 115.43 92.11325) (xy 115.43 91.957408)
- (xy 115.411077 91.911723) (xy 115.437346 91.782) (xy 115.437346 91.432) (xy 149.271894 91.432) (xy 150.035 92.195107)
- (xy 150.035 93.955893) (xy 148.816553 92.737447) (xy 148.654342 92.62906) (xy 148.649013 92.628) (xy 148.463 92.591)
- (xy 138.049 92.591) (xy 137.857658 92.62906) (xy 137.695447 92.737446) (xy 130.372987 100.059907) (xy 129.921 99.970001)
- (xy 129.452213 100.063249) (xy 129.054794 100.328795) (xy 128.789248 100.726214) (xy 128.696 101.195001) (xy 128.696 101.242999)
- (xy 128.789248 101.711786) (xy 129.054794 102.109205) (xy 129.452213 102.374751) (xy 129.921 102.467999) (xy 130.389787 102.374751)
- (xy 130.787206 102.109205) (xy 131.052752 101.711786) (xy 131.107751 101.435285) (xy 131.255243 101.435285) (xy 131.429794 101.880245)
- (xy 131.761337 102.224536) (xy 132.199398 102.415744) (xy 132.244715 102.424755) (xy 132.436 102.349974) (xy 132.436 101.244)
- (xy 132.486 101.244) (xy 132.486 102.349974) (xy 132.677285 102.424755) (xy 132.722602 102.415744) (xy 133.160663 102.224536)
- (xy 133.492206 101.880245) (xy 133.666757 101.435285) (xy 133.591997 101.244) (xy 132.486 101.244) (xy 132.436 101.244)
- (xy 131.330003 101.244) (xy 131.255243 101.435285) (xy 131.107751 101.435285) (xy 131.146 101.242999) (xy 131.146 101.195001)
- (xy 131.107752 101.002715) (xy 131.255243 101.002715) (xy 131.330003 101.194) (xy 132.436 101.194) (xy 132.436 100.088026)
- (xy 132.486 100.088026) (xy 132.486 101.194) (xy 133.591997 101.194) (xy 133.666757 101.002715) (xy 133.492206 100.557755)
- (xy 133.160663 100.213464) (xy 132.722602 100.022256) (xy 132.677285 100.013245) (xy 132.486 100.088026) (xy 132.436 100.088026)
- (xy 132.244715 100.013245) (xy 132.199398 100.022256) (xy 131.761337 100.213464) (xy 131.429794 100.557755) (xy 131.255243 101.002715)
- (xy 131.107752 101.002715) (xy 131.064057 100.783049) (xy 136.478356 95.36875) (xy 144.379 95.36875) (xy 144.379 95.699592)
- (xy 144.43609 95.837421) (xy 144.54158 95.94291) (xy 144.679408 96) (xy 145.23525 96) (xy 145.329 95.90625)
- (xy 145.329 95.275) (xy 144.47275 95.275) (xy 144.379 95.36875) (xy 136.478356 95.36875) (xy 137.046698 94.800408)
- (xy 144.379 94.800408) (xy 144.379 95.13125) (xy 144.47275 95.225) (xy 145.329 95.225) (xy 145.329 94.59375)
- (xy 145.23525 94.5) (xy 144.679408 94.5) (xy 144.54158 94.55709) (xy 144.43609 94.662579) (xy 144.379 94.800408)
- (xy 137.046698 94.800408) (xy 138.256107 93.591) (xy 148.255894 93.591) (xy 149.535 94.870107) (xy 149.535 95.949)
- (xy 149.51 95.823316) (xy 149.51 95.71575) (xy 149.41625 95.622) (xy 149.406296 95.622) (xy 149.388553 95.595446)
- (xy 148.689553 94.896447) (xy 148.527342 94.78806) (xy 148.336 94.75) (xy 148.212826 94.75) (xy 148.210198 94.736034)
- (xy 148.128069 94.608401) (xy 148.002754 94.522777) (xy 147.854 94.492654) (xy 146.654 94.492654) (xy 146.515034 94.518802)
- (xy 146.387401 94.600931) (xy 146.301777 94.726246) (xy 146.300629 94.731914) (xy 146.27191 94.662579) (xy 146.16642 94.55709)
- (xy 146.028592 94.5) (xy 145.47275 94.5) (xy 145.379 94.59375) (xy 145.379 95.225) (xy 145.399 95.225)
- (xy 145.399 95.275) (xy 145.379 95.275) (xy 145.379 95.90625) (xy 145.47275 96) (xy 146.028592 96)
- (xy 146.16642 95.94291) (xy 146.27191 95.837421) (xy 146.30056 95.768252) (xy 146.379931 95.891599) (xy 146.505246 95.977223)
- (xy 146.618 96.000056) (xy 146.618 96.652602) (xy 146.518117 96.893145) (xy 146.517883 97.161677) (xy 146.620429 97.409857)
- (xy 146.810144 97.599903) (xy 147.058145 97.702883) (xy 147.326677 97.703117) (xy 147.574857 97.600571) (xy 147.764903 97.410856)
- (xy 147.867883 97.162855) (xy 147.868117 96.894323) (xy 147.768 96.652022) (xy 147.768 96.007346) (xy 147.854 96.007346)
- (xy 147.992966 95.981198) (xy 148.120599 95.899069) (xy 148.184476 95.805582) (xy 148.527654 96.148761) (xy 148.527654 97.297)
- (xy 148.553802 97.435966) (xy 148.635931 97.563599) (xy 148.761246 97.649223) (xy 148.91 97.679346) (xy 149.16 97.679346)
- (xy 149.292811 97.654356) (xy 149.335408 97.672) (xy 149.41625 97.672) (xy 149.51 97.57825) (xy 149.51 97.449007)
- (xy 149.512223 97.445754) (xy 149.53473 97.334608) (xy 149.553802 97.435966) (xy 149.56 97.445598) (xy 149.56 97.57825)
- (xy 149.65375 97.672) (xy 149.734592 97.672) (xy 149.780277 97.653077) (xy 149.91 97.679346) (xy 150.16 97.679346)
- (xy 150.289589 97.654962) (xy 150.41 97.679346) (xy 150.66 97.679346) (xy 150.789589 97.654962) (xy 150.91 97.679346)
- (xy 151.16 97.679346) (xy 151.289589 97.654962) (xy 151.41 97.679346) (xy 151.66 97.679346) (xy 151.789589 97.654962)
- (xy 151.91 97.679346) (xy 152.16 97.679346) (xy 152.289589 97.654962) (xy 152.41 97.679346) (xy 152.535 97.679346)
- (xy 152.535 100.134769) (xy 152.526143 100.138429) (xy 152.336097 100.328144) (xy 152.233117 100.576145) (xy 152.232883 100.844677)
- (xy 152.335429 101.092857) (xy 152.525144 101.282903) (xy 152.773145 101.385883) (xy 153.041677 101.386117) (xy 153.289857 101.283571)
- (xy 153.479903 101.093856) (xy 153.582883 100.845855) (xy 153.582994 100.718016) (xy 153.662145 100.750883) (xy 153.930677 100.751117)
- (xy 154.178857 100.648571) (xy 154.368903 100.458856) (xy 154.471883 100.210855) (xy 154.472076 99.988925) (xy 154.692677 99.989117)
- (xy 154.940857 99.886571) (xy 155.102654 99.725056) (xy 155.102654 99.872) (xy 155.127038 100.001589) (xy 155.102654 100.122)
- (xy 155.102654 100.372) (xy 155.127038 100.501589) (xy 155.102654 100.622) (xy 155.102654 100.872) (xy 155.127038 101.001589)
- (xy 155.102654 101.122) (xy 155.102654 101.372) (xy 155.127038 101.501589) (xy 155.102654 101.622) (xy 155.102654 101.872)
- (xy 155.127038 102.001589) (xy 155.102654 102.122) (xy 155.102654 102.372) (xy 155.127038 102.501589) (xy 155.102654 102.622)
- (xy 155.102654 102.872) (xy 155.127038 103.001589) (xy 155.102654 103.122) (xy 155.102654 103.372) (xy 155.127038 103.501589)
- (xy 155.102654 103.622) (xy 155.102654 103.872) (xy 155.128802 104.010966) (xy 155.210931 104.138599) (xy 155.336246 104.224223)
- (xy 155.485 104.254346) (xy 156.785 104.254346) (xy 156.824041 104.247) (xy 157.451394 104.247) (xy 158.011472 104.807078)
- (xy 158.011383 104.908677) (xy 158.113929 105.156857) (xy 158.303644 105.346903) (xy 158.551645 105.449883) (xy 158.820177 105.450117)
- (xy 159.068357 105.347571) (xy 159.258403 105.157856) (xy 159.361383 104.909855) (xy 159.361617 104.641323) (xy 159.259071 104.393143)
- (xy 159.069356 104.203097) (xy 158.821355 104.100117) (xy 158.718634 104.100027) (xy 158.365606 103.747) (xy 158.919894 103.747)
- (xy 160.282 105.109107) (xy 160.282 122.809) (xy 160.307262 122.936) (xy 160.32006 123.000342) (xy 160.428447 123.162553)
- (xy 160.617775 123.351881) (xy 160.5594 123.645349) (xy 160.5594 124.004651) (xy 160.653683 124.478643) (xy 160.922178 124.880473)
- (xy 161.324008 125.148968) (xy 161.798 125.243251) (xy 162.271992 125.148968) (xy 162.673822 124.880473) (xy 162.942317 124.478643)
- (xy 163.0366 124.004651) (xy 163.0366 123.645349) (xy 162.942317 123.171357) (xy 162.871972 123.066079) (xy 163.157774 123.351881)
- (xy 163.0994 123.645349) (xy 163.0994 124.004651) (xy 163.193683 124.478643) (xy 163.462178 124.880473) (xy 163.864008 125.148968)
- (xy 164.338 125.243251) (xy 164.811992 125.148968) (xy 165.213822 124.880473) (xy 165.482317 124.478643) (xy 165.5766 124.004651)
- (xy 165.5766 123.645349) (xy 165.482317 123.171357) (xy 165.411971 123.066077) (xy 165.697775 123.351881) (xy 165.6394 123.645349)
- (xy 165.6394 124.004651) (xy 165.733683 124.478643) (xy 166.002178 124.880473) (xy 166.404008 125.148968) (xy 166.878 125.243251)
- (xy 167.351992 125.148968) (xy 167.753822 124.880473) (xy 168.022317 124.478643) (xy 168.1166 124.004651) (xy 168.1166 123.645349)
- (xy 168.1794 123.645349) (xy 168.1794 124.004651) (xy 168.273683 124.478643) (xy 168.542178 124.880473) (xy 168.944008 125.148968)
- (xy 169.418 125.243251) (xy 169.891992 125.148968) (xy 170.293822 124.880473) (xy 170.562317 124.478643) (xy 170.6566 124.004651)
- (xy 170.6566 123.645349) (xy 170.562317 123.171357) (xy 170.293822 122.769527) (xy 169.891992 122.501032) (xy 169.418 122.406749)
- (xy 168.944008 122.501032) (xy 168.542178 122.769527) (xy 168.273683 123.171357) (xy 168.1794 123.645349) (xy 168.1166 123.645349)
- (xy 168.022317 123.171357) (xy 167.753822 122.769527) (xy 167.351992 122.501032) (xy 166.878 122.406749) (xy 166.404008 122.501032)
- (xy 166.318364 122.558258) (xy 163.187 119.426894) (xy 163.187 117.585003) (xy 163.222447 117.638053) (xy 165.952947 120.368553)
- (xy 166.115158 120.47694) (xy 166.3065 120.515) (xy 167.804654 120.515) (xy 167.804654 120.865) (xy 167.830802 121.003966)
- (xy 167.912931 121.131599) (xy 168.038246 121.217223) (xy 168.187 121.247346) (xy 169.56224 121.247346) (xy 171.083522 122.768629)
- (xy 171.082178 122.769527) (xy 170.813683 123.171357) (xy 170.7194 123.645349) (xy 170.7194 124.004651) (xy 170.813683 124.478643)
- (xy 171.082178 124.880473) (xy 171.484008 125.148968) (xy 171.958 125.243251) (xy 172.431992 125.148968) (xy 172.833822 124.880473)
- (xy 173.102317 124.478643) (xy 173.1966 124.004651) (xy 173.1966 123.645349) (xy 173.102317 123.171357) (xy 172.833822 122.769527)
- (xy 172.431992 122.501032) (xy 172.180018 122.450911) (xy 170.269346 120.54024) (xy 170.269346 119.245) (xy 170.861894 119.245)
- (xy 171.106654 119.48976) (xy 171.106654 120.865) (xy 171.132802 121.003966) (xy 171.214931 121.131599) (xy 171.340246 121.217223)
- (xy 171.489 121.247346) (xy 172.86424 121.247346) (xy 173.998 122.381106) (xy 173.998 122.51841) (xy 173.622178 122.769527)
- (xy 173.353683 123.171357) (xy 173.2594 123.645349) (xy 173.2594 124.004651) (xy 173.353683 124.478643) (xy 173.622178 124.880473)
- (xy 174.024008 125.148968) (xy 174.498 125.243251) (xy 174.971992 125.148968) (xy 175.373822 124.880473) (xy 175.642317 124.478643)
- (xy 175.7366 124.004651) (xy 175.7366 123.645349) (xy 175.642317 123.171357) (xy 175.373822 122.769527) (xy 174.998 122.51841)
- (xy 174.998 122.174) (xy 174.95994 121.982658) (xy 174.851553 121.820447) (xy 173.571346 120.54024) (xy 173.571346 119.48976)
- (xy 174.724553 118.336553) (xy 174.83294 118.174342) (xy 174.871 117.983) (xy 174.871 117.047106) (xy 176.121553 115.796554)
+ (xy 149.845 89.782) (xy 124.732974 89.782) (xy 124.819999 89.3445) (xy 124.726751 88.875713) (xy 124.461205 88.478294)
+ (xy 124.063786 88.212748) (xy 123.594999 88.1195) (xy 123.547001 88.1195) (xy 123.078214 88.212748) (xy 122.680795 88.478294)
+ (xy 122.415249 88.875713) (xy 122.322001 89.3445) (xy 122.409026 89.782) (xy 115.882172 89.782) (xy 117.373586 88.290587)
+ (xy 117.498231 88.104043) (xy 117.51276 88.031) (xy 117.542 87.884) (xy 117.542 87.17475) (xy 117.868 87.17475)
+ (xy 117.868 87.730592) (xy 117.92509 87.86842) (xy 118.030579 87.97391) (xy 118.168408 88.031) (xy 118.49925 88.031)
+ (xy 118.593 87.93725) (xy 118.593 87.081) (xy 118.643 87.081) (xy 118.643 87.93725) (xy 118.73675 88.031)
+ (xy 119.067592 88.031) (xy 119.205421 87.97391) (xy 119.31091 87.86842) (xy 119.368 87.730592) (xy 119.368 87.17475)
+ (xy 119.27425 87.081) (xy 118.643 87.081) (xy 118.593 87.081) (xy 117.96175 87.081) (xy 117.868 87.17475)
+ (xy 117.542 87.17475) (xy 117.542 85.963172) (xy 117.774173 85.731) (xy 117.860654 85.731) (xy 117.860654 85.756)
+ (xy 117.886802 85.894966) (xy 117.968931 86.022599) (xy 118.094246 86.108223) (xy 118.099914 86.109371) (xy 118.030579 86.13809)
+ (xy 117.92509 86.24358) (xy 117.868 86.381408) (xy 117.868 86.93725) (xy 117.96175 87.031) (xy 118.593 87.031)
+ (xy 118.593 87.011) (xy 118.643 87.011) (xy 118.643 87.031) (xy 119.27425 87.031) (xy 119.368 86.93725)
+ (xy 119.368 86.381408) (xy 119.31091 86.24358) (xy 119.205421 86.13809) (xy 119.136252 86.10944) (xy 119.259599 86.030069)
+ (xy 119.345223 85.904754) (xy 119.375346 85.756) (xy 119.375346 85.6675) (xy 119.7325 85.6675) (xy 119.7325 85.92375)
+ (xy 119.82625 86.0175) (xy 120.8625 86.0175) (xy 120.8625 85.9975) (xy 120.9125 85.9975) (xy 120.9125 86.0175)
+ (xy 120.9325 86.0175) (xy 120.9325 86.0675) (xy 120.9125 86.0675) (xy 120.9125 86.0875) (xy 120.8625 86.0875)
+ (xy 120.8625 86.0675) (xy 119.82625 86.0675) (xy 119.7325 86.16125) (xy 119.7325 86.442092) (xy 119.760864 86.510569)
+ (xy 119.755277 86.518746) (xy 119.725154 86.6675) (xy 119.725154 87.3175) (xy 119.751302 87.456466) (xy 119.833431 87.584099)
+ (xy 119.958746 87.669723) (xy 120.1075 87.699846) (xy 121.6675 87.699846) (xy 121.806466 87.673698) (xy 121.934099 87.591569)
+ (xy 122.019723 87.466254) (xy 122.049653 87.318453) (xy 122.425154 86.942953) (xy 122.425154 87.3175) (xy 122.451302 87.456466)
+ (xy 122.533431 87.584099) (xy 122.658746 87.669723) (xy 122.8075 87.699846) (xy 124.3675 87.699846) (xy 124.506466 87.673698)
+ (xy 124.634099 87.591569) (xy 124.719723 87.466254) (xy 124.740176 87.36525) (xy 125.4245 87.36525) (xy 125.4245 87.921092)
+ (xy 125.48159 88.05892) (xy 125.587079 88.16441) (xy 125.724908 88.2215) (xy 126.05575 88.2215) (xy 126.1495 88.12775)
+ (xy 126.1495 87.2715) (xy 126.1995 87.2715) (xy 126.1995 88.12775) (xy 126.29325 88.2215) (xy 126.624092 88.2215)
+ (xy 126.761921 88.16441) (xy 126.86741 88.05892) (xy 126.9245 87.921092) (xy 126.9245 87.36525) (xy 126.83075 87.2715)
+ (xy 126.1995 87.2715) (xy 126.1495 87.2715) (xy 125.51825 87.2715) (xy 125.4245 87.36525) (xy 124.740176 87.36525)
+ (xy 124.749846 87.3175) (xy 124.749846 86.6675) (xy 124.723698 86.528534) (xy 124.641569 86.400901) (xy 124.516254 86.315277)
+ (xy 124.3675 86.285154) (xy 122.8075 86.285154) (xy 122.7375 86.298325) (xy 122.7375 85.785671) (xy 122.8075 85.799846)
+ (xy 124.3675 85.799846) (xy 124.506466 85.773698) (xy 124.593801 85.7175) (xy 125.417154 85.7175) (xy 125.417154 85.9465)
+ (xy 125.443302 86.085466) (xy 125.525431 86.213099) (xy 125.650746 86.298723) (xy 125.656414 86.299871) (xy 125.587079 86.32859)
+ (xy 125.48159 86.43408) (xy 125.4245 86.571908) (xy 125.4245 87.12775) (xy 125.51825 87.2215) (xy 126.1495 87.2215)
+ (xy 126.1495 87.2015) (xy 126.1995 87.2015) (xy 126.1995 87.2215) (xy 126.83075 87.2215) (xy 126.9245 87.12775)
+ (xy 126.9245 86.571908) (xy 126.86741 86.43408) (xy 126.761921 86.32859) (xy 126.692752 86.29994) (xy 126.816099 86.220569)
+ (xy 126.901723 86.095254) (xy 126.926783 85.9715) (xy 127.061116 85.9715) (xy 128.155756 87.066139) (xy 128.205429 87.186357)
+ (xy 128.395144 87.376403) (xy 128.643145 87.479383) (xy 128.911677 87.479617) (xy 129.159857 87.377071) (xy 129.349903 87.187356)
+ (xy 129.452883 86.939355) (xy 129.453117 86.670823) (xy 129.350571 86.422643) (xy 129.160856 86.232597) (xy 129.039651 86.182268)
+ (xy 127.761942 84.904558) (xy 127.559177 84.769075) (xy 127.32 84.7215) (xy 126.927142 84.7215) (xy 126.905698 84.607534)
+ (xy 126.823569 84.479901) (xy 126.698254 84.394277) (xy 126.5495 84.364154) (xy 125.7995 84.364154) (xy 125.660534 84.390302)
+ (xy 125.540564 84.4675) (xy 124.592685 84.4675) (xy 124.516254 84.415277) (xy 124.3675 84.385154) (xy 122.8075 84.385154)
+ (xy 122.668534 84.411302) (xy 122.540901 84.493431) (xy 122.455277 84.618746) (xy 122.425154 84.7675) (xy 122.425154 84.951547)
+ (xy 122.212553 84.738947) (xy 122.050342 84.63056) (xy 122.021282 84.62478) (xy 121.941569 84.500901) (xy 121.816254 84.415277)
+ (xy 121.6675 84.385154) (xy 120.1075 84.385154) (xy 119.968534 84.411302) (xy 119.840901 84.493431) (xy 119.824455 84.5175)
+ (xy 119.368102 84.5175) (xy 119.349198 84.417034) (xy 119.267069 84.289401) (xy 119.141754 84.203777) (xy 118.993 84.173654)
+ (xy 118.243 84.173654) (xy 118.104034 84.199802) (xy 117.976401 84.281931) (xy 117.890777 84.407246) (xy 117.860654 84.556)
+ (xy 117.860654 84.581) (xy 117.536 84.581) (xy 117.315957 84.624769) (xy 117.129414 84.749413) (xy 116.560414 85.318414)
+ (xy 116.435769 85.504957) (xy 116.392 85.725) (xy 116.392 87.645827) (xy 115.178791 88.859037) (xy 115.23 88.601591)
+ (xy 115.23 88.262409) (xy 115.165298 87.937128) (xy 114.981041 87.661368) (xy 114.705281 87.477111) (xy 114.38 87.412409)
+ (xy 114.054719 87.477111) (xy 113.778959 87.661368) (xy 113.594702 87.937128) (xy 113.53 88.262409) (xy 113.53 88.601591)
+ (xy 113.594702 88.926872) (xy 113.679898 89.054377) (xy 113.566034 89.075802) (xy 113.438401 89.157931) (xy 113.352777 89.283246)
+ (xy 113.322654 89.432) (xy 113.322654 89.832) (xy 113.347038 89.961589) (xy 113.322654 90.082) (xy 113.322654 90.482)
+ (xy 113.347038 90.611589) (xy 113.322654 90.732) (xy 113.322654 91.132) (xy 113.347038 91.261589) (xy 113.322654 91.382)
+ (xy 113.322654 91.782) (xy 113.347644 91.914811) (xy 113.33 91.957408) (xy 113.33 92.11325) (xy 113.42375 92.207)
+ (xy 114.355 92.207) (xy 114.355 92.187) (xy 114.405 92.187) (xy 114.405 92.207) (xy 115.33625 92.207)
+ (xy 115.43 92.11325) (xy 115.43 91.957408) (xy 115.411077 91.911723) (xy 115.437346 91.782) (xy 115.437346 91.432)
+ (xy 122.338654 91.432) (xy 122.338654 92.7345) (xy 122.364802 92.873466) (xy 122.446931 93.001099) (xy 122.572246 93.086723)
+ (xy 122.721 93.116846) (xy 124.421 93.116846) (xy 124.559966 93.090698) (xy 124.687599 93.008569) (xy 124.773223 92.883254)
+ (xy 124.803346 92.7345) (xy 124.803346 91.432) (xy 149.271894 91.432) (xy 150.035 92.195107) (xy 150.035 93.955893)
+ (xy 148.816553 92.737447) (xy 148.654342 92.62906) (xy 148.649013 92.628) (xy 148.463 92.591) (xy 138.049 92.591)
+ (xy 137.857658 92.62906) (xy 137.695447 92.737446) (xy 130.372987 100.059907) (xy 129.921 99.970001) (xy 129.452213 100.063249)
+ (xy 129.054794 100.328795) (xy 128.789248 100.726214) (xy 128.696 101.195001) (xy 128.696 101.242999) (xy 128.789248 101.711786)
+ (xy 129.054794 102.109205) (xy 129.452213 102.374751) (xy 129.921 102.467999) (xy 130.389787 102.374751) (xy 130.787206 102.109205)
+ (xy 131.052752 101.711786) (xy 131.107751 101.435285) (xy 131.255243 101.435285) (xy 131.429794 101.880245) (xy 131.761337 102.224536)
+ (xy 132.199398 102.415744) (xy 132.244715 102.424755) (xy 132.436 102.349974) (xy 132.436 101.244) (xy 132.486 101.244)
+ (xy 132.486 102.349974) (xy 132.677285 102.424755) (xy 132.722602 102.415744) (xy 133.160663 102.224536) (xy 133.492206 101.880245)
+ (xy 133.666757 101.435285) (xy 133.591997 101.244) (xy 132.486 101.244) (xy 132.436 101.244) (xy 131.330003 101.244)
+ (xy 131.255243 101.435285) (xy 131.107751 101.435285) (xy 131.146 101.242999) (xy 131.146 101.195001) (xy 131.107752 101.002715)
+ (xy 131.255243 101.002715) (xy 131.330003 101.194) (xy 132.436 101.194) (xy 132.436 100.088026) (xy 132.486 100.088026)
+ (xy 132.486 101.194) (xy 133.591997 101.194) (xy 133.666757 101.002715) (xy 133.492206 100.557755) (xy 133.160663 100.213464)
+ (xy 132.722602 100.022256) (xy 132.677285 100.013245) (xy 132.486 100.088026) (xy 132.436 100.088026) (xy 132.244715 100.013245)
+ (xy 132.199398 100.022256) (xy 131.761337 100.213464) (xy 131.429794 100.557755) (xy 131.255243 101.002715) (xy 131.107752 101.002715)
+ (xy 131.064057 100.783049) (xy 136.478356 95.36875) (xy 144.379 95.36875) (xy 144.379 95.699592) (xy 144.43609 95.837421)
+ (xy 144.54158 95.94291) (xy 144.679408 96) (xy 145.23525 96) (xy 145.329 95.90625) (xy 145.329 95.275)
+ (xy 144.47275 95.275) (xy 144.379 95.36875) (xy 136.478356 95.36875) (xy 137.046698 94.800408) (xy 144.379 94.800408)
+ (xy 144.379 95.13125) (xy 144.47275 95.225) (xy 145.329 95.225) (xy 145.329 94.59375) (xy 145.23525 94.5)
+ (xy 144.679408 94.5) (xy 144.54158 94.55709) (xy 144.43609 94.662579) (xy 144.379 94.800408) (xy 137.046698 94.800408)
+ (xy 138.256107 93.591) (xy 148.255894 93.591) (xy 149.535 94.870107) (xy 149.535 95.949) (xy 149.51 95.823316)
+ (xy 149.51 95.71575) (xy 149.41625 95.622) (xy 149.406296 95.622) (xy 149.388553 95.595446) (xy 148.689553 94.896447)
+ (xy 148.527342 94.78806) (xy 148.336 94.75) (xy 148.212826 94.75) (xy 148.210198 94.736034) (xy 148.128069 94.608401)
+ (xy 148.002754 94.522777) (xy 147.854 94.492654) (xy 146.654 94.492654) (xy 146.515034 94.518802) (xy 146.387401 94.600931)
+ (xy 146.301777 94.726246) (xy 146.300629 94.731914) (xy 146.27191 94.662579) (xy 146.16642 94.55709) (xy 146.028592 94.5)
+ (xy 145.47275 94.5) (xy 145.379 94.59375) (xy 145.379 95.225) (xy 145.399 95.225) (xy 145.399 95.275)
+ (xy 145.379 95.275) (xy 145.379 95.90625) (xy 145.47275 96) (xy 146.028592 96) (xy 146.16642 95.94291)
+ (xy 146.27191 95.837421) (xy 146.30056 95.768252) (xy 146.379931 95.891599) (xy 146.505246 95.977223) (xy 146.618 96.000056)
+ (xy 146.618 96.652602) (xy 146.518117 96.893145) (xy 146.517883 97.161677) (xy 146.620429 97.409857) (xy 146.810144 97.599903)
+ (xy 147.058145 97.702883) (xy 147.326677 97.703117) (xy 147.574857 97.600571) (xy 147.764903 97.410856) (xy 147.867883 97.162855)
+ (xy 147.868117 96.894323) (xy 147.768 96.652022) (xy 147.768 96.007346) (xy 147.854 96.007346) (xy 147.992966 95.981198)
+ (xy 148.120599 95.899069) (xy 148.184476 95.805582) (xy 148.527654 96.148761) (xy 148.527654 97.297) (xy 148.553802 97.435966)
+ (xy 148.635931 97.563599) (xy 148.761246 97.649223) (xy 148.91 97.679346) (xy 149.16 97.679346) (xy 149.292811 97.654356)
+ (xy 149.335408 97.672) (xy 149.41625 97.672) (xy 149.51 97.57825) (xy 149.51 97.449007) (xy 149.512223 97.445754)
+ (xy 149.53473 97.334608) (xy 149.553802 97.435966) (xy 149.56 97.445598) (xy 149.56 97.57825) (xy 149.65375 97.672)
+ (xy 149.734592 97.672) (xy 149.780277 97.653077) (xy 149.91 97.679346) (xy 150.16 97.679346) (xy 150.289589 97.654962)
+ (xy 150.41 97.679346) (xy 150.66 97.679346) (xy 150.789589 97.654962) (xy 150.91 97.679346) (xy 151.16 97.679346)
+ (xy 151.289589 97.654962) (xy 151.41 97.679346) (xy 151.66 97.679346) (xy 151.789589 97.654962) (xy 151.91 97.679346)
+ (xy 152.16 97.679346) (xy 152.289589 97.654962) (xy 152.41 97.679346) (xy 152.535 97.679346) (xy 152.535 100.134769)
+ (xy 152.526143 100.138429) (xy 152.336097 100.328144) (xy 152.233117 100.576145) (xy 152.232883 100.844677) (xy 152.335429 101.092857)
+ (xy 152.525144 101.282903) (xy 152.773145 101.385883) (xy 153.041677 101.386117) (xy 153.289857 101.283571) (xy 153.479903 101.093856)
+ (xy 153.582883 100.845855) (xy 153.582994 100.718016) (xy 153.662145 100.750883) (xy 153.930677 100.751117) (xy 154.178857 100.648571)
+ (xy 154.368903 100.458856) (xy 154.471883 100.210855) (xy 154.472076 99.988925) (xy 154.692677 99.989117) (xy 154.940857 99.886571)
+ (xy 155.102654 99.725056) (xy 155.102654 99.872) (xy 155.127038 100.001589) (xy 155.102654 100.122) (xy 155.102654 100.372)
+ (xy 155.127038 100.501589) (xy 155.102654 100.622) (xy 155.102654 100.872) (xy 155.127038 101.001589) (xy 155.102654 101.122)
+ (xy 155.102654 101.372) (xy 155.127038 101.501589) (xy 155.102654 101.622) (xy 155.102654 101.872) (xy 155.127038 102.001589)
+ (xy 155.102654 102.122) (xy 155.102654 102.372) (xy 155.127038 102.501589) (xy 155.102654 102.622) (xy 155.102654 102.872)
+ (xy 155.127038 103.001589) (xy 155.102654 103.122) (xy 155.102654 103.372) (xy 155.127038 103.501589) (xy 155.102654 103.622)
+ (xy 155.102654 103.872) (xy 155.128802 104.010966) (xy 155.210931 104.138599) (xy 155.336246 104.224223) (xy 155.485 104.254346)
+ (xy 156.785 104.254346) (xy 156.824041 104.247) (xy 157.451394 104.247) (xy 158.011472 104.807078) (xy 158.011383 104.908677)
+ (xy 158.113929 105.156857) (xy 158.303644 105.346903) (xy 158.551645 105.449883) (xy 158.820177 105.450117) (xy 159.068357 105.347571)
+ (xy 159.258403 105.157856) (xy 159.361383 104.909855) (xy 159.361617 104.641323) (xy 159.259071 104.393143) (xy 159.069356 104.203097)
+ (xy 158.821355 104.100117) (xy 158.718634 104.100027) (xy 158.365606 103.747) (xy 158.919894 103.747) (xy 160.282 105.109107)
+ (xy 160.282 122.809) (xy 160.297401 122.886425) (xy 160.32006 123.000342) (xy 160.428447 123.162553) (xy 160.617775 123.351881)
+ (xy 160.5594 123.645349) (xy 160.5594 124.004651) (xy 160.653683 124.478643) (xy 160.922178 124.880473) (xy 161.324008 125.148968)
+ (xy 161.798 125.243251) (xy 162.271992 125.148968) (xy 162.673822 124.880473) (xy 162.942317 124.478643) (xy 163.0366 124.004651)
+ (xy 163.0366 123.645349) (xy 162.942317 123.171357) (xy 162.871972 123.066079) (xy 163.157774 123.351881) (xy 163.0994 123.645349)
+ (xy 163.0994 124.004651) (xy 163.193683 124.478643) (xy 163.462178 124.880473) (xy 163.864008 125.148968) (xy 164.338 125.243251)
+ (xy 164.811992 125.148968) (xy 165.213822 124.880473) (xy 165.482317 124.478643) (xy 165.5766 124.004651) (xy 165.5766 123.645349)
+ (xy 165.482317 123.171357) (xy 165.411971 123.066077) (xy 165.697775 123.351881) (xy 165.6394 123.645349) (xy 165.6394 124.004651)
+ (xy 165.733683 124.478643) (xy 166.002178 124.880473) (xy 166.404008 125.148968) (xy 166.878 125.243251) (xy 167.351992 125.148968)
+ (xy 167.753822 124.880473) (xy 168.022317 124.478643) (xy 168.1166 124.004651) (xy 168.1166 123.645349) (xy 168.1794 123.645349)
+ (xy 168.1794 124.004651) (xy 168.273683 124.478643) (xy 168.542178 124.880473) (xy 168.944008 125.148968) (xy 169.418 125.243251)
+ (xy 169.891992 125.148968) (xy 170.293822 124.880473) (xy 170.562317 124.478643) (xy 170.6566 124.004651) (xy 170.6566 123.645349)
+ (xy 170.562317 123.171357) (xy 170.293822 122.769527) (xy 169.891992 122.501032) (xy 169.418 122.406749) (xy 168.944008 122.501032)
+ (xy 168.542178 122.769527) (xy 168.273683 123.171357) (xy 168.1794 123.645349) (xy 168.1166 123.645349) (xy 168.022317 123.171357)
+ (xy 167.753822 122.769527) (xy 167.351992 122.501032) (xy 166.878 122.406749) (xy 166.404008 122.501032) (xy 166.318364 122.558258)
+ (xy 163.187 119.426894) (xy 163.187 117.585003) (xy 163.222447 117.638053) (xy 165.952947 120.368553) (xy 166.115158 120.47694)
+ (xy 166.3065 120.515) (xy 167.804654 120.515) (xy 167.804654 120.865) (xy 167.830802 121.003966) (xy 167.912931 121.131599)
+ (xy 168.038246 121.217223) (xy 168.187 121.247346) (xy 169.56224 121.247346) (xy 171.083522 122.768629) (xy 171.082178 122.769527)
+ (xy 170.813683 123.171357) (xy 170.7194 123.645349) (xy 170.7194 124.004651) (xy 170.813683 124.478643) (xy 171.082178 124.880473)
+ (xy 171.484008 125.148968) (xy 171.958 125.243251) (xy 172.431992 125.148968) (xy 172.833822 124.880473) (xy 173.102317 124.478643)
+ (xy 173.1966 124.004651) (xy 173.1966 123.645349) (xy 173.102317 123.171357) (xy 172.833822 122.769527) (xy 172.431992 122.501032)
+ (xy 172.180018 122.450911) (xy 170.269346 120.54024) (xy 170.269346 119.245) (xy 170.861894 119.245) (xy 171.106654 119.48976)
+ (xy 171.106654 120.865) (xy 171.132802 121.003966) (xy 171.214931 121.131599) (xy 171.340246 121.217223) (xy 171.489 121.247346)
+ (xy 172.86424 121.247346) (xy 173.998 122.381106) (xy 173.998 122.51841) (xy 173.622178 122.769527) (xy 173.353683 123.171357)
+ (xy 173.2594 123.645349) (xy 173.2594 124.004651) (xy 173.353683 124.478643) (xy 173.622178 124.880473) (xy 174.024008 125.148968)
+ (xy 174.498 125.243251) (xy 174.971992 125.148968) (xy 175.373822 124.880473) (xy 175.642317 124.478643) (xy 175.7366 124.004651)
+ (xy 175.7366 123.645349) (xy 175.642317 123.171357) (xy 175.373822 122.769527) (xy 174.998 122.51841) (xy 174.998 122.174)
+ (xy 174.95994 121.982658) (xy 174.851553 121.820447) (xy 173.571346 120.54024) (xy 173.571346 119.48976) (xy 174.724553 118.336553)
+ (xy 174.83294 118.174342) (xy 174.841204 118.132794) (xy 174.871 117.983) (xy 174.871 117.047106) (xy 176.121553 115.796554)
(xy 176.151 115.752484) (xy 176.151 125.478) (xy 126.719099 125.478) (xy 127.007366 125.190236) (xy 127.374581 124.305882)
(xy 127.375157 123.645349) (xy 137.6994 123.645349) (xy 137.6994 124.004651) (xy 137.793683 124.478643) (xy 138.062178 124.880473)
(xy 138.464008 125.148968) (xy 138.938 125.243251) (xy 139.411992 125.148968) (xy 139.813822 124.880473) (xy 140.082317 124.478643)
@@ -2096,93 +2235,107 @@
(xy 140.602178 124.880473) (xy 141.004008 125.148968) (xy 141.478 125.243251) (xy 141.951992 125.148968) (xy 142.353822 124.880473)
(xy 142.622317 124.478643) (xy 142.7166 124.004651) (xy 142.7166 123.645349) (xy 142.7794 123.645349) (xy 142.7794 124.004651)
(xy 142.873683 124.478643) (xy 143.142178 124.880473) (xy 143.544008 125.148968) (xy 144.018 125.243251) (xy 144.491992 125.148968)
- (xy 144.893822 124.880473) (xy 145.162317 124.478643) (xy 145.2566 124.004651) (xy 145.2566 123.645349) (xy 145.3194 123.645349)
- (xy 145.3194 124.004651) (xy 145.413683 124.478643) (xy 145.682178 124.880473) (xy 146.084008 125.148968) (xy 146.558 125.243251)
- (xy 147.031992 125.148968) (xy 147.433822 124.880473) (xy 147.702317 124.478643) (xy 147.7966 124.004651) (xy 147.7966 123.645349)
- (xy 147.8594 123.645349) (xy 147.8594 124.004651) (xy 147.953683 124.478643) (xy 148.222178 124.880473) (xy 148.624008 125.148968)
- (xy 149.098 125.243251) (xy 149.571992 125.148968) (xy 149.973822 124.880473) (xy 150.242317 124.478643) (xy 150.3366 124.004651)
- (xy 150.3366 123.85) (xy 150.3994 123.85) (xy 150.3994 124.0024) (xy 150.50325 124.474489) (xy 150.779855 124.8709)
- (xy 151.187105 125.131284) (xy 151.419587 125.196591) (xy 151.613 125.121977) (xy 151.613 123.85) (xy 151.663 123.85)
- (xy 151.663 125.121977) (xy 151.856413 125.196591) (xy 152.088895 125.131284) (xy 152.496145 124.8709) (xy 152.77275 124.474489)
- (xy 152.8766 124.0024) (xy 152.8766 123.85) (xy 152.9394 123.85) (xy 152.9394 124.0024) (xy 153.04325 124.474489)
- (xy 153.319855 124.8709) (xy 153.727105 125.131284) (xy 153.959587 125.196591) (xy 154.153 125.121977) (xy 154.153 123.85)
- (xy 154.203 123.85) (xy 154.203 125.121977) (xy 154.396413 125.196591) (xy 154.628895 125.131284) (xy 155.036145 124.8709)
- (xy 155.31275 124.474489) (xy 155.4166 124.0024) (xy 155.4166 123.85) (xy 154.203 123.85) (xy 154.153 123.85)
- (xy 152.9394 123.85) (xy 152.8766 123.85) (xy 151.663 123.85) (xy 151.613 123.85) (xy 150.3994 123.85)
- (xy 150.3366 123.85) (xy 150.3366 123.6476) (xy 150.3994 123.6476) (xy 150.3994 123.8) (xy 151.613 123.8)
- (xy 151.613 122.528023) (xy 151.663 122.528023) (xy 151.663 123.8) (xy 152.8766 123.8) (xy 152.8766 123.6476)
- (xy 152.9394 123.6476) (xy 152.9394 123.8) (xy 154.153 123.8) (xy 154.153 122.528023) (xy 154.203 122.528023)
- (xy 154.203 123.8) (xy 155.4166 123.8) (xy 155.4166 123.6476) (xy 155.416105 123.645349) (xy 155.4794 123.645349)
- (xy 155.4794 124.004651) (xy 155.573683 124.478643) (xy 155.842178 124.880473) (xy 156.244008 125.148968) (xy 156.718 125.243251)
- (xy 157.191992 125.148968) (xy 157.593822 124.880473) (xy 157.862317 124.478643) (xy 157.9566 124.004651) (xy 157.9566 123.645349)
- (xy 157.862317 123.171357) (xy 157.593822 122.769527) (xy 157.191992 122.501032) (xy 156.718 122.406749) (xy 156.244008 122.501032)
- (xy 155.842178 122.769527) (xy 155.573683 123.171357) (xy 155.4794 123.645349) (xy 155.416105 123.645349) (xy 155.31275 123.175511)
- (xy 155.036145 122.7791) (xy 154.628895 122.518716) (xy 154.396413 122.453409) (xy 154.203 122.528023) (xy 154.153 122.528023)
- (xy 153.959587 122.453409) (xy 153.727105 122.518716) (xy 153.319855 122.7791) (xy 153.04325 123.175511) (xy 152.9394 123.6476)
- (xy 152.8766 123.6476) (xy 152.77275 123.175511) (xy 152.496145 122.7791) (xy 152.088895 122.518716) (xy 151.856413 122.453409)
- (xy 151.663 122.528023) (xy 151.613 122.528023) (xy 151.419587 122.453409) (xy 151.187105 122.518716) (xy 150.779855 122.7791)
- (xy 150.50325 123.175511) (xy 150.3994 123.6476) (xy 150.3366 123.6476) (xy 150.3366 123.645349) (xy 150.242317 123.171357)
- (xy 149.973822 122.769527) (xy 149.571992 122.501032) (xy 149.098 122.406749) (xy 148.624008 122.501032) (xy 148.222178 122.769527)
- (xy 147.953683 123.171357) (xy 147.8594 123.645349) (xy 147.7966 123.645349) (xy 147.702317 123.171357) (xy 147.433822 122.769527)
- (xy 147.031992 122.501032) (xy 146.558 122.406749) (xy 146.084008 122.501032) (xy 145.682178 122.769527) (xy 145.413683 123.171357)
- (xy 145.3194 123.645349) (xy 145.2566 123.645349) (xy 145.162317 123.171357) (xy 144.893822 122.769527) (xy 144.491992 122.501032)
- (xy 144.018 122.406749) (xy 143.544008 122.501032) (xy 143.142178 122.769527) (xy 142.873683 123.171357) (xy 142.7794 123.645349)
- (xy 142.7166 123.645349) (xy 142.622317 123.171357) (xy 142.353822 122.769527) (xy 141.951992 122.501032) (xy 141.478 122.406749)
- (xy 141.004008 122.501032) (xy 140.602178 122.769527) (xy 140.333683 123.171357) (xy 140.2394 123.645349) (xy 140.1766 123.645349)
- (xy 140.082317 123.171357) (xy 139.813822 122.769527) (xy 139.411992 122.501032) (xy 138.938 122.406749) (xy 138.464008 122.501032)
- (xy 138.062178 122.769527) (xy 137.793683 123.171357) (xy 137.6994 123.645349) (xy 127.375157 123.645349) (xy 127.375417 123.348319)
- (xy 127.009745 122.463325) (xy 126.333236 121.785634) (xy 125.448882 121.418419) (xy 124.491319 121.417583) (xy 123.606325 121.783255)
- (xy 122.928634 122.459764) (xy 122.561419 123.344118) (xy 122.560583 124.301681) (xy 122.926255 125.186675) (xy 123.217072 125.478)
- (xy 113.028 125.478) (xy 113.028 115.43475) (xy 147.554 115.43475) (xy 147.554 115.765592) (xy 147.61109 115.903421)
- (xy 147.71658 116.00891) (xy 147.854408 116.066) (xy 148.41025 116.066) (xy 148.504 115.97225) (xy 148.504 115.341)
- (xy 147.64775 115.341) (xy 147.554 115.43475) (xy 113.028 115.43475) (xy 113.028 114.866408) (xy 147.554 114.866408)
- (xy 147.554 115.19725) (xy 147.64775 115.291) (xy 148.504 115.291) (xy 148.504 114.65975) (xy 148.41025 114.566)
- (xy 147.854408 114.566) (xy 147.71658 114.62309) (xy 147.61109 114.728579) (xy 147.554 114.866408) (xy 113.028 114.866408)
- (xy 113.028 113.20975) (xy 145.935 113.20975) (xy 145.935 113.765592) (xy 145.99209 113.90342) (xy 146.097579 114.00891)
- (xy 146.235408 114.066) (xy 146.56625 114.066) (xy 146.66 113.97225) (xy 146.66 113.116) (xy 146.71 113.116)
- (xy 146.71 113.97225) (xy 146.80375 114.066) (xy 147.134592 114.066) (xy 147.272421 114.00891) (xy 147.37791 113.90342)
- (xy 147.435 113.765592) (xy 147.435 113.20975) (xy 147.34125 113.116) (xy 146.71 113.116) (xy 146.66 113.116)
- (xy 146.02875 113.116) (xy 145.935 113.20975) (xy 113.028 113.20975) (xy 113.028 107.56075) (xy 144.252 107.56075)
- (xy 144.252 107.891592) (xy 144.30909 108.029421) (xy 144.41458 108.13491) (xy 144.552408 108.192) (xy 145.10825 108.192)
- (xy 145.202 108.09825) (xy 145.202 107.467) (xy 144.34575 107.467) (xy 144.252 107.56075) (xy 113.028 107.56075)
- (xy 113.028 106.992408) (xy 144.252 106.992408) (xy 144.252 107.32325) (xy 144.34575 107.417) (xy 145.202 107.417)
- (xy 145.202 106.78575) (xy 145.10825 106.692) (xy 144.552408 106.692) (xy 144.41458 106.74909) (xy 144.30909 106.854579)
- (xy 144.252 106.992408) (xy 113.028 106.992408) (xy 113.028 101.195001) (xy 123.616 101.195001) (xy 123.616 101.242999)
- (xy 123.709248 101.711786) (xy 123.974794 102.109205) (xy 124.372213 102.374751) (xy 124.841 102.467999) (xy 125.292987 102.378093)
- (xy 126.646447 103.731553) (xy 126.808658 103.83994) (xy 127 103.878) (xy 139.827 103.878) (xy 139.828256 103.87775)
- (xy 141.585 103.87775) (xy 141.585 104.208592) (xy 141.64209 104.346421) (xy 141.74758 104.45191) (xy 141.885408 104.509)
- (xy 142.44125 104.509) (xy 142.535 104.41525) (xy 142.535 103.784) (xy 141.67875 103.784) (xy 141.585 103.87775)
- (xy 139.828256 103.87775) (xy 140.018342 103.83994) (xy 140.180553 103.731553) (xy 140.602698 103.309408) (xy 141.585 103.309408)
- (xy 141.585 103.64025) (xy 141.67875 103.734) (xy 142.535 103.734) (xy 142.535 103.10275) (xy 142.44125 103.009)
- (xy 141.885408 103.009) (xy 141.74758 103.06609) (xy 141.64209 103.171579) (xy 141.585 103.309408) (xy 140.602698 103.309408)
- (xy 144.165107 99.747) (xy 146.402654 99.747) (xy 146.402654 99.872) (xy 146.427038 100.001589) (xy 146.402654 100.122)
- (xy 146.402654 100.372) (xy 146.427038 100.501589) (xy 146.402654 100.622) (xy 146.402654 100.872) (xy 146.427038 101.001589)
- (xy 146.402654 101.122) (xy 146.402654 101.372) (xy 146.427038 101.501589) (xy 146.402654 101.622) (xy 146.402654 101.872)
- (xy 146.427038 102.001589) (xy 146.402654 102.122) (xy 146.402654 102.372) (xy 146.427038 102.501589) (xy 146.402654 102.622)
- (xy 146.402654 102.872) (xy 146.427644 103.004811) (xy 146.41 103.047408) (xy 146.41 103.12825) (xy 146.50375 103.222)
- (xy 146.632993 103.222) (xy 146.636246 103.224223) (xy 146.747392 103.24673) (xy 146.745959 103.247) (xy 145.416568 103.247)
- (xy 145.416198 103.245034) (xy 145.334069 103.117401) (xy 145.208754 103.031777) (xy 145.06 103.001654) (xy 145.035 103.001654)
- (xy 145.035 102.780995) (xy 145.073883 102.687355) (xy 145.074117 102.418823) (xy 144.971571 102.170643) (xy 144.781856 101.980597)
- (xy 144.533855 101.877617) (xy 144.265323 101.877383) (xy 144.017143 101.979929) (xy 143.827097 102.169644) (xy 143.724117 102.417645)
- (xy 143.723883 102.686177) (xy 143.826429 102.934357) (xy 143.885 102.99303) (xy 143.885 103.001654) (xy 143.86 103.001654)
- (xy 143.721034 103.027802) (xy 143.593401 103.109931) (xy 143.507777 103.235246) (xy 143.506629 103.240914) (xy 143.47791 103.171579)
- (xy 143.37242 103.06609) (xy 143.234592 103.009) (xy 142.67875 103.009) (xy 142.585 103.10275) (xy 142.585 103.734)
- (xy 142.605 103.734) (xy 142.605 103.784) (xy 142.585 103.784) (xy 142.585 104.41525) (xy 142.67875 104.509)
- (xy 143.234592 104.509) (xy 143.37242 104.45191) (xy 143.47791 104.346421) (xy 143.50656 104.277252) (xy 143.585931 104.400599)
- (xy 143.711246 104.486223) (xy 143.86 104.516346) (xy 145.06 104.516346) (xy 145.198966 104.490198) (xy 145.326599 104.408069)
- (xy 145.412223 104.282754) (xy 145.419463 104.247) (xy 146.748724 104.247) (xy 146.785 104.254346) (xy 147.895547 104.254346)
- (xy 146.985894 105.164) (xy 128.604106 105.164) (xy 128.056028 104.615922) (xy 128.056117 104.514323) (xy 127.953571 104.266143)
- (xy 127.763856 104.076097) (xy 127.515855 103.973117) (xy 127.247323 103.972883) (xy 126.999143 104.075429) (xy 126.809097 104.265144)
- (xy 126.706117 104.513145) (xy 126.705883 104.781677) (xy 126.808429 105.029857) (xy 126.998144 105.219903) (xy 127.246145 105.322883)
- (xy 127.348867 105.322973) (xy 128.043447 106.017553) (xy 128.205658 106.12594) (xy 128.397 106.164) (xy 147.193 106.164)
- (xy 147.384342 106.12594) (xy 147.546553 106.017553) (xy 148.527654 105.036453) (xy 148.527654 105.90824) (xy 147.747158 106.688736)
- (xy 147.727 106.684654) (xy 146.527 106.684654) (xy 146.388034 106.710802) (xy 146.260401 106.792931) (xy 146.174777 106.918246)
- (xy 146.173629 106.923914) (xy 146.14491 106.854579) (xy 146.03942 106.74909) (xy 145.901592 106.692) (xy 145.34575 106.692)
- (xy 145.252 106.78575) (xy 145.252 107.417) (xy 145.272 107.417) (xy 145.272 107.467) (xy 145.252 107.467)
- (xy 145.252 108.09825) (xy 145.34575 108.192) (xy 145.901592 108.192) (xy 146.03942 108.13491) (xy 146.14491 108.029421)
- (xy 146.17356 107.960252) (xy 146.252931 108.083599) (xy 146.378246 108.169223) (xy 146.527 108.199346) (xy 147.727 108.199346)
- (xy 147.865966 108.173198) (xy 147.993599 108.091069) (xy 148.079223 107.965754) (xy 148.109346 107.817) (xy 148.109346 107.74076)
- (xy 149.388553 106.461553) (xy 149.443483 106.379346) (xy 149.66 106.379346) (xy 149.789589 106.354962) (xy 149.91 106.379346)
+ (xy 144.893822 124.880473) (xy 145.162317 124.478643) (xy 145.2566 124.004651) (xy 145.2566 123.645349) (xy 145.162317 123.171357)
+ (xy 144.893822 122.769527) (xy 144.491992 122.501032) (xy 144.018 122.406749) (xy 143.544008 122.501032) (xy 143.142178 122.769527)
+ (xy 142.873683 123.171357) (xy 142.7794 123.645349) (xy 142.7166 123.645349) (xy 142.622317 123.171357) (xy 142.353822 122.769527)
+ (xy 141.951992 122.501032) (xy 141.478 122.406749) (xy 141.004008 122.501032) (xy 140.602178 122.769527) (xy 140.333683 123.171357)
+ (xy 140.2394 123.645349) (xy 140.1766 123.645349) (xy 140.082317 123.171357) (xy 139.813822 122.769527) (xy 139.411992 122.501032)
+ (xy 138.938 122.406749) (xy 138.464008 122.501032) (xy 138.062178 122.769527) (xy 137.793683 123.171357) (xy 137.6994 123.645349)
+ (xy 127.375157 123.645349) (xy 127.375417 123.348319) (xy 127.009745 122.463325) (xy 126.333236 121.785634) (xy 125.448882 121.418419)
+ (xy 124.491319 121.417583) (xy 123.606325 121.783255) (xy 122.928634 122.459764) (xy 122.561419 123.344118) (xy 122.560583 124.301681)
+ (xy 122.926255 125.186675) (xy 123.217072 125.478) (xy 113.028 125.478) (xy 113.028 118.999) (xy 144.293001 118.999)
+ (xy 144.386249 119.467787) (xy 144.651795 119.865206) (xy 144.917 120.04241) (xy 144.917 121.293) (xy 144.964575 121.532177)
+ (xy 145.100058 121.734942) (xy 145.933 122.567884) (xy 145.933 122.601933) (xy 145.682178 122.769527) (xy 145.413683 123.171357)
+ (xy 145.3194 123.645349) (xy 145.3194 124.004651) (xy 145.413683 124.478643) (xy 145.682178 124.880473) (xy 146.084008 125.148968)
+ (xy 146.558 125.243251) (xy 147.031992 125.148968) (xy 147.433822 124.880473) (xy 147.702317 124.478643) (xy 147.7966 124.004651)
+ (xy 147.7966 123.645349) (xy 147.8594 123.645349) (xy 147.8594 124.004651) (xy 147.953683 124.478643) (xy 148.222178 124.880473)
+ (xy 148.624008 125.148968) (xy 149.098 125.243251) (xy 149.571992 125.148968) (xy 149.973822 124.880473) (xy 150.242317 124.478643)
+ (xy 150.3366 124.004651) (xy 150.3366 123.85) (xy 150.3994 123.85) (xy 150.3994 124.0024) (xy 150.50325 124.474489)
+ (xy 150.779855 124.8709) (xy 151.187105 125.131284) (xy 151.419587 125.196591) (xy 151.613 125.121977) (xy 151.613 123.85)
+ (xy 151.663 123.85) (xy 151.663 125.121977) (xy 151.856413 125.196591) (xy 152.088895 125.131284) (xy 152.496145 124.8709)
+ (xy 152.77275 124.474489) (xy 152.8766 124.0024) (xy 152.8766 123.85) (xy 152.9394 123.85) (xy 152.9394 124.0024)
+ (xy 153.04325 124.474489) (xy 153.319855 124.8709) (xy 153.727105 125.131284) (xy 153.959587 125.196591) (xy 154.153 125.121977)
+ (xy 154.153 123.85) (xy 154.203 123.85) (xy 154.203 125.121977) (xy 154.396413 125.196591) (xy 154.628895 125.131284)
+ (xy 155.036145 124.8709) (xy 155.31275 124.474489) (xy 155.4166 124.0024) (xy 155.4166 123.85) (xy 154.203 123.85)
+ (xy 154.153 123.85) (xy 152.9394 123.85) (xy 152.8766 123.85) (xy 151.663 123.85) (xy 151.613 123.85)
+ (xy 150.3994 123.85) (xy 150.3366 123.85) (xy 150.3366 123.6476) (xy 150.3994 123.6476) (xy 150.3994 123.8)
+ (xy 151.613 123.8) (xy 151.613 122.528023) (xy 151.663 122.528023) (xy 151.663 123.8) (xy 152.8766 123.8)
+ (xy 152.8766 123.6476) (xy 152.9394 123.6476) (xy 152.9394 123.8) (xy 154.153 123.8) (xy 154.153 122.528023)
+ (xy 154.203 122.528023) (xy 154.203 123.8) (xy 155.4166 123.8) (xy 155.4166 123.6476) (xy 155.416105 123.645349)
+ (xy 155.4794 123.645349) (xy 155.4794 124.004651) (xy 155.573683 124.478643) (xy 155.842178 124.880473) (xy 156.244008 125.148968)
+ (xy 156.718 125.243251) (xy 157.191992 125.148968) (xy 157.593822 124.880473) (xy 157.862317 124.478643) (xy 157.9566 124.004651)
+ (xy 157.9566 123.645349) (xy 157.862317 123.171357) (xy 157.593822 122.769527) (xy 157.191992 122.501032) (xy 156.718 122.406749)
+ (xy 156.244008 122.501032) (xy 155.842178 122.769527) (xy 155.573683 123.171357) (xy 155.4794 123.645349) (xy 155.416105 123.645349)
+ (xy 155.31275 123.175511) (xy 155.036145 122.7791) (xy 154.628895 122.518716) (xy 154.396413 122.453409) (xy 154.203 122.528023)
+ (xy 154.153 122.528023) (xy 153.959587 122.453409) (xy 153.727105 122.518716) (xy 153.319855 122.7791) (xy 153.04325 123.175511)
+ (xy 152.9394 123.6476) (xy 152.8766 123.6476) (xy 152.77275 123.175511) (xy 152.496145 122.7791) (xy 152.088895 122.518716)
+ (xy 151.856413 122.453409) (xy 151.663 122.528023) (xy 151.613 122.528023) (xy 151.419587 122.453409) (xy 151.187105 122.518716)
+ (xy 150.779855 122.7791) (xy 150.50325 123.175511) (xy 150.3994 123.6476) (xy 150.3366 123.6476) (xy 150.3366 123.645349)
+ (xy 150.242317 123.171357) (xy 149.973822 122.769527) (xy 149.571992 122.501032) (xy 149.098 122.406749) (xy 148.624008 122.501032)
+ (xy 148.222178 122.769527) (xy 147.953683 123.171357) (xy 147.8594 123.645349) (xy 147.7966 123.645349) (xy 147.702317 123.171357)
+ (xy 147.433822 122.769527) (xy 147.183 122.601933) (xy 147.183 122.309) (xy 147.135425 122.069823) (xy 146.999942 121.867058)
+ (xy 146.167 121.034116) (xy 146.167 120.04241) (xy 146.432205 119.865206) (xy 146.697751 119.467787) (xy 146.790999 118.999)
+ (xy 146.697751 118.530213) (xy 146.443034 118.149) (xy 146.849654 118.149) (xy 146.849654 119.849) (xy 146.875802 119.987966)
+ (xy 146.957931 120.115599) (xy 147.083246 120.201223) (xy 147.232 120.231346) (xy 148.932 120.231346) (xy 149.070966 120.205198)
+ (xy 149.198599 120.123069) (xy 149.284223 119.997754) (xy 149.314346 119.849) (xy 149.314346 118.149) (xy 149.288198 118.010034)
+ (xy 149.206069 117.882401) (xy 149.080754 117.796777) (xy 148.932 117.766654) (xy 147.232 117.766654) (xy 147.093034 117.792802)
+ (xy 146.965401 117.874931) (xy 146.879777 118.000246) (xy 146.849654 118.149) (xy 146.443034 118.149) (xy 146.432205 118.132794)
+ (xy 146.034786 117.867248) (xy 145.565999 117.774) (xy 145.518001 117.774) (xy 145.049214 117.867248) (xy 144.651795 118.132794)
+ (xy 144.386249 118.530213) (xy 144.293001 118.999) (xy 113.028 118.999) (xy 113.028 115.43475) (xy 147.554 115.43475)
+ (xy 147.554 115.765592) (xy 147.61109 115.903421) (xy 147.71658 116.00891) (xy 147.854408 116.066) (xy 148.41025 116.066)
+ (xy 148.504 115.97225) (xy 148.504 115.341) (xy 147.64775 115.341) (xy 147.554 115.43475) (xy 113.028 115.43475)
+ (xy 113.028 114.866408) (xy 147.554 114.866408) (xy 147.554 115.19725) (xy 147.64775 115.291) (xy 148.504 115.291)
+ (xy 148.504 114.65975) (xy 148.41025 114.566) (xy 147.854408 114.566) (xy 147.71658 114.62309) (xy 147.61109 114.728579)
+ (xy 147.554 114.866408) (xy 113.028 114.866408) (xy 113.028 113.20975) (xy 145.935 113.20975) (xy 145.935 113.765592)
+ (xy 145.99209 113.90342) (xy 146.097579 114.00891) (xy 146.235408 114.066) (xy 146.56625 114.066) (xy 146.66 113.97225)
+ (xy 146.66 113.116) (xy 146.71 113.116) (xy 146.71 113.97225) (xy 146.80375 114.066) (xy 147.134592 114.066)
+ (xy 147.272421 114.00891) (xy 147.37791 113.90342) (xy 147.435 113.765592) (xy 147.435 113.20975) (xy 147.34125 113.116)
+ (xy 146.71 113.116) (xy 146.66 113.116) (xy 146.02875 113.116) (xy 145.935 113.20975) (xy 113.028 113.20975)
+ (xy 113.028 107.37025) (xy 144.5085 107.37025) (xy 144.5085 107.701092) (xy 144.56559 107.838921) (xy 144.67108 107.94441)
+ (xy 144.808908 108.0015) (xy 145.36475 108.0015) (xy 145.4585 107.90775) (xy 145.4585 107.2765) (xy 144.60225 107.2765)
+ (xy 144.5085 107.37025) (xy 113.028 107.37025) (xy 113.028 106.801908) (xy 144.5085 106.801908) (xy 144.5085 107.13275)
+ (xy 144.60225 107.2265) (xy 145.4585 107.2265) (xy 145.4585 106.59525) (xy 145.36475 106.5015) (xy 144.808908 106.5015)
+ (xy 144.67108 106.55859) (xy 144.56559 106.664079) (xy 144.5085 106.801908) (xy 113.028 106.801908) (xy 113.028 101.195001)
+ (xy 123.616 101.195001) (xy 123.616 101.242999) (xy 123.709248 101.711786) (xy 123.974794 102.109205) (xy 124.372213 102.374751)
+ (xy 124.841 102.467999) (xy 125.292987 102.378093) (xy 126.646447 103.731553) (xy 126.808658 103.83994) (xy 127 103.878)
+ (xy 139.827 103.878) (xy 139.828256 103.87775) (xy 141.585 103.87775) (xy 141.585 104.208592) (xy 141.64209 104.346421)
+ (xy 141.74758 104.45191) (xy 141.885408 104.509) (xy 142.44125 104.509) (xy 142.535 104.41525) (xy 142.535 103.784)
+ (xy 141.67875 103.784) (xy 141.585 103.87775) (xy 139.828256 103.87775) (xy 140.018342 103.83994) (xy 140.180553 103.731553)
+ (xy 140.602698 103.309408) (xy 141.585 103.309408) (xy 141.585 103.64025) (xy 141.67875 103.734) (xy 142.535 103.734)
+ (xy 142.535 103.10275) (xy 142.44125 103.009) (xy 141.885408 103.009) (xy 141.74758 103.06609) (xy 141.64209 103.171579)
+ (xy 141.585 103.309408) (xy 140.602698 103.309408) (xy 144.165107 99.747) (xy 146.402654 99.747) (xy 146.402654 99.872)
+ (xy 146.427038 100.001589) (xy 146.402654 100.122) (xy 146.402654 100.372) (xy 146.427038 100.501589) (xy 146.402654 100.622)
+ (xy 146.402654 100.872) (xy 146.427038 101.001589) (xy 146.402654 101.122) (xy 146.402654 101.247) (xy 146.213607 101.247)
+ (xy 146.114431 101.147824) (xy 146.13583 101.09629) (xy 146.136169 100.708411) (xy 145.988046 100.349929) (xy 145.714014 100.075418)
+ (xy 145.35579 99.92667) (xy 144.967911 99.926331) (xy 144.609429 100.074454) (xy 144.334918 100.348486) (xy 144.18617 100.70671)
+ (xy 144.185831 101.094589) (xy 144.333954 101.453071) (xy 144.607986 101.727582) (xy 144.96621 101.87633) (xy 145.354089 101.876669)
+ (xy 145.407141 101.854748) (xy 145.652947 102.100554) (xy 145.750186 102.165526) (xy 145.815158 102.20894) (xy 146.0065 102.247)
+ (xy 146.402654 102.247) (xy 146.402654 102.372) (xy 146.427038 102.501589) (xy 146.402654 102.622) (xy 146.402654 102.872)
+ (xy 146.427644 103.004811) (xy 146.41 103.047408) (xy 146.41 103.12825) (xy 146.50375 103.222) (xy 146.632993 103.222)
+ (xy 146.636246 103.224223) (xy 146.747392 103.24673) (xy 146.745959 103.247) (xy 145.416568 103.247) (xy 145.416198 103.245034)
+ (xy 145.334069 103.117401) (xy 145.208754 103.031777) (xy 145.06 103.001654) (xy 145.035 103.001654) (xy 145.035 102.780995)
+ (xy 145.073883 102.687355) (xy 145.074117 102.418823) (xy 144.971571 102.170643) (xy 144.781856 101.980597) (xy 144.533855 101.877617)
+ (xy 144.265323 101.877383) (xy 144.017143 101.979929) (xy 143.827097 102.169644) (xy 143.724117 102.417645) (xy 143.723883 102.686177)
+ (xy 143.826429 102.934357) (xy 143.885 102.99303) (xy 143.885 103.001654) (xy 143.86 103.001654) (xy 143.721034 103.027802)
+ (xy 143.593401 103.109931) (xy 143.507777 103.235246) (xy 143.506629 103.240914) (xy 143.47791 103.171579) (xy 143.37242 103.06609)
+ (xy 143.234592 103.009) (xy 142.67875 103.009) (xy 142.585 103.10275) (xy 142.585 103.734) (xy 142.605 103.734)
+ (xy 142.605 103.784) (xy 142.585 103.784) (xy 142.585 104.41525) (xy 142.67875 104.509) (xy 143.234592 104.509)
+ (xy 143.37242 104.45191) (xy 143.47791 104.346421) (xy 143.50656 104.277252) (xy 143.585931 104.400599) (xy 143.711246 104.486223)
+ (xy 143.86 104.516346) (xy 145.06 104.516346) (xy 145.198966 104.490198) (xy 145.326599 104.408069) (xy 145.412223 104.282754)
+ (xy 145.419463 104.247) (xy 146.748724 104.247) (xy 146.785 104.254346) (xy 147.895547 104.254346) (xy 146.985894 105.164)
+ (xy 128.604106 105.164) (xy 128.056028 104.615922) (xy 128.056117 104.514323) (xy 127.953571 104.266143) (xy 127.763856 104.076097)
+ (xy 127.515855 103.973117) (xy 127.247323 103.972883) (xy 126.999143 104.075429) (xy 126.809097 104.265144) (xy 126.706117 104.513145)
+ (xy 126.705883 104.781677) (xy 126.808429 105.029857) (xy 126.998144 105.219903) (xy 127.246145 105.322883) (xy 127.348867 105.322973)
+ (xy 128.043447 106.017553) (xy 128.205658 106.12594) (xy 128.397 106.164) (xy 147.193 106.164) (xy 147.384342 106.12594)
+ (xy 147.546553 106.017553) (xy 148.527654 105.036453) (xy 148.527654 105.997) (xy 148.535 106.036041) (xy 148.535 106.281893)
+ (xy 148.227522 106.589371) (xy 148.132254 106.524277) (xy 147.9835 106.494154) (xy 146.7835 106.494154) (xy 146.644534 106.520302)
+ (xy 146.516901 106.602431) (xy 146.431277 106.727746) (xy 146.430129 106.733414) (xy 146.40141 106.664079) (xy 146.29592 106.55859)
+ (xy 146.158092 106.5015) (xy 145.60225 106.5015) (xy 145.5085 106.59525) (xy 145.5085 107.2265) (xy 145.5285 107.2265)
+ (xy 145.5285 107.2765) (xy 145.5085 107.2765) (xy 145.5085 107.90775) (xy 145.60225 108.0015) (xy 146.158092 108.0015)
+ (xy 146.29592 107.94441) (xy 146.40141 107.838921) (xy 146.43006 107.769752) (xy 146.509431 107.893099) (xy 146.634746 107.978723)
+ (xy 146.7835 108.008846) (xy 147.9835 108.008846) (xy 148.122466 107.982698) (xy 148.250099 107.900569) (xy 148.335723 107.775254)
+ (xy 148.343389 107.737399) (xy 148.463842 107.71344) (xy 148.626053 107.605053) (xy 149.388554 106.842553) (xy 149.49694 106.680342)
+ (xy 149.535 106.489) (xy 149.535 106.379346) (xy 149.66 106.379346) (xy 149.789589 106.354962) (xy 149.91 106.379346)
(xy 150.16 106.379346) (xy 150.228422 106.366472) (xy 148.325447 108.269447) (xy 148.21706 108.431658) (xy 148.179 108.623)
(xy 148.179 110.085654) (xy 148.079 110.085654) (xy 147.940034 110.111802) (xy 147.812401 110.193931) (xy 147.726777 110.319246)
(xy 147.696654 110.468) (xy 147.696654 110.668) (xy 147.442346 110.668) (xy 147.442346 110.591) (xy 147.416198 110.452034)
@@ -2208,76 +2361,81 @@
(xy 151.385198 114.802034) (xy 151.303069 114.674401) (xy 151.177754 114.588777) (xy 151.029 114.558654) (xy 150.779 114.558654)
(xy 150.779 114.450346) (xy 150.879 114.450346) (xy 151.017966 114.424198) (xy 151.145599 114.342069) (xy 151.231223 114.216754)
(xy 151.261346 114.068) (xy 151.261346 113.092761) (xy 151.888553 112.465554) (xy 151.99694 112.303342) (xy 152.007481 112.250346)
- (xy 152.035 112.112) (xy 152.035 110.891) (xy 152.15425 110.891) (xy 152.248 110.79725) (xy 152.248 109.941)
- (xy 152.298 109.941) (xy 152.298 110.79725) (xy 152.39175 110.891) (xy 152.722592 110.891) (xy 152.860421 110.83391)
- (xy 152.96591 110.72842) (xy 153.023 110.590592) (xy 153.023 110.03475) (xy 153.174 110.03475) (xy 153.174 110.590592)
+ (xy 152.035 112.112) (xy 152.035 110.891) (xy 152.21775 110.891) (xy 152.3115 110.79725) (xy 152.3115 109.941)
+ (xy 152.3615 109.941) (xy 152.3615 110.79725) (xy 152.45525 110.891) (xy 152.786092 110.891) (xy 152.923921 110.83391)
+ (xy 153.02941 110.72842) (xy 153.0865 110.590592) (xy 153.0865 110.03475) (xy 153.174 110.03475) (xy 153.174 110.590592)
(xy 153.23109 110.72842) (xy 153.336579 110.83391) (xy 153.474408 110.891) (xy 153.80525 110.891) (xy 153.899 110.79725)
(xy 153.899 109.941) (xy 153.949 109.941) (xy 153.949 110.79725) (xy 154.04275 110.891) (xy 154.373592 110.891)
(xy 154.511421 110.83391) (xy 154.61691 110.72842) (xy 154.674 110.590592) (xy 154.674 110.03475) (xy 154.58025 109.941)
- (xy 153.949 109.941) (xy 153.899 109.941) (xy 153.26775 109.941) (xy 153.174 110.03475) (xy 153.023 110.03475)
- (xy 152.92925 109.941) (xy 152.298 109.941) (xy 152.248 109.941) (xy 152.228 109.941) (xy 152.228 109.891)
- (xy 152.248 109.891) (xy 152.248 109.871) (xy 152.298 109.871) (xy 152.298 109.891) (xy 152.92925 109.891)
- (xy 153.023 109.79725) (xy 153.023 109.241408) (xy 152.96591 109.10358) (xy 152.860421 108.99809) (xy 152.791252 108.96944)
- (xy 152.914599 108.890069) (xy 153.000223 108.764754) (xy 153.030346 108.616) (xy 153.030346 107.416) (xy 153.004198 107.277034)
- (xy 152.922069 107.149401) (xy 152.796754 107.063777) (xy 152.648 107.033654) (xy 152.535 107.033654) (xy 152.535 106.426)
- (xy 152.563631 106.56994) (xy 152.57306 106.617342) (xy 152.681447 106.779553) (xy 153.192123 107.290229) (xy 153.166654 107.416)
- (xy 153.166654 108.616) (xy 153.192802 108.754966) (xy 153.274931 108.882599) (xy 153.400246 108.968223) (xy 153.405914 108.969371)
- (xy 153.336579 108.99809) (xy 153.23109 109.10358) (xy 153.174 109.241408) (xy 153.174 109.79725) (xy 153.26775 109.891)
- (xy 153.899 109.891) (xy 153.899 109.871) (xy 153.949 109.871) (xy 153.949 109.891) (xy 154.58025 109.891)
- (xy 154.674 109.79725) (xy 154.674 109.241408) (xy 154.61691 109.10358) (xy 154.511421 108.99809) (xy 154.442252 108.96944)
- (xy 154.565599 108.890069) (xy 154.651223 108.764754) (xy 154.681346 108.616) (xy 154.681346 107.416) (xy 154.655198 107.277034)
- (xy 154.573069 107.149401) (xy 154.447754 107.063777) (xy 154.329994 107.03993) (xy 154.277553 106.961447) (xy 153.689838 106.373732)
- (xy 153.789589 106.354962) (xy 153.91 106.379346) (xy 154.16 106.379346) (xy 154.289589 106.354962) (xy 154.41 106.379346)
- (xy 154.66 106.379346) (xy 154.798966 106.353198) (xy 154.926599 106.271069) (xy 155.012223 106.145754) (xy 155.042346 105.997)
- (xy 155.042346 105.847) (xy 157.273394 105.847) (xy 157.566972 106.140578) (xy 157.566883 106.242177) (xy 157.669429 106.490357)
- (xy 157.859144 106.680403) (xy 158.107145 106.783383) (xy 158.375677 106.783617) (xy 158.623857 106.681071) (xy 158.813903 106.491356)
- (xy 158.916883 106.243355) (xy 158.917117 105.974823) (xy 158.814571 105.726643) (xy 158.624856 105.536597) (xy 158.376855 105.433617)
- (xy 158.274134 105.433527) (xy 157.834053 104.993447) (xy 157.671842 104.88506) (xy 157.4805 104.847) (xy 155.042346 104.847)
- (xy 155.042346 104.697) (xy 155.016198 104.558034) (xy 154.934069 104.430401) (xy 154.808754 104.344777) (xy 154.66 104.314654)
- (xy 154.41 104.314654) (xy 154.280411 104.339038) (xy 154.16 104.314654) (xy 153.91 104.314654) (xy 153.780411 104.339038)
- (xy 153.66 104.314654) (xy 153.41 104.314654) (xy 153.280411 104.339038) (xy 153.16 104.314654) (xy 152.91 104.314654)
- (xy 152.777189 104.339644) (xy 152.734592 104.322) (xy 152.65375 104.322) (xy 152.56 104.41575) (xy 152.56 104.544993)
- (xy 152.557777 104.548246) (xy 152.53527 104.659392) (xy 152.535 104.657959) (xy 152.535 104.156) (xy 152.49694 103.964658)
- (xy 152.444382 103.886) (xy 152.388554 103.802447) (xy 152.118553 103.532447) (xy 151.956342 103.42406) (xy 151.926464 103.418117)
- (xy 151.765 103.386) (xy 148.971 103.386) (xy 148.779658 103.42406) (xy 148.758284 103.438342) (xy 148.617447 103.532446)
- (xy 148.467346 103.682547) (xy 148.467346 103.622) (xy 148.442356 103.489189) (xy 148.46 103.446592) (xy 148.46 103.36575)
- (xy 148.36625 103.272) (xy 148.237007 103.272) (xy 148.233754 103.269777) (xy 148.122608 103.24727) (xy 148.124041 103.247)
- (xy 151.507 103.247) (xy 151.52711 103.243) (xy 152.770866 103.243) (xy 152.842644 103.314903) (xy 153.090645 103.417883)
- (xy 153.359177 103.418117) (xy 153.607357 103.315571) (xy 153.797403 103.125856) (xy 153.900383 102.877855) (xy 153.900617 102.609323)
- (xy 153.798071 102.361143) (xy 153.608356 102.171097) (xy 153.360355 102.068117) (xy 153.091823 102.067883) (xy 152.843643 102.170429)
- (xy 152.770945 102.243) (xy 152.076637 102.243) (xy 152.146403 102.173356) (xy 152.249383 101.925355) (xy 152.249617 101.656823)
- (xy 152.147071 101.408643) (xy 151.957356 101.218597) (xy 151.709355 101.115617) (xy 151.440823 101.115383) (xy 151.192643 101.217929)
- (xy 151.002597 101.407644) (xy 150.899617 101.655645) (xy 150.899537 101.747) (xy 148.467346 101.747) (xy 148.467346 101.622)
- (xy 148.442962 101.492411) (xy 148.467346 101.372) (xy 148.467346 101.122) (xy 148.442962 100.992411) (xy 148.467346 100.872)
- (xy 148.467346 100.622) (xy 148.442962 100.492411) (xy 148.467346 100.372) (xy 148.467346 100.122) (xy 148.442962 99.992411)
- (xy 148.467346 99.872) (xy 148.467346 99.622) (xy 148.442962 99.492411) (xy 148.467346 99.372) (xy 148.467346 99.122)
- (xy 148.442962 98.992411) (xy 148.467346 98.872) (xy 148.467346 98.622) (xy 148.442962 98.492411) (xy 148.467346 98.372)
- (xy 148.467346 98.122) (xy 148.441198 97.983034) (xy 148.359069 97.855401) (xy 148.233754 97.769777) (xy 148.085 97.739654)
- (xy 146.785 97.739654) (xy 146.745959 97.747) (xy 136.322 97.747) (xy 136.130658 97.78506) (xy 135.968447 97.893447)
- (xy 134.647447 99.214447) (xy 134.53906 99.376658) (xy 134.501 99.568) (xy 134.501 100.084105) (xy 134.134794 100.328795)
- (xy 133.869248 100.726214) (xy 133.776 101.195001) (xy 133.776 101.242999) (xy 133.869248 101.711786) (xy 134.134794 102.109205)
- (xy 134.532213 102.374751) (xy 135.001 102.467999) (xy 135.469787 102.374751) (xy 135.867206 102.109205) (xy 136.132752 101.711786)
- (xy 136.226 101.242999) (xy 136.226 101.195001) (xy 136.132752 100.726214) (xy 135.894071 100.369) (xy 136.308654 100.369)
- (xy 136.308654 102.069) (xy 136.334802 102.207966) (xy 136.416931 102.335599) (xy 136.542246 102.421223) (xy 136.691 102.451346)
- (xy 138.391 102.451346) (xy 138.529966 102.425198) (xy 138.657599 102.343069) (xy 138.743223 102.217754) (xy 138.773346 102.069)
- (xy 138.773346 100.369) (xy 138.747198 100.230034) (xy 138.665069 100.102401) (xy 138.539754 100.016777) (xy 138.391 99.986654)
- (xy 136.691 99.986654) (xy 136.552034 100.012802) (xy 136.424401 100.094931) (xy 136.338777 100.220246) (xy 136.308654 100.369)
- (xy 135.894071 100.369) (xy 135.867206 100.328795) (xy 135.501 100.084105) (xy 135.501 99.775106) (xy 136.529106 98.747)
- (xy 143.958 98.747) (xy 143.766658 98.78506) (xy 143.604446 98.893447) (xy 139.619894 102.878) (xy 127.207106 102.878)
- (xy 125.984057 101.654951) (xy 126.066 101.242999) (xy 126.066 101.195001) (xy 126.156 101.195001) (xy 126.156 101.242999)
- (xy 126.249248 101.711786) (xy 126.514794 102.109205) (xy 126.912213 102.374751) (xy 127.381 102.467999) (xy 127.849787 102.374751)
- (xy 128.247206 102.109205) (xy 128.512752 101.711786) (xy 128.606 101.242999) (xy 128.606 101.195001) (xy 128.512752 100.726214)
- (xy 128.247206 100.328795) (xy 127.849787 100.063249) (xy 127.381 99.970001) (xy 126.912213 100.063249) (xy 126.514794 100.328795)
- (xy 126.249248 100.726214) (xy 126.156 101.195001) (xy 126.066 101.195001) (xy 125.972752 100.726214) (xy 125.707206 100.328795)
- (xy 125.309787 100.063249) (xy 124.841 99.970001) (xy 124.372213 100.063249) (xy 123.974794 100.328795) (xy 123.709248 100.726214)
- (xy 123.616 101.195001) (xy 113.028 101.195001) (xy 113.028 92.35075) (xy 113.33 92.35075) (xy 113.33 92.506592)
- (xy 113.38709 92.644421) (xy 113.49258 92.74991) (xy 113.630408 92.807) (xy 113.681651 92.807) (xy 113.594702 92.937128)
- (xy 113.53 93.262409) (xy 113.53 93.601591) (xy 113.594702 93.926872) (xy 113.778959 94.202632) (xy 114.054719 94.386889)
- (xy 114.38 94.451591) (xy 114.705281 94.386889) (xy 114.981041 94.202632) (xy 115.165298 93.926872) (xy 115.23 93.601591)
- (xy 115.23 93.262409) (xy 115.165298 92.937128) (xy 115.078349 92.807) (xy 115.129592 92.807) (xy 115.26742 92.74991)
- (xy 115.37291 92.644421) (xy 115.43 92.506592) (xy 115.43 92.35075) (xy 115.33625 92.257) (xy 114.405 92.257)
- (xy 114.405 92.277) (xy 114.355 92.277) (xy 114.355 92.257) (xy 113.42375 92.257) (xy 113.33 92.35075)
- (xy 113.028 92.35075) (xy 113.028 73.912) (xy 124.486901 73.912)
+ (xy 153.949 109.941) (xy 153.899 109.941) (xy 153.26775 109.941) (xy 153.174 110.03475) (xy 153.0865 110.03475)
+ (xy 152.99275 109.941) (xy 152.3615 109.941) (xy 152.3115 109.941) (xy 152.2915 109.941) (xy 152.2915 109.891)
+ (xy 152.3115 109.891) (xy 152.3115 109.871) (xy 152.3615 109.871) (xy 152.3615 109.891) (xy 152.99275 109.891)
+ (xy 153.0865 109.79725) (xy 153.0865 109.241408) (xy 153.02941 109.10358) (xy 152.923921 108.99809) (xy 152.854752 108.96944)
+ (xy 152.978099 108.890069) (xy 153.063723 108.764754) (xy 153.093846 108.616) (xy 153.093846 107.416) (xy 153.067698 107.277034)
+ (xy 152.985569 107.149401) (xy 152.860254 107.063777) (xy 152.7115 107.033654) (xy 152.535 107.033654) (xy 152.535 106.172)
+ (xy 152.570252 106.349223) (xy 152.57306 106.363342) (xy 152.681447 106.525553) (xy 153.291786 107.135892) (xy 153.282401 107.141931)
+ (xy 153.196777 107.267246) (xy 153.166654 107.416) (xy 153.166654 108.616) (xy 153.192802 108.754966) (xy 153.274931 108.882599)
+ (xy 153.400246 108.968223) (xy 153.405914 108.969371) (xy 153.336579 108.99809) (xy 153.23109 109.10358) (xy 153.174 109.241408)
+ (xy 153.174 109.79725) (xy 153.26775 109.891) (xy 153.899 109.891) (xy 153.899 109.871) (xy 153.949 109.871)
+ (xy 153.949 109.891) (xy 154.58025 109.891) (xy 154.674 109.79725) (xy 154.674 109.241408) (xy 154.61691 109.10358)
+ (xy 154.511421 108.99809) (xy 154.442252 108.96944) (xy 154.565599 108.890069) (xy 154.651223 108.764754) (xy 154.681346 108.616)
+ (xy 154.681346 108.591) (xy 154.958328 108.591) (xy 155.9525 109.585173) (xy 155.9525 109.924102) (xy 155.852617 110.164645)
+ (xy 155.852383 110.433177) (xy 155.954929 110.681357) (xy 156.144644 110.871403) (xy 156.392645 110.974383) (xy 156.661177 110.974617)
+ (xy 156.909357 110.872071) (xy 157.099403 110.682356) (xy 157.202383 110.434355) (xy 157.202617 110.165823) (xy 157.1025 109.923522)
+ (xy 157.1025 109.347) (xy 157.058731 109.126957) (xy 156.99712 109.03475) (xy 156.934086 108.940413) (xy 155.603086 107.609414)
+ (xy 155.416543 107.484769) (xy 155.1965 107.441) (xy 154.681346 107.441) (xy 154.681346 107.416) (xy 154.655198 107.277034)
+ (xy 154.573069 107.149401) (xy 154.447754 107.063777) (xy 154.423579 107.058881) (xy 154.38594 106.869658) (xy 154.277553 106.707447)
+ (xy 153.949452 106.379346) (xy 154.16 106.379346) (xy 154.289589 106.354962) (xy 154.41 106.379346) (xy 154.66 106.379346)
+ (xy 154.798966 106.353198) (xy 154.926599 106.271069) (xy 155.012223 106.145754) (xy 155.042346 105.997) (xy 155.042346 105.847)
+ (xy 157.273394 105.847) (xy 157.566972 106.140578) (xy 157.566883 106.242177) (xy 157.669429 106.490357) (xy 157.859144 106.680403)
+ (xy 158.107145 106.783383) (xy 158.375677 106.783617) (xy 158.623857 106.681071) (xy 158.813903 106.491356) (xy 158.916883 106.243355)
+ (xy 158.917117 105.974823) (xy 158.814571 105.726643) (xy 158.624856 105.536597) (xy 158.376855 105.433617) (xy 158.274134 105.433527)
+ (xy 157.834053 104.993447) (xy 157.671842 104.88506) (xy 157.4805 104.847) (xy 155.042346 104.847) (xy 155.042346 104.697)
+ (xy 155.016198 104.558034) (xy 154.934069 104.430401) (xy 154.808754 104.344777) (xy 154.66 104.314654) (xy 154.41 104.314654)
+ (xy 154.280411 104.339038) (xy 154.16 104.314654) (xy 153.91 104.314654) (xy 153.780411 104.339038) (xy 153.66 104.314654)
+ (xy 153.41 104.314654) (xy 153.280411 104.339038) (xy 153.16 104.314654) (xy 152.91 104.314654) (xy 152.777189 104.339644)
+ (xy 152.734592 104.322) (xy 152.65375 104.322) (xy 152.56 104.41575) (xy 152.56 104.544993) (xy 152.557777 104.548246)
+ (xy 152.53527 104.659392) (xy 152.535 104.657959) (xy 152.535 104.156) (xy 152.49694 103.964658) (xy 152.444382 103.886)
+ (xy 152.388554 103.802447) (xy 152.118553 103.532447) (xy 151.956342 103.42406) (xy 151.926464 103.418117) (xy 151.765 103.386)
+ (xy 148.971 103.386) (xy 148.779658 103.42406) (xy 148.758284 103.438342) (xy 148.617447 103.532446) (xy 148.467346 103.682547)
+ (xy 148.467346 103.622) (xy 148.442356 103.489189) (xy 148.46 103.446592) (xy 148.46 103.36575) (xy 148.36625 103.272)
+ (xy 148.237007 103.272) (xy 148.233754 103.269777) (xy 148.122608 103.24727) (xy 148.124041 103.247) (xy 151.507 103.247)
+ (xy 151.52711 103.243) (xy 152.770866 103.243) (xy 152.842644 103.314903) (xy 153.090645 103.417883) (xy 153.359177 103.418117)
+ (xy 153.607357 103.315571) (xy 153.797403 103.125856) (xy 153.900383 102.877855) (xy 153.900617 102.609323) (xy 153.798071 102.361143)
+ (xy 153.608356 102.171097) (xy 153.360355 102.068117) (xy 153.091823 102.067883) (xy 152.843643 102.170429) (xy 152.770945 102.243)
+ (xy 152.076637 102.243) (xy 152.146403 102.173356) (xy 152.249383 101.925355) (xy 152.249617 101.656823) (xy 152.147071 101.408643)
+ (xy 151.957356 101.218597) (xy 151.709355 101.115617) (xy 151.440823 101.115383) (xy 151.192643 101.217929) (xy 151.002597 101.407644)
+ (xy 150.899617 101.655645) (xy 150.899537 101.747) (xy 148.467346 101.747) (xy 148.467346 101.622) (xy 148.442962 101.492411)
+ (xy 148.467346 101.372) (xy 148.467346 101.122) (xy 148.442962 100.992411) (xy 148.467346 100.872) (xy 148.467346 100.622)
+ (xy 148.442962 100.492411) (xy 148.467346 100.372) (xy 148.467346 100.122) (xy 148.442962 99.992411) (xy 148.467346 99.872)
+ (xy 148.467346 99.622) (xy 148.442962 99.492411) (xy 148.467346 99.372) (xy 148.467346 99.122) (xy 148.442962 98.992411)
+ (xy 148.467346 98.872) (xy 148.467346 98.622) (xy 148.442962 98.492411) (xy 148.467346 98.372) (xy 148.467346 98.122)
+ (xy 148.441198 97.983034) (xy 148.359069 97.855401) (xy 148.233754 97.769777) (xy 148.085 97.739654) (xy 146.785 97.739654)
+ (xy 146.745959 97.747) (xy 136.322 97.747) (xy 136.130658 97.78506) (xy 135.968447 97.893447) (xy 134.647447 99.214447)
+ (xy 134.53906 99.376658) (xy 134.501 99.568) (xy 134.501 100.084105) (xy 134.134794 100.328795) (xy 133.869248 100.726214)
+ (xy 133.776 101.195001) (xy 133.776 101.242999) (xy 133.869248 101.711786) (xy 134.134794 102.109205) (xy 134.532213 102.374751)
+ (xy 135.001 102.467999) (xy 135.469787 102.374751) (xy 135.867206 102.109205) (xy 136.132752 101.711786) (xy 136.226 101.242999)
+ (xy 136.226 101.195001) (xy 136.132752 100.726214) (xy 135.894071 100.369) (xy 136.308654 100.369) (xy 136.308654 102.069)
+ (xy 136.334802 102.207966) (xy 136.416931 102.335599) (xy 136.542246 102.421223) (xy 136.691 102.451346) (xy 138.391 102.451346)
+ (xy 138.529966 102.425198) (xy 138.657599 102.343069) (xy 138.743223 102.217754) (xy 138.773346 102.069) (xy 138.773346 100.369)
+ (xy 138.747198 100.230034) (xy 138.665069 100.102401) (xy 138.539754 100.016777) (xy 138.391 99.986654) (xy 136.691 99.986654)
+ (xy 136.552034 100.012802) (xy 136.424401 100.094931) (xy 136.338777 100.220246) (xy 136.308654 100.369) (xy 135.894071 100.369)
+ (xy 135.867206 100.328795) (xy 135.501 100.084105) (xy 135.501 99.775106) (xy 136.529106 98.747) (xy 143.958 98.747)
+ (xy 143.766658 98.78506) (xy 143.604446 98.893447) (xy 139.619894 102.878) (xy 127.207106 102.878) (xy 125.984057 101.654951)
+ (xy 126.066 101.242999) (xy 126.066 101.195001) (xy 126.156 101.195001) (xy 126.156 101.242999) (xy 126.249248 101.711786)
+ (xy 126.514794 102.109205) (xy 126.912213 102.374751) (xy 127.381 102.467999) (xy 127.849787 102.374751) (xy 128.247206 102.109205)
+ (xy 128.512752 101.711786) (xy 128.606 101.242999) (xy 128.606 101.195001) (xy 128.512752 100.726214) (xy 128.247206 100.328795)
+ (xy 127.849787 100.063249) (xy 127.381 99.970001) (xy 126.912213 100.063249) (xy 126.514794 100.328795) (xy 126.249248 100.726214)
+ (xy 126.156 101.195001) (xy 126.066 101.195001) (xy 125.972752 100.726214) (xy 125.707206 100.328795) (xy 125.309787 100.063249)
+ (xy 124.841 99.970001) (xy 124.372213 100.063249) (xy 123.974794 100.328795) (xy 123.709248 100.726214) (xy 123.616 101.195001)
+ (xy 113.028 101.195001) (xy 113.028 92.35075) (xy 113.33 92.35075) (xy 113.33 92.506592) (xy 113.38709 92.644421)
+ (xy 113.49258 92.74991) (xy 113.630408 92.807) (xy 113.681651 92.807) (xy 113.594702 92.937128) (xy 113.53 93.262409)
+ (xy 113.53 93.601591) (xy 113.594702 93.926872) (xy 113.778959 94.202632) (xy 114.054719 94.386889) (xy 114.38 94.451591)
+ (xy 114.705281 94.386889) (xy 114.981041 94.202632) (xy 115.165298 93.926872) (xy 115.23 93.601591) (xy 115.23 93.262409)
+ (xy 115.165298 92.937128) (xy 115.078349 92.807) (xy 115.129592 92.807) (xy 115.26742 92.74991) (xy 115.37291 92.644421)
+ (xy 115.43 92.506592) (xy 115.43 92.35075) (xy 115.33625 92.257) (xy 114.405 92.257) (xy 114.405 92.277)
+ (xy 114.355 92.277) (xy 114.355 92.257) (xy 113.42375 92.257) (xy 113.33 92.35075) (xy 113.028 92.35075)
+ (xy 113.028 73.912) (xy 124.486901 73.912)
)
)
)
diff --git a/hw1/hw1.net b/hw1/hw1.net
index 03ef62a..85d7f92 100644
--- a/hw1/hw1.net
+++ b/hw1/hw1.net
@@ -1,7 +1,7 @@
(export (version D)
(design
(source /home/karlp/src/libopencm3-tests/hw1/hw1.sch)
- (date "Sun 26 Nov 2017 08:26:28 PM GMT")
+ (date "Sun 17 Dec 2017 10:17:06 PM GMT")
(tool "Eeschema 4.0.6")
(sheet (number 1) (name /) (tstamps /)
(title_block
@@ -182,7 +182,25 @@
(footprint Capacitors_SMD:C_0603_HandSoldering)
(libsource (lib device) (part C))
(sheetpath (names /) (tstamps /))
- (tstamp 5A137455)))
+ (tstamp 5A137455))
+ (comp (ref JP3)
+ (value Jumper_NC_Small)
+ (footprint Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm)
+ (libsource (lib device) (part Jumper_NC_Small))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A36E60E))
+ (comp (ref J3)
+ (value CONN_01X02)
+ (footprint Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm)
+ (libsource (lib conn) (part CONN_01X02))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A36EBE0))
+ (comp (ref J2)
+ (value CONN_01X01_MALE)
+ (footprint Wire_Pads:SolderWirePad_single_0-8mmDrill)
+ (libsource (lib conn) (part CONN_01X01_MALE))
+ (sheetpath (names /) (tstamps /))
+ (tstamp 5A36F13B)))
(libparts
(libpart (lib device) (part C)
(description "Unpolarized capacitor")
@@ -206,6 +224,26 @@
(field (name Value) CONN_01X01))
(pins
(pin (num 1) (name P1) (type passive))))
+ (libpart (lib conn) (part CONN_01X01_MALE)
+ (description "Generic Male Connector, single row, 01x01, pin header")
+ (fields
+ (field (name Reference) J)
+ (field (name Value) CONN_01X01_MALE))
+ (pins
+ (pin (num 1) (name 1) (type passive))))
+ (libpart (lib conn) (part CONN_01X02)
+ (description "Connector, single row, 01x02, pin header")
+ (footprints
+ (fp Pin_Header_Straight_1X*)
+ (fp Pin_Header_Angled_1X*)
+ (fp Socket_Strip_Straight_1X*)
+ (fp Socket_Strip_Angled_1X*))
+ (fields
+ (field (name Reference) J)
+ (field (name Value) CONN_01X02))
+ (pins
+ (pin (num 1) (name P1) (type passive))
+ (pin (num 2) (name P2) (type passive))))
(libpart (lib conn) (part CONN_01X06)
(description "Connector, single row, 01x06, pin header")
(footprints
@@ -404,105 +442,84 @@
(pin (num 5) (name GND) (type power_in))
(pin (num 6) (name shield) (type passive)))))
(libraries
- (library (logical hw1-rescue)
- (uri /home/karlp/src/libopencm3-tests/hw1/hw1-rescue.lib))
(library (logical device)
(uri /usr/share/kicad/library/device.lib))
(library (logical conn)
(uri /usr/share/kicad/library/conn.lib))
+ (library (logical hw1-rescue)
+ (uri /home/karlp/src/libopencm3-tests/hw1/hw1-rescue.lib))
(library (logical stm32)
(uri /usr/share/kicad/library/stm32.lib))
(library (logical karlp-klibs)
(uri /home/karlp/src/libopencm3-tests/hw1/karlp-klibs.lib)))
(nets
- (net (code 1) (name /SPI_CS)
- (node (ref P3) (pin 3))
- (node (ref U1) (pin 25))
- (node (ref P9) (pin 8)))
- (net (code 2) (name /SPI_MOSI)
- (node (ref P3) (pin 4))
+ (net (code 1) (name /SPI_MOSI)
(node (ref U1) (pin 28))
+ (node (ref P3) (pin 4))
(node (ref P9) (pin 5)))
- (net (code 3) (name /SPI_MISO)
- (node (ref P3) (pin 5))
+ (net (code 2) (name "Net-(U2-Pad4)")
+ (node (ref U2) (pin 4)))
+ (net (code 3) (name /ADC_IN2)
+ (node (ref U1) (pin 17)))
+ (net (code 4) (name /ADC_IN1)
+ (node (ref U1) (pin 16))
+ (node (ref P2) (pin 3)))
+ (net (code 5) (name /SPI_MISO)
(node (ref P9) (pin 6))
+ (node (ref P3) (pin 5))
(node (ref U1) (pin 27)))
- (net (code 4) (name /SPI_SCK)
+ (net (code 6) (name /SPI_SCK)
+ (node (ref P9) (pin 7))
(node (ref P3) (pin 6))
- (node (ref U1) (pin 26))
- (node (ref P9) (pin 7)))
- (net (code 5) (name /UART_RX_OUT)
- (node (ref P9) (pin 4))
+ (node (ref U1) (pin 26)))
+ (net (code 7) (name /SPI_CS)
+ (node (ref P3) (pin 3))
+ (node (ref U1) (pin 25))
+ (node (ref P9) (pin 8)))
+ (net (code 8) (name /UART_RX_OUT)
(node (ref P4) (pin 2))
+ (node (ref P9) (pin 4))
(node (ref U1) (pin 13)))
- (net (code 6) (name /UART_TX_OUT)
- (node (ref P9) (pin 3))
+ (net (code 9) (name /UART_TX_OUT)
(node (ref P4) (pin 1))
- (node (ref U1) (pin 12)))
- (net (code 7) (name "Net-(P9-Pad9)")
+ (node (ref U1) (pin 12))
+ (node (ref P9) (pin 3)))
+ (net (code 10) (name "Net-(P9-Pad9)")
(node (ref P9) (pin 9)))
- (net (code 8) (name GND)
- (node (ref P1) (pin 6))
- (node (ref P1) (pin 7))
- (node (ref U1) (pin 8))
- (node (ref U1) (pin 23))
- (node (ref P3) (pin 7))
- (node (ref J1) (pin 3))
- (node (ref C10) (pin 2))
- (node (ref C9) (pin 2))
- (node (ref C6) (pin 2))
- (node (ref C4) (pin 2))
- (node (ref P9) (pin 10))
- (node (ref P10) (pin 5))
- (node (ref U1) (pin 35))
- (node (ref C5) (pin 2))
- (node (ref U1) (pin 47))
- (node (ref C3) (pin 2))
- (node (ref C2) (pin 2))
- (node (ref C1) (pin 2))
- (node (ref C7) (pin 2))
- (node (ref U2) (pin 2))
- (node (ref C8) (pin 2)))
- (net (code 9) (name /SWCLK)
- (node (ref J1) (pin 2))
- (node (ref U1) (pin 37)))
- (net (code 10) (name /SWDIO)
- (node (ref J1) (pin 4))
- (node (ref U1) (pin 34)))
- (net (code 11) (name /SWO)
- (node (ref J1) (pin 6))
- (node (ref U1) (pin 39)))
- (net (code 12) (name "Net-(U2-Pad4)")
- (node (ref U2) (pin 4)))
- (net (code 13) (name /ADC_IN2)
- (node (ref U1) (pin 17)))
- (net (code 14) (name /ADC_IN1)
- (node (ref P2) (pin 3))
- (node (ref U1) (pin 16)))
- (net (code 15) (name /I2C_SCL)
+ (net (code 11) (name +5V)
+ (node (ref U2) (pin 3))
+ (node (ref U2) (pin 1))
+ (node (ref C7) (pin 1))
+ (node (ref P10) (pin 1)))
+ (net (code 12) (name "Net-(P10-Pad6)")
+ (node (ref P10) (pin 6)))
+ (net (code 13) (name "Net-(P10-Pad4)")
+ (node (ref P10) (pin 4)))
+ (net (code 14) (name /I2C_SCL)
+ (node (ref P9) (pin 2))
(node (ref JP2) (pin 1))
(node (ref P2) (pin 6))
- (node (ref P3) (pin 10))
- (node (ref P9) (pin 2))
(node (ref U1) (pin 45)))
- (net (code 16) (name /I2C_SDA)
+ (net (code 15) (name /I2C_SDA)
(node (ref U1) (pin 46))
- (node (ref JP1) (pin 1))
- (node (ref P3) (pin 9))
+ (node (ref P9) (pin 1))
(node (ref P2) (pin 5))
- (node (ref P9) (pin 1)))
- (net (code 17) (name /USB_DP)
- (node (ref U1) (pin 33))
- (node (ref P10) (pin 3)))
- (net (code 18) (name /USB_DM)
- (node (ref P10) (pin 2))
- (node (ref U1) (pin 32)))
- (net (code 19) (name /NRST)
- (node (ref U1) (pin 7))
- (node (ref C1) (pin 1))
- (node (ref J1) (pin 5)))
- (net (code 20) (name "Net-(U1-Pad40)")
+ (node (ref JP1) (pin 1)))
+ (net (code 16) (name "Net-(U1-Pad40)")
(node (ref U1) (pin 40)))
+ (net (code 17) (name /NRST)
+ (node (ref J1) (pin 5))
+ (node (ref U1) (pin 7))
+ (node (ref C1) (pin 2)))
+ (net (code 18) (name /SWCLK)
+ (node (ref J1) (pin 2))
+ (node (ref U1) (pin 37)))
+ (net (code 19) (name /SWDIO)
+ (node (ref J1) (pin 4))
+ (node (ref U1) (pin 34)))
+ (net (code 20) (name /SWO)
+ (node (ref J1) (pin 6))
+ (node (ref U1) (pin 39)))
(net (code 21) (name "Net-(U1-Pad2)")
(node (ref U1) (pin 2)))
(net (code 22) (name "Net-(U1-Pad3)")
@@ -513,102 +530,122 @@
(node (ref U1) (pin 19)))
(net (code 25) (name "Net-(U1-Pad18)")
(node (ref U1) (pin 18)))
- (net (code 26) (name "Net-(P10-Pad4)")
- (node (ref P10) (pin 4)))
- (net (code 27) (name "Net-(U1-Pad44)")
- (node (ref U1) (pin 44)))
- (net (code 28) (name +3V3)
- (node (ref U1) (pin 36))
+ (net (code 26) (name +3V3)
+ (node (ref U2) (pin 5))
+ (node (ref R2) (pin 1))
(node (ref C5) (pin 1))
- (node (ref C2) (pin 1))
(node (ref C4) (pin 1))
- (node (ref U1) (pin 48))
(node (ref U1) (pin 9))
- (node (ref C3) (pin 1))
- (node (ref P1) (pin 4))
(node (ref U1) (pin 24))
- (node (ref R2) (pin 1))
- (node (ref R1) (pin 1))
- (node (ref U2) (pin 5))
+ (node (ref U1) (pin 36))
+ (node (ref U1) (pin 48))
+ (node (ref C2) (pin 1))
+ (node (ref JP3) (pin 1))
(node (ref J1) (pin 1))
- (node (ref C8) (pin 1)))
+ (node (ref C8) (pin 1))
+ (node (ref C3) (pin 1))
+ (node (ref R1) (pin 1)))
+ (net (code 27) (name "Net-(Y1-Pad4)")
+ (node (ref Y1) (pin 4)))
+ (net (code 28) (name "Net-(Y1-Pad2)")
+ (node (ref Y1) (pin 2)))
(net (code 29) (name /VLCD)
(node (ref U1) (pin 1))
- (node (ref C6) (pin 1)))
- (net (code 30) (name "Net-(U1-Pad20)")
+ (node (ref C6) (pin 2)))
+ (net (code 30) (name GND)
+ (node (ref U1) (pin 23))
+ (node (ref P9) (pin 10))
+ (node (ref P1) (pin 6))
+ (node (ref U1) (pin 35))
+ (node (ref P1) (pin 7))
+ (node (ref C4) (pin 2))
+ (node (ref U1) (pin 47))
+ (node (ref U2) (pin 2))
+ (node (ref C5) (pin 2))
+ (node (ref P10) (pin 5))
+ (node (ref C1) (pin 1))
+ (node (ref C10) (pin 2))
+ (node (ref C9) (pin 2))
+ (node (ref U1) (pin 8))
+ (node (ref C7) (pin 2))
+ (node (ref C8) (pin 2))
+ (node (ref C3) (pin 2))
+ (node (ref C6) (pin 1))
+ (node (ref J1) (pin 3))
+ (node (ref P3) (pin 7))
+ (node (ref C2) (pin 2)))
+ (net (code 31) (name "Net-(U1-Pad20)")
(node (ref U1) (pin 20)))
- (net (code 31) (name /Vin)
- (node (ref P1) (pin 8)))
- (net (code 32) (name "Net-(JP2-Pad2)")
- (node (ref JP2) (pin 2))
- (node (ref R2) (pin 2)))
- (net (code 33) (name "Net-(Y1-Pad4)")
- (node (ref Y1) (pin 4)))
- (net (code 34) (name "Net-(C9-Pad1)")
- (node (ref U1) (pin 5))
- (node (ref C9) (pin 1))
- (node (ref Y1) (pin 3)))
- (net (code 35) (name "Net-(Y1-Pad2)")
- (node (ref Y1) (pin 2)))
- (net (code 36) (name "Net-(C10-Pad1)")
- (node (ref Y1) (pin 1))
+ (net (code 32) (name "Net-(P3-Pad9)")
+ (node (ref P3) (pin 9)))
+ (net (code 33) (name "Net-(P3-Pad10)")
+ (node (ref P3) (pin 10)))
+ (net (code 34) (name "Net-(C10-Pad1)")
+ (node (ref Y1) (pin 3))
(node (ref C10) (pin 1))
(node (ref U1) (pin 6)))
- (net (code 37) (name "Net-(U1-Pad29)")
- (node (ref U1) (pin 29)))
- (net (code 38) (name "Net-(U1-Pad11)")
+ (net (code 35) (name "Net-(C9-Pad1)")
+ (node (ref Y1) (pin 1))
+ (node (ref C9) (pin 1))
+ (node (ref U1) (pin 5)))
+ (net (code 36) (name "Net-(J2-Pad1)")
+ (node (ref J2) (pin 1))
+ (node (ref U1) (pin 44)))
+ (net (code 37) (name /Vin)
+ (node (ref P1) (pin 8)))
+ (net (code 38) (name "Net-(JP3-Pad2)")
+ (node (ref JP3) (pin 2))
+ (node (ref P1) (pin 4)))
+ (net (code 39) (name "Net-(P1-Pad5)")
+ (node (ref P1) (pin 5)))
+ (net (code 40) (name "Net-(U1-Pad11)")
(node (ref U1) (pin 11)))
- (net (code 39) (name "Net-(U1-Pad10)")
- (node (ref U1) (pin 10)))
- (net (code 40) (name "Net-(U1-Pad30)")
- (node (ref U1) (pin 30)))
- (net (code 41) (name +5V)
- (node (ref P10) (pin 1))
- (node (ref U2) (pin 3))
- (node (ref C7) (pin 1))
- (node (ref P1) (pin 5))
- (node (ref U2) (pin 1)))
- (net (code 42) (name "Net-(P10-Pad6)")
- (node (ref P10) (pin 6)))
- (net (code 43) (name "Net-(JP1-Pad2)")
- (node (ref JP1) (pin 2))
- (node (ref R1) (pin 2)))
- (net (code 44) (name "Net-(U1-Pad41)")
+ (net (code 41) (name "Net-(U1-Pad41)")
(node (ref U1) (pin 41)))
- (net (code 45) (name "Net-(U1-Pad42)")
+ (net (code 42) (name "Net-(U1-Pad42)")
(node (ref U1) (pin 42)))
- (net (code 46) (name "Net-(U1-Pad43)")
+ (net (code 43) (name "Net-(U1-Pad43)")
(node (ref U1) (pin 43)))
- (net (code 47) (name "Net-(U1-Pad21)")
+ (net (code 44) (name "Net-(U1-Pad21)")
(node (ref U1) (pin 21)))
- (net (code 48) (name "Net-(U1-Pad22)")
+ (net (code 45) (name "Net-(U1-Pad22)")
(node (ref U1) (pin 22)))
- (net (code 49) (name "Net-(U1-Pad38)")
+ (net (code 46) (name "Net-(U1-Pad38)")
(node (ref U1) (pin 38)))
- (net (code 50) (name "Net-(U1-Pad31)")
+ (net (code 47) (name "Net-(U1-Pad31)")
(node (ref U1) (pin 31)))
- (net (code 51) (name /AREF)
+ (net (code 48) (name "Net-(U1-Pad30)")
+ (node (ref U1) (pin 30)))
+ (net (code 49) (name "Net-(U1-Pad29)")
+ (node (ref U1) (pin 29)))
+ (net (code 50) (name "Net-(U1-Pad10)")
+ (node (ref U1) (pin 10)))
+ (net (code 51) (name "Net-(JP2-Pad2)")
+ (node (ref R2) (pin 2))
+ (node (ref JP2) (pin 2)))
+ (net (code 52) (name "Net-(JP1-Pad2)")
+ (node (ref R1) (pin 2))
+ (node (ref JP1) (pin 2)))
+ (net (code 53) (name /AREF)
(node (ref P3) (pin 8)))
- (net (code 52) (name "Net-(P8-Pad1)")
- (node (ref P8) (pin 1)))
- (net (code 53) (name "Net-(P7-Pad1)")
- (node (ref P7) (pin 1)))
- (net (code 54) (name "Net-(P6-Pad1)")
- (node (ref P6) (pin 1)))
- (net (code 55) (name "Net-(P5-Pad1)")
- (node (ref P5) (pin 1)))
- (net (code 56) (name "/6(**)")
+ (net (code 54) (name /USB_DM)
+ (node (ref U1) (pin 32))
+ (node (ref J3) (pin 2))
+ (node (ref P10) (pin 2)))
+ (net (code 55) (name "/6(**)")
(node (ref P4) (pin 7)))
- (net (code 57) (name "Net-(P1-Pad1)")
+ (net (code 56) (name /RESET_OUT)
+ (node (ref P1) (pin 3)))
+ (net (code 57) (name /IOREF)
+ (node (ref P1) (pin 2)))
+ (net (code 58) (name "Net-(P1-Pad1)")
(node (ref P1) (pin 1)))
- (net (code 58) (name "/9(**)")
+ (net (code 59) (name "/9(**)")
(node (ref P3) (pin 2)))
- (net (code 59) (name /8)
+ (net (code 60) (name /8)
(node (ref P3) (pin 1)))
- (net (code 60) (name /7)
+ (net (code 61) (name /7)
(node (ref P4) (pin 8)))
- (net (code 61) (name /IOREF)
- (node (ref P1) (pin 2)))
(net (code 62) (name "/5(**)")
(node (ref P4) (pin 6)))
(net (code 63) (name /4)
@@ -617,13 +654,23 @@
(node (ref P4) (pin 4)))
(net (code 65) (name /2)
(node (ref P4) (pin 3)))
- (net (code 66) (name /A3)
- (node (ref P2) (pin 4)))
- (net (code 67) (name /DAC2_OUT)
+ (net (code 66) (name /DAC2_OUT)
(node (ref U1) (pin 15))
(node (ref P2) (pin 2)))
- (net (code 68) (name /DAC1_OUT)
- (node (ref U1) (pin 14))
- (node (ref P2) (pin 1)))
- (net (code 69) (name /RESET_OUT)
- (node (ref P1) (pin 3))))) \ No newline at end of file
+ (net (code 67) (name "Net-(P8-Pad1)")
+ (node (ref P8) (pin 1)))
+ (net (code 68) (name "Net-(P7-Pad1)")
+ (node (ref P7) (pin 1)))
+ (net (code 69) (name "Net-(P6-Pad1)")
+ (node (ref P6) (pin 1)))
+ (net (code 70) (name "Net-(P5-Pad1)")
+ (node (ref P5) (pin 1)))
+ (net (code 71) (name /A3)
+ (node (ref P2) (pin 4)))
+ (net (code 72) (name /DAC1_OUT)
+ (node (ref P2) (pin 1))
+ (node (ref U1) (pin 14)))
+ (net (code 73) (name /USB_DP)
+ (node (ref U1) (pin 33))
+ (node (ref P10) (pin 3))
+ (node (ref J3) (pin 1))))) \ No newline at end of file
diff --git a/hw1/hw1.sch b/hw1/hw1.sch
index 5c89d23..532cf81 100644
--- a/hw1/hw1.sch
+++ b/hw1/hw1.sch
@@ -34,7 +34,7 @@ LIBS:karlp-klibs
LIBS:hw1-cache
EELAYER 25 0
EELAYER END
-$Descr A4 11693 8268
+$Descr A3 16535 11693
encoding utf-8
Sheet 1 1
Title "test host"
@@ -46,1016 +46,1036 @@ Comment2 ""
Comment3 ""
Comment4 ""
$EndDescr
-Text Label 9300 2300 2 60 ~ 0
+Text Label 12400 2400 2 60 ~ 0
Vin
-Text Label 9300 1700 2 60 ~ 0
+Text Label 12400 1800 2 60 ~ 0
IOREF
-Text Label 9350 2500 2 60 ~ 0
+Text Label 12450 2600 2 60 ~ 0
DAC1_OUT
-Text Label 9350 2600 2 60 ~ 0
+Text Label 12450 2700 2 60 ~ 0
DAC2_OUT
-Text Label 9350 2700 2 60 ~ 0
+Text Label 12450 2800 2 60 ~ 0
ADC_IN1
-Text Label 8900 2800 0 60 ~ 0
+Text Label 12000 2900 0 60 ~ 0
A3
-Text Label 9350 2900 2 60 ~ 0
+Text Label 12450 3000 2 60 ~ 0
I2C_SDA
-Text Label 10250 3000 0 60 ~ 0
+Text Label 13350 3100 0 60 ~ 0
UART_TX_OUT
-Text Label 10550 2800 0 60 ~ 0
+Text Label 13650 2900 0 60 ~ 0
2
-Text Label 10250 2900 0 60 ~ 0
+Text Label 13350 3000 0 60 ~ 0
UART_RX_OUT
-Text Label 10550 2700 0 60 ~ 0
+Text Label 13650 2800 0 60 ~ 0
3(**)
-Text Label 10550 2600 0 60 ~ 0
+Text Label 13650 2700 0 60 ~ 0
4
-Text Label 10550 2500 0 60 ~ 0
+Text Label 13650 2600 0 60 ~ 0
5(**)
-Text Label 10550 2400 0 60 ~ 0
+Text Label 13650 2500 0 60 ~ 0
6(**)
-Text Label 10550 2300 0 60 ~ 0
+Text Label 13650 2400 0 60 ~ 0
7
-Text Label 10550 2100 0 60 ~ 0
+Text Label 13650 2200 0 60 ~ 0
8
-Text Label 10550 2000 0 60 ~ 0
+Text Label 13650 2100 0 60 ~ 0
9(**)
-Text Label 10350 1900 0 60 ~ 0
+Text Label 13450 2000 0 60 ~ 0
SPI_CS
-Text Label 10350 1800 0 60 ~ 0
+Text Label 13450 1900 0 60 ~ 0
SPI_MOSI
-Text Label 10350 1700 0 60 ~ 0
+Text Label 13450 1800 0 60 ~ 0
SPI_MISO
-Text Label 10350 1600 0 60 ~ 0
+Text Label 13450 1700 0 60 ~ 0
SPI_SCK
-Text Label 10300 1400 0 60 ~ 0
+Text Label 13400 1500 0 60 ~ 0
AREF
-NoConn ~ 9400 1600
-Text Label 10300 1300 0 60 ~ 0
-I2C_SDA
-Text Label 10300 1200 0 60 ~ 0
-I2C_SCL
-Text Notes 10850 1000 0 60 ~ 0
+NoConn ~ 12500 1700
+Text Notes 13950 1100 0 60 ~ 0
Holes
-Text Notes 8550 750 0 60 ~ 0
+Text Notes 11650 850 0 60 ~ 0
Arduino UNOr3 pins\nAs used on Nucleo64 boards\n
$Comp
L CONN_01X08 P1
U 1 1 56D70129
-P 9600 1950
-F 0 "P1" H 9600 2400 50 0000 C CNN
-F 1 "Power" V 9700 1950 50 0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 9600 1950 50 0001 C CNN
-F 3 "" H 9600 1950 50 0000 C CNN
- 1 9600 1950
+P 12700 2050
+F 0 "P1" H 12700 2500 50 0000 C CNN
+F 1 "Power" V 12800 2050 50 0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 12700 2050 50 0001 C CNN
+F 3 "" H 12700 2050 50 0000 C CNN
+ 1 12700 2050
1 0 0 -1
$EndComp
-Text Label 9300 1800 2 60 ~ 0
+Text Label 12400 1900 2 60 ~ 0
RESET_OUT
$Comp
L +3.3V #PWR01
U 1 1 56D70538
-P 8700 1450
-F 0 "#PWR01" H 8700 1300 50 0001 C CNN
-F 1 "+3.3V" H 8700 1590 30 0000 C CNN
-F 2 "" H 8700 1450 50 0000 C CNN
-F 3 "" H 8700 1450 50 0000 C CNN
- 1 8700 1450
+P 11800 1550
+F 0 "#PWR01" H 11800 1400 50 0001 C CNN
+F 1 "+3.3V" H 11800 1690 30 0000 C CNN
+F 2 "" H 11800 1550 50 0000 C CNN
+F 3 "" H 11800 1550 50 0000 C CNN
+ 1 11800 1550
1 0 0 -1
$EndComp
$Comp
-L +5V #PWR02
-U 1 1 56D707BB
-P 8600 1450
-F 0 "#PWR02" H 8600 1300 50 0001 C CNN
-F 1 "+5V" H 8600 1590 30 0000 C CNN
-F 2 "" H 8600 1450 50 0000 C CNN
-F 3 "" H 8600 1450 50 0000 C CNN
- 1 8600 1450
- 1 0 0 -1
-$EndComp
-$Comp
-L GND #PWR03
+L GND #PWR02
U 1 1 56D70CC2
-P 8850 2100
-F 0 "#PWR03" H 8850 1850 50 0001 C CNN
-F 1 "GND" H 8850 1950 50 0000 C CNN
-F 2 "" H 8850 2100 50 0000 C CNN
-F 3 "" H 8850 2100 50 0000 C CNN
- 1 8850 2100
+P 11950 2200
+F 0 "#PWR02" H 11950 1950 50 0001 C CNN
+F 1 "GND" H 11950 2050 50 0000 C CNN
+F 2 "" H 11950 2200 50 0000 C CNN
+F 3 "" H 11950 2200 50 0000 C CNN
+ 1 11950 2200
1 0 0 -1
$EndComp
$Comp
-L GND #PWR04
+L GND #PWR03
U 1 1 56D70CFF
-P 10950 1500
-F 0 "#PWR04" H 10950 1250 50 0001 C CNN
-F 1 "GND" H 10950 1350 50 0000 C CNN
-F 2 "" H 10950 1500 50 0000 C CNN
-F 3 "" H 10950 1500 50 0000 C CNN
- 1 10950 1500
+P 14050 1600
+F 0 "#PWR03" H 14050 1350 50 0001 C CNN
+F 1 "GND" H 14050 1450 50 0000 C CNN
+F 2 "" H 14050 1600 50 0000 C CNN
+F 3 "" H 14050 1600 50 0000 C CNN
+ 1 14050 1600
1 0 0 -1
$EndComp
$Comp
L CONN_01X06 P2
U 1 1 56D70DD8
-P 9600 2750
-F 0 "P2" H 9600 3100 50 0000 C CNN
-F 1 "Analog" V 9700 2750 50 0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x06" H 9600 2750 50 0001 C CNN
-F 3 "" H 9600 2750 50 0000 C CNN
- 1 9600 2750
+P 12700 2850
+F 0 "P2" H 12700 3200 50 0000 C CNN
+F 1 "Analog" V 12800 2850 50 0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x06" H 12700 2850 50 0001 C CNN
+F 3 "" H 12700 2850 50 0000 C CNN
+ 1 12700 2850
1 0 0 -1
$EndComp
$Comp
L CONN_01X01 P5
U 1 1 56D71177
-P 10800 650
-F 0 "P5" V 10900 650 50 0000 C CNN
-F 1 "CONN_01X01" V 10900 650 50 0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 10800 650 50 0001 C CNN
-F 3 "" H 10800 650 50 0000 C CNN
- 1 10800 650
+P 13900 750
+F 0 "P5" V 14000 750 50 0000 C CNN
+F 1 "CONN_01X01" V 14000 750 50 0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 13900 750 50 0001 C CNN
+F 3 "" H 13900 750 50 0000 C CNN
+ 1 13900 750
0 -1 -1 0
$EndComp
$Comp
L CONN_01X01 P6
U 1 1 56D71274
-P 10900 650
-F 0 "P6" V 11000 650 50 0000 C CNN
-F 1 "CONN_01X01" V 11000 650 50 0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 10900 650 50 0001 C CNN
-F 3 "" H 10900 650 50 0000 C CNN
- 1 10900 650
+P 14000 750
+F 0 "P6" V 14100 750 50 0000 C CNN
+F 1 "CONN_01X01" V 14100 750 50 0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 14000 750 50 0001 C CNN
+F 3 "" H 14000 750 50 0000 C CNN
+ 1 14000 750
0 -1 -1 0
$EndComp
$Comp
L CONN_01X01 P7
U 1 1 56D712A8
-P 11000 650
-F 0 "P7" V 11100 650 50 0000 C CNN
-F 1 "CONN_01X01" V 11100 650 50 0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 11000 650 50 0001 C CNN
-F 3 "" H 11000 650 50 0000 C CNN
- 1 11000 650
+P 14100 750
+F 0 "P7" V 14200 750 50 0000 C CNN
+F 1 "CONN_01X01" V 14200 750 50 0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 14100 750 50 0001 C CNN
+F 3 "" H 14100 750 50 0000 C CNN
+ 1 14100 750
0 -1 -1 0
$EndComp
$Comp
L CONN_01X01 P8
U 1 1 56D712DB
-P 11100 650
-F 0 "P8" V 11200 650 50 0000 C CNN
-F 1 "CONN_01X01" V 11200 650 50 0001 C CNN
-F 2 "Socket_Arduino_Uno:Arduino_1pin" H 11100 650 50 0001 C CNN
-F 3 "" H 11100 650 50 0000 C CNN
- 1 11100 650
+P 14200 750
+F 0 "P8" V 14300 750 50 0000 C CNN
+F 1 "CONN_01X01" V 14300 750 50 0001 C CNN
+F 2 "Socket_Arduino_Uno:Arduino_1pin" H 14200 750 50 0001 C CNN
+F 3 "" H 14200 750 50 0000 C CNN
+ 1 14200 750
0 -1 -1 0
$EndComp
-NoConn ~ 10800 850
-NoConn ~ 10900 850
-NoConn ~ 11000 850
-NoConn ~ 11100 850
+NoConn ~ 13900 950
+NoConn ~ 14000 950
+NoConn ~ 14100 950
+NoConn ~ 14200 950
$Comp
L CONN_01X08 P4
U 1 1 56D7164F
-P 10000 2650
-F 0 "P4" H 10000 3100 50 0000 C CNN
-F 1 "Digital" V 10100 2650 50 0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 10000 2650 50 0001 C CNN
-F 3 "" H 10000 2650 50 0000 C CNN
- 1 10000 2650
+P 13100 2750
+F 0 "P4" H 13100 3200 50 0000 C CNN
+F 1 "Digital" V 13200 2750 50 0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x08" H 13100 2750 50 0001 C CNN
+F 3 "" H 13100 2750 50 0000 C CNN
+ 1 13100 2750
-1 0 0 1
$EndComp
$Comp
L CONN_01X10 P3
U 1 1 56D721E0
-P 10000 1650
-F 0 "P3" H 10000 2200 50 0000 C CNN
-F 1 "Digital" V 10100 1650 50 0000 C CNN
-F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x10" H 10000 1650 50 0001 C CNN
-F 3 "" H 10000 1650 50 0000 C CNN
- 1 10000 1650
+P 13100 1750
+F 0 "P3" H 13100 2300 50 0000 C CNN
+F 1 "Digital" V 13200 1750 50 0000 C CNN
+F 2 "Socket_Arduino_Uno:Socket_Strip_Arduino_1x10" H 13100 1750 50 0001 C CNN
+F 3 "" H 13100 1750 50 0000 C CNN
+ 1 13100 1750
-1 0 0 1
$EndComp
-Text Notes 9700 1600 0 60 ~ 0
+Text Notes 12800 1700 0 60 ~ 0
1
$Comp
L STM32L151C6TxA U1
U 1 1 58CEFE92
-P 4950 4500
-F 0 "U1" H 1450 6225 50 0000 L BNN
-F 1 "STM32L151C6TxA" H 8450 6225 50 0000 R BNN
-F 2 "Housings_QFP:TQFP-48_7x7mm_Pitch0.5mm" H 8450 6175 50 0000 R TNN
-F 3 "" H 4950 4500 50 0000 C CNN
- 1 4950 4500
+P 6150 5800
+F 0 "U1" H 2650 7525 50 0000 L BNN
+F 1 "STM32L151C6TxA" H 9650 7525 50 0000 R BNN
+F 2 "Housings_QFP:TQFP-48_7x7mm_Pitch0.5mm" H 9650 7475 50 0000 R TNN
+F 3 "" H 6150 5800 50 0000 C CNN
+ 1 6150 5800
1 0 0 -1
$EndComp
$Comp
L CONN_02X05 P9
U 1 1 58CF048F
-P 1500 1250
-F 0 "P9" H 1500 1550 50 0000 C CNN
-F 1 "FX2LA" H 1500 950 50 0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Angled_2x05_Pitch2.54mm" H 1500 50 50 0001 C CNN
-F 3 "" H 1500 50 50 0000 C CNN
- 1 1500 1250
+P 1850 1450
+F 0 "P9" H 1850 1750 50 0000 C CNN
+F 1 "FX2LA" H 1850 1150 50 0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Angled_2x05_Pitch2.54mm" H 1850 250 50 0001 C CNN
+F 3 "" H 1850 250 50 0000 C CNN
+ 1 1850 1450
1 0 0 -1
$EndComp
$Comp
-L +3V3 #PWR05
+L +3V3 #PWR04
U 1 1 58CF063D
-P 4900 2500
-F 0 "#PWR05" H 4900 2350 50 0001 C CNN
-F 1 "+3V3" H 4900 2640 50 0000 C CNN
-F 2 "" H 4900 2500 50 0000 C CNN
-F 3 "" H 4900 2500 50 0000 C CNN
- 1 4900 2500
+P 6100 3800
+F 0 "#PWR04" H 6100 3650 50 0001 C CNN
+F 1 "+3V3" H 6100 3940 50 0000 C CNN
+F 2 "" H 6100 3800 50 0000 C CNN
+F 3 "" H 6100 3800 50 0000 C CNN
+ 1 6100 3800
1 0 0 -1
$EndComp
$Comp
-L GND #PWR06
+L GND #PWR05
U 1 1 58CF077D
-P 4850 6450
-F 0 "#PWR06" H 4850 6200 50 0001 C CNN
-F 1 "GND" H 4850 6300 50 0000 C CNN
-F 2 "" H 4850 6450 50 0000 C CNN
-F 3 "" H 4850 6450 50 0000 C CNN
- 1 4850 6450
+P 6050 7750
+F 0 "#PWR05" H 6050 7500 50 0001 C CNN
+F 1 "GND" H 6050 7600 50 0000 C CNN
+F 2 "" H 6050 7750 50 0000 C CNN
+F 3 "" H 6050 7750 50 0000 C CNN
+ 1 6050 7750
1 0 0 -1
$EndComp
$Comp
-L GND #PWR07
+L GND #PWR06
U 1 1 58CF0E5B
-P 1850 1550
-F 0 "#PWR07" H 1850 1300 50 0001 C CNN
-F 1 "GND" H 1850 1400 50 0000 C CNN
-F 2 "" H 1850 1550 50 0000 C CNN
-F 3 "" H 1850 1550 50 0000 C CNN
- 1 1850 1550
+P 2200 1750
+F 0 "#PWR06" H 2200 1500 50 0001 C CNN
+F 1 "GND" H 2200 1600 50 0000 C CNN
+F 2 "" H 2200 1750 50 0000 C CNN
+F 3 "" H 2200 1750 50 0000 C CNN
+ 1 2200 1750
1 0 0 -1
$EndComp
$Comp
L USB_OTG-RESCUE-hw1 P10
U 1 1 58CF10AD
-P 3650 1250
-F 0 "P10" H 3975 1125 50 0000 C CNN
-F 1 "CONTROL" H 3650 1450 50 0000 C CNN
-F 2 "Connectors:USB_Micro-B" V 3600 1150 50 0001 C CNN
-F 3 "" V 3600 1150 50 0000 C CNN
- 1 3650 1250
+P 4900 1400
+F 0 "P10" H 5225 1275 50 0000 C CNN
+F 1 "CONTROL" H 4900 1600 50 0000 C CNN
+F 2 "Connectors:USB_Micro-B" V 4850 1300 50 0001 C CNN
+F 3 "" V 4850 1300 50 0000 C CNN
+ 1 4900 1400
1 0 0 -1
$EndComp
$Comp
-L GND #PWR08
+L GND #PWR07
U 1 1 58CF1156
-P 3850 1650
-F 0 "#PWR08" H 3850 1400 50 0001 C CNN
-F 1 "GND" H 3850 1500 50 0000 C CNN
-F 2 "" H 3850 1650 50 0000 C CNN
-F 3 "" H 3850 1650 50 0000 C CNN
- 1 3850 1650
+P 5100 1800
+F 0 "#PWR07" H 5100 1550 50 0001 C CNN
+F 1 "GND" H 5100 1650 50 0000 C CNN
+F 2 "" H 5100 1800 50 0000 C CNN
+F 3 "" H 5100 1800 50 0000 C CNN
+ 1 5100 1800
1 0 0 -1
$EndComp
-Text Label 8650 5500 0 60 ~ 0
+Text Label 9850 6800 0 60 ~ 0
USB_DM
-Text Label 8650 5600 0 60 ~ 0
+Text Label 9850 6900 0 60 ~ 0
USB_DP
-Text Label 3550 1600 3 60 ~ 0
+Text Label 4800 1750 3 60 ~ 0
USB_DM
-Text Label 3650 1600 3 60 ~ 0
+Text Label 4900 1750 3 60 ~ 0
USB_DP
-Text Label 8650 4800 0 60 ~ 0
+Text Label 9850 6100 0 60 ~ 0
DAC1_OUT
-Text Label 8650 4900 0 60 ~ 0
+Text Label 9850 6200 0 60 ~ 0
DAC2_OUT
-Text Label 950 5200 0 60 ~ 0
+Text Label 2150 6500 0 60 ~ 0
I2C_SCL
-Text Label 950 5300 0 60 ~ 0
+Text Label 2150 6600 0 60 ~ 0
I2C_SDA
-Text Notes 5400 2350 0 60 ~ 0
+Text Notes 6450 1950 0 60 ~ 0
[x] debug via via 6pin\n[ ] debug via 10x5x1.27mm cortex SMD\n
-Text Label 9350 3000 2 60 ~ 0
+Text Label 12450 3100 2 60 ~ 0
I2C_SCL
-Text Notes 8500 3000 0 60 ~ 0
+Text Notes 11600 3100 0 60 ~ 0
A5 (SCL)
-Text Notes 8500 2900 0 60 ~ 0
+Text Notes 11600 3000 0 60 ~ 0
A4 (SDA)
-Text Notes 8500 2500 0 60 ~ 0
+Text Notes 11600 2600 0 60 ~ 0
A0
-Text Notes 8500 2600 0 60 ~ 0
+Text Notes 11600 2700 0 60 ~ 0
A1
-Text Notes 10950 1300 0 60 ~ 0
-D15 (SCL)\nD14 (SDA)
-Text Notes 11150 1900 0 60 ~ 0
+Text Notes 14050 1400 0 60 ~ 0
+D15 (_ALSO_ SCL)\nD14 (_ALSO_ SDA)
+Text Notes 14250 2000 0 60 ~ 0
13(SCK) (DACOUT2)\n12(MISO)\n11(**/MOSI)\n10(**/SS)
-Text Notes 11100 3000 0 60 ~ 0
+Text Notes 14200 3100 0 60 ~ 0
Target TX\nTarget RX
Wire Notes Line
- 8525 825 9925 825
+ 11625 925 13025 925
Wire Notes Line
- 9925 825 9925 475
-Wire Wire Line
- 9300 1700 9400 1700
+ 13025 925 13025 575
Wire Wire Line
- 9400 1900 8700 1900
+ 12400 1800 12500 1800
Wire Wire Line
- 9400 2000 8600 2000
+ 11950 2200 12500 2200
+Connection ~ 12400 2200
Wire Wire Line
- 8850 2100 9400 2100
-Connection ~ 9300 2100
+ 12500 2600 12450 2600
Wire Wire Line
- 8600 2000 8600 1450
+ 12500 2700 12450 2700
Wire Wire Line
- 8700 1900 8700 1450
+ 12500 2800 12450 2800
Wire Wire Line
- 9400 2500 9350 2500
+ 12500 2900 12000 2900
Wire Wire Line
- 9400 2600 9350 2600
+ 12500 3000 12450 3000
Wire Wire Line
- 9400 2700 9350 2700
+ 12500 3100 12450 3100
Wire Wire Line
- 9400 2800 8900 2800
+ 13300 2200 13650 2200
Wire Wire Line
- 9400 2900 9350 2900
+ 13300 2100 13650 2100
Wire Wire Line
- 9400 3000 9350 3000
+ 13300 2000 13450 2000
Wire Wire Line
- 10200 2100 10550 2100
+ 13300 1900 13450 1900
Wire Wire Line
- 10200 2000 10550 2000
+ 13300 1800 13450 1800
Wire Wire Line
- 10200 1900 10350 1900
+ 13300 1700 13450 1700
Wire Wire Line
- 10200 1800 10350 1800
+ 13300 1500 13400 1500
Wire Wire Line
- 10200 1700 10350 1700
+ 13300 3100 13350 3100
Wire Wire Line
- 10200 1600 10350 1600
+ 13300 3000 13350 3000
Wire Wire Line
- 10200 1400 10300 1400
+ 13300 2900 13650 2900
Wire Wire Line
- 10200 1300 10300 1300
+ 13300 2800 13650 2800
Wire Wire Line
- 10200 1200 10300 1200
+ 13300 2700 13650 2700
Wire Wire Line
- 10200 3000 10250 3000
+ 13300 2600 13650 2600
Wire Wire Line
- 10200 2900 10250 2900
+ 13300 2500 13650 2500
Wire Wire Line
- 10200 2800 10550 2800
+ 13300 2400 13650 2400
Wire Wire Line
- 10200 2700 10550 2700
-Wire Wire Line
- 10200 2600 10550 2600
-Wire Wire Line
- 10200 2500 10550 2500
-Wire Wire Line
- 10200 2400 10550 2400
-Wire Wire Line
- 10200 2300 10550 2300
-Wire Wire Line
- 10200 1500 10950 1500
+ 13300 1600 14050 1600
Wire Notes Line
- 8500 500 8500 3450
+ 11600 600 11600 3550
Wire Notes Line
- 8500 3450 11200 3450
+ 11600 3550 14300 3550
Wire Wire Line
- 9400 1800 9300 1800
+ 12500 1900 12400 1900
Wire Notes Line
- 11200 1000 10700 1000
+ 14300 1100 13800 1100
Wire Notes Line
- 10700 1000 10700 500
+ 13800 1100 13800 600
Wire Wire Line
- 4900 2600 4900 2500
+ 6100 3900 6100 3800
Wire Wire Line
- 4750 2600 5050 2600
+ 5950 3900 6250 3900
Wire Wire Line
- 4750 2600 4750 2700
+ 5950 3900 5950 4000
Wire Wire Line
- 4850 2700 4850 2600
-Connection ~ 4850 2600
+ 6050 4000 6050 3900
+Connection ~ 6050 3900
Wire Wire Line
- 4950 2600 4950 2700
-Connection ~ 4900 2600
+ 6150 3900 6150 4000
+Connection ~ 6100 3900
Wire Wire Line
- 5050 2600 5050 2700
-Connection ~ 4950 2600
+ 6250 3900 6250 4000
+Connection ~ 6150 3900
Wire Wire Line
- 4750 6300 4750 6400
+ 5950 7600 5950 7700
Wire Wire Line
- 4750 6400 5050 6400
+ 5950 7700 6250 7700
Wire Wire Line
- 4850 6300 4850 6450
-Connection ~ 4850 6400
+ 6050 7600 6050 7750
+Connection ~ 6050 7700
Wire Wire Line
- 4950 6400 4950 6300
+ 6150 7700 6150 7600
Wire Wire Line
- 5050 6400 5050 6300
-Connection ~ 4950 6400
+ 6250 7700 6250 7600
+Connection ~ 6150 7700
Wire Wire Line
- 1750 1450 1850 1450
+ 2100 1650 2200 1650
Wire Wire Line
- 1850 1450 1850 1550
+ 2200 1650 2200 1750
Wire Wire Line
- 3850 1550 3850 1650
+ 5100 1700 5100 1800
Wire Wire Line
- 8550 5500 8650 5500
+ 9750 6800 9850 6800
Wire Wire Line
- 8550 5600 8650 5600
+ 9750 6900 9850 6900
Wire Wire Line
- 3550 1550 3550 1600
+ 4800 1700 4800 2150
Wire Wire Line
- 3650 1550 3650 1600
+ 4900 1700 4900 2150
Wire Wire Line
- 8550 4800 8650 4800
+ 9750 6100 9850 6100
Wire Wire Line
- 8550 4900 8650 4900
+ 9750 6200 9850 6200
Wire Wire Line
- 950 5300 1350 5300
+ 2150 6600 2550 6600
Wire Wire Line
- 1350 5200 950 5200
+ 2550 6500 2150 6500
Wire Wire Line
- 1750 1050 1800 1050
+ 2100 1250 2150 1250
Wire Wire Line
- 1750 1150 1800 1150
+ 2100 1350 2150 1350
Wire Wire Line
- 1750 1250 1800 1250
+ 2100 1450 2150 1450
Wire Wire Line
- 1750 1350 1800 1350
+ 2100 1550 2150 1550
Wire Wire Line
- 1250 1050 1200 1050
+ 1600 1250 1550 1250
Wire Wire Line
- 1250 1150 1200 1150
+ 1600 1350 1550 1350
Wire Wire Line
- 1250 1250 1200 1250
+ 1600 1450 1550 1450
Wire Wire Line
- 1250 1350 1200 1350
-Text Label 1200 1050 2 60 ~ 0
+ 1600 1550 1550 1550
+Text Label 1550 1250 2 60 ~ 0
I2C_SDA
-Text Label 1800 1050 0 60 ~ 0
+Text Label 2150 1250 0 60 ~ 0
I2C_SCL
-Text Label 1200 1150 2 60 ~ 0
+Text Label 1550 1350 2 60 ~ 0
UART_TX_OUT
-Text Label 1200 1250 2 60 ~ 0
+Text Label 1550 1450 2 60 ~ 0
SPI_MOSI
-Text Label 1800 1150 0 60 ~ 0
+Text Label 2150 1350 0 60 ~ 0
UART_RX_OUT
-Text Label 1800 1250 0 60 ~ 0
+Text Label 2150 1450 0 60 ~ 0
SPI_MISO
-Text Label 1200 1350 2 60 ~ 0
+Text Label 1550 1550 2 60 ~ 0
SPI_SCK
-Text Notes 500 2100 0 60 Italic 0
+Text Notes 850 2300 0 60 Italic 0
NOTE: this can be freely routed to do whatever's possible!\nPotentially:\nJumpers to select what you're connecting here?\n(but non-ideal)
$Comp
L C C2
U 1 1 58CF43FF
-P 1500 7000
-F 0 "C2" H 1525 7100 50 0000 L CNN
-F 1 "100n" H 1525 6900 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1538 6850 50 0000 C CNN
-F 3 "" H 1500 7000 50 0000 C CNN
- 1 1500 7000
+P 2800 9900
+F 0 "C2" H 2825 10000 50 0000 L CNN
+F 1 "100n" H 2825 9800 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2838 9750 50 0000 C CNN
+F 3 "" H 2800 9900 50 0000 C CNN
+ 1 2800 9900
1 0 0 -1
$EndComp
$Comp
-L GND #PWR09
+L GND #PWR08
U 1 1 58CF46A1
-P 2050 7350
-F 0 "#PWR09" H 2050 7100 50 0001 C CNN
-F 1 "GND" H 2050 7200 50 0000 C CNN
-F 2 "" H 2050 7350 50 0000 C CNN
-F 3 "" H 2050 7350 50 0000 C CNN
- 1 2050 7350
+P 3350 10250
+F 0 "#PWR08" H 3350 10000 50 0001 C CNN
+F 1 "GND" H 3350 10100 50 0000 C CNN
+F 2 "" H 3350 10250 50 0000 C CNN
+F 3 "" H 3350 10250 50 0000 C CNN
+ 1 3350 10250
1 0 0 -1
$EndComp
$Comp
-L +3V3 #PWR010
+L +3V3 #PWR09
U 1 1 58CF46D6
-P 2050 6650
-F 0 "#PWR010" H 2050 6500 50 0001 C CNN
-F 1 "+3V3" H 2050 6790 50 0000 C CNN
-F 2 "" H 2050 6650 50 0000 C CNN
-F 3 "" H 2050 6650 50 0000 C CNN
- 1 2050 6650
+P 3350 9550
+F 0 "#PWR09" H 3350 9400 50 0001 C CNN
+F 1 "+3V3" H 3350 9690 50 0000 C CNN
+F 2 "" H 3350 9550 50 0000 C CNN
+F 3 "" H 3350 9550 50 0000 C CNN
+ 1 3350 9550
1 0 0 -1
$EndComp
Wire Wire Line
- 2050 6850 2050 6650
+ 3350 9750 3350 9550
Wire Wire Line
- 1500 6850 2600 6850
-Connection ~ 1850 6850
-Connection ~ 2050 6850
-Connection ~ 2250 6850
+ 2800 9750 3900 9750
+Connection ~ 3150 9750
+Connection ~ 3350 9750
+Connection ~ 3550 9750
Wire Wire Line
- 1500 7150 2600 7150
-Connection ~ 2250 7150
-Connection ~ 1850 7150
+ 2800 10050 3900 10050
+Connection ~ 3550 10050
+Connection ~ 3150 10050
Wire Wire Line
- 2050 7350 2050 7150
-Connection ~ 2050 7150
+ 3350 10250 3350 10050
+Connection ~ 3350 10050
$Comp
L C C1
U 1 1 58CF4B65
-P 600 2900
-F 0 "C1" H 625 3000 50 0000 L CNN
-F 1 "100n" H 625 2800 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 638 2750 50 0000 C CNN
-F 3 "" H 600 2900 50 0000 C CNN
- 1 600 2900
- 1 0 0 -1
+P 1200 4400
+F 0 "C1" H 1225 4500 50 0000 L CNN
+F 1 "100n" H 1225 4300 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1238 4250 50 0000 C CNN
+F 3 "" H 1200 4400 50 0000 C CNN
+ 1 1200 4400
+ 0 -1 -1 0
$EndComp
$Comp
-L GND #PWR011
+L GND #PWR010
U 1 1 58CF4BEA
-P 600 3100
-F 0 "#PWR011" H 600 2850 50 0001 C CNN
-F 1 "GND" H 600 2950 50 0000 C CNN
-F 2 "" H 600 3100 50 0000 C CNN
-F 3 "" H 600 3100 50 0000 C CNN
- 1 600 3100
+P 900 4400
+F 0 "#PWR010" H 900 4150 50 0001 C CNN
+F 1 "GND" H 900 4250 50 0000 C CNN
+F 2 "" H 900 4400 50 0000 C CNN
+F 3 "" H 900 4400 50 0000 C CNN
+ 1 900 4400
1 0 0 -1
$EndComp
Wire Wire Line
- 1350 3100 600 2750
+ 2550 4400 1350 4400
Wire Wire Line
- 600 3050 600 3100
-NoConn ~ 1350 4400
-NoConn ~ 1350 4500
-NoConn ~ 1350 4200
-NoConn ~ 1350 4100
-NoConn ~ 1350 4000
-NoConn ~ 1350 4800
+ 1050 4400 900 4400
+NoConn ~ 2550 5700
+NoConn ~ 2550 5800
+NoConn ~ 2550 5500
+NoConn ~ 2550 5400
+NoConn ~ 2550 5300
+NoConn ~ 2550 6100
Wire Wire Line
- 1350 4700 950 4700
-Text Label 950 4700 0 60 Italic 0
+ 2550 6000 2150 6000
+Text Label 2150 6000 0 60 Italic 0
SWO
Wire Wire Line
- 8550 5700 8650 5700
+ 9750 7000 9850 7000
Wire Wire Line
- 8550 5800 8650 5800
-Text Label 8650 5700 0 60 Italic 0
+ 9750 7100 9850 7100
+Text Label 9850 7000 0 60 Italic 0
SWDIO
-Text Label 8650 5800 0 60 Italic 0
+Text Label 9850 7100 0 60 Italic 0
SWCLK
-Text Label 600 2750 0 60 Italic 0
+Text Label 1350 4400 0 60 Italic 0
NRST
$Comp
-L PWR_FLAG #FLG012
+L PWR_FLAG #FLG011
U 1 1 58CF5E41
-P 4100 7000
-F 0 "#FLG012" H 4100 7095 50 0001 C CNN
-F 1 "PWR_FLAG" H 4100 7180 50 0000 C CNN
-F 2 "" H 4100 7000 50 0000 C CNN
-F 3 "" H 4100 7000 50 0000 C CNN
- 1 4100 7000
+P 6900 9950
+F 0 "#FLG011" H 6900 10045 50 0001 C CNN
+F 1 "PWR_FLAG" H 6900 10130 50 0000 C CNN
+F 2 "" H 6900 9950 50 0000 C CNN
+F 3 "" H 6900 9950 50 0000 C CNN
+ 1 6900 9950
1 0 0 -1
$EndComp
$Comp
-L GND #PWR013
+L GND #PWR012
U 1 1 58CF5E8B
-P 4100 7100
-F 0 "#PWR013" H 4100 6850 50 0001 C CNN
-F 1 "GND" H 4100 6950 50 0000 C CNN
-F 2 "" H 4100 7100 50 0000 C CNN
-F 3 "" H 4100 7100 50 0000 C CNN
- 1 4100 7100
+P 6900 10050
+F 0 "#PWR012" H 6900 9800 50 0001 C CNN
+F 1 "GND" H 6900 9900 50 0000 C CNN
+F 2 "" H 6900 10050 50 0000 C CNN
+F 3 "" H 6900 10050 50 0000 C CNN
+ 1 6900 10050
1 0 0 -1
$EndComp
Wire Wire Line
- 4100 7000 4100 7100
-Text Notes 2400 900 0 60 Italic 12
-ONLY GROUND BETWEEN BOARDS\nBoth will be powered by their own USB.\n(We're not interested in bootloading the target....\nyet...?)
+ 6900 9950 6900 10050
+Text Notes 3650 1050 0 60 Italic 12
+ONLY GROUND BETWEEN BOARDS by default!\nIntended for both to have their own USB\nOption for debug only, with power FROM target
$Comp
L C C3
U 1 1 58CF69A9
-P 1850 7000
-F 0 "C3" H 1875 7100 50 0000 L CNN
-F 1 "100n" H 1875 6900 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1888 6850 50 0000 C CNN
-F 3 "" H 1850 7000 50 0000 C CNN
- 1 1850 7000
+P 3150 9900
+F 0 "C3" H 3175 10000 50 0000 L CNN
+F 1 "100n" H 3175 9800 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3188 9750 50 0000 C CNN
+F 3 "" H 3150 9900 50 0000 C CNN
+ 1 3150 9900
1 0 0 -1
$EndComp
$Comp
L C C4
U 1 1 58CF69F1
-P 2250 7000
-F 0 "C4" H 2275 7100 50 0000 L CNN
-F 1 "100n" H 2275 6900 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2288 6850 50 0000 C CNN
-F 3 "" H 2250 7000 50 0000 C CNN
- 1 2250 7000
+P 3550 9900
+F 0 "C4" H 3575 10000 50 0000 L CNN
+F 1 "100n" H 3575 9800 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3588 9750 50 0000 C CNN
+F 3 "" H 3550 9900 50 0000 C CNN
+ 1 3550 9900
1 0 0 -1
$EndComp
$Comp
L C C5
U 1 1 58CF6A3A
-P 2600 7000
-F 0 "C5" H 2625 7100 50 0000 L CNN
-F 1 "100n" H 2625 6900 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 2638 6850 50 0000 C CNN
-F 3 "" H 2600 7000 50 0000 C CNN
- 1 2600 7000
+P 3900 9900
+F 0 "C5" H 3925 10000 50 0000 L CNN
+F 1 "100n" H 3925 9800 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 3938 9750 50 0000 C CNN
+F 3 "" H 3900 9900 50 0000 C CNN
+ 1 3900 9900
1 0 0 -1
$EndComp
-NoConn ~ 1250 1450
-Text Notes 1000 1450 0 60 ~ 0
+NoConn ~ 1600 1650
+Text Notes 1350 1650 0 60 ~ 0
CLK
Wire Wire Line
- 8550 4600 8650 4600
+ 9750 5900 9850 5900
Wire Wire Line
- 8550 4700 8650 4700
-Text Label 8650 4600 0 60 ~ 0
+ 9750 6000 9850 6000
+Text Label 9850 5900 0 60 ~ 0
UART_TX_OUT
-Text Label 8650 4700 0 60 ~ 0
+Text Label 9850 6000 0 60 ~ 0
UART_RX_OUT
Wire Wire Line
- 1350 5600 950 5600
+ 2550 6900 2150 6900
Wire Wire Line
- 1350 5700 950 5700
+ 2550 7000 2150 7000
Wire Wire Line
- 1350 5800 950 5800
+ 2550 7100 2150 7100
Wire Wire Line
- 1350 5900 950 5900
-Text Label 950 5600 0 60 ~ 0
+ 2550 7200 2150 7200
+Text Label 2150 6900 0 60 ~ 0
SPI_CS
-Text Label 950 5700 0 60 ~ 0
+Text Label 2150 7000 0 60 ~ 0
SPI_SCK
-Text Label 950 5800 0 60 ~ 0
+Text Label 2150 7100 0 60 ~ 0
SPI_MISO
-Text Label 950 5900 0 60 ~ 0
+Text Label 2150 7200 0 60 ~ 0
SPI_MOSI
Wire Wire Line
- 8550 5000 8650 5000
+ 9750 6300 9850 6300
Wire Wire Line
- 8550 5100 8650 5100
-Text Label 8650 5000 0 60 ~ 0
+ 9750 6400 9850 6400
+Text Label 9850 6300 0 60 ~ 0
ADC_IN1
-Text Label 8650 5100 0 60 ~ 0
+Text Label 9850 6400 0 60 ~ 0
ADC_IN2
-Text Notes 8500 2700 0 60 ~ 0
+Text Notes 11600 2800 0 60 ~ 0
PA4(DAC1)
$Comp
L MIC550x-3.3YM5 U2
U 1 1 59F7B611
-P 5400 7100
-F 0 "U2" H 5150 7300 50 0000 L CNN
-F 1 "MIC550x-3.3YM5" H 6000 7300 50 0000 R CNN
-F 2 "TO_SOT_Packages_SMD:SOT-23-5_HandSoldering" H 6050 6850 50 0001 C CIN
-F 3 "" H 5400 7100 50 0000 C CNN
- 1 5400 7100
+P 8200 10050
+F 0 "U2" H 7950 10250 50 0000 L CNN
+F 1 "MIC550x-3.3YM5" H 8800 10250 50 0000 R CNN
+F 2 "TO_SOT_Packages_SMD:SOT-23-5_HandSoldering" H 8850 9800 50 0001 C CIN
+F 3 "" H 8200 10050 50 0000 C CNN
+ 1 8200 10050
1 0 0 -1
$EndComp
$Comp
-L +3V3 #PWR014
+L +3V3 #PWR013
U 1 1 59F7B6BD
-P 6150 7000
-F 0 "#PWR014" H 6150 6850 50 0001 C CNN
-F 1 "+3V3" H 6150 7140 50 0000 C CNN
-F 2 "" H 6150 7000 50 0000 C CNN
-F 3 "" H 6150 7000 50 0000 C CNN
- 1 6150 7000
+P 8950 9950
+F 0 "#PWR013" H 8950 9800 50 0001 C CNN
+F 1 "+3V3" H 8950 10090 50 0000 C CNN
+F 2 "" H 8950 9950 50 0000 C CNN
+F 3 "" H 8950 9950 50 0000 C CNN
+ 1 8950 9950
1 0 0 -1
$EndComp
$Comp
-L GND #PWR015
+L GND #PWR014
U 1 1 59F7B70C
-P 5400 7550
-F 0 "#PWR015" H 5400 7300 50 0001 C CNN
-F 1 "GND" H 5400 7400 50 0000 C CNN
-F 2 "" H 5400 7550 50 0000 C CNN
-F 3 "" H 5400 7550 50 0000 C CNN
- 1 5400 7550
+P 8200 10500
+F 0 "#PWR014" H 8200 10250 50 0001 C CNN
+F 1 "GND" H 8200 10350 50 0000 C CNN
+F 2 "" H 8200 10500 50 0000 C CNN
+F 3 "" H 8200 10500 50 0000 C CNN
+ 1 8200 10500
1 0 0 -1
$EndComp
Wire Wire Line
- 5800 7000 6150 7000
+ 8600 9950 8950 9950
Wire Wire Line
- 4850 7000 5000 7000
+ 7650 9950 7800 9950
Wire Wire Line
- 3150 1600 3450 1600
+ 4400 1750 4700 1750
Wire Wire Line
- 3450 1600 3450 1550
+ 4700 1750 4700 1700
Wire Wire Line
- 3150 1600 3150 1550
+ 4400 1750 4400 1700
Wire Wire Line
- 5400 7400 5400 7550
+ 8200 10350 8200 10500
$Comp
-L +5V #PWR016
+L +5V #PWR015
U 1 1 59F7C40C
-P 3150 1550
-F 0 "#PWR016" H 3150 1400 50 0001 C CNN
-F 1 "+5V" H 3150 1690 50 0000 C CNN
-F 2 "" H 3150 1550 50 0001 C CNN
-F 3 "" H 3150 1550 50 0001 C CNN
- 1 3150 1550
+P 4400 1700
+F 0 "#PWR015" H 4400 1550 50 0001 C CNN
+F 1 "+5V" H 4400 1840 50 0000 C CNN
+F 2 "" H 4400 1700 50 0001 C CNN
+F 3 "" H 4400 1700 50 0001 C CNN
+ 1 4400 1700
1 0 0 -1
$EndComp
$Comp
-L +5V #PWR017
+L +5V #PWR016
U 1 1 59F7C819
-P 4850 7000
-F 0 "#PWR017" H 4850 6850 50 0001 C CNN
-F 1 "+5V" H 4850 7140 50 0000 C CNN
-F 2 "" H 4850 7000 50 0001 C CNN
-F 3 "" H 4850 7000 50 0001 C CNN
- 1 4850 7000
+P 7650 9950
+F 0 "#PWR016" H 7650 9800 50 0001 C CNN
+F 1 "+5V" H 7650 10090 50 0000 C CNN
+F 2 "" H 7650 9950 50 0001 C CNN
+F 3 "" H 7650 9950 50 0001 C CNN
+ 1 7650 9950
1 0 0 -1
$EndComp
-NoConn ~ 3750 1550
-NoConn ~ 4050 1150
+NoConn ~ 5000 1700
+NoConn ~ 5300 1300
Wire Wire Line
- 5000 7200 4900 7200
+ 7800 10150 7700 10150
Wire Wire Line
- 4900 7200 4900 7000
-Connection ~ 4900 7000
+ 7700 10150 7700 9950
+Connection ~ 7700 9950
$Comp
L CONN_01X06 J1
U 1 1 59F7E088
-P 5350 1400
-F 0 "J1" H 5350 1750 50 0000 C CNN
-F 1 "CONN_01X06" V 5450 1400 50 0000 C CNN
-F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 5350 1400 50 0001 C CNN
-F 3 "" H 5350 1400 50 0001 C CNN
- 1 5350 1400
+P 6850 1300
+F 0 "J1" H 6850 1650 50 0000 C CNN
+F 1 "CONN_01X06" V 6950 1300 50 0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x06_Pitch2.54mm" H 6850 1300 50 0001 C CNN
+F 3 "" H 6850 1300 50 0001 C CNN
+ 1 6850 1300
-1 0 0 -1
$EndComp
Wire Wire Line
- 5550 1150 6100 1150
+ 7050 1050 7600 1050
Wire Wire Line
- 5550 1250 5600 1250
+ 7050 1150 7100 1150
Wire Wire Line
- 5550 1350 6100 1350
+ 7050 1250 7600 1250
Wire Wire Line
- 5550 1450 5600 1450
+ 7050 1350 7100 1350
Wire Wire Line
- 5550 1550 5600 1550
+ 7050 1450 7100 1450
Wire Wire Line
- 5550 1650 5600 1650
+ 7050 1550 7100 1550
$Comp
-L GND #PWR018
+L GND #PWR017
U 1 1 59F7E9AF
-P 6100 1350
-F 0 "#PWR018" H 6100 1100 50 0001 C CNN
-F 1 "GND" H 6100 1200 50 0000 C CNN
-F 2 "" H 6100 1350 50 0000 C CNN
-F 3 "" H 6100 1350 50 0000 C CNN
- 1 6100 1350
+P 7600 1250
+F 0 "#PWR017" H 7600 1000 50 0001 C CNN
+F 1 "GND" H 7600 1100 50 0000 C CNN
+F 2 "" H 7600 1250 50 0000 C CNN
+F 3 "" H 7600 1250 50 0000 C CNN
+ 1 7600 1250
1 0 0 -1
$EndComp
$Comp
-L +3V3 #PWR019
+L +3V3 #PWR018
U 1 1 59F7EA7B
-P 6100 1150
-F 0 "#PWR019" H 6100 1000 50 0001 C CNN
-F 1 "+3V3" H 6100 1290 50 0000 C CNN
-F 2 "" H 6100 1150 50 0000 C CNN
-F 3 "" H 6100 1150 50 0000 C CNN
- 1 6100 1150
+P 7600 1050
+F 0 "#PWR018" H 7600 900 50 0001 C CNN
+F 1 "+3V3" H 7600 1190 50 0000 C CNN
+F 2 "" H 7600 1050 50 0000 C CNN
+F 3 "" H 7600 1050 50 0000 C CNN
+ 1 7600 1050
1 0 0 -1
$EndComp
-Text Label 5600 1550 0 60 ~ 0
+Text Label 7100 1450 0 60 ~ 0
NRST
-Text Label 5600 1650 0 60 ~ 0
+Text Label 7100 1550 0 60 ~ 0
SWO
-Text Notes 5200 950 0 60 ~ 0
+Text Notes 6700 850 0 60 ~ 0
STLink compatible debug
-NoConn ~ 8550 4400
-NoConn ~ 8550 4500
-NoConn ~ 8550 5200
-NoConn ~ 8550 5300
-NoConn ~ 8550 5400
-NoConn ~ 8550 5900
-NoConn ~ 1350 5500
-NoConn ~ 1350 5400
-NoConn ~ 1350 5100
-NoConn ~ 1350 5000
-NoConn ~ 1350 4900
+NoConn ~ 9750 5700
+NoConn ~ 9750 5800
+NoConn ~ 9750 6500
+NoConn ~ 9750 6600
+NoConn ~ 9750 6700
+NoConn ~ 9750 7200
+NoConn ~ 2550 6800
+NoConn ~ 2550 6700
+NoConn ~ 2550 6400
+NoConn ~ 2550 6300
+NoConn ~ 2550 6200
Text Notes -121300 438350 0 60 ~ 0
IN/OUT from perspective of HOST\nDUT Nucleo is TARGET
-Text Notes 8950 6350 0 60 ~ 0
+Text Notes 10150 7650 0 60 ~ 0
IN/OUT is from the perspective of HOST\nDUT Nucleo is TARGET
-Text Label 1800 1350 0 60 ~ 0
+Text Label 2150 1550 0 60 ~ 0
SPI_CS
-Text Label 5600 1250 0 60 ~ 0
+Text Label 7100 1150 0 60 ~ 0
SWCLK
-Text Label 5600 1450 0 60 ~ 0
+Text Label 7100 1350 0 60 ~ 0
SWDIO
$Comp
L R R1
U 1 1 5A0F8D14
-P 10500 4050
-F 0 "R1" V 10580 4050 50 0000 C CNN
-F 1 "4k7" V 10500 4050 50 0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 10430 4050 50 0001 C CNN
-F 3 "" H 10500 4050 50 0001 C CNN
- 1 10500 4050
+P 10600 9750
+F 0 "R1" V 10680 9750 50 0000 C CNN
+F 1 "4k7" V 10600 9750 50 0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 10530 9750 50 0001 C CNN
+F 3 "" H 10600 9750 50 0001 C CNN
+ 1 10600 9750
1 0 0 -1
$EndComp
$Comp
L R R2
U 1 1 5A0F8EF5
-P 10800 4050
-F 0 "R2" V 10880 4050 50 0000 C CNN
-F 1 "4k7" V 10800 4050 50 0000 C CNN
-F 2 "Resistors_SMD:R_0603_HandSoldering" V 10730 4050 50 0001 C CNN
-F 3 "" H 10800 4050 50 0001 C CNN
- 1 10800 4050
+P 10900 9750
+F 0 "R2" V 10980 9750 50 0000 C CNN
+F 1 "4k7" V 10900 9750 50 0000 C CNN
+F 2 "Resistors_SMD:R_0603_HandSoldering" V 10830 9750 50 0001 C CNN
+F 3 "" H 10900 9750 50 0001 C CNN
+ 1 10900 9750
1 0 0 -1
$EndComp
Wire Wire Line
- 10800 3800 10800 3900
+ 10900 9500 10900 9600
Wire Wire Line
- 10500 3800 10800 3800
+ 10600 9500 10900 9500
Wire Wire Line
- 10500 3800 10500 3900
+ 10600 9500 10600 9600
$Comp
-L +3V3 #PWR020
+L +3V3 #PWR019
U 1 1 5A0F90D0
-P 10650 3800
-F 0 "#PWR020" H 10650 3650 50 0001 C CNN
-F 1 "+3V3" H 10650 3940 50 0000 C CNN
-F 2 "" H 10650 3800 50 0000 C CNN
-F 3 "" H 10650 3800 50 0000 C CNN
- 1 10650 3800
+P 10750 9500
+F 0 "#PWR019" H 10750 9350 50 0001 C CNN
+F 1 "+3V3" H 10750 9640 50 0000 C CNN
+F 2 "" H 10750 9500 50 0000 C CNN
+F 3 "" H 10750 9500 50 0000 C CNN
+ 1 10750 9500
1 0 0 -1
$EndComp
$Comp
L Jumper_NC_Small JP1
U 1 1 5A0F91B9
-P 10500 4350
-F 0 "JP1" H 10500 4430 50 0000 C CNN
-F 1 "Jumper_NC_Small" H 10510 4290 50 0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10500 4350 50 0001 C CNN
-F 3 "" H 10500 4350 50 0001 C CNN
- 1 10500 4350
+P 10600 10050
+F 0 "JP1" H 10600 10130 50 0000 C CNN
+F 1 "Jumper_NC_Small" H 10610 9990 50 0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10600 10050 50 0001 C CNN
+F 3 "" H 10600 10050 50 0001 C CNN
+ 1 10600 10050
0 -1 -1 0
$EndComp
$Comp
L Jumper_NC_Small JP2
U 1 1 5A0F9269
-P 10800 4350
-F 0 "JP2" H 10800 4430 50 0000 C CNN
-F 1 "Jumper_NC_Small" H 10810 4290 50 0000 C CNN
-F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10800 4350 50 0001 C CNN
-F 3 "" H 10800 4350 50 0001 C CNN
- 1 10800 4350
+P 10900 10050
+F 0 "JP2" H 10900 10130 50 0000 C CNN
+F 1 "Jumper_NC_Small" H 10910 9990 50 0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 10900 10050 50 0001 C CNN
+F 3 "" H 10900 10050 50 0001 C CNN
+ 1 10900 10050
0 -1 -1 0
$EndComp
Wire Wire Line
- 10500 4200 10500 4250
+ 10600 9900 10600 9950
Wire Wire Line
- 10800 4200 10800 4250
+ 10900 9900 10900 9950
Wire Wire Line
- 10800 4450 10800 4600
+ 10900 10150 10900 10300
Wire Wire Line
- 10500 4450 10500 4600
-Text Label 10500 4600 3 60 ~ 0
+ 10600 10150 10600 10300
+Text Label 10600 10300 3 60 ~ 0
I2C_SDA
-Text Label 10800 4600 3 60 ~ 0
+Text Label 10900 10300 3 60 ~ 0
I2C_SCL
-Text Notes 600 800 0 60 ~ 0
+Text Notes 950 1000 0 60 ~ 0
Designed for a cheap FX2LA\nto be just "plugged in" for sigrok
-NoConn ~ 10300 1400
-NoConn ~ 9300 1700
-NoConn ~ 9300 1800
+NoConn ~ 13400 1500
+NoConn ~ 12400 1800
+NoConn ~ 12400 1900
Wire Wire Line
- 9400 2200 9300 2200
+ 12500 2300 12400 2300
Wire Wire Line
- 9300 2200 9300 2100
+ 12400 2300 12400 2200
Wire Wire Line
- 9400 2300 9300 2300
-NoConn ~ 9300 2300
-NoConn ~ 1350 4600
-NoConn ~ 1350 3300
-Text Notes 1750 3300 0 60 ~ 0
-We're using debugger only here
+ 12500 2400 12400 2400
+NoConn ~ 12400 2400
+NoConn ~ 2550 5900
+Text Notes 2950 4600 0 39 ~ 0
+We're using debugger only here\n(but be safe)
$Comp
L C C6
U 1 1 5A0FB867
-P 800 3200
-F 0 "C6" H 825 3300 50 0000 L CNN
-F 1 "100n" H 825 3100 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 838 3050 50 0000 C CNN
-F 3 "" H 800 3200 50 0000 C CNN
- 1 800 3200
- 1 0 0 -1
+P 1200 4800
+F 0 "C6" H 1225 4900 50 0000 L CNN
+F 1 "100n" H 1225 4700 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1238 4650 50 0000 C CNN
+F 3 "" H 1200 4800 50 0000 C CNN
+ 1 1200 4800
+ 0 -1 -1 0
$EndComp
$Comp
-L GND #PWR021
+L GND #PWR020
U 1 1 5A0FB8D8
-P 800 3400
-F 0 "#PWR021" H 800 3150 50 0001 C CNN
-F 1 "GND" H 800 3250 50 0000 C CNN
-F 2 "" H 800 3400 50 0000 C CNN
-F 3 "" H 800 3400 50 0000 C CNN
- 1 800 3400
+P 900 4800
+F 0 "#PWR020" H 900 4550 50 0001 C CNN
+F 1 "GND" H 900 4650 50 0000 C CNN
+F 2 "" H 900 4800 50 0000 C CNN
+F 3 "" H 900 4800 50 0000 C CNN
+ 1 900 4800
1 0 0 -1
$EndComp
Wire Wire Line
- 800 3350 800 3400
-Text Notes -950 3450 0 60 ~ 0
+ 1050 4800 900 4800
+Text Notes -50 4450 0 60 ~ 0
Not needed on L1, but needed for L4/F3
-Text Notes 9000 3300 0 60 ~ 0
+Text Notes 12100 3400 0 60 ~ 0
TODO\n[ ] Route all spare pins to _something_?
$Comp
L C C8
U 1 1 5A0FC660
-P 6100 7350
-F 0 "C8" H 6125 7450 50 0000 L CNN
-F 1 "1u" H 6125 7250 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 6138 7200 50 0000 C CNN
-F 3 "" H 6100 7350 50 0000 C CNN
- 1 6100 7350
+P 8900 10300
+F 0 "C8" H 8925 10400 50 0000 L CNN
+F 1 "1u" H 8925 10200 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 8938 10150 50 0000 C CNN
+F 3 "" H 8900 10300 50 0000 C CNN
+ 1 8900 10300
1 0 0 -1
$EndComp
$Comp
L C C7
U 1 1 5A0FC76D
-P 4900 7350
-F 0 "C7" H 4925 7450 50 0000 L CNN
-F 1 "1u" H 4925 7250 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 4938 7200 50 0000 C CNN
-F 3 "" H 4900 7350 50 0000 C CNN
- 1 4900 7350
+P 7700 10300
+F 0 "C7" H 7725 10400 50 0000 L CNN
+F 1 "1u" H 7725 10200 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 7738 10150 50 0000 C CNN
+F 3 "" H 7700 10300 50 0000 C CNN
+ 1 7700 10300
1 0 0 -1
$EndComp
Wire Wire Line
- 4900 7500 6100 7500
-Connection ~ 5400 7500
+ 7700 10450 8900 10450
+Connection ~ 8200 10450
Wire Wire Line
- 6100 7200 6100 7000
-Connection ~ 6100 7000
-Connection ~ 10650 3800
+ 8900 10150 8900 9950
+Connection ~ 8900 9950
+Connection ~ 10750 9500
Wire Wire Line
- 1350 3500 1100 3500
-Wire Wire Line
- 1100 3500 800 3050
-Text Label 1350 3500 2 60 ~ 0
+ 1350 4800 2550 4800
+Text Label 2550 4800 2 60 ~ 0
VLCD
-Text Notes 5150 2750 0 60 ~ 0
+Text Notes 6350 4050 0 60 ~ 0
L1/F303/L4 in qfp48 are all compatible with this layout\n(but f3 needs external pullup on USB-DP)
$Comp
L Crystal_GND24_Small Y1
U 1 1 5A137095
-P 800 3800
-F 0 "Y1" H 850 3975 50 0000 L CNN
-F 1 "Crystal_GND24_Small" H 850 3900 50 0000 L CNN
-F 2 "Crystals:Crystal_SMD_SeikoEpson_FA238-4pin_3.2x2.5mm" H 800 3800 50 0001 C CNN
-F 3 "" H 800 3800 50 0001 C CNN
- 1 800 3800
- 0 -1 -1 0
+P 1600 5100
+F 0 "Y1" H 1650 5275 50 0000 L CNN
+F 1 "Crystal_GND24_Small" H 1650 5200 50 0000 L CNN
+F 2 "Crystals:Crystal_SMD_SeikoEpson_FA238-4pin_3.2x2.5mm" H 1600 5100 50 0001 C CNN
+F 3 "" H 1600 5100 50 0001 C CNN
+ 1 1600 5100
+ 1 0 0 -1
$EndComp
Wire Wire Line
- 550 3700 1350 3700
-Wire Wire Line
- 1350 3800 1150 3800
-Wire Wire Line
- 1150 3800 1150 3900
-Wire Wire Line
- 1150 3900 750 3900
+ 1700 5100 2550 5100
$Comp
L C C10
U 1 1 5A1373B8
-P 750 4150
-F 0 "C10" H 775 4250 50 0000 L CNN
-F 1 "18pf" H 775 4050 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 788 4000 50 0000 C CNN
-F 3 "" H 750 4150 50 0000 C CNN
- 1 750 4150
+P 1750 5450
+F 0 "C10" H 1775 5550 50 0000 L CNN
+F 1 "18pf" H 1775 5350 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1788 5300 50 0000 C CNN
+F 3 "" H 1750 5450 50 0000 C CNN
+ 1 1750 5450
1 0 0 -1
$EndComp
$Comp
L C C9
U 1 1 5A137455
-P 550 4150
-F 0 "C9" H 575 4250 50 0000 L CNN
-F 1 "18pf" H 575 4050 50 0000 L CNN
-F 2 "Capacitors_SMD:C_0603_HandSoldering" H 588 4000 50 0000 C CNN
-F 3 "" H 550 4150 50 0000 C CNN
- 1 550 4150
+P 1450 5450
+F 0 "C9" H 1475 5550 50 0000 L CNN
+F 1 "18pf" H 1475 5350 50 0000 L CNN
+F 2 "Capacitors_SMD:C_0603_HandSoldering" H 1488 5300 50 0000 C CNN
+F 3 "" H 1450 5450 50 0000 C CNN
+ 1 1450 5450
1 0 0 -1
$EndComp
$Comp
-L GND #PWR022
+L GND #PWR021
U 1 1 5A137592
-P 650 4400
-F 0 "#PWR022" H 650 4150 50 0001 C CNN
-F 1 "GND" H 650 4250 50 0000 C CNN
-F 2 "" H 650 4400 50 0000 C CNN
-F 3 "" H 650 4400 50 0000 C CNN
- 1 650 4400
+P 1600 5800
+F 0 "#PWR021" H 1600 5550 50 0001 C CNN
+F 1 "GND" H 1600 5650 50 0000 C CNN
+F 2 "" H 1600 5800 50 0000 C CNN
+F 3 "" H 1600 5800 50 0000 C CNN
+ 1 1600 5800
1 0 0 -1
$EndComp
Wire Wire Line
- 550 4000 550 3700
-Connection ~ 800 3700
+ 1600 5800 1600 5600
+Wire Wire Line
+ 1450 5600 1750 5600
+Connection ~ 1600 5600
+$Comp
+L Jumper_NC_Small JP3
+U 1 1 5A36E60E
+P 12050 2000
+F 0 "JP3" H 12050 2080 50 0000 C CNN
+F 1 "Jumper_NC_Small" H 12060 1940 50 0000 C CNN
+F 2 "Socket_Strips:Socket_Strip_Straight_2x01_Pitch2.54mm" H 12050 2000 50 0001 C CNN
+F 3 "" H 12050 2000 50 0001 C CNN
+ 1 12050 2000
+ 1 0 0 -1
+$EndComp
+NoConn ~ 12500 2100
+Text Notes 12300 2150 0 60 ~ 0
+5V
+Wire Wire Line
+ 12500 2000 12150 2000
+Wire Wire Line
+ 11950 2000 11800 2000
+Wire Wire Line
+ 11800 2000 11800 1550
+$Comp
+L CONN_01X02 J3
+U 1 1 5A36EBE0
+P 4850 2350
+F 0 "J3" H 4850 2500 50 0000 C CNN
+F 1 "CONN_01X02" V 4950 2350 50 0000 C CNN
+F 2 "Pin_Headers:Pin_Header_Straight_1x02_Pitch2.54mm" H 4850 2350 50 0001 C CNN
+F 3 "" H 4850 2350 50 0001 C CNN
+ 1 4850 2350
+ 0 1 1 0
+$EndComp
+Text Notes 4550 2700 0 60 ~ 0
+Probe points, for\nbus tracing USB
+$Comp
+L CONN_01X01_MALE J2
+U 1 1 5A36F13B
+P 2150 4600
+F 0 "J2" H 2150 4675 50 0000 C CNN
+F 1 "CONN_01X01_MALE" H 2150 4500 50 0000 C CNN
+F 2 "Wire_Pads:SolderWirePad_single_0-8mmDrill" H 2150 4600 50 0001 C CNN
+F 3 "" H 2150 4600 50 0001 C CNN
+ 1 2150 4600
+ 1 0 0 -1
+$EndComp
+Wire Wire Line
+ 2550 4600 2450 4600
+Wire Wire Line
+ 1450 4900 1450 5300
+Wire Wire Line
+ 1450 5100 1500 5100
+Wire Wire Line
+ 2550 5000 2350 5000
Wire Wire Line
- 650 4400 650 4300
+ 2350 5000 2350 4900
Wire Wire Line
- 550 4300 750 4300
-Connection ~ 650 4300
+ 2350 4900 1450 4900
+Connection ~ 1450 5100
Wire Wire Line
- 750 3900 750 4000
-Connection ~ 800 3900
+ 1750 5300 1750 5100
+Connection ~ 1750 5100
+NoConn ~ 13300 1300
+NoConn ~ 13300 1400
$EndSCHEMATC