From b92d08fe24ef373033763c70389fb79b0ca606c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lao=C2=B7Zhu?= <2208213223@qq.com> Date: Wed, 9 Feb 2022 16:22:42 +0800 Subject: [PATCH] Switched the GPS serial port location over and updated the PCB file. --- circuit/Compass&Storage.kicad_sch | 4 +- circuit/ControlMCU.kicad_sch | 4 +- circuit/Debugger.kicad_sch | 4 +- circuit/IMU.kicad_sch | 4 +- circuit/LCD&GPS.kicad_sch | 4 +- circuit/Power.kicad_sch | 4 +- circuit/ProcessMCU.kicad_sch | 4 +- circuit/project.kicad_pcb | 737 +++++++++++------------------- circuit/project.kicad_sch | 4 +- 9 files changed, 279 insertions(+), 490 deletions(-) diff --git a/circuit/Compass&Storage.kicad_sch b/circuit/Compass&Storage.kicad_sch index 93d9f8d0..4f43b7ce 100644 --- a/circuit/Compass&Storage.kicad_sch +++ b/circuit/Compass&Storage.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/ControlMCU.kicad_sch b/circuit/ControlMCU.kicad_sch index 9b3e0350..0bed5050 100644 --- a/circuit/ControlMCU.kicad_sch +++ b/circuit/ControlMCU.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/Debugger.kicad_sch b/circuit/Debugger.kicad_sch index be2c414c..ea684a88 100644 --- a/circuit/Debugger.kicad_sch +++ b/circuit/Debugger.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/IMU.kicad_sch b/circuit/IMU.kicad_sch index 3e99ed25..43666b3d 100644 --- a/circuit/IMU.kicad_sch +++ b/circuit/IMU.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/LCD&GPS.kicad_sch b/circuit/LCD&GPS.kicad_sch index 2aab2aa3..fc5c6502 100644 --- a/circuit/LCD&GPS.kicad_sch +++ b/circuit/LCD&GPS.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/Power.kicad_sch b/circuit/Power.kicad_sch index ec997f54..d8a2c375 100644 --- a/circuit/Power.kicad_sch +++ b/circuit/Power.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/ProcessMCU.kicad_sch b/circuit/ProcessMCU.kicad_sch index 4c8fde5f..3c6947bd 100644 --- a/circuit/ProcessMCU.kicad_sch +++ b/circuit/ProcessMCU.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols diff --git a/circuit/project.kicad_pcb b/circuit/project.kicad_pcb index 8f4e4b9c..d1cc2294 100644 --- a/circuit/project.kicad_pcb +++ b/circuit/project.kicad_pcb @@ -1665,9 +1665,9 @@ (pad "19" smd roundrect locked (at 6 -1.5 180) (size 1.8 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 41 "unconnected-(U1-Pad19)") (pinfunction "I2C_SCL") (pintype "output+no_connect") (tstamp 4f188258-3fe8-47c3-9fca-7980b9e905b8)) (pad "20" smd roundrect locked (at 6 -2.6 180) (size 1.8 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 42 "/LCD&GPS/GPS_RX") (pinfunction "UOUT0") (pintype "output") (tstamp a5c069d3-8b48-4e4a-a9f5-b8c8c2052191)) + (net 43 "/LCD&GPS/GPS_TX") (pinfunction "UOUT0") (pintype "output") (tstamp a5c069d3-8b48-4e4a-a9f5-b8c8c2052191)) (pad "21" smd roundrect locked (at 6 -3.7 180) (size 1.8 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) - (net 43 "/LCD&GPS/GPS_TX") (pinfunction "UIN0") (pintype "input") (tstamp 7a31b6c4-1c30-4576-83f8-804a625c67fa)) + (net 42 "/LCD&GPS/GPS_RX") (pinfunction "UIN0") (pintype "input") (tstamp 7a31b6c4-1c30-4576-83f8-804a625c67fa)) (pad "22" smd roundrect locked (at 6 -4.8 180) (size 1.8 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (net 1 "+3.3VP") (pinfunction "AVDD_BAK") (pintype "power_in") (tstamp d1f6703a-1312-4dfa-9b04-cb25fb7cfd11)) (pad "23" smd roundrect locked (at 6 -5.9 180) (size 1.8 0.8) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) @@ -6069,40 +6069,6 @@ ) ) - (gr_poly - (pts - (xy 118.5418 76.6826) - (xy 112.6998 76.6826) - (xy 112.6998 77.9526) - (xy 108.8898 77.9526) - (xy 108.8898 72.8726) - (xy 118.5418 72.8726) - ) (layer "B.Mask") (width 0.1) (fill solid) (tstamp 2149c7a5-b4b6-4a47-aeeb-e3fdb854477d)) - (gr_poly - (pts - (xy 188.3918 78.9686) - (xy 185.0898 78.9686) - (xy 185.0898 76.4286) - (xy 181.5338 76.4286) - (xy 181.5338 72.8726) - (xy 188.3918 72.8726) - ) (layer "B.Mask") (width 0.1) (fill solid) (tstamp 4c8271da-5f28-48b1-9ffd-6c5bda1e5306)) - (gr_poly - (pts - (xy 188.3918 122.6566) - (xy 181.7878 122.6566) - (xy 181.7878 119.1006) - (xy 185.0898 119.1006) - (xy 185.0898 117.3226) - (xy 188.3918 117.3226) - ) (layer "B.Mask") (width 0.1) (fill solid) (tstamp 750a7e27-998e-47c3-8cb4-5a140d2d8a89)) - (gr_poly - (pts - (xy 151.8158 122.6566) - (xy 132.0038 122.6566) - (xy 132.0038 118.8466) - (xy 151.8158 118.8466) - ) (layer "B.Mask") (width 0.1) (fill solid) (tstamp dfa005d4-a67b-4beb-a438-476009667a15)) (gr_line (start 196.9078 72.6124) (end 105.9078 72.6124) (layer "Edge.Cuts") (width 0.1) (tstamp 00000000-0000-0000-0000-000061a78d1e)) (gr_line (start 103.9078 74.6124) (end 103.9078 120.6124) (layer "Edge.Cuts") (width 0.1) (tstamp 00000000-0000-0000-0000-000061a78d1f)) (gr_arc (start 103.9078 74.6124) (mid 104.493586 73.198186) (end 105.9078 72.6124) (layer "Edge.Cuts") (width 0.1) (tstamp 00000000-0000-0000-0000-000061a78d68)) @@ -6144,7 +6110,7 @@ (gr_text "LaoZhu" (at 182.6768 106.1466) (layer "B.SilkS") (tstamp 9507a60d-45cc-49a0-b125-afb9d04ddc32) (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror)) ) - (gr_text "Version 1.2.2" (at 193.4972 94.7674 90) (layer "B.SilkS") (tstamp a2d3eb96-58a0-4346-af1e-78bb35a50430) + (gr_text "Version 1.2.3" (at 193.4972 94.7674 90) (layer "B.SilkS") (tstamp a2d3eb96-58a0-4346-af1e-78bb35a50430) (effects (font (size 1.5 1.5) (thickness 0.25)) (justify mirror)) ) (gr_text "MM32 Control Board" (at 196.7738 102.235 90) (layer "B.SilkS") (tstamp ef78c02e-028c-418b-afc1-43ac71d6e7a4) @@ -6159,7 +6125,7 @@ (gr_text "Jesus" (at 163.7538 83.7946) (layer "F.Mask") (tstamp 15d3373b-4f1a-4faf-a914-d0739d254c5d) (effects (font (size 2 2) (thickness 0.4))) ) - (gr_text "2022/01/18" (at 183.8198 75.1586) (layer "F.Mask") (tstamp 9e7bb97f-2368-4a68-99a8-e2cb60e06838) + (gr_text "2022/02/09" (at 183.8198 75.1586) (layer "F.Mask") (tstamp 9e7bb97f-2368-4a68-99a8-e2cb60e06838) (effects (font (size 2 2) (thickness 0.4))) ) (gr_text "Team" (at 166.2938 86.8426) (layer "F.Mask") (tstamp f84f0aad-79f2-4bd7-bb35-f56f8e0ea461) @@ -7249,21 +7215,19 @@ (via (at 118.237 119.2492) (size 0.45) (drill 0.2) (layers "F.Cu" "B.Cu") (net 25) (tstamp bf8972b7-85a4-4570-baca-8e5d3429b6a2)) (segment (start 117.1194 118.1316) (end 118.237 119.2492) (width 0.27) (layer "B.Cu") (net 25) (tstamp 19ae18a6-837b-462c-89fa-84ea718dbb7b)) (segment (start 117.1194 112.95) (end 117.1194 118.1316) (width 0.27) (layer "B.Cu") (net 25) (tstamp 91a9bdf0-eddc-49e7-8709-dec3fdc8d4e9)) - (segment (start 172.402869 89.769) (end 173.7304 89.769) (width 0.27) (layer "F.Cu") (net 42) (tstamp 058f2974-a8da-4750-b8d4-e6c07c627654)) - (segment (start 171.123669 88.4898) (end 172.402869 89.769) (width 0.27) (layer "F.Cu") (net 42) (tstamp 3f87240f-2364-4bde-8631-ccd90d42850e)) - (segment (start 170.8658 88.4898) (end 171.123669 88.4898) (width 0.27) (layer "F.Cu") (net 42) (tstamp dda16b84-a36a-48a3-bdb6-768971b8cb87)) - (via (at 170.8658 88.4898) (size 0.45) (drill 0.2) (layers "F.Cu" "B.Cu") (net 42) (tstamp 58b9ad64-1cde-429c-a5e2-39bfa74b75dd)) + (segment (start 170.8658 89.0994) (end 170.8658 88.4898) (width 0.27) (layer "F.Cu") (net 42) (tstamp 065a4429-f8c5-436e-8eee-9bb327dcc1de)) + (segment (start 172.6354 90.869) (end 170.8658 89.0994) (width 0.27) (layer "F.Cu") (net 42) (tstamp 9a5f6f5a-9d56-4983-83e2-dd223289e3e6)) + (segment (start 172.6354 90.869) (end 173.7304 90.869) (width 0.27) (layer "F.Cu") (net 42) (tstamp c7dc123c-f7de-495f-9f4a-e13097a40082)) + (via (at 170.8658 88.4898) (size 0.45) (drill 0.2) (layers "F.Cu" "B.Cu") (net 42) (tstamp fe008ef6-bd31-4c04-8583-52d97bf719ef)) (segment (start 170.8658 84.3242) (end 171.533266 83.656734) (width 0.27) (layer "B.Cu") (net 42) (tstamp 24d33da0-ca88-4c3a-aea7-cd33d082e6fc)) (segment (start 170.8658 88.4898) (end 170.8658 84.3242) (width 0.27) (layer "B.Cu") (net 42) (tstamp e924abdc-c760-4c62-85af-48d04283f0be)) (segment (start 171.533266 83.656734) (end 172.9939 83.656734) (width 0.27) (layer "B.Cu") (net 42) (tstamp f6bf479f-0da1-43bf-9a64-79db9cb48d0e)) - (segment (start 171.3992 89.5566) (end 171.3992 89.6328) (width 0.27) (layer "F.Cu") (net 43) (tstamp 9b1c203f-9f57-4184-8adc-a2e9241e80aa)) - (segment (start 172.6354 90.869) (end 173.7304 90.869) (width 0.27) (layer "F.Cu") (net 43) (tstamp c7dc123c-f7de-495f-9f4a-e13097a40082)) - (segment (start 171.3992 89.6328) (end 172.6354 90.869) (width 0.27) (layer "F.Cu") (net 43) (tstamp f0c1ab08-39ef-43d1-9c99-b25f24e56ec9)) - (via (at 171.3992 89.5566) (size 0.45) (drill 0.2) (layers "F.Cu" "B.Cu") (net 43) (tstamp 21d3ca8b-3702-4aa4-861d-f750f9555f2a)) - (segment (start 171.425311 84.552089) (end 171.820666 84.156734) (width 0.27) (layer "B.Cu") (net 43) (tstamp 15e29ac9-f47e-45fe-997e-3f9dee62b2ab)) - (segment (start 171.820666 84.156734) (end 172.9939 84.156734) (width 0.27) (layer "B.Cu") (net 43) (tstamp 92478a43-37b9-4fa2-ae46-2180e90111d2)) - (segment (start 171.425311 89.530489) (end 171.425311 84.552089) (width 0.27) (layer "B.Cu") (net 43) (tstamp ac3dfc8a-4e11-4667-b62e-e1db85e22839)) - (segment (start 171.3992 89.5566) (end 171.425311 89.530489) (width 0.27) (layer "B.Cu") (net 43) (tstamp c48ebe88-b6c9-463f-8070-556a966ccfea)) + (segment (start 172.326654 89.769) (end 171.557027 88.999373) (width 0.27) (layer "F.Cu") (net 43) (tstamp 694bc916-de17-4604-b324-8058492839a9)) + (segment (start 173.7304 89.769) (end 172.326654 89.769) (width 0.27) (layer "F.Cu") (net 43) (tstamp e65730f4-c4a4-4ffe-9feb-12fc43dec052)) + (via (at 171.557027 88.999373) (size 0.45) (drill 0.2) (layers "F.Cu" "B.Cu") (net 43) (tstamp 47b39b12-95e3-4d6a-abe6-cf945f95abe3)) + (segment (start 171.557027 84.420373) (end 171.557027 88.999373) (width 0.27) (layer "B.Cu") (net 43) (tstamp 470771f4-703a-4b63-ae1b-31101b135a67)) + (segment (start 171.820666 84.156734) (end 171.557027 84.420373) (width 0.27) (layer "B.Cu") (net 43) (tstamp 6af1585d-d55f-40b9-b88a-455699c2d754)) + (segment (start 172.9939 84.156734) (end 171.820666 84.156734) (width 0.27) (layer "B.Cu") (net 43) (tstamp 9765b86a-9551-414a-a938-7933895550f6)) (segment (start 150.8304 112.2336) (end 150.8304 110.4688) (width 0.27) (layer "F.Cu") (net 44) (tstamp 4264af8b-a641-4e49-a1bf-294d02cb33e3)) (segment (start 150.7236 112.3404) (end 150.8304 112.2336) (width 0.27) (layer "F.Cu") (net 44) (tstamp 9d0d14e8-0e3f-4cbc-8108-874e99e8bc6b)) (via (at 150.7236 112.3404) (size 0.45) (drill 0.2) (layers "F.Cu" "B.Cu") (net 44) (tstamp e4c3aae7-54d4-45b0-a354-4c54d30a1e34)) @@ -16940,6 +16904,8 @@ (xy 143.00952 90.803859) (xy 143.003577 90.810588) (xy 142.942647 90.940363) + (xy 142.935581 90.985744) + (xy 142.928343 91.032237) (xy 142.920591 91.082023) (xy 142.921755 91.090925) (xy 142.921755 91.090928) @@ -17855,6 +17821,8 @@ (xy 186.735887 91.329905) (xy 186.75845 91.307342) (xy 186.816046 91.194304) + (xy 186.818053 91.181636) + (xy 186.823145 91.149481) (xy 186.8309 91.100519) (xy 186.830899 90.637482) (xy 186.824313 90.595898) @@ -17872,7 +17840,7 @@ (xy 186.8245 90.040929) (xy 186.8309 90.000519) (xy 186.830899 89.537482) - (xy 186.821796 89.480001) + (xy 186.822829 89.486526) (xy 186.817598 89.453494) (xy 186.817597 89.453492) (xy 186.816046 89.443696) @@ -17939,7 +17907,7 @@ (xy 184.644754 88.994304) (xy 184.649255 89.003137) (xy 184.649257 89.003142) - (xy 184.653597 89.011659) + (xy 184.652767 89.010031) (xy 184.70235 89.107342) (xy 184.724913 89.129905) (xy 184.758939 89.192217) @@ -17958,7 +17926,7 @@ (xy 184.644754 90.094304) (xy 184.649255 90.103137) (xy 184.649257 90.103142) - (xy 184.652092 90.108706) + (xy 184.649949 90.1045) (xy 184.70235 90.207342) (xy 184.724913 90.229905) (xy 184.758939 90.292217) @@ -17970,8 +17938,11 @@ (xy 184.629901 91.100518) (xy 184.630676 91.105409) (xy 184.630676 91.105412) - (xy 184.642134 91.177758) + (xy 184.642748 91.181636) (xy 184.644754 91.194304) + (xy 184.649255 91.203137) + (xy 184.649257 91.203142) + (xy 184.655439 91.215274) (xy 184.70235 91.307342) (xy 184.724913 91.329905) (xy 184.758939 91.392217) @@ -18047,7 +18018,6 @@ (xy 181.131396 89.550568) (xy 181.131395 89.550565) (xy 181.130123 89.541682) - (xy 181.109142 89.495535) (xy 181.106599 89.489943) (xy 181.0953 89.437792) (xy 181.0953 84.337481) @@ -18492,9 +18462,11 @@ (xy 174.748471 91.318438) (xy 174.751439 91.314353) (xy 174.75845 91.307342) - (xy 174.762953 91.298506) + (xy 174.766914 91.290732) (xy 174.796288 91.233081) (xy 174.816046 91.194304) + (xy 174.818053 91.181636) + (xy 174.823145 91.149481) (xy 174.8309 91.100519) (xy 174.8309 90.928865) (xy 174.850902 90.860744) @@ -18512,8 +18484,6 @@ (xy 175.55376 90.91202) (xy 175.562417 90.90966) (xy 175.684591 90.834645) - (xy 175.719418 90.796169) - (xy 175.774778 90.735007) (xy 175.7808 90.728354) (xy 175.815689 90.656343) (xy 175.839395 90.607414) @@ -18541,7 +18511,7 @@ (xy 175.84331 89.608733) (xy 175.867096 89.467354) (xy 175.867247 89.455) - (xy 175.856863 89.382491) + (xy 175.854316 89.364703) (xy 175.848196 89.321968) (xy 175.848195 89.321965) (xy 175.846923 89.313082) @@ -18620,42 +18590,42 @@ (xy 172.644754 88.994304) (xy 172.649255 89.003137) (xy 172.649257 89.003142) - (xy 172.653597 89.011659) + (xy 172.652767 89.010031) (xy 172.70235 89.107342) (xy 172.724913 89.129905) (xy 172.758939 89.192217) (xy 172.753874 89.263032) (xy 172.724913 89.308095) (xy 172.70235 89.330658) - (xy 172.69219 89.350598) - (xy 172.643444 89.402213) - (xy 172.574529 89.41928) - (xy 172.507327 89.396381) - (xy 172.490828 89.382491) - (xy 171.375162 88.266825) - (xy 171.367735 88.258721) - (xy 171.349737 88.237272) - (xy 171.342651 88.228827) - (xy 171.333106 88.223316) - (xy 171.333102 88.223313) - (xy 171.308863 88.209319) - (xy 171.299592 88.203413) - (xy 171.267645 88.181043) - (xy 171.256997 88.17819) - (xy 171.253423 88.176523) - (xy 171.249732 88.175179) - (xy 171.240187 88.169669) - (xy 171.229334 88.167755) - (xy 171.229333 88.167755) - (xy 171.214058 88.165062) - (xy 171.201765 88.162894) - (xy 171.191034 88.160515) - (xy 171.164013 88.153275) - (xy 171.164012 88.153275) - (xy 171.153361 88.150421) - (xy 171.153109 88.150443) - (xy 171.11631 88.139891) - (xy 171.03596 88.098951) + (xy 172.69785 89.339489) + (xy 172.697849 89.339491) + (xy 172.685003 89.364703) + (xy 172.636254 89.416318) + (xy 172.572736 89.4335) + (xy 172.517812 89.4335) + (xy 172.449691 89.413498) + (xy 172.428717 89.396595) + (xy 172.008564 88.976442) + (xy 171.97321 88.907058) + (xy 171.968297 88.876039) + (xy 171.968297 88.876038) + (xy 171.966746 88.866247) + (xy 171.905555 88.746153) + (xy 171.810247 88.650845) + (xy 171.690153 88.589654) + (xy 171.680364 88.588104) + (xy 171.680362 88.588103) + (xy 171.56682 88.57012) + (xy 171.557027 88.568569) + (xy 171.439597 88.587168) + (xy 171.369186 88.578068) + (xy 171.314872 88.532346) + (xy 171.295437 88.48243) + (xy 171.27707 88.366465) + (xy 171.277069 88.366463) + (xy 171.275519 88.356674) + (xy 171.214328 88.23658) + (xy 171.11902 88.141272) (xy 170.998926 88.080081) (xy 170.989137 88.078531) (xy 170.989135 88.07853) @@ -18672,30 +18642,18 @@ (xy 170.45453 88.366465) (xy 170.436547 88.480007) (xy 170.434996 88.4898) + (xy 170.436547 88.499593) + (xy 170.450566 88.588103) (xy 170.456081 88.622926) - (xy 170.517272 88.74302) - (xy 170.61258 88.838328) - (xy 170.732674 88.899519) - (xy 170.742463 88.901069) - (xy 170.742465 88.90107) - (xy 170.856007 88.919053) - (xy 170.8658 88.920604) - (xy 170.987308 88.901359) - (xy 171.057719 88.910459) - (xy 171.096114 88.936713) - (xy 171.17106 89.011659) - (xy 171.205086 89.073971) - (xy 171.200021 89.144786) - (xy 171.156029 89.202688) - (xy 171.154814 89.203571) - (xy 171.14598 89.208072) - (xy 171.050672 89.30338) - (xy 170.989481 89.423474) - (xy 170.989214 89.425158) - (xy 170.951716 89.480001) - (xy 170.88632 89.507639) - (xy 170.816363 89.495535) - (xy 170.782859 89.471556) + (xy 170.515296 88.739142) + (xy 170.516567 88.741636) + (xy 170.5303 88.798839) + (xy 170.5303 88.914807) + (xy 170.510298 88.982928) + (xy 170.456642 89.029421) + (xy 170.386368 89.039525) + (xy 170.321788 89.010031) + (xy 170.315205 89.003902) (xy 170.212553 88.90125) (xy 170.202699 88.890161) (xy 170.187507 88.870891) @@ -18792,9 +18750,6 @@ (xy 132.677176 88.694631) (xy 132.539329 88.734028) (xy 132.41808 88.81053) - (xy 132.412138 88.817258) - (xy 132.412137 88.817259) - (xy 132.38934 88.843072) (xy 132.323177 88.917988) (xy 132.262247 89.047763) (xy 132.2551 89.093665) @@ -22312,7 +22267,7 @@ (xy 110.693239 91.13443) (xy 110.693236 91.134429) (xy 110.686622 91.132022) - (xy 110.603559 91.121529) + (xy 110.629892 91.124856) (xy 110.551845 91.114996) (xy 110.551842 91.114996) (xy 110.547917 91.1145) @@ -22320,11 +22275,11 @@ (xy 109.768728 91.129454) (xy 109.762075 91.131771) (xy 109.762074 91.131771) - (xy 109.751406 91.135486) + (xy 109.751403 91.135487) (xy 109.599127 91.188515) (xy 109.593153 91.192248) (xy 109.593151 91.192249) - (xy 109.500708 91.250014) + (xy 109.51364 91.241933) (xy 109.446825 91.283684) (xy 109.393023 91.337112) (xy 109.32439 91.405267) @@ -22380,7 +22335,7 @@ (xy 111.120013 88.424729) (xy 111.125007 88.41977) (xy 111.221237 88.268136) - (xy 111.249998 88.187366) + (xy 111.264805 88.145783) (xy 111.279119 88.105586) (xy 111.27912 88.105581) (xy 111.281481 88.098951) @@ -23892,7 +23847,7 @@ (xy 180.31708 89.29853) (xy 180.222177 89.405988) (xy 180.161247 89.535763) - (xy 180.156947 89.563381) + (xy 180.159866 89.544635) (xy 180.141214 89.66443) (xy 180.139191 89.677423) (xy 176.655472 89.677423) @@ -24476,16 +24431,11 @@ (xy 146.601487 84.731646) (xy 146.581376 84.799734) (xy 146.573184 84.85607) - (xy 146.572045 85.572007) - (xy 146.570151 86.762282) - (xy 146.568603 87.735346) - (xy 146.567418 88.47968) - (xy 146.567402 88.489473) - (xy 146.566155 88.489471) - (xy 146.566155 88.48948) + (xy 146.571234 86.080975) + (xy 146.57015 86.762282) (xy 146.567402 88.489482) - (xy 146.565705 89.556282) - (xy 146.563573 90.896305) + (xy 146.567274 88.569802) + (xy 146.563572 90.896305) (xy 146.560986 92.521905) (xy 146.556904 95.087305) (xy 146.556354 95.433318) @@ -28160,7 +28110,7 @@ (xy 109.438059 88.539268) (xy 109.443984 88.543087) (xy 109.443986 88.543088) - (xy 109.583091 88.632735) + (xy 109.485438 88.569802) (xy 109.589017 88.636554) (xy 109.595637 88.638963) (xy 109.59564 88.638965) @@ -28179,7 +28129,7 @@ (xy 110.853165 88.636554) (xy 110.991601 88.550049) (xy 110.997575 88.546316) - (xy 111.064684 88.479674) + (xy 111.061565 88.482771) (xy 111.12001 88.424733) (xy 111.120013 88.424729) (xy 111.125007 88.41977) @@ -35880,7 +35830,7 @@ (xy 180.31708 89.29853) (xy 180.311138 89.305258) (xy 180.311137 89.305259) - (xy 180.304228 89.313082) + (xy 180.307513 89.309363) (xy 180.222177 89.405988) (xy 180.161247 89.535763) (xy 180.152697 89.59068) @@ -35895,9 +35845,9 @@ (xy 175.848195 89.321965) (xy 175.846923 89.313082) (xy 175.842141 89.302563) - (xy 175.827779 89.270977) + (xy 175.815405 89.243761) (xy 175.787584 89.182572) - (xy 175.739999 89.127347) + (xy 175.736002 89.122708) (xy 175.69986 89.080763) (xy 175.699857 89.08076) (xy 175.694 89.073963) @@ -35911,8 +35861,8 @@ (xy 175.03388 89.06993) (xy 174.938977 89.177388) (xy 174.878047 89.307163) - (xy 174.872373 89.343607) - (xy 174.859938 89.423474) + (xy 174.872796 89.34089) + (xy 174.859136 89.428626) (xy 174.855991 89.448823) (xy 174.857155 89.457725) (xy 174.857155 89.457728) @@ -35923,7 +35873,7 @@ (xy 174.93232 89.722203) (xy 174.938097 89.729076) (xy 174.938098 89.729077) - (xy 175.006615 89.810588) + (xy 174.965426 89.761588) (xy 175.02457 89.831948) (xy 175.032047 89.836925) (xy 175.032048 89.836926) @@ -36004,14 +35954,14 @@ (xy 132.240191 89.189423) (xy 132.241355 89.198325) (xy 132.241355 89.198328) - (xy 132.249485 89.260501) + (xy 132.247296 89.243761) (xy 132.25878 89.331579) (xy 132.270148 89.357414) (xy 132.310968 89.450184) (xy 132.31652 89.462803) (xy 132.322297 89.469676) (xy 132.322298 89.469677) - (xy 132.390294 89.550568) + (xy 132.385307 89.544635) (xy 132.40877 89.572548) (xy 132.468441 89.612269) (xy 132.490013 89.626628) @@ -36036,14 +35986,14 @@ (xy 133.560991 89.189423) (xy 133.562155 89.198325) (xy 133.562155 89.198328) - (xy 133.570285 89.260501) + (xy 133.568096 89.243761) (xy 133.57958 89.331579) (xy 133.590948 89.357414) (xy 133.631768 89.450184) (xy 133.63732 89.462803) (xy 133.643097 89.469676) (xy 133.643098 89.469677) - (xy 133.711094 89.550568) + (xy 133.706107 89.544635) (xy 133.72957 89.572548) (xy 133.789241 89.612269) (xy 133.810813 89.626628) @@ -36068,14 +36018,14 @@ (xy 135.110391 89.189423) (xy 135.111555 89.198325) (xy 135.111555 89.198328) - (xy 135.119685 89.260501) + (xy 135.117496 89.243761) (xy 135.12898 89.331579) (xy 135.140348 89.357414) (xy 135.181168 89.450184) (xy 135.18672 89.462803) (xy 135.192497 89.469676) (xy 135.192498 89.469677) - (xy 135.260494 89.550568) + (xy 135.255507 89.544635) (xy 135.27897 89.572548) (xy 135.338641 89.612269) (xy 135.360213 89.626628) @@ -36100,14 +36050,14 @@ (xy 136.659791 89.189423) (xy 136.660955 89.198325) (xy 136.660955 89.198328) - (xy 136.669085 89.260501) + (xy 136.666896 89.243761) (xy 136.67838 89.331579) (xy 136.689748 89.357414) (xy 136.730568 89.450184) (xy 136.73612 89.462803) (xy 136.741897 89.469676) (xy 136.741898 89.469677) - (xy 136.809894 89.550568) + (xy 136.804907 89.544635) (xy 136.82837 89.572548) (xy 136.888041 89.612269) (xy 136.909613 89.626628) @@ -36132,14 +36082,14 @@ (xy 138.336191 89.189423) (xy 138.337355 89.198325) (xy 138.337355 89.198328) - (xy 138.345485 89.260501) + (xy 138.343296 89.243761) (xy 138.35478 89.331579) (xy 138.366148 89.357414) (xy 138.406968 89.450184) (xy 138.41252 89.462803) (xy 138.418297 89.469676) (xy 138.418298 89.469677) - (xy 138.486294 89.550568) + (xy 138.481307 89.544635) (xy 138.50477 89.572548) (xy 138.564441 89.612269) (xy 138.586013 89.626628) @@ -36164,14 +36114,14 @@ (xy 139.936391 89.189423) (xy 139.937555 89.198325) (xy 139.937555 89.198328) - (xy 139.945685 89.260501) + (xy 139.943496 89.243761) (xy 139.95498 89.331579) (xy 139.966348 89.357414) (xy 140.007168 89.450184) (xy 140.01272 89.462803) (xy 140.018497 89.469676) (xy 140.018498 89.469677) - (xy 140.086494 89.550568) + (xy 140.081507 89.544635) (xy 140.10497 89.572548) (xy 140.164641 89.612269) (xy 140.186213 89.626628) @@ -36187,51 +36137,6 @@ (xy 140.642817 89.65966) (xy 140.764991 89.584645) (xy 140.771343 89.577628) - (xy 140.790376 89.5566) - (xy 170.968396 89.5566) - (xy 170.969947 89.566393) - (xy 170.983929 89.654669) - (xy 170.989481 89.689726) - (xy 171.050672 89.80982) - (xy 171.14598 89.905128) - (xy 171.266074 89.966319) - (xy 171.275863 89.967869) - (xy 171.275865 89.96787) - (xy 171.389407 89.985853) - (xy 171.3992 89.987404) - (xy 171.408993 89.985853) - (xy 171.522535 89.96787) - (xy 171.522537 89.967869) - (xy 171.532326 89.966319) - (xy 171.65242 89.905128) - (xy 171.747728 89.80982) - (xy 171.808919 89.689726) - (xy 171.814472 89.654669) - (xy 171.828453 89.566393) - (xy 171.830004 89.5566) - (xy 171.825417 89.527636) - (xy 171.81047 89.433265) - (xy 171.810469 89.433263) - (xy 171.808919 89.423474) - (xy 171.747728 89.30338) - (xy 171.65242 89.208072) - (xy 171.532326 89.146881) - (xy 171.522537 89.145331) - (xy 171.522535 89.14533) - (xy 171.408993 89.127347) - (xy 171.3992 89.125796) - (xy 171.389407 89.127347) - (xy 171.275865 89.14533) - (xy 171.275863 89.145331) - (xy 171.266074 89.146881) - (xy 171.14598 89.208072) - (xy 171.050672 89.30338) - (xy 170.989481 89.423474) - (xy 170.987931 89.433263) - (xy 170.98793 89.433265) - (xy 170.972983 89.527636) - (xy 170.968396 89.5566) - (xy 140.790376 89.5566) (xy 140.855178 89.485007) (xy 140.8612 89.478354) (xy 140.92371 89.349333) @@ -36256,7 +36161,7 @@ (xy 140.11428 88.81053) (xy 140.108338 88.817258) (xy 140.108337 88.817259) - (xy 140.066828 88.864259) + (xy 140.072874 88.857414) (xy 140.019377 88.917988) (xy 139.958447 89.047763) (xy 139.957066 89.056633) @@ -36282,7 +36187,7 @@ (xy 138.51408 88.81053) (xy 138.508138 88.817258) (xy 138.508137 88.817259) - (xy 138.466628 88.864259) + (xy 138.472674 88.857414) (xy 138.419177 88.917988) (xy 138.358247 89.047763) (xy 138.356866 89.056633) @@ -36308,7 +36213,7 @@ (xy 136.83768 88.81053) (xy 136.831738 88.817258) (xy 136.831737 88.817259) - (xy 136.790228 88.864259) + (xy 136.796274 88.857414) (xy 136.742777 88.917988) (xy 136.681847 89.047763) (xy 136.680466 89.056633) @@ -36334,7 +36239,7 @@ (xy 135.28828 88.81053) (xy 135.282338 88.817258) (xy 135.282337 88.817259) - (xy 135.240828 88.864259) + (xy 135.246874 88.857414) (xy 135.193377 88.917988) (xy 135.132447 89.047763) (xy 135.131066 89.056633) @@ -36360,7 +36265,7 @@ (xy 133.73888 88.81053) (xy 133.732938 88.817258) (xy 133.732937 88.817259) - (xy 133.691428 88.864259) + (xy 133.697474 88.857414) (xy 133.643977 88.917988) (xy 133.583047 89.047763) (xy 133.581666 89.056633) @@ -36386,7 +36291,7 @@ (xy 132.41808 88.81053) (xy 132.412138 88.817258) (xy 132.412137 88.817259) - (xy 132.370628 88.864259) + (xy 132.376674 88.857414) (xy 132.323177 88.917988) (xy 132.262247 89.047763) (xy 132.260866 89.056633) @@ -36427,6 +36332,8 @@ (xy 110.997575 88.546316) (xy 111.054486 88.4898) (xy 170.434996 88.4898) + (xy 170.436547 88.499593) + (xy 170.450566 88.588103) (xy 170.456081 88.622926) (xy 170.517272 88.74302) (xy 170.61258 88.838328) @@ -36435,15 +36342,42 @@ (xy 170.742465 88.90107) (xy 170.856007 88.919053) (xy 170.8658 88.920604) - (xy 170.875593 88.919053) - (xy 170.989135 88.90107) - (xy 170.989137 88.901069) - (xy 170.998926 88.899519) - (xy 171.11902 88.838328) - (xy 171.214328 88.74302) - (xy 171.275519 88.622926) - (xy 171.296604 88.4898) - (xy 171.295053 88.480007) + (xy 170.98323 88.902005) + (xy 171.053641 88.911105) + (xy 171.107955 88.956827) + (xy 171.12739 89.006743) + (xy 171.142189 89.10018) + (xy 171.147308 89.132499) + (xy 171.208499 89.252593) + (xy 171.303807 89.347901) + (xy 171.423901 89.409092) + (xy 171.43369 89.410642) + (xy 171.433692 89.410643) + (xy 171.547234 89.428626) + (xy 171.557027 89.430177) + (xy 171.56682 89.428626) + (xy 171.680362 89.410643) + (xy 171.680364 89.410642) + (xy 171.690153 89.409092) + (xy 171.810247 89.347901) + (xy 171.905555 89.252593) + (xy 171.966746 89.132499) + (xy 171.987831 88.999373) + (xy 171.981196 88.95748) + (xy 171.968297 88.876038) + (xy 171.968296 88.876036) + (xy 171.966746 88.866247) + (xy 171.905555 88.746153) + (xy 171.810247 88.650845) + (xy 171.690153 88.589654) + (xy 171.680364 88.588104) + (xy 171.680362 88.588103) + (xy 171.56682 88.57012) + (xy 171.557027 88.568569) + (xy 171.439597 88.587168) + (xy 171.369186 88.578068) + (xy 171.314872 88.532346) + (xy 171.295437 88.48243) (xy 171.27707 88.366465) (xy 171.277069 88.366463) (xy 171.275519 88.356674) @@ -43130,7 +43064,7 @@ (xy 121.726 89.690333) (xy 121.725999 89.486068) (xy 121.723647 89.474239) - (xy 121.713549 89.423474) + (xy 121.714574 89.428626) (xy 121.710015 89.405705) (xy 121.703119 89.395385) (xy 121.699405 89.386418) @@ -43147,7 +43081,7 @@ (xy 132.241355 89.198328) (xy 132.248463 89.25268) (xy 132.25878 89.331579) - (xy 132.270148 89.357414) + (xy 132.271537 89.360572) (xy 132.310968 89.450184) (xy 132.31652 89.462803) (xy 132.322297 89.469676) @@ -43182,7 +43116,7 @@ (xy 133.562155 89.198328) (xy 133.569263 89.25268) (xy 133.57958 89.331579) - (xy 133.590948 89.357414) + (xy 133.592337 89.360572) (xy 133.631768 89.450184) (xy 133.63732 89.462803) (xy 133.643097 89.469676) @@ -43217,7 +43151,7 @@ (xy 135.111555 89.198328) (xy 135.118663 89.25268) (xy 135.12898 89.331579) - (xy 135.140348 89.357414) + (xy 135.141737 89.360572) (xy 135.181168 89.450184) (xy 135.18672 89.462803) (xy 135.192497 89.469676) @@ -43252,7 +43186,7 @@ (xy 136.660955 89.198328) (xy 136.668063 89.25268) (xy 136.67838 89.331579) - (xy 136.689748 89.357414) + (xy 136.691137 89.360572) (xy 136.730568 89.450184) (xy 136.73612 89.462803) (xy 136.741897 89.469676) @@ -43287,7 +43221,7 @@ (xy 138.337355 89.198328) (xy 138.344463 89.25268) (xy 138.35478 89.331579) - (xy 138.366148 89.357414) + (xy 138.367537 89.360572) (xy 138.406968 89.450184) (xy 138.41252 89.462803) (xy 138.418297 89.469676) @@ -43322,7 +43256,7 @@ (xy 139.937555 89.198328) (xy 139.944663 89.25268) (xy 139.95498 89.331579) - (xy 139.966348 89.357414) + (xy 139.967737 89.360572) (xy 140.007168 89.450184) (xy 140.01272 89.462803) (xy 140.018497 89.469676) @@ -43372,7 +43306,7 @@ (xy 141.175001 89.690332) (xy 141.176208 89.696399) (xy 141.176208 89.696402) - (xy 141.180923 89.720108) + (xy 141.18121 89.721548) (xy 141.190985 89.770695) (xy 141.197881 89.781015) (xy 141.201595 89.789982) @@ -43422,7 +43356,7 @@ (xy 143.051 89.690333) (xy 143.050999 89.486068) (xy 143.048647 89.474239) - (xy 143.038549 89.423474) + (xy 143.039574 89.428626) (xy 143.035015 89.405705) (xy 143.028119 89.395385) (xy 143.024405 89.386418) @@ -48463,7 +48397,7 @@ (xy 174.276955 86.88528) (xy 174.266854 86.878062) (xy 174.262107 86.874498) - (xy 174.243635 86.859936) + (xy 174.249677 86.864699) (xy 174.225123 86.845342) (xy 174.217147 86.842541) (xy 174.210265 86.837623) @@ -48493,154 +48427,18 @@ (xy 172.213587 86.829113) (xy 172.167458 86.859936) (xy 172.132776 86.88311) - (xy 172.071885 86.974239) - (xy 172.0559 87.054601) - (xy 172.055901 87.258866) - (xy 172.057108 87.264933) - (xy 172.057108 87.264936) - (xy 172.06209 87.289981) - (xy 172.071885 87.339229) - (xy 172.078781 87.349549) - (xy 172.082495 87.358516) - (xy 172.090084 87.429106) - (xy 172.082495 87.454953) - (xy 172.078782 87.463918) - (xy 172.071885 87.474239) - (xy 172.069464 87.486412) - (xy 172.069463 87.486414) - (xy 172.068301 87.492256) - (xy 172.0559 87.554601) - (xy 172.055901 87.758866) - (xy 172.057108 87.764933) - (xy 172.057108 87.764936) - (xy 172.060797 87.783482) - (xy 172.071885 87.839229) - (xy 172.078781 87.849549) - (xy 172.082495 87.858516) - (xy 172.090084 87.929106) - (xy 172.082495 87.954953) - (xy 172.078782 87.963918) - (xy 172.071885 87.974239) - (xy 172.069464 87.986412) - (xy 172.069463 87.986414) - (xy 172.068301 87.992256) - (xy 172.0559 88.054601) - (xy 172.055901 88.258866) - (xy 172.057108 88.264933) - (xy 172.057108 88.264936) - (xy 172.061016 88.284582) - (xy 172.071885 88.339229) - (xy 172.078781 88.349549) - (xy 172.082495 88.358516) - (xy 172.090084 88.429106) - (xy 172.082495 88.454953) - (xy 172.078782 88.463918) - (xy 172.071885 88.474239) - (xy 172.069464 88.486412) - (xy 172.069463 88.486414) - (xy 172.064327 88.512236) - (xy 172.0559 88.554601) - (xy 172.055901 88.758866) - (xy 172.057108 88.764933) - (xy 172.057108 88.764936) - (xy 172.06209 88.789981) - (xy 172.071885 88.839229) - (xy 172.078781 88.849549) - (xy 172.082495 88.858516) - (xy 172.090084 88.929106) - (xy 172.082495 88.954953) - (xy 172.078782 88.963918) - (xy 172.071885 88.974239) - (xy 172.069464 88.986412) - (xy 172.069463 88.986414) - (xy 172.062961 89.019101) - (xy 172.0559 89.054601) - (xy 172.055901 89.258866) - (xy 172.057108 89.264933) - (xy 172.057108 89.264936) - (xy 172.059188 89.275391) - (xy 172.071885 89.339229) - (xy 172.078781 89.349549) - (xy 172.082495 89.358516) - (xy 172.090084 89.429106) - (xy 172.082495 89.454953) - (xy 172.078782 89.463918) - (xy 172.071885 89.474239) - (xy 172.069464 89.486412) - (xy 172.069463 89.486414) - (xy 172.067616 89.495701) - (xy 172.03471 89.558611) - (xy 171.973016 89.593744) - (xy 171.902121 89.589946) - (xy 171.844534 89.548421) - (xy 171.819588 89.490833) - (xy 171.81047 89.433266) - (xy 171.81047 89.433265) - (xy 171.808919 89.423474) - (xy 171.774544 89.356009) - (xy 171.760811 89.298806) - (xy 171.760811 84.743247) - (xy 171.780813 84.675126) - (xy 171.797716 84.654152) - (xy 171.840806 84.611062) - (xy 171.903118 84.577036) - (xy 171.973933 84.582101) - (xy 172.030769 84.624648) - (xy 172.05558 84.691168) - (xy 172.055901 84.700149) - (xy 172.055901 84.758866) - (xy 172.057108 84.764933) - (xy 172.057108 84.764936) - (xy 172.058597 84.772422) - (xy 172.071885 84.839229) - (xy 172.078781 84.849549) - (xy 172.082495 84.858516) - (xy 172.090084 84.929106) - (xy 172.082495 84.954953) - (xy 172.078782 84.963918) - (xy 172.071885 84.974239) - (xy 172.069464 84.986412) - (xy 172.069463 84.986414) - (xy 172.05801 85.043995) - (xy 172.0559 85.054601) - (xy 172.055901 85.258866) - (xy 172.057108 85.264933) - (xy 172.057108 85.264936) - (xy 172.06209 85.289981) - (xy 172.071885 85.339229) - (xy 172.078781 85.349549) - (xy 172.082495 85.358516) - (xy 172.090084 85.429106) - (xy 172.082495 85.454953) - (xy 172.078782 85.463918) - (xy 172.071885 85.474239) - (xy 172.069464 85.486412) - (xy 172.069463 85.486414) - (xy 172.068301 85.492256) - (xy 172.0559 85.554601) - (xy 172.055901 85.758866) - (xy 172.057108 85.764933) - (xy 172.057108 85.764936) - (xy 172.06184 85.788726) - (xy 172.071885 85.839229) - (xy 172.078781 85.849549) - (xy 172.082495 85.858516) - (xy 172.090084 85.929106) - (xy 172.082495 85.954953) - (xy 172.078782 85.963918) - (xy 172.071885 85.974239) - (xy 172.069464 85.986412) - (xy 172.069463 85.986414) - (xy 172.057107 86.048532) - (xy 172.0559 86.054601) - (xy 172.055901 86.258866) - (xy 172.057108 86.264933) - (xy 172.057108 86.264936) - (xy 172.069463 86.327054) - (xy 172.071885 86.339229) - (xy 172.078778 86.349546) - (xy 172.078779 86.349547) - (xy 172.115802 86.404955) + (xy 172.123292 86.897304) + (xy 172.068816 86.942831) + (xy 171.998373 86.95168) + (xy 171.934329 86.921039) + (xy 171.897017 86.860638) + (xy 171.892527 86.827302) + (xy 171.892527 86.486166) + (xy 171.912529 86.418045) + (xy 171.966185 86.371552) + (xy 172.036459 86.361448) + (xy 172.101039 86.390942) + (xy 172.123291 86.416162) (xy 172.132776 86.430358) (xy 172.223905 86.491249) (xy 172.304267 86.507234) @@ -48779,7 +48577,7 @@ (xy 189.897477 89.462803) (xy 189.913253 89.363193) (xy 189.914804 89.3534) - (xy 189.911348 89.331579) + (xy 189.910631 89.327054) (xy 189.89527 89.230065) (xy 189.895269 89.230063) (xy 189.893719 89.220274) @@ -49367,7 +49165,7 @@ (xy 170.456081 88.356674) (xy 170.454531 88.366463) (xy 170.45453 88.366465) - (xy 170.444609 88.429106) + (xy 170.444547 88.429495) (xy 170.434996 88.4898) (xy 170.436547 88.499593) (xy 170.44624 88.56079) @@ -49379,49 +49177,41 @@ (xy 170.742465 88.90107) (xy 170.856007 88.919053) (xy 170.8658 88.920604) - (xy 170.875593 88.919053) - (xy 170.875594 88.919053) - (xy 170.944101 88.908203) - (xy 171.014512 88.917303) - (xy 171.068826 88.963025) - (xy 171.089811 89.032652) - (xy 171.089811 89.212051) - (xy 171.069809 89.280172) - (xy 171.063327 89.288215) - (xy 171.063511 89.288348) - (xy 171.057684 89.296368) - (xy 171.050672 89.30338) - (xy 170.989481 89.423474) - (xy 170.987931 89.433263) - (xy 170.98793 89.433265) - (xy 170.978041 89.495701) - (xy 170.968396 89.5566) - (xy 170.969947 89.566393) - (xy 170.986987 89.673977) - (xy 170.989481 89.689726) - (xy 171.050672 89.80982) - (xy 171.14598 89.905128) - (xy 171.266074 89.966319) - (xy 171.275863 89.967869) - (xy 171.275865 89.96787) - (xy 171.389407 89.985853) - (xy 171.3992 89.987404) - (xy 171.408993 89.985853) - (xy 171.522535 89.96787) - (xy 171.522537 89.967869) - (xy 171.532326 89.966319) - (xy 171.65242 89.905128) - (xy 171.747728 89.80982) - (xy 171.793615 89.719762) - (xy 171.804418 89.69856) - (xy 171.804418 89.698559) - (xy 171.808919 89.689726) - (xy 171.810336 89.680779) - (xy 171.850143 89.622565) - (xy 171.915539 89.594929) - (xy 171.985496 89.607036) - (xy 172.037802 89.655043) - (xy 172.055901 89.720107) + (xy 170.883012 88.917878) + (xy 170.98323 88.902005) + (xy 171.053641 88.911105) + (xy 171.107955 88.956827) + (xy 171.12739 89.006743) + (xy 171.145757 89.122708) + (xy 171.147308 89.132499) + (xy 171.208499 89.252593) + (xy 171.303807 89.347901) + (xy 171.423901 89.409092) + (xy 171.43369 89.410642) + (xy 171.433692 89.410643) + (xy 171.547234 89.428626) + (xy 171.557027 89.430177) + (xy 171.56682 89.428626) + (xy 171.680362 89.410643) + (xy 171.680364 89.410642) + (xy 171.690153 89.409092) + (xy 171.810247 89.347901) + (xy 171.866306 89.291842) + (xy 171.928618 89.257816) + (xy 171.999433 89.262881) + (xy 172.056269 89.305428) + (xy 172.069936 89.329427) + (xy 172.071885 89.339229) + (xy 172.078782 89.349551) + (xy 172.082496 89.358518) + (xy 172.090084 89.429108) + (xy 172.082495 89.454953) + (xy 172.078782 89.463918) + (xy 172.071885 89.474239) + (xy 172.069464 89.486412) + (xy 172.069463 89.486414) + (xy 172.063165 89.518078) + (xy 172.0559 89.554601) (xy 172.055901 89.758866) (xy 172.057108 89.764933) (xy 172.057108 89.764936) @@ -49614,8 +49404,8 @@ (xy 174.9111 89.208656) (xy 174.899155 89.262205) (xy 174.878047 89.307163) - (xy 174.872373 89.343607) - (xy 174.859061 89.429106) + (xy 174.872796 89.34089) + (xy 174.859061 89.429108) (xy 174.855991 89.448823) (xy 174.857155 89.457725) (xy 174.857155 89.457728) @@ -51291,7 +51081,7 @@ (xy 150.54502 86.414072) (xy 150.536189 86.409572) (xy 150.536187 86.409571) - (xy 150.464435 86.373012) + (xy 150.46157 86.371552) (xy 150.424926 86.352881) (xy 150.415137 86.351331) (xy 150.415135 86.35133) @@ -51622,7 +51412,7 @@ (xy 141.190985 86.905705) (xy 141.188564 86.917878) (xy 141.188563 86.91788) - (xy 141.181189 86.954952) + (xy 141.18184 86.95168) (xy 141.175 86.986067) (xy 141.175001 87.190332) (xy 141.190985 87.270695) @@ -51862,7 +51652,7 @@ (xy 121.726 88.690333) (xy 121.725999 88.486068) (xy 121.723647 88.474239) - (xy 121.714669 88.429106) + (xy 121.714747 88.429495) (xy 121.710015 88.405705) (xy 121.703119 88.395385) (xy 121.699405 88.386418) @@ -51914,7 +51704,7 @@ (xy 121.726 86.690333) (xy 121.725999 86.486068) (xy 121.723647 86.474239) - (xy 121.714597 86.428742) + (xy 121.712867 86.420043) (xy 121.710015 86.405705) (xy 121.703119 86.395385) (xy 121.699405 86.386418) @@ -51953,7 +51743,7 @@ (xy 121.726 85.190333) (xy 121.725999 84.986068) (xy 121.723647 84.974239) - (xy 121.714669 84.929106) + (xy 121.71482 84.929863) (xy 121.710015 84.905705) (xy 121.703119 84.895385) (xy 121.699405 84.886418) @@ -52071,7 +51861,7 @@ (xy 115.885101 84.872718) (xy 115.885876 84.877611) (xy 115.885876 84.877612) - (xy 115.898125 84.954953) + (xy 115.897668 84.952068) (xy 115.899954 84.966504) (xy 115.904457 84.975341) (xy 115.904457 84.975342) @@ -52230,7 +52020,7 @@ (xy 109.141655 87.909376) (xy 109.142391 87.916379) (xy 109.142391 87.91638) - (xy 109.157569 88.060788) + (xy 109.156919 88.054602) (xy 109.160427 88.087983) (xy 109.162698 88.094654) (xy 109.212625 88.241313) @@ -52478,7 +52268,7 @@ (xy 119.850001 89.190332) (xy 119.851208 89.196399) (xy 119.851208 89.196402) - (xy 119.854321 89.212051) + (xy 119.85446 89.212749) (xy 119.865985 89.270695) (xy 119.872881 89.281015) (xy 119.876595 89.289982) @@ -52531,7 +52321,7 @@ (xy 117.388362 89.539052) (xy 117.328155 89.538684) (xy 117.253976 89.538231) - (xy 117.182668 89.558611) + (xy 117.175051 89.560788) (xy 117.133904 89.572548) (xy 117.116129 89.577628) (xy 117.114424 89.578704) @@ -52778,11 +52568,11 @@ (xy 109.312406 84.410955) (xy 109.317332 84.415986) (xy 109.317335 84.415989) - (xy 109.319185 84.417878) + (xy 109.369525 84.469283) (xy 109.438059 84.539268) (xy 109.443984 84.543087) (xy 109.443986 84.543088) - (xy 109.583091 84.632735) + (xy 109.550197 84.611536) (xy 109.589017 84.636554) (xy 109.595637 84.638963) (xy 109.59564 84.638965) @@ -52796,7 +52586,7 @@ (xy 110.542355 84.7155) (xy 110.675672 84.700546) (xy 110.683047 84.697978) - (xy 110.808898 84.654152) + (xy 110.778419 84.664766) (xy 110.845273 84.641485) (xy 110.853165 84.636554) (xy 110.991601 84.550049) @@ -58340,7 +58130,7 @@ (xy 168.426447 92.380563) (xy 168.404391 92.522223) (xy 146.760986 92.522223) - (xy 146.763573 90.896623) + (xy 146.763572 90.896623) (xy 149.252791 90.896623) (xy 149.253955 90.905525) (xy 149.253955 90.905528) @@ -58507,44 +58297,12 @@ (xy 149.271125 90.778871) (xy 149.258686 90.858763) (xy 149.252791 90.896623) - (xy 146.763573 90.896623) - (xy 146.765705 89.5566) - (xy 170.968396 89.5566) - (xy 170.989481 89.689726) - (xy 171.050672 89.80982) - (xy 171.14598 89.905128) - (xy 171.266074 89.966319) - (xy 171.275863 89.967869) - (xy 171.275865 89.96787) - (xy 171.389407 89.985853) - (xy 171.3992 89.987404) - (xy 171.408993 89.985853) - (xy 171.522535 89.96787) - (xy 171.522537 89.967869) - (xy 171.532326 89.966319) - (xy 171.65242 89.905128) - (xy 171.747728 89.80982) - (xy 171.808919 89.689726) - (xy 171.830004 89.5566) - (xy 171.808919 89.423474) - (xy 171.747728 89.30338) - (xy 171.65242 89.208072) - (xy 171.532326 89.146881) - (xy 171.522537 89.145331) - (xy 171.522535 89.14533) - (xy 171.408993 89.127347) - (xy 171.3992 89.125796) - (xy 171.389407 89.127347) - (xy 171.275865 89.14533) - (xy 171.275863 89.145331) - (xy 171.266074 89.146881) - (xy 171.14598 89.208072) - (xy 171.050672 89.30338) - (xy 170.989481 89.423474) - (xy 170.968396 89.5566) - (xy 146.765705 89.5566) + (xy 146.763572 90.896623) + (xy 146.767274 88.57012) (xy 146.767402 88.4898) (xy 170.434996 88.4898) + (xy 170.436547 88.499593) + (xy 170.450566 88.588103) (xy 170.456081 88.622926) (xy 170.517272 88.74302) (xy 170.61258 88.838328) @@ -58553,14 +58311,46 @@ (xy 170.742465 88.90107) (xy 170.856007 88.919053) (xy 170.8658 88.920604) - (xy 170.875593 88.919053) - (xy 170.989135 88.90107) - (xy 170.989137 88.901069) - (xy 170.998926 88.899519) - (xy 171.11902 88.838328) - (xy 171.214328 88.74302) - (xy 171.275519 88.622926) - (xy 171.296604 88.4898) + (xy 170.98323 88.902005) + (xy 171.053641 88.911105) + (xy 171.107955 88.956827) + (xy 171.12739 89.006743) + (xy 171.145757 89.122708) + (xy 171.147308 89.132499) + (xy 171.208499 89.252593) + (xy 171.303807 89.347901) + (xy 171.423901 89.409092) + (xy 171.43369 89.410642) + (xy 171.433692 89.410643) + (xy 171.547234 89.428626) + (xy 171.557027 89.430177) + (xy 171.56682 89.428626) + (xy 171.680362 89.410643) + (xy 171.680364 89.410642) + (xy 171.690153 89.409092) + (xy 171.810247 89.347901) + (xy 171.905555 89.252593) + (xy 171.966746 89.132499) + (xy 171.987831 88.999373) + (xy 171.98628 88.98958) + (xy 171.968297 88.876038) + (xy 171.968296 88.876036) + (xy 171.966746 88.866247) + (xy 171.905555 88.746153) + (xy 171.810247 88.650845) + (xy 171.690153 88.589654) + (xy 171.680364 88.588104) + (xy 171.680362 88.588103) + (xy 171.56682 88.57012) + (xy 171.557027 88.568569) + (xy 171.547234 88.57012) + (xy 171.497052 88.578068) + (xy 171.439597 88.587168) + (xy 171.369186 88.578068) + (xy 171.314872 88.532346) + (xy 171.295437 88.48243) + (xy 171.27707 88.366465) + (xy 171.277069 88.366463) (xy 171.275519 88.356674) (xy 171.214328 88.23658) (xy 171.11902 88.141272) @@ -58578,8 +58368,7 @@ (xy 170.456081 88.356674) (xy 170.434996 88.4898) (xy 146.767402 88.4898) - (xy 146.767418 88.480007) - (xy 146.770151 86.7626) + (xy 146.77015 86.7626) (xy 149.860996 86.7626) (xy 149.882081 86.895726) (xy 149.943272 87.01582) @@ -58662,7 +58451,7 @@ (xy 149.943272 86.50938) (xy 149.882081 86.629474) (xy 149.860996 86.7626) - (xy 146.770151 86.7626) + (xy 146.77015 86.7626) (xy 146.773184 84.856388) (xy 146.793295 84.7883) (xy 146.849144 84.740952) diff --git a/circuit/project.kicad_sch b/circuit/project.kicad_sch index 15db15df..dcc25105 100644 --- a/circuit/project.kicad_sch +++ b/circuit/project.kicad_sch @@ -6,8 +6,8 @@ (title_block (title "MM32_Board") - (date "2022-01-18") - (rev "1.2.2") + (date "2022-02-09") + (rev "1.2.3") ) (lib_symbols