From 8ae69f372d4cfd8524f4a4cd33e8e716ff99add5 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Mon, 13 Mar 2023 21:02:11 +1100 Subject: [PATCH] fix up fuses --- mainboard/audio.kicad_sch | 264 +- mainboard/gay-ipod.kicad_pcb | 4419 ++++++++++++++++------------------ mainboard/gay-ipod.kicad_sch | 8 +- mainboard/power.kicad_sch | 475 ++-- 4 files changed, 2553 insertions(+), 2613 deletions(-) diff --git a/mainboard/audio.kicad_sch b/mainboard/audio.kicad_sch index 3d9f08c..76bff48 100644 --- a/mainboard/audio.kicad_sch +++ b/mainboard/audio.kicad_sch @@ -1087,6 +1087,9 @@ (junction (at 71.12 85.09) (diameter 0) (color 0 0 0 0) (uuid 02721ca4-90d4-49e7-9c97-6774caa8a3ae) ) + (junction (at 199.39 69.85) (diameter 0) (color 0 0 0 0) + (uuid 04e74692-e949-447f-898f-fe38b8a2b0a1) + ) (junction (at 147.32 83.82) (diameter 0) (color 0 0 0 0) (uuid 05a2ec2a-4448-4c19-a4a2-7f7ed9d3956e) ) @@ -1105,9 +1108,6 @@ (junction (at 52.07 50.8) (diameter 0) (color 0 0 0 0) (uuid 2836294a-fcf4-488b-8697-f419aa7c7170) ) - (junction (at 195.58 60.96) (diameter 0) (color 0 0 0 0) - (uuid 299cac9d-580a-4857-b29e-b7ce2fbdbb9d) - ) (junction (at 176.53 110.49) (diameter 0) (color 0 0 0 0) (uuid 2a56fc4e-c4c8-4e74-a796-77f059dce45c) ) @@ -1141,8 +1141,8 @@ (junction (at 147.32 96.52) (diameter 0) (color 0 0 0 0) (uuid 6d9e5336-8f4d-4484-beb6-9522c5400f7e) ) - (junction (at 199.39 74.93) (diameter 0) (color 0 0 0 0) - (uuid 78cbdd12-478c-47ed-80f4-c13a36cb36cd) + (junction (at 194.31 69.85) (diameter 0) (color 0 0 0 0) + (uuid 7973f79d-043c-47ef-a55c-4eeb12e0ac18) ) (junction (at 60.96 67.31) (diameter 0) (color 0 0 0 0) (uuid 800de857-627e-40ad-ba15-932956448a93) @@ -1177,8 +1177,11 @@ (junction (at 60.96 50.8) (diameter 0) (color 0 0 0 0) (uuid c03bb5b5-700b-4ef5-b93f-56a43021d03c) ) - (junction (at 199.39 72.39) (diameter 0) (color 0 0 0 0) - (uuid c0ce9d84-a516-49cb-bda2-5065a4902eac) + (junction (at 177.8 60.96) (diameter 0) (color 0 0 0 0) + (uuid c1c500e6-d609-41be-b3e4-6d3de9a4e762) + ) + (junction (at 199.39 60.96) (diameter 0) (color 0 0 0 0) + (uuid c9cb1f77-4f3f-4083-9127-1bc9f821728a) ) (junction (at 233.68 96.52) (diameter 0) (color 0 0 0 0) (uuid cce521a9-35ea-47f8-b248-475b445e29f4) @@ -1204,9 +1207,6 @@ (junction (at 60.96 74.93) (diameter 0) (color 0 0 0 0) (uuid f3c4dff9-c91d-426e-b778-591b0444edd4) ) - (junction (at 194.31 74.93) (diameter 0) (color 0 0 0 0) - (uuid f97c2742-f009-467e-9be7-7fb88be81c9b) - ) (junction (at 227.33 96.52) (diameter 0) (color 0 0 0 0) (uuid f9f37a25-a2ea-4c5e-8b2a-8392d916ce4f) ) @@ -1290,7 +1290,7 @@ (stroke (width 0) (type default)) (uuid 131dd0ff-085c-4851-b3b1-f9b7bd57e0ac) ) - (wire (pts (xy 176.53 60.96) (xy 195.58 60.96)) + (wire (pts (xy 176.53 60.96) (xy 177.8 60.96)) (stroke (width 0) (type default)) (uuid 14924c22-79cc-420a-8998-f100fb2f5f80) ) @@ -1302,7 +1302,7 @@ (stroke (width 0) (type default)) (uuid 19ec6636-ff11-4b08-b2f2-39256d948c72) ) - (wire (pts (xy 177.8 68.58) (xy 177.8 69.85)) + (wire (pts (xy 177.8 67.31) (xy 177.8 68.58)) (stroke (width 0) (type default)) (uuid 1a3cb48b-e470-475b-be15-ab7e065f9fe2) ) @@ -1335,10 +1335,6 @@ (stroke (width 0) (type default)) (uuid 1ec82c62-7b54-426c-a0eb-efee38009dc3) ) - (wire (pts (xy 195.58 60.96) (xy 199.39 60.96)) - (stroke (width 0) (type default)) - (uuid 22a4c135-02ad-4e03-b24a-3379c296ac8f) - ) (wire (pts (xy 149.86 114.3) (xy 139.7 114.3)) (stroke (width 0) (type default)) (uuid 269db5aa-df4a-47c6-9e4f-42d0b6a12eb0) @@ -1380,10 +1376,6 @@ (stroke (width 0) (type default)) (uuid 361dc56d-5438-48a0-ae55-342c444724e5) ) - (wire (pts (xy 203.2 78.74) (xy 203.2 77.47)) - (stroke (width 0) (type default)) - (uuid 378cd83b-7d5c-4751-836a-57b987ef1b55) - ) (wire (pts (xy 97.79 107.95) (xy 97.79 109.22)) (stroke (width 0) (type default)) (uuid 3849452c-3abe-4fe9-befd-fb55f8d60c7c) @@ -1416,10 +1408,6 @@ (stroke (width 0) (type default)) (uuid 41dc6942-bb9c-4e63-95fc-338cfd511953) ) - (wire (pts (xy 199.39 60.96) (xy 199.39 66.04)) - (stroke (width 0) (type default)) - (uuid 43c65e9e-d674-4f48-8124-45f62673cfbe) - ) (wire (pts (xy 99.06 67.31) (xy 71.12 67.31)) (stroke (width 0) (type default)) (uuid 44b8df86-5adb-42fb-8fc3-d61604cff637) @@ -1428,6 +1416,10 @@ (stroke (width 0) (type default)) (uuid 474ffb07-fbd1-461f-88e8-7bd5231751f9) ) + (wire (pts (xy 199.39 60.96) (xy 199.39 69.85)) + (stroke (width 0) (type default)) + (uuid 491ca43a-601e-48a1-ae78-62a3b9d7acfa) + ) (wire (pts (xy 71.12 73.66) (xy 71.12 74.93)) (stroke (width 0) (type default)) (uuid 4c1af24d-b973-414a-a60f-4f1e2b7d7da8) @@ -1436,6 +1428,10 @@ (stroke (width 0) (type default)) (uuid 4c4ffca4-3ff2-4173-bb86-96f0aaab940e) ) + (wire (pts (xy 189.23 69.85) (xy 194.31 69.85)) + (stroke (width 0) (type default)) + (uuid 4e112e78-bcb6-4dba-83f7-965caf8a0deb) + ) (wire (pts (xy 137.16 110.49) (xy 134.62 110.49)) (stroke (width 0) (type default)) (uuid 4e5b2b41-c471-4810-a9e2-7ee5ac8d7dc9) @@ -1472,10 +1468,6 @@ (stroke (width 0) (type default)) (uuid 5a51f076-e0b1-4c66-b582-3e6e7b71c7c3) ) - (wire (pts (xy 177.8 68.58) (xy 195.58 68.58)) - (stroke (width 0) (type default)) - (uuid 5c961f6b-27c9-4eb6-accf-05c266ebfa23) - ) (bus (pts (xy 87.63 91.44) (xy 87.63 93.98)) (stroke (width 0) (type default)) (uuid 5cd3a58c-7d35-4319-96f8-cbc4dcff2965) @@ -1513,10 +1505,6 @@ (stroke (width 0) (type default)) (uuid 6b375084-040d-41f5-b327-c26705e11467) ) - (wire (pts (xy 195.58 68.58) (xy 195.58 67.31)) - (stroke (width 0) (type default)) - (uuid 6e99d058-c22b-4cf3-927b-fd396ce1461e) - ) (wire (pts (xy 134.62 123.19) (xy 134.62 125.73)) (stroke (width 0) (type default)) (uuid 6f3eab04-9125-4a7d-8130-b63851035ef0) @@ -1545,6 +1533,10 @@ (stroke (width 0) (type default)) (uuid 7616ee87-25f1-41bd-b206-4f2d890788ea) ) + (wire (pts (xy 177.8 60.96) (xy 186.69 60.96)) + (stroke (width 0) (type default)) + (uuid 76bae7bf-baca-4300-8c80-b758fafdf3d7) + ) (wire (pts (xy 88.9 111.76) (xy 88.9 116.84)) (stroke (width 0) (type default)) (uuid 78ba4948-56f1-4b78-9bcb-6bacdf6212af) @@ -1578,6 +1570,10 @@ (stroke (width 0) (type default)) (uuid 82da7652-ca4c-4556-b1d7-961e1734db91) ) + (wire (pts (xy 189.23 76.2) (xy 189.23 77.47)) + (stroke (width 0) (type default)) + (uuid 83df54d6-4dde-43bd-affa-934897ce07a5) + ) (wire (pts (xy 60.96 73.66) (xy 60.96 74.93)) (stroke (width 0) (type default)) (uuid 83ffef6a-f066-4332-9ab9-d7b1607cf259) @@ -1590,6 +1586,10 @@ (stroke (width 0) (type default)) (uuid 8562fa07-ce80-4866-a1f7-5fcf253b65b7) ) + (wire (pts (xy 189.23 69.85) (xy 189.23 71.12)) + (stroke (width 0) (type default)) + (uuid 86dbc041-a582-45f8-9908-d979438bd03b) + ) (wire (pts (xy 147.32 97.79) (xy 147.32 96.52)) (stroke (width 0) (type default)) (uuid 876d5f5b-d1b0-4fc2-a271-ea3434d1caeb) @@ -1626,10 +1626,6 @@ (stroke (width 0) (type default)) (uuid 8de387d9-dbbb-4c02-b70f-8c08cb3e6e29) ) - (wire (pts (xy 199.39 72.39) (xy 203.2 72.39)) - (stroke (width 0) (type default)) - (uuid 91952a4a-37da-4e2a-a028-f7d81c4997b1) - ) (wire (pts (xy 196.85 115.57) (xy 196.85 116.84)) (stroke (width 0) (type default)) (uuid 92a2f48a-2f18-4679-8dec-4a31a16b1ec4) @@ -1646,10 +1642,6 @@ (stroke (width 0) (type default)) (uuid 9ba8f8f5-ee8a-465d-94a0-dc6e00e9168c) ) - (wire (pts (xy 194.31 82.55) (xy 194.31 74.93)) - (stroke (width 0) (type default)) - (uuid 9c92a010-5771-4e31-9cb2-edae2e182595) - ) (wire (pts (xy 246.38 88.9) (xy 246.38 86.36)) (stroke (width 0) (type default)) (uuid 9e8ba717-8713-4856-8f25-85b54e72e926) @@ -1707,10 +1699,6 @@ (stroke (width 0) (type default)) (uuid a7917c19-dff8-4dbc-9e8c-01a59633b8c7) ) - (wire (pts (xy 199.39 71.12) (xy 199.39 72.39)) - (stroke (width 0) (type default)) - (uuid a89fd447-1ecf-4025-89c0-bdbeb6d2e590) - ) (wire (pts (xy 71.12 85.09) (xy 74.93 85.09)) (stroke (width 0) (type default)) (uuid ab574679-82b0-4217-9ba5-2feb30367b96) @@ -1719,7 +1707,7 @@ (stroke (width 0) (type default)) (uuid abcc975a-6b28-4127-aa8a-8bff740a9f3a) ) - (wire (pts (xy 194.31 74.93) (xy 199.39 74.93)) + (wire (pts (xy 194.31 69.85) (xy 199.39 69.85)) (stroke (width 0) (type default)) (uuid ac2dbcb8-fdfd-4bcd-ac9a-5bcd83b4bb47) ) @@ -1812,7 +1800,7 @@ (stroke (width 0) (type default)) (uuid caf97ffd-5997-4812-b743-ba07d8cf258b) ) - (wire (pts (xy 195.58 60.96) (xy 195.58 62.23)) + (wire (pts (xy 177.8 60.96) (xy 177.8 62.23)) (stroke (width 0) (type default)) (uuid ccd14192-2d02-4372-bf80-fc152970f144) ) @@ -1824,6 +1812,10 @@ (stroke (width 0) (type default)) (uuid cf071bd7-629e-4bfa-8aa2-b20affa48d71) ) + (wire (pts (xy 199.39 69.85) (xy 199.39 82.55)) + (stroke (width 0) (type default)) + (uuid d0a64ea8-f96c-4945-bb72-1aefcae00a33) + ) (wire (pts (xy 60.96 58.42) (xy 60.96 59.69)) (stroke (width 0) (type default)) (uuid d3695161-ade5-4c24-85ac-725782824108) @@ -1836,10 +1828,6 @@ (stroke (width 0) (type default)) (uuid d564a6fc-1590-43c1-a17b-43ed3a4aeb5f) ) - (wire (pts (xy 199.39 72.39) (xy 199.39 74.93)) - (stroke (width 0) (type default)) - (uuid d569fd19-3bec-46ea-b8f3-8687fe1722ae) - ) (wire (pts (xy 184.15 81.28) (xy 161.29 81.28)) (stroke (width 0) (type default)) (uuid d6fc3cbb-4dc1-4b5d-b2d2-c9b38643dcff) @@ -1852,10 +1840,6 @@ (stroke (width 0) (type default)) (uuid dc559801-50a0-4358-b650-e83cb7c86edb) ) - (wire (pts (xy 199.39 74.93) (xy 199.39 82.55)) - (stroke (width 0) (type default)) - (uuid dcb9f0bf-3337-4663-821a-3d4ab3f12e29) - ) (wire (pts (xy 119.38 121.92) (xy 119.38 123.19)) (stroke (width 0) (type default)) (uuid dfbf1676-a268-471a-a798-88b83a68d3f9) @@ -1876,6 +1860,18 @@ (stroke (width 0) (type default)) (uuid e43a830a-7c61-4eb5-b330-31a904ef1f9b) ) + (wire (pts (xy 194.31 69.85) (xy 194.31 82.55)) + (stroke (width 0) (type default)) + (uuid e728ad81-a3c8-4394-997b-a4f82a96c49c) + ) + (wire (pts (xy 176.53 60.96) (xy 176.53 59.69)) + (stroke (width 0) (type default)) + (uuid e77884cf-74a2-4f1d-bbbf-31a16b0df2d2) + ) + (wire (pts (xy 199.39 60.96) (xy 191.77 60.96)) + (stroke (width 0) (type default)) + (uuid e9a1af47-6201-4ac3-8e2b-d444f90f8c7b) + ) (wire (pts (xy 137.16 105.41) (xy 134.62 105.41)) (stroke (width 0) (type default)) (uuid e9c03eaf-2e22-4732-ac3b-bdc706aceb85) @@ -1909,7 +1905,7 @@ (uuid ffa8587b-8f57-48e7-86b4-f498fd8a30f0) ) - (text "~20mA" (at 210.185 64.135 0) + (text "~20mA" (at 218.44 78.74 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 14125733-71cd-4e9b-b53b-1e69ed845353) ) @@ -1926,10 +1922,6 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 9aaca037-8bb0-4b20-857d-3e4b591d6bf5) ) - (text "TODO: rate this\nhigher (25V)" (at 143.51 110.49 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid a6b03933-0d8f-48d7-b7e8-2400fc8e6c7a) - ) (text "enables i2c mode" (at 77.47 109.22 0) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid e2d04cc3-d4ae-48bc-993b-e5149dd78aeb) @@ -2057,7 +2049,7 @@ (property "PN" "" (at 139.7 120.65 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 139.7 120.65 0) + (property "MPN" "EMK107BJ104KAHT" (at 139.7 120.65 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid d8dfc26b-14a8-4cfc-9ae0-c25f27b2e51a)) @@ -2071,25 +2063,25 @@ ) ) - (symbol (lib_id "Device:FerriteBead_Small") (at 199.39 68.58 180) (unit 1) + (symbol (lib_id "Device:FerriteBead_Small") (at 189.23 60.96 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 1da30efb-5d3c-4e11-be93-985ebf038458) - (property "Reference" "FB4" (at 212.09 67.31 0) + (property "Reference" "FB4" (at 182.88 63.5 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "100@100MHz 3A" (at 204.47 73.66 0) + (property "Value" "100@100MHz 3A" (at 182.88 66.04 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (at 201.168 68.58 90) + (property "Footprint" "Inductor_SMD:L_0603_1608Metric" (at 189.23 59.182 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 199.39 68.58 0) + (property "Datasheet" "~" (at 189.23 60.96 0) (effects (font (size 1.27 1.27)) hide) ) - (property "PN" "" (at 199.39 68.58 0) + (property "PN" "" (at 189.23 60.96 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "BLM18KG101TN1D" (at 199.39 68.58 0) + (property "MPN" "BLM18KG101TN1D" (at 189.23 60.96 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid cc9f6db4-076e-42c4-8bb8-18de7952cecb)) @@ -2342,22 +2334,22 @@ ) ) - (symbol (lib_id "Device:C_Polarized_Small") (at 195.58 64.77 0) (mirror y) (unit 1) + (symbol (lib_id "Device:C_Polarized_Small") (at 177.8 64.77 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 59c1de74-dd68-48d3-8e20-31af85e11fae) - (property "Reference" "C18" (at 193.04 63.5889 0) + (property "Reference" "C18" (at 175.26 63.5889 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "10uF" (at 193.04 66.1289 0) + (property "Value" "10uF" (at 175.26 66.1289 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Capacitor_Tantalum_SMD:CP_EIA-3216-18_Kemet-A" (at 195.58 64.77 0) + (property "Footprint" "Capacitor_Tantalum_SMD:CP_EIA-3216-18_Kemet-A" (at 177.8 64.77 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 195.58 64.77 0) + (property "Datasheet" "~" (at 177.8 64.77 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "TCJA106M020R0150 " (at 195.58 64.77 90) + (property "MPN" "TCJA106M020R0150 " (at 177.8 64.77 90) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 7f37605a-d661-41f8-8afd-102d45208a5c)) @@ -2421,19 +2413,19 @@ ) ) - (symbol (lib_id "power:+3V3") (at 176.53 60.96 0) (unit 1) + (symbol (lib_id "power:+3V3") (at 176.53 59.69 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 611a6558-0307-4df6-8df9-47488c73b8a8) - (property "Reference" "#PWR0310" (at 176.53 64.77 0) + (property "Reference" "#PWR0310" (at 176.53 63.5 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3V3" (at 179.07 57.15 0) + (property "Value" "+3V3" (at 175.26 58.42 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "" (at 176.53 60.96 0) + (property "Footprint" "" (at 176.53 59.69 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 176.53 60.96 0) + (property "Datasheet" "" (at 176.53 59.69 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 108f718b-5d45-4885-9581-961d70e9198d)) @@ -2496,25 +2488,25 @@ ) ) - (symbol (lib_id "Device:C_Small") (at 203.2 74.93 0) (mirror y) (unit 1) + (symbol (lib_id "Device:C_Small") (at 189.23 73.66 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 719f09c4-ba22-44a2-b695-f0736355437e) - (property "Reference" "C10" (at 208.28 74.295 0) + (property "Reference" "C10" (at 184.15 73.025 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "0.1uF" (at 208.28 76.2 0) + (property "Value" "0.1uF" (at 184.15 74.93 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 203.2 74.93 0) + (property "Footprint" "Capacitor_SMD:C_0603_1608Metric" (at 189.23 73.66 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 203.2 74.93 0) + (property "Datasheet" "~" (at 189.23 73.66 0) (effects (font (size 1.27 1.27)) hide) ) - (property "PN" "" (at 203.2 74.93 90) + (property "PN" "" (at 189.23 73.66 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 203.2 74.93 0) + (property "MPN" "EMK107BJ104KAHT" (at 189.23 73.66 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 336dd2f5-bad2-4a8a-88f9-43591086beee)) @@ -2546,7 +2538,7 @@ (property "PN" "" (at 212.09 81.28 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 212.09 81.28 0) + (property "MPN" "GRM188R61E475KE11D" (at 212.09 81.28 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 13b1dd24-c6cc-4b72-a3ac-1cd10e72cd29)) @@ -2787,7 +2779,7 @@ (property "PN" "" (at 137.16 107.95 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 137.16 107.95 0) + (property "MPN" "GRM188R61E475KE11D" (at 137.16 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 91e73eb9-73b3-49ae-b526-eb16bd9e350f)) @@ -2801,53 +2793,19 @@ ) ) - (symbol (lib_id "power:PWR_FLAG") (at 194.31 74.93 90) (unit 1) - (in_bom yes) (on_board yes) (dnp no) - (uuid a613bd55-f2a0-4ca3-92c2-cae4fa307c6d) - (property "Reference" "#FLG0203" (at 192.405 74.93 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "PWR_FLAG" (at 190.5 74.93 90) - (effects (font (size 1.27 1.27)) (justify left)) - ) - (property "Footprint" "" (at 194.31 74.93 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "~" (at 194.31 74.93 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid a9cf2319-2f40-45e7-827a-4f589276064d)) - (instances - (project "gay-ipod" - (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda" - (reference "#FLG0203") (unit 1) - ) - (path "/de8684e7-e170-4d2f-a805-7d7995907eaf" - (reference "#FLG0102") (unit 1) - ) - (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a" - (reference "#FLG0401") (unit 1) - ) - (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/aa634b70-9cb7-4291-a4a8-f65abc12d546" - (reference "#FLG0302") (unit 1) - ) - ) - ) - ) - - (symbol (lib_id "power:GND") (at 177.8 69.85 0) (unit 1) + (symbol (lib_id "power:GND") (at 177.8 68.58 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid aaf70cbd-bbc5-4bfa-ad81-69a73d8a7c00) - (property "Reference" "#PWR0312" (at 177.8 76.2 0) + (property "Reference" "#PWR0312" (at 177.8 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 177.8 74.295 0) + (property "Value" "GND" (at 177.8 73.025 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 177.8 69.85 0) + (property "Footprint" "" (at 177.8 68.58 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 177.8 69.85 0) + (property "Datasheet" "" (at 177.8 68.58 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 9ba12d3b-ae68-4d21-b698-e9b75aa03403)) @@ -2917,6 +2875,40 @@ ) ) + (symbol (lib_id "power:PWR_FLAG") (at 199.39 60.96 270) (unit 1) + (in_bom yes) (on_board yes) (dnp no) + (uuid b9852aeb-7433-4e6e-9faf-860b16e25a6b) + (property "Reference" "#FLG0203" (at 201.295 60.96 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "PWR_FLAG" (at 203.2 60.96 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (at 199.39 60.96 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 199.39 60.96 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 19ddd3f7-6ad8-4d2c-8e78-448c5a656354)) + (instances + (project "gay-ipod" + (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda" + (reference "#FLG0203") (unit 1) + ) + (path "/de8684e7-e170-4d2f-a805-7d7995907eaf" + (reference "#FLG0102") (unit 1) + ) + (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a" + (reference "#FLG0401") (unit 1) + ) + (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/aa634b70-9cb7-4291-a4a8-f65abc12d546" + (reference "#FLG01") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "Device:C_Small") (at 60.96 88.9 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid c0ef417d-7110-4f13-843c-383b83968060) @@ -2935,7 +2927,7 @@ (property "PN" "" (at 60.96 88.9 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 60.96 88.9 0) + (property "MPN" "EMK107BJ104KAHT" (at 60.96 88.9 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid f1620cf5-c25e-4805-980c-0d7bf2397f36)) @@ -2992,7 +2984,7 @@ (property "PN" "" (at 60.96 71.12 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 60.96 71.12 0) + (property "MPN" "EMK107BJ104KAHT" (at 60.96 71.12 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid c4b935ab-3c0e-4989-9863-24d64400b6fb)) @@ -3191,7 +3183,7 @@ (property "PN" "" (at 147.32 87.63 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 147.32 87.63 0) + (property "MPN" "C1608X5R1H222K080AA" (at 147.32 87.63 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 3676f6ee-5baf-441c-a724-d36fc0f96797)) @@ -3378,7 +3370,7 @@ (property "PN" "" (at 60.96 54.61 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 60.96 54.61 0) + (property "MPN" "EMK107BJ104KAHT" (at 60.96 54.61 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 2c2be6fd-f942-4497-9fe0-a7d01eebc825)) @@ -3410,7 +3402,7 @@ (property "PN" "" (at 143.51 87.63 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 143.51 87.63 0) + (property "MPN" "C1608X5R1H222K080AA" (at 143.51 87.63 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 63600e1b-989e-4ceb-84d3-7ccacdbfdd5b)) @@ -3512,19 +3504,19 @@ ) ) - (symbol (lib_id "power:GND") (at 203.2 78.74 0) (unit 1) + (symbol (lib_id "power:GND") (at 189.23 77.47 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid fd53d268-73bb-454c-91d4-8729d3ba07c0) - (property "Reference" "#PWR02" (at 203.2 85.09 0) + (property "Reference" "#PWR02" (at 189.23 83.82 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 203.2 83.185 0) + (property "Value" "GND" (at 189.23 81.915 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 203.2 78.74 0) + (property "Footprint" "" (at 189.23 77.47 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 203.2 78.74 0) + (property "Datasheet" "" (at 189.23 77.47 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 0e8a4065-6c24-4e2e-873b-6c67a394e83c)) diff --git a/mainboard/gay-ipod.kicad_pcb b/mainboard/gay-ipod.kicad_pcb index f24dd33..dd4b701 100644 --- a/mainboard/gay-ipod.kicad_pcb +++ b/mainboard/gay-ipod.kicad_pcb @@ -149,13 +149,13 @@ (net 52 "~{TOUCH_INT}") (net 53 "DISPLAY_DR") (net 54 "+3V3") - (net 55 "Net-(U2--AVDD)") + (net 55 "Net-(#FLG0301-pwr)") (net 56 "Net-(U3-OUTR)") - (net 57 "Net-(U2-AVDD)") + (net 57 "Net-(#FLG0302-pwr)") (net 58 "Net-(U3-VNEG)") (net 59 "Net-(U3-OUTL)") - (net 60 "Net-(J4-VDD)") - (net 61 "Net-(U8-VDDIN)") + (net 60 "Net-(U5-V_{BAT_SENSE})") + (net 61 "Net-(#FLG0401-pwr)") (net 62 "Net-(U3-CAPP)") (net 63 "Net-(U3-CAPM)") (net 64 "Net-(U3-LDOO)") @@ -222,6 +222,8 @@ (net 125 "unconnected-(U8-SERCOM3.1-Pad22)") (net 126 "unconnected-(U8-PA27-Pad25)") (net 127 "unconnected-(U8-PA28-Pad27)") + (net 128 "Net-(#FLG0101-pwr)") + (net 129 "Net-(#FLG0202-pwr)") (footprint "Capacitor_Tantalum_SMD:CP_EIA-3216-18_Kemet-A" (layer "F.Cu") (tstamp 030e13ef-9b6b-45fb-a21e-6e840681de67) @@ -351,7 +353,7 @@ (property "ki_keywords" "transistor PMOS P-MOS P-MOSFET") (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/9f890897-0f82-45a8-8346-61a2ec80004a") (attr smd) - (fp_text reference "Q2" (at 0 -2.45 90) (layer "F.SilkS") + (fp_text reference "Q2" (at 1.7 1.6 180) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp 2df8eba3-d7c8-4699-b3f0-703b49a63978) ) @@ -402,6 +404,61 @@ ) ) + (footprint "Fuse:Fuse_1206_3216Metric" (layer "F.Cu") + (tstamp 05af7262-61b2-4367-a819-94cc9530a379) + (at 128.1 138.65) + (descr "Fuse SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator") + (tags "fuse") + (property "MPN" "SMD1206B050TF/15") + (property "Sheetfile" "power.kicad_sch") + (property "Sheetname" "Power") + (property "ki_description" "Resettable fuse, polymeric positive temperature coefficient, small symbol") + (property "ki_keywords" "resettable fuse PTC PPTC polyfuse polyswitch") + (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/92b61bfc-7b61-468b-bd0c-591d94244df2") + (attr smd) + (fp_text reference "F1" (at -2.95 -0.05 90) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 752c9976-2001-4839-b1da-227e741c0c13) + ) + (fp_text value "500mA hold, 1A trip" (at 0 1.82) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp aeb749b9-294b-4748-8c3a-76d00fe25944) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.8 0.8) (thickness 0.12))) + (tstamp 18519e3d-647c-48e8-88ba-e0aaf50de5df) + ) + (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b835f755-9abe-49be-9a82-edfb80f00976)) + (fp_line (start -0.602064 0.91) (end 0.602064 0.91) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp b2c85df6-9642-4a0e-acab-63c4f7191a0b)) + (fp_line (start -2.28 -1.12) (end 2.28 -1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 65da900f-5be7-43b5-9752-288fffbbbd38)) + (fp_line (start -2.28 1.12) (end -2.28 -1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3ffbd66e-b52a-440b-b96b-c9c6c15ad15a)) + (fp_line (start 2.28 -1.12) (end 2.28 1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp c007b75f-faa6-4bbc-a3de-7dd16abc3d5b)) + (fp_line (start 2.28 1.12) (end -2.28 1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8bd8fbcb-d96b-49c8-be17-1ec88fb1d3ac)) + (fp_line (start -1.6 -0.8) (end 1.6 -0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3d589798-b450-4143-8ad0-720feb6c80f1)) + (fp_line (start -1.6 0.8) (end -1.6 -0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 69b340c8-2d23-4da9-a292-3999c75749cf)) + (fp_line (start 1.6 -0.8) (end 1.6 0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 72236549-d548-45e4-b8ec-6929cc859826)) + (fp_line (start 1.6 0.8) (end -1.6 0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6b441551-05ad-4900-bebe-bd8277176166)) + (pad "1" smd roundrect (at -1.4 0) (size 1.25 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) + (net 67 "Net-(J7-Pin_1)") (pintype "passive") (tstamp 79ba0d00-b66c-4f80-a814-210791847a8c)) + (pad "2" smd roundrect (at 1.4 0) (size 1.25 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) + (net 60 "Net-(U5-V_{BAT_SENSE})") (pintype "passive") (tstamp 40a3abf1-e649-4586-8c48-ad3352d71faa)) + (model "${KICAD6_3DMODEL_DIR}/Fuse.3dshapes/Fuse_1206_3216Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu") (tstamp 097af814-0155-4313-82f4-43625bf840a8) (at 145.6 105.6 90) @@ -1078,17 +1135,17 @@ (pad "13" smd roundrect (at 1.9375 0 270) (size 0.825 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 102 "Net-(U5-PROG1)") (pinfunction "PROG1") (pintype "bidirectional") (tstamp eb8f6e37-6e7b-4c1e-adf1-ab726c5729cb)) (pad "14" smd roundrect (at 1.9375 -0.5 270) (size 0.825 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 67 "Net-(J7-Pin_1)") (pinfunction "V_{BAT}") (pintype "power_out") (tstamp ae4f1336-0d26-4f5c-9e2f-80f21957f2f0)) + (net 60 "Net-(U5-V_{BAT_SENSE})") (pinfunction "V_{BAT}") (pintype "power_out") (tstamp ae4f1336-0d26-4f5c-9e2f-80f21957f2f0)) (pad "15" smd roundrect (at 1.9375 -1 270) (size 0.825 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 67 "Net-(J7-Pin_1)") (pinfunction "V_{BAT}") (pintype "passive") (tstamp 06ffc218-7d36-4132-b1df-a10a5aedc00d)) + (net 60 "Net-(U5-V_{BAT_SENSE})") (pinfunction "V_{BAT}") (pintype "passive") (tstamp 06ffc218-7d36-4132-b1df-a10a5aedc00d)) (pad "16" smd roundrect (at 1 -1.9375 270) (size 0.25 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 67 "Net-(J7-Pin_1)") (pinfunction "V_{BAT_SENSE}") (pintype "input") (tstamp 6fd0d54e-456c-4233-b14d-de3f4f7c740e)) + (net 60 "Net-(U5-V_{BAT_SENSE})") (pinfunction "V_{BAT_SENSE}") (pintype "input") (tstamp 6fd0d54e-456c-4233-b14d-de3f4f7c740e)) (pad "17" smd roundrect (at 0.5 -1.9375 270) (size 0.25 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 99 "Net-(U5-CE)") (pinfunction "CE") (pintype "input") (tstamp 81bfbba2-fe2c-46dc-9803-993b50651169)) (pad "18" smd roundrect (at 0 -1.9375 270) (size 0.25 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 42 "/Power/VBUS_SWITCHED") (pinfunction "IN") (pintype "power_in") (tstamp 2f73138d-d1a1-450f-bb3b-efcbe39758cb)) + (net 129 "Net-(#FLG0202-pwr)") (pinfunction "IN") (pintype "power_in") (tstamp 2f73138d-d1a1-450f-bb3b-efcbe39758cb)) (pad "19" smd roundrect (at -0.5 -1.9375 270) (size 0.25 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 42 "/Power/VBUS_SWITCHED") (pinfunction "IN") (pintype "passive") (tstamp add520ee-2da3-49eb-9921-418f7ee3b8b7)) + (net 129 "Net-(#FLG0202-pwr)") (pinfunction "IN") (pintype "passive") (tstamp add520ee-2da3-49eb-9921-418f7ee3b8b7)) (pad "20" smd roundrect (at -1 -1.9375 270) (size 0.25 0.825) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 4 "/Power/SYS_POWER") (pinfunction "OUT") (pintype "passive") (tstamp 05e2964a-bcf2-4f92-91ac-baf6aed9f234)) (pad "21" smd rect (at 0 0 270) (size 2.5 2.5) (layers "F.Cu" "F.Mask") @@ -1156,7 +1213,7 @@ (pad "2" smd roundrect (at -0.9375 0.95 90) (size 1.475 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 54 "+3V3") (pinfunction "S") (pintype "passive") (tstamp 9e024fc4-e254-4d84-833d-b67ca4be4fa8)) (pad "3" smd roundrect (at 0.9375 0 90) (size 1.475 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 60 "Net-(J4-VDD)") (pinfunction "D") (pintype "passive") (tstamp 0eb1d378-18c9-44cf-a719-d8e790340d1d)) + (net 61 "Net-(#FLG0401-pwr)") (pinfunction "D") (pintype "passive") (tstamp 0eb1d378-18c9-44cf-a719-d8e790340d1d)) (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -1166,7 +1223,7 @@ (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tstamp 1bdb48af-19a6-4b0b-b54d-5491b2ce2204) - (at 127.4 135) + (at 127.65 134.75) (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator") (tags "capacitor") (property "MPN" "EMK212ABJ106KG-T") @@ -1210,7 +1267,7 @@ (fp_line (start 1 0.625) (end -1 0.625) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c79b7a75-d28e-461f-9e60-19edb91b91b4)) (pad "1" smd roundrect (at -0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 67 "Net-(J7-Pin_1)") (pintype "passive") (tstamp 3dc1c8ff-efe7-4e4c-8c3b-2dc25df5ca11)) + (net 60 "Net-(U5-V_{BAT_SENSE})") (pintype "passive") (tstamp 3dc1c8ff-efe7-4e4c-8c3b-2dc25df5ca11)) (pad "2" smd roundrect (at 0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp d4e165f4-cf42-44b6-bae4-54f50663e620)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" @@ -1449,7 +1506,7 @@ (at 160.15 61.45 180) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "GRM188R61E475KE11D") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -1627,7 +1684,7 @@ (property "ki_keywords" "R resistor") (path "/fba77fe4-00f0-4e14-bab0-0b9465238e08") (attr smd) - (fp_text reference "R34" (at 6.775 -0.1) (layer "F.SilkS") + (fp_text reference "R34" (at -2.225 -0.65 90) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp d24bb086-702e-4f5b-aec1-196022e18667) ) @@ -1998,7 +2055,7 @@ (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4cfea34f-11df-4b31-ab10-70c7584e2c47)) (pad "1" smd roundrect (at -0.825 0 270) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 60 "Net-(J4-VDD)") (pintype "passive") (tstamp fb771543-0b8c-40da-bb09-7ccfe805a84b)) + (net 61 "Net-(#FLG0401-pwr)") (pintype "passive") (tstamp fb771543-0b8c-40da-bb09-7ccfe805a84b)) (pad "2" smd roundrect (at 0.825 0 270) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 83 "Net-(J4-DAT1)") (pintype "passive") (tstamp d23b86d3-e46b-4871-a327-de6cca99f7d5)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" @@ -2013,7 +2070,7 @@ (at 143 60.55 90) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "EMK107BJ104KAHT") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -2054,7 +2111,7 @@ (fp_line (start 0.8 0.4) (end -0.8 0.4) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 66fb8e84-7c49-4584-8e03-8fc2af225e05)) (pad "1" smd roundrect (at -0.775 0 90) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 57 "Net-(U2-AVDD)") (pintype "passive") (tstamp cbdfa5e0-8345-497b-945e-4f9fdcd4acb7)) + (net 57 "Net-(#FLG0302-pwr)") (pintype "passive") (tstamp cbdfa5e0-8345-497b-945e-4f9fdcd4acb7)) (pad "2" smd roundrect (at 0.775 0 90) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp 4bb26bd1-364a-4e2a-925e-4ea89efe07fc)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl" @@ -2125,7 +2182,7 @@ (at 163.3 72.65 -90) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "EMK107BJ104KAHT") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -2185,7 +2242,7 @@ (property "Sheetname" "Power") (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/09348fc8-4c3f-471a-93e6-bac86eed2973") (attr through_hole) - (fp_text reference "U7" (at 2.1975 -0.800126 90) (layer "F.SilkS") + (fp_text reference "U7" (at -2.5025 -2.050126 180) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp 294233fb-4066-4c1d-adf6-652a5586e89d) ) @@ -2381,6 +2438,62 @@ (net 1 "GND") (pinfunction "EP") (pintype "power_in") (tstamp 530c1c78-e6c8-4a5d-942b-2ef4a5106775)) ) + (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu") + (tstamp 4e1126b2-d049-48d4-aa49-d96df11532b2) + (at 122.95 137.3 -90) + (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") + (tags "resistor") + (property "MPN" "") + (property "PN" "") + (property "Sheetfile" "power.kicad_sch") + (property "Sheetname" "Power") + (property "ki_description" "Resistor, small symbol") + (property "ki_keywords" "R resistor") + (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/52da1068-fc49-4e26-9f89-b6181d7abdaf") + (attr smd) + (fp_text reference "R45" (at 3.1 -0.1 90) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 89ce2c54-c3aa-4e31-be77-e46e67e713ad) + ) + (fp_text value "2k" (at 0 1.43 90) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 341b9276-ad19-4435-bc8c-968d1cafc740) + ) + (fp_text user "${REFERENCE}" (at 0 0 90) (layer "F.Fab") + (effects (font (size 0.4 0.4) (thickness 0.06))) + (tstamp a7644439-421a-4e17-83d5-6c8f44706121) + ) + (fp_line (start -0.237258 -0.5225) (end 0.237258 -0.5225) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 334d6269-78f1-44c7-9f1b-3bc4e3f453ab)) + (fp_line (start -0.237258 0.5225) (end 0.237258 0.5225) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 4cbf8828-6404-44e9-bcba-ced8aeb5d75d)) + (fp_line (start -1.48 -0.73) (end 1.48 -0.73) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 50177cbd-8717-44b1-be44-0b6af7da1884)) + (fp_line (start -1.48 0.73) (end -1.48 -0.73) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6f77aa76-28b5-4a64-aff6-02370ed8ef08)) + (fp_line (start 1.48 -0.73) (end 1.48 0.73) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 53340235-aeab-4fc7-a946-c9c31ee1636a)) + (fp_line (start 1.48 0.73) (end -1.48 0.73) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp fe0ca1fa-2d91-47ea-b57f-6e367d35dbff)) + (fp_line (start -0.8 -0.4125) (end 0.8 -0.4125) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp a8bfa787-484e-42e3-a003-f23f8c0e22a4)) + (fp_line (start -0.8 0.4125) (end -0.8 -0.4125) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 048ec72d-0839-470a-8cbf-bb90bc59a28d)) + (fp_line (start 0.8 -0.4125) (end 0.8 0.4125) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c601d491-2677-453d-8318-78300efcd79f)) + (fp_line (start 0.8 0.4125) (end -0.8 0.4125) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 87ce63d2-c609-4c7a-a0e1-33b4599fe45a)) + (pad "1" smd roundrect (at -0.825 0 270) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 102 "Net-(U5-PROG1)") (pintype "passive") (tstamp ff4429c0-037c-49d4-be78-aea6799aff19)) + (pad "2" smd roundrect (at 0.825 0 270) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 1 "GND") (pintype "passive") (tstamp 69e74978-7cfe-49cf-a301-6cf502823401)) + (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") (tstamp 4fcccb39-575f-4cfb-8e8c-70fda3772a18) (at 156.4 141.8 90) @@ -2538,7 +2651,7 @@ (fp_line (start 1 0.625) (end -1 0.625) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 8479002e-e3fe-4984-a198-2e08336daf28)) (pad "1" smd roundrect (at -0.95 0 90) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 60 "Net-(J4-VDD)") (pintype "passive") (tstamp 7820c3b8-2db9-4ca1-8bb8-aa616a9bc287)) + (net 61 "Net-(#FLG0401-pwr)") (pintype "passive") (tstamp 7820c3b8-2db9-4ca1-8bb8-aa616a9bc287)) (pad "2" smd roundrect (at 0.95 0 90) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp 0566779b-2e70-49be-8526-93cca9bfb576)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" @@ -2716,7 +2829,7 @@ (property "ki_keywords" "capacitor cap") (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/6ed67879-4bc3-48c3-a925-594c9c7a33c3") (attr smd) - (fp_text reference "C32" (at -0.9 -2.25 -180) (layer "F.SilkS") + (fp_text reference "C32" (at 2.5 0.45 -180) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp d1ad7c9c-63d8-41ef-9238-22ee870e614b) ) @@ -2749,7 +2862,7 @@ (fp_line (start 1 0.625) (end -1 0.625) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 81dba473-2ce2-4749-b5b3-4c13ef725d34)) (pad "1" smd roundrect (at -0.95 0 270) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 42 "/Power/VBUS_SWITCHED") (pintype "passive") (tstamp 9da9f3c8-7b52-40ab-97e9-83c97d2dd2af)) + (net 129 "Net-(#FLG0202-pwr)") (pintype "passive") (tstamp 9da9f3c8-7b52-40ab-97e9-83c97d2dd2af)) (pad "2" smd roundrect (at 0.95 0 270) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp 93c45ff5-7bc3-4594-8db0-27641497d32b)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" @@ -2764,7 +2877,7 @@ (at 151.925 56.95 180) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "EMK107BJ104KAHT") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -2917,7 +3030,7 @@ (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 78e20471-430d-4cce-ab0b-727dc8a5a64b)) (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 67 "Net-(J7-Pin_1)") (pintype "passive") (tstamp 93d0e875-0daf-41cb-a11a-ea1b401aa28e)) + (net 60 "Net-(U5-V_{BAT_SENSE})") (pintype "passive") (tstamp 93d0e875-0daf-41cb-a11a-ea1b401aa28e)) (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 3 "BAT_LEVEL") (pintype "passive") (tstamp 38fc3e8c-89ec-4289-89be-a9807a877417)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" @@ -2973,7 +3086,7 @@ (fp_line (start 0.8 0.4) (end -0.8 0.4) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7e7a1908-c158-4f7c-b07f-edb397867275)) (pad "1" smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 57 "Net-(U2-AVDD)") (pintype "passive") (tstamp c63bd96b-104b-4541-b89f-74068ed7c330)) + (net 57 "Net-(#FLG0302-pwr)") (pintype "passive") (tstamp c63bd96b-104b-4541-b89f-74068ed7c330)) (pad "2" smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 54 "+3V3") (pintype "passive") (tstamp 85190cf7-ca86-4ded-bf4e-eabdf46734fb)) (model "${KICAD6_3DMODEL_DIR}/Inductor_SMD.3dshapes/L_0603_1608Metric.wrl" @@ -3047,7 +3160,7 @@ (at 149.5 65.275 90) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "GRM188R61E475KE11D") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -3110,7 +3223,7 @@ (property "ki_keywords" "inductor choke coil reactor magnetic") (path "/95ebd080-f1a4-4b69-a48e-212b411b4fc8") (attr smd) - (fp_text reference "L2" (at 0.025 1.9 90) (layer "F.SilkS") + (fp_text reference "L2" (at 2.675 -0.1 -180) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp e756e0fc-e2c7-4626-a3cf-f9e13237f4d2) ) @@ -3145,7 +3258,7 @@ (pad "1" smd roundrect (at -1.075 0 270) (size 1.25 2.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) (net 54 "+3V3") (pintype "passive") (tstamp 2b44e14a-44f6-4d8b-ab6d-f8602c284b85)) (pad "2" smd roundrect (at 1.075 0 270) (size 1.25 2.2) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) - (net 61 "Net-(U8-VDDIN)") (pintype "passive") (tstamp 8b2e8f82-0d01-42e1-a809-78716f2034ee)) + (net 128 "Net-(#FLG0101-pwr)") (pintype "passive") (tstamp 8b2e8f82-0d01-42e1-a809-78716f2034ee)) (model "${KICAD6_3DMODEL_DIR}/Inductor_SMD.3dshapes/L_1008_2520Metric.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -3457,7 +3570,7 @@ (pad "1" smd roundrect (at -0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 98 "Net-(U5-VPCC)") (pintype "passive") (tstamp 793c27d1-ee56-457b-b8f2-96798d54566a)) (pad "2" smd roundrect (at 0.825 0) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 42 "/Power/VBUS_SWITCHED") (pintype "passive") (tstamp 78d33cca-c417-4d1c-90c2-6f8e93de5143)) + (net 129 "Net-(#FLG0202-pwr)") (pintype "passive") (tstamp 78d33cca-c417-4d1c-90c2-6f8e93de5143)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -3615,7 +3728,7 @@ (pad "1" smd rect (at -1.5 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (net 41 "AMP_EN") (pinfunction "SD_LC") (pintype "input") (tstamp ee45cd15-1832-4cd8-aa3d-7e9bb2225463)) (pad "2" smd rect (at -1 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 57 "Net-(U2-AVDD)") (pinfunction "CPVDD") (pintype "power_in") (tstamp e2f335d2-c93c-47da-bd29-1c9e23dc6d5b)) + (net 57 "Net-(#FLG0302-pwr)") (pinfunction "CPVDD") (pintype "power_in") (tstamp e2f335d2-c93c-47da-bd29-1c9e23dc6d5b)) (pad "3" smd rect (at -0.5 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (net 65 "Net-(U2-CCP+)") (pinfunction "CCP+") (pintype "passive") (tstamp ce65c71e-0047-4975-846b-f10f621f06db)) (pad "4" smd rect (at 0 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") @@ -3623,13 +3736,13 @@ (pad "5" smd rect (at 0.5 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (net 66 "Net-(U2-CCP-)") (pinfunction "CCP-") (pintype "passive") (tstamp c719c30b-edc2-4845-a0ea-dcbc87f6e93d)) (pad "6" smd rect (at 1 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 55 "Net-(U2--AVDD)") (pinfunction "VCP_OUT") (pintype "power_in") (tstamp 2593d001-ea38-400f-97be-8d8bf033b588)) + (net 55 "Net-(#FLG0301-pwr)") (pinfunction "VCP_OUT") (pintype "power_in") (tstamp 2593d001-ea38-400f-97be-8d8bf033b588)) (pad "7" smd rect (at 1.5 1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 55 "Net-(U2--AVDD)") (pinfunction "-AVDD") (pintype "power_in") (tstamp 09409992-25be-4927-a4de-48d74e23005e)) + (net 55 "Net-(#FLG0301-pwr)") (pinfunction "-AVDD") (pintype "power_in") (tstamp 09409992-25be-4927-a4de-48d74e23005e)) (pad "8" smd rect (at 1.5 -1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (net 70 "Net-(U2-L_OUT)") (pinfunction "L_OUT") (pintype "output") (tstamp 0b43b29e-37e4-40b5-8d18-fa8fc18f5288)) (pad "9" smd rect (at 1 -1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 57 "Net-(U2-AVDD)") (pinfunction "AVDD") (pintype "power_in") (tstamp 62ee28ae-4543-4397-bcfb-eedd5a5400ab)) + (net 57 "Net-(#FLG0302-pwr)") (pinfunction "AVDD") (pintype "power_in") (tstamp 62ee28ae-4543-4397-bcfb-eedd5a5400ab)) (pad "10" smd rect (at 0.5 -1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (net 93 "Net-(U2-L_IN)") (pinfunction "L_IN") (pintype "input") (tstamp f6f59c33-08f1-4132-87dd-6bbfd4774465)) (pad "11" smd rect (at 0 -1.4 90) (size 0.25 0.6) (layers "F.Cu" "F.Paste" "F.Mask") @@ -4142,7 +4255,7 @@ (at 165.55 63.2 180) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "EMK107BJ104KAHT") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -4198,7 +4311,7 @@ (at 143.8 55.35 180) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "C1608X5R1H222K080AA") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -4533,6 +4646,61 @@ ) ) + (footprint "Fuse:Fuse_1206_3216Metric" (layer "F.Cu") + (tstamp b305016e-8b98-46b3-95de-57905ced4097) + (at 136.5 131.2) + (descr "Fuse SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator") + (tags "fuse") + (property "MPN" "SMD1206B075TF/16") + (property "Sheetfile" "power.kicad_sch") + (property "Sheetname" "Power") + (property "ki_description" "Resettable fuse, polymeric positive temperature coefficient, small symbol") + (property "ki_keywords" "resettable fuse PTC PPTC polyfuse polyswitch") + (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/a221dce7-6d2b-4e12-aa30-033d8527a39d") + (attr smd) + (fp_text reference "F2" (at 1.35 -1.7) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 49bb8c24-74a5-4bde-970e-e71d7372c95e) + ) + (fp_text value "750mA hold, 1.5A trip" (at 0 1.82) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp b4d293a3-e74a-47d1-bd27-07530c14192f) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.8 0.8) (thickness 0.12))) + (tstamp 6831d6e9-f63a-48b5-8b62-addfa596ae94) + ) + (fp_line (start -0.602064 -0.91) (end 0.602064 -0.91) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 161cb8f9-854d-43c4-9095-b66c78449c1e)) + (fp_line (start -0.602064 0.91) (end 0.602064 0.91) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 8a46ae29-9f54-4447-83a6-4cc3587d5774)) + (fp_line (start -2.28 -1.12) (end 2.28 -1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ef993197-c0b9-4508-87b6-73805de4af72)) + (fp_line (start -2.28 1.12) (end -2.28 -1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 19bd9225-2797-4b18-b45d-56baa401cf04)) + (fp_line (start 2.28 -1.12) (end 2.28 1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 05eb03b8-e5ff-48bb-a106-b549014e8b8e)) + (fp_line (start 2.28 1.12) (end -2.28 1.12) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 99ec466a-fc16-49e4-9969-193de51c8dea)) + (fp_line (start -1.6 -0.8) (end 1.6 -0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 05333a1f-4ddd-44e1-97af-feb9ab618dac)) + (fp_line (start -1.6 0.8) (end -1.6 -0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp b2c3490c-d38b-4883-b55e-4d567ad7ce58)) + (fp_line (start 1.6 -0.8) (end 1.6 0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1c0d6e86-46b7-4c3d-9fba-6ce69b3a1be5)) + (fp_line (start 1.6 0.8) (end -1.6 0.8) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f65ca7ec-b049-42cd-bfd3-b41f94957a3d)) + (pad "1" smd roundrect (at -1.4 0) (size 1.25 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) + (net 129 "Net-(#FLG0202-pwr)") (pintype "passive") (tstamp 1fc0be71-5ee7-4355-b1a5-d2001d6d3660)) + (pad "2" smd roundrect (at 1.4 0) (size 1.25 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.2) + (net 42 "/Power/VBUS_SWITCHED") (pintype "passive") (tstamp 134a7124-8d86-4edb-8df8-1ce801907ccb)) + (model "${KICAD6_3DMODEL_DIR}/Fuse.3dshapes/Fuse_1206_3216Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu") (tstamp b5784622-9d0d-4e0f-b915-40e27f0379c0) (at 159.8 105.575 90) @@ -4594,7 +4762,7 @@ (at 161.45 56.725 90) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "EMK107BJ104KAHT") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -4998,7 +5166,7 @@ (property "ki_keywords" "32-bit ARM Cortex-M0+ MCU Microcontroller") (path "/f07801c9-1ad2-4b77-b09e-878267921424") (attr smd) - (fp_text reference "U8" (at 4.55 -4.65) (layer "F.SilkS") + (fp_text reference "U8" (at -4.25 -4.55) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp 81b30705-54e0-41cb-9a7f-519a42dc10d4) ) @@ -5105,7 +5273,7 @@ (pad "29" smd rect (at -0.4 -4.25 270) (size 1.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (net 69 "Net-(U8-VDDCORE)") (pinfunction "VDDCORE") (pintype "power_out") (tstamp 1c1a1d56-c75a-4348-b270-69b0dc329483)) (pad "30" smd rect (at -1.2 -4.25 270) (size 1.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") - (net 61 "Net-(U8-VDDIN)") (pinfunction "VDDIN") (pintype "power_in") (tstamp b55a4e28-eb82-4f51-a3e6-4438f86f33de)) + (net 128 "Net-(#FLG0101-pwr)") (pinfunction "VDDIN") (pintype "power_in") (tstamp b55a4e28-eb82-4f51-a3e6-4438f86f33de)) (pad "31" smd rect (at -2 -4.25 270) (size 1.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") (net 13 "/SWD.SWCLK") (pinfunction "SWCLK") (pintype "bidirectional") (tstamp f377c77a-9c53-428b-8851-df418f9d7579)) (pad "32" smd rect (at -2.8 -4.25 270) (size 1.6 0.55) (layers "F.Cu" "F.Paste" "F.Mask") @@ -5237,7 +5405,7 @@ (at 147.775 55.35) (descr "Capacitor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor") - (property "MPN" "") + (property "MPN" "C1608X5R1H222K080AA") (property "PN" "") (property "Sheetfile" "audio.kicad_sch") (property "Sheetname" "Audio") @@ -5601,7 +5769,7 @@ (fp_line (start 1 0.625) (end -1 0.625) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 686bb9c0-3b93-40e5-a6f7-8731ff7e8df1)) (pad "1" smd roundrect (at -0.95 0 270) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 61 "Net-(U8-VDDIN)") (pintype "passive") (tstamp a0cd30cb-a3f8-4798-8c36-04796191df62)) + (net 128 "Net-(#FLG0101-pwr)") (pintype "passive") (tstamp a0cd30cb-a3f8-4798-8c36-04796191df62)) (pad "2" smd roundrect (at 0.95 0 270) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp 55391fe9-3843-4de5-a332-8886eeee7d7b)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" @@ -5826,7 +5994,7 @@ (pad "1" smd roundrect (at -0.775 0 180) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp 059583cd-04c0-47d4-a405-ae363c5a1a9d)) (pad "2" smd roundrect (at 0.775 0 180) (size 0.9 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 55 "Net-(U2--AVDD)") (pintype "passive") (tstamp 0d9e85ea-7e0a-4457-83e2-165d298d31f2)) + (net 55 "Net-(#FLG0301-pwr)") (pintype "passive") (tstamp 0d9e85ea-7e0a-4457-83e2-165d298d31f2)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0603_1608Metric.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -6216,7 +6384,7 @@ (pad "1" smd roundrect (at -0.95 0 90) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "GND") (pintype "passive") (tstamp b23a516d-4608-46b4-8bda-409423a91ab4)) (pad "2" smd roundrect (at 0.95 0 90) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 61 "Net-(U8-VDDIN)") (pintype "passive") (tstamp f0886762-53fc-4929-839c-5e2a27648f4e)) + (net 128 "Net-(#FLG0101-pwr)") (pintype "passive") (tstamp f0886762-53fc-4929-839c-5e2a27648f4e)) (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -6753,7 +6921,7 @@ (property "ki_keywords" "R resistor") (path "/a46377c2-b5e0-47a0-ab83-f2feb3bc1f6a/2508ede4-9915-4302-a20d-1df71873819d") (attr smd) - (fp_text reference "R33" (at 0 -1.43) (layer "F.SilkS") + (fp_text reference "R33" (at -2.9 -0.15) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp cc8472e4-2548-4898-a0e1-4738e6836a45) ) @@ -6786,7 +6954,7 @@ (fp_line (start 0.8 0.4125) (end -0.8 0.4125) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 081c6471-55fb-46a8-bb45-f58dae76369a)) (pad "1" smd roundrect (at -0.825 0 180) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 60 "Net-(J4-VDD)") (pintype "passive") (tstamp f8a74f3b-4e6f-41ed-b454-3f668f3eafdf)) + (net 61 "Net-(#FLG0401-pwr)") (pintype "passive") (tstamp f8a74f3b-4e6f-41ed-b454-3f668f3eafdf)) (pad "2" smd roundrect (at 0.825 0 180) (size 0.8 0.95) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 84 "Net-(J4-DAT2)") (pintype "passive") (tstamp b621213b-88f6-43fe-8401-f16a78bce747)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" @@ -6864,7 +7032,7 @@ (property "ki_keywords" "R resistor") (path "/4561b50a-f368-4def-a9f2-05227ed6a1b2") (attr smd) - (fp_text reference "R32" (at -6.775 -0.1) (layer "F.SilkS") + (fp_text reference "R32" (at 2.225 -0.8 90) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) (tstamp 794f5310-77ec-4f8d-9470-ad7d31a3176b) ) @@ -7297,61 +7465,9 @@ ) ) - (footprint "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (layer "B.Cu") - (tstamp 4e1126b2-d049-48d4-aa49-d96df11532b2) - (at 122.95 136.35 -90) - (descr "Resistor, Axial_DIN0204 series, Axial, Vertical, pin pitch=2.54mm, 0.167W, length*diameter=3.6*1.6mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf") - (tags "Resistor Axial_DIN0204 series Axial Vertical pin pitch 2.54mm 0.167W length 3.6mm diameter 1.6mm") - (property "MPN" "") - (property "PN" "") - (property "Sheetfile" "power.kicad_sch") - (property "Sheetname" "Power") - (property "ki_description" "Resistor, small symbol") - (property "ki_keywords" "R resistor") - (path "/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda/52da1068-fc49-4e26-9f89-b6181d7abdaf") - (attr through_hole) - (fp_text reference "R45" (at -2.55 -0.1 90) (layer "B.SilkS") hide - (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp f4ffba7b-d3d8-4388-ac51-f17afa4d4168) - ) - (fp_text value "2k" (at 1.27 -1.92 90) (layer "B.Fab") - (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 726fd236-a7da-408b-84b1-319f92bd91d0) - ) - (fp_text user "${REFERENCE}" (at 1.27 1.92 90) (layer "B.Fab") - (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp c9c14924-9bff-43fe-8217-be336bd3c0a5) - ) - (fp_line (start 0.92 0) (end 1.54 0) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 5be9f69a-d660-45ca-a8ce-a3c44da37d40)) - (fp_circle (center 0 0) (end 0.92 0) - (stroke (width 0.12) (type solid)) (fill none) (layer "B.SilkS") (tstamp ec29315b-6875-487f-b337-2500e0e0744c)) - (fp_line (start -1.05 -1.05) (end 3.49 -1.05) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp c6d59fde-3050-4d19-9c62-465dd094ad83)) - (fp_line (start -1.05 1.05) (end -1.05 -1.05) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 63b52cc5-47f9-4dfd-ae22-3ef0ad2e310b)) - (fp_line (start 3.49 -1.05) (end 3.49 1.05) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 013e41a1-ca38-4166-882e-97544d5c9643)) - (fp_line (start 3.49 1.05) (end -1.05 1.05) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 14475891-1e36-432f-95b5-d3cbce85569d)) - (fp_line (start 0 0) (end 2.54 0) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp b27753ef-153b-42b5-9881-362ecbb27338)) - (fp_circle (center 0 0) (end 0.8 0) - (stroke (width 0.1) (type solid)) (fill none) (layer "B.Fab") (tstamp 66a0baf4-6475-418d-bc7c-547d2b1bbc54)) - (pad "1" thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.7) (layers "*.Cu" "*.Mask") - (net 102 "Net-(U5-PROG1)") (pintype "passive") (tstamp 893dd4c9-1770-4185-b981-70e2ad990356)) - (pad "2" thru_hole oval (at 2.54 0 270) (size 1.4 1.4) (drill 0.7) (layers "*.Cu" "*.Mask") - (net 1 "GND") (pintype "passive") (tstamp 68dcd256-ed94-4809-ad2e-721bd87ed34c)) - (model "${KICAD6_3DMODEL_DIR}/Resistor_THT.3dshapes/R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical.wrl" - (offset (xyz 0 0 0)) - (scale (xyz 1 1 1)) - (rotate (xyz 0 0 0)) - ) - ) - (footprint "Connector_JST:JST_PH_S3B-PH-K_1x03_P2.00mm_Horizontal" (layer "B.Cu") (tstamp 6093f9f7-b248-4132-810a-09e7a6cd7ed2) - (at 126.7 141.4) + (at 126.65 141.9) (descr "JST PH series connector, S3B-PH-K (http://www.jst-mfg.com/product/pdf/eng/ePH.pdf), generated with kicad-footprint-generator") (tags "connector JST PH top entry") (property "PN" "") @@ -7700,7 +7816,7 @@ (pad "3" smd rect (at 1.075 14.95 270) (size 1.1 2) (layers "B.Cu" "B.Paste" "B.Mask") (net 1 "GND") (pinfunction "VSS") (pintype "power_in") (tstamp 51dc7f52-124a-4b48-9b73-c704e55aab01)) (pad "4" smd rect (at -1.425 14.95 270) (size 1.1 2) (layers "B.Cu" "B.Paste" "B.Mask") - (net 60 "Net-(J4-VDD)") (pinfunction "VDD") (pintype "power_in") (tstamp 6b32e5db-0082-42b7-a76b-032656df1abc)) + (net 61 "Net-(#FLG0401-pwr)") (pinfunction "VDD") (pintype "power_in") (tstamp 6b32e5db-0082-42b7-a76b-032656df1abc)) (pad "5" smd rect (at -3.925 14.95 270) (size 1.1 2) (layers "B.Cu" "B.Paste" "B.Mask") (net 81 "Net-(J4-CLK)") (pinfunction "CLK") (pintype "input") (tstamp 9fbb02c8-e31b-4001-a94a-33d8d583020f)) (pad "6" smd rect (at -6.425 14.95 270) (size 1.1 2) (layers "B.Cu" "B.Paste" "B.Mask") @@ -8606,10 +8722,7 @@ (gr_text "ATSAMD\nSWD" (at 160.5 141) (layer "B.SilkS") (tstamp 175c6636-6e15-4fd2-9c33-98715b9bb0d7) (effects (font (size 0.75 0.75) (thickness 0.125) bold) (justify right bottom mirror)) ) - (gr_text "PROG3" (at 119.45 135.15 -90) (layer "B.SilkS") (tstamp 1fb58a22-06a9-4275-b751-b993606ecb25) - (effects (font (size 1 1) (thickness 0.15)) (justify left bottom mirror)) - ) - (gr_text "PROG1" (at 122.3 135.15 -90) (layer "B.SilkS") (tstamp 4095c515-f344-4883-9dc4-96584ad185c3) + (gr_text "PROG" (at 119.45 135.15 270) (layer "B.SilkS") (tstamp 1fb58a22-06a9-4275-b751-b993606ecb25) (effects (font (size 1 1) (thickness 0.15)) (justify left bottom mirror)) ) (gr_text "ESP32\nJTAG" (at 146.2 76.55) (layer "B.SilkS") (tstamp d07690ab-694e-4ea1-8bb8-85dd0690783b) @@ -8910,13 +9023,14 @@ (segment (start 122.6 129.25) (end 123.45 129.25) (width 0.254) (layer "F.Cu") (net 15) (tstamp 643c1901-b302-4537-89bc-1c94bd1cf7bc)) (segment (start 123.45 129.25) (end 123.4625 129.2625) (width 0.254) (layer "F.Cu") (net 15) (tstamp cc417a54-727c-488b-8cae-9f598662e734)) (via (at 122.6 129.25) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 15) (tstamp 26201c92-8d1c-4913-a35a-2ef7e4f46c34)) - (segment (start 126.95 137.65) (end 130.7 141.4) (width 0.254) (layer "B.Cu") (net 15) (tstamp 12a9ce3b-edcc-4a63-957d-461534645b64)) - (segment (start 121.7 128.35) (end 120.35 128.35) (width 0.254) (layer "B.Cu") (net 15) (tstamp 4c1a2056-4366-4e95-a048-69b876a67221)) - (segment (start 118.95 129.75) (end 118.95 137.1) (width 0.254) (layer "B.Cu") (net 15) (tstamp 87353ffd-29be-4081-8e1e-38c5b4a715b0)) - (segment (start 118.95 137.1) (end 119.5 137.65) (width 0.254) (layer "B.Cu") (net 15) (tstamp 889d13d7-545a-4fa1-b386-063d4711b497)) - (segment (start 120.35 128.35) (end 118.95 129.75) (width 0.254) (layer "B.Cu") (net 15) (tstamp 8ca668ff-73e5-4004-8d67-b28b22172d97)) - (segment (start 119.5 137.65) (end 126.95 137.65) (width 0.254) (layer "B.Cu") (net 15) (tstamp 9e2d2c6a-80ad-4367-b49a-cbc1e073dbf5)) - (segment (start 122.6 129.25) (end 121.7 128.35) (width 0.254) (layer "B.Cu") (net 15) (tstamp ec19aed2-72be-497b-9d7e-750eb6f908b1)) + (segment (start 122.6 129.25) (end 121.7 128.35) (width 0.254) (layer "B.Cu") (net 15) (tstamp 22a1cbb9-5748-4c25-81b0-4f96a37d5108)) + (segment (start 118.95 129.75) (end 118.95 137.1) (width 0.254) (layer "B.Cu") (net 15) (tstamp 3d215390-eb36-4de0-854c-f08aef8cdc0b)) + (segment (start 119.5 137.65) (end 127.15 137.65) (width 0.254) (layer "B.Cu") (net 15) (tstamp 4644113b-1809-47d3-b0c9-ff218d16816b)) + (segment (start 120.35 128.35) (end 118.95 129.75) (width 0.254) (layer "B.Cu") (net 15) (tstamp 628d668e-cb97-45df-bcc4-260b28a874e4)) + (segment (start 127.15 137.65) (end 130.65 141.15) (width 0.254) (layer "B.Cu") (net 15) (tstamp 6b6b70e3-9994-426d-abc3-26820718feeb)) + (segment (start 118.95 137.1) (end 119.5 137.65) (width 0.254) (layer "B.Cu") (net 15) (tstamp 832fdc41-0d37-4385-8f91-37bf82c3e2da)) + (segment (start 121.7 128.35) (end 120.35 128.35) (width 0.254) (layer "B.Cu") (net 15) (tstamp dfacb624-8994-4e65-887c-75f3dbf0901b)) + (segment (start 130.65 141.15) (end 130.65 141.9) (width 0.254) (layer "B.Cu") (net 15) (tstamp f8847e35-8364-443a-a8e1-dc587ccecdf4)) (segment (start 156.85 133.35) (end 155.7 133.35) (width 0.254) (layer "F.Cu") (net 16) (tstamp 20cdebcf-1785-406d-8496-2df0f02fc8ad)) (segment (start 157.3 133.8) (end 156.85 133.35) (width 0.254) (layer "F.Cu") (net 16) (tstamp 7754bcd8-3d6f-434f-be03-e7a51e05c7ea)) (segment (start 122.525 130.2) (end 121.95 130.2) (width 0.254) (layer "F.Cu") (net 16) (tstamp 7f6b9962-11e6-4708-aec3-20352e253745)) @@ -9364,11 +9478,9 @@ (segment (start 144.6 67.1) (end 144.1 67.6) (width 0.254) (layer "B.Cu") (net 41) (tstamp 4d697e7f-9c61-4c73-a914-463483df0584)) (segment (start 144.6 65.2) (end 144.6 67.1) (width 0.254) (layer "B.Cu") (net 41) (tstamp 603b9597-eafc-4c67-a9b3-5989722d21c9)) (segment (start 144.1 67.6) (end 141.4 67.6) (width 0.254) (layer "B.Cu") (net 41) (tstamp b6f96823-f958-48c3-af7d-015a12bf3c63)) - (segment (start 132.4 131.6) (end 136.75 131.6) (width 0.762) (layer "F.Cu") (net 42) (tstamp 3318f8e2-f7e8-45ab-b771-e8b29b825731)) - (segment (start 137.44 132.29) (end 141.2 132.29) (width 0.762) (layer "F.Cu") (net 42) (tstamp 47651ed4-f811-49e4-9f53-8f95aeaf916a)) - (segment (start 132.625 128.4) (end 132.625 131.375) (width 0.254) (layer "F.Cu") (net 42) (tstamp 51ebf702-e777-4f00-8573-3b99ca4838fe)) - (segment (start 136.75 131.6) (end 137.44 132.29) (width 0.762) (layer "F.Cu") (net 42) (tstamp 608ac554-8688-412e-bdc4-d36000c8a4b7)) - (segment (start 132.625 131.375) (end 132.4 131.6) (width 0.254) (layer "F.Cu") (net 42) (tstamp bd9df624-de4a-493c-a481-fc5ea62310fd)) + (segment (start 141.2 132.29) (end 140.49 132.29) (width 0.762) (layer "F.Cu") (net 42) (tstamp 1e334373-467f-413d-b8bf-574c3b9d2e90)) + (segment (start 139.4 131.2) (end 137.9 131.2) (width 0.762) (layer "F.Cu") (net 42) (tstamp 8f69999f-adbe-459d-bb35-ff18fac02170)) + (segment (start 140.49 132.29) (end 139.4 131.2) (width 0.762) (layer "F.Cu") (net 42) (tstamp c6a274ed-20a5-4488-8f11-900c7e8a3d43)) (segment (start 131.3 81) (end 131.3 81.05) (width 0.254) (layer "F.Cu") (net 43) (tstamp 0d90cef1-6612-41d6-8871-886042c87258)) (segment (start 129.755 78.6) (end 129.755 80.205) (width 0.254) (layer "F.Cu") (net 43) (tstamp 19816050-30c4-4e18-9009-a150b14c34d5)) (segment (start 129.755 78.6) (end 127.155 78.6) (width 0.254) (layer "F.Cu") (net 43) (tstamp 275eefe3-8f50-41a1-b766-d628b3d987da)) @@ -9782,16 +9894,17 @@ (segment (start 147.85 54.25) (end 146.925 55.175) (width 0.254) (layer "F.Cu") (net 56) (tstamp ebceb58c-85a8-427b-a95c-2df0aae51fd6)) (segment (start 146.925 56.925) (end 146.95 56.95) (width 0.254) (layer "F.Cu") (net 56) (tstamp f10489d4-df6d-450a-baf0-8f71d5c318b9)) (segment (start 146.789 66) (end 147.4 66.611) (width 0.254) (layer "F.Cu") (net 57) (tstamp 007799a2-449e-42bb-a411-8256c1ccbecd)) - (segment (start 143.4 61.2) (end 143.4 62.4) (width 0.254) (layer "F.Cu") (net 57) (tstamp 2577e212-1505-4d92-ae21-03635ec6485f)) - (segment (start 144 64) (end 144.2 63.8) (width 0.254) (layer "F.Cu") (net 57) (tstamp 2dc33a2c-fbab-4e25-bd5b-38eac8f608de)) - (segment (start 144.2 62) (end 143.4 61.2) (width 0.254) (layer "F.Cu") (net 57) (tstamp 3560ef52-b6c9-413c-acc6-07181aeb52d1)) + (segment (start 143.4 61.125) (end 143.4 62.4) (width 0.254) (layer "F.Cu") (net 57) (tstamp 2c9ff14a-9046-454e-8fbf-25412ae25920)) + (segment (start 144.2 63.8) (end 144.2 61.65) (width 0.254) (layer "F.Cu") (net 57) (tstamp 3fe245f9-fc67-479f-8b07-092cc90aabee)) (segment (start 146.4 69.2875) (end 146.4875 69.2) (width 0.762) (layer "F.Cu") (net 57) (tstamp 4ebaffca-bb53-4c28-a89e-af1e26d4f4e2)) - (segment (start 143.51 64) (end 144 64) (width 0.254) (layer "F.Cu") (net 57) (tstamp 61973b48-dada-4799-be08-b1747eee659d)) + (segment (start 144 64) (end 144.2 63.8) (width 0.254) (layer "F.Cu") (net 57) (tstamp 4f2398b9-54f6-4e3b-87e7-4974f16bf59c)) (segment (start 146.31 66) (end 146.789 66) (width 0.254) (layer "F.Cu") (net 57) (tstamp 7fd84178-5eae-4b1a-975a-88e52d284874)) - (segment (start 144.2 63.8) (end 144.2 62) (width 0.254) (layer "F.Cu") (net 57) (tstamp 97af8a75-c930-465b-8f15-abada4662f46)) (segment (start 147.4 68.2875) (end 146.4875 69.2) (width 0.254) (layer "F.Cu") (net 57) (tstamp 9a2bf18f-b12e-4b1f-be22-9e9f990727f2)) + (segment (start 143.875 61.325) (end 143 61.325) (width 0.254) (layer "F.Cu") (net 57) (tstamp a60666f8-905a-47f9-b8ed-491c443667a9)) + (segment (start 144.2 61.65) (end 143.875 61.325) (width 0.254) (layer "F.Cu") (net 57) (tstamp acc45e57-1aec-4c0a-9170-6521b8c0baea)) (segment (start 147.4 66.611) (end 147.4 68.2) (width 0.254) (layer "F.Cu") (net 57) (tstamp b08a6429-22c4-4072-a5db-24ee47b16118)) (segment (start 147.4 68.2) (end 147.4 68.2875) (width 0.254) (layer "F.Cu") (net 57) (tstamp bd830d73-6b48-4568-9fe3-7eb9bb127746)) + (segment (start 143.51 64) (end 144 64) (width 0.254) (layer "F.Cu") (net 57) (tstamp d5674f5a-71ee-455c-950e-9ec3d5383b55)) (via (at 143.4 62.4) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 57) (tstamp 0cd576f0-76d2-4597-a950-50828271f01c)) (via (at 147.4 68.2) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 57) (tstamp 2e65858c-a6e5-47b2-a157-41412e7ca49d)) (segment (start 147.2 62.4) (end 147.4 62.6) (width 0.254) (layer "B.Cu") (net 57) (tstamp 43a726db-f27c-4865-94af-a15abc87b5db)) @@ -9810,41 +9923,46 @@ (segment (start 158.35 60.6) (end 156 58.25) (width 0.254) (layer "F.Cu") (net 59) (tstamp e8d63248-cdb0-4422-a1da-aa3d9c76d881)) (segment (start 158.175 63.5375) (end 158.175 62.3) (width 0.254) (layer "F.Cu") (net 59) (tstamp e99a0dc1-54a3-4ac3-bb82-c4b4443fb57e)) (segment (start 144.6 55) (end 144.6 56.8) (width 0.254) (layer "F.Cu") (net 59) (tstamp eda5c8f5-7fca-428b-a6a5-1b0a43660dd2)) - (segment (start 140.8 117.4) (end 140.8 118.8) (width 0.508) (layer "F.Cu") (net 60) (tstamp 0961d889-764e-4f8d-8193-7468b2a75bbc)) - (segment (start 141.25 118.15) (end 142.8 118.15) (width 0.508) (layer "F.Cu") (net 60) (tstamp 0d375a7a-2c8a-4f99-b7f6-81665bbdc315)) - (segment (start 140.8 117.4) (end 140.8 117.7) (width 0.508) (layer "F.Cu") (net 60) (tstamp 5285d7ca-c03e-4a53-b6f6-3d6359af024d)) - (segment (start 142.95 118.3) (end 142.8 118.15) (width 0.508) (layer "F.Cu") (net 60) (tstamp 70e23593-768f-4dcc-a7ca-054acea9e247)) - (segment (start 140.8 117.7) (end 141.25 118.15) (width 0.508) (layer "F.Cu") (net 60) (tstamp 79507992-c97d-4124-a90d-2aa5a34b22bc)) - (segment (start 140.8 118.8) (end 140.8 118.6) (width 0.508) (layer "F.Cu") (net 60) (tstamp 7fe7b8e6-03b5-464d-b9eb-0e3982b453b5)) - (segment (start 143.625 128.2) (end 144.8 128.2) (width 0.254) (layer "F.Cu") (net 60) (tstamp bc780bee-ebde-440d-855c-6fc85ff32c70)) - (segment (start 142.95 120.125) (end 142.95 118.3) (width 0.508) (layer "F.Cu") (net 60) (tstamp d2c823ed-8a28-4277-81f2-6a684b6c6814)) - (segment (start 138.8 105.575) (end 136.825 105.575) (width 0.254) (layer "F.Cu") (net 60) (tstamp d9c323ea-d301-45d8-a993-a7d45233c224)) - (segment (start 136.825 105.575) (end 136.8 105.6) (width 0.254) (layer "F.Cu") (net 60) (tstamp e41d93a8-7b51-484d-9a01-f22699b3b9c2)) - (segment (start 140.8 118.6) (end 141.25 118.15) (width 0.508) (layer "F.Cu") (net 60) (tstamp eccb9994-2570-49ef-b567-3f316fc5dc1a)) - (via (at 144.8 128.2) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 60) (tstamp 0b022ae4-7305-45f4-92d0-6fbf96b27b45)) - (via (at 136.8 105.6) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 60) (tstamp 1acf0064-4c0a-4a76-a57b-525b5d708c57)) - (via (at 140.8 118.8) (size 0.762) (drill 0.281) (layers "F.Cu" "B.Cu") (net 60) (tstamp 91861c25-fc0c-4145-8052-4db6cc651482)) - (via (at 140.8 117.4) (size 0.762) (drill 0.281) (layers "F.Cu" "B.Cu") (net 60) (tstamp c3df51b0-861b-4cb3-9337-3ff5e644b241)) - (segment (start 142.6 107.95) (end 142.6 115.6) (width 0.254) (layer "B.Cu") (net 60) (tstamp 0ca8a757-53c1-47aa-820d-ed026429e5d0)) - (segment (start 144.9 118.8) (end 145.3 119.2) (width 0.254) (layer "B.Cu") (net 60) (tstamp 12c8d48e-9d5e-4e26-a225-53f89228ca76)) - (segment (start 139.925 118.275) (end 140.8 117.4) (width 0.762) (layer "B.Cu") (net 60) (tstamp 36027180-2bbf-4672-a0fb-b1edff46ce2d)) - (segment (start 140.275 118.275) (end 139.925 118.275) (width 0.508) (layer "B.Cu") (net 60) (tstamp 4a076b32-c8be-4ecf-8a74-012ebcea71e1)) - (segment (start 140.8 118.8) (end 144.9 118.8) (width 0.254) (layer "B.Cu") (net 60) (tstamp 4ca41442-ebc4-4d77-adec-ce4a31905c41)) - (segment (start 136.8 105.6) (end 140.25 105.6) (width 0.254) (layer "B.Cu") (net 60) (tstamp 4d320354-f6b7-4f3f-84ff-b66207572541)) - (segment (start 144.1 127.5) (end 144.8 128.2) (width 0.254) (layer "B.Cu") (net 60) (tstamp 9029d179-7bd9-4c07-bcb1-ac3387119c33)) - (segment (start 142.6 115.6) (end 140.8 117.4) (width 0.254) (layer "B.Cu") (net 60) (tstamp a5a8ddfa-eae9-4abc-9309-b84b936d79b0)) - (segment (start 138.8 118.275) (end 139.925 118.275) (width 0.762) (layer "B.Cu") (net 60) (tstamp a5ae7d33-071e-4ec8-b53a-a50beaac1031)) - (segment (start 145.3 119.2) (end 145.3 120.7) (width 0.254) (layer "B.Cu") (net 60) (tstamp a872a0f0-b835-475a-804c-bbae5fb2fee2)) - (segment (start 145.3 120.7) (end 144.1 121.9) (width 0.254) (layer "B.Cu") (net 60) (tstamp ba5d6230-e554-47fd-94dd-23a619376940)) - (segment (start 144.1 121.9) (end 144.1 127.5) (width 0.254) (layer "B.Cu") (net 60) (tstamp e2f63f4c-07cb-4882-815e-313287834ed0)) - (segment (start 140.8 118.8) (end 140.275 118.275) (width 0.508) (layer "B.Cu") (net 60) (tstamp eb91b2d5-5965-4360-ac23-dc2b66ed38a1)) - (segment (start 140.25 105.6) (end 142.6 107.95) (width 0.254) (layer "B.Cu") (net 60) (tstamp fd156147-e4f4-4eb9-a027-7f0708e91ba9)) - (segment (start 166.125 139.15) (end 167 139.15) (width 0.762) (layer "F.Cu") (net 61) (tstamp 229f64b4-2ca4-4fef-b661-f2daa38547a0)) - (segment (start 162.7 140.8) (end 164.475 140.8) (width 0.762) (layer "F.Cu") (net 61) (tstamp 44eba802-62f8-4964-afc8-96c21f125a02)) - (segment (start 161.15 140.05) (end 160.4 140.8) (width 0.254) (layer "F.Cu") (net 61) (tstamp 7786e29b-8041-474e-8d44-ba28e1d46fea)) - (segment (start 161.15 137.2) (end 161.15 140.05) (width 0.254) (layer "F.Cu") (net 61) (tstamp bad2fb5a-3636-4de1-b889-09136984ed6a)) - (segment (start 160.4 140.8) (end 162.7 140.8) (width 0.762) (layer "F.Cu") (net 61) (tstamp cf4d3edb-e322-4bf4-a0bc-f53bcbcdd2cb)) - (segment (start 164.475 140.8) (end 166.125 139.15) (width 0.762) (layer "F.Cu") (net 61) (tstamp ed191a52-ce87-43e0-bbc8-e2cccfce6bb1)) + (segment (start 126.6 136.25) (end 127.1 136.75) (width 0.762) (layer "F.Cu") (net 60) (tstamp 00afe3a9-4c62-4e63-8e0f-2d5bf0b3d138)) + (segment (start 126.6 134.85) (end 126.6 136.25) (width 0.762) (layer "F.Cu") (net 60) (tstamp 1b2f0cd6-d589-4548-a889-2d8f1d8588fe)) + (segment (start 126.7 134.75) (end 126.6 134.85) (width 0.762) (layer "F.Cu") (net 60) (tstamp 2b0be952-a3df-485a-907a-a144ebcf1dd7)) + (segment (start 129.5 137.35) (end 129.5 138.65) (width 0.762) (layer "F.Cu") (net 60) (tstamp 503f2602-5963-4af0-b80b-2abd74cacc80)) + (segment (start 134.8 141) (end 132.65 141) (width 0.254) (layer "F.Cu") (net 60) (tstamp 5cda1ebe-939a-4f49-9caf-2d5be90371da)) + (segment (start 127.1 136.75) (end 128.9 136.75) (width 0.762) (layer "F.Cu") (net 60) (tstamp 7505bf4d-13ff-44a1-aab9-bb9a2a95cb69)) + (segment (start 130.3 138.65) (end 129.5 138.65) (width 0.254) (layer "F.Cu") (net 60) (tstamp 7ace0379-b2c8-48b5-a76d-314d0cfa0f42)) + (segment (start 128.9 136.75) (end 129.5 137.35) (width 0.762) (layer "F.Cu") (net 60) (tstamp 916149aa-3d04-450b-84b9-4c56f4452d24)) + (segment (start 132.65 141) (end 130.3 138.65) (width 0.254) (layer "F.Cu") (net 60) (tstamp aebe1721-dec2-429c-9355-e43360befbcc)) + (segment (start 129.5 138.25) (end 129.5 138.65) (width 0.508) (layer "F.Cu") (net 60) (tstamp cd933d96-6d59-4111-8d16-4c481a69bbef)) + (segment (start 126.45 134.8) (end 126.45 135.2) (width 0.508) (layer "F.Cu") (net 60) (tstamp e57e0f13-ef36-46e6-8f1c-affb596259f5)) + (segment (start 140.8 117.4) (end 140.8 118.8) (width 0.508) (layer "F.Cu") (net 61) (tstamp 0961d889-764e-4f8d-8193-7468b2a75bbc)) + (segment (start 141.25 118.15) (end 142.8 118.15) (width 0.508) (layer "F.Cu") (net 61) (tstamp 0d375a7a-2c8a-4f99-b7f6-81665bbdc315)) + (segment (start 140.8 117.4) (end 140.8 117.7) (width 0.508) (layer "F.Cu") (net 61) (tstamp 5285d7ca-c03e-4a53-b6f6-3d6359af024d)) + (segment (start 142.95 118.3) (end 142.8 118.15) (width 0.508) (layer "F.Cu") (net 61) (tstamp 70e23593-768f-4dcc-a7ca-054acea9e247)) + (segment (start 140.8 117.7) (end 141.25 118.15) (width 0.508) (layer "F.Cu") (net 61) (tstamp 79507992-c97d-4124-a90d-2aa5a34b22bc)) + (segment (start 140.8 118.8) (end 140.8 118.6) (width 0.508) (layer "F.Cu") (net 61) (tstamp 7fe7b8e6-03b5-464d-b9eb-0e3982b453b5)) + (segment (start 143.625 128.2) (end 144.8 128.2) (width 0.254) (layer "F.Cu") (net 61) (tstamp bc780bee-ebde-440d-855c-6fc85ff32c70)) + (segment (start 142.95 120.125) (end 142.95 118.3) (width 0.508) (layer "F.Cu") (net 61) (tstamp d2c823ed-8a28-4277-81f2-6a684b6c6814)) + (segment (start 138.8 105.575) (end 136.825 105.575) (width 0.254) (layer "F.Cu") (net 61) (tstamp d9c323ea-d301-45d8-a993-a7d45233c224)) + (segment (start 136.825 105.575) (end 136.8 105.6) (width 0.254) (layer "F.Cu") (net 61) (tstamp e41d93a8-7b51-484d-9a01-f22699b3b9c2)) + (segment (start 140.8 118.6) (end 141.25 118.15) (width 0.508) (layer "F.Cu") (net 61) (tstamp eccb9994-2570-49ef-b567-3f316fc5dc1a)) + (via (at 144.8 128.2) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 61) (tstamp 0b022ae4-7305-45f4-92d0-6fbf96b27b45)) + (via (at 136.8 105.6) (size 0.6) (drill 0.2) (layers "F.Cu" "B.Cu") (net 61) (tstamp 1acf0064-4c0a-4a76-a57b-525b5d708c57)) + (via (at 140.8 118.8) (size 0.762) (drill 0.281) (layers "F.Cu" "B.Cu") (net 61) (tstamp 91861c25-fc0c-4145-8052-4db6cc651482)) + (via (at 140.8 117.4) (size 0.762) (drill 0.281) (layers "F.Cu" "B.Cu") (net 61) (tstamp c3df51b0-861b-4cb3-9337-3ff5e644b241)) + (segment (start 142.6 107.95) (end 142.6 115.6) (width 0.254) (layer "B.Cu") (net 61) (tstamp 0ca8a757-53c1-47aa-820d-ed026429e5d0)) + (segment (start 144.9 118.8) (end 145.3 119.2) (width 0.254) (layer "B.Cu") (net 61) (tstamp 12c8d48e-9d5e-4e26-a225-53f89228ca76)) + (segment (start 139.925 118.275) (end 140.8 117.4) (width 0.762) (layer "B.Cu") (net 61) (tstamp 36027180-2bbf-4672-a0fb-b1edff46ce2d)) + (segment (start 140.275 118.275) (end 139.925 118.275) (width 0.508) (layer "B.Cu") (net 61) (tstamp 4a076b32-c8be-4ecf-8a74-012ebcea71e1)) + (segment (start 140.8 118.8) (end 144.9 118.8) (width 0.254) (layer "B.Cu") (net 61) (tstamp 4ca41442-ebc4-4d77-adec-ce4a31905c41)) + (segment (start 136.8 105.6) (end 140.25 105.6) (width 0.254) (layer "B.Cu") (net 61) (tstamp 4d320354-f6b7-4f3f-84ff-b66207572541)) + (segment (start 144.1 127.5) (end 144.8 128.2) (width 0.254) (layer "B.Cu") (net 61) (tstamp 9029d179-7bd9-4c07-bcb1-ac3387119c33)) + (segment (start 142.6 115.6) (end 140.8 117.4) (width 0.254) (layer "B.Cu") (net 61) (tstamp a5a8ddfa-eae9-4abc-9309-b84b936d79b0)) + (segment (start 138.8 118.275) (end 139.925 118.275) (width 0.762) (layer "B.Cu") (net 61) (tstamp a5ae7d33-071e-4ec8-b53a-a50beaac1031)) + (segment (start 145.3 119.2) (end 145.3 120.7) (width 0.254) (layer "B.Cu") (net 61) (tstamp a872a0f0-b835-475a-804c-bbae5fb2fee2)) + (segment (start 145.3 120.7) (end 144.1 121.9) (width 0.254) (layer "B.Cu") (net 61) (tstamp ba5d6230-e554-47fd-94dd-23a619376940)) + (segment (start 144.1 121.9) (end 144.1 127.5) (width 0.254) (layer "B.Cu") (net 61) (tstamp e2f63f4c-07cb-4882-815e-313287834ed0)) + (segment (start 140.8 118.8) (end 140.275 118.275) (width 0.508) (layer "B.Cu") (net 61) (tstamp eb91b2d5-5965-4360-ac23-dc2b66ed38a1)) + (segment (start 140.25 105.6) (end 142.6 107.95) (width 0.254) (layer "B.Cu") (net 61) (tstamp fd156147-e4f4-4eb9-a027-7f0708e91ba9)) (segment (start 160.767 61.783) (end 160.767 63.5375) (width 0.508) (layer "F.Cu") (net 62) (tstamp 8e140d03-d20a-42dd-ba82-c167c208f550)) (segment (start 159.375 61.45) (end 159.475 61.55) (width 0.508) (layer "F.Cu") (net 63) (tstamp 6a807280-6d99-48e1-aefd-04deda945b10)) (segment (start 159.475 61.55) (end 159.475 63.5375) (width 0.508) (layer "F.Cu") (net 63) (tstamp bd90759c-f89c-4777-b48a-c5fb20807b48)) @@ -9855,15 +9973,8 @@ (segment (start 147.9 66.05) (end 149.5 66.05) (width 0.254) (layer "F.Cu") (net 65) (tstamp 57127d78-7823-4d2f-8be5-38583ddf4e8f)) (segment (start 147.35 65.5) (end 147.9 66.05) (width 0.254) (layer "F.Cu") (net 65) (tstamp f3b6e365-9da9-45b5-976a-d21d6f2f7836)) (segment (start 146.31 64.5) (end 149.5 64.5) (width 0.254) (layer "F.Cu") (net 66) (tstamp d8ce3895-2a7f-44a6-83b8-f1df4ac05554)) - (segment (start 131.8 143.45) (end 132.7 142.55) (width 0.508) (layer "F.Cu") (net 67) (tstamp 1d3dea72-1ffa-4f4b-8dbd-04d8fc188c37)) - (segment (start 127.1 143.45) (end 131.8 143.45) (width 0.508) (layer "F.Cu") (net 67) (tstamp 2295202b-f195-4ffb-8f3f-d7df3e43ac06)) - (segment (start 132.7 142.55) (end 132.7 141.6) (width 0.508) (layer "F.Cu") (net 67) (tstamp 2f0527df-d5f2-434a-929d-3326507f40bf)) - (segment (start 126.7 143.05) (end 127.1 143.45) (width 0.508) (layer "F.Cu") (net 67) (tstamp 56d202e0-a797-4d62-94e2-008e5c58a372)) - (segment (start 126.7 141.4) (end 126.7 143.05) (width 0.508) (layer "F.Cu") (net 67) (tstamp 6e6d794d-8f6c-4b87-ac5a-4b516a1ff651)) - (segment (start 126.7 135.25) (end 126.7 141.4) (width 0.762) (layer "F.Cu") (net 67) (tstamp a81ddf80-f9df-451b-838a-5538a0f889ab)) - (segment (start 126.45 135) (end 126.7 135.25) (width 0.762) (layer "F.Cu") (net 67) (tstamp b29bfc4e-97ec-42c7-b2c6-f94c03f43fe5)) - (segment (start 132.7 141.6) (end 133.3 141) (width 0.508) (layer "F.Cu") (net 67) (tstamp cb30fc9d-b585-4445-98bf-b8e4ea5f8293)) - (segment (start 133.3 141) (end 134.8 141) (width 0.508) (layer "F.Cu") (net 67) (tstamp f9a51fbb-71d3-4278-9417-ee0d9ac16342)) + (segment (start 126.7 141.85) (end 126.65 141.9) (width 0.762) (layer "F.Cu") (net 67) (tstamp 12973989-9018-4bb5-a1c6-85c4545f7d4a)) + (segment (start 126.7 138.65) (end 126.7 141.85) (width 0.762) (layer "F.Cu") (net 67) (tstamp 58d8c82a-b4f9-4f90-b4ee-8d0f6e7210bf)) (segment (start 150.23 140.42) (end 150.25 140.4) (width 0.762) (layer "F.Cu") (net 68) (tstamp 1658c786-175d-4833-bd87-7dc9b7fd88a5)) (segment (start 150.25 142.7625) (end 150.2875 142.8) (width 0.762) (layer "F.Cu") (net 68) (tstamp 2d69eacb-c760-4bc6-a1dd-f54132fd5d4e)) (segment (start 147.825 141.425) (end 149.2 142.8) (width 0.762) (layer "F.Cu") (net 68) (tstamp 67d80e95-b86c-4ece-a558-b262625bd830)) @@ -10074,6 +10185,16 @@ (segment (start 133.3 84.75) (end 135 86.45) (width 0.254) (layer "B.Cu") (net 106) (tstamp b8d692c1-bcd7-429f-955e-4f5b5d1e4e02)) (segment (start 148.95 120.5) (end 148.95 112.35) (width 0.254) (layer "B.Cu") (net 106) (tstamp fb2e8e41-581c-46d4-8588-f0352320a0bd)) (segment (start 151.55 123.1) (end 148.95 120.5) (width 0.254) (layer "B.Cu") (net 106) (tstamp fbfc8c1c-bdc3-4ae6-9a35-f38de3ba910f)) + (segment (start 166.125 139.15) (end 167 139.15) (width 0.762) (layer "F.Cu") (net 128) (tstamp 229f64b4-2ca4-4fef-b661-f2daa38547a0)) + (segment (start 162.7 140.8) (end 164.475 140.8) (width 0.762) (layer "F.Cu") (net 128) (tstamp 44eba802-62f8-4964-afc8-96c21f125a02)) + (segment (start 161.15 140.05) (end 160.4 140.8) (width 0.254) (layer "F.Cu") (net 128) (tstamp 7786e29b-8041-474e-8d44-ba28e1d46fea)) + (segment (start 161.15 137.2) (end 161.15 140.05) (width 0.254) (layer "F.Cu") (net 128) (tstamp bad2fb5a-3636-4de1-b889-09136984ed6a)) + (segment (start 160.4 140.8) (end 162.7 140.8) (width 0.762) (layer "F.Cu") (net 128) (tstamp cf4d3edb-e322-4bf4-a0bc-f53bcbcdd2cb)) + (segment (start 164.475 140.8) (end 166.125 139.15) (width 0.762) (layer "F.Cu") (net 128) (tstamp ed191a52-ce87-43e0-bbc8-e2cccfce6bb1)) + (segment (start 132.625 128.4) (end 132.625 131.375) (width 0.254) (layer "F.Cu") (net 129) (tstamp 51ebf702-e777-4f00-8573-3b99ca4838fe)) + (segment (start 132.8 131.2) (end 132.4 131.6) (width 0.762) (layer "F.Cu") (net 129) (tstamp 8193051c-ff87-4ac5-bc39-8092f4af78f2)) + (segment (start 135.1 131.2) (end 132.8 131.2) (width 0.762) (layer "F.Cu") (net 129) (tstamp b26a472f-6555-438d-bb4d-b847a01d7213)) + (segment (start 132.625 131.375) (end 132.4 131.6) (width 0.254) (layer "F.Cu") (net 129) (tstamp bd9df624-de4a-493c-a481-fc5ea62310fd)) (zone (net 72) (net_name "Net-(U3-CPVDD)") (layer "F.Cu") (tstamp 39199d87-7e86-4dd5-85c0-1be700d4c46f) (hatch edge 0.5) (priority 2) @@ -10209,7 +10330,7 @@ ) ) ) - (zone (net 42) (net_name "/Power/VBUS_SWITCHED") (layer "F.Cu") (tstamp 6a3c8547-2b94-40f0-a1e9-a3d110e23118) (hatch edge 0.5) + (zone (net 129) (net_name "Net-(#FLG0202-pwr)") (layer "F.Cu") (tstamp 6a3c8547-2b94-40f0-a1e9-a3d110e23118) (hatch edge 0.5) (priority 2) (connect_pads (clearance 0.2)) (min_thickness 0.25) (filled_areas_thickness no) @@ -10459,7 +10580,7 @@ ) ) ) - (zone (net 55) (net_name "Net-(U2--AVDD)") (layer "F.Cu") (tstamp a72b0d30-6b73-474a-bf73-58e85ae0a0a0) (hatch edge 0.5) + (zone (net 55) (net_name "Net-(#FLG0301-pwr)") (layer "F.Cu") (tstamp a72b0d30-6b73-474a-bf73-58e85ae0a0a0) (hatch edge 0.5) (priority 2) (connect_pads yes (clearance 0.2)) (min_thickness 0.25) (filled_areas_thickness no) @@ -10607,7 +10728,7 @@ ) ) ) - (zone (net 67) (net_name "Net-(J7-Pin_1)") (layer "F.Cu") (tstamp fc9a0fa1-9003-4faa-9c3d-3fca3ff75a6b) (hatch edge 0.5) + (zone (net 60) (net_name "Net-(U5-V_{BAT_SENSE})") (layer "F.Cu") (tstamp fc9a0fa1-9003-4faa-9c3d-3fca3ff75a6b) (hatch edge 0.5) (priority 2) (connect_pads (clearance 0.2)) (min_thickness 0.25) (filled_areas_thickness no) @@ -10642,63 +10763,59 @@ (xy 126.950409 132.588915) (xy 126.986911 132.632659) (xy 127 132.688108) - (xy 127 133.920383) - (xy 126.985876 133.977858) - (xy 126.946721 134.022239) - (xy 126.891454 134.043416) - (xy 126.832668 134.036565) - (xy 126.815509 134.030165) - (xy 126.800521 134.026623) - (xy 126.751498 134.021353) - (xy 126.744901 134.021) - (xy 126.720326 134.021) - (xy 126.70745 134.02445) - (xy 126.704 134.037326) - (xy 126.704 135.13) - (xy 126.687387 135.192) - (xy 126.642 135.237387) - (xy 126.58 135.254) - (xy 125.712327 135.254) - (xy 125.699451 135.25745) - (xy 125.696001 135.270326) - (xy 125.696001 135.519898) - (xy 125.696354 135.526501) - (xy 125.701623 135.575519) - (xy 125.706814 135.597484) - (xy 125.707184 135.652899) - (xy 125.683379 135.702942) - (xy 125.640152 135.737617) - (xy 125.586137 135.75) + (xy 127 133.679613) + (xy 126.990561 133.727066) + (xy 126.963681 133.767294) + (xy 126.957788 133.773186) + (xy 126.954 133.787326) + (xy 126.954 134.88) + (xy 126.937387 134.942) + (xy 126.892 134.987387) + (xy 126.83 135.004) + (xy 125.962327 135.004) + (xy 125.949451 135.00745) + (xy 125.946001 135.020326) + (xy 125.946001 135.269898) + (xy 125.946354 135.276501) + (xy 125.951624 135.325523) + (xy 125.955163 135.3405) + (xy 126.000004 135.460722) + (xy 126.008413 135.476123) + (xy 126.064982 135.55169) + (xy 126.089221 135.614948) + (xy 126.076599 135.681505) + (xy 126.030882 135.731495) + (xy 125.965715 135.75) (xy 124.974 135.75) (xy 124.912 135.733387) (xy 124.866613 135.688) (xy 124.85 135.626) - (xy 124.85 134.729674) - (xy 125.696 134.729674) - (xy 125.69945 134.742549) - (xy 125.712326 134.746) - (xy 126.179674 134.746) - (xy 126.192549 134.742549) - (xy 126.196 134.729674) - (xy 126.196 134.037327) - (xy 126.192549 134.024451) - (xy 126.179674 134.021001) - (xy 126.155102 134.021001) - (xy 126.148498 134.021354) - (xy 126.099476 134.026624) - (xy 126.084499 134.030163) - (xy 125.964277 134.075004) - (xy 125.948881 134.083411) - (xy 125.847048 134.159641) - (xy 125.834641 134.172048) - (xy 125.758411 134.273881) - (xy 125.750004 134.289277) - (xy 125.705163 134.409496) - (xy 125.701623 134.424478) - (xy 125.696353 134.473501) - (xy 125.696 134.480099) - (xy 125.696 134.729674) - (xy 124.85 134.729674) + (xy 124.85 134.479674) + (xy 125.946 134.479674) + (xy 125.94945 134.492549) + (xy 125.962326 134.496) + (xy 126.429674 134.496) + (xy 126.442549 134.492549) + (xy 126.446 134.479674) + (xy 126.446 133.787327) + (xy 126.442549 133.774451) + (xy 126.429674 133.771001) + (xy 126.405102 133.771001) + (xy 126.398498 133.771354) + (xy 126.349476 133.776624) + (xy 126.334499 133.780163) + (xy 126.214277 133.825004) + (xy 126.198881 133.833411) + (xy 126.097048 133.909641) + (xy 126.084641 133.922048) + (xy 126.008411 134.023881) + (xy 126.000004 134.039277) + (xy 125.955163 134.159496) + (xy 125.951623 134.174478) + (xy 125.946353 134.223501) + (xy 125.946 134.230099) + (xy 125.946 134.479674) + (xy 124.85 134.479674) (xy 124.85 133.860326) (xy 124.85 133.782952) (xy 125.0875 133.782952) @@ -10791,6 +10908,9 @@ (xy 140.820811 140.798059) (xy 140.834793 140.904266) (xy 140.83867 140.933709) + (xy 140.841781 140.94122) + (xy 140.841782 140.941223) + (xy 140.869908 141.009125) (xy 140.894139 141.067625) (xy 140.899084 141.074069) (xy 140.899085 141.074071) @@ -10863,7 +10983,7 @@ (xy 147.1745 141.210925) (xy 147.174987 141.214784) (xy 147.174988 141.214791) - (xy 147.187185 141.311339) + (xy 147.188686 141.323217) (xy 147.189929 141.333058) (xy 147.1928 141.340309) (xy 147.192801 141.340313) @@ -10922,7 +11042,7 @@ (xy 147.294552 143.014607) (xy 147.290798 143.021434) (xy 147.290796 143.021438) - (xy 147.260626 143.076317) + (xy 147.25971 143.077984) (xy 147.225536 143.140147) (xy 147.217789 143.154238) (xy 147.172248 143.201232) @@ -10988,14 +11108,28 @@ (filled_polygon (layer "F.Cu") (pts - (xy 134.503122 132.197528) - (xy 134.548334 132.241467) - (xy 134.566096 132.301959) - (xy 134.551817 132.363367) - (xy 134.509186 132.409815) - (xy 134.498647 132.416589) - (xy 134.426329 132.463064) - (xy 134.426325 132.463066) + (xy 134.211038 131.796232) + (xy 134.255731 131.836929) + (xy 134.275874 131.893919) + (xy 134.276649 131.902188) + (xy 134.27665 131.902192) + (xy 134.277354 131.909699) + (xy 134.279842 131.916811) + (xy 134.279844 131.916817) + (xy 134.319138 132.029113) + (xy 134.319139 132.029116) + (xy 134.322207 132.037882) + (xy 134.327722 132.045355) + (xy 134.327724 132.045358) + (xy 134.396243 132.138198) + (xy 134.40285 132.14715) + (xy 134.497844 132.217258) + (xy 134.535791 132.26294) + (xy 134.548144 132.321031) + (xy 134.532068 132.378203) + (xy 134.491249 132.421342) + (xy 134.426331 132.463062) + (xy 134.426324 132.463067) (xy 134.418872 132.467857) (xy 134.41307 132.474551) (xy 134.413065 132.474557) @@ -11008,7 +11142,7 @@ (xy 134.264835 132.707543) (xy 134.263573 132.716316) (xy 134.263572 132.716322) - (xy 134.251838 132.797939) + (xy 134.251838 132.79794) (xy 134.244353 132.85) (xy 134.245615 132.858777) (xy 134.263572 132.983677) @@ -11123,7 +11257,7 @@ (xy 131.764835 134.907543) (xy 131.763573 134.916316) (xy 131.763572 134.916322) - (xy 131.75608 134.968436) + (xy 131.748428 135.021655) (xy 131.744353 135.05) (xy 131.745615 135.058777) (xy 131.763572 135.183677) @@ -11131,7 +11265,7 @@ (xy 131.764835 135.192457) (xy 131.768519 135.200525) (xy 131.76852 135.200526) - (xy 131.813987 135.300085) + (xy 131.820515 135.314379) (xy 131.824623 135.323373) (xy 131.83043 135.330075) (xy 131.830431 135.330076) @@ -11163,7 +11297,6 @@ (xy 132.032366 139.39552) (xy 132.854478 140.217633) (xy 132.861787 140.225608) - (xy 132.866176 140.230839) (xy 132.88624 140.25475) (xy 132.895634 140.260173) (xy 132.895636 140.260175) @@ -11177,281 +11310,128 @@ (xy 133.023722 140.319101) (xy 133.034276 140.321442) (xy 133.071016 140.331287) - (xy 133.088781 140.329732) - (xy 133.147274 140.338795) - (xy 133.194904 140.373944) - (xy 133.220813 140.427167) - (xy 133.219096 140.486337) - (xy 133.190145 140.537969) - (xy 133.147862 140.565534) - (xy 133.148192 140.566159) - (xy 133.141391 140.569753) - (xy 133.141384 140.569757) - (xy 133.139988 140.570494) - (xy 133.13998 140.570498) - (xy 133.097179 140.593119) - (xy 133.093044 140.595207) - (xy 133.04945 140.616201) - (xy 133.049447 140.616202) - (xy 133.041079 140.620233) - (xy 133.034724 140.626129) - (xy 133.02706 140.63018) - (xy 133.020497 140.636742) - (xy 133.02049 140.636748) - (xy 132.986274 140.670964) - (xy 132.982939 140.674177) - (xy 132.947451 140.707105) - (xy 132.947445 140.707112) - (xy 132.940644 140.713423) - (xy 132.937152 140.719468) - (xy 132.931968 140.72527) - (xy 132.401593 141.255644) - (xy 132.391228 141.264907) - (xy 132.370331 141.281572) - (xy 132.370325 141.281578) - (xy 132.363064 141.287369) - (xy 132.357834 141.295039) - (xy 132.357829 141.295045) - (xy 132.33056 141.335042) - (xy 132.327879 141.33882) - (xy 132.299146 141.377753) - (xy 132.299144 141.377756) - (xy 132.293631 141.385227) - (xy 132.290768 141.393407) - (xy 132.285884 141.400572) - (xy 132.283147 141.409444) - (xy 132.283146 141.409447) - (xy 132.26888 141.455696) - (xy 132.267431 141.460098) - (xy 132.251446 141.50578) - (xy 132.251444 141.505788) - (xy 132.248379 141.514549) - (xy 132.248054 141.523212) - (xy 132.2455 141.531495) - (xy 132.2455 141.540784) - (xy 132.2455 141.589179) - (xy 132.245413 141.593816) - (xy 132.243736 141.638647) - (xy 132.243256 141.651463) - (xy 132.245063 141.65821) - (xy 132.2455 141.665972) - (xy 132.2455 142.310378) - (xy 132.236061 142.357831) - (xy 132.209181 142.398059) - (xy 131.648058 142.959181) - (xy 131.60783 142.986061) - (xy 131.560377 142.9955) - (xy 128.959708 142.9955) - (xy 128.902015 142.981261) - (xy 128.857572 142.941815) - (xy 128.836585 142.886221) - (xy 128.843874 142.827246) - (xy 128.877764 142.778434) - (xy 128.930474 142.750995) - (xy 129.05567 142.720622) - (xy 129.066788 142.716774) - (xy 129.247121 142.634419) - (xy 129.257319 142.628531) - (xy 129.418806 142.513536) - (xy 129.427703 142.505827) - (xy 129.564517 142.362341) - (xy 129.571784 142.3531) - (xy 129.678971 142.186314) - (xy 129.684362 142.175856) - (xy 129.744754 142.025005) - (xy 129.777401 141.978492) - (xy 129.827369 141.951427) - (xy 129.884163 141.949494) - (xy 129.935856 141.973099) - (xy 129.97159 142.017285) - (xy 129.971913 142.017956) - (xy 129.974211 142.024522) - (xy 129.977912 142.030412) - (xy 129.977913 142.030414) - (xy 130.061532 142.163493) - (xy 130.070184 142.177262) - (xy 130.197738 142.304816) - (xy 130.350478 142.400789) - (xy 130.520745 142.460368) - (xy 130.7 142.480565) - (xy 130.879255 142.460368) - (xy 131.049522 142.400789) - (xy 131.202262 142.304816) - (xy 131.329816 142.177262) - (xy 131.425789 142.024522) - (xy 131.485368 141.854255) - (xy 131.5005 141.719954) - (xy 131.5005 141.080046) - (xy 131.485368 140.945745) - (xy 131.425789 140.775478) - (xy 131.329816 140.622738) - (xy 131.202262 140.495184) - (xy 131.184768 140.484192) - (xy 131.087153 140.422856) - (xy 131.049522 140.399211) - (xy 131.042959 140.396914) - (xy 131.042956 140.396913) - (xy 130.885824 140.34193) - (xy 130.885819 140.341928) - (xy 130.879255 140.339632) - (xy 130.872335 140.338852) - (xy 130.872334 140.338852) - (xy 130.706923 140.320215) - (xy 130.7 140.319435) - (xy 130.693077 140.320215) - (xy 130.527665 140.338852) - (xy 130.527662 140.338852) - (xy 130.520745 140.339632) - (xy 130.514182 140.341928) - (xy 130.514175 140.34193) - (xy 130.357043 140.396913) - (xy 130.357036 140.396915) - (xy 130.350478 140.399211) - (xy 130.34459 140.40291) - (xy 130.344587 140.402912) - (xy 130.203638 140.491476) - (xy 130.203633 140.491479) - (xy 130.197738 140.495184) - (xy 130.192813 140.500108) - (xy 130.192809 140.500112) - (xy 130.075112 140.617809) - (xy 130.075108 140.617813) - (xy 130.070184 140.622738) - (xy 130.066479 140.628633) - (xy 130.066476 140.628638) - (xy 129.977913 140.769585) - (xy 129.97791 140.76959) - (xy 129.974211 140.775478) - (xy 129.971914 140.782042) - (xy 129.971279 140.783361) - (xy 129.933666 140.828976) - (xy 129.879206 140.851989) - (xy 129.82028 140.847169) - (xy 129.770284 140.815611) - (xy 129.740584 140.76449) - (xy 129.727512 140.719973) - (xy 129.723146 140.709067) - (xy 129.632295 140.53284) - (xy 129.625935 140.522944) - (xy 129.503382 140.367105) - (xy 129.495264 140.358591) - (xy 129.345427 140.228756) - (xy 129.33585 140.221937) - (xy 129.164153 140.122808) - (xy 129.15345 140.11792) - (xy 128.966095 140.053075) - (xy 128.960511 140.05172) - (xy 128.952318 140.052306) - (xy 128.95 140.062964) - (xy 128.95 141.526) - (xy 128.933387 141.588) - (xy 128.888 141.633387) - (xy 128.826 141.65) - (xy 128.574 141.65) - (xy 128.512 141.633387) - (xy 128.466613 141.588) - (xy 128.45 141.526) - (xy 128.45 140.067819) - (xy 128.447494 140.056927) - (xy 128.43632 140.05706) - (xy 128.344329 140.079377) - (xy 128.333211 140.083225) - (xy 128.152878 140.16558) - (xy 128.14268 140.171468) - (xy 127.981193 140.286463) - (xy 127.972296 140.294172) - (xy 127.835482 140.437658) - (xy 127.828215 140.446899) - (xy 127.721028 140.613685) - (xy 127.715635 140.624146) - (xy 127.709884 140.638511) - (xy 127.675136 140.68685) - (xy 127.621863 140.713423) - (xy 127.562346 140.712106) - (xy 127.510302 140.683202) - (xy 127.477726 140.633374) - (xy 127.476608 140.63018) - (xy 127.452793 140.562118) - (xy 127.44521 140.551843) - (xy 127.377671 140.46033) - (xy 127.377668 140.460327) - (xy 127.37215 140.45285) - (xy 127.364672 140.447331) - (xy 127.364667 140.447326) - (xy 127.331867 140.423119) - (xy 127.294806 140.37923) - (xy 127.2815 140.323349) - (xy 127.2815 136.012685) - (xy 127.296355 135.953835) - (xy 127.33736 135.909085) - (xy 127.394691 135.889157) - (xy 127.454612 135.898825) - (xy 127.502766 135.935774) - (xy 127.51279 135.948451) - (xy 127.626544 136.062205) - (xy 127.637805 136.071109) - (xy 127.774733 136.155567) - (xy 127.787732 136.161629) - (xy 127.940874 136.212375) - (xy 127.954041 136.215194) - (xy 128.04689 136.22468) - (xy 128.053168 136.225) - (xy 128.083674 136.225) - (xy 128.096549 136.221549) - (xy 128.1 136.208674) - (xy 128.1 136.208673) - (xy 128.6 136.208673) - (xy 128.60345 136.221548) - (xy 128.616326 136.224999) - (xy 128.646829 136.224999) - (xy 128.653111 136.224678) - (xy 128.745959 136.215194) - (xy 128.759122 136.212376) - (xy 128.912267 136.161629) - (xy 128.925266 136.155567) - (xy 129.062194 136.071109) - (xy 129.073455 136.062205) - (xy 129.187205 135.948455) - (xy 129.196109 135.937194) - (xy 129.280567 135.800266) - (xy 129.286629 135.787267) - (xy 129.337375 135.634125) - (xy 129.340194 135.620958) - (xy 129.34968 135.528109) - (xy 129.35 135.521832) - (xy 129.35 135.266326) - (xy 129.346549 135.25345) - (xy 129.333674 135.25) - (xy 128.616326 135.25) - (xy 128.60345 135.25345) - (xy 128.6 135.266326) - (xy 128.6 136.208673) - (xy 128.1 136.208673) - (xy 128.1 134.874) - (xy 128.116613 134.812) - (xy 128.162 134.766613) - (xy 128.224 134.75) - (xy 129.333673 134.75) - (xy 129.346548 134.746549) - (xy 129.349999 134.733674) - (xy 129.349999 134.478171) - (xy 129.349678 134.471888) - (xy 129.340194 134.37904) - (xy 129.337376 134.365877) - (xy 129.286629 134.212732) - (xy 129.280567 134.199733) - (xy 129.196109 134.062805) - (xy 129.187205 134.051544) - (xy 129.073455 133.937794) - (xy 129.062194 133.92889) - (xy 128.927304 133.845689) - (xy 128.882916 133.798365) - (xy 128.868504 133.735101) - (xy 128.888015 133.67322) - (xy 128.936107 133.629665) - (xy 128.94237 133.626474) - (xy 128.988342 133.60305) - (xy 129.07805 133.513342) + (xy 133.108906 140.327972) + (xy 133.119714 140.3275) + (xy 134.150695 140.3275) + (xy 134.211284 140.343311) + (xy 134.256422 140.38671) + (xy 134.274599 140.446632) + (xy 134.26118 140.507795) + (xy 134.214354 140.599696) + (xy 134.213082 140.599048) + (xy 134.19436 140.631475) + (xy 134.152646 140.66178) + (xy 134.102212 140.6725) + (xy 132.837017 140.6725) + (xy 132.789564 140.663061) + (xy 132.749336 140.636181) + (xy 130.54552 138.432366) + (xy 130.538211 138.42439) + (xy 130.529783 138.414346) + (xy 130.51376 138.39525) + (xy 130.480813 138.376227) + (xy 130.471698 138.370421) + (xy 130.449429 138.354828) + (xy 130.449428 138.354827) + (xy 130.440543 138.348606) + (xy 130.430065 138.345798) + (xy 130.426653 138.344207) + (xy 130.423129 138.342924) + (xy 130.413739 138.337503) + (xy 130.405372 138.336027) + (xy 130.364405 138.310759) + (xy 130.335641 138.269678) + (xy 130.3255 138.220565) + (xy 130.3255 137.973627) + (xy 130.3255 137.970734) + (xy 130.322646 137.940301) + (xy 130.315853 137.920889) + (xy 130.280861 137.820886) + (xy 130.277793 137.812118) + (xy 130.272118 137.804429) + (xy 130.222425 137.737097) + (xy 130.19715 137.70285) + (xy 130.131864 137.654667) + (xy 130.094805 137.61078) + (xy 130.0815 137.554899) + (xy 130.0815 137.396241) + (xy 130.082561 137.380055) + (xy 130.085457 137.358059) + (xy 130.086518 137.35) + (xy 130.079048 137.293259) + (xy 130.066533 137.198198) + (xy 130.007939 137.056741) + (xy 129.981963 137.022888) + (xy 129.97809 137.01784) + (xy 129.938144 136.96578) + (xy 129.938138 136.965774) + (xy 129.938135 136.965769) + (xy 129.938131 136.965765) + (xy 129.914731 136.935269) + (xy 129.89068 136.916814) + (xy 129.878485 136.906119) + (xy 129.343879 136.371513) + (xy 129.333183 136.359317) + (xy 129.320083 136.342245) + (xy 129.314731 136.335269) + (xy 129.284234 136.311868) + (xy 129.284231 136.311865) + (xy 129.218056 136.261087) + (xy 129.199709 136.247009) + (xy 129.199707 136.247008) + (xy 129.193259 136.24206) + (xy 129.155054 136.226235) + (xy 129.059314 136.186578) + (xy 129.05931 136.186576) + (xy 129.051802 136.183467) + (xy 129.052013 136.182955) + (xy 129.002977 136.155023) + (xy 128.970637 136.101199) + (xy 128.968811 136.038434) + (xy 128.997968 135.982821) + (xy 129.05063 135.948622) + (xy 129.162265 135.91163) + (xy 129.175266 135.905567) + (xy 129.312194 135.821109) + (xy 129.323455 135.812205) + (xy 129.437205 135.698455) + (xy 129.446109 135.687194) + (xy 129.530567 135.550266) + (xy 129.536629 135.537267) + (xy 129.587375 135.384125) + (xy 129.590194 135.370958) + (xy 129.59968 135.278109) + (xy 129.6 135.271832) + (xy 129.6 135.016326) + (xy 129.596549 135.00345) + (xy 129.583674 135) + (xy 128.474 135) + (xy 128.412 134.983387) + (xy 128.366613 134.938) + (xy 128.35 134.876) + (xy 128.35 134.624) + (xy 128.366613 134.562) + (xy 128.412 134.516613) + (xy 128.474 134.5) + (xy 129.583673 134.5) + (xy 129.596548 134.496549) + (xy 129.599999 134.483674) + (xy 129.599999 134.228171) + (xy 129.599678 134.221888) + (xy 129.590194 134.12904) + (xy 129.587376 134.115877) + (xy 129.536629 133.962732) + (xy 129.530567 133.949733) + (xy 129.446109 133.812805) + (xy 129.437205 133.801544) + (xy 129.323455 133.687794) + (xy 129.312194 133.67889) + (xy 129.169122 133.590642) + (xy 129.170388 133.588588) + (xy 129.129719 133.554065) + (xy 129.108362 133.492053) + (xy 129.121625 133.427821) + (xy 129.126702 133.417857) (xy 129.135646 133.400304) (xy 129.1505 133.306519) (xy 129.150499 132.693482) @@ -11569,10 +11549,16 @@ (xy 132.970955 132.310992) (xy 133.023597 132.275287) (xy 133.087882 132.252793) - (xy 133.151653 132.205727) - (xy 133.186524 132.187713) - (xy 133.225283 132.1815) - (xy 134.442147 132.1815) + (xy 133.19715 132.17215) + (xy 133.277793 132.062882) + (xy 133.322646 131.934699) + (xy 133.3255 131.904266) + (xy 133.3255 131.901368) + (xy 133.325578 131.899704) + (xy 133.344039 131.840183) + (xy 133.389123 131.79716) + (xy 133.449442 131.7815) + (xy 134.152416 131.7815) ) ) (filled_polygon @@ -11761,7 +11747,7 @@ (xy 155.477354 140.515301) (xy 155.47665 140.522807) (xy 155.476649 140.522812) - (xy 155.475228 140.537969) + (xy 155.47477 140.54285) (xy 155.4745 140.545734) (xy 155.4745 141.154266) (xy 155.474769 141.157141) @@ -11778,10 +11764,10 @@ (xy 155.527724 141.320358) (xy 155.593142 141.408996) (xy 155.60285 141.42215) - (xy 155.648527 141.455861) + (xy 155.636896 141.447277) (xy 155.697515 141.492016) (xy 155.712118 141.502793) - (xy 155.770472 141.523212) + (xy 155.761987 141.520243) (xy 155.7764 141.525286) (xy 155.829042 141.560991) (xy 155.857056 141.618098) @@ -11967,7 +11953,7 @@ (xy 162.736932 132.374555) (xy 162.731128 132.367857) (xy 162.610053 132.290047) - (xy 162.553266 132.273373) + (xy 162.55079 132.272646) (xy 162.480473 132.251999) (xy 162.48047 132.251998) (xy 162.471961 132.2495) @@ -12024,11 +12010,11 @@ (xy 161.924623 133.526627) (xy 161.920941 133.534689) (xy 161.920938 133.534694) - (xy 161.873462 133.638652) + (xy 161.874515 133.636346) (xy 161.864835 133.657543) (xy 161.863573 133.666316) (xy 161.863572 133.666322) - (xy 161.848361 133.772122) + (xy 161.849075 133.767157) (xy 161.844353 133.8) (xy 161.845615 133.808777) (xy 161.863572 133.933677) @@ -16100,6 +16086,7 @@ (xy 129.754095 76.165539) (xy 129.709206 76.207332) (xy 129.649779 76.2225) + (xy 128.928652 76.2225) (xy 128.778385 76.2225) (xy 128.716385 76.205887) (xy 128.670998 76.1605) @@ -17258,16 +17245,47 @@ (xy 144.5105 59.167112) (xy 144.555887 59.212499) (xy 144.5725 59.274499) - (xy 144.5725 61.609983) - (xy 144.558985 61.666278) - (xy 144.521385 61.710301) - (xy 144.467898 61.732456) - (xy 144.410182 61.727914) - (xy 144.360819 61.697664) - (xy 143.692682 61.029528) - (xy 143.662431 60.980163) - (xy 143.661246 60.976515) - (xy 143.659719 60.966874) + (xy 144.5725 61.259983) + (xy 144.558985 61.316278) + (xy 144.521385 61.360301) + (xy 144.467898 61.382456) + (xy 144.410182 61.377914) + (xy 144.360819 61.347664) + (xy 144.120524 61.107369) + (xy 144.113216 61.099395) + (xy 144.095732 61.078559) + (xy 144.08876 61.07025) + (xy 144.055813 61.051227) + (xy 144.046698 61.045421) + (xy 144.024429 61.029828) + (xy 144.024428 61.029827) + (xy 144.015543 61.023606) + (xy 144.005067 61.020798) + (xy 144.001656 61.019208) + (xy 143.998129 61.017924) + (xy 143.988739 61.012503) + (xy 143.978057 61.010619) + (xy 143.978056 61.010619) + (xy 143.951282 61.005898) + (xy 143.940723 61.003557) + (xy 143.914461 60.99652) + (xy 143.914459 60.996519) + (xy 143.903984 60.993713) + (xy 143.89318 60.994658) + (xy 143.893178 60.994658) + (xy 143.866097 60.997028) + (xy 143.855289 60.9975) + (xy 143.776143 60.9975) + (xy 143.714142 60.980887) + (xy 143.668755 60.935498) + (xy 143.668239 60.934605) + (xy 143.65475 60.91124) + (xy 143.646439 60.904266) + (xy 143.646438 60.904265) + (xy 143.633238 60.893189) + (xy 143.609218 60.862992) + (xy 143.608696 60.863372) + (xy 143.602958 60.855475) (xy 143.598528 60.84678) (xy 143.579574 60.827825) (xy 143.550129 60.780856) @@ -17696,9 +17714,11 @@ (xy 118.066506 143.995457) (xy 117.959504 143.757706) (xy 117.954196 143.743709) + (xy 117.946886 143.720251) (xy 117.872455 143.481395) (xy 117.868873 143.466862) (xy 117.868662 143.465713) + (xy 117.829722 143.25322) (xy 117.819347 143.196605) (xy 117.817542 143.181741) (xy 117.815878 143.154238) @@ -17738,7 +17758,304 @@ (xy 121.32152 142.888) (xy 121.306366 142.776128) (xy 121.299603 142.726198) - (xy 121.253954 142.585703) + (xy 121.259956 142.604177) + (xy 121.251862 142.579266) + (xy 125.8495 142.579266) + (xy 125.849769 142.582141) + (xy 125.84977 142.582149) + (xy 125.851649 142.602187) + (xy 125.851649 142.602191) + (xy 125.852354 142.609699) + (xy 125.854842 142.616811) + (xy 125.854844 142.616817) + (xy 125.894138 142.729113) + (xy 125.894139 142.729116) + (xy 125.897207 142.737882) + (xy 125.902722 142.745355) + (xy 125.902724 142.745358) + (xy 125.94624 142.80432) + (xy 125.97785 142.84715) + (xy 126.013381 142.873373) + (xy 126.054532 142.903744) + (xy 126.087118 142.927793) + (xy 126.215301 142.972646) + (xy 126.245734 142.9755) + (xy 127.051373 142.9755) + (xy 127.054266 142.9755) + (xy 127.084699 142.972646) + (xy 127.212882 142.927793) + (xy 127.32215 142.84715) + (xy 127.402793 142.737882) + (xy 127.428823 142.66349) + (xy 127.459685 142.615288) + (xy 127.508911 142.58608) + (xy 127.56601 142.582094) + (xy 127.618817 142.604177) + (xy 127.656079 142.647626) + (xy 127.717699 142.767151) + (xy 127.724064 142.777055) + (xy 127.846617 142.932894) + (xy 127.854735 142.941408) + (xy 128.004572 143.071243) + (xy 128.014149 143.078062) + (xy 128.185846 143.177191) + (xy 128.196549 143.182079) + (xy 128.383904 143.246924) + (xy 128.389488 143.248279) + (xy 128.397681 143.247693) + (xy 128.4 143.237036) + (xy 128.4 143.232181) + (xy 128.9 143.232181) + (xy 128.902505 143.243072) + (xy 128.913679 143.242939) + (xy 129.00567 143.220622) + (xy 129.016788 143.216774) + (xy 129.197121 143.134419) + (xy 129.206934 143.128753) + (xy 133.875001 143.128753) + (xy 133.875256 143.134386) + (xy 133.880815 143.19557) + (xy 133.883361 143.208369) + (xy 133.929748 143.357232) + (xy 133.935864 143.37082) + (xy 134.016045 143.503456) + (xy 134.025228 143.515177) + (xy 134.134822 143.624771) + (xy 134.146543 143.633954) + (xy 134.279179 143.714135) + (xy 134.292767 143.720251) + (xy 134.441627 143.766638) + (xy 134.454431 143.769184) + (xy 134.511143 143.774338) + (xy 134.521549 143.771549) + (xy 134.525 143.758674) + (xy 134.525 143.066326) + (xy 134.521549 143.05345) + (xy 134.508674 143.05) + (xy 133.891327 143.05) + (xy 133.878451 143.05345) + (xy 133.875001 143.066326) + (xy 133.875001 143.128753) + (xy 129.206934 143.128753) + (xy 129.207319 143.128531) + (xy 129.368806 143.013536) + (xy 129.377703 143.005827) + (xy 129.514517 142.862341) + (xy 129.521784 142.8531) + (xy 129.628971 142.686314) + (xy 129.634362 142.675856) + (xy 129.694754 142.525005) + (xy 129.727401 142.478492) + (xy 129.777369 142.451427) + (xy 129.834163 142.449494) + (xy 129.885856 142.473099) + (xy 129.92159 142.517285) + (xy 129.921913 142.517956) + (xy 129.924211 142.524522) + (xy 129.927912 142.530412) + (xy 129.927913 142.530414) + (xy 130.016476 142.671361) + (xy 130.020184 142.677262) + (xy 130.147738 142.804816) + (xy 130.300478 142.900789) + (xy 130.470745 142.960368) + (xy 130.65 142.980565) + (xy 130.829255 142.960368) + (xy 130.999522 142.900789) + (xy 131.152262 142.804816) + (xy 131.279816 142.677262) + (xy 131.375789 142.524522) + (xy 131.435368 142.354255) + (xy 131.4505 142.219954) + (xy 131.4505 141.580046) + (xy 131.435368 141.445745) + (xy 131.375789 141.275478) + (xy 131.279816 141.122738) + (xy 131.152262 140.995184) + (xy 131.096787 140.960327) + (xy 131.047119 140.929118) + (xy 130.999522 140.899211) + (xy 130.992959 140.896914) + (xy 130.992956 140.896913) + (xy 130.835824 140.84193) + (xy 130.835819 140.841928) + (xy 130.829255 140.839632) + (xy 130.822335 140.838852) + (xy 130.822334 140.838852) + (xy 130.656923 140.820215) + (xy 130.65 140.819435) + (xy 130.643077 140.820215) + (xy 130.477665 140.838852) + (xy 130.477662 140.838852) + (xy 130.470745 140.839632) + (xy 130.464182 140.841928) + (xy 130.464175 140.84193) + (xy 130.307043 140.896913) + (xy 130.307036 140.896915) + (xy 130.300478 140.899211) + (xy 130.29459 140.90291) + (xy 130.294587 140.902912) + (xy 130.153638 140.991476) + (xy 130.153633 140.991479) + (xy 130.147738 140.995184) + (xy 130.142813 141.000108) + (xy 130.142809 141.000112) + (xy 130.025112 141.117809) + (xy 130.025108 141.117813) + (xy 130.020184 141.122738) + (xy 130.016479 141.128633) + (xy 130.016476 141.128638) + (xy 129.927913 141.269585) + (xy 129.92791 141.26959) + (xy 129.924211 141.275478) + (xy 129.921914 141.282042) + (xy 129.921279 141.283361) + (xy 129.883666 141.328976) + (xy 129.829206 141.351989) + (xy 129.77028 141.347169) + (xy 129.720284 141.315611) + (xy 129.690584 141.26449) + (xy 129.677512 141.219973) + (xy 129.673146 141.209067) + (xy 129.582295 141.03284) + (xy 129.575935 141.022944) + (xy 129.453382 140.867105) + (xy 129.445264 140.858591) + (xy 129.295427 140.728756) + (xy 129.28585 140.721937) + (xy 129.114153 140.622808) + (xy 129.10345 140.61792) + (xy 128.916095 140.553075) + (xy 128.910511 140.55172) + (xy 128.902318 140.552306) + (xy 128.9 140.562964) + (xy 128.9 143.232181) + (xy 128.4 143.232181) + (xy 128.4 140.567819) + (xy 128.397494 140.556927) + (xy 128.38632 140.55706) + (xy 128.294329 140.579377) + (xy 128.283211 140.583225) + (xy 128.102878 140.66558) + (xy 128.09268 140.671468) + (xy 127.931193 140.786463) + (xy 127.922296 140.794172) + (xy 127.785482 140.937658) + (xy 127.778215 140.946899) + (xy 127.671028 141.113685) + (xy 127.665635 141.124146) + (xy 127.659884 141.138511) + (xy 127.625136 141.18685) + (xy 127.571863 141.213423) + (xy 127.512346 141.212106) + (xy 127.460302 141.183202) + (xy 127.427726 141.133374) + (xy 127.425723 141.127651) + (xy 127.402793 141.062118) + (xy 127.32215 140.95285) + (xy 127.31673 140.94885) + (xy 127.290938 140.910247) + (xy 127.2815 140.862796) + (xy 127.2815 139.745101) + (xy 127.294805 139.68922) + (xy 127.331864 139.645332) + (xy 127.39715 139.59715) + (xy 127.477793 139.487882) + (xy 127.522646 139.359699) + (xy 127.5255 139.329266) + (xy 127.5255 137.970734) + (xy 127.522646 137.940301) + (xy 127.515853 137.920889) + (xy 127.480861 137.820886) + (xy 127.477793 137.812118) + (xy 127.472118 137.804429) + (xy 127.422425 137.737097) + (xy 127.39715 137.70285) + (xy 127.342891 137.662805) + (xy 127.295358 137.627724) + (xy 127.295355 137.627722) + (xy 127.287882 137.622207) + (xy 127.279116 137.619139) + (xy 127.279113 137.619138) + (xy 127.166817 137.579844) + (xy 127.166811 137.579842) + (xy 127.159699 137.577354) + (xy 127.152187 137.576649) + (xy 127.152162 137.576644) + (xy 127.098473 137.550117) + (xy 127.0931 137.542656) + (xy 127.075422 137.559214) + (xy 127.015779 137.5745) + (xy 126.270734 137.5745) + (xy 126.267859 137.574769) + (xy 126.26785 137.57477) + (xy 126.247812 137.576649) + (xy 126.247807 137.57665) + (xy 126.240301 137.577354) + (xy 126.233189 137.579842) + (xy 126.233182 137.579844) + (xy 126.120886 137.619138) + (xy 126.12088 137.61914) + (xy 126.112118 137.622207) + (xy 126.104646 137.62772) + (xy 126.104641 137.627724) + (xy 126.010327 137.697331) + (xy 126.010324 137.697333) + (xy 126.00285 137.70285) + (xy 125.997333 137.710324) + (xy 125.997331 137.710327) + (xy 125.927724 137.804641) + (xy 125.92772 137.804646) + (xy 125.922207 137.812118) + (xy 125.91914 137.82088) + (xy 125.919138 137.820886) + (xy 125.879844 137.933182) + (xy 125.879842 137.933189) + (xy 125.877354 137.940301) + (xy 125.87665 137.947807) + (xy 125.876649 137.947812) + (xy 125.87477 137.96785) + (xy 125.8745 137.970734) + (xy 125.8745 139.329266) + (xy 125.874769 139.332141) + (xy 125.87477 139.332149) + (xy 125.876649 139.352187) + (xy 125.876649 139.352191) + (xy 125.877354 139.359699) + (xy 125.879842 139.366811) + (xy 125.879844 139.366817) + (xy 125.919138 139.479113) + (xy 125.919139 139.479116) + (xy 125.922207 139.487882) + (xy 125.927722 139.495355) + (xy 125.927724 139.495358) + (xy 125.970062 139.552724) + (xy 126.00285 139.59715) + (xy 126.068135 139.645332) + (xy 126.105195 139.68922) + (xy 126.1185 139.745101) + (xy 126.1185 140.786448) + (xy 126.105195 140.842329) + (xy 126.068134 140.886217) + (xy 126.050529 140.899211) + (xy 125.998435 140.937658) + (xy 125.97785 140.95285) + (xy 125.972333 140.960324) + (xy 125.972331 140.960327) + (xy 125.902724 141.054641) + (xy 125.90272 141.054646) + (xy 125.897207 141.062118) + (xy 125.89414 141.07088) + (xy 125.894138 141.070886) + (xy 125.854844 141.183182) + (xy 125.854842 141.183189) + (xy 125.852354 141.190301) + (xy 125.85165 141.197807) + (xy 125.851649 141.197812) + (xy 125.84977 141.21785) + (xy 125.8495 141.220734) + (xy 125.8495 142.579266) + (xy 121.251862 142.579266) (xy 121.233157 142.521697) (xy 121.233156 142.521694) (xy 121.231436 142.516401) @@ -17750,7 +18067,7 @@ (xy 120.827434 142.008205) (xy 120.827431 142.008202) (xy 120.823242 142.004543) - (xy 120.795228 141.987805) + (xy 120.77638 141.976544) (xy 120.638658 141.894258) (xy 120.638655 141.894256) (xy 120.633874 141.8914) @@ -17804,9 +18121,6 @@ (xy 118.881922 142.829401) (xy 118.881921 142.829407) (xy 118.880683 142.834832) - (xy 118.880433 142.840396) - (xy 118.880433 142.840397) - (xy 118.879314 142.865305) (xy 118.870786 143.055204) (xy 117.809888 143.055204) (xy 117.803626 142.951679) @@ -17846,52 +18160,6 @@ (xy 121.275327 139.31984) (xy 121.322559 139.153835) (xy 121.323079 139.14258) - (xy 121.77692 139.14258) - (xy 121.77744 139.153835) - (xy 121.824672 139.31984) - (xy 121.828792 139.330474) - (xy 121.922813 139.519295) - (xy 121.92882 139.528997) - (xy 122.055932 139.69732) - (xy 122.06363 139.705764) - (xy 122.219505 139.847862) - (xy 122.228609 139.854738) - (xy 122.40795 139.965781) - (xy 122.418163 139.970867) - (xy 122.614855 140.047066) - (xy 122.625831 140.050188) - (xy 122.68657 140.061542) - (xy 122.697598 140.06116) - (xy 122.7 140.050393) - (xy 123.2 140.050393) - (xy 123.202401 140.06116) - (xy 123.213429 140.061542) - (xy 123.274168 140.050188) - (xy 123.285144 140.047066) - (xy 123.481836 139.970867) - (xy 123.492049 139.965781) - (xy 123.67139 139.854738) - (xy 123.680494 139.847862) - (xy 123.836369 139.705764) - (xy 123.844067 139.69732) - (xy 123.971179 139.528997) - (xy 123.977186 139.519295) - (xy 124.071207 139.330474) - (xy 124.075327 139.31984) - (xy 124.122559 139.153835) - (xy 124.123079 139.14258) - (xy 124.11211 139.14) - (xy 123.216326 139.14) - (xy 123.20345 139.14345) - (xy 123.2 139.156326) - (xy 123.2 140.050393) - (xy 122.7 140.050393) - (xy 122.7 139.156326) - (xy 122.696549 139.14345) - (xy 122.683674 139.14) - (xy 121.78789 139.14) - (xy 121.77692 139.14258) - (xy 121.323079 139.14258) (xy 121.31211 139.14) (xy 120.416326 139.14) (xy 120.40345 139.14345) @@ -17915,57 +18183,63 @@ (xy 120.416326 138.64) (xy 121.31211 138.64) (xy 121.323079 138.637419) - (xy 121.77692 138.637419) - (xy 121.78789 138.64) - (xy 122.683674 138.64) - (xy 122.696549 138.636549) - (xy 122.7 138.623674) - (xy 123.2 138.623674) - (xy 123.20345 138.636549) - (xy 123.216326 138.64) - (xy 124.11211 138.64) - (xy 124.123079 138.637419) - (xy 124.122559 138.626164) - (xy 124.075327 138.460159) - (xy 124.071207 138.449525) - (xy 123.977186 138.260704) - (xy 123.971179 138.251002) - (xy 123.844067 138.082679) - (xy 123.836369 138.074235) - (xy 123.680494 137.932137) - (xy 123.67139 137.925261) - (xy 123.492049 137.814218) - (xy 123.481836 137.809132) - (xy 123.285144 137.732933) - (xy 123.274168 137.729811) - (xy 123.213429 137.718457) - (xy 123.202401 137.718839) - (xy 123.2 137.729607) - (xy 123.2 138.623674) - (xy 122.7 138.623674) - (xy 122.7 137.729607) - (xy 122.697598 137.718839) - (xy 122.68657 137.718457) - (xy 122.625831 137.729811) - (xy 122.614855 137.732933) - (xy 122.418163 137.809132) - (xy 122.40795 137.814218) - (xy 122.228609 137.925261) - (xy 122.219505 137.932137) - (xy 122.06363 138.074235) - (xy 122.055932 138.082679) - (xy 121.92882 138.251002) - (xy 121.922813 138.260704) - (xy 121.828792 138.449525) - (xy 121.824672 138.460159) - (xy 121.77744 138.626164) - (xy 121.77692 138.637419) - (xy 121.323079 138.637419) (xy 121.322559 138.626164) (xy 121.275327 138.460159) (xy 121.271207 138.449525) + (xy 121.240998 138.388856) + (xy 121.975662 138.388856) + (xy 121.980815 138.44557) + (xy 121.983361 138.458369) + (xy 122.029748 138.607232) + (xy 122.035864 138.62082) + (xy 122.116045 138.753456) + (xy 122.125228 138.765177) + (xy 122.234822 138.874771) + (xy 122.246543 138.883954) + (xy 122.379179 138.964135) + (xy 122.392767 138.970251) + (xy 122.541627 139.016638) + (xy 122.554431 139.019184) + (xy 122.615615 139.024744) + (xy 122.621244 139.025) + (xy 122.683674 139.025) + (xy 122.696549 139.021549) + (xy 122.7 139.008674) + (xy 122.7 139.008673) + (xy 123.2 139.008673) + (xy 123.20345 139.021548) + (xy 123.216326 139.024999) + (xy 123.278753 139.024999) + (xy 123.284386 139.024743) + (xy 123.34557 139.019184) + (xy 123.358369 139.016638) + (xy 123.507232 138.970251) + (xy 123.52082 138.964135) + (xy 123.653456 138.883954) + (xy 123.665177 138.874771) + (xy 123.774771 138.765177) + (xy 123.783954 138.753456) + (xy 123.864135 138.62082) + (xy 123.870251 138.607232) + (xy 123.916638 138.458372) + (xy 123.919184 138.445568) + (xy 123.924338 138.388856) + (xy 123.921549 138.37845) + (xy 123.908674 138.375) + (xy 123.216326 138.375) + (xy 123.20345 138.37845) + (xy 123.2 138.391326) + (xy 123.2 139.008673) + (xy 122.7 139.008673) + (xy 122.7 138.391326) + (xy 122.696549 138.37845) + (xy 122.683674 138.375) + (xy 121.991327 138.375) + (xy 121.978451 138.37845) + (xy 121.975662 138.388856) + (xy 121.240998 138.388856) (xy 121.177186 138.260704) - (xy 121.171179 138.251002) + (xy 121.171177 138.251) (xy 121.044067 138.082679) (xy 121.036369 138.074235) (xy 120.880494 137.932137) @@ -17990,7 +18264,7 @@ (xy 119.419505 137.932137) (xy 119.26363 138.074235) (xy 119.255932 138.082679) - (xy 119.12882 138.251002) + (xy 119.128823 138.251) (xy 119.122813 138.260704) (xy 119.028792 138.449525) (xy 119.024672 138.460159) @@ -18005,7 +18279,7 @@ (xy 119.264326 136.538256) (xy 119.266331 136.544428) (xy 119.266333 136.544435) - (xy 119.320813 136.712105) + (xy 119.32056 136.711326) (xy 119.322821 136.718284) (xy 119.326068 136.723908) (xy 119.326069 136.72391) @@ -18013,7 +18287,7 @@ (xy 119.417467 136.882216) (xy 119.421811 136.887041) (xy 119.421813 136.887043) - (xy 119.510018 136.985004) + (xy 119.530256 137.007481) (xy 119.544129 137.022888) (xy 119.69727 137.134151) (xy 119.870197 137.211144) @@ -18027,9 +18301,6 @@ (xy 120.977179 136.718284) (xy 121.035674 136.538256) (xy 121.05546 136.35) - (xy 121.04196 136.221549) - (xy 121.036353 136.168204) - (xy 121.036352 136.168203) (xy 121.035674 136.161744) (xy 121.001703 136.057196) (xy 120.999061 135.989932) @@ -18037,74 +18308,114 @@ (xy 121.599335 135.363819) (xy 121.639564 135.336939) (xy 121.687017 135.3275) - (xy 122.449237 135.3275) - (xy 122.513471 135.345434) - (xy 122.559125 135.39405) - (xy 122.572993 135.459283) - (xy 122.551062 135.522265) - (xy 122.507757 135.558092) - (xy 122.508834 135.559957) - (xy 122.503208 135.563205) - (xy 122.49727 135.565849) - (xy 122.492016 135.569665) - (xy 122.492011 135.569669) - (xy 122.349388 135.67329) - (xy 122.349381 135.673295) - (xy 122.344129 135.677112) - (xy 122.339784 135.681937) - (xy 122.339779 135.681942) - (xy 122.221813 135.812956) - (xy 122.221808 135.812962) - (xy 122.217467 135.817784) - (xy 122.214222 135.823404) - (xy 122.214218 135.82341) - (xy 122.126069 135.976089) - (xy 122.126066 135.976094) - (xy 122.122821 135.981716) - (xy 122.120815 135.987888) - (xy 122.120813 135.987894) - (xy 122.066333 136.155564) - (xy 122.066331 136.155573) - (xy 122.064326 136.161744) - (xy 122.063648 136.168194) - (xy 122.063646 136.168204) - (xy 122.04871 136.310326) - (xy 122.04454 136.35) - (xy 122.045219 136.35646) - (xy 122.063646 136.531795) - (xy 122.063647 136.531803) - (xy 122.064326 136.538256) - (xy 122.066331 136.544428) - (xy 122.066333 136.544435) - (xy 122.120813 136.712105) - (xy 122.122821 136.718284) - (xy 122.126068 136.723908) - (xy 122.126069 136.72391) - (xy 122.195676 136.844474) - (xy 122.217467 136.882216) - (xy 122.221811 136.887041) - (xy 122.221813 136.887043) - (xy 122.310018 136.985004) - (xy 122.344129 137.022888) - (xy 122.49727 137.134151) - (xy 122.670197 137.211144) - (xy 122.855354 137.2505) - (xy 123.038143 137.2505) - (xy 123.044646 137.2505) - (xy 123.229803 137.211144) - (xy 123.40273 137.134151) - (xy 123.555871 137.022888) - (xy 123.682533 136.882216) - (xy 123.777179 136.718284) - (xy 123.835674 136.538256) - (xy 123.85546 136.35) - (xy 123.84196 136.221549) - (xy 123.836353 136.168204) - (xy 123.836352 136.168203) - (xy 123.835674 136.161744) - (xy 123.801703 136.057196) - (xy 123.799061 135.989932) - (xy 123.831952 135.9312) + (xy 123.030289 135.3275) + (xy 123.041097 135.327972) + (xy 123.078984 135.331287) + (xy 123.115748 135.321435) + (xy 123.126262 135.319104) + (xy 123.163739 135.312497) + (xy 123.173145 135.307065) + (xy 123.176658 135.305787) + (xy 123.180051 135.304204) + (xy 123.190543 135.301394) + (xy 123.199436 135.295166) + (xy 123.203358 135.293338) + (xy 123.270874 135.282645) + (xy 123.333797 135.309355) + (xy 123.373005 135.365351) + (xy 123.376583 135.433615) + (xy 123.343442 135.493402) + (xy 122.998663 135.838181) + (xy 122.958435 135.865061) + (xy 122.910982 135.8745) + (xy 122.648352 135.8745) + (xy 122.648339 135.8745) + (xy 122.643482 135.874501) + (xy 122.63868 135.875261) + (xy 122.638673 135.875262) + (xy 122.559331 135.887828) + (xy 122.55933 135.887828) + (xy 122.549696 135.889354) + (xy 122.54101 135.893779) + (xy 122.541003 135.893782) + (xy 122.445353 135.942519) + (xy 122.445349 135.942521) + (xy 122.436658 135.94695) + (xy 122.429759 135.953848) + (xy 122.429756 135.953851) + (xy 122.353851 136.029756) + (xy 122.353848 136.029759) + (xy 122.34695 136.036658) + (xy 122.342521 136.045349) + (xy 122.342519 136.045353) + (xy 122.297516 136.133677) + (xy 122.289354 136.149696) + (xy 122.287827 136.15933) + (xy 122.287826 136.159337) + (xy 122.275263 136.23866) + (xy 122.275262 136.238667) + (xy 122.2745 136.243481) + (xy 122.2745 136.248358) + (xy 122.2745 136.248359) + (xy 122.2745 136.701647) + (xy 122.2745 136.701659) + (xy 122.274501 136.706518) + (xy 122.275261 136.71132) + (xy 122.275262 136.711326) + (xy 122.279925 136.740769) + (xy 122.289354 136.800304) + (xy 122.29378 136.808991) + (xy 122.293782 136.808996) + (xy 122.328223 136.876589) + (xy 122.34695 136.913342) + (xy 122.436658 137.00305) + (xy 122.459656 137.014768) + (xy 122.485611 137.027993) + (xy 122.52981 137.065835) + (xy 122.551883 137.119671) + (xy 122.546967 137.177649) + (xy 122.516148 137.227002) + (xy 122.466209 137.256863) + (xy 122.392764 137.27975) + (xy 122.379179 137.285864) + (xy 122.246543 137.366045) + (xy 122.234822 137.375228) + (xy 122.125228 137.484822) + (xy 122.116045 137.496543) + (xy 122.035864 137.629179) + (xy 122.029748 137.642767) + (xy 121.983361 137.791627) + (xy 121.980815 137.804431) + (xy 121.975661 137.861143) + (xy 121.97845 137.871549) + (xy 121.991326 137.875) + (xy 123.908673 137.875) + (xy 123.921548 137.871549) + (xy 123.924337 137.861143) + (xy 123.919184 137.804429) + (xy 123.916638 137.79163) + (xy 123.870251 137.642767) + (xy 123.864135 137.629179) + (xy 123.783954 137.496543) + (xy 123.774771 137.484822) + (xy 123.665177 137.375228) + (xy 123.653456 137.366045) + (xy 123.52082 137.285864) + (xy 123.507236 137.27975) + (xy 123.43379 137.256863) + (xy 123.383851 137.227002) + (xy 123.353031 137.177649) + (xy 123.348117 137.119671) + (xy 123.370189 137.065834) + (xy 123.414386 137.027994) + (xy 123.463342 137.00305) + (xy 123.55305 136.913342) + (xy 123.610646 136.800304) + (xy 123.6255 136.706519) + (xy 123.625499 136.243482) + (xy 123.620913 136.214526) + (xy 123.625455 136.156811) + (xy 123.655703 136.107449) (xy 124.432818 135.330335) (xy 124.482182 135.300085) (xy 124.539898 135.295543) @@ -18135,186 +18446,125 @@ (xy 124.858812 135.931885) (xy 124.920812 135.948498) (xy 124.974 135.9555) - (xy 125.582651 135.9555) - (xy 125.586137 135.9555) - (xy 125.632057 135.950304) - (xy 125.686072 135.937921) - (xy 125.729668 135.922596) - (xy 125.768738 135.897916) - (xy 125.811965 135.863241) - (xy 125.813016 135.864551) - (xy 125.854728 135.840934) - (xy 125.911231 135.837833) - (xy 125.963224 135.860158) - (xy 125.987118 135.877793) - (xy 126.035455 135.894707) - (xy 126.078841 135.920849) - (xy 126.108154 135.962161) - (xy 126.1185 136.011748) - (xy 126.1185 140.323349) - (xy 126.105194 140.37923) - (xy 126.068133 140.423119) - (xy 126.035332 140.447326) - (xy 126.035324 140.447333) - (xy 126.02785 140.45285) - (xy 126.022333 140.460324) - (xy 126.022328 140.46033) - (xy 125.952724 140.554641) - (xy 125.95272 140.554646) - (xy 125.947207 140.562118) - (xy 125.94414 140.57088) - (xy 125.944138 140.570886) - (xy 125.904844 140.683182) - (xy 125.904842 140.683189) - (xy 125.902354 140.690301) - (xy 125.90165 140.697807) - (xy 125.901649 140.697812) - (xy 125.900046 140.714909) - (xy 125.8995 140.720734) - (xy 125.8995 142.079266) - (xy 125.899769 142.082141) - (xy 125.89977 142.082149) - (xy 125.901649 142.102187) - (xy 125.901649 142.102191) - (xy 125.902354 142.109699) - (xy 125.904842 142.116811) - (xy 125.904844 142.116817) - (xy 125.944138 142.229113) - (xy 125.944139 142.229116) - (xy 125.947207 142.237882) - (xy 125.952722 142.245355) - (xy 125.952724 142.245358) - (xy 125.996606 142.304816) - (xy 126.02785 142.34715) - (xy 126.061369 142.371888) - (xy 126.12934 142.422053) - (xy 126.137118 142.427793) - (xy 126.161698 142.436393) - (xy 126.162453 142.436658) - (xy 126.20584 142.462801) - (xy 126.235153 142.504113) - (xy 126.2455 142.5537) - (xy 126.2455 143.017509) - (xy 126.24472 143.031393) - (xy 126.241807 143.05725) - (xy 126.240687 143.067186) - (xy 126.242413 143.076312) - (xy 126.242414 143.076317) - (xy 126.25141 143.123861) - (xy 126.252187 143.128431) - (xy 126.260786 143.185479) - (xy 126.264547 143.193289) - (xy 126.266159 143.201807) - (xy 126.270497 143.210016) - (xy 126.270498 143.210017) - (xy 126.293113 143.252807) - (xy 126.295202 143.256945) - (xy 126.320233 143.308921) - (xy 126.326129 143.315275) - (xy 126.33018 143.32294) - (xy 126.336752 143.329512) - (xy 126.370974 143.363734) - (xy 126.374191 143.367074) - (xy 126.413423 143.409356) - (xy 126.419473 143.412849) - (xy 126.425265 143.418025) - (xy 126.755639 143.748399) - (xy 126.764905 143.758767) - (xy 126.781574 143.77967) - (xy 126.781576 143.779672) - (xy 126.787369 143.786936) - (xy 126.795045 143.792169) - (xy 126.795047 143.792171) - (xy 126.83504 143.819437) - (xy 126.838823 143.822121) - (xy 126.85619 143.834939) - (xy 126.885227 143.856369) - (xy 126.893407 143.859231) - (xy 126.900572 143.864116) - (xy 126.909452 143.866855) - (xy 126.909454 143.866856) - (xy 126.955707 143.881123) - (xy 126.960102 143.882568) - (xy 127.014549 143.90162) - (xy 127.023208 143.901944) - (xy 127.031495 143.9045) - (xy 127.089205 143.9045) - (xy 127.093842 143.904587) - (xy 127.151462 143.906743) - (xy 127.158208 143.904935) - (xy 127.165963 143.9045) - (xy 131.767509 143.9045) - (xy 131.78139 143.905279) - (xy 131.817186 143.909313) - (xy 131.873941 143.898573) - (xy 131.878369 143.897821) - (xy 131.935479 143.889214) - (xy 131.943289 143.885452) - (xy 131.951807 143.883841) - (xy 132.002848 143.856864) - (xy 132.006906 143.854815) - (xy 132.058921 143.829767) - (xy 132.065275 143.82387) - (xy 132.07294 143.81982) - (xy 132.113759 143.778999) - (xy 132.117016 143.775861) - (xy 132.159356 143.736577) - (xy 132.16285 143.730523) - (xy 132.168018 143.72474) - (xy 132.764005 143.128753) - (xy 133.875001 143.128753) - (xy 133.875256 143.134386) - (xy 133.880815 143.19557) - (xy 133.883361 143.208369) - (xy 133.929748 143.357232) - (xy 133.935864 143.37082) - (xy 134.016045 143.503456) - (xy 134.025228 143.515177) - (xy 134.134822 143.624771) - (xy 134.146543 143.633954) - (xy 134.279179 143.714135) - (xy 134.292767 143.720251) - (xy 134.441627 143.766638) - (xy 134.454431 143.769184) - (xy 134.511143 143.774338) - (xy 134.521549 143.771549) - (xy 134.525 143.758674) - (xy 134.525 143.066326) - (xy 134.521549 143.05345) - (xy 134.508674 143.05) - (xy 133.891327 143.05) - (xy 133.878451 143.05345) - (xy 133.875001 143.066326) - (xy 133.875001 143.128753) - (xy 132.764005 143.128753) - (xy 132.998405 142.894353) - (xy 133.008768 142.885093) - (xy 133.036936 142.862631) - (xy 133.069471 142.814908) - (xy 133.072115 142.811183) - (xy 133.106369 142.764773) - (xy 133.109231 142.756592) - (xy 133.114116 142.749428) - (xy 133.131142 142.694229) - (xy 133.132557 142.689929) - (xy 133.15162 142.635451) - (xy 133.151944 142.626791) - (xy 133.1545 142.618505) - (xy 133.1545 142.560795) - (xy 133.154587 142.556158) - (xy 133.154817 142.55) - (xy 133.156743 142.498538) - (xy 133.154935 142.491791) - (xy 133.1545 142.484037) - (xy 133.1545 141.839622) - (xy 133.163939 141.792169) - (xy 133.190819 141.751941) - (xy 133.451941 141.490819) - (xy 133.492169 141.463939) - (xy 133.539622 141.4545) - (xy 134.167905 141.4545) - (xy 134.2242 141.468015) - (xy 134.267849 141.505295) + (xy 124.978055 135.9555) + (xy 125.8945 135.9555) + (xy 125.9565 135.972113) + (xy 126.001887 136.0175) + (xy 126.0185 136.0795) + (xy 126.0185 136.203758) + (xy 126.017438 136.219943) + (xy 126.013482 136.25) + (xy 126.014543 136.258059) + (xy 126.0185 136.288116) + (xy 126.026647 136.35) + (xy 126.031762 136.388856) + (xy 126.033467 136.401802) + (xy 126.036578 136.409313) + (xy 126.036579 136.409316) + (xy 126.06189 136.470421) + (xy 126.09206 136.543259) + (xy 126.097008 136.549707) + (xy 126.097009 136.549709) + (xy 126.161865 136.634231) + (xy 126.161865 136.634232) + (xy 126.161868 136.634234) + (xy 126.185269 136.664731) + (xy 126.191715 136.669677) + (xy 126.209319 136.683185) + (xy 126.221514 136.69388) + (xy 126.656116 137.128481) + (xy 126.666811 137.140676) + (xy 126.685269 137.164731) + (xy 126.71577 137.188135) + (xy 126.806741 137.25794) + (xy 126.814249 137.26105) + (xy 126.814251 137.261051) + (xy 126.859395 137.27975) + (xy 126.948198 137.316533) + (xy 127.017275 137.325627) + (xy 127.031964 137.327561) + (xy 127.089101 137.350501) + (xy 127.10028 137.364122) + (xy 127.120509 137.34596) + (xy 127.178621 137.3315) + (xy 128.607772 137.3315) + (xy 128.655225 137.340939) + (xy 128.695453 137.367819) + (xy 128.831935 137.504301) + (xy 128.860509 137.548846) + (xy 128.867907 137.601248) + (xy 128.852782 137.651962) + (xy 128.817892 137.691748) + (xy 128.80285 137.70285) + (xy 128.797333 137.710324) + (xy 128.797331 137.710327) + (xy 128.727724 137.804641) + (xy 128.72772 137.804646) + (xy 128.722207 137.812118) + (xy 128.71914 137.82088) + (xy 128.719138 137.820886) + (xy 128.679844 137.933182) + (xy 128.679842 137.933189) + (xy 128.677354 137.940301) + (xy 128.67665 137.947807) + (xy 128.676649 137.947812) + (xy 128.67477 137.96785) + (xy 128.6745 137.970734) + (xy 128.6745 139.329266) + (xy 128.674769 139.332141) + (xy 128.67477 139.332149) + (xy 128.676649 139.352187) + (xy 128.676649 139.352191) + (xy 128.677354 139.359699) + (xy 128.679842 139.366811) + (xy 128.679844 139.366817) + (xy 128.719138 139.479113) + (xy 128.719139 139.479116) + (xy 128.722207 139.487882) + (xy 128.727722 139.495355) + (xy 128.727724 139.495358) + (xy 128.770062 139.552724) + (xy 128.80285 139.59715) + (xy 128.844447 139.62785) + (xy 128.892156 139.663061) + (xy 128.912118 139.677793) + (xy 128.920886 139.680861) + (xy 129.028569 139.718541) + (xy 129.040301 139.722646) + (xy 129.070734 139.7255) + (xy 129.926373 139.7255) + (xy 129.929266 139.7255) + (xy 129.959699 139.722646) + (xy 130.087882 139.677793) + (xy 130.19715 139.59715) + (xy 130.277793 139.487882) + (xy 130.315505 139.380106) + (xy 130.349919 139.328603) + (xy 130.404953 139.300171) + (xy 130.466873 139.301908) + (xy 130.520226 139.33338) + (xy 131.463316 140.276471) + (xy 132.404478 141.217633) + (xy 132.411787 141.225608) + (xy 132.43624 141.25475) + (xy 132.469191 141.273774) + (xy 132.478286 141.279568) + (xy 132.509457 141.301394) + (xy 132.519935 141.304201) + (xy 132.523334 141.305786) + (xy 132.526861 141.307069) + (xy 132.536261 141.312497) + (xy 132.573738 141.319104) + (xy 132.584258 141.321437) + (xy 132.621016 141.331287) + (xy 132.658902 141.327972) + (xy 132.669711 141.3275) + (xy 134.102212 141.3275) + (xy 134.152646 141.33822) + (xy 134.19436 141.368525) + (xy 134.213082 141.400951) + (xy 134.214354 141.400304) + (xy 134.256738 141.483488) (xy 134.27195 141.513342) (xy 134.361658 141.60305) (xy 134.370353 141.60748) @@ -18390,8 +18640,8 @@ (xy 137.0505 141.306519) (xy 137.050499 140.693482) (xy 137.035646 140.599696) - (xy 137.020666 140.570297) - (xy 137.004194 140.537969) + (xy 137.011499 140.552306) + (xy 137.006681 140.54285) (xy 136.97805 140.486658) (xy 136.888342 140.39695) (xy 136.879649 140.39252) @@ -18465,7 +18715,7 @@ (xy 138.5245 141.210925) (xy 138.524987 141.214784) (xy 138.524988 141.214791) - (xy 138.537185 141.311339) + (xy 138.538686 141.323217) (xy 138.539929 141.333058) (xy 138.5428 141.340311) (xy 138.542801 141.340312) @@ -18712,7 +18962,7 @@ (xy 150.986016 139.751725) (xy 150.933223 139.710602) (xy 150.87215 139.62785) - (xy 150.837378 139.602187) + (xy 150.846517 139.608932) (xy 150.770358 139.552724) (xy 150.770355 139.552722) (xy 150.762882 139.547207) @@ -18764,7 +19014,7 @@ (xy 149.577354 140.934699) (xy 149.579842 140.941811) (xy 149.579844 140.941817) - (xy 149.614401 141.040574) + (xy 149.608232 141.022944) (xy 149.622207 141.062882) (xy 149.627722 141.070355) (xy 149.627724 141.070358) @@ -18909,16 +19159,16 @@ (xy 152.014835 137.757543) (xy 152.013573 137.766316) (xy 152.013572 137.766322) - (xy 151.99712 137.880754) + (xy 151.998444 137.871549) (xy 151.994353 137.9) (xy 146.0795 137.9) (xy 146.0795 137.657491) (xy 146.08028 137.643607) - (xy 146.082193 137.626627) + (xy 146.081284 137.634694) (xy 146.084313 137.607814) (xy 146.07358 137.551092) (xy 146.072809 137.546551) - (xy 146.072459 137.544228) + (xy 146.072222 137.542656) (xy 146.064214 137.489521) (xy 146.060452 137.48171) (xy 146.058841 137.473193) @@ -19090,7 +19340,7 @@ (xy 147.228039 135.4995) (xy 147.21953 135.501998) (xy 147.219526 135.501999) - (xy 147.098461 135.537547) + (xy 147.099415 135.537267) (xy 147.089947 135.540047) (xy 147.082484 135.544842) (xy 147.082484 135.544843) @@ -19108,7 +19358,7 @@ (xy 146.814835 135.857543) (xy 146.813573 135.866316) (xy 146.813572 135.866322) - (xy 146.799493 135.964248) + (xy 146.797791 135.976089) (xy 146.794353 136) (xy 144.775858 136) (xy 144.757939 135.956741) @@ -19437,7 +19687,7 @@ (xy 150.310951 133.8775) (xy 150.375741 133.895773) (xy 150.421435 133.945203) - (xy 150.431888 133.965719) + (xy 150.436054 133.973895) (xy 150.472041 134.044525) (xy 150.472043 134.044528) (xy 150.476472 134.05322) @@ -19552,7 +19802,7 @@ (xy 142.614835 133.457543) (xy 142.613573 133.466316) (xy 142.613572 133.466322) - (xy 142.59712 133.580754) + (xy 142.603758 133.534584) (xy 142.594353 133.6) (xy 137.342973 133.6) (xy 137.255589 133.534584) @@ -19684,7 +19934,7 @@ (xy 132.5775 135.482579) (xy 132.585318 135.439246) (xy 132.607787 135.401377) - (xy 132.636847 135.367839) + (xy 132.639003 135.365351) (xy 132.675377 135.323373) (xy 132.735165 135.192457) (xy 132.736427 135.183675) @@ -19733,7 +19983,7 @@ (xy 132.914835 136.242457) (xy 132.918519 136.250525) (xy 132.91852 136.250526) - (xy 132.963948 136.35) + (xy 132.968203 136.359317) (xy 132.974623 136.373373) (xy 132.98043 136.380075) (xy 132.980431 136.380076) @@ -19780,30 +20030,67 @@ (xy 135.255647 132.85) (xy 135.235165 132.707543) (xy 135.175377 132.576627) - (xy 135.15991 132.558777) - (xy 135.086934 132.474557) - (xy 135.086932 132.474555) - (xy 135.081128 132.467857) - (xy 134.990813 132.409815) - (xy 134.948183 132.363367) - (xy 134.933904 132.301959) - (xy 134.951666 132.241467) - (xy 134.996878 132.197528) - (xy 135.057853 132.1815) - (xy 136.457772 132.1815) - (xy 136.505225 132.190939) - (xy 136.545453 132.217819) - (xy 136.996116 132.668481) - (xy 137.006811 132.680676) - (xy 137.025269 132.704731) - (xy 137.146741 132.797939) - (xy 137.288198 132.856533) - (xy 137.401884 132.8715) - (xy 137.401886 132.8715) - (xy 137.430467 132.875263) - (xy 137.44 132.876518) - (xy 137.470055 132.87256) - (xy 137.486241 132.8715) + (xy 135.092257 132.480701) + (xy 135.063233 132.417147) + (xy 135.073177 132.347988) + (xy 135.118932 132.295185) + (xy 135.185971 132.2755) + (xy 135.526373 132.2755) + (xy 135.529266 132.2755) + (xy 135.559699 132.272646) + (xy 135.687882 132.227793) + (xy 135.79715 132.14715) + (xy 135.877793 132.037882) + (xy 135.922646 131.909699) + (xy 135.9255 131.879266) + (xy 137.0745 131.879266) + (xy 137.07477 131.882143) + (xy 137.076649 131.902187) + (xy 137.076649 131.902191) + (xy 137.077354 131.909699) + (xy 137.079842 131.916811) + (xy 137.079844 131.916817) + (xy 137.119138 132.029113) + (xy 137.119139 132.029116) + (xy 137.122207 132.037882) + (xy 137.127722 132.045355) + (xy 137.127724 132.045358) + (xy 137.196243 132.138198) + (xy 137.20285 132.14715) + (xy 137.251927 132.18337) + (xy 137.302794 132.220912) + (xy 137.312118 132.227793) + (xy 137.440301 132.272646) + (xy 137.470734 132.2755) + (xy 138.326373 132.2755) + (xy 138.329266 132.2755) + (xy 138.359699 132.272646) + (xy 138.487882 132.227793) + (xy 138.59715 132.14715) + (xy 138.677793 132.037882) + (xy 138.722646 131.909699) + (xy 138.724125 131.893919) + (xy 138.744269 131.836929) + (xy 138.788962 131.796232) + (xy 138.847584 131.7815) + (xy 139.107772 131.7815) + (xy 139.155225 131.790939) + (xy 139.195453 131.817819) + (xy 140.046115 132.66848) + (xy 140.056809 132.680674) + (xy 140.07032 132.698282) + (xy 140.070322 132.698284) + (xy 140.075269 132.704731) + (xy 140.10577 132.728135) + (xy 140.196741 132.79794) + (xy 140.204249 132.80105) + (xy 140.204251 132.801051) + (xy 140.301236 132.841223) + (xy 140.338198 132.856533) + (xy 140.49 132.876518) + (xy 140.498059 132.875457) + (xy 140.520057 132.872561) + (xy 140.536242 132.8715) (xy 140.563139 132.8715) (xy 140.617982 132.884287) (xy 140.661514 132.920012) @@ -19825,7 +20112,7 @@ (xy 141.7255 132.919748) (xy 141.7255 132.565529) (xy 141.734939 132.518076) - (xy 141.748766 132.484694) + (xy 141.75042 132.480702) (xy 141.766533 132.441802) (xy 141.786518 132.29) (xy 141.766533 132.138198) @@ -19841,7 +20128,7 @@ (xy 150.364354 131.950304) (xy 150.36878 131.958991) (xy 150.368782 131.958996) - (xy 150.40937 132.038652) + (xy 150.417519 132.054646) (xy 150.42195 132.063342) (xy 150.511658 132.15305) (xy 150.624696 132.210646) @@ -19997,80 +20284,45 @@ (xy 140.796769 131.491133) (xy 140.786618 131.497915) (xy 140.786615 131.497917) - (xy 140.740601 131.528663) - (xy 140.740598 131.528665) + (xy 140.740599 131.528664) + (xy 140.740595 131.528667) (xy 140.730448 131.535448) - (xy 140.723665 131.545598) - (xy 140.723663 131.545601) - (xy 140.700964 131.579573) - (xy 140.686133 131.601769) - (xy 140.68375 131.613748) - (xy 140.679077 131.62503) - (xy 140.677625 131.624428) - (xy 140.661514 131.659988) - (xy 140.617982 131.695713) - (xy 140.563139 131.7085) - (xy 137.732227 131.7085) - (xy 137.684774 131.699061) - (xy 137.644546 131.672181) - (xy 137.433713 131.461348) - (xy 137.19388 131.221514) - (xy 137.183185 131.209319) - (xy 137.169677 131.191715) - (xy 137.164731 131.185269) - (xy 137.134234 131.161868) - (xy 137.134231 131.161865) - (xy 137.08561 131.124557) - (xy 137.049709 131.097009) - (xy 137.049707 131.097008) - (xy 137.043259 131.09206) - (xy 137.035746 131.088948) - (xy 136.909314 131.036578) - (xy 136.90931 131.036576) - (xy 136.901802 131.033467) - (xy 136.893744 131.032406) - (xy 136.89374 131.032405) - (xy 136.885243 131.031287) - (xy 136.788116 131.0185) - (xy 136.758059 131.014543) - (xy 136.75 131.013482) - (xy 136.741941 131.014543) - (xy 136.719943 131.017439) - (xy 136.703758 131.0185) - (xy 133.448821 131.0185) - (xy 133.391868 131.004647) - (xy 133.347641 130.966184) - (xy 133.32602 130.911704) - (xy 133.331837 130.853381) - (xy 133.334253 130.846506) - (xy 133.337921 130.836072) - (xy 133.350304 130.782057) - (xy 133.3555 130.736137) - (xy 133.3555 130.674) - (xy 133.348498 130.620812) - (xy 133.331885 130.558812) - (xy 133.328235 130.55) - (xy 133.314466 130.51676) - (xy 133.314465 130.516759) - (xy 133.311355 130.50925) - (xy 133.278697 130.46669) - (xy 133.23331 130.421303) - (xy 133.19075 130.388645) - (xy 133.183243 130.385535) - (xy 133.183239 130.385533) - (xy 133.144941 130.369669) - (xy 133.144932 130.369666) - (xy 133.141188 130.368115) - (xy 133.137272 130.367065) - (xy 133.13727 130.367065) - (xy 133.083101 130.35255) - (xy 133.083093 130.352548) - (xy 133.079188 130.351502) - (xy 133.060313 130.349017) - (xy 133.005378 130.327655) - (xy 132.966511 130.283337) - (xy 132.9525 130.226079) - (xy 132.9525 130.2) + (xy 140.728184 131.538835) + (xy 140.677906 131.567862) + (xy 140.61372 131.567861) + (xy 140.558134 131.535768) + (xy 139.84388 130.821514) + (xy 139.833185 130.809319) + (xy 139.819677 130.791715) + (xy 139.814731 130.785269) + (xy 139.784234 130.761868) + (xy 139.784231 130.761865) + (xy 139.699709 130.697009) + (xy 139.699707 130.697008) + (xy 139.693259 130.69206) + (xy 139.685746 130.688948) + (xy 139.559314 130.636578) + (xy 139.55931 130.636576) + (xy 139.551802 130.633467) + (xy 139.543744 130.632406) + (xy 139.54374 130.632405) + (xy 139.408059 130.614543) + (xy 139.4 130.613482) + (xy 139.391941 130.614543) + (xy 139.369943 130.617439) + (xy 139.353758 130.6185) + (xy 138.847584 130.6185) + (xy 138.788962 130.603768) + (xy 138.744269 130.563071) + (xy 138.724126 130.506081) + (xy 138.723602 130.5005) + (xy 138.722646 130.490301) + (xy 138.677793 130.362118) + (xy 138.66479 130.3445) + (xy 138.62994 130.297279) + (xy 138.59715 130.25285) + (xy 138.574566 130.236182) + (xy 138.525541 130.2) (xy 140.219593 130.2) (xy 140.220373 130.206923) (xy 140.238378 130.366733) @@ -20080,14 +20332,14 @@ (xy 140.24146 130.380233) (xy 140.254584 130.417739) (xy 140.296878 130.538606) - (xy 140.315046 130.567521) + (xy 140.309574 130.558812) (xy 140.386145 130.680676) (xy 140.386148 130.68068) (xy 140.389853 130.686576) (xy 140.513424 130.810147) (xy 140.51932 130.813851) (xy 140.519323 130.813854) - (xy 140.559918 130.839361) + (xy 140.534492 130.823385) (xy 140.661394 130.903122) (xy 140.826343 130.960841) (xy 140.956448 130.9755) @@ -20100,6 +20352,8 @@ (xy 141.703122 130.538606) (xy 141.760841 130.373657) (xy 141.780407 130.2) + (xy 141.772502 130.129844) + (xy 141.761621 130.033266) (xy 141.760841 130.026343) (xy 141.703122 129.861394) (xy 141.646992 129.772064) @@ -20153,7 +20407,128 @@ (xy 140.238378 130.033266) (xy 140.22538 130.148638) (xy 140.219593 130.2) - (xy 132.9525 130.2) + (xy 138.525541 130.2) + (xy 138.495358 130.177724) + (xy 138.495355 130.177722) + (xy 138.487882 130.172207) + (xy 138.479116 130.169139) + (xy 138.479113 130.169138) + (xy 138.366817 130.129844) + (xy 138.366811 130.129842) + (xy 138.359699 130.127354) + (xy 138.352191 130.126649) + (xy 138.352187 130.126649) + (xy 138.332149 130.12477) + (xy 138.332141 130.124769) + (xy 138.329266 130.1245) + (xy 137.470734 130.1245) + (xy 137.467859 130.124769) + (xy 137.46785 130.12477) + (xy 137.447812 130.126649) + (xy 137.447807 130.12665) + (xy 137.440301 130.127354) + (xy 137.433189 130.129842) + (xy 137.433182 130.129844) + (xy 137.320886 130.169138) + (xy 137.32088 130.16914) + (xy 137.312118 130.172207) + (xy 137.304646 130.17772) + (xy 137.304641 130.177724) + (xy 137.210327 130.247331) + (xy 137.210324 130.247333) + (xy 137.20285 130.25285) + (xy 137.197333 130.260324) + (xy 137.197331 130.260327) + (xy 137.127724 130.354641) + (xy 137.12772 130.354646) + (xy 137.122207 130.362118) + (xy 137.11914 130.37088) + (xy 137.119138 130.370886) + (xy 137.079844 130.483182) + (xy 137.079842 130.483189) + (xy 137.077354 130.490301) + (xy 137.07665 130.497807) + (xy 137.076649 130.497812) + (xy 137.07477 130.51785) + (xy 137.0745 130.520734) + (xy 137.0745 131.879266) + (xy 135.9255 131.879266) + (xy 135.9255 130.520734) + (xy 135.922646 130.490301) + (xy 135.877793 130.362118) + (xy 135.86479 130.3445) + (xy 135.82994 130.297279) + (xy 135.79715 130.25285) + (xy 135.774566 130.236182) + (xy 135.695358 130.177724) + (xy 135.695355 130.177722) + (xy 135.687882 130.172207) + (xy 135.679116 130.169139) + (xy 135.679113 130.169138) + (xy 135.566817 130.129844) + (xy 135.566811 130.129842) + (xy 135.559699 130.127354) + (xy 135.552191 130.126649) + (xy 135.552187 130.126649) + (xy 135.532149 130.12477) + (xy 135.532141 130.124769) + (xy 135.529266 130.1245) + (xy 134.670734 130.1245) + (xy 134.667859 130.124769) + (xy 134.66785 130.12477) + (xy 134.647812 130.126649) + (xy 134.647807 130.12665) + (xy 134.640301 130.127354) + (xy 134.633189 130.129842) + (xy 134.633182 130.129844) + (xy 134.520886 130.169138) + (xy 134.52088 130.16914) + (xy 134.512118 130.172207) + (xy 134.504646 130.17772) + (xy 134.504641 130.177724) + (xy 134.410327 130.247331) + (xy 134.410324 130.247333) + (xy 134.40285 130.25285) + (xy 134.397333 130.260324) + (xy 134.397331 130.260327) + (xy 134.327724 130.354641) + (xy 134.32772 130.354646) + (xy 134.322207 130.362118) + (xy 134.31914 130.37088) + (xy 134.319138 130.370886) + (xy 134.279844 130.483182) + (xy 134.279842 130.483189) + (xy 134.277354 130.490301) + (xy 134.27665 130.497805) + (xy 134.276649 130.497811) + (xy 134.275874 130.506081) + (xy 134.255731 130.563071) + (xy 134.211038 130.603768) + (xy 134.152416 130.6185) + (xy 133.439462 130.6185) + (xy 133.39201 130.609061) + (xy 133.351782 130.582182) + (xy 133.324902 130.541954) + (xy 133.314466 130.51676) + (xy 133.314465 130.516759) + (xy 133.311355 130.50925) + (xy 133.278697 130.46669) + (xy 133.23331 130.421303) + (xy 133.19075 130.388645) + (xy 133.183243 130.385535) + (xy 133.183239 130.385533) + (xy 133.144941 130.369669) + (xy 133.144932 130.369666) + (xy 133.141188 130.368115) + (xy 133.137272 130.367065) + (xy 133.13727 130.367065) + (xy 133.083101 130.35255) + (xy 133.083093 130.352548) + (xy 133.079188 130.351502) + (xy 133.060313 130.349017) + (xy 133.005378 130.327655) + (xy 132.966511 130.283337) + (xy 132.9525 130.226079) (xy 132.9525 129.135514) (xy 132.970773 129.070724) (xy 133.020206 129.025029) @@ -21147,7 +21522,7 @@ (xy 120.364835 130.492457) (xy 120.368519 130.500525) (xy 120.36852 130.500526) - (xy 120.417944 130.60875) + (xy 120.420105 130.613482) (xy 120.424623 130.623373) (xy 120.43043 130.630075) (xy 120.430431 130.630076) @@ -24166,7 +24541,6 @@ (xy 157.117438 119.669943) (xy 157.113482 119.7) (xy 157.114543 119.708059) - (xy 157.1185 119.738116) (xy 157.132405 119.843742) (xy 157.132406 119.843748) (xy 157.133467 119.851802) @@ -24183,7 +24557,6 @@ (xy 158.114731 120.114731) (xy 158.207939 119.993259) (xy 158.266533 119.851802) - (xy 158.2815 119.738116) (xy 158.286518 119.7) (xy 158.282561 119.669943) (xy 158.2815 119.653758) @@ -24991,7 +25364,7 @@ (xy 152.014354 131.950304) (xy 152.01878 131.958991) (xy 152.018782 131.958996) - (xy 152.05937 132.038652) + (xy 152.067519 132.054646) (xy 152.07195 132.063342) (xy 152.161658 132.15305) (xy 152.274696 132.210646) @@ -25094,7 +25467,7 @@ (xy 151.963753 133.923484) (xy 151.963754 133.923489) (xy 151.965281 133.933126) - (xy 151.981888 133.965719) + (xy 151.986054 133.973895) (xy 152.017032 134.034694) (xy 152.026472 134.05322) (xy 152.12178 134.148528) @@ -25248,7 +25621,7 @@ (xy 153.485617 139.296946) (xy 153.480896 139.323721) (xy 153.478557 139.334274) - (xy 153.47152 139.360538) + (xy 153.471745 139.359699) (xy 153.468713 139.371016) (xy 153.469658 139.381818) (xy 153.469658 139.381821) @@ -25349,7 +25722,6 @@ (xy 158.120421 143.671698) (xy 158.126227 143.680813) (xy 158.14525 143.71376) - (xy 158.163495 143.729069) (xy 158.17439 143.738211) (xy 158.182366 143.74552) (xy 158.554478 144.117633) @@ -25440,7 +25812,7 @@ (xy 168.12152 142.888) (xy 168.106366 142.776128) (xy 168.099603 142.726198) - (xy 168.053954 142.585703) + (xy 168.059956 142.604177) (xy 168.033157 142.521697) (xy 168.033156 142.521694) (xy 168.031436 142.516401) @@ -25452,7 +25824,7 @@ (xy 167.627434 142.008205) (xy 167.627431 142.008202) (xy 167.623242 142.004543) - (xy 167.595228 141.987805) + (xy 167.57638 141.976544) (xy 167.438658 141.894258) (xy 167.438655 141.894256) (xy 167.433874 141.8914) @@ -25506,26 +25878,23 @@ (xy 165.681922 142.829401) (xy 165.681921 142.829407) (xy 165.680683 142.834832) - (xy 165.680433 142.840396) - (xy 165.680433 142.840397) - (xy 165.679314 142.865305) (xy 165.670786 143.055204) (xy 165.2275 143.055204) (xy 165.2275 143.032579) (xy 165.235318 142.989246) (xy 165.257787 142.951377) - (xy 165.274458 142.932137) + (xy 165.278222 142.927793) (xy 165.325377 142.873373) (xy 165.385165 142.742457) (xy 165.405647 142.6) (xy 165.385165 142.457543) (xy 165.325377 142.326627) - (xy 165.302207 142.299887) + (xy 165.305805 142.30404) (xy 165.236934 142.224557) (xy 165.236932 142.224555) (xy 165.231128 142.217857) (xy 165.110053 142.140047) - (xy 165.030938 142.116817) + (xy 165.054863 142.123841) (xy 164.980473 142.101999) (xy 164.98047 142.101998) (xy 164.971961 142.0995) @@ -25552,13 +25921,13 @@ (xy 164.413572 142.466322) (xy 164.399153 142.566613) (xy 164.394353 142.6) - (xy 164.395615 142.608777) + (xy 164.396078 142.612) (xy 164.413572 142.733677) (xy 164.413573 142.733681) (xy 164.414835 142.742457) (xy 164.418519 142.750525) (xy 164.41852 142.750526) - (xy 164.469309 142.861739) + (xy 164.469584 142.862341) (xy 164.474623 142.873373) (xy 164.48043 142.880075) (xy 164.480431 142.880076) @@ -25624,7 +25993,7 @@ (xy 164.475 141.386518) (xy 164.584137 141.37215) (xy 164.626802 141.366533) - (xy 164.628238 141.365938) + (xy 164.626802 141.366532) (xy 164.768259 141.30794) (xy 164.859231 141.238135) (xy 164.859238 141.238127) @@ -25646,7 +26015,7 @@ (xy 168.297646 138.690301) (xy 168.252793 138.562118) (xy 168.17215 138.45285) - (xy 168.135947 138.426131) + (xy 168.133588 138.42439) (xy 168.070358 138.377724) (xy 168.070355 138.377722) (xy 168.062882 138.372207) @@ -25849,7 +26218,7 @@ (xy 165.861801 137.722207) (xy 165.927222 137.77049) (xy 165.937118 137.777793) - (xy 165.945886 137.780861) + (xy 165.976662 137.79163) (xy 166.049648 137.817169) (xy 166.065301 137.822646) (xy 166.095734 137.8255) @@ -25864,10 +26233,10 @@ (xy 168.3005 136.570734) (xy 168.297646 136.540301) (xy 168.252793 136.412118) - (xy 168.224864 136.374276) + (xy 168.245179 136.401802) (xy 168.186113 136.321769) (xy 168.17215 136.30285) - (xy 168.115563 136.261087) + (xy 168.11146 136.258059) (xy 168.070358 136.227724) (xy 168.070355 136.227722) (xy 168.062882 136.222207) @@ -25902,7 +26271,7 @@ (xy 167.38017 133.80875) (xy 167.347596 133.783755) (xy 167.293259 133.742061) - (xy 167.276456 133.735101) + (xy 167.281876 133.737346) (xy 167.159311 133.686577) (xy 167.159308 133.686576) (xy 167.151802 133.683467) @@ -25983,7 +26352,7 @@ (xy 165.220384 134.577165) (xy 165.195953 134.52863) (xy 165.19462 134.474309) - (xy 165.195331 134.470734) + (xy 165.19519 134.471444) (xy 165.2005 134.444748) (xy 165.2005 133.855252) (xy 165.188867 133.796769) @@ -33954,9 +34323,9 @@ (xy 119.234768 60.903954) (xy 119.237638 60.909323) (xy 119.23764 60.909328) - (xy 119.329444 61.081079) + (xy 119.328097 61.078559) (xy 119.332315 61.08645) - (xy 119.352 61.110436) + (xy 119.346336 61.103535) (xy 119.408313 61.179055) (xy 119.46359 61.24641) (xy 119.62355 61.377685) @@ -33978,7 +34347,7 @@ (xy 126.160557 60.838775) (xy 126.162701 60.84514) (xy 126.162703 60.845146) - (xy 126.200788 60.958177) + (xy 126.216078 61.003557) (xy 126.219904 61.014911) (xy 126.315727 61.174171) (xy 126.320351 61.179053) @@ -35859,7 +36228,7 @@ (xy 152.083467 60.748198) (xy 152.082407 60.756249) (xy 152.082405 60.756257) - (xy 152.068207 60.864108) + (xy 152.064888 60.889321) (xy 152.063482 60.9) (xy 152.064543 60.908059) (xy 152.082405 61.04374) @@ -36217,7 +36586,7 @@ (xy 140.824501 61.306518) (xy 140.825261 61.31132) (xy 140.825262 61.311326) - (xy 140.833142 61.361079) + (xy 140.833019 61.360301) (xy 140.839354 61.400304) (xy 140.84378 61.408991) (xy 140.843782 61.408996) @@ -36328,7 +36697,7 @@ (xy 138.687017 62.1725) (xy 138.639564 62.163061) (xy 138.599336 62.136181) - (xy 138.173456 61.710301) + (xy 138.190933 61.727778) (xy 137.736945 61.273791) (xy 137.706422 61.223575) (xy 137.702447 61.164944) @@ -36395,7 +36764,7 @@ (xy 136.160557 60.838775) (xy 136.162701 60.84514) (xy 136.162703 60.845146) - (xy 136.200788 60.958177) + (xy 136.216078 61.003557) (xy 136.219904 61.014911) (xy 136.315727 61.174171) (xy 136.320351 61.179053) @@ -37427,7 +37796,7 @@ (xy 153.963522 61.327783) (xy 153.965049 61.33742) (xy 153.985565 61.377685) - (xy 154.012642 61.430827) + (xy 154.0154 61.43624) (xy 154.025342 61.455751) (xy 154.119249 61.549658) (xy 154.23758 61.609951) @@ -38133,7 +38502,7 @@ (xy 163.58757 61.880116) (xy 163.599917 61.855883) (xy 163.599658 61.855751) - (xy 163.611186 61.833126) + (xy 163.626349 61.803367) (xy 163.659951 61.73742) (xy 163.6755 61.639246) (xy 163.6755 61.35) @@ -38144,7 +38513,7 @@ (xy 166.939313 61.500236) (xy 166.942422 61.507742) (xy 166.942423 61.507745) - (xy 166.984772 61.609983) + (xy 166.990883 61.624736) (xy 166.997302 61.640233) (xy 167.002245 61.646674) (xy 167.002248 61.64668) @@ -38243,7 +38612,7 @@ (xy 162.400342 60.919249) (xy 162.395913 60.927941) (xy 162.395911 60.927944) - (xy 162.351599 61.014911) + (xy 162.348661 61.020678) (xy 162.340049 61.03758) (xy 162.338523 61.047214) (xy 162.338521 61.047221) @@ -39815,7 +40184,7 @@ (xy 148.302963 142.951163) (xy 148.296952 142.94619) (xy 148.29695 142.946188) - (xy 148.199178 142.865305) + (xy 148.195595 142.862341) (xy 148.176326 142.8464) (xy 148.169277 142.843083) (xy 148.169274 142.843081) @@ -39869,7 +40238,7 @@ (xy 139.652963 142.951163) (xy 139.646952 142.94619) (xy 139.64695 142.946188) - (xy 139.549178 142.865305) + (xy 139.545595 142.862341) (xy 139.526326 142.8464) (xy 139.519277 142.843083) (xy 139.519274 142.843081) @@ -39922,13 +40291,15 @@ (xy 117.872455 143.481395) (xy 117.868873 143.466862) (xy 117.852997 143.380231) + (xy 117.832482 143.268282) (xy 117.819347 143.196605) (xy 117.817542 143.181741) + (xy 117.814323 143.128531) (xy 117.809888 143.055204) (xy 118.870786 143.055204) (xy 118.871531 143.060707) (xy 118.871532 143.060718) - (xy 118.88994 143.196605) + (xy 118.899649 143.268282) (xy 118.900397 143.273802) (xy 118.902117 143.279095) (xy 118.902118 143.2791) @@ -39955,71 +40326,95 @@ (xy 121.319317 143.165168) (xy 121.329214 142.944796) (xy 121.299603 142.726198) - (xy 121.231436 142.516401) - (xy 121.126903 142.322147) - (xy 120.989365 142.14968) - (xy 120.90877 142.079266) - (xy 125.8995 142.079266) - (xy 125.899769 142.082141) - (xy 125.89977 142.082149) - (xy 125.901649 142.102187) - (xy 125.901649 142.102191) - (xy 125.902354 142.109699) - (xy 125.904842 142.116811) - (xy 125.904844 142.116817) - (xy 125.944138 142.229113) - (xy 125.944139 142.229116) - (xy 125.947207 142.237882) - (xy 125.952722 142.245355) - (xy 125.952724 142.245358) - (xy 125.996606 142.304816) - (xy 126.02785 142.34715) - (xy 126.035327 142.352668) - (xy 126.12934 142.422053) - (xy 126.137118 142.427793) - (xy 126.265301 142.472646) - (xy 126.295734 142.4755) - (xy 127.101373 142.4755) - (xy 127.104266 142.4755) - (xy 127.134699 142.472646) - (xy 127.262882 142.427793) - (xy 127.37215 142.34715) - (xy 127.452793 142.237882) - (xy 127.478823 142.16349) - (xy 127.509685 142.115288) - (xy 127.558911 142.08608) - (xy 127.61601 142.082094) - (xy 127.668817 142.104177) - (xy 127.706079 142.147626) - (xy 127.767699 142.267151) - (xy 127.774064 142.277055) - (xy 127.896617 142.432894) - (xy 127.904735 142.441408) - (xy 128.054572 142.571243) - (xy 128.064149 142.578062) - (xy 128.235846 142.677191) - (xy 128.246549 142.682079) - (xy 128.433904 142.746924) - (xy 128.439488 142.748279) - (xy 128.447681 142.747693) - (xy 128.45 142.737036) - (xy 128.45 142.732181) - (xy 128.95 142.732181) - (xy 128.952505 142.743072) - (xy 128.963679 142.742939) - (xy 129.05567 142.720622) - (xy 129.066788 142.716774) - (xy 129.247121 142.634419) - (xy 129.257319 142.628531) - (xy 129.297385 142.6) + (xy 121.259956 142.604177) + (xy 121.251862 142.579266) + (xy 125.8495 142.579266) + (xy 125.849769 142.582141) + (xy 125.84977 142.582149) + (xy 125.851649 142.602187) + (xy 125.851649 142.602191) + (xy 125.852354 142.609699) + (xy 125.854842 142.616811) + (xy 125.854844 142.616817) + (xy 125.894138 142.729113) + (xy 125.894139 142.729116) + (xy 125.897207 142.737882) + (xy 125.902722 142.745355) + (xy 125.902724 142.745358) + (xy 125.94624 142.80432) + (xy 125.97785 142.84715) + (xy 126.013381 142.873373) + (xy 126.054532 142.903744) + (xy 126.087118 142.927793) + (xy 126.215301 142.972646) + (xy 126.245734 142.9755) + (xy 127.051373 142.9755) + (xy 127.054266 142.9755) + (xy 127.084699 142.972646) + (xy 127.212882 142.927793) + (xy 127.32215 142.84715) + (xy 127.402793 142.737882) + (xy 127.428823 142.66349) + (xy 127.459685 142.615288) + (xy 127.508911 142.58608) + (xy 127.56601 142.582094) + (xy 127.618817 142.604177) + (xy 127.656079 142.647626) + (xy 127.717699 142.767151) + (xy 127.724064 142.777055) + (xy 127.846617 142.932894) + (xy 127.854735 142.941408) + (xy 128.004572 143.071243) + (xy 128.014149 143.078062) + (xy 128.185846 143.177191) + (xy 128.196549 143.182079) + (xy 128.383904 143.246924) + (xy 128.389488 143.248279) + (xy 128.397681 143.247693) + (xy 128.4 143.237036) + (xy 128.4 143.232181) + (xy 128.9 143.232181) + (xy 128.902505 143.243072) + (xy 128.913679 143.242939) + (xy 129.00567 143.220622) + (xy 129.016788 143.216774) + (xy 129.197121 143.134419) + (xy 129.207319 143.128531) + (xy 129.368806 143.013536) + (xy 129.377703 143.005827) + (xy 129.514517 142.862341) + (xy 129.521784 142.8531) + (xy 129.628971 142.686314) + (xy 129.634362 142.675856) + (xy 129.694754 142.525005) + (xy 129.727401 142.478492) + (xy 129.777369 142.451427) + (xy 129.834163 142.449494) + (xy 129.885856 142.473099) + (xy 129.92159 142.517285) + (xy 129.921913 142.517956) + (xy 129.924211 142.524522) + (xy 129.927912 142.530412) + (xy 129.927913 142.530414) + (xy 129.977152 142.608777) + (xy 130.020184 142.677262) + (xy 130.147738 142.804816) + (xy 130.300478 142.900789) + (xy 130.470745 142.960368) + (xy 130.65 142.980565) + (xy 130.829255 142.960368) + (xy 130.999522 142.900789) + (xy 131.152262 142.804816) + (xy 131.279816 142.677262) + (xy 131.328363 142.6) (xy 164.394353 142.6) - (xy 164.395615 142.608777) + (xy 164.396459 142.614645) (xy 164.413572 142.733677) (xy 164.413573 142.733681) (xy 164.414835 142.742457) (xy 164.418519 142.750525) (xy 164.41852 142.750526) - (xy 164.465035 142.85238) + (xy 164.469584 142.862341) (xy 164.474623 142.873373) (xy 164.48043 142.880075) (xy 164.480431 142.880076) @@ -40035,7 +40430,7 @@ (xy 165.670786 143.055204) (xy 165.671531 143.060707) (xy 165.671532 143.060718) - (xy 165.68994 143.196605) + (xy 165.699649 143.268282) (xy 165.700397 143.273802) (xy 165.702117 143.279095) (xy 165.702118 143.2791) @@ -40062,14 +40457,14 @@ (xy 168.119317 143.165168) (xy 168.129214 142.944796) (xy 168.099603 142.726198) + (xy 168.059956 142.604177) + (xy 168.033157 142.521697) + (xy 168.033156 142.521694) (xy 168.031436 142.516401) (xy 167.926903 142.322147) (xy 167.789365 142.14968) - (xy 167.64611 142.024522) - (xy 167.627434 142.008205) - (xy 167.627431 142.008202) (xy 167.623242 142.004543) - (xy 167.618462 142.001687) + (xy 167.517394 141.941301) (xy 167.438658 141.894258) (xy 167.438655 141.894256) (xy 167.433874 141.8914) @@ -40139,7 +40534,7 @@ (xy 165.236932 142.224555) (xy 165.231128 142.217857) (xy 165.110053 142.140047) - (xy 165.025731 142.115288) + (xy 165.054863 142.123841) (xy 164.980473 142.101999) (xy 164.98047 142.101998) (xy 164.971961 142.0995) @@ -40164,43 +40559,20 @@ (xy 164.414835 142.457543) (xy 164.413573 142.466316) (xy 164.413572 142.466322) - (xy 164.405611 142.521697) + (xy 164.404358 142.530412) (xy 164.394353 142.6) - (xy 129.297385 142.6) - (xy 129.418806 142.513536) - (xy 129.427703 142.505827) - (xy 129.564517 142.362341) - (xy 129.571784 142.3531) - (xy 129.678971 142.186314) - (xy 129.684362 142.175856) - (xy 129.744754 142.025005) - (xy 129.777401 141.978492) - (xy 129.827369 141.951427) - (xy 129.884163 141.949494) - (xy 129.935856 141.973099) - (xy 129.97159 142.017285) - (xy 129.971913 142.017956) - (xy 129.974211 142.024522) - (xy 129.977912 142.030412) - (xy 129.977913 142.030414) - (xy 130.027731 142.109699) - (xy 130.070184 142.177262) - (xy 130.197738 142.304816) - (xy 130.350478 142.400789) - (xy 130.520745 142.460368) - (xy 130.7 142.480565) - (xy 130.879255 142.460368) - (xy 131.049522 142.400789) - (xy 131.202262 142.304816) - (xy 131.329816 142.177262) - (xy 131.425789 142.024522) - (xy 131.485368 141.854255) - (xy 131.5005 141.719954) - (xy 131.5005 141.210925) + (xy 131.328363 142.6) + (xy 131.375789 142.524522) + (xy 131.435368 142.354255) + (xy 131.4505 142.219954) + (xy 131.4505 141.580046) + (xy 131.435368 141.445745) + (xy 131.375789 141.275478) + (xy 131.335228 141.210925) (xy 138.5245 141.210925) (xy 138.524987 141.214784) (xy 138.524988 141.214791) - (xy 138.538686 141.323217) + (xy 138.532655 141.275478) (xy 138.539929 141.333058) (xy 138.5428 141.340311) (xy 138.542801 141.340312) @@ -40273,8 +40645,11 @@ (xy 140.171446 140.79) (xy 140.81975 140.79) (xy 140.820811 140.798059) - (xy 140.827276 140.847169) + (xy 140.833825 140.896913) (xy 140.83867 140.933709) + (xy 140.841781 140.94122) + (xy 140.841782 140.941223) + (xy 140.875632 141.022944) (xy 140.894139 141.067625) (xy 140.982379 141.182621) (xy 141.097375 141.270861) @@ -40334,11 +40709,8 @@ (xy 146.16133 140.646291) (xy 146.105861 140.512375) (xy 146.017621 140.397379) - (xy 145.989032 140.375442) - (xy 145.909071 140.314085) - (xy 145.909069 140.314084) (xy 145.902625 140.309139) - (xy 145.866491 140.294172) + (xy 145.796799 140.265305) (xy 145.776223 140.256782) (xy 145.77622 140.256781) (xy 145.768709 140.25367) @@ -40364,7 +40736,7 @@ (xy 145.059072 140.314085) (xy 145.059066 140.314082) (xy 145.052625 140.309139) - (xy 145.016491 140.294172) + (xy 144.946799 140.265305) (xy 144.926223 140.256782) (xy 144.92622 140.256781) (xy 144.918709 140.25367) @@ -40390,7 +40762,7 @@ (xy 144.209072 140.314085) (xy 144.209066 140.314082) (xy 144.202625 140.309139) - (xy 144.166491 140.294172) + (xy 144.096799 140.265305) (xy 144.076223 140.256782) (xy 144.07622 140.256781) (xy 144.068709 140.25367) @@ -40416,7 +40788,7 @@ (xy 143.359072 140.314085) (xy 143.359066 140.314082) (xy 143.352625 140.309139) - (xy 143.316491 140.294172) + (xy 143.246799 140.265305) (xy 143.226223 140.256782) (xy 143.22622 140.256781) (xy 143.218709 140.25367) @@ -40442,7 +40814,7 @@ (xy 142.509072 140.314085) (xy 142.509066 140.314082) (xy 142.502625 140.309139) - (xy 142.466491 140.294172) + (xy 142.396799 140.265305) (xy 142.376223 140.256782) (xy 142.37622 140.256781) (xy 142.368709 140.25367) @@ -40468,7 +40840,7 @@ (xy 141.659072 140.314085) (xy 141.659066 140.314082) (xy 141.652625 140.309139) - (xy 141.616491 140.294172) + (xy 141.546799 140.265305) (xy 141.526223 140.256782) (xy 141.52622 140.256781) (xy 141.518709 140.25367) @@ -40502,7 +40874,7 @@ (xy 140.83867 140.646291) (xy 140.837609 140.654348) (xy 140.837608 140.654353) - (xy 140.822438 140.769585) + (xy 140.835355 140.671468) (xy 140.81975 140.79) (xy 140.171446 140.79) (xy 140.525 140.436447) @@ -40518,7 +40890,7 @@ (xy 147.1745 141.210925) (xy 147.174987 141.214784) (xy 147.174988 141.214791) - (xy 147.188686 141.323217) + (xy 147.182655 141.275478) (xy 147.189929 141.333058) (xy 147.1928 141.340311) (xy 147.192801 141.340312) @@ -40825,146 +41197,145 @@ (xy 138.526439 139.58027) (xy 138.5245 139.587823) (xy 138.5245 141.210925) - (xy 131.5005 141.210925) - (xy 131.5005 141.080046) - (xy 131.485368 140.945745) - (xy 131.425789 140.775478) - (xy 131.329816 140.622738) - (xy 131.202262 140.495184) - (xy 131.150169 140.462452) - (xy 131.055412 140.402912) - (xy 131.049522 140.399211) - (xy 131.042959 140.396914) - (xy 131.042956 140.396913) - (xy 130.885824 140.34193) - (xy 130.885819 140.341928) - (xy 130.879255 140.339632) - (xy 130.872335 140.338852) - (xy 130.872334 140.338852) - (xy 130.706923 140.320215) - (xy 130.7 140.319435) - (xy 130.693077 140.320215) - (xy 130.527665 140.338852) - (xy 130.527662 140.338852) - (xy 130.520745 140.339632) - (xy 130.514182 140.341928) - (xy 130.514175 140.34193) - (xy 130.357043 140.396913) - (xy 130.357036 140.396915) - (xy 130.350478 140.399211) - (xy 130.34459 140.40291) - (xy 130.344587 140.402912) - (xy 130.203638 140.491476) - (xy 130.203633 140.491479) - (xy 130.197738 140.495184) - (xy 130.192813 140.500108) - (xy 130.192809 140.500112) - (xy 130.075112 140.617809) - (xy 130.075108 140.617813) - (xy 130.070184 140.622738) - (xy 130.066479 140.628633) - (xy 130.066476 140.628638) - (xy 129.977913 140.769585) - (xy 129.97791 140.76959) - (xy 129.974211 140.775478) - (xy 129.971914 140.782042) - (xy 129.971279 140.783361) - (xy 129.933666 140.828976) - (xy 129.879206 140.851989) - (xy 129.82028 140.847169) - (xy 129.770284 140.815611) - (xy 129.740584 140.76449) - (xy 129.727512 140.719973) - (xy 129.723146 140.709067) - (xy 129.632295 140.53284) - (xy 129.625935 140.522944) - (xy 129.503382 140.367105) - (xy 129.495264 140.358591) - (xy 129.345427 140.228756) - (xy 129.33585 140.221937) - (xy 129.164153 140.122808) - (xy 129.15345 140.11792) - (xy 128.966095 140.053075) - (xy 128.960511 140.05172) - (xy 128.952318 140.052306) - (xy 128.95 140.062964) - (xy 128.95 142.732181) - (xy 128.45 142.732181) - (xy 128.45 140.067819) - (xy 128.447494 140.056927) - (xy 128.43632 140.05706) - (xy 128.344329 140.079377) - (xy 128.333211 140.083225) - (xy 128.152878 140.16558) - (xy 128.14268 140.171468) - (xy 127.981193 140.286463) - (xy 127.972296 140.294172) - (xy 127.835482 140.437658) - (xy 127.828215 140.446899) - (xy 127.721028 140.613685) - (xy 127.715635 140.624146) - (xy 127.709884 140.638511) - (xy 127.675136 140.68685) - (xy 127.621863 140.713423) - (xy 127.562346 140.712106) - (xy 127.510302 140.683202) - (xy 127.477726 140.633374) - (xy 127.474004 140.622738) - (xy 127.452793 140.562118) - (xy 127.423881 140.522944) - (xy 127.400657 140.491476) - (xy 127.37215 140.45285) - (xy 127.354163 140.439575) - (xy 127.270358 140.377724) - (xy 127.270355 140.377722) - (xy 127.262882 140.372207) - (xy 127.254116 140.369139) - (xy 127.254113 140.369138) - (xy 127.141817 140.329844) - (xy 127.141811 140.329842) - (xy 127.134699 140.327354) - (xy 127.127191 140.326649) - (xy 127.127187 140.326649) - (xy 127.107149 140.32477) - (xy 127.107141 140.324769) - (xy 127.104266 140.3245) - (xy 126.295734 140.3245) - (xy 126.292859 140.324769) - (xy 126.29285 140.32477) - (xy 126.272812 140.326649) - (xy 126.272807 140.32665) - (xy 126.265301 140.327354) - (xy 126.258189 140.329842) - (xy 126.258182 140.329844) - (xy 126.145886 140.369138) - (xy 126.14588 140.36914) - (xy 126.137118 140.372207) - (xy 126.129646 140.37772) - (xy 126.129641 140.377724) - (xy 126.035327 140.447331) - (xy 126.035324 140.447333) - (xy 126.02785 140.45285) - (xy 126.022333 140.460324) - (xy 126.022331 140.460327) - (xy 125.952724 140.554641) - (xy 125.95272 140.554646) - (xy 125.947207 140.562118) - (xy 125.94414 140.57088) - (xy 125.944138 140.570886) - (xy 125.904844 140.683182) - (xy 125.904842 140.683189) - (xy 125.902354 140.690301) - (xy 125.90165 140.697807) - (xy 125.901649 140.697812) - (xy 125.89977 140.71785) - (xy 125.8995 140.720734) - (xy 125.8995 142.079266) - (xy 120.90877 142.079266) - (xy 120.84611 142.024522) - (xy 120.827434 142.008205) - (xy 120.827431 142.008202) + (xy 131.335228 141.210925) + (xy 131.279816 141.122738) + (xy 131.152262 140.995184) + (xy 131.096787 140.960327) + (xy 131.005412 140.902912) + (xy 130.999522 140.899211) + (xy 130.992959 140.896914) + (xy 130.992956 140.896913) + (xy 130.835824 140.84193) + (xy 130.835819 140.841928) + (xy 130.829255 140.839632) + (xy 130.822335 140.838852) + (xy 130.822334 140.838852) + (xy 130.656923 140.820215) + (xy 130.65 140.819435) + (xy 130.643077 140.820215) + (xy 130.477665 140.838852) + (xy 130.477662 140.838852) + (xy 130.470745 140.839632) + (xy 130.464182 140.841928) + (xy 130.464175 140.84193) + (xy 130.307043 140.896913) + (xy 130.307036 140.896915) + (xy 130.300478 140.899211) + (xy 130.29459 140.90291) + (xy 130.294587 140.902912) + (xy 130.153638 140.991476) + (xy 130.153633 140.991479) + (xy 130.147738 140.995184) + (xy 130.142813 141.000108) + (xy 130.142809 141.000112) + (xy 130.025112 141.117809) + (xy 130.025108 141.117813) + (xy 130.020184 141.122738) + (xy 130.016479 141.128633) + (xy 130.016476 141.128638) + (xy 129.927913 141.269585) + (xy 129.92791 141.26959) + (xy 129.924211 141.275478) + (xy 129.921914 141.282042) + (xy 129.921279 141.283361) + (xy 129.883666 141.328976) + (xy 129.829206 141.351989) + (xy 129.77028 141.347169) + (xy 129.720284 141.315611) + (xy 129.690584 141.26449) + (xy 129.677512 141.219973) + (xy 129.673146 141.209067) + (xy 129.582295 141.03284) + (xy 129.575935 141.022944) + (xy 129.453382 140.867105) + (xy 129.445264 140.858591) + (xy 129.295427 140.728756) + (xy 129.28585 140.721937) + (xy 129.114153 140.622808) + (xy 129.10345 140.61792) + (xy 128.916095 140.553075) + (xy 128.910511 140.55172) + (xy 128.902318 140.552306) + (xy 128.9 140.562964) + (xy 128.9 143.232181) + (xy 128.4 143.232181) + (xy 128.4 140.567819) + (xy 128.397494 140.556927) + (xy 128.38632 140.55706) + (xy 128.294329 140.579377) + (xy 128.283211 140.583225) + (xy 128.102878 140.66558) + (xy 128.09268 140.671468) + (xy 127.931193 140.786463) + (xy 127.922296 140.794172) + (xy 127.785482 140.937658) + (xy 127.778215 140.946899) + (xy 127.671028 141.113685) + (xy 127.665635 141.124146) + (xy 127.659884 141.138511) + (xy 127.625136 141.18685) + (xy 127.571863 141.213423) + (xy 127.512346 141.212106) + (xy 127.460302 141.183202) + (xy 127.427726 141.133374) + (xy 127.424004 141.122738) + (xy 127.402793 141.062118) + (xy 127.373881 141.022944) + (xy 127.327668 140.960327) + (xy 127.32215 140.95285) + (xy 127.306396 140.941223) + (xy 127.220358 140.877724) + (xy 127.220355 140.877722) + (xy 127.212882 140.872207) + (xy 127.204116 140.869139) + (xy 127.204113 140.869138) + (xy 127.091817 140.829844) + (xy 127.091811 140.829842) + (xy 127.084699 140.827354) + (xy 127.077191 140.826649) + (xy 127.077187 140.826649) + (xy 127.057149 140.82477) + (xy 127.057141 140.824769) + (xy 127.054266 140.8245) + (xy 126.245734 140.8245) + (xy 126.242859 140.824769) + (xy 126.24285 140.82477) + (xy 126.222812 140.826649) + (xy 126.222807 140.82665) + (xy 126.215301 140.827354) + (xy 126.208189 140.829842) + (xy 126.208182 140.829844) + (xy 126.095886 140.869138) + (xy 126.09588 140.86914) + (xy 126.087118 140.872207) + (xy 126.079646 140.87772) + (xy 126.079641 140.877724) + (xy 125.985327 140.947331) + (xy 125.985324 140.947333) + (xy 125.97785 140.95285) + (xy 125.972333 140.960324) + (xy 125.972331 140.960327) + (xy 125.902724 141.054641) + (xy 125.90272 141.054646) + (xy 125.897207 141.062118) + (xy 125.89414 141.07088) + (xy 125.894138 141.070886) + (xy 125.854844 141.183182) + (xy 125.854842 141.183189) + (xy 125.852354 141.190301) + (xy 125.85165 141.197807) + (xy 125.851649 141.197812) + (xy 125.850057 141.214791) + (xy 125.8495 141.220734) + (xy 125.8495 142.579266) + (xy 121.251862 142.579266) + (xy 121.233157 142.521697) + (xy 121.233156 142.521694) + (xy 121.231436 142.516401) + (xy 121.126903 142.322147) + (xy 120.989365 142.14968) (xy 120.823242 142.004543) - (xy 120.818462 142.001687) + (xy 120.717394 141.941301) (xy 120.638658 141.894258) (xy 120.638655 141.894256) (xy 120.633874 141.8914) @@ -41060,52 +41431,6 @@ (xy 121.275327 139.31984) (xy 121.322559 139.153835) (xy 121.323079 139.14258) - (xy 121.77692 139.14258) - (xy 121.77744 139.153835) - (xy 121.824672 139.31984) - (xy 121.828792 139.330474) - (xy 121.922813 139.519295) - (xy 121.92882 139.528997) - (xy 122.055932 139.69732) - (xy 122.06363 139.705764) - (xy 122.219505 139.847862) - (xy 122.228609 139.854738) - (xy 122.40795 139.965781) - (xy 122.418163 139.970867) - (xy 122.614855 140.047066) - (xy 122.625831 140.050188) - (xy 122.68657 140.061542) - (xy 122.697598 140.06116) - (xy 122.7 140.050393) - (xy 123.2 140.050393) - (xy 123.202401 140.06116) - (xy 123.213429 140.061542) - (xy 123.274168 140.050188) - (xy 123.285144 140.047066) - (xy 123.481836 139.970867) - (xy 123.492049 139.965781) - (xy 123.67139 139.854738) - (xy 123.680494 139.847862) - (xy 123.836369 139.705764) - (xy 123.844067 139.69732) - (xy 123.971179 139.528997) - (xy 123.977186 139.519295) - (xy 124.071207 139.330474) - (xy 124.075327 139.31984) - (xy 124.122559 139.153835) - (xy 124.123079 139.14258) - (xy 124.11211 139.14) - (xy 123.216326 139.14) - (xy 123.20345 139.14345) - (xy 123.2 139.156326) - (xy 123.2 140.050393) - (xy 122.7 140.050393) - (xy 122.7 139.156326) - (xy 122.696549 139.14345) - (xy 122.683674 139.14) - (xy 121.78789 139.14) - (xy 121.77692 139.14258) - (xy 121.323079 139.14258) (xy 121.31211 139.14) (xy 120.416326 139.14) (xy 120.40345 139.14345) @@ -41549,52 +41874,6 @@ (xy 120.416326 138.64) (xy 121.31211 138.64) (xy 121.323079 138.637419) - (xy 121.77692 138.637419) - (xy 121.78789 138.64) - (xy 122.683674 138.64) - (xy 122.696549 138.636549) - (xy 122.7 138.623674) - (xy 123.2 138.623674) - (xy 123.20345 138.636549) - (xy 123.216326 138.64) - (xy 124.11211 138.64) - (xy 124.123079 138.637419) - (xy 124.122559 138.626164) - (xy 124.075327 138.460159) - (xy 124.071207 138.449525) - (xy 123.977186 138.260704) - (xy 123.971179 138.251002) - (xy 123.844067 138.082679) - (xy 123.836369 138.074235) - (xy 123.680494 137.932137) - (xy 123.67139 137.925261) - (xy 123.492049 137.814218) - (xy 123.481836 137.809132) - (xy 123.285144 137.732933) - (xy 123.274168 137.729811) - (xy 123.213429 137.718457) - (xy 123.202401 137.718839) - (xy 123.2 137.729607) - (xy 123.2 138.623674) - (xy 122.7 138.623674) - (xy 122.7 137.729607) - (xy 122.697598 137.718839) - (xy 122.68657 137.718457) - (xy 122.625831 137.729811) - (xy 122.614855 137.732933) - (xy 122.418163 137.809132) - (xy 122.40795 137.814218) - (xy 122.228609 137.925261) - (xy 122.219505 137.932137) - (xy 122.06363 138.074235) - (xy 122.055932 138.082679) - (xy 121.92882 138.251002) - (xy 121.922813 138.260704) - (xy 121.828792 138.449525) - (xy 121.824672 138.460159) - (xy 121.77744 138.626164) - (xy 121.77692 138.637419) - (xy 121.323079 138.637419) (xy 121.322559 138.626164) (xy 121.275327 138.460159) (xy 121.271207 138.449525) @@ -41661,89 +41940,6 @@ (xy 120.977179 136.718284) (xy 121.035674 136.538256) (xy 121.05546 136.35) - (xy 122.04454 136.35) - (xy 122.045219 136.35646) - (xy 122.063646 136.531795) - (xy 122.063647 136.531803) - (xy 122.064326 136.538256) - (xy 122.066331 136.544428) - (xy 122.066333 136.544435) - (xy 122.120813 136.712105) - (xy 122.122821 136.718284) - (xy 122.126068 136.723908) - (xy 122.126069 136.72391) - (xy 122.184602 136.825293) - (xy 122.217467 136.882216) - (xy 122.221811 136.887041) - (xy 122.221813 136.887043) - (xy 122.292626 136.965688) - (xy 122.344129 137.022888) - (xy 122.49727 137.134151) - (xy 122.670197 137.211144) - (xy 122.855354 137.2505) - (xy 123.038143 137.2505) - (xy 123.044646 137.2505) - (xy 123.229803 137.211144) - (xy 123.40273 137.134151) - (xy 123.555871 137.022888) - (xy 123.682533 136.882216) - (xy 123.777179 136.718284) - (xy 123.835674 136.538256) - (xy 123.85546 136.35) - (xy 123.835674 136.161744) - (xy 123.777179 135.981716) - (xy 123.682533 135.817784) - (xy 123.555871 135.677112) - (xy 123.550613 135.673292) - (xy 123.550611 135.67329) - (xy 123.407988 135.569669) - (xy 123.407987 135.569668) - (xy 123.40273 135.565849) - (xy 123.384075 135.557543) - (xy 123.235745 135.491501) - (xy 123.23574 135.491499) - (xy 123.229803 135.488856) - (xy 123.223444 135.487504) - (xy 123.22344 135.487503) - (xy 123.051008 135.450852) - (xy 123.051005 135.450851) - (xy 123.044646 135.4495) - (xy 122.855354 135.4495) - (xy 122.848995 135.450851) - (xy 122.848991 135.450852) - (xy 122.676559 135.487503) - (xy 122.676552 135.487505) - (xy 122.670197 135.488856) - (xy 122.664262 135.491498) - (xy 122.664254 135.491501) - (xy 122.503207 135.563205) - (xy 122.503202 135.563207) - (xy 122.49727 135.565849) - (xy 122.492016 135.569665) - (xy 122.492011 135.569669) - (xy 122.349388 135.67329) - (xy 122.349381 135.673295) - (xy 122.344129 135.677112) - (xy 122.339784 135.681937) - (xy 122.339779 135.681942) - (xy 122.221813 135.812956) - (xy 122.221808 135.812962) - (xy 122.217467 135.817784) - (xy 122.214222 135.823404) - (xy 122.214218 135.82341) - (xy 122.126069 135.976089) - (xy 122.126066 135.976094) - (xy 122.122821 135.981716) - (xy 122.120815 135.987888) - (xy 122.120813 135.987894) - (xy 122.066333 136.155564) - (xy 122.066331 136.155573) - (xy 122.064326 136.161744) - (xy 122.063648 136.168194) - (xy 122.063646 136.168204) - (xy 122.051889 136.280076) - (xy 122.04454 136.35) - (xy 121.05546 136.35) (xy 121.035674 136.161744) (xy 120.977179 135.981716) (xy 120.882533 135.817784) @@ -53399,8 +53595,11 @@ (xy 140.820678 140.78295) (xy 140.81975 140.79) (xy 140.820811 140.798059) - (xy 140.827276 140.847169) + (xy 140.833825 140.896913) (xy 140.83867 140.933709) + (xy 140.841781 140.94122) + (xy 140.841782 140.941223) + (xy 140.875632 141.022944) (xy 140.894139 141.067625) (xy 140.982379 141.182621) (xy 141.097375 141.270861) @@ -53723,7 +53922,7 @@ (xy 138.5245 141.210925) (xy 138.524987 141.214784) (xy 138.524988 141.214791) - (xy 138.538686 141.323217) + (xy 138.532655 141.275478) (xy 138.539929 141.333058) (xy 138.5428 141.340311) (xy 138.542801 141.340312) @@ -54154,13 +54353,15 @@ (xy 117.872455 143.481395) (xy 117.868873 143.466862) (xy 117.852997 143.380231) + (xy 117.832482 143.268282) (xy 117.819347 143.196605) (xy 117.817542 143.181741) + (xy 117.814323 143.128531) (xy 117.809888 143.055204) (xy 118.870786 143.055204) (xy 118.871531 143.060707) (xy 118.871532 143.060718) - (xy 118.88994 143.196605) + (xy 118.899649 143.268282) (xy 118.900397 143.273802) (xy 118.902117 143.279095) (xy 118.902118 143.2791) @@ -54187,228 +54388,228 @@ (xy 121.319317 143.165168) (xy 121.329214 142.944796) (xy 121.299603 142.726198) - (xy 121.251471 142.578062) + (xy 121.259956 142.604177) + (xy 121.251862 142.579266) + (xy 125.8495 142.579266) + (xy 125.849769 142.582141) + (xy 125.84977 142.582149) + (xy 125.851649 142.602187) + (xy 125.851649 142.602191) + (xy 125.852354 142.609699) + (xy 125.854842 142.616811) + (xy 125.854844 142.616817) + (xy 125.894138 142.729113) + (xy 125.894139 142.729116) + (xy 125.897207 142.737882) + (xy 125.902722 142.745355) + (xy 125.902724 142.745358) + (xy 125.94624 142.80432) + (xy 125.97785 142.84715) + (xy 126.013381 142.873373) + (xy 126.054532 142.903744) + (xy 126.087118 142.927793) + (xy 126.215301 142.972646) + (xy 126.245734 142.9755) + (xy 127.051373 142.9755) + (xy 127.054266 142.9755) + (xy 127.084699 142.972646) + (xy 127.212882 142.927793) + (xy 127.32215 142.84715) + (xy 127.402793 142.737882) + (xy 127.428823 142.66349) + (xy 127.459685 142.615288) + (xy 127.508911 142.58608) + (xy 127.56601 142.582094) + (xy 127.618817 142.604177) + (xy 127.656079 142.647626) + (xy 127.717699 142.767151) + (xy 127.724064 142.777055) + (xy 127.846617 142.932894) + (xy 127.854735 142.941408) + (xy 128.004572 143.071243) + (xy 128.014149 143.078062) + (xy 128.185846 143.177191) + (xy 128.196549 143.182079) + (xy 128.383904 143.246924) + (xy 128.389488 143.248279) + (xy 128.397681 143.247693) + (xy 128.4 143.237036) + (xy 128.4 143.232181) + (xy 128.9 143.232181) + (xy 128.902505 143.243072) + (xy 128.913679 143.242939) + (xy 129.00567 143.220622) + (xy 129.016788 143.216774) + (xy 129.197121 143.134419) + (xy 129.207319 143.128531) + (xy 129.368806 143.013536) + (xy 129.377703 143.005827) + (xy 129.514517 142.862341) + (xy 129.521784 142.8531) + (xy 129.628971 142.686314) + (xy 129.634362 142.675856) + (xy 129.694754 142.525005) + (xy 129.727401 142.478492) + (xy 129.777369 142.451427) + (xy 129.834163 142.449494) + (xy 129.885856 142.473099) + (xy 129.92159 142.517285) + (xy 129.921913 142.517956) + (xy 129.924211 142.524522) + (xy 129.927912 142.530412) + (xy 129.927913 142.530414) + (xy 129.991296 142.631287) + (xy 130.020184 142.677262) + (xy 130.147738 142.804816) + (xy 130.300478 142.900789) + (xy 130.470745 142.960368) + (xy 130.65 142.980565) + (xy 130.829255 142.960368) + (xy 130.999522 142.900789) + (xy 131.152262 142.804816) + (xy 131.279816 142.677262) + (xy 131.375789 142.524522) + (xy 131.435368 142.354255) + (xy 131.4505 142.219954) + (xy 131.4505 141.580046) + (xy 131.435368 141.445745) + (xy 131.375789 141.275478) + (xy 131.279816 141.122738) + (xy 131.152262 140.995184) + (xy 131.096787 140.960327) + (xy 131.005412 140.902912) + (xy 130.999522 140.899211) + (xy 130.992959 140.896914) + (xy 130.992956 140.896913) + (xy 130.835824 140.84193) + (xy 130.835819 140.841928) + (xy 130.829255 140.839632) + (xy 130.822335 140.838852) + (xy 130.822334 140.838852) + (xy 130.656923 140.820215) + (xy 130.65 140.819435) + (xy 130.643077 140.820215) + (xy 130.477665 140.838852) + (xy 130.477662 140.838852) + (xy 130.470745 140.839632) + (xy 130.464182 140.841928) + (xy 130.464175 140.84193) + (xy 130.307043 140.896913) + (xy 130.307036 140.896915) + (xy 130.300478 140.899211) + (xy 130.29459 140.90291) + (xy 130.294587 140.902912) + (xy 130.153638 140.991476) + (xy 130.153633 140.991479) + (xy 130.147738 140.995184) + (xy 130.142813 141.000108) + (xy 130.142809 141.000112) + (xy 130.025112 141.117809) + (xy 130.025108 141.117813) + (xy 130.020184 141.122738) + (xy 130.016479 141.128633) + (xy 130.016476 141.128638) + (xy 129.927913 141.269585) + (xy 129.92791 141.26959) + (xy 129.924211 141.275478) + (xy 129.921914 141.282042) + (xy 129.921279 141.283361) + (xy 129.883666 141.328976) + (xy 129.829206 141.351989) + (xy 129.77028 141.347169) + (xy 129.720284 141.315611) + (xy 129.690584 141.26449) + (xy 129.677512 141.219973) + (xy 129.673146 141.209067) + (xy 129.582295 141.03284) + (xy 129.575935 141.022944) + (xy 129.453382 140.867105) + (xy 129.445264 140.858591) + (xy 129.295427 140.728756) + (xy 129.28585 140.721937) + (xy 129.114153 140.622808) + (xy 129.10345 140.61792) + (xy 128.916095 140.553075) + (xy 128.910511 140.55172) + (xy 128.902318 140.552306) + (xy 128.9 140.562964) + (xy 128.9 143.232181) + (xy 128.4 143.232181) + (xy 128.4 140.567819) + (xy 128.397494 140.556927) + (xy 128.38632 140.55706) + (xy 128.294329 140.579377) + (xy 128.283211 140.583225) + (xy 128.102878 140.66558) + (xy 128.09268 140.671468) + (xy 127.931193 140.786463) + (xy 127.922296 140.794172) + (xy 127.785482 140.937658) + (xy 127.778215 140.946899) + (xy 127.671028 141.113685) + (xy 127.665635 141.124146) + (xy 127.659884 141.138511) + (xy 127.625136 141.18685) + (xy 127.571863 141.213423) + (xy 127.512346 141.212106) + (xy 127.460302 141.183202) + (xy 127.427726 141.133374) + (xy 127.424004 141.122738) + (xy 127.402793 141.062118) + (xy 127.373881 141.022944) + (xy 127.327668 140.960327) + (xy 127.32215 140.95285) + (xy 127.306396 140.941223) + (xy 127.220358 140.877724) + (xy 127.220355 140.877722) + (xy 127.212882 140.872207) + (xy 127.204116 140.869139) + (xy 127.204113 140.869138) + (xy 127.091817 140.829844) + (xy 127.091811 140.829842) + (xy 127.084699 140.827354) + (xy 127.077191 140.826649) + (xy 127.077187 140.826649) + (xy 127.057149 140.82477) + (xy 127.057141 140.824769) + (xy 127.054266 140.8245) + (xy 126.245734 140.8245) + (xy 126.242859 140.824769) + (xy 126.24285 140.82477) + (xy 126.222812 140.826649) + (xy 126.222807 140.82665) + (xy 126.215301 140.827354) + (xy 126.208189 140.829842) + (xy 126.208182 140.829844) + (xy 126.095886 140.869138) + (xy 126.09588 140.86914) + (xy 126.087118 140.872207) + (xy 126.079646 140.87772) + (xy 126.079641 140.877724) + (xy 125.985327 140.947331) + (xy 125.985324 140.947333) + (xy 125.97785 140.95285) + (xy 125.972333 140.960324) + (xy 125.972331 140.960327) + (xy 125.902724 141.054641) + (xy 125.90272 141.054646) + (xy 125.897207 141.062118) + (xy 125.89414 141.07088) + (xy 125.894138 141.070886) + (xy 125.854844 141.183182) + (xy 125.854842 141.183189) + (xy 125.852354 141.190301) + (xy 125.85165 141.197807) + (xy 125.851649 141.197812) + (xy 125.850057 141.214791) + (xy 125.8495 141.220734) + (xy 125.8495 142.579266) + (xy 121.251862 142.579266) (xy 121.233157 142.521697) (xy 121.233156 142.521694) (xy 121.231436 142.516401) (xy 121.126903 142.322147) (xy 120.989365 142.14968) - (xy 120.908769 142.079266) - (xy 125.8995 142.079266) - (xy 125.899769 142.082141) - (xy 125.89977 142.082149) - (xy 125.901649 142.102187) - (xy 125.901649 142.102191) - (xy 125.902354 142.109699) - (xy 125.904842 142.116811) - (xy 125.904844 142.116817) - (xy 125.944138 142.229113) - (xy 125.944139 142.229116) - (xy 125.947207 142.237882) - (xy 125.952722 142.245355) - (xy 125.952724 142.245358) - (xy 125.996606 142.304816) - (xy 126.02785 142.34715) - (xy 126.035327 142.352668) - (xy 126.12934 142.422053) - (xy 126.137118 142.427793) - (xy 126.265301 142.472646) - (xy 126.295734 142.4755) - (xy 127.101373 142.4755) - (xy 127.104266 142.4755) - (xy 127.134699 142.472646) - (xy 127.262882 142.427793) - (xy 127.37215 142.34715) - (xy 127.452793 142.237882) - (xy 127.478823 142.16349) - (xy 127.509685 142.115288) - (xy 127.558911 142.08608) - (xy 127.61601 142.082094) - (xy 127.668817 142.104177) - (xy 127.706079 142.147626) - (xy 127.767699 142.267151) - (xy 127.774064 142.277055) - (xy 127.896617 142.432894) - (xy 127.904735 142.441408) - (xy 128.054572 142.571243) - (xy 128.064149 142.578062) - (xy 128.235846 142.677191) - (xy 128.246549 142.682079) - (xy 128.433904 142.746924) - (xy 128.439488 142.748279) - (xy 128.447681 142.747693) - (xy 128.45 142.737036) - (xy 128.45 142.732181) - (xy 128.95 142.732181) - (xy 128.952505 142.743072) - (xy 128.963679 142.742939) - (xy 129.05567 142.720622) - (xy 129.066788 142.716774) - (xy 129.247121 142.634419) - (xy 129.257319 142.628531) - (xy 129.418806 142.513536) - (xy 129.427703 142.505827) - (xy 129.564517 142.362341) - (xy 129.571784 142.3531) - (xy 129.678971 142.186314) - (xy 129.684362 142.175856) - (xy 129.744754 142.025005) - (xy 129.777401 141.978492) - (xy 129.827369 141.951427) - (xy 129.884163 141.949494) - (xy 129.935856 141.973099) - (xy 129.97159 142.017285) - (xy 129.971913 142.017956) - (xy 129.974211 142.024522) - (xy 129.977912 142.030412) - (xy 129.977913 142.030414) - (xy 130.027731 142.109699) - (xy 130.070184 142.177262) - (xy 130.197738 142.304816) - (xy 130.350478 142.400789) - (xy 130.520745 142.460368) - (xy 130.7 142.480565) - (xy 130.879255 142.460368) - (xy 131.049522 142.400789) - (xy 131.202262 142.304816) - (xy 131.329816 142.177262) - (xy 131.425789 142.024522) - (xy 131.485368 141.854255) - (xy 131.5005 141.719954) - (xy 131.5005 141.080046) - (xy 131.485368 140.945745) - (xy 131.425789 140.775478) - (xy 131.329816 140.622738) - (xy 131.202262 140.495184) - (xy 131.150169 140.462452) - (xy 131.055412 140.402912) - (xy 131.049522 140.399211) - (xy 131.042959 140.396914) - (xy 131.042956 140.396913) - (xy 130.885824 140.34193) - (xy 130.885819 140.341928) - (xy 130.879255 140.339632) - (xy 130.872335 140.338852) - (xy 130.872334 140.338852) - (xy 130.706923 140.320215) - (xy 130.7 140.319435) - (xy 130.693077 140.320215) - (xy 130.527665 140.338852) - (xy 130.527662 140.338852) - (xy 130.520745 140.339632) - (xy 130.514182 140.341928) - (xy 130.514175 140.34193) - (xy 130.357043 140.396913) - (xy 130.357036 140.396915) - (xy 130.350478 140.399211) - (xy 130.34459 140.40291) - (xy 130.344587 140.402912) - (xy 130.203638 140.491476) - (xy 130.203633 140.491479) - (xy 130.197738 140.495184) - (xy 130.192813 140.500108) - (xy 130.192809 140.500112) - (xy 130.075112 140.617809) - (xy 130.075108 140.617813) - (xy 130.070184 140.622738) - (xy 130.066479 140.628633) - (xy 130.066476 140.628638) - (xy 129.977913 140.769585) - (xy 129.97791 140.76959) - (xy 129.974211 140.775478) - (xy 129.971914 140.782042) - (xy 129.971279 140.783361) - (xy 129.933666 140.828976) - (xy 129.879206 140.851989) - (xy 129.82028 140.847169) - (xy 129.770284 140.815611) - (xy 129.740584 140.76449) - (xy 129.727512 140.719973) - (xy 129.723146 140.709067) - (xy 129.632295 140.53284) - (xy 129.625935 140.522944) - (xy 129.503382 140.367105) - (xy 129.495264 140.358591) - (xy 129.345427 140.228756) - (xy 129.33585 140.221937) - (xy 129.164153 140.122808) - (xy 129.15345 140.11792) - (xy 128.966095 140.053075) - (xy 128.960511 140.05172) - (xy 128.952318 140.052306) - (xy 128.95 140.062964) - (xy 128.95 142.732181) - (xy 128.45 142.732181) - (xy 128.45 140.067819) - (xy 128.447494 140.056927) - (xy 128.43632 140.05706) - (xy 128.344329 140.079377) - (xy 128.333211 140.083225) - (xy 128.152878 140.16558) - (xy 128.14268 140.171468) - (xy 127.981193 140.286463) - (xy 127.972296 140.294172) - (xy 127.835482 140.437658) - (xy 127.828215 140.446899) - (xy 127.721028 140.613685) - (xy 127.715635 140.624146) - (xy 127.709884 140.638511) - (xy 127.675136 140.68685) - (xy 127.621863 140.713423) - (xy 127.562346 140.712106) - (xy 127.510302 140.683202) - (xy 127.477726 140.633374) - (xy 127.474004 140.622738) - (xy 127.452793 140.562118) - (xy 127.423881 140.522944) - (xy 127.390727 140.478021) - (xy 127.37215 140.45285) - (xy 127.354163 140.439575) - (xy 127.270358 140.377724) - (xy 127.270355 140.377722) - (xy 127.262882 140.372207) - (xy 127.254116 140.369139) - (xy 127.254113 140.369138) - (xy 127.141817 140.329844) - (xy 127.141811 140.329842) - (xy 127.134699 140.327354) - (xy 127.127191 140.326649) - (xy 127.127187 140.326649) - (xy 127.107149 140.32477) - (xy 127.107141 140.324769) - (xy 127.104266 140.3245) - (xy 126.295734 140.3245) - (xy 126.292859 140.324769) - (xy 126.29285 140.32477) - (xy 126.272812 140.326649) - (xy 126.272807 140.32665) - (xy 126.265301 140.327354) - (xy 126.258189 140.329842) - (xy 126.258182 140.329844) - (xy 126.145886 140.369138) - (xy 126.14588 140.36914) - (xy 126.137118 140.372207) - (xy 126.129646 140.37772) - (xy 126.129641 140.377724) - (xy 126.035327 140.447331) - (xy 126.035324 140.447333) - (xy 126.02785 140.45285) - (xy 126.022333 140.460324) - (xy 126.022331 140.460327) - (xy 125.952724 140.554641) - (xy 125.95272 140.554646) - (xy 125.947207 140.562118) - (xy 125.94414 140.57088) - (xy 125.944138 140.570886) - (xy 125.904844 140.683182) - (xy 125.904842 140.683189) - (xy 125.902354 140.690301) - (xy 125.90165 140.697807) - (xy 125.901649 140.697812) - (xy 125.89977 140.71785) - (xy 125.8995 140.720734) - (xy 125.8995 142.079266) - (xy 120.908769 142.079266) (xy 120.870144 142.04552) (xy 120.827434 142.008205) (xy 120.827431 142.008202) @@ -54469,7 +54670,7 @@ (xy 118.880683 142.834832) (xy 118.880433 142.840396) (xy 118.880433 142.840397) - (xy 118.87994 142.851369) + (xy 118.88013 142.84715) (xy 118.870786 143.055204) (xy 117.809888 143.055204) (xy 117.803626 142.951679) @@ -54509,52 +54710,6 @@ (xy 121.275327 139.31984) (xy 121.322559 139.153835) (xy 121.323079 139.14258) - (xy 121.77692 139.14258) - (xy 121.77744 139.153835) - (xy 121.824672 139.31984) - (xy 121.828792 139.330474) - (xy 121.922813 139.519295) - (xy 121.92882 139.528997) - (xy 122.055932 139.69732) - (xy 122.06363 139.705764) - (xy 122.219505 139.847862) - (xy 122.228609 139.854738) - (xy 122.40795 139.965781) - (xy 122.418163 139.970867) - (xy 122.614855 140.047066) - (xy 122.625831 140.050188) - (xy 122.68657 140.061542) - (xy 122.697598 140.06116) - (xy 122.7 140.050393) - (xy 123.2 140.050393) - (xy 123.202401 140.06116) - (xy 123.213429 140.061542) - (xy 123.274168 140.050188) - (xy 123.285144 140.047066) - (xy 123.481836 139.970867) - (xy 123.492049 139.965781) - (xy 123.67139 139.854738) - (xy 123.680494 139.847862) - (xy 123.836369 139.705764) - (xy 123.844067 139.69732) - (xy 123.971179 139.528997) - (xy 123.977186 139.519295) - (xy 124.071207 139.330474) - (xy 124.075327 139.31984) - (xy 124.122559 139.153835) - (xy 124.123079 139.14258) - (xy 124.11211 139.14) - (xy 123.216326 139.14) - (xy 123.20345 139.14345) - (xy 123.2 139.156326) - (xy 123.2 140.050393) - (xy 122.7 140.050393) - (xy 122.7 139.156326) - (xy 122.696549 139.14345) - (xy 122.683674 139.14) - (xy 121.78789 139.14) - (xy 121.77692 139.14258) - (xy 121.323079 139.14258) (xy 121.31211 139.14) (xy 120.416326 139.14) (xy 120.40345 139.14345) @@ -54578,52 +54733,6 @@ (xy 120.416326 138.64) (xy 121.31211 138.64) (xy 121.323079 138.637419) - (xy 121.77692 138.637419) - (xy 121.78789 138.64) - (xy 122.683674 138.64) - (xy 122.696549 138.636549) - (xy 122.7 138.623674) - (xy 123.2 138.623674) - (xy 123.20345 138.636549) - (xy 123.216326 138.64) - (xy 124.11211 138.64) - (xy 124.123079 138.637419) - (xy 124.122559 138.626164) - (xy 124.075327 138.460159) - (xy 124.071207 138.449525) - (xy 123.977186 138.260704) - (xy 123.971179 138.251002) - (xy 123.844067 138.082679) - (xy 123.836369 138.074235) - (xy 123.680494 137.932137) - (xy 123.67139 137.925261) - (xy 123.492049 137.814218) - (xy 123.481836 137.809132) - (xy 123.285144 137.732933) - (xy 123.274168 137.729811) - (xy 123.213429 137.718457) - (xy 123.202401 137.718839) - (xy 123.2 137.729607) - (xy 123.2 138.623674) - (xy 122.7 138.623674) - (xy 122.7 137.729607) - (xy 122.697598 137.718839) - (xy 122.68657 137.718457) - (xy 122.625831 137.729811) - (xy 122.614855 137.732933) - (xy 122.418163 137.809132) - (xy 122.40795 137.814218) - (xy 122.228609 137.925261) - (xy 122.219505 137.932137) - (xy 122.06363 138.074235) - (xy 122.055932 138.082679) - (xy 121.92882 138.251002) - (xy 121.922813 138.260704) - (xy 121.828792 138.449525) - (xy 121.824672 138.460159) - (xy 121.77744 138.626164) - (xy 121.77692 138.637419) - (xy 121.323079 138.637419) (xy 121.322559 138.626164) (xy 121.275327 138.460159) (xy 121.271207 138.449525) @@ -54690,89 +54799,6 @@ (xy 120.977179 136.718284) (xy 121.035674 136.538256) (xy 121.05546 136.35) - (xy 122.04454 136.35) - (xy 122.045219 136.35646) - (xy 122.063646 136.531795) - (xy 122.063647 136.531803) - (xy 122.064326 136.538256) - (xy 122.066331 136.544428) - (xy 122.066333 136.544435) - (xy 122.120813 136.712105) - (xy 122.122821 136.718284) - (xy 122.126068 136.723908) - (xy 122.126069 136.72391) - (xy 122.189757 136.834222) - (xy 122.217467 136.882216) - (xy 122.221811 136.887041) - (xy 122.221813 136.887043) - (xy 122.292626 136.965688) - (xy 122.344129 137.022888) - (xy 122.49727 137.134151) - (xy 122.670197 137.211144) - (xy 122.855354 137.2505) - (xy 123.038143 137.2505) - (xy 123.044646 137.2505) - (xy 123.229803 137.211144) - (xy 123.40273 137.134151) - (xy 123.555871 137.022888) - (xy 123.682533 136.882216) - (xy 123.777179 136.718284) - (xy 123.835674 136.538256) - (xy 123.85546 136.35) - (xy 123.835674 136.161744) - (xy 123.777179 135.981716) - (xy 123.682533 135.817784) - (xy 123.555871 135.677112) - (xy 123.550613 135.673292) - (xy 123.550611 135.67329) - (xy 123.407988 135.569669) - (xy 123.407987 135.569668) - (xy 123.40273 135.565849) - (xy 123.384075 135.557543) - (xy 123.235745 135.491501) - (xy 123.23574 135.491499) - (xy 123.229803 135.488856) - (xy 123.223444 135.487504) - (xy 123.22344 135.487503) - (xy 123.051008 135.450852) - (xy 123.051005 135.450851) - (xy 123.044646 135.4495) - (xy 122.855354 135.4495) - (xy 122.848995 135.450851) - (xy 122.848991 135.450852) - (xy 122.676559 135.487503) - (xy 122.676552 135.487505) - (xy 122.670197 135.488856) - (xy 122.664262 135.491498) - (xy 122.664254 135.491501) - (xy 122.503207 135.563205) - (xy 122.503202 135.563207) - (xy 122.49727 135.565849) - (xy 122.492016 135.569665) - (xy 122.492011 135.569669) - (xy 122.349388 135.67329) - (xy 122.349381 135.673295) - (xy 122.344129 135.677112) - (xy 122.339784 135.681937) - (xy 122.339779 135.681942) - (xy 122.221813 135.812956) - (xy 122.221808 135.812962) - (xy 122.217467 135.817784) - (xy 122.214222 135.823404) - (xy 122.214218 135.82341) - (xy 122.126069 135.976089) - (xy 122.126066 135.976094) - (xy 122.122821 135.981716) - (xy 122.120815 135.987888) - (xy 122.120813 135.987894) - (xy 122.066333 136.155564) - (xy 122.066331 136.155573) - (xy 122.064326 136.161744) - (xy 122.063648 136.168194) - (xy 122.063646 136.168204) - (xy 122.045962 136.336464) - (xy 122.04454 136.35) - (xy 121.05546 136.35) (xy 121.035674 136.161744) (xy 120.977179 135.981716) (xy 120.882533 135.817784) @@ -55731,7 +55757,6 @@ (xy 137.620421 141.971698) (xy 137.626227 141.980813) (xy 137.64525 142.01376) - (xy 137.665098 142.030414) (xy 137.67439 142.038211) (xy 137.682366 142.04552) (xy 138.154478 142.517633) @@ -55902,7 +55927,7 @@ (xy 148.302963 142.951163) (xy 148.296952 142.94619) (xy 148.29695 142.946188) - (xy 148.199178 142.865305) + (xy 148.195595 142.862341) (xy 148.176326 142.8464) (xy 148.169277 142.843083) (xy 148.169274 142.843081) @@ -55956,7 +55981,7 @@ (xy 139.652963 142.951163) (xy 139.646952 142.94619) (xy 139.64695 142.946188) - (xy 139.549178 142.865305) + (xy 139.545595 142.862341) (xy 139.527103 142.847043) (xy 139.491435 142.798593) (xy 139.48277 142.739055) @@ -56072,7 +56097,7 @@ (xy 147.1745 141.210925) (xy 147.174987 141.214784) (xy 147.174988 141.214791) - (xy 147.188686 141.323217) + (xy 147.182655 141.275478) (xy 147.189929 141.333058) (xy 147.1928 141.340311) (xy 147.192801 141.340312) @@ -56968,20 +56993,19 @@ (xy 164.436061 132.342169) (xy 164.4455 132.389622) (xy 164.4455 142.363422) - (xy 164.434294 142.414934) - (xy 164.422204 142.441408) + (xy 164.434293 142.414934) (xy 164.414835 142.457543) (xy 164.413573 142.466316) (xy 164.413572 142.466322) (xy 164.400859 142.55475) (xy 164.394353 142.6) - (xy 164.395615 142.608777) + (xy 164.39615 142.612497) (xy 164.413572 142.733677) (xy 164.413573 142.733681) (xy 164.414835 142.742457) (xy 164.418519 142.750525) (xy 164.41852 142.750526) - (xy 164.465035 142.85238) + (xy 164.469584 142.862341) (xy 164.474623 142.873373) (xy 164.48043 142.880075) (xy 164.480431 142.880076) @@ -56997,7 +57021,7 @@ (xy 165.670786 143.055204) (xy 165.671531 143.060707) (xy 165.671532 143.060718) - (xy 165.68994 143.196605) + (xy 165.699649 143.268282) (xy 165.700397 143.273802) (xy 165.702117 143.279095) (xy 165.702118 143.2791) @@ -57024,7 +57048,7 @@ (xy 168.119317 143.165168) (xy 168.129214 142.944796) (xy 168.099603 142.726198) - (xy 168.051471 142.578062) + (xy 168.059956 142.604177) (xy 168.033157 142.521697) (xy 168.033156 142.521694) (xy 168.031436 142.516401) @@ -57090,7 +57114,7 @@ (xy 165.680683 142.834832) (xy 165.680433 142.840396) (xy 165.680433 142.840397) - (xy 165.67994 142.851369) + (xy 165.68013 142.84715) (xy 165.670786 143.055204) (xy 165.117443 143.055204) (xy 165.231128 142.982143) @@ -73858,7 +73882,7 @@ (xy 148.302963 142.951163) (xy 148.296952 142.94619) (xy 148.29695 142.946188) - (xy 148.199178 142.865305) + (xy 148.195595 142.862341) (xy 148.176326 142.8464) (xy 148.169277 142.843083) (xy 148.169274 142.843081) @@ -73912,7 +73936,7 @@ (xy 139.652963 142.951163) (xy 139.646952 142.94619) (xy 139.64695 142.946188) - (xy 139.549178 142.865305) + (xy 139.545595 142.862341) (xy 139.526326 142.8464) (xy 139.519277 142.843083) (xy 139.519274 142.843081) @@ -73964,10 +73988,10 @@ (xy 117.872455 143.481395) (xy 117.868873 143.466862) (xy 117.865678 143.44943) - (xy 117.828157 143.244682) + (xy 117.829376 143.251334) (xy 117.819347 143.196605) (xy 117.817542 143.181741) - (xy 117.813423 143.113652) + (xy 117.814323 143.128531) (xy 117.809888 143.055204) (xy 118.870786 143.055204) (xy 118.871531 143.060707) @@ -74002,14 +74026,129 @@ (xy 121.319317 143.165168) (xy 121.329214 142.944796) (xy 121.299603 142.726198) + (xy 121.259956 142.604177) + (xy 121.251862 142.579266) + (xy 125.8495 142.579266) + (xy 125.849769 142.582141) + (xy 125.84977 142.582149) + (xy 125.851649 142.602187) + (xy 125.851649 142.602191) + (xy 125.852354 142.609699) + (xy 125.854842 142.616811) + (xy 125.854844 142.616817) + (xy 125.894138 142.729113) + (xy 125.894139 142.729116) + (xy 125.897207 142.737882) + (xy 125.902722 142.745355) + (xy 125.902724 142.745358) + (xy 125.94624 142.80432) + (xy 125.97785 142.84715) + (xy 126.013381 142.873373) + (xy 126.054532 142.903744) + (xy 126.087118 142.927793) + (xy 126.215301 142.972646) + (xy 126.245734 142.9755) + (xy 127.051373 142.9755) + (xy 127.054266 142.9755) + (xy 127.084699 142.972646) + (xy 127.212882 142.927793) + (xy 127.32215 142.84715) + (xy 127.402793 142.737882) + (xy 127.428823 142.66349) + (xy 127.459685 142.615288) + (xy 127.508911 142.58608) + (xy 127.56601 142.582094) + (xy 127.618817 142.604177) + (xy 127.656079 142.647626) + (xy 127.717699 142.767151) + (xy 127.724064 142.777055) + (xy 127.846617 142.932894) + (xy 127.854735 142.941408) + (xy 128.004572 143.071243) + (xy 128.014149 143.078062) + (xy 128.185846 143.177191) + (xy 128.196549 143.182079) + (xy 128.383904 143.246924) + (xy 128.389488 143.248279) + (xy 128.397681 143.247693) + (xy 128.4 143.237036) + (xy 128.4 140.567819) + (xy 128.397494 140.556927) + (xy 128.38632 140.55706) + (xy 128.294329 140.579377) + (xy 128.283211 140.583225) + (xy 128.102878 140.66558) + (xy 128.09268 140.671468) + (xy 127.931193 140.786463) + (xy 127.922296 140.794172) + (xy 127.785482 140.937658) + (xy 127.778215 140.946899) + (xy 127.671028 141.113685) + (xy 127.665635 141.124146) + (xy 127.659884 141.138511) + (xy 127.625136 141.18685) + (xy 127.571863 141.213423) + (xy 127.512346 141.212106) + (xy 127.460302 141.183202) + (xy 127.427726 141.133374) + (xy 127.424004 141.122738) + (xy 127.402793 141.062118) + (xy 127.373881 141.022944) + (xy 127.327668 140.960327) + (xy 127.32215 140.95285) + (xy 127.306396 140.941223) + (xy 127.220358 140.877724) + (xy 127.220355 140.877722) + (xy 127.212882 140.872207) + (xy 127.204116 140.869139) + (xy 127.204113 140.869138) + (xy 127.091817 140.829844) + (xy 127.091811 140.829842) + (xy 127.084699 140.827354) + (xy 127.077191 140.826649) + (xy 127.077187 140.826649) + (xy 127.057149 140.82477) + (xy 127.057141 140.824769) + (xy 127.054266 140.8245) + (xy 126.245734 140.8245) + (xy 126.242859 140.824769) + (xy 126.24285 140.82477) + (xy 126.222812 140.826649) + (xy 126.222807 140.82665) + (xy 126.215301 140.827354) + (xy 126.208189 140.829842) + (xy 126.208182 140.829844) + (xy 126.095886 140.869138) + (xy 126.09588 140.86914) + (xy 126.087118 140.872207) + (xy 126.079646 140.87772) + (xy 126.079641 140.877724) + (xy 125.985327 140.947331) + (xy 125.985324 140.947333) + (xy 125.97785 140.95285) + (xy 125.972333 140.960324) + (xy 125.972331 140.960327) + (xy 125.902724 141.054641) + (xy 125.90272 141.054646) + (xy 125.897207 141.062118) + (xy 125.89414 141.07088) + (xy 125.894138 141.070886) + (xy 125.854844 141.183182) + (xy 125.854842 141.183189) + (xy 125.852354 141.190301) + (xy 125.85165 141.197807) + (xy 125.851649 141.197812) + (xy 125.850057 141.214791) + (xy 125.8495 141.220734) + (xy 125.8495 142.579266) + (xy 121.251862 142.579266) + (xy 121.233157 142.521697) + (xy 121.233156 142.521694) (xy 121.231436 142.516401) (xy 121.126903 142.322147) (xy 120.989365 142.14968) - (xy 120.843995 142.022674) - (xy 120.827434 142.008205) - (xy 120.827431 142.008202) (xy 120.823242 142.004543) - (xy 120.818462 142.001687) + (xy 120.717394 141.941301) (xy 120.638658 141.894258) (xy 120.638655 141.894256) (xy 120.633874 141.8914) @@ -74105,52 +74244,6 @@ (xy 121.275327 139.31984) (xy 121.322559 139.153835) (xy 121.323079 139.14258) - (xy 121.77692 139.14258) - (xy 121.77744 139.153835) - (xy 121.824672 139.31984) - (xy 121.828792 139.330474) - (xy 121.922813 139.519295) - (xy 121.92882 139.528997) - (xy 122.055932 139.69732) - (xy 122.06363 139.705764) - (xy 122.219505 139.847862) - (xy 122.228609 139.854738) - (xy 122.40795 139.965781) - (xy 122.418163 139.970867) - (xy 122.614855 140.047066) - (xy 122.625831 140.050188) - (xy 122.68657 140.061542) - (xy 122.697598 140.06116) - (xy 122.7 140.050393) - (xy 123.2 140.050393) - (xy 123.202401 140.06116) - (xy 123.213429 140.061542) - (xy 123.274168 140.050188) - (xy 123.285144 140.047066) - (xy 123.481836 139.970867) - (xy 123.492049 139.965781) - (xy 123.67139 139.854738) - (xy 123.680494 139.847862) - (xy 123.836369 139.705764) - (xy 123.844067 139.69732) - (xy 123.971179 139.528997) - (xy 123.977186 139.519295) - (xy 124.071207 139.330474) - (xy 124.075327 139.31984) - (xy 124.122559 139.153835) - (xy 124.123079 139.14258) - (xy 124.11211 139.14) - (xy 123.216326 139.14) - (xy 123.20345 139.14345) - (xy 123.2 139.156326) - (xy 123.2 140.050393) - (xy 122.7 140.050393) - (xy 122.7 139.156326) - (xy 122.696549 139.14345) - (xy 122.683674 139.14) - (xy 121.78789 139.14) - (xy 121.77692 139.14258) - (xy 121.323079 139.14258) (xy 121.31211 139.14) (xy 120.416326 139.14) (xy 120.40345 139.14345) @@ -74209,199 +74302,82 @@ (xy 121.102665 138.046229) (xy 121.148387 137.996073) (xy 121.213665 137.9775) - (xy 121.886335 137.9775) - (xy 121.951613 137.996073) - (xy 121.997335 138.046229) - (xy 122.009806 138.112941) - (xy 121.985289 138.176227) - (xy 121.92882 138.251002) - (xy 121.922813 138.260704) - (xy 121.828792 138.449525) - (xy 121.824672 138.460159) - (xy 121.77744 138.626164) - (xy 121.77692 138.637419) - (xy 121.78789 138.64) - (xy 124.11211 138.64) - (xy 124.123079 138.637419) - (xy 124.122559 138.626164) - (xy 124.075327 138.460159) - (xy 124.071207 138.449525) - (xy 123.977186 138.260704) - (xy 123.971179 138.251002) - (xy 123.914711 138.176227) - (xy 123.890194 138.112941) - (xy 123.902665 138.046229) - (xy 123.948387 137.996073) - (xy 124.013665 137.9775) - (xy 126.762984 137.9775) - (xy 126.810437 137.986939) - (xy 126.850665 138.013819) - (xy 128.655091 139.818245) - (xy 128.684971 139.866486) - (xy 128.690231 139.922987) - (xy 128.66977 139.975915) - (xy 128.627873 140.014186) - (xy 128.573314 140.029785) - (xy 128.548649 140.03096) - (xy 128.537004 140.032635) - (xy 128.344329 140.079377) - (xy 128.333211 140.083225) - (xy 128.152878 140.16558) - (xy 128.14268 140.171468) - (xy 127.981193 140.286463) - (xy 127.972296 140.294172) - (xy 127.835482 140.437658) - (xy 127.828215 140.446899) - (xy 127.721028 140.613685) - (xy 127.715635 140.624146) - (xy 127.709884 140.638511) - (xy 127.675136 140.68685) - (xy 127.621863 140.713423) - (xy 127.562346 140.712106) - (xy 127.510302 140.683202) - (xy 127.477726 140.633374) - (xy 127.474004 140.622738) - (xy 127.452793 140.562118) - (xy 127.434702 140.537606) - (xy 127.396237 140.485487) - (xy 127.37215 140.45285) - (xy 127.35243 140.438296) - (xy 127.270358 140.377724) - (xy 127.270355 140.377722) - (xy 127.262882 140.372207) - (xy 127.254116 140.369139) - (xy 127.254113 140.369138) - (xy 127.141817 140.329844) - (xy 127.141811 140.329842) - (xy 127.134699 140.327354) - (xy 127.127191 140.326649) - (xy 127.127187 140.326649) - (xy 127.107149 140.32477) - (xy 127.107141 140.324769) - (xy 127.104266 140.3245) - (xy 126.295734 140.3245) - (xy 126.292859 140.324769) - (xy 126.29285 140.32477) - (xy 126.272812 140.326649) - (xy 126.272807 140.32665) - (xy 126.265301 140.327354) - (xy 126.258189 140.329842) - (xy 126.258182 140.329844) - (xy 126.145886 140.369138) - (xy 126.14588 140.36914) - (xy 126.137118 140.372207) - (xy 126.129646 140.37772) - (xy 126.129641 140.377724) - (xy 126.035327 140.447331) - (xy 126.035324 140.447333) - (xy 126.02785 140.45285) - (xy 126.022333 140.460324) - (xy 126.022331 140.460327) - (xy 125.952724 140.554641) - (xy 125.95272 140.554646) - (xy 125.947207 140.562118) - (xy 125.94414 140.57088) - (xy 125.944138 140.570886) - (xy 125.904844 140.683182) - (xy 125.904842 140.683189) - (xy 125.902354 140.690301) - (xy 125.90165 140.697807) - (xy 125.901649 140.697812) - (xy 125.89977 140.71785) - (xy 125.8995 140.720734) - (xy 125.8995 142.079266) - (xy 125.899769 142.082141) - (xy 125.89977 142.082149) - (xy 125.901649 142.102187) - (xy 125.901649 142.102191) - (xy 125.902354 142.109699) - (xy 125.904842 142.116811) - (xy 125.904844 142.116817) - (xy 125.944138 142.229113) - (xy 125.944139 142.229116) - (xy 125.947207 142.237882) - (xy 125.952722 142.245355) - (xy 125.952724 142.245358) - (xy 125.996606 142.304816) - (xy 126.02785 142.34715) - (xy 126.035327 142.352668) - (xy 126.12934 142.422053) - (xy 126.137118 142.427793) - (xy 126.265301 142.472646) - (xy 126.295734 142.4755) - (xy 127.101373 142.4755) - (xy 127.104266 142.4755) - (xy 127.134699 142.472646) - (xy 127.262882 142.427793) - (xy 127.37215 142.34715) - (xy 127.452793 142.237882) - (xy 127.478823 142.16349) - (xy 127.509685 142.115288) - (xy 127.558911 142.08608) - (xy 127.61601 142.082094) - (xy 127.668817 142.104177) - (xy 127.706079 142.147626) - (xy 127.767699 142.267151) - (xy 127.774064 142.277055) - (xy 127.896617 142.432894) - (xy 127.904735 142.441408) - (xy 128.054572 142.571243) - (xy 128.064149 142.578062) - (xy 128.235846 142.677191) - (xy 128.246549 142.682079) - (xy 128.433904 142.746924) - (xy 128.439488 142.748279) - (xy 128.447681 142.747693) - (xy 128.45 142.737036) - (xy 128.45 141.274) - (xy 128.466613 141.212) - (xy 128.512 141.166613) - (xy 128.574 141.15) - (xy 128.826 141.15) - (xy 128.888 141.166613) - (xy 128.933387 141.212) - (xy 128.95 141.274) - (xy 128.95 142.732181) - (xy 128.952505 142.743072) - (xy 128.963679 142.742939) - (xy 129.05567 142.720622) - (xy 129.066788 142.716774) - (xy 129.247121 142.634419) - (xy 129.257319 142.628531) - (xy 129.418806 142.513536) - (xy 129.427703 142.505827) - (xy 129.564517 142.362341) - (xy 129.571784 142.3531) - (xy 129.678971 142.186314) - (xy 129.684362 142.175856) - (xy 129.744754 142.025005) - (xy 129.777401 141.978492) - (xy 129.827369 141.951427) - (xy 129.884163 141.949494) - (xy 129.935856 141.973099) - (xy 129.97159 142.017285) - (xy 129.971913 142.017956) - (xy 129.974211 142.024522) - (xy 129.977912 142.030412) - (xy 129.977913 142.030414) - (xy 130.027731 142.109699) - (xy 130.070184 142.177262) - (xy 130.197738 142.304816) - (xy 130.350478 142.400789) - (xy 130.520745 142.460368) - (xy 130.7 142.480565) - (xy 130.879255 142.460368) - (xy 131.049522 142.400789) - (xy 131.202262 142.304816) - (xy 131.329816 142.177262) - (xy 131.425789 142.024522) - (xy 131.485368 141.854255) - (xy 131.5005 141.719954) - (xy 131.5005 141.210925) + (xy 126.962984 137.9775) + (xy 127.010437 137.986939) + (xy 127.050665 138.013819) + (xy 130.004228 140.967383) + (xy 130.035037 141.01851) + (xy 130.038387 141.078108) + (xy 130.018424 141.121632) + (xy 130.020184 141.122738) + (xy 129.927913 141.269585) + (xy 129.92791 141.26959) + (xy 129.924211 141.275478) + (xy 129.921914 141.282042) + (xy 129.921279 141.283361) + (xy 129.883666 141.328976) + (xy 129.829206 141.351989) + (xy 129.77028 141.347169) + (xy 129.720284 141.315611) + (xy 129.690584 141.26449) + (xy 129.677512 141.219973) + (xy 129.673146 141.209067) + (xy 129.582295 141.03284) + (xy 129.575935 141.022944) + (xy 129.453382 140.867105) + (xy 129.445264 140.858591) + (xy 129.295427 140.728756) + (xy 129.28585 140.721937) + (xy 129.114153 140.622808) + (xy 129.10345 140.61792) + (xy 128.916095 140.553075) + (xy 128.910511 140.55172) + (xy 128.902318 140.552306) + (xy 128.9 140.562964) + (xy 128.9 143.232181) + (xy 128.902505 143.243072) + (xy 128.913679 143.242939) + (xy 129.00567 143.220622) + (xy 129.016788 143.216774) + (xy 129.197121 143.134419) + (xy 129.207319 143.128531) + (xy 129.368806 143.013536) + (xy 129.377703 143.005827) + (xy 129.514517 142.862341) + (xy 129.521784 142.8531) + (xy 129.628971 142.686314) + (xy 129.634362 142.675856) + (xy 129.694754 142.525005) + (xy 129.727401 142.478492) + (xy 129.777369 142.451427) + (xy 129.834163 142.449494) + (xy 129.885856 142.473099) + (xy 129.92159 142.517285) + (xy 129.921913 142.517956) + (xy 129.924211 142.524522) + (xy 129.927912 142.530412) + (xy 129.927913 142.530414) + (xy 130.011532 142.663493) + (xy 130.020184 142.677262) + (xy 130.147738 142.804816) + (xy 130.300478 142.900789) + (xy 130.470745 142.960368) + (xy 130.65 142.980565) + (xy 130.829255 142.960368) + (xy 130.999522 142.900789) + (xy 131.152262 142.804816) + (xy 131.279816 142.677262) + (xy 131.375789 142.524522) + (xy 131.435368 142.354255) + (xy 131.4505 142.219954) + (xy 131.4505 141.580046) + (xy 131.435368 141.445745) + (xy 131.375789 141.275478) + (xy 131.335228 141.210925) (xy 138.5245 141.210925) (xy 138.524987 141.214784) (xy 138.524988 141.214791) - (xy 138.532468 141.274) + (xy 138.532655 141.275478) (xy 138.539929 141.333058) (xy 138.5428 141.340311) (xy 138.542801 141.340312) @@ -74530,62 +74506,42 @@ (xy 138.526439 139.58027) (xy 138.5245 139.587823) (xy 138.5245 141.210925) - (xy 131.5005 141.210925) - (xy 131.5005 141.080046) - (xy 131.485368 140.945745) - (xy 131.425789 140.775478) - (xy 131.329816 140.622738) - (xy 131.202262 140.495184) - (xy 131.186829 140.485487) - (xy 131.055412 140.402912) - (xy 131.049522 140.399211) - (xy 131.042959 140.396914) - (xy 131.042956 140.396913) - (xy 130.885824 140.34193) - (xy 130.885819 140.341928) - (xy 130.879255 140.339632) - (xy 130.872335 140.338852) - (xy 130.872334 140.338852) - (xy 130.706923 140.320215) - (xy 130.7 140.319435) - (xy 130.693077 140.320215) - (xy 130.527665 140.338852) - (xy 130.527662 140.338852) - (xy 130.520745 140.339632) - (xy 130.514182 140.341928) - (xy 130.514175 140.34193) - (xy 130.357043 140.396913) - (xy 130.357036 140.396915) - (xy 130.350478 140.399211) - (xy 130.344589 140.40291) - (xy 130.344579 140.402916) - (xy 130.31868 140.419189) - (xy 130.266593 140.437415) - (xy 130.211755 140.431235) - (xy 130.16503 140.401875) - (xy 127.19552 137.432366) - (xy 127.188211 137.42439) - (xy 127.16376 137.39525) - (xy 127.130813 137.376227) - (xy 127.121698 137.370421) - (xy 127.099429 137.354828) - (xy 127.099428 137.354827) - (xy 127.090543 137.348606) - (xy 127.080067 137.345798) - (xy 127.076656 137.344208) - (xy 127.073129 137.342924) - (xy 127.063739 137.337503) - (xy 127.053057 137.335619) - (xy 127.053056 137.335619) - (xy 127.026282 137.330898) - (xy 127.015723 137.328557) - (xy 126.98556 137.320475) - (xy 126.93388 137.292123) - (xy 126.901131 137.243111) - (xy 126.894714 137.184515) - (xy 126.916078 137.129577) - (xy 126.960396 137.090711) - (xy 127.017653 137.0767) + (xy 131.335228 141.210925) + (xy 131.279816 141.122738) + (xy 131.152262 140.995184) + (xy 131.096787 140.960327) + (xy 131.005412 140.902912) + (xy 130.999522 140.899211) + (xy 130.992959 140.896914) + (xy 130.992956 140.896913) + (xy 130.83582 140.841929) + (xy 130.835818 140.841928) + (xy 130.829255 140.839632) + (xy 130.828596 140.839557) + (xy 130.770734 140.807579) + (xy 127.39552 137.432366) + (xy 127.388211 137.42439) + (xy 127.36376 137.39525) + (xy 127.330813 137.376227) + (xy 127.321698 137.370421) + (xy 127.299429 137.354828) + (xy 127.299428 137.354827) + (xy 127.290543 137.348606) + (xy 127.280067 137.345798) + (xy 127.276656 137.344208) + (xy 127.273129 137.342924) + (xy 127.263739 137.337503) + (xy 127.253057 137.335619) + (xy 127.253056 137.335619) + (xy 127.226282 137.330898) + (xy 127.215723 137.328557) + (xy 127.18556 137.320475) + (xy 127.13388 137.292123) + (xy 127.101131 137.243111) + (xy 127.094714 137.184515) + (xy 127.116078 137.129577) + (xy 127.160396 137.090711) + (xy 127.217653 137.0767) (xy 129.984025 137.0767) (xy 130.031478 137.086139) (xy 130.071706 137.113019) @@ -74859,7 +74815,7 @@ (xy 142.509072 140.314085) (xy 142.509066 140.314082) (xy 142.502625 140.309139) - (xy 142.452503 140.288378) + (xy 142.440277 140.283314) (xy 142.376223 140.256782) (xy 142.37622 140.256781) (xy 142.368709 140.25367) @@ -74885,7 +74841,7 @@ (xy 141.659072 140.314085) (xy 141.659066 140.314082) (xy 141.652625 140.309139) - (xy 141.602503 140.288378) + (xy 141.590277 140.283314) (xy 141.526223 140.256782) (xy 141.52622 140.256781) (xy 141.518709 140.25367) @@ -74919,13 +74875,15 @@ (xy 140.83867 140.646291) (xy 140.837609 140.654348) (xy 140.837608 140.654353) - (xy 140.829249 140.71785) + (xy 140.833396 140.686348) (xy 140.81975 140.79) + (xy 140.820811 140.798059) + (xy 140.833825 140.896913) (xy 140.83867 140.933709) + (xy 140.841781 140.94122) + (xy 140.841782 140.941223) + (xy 140.873795 141.01851) (xy 140.894139 141.067625) - (xy 140.899084 141.074069) - (xy 140.899085 141.074071) - (xy 140.977435 141.176178) (xy 140.982379 141.182621) (xy 141.097375 141.270861) (xy 141.231291 141.32633) @@ -74984,11 +74942,11 @@ (xy 146.16133 140.646291) (xy 146.105861 140.512375) (xy 146.017621 140.397379) - (xy 145.992006 140.377724) + (xy 145.984269 140.371787) (xy 145.909071 140.314085) (xy 145.909068 140.314083) (xy 145.902625 140.309139) - (xy 145.852503 140.288378) + (xy 145.840277 140.283314) (xy 145.776223 140.256782) (xy 145.77622 140.256781) (xy 145.768709 140.25367) @@ -75014,7 +74972,7 @@ (xy 145.059072 140.314085) (xy 145.059066 140.314082) (xy 145.052625 140.309139) - (xy 145.002503 140.288378) + (xy 144.990277 140.283314) (xy 144.926223 140.256782) (xy 144.92622 140.256781) (xy 144.918709 140.25367) @@ -75056,7 +75014,7 @@ (xy 147.1745 141.210925) (xy 147.174987 141.214784) (xy 147.174988 141.214791) - (xy 147.182468 141.274) + (xy 147.182655 141.275478) (xy 147.189929 141.333058) (xy 147.1928 141.340311) (xy 147.192801 141.340312) @@ -75762,7 +75720,7 @@ (xy 154.955 140.636516) (xy 154.896548 140.621875) (xy 154.851899 140.581409) - (xy 154.849562 140.577912) + (xy 154.841335 140.5656) (xy 154.834552 140.555448) (xy 154.768231 140.511133) (xy 154.756253 140.50875) @@ -75900,14 +75858,14 @@ (xy 168.119317 143.165168) (xy 168.129214 142.944796) (xy 168.099603 142.726198) + (xy 168.059956 142.604177) + (xy 168.033157 142.521697) + (xy 168.033156 142.521694) (xy 168.031436 142.516401) (xy 167.926903 142.322147) (xy 167.789365 142.14968) - (xy 167.643995 142.022674) - (xy 167.627434 142.008205) - (xy 167.627431 142.008202) (xy 167.623242 142.004543) - (xy 167.618462 142.001687) + (xy 167.517394 141.941301) (xy 167.438658 141.894258) (xy 167.438655 141.894256) (xy 167.433874 141.8914) @@ -75977,7 +75935,7 @@ (xy 165.236932 142.224555) (xy 165.231128 142.217857) (xy 165.110053 142.140047) - (xy 165.025731 142.115288) + (xy 165.054863 142.123841) (xy 164.980473 142.101999) (xy 164.98047 142.101998) (xy 164.971961 142.0995) @@ -83396,101 +83354,6 @@ (xy 126.189875 137.266993) (xy 126.145172 137.307746) (xy 126.086508 137.3225) - (xy 123.525122 137.3225) - (xy 123.465384 137.307162) - (xy 123.420425 137.264942) - (xy 123.401367 137.206286) - (xy 123.412924 137.145703) - (xy 123.452237 137.098182) - (xy 123.469413 137.085703) - (xy 123.555871 137.022888) - (xy 123.682533 136.882216) - (xy 123.777179 136.718284) - (xy 123.835674 136.538256) - (xy 123.85546 136.35) - (xy 123.842774 136.229297) - (xy 123.836353 136.168204) - (xy 123.836352 136.168203) - (xy 123.835674 136.161744) - (xy 123.777179 135.981716) - (xy 123.682533 135.817784) - (xy 123.650642 135.782366) - (xy 123.56022 135.681942) - (xy 123.560216 135.681938) - (xy 123.555871 135.677112) - (xy 123.550613 135.673292) - (xy 123.550611 135.67329) - (xy 123.407988 135.569669) - (xy 123.407987 135.569668) - (xy 123.40273 135.565849) - (xy 123.396792 135.563205) - (xy 123.235745 135.491501) - (xy 123.23574 135.491499) - (xy 123.229803 135.488856) - (xy 123.223444 135.487504) - (xy 123.22344 135.487503) - (xy 123.051008 135.450852) - (xy 123.051005 135.450851) - (xy 123.044646 135.4495) - (xy 122.855354 135.4495) - (xy 122.848995 135.450851) - (xy 122.848991 135.450852) - (xy 122.676559 135.487503) - (xy 122.676552 135.487505) - (xy 122.670197 135.488856) - (xy 122.664262 135.491498) - (xy 122.664254 135.491501) - (xy 122.503207 135.563205) - (xy 122.503202 135.563207) - (xy 122.49727 135.565849) - (xy 122.492016 135.569665) - (xy 122.492011 135.569669) - (xy 122.349388 135.67329) - (xy 122.349381 135.673295) - (xy 122.344129 135.677112) - (xy 122.339784 135.681937) - (xy 122.339779 135.681942) - (xy 122.221813 135.812956) - (xy 122.221808 135.812962) - (xy 122.217467 135.817784) - (xy 122.214222 135.823404) - (xy 122.214218 135.82341) - (xy 122.126069 135.976089) - (xy 122.126066 135.976094) - (xy 122.122821 135.981716) - (xy 122.120815 135.987888) - (xy 122.120813 135.987894) - (xy 122.066333 136.155564) - (xy 122.066331 136.155573) - (xy 122.064326 136.161744) - (xy 122.063648 136.168194) - (xy 122.063646 136.168204) - (xy 122.048837 136.309111) - (xy 122.04454 136.35) - (xy 122.045219 136.35646) - (xy 122.063646 136.531795) - (xy 122.063647 136.531803) - (xy 122.064326 136.538256) - (xy 122.066331 136.544428) - (xy 122.066333 136.544435) - (xy 122.120654 136.711615) - (xy 122.122821 136.718284) - (xy 122.126068 136.723908) - (xy 122.126069 136.72391) - (xy 122.208175 136.866123) - (xy 122.217467 136.882216) - (xy 122.221811 136.887041) - (xy 122.221813 136.887043) - (xy 122.339209 137.017424) - (xy 122.344129 137.022888) - (xy 122.349387 137.026708) - (xy 122.349388 137.026709) - (xy 122.447763 137.098182) - (xy 122.487076 137.145703) - (xy 122.498633 137.206286) - (xy 122.479575 137.264942) - (xy 122.434616 137.307162) - (xy 122.374878 137.3225) (xy 120.725122 137.3225) (xy 120.665384 137.307162) (xy 120.620425 137.264942) diff --git a/mainboard/gay-ipod.kicad_sch b/mainboard/gay-ipod.kicad_sch index 361c187..219c311 100644 --- a/mainboard/gay-ipod.kicad_sch +++ b/mainboard/gay-ipod.kicad_sch @@ -988,11 +988,11 @@ ) ) - (bus_alias "SAMD_SPI" (members "SCLK" "POCI" "PICO" "CS")) - (bus_alias "ESP_SPI" (members "SCLK" "POCI" "PICO" "SD_CS" "DISPLAY_CS")) - (bus_alias "USB" (members "DN" "DP")) - (bus_alias "I2S" (members "SCK" "BCK" "LRCK" "DATA")) (bus_alias "I2C" (members "SDA" "SCL")) + (bus_alias "ESP_SPI" (members "SCLK" "POCI" "PICO" "SD_CS" "DISPLAY_CS")) + (bus_alias "SAMD_SPI" (members "SCLK" "POCI" "PICO" "CS")) + (bus_alias "I2S" (members "SCK" "BCK" "LRCK" "DATA")) + (bus_alias "USB" (members "DN" "DP")) (junction (at 125.73 118.11) (diameter 0) (color 0 0 0 0) (uuid 03cf8733-1885-46f0-a473-77977fa25d9e) ) diff --git a/mainboard/power.kicad_sch b/mainboard/power.kicad_sch index 007b730..a312a23 100644 --- a/mainboard/power.kicad_sch +++ b/mainboard/power.kicad_sch @@ -619,6 +619,63 @@ ) ) ) + (symbol "Device:Polyfuse_Small" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes) + (property "Reference" "F" (at -1.905 0 90) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "Polyfuse_Small" (at 1.905 0 90) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "" (at 1.27 -5.08 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + (property "Datasheet" "~" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_keywords" "resettable fuse PTC PPTC polyfuse polyswitch" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "Resettable fuse, polymeric positive temperature coefficient, small symbol" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_fp_filters" "*polyfuse* *PTC*" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "Polyfuse_Small_0_1" + (rectangle (start -0.508 1.27) (end 0.508 -1.27) + (stroke (width 0) (type default)) + (fill (type none)) + ) + (polyline + (pts + (xy 0 2.54) + (xy 0 -2.54) + ) + (stroke (width 0) (type default)) + (fill (type none)) + ) + (polyline + (pts + (xy -1.016 1.27) + (xy -1.016 0.762) + (xy 1.016 -0.762) + (xy 1.016 -1.27) + ) + (stroke (width 0) (type default)) + (fill (type none)) + ) + ) + (symbol "Polyfuse_Small_1_1" + (pin passive line (at 0 2.54 270) (length 0.635) + (name "~" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 0 -2.54 90) (length 0.635) + (name "~" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + ) + ) (symbol "Device:Q_PMOS_GSD" (pin_names (offset 0) hide) (in_bom yes) (on_board yes) (property "Reference" "Q" (at 5.08 1.27 0) (effects (font (size 1.27 1.27)) (justify left)) @@ -1038,28 +1095,22 @@ (junction (at 203.2 120.65) (diameter 0) (color 0 0 0 0) (uuid 06677bc3-5731-41e0-8ea1-074ae35e7ccd) ) - (junction (at 115.57 68.58) (diameter 0) (color 0 0 0 0) - (uuid 19f92259-3518-4433-bf2f-de26a01f8b66) - ) - (junction (at 163.83 101.6) (diameter 0) (color 0 0 0 0) - (uuid 1ac60a41-868b-416d-acf8-a410c3c6b15d) - ) (junction (at 55.88 78.74) (diameter 0) (color 0 0 0 0) (uuid 1d722608-663e-4a1f-bb41-fdd543b567e5) ) (junction (at 19.05 130.81) (diameter 0) (color 0 0 0 0) (uuid 1f2c2de5-81b4-4d1f-8cc2-49529e0c151e) ) - (junction (at 205.74 57.15) (diameter 0) (color 0 0 0 0) - (uuid 3cc01e41-dd9a-4233-a2e3-9fd3419b6696) - ) (junction (at 161.29 109.22) (diameter 0) (color 0 0 0 0) (uuid 40923f5b-752b-4e6e-b3fc-de5b06483a80) ) - (junction (at 215.9 49.53) (diameter 0) (color 0 0 0 0) + (junction (at 209.55 69.85) (diameter 0) (color 0 0 0 0) (uuid 48566b19-46b9-41a1-b487-bd44408eb4e6) ) - (junction (at 205.74 49.53) (diameter 0) (color 0 0 0 0) + (junction (at 199.39 81.28) (diameter 0) (color 0 0 0 0) + (uuid 607e2560-af23-4284-8803-829f40e8575f) + ) + (junction (at 199.39 69.85) (diameter 0) (color 0 0 0 0) (uuid 7823853a-ee71-4a7c-8158-d543f10409ae) ) (junction (at 41.91 106.68) (diameter 0) (color 0 0 0 0) @@ -1071,16 +1122,13 @@ (junction (at 26.67 138.43) (diameter 0) (color 0 0 0 0) (uuid 8cf65d16-d7c4-42ea-a372-a0e12f27c6f5) ) - (junction (at 140.97 76.2) (diameter 0) (color 0 0 0 0) - (uuid 95f27bd5-eaa1-4778-8ca3-274ad92f03f8) - ) (junction (at 44.45 87.63) (diameter 0) (color 0 0 0 0) (uuid 9646b1b1-0b8a-4658-9656-ba0c04d7ab25) ) (junction (at 166.37 109.22) (diameter 0) (color 0 0 0 0) (uuid a8da8a54-210f-4a8d-8fc6-09083e3a3fae) ) - (junction (at 176.53 49.53) (diameter 0) (color 0 0 0 0) + (junction (at 170.18 69.85) (diameter 0) (color 0 0 0 0) (uuid ab075bc3-8147-433d-b713-0a32b9ab9649) ) (junction (at 140.97 92.71) (diameter 0) (color 0 0 0 0) @@ -1089,6 +1137,9 @@ (junction (at 203.2 109.22) (diameter 0) (color 0 0 0 0) (uuid ad7e957a-6036-4251-bf59-a78f2f3c8112) ) + (junction (at 161.29 101.6) (diameter 0) (color 0 0 0 0) + (uuid af10ee06-a3e9-4954-94de-7e1eef6983d8) + ) (junction (at 41.91 109.22) (diameter 0) (color 0 0 0 0) (uuid bf1275f4-4866-45be-93e9-570d90a5503a) ) @@ -1101,12 +1152,21 @@ (junction (at 53.34 106.68) (diameter 0) (color 0 0 0 0) (uuid c4e3836f-dca2-489b-a7cb-3aea09a7c34d) ) + (junction (at 184.15 81.28) (diameter 0) (color 0 0 0 0) + (uuid d459426e-5b13-4021-8067-d01e37d12768) + ) (junction (at 55.88 68.58) (diameter 0) (color 0 0 0 0) (uuid d91e6c8d-cb47-4ca5-9724-66733d9bd2d3) ) (junction (at 48.26 109.22) (diameter 0) (color 0 0 0 0) (uuid dda93dca-2359-448c-b5e6-6f49be2ec66a) ) + (junction (at 132.08 68.58) (diameter 0) (color 0 0 0 0) + (uuid e51e2bd8-a3e6-4ad6-a9c1-defe73b04b3f) + ) + (junction (at 140.97 72.39) (diameter 0) (color 0 0 0 0) + (uuid eaeb385c-1558-413d-aa87-4dbc862fd9b2) + ) (junction (at 95.25 129.54) (diameter 0) (color 0 0 0 0) (uuid f5b98cdd-8273-4ba9-8bff-01c298bda2bf) ) @@ -1133,7 +1193,7 @@ (stroke (width 0) (type default)) (uuid 034565a2-b313-41d6-9223-0ac0f0dd2d97) ) - (wire (pts (xy 205.74 50.8) (xy 205.74 49.53)) + (wire (pts (xy 199.39 72.39) (xy 199.39 69.85)) (stroke (width 0) (type default)) (uuid 0390d7d6-5f99-4baf-9168-1a895dd8a591) ) @@ -1141,15 +1201,11 @@ (stroke (width 0) (type default)) (uuid 05aafbab-82af-42e1-8326-1e088d978e31) ) - (wire (pts (xy 115.57 68.58) (xy 140.97 68.58)) - (stroke (width 0) (type default)) - (uuid 075dd52a-3d48-4bb8-a84a-9f608e5b38b6) - ) (wire (pts (xy 44.45 68.58) (xy 44.45 87.63)) (stroke (width 0) (type default)) (uuid 078c7170-d69c-42b9-932d-22325a50b29a) ) - (wire (pts (xy 163.83 49.53) (xy 176.53 49.53)) + (wire (pts (xy 161.29 69.85) (xy 170.18 69.85)) (stroke (width 0) (type default)) (uuid 08d604f6-e416-4522-acdd-2b90767894d8) ) @@ -1157,14 +1213,18 @@ (stroke (width 0) (type default)) (uuid 0997f373-c2ed-4e2b-a4e1-d8dfede728f4) ) - (wire (pts (xy 140.97 76.2) (xy 140.97 92.71)) - (stroke (width 0) (type default)) - (uuid 0a403292-edab-4367-9e5c-4318f41caf68) - ) (wire (pts (xy 50.8 123.19) (xy 50.8 121.92)) (stroke (width 0) (type default)) (uuid 0af8d277-d216-421a-a245-3c03397f896e) ) + (wire (pts (xy 203.2 107.95) (xy 203.2 109.22)) + (stroke (width 0) (type default)) + (uuid 0e895f5e-4882-4055-a3b6-418394d03859) + ) + (wire (pts (xy 199.39 81.28) (xy 184.15 81.28)) + (stroke (width 0) (type default)) + (uuid 126f41ac-fc70-41a6-8d87-02f92d5a78eb) + ) (wire (pts (xy 158.75 127) (xy 163.83 127)) (stroke (width 0) (type default)) (uuid 13bd5a88-c167-4556-86c0-14ad36d78872) @@ -1181,10 +1241,6 @@ (stroke (width 0) (type default)) (uuid 1a621fc6-1b3b-4b2b-bdda-a74b4b087890) ) - (wire (pts (xy 163.83 101.6) (xy 167.64 101.6)) - (stroke (width 0) (type default)) - (uuid 1e1f2bb5-eaed-4671-b0be-23d11c361bc1) - ) (wire (pts (xy 26.67 129.54) (xy 26.67 130.81)) (stroke (width 0) (type default)) (uuid 1fe538db-add0-4e5b-b011-8ca816df8815) @@ -1201,6 +1257,18 @@ (stroke (width 0) (type default)) (uuid 2fc978cc-463b-4b7e-be1a-1e4cf15b8b9a) ) + (wire (pts (xy 132.08 68.58) (xy 140.97 68.58)) + (stroke (width 0) (type default)) + (uuid 30e0f174-0694-43c1-a5f0-19396ed44ccf) + ) + (wire (pts (xy 170.18 81.28) (xy 184.15 81.28)) + (stroke (width 0) (type default)) + (uuid 37447f09-e024-4e0c-81b6-37b69f19b888) + ) + (wire (pts (xy 116.84 68.58) (xy 132.08 68.58)) + (stroke (width 0) (type default)) + (uuid 37be7c86-021d-4389-90e2-59dec3a5357d) + ) (bus (pts (xy 67.31 111.76) (xy 67.31 115.57)) (stroke (width 0) (type default)) (uuid 387e799f-7c4a-4a10-9620-0723d8fd7eec) @@ -1210,7 +1278,7 @@ (stroke (width 0) (type default)) (uuid 389befb4-d796-41a6-bf87-4f36481d53e5) ) - (wire (pts (xy 198.12 92.71) (xy 198.12 91.44)) + (wire (pts (xy 198.12 99.06) (xy 198.12 97.79)) (stroke (width 0) (type default)) (uuid 3fed74db-a4a6-43eb-8d14-b11840b65a4d) ) @@ -1218,7 +1286,7 @@ (stroke (width 0) (type default)) (uuid 4046cf5e-598e-4fec-82aa-46bd0c9c365a) ) - (wire (pts (xy 200.66 91.44) (xy 200.66 92.71)) + (wire (pts (xy 200.66 97.79) (xy 200.66 99.06)) (stroke (width 0) (type default)) (uuid 41ba67b6-3027-4771-9a3a-a215623a9f47) ) @@ -1226,7 +1294,7 @@ (stroke (width 0) (type default)) (uuid 4692c9c1-6ade-42d9-a307-f6e89cad4bc3) ) - (wire (pts (xy 176.53 50.8) (xy 176.53 49.53)) + (wire (pts (xy 170.18 72.39) (xy 170.18 69.85)) (stroke (width 0) (type default)) (uuid 482f88ca-1ea0-4c5e-94d0-be2965320a5f) ) @@ -1242,6 +1310,10 @@ (stroke (width 0) (type default)) (uuid 4c733966-20f2-4fb8-8d95-d1acf432405d) ) + (wire (pts (xy 140.97 72.39) (xy 140.97 92.71)) + (stroke (width 0) (type default)) + (uuid 4ebaec74-b5d8-4fb8-85b3-ab51fe36bdbb) + ) (wire (pts (xy 53.34 106.68) (xy 64.77 106.68)) (stroke (width 0) (type default)) (uuid 50272138-b491-4666-aee8-9a6729472b28) @@ -1254,7 +1326,7 @@ (stroke (width 0) (type default)) (uuid 54b1f613-a30e-4c28-b341-eadc95272602) ) - (wire (pts (xy 215.9 49.53) (xy 215.9 50.8)) + (wire (pts (xy 209.55 69.85) (xy 209.55 72.39)) (stroke (width 0) (type default)) (uuid 56d8b133-a322-47e8-97fc-e6d9e8454816) ) @@ -1266,7 +1338,7 @@ (stroke (width 0) (type default)) (uuid 5986bcbe-6ea3-403f-ae06-d42008655821) ) - (wire (pts (xy 190.5 60.96) (xy 190.5 59.69)) + (wire (pts (xy 184.15 81.28) (xy 184.15 80.01)) (stroke (width 0) (type default)) (uuid 5c3b4c0c-270c-4f02-97ef-277bd72a8eb4) ) @@ -1282,7 +1354,7 @@ (stroke (width 0) (type default)) (uuid 5e1c8ae4-b1d3-4143-8121-8803897a3d60) ) - (wire (pts (xy 215.9 49.53) (xy 218.44 49.53)) + (wire (pts (xy 209.55 69.85) (xy 212.09 69.85)) (stroke (width 0) (type default)) (uuid 667e3a86-05fe-49d6-a2e8-508ad6388de3) ) @@ -1298,11 +1370,15 @@ (stroke (width 0) (type default)) (uuid 736e07b7-521f-4eb0-a9eb-db3fb5fb836d) ) + (wire (pts (xy 184.15 82.55) (xy 184.15 81.28)) + (stroke (width 0) (type default)) + (uuid 74d7aa37-7df3-4892-91f8-91f1d0f56b39) + ) (wire (pts (xy 44.45 68.58) (xy 55.88 68.58)) (stroke (width 0) (type default)) (uuid 76e00c74-8aaf-4cdf-bafa-78e7801b18f0) ) - (wire (pts (xy 176.53 49.53) (xy 180.34 49.53)) + (wire (pts (xy 170.18 69.85) (xy 173.99 69.85)) (stroke (width 0) (type default)) (uuid 77ce5f5e-5c26-468e-a317-97cdc8dcacef) ) @@ -1310,7 +1386,7 @@ (stroke (width 0) (type default)) (uuid 7ea869ee-c102-49c9-ac47-6e86e9375632) ) - (wire (pts (xy 137.16 77.47) (xy 137.16 76.2)) + (wire (pts (xy 146.05 73.66) (xy 146.05 72.39)) (stroke (width 0) (type default)) (uuid 875f359f-65e0-41e2-a159-09f15bada60c) ) @@ -1330,7 +1406,7 @@ (stroke (width 0) (type default)) (uuid 8e3d4d52-7ed4-4115-a212-503a66cba8cd) ) - (wire (pts (xy 200.66 49.53) (xy 205.74 49.53)) + (wire (pts (xy 194.31 69.85) (xy 199.39 69.85)) (stroke (width 0) (type default)) (uuid 8fbfc8e3-01ae-4971-9a46-84c86be08ee6) ) @@ -1342,7 +1418,7 @@ (stroke (width 0) (type default)) (uuid 90593372-f77c-42d3-aea8-0fe2006246e8) ) - (wire (pts (xy 205.74 57.15) (xy 205.74 55.88)) + (wire (pts (xy 199.39 77.47) (xy 199.39 81.28)) (stroke (width 0) (type default)) (uuid 906344b9-ba41-4a6c-9b05-13f61b60e14a) ) @@ -1358,7 +1434,7 @@ (stroke (width 0) (type default)) (uuid 943d95c1-b1e5-4886-a9ee-fdbef7b0777f) ) - (wire (pts (xy 80.01 68.58) (xy 115.57 68.58)) + (wire (pts (xy 80.01 68.58) (xy 111.76 68.58)) (stroke (width 0) (type default)) (uuid 950d54bc-a91a-4a2b-a887-2275bf1d6a3e) ) @@ -1366,10 +1442,14 @@ (stroke (width 0) (type default)) (uuid 9b84fb8e-f9ba-42f9-819b-de6d1579c86e) ) - (wire (pts (xy 176.53 57.15) (xy 176.53 55.88)) + (wire (pts (xy 170.18 77.47) (xy 170.18 81.28)) (stroke (width 0) (type default)) (uuid 9c4215ad-2fd4-480f-afdf-e8d7b6324827) ) + (wire (pts (xy 146.05 72.39) (xy 140.97 72.39)) + (stroke (width 0) (type default)) + (uuid 9eff1e5b-30bb-4fb5-bcf7-8d219c274345) + ) (wire (pts (xy 140.97 92.71) (xy 140.97 93.98)) (stroke (width 0) (type default)) (uuid a04c3a54-d22e-412a-a330-5670246172a0) @@ -1382,7 +1462,7 @@ (stroke (width 0) (type default)) (uuid a348e94d-6c22-46cd-87e7-f127149e0ed2) ) - (wire (pts (xy 218.44 46.99) (xy 218.44 49.53)) + (wire (pts (xy 212.09 67.31) (xy 212.09 69.85)) (stroke (width 0) (type default)) (uuid a740eb20-3afa-4ada-b39c-7bb970adc1a7) ) @@ -1394,7 +1474,7 @@ (stroke (width 0) (type default)) (uuid ace5c2f1-5408-42be-a7e6-b97a54927e06) ) - (wire (pts (xy 163.83 49.53) (xy 163.83 101.6)) + (wire (pts (xy 161.29 69.85) (xy 161.29 101.6)) (stroke (width 0) (type default)) (uuid ad07a498-3584-4e73-916a-c76f2853fab8) ) @@ -1414,15 +1494,11 @@ (stroke (width 0) (type default)) (uuid b07a2ed2-6e75-4d6d-a061-31be8c2f54ed) ) - (wire (pts (xy 137.16 76.2) (xy 140.97 76.2)) - (stroke (width 0) (type default)) - (uuid b0e4dd8c-0f2e-4054-b7b9-f84674a8ec25) - ) (wire (pts (xy 120.65 92.71) (xy 121.92 92.71)) (stroke (width 0) (type default)) (uuid b13e7152-2075-4979-95c3-8b0c0b5a6f0a) ) - (wire (pts (xy 205.74 49.53) (xy 215.9 49.53)) + (wire (pts (xy 199.39 69.85) (xy 209.55 69.85)) (stroke (width 0) (type default)) (uuid b1bef17b-6ece-40f3-b744-8edc2e7b6293) ) @@ -1430,18 +1506,26 @@ (stroke (width 0) (type default)) (uuid b2775f9f-f459-44aa-9a31-1424e83c99b9) ) - (wire (pts (xy 137.16 82.55) (xy 137.16 85.09)) + (wire (pts (xy 146.05 78.74) (xy 146.05 80.01)) (stroke (width 0) (type default)) (uuid b4e0d7be-a7b4-4fc0-b7b2-a2bad0dedcd3) ) - (wire (pts (xy 205.74 57.15) (xy 215.9 57.15)) + (wire (pts (xy 199.39 81.28) (xy 209.55 81.28)) (stroke (width 0) (type default)) (uuid bac77464-07fb-4a35-be14-87a0e09a492f) ) + (wire (pts (xy 161.29 101.6) (xy 163.83 101.6)) + (stroke (width 0) (type default)) + (uuid bc284b90-adab-49bc-86fb-123fbbb97eca) + ) (wire (pts (xy 78.74 105.41) (xy 78.74 106.68)) (stroke (width 0) (type default)) (uuid bc9ad445-d411-4a8b-8ece-ddc809dec0be) ) + (wire (pts (xy 158.75 101.6) (xy 161.29 101.6)) + (stroke (width 0) (type default)) + (uuid bd396207-8b62-4ec0-8624-2540a280a4b9) + ) (wire (pts (xy 158.75 121.92) (xy 163.83 121.92)) (stroke (width 0) (type default)) (uuid c00cfd97-a1f2-47b3-bf17-9612ae2db296) @@ -1455,7 +1539,7 @@ (uuid c4fc6fd5-a442-4e98-aee4-e8a72dbbbd6b) ) - (wire (pts (xy 140.97 68.58) (xy 140.97 76.2)) + (wire (pts (xy 140.97 68.58) (xy 140.97 72.39)) (stroke (width 0) (type default)) (uuid c650a92c-36b3-473e-9d8a-c8a7025e464b) ) @@ -1463,7 +1547,7 @@ (stroke (width 0) (type default)) (uuid c896e082-b024-43e1-9343-83a407a5bbff) ) - (wire (pts (xy 203.2 91.44) (xy 203.2 109.22)) + (wire (pts (xy 203.2 97.79) (xy 203.2 102.87)) (stroke (width 0) (type default)) (uuid cd12510d-e65b-4476-a0d0-862d61aa078c) ) @@ -1471,10 +1555,6 @@ (stroke (width 0) (type default)) (uuid ce8bfeb6-9176-4a92-811b-aecf859db484) ) - (wire (pts (xy 158.75 101.6) (xy 163.83 101.6)) - (stroke (width 0) (type default)) - (uuid d10958d2-bc66-42fb-8db8-f9efdfb76000) - ) (wire (pts (xy 161.29 109.22) (xy 166.37 109.22)) (stroke (width 0) (type default)) (uuid d3080d1e-5b61-460d-989d-337803943f3a) @@ -1483,10 +1563,6 @@ (stroke (width 0) (type default)) (uuid d3c29d57-b562-46ac-a56c-92813b417420) ) - (wire (pts (xy 205.74 58.42) (xy 205.74 57.15)) - (stroke (width 0) (type default)) - (uuid d44202c2-e57c-4ca1-9f2b-bba2dc35fc3b) - ) (wire (pts (xy 50.8 78.74) (xy 49.53 78.74)) (stroke (width 0) (type default)) (uuid dddbd2e8-c8b2-4234-9bfb-e653d14bc67b) @@ -1515,7 +1591,7 @@ (stroke (width 0) (type default)) (uuid f57a372a-67cd-4b36-9227-68dd8d65f7d8) ) - (wire (pts (xy 215.9 55.88) (xy 215.9 57.15)) + (wire (pts (xy 209.55 77.47) (xy 209.55 81.28)) (stroke (width 0) (type default)) (uuid fad61a82-5d4f-4fd9-affd-166226e5602a) ) @@ -1529,20 +1605,21 @@ ) (text "https://ecocell.com.au/product/lipo-1000-603450-3w/" - (at 168.91 77.47 0) + (at 207.01 92.71 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 0f5b88e9-fa30-4ef0-af34-5f2ab169385c) ) - (text "max 600mA" (at 201.93 48.26 0) + (text "max 600mA" (at 195.58 68.58 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 20d117c1-35dc-4b55-9149-a2924cdc1889) ) - (text "https://ww1.microchip.com/downloads/en/Appnotes/01260B.pdf" - (at 167.005 71.755 0) + (text "500mA charge current\n600mA (=400mA@5v) main reg\n1.1A hold gives us ~200mA of\nheadroom for derating." + (at 102.87 83.82 0) (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid 3232c408-a11b-45a7-bcfe-0155deaffec7) + (uuid 25879005-76ce-4c5a-9390-b676eb3395eb) ) - (text "Should be ~2V at full charge" (at 210.185 123.825 0) + (text "Should be ~2V at full charge\nfor a standard LiPo cell" + (at 210.82 127 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 6224b807-8fde-44af-9e2a-572462b9bbab) ) @@ -1551,6 +1628,10 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 63193c83-807e-4fd4-8c79-47dd2a178194) ) + (text "I_REG = 1000V / R_PROG1\n500mA = 1000V / 2kOhms" (at 88.9 130.81 0) + (effects (font (size 1.27 1.27)) (justify right bottom)) + (uuid ab4d93d6-0884-47f4-8fa2-c71a065eafe8) + ) (text "Keep VBUS_RAW <= 10uF" (at 46.355 65.405 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid bfecfbaf-2163-4150-8239-3d4b1c7a8322) @@ -1559,19 +1640,15 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid c6e9802c-d15b-4780-b0d1-9b45b01a9c84) ) - (text "select based on\nspecific battery" (at 88.9 130.175 0) + (text "select based on\nspecific battery" (at 116.84 125.73 0) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid c9c44ed2-df23-4da5-8a66-7e6b99f026eb) ) - (text "Note USB capacitance limits on initial connection:" - (at 45.085 60.96 0) + (text "Note USB spec capacitance limits on initial connection:" + (at 53.34 60.96 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid dd848609-fc16-4db3-831f-3ccaa22abffc) ) - (text "BAT <= 5.5V at max charge\n(limited by 1V8 reg)" (at 193.675 88.265 0) - (effects (font (size 1.27 1.27)) (justify right bottom)) - (uuid ef19af50-3724-4ded-b526-480f2a5e9fa2) - ) (label "SYS_POWER" (at 110.49 132.08 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right bottom)) @@ -1597,11 +1674,11 @@ (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid 43e2b1ff-df81-4cda-8d49-232eddf0da62) ) - (label "SYS_POWER" (at 167.64 101.6 0) (fields_autoplaced) + (label "SYS_POWER" (at 163.83 101.6 0) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid abd93a8e-7858-4231-a30c-fb919c412bd5) ) - (label "NTC" (at 198.12 92.71 270) (fields_autoplaced) + (label "NTC" (at 198.12 99.06 270) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid b3372b80-beff-4f5f-bec4-81f89a9bc518) ) @@ -1765,19 +1842,19 @@ ) ) - (symbol (lib_id "power:+3V3") (at 218.44 46.99 0) (unit 1) + (symbol (lib_id "power:+3V3") (at 212.09 67.31 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 18fde3d3-cea9-406b-9f4e-d46603f6493d) - (property "Reference" "#PWR0217" (at 218.44 50.8 0) + (property "Reference" "#PWR0217" (at 212.09 71.12 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3V3" (at 218.44 41.275 0) + (property "Value" "+3V3" (at 212.09 61.595 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 218.44 46.99 0) + (property "Footprint" "" (at 212.09 67.31 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 218.44 46.99 0) + (property "Datasheet" "" (at 212.09 67.31 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid b437b181-1ecd-44ad-b1f5-c534000cc43a)) @@ -1790,25 +1867,25 @@ ) ) - (symbol (lib_id "Device:C_Small") (at 176.53 53.34 0) (unit 1) + (symbol (lib_id "Device:C_Small") (at 170.18 74.93 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 21cdcb26-8c57-40c6-ab1a-c5d4468243cd) - (property "Reference" "C29" (at 172.085 52.705 0) + (property "Reference" "C29" (at 165.735 74.295 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "10uF" (at 172.085 54.61 0) + (property "Value" "10uF" (at 165.735 76.2 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (at 176.53 53.34 0) + (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (at 170.18 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 176.53 53.34 0) + (property "Datasheet" "~" (at 170.18 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "PN" "" (at 176.53 53.34 90) + (property "PN" "" (at 170.18 74.93 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "EMK212ABJ106KG-T" (at 176.53 53.34 0) + (property "MPN" "EMK212ABJ106KG-T" (at 170.18 74.93 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid add1d77d-4dab-409e-af4c-26f2af45834e)) @@ -1854,19 +1931,19 @@ ) ) - (symbol (lib_id "power:GND") (at 200.66 92.71 0) (unit 1) + (symbol (lib_id "power:GND") (at 200.66 99.06 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 2e4619a6-44a6-4f5c-917b-ee7e9f5fe3d2) - (property "Reference" "#PWR0213" (at 200.66 99.06 0) + (property "Reference" "#PWR0213" (at 200.66 105.41 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 200.66 96.52 0) + (property "Value" "GND" (at 200.66 102.87 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 200.66 92.71 0) + (property "Footprint" "" (at 200.66 99.06 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 200.66 92.71 0) + (property "Datasheet" "" (at 200.66 99.06 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 9f4dfb32-6bb2-42e5-914f-84b2d091d0eb)) @@ -1995,19 +2072,19 @@ ) ) - (symbol (lib_id "power:PWR_FLAG") (at 115.57 68.58 180) (unit 1) - (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (symbol (lib_id "power:PWR_FLAG") (at 132.08 68.58 180) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (uuid 3a31683a-37bf-4a7b-b482-c1d0158d579b) - (property "Reference" "#FLG0202" (at 115.57 70.485 0) + (property "Reference" "#FLG0202" (at 132.08 70.485 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "PWR_FLAG" (at 115.57 73.66 0) + (property "Value" "PWR_FLAG" (at 132.08 72.39 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 115.57 68.58 0) + (property "Footprint" "" (at 132.08 68.58 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 115.57 68.58 0) + (property "Datasheet" "~" (at 132.08 68.58 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 9d6551d5-bc85-487d-a117-1bfaf31b5555)) @@ -2136,7 +2213,7 @@ (property "Value" "2k" (at 86.36 125.73 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 90.17 124.46 0) + (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (at 90.17 124.46 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (at 90.17 124.46 0) @@ -2145,7 +2222,7 @@ (property "PN" "" (at 90.17 124.46 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 90.17 124.46 0) + (property "MPN" "RC0603JR-072KL" (at 90.17 124.46 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 9c1ffc77-05c7-4f2f-9372-dca984af026c)) @@ -2159,22 +2236,22 @@ ) ) - (symbol (lib_id "Device:C_Polarized_Small") (at 215.9 53.34 0) (unit 1) + (symbol (lib_id "Device:C_Polarized_Small") (at 209.55 74.93 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 63c7d963-dc6c-48ec-ab67-1e32998f7224) - (property "Reference" "C7" (at 218.44 52.1589 0) + (property "Reference" "C7" (at 212.09 73.7489 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "10uF" (at 218.44 54.6989 0) + (property "Value" "10uF" (at 212.09 76.2889 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Capacitor_Tantalum_SMD:CP_EIA-3216-18_Kemet-A" (at 215.9 53.34 0) + (property "Footprint" "Capacitor_Tantalum_SMD:CP_EIA-3216-18_Kemet-A" (at 209.55 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 215.9 53.34 0) + (property "Datasheet" "~" (at 209.55 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "TCJA106M020R0150 " (at 215.9 53.34 90) + (property "MPN" "TCJA106M020R0150 " (at 209.55 74.93 90) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 16a88025-145f-4750-87a8-288ebd7c7ba2)) @@ -2191,25 +2268,25 @@ ) ) - (symbol (lib_id "Device:C_Small") (at 137.16 80.01 0) (unit 1) + (symbol (lib_id "Device:C_Small") (at 146.05 76.2 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 6ed67879-4bc3-48c3-a925-594c9c7a33c3) - (property "Reference" "C32" (at 133.0325 79.0575 0) + (property "Reference" "C32" (at 150.1775 75.2475 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "10uF" (at 133.0325 80.9625 0) + (property "Value" "10uF" (at 150.1775 77.1525 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (at 137.16 80.01 0) + (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (at 146.05 76.2 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 137.16 80.01 0) + (property "Datasheet" "~" (at 146.05 76.2 0) (effects (font (size 1.27 1.27)) hide) ) - (property "PN" "" (at 137.16 80.01 90) + (property "PN" "" (at 146.05 76.2 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "EMK212ABJ106KG-T" (at 137.16 80.01 0) + (property "MPN" "EMK212ABJ106KG-T" (at 146.05 76.2 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 4287ce00-9fab-43cc-a39f-bb43106ea2f0)) @@ -2337,6 +2414,35 @@ ) ) + (symbol (lib_id "Device:Polyfuse_Small") (at 203.2 105.41 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (uuid 92b61bfc-7b61-468b-bd0c-591d94244df2) + (property "Reference" "F1" (at 205.74 104.775 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "500mA hold, 1A trip" (at 205.74 107.315 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Fuse:Fuse_1206_3216Metric" (at 204.47 110.49 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + (property "Datasheet" "~" (at 203.2 105.41 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "MPN" "SMD1206B050TF/15" (at 203.2 105.41 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 07aad405-ac41-43cf-a6c3-41c66427ab47)) + (pin "2" (uuid 3ba3b75f-1bbc-4e0f-ab7c-2d5dfb3f4947)) + (instances + (project "gay-ipod" + (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda" + (reference "F1") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "Device:Q_PMOS_GSD") (at 74.93 71.12 270) (mirror x) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid 9f890897-0f82-45a8-8346-61a2ec80004a) @@ -2370,6 +2476,35 @@ ) ) + (symbol (lib_id "Device:Polyfuse_Small") (at 114.3 68.58 270) (unit 1) + (in_bom yes) (on_board yes) (dnp no) + (uuid a221dce7-6d2b-4e12-aa30-033d8527a39d) + (property "Reference" "F2" (at 114.3 71.12 90) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "1.1A hold, 2.2A trip" (at 114.3 73.66 90) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "Fuse:Fuse_1206_3216Metric" (at 109.22 69.85 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + (property "Datasheet" "~" (at 114.3 68.58 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "MPN" "SMD1206B110TFT" (at 114.3 68.58 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 9705b449-7219-497d-a690-85a9bfcb614c)) + (pin "2" (uuid 9fd5c504-4c50-451f-a8ec-78a421ad1a3d)) + (instances + (project "gay-ipod" + (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda" + (reference "F2") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "power:GND") (at 95.25 132.08 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid a5d7504d-3f79-4f5b-a5e3-4cafa5f87b94) @@ -2445,22 +2580,22 @@ ) ) - (symbol (lib_id "symbols:AP7365") (at 190.5 50.8 0) (unit 1) - (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (symbol (lib_id "symbols:AP7365") (at 184.15 71.12 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (uuid b3b32fe1-5e8d-4893-9196-def54060055d) - (property "Reference" "U6" (at 190.5 45.72 0) + (property "Reference" "U6" (at 177.8 63.5 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "~" (at 190.5 50.8 0) + (property "Value" "AP7365" (at 180.34 66.04 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Package_TO_SOT_SMD:SOT-89-3" (at 190.5 50.8 0) + (property "Footprint" "Package_TO_SOT_SMD:SOT-89-3" (at 184.15 71.12 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 190.5 50.8 0) + (property "Datasheet" "" (at 184.15 71.12 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "AP7365-33YG-13 " (at 190.5 50.8 0) + (property "MPN" "AP7365-33YG-13 " (at 184.15 71.12 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid f47d5c11-6cb8-4094-9212-6f69e7225b81)) @@ -2475,19 +2610,19 @@ ) ) - (symbol (lib_id "power:GND") (at 190.5 60.96 0) (unit 1) + (symbol (lib_id "power:GND") (at 184.15 82.55 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid ba83e7e1-f27e-4154-adaa-f25b95974f4a) - (property "Reference" "#PWR01" (at 190.5 67.31 0) + (property "Reference" "#PWR01" (at 184.15 88.9 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 190.5 65.405 0) + (property "Value" "GND" (at 184.15 86.995 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 190.5 60.96 0) + (property "Footprint" "" (at 184.15 82.55 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 190.5 60.96 0) + (property "Datasheet" "" (at 184.15 82.55 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 5eb25f36-8c5e-4c80-9532-04aa34198999)) @@ -2621,31 +2756,6 @@ ) ) - (symbol (lib_id "power:GND") (at 205.74 58.42 0) (unit 1) - (in_bom yes) (on_board yes) (dnp no) - (uuid cfc8d10e-b52d-4c49-a87e-b7c96f735cc9) - (property "Reference" "#PWR0216" (at 205.74 64.77 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "GND" (at 205.74 62.23 0) - (effects (font (size 1.27 1.27))) - ) - (property "Footprint" "" (at 205.74 58.42 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "" (at 205.74 58.42 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid b077fa04-e072-4a71-9f31-987f2627ea0a)) - (instances - (project "gay-ipod" - (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda" - (reference "#PWR0216") (unit 1) - ) - ) - ) - ) - (symbol (lib_id "Device:R_Small") (at 22.86 138.43 90) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid d1b2aef7-e7ee-4306-959b-5519609da3e0) @@ -2678,25 +2788,25 @@ ) ) - (symbol (lib_id "Device:C_Small") (at 205.74 53.34 0) (mirror y) (unit 1) + (symbol (lib_id "Device:C_Small") (at 199.39 74.93 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid e8cbaaeb-611e-4a62-b347-e8d8270c5b7b) - (property "Reference" "C24" (at 210.185 52.705 0) + (property "Reference" "C24" (at 203.835 74.295 0) (effects (font (size 1.27 1.27))) ) - (property "Value" "10uF" (at 210.185 54.61 0) + (property "Value" "10uF" (at 203.835 76.2 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (at 205.74 53.34 0) + (property "Footprint" "Capacitor_SMD:C_0805_2012Metric" (at 199.39 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 205.74 53.34 0) + (property "Datasheet" "~" (at 199.39 74.93 0) (effects (font (size 1.27 1.27)) hide) ) - (property "PN" "" (at 205.74 53.34 90) + (property "PN" "" (at 199.39 74.93 90) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "EMK212ABJ106KG-T" (at 205.74 53.34 0) + (property "MPN" "EMK212ABJ106KG-T" (at 199.39 74.93 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid cc2e2f04-e02c-4838-bee3-d0b6b6cde093)) @@ -2807,19 +2917,19 @@ ) ) - (symbol (lib_id "power:GND") (at 137.16 85.09 0) (unit 1) + (symbol (lib_id "power:GND") (at 146.05 80.01 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid ee9564dd-4ea9-4962-b23b-9a9a5a41b369) - (property "Reference" "#PWR0209" (at 137.16 91.44 0) + (property "Reference" "#PWR0209" (at 146.05 86.36 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 137.16 89.535 0) + (property "Value" "GND" (at 146.05 84.455 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 137.16 85.09 0) + (property "Footprint" "" (at 146.05 80.01 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 137.16 85.09 0) + (property "Datasheet" "" (at 146.05 80.01 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid f1d57097-ff67-402f-ad4c-be175a8582ad)) @@ -2832,22 +2942,22 @@ ) ) - (symbol (lib_id "Connector_Generic:Conn_01x03") (at 200.66 86.36 270) (mirror x) (unit 1) + (symbol (lib_id "Connector_Generic:Conn_01x03") (at 200.66 92.71 270) (mirror x) (unit 1) (in_bom yes) (on_board yes) (dnp no) (uuid f72fe528-69f4-4c4b-8eec-5db4deb28b5b) - (property "Reference" "J7" (at 198.755 80.645 90) + (property "Reference" "J7" (at 198.755 86.995 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "Battery" (at 197.485 83.185 90) + (property "Value" "Battery" (at 197.485 89.535 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Connector_JST:JST_PH_S3B-PH-K_1x03_P2.00mm_Horizontal" (at 200.66 86.36 0) + (property "Footprint" "Connector_JST:JST_PH_S3B-PH-K_1x03_P2.00mm_Horizontal" (at 200.66 92.71 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 200.66 86.36 0) + (property "Datasheet" "~" (at 200.66 92.71 0) (effects (font (size 1.27 1.27)) hide) ) - (property "PN" "" (at 200.66 86.36 0) + (property "MPN" "S3B-PH-K-S(LF)(SN)" (at 200.66 92.71 90) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 9ef182b5-daa1-4f9b-a61c-6900b90ac9a2)) @@ -2880,7 +2990,7 @@ (property "PN" "" (at 95.25 124.46 0) (effects (font (size 1.27 1.27)) hide) ) - (property "MPN" "" (at 95.25 124.46 0) + (property "MPN" "MFR-25FBF52-24K9" (at 95.25 124.46 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid cefd1260-e011-4bb9-bb07-4256d9dcce45)) @@ -2893,29 +3003,4 @@ ) ) ) - - (symbol (lib_id "power:GND") (at 176.53 57.15 0) (unit 1) - (in_bom yes) (on_board yes) (dnp no) - (uuid ffb754da-bd87-4cf5-89cc-1b9219133e1c) - (property "Reference" "#PWR0212" (at 176.53 63.5 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "GND" (at 176.53 61.595 0) - (effects (font (size 1.27 1.27))) - ) - (property "Footprint" "" (at 176.53 57.15 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "" (at 176.53 57.15 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid 6e1e2555-79f3-4441-89eb-e4d27460539c)) - (instances - (project "gay-ipod" - (path "/de8684e7-e170-4d2f-a805-7d7995907eaf/3e1bbe1f-2b0b-4dc2-a25f-c37315228fda" - (reference "#PWR0212") (unit 1) - ) - ) - ) - ) )