diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-06-02_143434.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-06-02_143434.zip deleted file mode 100644 index 669c349..0000000 Binary files a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-06-02_143434.zip and /dev/null differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_200455.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_200455.zip deleted file mode 100644 index c551742..0000000 Binary files a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_200455.zip and /dev/null differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_201639.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_201639.zip deleted file mode 100644 index c551742..0000000 Binary files a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_201639.zip and /dev/null differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_203158.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_203158.zip deleted file mode 100644 index 25722d7..0000000 Binary files a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-08-23_203158.zip and /dev/null differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-16_161655.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-16_161655.zip new file mode 100644 index 0000000..0bbfd20 Binary files /dev/null and b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-16_161655.zip differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-16_190456.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-16_190456.zip new file mode 100644 index 0000000..0bbfd20 Binary files /dev/null and b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-16_190456.zip differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-17_153315.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-17_153315.zip new file mode 100644 index 0000000..646daba Binary files /dev/null and b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-17_153315.zip differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-17_154220.zip b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-17_154220.zip new file mode 100644 index 0000000..2dc8536 Binary files /dev/null and b/Penguinator-Glue-Board/Penguinator-Glue-Board-backups/Penguinator-Glue-Board-2022-10-17_154220.zip differ diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pcb b/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pcb index 6a8ec13..3c9ded2 100644 --- a/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pcb +++ b/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pcb @@ -135,7 +135,6 @@ (net 45 "unconnected-(U3-Pad5)") (net 46 "unconnected-(J1-Pad5)") (net 47 "unconnected-(J1-Pad6)") - (net 48 "Net-(R3-Pad1)") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal" (layer "F.Cu") (tedit 59FED5CB) (tstamp 151810ec-30ed-4143-b96f-8bb0e7ca2667) @@ -2639,7 +2638,7 @@ (fp_line (start -0.8 -0.4125) (end -0.8 0.4125) (layer "B.Fab") (width 0.1) (tstamp 58b15a33-ffb6-4604-9b75-04ed68ba79c2)) (fp_line (start 0.8 0.4125) (end 0.8 -0.4125) (layer "B.Fab") (width 0.1) (tstamp 84a64f2b-6bf4-42e4-b602-4628ea3d6528)) (pad "1" smd roundrect (at -0.9125 0 90) (size 0.975 0.95) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 48 "Net-(R3-Pad1)") (pintype "passive") (tstamp 4ac7952b-3ad5-44c3-80a6-3dfe5369c949)) + (net 12 "+3V3") (pintype "passive") (tstamp 4ac7952b-3ad5-44c3-80a6-3dfe5369c949)) (pad "2" smd roundrect (at 0.9125 0 90) (size 0.975 0.95) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) (net 9 "GND") (pintype "passive") (tstamp f37894ca-46e7-409a-88e8-1ad75a35fb2f)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl" @@ -2744,7 +2743,7 @@ (pad "9" smd roundrect (at -2.8625 -2.275 270) (size 1.475 0.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) (net 41 "unconnected-(U2-Pad9)") (pinfunction "A8") (pintype "bidirectional+no_connect") (tstamp a91537f7-a96f-493d-aa4d-16690a277c14)) (pad "10" smd roundrect (at -2.8625 -2.925 270) (size 1.475 0.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) - (net 48 "Net-(R3-Pad1)") (pinfunction "OE") (pintype "input") (tstamp 4b4c468a-b373-44ea-b24c-af594ad2665e)) + (net 12 "+3V3") (pinfunction "OE") (pintype "input") (tstamp 4b4c468a-b373-44ea-b24c-af594ad2665e)) (pad "11" smd roundrect (at 2.8625 -2.925 270) (size 1.475 0.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) (net 9 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 11f5220f-31ee-4485-86b2-d80c5398a6f4)) (pad "12" smd roundrect (at 2.8625 -2.275 270) (size 1.475 0.4) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) @@ -3016,19 +3015,26 @@ (segment (start 27 54.9635) (end 27 53.4) (width 0.7) (layer "F.Cu") (net 12) (tstamp 37c3995a-0891-4f32-a91d-95630914c1f8)) (segment (start 32.37 35.805) (end 29.755 35.805) (width 0.7) (layer "F.Cu") (net 12) (tstamp 60523d6f-dc0c-4be3-8f4e-d70eb0309518)) (segment (start 37.284155 40.815845) (end 37.15 40.95) (width 0.7) (layer "F.Cu") (net 12) (tstamp 8a80b8a2-9ddc-42e7-a10d-cddf7bcd59c8)) + (segment (start 29.755 35.805) (end 29.425 35.475) (width 0.7) (layer "F.Cu") (net 12) (tstamp 8c8abc1a-da86-416b-a9aa-8c491477f7ce)) (segment (start 37.284155 38.084155) (end 37.284155 40.815845) (width 0.7) (layer "F.Cu") (net 12) (tstamp 8ee6cbc1-8802-47a5-b0d7-d9001d42a363)) (segment (start 35.005 35.805) (end 37.284155 38.084155) (width 0.7) (layer "F.Cu") (net 12) (tstamp 93013acd-217d-4382-bed5-4956f1b81a28)) (segment (start 26.8535 55.11) (end 24.185 55.11) (width 0.7) (layer "F.Cu") (net 12) (tstamp 94b9b5b9-338c-4b49-991c-bea3cd465cd9)) - (segment (start 29.755 35.805) (end 25.95 32) (width 0.7) (layer "F.Cu") (net 12) (tstamp ff0a91ef-d4b2-422c-83dd-b1b3b2e44fff)) + (segment (start 29.425 35.475) (end 25.95 32) (width 0.7) (layer "F.Cu") (net 12) (tstamp ba813a9b-939b-4d29-bf12-a942eb16c91e)) + (via (at 29.425 35.475) (size 0.9) (drill 0.8) (layers "F.Cu" "B.Cu") (net 12) (tstamp 116237e8-785f-44e3-9c10-650b51097e16)) (via (at 37.15 40.95) (size 0.9) (drill 0.8) (layers "F.Cu" "B.Cu") (net 12) (tstamp 5d85934e-81e2-4bc0-bb6b-89872cda8f6d)) (via (at 27 53.4) (size 0.9) (drill 0.8) (layers "F.Cu" "B.Cu") (net 12) (tstamp 67eb8d6f-b680-44cc-9820-cf4e16b94128)) (via (at 25.95 32) (size 0.9) (drill 0.8) (layers "F.Cu" "B.Cu") (net 12) (tstamp fb02077c-8092-43f0-9734-678d58b86274)) + (segment (start 28.8125 36.0875) (end 29.425 35.475) (width 0.25) (layer "B.Cu") (net 12) (tstamp 08ba252e-4bb8-49cd-a9c5-58b5a5629140)) + (segment (start 27.525 36.0875) (end 28.8125 36.0875) (width 0.25) (layer "B.Cu") (net 12) (tstamp 312d9358-71e9-4e4c-b8c8-fd4a6d09d2ff)) (segment (start 37.15 44.55) (end 28.3 53.4) (width 0.7) (layer "B.Cu") (net 12) (tstamp 3f1299c6-b900-4000-9d71-aafe81ccdb91)) (segment (start 22.325 34.6625) (end 22.325 36.0875) (width 0.25) (layer "B.Cu") (net 12) (tstamp 4817ab17-8bb5-47d5-b135-b1175eb390ec)) (segment (start 37.15 40.95) (end 37.15 44.55) (width 0.7) (layer "B.Cu") (net 12) (tstamp 4a33a8dc-2861-4a2b-b6ff-b407865ffd69)) (segment (start 28.3 53.4) (end 27 53.4) (width 0.7) (layer "B.Cu") (net 12) (tstamp 4d72de37-f7f9-46b9-8865-4bd52b7f0f79)) (segment (start 24.9875 32) (end 25.95 32) (width 0.7) (layer "B.Cu") (net 12) (tstamp 8c1ee1b0-7349-4d5d-bad8-752c843740ad)) + (segment (start 27.525 36.0875) (end 27.525 35.575) (width 0.25) (layer "B.Cu") (net 12) (tstamp 92010a4c-e587-4440-a26b-3dc2cc787c62)) (segment (start 22.8875 34.1) (end 24.9875 32) (width 0.7) (layer "B.Cu") (net 12) (tstamp a24f96d8-b62c-425c-9469-a00337655682)) + (segment (start 27.525 35.575) (end 28.3 34.8) (width 0.25) (layer "B.Cu") (net 12) (tstamp d2e98346-0528-4336-8c94-c0d3b855fe73)) + (segment (start 28.3 34.8) (end 28.3 30.6125) (width 0.25) (layer "B.Cu") (net 12) (tstamp eb982a1f-f00b-4425-9baa-2d086403426a)) (segment (start 22.8875 34.1) (end 22.325 34.6625) (width 0.25) (layer "B.Cu") (net 12) (tstamp f951e976-e8e9-4617-9569-e17501c82153)) (segment (start 24.3 29.9) (end 23.2 29.9) (width 0.25) (layer "F.Cu") (net 13) (tstamp 08d7911c-1c3a-4944-a48e-8feffb9ab3be)) (segment (start 30.35 23.85) (end 24.3 29.9) (width 0.25) (layer "F.Cu") (net 13) (tstamp e6622d3c-cd73-4b35-9f3f-433218fc544d)) @@ -3192,9 +3198,6 @@ (segment (start 25.575 38.025) (end 24.25 39.35) (width 0.25) (layer "B.Cu") (net 39) (tstamp 264bbce5-a403-44ff-a0c3-5bee994a0573)) (segment (start 25.575 36.0875) (end 25.575 38.025) (width 0.25) (layer "B.Cu") (net 39) (tstamp 566e1455-a1bd-4b54-bd7c-c37c18066a84)) (segment (start 24.25 39.35) (end 20.3 39.35) (width 0.25) (layer "B.Cu") (net 39) (tstamp a84f6dc2-cc01-4b5b-ae82-335d8c8c63dc)) - (segment (start 27.525 36.0875) (end 27.525 35.575) (width 0.25) (layer "B.Cu") (net 48) (tstamp 92010a4c-e587-4440-a26b-3dc2cc787c62)) - (segment (start 27.525 35.575) (end 28.3 34.8) (width 0.25) (layer "B.Cu") (net 48) (tstamp d2e98346-0528-4336-8c94-c0d3b855fe73)) - (segment (start 28.3 34.8) (end 28.3 30.6125) (width 0.25) (layer "B.Cu") (net 48) (tstamp eb982a1f-f00b-4425-9baa-2d086403426a)) (zone (net 6) (net_name "+5V") (layer "F.Cu") (tstamp edd6b12b-f2d7-40a4-b1bb-9f5a5af995c9) (hatch edge 0.508) (connect_pads (clearance 0.508)) @@ -5641,7 +5644,7 @@ (xy 20.919468 36.28407) (xy 20.919468 36.284069) (xy 20.918474 36.276203) - (xy 20.915555 36.26883) + (xy 20.912806 36.261887) (xy 20.902196 36.235088) (xy 20.898351 36.223858) (xy 20.888229 36.189017) @@ -6054,13 +6057,26 @@ (xy 31.735805 34.695577) (xy 31.7358 34.69558) (xy 31.730818 34.697903) + (xy 31.628608 34.769472) + (xy 31.583427 34.801108) (xy 31.548283 34.825716) (xy 31.464404 34.909595) (xy 31.402092 34.943621) (xy 31.375309 34.9465) - (xy 30.162793 34.9465) - (xy 30.094672 34.926498) - (xy 30.073698 34.909595) + (xy 30.29071 34.9465) + (xy 30.222589 34.926498) + (xy 30.193071 34.90014) + (xy 30.108415 34.79634) + (xy 30.054603 34.751823) + (xy 29.968329 34.68045) + (xy 29.968324 34.680447) + (xy 29.96358 34.676522) + (xy 29.958161 34.673592) + (xy 29.958158 34.67359) + (xy 29.829376 34.603959) + (xy 29.798231 34.587119) + (xy 29.75993 34.575263) + (xy 29.708095 34.543993) (xy 26.881609 31.717506) (xy 26.850082 31.66483) (xy 26.842245 31.638874) @@ -6123,10 +6139,22 @@ (xy 25.570269 32.884488) (xy 25.615739 32.899262) (xy 25.665898 32.93) - (xy 29.012862 36.276965) - (xy 29.046888 36.339277) - (xy 29.041823 36.410093) - (xy 29.017406 36.450367) + (xy 28.492 35.756102) + (xy 28.524023 35.810466) + (xy 28.529497 35.829555) + (xy 28.615418 35.99674) + (xy 28.619241 36.001564) + (xy 28.619244 36.001568) + (xy 28.695064 36.097228) + (xy 28.732177 36.144052) + (xy 28.736871 36.148047) + (xy 28.853386 36.247209) + (xy 28.875324 36.26588) + (xy 28.942569 36.303462) + (xy 28.992273 36.354155) + (xy 29.006681 36.423674) + (xy 28.981217 36.489947) + (xy 28.974743 36.497749) (xy 28.96096 36.513056) (xy 28.865473 36.678444) (xy 28.806458 36.860072) @@ -6759,7 +6787,7 @@ (xy 33.29657 34.926498) (xy 33.275596 34.909595) (xy 33.191717 34.825716) - (xy 33.142307 34.791118) + (xy 33.156574 34.801108) (xy 33.049773 34.726325) (xy 33.009183 34.697903) (xy 33.004201 34.69558) @@ -9326,7 +9354,7 @@ (xy 8.131738 35.98039) (xy 8.131048 35.986951) (xy 8.131048 35.986953) - (xy 8.11345 36.154392) + (xy 8.114117 36.148047) (xy 8.111776 36.170318) (xy 8.112466 36.176883) (xy 8.129929 36.34303) @@ -9378,6 +9406,9 @@ (xy 14.03646 35.460253) (xy 13.940973 35.625641) (xy 13.881958 35.807269) + (xy 13.881268 35.81383) + (xy 13.881268 35.813832) + (xy 13.87904 35.835035) (xy 13.861996 35.997197) (xy 13.862686 36.003762) (xy 13.880882 36.176883) @@ -9603,7 +9634,7 @@ (xy 4.547149 36.701577) (xy 4.313683 36.533814) (xy 4.291843 36.52225) - (xy 4.240548 36.495091) + (xy 4.230833 36.489947) (xy 4.059608 36.399288) (xy 3.863446 36.327503) (xy 3.793658 36.301964) @@ -9622,7 +9653,7 @@ (xy 2.913175 36.236127) (xy 2.90898 36.236996) (xy 2.908978 36.236996) - (xy 2.772417 36.265276) + (xy 2.788784 36.261887) (xy 2.631658 36.294426) (xy 2.360657 36.390393) (xy 2.356848 36.392359) @@ -11715,7 +11746,7 @@ (xy 2.913175 36.236127) (xy 2.90898 36.236996) (xy 2.908978 36.236996) - (xy 2.784554 36.262763) + (xy 2.772417 36.265276) (xy 2.631658 36.294426) (xy 2.360657 36.390393) (xy 2.105188 36.52225) @@ -11723,8 +11754,8 @@ (xy 2.101683 36.524713) (xy 2.051804 36.559769) (xy 1.869977 36.687559) - (xy 1.827127 36.727378) - (xy 1.677269 36.866635) + (xy 1.83399 36.721) + (xy 1.684225 36.860171) (xy 1.659378 36.88326) (xy 1.477287 37.105732) (xy 1.327073 37.350858) @@ -11871,7 +11902,7 @@ (xy 7.543542 37.310072) (xy 7.484527 37.128444) (xy 7.479903 37.120434) - (xy 7.428773 37.031875) + (xy 7.439237 37.05) (xy 7.38904 36.963056) (xy 7.367339 36.938954) (xy 7.265675 36.826045) @@ -11954,7 +11985,7 @@ (xy 8.131738 35.98039) (xy 8.131048 35.986951) (xy 8.131048 35.986953) - (xy 8.125517 36.039577) + (xy 8.126282 36.032299) (xy 8.111776 36.170318) (xy 8.112466 36.176883) (xy 8.127459 36.31953) @@ -14808,810 +14839,15 @@ (xy 28.131916 37.063944) (xy 28.156524 37.031875) (xy 28.217838 36.88385) - (xy 28.231459 36.780387) - (xy 28.232962 36.768972) - (xy 28.232962 36.768971) - (xy 28.2335 36.764885) - (xy 28.233499 35.814595) - (xy 28.253501 35.746474) - (xy 28.270404 35.7255) - (xy 28.692247 35.303657) - (xy 28.700537 35.296113) - (xy 28.707018 35.292) - (xy 28.753659 35.242332) - (xy 28.756413 35.239491) - (xy 28.776135 35.219769) - (xy 28.778612 35.216576) - (xy 28.786317 35.207555) - (xy 28.796005 35.197238) - (xy 28.816586 35.175321) - (xy 28.820407 35.168371) - (xy 28.826346 35.157568) - (xy 28.837202 35.141041) - (xy 28.844757 35.131302) - (xy 28.844758 35.1313) - (xy 28.849614 35.12504) - (xy 28.867174 35.08446) - (xy 28.872391 35.073812) - (xy 28.889875 35.042009) - (xy 28.889876 35.042007) - (xy 28.893695 35.03506) - (xy 28.898733 35.015437) - (xy 28.905137 34.996734) - (xy 28.910033 34.98542) - (xy 28.910033 34.985419) - (xy 28.913181 34.978145) - (xy 28.91442 34.970322) - (xy 28.914423 34.970312) - (xy 28.920099 34.934476) - (xy 28.922505 34.922856) - (xy 28.931528 34.887711) - (xy 28.931528 34.88771) - (xy 28.9335 34.88003) - (xy 28.9335 34.859776) - (xy 28.935051 34.840065) - (xy 28.93698 34.827886) - (xy 28.93822 34.820057) - (xy 28.934059 34.776038) - (xy 28.9335 34.764181) - (xy 28.9335 31.564964) - (xy 28.953502 31.496843) - (xy 28.993196 31.457821) - (xy 29.004031 31.451116) - (xy 29.036877 31.418213) - (xy 29.121758 31.333184) - (xy 29.121762 31.333179) - (xy 29.126929 31.328003) - (xy 29.163492 31.268687) - (xy 29.214369 31.18615) - (xy 29.21437 31.186148) - (xy 29.218209 31.17992) - (xy 29.272974 31.014809) - (xy 29.2835 30.912072) - (xy 29.2835 30.312928) - (xy 29.28089 30.287773) - (xy 29.273419 30.215765) - (xy 29.273418 30.215761) - (xy 29.272707 30.208907) - (xy 29.263373 30.180928) - (xy 29.219972 30.050841) - (xy 29.217654 30.043893) - (xy 29.126116 29.895969) - (xy 29.018859 29.788899) - (xy 28.98478 29.726618) - (xy 28.989783 29.655798) - (xy 29.018704 29.610709) - (xy 29.121363 29.507871) - (xy 29.130375 29.49646) - (xy 29.213912 29.360937) - (xy 29.220056 29.347759) - (xy 29.270315 29.196234) - (xy 29.273181 29.182868) - (xy 29.282672 29.09023) - (xy 29.283 29.083815) - (xy 29.283 29.059615) - (xy 29.278525 29.044376) - (xy 29.277135 29.043171) - (xy 29.269452 29.0415) - (xy 27.335115 29.0415) - (xy 27.319876 29.045975) - (xy 27.318671 29.047365) - (xy 27.317 29.055048) - (xy 27.317 29.083766) - (xy 27.317337 29.090282) - (xy 27.327075 29.184132) - (xy 27.329968 29.197528) - (xy 27.380488 29.348953) - (xy 27.386653 29.362115) - (xy 27.470426 29.497492) - (xy 27.47946 29.50889) - (xy 27.58114 29.610393) - (xy 27.615219 29.672676) - (xy 27.610216 29.743496) - (xy 27.581296 29.788583) - (xy 27.473071 29.896997) - (xy 27.469231 29.903227) - (xy 27.46923 29.903228) - (xy 27.386364 30.037662) - (xy 27.381791 30.04508) - (xy 27.327026 30.210191) - (xy 27.326326 30.217027) - (xy 27.326325 30.21703) - (xy 27.322062 30.258637) - (xy 27.3165 30.312928) - (xy 27.3165 30.912072) - (xy 27.316837 30.915318) - (xy 27.316837 30.915322) - (xy 27.325937 31.003022) - (xy 27.327293 31.016093) - (xy 27.329474 31.022629) - (xy 27.329474 31.022631) - (xy 27.367529 31.136696) - (xy 27.382346 31.181107) - (xy 27.473884 31.329031) - (xy 27.479066 31.334204) - (xy 27.591816 31.446758) - (xy 27.591821 31.446762) - (xy 27.596997 31.451929) - (xy 27.603227 31.455769) - (xy 27.603228 31.45577) - (xy 27.606614 31.457857) - (xy 27.608441 31.459886) - (xy 27.608973 31.460307) - (xy 27.608901 31.460398) - (xy 27.654108 31.510628) - (xy 27.6665 31.565118) - (xy 27.6665 34.485405) - (xy 27.646498 34.553526) - (xy 27.629595 34.574501) - (xy 27.389423 34.814672) - (xy 27.327111 34.848697) - (xy 27.31678 34.850497) - (xy 27.292111 34.853744) - (xy 27.274337 34.856084) - (xy 27.274335 34.856084) - (xy 27.26615 34.857162) - (xy 27.248219 34.864589) - (xy 27.17763 34.872179) - (xy 27.151782 34.86459) - (xy 27.148339 34.863163) - (xy 27.14148 34.860322) - (xy 27.141477 34.860321) - (xy 27.13385 34.857162) - (xy 27.083232 34.850498) - (xy 27.018972 34.842038) - (xy 27.018971 34.842038) - (xy 27.014885 34.8415) - (xy 26.875017 34.8415) - (xy 26.735116 34.841501) - (xy 26.731031 34.842039) - (xy 26.731027 34.842039) - (xy 26.624337 34.856084) - (xy 26.624335 34.856084) - (xy 26.61615 34.857162) - (xy 26.598219 34.864589) - (xy 26.52763 34.872179) - (xy 26.501782 34.86459) - (xy 26.498339 34.863163) - (xy 26.49148 34.860322) - (xy 26.491477 34.860321) - (xy 26.48385 34.857162) - (xy 26.433232 34.850498) - (xy 26.368972 34.842038) - (xy 26.368971 34.842038) - (xy 26.364885 34.8415) - (xy 26.225017 34.8415) - (xy 26.085116 34.841501) - (xy 26.081031 34.842039) - (xy 26.081027 34.842039) - (xy 25.974337 34.856084) - (xy 25.974335 34.856084) - (xy 25.96615 34.857162) - (xy 25.948219 34.864589) - (xy 25.87763 34.872179) - (xy 25.851782 34.86459) - (xy 25.848339 34.863163) - (xy 25.84148 34.860322) - (xy 25.841477 34.860321) - (xy 25.83385 34.857162) - (xy 25.783232 34.850498) - (xy 25.718972 34.842038) - (xy 25.718971 34.842038) - (xy 25.714885 34.8415) - (xy 25.702494 34.8415) - (xy 25.634373 34.821498) - (xy 25.58788 34.767842) - (xy 25.577776 34.697568) - (xy 25.588299 34.662251) - (xy 25.595056 34.647759) - (xy 25.645315 34.496234) - (xy 25.648181 34.482868) - (xy 25.657672 34.39023) - (xy 25.658 34.383815) - (xy 25.658 34.372115) - (xy 25.653525 34.356876) - (xy 25.652135 34.355671) - (xy 25.644452 34.354) - (xy 24.4845 34.354) - (xy 24.416379 34.333998) - (xy 24.369886 34.280342) - (xy 24.3585 34.228) - (xy 24.3585 33.972) - (xy 24.378502 33.903879) - (xy 24.432158 33.857386) - (xy 24.4845 33.846) - (xy 25.639885 33.846) - (xy 25.655124 33.841525) - (xy 25.656329 33.840135) - (xy 25.658 33.832452) - (xy 25.658 33.816234) - (xy 25.657663 33.809718) - (xy 25.647925 33.715868) - (xy 25.645032 33.702472) - (xy 25.594512 33.551047) - (xy 25.588347 33.537885) - (xy 25.504574 33.402508) - (xy 25.49554 33.39111) - (xy 25.382871 33.278637) - (xy 25.371457 33.269623) - (xy 25.235264 33.185673) - (xy 25.18777 33.132901) - (xy 25.176346 33.06283) - (xy 25.20462 32.997706) - (xy 25.212284 32.989318) - (xy 25.306197 32.895405) - (xy 25.368509 32.861379) - (xy 25.395292 32.8585) - (xy 25.488495 32.8585) - (xy 25.549966 32.874512) - (xy 25.564409 32.882584) - (xy 25.74318 32.94067) - (xy 25.92983 32.962927) - (xy 25.935965 32.962455) - (xy 25.935967 32.962455) - (xy 26.111105 32.948979) - (xy 26.111109 32.948978) - (xy 26.117247 32.948506) - (xy 26.202378 32.924737) - (xy 26.29235 32.899616) - (xy 26.292353 32.899615) - (xy 26.298294 32.897956) - (xy 26.303798 32.895176) - (xy 26.3038 32.895175) - (xy 26.460574 32.815983) - (xy 26.460576 32.815982) - (xy 26.466075 32.813204) - (xy 26.614199 32.697477) - (xy 26.665349 32.638219) - (xy 26.732994 32.559852) - (xy 26.732995 32.55985) - (xy 26.737023 32.555184) - (xy 26.82987 32.391744) - (xy 26.889203 32.213382) - (xy 26.912762 32.026892) - (xy 26.912857 32.020101) - (xy 26.913089 32.003522) - (xy 26.913089 32.003518) - (xy 26.913138 32) - (xy 26.894795 31.812926) - (xy 26.889817 31.796436) - (xy 26.860547 31.699492) - (xy 26.840465 31.632977) - (xy 26.752218 31.467008) - (xy 26.633415 31.32134) - (xy 26.570754 31.269502) - (xy 26.493329 31.20545) - (xy 26.493324 31.205447) - (xy 26.48858 31.201522) - (xy 26.483161 31.198592) - (xy 26.483158 31.19859) - (xy 26.388551 31.147437) - (xy 26.323231 31.112119) - (xy 26.143666 31.056534) - (xy 26.137541 31.05589) - (xy 26.13754 31.05589) - (xy 25.962852 31.037529) - (xy 25.962851 31.037529) - (xy 25.956724 31.036885) - (xy 25.879673 31.043897) - (xy 25.775665 31.053363) - (xy 25.775662 31.053364) - (xy 25.769526 31.053922) - (xy 25.76362 31.05566) - (xy 25.763616 31.055661) - (xy 25.630278 31.094905) - (xy 25.589202 31.106994) - (xy 25.583742 31.109848) - (xy 25.583743 31.109848) - (xy 25.550624 31.127162) - (xy 25.492249 31.1415) - (xy 25.02889 31.1415) - (xy 25.018347 31.141058) - (xy 24.966401 31.136696) - (xy 24.959641 31.137598) - (xy 24.959639 31.137598) - (xy 24.885898 31.147437) - (xy 24.882843 31.147807) - (xy 24.850611 31.151309) - (xy 24.802063 31.156583) - (xy 24.795599 31.158758) - (xy 24.792324 31.159478) - (xy 24.791928 31.159548) - (xy 24.791504 31.159671) - (xy 24.788285 31.160462) - (xy 24.781511 31.161366) - (xy 24.70518 31.189148) - (xy 24.70233 31.190145) - (xy 24.631745 31.2139) - (xy 24.631735 31.213905) - (xy 24.625277 31.216078) - (xy 24.619431 31.21959) - (xy 24.616398 31.220992) - (xy 24.616014 31.22115) - (xy 24.615624 31.221363) - (xy 24.612645 31.222828) - (xy 24.606232 31.225163) - (xy 24.600474 31.228817) - (xy 24.600468 31.22882) - (xy 24.537647 31.268687) - (xy 24.535029 31.270304) - (xy 24.471242 31.308631) - (xy 24.47124 31.308633) - (xy 24.465391 31.312147) - (xy 24.460432 31.316837) - (xy 24.45778 31.31885) - (xy 24.457055 31.319354) - (xy 24.453115 31.322334) - (xy 24.448741 31.325109) - (xy 24.444468 31.32893) - (xy 24.39049 31.382908) - (xy 24.387968 31.385362) - (xy 24.329864 31.440308) - (xy 24.326026 31.445956) - (xy 24.321607 31.451148) - (xy 24.321207 31.450808) - (xy 24.314598 31.4588) - (xy 22.693802 33.079595) - (xy 22.63149 33.113621) - (xy 22.604707 33.1165) - (xy 22.537928 33.1165) - (xy 22.534684 33.116837) - (xy 22.534676 33.116837) - (xy 22.447503 33.125882) - (xy 22.377682 33.113017) - (xy 22.3259 33.064446) - (xy 22.3085 33.000555) - (xy 22.3085 31.739594) - (xy 22.328502 31.671473) - (xy 22.345405 31.650499) - (xy 23.150499 30.845405) - (xy 23.212811 30.811379) - (xy 23.239594 30.8085) - (xy 23.295487 30.8085) - (xy 23.301939 30.807128) - (xy 23.301944 30.807128) - (xy 23.388888 30.788647) - (xy 23.482288 30.768794) - (xy 23.488319 30.766109) - (xy 23.650722 30.693803) - (xy 23.650724 30.693802) - (xy 23.656752 30.691118) - (xy 23.811253 30.578866) - (xy 23.815675 30.573955) - (xy 23.934621 30.441852) - (xy 23.934622 30.441851) - (xy 23.93904 30.436944) - (xy 24.026798 30.284943) - (xy 24.031223 30.277279) - (xy 24.031224 30.277278) - (xy 24.034527 30.271556) - (xy 24.093542 30.089928) - (xy 24.096373 30.062999) - (xy 24.112814 29.906565) - (xy 24.113504 29.9) - (xy 24.106028 29.828866) - (xy 24.094232 29.716635) - (xy 24.094232 29.716633) - (xy 24.093542 29.710072) - (xy 24.034527 29.528444) - (xy 24.023238 29.50889) - (xy 23.985741 29.443944) - (xy 23.93904 29.363056) - (xy 23.918216 29.339928) - (xy 23.815675 29.226045) - (xy 23.815674 29.226044) - (xy 23.811253 29.221134) - (xy 23.733006 29.164284) - (xy 23.706364 29.144927) - (xy 23.66301 29.088704) - (xy 23.655115 29.029821) - (xy 23.662814 28.956565) - (xy 23.663504 28.95) - (xy 23.655895 28.877604) - (xy 23.644232 28.766635) - (xy 23.644232 28.766633) - (xy 23.643542 28.760072) - (xy 23.584527 28.578444) - (xy 23.54812 28.515385) - (xy 27.317 28.515385) - (xy 27.321475 28.530624) - (xy 27.322865 28.531829) - (xy 27.330548 28.5335) - (xy 28.027885 28.5335) - (xy 28.043124 28.529025) - (xy 28.044329 28.527635) - (xy 28.046 28.519952) - (xy 28.046 28.515385) - (xy 28.554 28.515385) - (xy 28.558475 28.530624) - (xy 28.559865 28.531829) - (xy 28.567548 28.5335) - (xy 29.264885 28.5335) - (xy 29.280124 28.529025) - (xy 29.281329 28.527635) - (xy 29.283 28.519952) - (xy 29.283 28.491234) - (xy 29.282663 28.484718) - (xy 29.272925 28.390868) - (xy 29.270032 28.377472) - (xy 29.219512 28.226047) - (xy 29.213347 28.212885) - (xy 29.129574 28.077508) - (xy 29.12054 28.06611) - (xy 29.007871 27.953637) - (xy 28.99646 27.944625) - (xy 28.860937 27.861088) - (xy 28.847759 27.854944) - (xy 28.696234 27.804685) - (xy 28.682868 27.801819) - (xy 28.59023 27.792328) - (xy 28.583815 27.792) - (xy 28.572115 27.792) - (xy 28.556876 27.796475) - (xy 28.555671 27.797865) - (xy 28.554 27.805548) - (xy 28.554 28.515385) - (xy 28.046 28.515385) - (xy 28.046 27.810115) - (xy 28.041525 27.794876) - (xy 28.040135 27.793671) - (xy 28.032452 27.792) - (xy 28.016234 27.792) - (xy 28.009718 27.792337) - (xy 27.915868 27.802075) - (xy 27.902472 27.804968) - (xy 27.751047 27.855488) - (xy 27.737885 27.861653) - (xy 27.602508 27.945426) - (xy 27.59111 27.95446) - (xy 27.478637 28.067129) - (xy 27.469625 28.07854) - (xy 27.386088 28.214063) - (xy 27.379944 28.227241) - (xy 27.329685 28.378766) - (xy 27.326819 28.392132) - (xy 27.317328 28.48477) - (xy 27.317 28.491185) - (xy 27.317 28.515385) - (xy 23.54812 28.515385) - (xy 23.48904 28.413056) - (xy 23.478641 28.401506) - (xy 23.365675 28.276045) - (xy 23.365674 28.276044) - (xy 23.361253 28.271134) - (xy 23.206752 28.158882) - (xy 23.208048 28.157099) - (xy 23.166116 28.113111) - (xy 23.153468 28.04574) - (xy 23.153131 28.04574) - (xy 23.153131 28.043946) - (xy 23.152807 28.04222) - (xy 23.153131 28.039137) - (xy 23.153131 28.039135) - (xy 23.153821 28.03257) - (xy 23.147086 27.968494) - (xy 23.134549 27.849205) - (xy 23.134549 27.849203) - (xy 23.133859 27.842642) - (xy 23.074844 27.661014) - (xy 22.979357 27.495626) - (xy 22.954041 27.467509) - (xy 22.855992 27.358615) - (xy 22.855991 27.358614) - (xy 22.85157 27.353704) - (xy 22.697069 27.241452) - (xy 22.691041 27.238768) - (xy 22.691039 27.238767) - (xy 22.528636 27.166461) - (xy 22.528635 27.166461) - (xy 22.522605 27.163776) - (xy 22.429205 27.143923) - (xy 22.342261 27.125442) - (xy 22.342256 27.125442) - (xy 22.335804 27.12407) - (xy 22.14483 27.12407) - (xy 22.138378 27.125442) - (xy 22.138373 27.125442) - (xy 22.051429 27.143923) - (xy 21.958029 27.163776) - (xy 21.951999 27.166461) - (xy 21.951998 27.166461) - (xy 21.789595 27.238767) - (xy 21.789593 27.238768) - (xy 21.783565 27.241452) - (xy 21.629064 27.353704) - (xy 21.624643 27.358614) - (xy 21.624642 27.358615) - (xy 21.526594 27.467509) - (xy 21.501277 27.495626) - (xy 21.40579 27.661014) - (xy 21.346775 27.842642) - (xy 21.346085 27.849203) - (xy 21.346085 27.849205) - (xy 21.32941 28.007863) - (xy 21.302397 28.07352) - (xy 21.293195 28.083788) - (xy 20.549487 28.827495) - (xy 19.807248 29.569734) - (xy 19.798962 29.577274) - (xy 19.792483 29.581386) - (xy 19.787058 29.587163) - (xy 19.745858 29.631037) - (xy 19.743103 29.633879) - (xy 19.723366 29.653616) - (xy 19.720886 29.656813) - (xy 19.713183 29.665833) - (xy 19.682915 29.698065) - (xy 19.679096 29.705011) - (xy 19.679094 29.705014) - (xy 19.673153 29.71582) - (xy 19.662302 29.732339) - (xy 19.649887 29.748345) - (xy 19.646742 29.755614) - (xy 19.646739 29.755618) - (xy 19.632327 29.788923) - (xy 19.62711 29.799573) - (xy 19.605806 29.838326) - (xy 19.603835 29.846001) - (xy 19.603835 29.846002) - (xy 19.600768 29.857948) - (xy 19.594364 29.876652) - (xy 19.58632 29.895241) - (xy 19.585081 29.903064) - (xy 19.585078 29.903074) - (xy 19.579402 29.93891) - (xy 19.576996 29.95053) - (xy 19.571598 29.971556) - (xy 19.566001 29.993356) - (xy 19.566001 30.01361) - (xy 19.56445 30.03332) - (xy 19.561281 30.053329) - (xy 19.562027 30.061221) - (xy 19.565442 30.097347) - (xy 19.566001 30.109205) - (xy 19.566001 31.960907) - (xy 19.545999 32.029028) - (xy 19.492343 32.075521) - (xy 19.422069 32.085625) - (xy 19.357489 32.056131) - (xy 19.350922 32.050018) - (xy 18.410574 31.109669) - (xy 18.37655 31.047359) - (xy 18.377964 30.987966) - (xy 18.38752 30.952303) - (xy 18.387521 30.952296) - (xy 18.388944 30.946986) - (xy 18.408365 30.725) - (xy 18.388944 30.503014) - (xy 18.342306 30.328961) - (xy 18.332693 30.293083) - (xy 18.332692 30.293081) - (xy 18.33127 30.287773) - (xy 18.3263 30.277114) - (xy 18.239423 30.090805) - (xy 18.23942 30.0908) - (xy 18.237097 30.085818) - (xy 18.137657 29.943803) - (xy 18.112443 29.907794) - (xy 18.112441 29.907791) - (xy 18.109284 29.903283) - (xy 17.951717 29.745716) - (xy 17.946532 29.742085) - (xy 17.816181 29.650812) - (xy 17.769183 29.617903) - (xy 17.764201 29.61558) - (xy 17.764196 29.615577) - (xy 17.664728 29.569195) - (xy 17.611443 29.522278) - (xy 17.591982 29.454001) - (xy 17.612524 29.386041) - (xy 17.664728 29.340805) - (xy 17.764196 29.294423) - (xy 17.764201 29.29442) - (xy 17.769183 29.292097) - (xy 17.917398 29.188315) - (xy 17.947206 29.167443) - (xy 17.947208 29.167441) - (xy 17.951717 29.164284) - (xy 18.109284 29.006717) - (xy 18.116539 28.996357) - (xy 18.196034 28.882826) - (xy 18.237097 28.824182) - (xy 18.23942 28.8192) - (xy 18.239423 28.819195) - (xy 18.328947 28.627209) - (xy 18.328948 28.627208) - (xy 18.33127 28.622227) - (xy 18.333728 28.613056) - (xy 18.355815 28.530624) - (xy 18.388944 28.406986) - (xy 18.408365 28.185) - (xy 18.388944 27.963014) - (xy 18.33127 27.747773) - (xy 18.321175 27.726124) - (xy 18.239423 27.550805) - (xy 18.23942 27.5508) - (xy 18.237097 27.545818) - (xy 18.109284 27.363283) - (xy 17.951717 27.205716) - (xy 17.91105 27.17724) - (xy 17.837075 27.125442) - (xy 17.769183 27.077903) - (xy 17.764201 27.07558) - (xy 17.764196 27.075577) - (xy 17.664728 27.029195) - (xy 17.611443 26.982278) - (xy 17.591982 26.914001) - (xy 17.612524 26.846041) - (xy 17.664728 26.800805) - (xy 17.764196 26.754423) - (xy 17.764201 26.75442) - (xy 17.769183 26.752097) - (xy 17.951717 26.624284) - (xy 18.109284 26.466717) - (xy 18.237097 26.284182) - (xy 18.23942 26.2792) - (xy 18.239423 26.279195) - (xy 18.328947 26.087209) - (xy 18.328948 26.087208) - (xy 18.33127 26.082227) - (xy 18.388944 25.866986) - (xy 18.408365 25.645) - (xy 18.388944 25.423014) - (xy 18.341568 25.246206) - (xy 18.332693 25.213083) - (xy 18.332692 25.213081) - (xy 18.33127 25.207773) - (xy 18.3185 25.180388) - (xy 18.239423 25.010805) - (xy 18.23942 25.0108) - (xy 18.237097 25.005818) - (xy 18.165528 24.903608) - (xy 18.112443 24.827794) - (xy 18.112441 24.827791) - (xy 18.109284 24.823283) - (xy 17.986001 24.7) - (xy 25.936496 24.7) - (xy 25.937186 24.706565) - (xy 25.949928 24.827794) - (xy 25.956458 24.889928) - (xy 26.015473 25.071556) - (xy 26.11096 25.236944) - (xy 26.115378 25.241851) - (xy 26.115379 25.241852) - (xy 26.130788 25.258965) - (xy 26.238747 25.378866) - (xy 26.393248 25.491118) - (xy 26.399276 25.493802) - (xy 26.399278 25.493803) - (xy 26.561681 25.566109) - (xy 26.567712 25.568794) - (xy 26.653101 25.586944) - (xy 26.748056 25.607128) - (xy 26.748061 25.607128) - (xy 26.754513 25.6085) - (xy 26.945487 25.6085) - (xy 26.951939 25.607128) - (xy 26.951944 25.607128) - (xy 27.046899 25.586944) - (xy 27.132288 25.568794) - (xy 27.138319 25.566109) - (xy 27.300722 25.493803) - (xy 27.300724 25.493802) - (xy 27.306752 25.491118) - (xy 27.335157 25.470481) - (xy 27.449526 25.387386) - (xy 27.461253 25.378866) - (xy 27.465668 25.373963) - (xy 27.47058 25.36954) - (xy 27.471705 25.370789) - (xy 27.525014 25.337949) - (xy 27.5582 25.3335) - (xy 30.981382 25.3335) - (xy 31.049503 25.353502) - (xy 31.095996 25.407158) - (xy 31.106903 25.470481) - (xy 31.091635 25.645) - (xy 31.111056 25.866986) - (xy 31.16873 26.082227) - (xy 31.171052 26.087208) - (xy 31.171053 26.087209) - (xy 31.260577 26.279195) - (xy 31.26058 26.2792) - (xy 31.262903 26.284182) - (xy 31.390716 26.466717) - (xy 31.548283 26.624284) - (xy 31.730817 26.752097) - (xy 31.735802 26.754421) - (xy 31.735808 26.754425) - (xy 31.835272 26.800805) - (xy 31.888558 26.847722) - (xy 31.908019 26.915999) - (xy 31.887478 26.983959) - (xy 31.835273 27.029195) - (xy 31.828149 27.032517) - (xy 31.735805 27.075577) - (xy 31.7358 27.07558) - (xy 31.730818 27.077903) - (xy 31.722318 27.083855) - (xy 31.588951 27.17724) - (xy 31.548283 27.205716) - (xy 31.390716 27.363283) - (xy 31.262903 27.545818) - (xy 31.26058 27.5508) - (xy 31.260577 27.550805) - (xy 31.178825 27.726124) - (xy 31.16873 27.747773) - (xy 31.111056 27.963014) - (xy 31.091635 28.185) - (xy 31.111056 28.406986) - (xy 31.112479 28.412296) - (xy 31.11248 28.412303) - (xy 31.122036 28.447966) - (xy 31.120346 28.518942) - (xy 31.089424 28.569671) - (xy 29.857747 29.801348) - (xy 29.849461 29.808888) - (xy 29.842982 29.813) - (xy 29.837557 29.818777) - (xy 29.796357 29.862651) - (xy 29.793602 29.865493) - (xy 29.773865 29.88523) - (xy 29.771385 29.888427) - (xy 29.763682 29.897447) - (xy 29.733414 29.929679) - (xy 29.729595 29.936625) - (xy 29.729593 29.936628) - (xy 29.723652 29.947434) - (xy 29.712801 29.963953) - (xy 29.700386 29.979959) - (xy 29.697241 29.987228) - (xy 29.697238 29.987232) - (xy 29.682826 30.020537) - (xy 29.677609 30.031187) - (xy 29.656305 30.06994) - (xy 29.654334 30.077615) - (xy 29.654334 30.077616) - (xy 29.651267 30.089562) - (xy 29.644863 30.108266) - (xy 29.636819 30.126855) - (xy 29.63558 30.134678) - (xy 29.635577 30.134688) - (xy 29.629901 30.170524) - (xy 29.627495 30.182144) - (xy 29.618472 30.217289) - (xy 29.6165 30.22497) - (xy 29.6165 30.245224) - (xy 29.614949 30.264934) - (xy 29.61178 30.284943) - (xy 29.612526 30.292835) - (xy 29.615941 30.328961) - (xy 29.6165 30.340819) - (xy 29.6165 36.036919) - (xy 29.596498 36.10504) - (xy 29.542842 36.151533) - (xy 29.516697 36.160166) - (xy 29.417712 36.181206) - (xy 29.411682 36.183891) - (xy 29.411681 36.183891) - (xy 29.249278 36.256197) - (xy 29.249276 36.256198) - (xy 29.243248 36.258882) - (xy 29.237907 36.262762) - (xy 29.237906 36.262763) - (xy 29.195522 36.293557) - (xy 29.088747 36.371134) - (xy 29.084326 36.376044) - (xy 29.084325 36.376045) - (xy 29.072695 36.388962) - (xy 28.96096 36.513056) - (xy 28.917858 36.587711) - (xy 28.870165 36.670318) - (xy 28.865473 36.678444) - (xy 28.806458 36.860072) - (xy 28.805768 36.866633) - (xy 28.805768 36.866635) - (xy 28.799889 36.922572) + (xy 28.22056 36.863177) + (xy 28.224855 36.830553) + (xy 28.253578 36.765626) + (xy 28.312844 36.726535) + (xy 28.349777 36.721) + (xy 28.681138 36.721) + (xy 28.749259 36.741002) + (xy 28.795752 36.794658) + (xy 28.806448 36.860169) (xy 28.786496 37.05) (xy 28.787186 37.056565) (xy 28.804035 37.216871) @@ -15697,7 +14933,7 @@ (xy 31.260577 36.439195) (xy 31.26058 36.4392) (xy 31.262903 36.444182) - (xy 31.311129 36.513056) + (xy 31.316032 36.520057) (xy 31.371025 36.598595) (xy 31.390716 36.626717) (xy 31.548283 36.784284) @@ -15805,7 +15041,7 @@ (xy 33.191717 36.784284) (xy 33.349284 36.626717) (xy 33.368976 36.598595) - (xy 33.428871 36.513056) + (xy 33.423968 36.520057) (xy 33.477097 36.444182) (xy 33.47942 36.4392) (xy 33.479423 36.439195) @@ -15813,7 +15049,7 @@ (xy 33.568948 36.247208) (xy 33.57127 36.242227) (xy 33.572905 36.236127) - (xy 33.593258 36.160166) + (xy 33.62752 36.032299) (xy 33.628944 36.026986) (xy 33.648365 35.805) (xy 33.628944 35.583014) @@ -15822,9 +15058,6 @@ (xy 33.479423 35.170805) (xy 33.47942 35.1708) (xy 33.477097 35.165818) - (xy 33.380162 35.027381) - (xy 33.352443 34.987794) - (xy 33.352441 34.987791) (xy 33.349284 34.983283) (xy 33.191717 34.825716) (xy 33.185694 34.821498) @@ -16918,7 +16151,756 @@ (xy 25.955768 24.516635) (xy 25.943036 24.637778) (xy 25.936496 24.7) - (xy 17.986001 24.7) + (xy 25.937186 24.706565) + (xy 25.949928 24.827794) + (xy 25.956458 24.889928) + (xy 26.015473 25.071556) + (xy 26.11096 25.236944) + (xy 26.115378 25.241851) + (xy 26.115379 25.241852) + (xy 26.130788 25.258965) + (xy 26.238747 25.378866) + (xy 26.393248 25.491118) + (xy 26.399276 25.493802) + (xy 26.399278 25.493803) + (xy 26.561681 25.566109) + (xy 26.567712 25.568794) + (xy 26.653101 25.586944) + (xy 26.748056 25.607128) + (xy 26.748061 25.607128) + (xy 26.754513 25.6085) + (xy 26.945487 25.6085) + (xy 26.951939 25.607128) + (xy 26.951944 25.607128) + (xy 27.046899 25.586944) + (xy 27.132288 25.568794) + (xy 27.138319 25.566109) + (xy 27.300722 25.493803) + (xy 27.300724 25.493802) + (xy 27.306752 25.491118) + (xy 27.335157 25.470481) + (xy 27.449526 25.387386) + (xy 27.461253 25.378866) + (xy 27.465668 25.373963) + (xy 27.47058 25.36954) + (xy 27.471705 25.370789) + (xy 27.525014 25.337949) + (xy 27.5582 25.3335) + (xy 30.981382 25.3335) + (xy 31.049503 25.353502) + (xy 31.095996 25.407158) + (xy 31.106903 25.470481) + (xy 31.091635 25.645) + (xy 31.111056 25.866986) + (xy 31.16873 26.082227) + (xy 31.171052 26.087208) + (xy 31.171053 26.087209) + (xy 31.260577 26.279195) + (xy 31.26058 26.2792) + (xy 31.262903 26.284182) + (xy 31.390716 26.466717) + (xy 31.548283 26.624284) + (xy 31.730817 26.752097) + (xy 31.735802 26.754421) + (xy 31.735808 26.754425) + (xy 31.835272 26.800805) + (xy 31.888558 26.847722) + (xy 31.908019 26.915999) + (xy 31.887478 26.983959) + (xy 31.835273 27.029195) + (xy 31.828149 27.032517) + (xy 31.735805 27.075577) + (xy 31.7358 27.07558) + (xy 31.730818 27.077903) + (xy 31.722318 27.083855) + (xy 31.588951 27.17724) + (xy 31.548283 27.205716) + (xy 31.390716 27.363283) + (xy 31.262903 27.545818) + (xy 31.26058 27.5508) + (xy 31.260577 27.550805) + (xy 31.178825 27.726124) + (xy 31.16873 27.747773) + (xy 31.111056 27.963014) + (xy 31.091635 28.185) + (xy 31.111056 28.406986) + (xy 31.112479 28.412296) + (xy 31.11248 28.412303) + (xy 31.122036 28.447966) + (xy 31.120346 28.518942) + (xy 31.089424 28.569671) + (xy 29.857747 29.801348) + (xy 29.849461 29.808888) + (xy 29.842982 29.813) + (xy 29.837557 29.818777) + (xy 29.796357 29.862651) + (xy 29.793602 29.865493) + (xy 29.773865 29.88523) + (xy 29.771385 29.888427) + (xy 29.763682 29.897447) + (xy 29.733414 29.929679) + (xy 29.729595 29.936625) + (xy 29.729593 29.936628) + (xy 29.723652 29.947434) + (xy 29.712801 29.963953) + (xy 29.700386 29.979959) + (xy 29.697241 29.987228) + (xy 29.697238 29.987232) + (xy 29.682826 30.020537) + (xy 29.677609 30.031187) + (xy 29.656305 30.06994) + (xy 29.654334 30.077615) + (xy 29.654334 30.077616) + (xy 29.651267 30.089562) + (xy 29.644863 30.108266) + (xy 29.636819 30.126855) + (xy 29.63558 30.134678) + (xy 29.635577 30.134688) + (xy 29.629901 30.170524) + (xy 29.627495 30.182144) + (xy 29.618472 30.217289) + (xy 29.6165 30.22497) + (xy 29.6165 30.245224) + (xy 29.614949 30.264934) + (xy 29.61178 30.284943) + (xy 29.612526 30.292835) + (xy 29.615941 30.328961) + (xy 29.6165 30.340819) + (xy 29.6165 34.391368) + (xy 29.596498 34.459489) + (xy 29.542842 34.505982) + (xy 29.47733 34.516678) + (xy 29.437854 34.512529) + (xy 29.437851 34.512529) + (xy 29.431724 34.511885) + (xy 29.354673 34.518897) + (xy 29.250665 34.528363) + (xy 29.250662 34.528364) + (xy 29.244526 34.528922) + (xy 29.23862 34.53066) + (xy 29.238616 34.530661) + (xy 29.20061 34.541847) + (xy 29.095074 34.572908) + (xy 29.024079 34.572953) + (xy 28.964328 34.534607) + (xy 28.934794 34.470045) + (xy 28.9335 34.452034) + (xy 28.9335 31.564964) + (xy 28.953502 31.496843) + (xy 28.993196 31.457821) + (xy 29.004031 31.451116) + (xy 29.036877 31.418213) + (xy 29.121758 31.333184) + (xy 29.121762 31.333179) + (xy 29.126929 31.328003) + (xy 29.163492 31.268687) + (xy 29.214369 31.18615) + (xy 29.21437 31.186148) + (xy 29.218209 31.17992) + (xy 29.272974 31.014809) + (xy 29.2835 30.912072) + (xy 29.2835 30.312928) + (xy 29.28089 30.287773) + (xy 29.273419 30.215765) + (xy 29.273418 30.215761) + (xy 29.272707 30.208907) + (xy 29.263373 30.180928) + (xy 29.219972 30.050841) + (xy 29.217654 30.043893) + (xy 29.126116 29.895969) + (xy 29.018859 29.788899) + (xy 28.98478 29.726618) + (xy 28.989783 29.655798) + (xy 29.018704 29.610709) + (xy 29.121363 29.507871) + (xy 29.130375 29.49646) + (xy 29.213912 29.360937) + (xy 29.220056 29.347759) + (xy 29.270315 29.196234) + (xy 29.273181 29.182868) + (xy 29.282672 29.09023) + (xy 29.283 29.083815) + (xy 29.283 29.059615) + (xy 29.278525 29.044376) + (xy 29.277135 29.043171) + (xy 29.269452 29.0415) + (xy 27.335115 29.0415) + (xy 27.319876 29.045975) + (xy 27.318671 29.047365) + (xy 27.317 29.055048) + (xy 27.317 29.083766) + (xy 27.317337 29.090282) + (xy 27.327075 29.184132) + (xy 27.329968 29.197528) + (xy 27.380488 29.348953) + (xy 27.386653 29.362115) + (xy 27.470426 29.497492) + (xy 27.47946 29.50889) + (xy 27.58114 29.610393) + (xy 27.615219 29.672676) + (xy 27.610216 29.743496) + (xy 27.581296 29.788583) + (xy 27.473071 29.896997) + (xy 27.469231 29.903227) + (xy 27.46923 29.903228) + (xy 27.386364 30.037662) + (xy 27.381791 30.04508) + (xy 27.327026 30.210191) + (xy 27.326326 30.217027) + (xy 27.326325 30.21703) + (xy 27.322062 30.258637) + (xy 27.3165 30.312928) + (xy 27.3165 30.912072) + (xy 27.316837 30.915318) + (xy 27.316837 30.915322) + (xy 27.325937 31.003022) + (xy 27.327293 31.016093) + (xy 27.329474 31.022629) + (xy 27.329474 31.022631) + (xy 27.367529 31.136696) + (xy 27.382346 31.181107) + (xy 27.473884 31.329031) + (xy 27.479066 31.334204) + (xy 27.591816 31.446758) + (xy 27.591821 31.446762) + (xy 27.596997 31.451929) + (xy 27.603227 31.455769) + (xy 27.603228 31.45577) + (xy 27.606614 31.457857) + (xy 27.608441 31.459886) + (xy 27.608973 31.460307) + (xy 27.608901 31.460398) + (xy 27.654108 31.510628) + (xy 27.6665 31.565118) + (xy 27.6665 34.485405) + (xy 27.646498 34.553526) + (xy 27.629595 34.574501) + (xy 27.389423 34.814672) + (xy 27.327111 34.848697) + (xy 27.31678 34.850497) + (xy 27.292111 34.853744) + (xy 27.274337 34.856084) + (xy 27.274335 34.856084) + (xy 27.26615 34.857162) + (xy 27.248219 34.864589) + (xy 27.17763 34.872179) + (xy 27.151782 34.86459) + (xy 27.148339 34.863163) + (xy 27.14148 34.860322) + (xy 27.141477 34.860321) + (xy 27.13385 34.857162) + (xy 27.040825 34.844915) + (xy 27.018972 34.842038) + (xy 27.018971 34.842038) + (xy 27.014885 34.8415) + (xy 26.875017 34.8415) + (xy 26.735116 34.841501) + (xy 26.731031 34.842039) + (xy 26.731027 34.842039) + (xy 26.624337 34.856084) + (xy 26.624335 34.856084) + (xy 26.61615 34.857162) + (xy 26.598219 34.864589) + (xy 26.52763 34.872179) + (xy 26.501782 34.86459) + (xy 26.498339 34.863163) + (xy 26.49148 34.860322) + (xy 26.491477 34.860321) + (xy 26.48385 34.857162) + (xy 26.390825 34.844915) + (xy 26.368972 34.842038) + (xy 26.368971 34.842038) + (xy 26.364885 34.8415) + (xy 26.225017 34.8415) + (xy 26.085116 34.841501) + (xy 26.081031 34.842039) + (xy 26.081027 34.842039) + (xy 25.974337 34.856084) + (xy 25.974335 34.856084) + (xy 25.96615 34.857162) + (xy 25.948219 34.864589) + (xy 25.87763 34.872179) + (xy 25.851782 34.86459) + (xy 25.848339 34.863163) + (xy 25.84148 34.860322) + (xy 25.841477 34.860321) + (xy 25.83385 34.857162) + (xy 25.740825 34.844915) + (xy 25.718972 34.842038) + (xy 25.718971 34.842038) + (xy 25.714885 34.8415) + (xy 25.702494 34.8415) + (xy 25.634373 34.821498) + (xy 25.58788 34.767842) + (xy 25.577776 34.697568) + (xy 25.588299 34.662251) + (xy 25.595056 34.647759) + (xy 25.645315 34.496234) + (xy 25.648181 34.482868) + (xy 25.657672 34.39023) + (xy 25.658 34.383815) + (xy 25.658 34.372115) + (xy 25.653525 34.356876) + (xy 25.652135 34.355671) + (xy 25.644452 34.354) + (xy 24.4845 34.354) + (xy 24.416379 34.333998) + (xy 24.369886 34.280342) + (xy 24.3585 34.228) + (xy 24.3585 33.972) + (xy 24.378502 33.903879) + (xy 24.432158 33.857386) + (xy 24.4845 33.846) + (xy 25.639885 33.846) + (xy 25.655124 33.841525) + (xy 25.656329 33.840135) + (xy 25.658 33.832452) + (xy 25.658 33.816234) + (xy 25.657663 33.809718) + (xy 25.647925 33.715868) + (xy 25.645032 33.702472) + (xy 25.594512 33.551047) + (xy 25.588347 33.537885) + (xy 25.504574 33.402508) + (xy 25.49554 33.39111) + (xy 25.382871 33.278637) + (xy 25.371457 33.269623) + (xy 25.235264 33.185673) + (xy 25.18777 33.132901) + (xy 25.176346 33.06283) + (xy 25.20462 32.997706) + (xy 25.212284 32.989318) + (xy 25.306197 32.895405) + (xy 25.368509 32.861379) + (xy 25.395292 32.8585) + (xy 25.488495 32.8585) + (xy 25.549966 32.874512) + (xy 25.564409 32.882584) + (xy 25.74318 32.94067) + (xy 25.92983 32.962927) + (xy 25.935965 32.962455) + (xy 25.935967 32.962455) + (xy 26.111105 32.948979) + (xy 26.111109 32.948978) + (xy 26.117247 32.948506) + (xy 26.202378 32.924737) + (xy 26.29235 32.899616) + (xy 26.292353 32.899615) + (xy 26.298294 32.897956) + (xy 26.303798 32.895176) + (xy 26.3038 32.895175) + (xy 26.460574 32.815983) + (xy 26.460576 32.815982) + (xy 26.466075 32.813204) + (xy 26.614199 32.697477) + (xy 26.665349 32.638219) + (xy 26.732994 32.559852) + (xy 26.732995 32.55985) + (xy 26.737023 32.555184) + (xy 26.82987 32.391744) + (xy 26.889203 32.213382) + (xy 26.912762 32.026892) + (xy 26.912857 32.020101) + (xy 26.913089 32.003522) + (xy 26.913089 32.003518) + (xy 26.913138 32) + (xy 26.894795 31.812926) + (xy 26.889817 31.796436) + (xy 26.860547 31.699492) + (xy 26.840465 31.632977) + (xy 26.752218 31.467008) + (xy 26.633415 31.32134) + (xy 26.570754 31.269502) + (xy 26.493329 31.20545) + (xy 26.493324 31.205447) + (xy 26.48858 31.201522) + (xy 26.483161 31.198592) + (xy 26.483158 31.19859) + (xy 26.388551 31.147437) + (xy 26.323231 31.112119) + (xy 26.143666 31.056534) + (xy 26.137541 31.05589) + (xy 26.13754 31.05589) + (xy 25.962852 31.037529) + (xy 25.962851 31.037529) + (xy 25.956724 31.036885) + (xy 25.879673 31.043897) + (xy 25.775665 31.053363) + (xy 25.775662 31.053364) + (xy 25.769526 31.053922) + (xy 25.76362 31.05566) + (xy 25.763616 31.055661) + (xy 25.630278 31.094905) + (xy 25.589202 31.106994) + (xy 25.583742 31.109848) + (xy 25.583743 31.109848) + (xy 25.550624 31.127162) + (xy 25.492249 31.1415) + (xy 25.02889 31.1415) + (xy 25.018347 31.141058) + (xy 24.966401 31.136696) + (xy 24.959641 31.137598) + (xy 24.959639 31.137598) + (xy 24.885898 31.147437) + (xy 24.882843 31.147807) + (xy 24.850611 31.151309) + (xy 24.802063 31.156583) + (xy 24.795599 31.158758) + (xy 24.792324 31.159478) + (xy 24.791928 31.159548) + (xy 24.791504 31.159671) + (xy 24.788285 31.160462) + (xy 24.781511 31.161366) + (xy 24.70518 31.189148) + (xy 24.70233 31.190145) + (xy 24.631745 31.2139) + (xy 24.631735 31.213905) + (xy 24.625277 31.216078) + (xy 24.619431 31.21959) + (xy 24.616398 31.220992) + (xy 24.616014 31.22115) + (xy 24.615624 31.221363) + (xy 24.612645 31.222828) + (xy 24.606232 31.225163) + (xy 24.600474 31.228817) + (xy 24.600468 31.22882) + (xy 24.537647 31.268687) + (xy 24.535029 31.270304) + (xy 24.471242 31.308631) + (xy 24.47124 31.308633) + (xy 24.465391 31.312147) + (xy 24.460432 31.316837) + (xy 24.45778 31.31885) + (xy 24.457055 31.319354) + (xy 24.453115 31.322334) + (xy 24.448741 31.325109) + (xy 24.444468 31.32893) + (xy 24.39049 31.382908) + (xy 24.387968 31.385362) + (xy 24.329864 31.440308) + (xy 24.326026 31.445956) + (xy 24.321607 31.451148) + (xy 24.321207 31.450808) + (xy 24.314598 31.4588) + (xy 22.693802 33.079595) + (xy 22.63149 33.113621) + (xy 22.604707 33.1165) + (xy 22.537928 33.1165) + (xy 22.534684 33.116837) + (xy 22.534676 33.116837) + (xy 22.447503 33.125882) + (xy 22.377682 33.113017) + (xy 22.3259 33.064446) + (xy 22.3085 33.000555) + (xy 22.3085 31.739594) + (xy 22.328502 31.671473) + (xy 22.345405 31.650499) + (xy 23.150499 30.845405) + (xy 23.212811 30.811379) + (xy 23.239594 30.8085) + (xy 23.295487 30.8085) + (xy 23.301939 30.807128) + (xy 23.301944 30.807128) + (xy 23.388888 30.788647) + (xy 23.482288 30.768794) + (xy 23.488319 30.766109) + (xy 23.650722 30.693803) + (xy 23.650724 30.693802) + (xy 23.656752 30.691118) + (xy 23.811253 30.578866) + (xy 23.815675 30.573955) + (xy 23.934621 30.441852) + (xy 23.934622 30.441851) + (xy 23.93904 30.436944) + (xy 24.026798 30.284943) + (xy 24.031223 30.277279) + (xy 24.031224 30.277278) + (xy 24.034527 30.271556) + (xy 24.093542 30.089928) + (xy 24.096373 30.062999) + (xy 24.112814 29.906565) + (xy 24.113504 29.9) + (xy 24.106028 29.828866) + (xy 24.094232 29.716635) + (xy 24.094232 29.716633) + (xy 24.093542 29.710072) + (xy 24.034527 29.528444) + (xy 24.023238 29.50889) + (xy 23.985741 29.443944) + (xy 23.93904 29.363056) + (xy 23.918216 29.339928) + (xy 23.815675 29.226045) + (xy 23.815674 29.226044) + (xy 23.811253 29.221134) + (xy 23.733006 29.164284) + (xy 23.706364 29.144927) + (xy 23.66301 29.088704) + (xy 23.655115 29.029821) + (xy 23.662814 28.956565) + (xy 23.663504 28.95) + (xy 23.655895 28.877604) + (xy 23.644232 28.766635) + (xy 23.644232 28.766633) + (xy 23.643542 28.760072) + (xy 23.584527 28.578444) + (xy 23.54812 28.515385) + (xy 27.317 28.515385) + (xy 27.321475 28.530624) + (xy 27.322865 28.531829) + (xy 27.330548 28.5335) + (xy 28.027885 28.5335) + (xy 28.043124 28.529025) + (xy 28.044329 28.527635) + (xy 28.046 28.519952) + (xy 28.046 28.515385) + (xy 28.554 28.515385) + (xy 28.558475 28.530624) + (xy 28.559865 28.531829) + (xy 28.567548 28.5335) + (xy 29.264885 28.5335) + (xy 29.280124 28.529025) + (xy 29.281329 28.527635) + (xy 29.283 28.519952) + (xy 29.283 28.491234) + (xy 29.282663 28.484718) + (xy 29.272925 28.390868) + (xy 29.270032 28.377472) + (xy 29.219512 28.226047) + (xy 29.213347 28.212885) + (xy 29.129574 28.077508) + (xy 29.12054 28.06611) + (xy 29.007871 27.953637) + (xy 28.99646 27.944625) + (xy 28.860937 27.861088) + (xy 28.847759 27.854944) + (xy 28.696234 27.804685) + (xy 28.682868 27.801819) + (xy 28.59023 27.792328) + (xy 28.583815 27.792) + (xy 28.572115 27.792) + (xy 28.556876 27.796475) + (xy 28.555671 27.797865) + (xy 28.554 27.805548) + (xy 28.554 28.515385) + (xy 28.046 28.515385) + (xy 28.046 27.810115) + (xy 28.041525 27.794876) + (xy 28.040135 27.793671) + (xy 28.032452 27.792) + (xy 28.016234 27.792) + (xy 28.009718 27.792337) + (xy 27.915868 27.802075) + (xy 27.902472 27.804968) + (xy 27.751047 27.855488) + (xy 27.737885 27.861653) + (xy 27.602508 27.945426) + (xy 27.59111 27.95446) + (xy 27.478637 28.067129) + (xy 27.469625 28.07854) + (xy 27.386088 28.214063) + (xy 27.379944 28.227241) + (xy 27.329685 28.378766) + (xy 27.326819 28.392132) + (xy 27.317328 28.48477) + (xy 27.317 28.491185) + (xy 27.317 28.515385) + (xy 23.54812 28.515385) + (xy 23.48904 28.413056) + (xy 23.478641 28.401506) + (xy 23.365675 28.276045) + (xy 23.365674 28.276044) + (xy 23.361253 28.271134) + (xy 23.206752 28.158882) + (xy 23.208048 28.157099) + (xy 23.166116 28.113111) + (xy 23.153468 28.04574) + (xy 23.153131 28.04574) + (xy 23.153131 28.043946) + (xy 23.152807 28.04222) + (xy 23.153131 28.039137) + (xy 23.153131 28.039135) + (xy 23.153821 28.03257) + (xy 23.147086 27.968494) + (xy 23.134549 27.849205) + (xy 23.134549 27.849203) + (xy 23.133859 27.842642) + (xy 23.074844 27.661014) + (xy 22.979357 27.495626) + (xy 22.954041 27.467509) + (xy 22.855992 27.358615) + (xy 22.855991 27.358614) + (xy 22.85157 27.353704) + (xy 22.697069 27.241452) + (xy 22.691041 27.238768) + (xy 22.691039 27.238767) + (xy 22.528636 27.166461) + (xy 22.528635 27.166461) + (xy 22.522605 27.163776) + (xy 22.429205 27.143923) + (xy 22.342261 27.125442) + (xy 22.342256 27.125442) + (xy 22.335804 27.12407) + (xy 22.14483 27.12407) + (xy 22.138378 27.125442) + (xy 22.138373 27.125442) + (xy 22.051429 27.143923) + (xy 21.958029 27.163776) + (xy 21.951999 27.166461) + (xy 21.951998 27.166461) + (xy 21.789595 27.238767) + (xy 21.789593 27.238768) + (xy 21.783565 27.241452) + (xy 21.629064 27.353704) + (xy 21.624643 27.358614) + (xy 21.624642 27.358615) + (xy 21.526594 27.467509) + (xy 21.501277 27.495626) + (xy 21.40579 27.661014) + (xy 21.346775 27.842642) + (xy 21.346085 27.849203) + (xy 21.346085 27.849205) + (xy 21.32941 28.007863) + (xy 21.302397 28.07352) + (xy 21.293195 28.083788) + (xy 20.549487 28.827495) + (xy 19.807248 29.569734) + (xy 19.798962 29.577274) + (xy 19.792483 29.581386) + (xy 19.787058 29.587163) + (xy 19.745858 29.631037) + (xy 19.743103 29.633879) + (xy 19.723366 29.653616) + (xy 19.720886 29.656813) + (xy 19.713183 29.665833) + (xy 19.682915 29.698065) + (xy 19.679096 29.705011) + (xy 19.679094 29.705014) + (xy 19.673153 29.71582) + (xy 19.662302 29.732339) + (xy 19.649887 29.748345) + (xy 19.646742 29.755614) + (xy 19.646739 29.755618) + (xy 19.632327 29.788923) + (xy 19.62711 29.799573) + (xy 19.605806 29.838326) + (xy 19.603835 29.846001) + (xy 19.603835 29.846002) + (xy 19.600768 29.857948) + (xy 19.594364 29.876652) + (xy 19.58632 29.895241) + (xy 19.585081 29.903064) + (xy 19.585078 29.903074) + (xy 19.579402 29.93891) + (xy 19.576996 29.95053) + (xy 19.571598 29.971556) + (xy 19.566001 29.993356) + (xy 19.566001 30.01361) + (xy 19.56445 30.03332) + (xy 19.561281 30.053329) + (xy 19.562027 30.061221) + (xy 19.565442 30.097347) + (xy 19.566001 30.109205) + (xy 19.566001 31.960907) + (xy 19.545999 32.029028) + (xy 19.492343 32.075521) + (xy 19.422069 32.085625) + (xy 19.357489 32.056131) + (xy 19.350922 32.050018) + (xy 18.410574 31.109669) + (xy 18.37655 31.047359) + (xy 18.377964 30.987966) + (xy 18.38752 30.952303) + (xy 18.387521 30.952296) + (xy 18.388944 30.946986) + (xy 18.408365 30.725) + (xy 18.388944 30.503014) + (xy 18.342306 30.328961) + (xy 18.332693 30.293083) + (xy 18.332692 30.293081) + (xy 18.33127 30.287773) + (xy 18.3263 30.277114) + (xy 18.239423 30.090805) + (xy 18.23942 30.0908) + (xy 18.237097 30.085818) + (xy 18.137657 29.943803) + (xy 18.112443 29.907794) + (xy 18.112441 29.907791) + (xy 18.109284 29.903283) + (xy 17.951717 29.745716) + (xy 17.946532 29.742085) + (xy 17.816181 29.650812) + (xy 17.769183 29.617903) + (xy 17.764201 29.61558) + (xy 17.764196 29.615577) + (xy 17.664728 29.569195) + (xy 17.611443 29.522278) + (xy 17.591982 29.454001) + (xy 17.612524 29.386041) + (xy 17.664728 29.340805) + (xy 17.764196 29.294423) + (xy 17.764201 29.29442) + (xy 17.769183 29.292097) + (xy 17.917398 29.188315) + (xy 17.947206 29.167443) + (xy 17.947208 29.167441) + (xy 17.951717 29.164284) + (xy 18.109284 29.006717) + (xy 18.116539 28.996357) + (xy 18.196034 28.882826) + (xy 18.237097 28.824182) + (xy 18.23942 28.8192) + (xy 18.239423 28.819195) + (xy 18.328947 28.627209) + (xy 18.328948 28.627208) + (xy 18.33127 28.622227) + (xy 18.333728 28.613056) + (xy 18.355815 28.530624) + (xy 18.388944 28.406986) + (xy 18.408365 28.185) + (xy 18.388944 27.963014) + (xy 18.33127 27.747773) + (xy 18.321175 27.726124) + (xy 18.239423 27.550805) + (xy 18.23942 27.5508) + (xy 18.237097 27.545818) + (xy 18.109284 27.363283) + (xy 17.951717 27.205716) + (xy 17.91105 27.17724) + (xy 17.837075 27.125442) + (xy 17.769183 27.077903) + (xy 17.764201 27.07558) + (xy 17.764196 27.075577) + (xy 17.664728 27.029195) + (xy 17.611443 26.982278) + (xy 17.591982 26.914001) + (xy 17.612524 26.846041) + (xy 17.664728 26.800805) + (xy 17.764196 26.754423) + (xy 17.764201 26.75442) + (xy 17.769183 26.752097) + (xy 17.951717 26.624284) + (xy 18.109284 26.466717) + (xy 18.237097 26.284182) + (xy 18.23942 26.2792) + (xy 18.239423 26.279195) + (xy 18.328947 26.087209) + (xy 18.328948 26.087208) + (xy 18.33127 26.082227) + (xy 18.388944 25.866986) + (xy 18.408365 25.645) + (xy 18.388944 25.423014) + (xy 18.341568 25.246206) + (xy 18.332693 25.213083) + (xy 18.332692 25.213081) + (xy 18.33127 25.207773) + (xy 18.3185 25.180388) + (xy 18.239423 25.010805) + (xy 18.23942 25.0108) + (xy 18.237097 25.005818) + (xy 18.165528 24.903608) + (xy 18.112443 24.827794) + (xy 18.112441 24.827791) + (xy 18.109284 24.823283) (xy 17.951717 24.665716) (xy 17.932075 24.651962) (xy 17.86862 24.60753) @@ -17495,7 +17477,7 @@ (xy 12.918372 35.229593) (xy 12.907566 35.223652) (xy 12.891047 35.212801) - (xy 12.889866 35.211885) + (xy 12.890583 35.212441) (xy 12.875041 35.200386) (xy 12.867772 35.197241) (xy 12.867768 35.197238) diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pro b/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pro index d00a04d..42bcc79 100644 --- a/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pro +++ b/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_pro @@ -204,7 +204,7 @@ }, "track_widths": [ 0.0, - 0.0 + 0.25 ], "via_dimensions": [ { diff --git a/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_sch b/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_sch index 0f6cae5..ea2a147 100644 --- a/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_sch +++ b/Penguinator-Glue-Board/Penguinator-Glue-Board.kicad_sch @@ -978,6 +978,9 @@ (junction (at 275.59 120.65) (diameter 0) (color 0 0 0 0) (uuid 185a9317-c8cb-4693-8e1f-ead5b4e7216b) ) + (junction (at 29.21 169.545) (diameter 0) (color 0 0 0 0) + (uuid 2fd3a633-0777-4530-b425-2b71d189eb0a) + ) (junction (at 250.19 128.27) (diameter 0) (color 0 0 0 0) (uuid 604044f1-8632-4473-9660-08a439bd763c) ) @@ -1076,6 +1079,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 16f43cf0-7f7e-43eb-b503-24bee5f9bb1a) ) + (wire (pts (xy 29.21 167.64) (xy 29.21 169.545)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 18f92e67-db13-4783-bd42-cef509162c2f) + ) (wire (pts (xy 66.04 123.825) (xy 66.04 126.365)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1c47d932-2c73-4fea-b574-4958a9fd90ee) @@ -16276,6 +16283,22 @@ (pin "1" (uuid c6dd8506-2192-4694-a415-4eaf8e2d0125)) ) + (symbol (lib_id "power:+3V3") (at 29.21 167.64 0) (unit 1) + (in_bom yes) (on_board yes) (fields_autoplaced) + (uuid cc563164-8616-44a4-9e9b-05eb1d0b75d6) + (property "Reference" "#PWR?" (id 0) (at 29.21 171.45 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+3V3" (id 1) (at 29.21 161.925 0)) + (property "Footprint" "" (id 2) (at 29.21 167.64 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 29.21 167.64 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid facb63d4-85ea-4da2-9531-0f9832ce04be)) + ) + (symbol (lib_id "power:GND") (at 67.31 199.39 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid ccc4caec-4802-4549-9a44-de5311ed47e5) @@ -16450,6 +16473,9 @@ (path "/3f7622c4-9044-4188-a5f3-d3a247821a36" (reference "#PWR0132") (unit 1) (value "+5V") (footprint "") ) + (path "/cc563164-8616-44a4-9e9b-05eb1d0b75d6" + (reference "#PWR?") (unit 1) (value "+3V3") (footprint "") + ) (path "/de3783ee-4845-4770-b1c4-cbeac77bfb1b" (reference "C1") (unit 1) (value "0.1uF") (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder") ) diff --git a/pi-hat/pi-hat-backups/pi-hat-2022-10-16_153556.zip b/pi-hat/pi-hat-backups/pi-hat-2022-10-16_153556.zip new file mode 100644 index 0000000..1937360 Binary files /dev/null and b/pi-hat/pi-hat-backups/pi-hat-2022-10-16_153556.zip differ