From d35ddcbaf08fd7fa3407ac4cda72520e1dd7215b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Rydlo?= Date: Sun, 19 Jun 2022 14:22:49 +0200 Subject: [PATCH] COMM: Change connectors header to horizontal. --- modules/Communication/OpenLST.kicad_sch | 4 +- modules/Communication/camera.kicad_sch | 2 +- modules/Communication/comm.kicad_pcb | 2195 ++++++++++++---------- modules/Communication/comm.kicad_prl | 2 +- modules/Communication/comm.kicad_sch | 12 +- modules/Communication/fp-info-cache | 43 +- modules/Communication/mcu_comm.kicad_sch | 6 +- 7 files changed, 1237 insertions(+), 1027 deletions(-) diff --git a/modules/Communication/OpenLST.kicad_sch b/modules/Communication/OpenLST.kicad_sch index 1a09140..bcabf5d 100644 --- a/modules/Communication/OpenLST.kicad_sch +++ b/modules/Communication/OpenLST.kicad_sch @@ -5776,7 +5776,7 @@ (property "Value" "Conn_01x05_MountingPin" (id 1) (at 48.26 151.765 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "TCY_Connector:Amphenol 10114826-10103LF 1x05 Vertical" (id 2) (at 45.72 149.86 0) + (property "Footprint" "TCY_Connector:Amphenol 10114830-10105LF 1x05 Horizontal" (id 2) (at 45.72 149.86 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 45.72 149.86 0) @@ -6261,7 +6261,7 @@ (property "Value" "Conn_01x04_MountingPin" (id 1) (at 74.295 173.99 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "TCY_Connector:Amphenol 10114830-11104LF 1x04 Vertical" (id 2) (at 83.82 179.705 0) + (property "Footprint" "TCY_Connector:Amphenol 10114830-10104LF 1x04 Horizontal" (id 2) (at 83.82 179.705 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 83.82 179.705 0) diff --git a/modules/Communication/camera.kicad_sch b/modules/Communication/camera.kicad_sch index 406376b..f4665da 100644 --- a/modules/Communication/camera.kicad_sch +++ b/modules/Communication/camera.kicad_sch @@ -651,7 +651,7 @@ (property "Value" "Camera" (id 1) (at 261.62 62.23 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "TCY_Connector:Amphenol 10114826-10108LF 1x08 Vertical" (id 2) (at 265.43 49.53 0) + (property "Footprint" "TCY_Connector:Amphenol 10114830-10108LF 1x08 Horizontal" (id 2) (at 265.43 49.53 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 265.43 49.53 0) diff --git a/modules/Communication/comm.kicad_pcb b/modules/Communication/comm.kicad_pcb index 1ae8e0f..3baad6c 100644 --- a/modules/Communication/comm.kicad_pcb +++ b/modules/Communication/comm.kicad_pcb @@ -700,41 +700,41 @@ ) ) - (footprint "Resistor_SMD:R_1206_3216Metric_Pad1.30x1.75mm_HandSolder" (layer "F.Cu") + (footprint "Resistor_SMD:R_1206_3216Metric" (layer "F.Cu") (tedit 5F68FEEE) (tstamp 0b6ba80d-0be7-4c8d-9cdb-308fd0f994d0) (at 147.32 65.659 180) - (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") - (tags "resistor handsolder") + (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") + (tags "resistor") (property "Sheetfile" "mcu_comm.kicad_sch") (property "Sheetname" "MCU") (path "/81a5172c-b171-400d-8856-41d6e486bdd1/67ee59c1-c965-44af-bd13-1b13402d9f28") (attr smd) (fp_text reference "R40" (at 0 -1.82 180) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp db22f328-29cf-4e73-b3b4-2ef0e780d434) + (tstamp 3853bdbc-94f7-4034-a589-571b962ec92a) ) (fp_text value "120R" (at 0 1.82 180) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp d6656e01-02a0-4660-8038-cccfb121218f) + (tstamp 1b0594d2-da38-44e8-87f7-07bd04d51c14) ) (fp_text user "${REFERENCE}" (at 0 0 180) (layer "F.Fab") (effects (font (size 0.8 0.8) (thickness 0.12))) - (tstamp 77670d47-fb36-455c-9b1b-00c5b35467ca) - ) - (fp_line (start -0.727064 0.91) (end 0.727064 0.91) (layer "F.SilkS") (width 0.12) (tstamp 44302eaf-b984-4502-ba75-21b3f0e6263c)) - (fp_line (start -0.727064 -0.91) (end 0.727064 -0.91) (layer "F.SilkS") (width 0.12) (tstamp 5d40c2c0-7497-4c1d-ba80-6796d71cbae6)) - (fp_line (start 2.45 -1.12) (end 2.45 1.12) (layer "F.CrtYd") (width 0.05) (tstamp 793d4d73-593f-4c8f-a1cb-8fe3ed213b9e)) - (fp_line (start -2.45 1.12) (end -2.45 -1.12) (layer "F.CrtYd") (width 0.05) (tstamp 859e73ee-c83a-4297-8402-7e16262cbc2f)) - (fp_line (start 2.45 1.12) (end -2.45 1.12) (layer "F.CrtYd") (width 0.05) (tstamp 8a403371-d27c-487c-a8ab-4a915cb2daf2)) - (fp_line (start -2.45 -1.12) (end 2.45 -1.12) (layer "F.CrtYd") (width 0.05) (tstamp 9aab40fb-73fb-4e30-a3be-aec7f6e9d0d8)) - (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer "F.Fab") (width 0.1) (tstamp 2e3cbfcf-5632-460e-996f-029ad03d0f49)) - (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer "F.Fab") (width 0.1) (tstamp 929b5d2a-1bd9-4da0-8aaf-ce615c641a1c)) - (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer "F.Fab") (width 0.1) (tstamp 9c06a60d-9b36-4530-96e7-d9c3dce1aa95)) - (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer "F.Fab") (width 0.1) (tstamp fa9ac5e5-1d8b-4d3d-9d85-5c4dfaeb7520)) - (pad "1" smd roundrect locked (at -1.55 0 180) (size 1.3 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) - (net 98 "/MCU/RS_485_A") (pintype "passive") (tstamp 97954d2a-3693-4bd4-bb59-c18ad7b5ddb2)) - (pad "2" smd roundrect locked (at 1.55 0 180) (size 1.3 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) - (net 97 "/MCU/RS_485_~{B}") (pintype "passive") (tstamp 789fac09-a8cb-4db4-b8ea-b0441be2cd67)) + (tstamp faef14a2-0b95-4d3c-9e32-c5cac890b867) + ) + (fp_line (start -0.727064 -0.91) (end 0.727064 -0.91) (layer "F.SilkS") (width 0.12) (tstamp 15c377e8-3162-4000-a68d-551f48addac3)) + (fp_line (start -0.727064 0.91) (end 0.727064 0.91) (layer "F.SilkS") (width 0.12) (tstamp f48afd28-b0e8-410e-a920-ca1e6567e6f7)) + (fp_line (start 2.28 1.12) (end -2.28 1.12) (layer "F.CrtYd") (width 0.05) (tstamp 0394ccea-3d3c-42b3-af0c-227be5bcf034)) + (fp_line (start 2.28 -1.12) (end 2.28 1.12) (layer "F.CrtYd") (width 0.05) (tstamp 18e38b34-cc94-436f-8a38-7e021029a572)) + (fp_line (start -2.28 1.12) (end -2.28 -1.12) (layer "F.CrtYd") (width 0.05) (tstamp 4936d87d-0f0d-4bac-bdef-a263dbb09b49)) + (fp_line (start -2.28 -1.12) (end 2.28 -1.12) (layer "F.CrtYd") (width 0.05) (tstamp 9ae2abe8-f4f3-4a65-b5a3-ed95d16eb9ec)) + (fp_line (start -1.6 0.8) (end -1.6 -0.8) (layer "F.Fab") (width 0.1) (tstamp 456805c2-847f-405d-839f-c0039cb5a9d4)) + (fp_line (start -1.6 -0.8) (end 1.6 -0.8) (layer "F.Fab") (width 0.1) (tstamp 700676a9-8941-4242-9b22-1a1a67e5119f)) + (fp_line (start 1.6 -0.8) (end 1.6 0.8) (layer "F.Fab") (width 0.1) (tstamp 712dd24f-9e15-44eb-9217-329a2acb35ef)) + (fp_line (start 1.6 0.8) (end -1.6 0.8) (layer "F.Fab") (width 0.1) (tstamp 731f14a6-b05d-47f7-b239-f0c5d8c5791c)) + (pad "1" smd roundrect locked (at -1.4625 0 180) (size 1.125 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.222222) + (net 98 "/MCU/RS_485_A") (pintype "passive") (tstamp 630a599a-59fe-4cc4-8060-a0f1608d748e)) + (pad "2" smd roundrect locked (at 1.4625 0 180) (size 1.125 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.222222) + (net 97 "/MCU/RS_485_~{B}") (pintype "passive") (tstamp 1291e702-fca5-449c-b8f0-e5b1af09b146)) (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_1206_3216Metric.wrl" (offset (xyz 0 0 0)) (scale (xyz 1 1 1)) @@ -919,43 +919,44 @@ ) ) - (footprint "TCY_Connector:Amphenol 10114830-11104LF 1x04 Vertical" (layer "F.Cu") - (tedit 622E111F) (tstamp 14fb8bc6-1356-4d0d-b91a-1fe9aef43261) + (footprint "TCY_Connector:Amphenol 10114830-10104LF 1x04 Horizontal" (layer "F.Cu") + (tedit 62AF1183) (tstamp 14fb8bc6-1356-4d0d-b91a-1fe9aef43261) (at 88.265 92.6592 -90) (property "Sheetfile" "OpenLST.kicad_sch") (property "Sheetname" "OpenLST (Beacon)") (path "/829b2795-9702-4633-a078-e2998d6d9402/b45d3cf0-73cc-45e6-84c0-33bd31af103b") (attr smd) - (fp_text reference "J4" (at -4.5212 -4.064 unlocked) (layer "F.SilkS") + (fp_text reference "J4" (at -3.5052 -2.794 unlocked) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp ca957eb6-1e3e-4cd5-a555-5d046f8c8ddb) + (tstamp b9daff3e-fb8a-4fdd-999c-dfc98923ebf1) ) (fp_text value "Conn_01x04_MountingPin" (at 0 -7.25 -90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 3d25003f-ae37-4671-a043-6e645445e1e5) + (tstamp c2cedebd-33c7-4889-9977-33f1c49e5e6f) ) (fp_text user "${REFERENCE}" (at 0 9 -90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp f3bf481f-e0af-4dd9-8dfb-81d2944106c5) - ) - (fp_line (start -5.75 -2.5) (end -5.75 0) (layer "F.SilkS") (width 0.12) (tstamp 2a891127-1a26-47ae-813e-2d426bcdba5d)) - (fp_line (start 5.75 1) (end 5.75 -0.5) (layer "F.SilkS") (width 0.12) (tstamp 542caa63-7e7e-4950-bb37-eedf7c4ffae0)) - (fp_line (start 5.75 -2.5) (end 2.5 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 6dc7fba1-3835-4780-95f9-514a460ad0bb)) - (fp_line (start -2.5 -2.5) (end -5.75 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 93e34d46-eb02-484a-9d7d-0d282e60f159)) - (fp_line (start 5.75 -0.5) (end 5.75 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 9b68f0db-4a03-4221-adc1-2670068a903e)) - (fp_line (start -5.75 1) (end -5.75 0) (layer "F.SilkS") (width 0.12) (tstamp c05099ec-0fd4-4ffd-8098-48b52188ec7f)) + (tstamp 406ca1f7-570d-41d2-a9fb-681fc68f82a6) + ) + (fp_line (start -5 2.75) (end 5 2.75) (layer "F.SilkS") (width 0.12) (tstamp 39688f14-86bd-423a-b18e-9696dcd1a60c)) + (fp_line (start 5 -1.5) (end 2.375 -1.5) (layer "F.SilkS") (width 0.12) (tstamp 40dd2dfd-f557-499c-9a6b-d5d179ebf5ea)) + (fp_line (start 5 -0.75) (end 5 -1.5) (layer "F.SilkS") (width 0.12) (tstamp 4252f8ec-ac2f-46c4-8fe7-599d67a2364a)) + (fp_line (start 5 2.75) (end 5 2.5) (layer "F.SilkS") (width 0.12) (tstamp 48486c33-acc9-429c-b2b0-5da85d3f62c6)) + (fp_line (start -2.5 -1.5) (end -5 -1.5) (layer "F.SilkS") (width 0.12) (tstamp 6438d79c-9563-4eeb-b524-732b4537cc3c)) + (fp_line (start -5 -0.75) (end -5 -1.5) (layer "F.SilkS") (width 0.12) (tstamp 96ebedd2-a593-44cf-9e7c-96cec04f0067)) + (fp_line (start -5 2.75) (end -5 2.5) (layer "F.SilkS") (width 0.12) (tstamp acb3f20b-1e4f-49e8-a1e8-45784e27e149)) (pad "1" smd rect (at 1.875 -2 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 58 "/OpenLST (Beacon)/USB_POWER_LST") (pinfunction "Pin_1") (pintype "passive") (tstamp 389a467e-e4c0-4a62-ba89-4f49a3a80ae8)) + (net 58 "/OpenLST (Beacon)/USB_POWER_LST") (pinfunction "Pin_1") (pintype "passive") (tstamp 77ebc2e5-1f0f-4872-92a7-5d8ca6e9d738)) (pad "2" smd rect (at 0.625 -2 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 216 "Net-(J4-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 531321d6-cd69-47f6-b05d-418af7146ff4)) + (net 216 "Net-(J4-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 66b9f7f0-dc5f-46d1-a083-ee17d860ec7e)) (pad "3" smd rect (at -0.625 -2 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 217 "Net-(J4-Pad3)") (pinfunction "Pin_3") (pintype "passive") (tstamp f519a7c8-68e9-42f3-9bb7-cf5c0ded45e6)) + (net 217 "Net-(J4-Pad3)") (pinfunction "Pin_3") (pintype "passive") (tstamp 0dbdb01d-78ed-4925-b70f-86666ccc7131)) (pad "4" smd rect (at -1.875 -2 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 7db44cb5-d607-4567-b652-be5e57e45125)) - (pad "MP" smd rect (at -4.425 0.9 270) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp af1c91b6-9199-439f-a7a5-44099b7f61d2)) + (net 2 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 181710ef-7f2a-4351-a3a6-56d2f8765ecc)) (pad "MP" smd rect (at 4.425 0.9 270) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp c8fa5d1c-df8b-4d6b-8f6d-4cadcf82d414)) + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp b23e7dda-0fc1-45cd-97e8-f6b6cdf1d435)) + (pad "MP" smd rect (at -4.425 0.9 270) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp da8cef22-8613-4e08-9b41-406c689b1603)) ) (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu") @@ -2947,44 +2948,46 @@ ) ) - (footprint "TCY_Connector:Amphenol 10114826-10103LF 1x05 Vertical" (layer "F.Cu") - (tedit 62966397) (tstamp 66757d5e-03b9-4436-bc30-ef0f9fbc9426) + (footprint "TCY_Connector:Amphenol 10114830-10105LF 1x05 Horizontal" (layer "F.Cu") + (tedit 62AF1224) (tstamp 66757d5e-03b9-4436-bc30-ef0f9fbc9426) (at 87.503 78.105 -90) (property "Sheetfile" "OpenLST.kicad_sch") (property "Sheetname" "OpenLST (Beacon)") (path "/829b2795-9702-4633-a078-e2998d6d9402/2f812110-a1b0-44bb-bd91-00be9b91196c") (attr smd) - (fp_text reference "J2" (at -4.572 -4.191 unlocked) (layer "F.SilkS") + (fp_text reference "J2" (at -4.445 -3.175 unlocked) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp d1e534ef-5b2e-41d7-9f6f-e2736caa1b33) + (tstamp 42e9ebd9-d764-452d-9ee1-66b81f6eec69) ) (fp_text value "Conn_01x05_MountingPin" (at 0 4.5 -90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 97e92af5-6542-41b2-890d-912ac0b0a38f) + (tstamp 0bafa49d-c8b6-4027-a3b2-3a64d3ab75ba) ) (fp_text user "${REFERENCE}" (at 0 6 -90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp b1887eb6-5792-43d3-af4d-218bd73e29d1) - ) - (fp_line (start 5.75 -1.38) (end 5.75 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 07551ec3-866f-4d93-9438-8c3bf099af67)) - (fp_line (start -3.85 1.5) (end 3.85 1.5) (layer "F.SilkS") (width 0.12) (tstamp 6d526b1a-b545-47a9-a013-3477a668a3f0)) - (fp_line (start -5.75 -2.1) (end -5.75 -1.38) (layer "F.SilkS") (width 0.12) (tstamp 8f62a96b-3a89-4454-b1fd-d5913842278f)) - (fp_line (start 3.1 -2.1) (end 5.75 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 9546505e-6909-4c85-8b08-b43a34b09288)) - (fp_line (start -5.75 -2.1) (end -3.1 -2.1) (layer "F.SilkS") (width 0.12) (tstamp afb394fd-b4b0-43b1-8b32-212a8e48aeb1)) + (tstamp 0d5f03cb-f0db-4046-8076-160700cbe411) + ) + (fp_line (start -5.75 -2.1) (end -3.1 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 10eb4f88-d524-4938-8b97-20ba7635f11a)) + (fp_line (start -5.75 2.1) (end -5.75 1.85) (layer "F.SilkS") (width 0.12) (tstamp 2e4063d4-9ee7-47a9-8591-5183abe7b50d)) + (fp_line (start 5.75 2.1) (end 5.75 1.85) (layer "F.SilkS") (width 0.12) (tstamp 4fa17abf-f434-4cbd-9d75-da20e8fe6316)) + (fp_line (start -5.75 -2.1) (end -5.75 -1.38) (layer "F.SilkS") (width 0.12) (tstamp 93579848-3c8e-40db-a11f-27e2944f5ed1)) + (fp_line (start -5.75 2.1) (end 5.75 2.1) (layer "F.SilkS") (width 0.12) (tstamp 93718ab1-d540-4371-bdef-40721b39c1f7)) + (fp_line (start 3.1 -2.1) (end 5.75 -2.1) (layer "F.SilkS") (width 0.12) (tstamp a65e92e3-9fda-4f4f-9973-a96b09d461d2)) + (fp_line (start 5.75 -1.38) (end 5.75 -2.1) (layer "F.SilkS") (width 0.12) (tstamp db526cd6-efbd-4ff1-be0f-0a48e6dd23c8)) (pad "1" smd rect (at -2.54 -2.75 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 3 "+3V3") (pinfunction "Pin_1") (pintype "passive") (tstamp 365ae7ec-ba9f-4474-b1ce-a187e91b8b07)) + (net 3 "+3V3") (pinfunction "Pin_1") (pintype "passive") (tstamp ca10adf8-e48b-4d4d-9a92-9612ea418ebb)) (pad "2" smd rect (at -1.27 -2.75 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 76 "/OpenLST (Beacon)/~{LST_RESET}") (pinfunction "Pin_2") (pintype "passive") (tstamp d0337704-b48e-4df0-a679-f1d9cbd6229d)) + (net 76 "/OpenLST (Beacon)/~{LST_RESET}") (pinfunction "Pin_2") (pintype "passive") (tstamp 07a69e4a-869b-484f-aaaa-50e614867267)) (pad "3" smd rect (at 0 -2.75 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 74 "/OpenLST (Beacon)/PROG_DD") (pinfunction "Pin_3") (pintype "passive") (tstamp f66c6368-50c8-439d-b3fa-f1acd8e96907)) + (net 74 "/OpenLST (Beacon)/PROG_DD") (pinfunction "Pin_3") (pintype "passive") (tstamp 87bf3565-0e58-4492-afc2-abf6c2640264)) (pad "4" smd rect (at 1.27 -2.75 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 75 "/OpenLST (Beacon)/PROG_DC") (pinfunction "Pin_4") (pintype "passive") (tstamp 1ef03c89-93dc-4117-9960-65f0c8c2db8e)) + (net 75 "/OpenLST (Beacon)/PROG_DC") (pinfunction "Pin_4") (pintype "passive") (tstamp 30f70446-f8fc-40ff-92fb-56eae08fade9)) (pad "5" smd rect (at 2.54 -2.75 270) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "Pin_5") (pintype "passive") (tstamp b2eaf24f-bc7d-48ea-aa0c-4eeba5154b9b)) + (net 2 "GND") (pinfunction "Pin_5") (pintype "passive") (tstamp 7a1af7bf-c065-4afe-8781-335214643795)) (pad "MP" smd rect (at -5.07 0.2 270) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp c0321040-f493-4866-9cd8-a1457586351b)) + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 2872653f-5587-4693-9820-5b924e45bdd1)) (pad "MP" smd rect (at 5.07 0.2 270) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp e825a503-01da-47a6-8226-d124e358bf3f)) + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 2cbeee39-ac6c-4f66-95b6-6ac627b430f6)) ) (footprint "Capacitor_SMD:C_0603_1608Metric" (layer "F.Cu") @@ -4476,54 +4479,52 @@ ) ) - (footprint "TCY_Connector:Amphenol 10114826-10108LF 1x08 Vertical" (layer "F.Cu") - (tedit 62167C81) (tstamp a3bbd2a6-e83b-4751-955d-843cd7903064) + (footprint "TCY_Connector:Amphenol 10114830-10108LF 1x08 Horizontal" (layer "F.Cu") + (tedit 62AF1348) (tstamp a3bbd2a6-e83b-4751-955d-843cd7903064) (at 164.719 77.851 90) (property "Sheetfile" "camera.kicad_sch") (property "Sheetname" "camera") (path "/1e3f6e69-339a-4a82-8e4d-44c2adb747fb/da116425-550f-4045-b880-60492319835e") (attr smd) - (fp_text reference "J9" (at 5.969 -2.921 unlocked) (layer "F.SilkS") + (fp_text reference "J9" (at 5.969 -2.794 unlocked) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 599c5faa-f7c0-4b91-a423-68ae9dd28984) + (tstamp 18ac07ce-df99-4b15-b1c7-1a6f6425b01c) ) (fp_text value "Camera" (at 0 5.5 90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp e366501a-4478-417f-90dc-6987568c6e0d) + (tstamp 00157c31-bac4-4ea8-b017-e42f00f2e075) ) (fp_text user "${REFERENCE}" (at 0 7 90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 7a8bd5ca-7e3d-4e66-b16e-3a7308861f26) - ) - (fp_line (start 4.9 -1.75) (end 6.5 -1.75) (layer "F.SilkS") (width 0.12) (tstamp 0209c0f2-e6a9-42a2-920d-5ef3818c5864)) - (fp_line (start -6.5 1.5) (end -6.5 1.05) (layer "F.SilkS") (width 0.12) (tstamp 0ec6826c-98d2-4b66-90b9-b31dca2ee5aa)) - (fp_line (start -6.5 1.5) (end -6.5 1.75) (layer "F.SilkS") (width 0.12) (tstamp 1e8348e3-5c97-4517-8f63-a4bde8bfcc6a)) - (fp_line (start 6.5 1.05) (end 6.5 1.5) (layer "F.SilkS") (width 0.12) (tstamp 2838d893-dd02-4e49-a916-52eee2944fa2)) - (fp_line (start -6.5 -1.1) (end -6.5 -1.75) (layer "F.SilkS") (width 0.12) (tstamp 33ca0ed0-63a6-4188-90af-a6e54ac2ce82)) - (fp_line (start 6.5 -1.75) (end 6.5 -1.1) (layer "F.SilkS") (width 0.12) (tstamp 88e0ee42-2a1b-4b26-90d9-e1ffef9153b2)) - (fp_line (start -6.5 -1.75) (end -4.95 -1.75) (layer "F.SilkS") (width 0.12) (tstamp 9bdff96a-db4a-433d-b3b1-bb96a81421a8)) - (fp_line (start 6.5 1.75) (end 6.5 1.5) (layer "F.SilkS") (width 0.12) (tstamp a3dfd68b-1abc-4d56-b7ac-f65c33a9452e)) - (fp_line (start -6.5 1.75) (end 6.5 1.75) (layer "F.SilkS") (width 0.12) (tstamp a79b728c-de6a-44cf-b9b8-3fe5aba6345f)) + (tstamp bd533ecf-61ce-4967-89b2-da6b292430bc) + ) + (fp_line (start -6.5 -1.75) (end -4.95 -1.75) (layer "F.SilkS") (width 0.12) (tstamp 1e6ca3c0-d996-4042-9d2c-27493ef4bac1)) + (fp_line (start 6.5 -1.75) (end 6.5 -1.1) (layer "F.SilkS") (width 0.12) (tstamp 25009f82-f1a2-4fa3-b178-3dc4c2b9a5ca)) + (fp_line (start 4.9 -1.75) (end 6.5 -1.75) (layer "F.SilkS") (width 0.12) (tstamp 574c9cfb-4c10-488b-9997-c3a3509d45b7)) + (fp_line (start -6.5 2.45) (end -6.5 2.15) (layer "F.SilkS") (width 0.12) (tstamp ad6f9a16-b0e0-4d7c-9206-fc1f7d619a66)) + (fp_line (start 6.5 2.45) (end 6.5 2.15) (layer "F.SilkS") (width 0.12) (tstamp b99b3a3d-9299-4c9b-acb0-9dbc2f5811ca)) + (fp_line (start 6.5 2.45) (end -6.5 2.45) (layer "F.SilkS") (width 0.12) (tstamp db19339a-499b-4c80-98e9-9ad76d970d18)) + (fp_line (start -6.5 -1.1) (end -6.5 -1.75) (layer "F.SilkS") (width 0.12) (tstamp e7e903fd-a93b-42d8-a310-e03d48dba9c9)) (pad "1" smd rect (at -4.375 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 80 "/MCU/QSPI_D1{slash}CAM_CSN") (pinfunction "Pin_1") (pintype "passive") (tstamp 09de8853-6829-4d85-ac63-1872df563676)) + (net 80 "/MCU/QSPI_D1{slash}CAM_CSN") (pinfunction "Pin_1") (pintype "passive") (tstamp f9846810-4cbb-427f-8639-f3bc3c965923)) (pad "2" smd rect (at -3.125 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 81 "/MCU/QSPI_D2{slash}CAM_MOSI") (pinfunction "Pin_2") (pintype "passive") (tstamp 2485f48d-fcfa-4f1f-9809-696e2b2be3bc)) + (net 81 "/MCU/QSPI_D2{slash}CAM_MOSI") (pinfunction "Pin_2") (pintype "passive") (tstamp 9b134edf-d643-481f-9970-5097e229522a)) (pad "3" smd rect (at -1.875 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 82 "/MCU/QSPI_D3{slash}CAM_MISO") (pinfunction "Pin_3") (pintype "passive") (tstamp bbc672e2-b0d5-46b5-a5d5-d70772bda783)) + (net 82 "/MCU/QSPI_D3{slash}CAM_MISO") (pinfunction "Pin_3") (pintype "passive") (tstamp de1f754a-d87f-4f5d-9823-f0dbef38b3dd)) (pad "4" smd rect (at -0.625 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 83 "/MCU/CAM_SCK") (pinfunction "Pin_4") (pintype "passive") (tstamp b805f466-203c-4046-839d-a327def078fc)) + (net 83 "/MCU/CAM_SCK") (pinfunction "Pin_4") (pintype "passive") (tstamp f2cb3c9a-fa0c-4c6d-8dfa-ca64675da18d)) (pad "5" smd rect (at 0.625 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "Pin_5") (pintype "passive") (tstamp ef6f5d9d-de86-4fbf-b515-4d3866fa6723)) + (net 2 "GND") (pinfunction "Pin_5") (pintype "passive") (tstamp af73e9c6-a65d-4560-b2f3-108a4495450f)) (pad "6" smd rect (at 1.875 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 214 "/camera/CAM_VCC") (pinfunction "Pin_6") (pintype "passive") (tstamp 3f67313e-0d59-4c41-bf1e-7d9c5f0359f5)) + (net 214 "/camera/CAM_VCC") (pinfunction "Pin_6") (pintype "passive") (tstamp 98664846-514c-45ff-8250-b734f7a4e6a8)) (pad "7" smd rect (at 3.125 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 85 "/I2C_SDA") (pinfunction "Pin_7") (pintype "passive") (tstamp 50048d16-f6b5-4160-bb54-a387064deab7)) + (net 85 "/I2C_SDA") (pinfunction "Pin_7") (pintype "passive") (tstamp 823de2ab-090f-4bab-b63f-b82d0c8f7fd6)) (pad "8" smd rect (at 4.375 -2.35 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 86 "/I2C_SCL") (pinfunction "Pin_8") (pintype "passive") (tstamp 06fcd135-852d-4c30-a0e3-285354b12250)) - (pad "MP" smd rect (at 7.325 0 90) (size 2.1 1.9) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 6ba7cd26-bcec-4333-9b6d-67fc4b104c52)) - (pad "MP" smd rect (at -7.325 0 90) (size 2.1 1.9) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 826a6616-c80c-4526-a074-64340a9bb8dd)) + (net 86 "/I2C_SCL") (pinfunction "Pin_8") (pintype "passive") (tstamp 9d04926f-36c0-4fcd-b151-69a639110201)) + (pad "MP" smd rect (at -6.925 0.55 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 148f8e77-bd10-4fe6-95a2-639e3f32824d)) + (pad "MP" smd rect (at 6.925 0.55 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp fd19abe8-36a3-4cce-a5ce-55c699b6f0b8)) ) (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu") @@ -6067,79 +6068,82 @@ ) ) - (footprint "TCY_Connector:Amphenol 10114830-11104LF 1x04 Vertical" (layer "F.Cu") - (tedit 622E111F) (tstamp d443669c-087d-4d8b-b137-12dedcfae7a2) + (footprint "TCY_Connector:Amphenol 10114830-10104LF 1x04 Horizontal" (layer "F.Cu") + (tedit 62AF1183) (tstamp d443669c-087d-4d8b-b137-12dedcfae7a2) (at 164.084 97.79 90) (property "Sheetfile" "mcu_comm.kicad_sch") (property "Sheetname" "MCU") (path "/81a5172c-b171-400d-8856-41d6e486bdd1/af67e199-e48e-4756-86dd-b11b5ab428d7") (attr smd) - (fp_text reference "J7" (at 3.683 -3.556 unlocked) (layer "F.SilkS") + (fp_text reference "J7" (at 3.937 -2.667 unlocked) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 7498d8d6-9ff2-4b36-aff3-c64e46c4c7a2) + (tstamp c962aba1-d9cf-4417-a258-e508751e8993) ) (fp_text value "Conn_01x04_MountingPin" (at 0 -7.25 90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp ba99e7ba-0ac3-4b0f-b21a-7c7e0cc6342a) + (tstamp 2898ce23-265d-49af-94cb-9408683f97d0) ) (fp_text user "${REFERENCE}" (at 0 9 90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 3c0b53e1-5b08-4beb-94a1-94e353d4b4ad) - ) - (fp_line (start -2.5 -2.5) (end -5.75 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 15b1cc6b-ad67-4ffd-bef2-6c057f398cbe)) - (fp_line (start -5.75 -2.5) (end -5.75 0) (layer "F.SilkS") (width 0.12) (tstamp 2825b1c3-fb71-41e9-ae2b-15485fa7a2a4)) - (fp_line (start 5.75 -2.5) (end 2.5 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 6958675a-d50a-4a7c-94d1-607866661b27)) - (fp_line (start 5.75 -0.5) (end 5.75 -2.5) (layer "F.SilkS") (width 0.12) (tstamp b497239e-45d7-465e-881c-c96d49d43a77)) - (fp_line (start 5.75 1) (end 5.75 -0.5) (layer "F.SilkS") (width 0.12) (tstamp e5dc5d8c-6b08-4b6b-9078-8ddb1f77f2cf)) - (fp_line (start -5.75 1) (end -5.75 0) (layer "F.SilkS") (width 0.12) (tstamp f4293fd6-2902-4f5d-a2e3-56973908143b)) + (tstamp 06423581-cf14-4526-bcd7-128370651432) + ) + (fp_line (start -5 2.75) (end 5 2.75) (layer "F.SilkS") (width 0.12) (tstamp 01edbfe1-966e-4241-882c-6eea6125a86d)) + (fp_line (start -5 2.75) (end -5 2.5) (layer "F.SilkS") (width 0.12) (tstamp 10f2abcd-c143-4ea4-b5b8-d04515818a8b)) + (fp_line (start 5 -0.75) (end 5 -1.5) (layer "F.SilkS") (width 0.12) (tstamp 3171891b-4bbb-49cd-b89e-92dc5e7dcca5)) + (fp_line (start 5 2.75) (end 5 2.5) (layer "F.SilkS") (width 0.12) (tstamp 9e2067bb-5e3c-4446-b91e-1cdc11514704)) + (fp_line (start -5 -0.75) (end -5 -1.5) (layer "F.SilkS") (width 0.12) (tstamp afd902dc-39cb-4a0e-88be-f30b1d47b9b9)) + (fp_line (start -2.5 -1.5) (end -5 -1.5) (layer "F.SilkS") (width 0.12) (tstamp d98afb68-1e23-4fef-a599-36918c776c74)) + (fp_line (start 5 -1.5) (end 2.375 -1.5) (layer "F.SilkS") (width 0.12) (tstamp f1cb96b3-5053-421f-94d8-94cd6e97e84f)) (pad "1" smd rect (at 1.875 -2 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 77 "/MCU/USB_POWER") (pinfunction "Pin_1") (pintype "passive") (tstamp 7269f42c-54ff-4845-becf-f84b0789a729)) + (net 77 "/MCU/USB_POWER") (pinfunction "Pin_1") (pintype "passive") (tstamp cec5c445-cad6-4108-aedc-5c3dbc07730d)) (pad "2" smd rect (at 0.625 -2 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 218 "Net-(J7-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 2676f769-c3b7-4cf2-a513-f800c01a615d)) + (net 218 "Net-(J7-Pad2)") (pinfunction "Pin_2") (pintype "passive") (tstamp 22cf26dc-f41e-4e3e-bd6c-edbf7f2974ed)) (pad "3" smd rect (at -0.625 -2 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 219 "Net-(J7-Pad3)") (pinfunction "Pin_3") (pintype "passive") (tstamp 92752f24-dd69-4eda-b942-c0392c8956db)) + (net 219 "Net-(J7-Pad3)") (pinfunction "Pin_3") (pintype "passive") (tstamp a5bba650-8884-44b6-a797-728282087074)) (pad "4" smd rect (at -1.875 -2 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp e4e086f0-a67f-4668-ae24-a945cf44a5fb)) + (net 2 "GND") (pinfunction "Pin_4") (pintype "passive") (tstamp 0ed67ac8-ea12-45f5-aee5-445fb49c7772)) (pad "MP" smd rect (at 4.425 0.9 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 4d4a2bbf-d28e-4265-9c87-0d4a75d64ea0)) + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 1d86bb1e-861f-405b-a3ba-ce5c31bd330b)) (pad "MP" smd rect (at -4.425 0.9 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp a08ac897-d037-4ce4-9bcb-341c50d2126b)) + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 2abb28ca-027d-43e0-9099-5a35e98674be)) ) - (footprint "TCY_Connector:Amphenol 10114826-10103LF 1x03 Vertical" (layer "F.Cu") - (tedit 62332808) (tstamp d545e016-5e89-4d34-866d-cf47e8675bd2) + (footprint "TCY_Connector:Amphenol 10114830-10103LF 1x03 Horizontal" (layer "F.Cu") + (tedit 62AF1090) (tstamp d545e016-5e89-4d34-866d-cf47e8675bd2) (at 164.719 60.071 90) (property "Sheetfile" "mcu_comm.kicad_sch") (property "Sheetname" "MCU") (path "/81a5172c-b171-400d-8856-41d6e486bdd1/5bd7a265-5115-4077-b1c4-f017537909a2") (attr smd) - (fp_text reference "J8" (at 5.842 0 unlocked) (layer "F.SilkS") + (fp_text reference "J8" (at 3.048 -3.175 unlocked) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 54a49180-1c8e-4438-ac19-a680c0232ab5) + (tstamp 4022fc35-5894-40ea-a70f-f31d8a127ff9) ) (fp_text value "PROG" (at 0 4.5 90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp 90fea219-8ad9-49cd-8210-d1d8db0d84f6) + (tstamp 27657bad-e009-4803-bfa1-449a6cddb759) ) (fp_text user "${REFERENCE}" (at 0 6 90 unlocked) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp bb7cd871-64bf-4296-9034-64ab1e2cb74b) - ) - (fp_line (start -4.5 -2.1) (end -1.75 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 048de4c0-c3a8-4903-b5f1-51619e5976e6)) - (fp_line (start 1.75 -2.1) (end 4.5 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 25e46a37-03fd-4978-9cb2-22d2251744b4)) - (fp_line (start -4.5 -2.1) (end -4.5 -1.38) (layer "F.SilkS") (width 0.12) (tstamp 33782454-99da-4cd2-a6e3-aa849ee449b3)) - (fp_line (start -2.65 1.5) (end 2.65 1.5) (layer "F.SilkS") (width 0.12) (tstamp 44f1936a-3df1-4133-967d-5967c818d3b2)) - (fp_line (start 4.5 -1.38) (end 4.5 -2.1) (layer "F.SilkS") (width 0.12) (tstamp a0b21818-5a62-4102-ad24-d7e9a1245fec)) + (tstamp 82b192ef-a3d0-439d-ac14-471f59fdc9db) + ) + (fp_line (start -4.5 1.8) (end -4.5 2.1) (layer "F.SilkS") (width 0.12) (tstamp 027cb513-ec66-4df8-8f63-1c9818c3d36d)) + (fp_line (start 4.5 -1.38) (end 4.5 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 0449cd95-baa9-406d-8524-5c52044d8776)) + (fp_line (start 4.75 2.1) (end 4.75 1.8) (layer "F.SilkS") (width 0.12) (tstamp 3a4ce814-b529-422d-a165-920304182013)) + (fp_line (start -4.5 -2.1) (end -1.75 -2.1) (layer "F.SilkS") (width 0.12) (tstamp 9c74f755-6da3-425e-ac81-9c90b4bef476)) + (fp_line (start -4.5 -2.1) (end -4.5 -1.38) (layer "F.SilkS") (width 0.12) (tstamp b7ab34c8-2d25-4759-8078-6b1c3c48b0a7)) + (fp_line (start -4.5 2.1) (end 4.75 2.1) (layer "F.SilkS") (width 0.12) (tstamp c32c1b54-ead2-449a-a061-f8ecc33a043e)) + (fp_line (start 1.75 -2.1) (end 4.5 -2.1) (layer "F.SilkS") (width 0.12) (tstamp e3efff13-2e70-484d-bd9e-577b80b9d4a6)) (pad "1" smd rect (at -1.27 -2.75 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp aa2b8f21-be60-48aa-a8cb-c4ead7ea6efd)) + (net 2 "GND") (pinfunction "Pin_1") (pintype "passive") (tstamp 3c2ce915-0738-45e4-9565-c540f9c15ced)) (pad "2" smd rect (at 0 -2.75 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 78 "/MCU/SWCLK") (pinfunction "Pin_2") (pintype "passive") (tstamp b53474fe-3f70-48c7-bcce-7f8be0210b3b)) + (net 78 "/MCU/SWCLK") (pinfunction "Pin_2") (pintype "passive") (tstamp 53afdeef-1c67-4034-bc72-7f3e16d277e1)) (pad "3" smd rect (at 1.27 -2.75 90) (size 0.8 1.6) (layers "F.Cu" "F.Paste" "F.Mask") - (net 79 "/MCU/SWDIO") (pinfunction "Pin_3") (pintype "passive") (tstamp c0f54a82-8c2d-4e8c-9db7-67a5b9e494cf)) - (pad "MP" smd rect (at 3.8 0.2 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 812bb90c-e68f-4d0b-9647-cf36ebd5b652)) + (net 79 "/MCU/SWDIO") (pinfunction "Pin_3") (pintype "passive") (tstamp 63e7494d-b1cf-4811-976d-8b9b2686c05e)) (pad "MP" smd rect (at -3.8 0.2 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") - (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 89c8a474-ca51-4a1c-9b88-710788d2ab84)) + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp 8097dbb5-2158-4a2b-9d55-c1d8592f4533)) + (pad "MP" smd rect (at 3.8 0.2 90) (size 2.1 3) (layers "F.Cu" "F.Paste" "F.Mask") + (net 2 "GND") (pinfunction "MountPin") (pintype "passive") (tstamp b3c0e051-4218-4fce-9b3d-a1df02832408)) ) (footprint "Resistor_SMD:R_0603_1608Metric" (layer "F.Cu") @@ -8386,8 +8390,8 @@ (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer "B.CrtYd") (width 0.05) (tstamp 7b4e0905-b3f5-446f-b52b-e06c41b71e71)) (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer "B.CrtYd") (width 0.05) (tstamp 7ca69eb3-2e52-4ae0-a990-0eb21b8c6d68)) (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer "B.CrtYd") (width 0.05) (tstamp da5c4ee2-4e18-477f-b1cc-c9193d8fd861)) - (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer "B.Fab") (width 0.1) (tstamp 3e34356e-84cd-4b50-a26e-f3171670b8e9)) - (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer "B.Fab") (width 0.1) (tstamp 90d3e0b5-7b53-4888-8483-9916062eec86)) + (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer "B.Fab") (width 0.1) (tstamp d5cd53a1-e779-4e22-b286-7a3ba4cc2555)) + (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer "B.Fab") (width 0.1) (tstamp eacebde2-7377-4d73-b09e-26076daeabae)) (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer "B.Fab") (width 0.1) (tstamp f2a59e4f-ad3f-45e5-8352-7dfadc4f503a)) (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer "B.Fab") (width 0.1) (tstamp f7d9c1b2-0cf3-478a-864f-011b5152af2a)) (pad "1" smd roundrect locked (at -0.7875 0 180) (size 0.875 0.95) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.25) @@ -12017,6 +12021,7 @@ (segment (start 95.25 78.2828) (end 101.092 72.4408) (width 0.4) (layer "F.Cu") (net 5) (tstamp 07cb6b7f-d2bd-4ef9-868f-b82e6e0926f9)) (segment (start 103.124 70.4088) (end 103.124 62.3316) (width 0.4) (layer "F.Cu") (net 5) (tstamp 0b0dd902-ca62-4a7a-a078-f494931c185c)) (segment (start 90.3987 56.9213) (end 92.1767 55.1433) (width 0.2) (layer "F.Cu") (net 5) (tstamp 2830adc5-17f5-4a49-b4ca-77de80571a05)) + (segment (start 92.1767 55.1433) (end 92.9132 55.1433) (width 0.2) (layer "F.Cu") (net 5) (tstamp 316f7731-ca0e-4353-9d0a-b39b70f911ba)) (segment (start 106.68 105.3028) (end 106.68 100.2284) (width 0.25) (layer "F.Cu") (net 5) (tstamp 38168691-70cb-48c9-9be8-bf09ac91b6c4)) (segment (start 103.0732 54.102) (end 93.345 54.102) (width 0.2) (layer "F.Cu") (net 5) (tstamp 3a3aca63-b635-4677-a0de-862a06867a82)) (segment (start 101.092 72.4408) (end 101.092 72.2884) (width 0.4) (layer "F.Cu") (net 5) (tstamp 405e5892-374e-46b6-8abf-8b8579bffed0)) @@ -12038,7 +12043,6 @@ (segment (start 91.567 98.806) (end 91.948 98.806) (width 0.4) (layer "F.Cu") (net 5) (tstamp e3a4cea1-a7ef-42f8-83a6-9ac2bd71bf07)) (segment (start 93.345 54.102) (end 92.9132 54.5338) (width 0.2) (layer "F.Cu") (net 5) (tstamp ee5398f2-011c-4cd0-a781-c87bc39f5028)) (segment (start 123.9266 90.9198) (end 123.9266 88.6714) (width 0.25) (layer "F.Cu") (net 5) (tstamp f7d62a9b-0e70-4853-9e49-1a311ca1eaa3)) - (segment (start 92.1767 55.1433) (end 92.9132 55.1433) (width 0.2) (layer "F.Cu") (net 5) (tstamp fee0ccd7-c5f0-4f23-b779-1cce36ec4445)) (via (at 106.68 100.2284) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 5) (tstamp 37afd392-913e-44dd-8b8f-bffd2a4d7cfd)) (via (at 91.567 98.806) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 5) (tstamp 5c80e144-52de-4115-ae00-1cbff16cc975)) (via (at 103.124 54.0512) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (free) (net 5) (tstamp b0f52944-27bf-4551-b4cb-115c84c31395)) @@ -12890,13 +12894,13 @@ (segment (start 144.48736 57.92977) (end 146.304 59.746412) (width 0.15) (layer "In2.Cu") (net 97) (tstamp ee5e2f91-5ffe-4b40-b6fc-9021a6b1cdf2)) (segment (start 144.48736 55.421256) (end 144.48736 57.92977) (width 0.15) (layer "In2.Cu") (net 97) (tstamp f627fbdb-b820-4fa6-a42b-adabd0de2b49)) (segment (start 127.7112 50.6984) (end 127.762 50.6984) (width 0.15) (layer "In2.Cu") (net 97) (tstamp ff80c531-c219-4ee0-8ebf-fe8d83254053)) - (segment (start 148.336 67.439) (end 148.8054 66.9696) (width 0.2) (layer "F.Cu") (net 98) (tstamp 193c7b83-dea8-4c10-9cf3-ac6f64d1ff9b)) - (segment (start 148.8054 65.8368) (end 148.8054 65.2394) (width 0.2) (layer "F.Cu") (net 98) (tstamp 5f884fab-a47f-4a66-834d-cfb15d766b9c)) - (segment (start 148.336 68.6556) (end 148.336 67.439) (width 0.2) (layer "F.Cu") (net 98) (tstamp 75f2bf55-6068-43ef-b281-268fcd27b459)) - (segment (start 148.8054 66.9696) (end 148.8054 65.8368) (width 0.2) (layer "F.Cu") (net 98) (tstamp 82d16010-f229-48d8-aea9-c3cb2ce00ac8)) - (segment (start 147.828 65.659) (end 148.87 65.659) (width 0.2) (layer "F.Cu") (net 98) (tstamp ce839e00-83a1-44a7-8b79-361e693cdc93)) - (segment (start 147.3708 63.6077) (end 147.3708 65.2018) (width 0.2) (layer "F.Cu") (net 98) (tstamp e2552f64-bdd2-4d7f-890d-c12452b2e271)) - (segment (start 147.3708 65.2018) (end 147.828 65.659) (width 0.2) (layer "F.Cu") (net 98) (tstamp e5d5308b-a098-4f70-b9da-5000b6bf6e54)) + (segment (start 148.336 67.439) (end 148.8054 66.9696) (width 0.2) (layer "F.Cu") (net 98) (tstamp 09371e45-0859-4994-b0c4-729db2f37b54)) + (segment (start 148.717 65.659) (end 147.574 65.659) (width 0.2) (layer "F.Cu") (net 98) (tstamp 50c37066-5aca-4781-820d-cbc7ff10863b)) + (segment (start 148.8054 66.9696) (end 148.8054 65.7474) (width 0.2) (layer "F.Cu") (net 98) (tstamp a9d41699-9c61-4a49-88bc-18aa1e3f97ea)) + (segment (start 147.3708 65.4558) (end 147.3708 63.6077) (width 0.2) (layer "F.Cu") (net 98) (tstamp cf6fa92a-9f45-4bb7-8250-9281238bcc0d)) + (segment (start 147.574 65.659) (end 147.3708 65.4558) (width 0.2) (layer "F.Cu") (net 98) (tstamp d797d4fa-b797-4987-8c27-c62164c52087)) + (segment (start 148.8054 65.7474) (end 148.717 65.659) (width 0.2) (layer "F.Cu") (net 98) (tstamp dfcd8134-f430-453d-9a70-11b40674036f)) + (segment (start 148.336 68.6556) (end 148.336 67.439) (width 0.2) (layer "F.Cu") (net 98) (tstamp e42402e9-7f1b-44d5-b2ad-c02207a74172)) (via (at 147.3708 63.6077) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 98) (tstamp 7a23c309-eaec-4eed-80c5-ec8b09c75cf2)) (segment (start 144.83688 57.44872) (end 144.83688 55.27648) (width 0.15) (layer "In2.Cu") (net 98) (tstamp 1557096b-6ec0-4426-ac1d-b5f68555e300)) (segment (start 128.7272 47.9472) (end 127.49 46.71) (width 0.15) (layer "In2.Cu") (net 98) (tstamp 385337ba-0bb1-404d-9a2a-c76d5f1acdc6)) @@ -13335,13 +13339,13 @@ (via (at 118.774845 94.331155) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 158) (tstamp 2e007118-c931-464f-b9e1-a3758e6e231a)) (via (at 97.028 117.92435) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 158) (tstamp a6de8f38-972f-4d15-8283-089b889386b0)) (segment (start 98.362 119.063) (end 99.136395 119.837395) (width 0.2) (layer "B.Cu") (net 158) (tstamp 273c5330-0b4a-4bbd-b24f-477485639922)) - (segment (start 99.136395 119.837395) (end 111.683605 119.837395) (width 0.2) (layer "B.Cu") (net 158) (tstamp 291b4579-ecab-4e56-b3d2-768c18cdd213)) (segment (start 97.028 117.92435) (end 98.30335 117.92435) (width 0.2) (layer "B.Cu") (net 158) (tstamp 2e5c00ea-bb32-4e79-99d2-0ab7f2bacb29)) (segment (start 117.983 94.615) (end 118.266845 94.331155) (width 0.2) (layer "B.Cu") (net 158) (tstamp 3e34356e-84cd-4b50-a26e-f3171670b8e9)) - (segment (start 111.683605 119.837395) (end 117.983 113.538) (width 0.2) (layer "B.Cu") (net 158) (tstamp 58d709df-f3f7-4b63-b668-8223091c52d8)) + (segment (start 117.983 113.538) (end 117.983 94.615) (width 0.2) (layer "B.Cu") (net 158) (tstamp 58e0b45e-f213-4152-9f59-435178d20c89)) + (segment (start 111.683605 119.837395) (end 117.983 113.538) (width 0.2) (layer "B.Cu") (net 158) (tstamp 7413b2cc-42f9-4b79-8935-d73b76c29038)) + (segment (start 99.136395 119.837395) (end 111.683605 119.837395) (width 0.2) (layer "B.Cu") (net 158) (tstamp 8b769127-90f2-48a9-b9ec-b84163ab0da2)) (segment (start 118.266845 94.331155) (end 118.774845 94.331155) (width 0.2) (layer "B.Cu") (net 158) (tstamp 90d3e0b5-7b53-4888-8483-9916062eec86)) (segment (start 98.362 117.983) (end 98.362 119.063) (width 0.2) (layer "B.Cu") (net 158) (tstamp a97be0fd-8df3-4f43-a91a-932faf6be905)) - (segment (start 117.983 113.538) (end 117.983 94.615) (width 0.2) (layer "B.Cu") (net 158) (tstamp b2f41f6d-2db9-4561-ad2f-08498e8c663b)) (segment (start 98.30335 117.92435) (end 98.362 117.983) (width 0.2) (layer "B.Cu") (net 158) (tstamp dc2a56fe-a4ff-437c-992c-0729a7f60918)) (segment (start 126.9244 73.5844) (end 127.2725 73.9325) (width 0.2) (layer "F.Cu") (net 159) (tstamp 19d70424-3ab2-4551-84f6-1abb0260357c)) (segment (start 127.8556 70.4209) (end 127.3306 70.4209) (width 0.2) (layer "F.Cu") (net 159) (tstamp 1a54ee2d-915f-4603-a47f-c3276c22620f)) @@ -13802,6 +13806,66 @@ (xy 167.254919 48.813773) (xy 167.293425 48.861323) (xy 167.3 48.896801) + (xy 167.3 69.443599) + (xy 167.281093 69.50179) + (xy 167.231593 69.537754) + (xy 167.170407 69.537754) + (xy 167.130996 69.513603) + (xy 167.126256 69.508863) + (xy 167.021108 69.430059) + (xy 167.008855 69.423351) + (xy 166.885022 69.376928) + (xy 166.873033 69.374077) + (xy 166.819748 69.368289) + (xy 166.814414 69.368) + (xy 165.78468 69.368) + (xy 165.771995 69.372122) + (xy 165.769 69.376243) + (xy 165.769 72.468319) + (xy 165.773122 72.481004) + (xy 165.777243 72.483999) + (xy 166.814411 72.483999) + (xy 166.819751 72.48371) + (xy 166.873035 72.477922) + (xy 166.88502 72.475073) + (xy 167.008855 72.428649) + (xy 167.021108 72.421941) + (xy 167.126256 72.343137) + (xy 167.130996 72.338397) + (xy 167.185513 72.31062) + (xy 167.245945 72.320191) + (xy 167.28921 72.363456) + (xy 167.3 72.408401) + (xy 167.3 83.293599) + (xy 167.281093 83.35179) + (xy 167.231593 83.387754) + (xy 167.170407 83.387754) + (xy 167.130996 83.363603) + (xy 167.126256 83.358863) + (xy 167.021108 83.280059) + (xy 167.008855 83.273351) + (xy 166.885022 83.226928) + (xy 166.873033 83.224077) + (xy 166.819748 83.218289) + (xy 166.814414 83.218) + (xy 165.78468 83.218) + (xy 165.771995 83.222122) + (xy 165.769 83.226243) + (xy 165.769 86.318319) + (xy 165.773122 86.331004) + (xy 165.777243 86.333999) + (xy 166.814411 86.333999) + (xy 166.819751 86.33371) + (xy 166.873035 86.327922) + (xy 166.88502 86.325073) + (xy 167.008855 86.278649) + (xy 167.021108 86.271941) + (xy 167.126256 86.193137) + (xy 167.130996 86.188397) + (xy 167.185513 86.16062) + (xy 167.245945 86.170191) + (xy 167.28921 86.213456) + (xy 167.3 86.258401) (xy 167.3 121.603199) (xy 167.281093 121.66139) (xy 167.231593 121.697354) @@ -26747,7 +26811,7 @@ (xy 130.761159 86.343464) (xy 130.635718 86.439718) (xy 130.539464 86.565159) - (xy 130.527875 86.593137) + (xy 130.526297 86.596946) (xy 130.489664 86.685386) (xy 130.449927 86.731912) (xy 130.3982 86.7465) @@ -27691,6 +27755,9 @@ (xy 137.175945 83.311693) (xy 137.1711 83.2811) (xy 137.1711 83.246966) + (xy 137.168937 83.224078) + (xy 137.168687 83.221439) + (xy 137.168687 83.221438) (xy 137.168119 83.215431) (xy 137.123234 83.087616) (xy 137.103586 83.061014) @@ -27753,6 +27820,9 @@ (xy 135.387615 83.061014) (xy 135.367966 83.087616) (xy 135.323081 83.215431) + (xy 135.322513 83.221438) + (xy 135.322513 83.221439) + (xy 135.322264 83.224078) (xy 135.3201 83.246966) (xy 135.3201 83.297233) (xy 135.301193 83.355424) @@ -27820,7 +27890,7 @@ (xy 135.732835 84.842434) (xy 135.733682 84.836) (xy 135.713044 84.679238) - (xy 135.710462 84.673005) + (xy 135.710559 84.673238) (xy 135.664974 84.563185) (xy 135.660173 84.502189) (xy 135.692143 84.45002) @@ -27840,9 +27910,6 @@ (xy 137.118838 84.194936) (xy 137.118839 84.194935) (xy 137.123234 84.188984) - (xy 137.1613 84.080586) - (xy 137.166121 84.066859) - (xy 137.166121 84.066858) (xy 137.168119 84.061169) (xy 137.168425 84.057936) (xy 137.198813 84.006094) @@ -31531,7 +31598,7 @@ (xy 157.399701 83.974118) (xy 157.40031 83.977961) (xy 157.40031 83.977966) - (xy 157.406147 84.014817) + (xy 157.400882 83.981576) (xy 157.414554 84.067904) (xy 157.441589 84.120962) (xy 157.463684 84.164326) @@ -31651,110 +31718,32 @@ (xy 158.329696 88.054725) (xy 158.301919 88.000208) (xy 158.3007 87.984721) - (xy 158.3007 86.271411) - (xy 163.261001 86.271411) - (xy 163.26129 86.276751) - (xy 163.267078 86.330035) - (xy 163.269927 86.34202) - (xy 163.316351 86.465855) - (xy 163.323059 86.478108) - (xy 163.401863 86.583256) - (xy 163.411744 86.593137) - (xy 163.516892 86.671941) - (xy 163.529145 86.678649) - (xy 163.652978 86.725072) - (xy 163.664967 86.727923) - (xy 163.718252 86.733711) - (xy 163.723586 86.734) - (xy 164.20332 86.734) - (xy 164.216005 86.729878) - (xy 164.219 86.725757) - (xy 164.219 86.718319) - (xy 165.219 86.718319) - (xy 165.223122 86.731004) - (xy 165.227243 86.733999) - (xy 165.714411 86.733999) - (xy 165.719751 86.73371) - (xy 165.773035 86.727922) - (xy 165.78502 86.725073) - (xy 165.908855 86.678649) - (xy 165.921108 86.671941) - (xy 166.026256 86.593137) - (xy 166.036137 86.583256) - (xy 166.114941 86.478108) - (xy 166.121649 86.465855) - (xy 166.168072 86.342022) - (xy 166.170923 86.330033) - (xy 166.176711 86.276748) - (xy 166.177 86.271414) - (xy 166.177 85.69168) - (xy 166.172878 85.678995) - (xy 166.168757 85.676) - (xy 165.23468 85.676) - (xy 165.221995 85.680122) - (xy 165.219 85.684243) - (xy 165.219 86.718319) - (xy 164.219 86.718319) - (xy 164.219 85.69168) - (xy 164.214878 85.678995) - (xy 164.210757 85.676) - (xy 163.276681 85.676) - (xy 163.263996 85.680122) - (xy 163.261001 85.684243) - (xy 163.261001 86.271411) - (xy 158.3007 86.271411) - (xy 158.3007 84.66032) - (xy 163.261 84.66032) - (xy 163.265122 84.673005) - (xy 163.269243 84.676) - (xy 164.20332 84.676) - (xy 164.216005 84.671878) - (xy 164.219 84.667757) - (xy 164.219 84.66032) - (xy 165.219 84.66032) - (xy 165.223122 84.673005) - (xy 165.227243 84.676) - (xy 166.161319 84.676) - (xy 166.174004 84.671878) - (xy 166.176999 84.667757) - (xy 166.176999 84.080589) - (xy 166.17671 84.075249) - (xy 166.170922 84.021965) - (xy 166.168073 84.00998) - (xy 166.121649 83.886145) - (xy 166.114941 83.873892) - (xy 166.036137 83.768744) - (xy 166.026256 83.758863) - (xy 165.921108 83.680059) - (xy 165.908855 83.673351) - (xy 165.785022 83.626928) - (xy 165.773033 83.624077) - (xy 165.719748 83.618289) - (xy 165.714414 83.618) - (xy 165.23468 83.618) - (xy 165.221995 83.622122) - (xy 165.219 83.626243) - (xy 165.219 84.66032) - (xy 164.219 84.66032) - (xy 164.219 83.633681) - (xy 164.214878 83.620996) - (xy 164.210757 83.618001) - (xy 163.723589 83.618001) - (xy 163.718249 83.61829) - (xy 163.664965 83.624078) - (xy 163.65298 83.626927) - (xy 163.529145 83.673351) - (xy 163.516892 83.680059) - (xy 163.411744 83.758863) - (xy 163.401863 83.768744) - (xy 163.323059 83.873892) - (xy 163.316351 83.886145) - (xy 163.269928 84.009978) - (xy 163.267077 84.021967) - (xy 163.261289 84.075252) - (xy 163.261 84.080586) - (xy 163.261 84.66032) - (xy 158.3007 84.66032) + (xy 158.3007 85.871411) + (xy 163.261001 85.871411) + (xy 163.26129 85.876751) + (xy 163.267078 85.930035) + (xy 163.269927 85.94202) + (xy 163.316351 86.065855) + (xy 163.323058 86.078106) + (xy 163.401863 86.183256) + (xy 163.411744 86.193137) + (xy 163.516892 86.271941) + (xy 163.529145 86.278649) + (xy 163.652978 86.325072) + (xy 163.664967 86.327923) + (xy 163.718252 86.333711) + (xy 163.723586 86.334) + (xy 164.75332 86.334) + (xy 164.766005 86.329878) + (xy 164.769 86.325757) + (xy 164.769 85.29168) + (xy 164.764878 85.278995) + (xy 164.760757 85.276) + (xy 163.276681 85.276) + (xy 163.263996 85.280122) + (xy 163.261001 85.284243) + (xy 163.261001 85.871411) + (xy 158.3007 85.871411) (xy 158.3007 84.401552) (xy 158.319607 84.343361) (xy 158.354755 84.313343) @@ -31771,7 +31760,7 @@ (xy 158.600091 83.977963) (xy 158.6007 83.974119) (xy 158.600699 83.361082) - (xy 158.596029 83.331591) + (xy 158.599228 83.35179) (xy 158.593791 83.317462) (xy 158.585846 83.267296) (xy 158.554228 83.205243) @@ -31806,10 +31795,10 @@ (xy 157.414554 83.267296) (xy 157.413335 83.27499) (xy 157.413335 83.274991) - (xy 157.404636 83.329916) + (xy 157.401098 83.352252) (xy 157.3997 83.361081) (xy 156.950699 83.361081) - (xy 156.946029 83.331591) + (xy 156.949228 83.35179) (xy 156.943791 83.317462) (xy 156.935846 83.267296) (xy 156.904228 83.205243) @@ -32378,6 +32367,32 @@ (xy 159.495252 84.418654) (xy 159.652014 84.398016) (xy 159.798093 84.337508) + (xy 159.898687 84.26032) + (xy 163.261 84.26032) + (xy 163.265122 84.273005) + (xy 163.269243 84.276) + (xy 164.75332 84.276) + (xy 164.766005 84.271878) + (xy 164.769 84.267757) + (xy 164.769 83.233681) + (xy 164.764878 83.220996) + (xy 164.760757 83.218001) + (xy 163.723589 83.218001) + (xy 163.718249 83.21829) + (xy 163.664965 83.224078) + (xy 163.65298 83.226927) + (xy 163.529145 83.273351) + (xy 163.516892 83.280059) + (xy 163.411744 83.358863) + (xy 163.401863 83.368744) + (xy 163.323059 83.473892) + (xy 163.316351 83.486145) + (xy 163.269928 83.609978) + (xy 163.267077 83.621967) + (xy 163.261289 83.675252) + (xy 163.261 83.680586) + (xy 163.261 84.26032) + (xy 159.898687 84.26032) (xy 159.923534 84.241254) (xy 160.019788 84.115813) (xy 160.080296 83.969734) @@ -32654,12 +32669,38 @@ (xy 158.09012 72.058143) (xy 158.090497 72.049514) (xy 158.090498 72.049504) + (xy 158.092956 72.021411) + (xy 163.261001 72.021411) + (xy 163.26129 72.026751) + (xy 163.267078 72.080035) + (xy 163.269927 72.09202) + (xy 163.316351 72.215855) + (xy 163.323059 72.228108) + (xy 163.401863 72.333256) + (xy 163.411744 72.343137) + (xy 163.516892 72.421941) + (xy 163.529145 72.428649) + (xy 163.652978 72.475072) + (xy 163.664967 72.477923) + (xy 163.718252 72.483711) + (xy 163.723586 72.484) + (xy 164.75332 72.484) + (xy 164.766005 72.479878) + (xy 164.769 72.475757) + (xy 164.769 71.44168) + (xy 164.764878 71.428995) + (xy 164.760757 71.426) + (xy 163.276681 71.426) + (xy 163.263996 71.430122) + (xy 163.261001 71.434243) + (xy 163.261001 72.021411) + (xy 158.092956 72.021411) (xy 158.093883 72.010813) (xy 158.091642 72.00245) (xy 158.091642 72.002447) (xy 158.083826 71.973276) (xy 158.081957 71.964848) - (xy 158.078132 71.943159) + (xy 158.077503 71.939589) (xy 158.075208 71.926575) (xy 158.070877 71.919074) (xy 158.068878 71.91358) @@ -32675,58 +32716,6 @@ (xy 157.961496 71.776169) (xy 157.933719 71.721652) (xy 157.9325 71.706165) - (xy 157.9325 71.621411) - (xy 163.261001 71.621411) - (xy 163.26129 71.626751) - (xy 163.267078 71.680035) - (xy 163.269927 71.69202) - (xy 163.316351 71.815855) - (xy 163.323059 71.828108) - (xy 163.401863 71.933256) - (xy 163.411744 71.943137) - (xy 163.516892 72.021941) - (xy 163.529145 72.028649) - (xy 163.652978 72.075072) - (xy 163.664967 72.077923) - (xy 163.718252 72.083711) - (xy 163.723586 72.084) - (xy 164.20332 72.084) - (xy 164.216005 72.079878) - (xy 164.219 72.075757) - (xy 164.219 72.068319) - (xy 165.219 72.068319) - (xy 165.223122 72.081004) - (xy 165.227243 72.083999) - (xy 165.714411 72.083999) - (xy 165.719751 72.08371) - (xy 165.773035 72.077922) - (xy 165.78502 72.075073) - (xy 165.908855 72.028649) - (xy 165.921108 72.021941) - (xy 166.026256 71.943137) - (xy 166.036137 71.933256) - (xy 166.114941 71.828108) - (xy 166.121649 71.815855) - (xy 166.168072 71.692022) - (xy 166.170923 71.680033) - (xy 166.176711 71.626748) - (xy 166.177 71.621414) - (xy 166.177 71.04168) - (xy 166.172878 71.028995) - (xy 166.168757 71.026) - (xy 165.23468 71.026) - (xy 165.221995 71.030122) - (xy 165.219 71.034243) - (xy 165.219 72.068319) - (xy 164.219 72.068319) - (xy 164.219 71.04168) - (xy 164.214878 71.028995) - (xy 164.210757 71.026) - (xy 163.276681 71.026) - (xy 163.263996 71.030122) - (xy 163.261001 71.034243) - (xy 163.261001 71.621411) - (xy 157.9325 71.621411) (xy 157.9325 71.605606) (xy 157.951407 71.547415) (xy 157.964419 71.534495) @@ -32739,67 +32728,41 @@ (xy 158.106983 71.281763) (xy 158.106983 71.281761) (xy 158.1075 71.278218) - (xy 158.1075 70.01032) - (xy 163.261 70.01032) - (xy 163.265122 70.023005) - (xy 163.269243 70.026) - (xy 164.20332 70.026) - (xy 164.216005 70.021878) - (xy 164.219 70.017757) - (xy 164.219 70.01032) - (xy 165.219 70.01032) - (xy 165.223122 70.023005) - (xy 165.227243 70.026) - (xy 166.161319 70.026) - (xy 166.174004 70.021878) - (xy 166.176999 70.017757) - (xy 166.176999 69.430589) - (xy 166.17671 69.425249) - (xy 166.170922 69.371965) - (xy 166.168073 69.35998) - (xy 166.121649 69.236145) - (xy 166.114941 69.223892) - (xy 166.036137 69.118744) - (xy 166.026256 69.108863) - (xy 165.921108 69.030059) - (xy 165.908855 69.023351) - (xy 165.785022 68.976928) - (xy 165.773033 68.974077) - (xy 165.719748 68.968289) - (xy 165.714414 68.968) - (xy 165.23468 68.968) - (xy 165.221995 68.972122) - (xy 165.219 68.976243) - (xy 165.219 70.01032) - (xy 164.219 70.01032) - (xy 164.219 68.983681) - (xy 164.214878 68.970996) - (xy 164.210757 68.968001) - (xy 163.723589 68.968001) - (xy 163.718249 68.96829) - (xy 163.664965 68.974078) - (xy 163.65298 68.976927) - (xy 163.529145 69.023351) - (xy 163.516892 69.030059) - (xy 163.411744 69.108863) - (xy 163.401863 69.118744) - (xy 163.323059 69.223892) - (xy 163.316351 69.236145) - (xy 163.269928 69.359978) - (xy 163.267077 69.371967) - (xy 163.261289 69.425252) - (xy 163.261 69.430586) - (xy 163.261 70.01032) - (xy 158.1075 70.01032) + (xy 158.1075 70.41032) + (xy 163.261 70.41032) + (xy 163.265122 70.423005) + (xy 163.269243 70.426) + (xy 164.75332 70.426) + (xy 164.766005 70.421878) + (xy 164.769 70.417757) + (xy 164.769 69.383681) + (xy 164.764878 69.370996) + (xy 164.760757 69.368001) + (xy 163.723589 69.368001) + (xy 163.718249 69.36829) + (xy 163.664965 69.374078) + (xy 163.65298 69.376927) + (xy 163.529145 69.423351) + (xy 163.516892 69.430059) + (xy 163.411744 69.508863) + (xy 163.401863 69.518744) + (xy 163.323059 69.623892) + (xy 163.316351 69.636145) + (xy 163.269928 69.759978) + (xy 163.267077 69.771967) + (xy 163.261289 69.825252) + (xy 163.261 69.830586) + (xy 163.261 70.41032) + (xy 158.1075 70.41032) (xy 158.1075 69.561782) (xy 158.106964 69.558135) (xy 158.098479 69.500501) (xy 158.098478 69.500499) (xy 158.097358 69.492888) (xy 158.089013 69.47589) - (xy 158.066769 69.430586) + (xy 158.057866 69.412452) (xy 158.045932 69.388145) - (xy 158.029556 69.371797) + (xy 158.031841 69.374078) (xy 157.96914 69.311487) (xy 157.96335 69.305707) (xy 157.858518 69.254464) @@ -32938,9 +32901,9 @@ (xy 156.828478 69.500499) (xy 156.827358 69.492888) (xy 156.819013 69.47589) - (xy 156.796769 69.430586) + (xy 156.787866 69.412452) (xy 156.775932 69.388145) - (xy 156.759556 69.371797) + (xy 156.761841 69.374078) (xy 156.69914 69.311487) (xy 156.69335 69.305707) (xy 156.588518 69.254464) @@ -33667,7 +33630,7 @@ (xy 150.924841 68.342536) (xy 151.050282 68.246282) (xy 151.146536 68.120841) - (xy 151.202387 67.986006) + (xy 151.203587 67.983107) (xy 151.20456 67.980759) (xy 151.207044 67.974762) (xy 151.227682 67.818) @@ -33675,9 +33638,7 @@ (xy 151.212871 67.7055) (xy 151.207044 67.661238) (xy 151.146536 67.515159) - (xy 151.107211 67.463909) - (xy 151.078433 67.426405) - (xy 151.067481 67.395477) + (xy 151.054701 67.395477) (xy 158.696301 67.395477) (xy 158.696347 67.407061) (xy 158.718879 67.4746) @@ -33716,40 +33677,60 @@ (xy 159.180757 67.392) (xy 158.707002 67.392) (xy 158.696301 67.395477) - (xy 151.067481 67.395477) - (xy 151.058009 67.368729) - (xy 151.075387 67.310064) - (xy 151.11203 67.277928) - (xy 151.128403 67.269586) - (xy 151.128405 67.269585) - (xy 151.135342 67.26605) - (xy 151.22505 67.176342) - (xy 151.228586 67.169403) - (xy 151.228588 67.1694) - (xy 151.255005 67.117554) - (xy 151.29827 67.07429) - (xy 151.343214 67.0635) - (xy 151.429466 67.0635) - (xy 151.438095 67.063877) - (xy 151.476807 67.067264) - (xy 151.51435 67.057204) - (xy 151.522784 67.055334) - (xy 151.552517 67.050092) - (xy 151.552519 67.050091) - (xy 151.561045 67.048588) - (xy 151.568544 67.044258) - (xy 151.574029 67.042262) - (xy 151.579316 67.039796) - (xy 151.587684 67.037554) - (xy 151.619511 67.015268) - (xy 151.626795 67.010627) - (xy 151.636663 67.00493) - (xy 151.660455 66.991194) - (xy 151.685431 66.961429) - (xy 151.691265 66.955061) - (xy 152.82183 65.824496) - (xy 152.876347 65.796719) - (xy 152.891834 65.7955) + (xy 151.054701 67.395477) + (xy 151.050282 67.389718) + (xy 151.021478 67.367616) + (xy 151.000998 67.351901) + (xy 150.966342 67.301476) + (xy 150.967944 67.240312) + (xy 150.991261 67.203355) + (xy 151.044731 67.149885) + (xy 151.059733 67.137574) + (xy 151.066518 67.133041) + (xy 151.06652 67.133039) + (xy 151.074624 67.127624) + (xy 151.091729 67.102026) + (xy 151.135515 67.036495) + (xy 151.156897 66.929) + (xy 151.153402 66.911429) + (xy 151.1515 66.892116) + (xy 151.1515 66.665966) + (xy 151.170407 66.607775) + (xy 151.219907 66.571811) + (xy 151.235015 66.568185) + (xy 151.268609 66.562865) + (xy 151.268611 66.562864) + (xy 151.276304 66.561646) + (xy 151.364268 66.516826) + (xy 151.382403 66.507586) + (xy 151.382405 66.507585) + (xy 151.389342 66.50405) + (xy 151.47905 66.414342) + (xy 151.482586 66.407403) + (xy 151.482588 66.4074) + (xy 151.509005 66.355554) + (xy 151.55227 66.31229) + (xy 151.597214 66.3015) + (xy 152.318466 66.3015) + (xy 152.327095 66.301877) + (xy 152.365807 66.305264) + (xy 152.40335 66.295204) + (xy 152.411784 66.293334) + (xy 152.441517 66.288092) + (xy 152.441519 66.288091) + (xy 152.450045 66.286588) + (xy 152.457544 66.282258) + (xy 152.463029 66.280262) + (xy 152.468316 66.277796) + (xy 152.476684 66.275554) + (xy 152.508511 66.253268) + (xy 152.515795 66.248627) + (xy 152.549455 66.229194) + (xy 152.574431 66.199429) + (xy 152.580265 66.193061) + (xy 152.94883 65.824496) + (xy 153.003347 65.796719) + (xy 153.018834 65.7955) (xy 153.1975 65.7955) (xy 153.255691 65.814407) (xy 153.291655 65.863907) @@ -33761,7 +33742,7 @@ (xy 153.306642 66.397112) (xy 153.310033 66.404018) (xy 153.310033 66.404019) - (xy 153.318024 66.420295) + (xy 153.317805 66.419848) (xy 153.358068 66.501855) (xy 153.44065 66.584293) (xy 153.545482 66.635536) @@ -33776,8 +33757,8 @@ (xy 154.041499 66.636479) (xy 154.041501 66.636478) (xy 154.049112 66.635358) - (xy 154.059653 66.630183) - (xy 154.127399 66.596921) + (xy 154.079878 66.620253) + (xy 154.124988 66.598105) (xy 154.153855 66.583932) (xy 154.236293 66.50135) (xy 154.287536 66.396518) @@ -33787,7 +33768,7 @@ (xy 154.296983 66.331761) (xy 154.2975 66.328218) (xy 154.2975 64.611782) - (xy 154.296632 64.605881) + (xy 154.296688 64.606262) (xy 154.288479 64.550501) (xy 154.288478 64.550499) (xy 154.287358 64.542888) @@ -33823,97 +33804,125 @@ (xy 153.277593 65.103691) (xy 153.228093 65.139655) (xy 153.1975 65.1445) - (xy 152.734534 65.1445) - (xy 152.725905 65.144123) - (xy 152.695822 65.141491) - (xy 152.687193 65.140736) - (xy 152.678826 65.142978) - (xy 152.649651 65.150796) - (xy 152.641216 65.152666) - (xy 152.611483 65.157908) - (xy 152.611481 65.157909) - (xy 152.602955 65.159412) - (xy 152.595456 65.163742) - (xy 152.589971 65.165738) - (xy 152.584684 65.168204) - (xy 152.576316 65.170446) - (xy 152.546944 65.191013) - (xy 152.544489 65.192732) - (xy 152.537208 65.197371) - (xy 152.503545 65.216806) - (xy 152.489327 65.23375) - (xy 152.478569 65.246571) - (xy 152.472735 65.252939) - (xy 151.389236 66.336438) - (xy 151.334719 66.364215) - (xy 151.274287 66.354644) - (xy 151.231022 66.311378) - (xy 151.228587 66.306599) - (xy 151.228586 66.306597) - (xy 151.22505 66.299658) - (xy 151.135342 66.20995) - (xy 151.128404 66.206415) - (xy 151.1284 66.206412) - (xy 151.042036 66.162407) - (xy 150.998772 66.119143) - (xy 150.989201 66.05871) - (xy 151.016979 66.004194) - (xy 151.057377 65.979728) - (xy 151.184797 65.939798) - (xy 151.195597 65.934921) - (xy 151.331965 65.852333) - (xy 151.341288 65.845024) - (xy 151.454024 65.732288) - (xy 151.461333 65.722965) - (xy 151.543923 65.586595) - (xy 151.548797 65.575798) - (xy 151.571622 65.502964) - (xy 151.5715 65.491385) - (xy 151.560895 65.488) - (xy 149.683369 65.488) - (xy 149.672357 65.491578) - (xy 149.672299 65.50271) - (xy 149.695203 65.575798) - (xy 149.700077 65.586595) - (xy 149.782667 65.722965) - (xy 149.789976 65.732288) - (xy 149.902712 65.845024) - (xy 149.912035 65.852333) - (xy 150.048403 65.934921) - (xy 150.059203 65.939798) - (xy 150.186623 65.979728) - (xy 150.236497 66.015171) - (xy 150.256013 66.073161) - (xy 150.237716 66.131546) - (xy 150.201964 66.162407) - (xy 150.1156 66.206412) - (xy 150.115596 66.206415) - (xy 150.108658 66.20995) - (xy 150.01895 66.299658) - (xy 150.015415 66.306595) - (xy 150.015414 66.306597) - (xy 149.971186 66.3934) - (xy 149.961354 66.412696) - (xy 149.960135 66.42039) - (xy 149.960135 66.420391) - (xy 149.948477 66.493999) - (xy 149.9465 66.506481) - (xy 149.946501 66.969518) - (xy 149.94711 66.973361) - (xy 149.94711 66.973366) - (xy 149.950619 66.995523) - (xy 149.961354 67.063304) - (xy 149.96489 67.070243) - (xy 150.015413 67.1694) - (xy 150.01895 67.176342) - (xy 150.108658 67.26605) - (xy 150.115595 67.269585) - (xy 150.115597 67.269586) - (xy 150.13197 67.277928) - (xy 150.175235 67.321193) - (xy 150.184806 67.381625) - (xy 150.165567 67.426405) - (xy 150.136789 67.463909) + (xy 152.861534 65.1445) + (xy 152.852905 65.144123) + (xy 152.822822 65.141491) + (xy 152.814193 65.140736) + (xy 152.805826 65.142978) + (xy 152.776651 65.150796) + (xy 152.768216 65.152666) + (xy 152.738483 65.157908) + (xy 152.738481 65.157909) + (xy 152.729955 65.159412) + (xy 152.722456 65.163742) + (xy 152.716971 65.165738) + (xy 152.711684 65.168204) + (xy 152.703316 65.170446) + (xy 152.673944 65.191013) + (xy 152.671489 65.192732) + (xy 152.664208 65.197371) + (xy 152.630545 65.216806) + (xy 152.612809 65.237943) + (xy 152.605569 65.246571) + (xy 152.599735 65.252939) + (xy 152.23117 65.621504) + (xy 152.176653 65.649281) + (xy 152.161166 65.6505) + (xy 151.597214 65.6505) + (xy 151.539023 65.631593) + (xy 151.509005 65.596446) + (xy 151.482588 65.5446) + (xy 151.482585 65.544596) + (xy 151.47905 65.537658) + (xy 151.389342 65.44795) + (xy 151.382404 65.444415) + (xy 151.3824 65.444412) + (xy 151.296036 65.400407) + (xy 151.252772 65.357143) + (xy 151.243201 65.29671) + (xy 151.270979 65.242194) + (xy 151.311377 65.217728) + (xy 151.438797 65.177798) + (xy 151.449597 65.172921) + (xy 151.585965 65.090333) + (xy 151.595288 65.083024) + (xy 151.708024 64.970288) + (xy 151.715333 64.960965) + (xy 151.797923 64.824595) + (xy 151.802797 64.813798) + (xy 151.825622 64.740964) + (xy 151.8255 64.729385) + (xy 151.814895 64.726) + (xy 149.937369 64.726) + (xy 149.926357 64.729578) + (xy 149.926299 64.74071) + (xy 149.949203 64.813798) + (xy 149.954077 64.824595) + (xy 150.036667 64.960965) + (xy 150.043976 64.970288) + (xy 150.156712 65.083024) + (xy 150.166035 65.090333) + (xy 150.302403 65.172921) + (xy 150.313203 65.177798) + (xy 150.440623 65.217728) + (xy 150.490497 65.253171) + (xy 150.510013 65.311161) + (xy 150.491716 65.369546) + (xy 150.455964 65.400407) + (xy 150.3696 65.444412) + (xy 150.369596 65.444415) + (xy 150.362658 65.44795) + (xy 150.27295 65.537658) + (xy 150.269415 65.544595) + (xy 150.269414 65.544597) + (xy 150.224649 65.632453) + (xy 150.215354 65.650696) + (xy 150.214135 65.65839) + (xy 150.214135 65.658391) + (xy 150.207769 65.698585) + (xy 150.2005 65.744481) + (xy 150.200501 66.207518) + (xy 150.20111 66.211361) + (xy 150.20111 66.211366) + (xy 150.204619 66.233523) + (xy 150.215354 66.301304) + (xy 150.233967 66.337834) + (xy 150.269413 66.4074) + (xy 150.27295 66.414342) + (xy 150.362658 66.50405) + (xy 150.369595 66.507585) + (xy 150.369597 66.507586) + (xy 150.468756 66.55811) + (xy 150.475696 66.561646) + (xy 150.48339 66.562865) + (xy 150.483391 66.562865) + (xy 150.516987 66.568186) + (xy 150.571504 66.595964) + (xy 150.599281 66.65048) + (xy 150.6005 66.665967) + (xy 150.6005 66.773876) + (xy 150.581593 66.832067) + (xy 150.571504 66.84388) + (xy 150.453269 66.962115) + (xy 150.438267 66.974426) + (xy 150.423376 66.984376) + (xy 150.408007 67.007377) + (xy 150.408006 67.007378) + (xy 150.395567 67.025994) + (xy 150.362485 67.075505) + (xy 150.360583 67.085068) + (xy 150.360582 67.08507) + (xy 150.350139 67.137574) + (xy 150.347037 67.153168) + (xy 150.341103 67.183) + (xy 150.343005 67.192561) + (xy 150.344598 67.200569) + (xy 150.3465 67.219884) + (xy 150.3465 67.223663) + (xy 150.327593 67.281854) + (xy 150.307767 67.302205) + (xy 150.222522 67.367616) + (xy 150.193718 67.389718) (xy 150.097464 67.515159) (xy 150.036956 67.661238) (xy 150.031129 67.7055) @@ -33979,6 +33988,7 @@ (xy 149.079722 67.100993) (xy 149.079723 67.10099) (xy 149.084893 67.093454) + (xy 149.088573 67.077949) (xy 149.091044 67.067534) (xy 149.095414 67.053715) (xy 149.105283 67.028978) @@ -33989,109 +33999,132 @@ (xy 149.11074 66.984534) (xy 149.106804 66.955612) (xy 149.1059 66.942263) - (xy 149.1059 66.570752) - (xy 149.124807 66.512561) - (xy 149.159955 66.482543) - (xy 149.236798 66.443389) - (xy 149.236802 66.443386) - (xy 149.243742 66.43985) - (xy 149.33345 66.350142) - (xy 149.346469 66.324592) - (xy 149.38751 66.244044) - (xy 149.38751 66.244043) - (xy 149.391046 66.237104) - (xy 149.39326 66.223129) - (xy 149.405291 66.147165) - (xy 149.405291 66.147163) - (xy 149.4059 66.143319) - (xy 149.405899 65.530282) - (xy 149.404364 65.520585) - (xy 149.398567 65.483988) - (xy 149.391046 65.436496) - (xy 149.347222 65.350487) - (xy 149.336986 65.330397) - (xy 149.336985 65.330395) - (xy 149.33345 65.323458) - (xy 149.243742 65.23375) - (xy 149.236802 65.230214) - (xy 149.236798 65.230211) - (xy 149.134818 65.178249) - (xy 149.091683 65.135115) - (xy 149.090609 65.129347) - (xy 149.085815 65.12157) - (xy 149.085814 65.121567) - (xy 149.076632 65.106672) - (xy 149.069948 65.093804) - (xy 149.062193 65.075753) - (xy 149.062192 65.075751) - (xy 149.059436 65.069337) - (xy 149.055423 65.064451) - (xy 149.051057 65.060085) - (xy 149.036785 65.042029) - (xy 149.036664 65.041832) - (xy 149.036663 65.041831) - (xy 149.031868 65.034052) - (xy 149.022508 65.026934) - (xy 149.012598 65.019399) - (xy 149.008644 65.016392) - (xy 148.998565 65.007593) - (xy 148.731443 64.740471) - (xy 148.664008 64.673036) - (xy 149.672378 64.673036) - (xy 149.6725 64.684615) - (xy 149.683105 64.688) - (xy 150.20632 64.688) - (xy 150.219005 64.683878) - (xy 150.222 64.679757) - (xy 150.222 64.67232) - (xy 151.022 64.67232) - (xy 151.026122 64.685005) - (xy 151.030243 64.688) - (xy 151.560631 64.688) - (xy 151.571643 64.684422) - (xy 151.571701 64.67329) - (xy 151.548797 64.600202) - (xy 151.543923 64.589405) - (xy 151.461333 64.453035) - (xy 151.454024 64.443712) - (xy 151.341288 64.330976) - (xy 151.331965 64.323667) - (xy 151.195597 64.241079) - (xy 151.184797 64.236202) - (xy 151.033246 64.18871) - (xy 151.024605 64.190665) - (xy 151.022735 64.192797) - (xy 151.022 64.196367) - (xy 151.022 64.67232) - (xy 150.222 64.67232) - (xy 150.222 64.201966) - (xy 150.217878 64.189281) - (xy 150.215583 64.187613) - (xy 150.21554 64.187608) - (xy 150.212019 64.188313) - (xy 150.059203 64.236202) - (xy 150.048403 64.241079) - (xy 149.912035 64.323667) - (xy 149.902712 64.330976) - (xy 149.789976 64.443712) - (xy 149.782667 64.453035) - (xy 149.700077 64.589405) - (xy 149.695203 64.600202) - (xy 149.672378 64.673036) - (xy 148.664008 64.673036) - (xy 148.453708 64.462737) - (xy 148.425932 64.408221) - (xy 148.435503 64.347789) - (xy 148.478768 64.304524) - (xy 148.536635 64.294581) - (xy 148.685166 64.314135) + (xy 149.1059 66.826742) + (xy 149.124807 66.768551) + (xy 149.174307 66.732587) + (xy 149.177105 66.731828) + (xy 149.180369 66.731519) + (xy 149.308184 66.686634) + (xy 149.348116 66.65714) + (xy 149.411193 66.61055) + (xy 149.41715 66.60615) + (xy 149.457364 66.551705) + (xy 149.493238 66.503136) + (xy 149.493239 66.503135) + (xy 149.497634 66.497184) + (xy 149.542519 66.369369) + (xy 149.5455 66.337834) + (xy 149.5455 64.980166) + (xy 149.545219 64.977186) + (xy 149.543087 64.954639) + (xy 149.543087 64.954638) + (xy 149.542519 64.948631) + (xy 149.497634 64.820816) + (xy 149.492451 64.813798) + (xy 149.42155 64.717807) + (xy 149.41715 64.71185) + (xy 149.308184 64.631366) + (xy 149.180369 64.586481) + (xy 149.174362 64.585913) + (xy 149.174361 64.585913) + (xy 149.151145 64.583718) + (xy 149.151135 64.583718) + (xy 149.148834 64.5835) + (xy 148.416166 64.5835) + (xy 148.413865 64.583718) + (xy 148.413855 64.583718) + (xy 148.390639 64.585913) + (xy 148.390638 64.585913) + (xy 148.384631 64.586481) + (xy 148.256816 64.631366) + (xy 148.14785 64.71185) + (xy 148.14345 64.717807) + (xy 148.07255 64.813798) + (xy 148.067366 64.820816) + (xy 148.022481 64.948631) + (xy 148.021913 64.954638) + (xy 148.021913 64.954639) + (xy 148.019782 64.977186) + (xy 148.0195 64.980166) + (xy 148.0195 65.2595) + (xy 148.000593 65.317691) + (xy 147.951093 65.353655) + (xy 147.9205 65.3585) + (xy 147.7703 65.3585) + (xy 147.712109 65.339593) + (xy 147.676145 65.290093) + (xy 147.6713 65.2595) + (xy 147.6713 64.182854) + (xy 147.690207 64.124663) + (xy 147.710032 64.104312) + (xy 147.720187 64.09652) + (xy 147.799082 64.035982) + (xy 147.895336 63.910541) + (xy 147.919752 63.851596) + (xy 147.959489 63.80507) + (xy 148.018984 63.790787) + (xy 148.075512 63.814202) + (xy 148.106114 63.862705) + (xy 148.106556 63.866062) + (xy 148.109038 63.872054) + (xy 148.109039 63.872058) + (xy 148.145868 63.96097) + (xy 148.167064 64.012141) + (xy 148.263318 64.137582) + (xy 148.388759 64.233836) + (xy 148.470944 64.267878) + (xy 148.525592 64.290514) + (xy 148.534838 64.294344) (xy 148.6916 64.314982) (xy 148.848362 64.294344) (xy 148.857609 64.290514) - (xy 148.94198 64.255566) + (xy 148.912256 64.267878) (xy 148.994441 64.233836) (xy 149.119882 64.137582) (xy 149.216136 64.012141) + (xy 149.258015 63.911036) + (xy 149.926378 63.911036) + (xy 149.9265 63.922615) + (xy 149.937105 63.926) + (xy 150.46032 63.926) + (xy 150.473005 63.921878) + (xy 150.476 63.917757) + (xy 150.476 63.91032) + (xy 151.276 63.91032) + (xy 151.280122 63.923005) + (xy 151.284243 63.926) + (xy 151.814631 63.926) + (xy 151.825643 63.922422) + (xy 151.825701 63.91129) + (xy 151.802797 63.838202) + (xy 151.797923 63.827405) + (xy 151.715333 63.691035) + (xy 151.708024 63.681712) + (xy 151.595288 63.568976) + (xy 151.585965 63.561667) + (xy 151.449597 63.479079) + (xy 151.438797 63.474202) + (xy 151.287246 63.42671) + (xy 151.278605 63.428665) + (xy 151.276735 63.430797) + (xy 151.276 63.434367) + (xy 151.276 63.91032) + (xy 150.476 63.91032) + (xy 150.476 63.439966) + (xy 150.471878 63.427281) + (xy 150.469583 63.425613) + (xy 150.46954 63.425608) + (xy 150.466019 63.426313) + (xy 150.313203 63.474202) + (xy 150.302403 63.479079) + (xy 150.166035 63.561667) + (xy 150.156712 63.568976) + (xy 150.043976 63.681712) + (xy 150.036667 63.691035) + (xy 149.954077 63.827405) + (xy 149.949203 63.838202) + (xy 149.926378 63.911036) + (xy 149.258015 63.911036) (xy 149.276644 63.866062) (xy 149.297282 63.7093) (xy 149.296347 63.702194) @@ -34278,7 +34311,7 @@ (xy 137.377022 67.326536) (xy 137.416126 67.215181) (xy 137.41846 67.208534) - (xy 137.419874 67.193575) + (xy 137.41997 67.192561) (xy 137.421182 67.179744) (xy 137.421182 67.179734) (xy 137.4214 67.177433) @@ -34321,30 +34354,12 @@ (xy 143.985044 65.956762) (xy 144.005682 65.8) (xy 144.004042 65.787539) - (xy 143.996939 65.733593) + (xy 143.996007 65.726514) (xy 143.985044 65.643238) + (xy 143.980221 65.631593) + (xy 143.949197 65.556696) (xy 143.924536 65.497159) (xy 143.828282 65.371718) - (xy 143.826302 65.370199) - (xy 144.497601 65.370199) - (xy 144.508568 65.3738) - (xy 144.97472 65.3738) - (xy 144.987405 65.369678) - (xy 144.9904 65.365557) - (xy 144.9904 64.908461) - (xy 144.986923 64.897761) - (xy 144.975337 64.897806) - (xy 144.882803 64.928678) - (xy 144.872454 64.933525) - (xy 144.736888 65.017416) - (xy 144.727937 65.024511) - (xy 144.615305 65.137339) - (xy 144.608226 65.146303) - (xy 144.52457 65.282018) - (xy 144.519744 65.292368) - (xy 144.49767 65.358918) - (xy 144.497601 65.370199) - (xy 143.826302 65.370199) (xy 143.702841 65.275464) (xy 143.556762 65.214956) (xy 143.413779 65.196132) @@ -34356,115 +34371,289 @@ (xy 143.299059 65.126758) (xy 143.299059 65.065572) (xy 143.32321 65.026161) - (xy 144.129854 64.219518) + (xy 144.138684 64.210688) (xy 145.231076 63.118296) (xy 145.285593 63.090519) (xy 145.30108 63.0893) - (xy 146.810916 63.0893) - (xy 146.869107 63.108207) - (xy 146.905071 63.157707) - (xy 146.905071 63.218893) - (xy 146.889458 63.248567) - (xy 146.878551 63.262781) - (xy 146.846264 63.304859) - (xy 146.785756 63.450938) - (xy 146.765118 63.6077) - (xy 146.769812 63.64335) - (xy 146.770711 63.650182) - (xy 146.759561 63.710342) - (xy 146.715179 63.75246) - (xy 146.654517 63.760446) - (xy 146.617903 63.744145) - (xy 146.617607 63.744658) - (xy 146.612728 63.741841) - (xy 146.612293 63.741647) - (xy 146.606841 63.737464) - (xy 146.460762 63.676956) - (xy 146.304 63.656318) - (xy 146.147238 63.676956) - (xy 146.001159 63.737464) - (xy 145.875718 63.833718) - (xy 145.779464 63.959159) - (xy 145.718956 64.105238) - (xy 145.698318 64.262) - (xy 145.718956 64.418762) - (xy 145.72144 64.424759) - (xy 145.722768 64.427966) - (xy 145.779464 64.564841) - (xy 145.875718 64.690282) - (xy 145.917419 64.72228) - (xy 145.952073 64.772704) - (xy 145.950471 64.833868) - (xy 145.91485 64.881268) - (xy 145.894639 64.895764) - (xy 145.8904 64.908678) - (xy 145.8904 66.1748) - (xy 145.871493 66.232991) - (xy 145.821993 66.268955) - (xy 145.7914 66.2738) - (xy 144.508402 66.2738) - (xy 144.497701 66.277277) - (xy 144.497747 66.288861) - (xy 144.520279 66.3564) - (xy 144.525126 66.366747) - (xy 144.609016 66.502312) - (xy 144.616111 66.511263) - (xy 144.728939 66.623895) - (xy 144.737903 66.630974) - (xy 144.859308 66.705808) - (xy 144.898923 66.752438) - (xy 144.903564 66.813447) - (xy 144.877364 66.860088) - (xy 144.841872 66.89558) - (xy 144.838337 66.902517) - (xy 144.838336 66.902519) - (xy 144.786155 67.00493) - (xy 144.780681 67.015674) - (xy 144.779462 67.023368) - (xy 144.779462 67.023369) - (xy 144.766825 67.10316) - (xy 144.7649 67.115312) - (xy 144.7649 67.632288) - (xy 144.765509 67.636132) - (xy 144.765509 67.636134) - (xy 144.776496 67.7055) - (xy 144.780681 67.731926) - (xy 144.784217 67.738865) - (xy 144.784217 67.738866) - (xy 144.837976 67.844373) - (xy 144.841872 67.85202) - (xy 144.93718 67.947328) - (xy 144.944117 67.950863) - (xy 144.944119 67.950864) - (xy 145.036731 67.998052) - (xy 145.057274 68.008519) - (xy 145.06497 68.009738) - (xy 145.071492 68.011857) - (xy 145.120992 68.047821) - (xy 145.1399 68.106012) - (xy 145.1399 68.125348) - (xy 145.140725 68.129778) - (xy 145.141061 68.134971) - (xy 145.142174 68.164608) - (xy 145.14578 68.173002) - (xy 145.145781 68.173005) - (xy 145.146717 68.175183) - (xy 145.153083 68.196134) - (xy 145.155191 68.207453) - (xy 145.159988 68.215235) - (xy 145.169168 68.230128) - (xy 145.175852 68.242996) - (xy 145.179076 68.250499) - (xy 145.186364 68.267463) - (xy 145.190378 68.272349) - (xy 145.194742 68.276713) - (xy 145.209013 68.294768) - (xy 145.213932 68.302748) - (xy 145.237169 68.320418) - (xy 145.247239 68.32921) - (xy 146.001904 69.083876) - (xy 146.029681 69.138393) - (xy 146.0309 69.15388) + (xy 145.714728 63.0893) + (xy 145.772919 63.108207) + (xy 145.808883 63.157707) + (xy 145.808883 63.218893) + (xy 145.793269 63.248568) + (xy 145.783415 63.261409) + (xy 145.783413 63.261413) + (xy 145.779464 63.266559) + (xy 145.718956 63.412638) + (xy 145.698318 63.5694) + (xy 145.712359 63.676046) + (xy 145.712969 63.680683) + (xy 145.701819 63.740843) + (xy 145.68482 63.763609) + (xy 145.595349 63.85308) + (xy 145.59222 63.85578) + (xy 145.587731 63.857975) + (xy 145.581513 63.864678) + (xy 145.554107 63.894222) + (xy 145.551531 63.896898) + (xy 145.537752 63.910677) + (xy 145.535207 63.914387) + (xy 145.531771 63.9183) + (xy 145.511599 63.940046) + (xy 145.508212 63.948534) + (xy 145.508212 63.948535) + (xy 145.507334 63.950736) + (xy 145.49702 63.970052) + (xy 145.495679 63.972007) + (xy 145.495678 63.97201) + (xy 145.490508 63.979546) + (xy 145.488398 63.988438) + (xy 145.484359 64.005458) + (xy 145.479986 64.019284) + (xy 145.472706 64.037532) + (xy 145.470117 64.044022) + (xy 145.4695 64.050315) + (xy 145.4695 64.056484) + (xy 145.466825 64.079343) + (xy 145.46466 64.088466) + (xy 145.468596 64.117387) + (xy 145.4695 64.130737) + (xy 145.4695 64.512854) + (xy 145.450593 64.571045) + (xy 145.403302 64.606262) + (xy 145.397678 64.608237) + (xy 145.331816 64.631366) + (xy 145.22285 64.71185) + (xy 145.21845 64.717807) + (xy 145.14755 64.813798) + (xy 145.142366 64.820816) + (xy 145.097481 64.948631) + (xy 145.096913 64.954638) + (xy 145.096913 64.954639) + (xy 145.094782 64.977186) + (xy 145.0945 64.980166) + (xy 145.0945 66.337834) + (xy 145.097481 66.369369) + (xy 145.142366 66.497184) + (xy 145.146761 66.503135) + (xy 145.146762 66.503136) + (xy 145.182636 66.551705) + (xy 145.22285 66.60615) + (xy 145.228807 66.61055) + (xy 145.291885 66.65714) + (xy 145.331816 66.686634) + (xy 145.379579 66.703407) + (xy 145.403302 66.711738) + (xy 145.451941 66.748858) + (xy 145.4695 66.805146) + (xy 145.4695 66.849492) + (xy 145.469197 66.853617) + (xy 145.467575 66.858342) + (xy 145.468843 66.892116) + (xy 145.46943 66.907761) + (xy 145.4695 66.911462) + (xy 145.4695 66.930948) + (xy 145.470325 66.935378) + (xy 145.470661 66.940571) + (xy 145.471774 66.970208) + (xy 145.47538 66.978602) + (xy 145.475381 66.978605) + (xy 145.476317 66.980783) + (xy 145.482683 67.001734) + (xy 145.484791 67.013053) + (xy 145.489588 67.020835) + (xy 145.498768 67.035728) + (xy 145.505451 67.048595) + (xy 145.515964 67.073063) + (xy 145.519978 67.077949) + (xy 145.524342 67.082313) + (xy 145.538613 67.100368) + (xy 145.543532 67.108348) + (xy 145.566769 67.126018) + (xy 145.576839 67.13481) + (xy 145.79968 67.357651) + (xy 145.80238 67.36078) + (xy 145.804575 67.365269) + (xy 145.811278 67.371487) + (xy 145.840822 67.398893) + (xy 145.843498 67.401469) + (xy 145.857277 67.415248) + (xy 145.860987 67.417793) + (xy 145.8649 67.421229) + (xy 145.874745 67.430361) + (xy 145.886646 67.441401) + (xy 145.895132 67.444787) + (xy 145.895134 67.444788) + (xy 145.897337 67.445667) + (xy 145.916648 67.455978) + (xy 145.918607 67.457322) + (xy 145.91861 67.457323) + (xy 145.926146 67.462493) + (xy 145.935038 67.464603) + (xy 145.93504 67.464604) + (xy 145.952066 67.468644) + (xy 145.965885 67.473014) + (xy 145.990622 67.482883) + (xy 145.996915 67.4835) + (xy 146.003085 67.4835) + (xy 146.025941 67.486175) + (xy 146.035066 67.48834) + (xy 146.063988 67.484404) + (xy 146.077337 67.4835) + (xy 147.410521 67.4835) + (xy 147.468712 67.502407) + (xy 147.480525 67.512496) + (xy 147.506504 67.538475) + (xy 147.534281 67.592992) + (xy 147.5355 67.608479) + (xy 147.5355 68.0311) + (xy 147.516593 68.089291) + (xy 147.467093 68.125255) + (xy 147.4365 68.1301) + (xy 147.166252 68.1301) + (xy 147.146158 68.134097) + (xy 147.117334 68.13983) + (xy 147.117332 68.139831) + (xy 147.107769 68.141733) + (xy 147.041448 68.186048) + (xy 146.997133 68.252369) + (xy 146.995231 68.261932) + (xy 146.99523 68.261934) + (xy 146.992549 68.275414) + (xy 146.962652 68.328798) + (xy 146.907087 68.354414) + (xy 146.895451 68.3551) + (xy 146.667172 68.3551) + (xy 146.608981 68.336193) + (xy 146.585681 68.310908) + (xy 146.585436 68.310337) + (xy 146.581423 68.305451) + (xy 146.577057 68.301085) + (xy 146.562785 68.283029) + (xy 146.562664 68.282832) + (xy 146.562663 68.282831) + (xy 146.557868 68.275052) + (xy 146.53463 68.257381) + (xy 146.524575 68.248603) + (xy 146.300317 68.024346) + (xy 146.29762 68.021222) + (xy 146.295425 68.016731) + (xy 146.259178 67.983107) + (xy 146.256502 67.980531) + (xy 146.242723 67.966752) + (xy 146.239013 67.964207) + (xy 146.2351 67.960771) + (xy 146.220055 67.946815) + (xy 146.213354 67.940599) + (xy 146.202664 67.936334) + (xy 146.183348 67.92602) + (xy 146.181393 67.924679) + (xy 146.18139 67.924678) + (xy 146.173854 67.919508) + (xy 146.147941 67.913359) + (xy 146.134116 67.908986) + (xy 146.115868 67.901706) + (xy 146.115866 67.901706) + (xy 146.109378 67.899117) + (xy 146.103085 67.8985) + (xy 146.096916 67.8985) + (xy 146.074057 67.895825) + (xy 146.073827 67.89577) + (xy 146.073825 67.89577) + (xy 146.064934 67.89366) + (xy 146.036013 67.897596) + (xy 146.022663 67.8985) + (xy 145.144212 67.8985) + (xy 145.086021 67.879593) + (xy 145.050057 67.830092) + (xy 145.047938 67.82357) + (xy 145.046719 67.815874) + (xy 145.037257 67.797303) + (xy 144.989064 67.702719) + (xy 144.989063 67.702717) + (xy 144.985528 67.69578) + (xy 144.89022 67.600472) + (xy 144.883283 67.596937) + (xy 144.883281 67.596936) + (xy 144.777066 67.542817) + (xy 144.777065 67.542817) + (xy 144.770126 67.539281) + (xy 144.762432 67.538062) + (xy 144.762431 67.538062) + (xy 144.674334 67.524109) + (xy 144.674332 67.524109) + (xy 144.670488 67.5235) + (xy 144.153512 67.5235) + (xy 144.149668 67.524109) + (xy 144.149666 67.524109) + (xy 144.061569 67.538062) + (xy 144.061568 67.538062) + (xy 144.053874 67.539281) + (xy 144.046935 67.542817) + (xy 144.046934 67.542817) + (xy 143.940719 67.596936) + (xy 143.940717 67.596937) + (xy 143.93378 67.600472) + (xy 143.898369 67.635883) + (xy 143.843852 67.66366) + (xy 143.78342 67.654089) + (xy 143.74418 67.617974) + (xy 143.668383 67.495488) + (xy 143.661289 67.486537) + (xy 143.548461 67.373905) + (xy 143.539497 67.366826) + (xy 143.403782 67.28317) + (xy 143.393432 67.278344) + (xy 143.326882 67.25627) + (xy 143.315601 67.256201) + (xy 143.312 67.267168) + (xy 143.312 69.130998) + (xy 143.315477 69.141699) + (xy 143.327061 69.141653) + (xy 143.3946 69.119121) + (xy 143.404947 69.114274) + (xy 143.540512 69.030384) + (xy 143.549463 69.023289) + (xy 143.662095 68.910461) + (xy 143.669174 68.901497) + (xy 143.744008 68.780092) + (xy 143.790638 68.740477) + (xy 143.851647 68.735836) + (xy 143.898288 68.762036) + (xy 143.93378 68.797528) + (xy 143.940717 68.801063) + (xy 143.940719 68.801064) + (xy 144.046934 68.855183) + (xy 144.053874 68.858719) + (xy 144.061568 68.859938) + (xy 144.061569 68.859938) + (xy 144.149666 68.873891) + (xy 144.149668 68.873891) + (xy 144.153512 68.8745) + (xy 144.670488 68.8745) + (xy 144.674332 68.873891) + (xy 144.674334 68.873891) + (xy 144.762431 68.859938) + (xy 144.762432 68.859938) + (xy 144.770126 68.858719) + (xy 144.777066 68.855183) + (xy 144.883281 68.801064) + (xy 144.883283 68.801063) + (xy 144.89022 68.797528) + (xy 144.985528 68.70222) + (xy 144.998463 68.676835) + (xy 145.043182 68.589068) + (xy 145.043182 68.589067) + (xy 145.046719 68.582126) + (xy 145.047938 68.57443) + (xy 145.050057 68.567908) + (xy 145.086021 68.518408) + (xy 145.144212 68.4995) + (xy 145.884521 68.4995) + (xy 145.942712 68.518407) + (xy 145.954525 68.528496) + (xy 146.001904 68.575875) + (xy 146.029681 68.630392) + (xy 146.0309 68.645879) (xy 146.0309 69.97868) (xy 146.011993 70.036871) (xy 145.962493 70.072835) @@ -35048,7 +35237,7 @@ (xy 132.645446 69.381368) (xy 132.688711 69.424633) (xy 132.698282 69.485065) - (xy 132.689523 69.54037) + (xy 132.689937 69.537754) (xy 132.6861 69.561981) (xy 132.686101 70.175018) (xy 132.68671 70.178861) @@ -35530,7 +35719,7 @@ (xy 137.054879 69.639201) (xy 137.054878 69.639199) (xy 137.053758 69.631588) - (xy 137.039864 69.603288) + (xy 137.04998 69.623892) (xy 137.025115 69.573249) (xy 137.002332 69.526845) (xy 136.91975 69.444407) @@ -35589,7 +35778,7 @@ (xy 139.329879 69.639201) (xy 139.329878 69.639199) (xy 139.328758 69.631588) - (xy 139.314864 69.603288) + (xy 139.32498 69.623892) (xy 139.300115 69.573249) (xy 139.277332 69.526845) (xy 139.19475 69.444407) @@ -35608,6 +35797,46 @@ (xy 138.778325 68.978858) (xy 138.77647 68.929438) (xy 138.7764 68.925725) + (xy 138.7764 68.652477) + (xy 141.935961 68.652477) + (xy 141.936006 68.664063) + (xy 141.966878 68.756597) + (xy 141.971725 68.766946) + (xy 142.055616 68.902512) + (xy 142.062711 68.911463) + (xy 142.175539 69.024095) + (xy 142.184503 69.031174) + (xy 142.320218 69.11483) + (xy 142.330568 69.119656) + (xy 142.397118 69.14173) + (xy 142.408399 69.141799) + (xy 142.412 69.130832) + (xy 142.412 68.66468) + (xy 142.407878 68.651995) + (xy 142.403757 68.649) + (xy 141.946661 68.649) + (xy 141.935961 68.652477) + (xy 138.7764 68.652477) + (xy 138.7764 67.745399) + (xy 141.935909 67.745399) + (xy 141.946878 67.749) + (xy 142.39632 67.749) + (xy 142.409005 67.744878) + (xy 142.412 67.740757) + (xy 142.412 67.267002) + (xy 142.408523 67.256301) + (xy 142.396939 67.256347) + (xy 142.3294 67.278879) + (xy 142.319053 67.283726) + (xy 142.183488 67.367616) + (xy 142.174537 67.374711) + (xy 142.061905 67.487539) + (xy 142.054826 67.496503) + (xy 141.971171 67.632217) + (xy 141.966343 67.642571) + (xy 141.935978 67.734118) + (xy 141.935909 67.745399) + (xy 138.7764 67.745399) (xy 138.7764 67.667599) (xy 138.795307 67.609408) (xy 138.844807 67.573444) @@ -35626,7 +35855,7 @@ (xy 139.252022 67.326536) (xy 139.291126 67.215181) (xy 139.29346 67.208534) - (xy 139.294874 67.193575) + (xy 139.29497 67.192561) (xy 139.296182 67.179744) (xy 139.296182 67.179734) (xy 139.2964 67.177433) @@ -35721,11 +35950,14 @@ (xy 131.401234 69.19361) (xy 131.364383 69.199447) (xy 131.311296 69.207854) - (xy 131.27982 69.223892) + (xy 131.254777 69.236652) (xy 131.205197 69.261914) (xy 131.205195 69.261915) (xy 131.198258 69.26545) (xy 131.10855 69.355158) + (xy 131.105015 69.362095) + (xy 131.105014 69.362097) + (xy 131.095969 69.379849) (xy 131.079358 69.412452) (xy 131.077374 69.416345) (xy 131.034109 69.459609) @@ -35754,14 +35986,14 @@ (xy 129.104279 69.044493) (xy 129.104279 68.983307) (xy 129.12843 68.943896) - (xy 129.335134 68.737193) + (xy 129.33185 68.740477) (xy 130.021869 68.050458) (xy 130.028224 68.044635) (xy 130.057994 68.019655) (xy 130.077436 67.985981) (xy 130.082061 67.978722) (xy 130.085828 67.973343) - (xy 130.090942 67.966038) + (xy 130.092611 67.963655) (xy 130.099387 67.953978) (xy 130.099387 67.953977) (xy 130.104354 67.946884) @@ -35801,7 +36033,7 @@ (xy 132.66858 67.317428) (xy 132.675517 67.320963) (xy 132.675519 67.320964) - (xy 132.769264 67.368729) + (xy 132.779422 67.373905) (xy 132.788674 67.378619) (xy 132.796368 67.379838) (xy 132.796369 67.379838) @@ -35814,7 +36046,7 @@ (xy 133.497231 67.379838) (xy 133.497232 67.379838) (xy 133.504926 67.378619) - (xy 133.524336 67.368729) + (xy 133.514178 67.373905) (xy 133.618081 67.320964) (xy 133.618083 67.320963) (xy 133.62502 67.317428) @@ -35896,7 +36128,7 @@ (xy 133.501296 65.58703) (xy 134.241257 64.847069) (xy 134.247625 64.841234) - (xy 134.254231 64.835691) + (xy 134.258725 64.83192) (xy 134.277394 64.816255) (xy 134.296829 64.782592) (xy 134.301468 64.775311) @@ -35906,7 +36138,7 @@ (xy 134.328462 64.729829) (xy 134.330458 64.724344) (xy 134.334788 64.716845) - (xy 134.337751 64.700043) + (xy 134.336445 64.70745) (xy 134.341534 64.678584) (xy 134.343404 64.670149) (xy 134.351222 64.640974) @@ -35920,11 +36152,11 @@ (xy 134.455604 64.175885) (xy 134.462542 64.17235) (xy 134.55225 64.082642) - (xy 134.5654 64.056835) + (xy 134.559675 64.068071) (xy 134.60631 63.976544) (xy 134.60631 63.976543) (xy 134.609846 63.969604) - (xy 134.611501 63.959159) + (xy 134.611214 63.96097) (xy 134.624091 63.879665) (xy 134.624091 63.879663) (xy 134.6247 63.875819) @@ -35934,15 +36166,15 @@ (xy 135.073701 63.875818) (xy 135.07431 63.879661) (xy 135.07431 63.879666) - (xy 135.078862 63.908407) + (xy 135.079319 63.91129) (xy 135.088554 63.969604) - (xy 135.097332 63.986831) - (xy 135.133001 64.056835) + (xy 135.098182 63.9885) + (xy 135.138726 64.068071) (xy 135.14615 64.082642) (xy 135.235858 64.17235) (xy 135.242795 64.175885) (xy 135.242797 64.175886) - (xy 135.3029 64.20651) + (xy 135.3111 64.210688) (xy 135.348896 64.229946) (xy 135.35659 64.231165) (xy 135.356591 64.231165) @@ -35955,16 +36187,16 @@ (xy 135.909566 64.24419) (xy 135.946417 64.238353) (xy 135.999504 64.229946) - (xy 136.065406 64.196367) + (xy 136.091927 64.182854) (xy 136.105603 64.175886) (xy 136.105605 64.175885) (xy 136.112542 64.17235) (xy 136.20225 64.082642) - (xy 136.2154 64.056835) + (xy 136.209675 64.068071) (xy 136.25631 63.976544) (xy 136.25631 63.976543) (xy 136.259846 63.969604) - (xy 136.261501 63.959159) + (xy 136.261214 63.96097) (xy 136.274091 63.879665) (xy 136.274091 63.879663) (xy 136.2747 63.875819) @@ -36392,7 +36624,7 @@ (xy 154.090732 63.353511) (xy 154.095371 63.360792) (xy 154.114806 63.394455) - (xy 154.141736 63.417052) + (xy 154.136476 63.412638) (xy 154.14457 63.41943) (xy 154.150938 63.425264) (xy 154.712504 63.986831) @@ -36418,7 +36650,7 @@ (xy 154.576642 66.397112) (xy 154.580033 66.404018) (xy 154.580033 66.404019) - (xy 154.588024 66.420295) + (xy 154.587805 66.419848) (xy 154.628068 66.501855) (xy 154.71065 66.584293) (xy 154.815482 66.635536) @@ -36433,8 +36665,8 @@ (xy 155.311499 66.636479) (xy 155.311501 66.636478) (xy 155.319112 66.635358) - (xy 155.329653 66.630183) - (xy 155.397399 66.596921) + (xy 155.349878 66.620253) + (xy 155.394988 66.598105) (xy 155.423855 66.583932) (xy 155.506293 66.50135) (xy 155.557536 66.396518) @@ -36444,7 +36676,7 @@ (xy 155.566983 66.331761) (xy 155.5675 66.328218) (xy 155.5675 64.611782) - (xy 155.566632 64.605881) + (xy 155.566688 64.606262) (xy 155.558479 64.550501) (xy 155.558478 64.550499) (xy 155.557358 64.542888) @@ -36617,7 +36849,7 @@ (xy 155.846642 66.397112) (xy 155.850033 66.404018) (xy 155.850033 66.404019) - (xy 155.858024 66.420295) + (xy 155.857805 66.419848) (xy 155.898068 66.501855) (xy 155.98065 66.584293) (xy 156.085482 66.635536) @@ -36632,8 +36864,8 @@ (xy 156.581499 66.636479) (xy 156.581501 66.636478) (xy 156.589112 66.635358) - (xy 156.599653 66.630183) - (xy 156.667399 66.596921) + (xy 156.619878 66.620253) + (xy 156.664988 66.598105) (xy 156.693855 66.583932) (xy 156.776293 66.50135) (xy 156.827536 66.396518) @@ -36649,7 +36881,7 @@ (xy 157.116642 66.397112) (xy 157.120033 66.404018) (xy 157.120033 66.404019) - (xy 157.128024 66.420295) + (xy 157.127805 66.419848) (xy 157.168068 66.501855) (xy 157.25065 66.584293) (xy 157.355482 66.635536) @@ -36664,8 +36896,8 @@ (xy 157.851499 66.636479) (xy 157.851501 66.636478) (xy 157.859112 66.635358) - (xy 157.869653 66.630183) - (xy 157.937399 66.596921) + (xy 157.889878 66.620253) + (xy 157.934988 66.598105) (xy 157.963855 66.583932) (xy 158.046293 66.50135) (xy 158.097536 66.396518) @@ -36794,7 +37026,8 @@ (xy 159.940795 64.638678) (xy 159.938554 64.630316) (xy 159.928116 64.615408) - (xy 159.916261 64.598478) + (xy 159.923063 64.608192) + (xy 159.916259 64.598475) (xy 159.911636 64.591219) (xy 159.892194 64.557545) (xy 159.862435 64.532574) @@ -37021,6 +37254,8 @@ (xy 157.940718 63.928282) (xy 158.066159 64.024536) (xy 158.212238 64.085044) + (xy 158.343431 64.102316) + (xy 158.358594 64.104312) (xy 158.369 64.105682) (xy 158.449042 64.095144) (xy 158.509201 64.106294) @@ -37045,7 +37280,7 @@ (xy 158.112345 65.076093) (xy 158.1075 65.0455) (xy 158.1075 64.611782) - (xy 158.106632 64.605881) + (xy 158.106688 64.606262) (xy 158.098479 64.550501) (xy 158.098478 64.550499) (xy 158.097358 64.542888) @@ -37080,7 +37315,7 @@ (xy 157.1065 66.328218) (xy 156.8375 66.328218) (xy 156.8375 64.611782) - (xy 156.836632 64.605881) + (xy 156.836688 64.606262) (xy 156.828479 64.550501) (xy 156.828478 64.550499) (xy 156.827358 64.542888) @@ -37571,7 +37806,7 @@ (xy 135.14615 63.055958) (xy 135.142615 63.062895) (xy 135.142614 63.062897) - (xy 135.103747 63.139178) + (xy 135.101315 63.143951) (xy 135.088554 63.168996) (xy 135.087335 63.17669) (xy 135.087335 63.176691) @@ -37609,7 +37844,7 @@ (xy 133.49615 63.055958) (xy 133.492615 63.062895) (xy 133.492614 63.062897) - (xy 133.453747 63.139178) + (xy 133.451315 63.143951) (xy 133.438554 63.168996) (xy 133.437335 63.17669) (xy 133.437335 63.176691) @@ -37618,10 +37853,10 @@ (xy 133.423701 63.875818) (xy 133.42431 63.879661) (xy 133.42431 63.879666) - (xy 133.428862 63.908407) + (xy 133.429319 63.91129) (xy 133.438554 63.969604) - (xy 133.447332 63.986831) - (xy 133.483001 64.056835) + (xy 133.448182 63.9885) + (xy 133.488726 64.068071) (xy 133.49615 64.082642) (xy 133.585858 64.17235) (xy 133.592796 64.175885) @@ -37637,18 +37872,13 @@ (xy 133.051532 65.019399) (xy 133.008267 64.976134) (xy 132.998324 64.944111) - (xy 132.995871 64.925481) (xy 132.985044 64.843238) (xy 132.924536 64.697159) (xy 132.828282 64.571718) (xy 132.702841 64.475464) - (xy 132.581865 64.425354) - (xy 132.562759 64.41744) (xy 132.556762 64.414956) (xy 132.4 64.394318) (xy 132.243238 64.414956) - (xy 132.237241 64.41744) - (xy 132.218135 64.425354) (xy 132.097159 64.475464) (xy 131.971718 64.571718) (xy 131.875464 64.697159) @@ -37657,10 +37887,10 @@ (xy 131.797322 64.977186) (xy 131.794318 65) (xy 131.795165 65.006434) - (xy 131.795318 65.007593) + (xy 131.795372 65.008005) (xy 131.814956 65.156762) (xy 131.81744 65.162759) - (xy 131.821727 65.173108) + (xy 131.819787 65.168425) (xy 131.875464 65.302841) (xy 131.971718 65.428282) (xy 132.097159 65.524536) @@ -37671,7 +37901,7 @@ (xy 132.420175 65.603026) (xy 132.425569 65.602316) (xy 132.556762 65.585044) - (xy 132.594887 65.569252) + (xy 132.603093 65.565853) (xy 132.684414 65.532169) (xy 132.745411 65.527368) (xy 132.79758 65.559338) @@ -37701,8 +37931,8 @@ (xy 130.296279 66.030201) (xy 130.296278 66.030199) (xy 130.295158 66.022588) - (xy 130.291517 66.015171) - (xy 130.261154 65.953329) + (xy 130.281945 65.995675) + (xy 130.264123 65.959376) (xy 130.243732 65.917845) (xy 130.16115 65.835407) (xy 130.056318 65.784164) @@ -37732,9 +37962,6 @@ (xy 129.304828 67.186508) (xy 129.313235 67.243613) (xy 129.314442 67.251812) - (xy 129.317833 67.258718) - (xy 129.317833 67.258719) - (xy 129.325988 67.275329) (xy 129.365868 67.356555) (xy 129.371659 67.362336) (xy 129.44845 67.438993) @@ -37769,7 +37996,7 @@ (xy 126.274943 69.708331) (xy 126.268575 69.714166) (xy 126.238806 69.739145) - (xy 126.234477 69.746644) + (xy 126.222211 69.767889) (xy 126.219373 69.772805) (xy 126.214732 69.780089) (xy 126.192446 69.811916) @@ -37854,8 +38081,8 @@ (xy 128.396279 66.030201) (xy 128.396278 66.030199) (xy 128.395158 66.022588) - (xy 128.391517 66.015171) - (xy 128.361154 65.953329) + (xy 128.381945 65.995675) + (xy 128.364123 65.959376) (xy 128.343732 65.917845) (xy 128.26115 65.835407) (xy 128.156318 65.784164) @@ -37885,9 +38112,6 @@ (xy 127.404828 67.186508) (xy 127.413235 67.243613) (xy 127.414442 67.251812) - (xy 127.417833 67.258718) - (xy 127.417833 67.258719) - (xy 127.425988 67.275329) (xy 127.465868 67.356555) (xy 127.471659 67.362336) (xy 127.498635 67.389265) @@ -37938,9 +38162,9 @@ (xy 126.3353 65.19833) (xy 126.354207 65.140139) (xy 126.360902 65.131894) - (xy 126.363208 65.129347) + (xy 126.366606 65.125593) (xy 126.412122 65.075307) - (xy 126.462947 64.970405) + (xy 126.463004 64.970288) (xy 126.465312 64.965524) (xy 126.465312 64.965523) (xy 126.468388 64.959175) @@ -37948,11 +38172,11 @@ (xy 127.4043 64.907918) (xy 127.404828 64.911501) (xy 127.404828 64.911508) - (xy 127.412357 64.962652) + (xy 127.412109 64.960965) (xy 127.414442 64.976812) (xy 127.417833 64.983718) (xy 127.417833 64.983719) - (xy 127.429555 65.007593) + (xy 127.429757 65.008005) (xy 127.465868 65.081555) (xy 127.471659 65.087336) (xy 127.495574 65.111209) @@ -38019,6 +38243,8 @@ (xy 126.489163 64.835691) (xy 126.489163 64.835686) (xy 126.489797 64.83192) + (xy 126.489848 64.827797) + (xy 126.489886 64.824625) (xy 126.489933 64.8208) (xy 126.471639 64.693059) (xy 126.436153 64.615012) @@ -38158,7 +38384,7 @@ (xy 130.049301 65.216178) (xy 130.056912 65.215058) (xy 130.09743 65.195165) - (xy 130.121826 65.183187) + (xy 130.132802 65.177798) (xy 130.161655 65.163632) (xy 130.191723 65.133512) (xy 130.238313 65.08684) @@ -38174,8 +38400,8 @@ (xy 130.296279 63.755201) (xy 130.296278 63.755199) (xy 130.295158 63.747588) - (xy 130.290188 63.737464) - (xy 130.261699 63.67944) + (xy 130.284639 63.726162) + (xy 130.247338 63.65019) (xy 130.243732 63.642845) (xy 130.16115 63.560407) (xy 130.153799 63.556814) @@ -38806,12 +39032,13 @@ (xy 118.849263 71.049431) (xy 118.844468 71.041652) (xy 118.830918 71.031348) - (xy 118.823884 71.026) + (xy 118.823903 71.026014) (xy 118.821244 71.023992) (xy 118.811165 71.015193) (xy 115.71882 67.922849) (xy 115.71612 67.91972) (xy 115.713925 67.915231) + (xy 115.696023 67.898624) (xy 115.677678 67.881607) (xy 115.675002 67.879031) (xy 115.661223 67.865252) @@ -38921,8 +39148,6 @@ (xy 108.344033 68.265019) (xy 108.354118 68.285559) (xy 108.392068 68.362855) - (xy 108.397859 68.368636) - (xy 108.406073 68.376836) (xy 108.47465 68.445293) (xy 108.579482 68.496536) (xy 108.587084 68.497645) @@ -38937,8 +39162,8 @@ (xy 109.950501 68.497478) (xy 109.958112 68.496358) (xy 110.062855 68.444932) - (xy 110.078628 68.429132) - (xy 110.137266 68.370391) + (xy 110.084914 68.422835) + (xy 110.13654 68.371118) (xy 110.145293 68.36235) (xy 110.148886 68.354999) (xy 110.153639 68.348336) @@ -38948,8 +39173,7 @@ (xy 110.993176 68.3065) (xy 111.051367 68.325407) (xy 111.087331 68.374907) - (xy 111.090957 68.390014) - (xy 111.097153 68.429132) + (xy 111.090957 68.390013) (xy 111.100049 68.44742) (xy 111.103585 68.454359) (xy 111.103585 68.45436) @@ -39557,7 +39781,7 @@ (xy 104.650249 66.246658) (xy 104.657186 66.250193) (xy 104.657188 66.250194) - (xy 104.76164 66.303415) + (xy 104.731567 66.288092) (xy 104.76858 66.306951) (xy 104.776273 66.30817) (xy 104.776275 66.30817) @@ -39570,7 +39794,7 @@ (xy 105.535725 66.30817) (xy 105.535727 66.30817) (xy 105.54342 66.306951) - (xy 105.55036 66.303415) + (xy 105.580433 66.288092) (xy 105.654812 66.250194) (xy 105.654814 66.250193) (xy 105.661751 66.246658) @@ -39597,12 +39821,12 @@ (xy 106.465464 66.804482) (xy 106.464355 66.812084) (xy 106.464354 66.812087) - (xy 106.456428 66.866419) + (xy 106.456788 66.863953) (xy 106.4555 66.872782) (xy 106.4555 67.239218) (xy 106.456028 67.242801) (xy 106.456028 67.242808) - (xy 106.46234 67.285683) + (xy 106.464435 67.299913) (xy 106.465642 67.308112) (xy 106.517068 67.412855) (xy 106.59965 67.495293) @@ -39618,8 +39842,8 @@ (xy 108.075499 67.547479) (xy 108.075501 67.547478) (xy 108.083112 67.546358) - (xy 108.100633 67.537756) - (xy 108.148297 67.514354) + (xy 108.090325 67.542817) + (xy 108.152081 67.512496) (xy 108.187855 67.494932) (xy 108.201333 67.481431) (xy 108.252313 67.430361) @@ -39754,7 +39978,7 @@ (xy 109.559229 65.1081) (xy 109.573187 65.093053) (xy 109.579401 65.086354) - (xy 109.583631 65.075753) + (xy 109.583495 65.076093) (xy 109.583667 65.075663) (xy 109.593978 65.056352) (xy 109.595322 65.054393) @@ -39779,10 +40003,10 @@ (xy 109.668052 64.735052) (xy 109.673467 64.726948) (xy 109.673469 64.726946) - (xy 109.697967 64.690282) + (xy 109.705783 64.678584) (xy 109.712367 64.668731) (xy 109.71471 64.656955) - (xy 109.718779 64.636495) + (xy 109.718925 64.635762) (xy 109.724 64.610248) (xy 109.724 63.580752) (xy 109.714523 63.533107) @@ -39840,6 +40064,8 @@ (xy 105.869189 63.745) (xy 105.810998 63.726093) (xy 105.780979 63.690945) + (xy 105.775751 63.680683) + (xy 105.766618 63.662759) (xy 105.759194 63.648188) (xy 105.759193 63.648186) (xy 105.755658 63.641249) @@ -39931,11 +40157,11 @@ (xy 104.556342 63.641249) (xy 104.552807 63.648186) (xy 104.552806 63.648188) - (xy 104.499677 63.75246) + (xy 104.499585 63.75264) (xy 104.496049 63.75958) (xy 104.49483 63.767273) (xy 104.49483 63.767275) - (xy 104.484933 63.829764) + (xy 104.485307 63.827405) (xy 104.4805 63.857754) (xy 104.4805 64.361246) (xy 104.481109 64.36509) @@ -39944,7 +40170,7 @@ (xy 104.496049 64.45942) (xy 104.499585 64.466359) (xy 104.499585 64.46636) - (xy 104.552388 64.56999) + (xy 104.549638 64.564593) (xy 104.556342 64.577751) (xy 104.650249 64.671658) (xy 104.657186 64.675193) @@ -39967,7 +40193,7 @@ (xy 105.654814 64.675193) (xy 105.661751 64.671658) (xy 105.755658 64.577751) - (xy 105.759613 64.56999) + (xy 105.762363 64.564593) (xy 105.780096 64.529789) (xy 105.795247 64.500054) (xy 105.838511 64.45679) @@ -39977,7 +40203,7 @@ (xy 106.933155 64.514407) (xy 106.938 64.545) (xy 106.938 64.610248) - (xy 106.943221 64.636495) + (xy 106.943075 64.635762) (xy 106.947291 64.656955) (xy 106.949633 64.668731) (xy 106.993948 64.735052) @@ -40000,7 +40226,7 @@ (xy 107.994175 64.859407) (xy 107.994175 64.920593) (xy 107.970024 64.960004) - (xy 107.712589 65.21744) + (xy 107.712301 65.217728) (xy 107.473525 65.456504) (xy 107.419008 65.484281) (xy 107.403521 65.4855) @@ -40011,7 +40237,7 @@ (xy 105.81717 65.342275) (xy 105.81717 65.342273) (xy 105.815951 65.33458) - (xy 105.810284 65.323458) + (xy 105.812415 65.32764) (xy 105.759194 65.223188) (xy 105.759193 65.223186) (xy 105.755658 65.216249) @@ -40040,7 +40266,7 @@ (xy 104.556342 65.216249) (xy 104.552807 65.223186) (xy 104.552806 65.223188) - (xy 104.501716 65.323458) + (xy 104.499585 65.32764) (xy 104.496049 65.33458) (xy 104.49483 65.342273) (xy 104.49483 65.342275) @@ -41333,8 +41559,8 @@ (xy 89.900876 65.532169) (xy 89.8935 65.569252) (xy 89.8935 66.808748) - (xy 89.894448 66.813512) - (xy 89.902062 66.85179) + (xy 89.894721 66.814884) + (xy 89.90225 66.852735) (xy 89.905133 66.867231) (xy 89.949448 66.933552) (xy 90.015769 66.977867) @@ -41349,12 +41575,12 @@ (xy 91.372231 66.977867) (xy 91.438552 66.933552) (xy 91.482867 66.867231) - (xy 91.485939 66.85179) - (xy 91.493552 66.813512) + (xy 91.485751 66.852735) + (xy 91.493279 66.814884) (xy 91.4945 66.808748) (xy 91.8935 66.808748) - (xy 91.894448 66.813512) - (xy 91.902062 66.85179) + (xy 91.894721 66.814884) + (xy 91.90225 66.852735) (xy 91.905133 66.867231) (xy 91.949448 66.933552) (xy 92.015769 66.977867) @@ -41369,8 +41595,8 @@ (xy 93.372231 66.977867) (xy 93.438552 66.933552) (xy 93.482867 66.867231) - (xy 93.485939 66.85179) - (xy 93.493552 66.813512) + (xy 93.485751 66.852735) + (xy 93.493279 66.814884) (xy 93.4945 66.808748) (xy 93.4945 66.5885) (xy 93.513407 66.530309) @@ -41400,11 +41626,11 @@ (xy 95.455301 66.89804) (xy 95.456216 66.905037) (xy 95.456216 66.905038) - (xy 95.45682 66.909654) + (xy 95.459587 66.930815) (xy 95.472033 67.025994) (xy 95.474871 67.032445) (xy 95.474872 67.032447) - (xy 95.514392 67.122263) + (xy 95.519913 67.13481) (xy 95.524005 67.14411) (xy 95.557353 67.183782) (xy 95.586683 67.218675) @@ -41451,7 +41677,7 @@ (xy 94.459142 69.445849) (xy 94.455607 69.452786) (xy 94.455606 69.452788) - (xy 94.420818 69.521064) + (xy 94.422 69.518744) (xy 94.398849 69.56418) (xy 94.39763 69.571873) (xy 94.39763 69.571875) @@ -41464,7 +41690,7 @@ (xy 94.398849 70.33902) (xy 94.402385 70.345959) (xy 94.402385 70.34596) - (xy 94.416793 70.374236) + (xy 94.443168 70.426) (xy 94.459142 70.457351) (xy 94.553049 70.551258) (xy 94.559986 70.554793) @@ -41561,7 +41787,7 @@ (xy 95.347415 69.258299) (xy 95.337844 69.197866) (xy 95.365621 69.14335) - (xy 95.722279 68.786693) + (xy 95.707908 68.801064) (xy 96.085056 68.423916) (xy 96.088181 68.421219) (xy 96.092669 68.419025) @@ -41609,7 +41835,7 @@ (xy 97.563999 68.063878) (xy 97.595969 68.116047) (xy 97.597858 68.126237) - (xy 97.60291 68.164608) + (xy 97.598893 68.134097) (xy 97.611356 68.228762) (xy 97.671864 68.374841) (xy 97.768118 68.500282) @@ -41646,7 +41872,7 @@ (xy 97.156683 64.711663) (xy 97.16362 64.708128) (xy 97.258928 64.61282) - (xy 97.265358 64.600202) + (xy 97.270767 64.589586) (xy 97.316583 64.499666) (xy 97.316583 64.499665) (xy 97.320119 64.492726) @@ -41655,7 +41881,7 @@ (xy 97.335291 64.396932) (xy 97.3359 64.393088) (xy 97.3359 63.826112) - (xy 97.3255 63.760446) + (xy 97.326001 63.763609) (xy 97.321338 63.734169) (xy 97.321338 63.734168) (xy 97.320119 63.726474) @@ -42546,7 +42772,7 @@ (xy 96.050681 63.726474) (xy 96.049462 63.734168) (xy 96.049462 63.734169) - (xy 96.0453 63.760446) + (xy 96.044799 63.763609) (xy 96.0349 63.826112) (xy 96.0349 64.393088) (xy 96.035509 64.396932) @@ -42555,7 +42781,7 @@ (xy 96.050681 64.492726) (xy 96.054217 64.499665) (xy 96.054217 64.499666) - (xy 96.105443 64.600202) + (xy 96.100034 64.589586) (xy 96.111872 64.61282) (xy 96.20718 64.708128) (xy 96.214117 64.711663) @@ -42567,7 +42793,7 @@ (xy 96.3849 66.456692) (xy 96.384597 66.460817) (xy 96.382975 66.465542) - (xy 96.38391 66.490441) + (xy 96.383901 66.490203) (xy 96.384 66.492846) (xy 96.367289 66.551705) (xy 96.319173 66.589501) @@ -42600,7 +42826,7 @@ (xy 95.606683 64.711663) (xy 95.61362 64.708128) (xy 95.708928 64.61282) - (xy 95.715358 64.600202) + (xy 95.720767 64.589586) (xy 95.766583 64.499666) (xy 95.766583 64.499665) (xy 95.770119 64.492726) @@ -42609,7 +42835,7 @@ (xy 95.785291 64.396932) (xy 95.7859 64.393088) (xy 95.7859 63.826112) - (xy 95.7755 63.760446) + (xy 95.776001 63.763609) (xy 95.771338 63.734169) (xy 95.771338 63.734168) (xy 95.770119 63.726474) @@ -42990,7 +43216,7 @@ (xy 94.500681 63.726474) (xy 94.499462 63.734168) (xy 94.499462 63.734169) - (xy 94.4953 63.760446) + (xy 94.494799 63.763609) (xy 94.4849 63.826112) (xy 94.4849 64.393088) (xy 94.485509 64.396932) @@ -42999,7 +43225,7 @@ (xy 94.500681 64.492726) (xy 94.504217 64.499665) (xy 94.504217 64.499666) - (xy 94.555443 64.600202) + (xy 94.550034 64.589586) (xy 94.561872 64.61282) (xy 94.65718 64.708128) (xy 94.664117 64.711663) @@ -50177,7 +50403,7 @@ (xy 111.587634 86.54871) (xy 111.550783 86.554547) (xy 111.497696 86.562954) - (xy 111.442843 86.590903) + (xy 111.467482 86.578349) (xy 111.391597 86.617014) (xy 111.391595 86.617015) (xy 111.384658 86.62055) @@ -50328,27 +50554,6 @@ (xy 87.674952 123.286103) ) ) - (filled_polygon - (layer "F.Cu") - (pts - (xy 165.629496 45.401562) - (xy 165.654555 45.419768) - (xy 166.080232 45.845445) - (xy 166.108009 45.899962) - (xy 166.098438 45.960394) - (xy 166.080232 45.985453) - (xy 164.879565 47.18612) - (xy 164.825048 47.213897) - (xy 164.764616 47.204326) - (xy 164.739557 47.18612) - (xy 164.31388 46.760443) - (xy 164.286103 46.705926) - (xy 164.295674 46.645494) - (xy 164.31388 46.620435) - (xy 165.514547 45.419768) - (xy 165.569064 45.391991) - ) - ) (filled_polygon (layer "F.Cu") (pts @@ -50370,6 +50575,27 @@ (xy 86.899962 45.391991) ) ) + (filled_polygon + (layer "F.Cu") + (pts + (xy 165.629496 45.401562) + (xy 165.654555 45.419768) + (xy 166.080232 45.845445) + (xy 166.108009 45.899962) + (xy 166.098438 45.960394) + (xy 166.080232 45.985453) + (xy 164.879565 47.18612) + (xy 164.825048 47.213897) + (xy 164.764616 47.204326) + (xy 164.739557 47.18612) + (xy 164.31388 46.760443) + (xy 164.286103 46.705926) + (xy 164.295674 46.645494) + (xy 164.31388 46.620435) + (xy 165.514547 45.419768) + (xy 165.569064 45.391991) + ) + ) (filled_polygon (layer "In1.Cu") (pts @@ -55981,45 +56207,31 @@ (xy 132.924536 64.697159) (xy 132.828282 64.571718) (xy 132.702841 64.475464) - (xy 132.585046 64.426671) - (xy 132.562759 64.41744) (xy 132.556762 64.414956) (xy 132.4 64.394318) (xy 132.243238 64.414956) - (xy 132.237241 64.41744) - (xy 132.214954 64.426671) (xy 132.097159 64.475464) (xy 131.971718 64.571718) (xy 131.875464 64.697159) (xy 131.814956 64.843238) (xy 131.794318 65) (xy 85.2 65) - (xy 85.2 64.262) - (xy 145.698318 64.262) - (xy 145.718956 64.418762) - (xy 145.779464 64.564841) - (xy 145.875718 64.690282) - (xy 146.001159 64.786536) - (xy 146.118954 64.835329) - (xy 146.13805 64.843238) - (xy 146.147238 64.847044) - (xy 146.304 64.867682) - (xy 146.460762 64.847044) - (xy 146.469951 64.843238) - (xy 146.489046 64.835329) - (xy 146.606841 64.786536) - (xy 146.732282 64.690282) - (xy 146.828536 64.564841) - (xy 146.889044 64.418762) - (xy 146.909682 64.262) - (xy 146.904089 64.219517) - (xy 146.915239 64.159358) - (xy 146.959621 64.11724) - (xy 147.020283 64.109254) - (xy 147.056897 64.125555) - (xy 147.057193 64.125042) - (xy 147.062072 64.127859) - (xy 147.062507 64.128053) + (xy 85.2 63.5694) + (xy 145.698318 63.5694) + (xy 145.718956 63.726162) + (xy 145.779464 63.872241) + (xy 145.875718 63.997682) + (xy 146.001159 64.093936) + (xy 146.147238 64.154444) + (xy 146.304 64.175082) + (xy 146.460762 64.154444) + (xy 146.606841 64.093936) + (xy 146.732282 63.997682) + (xy 146.744164 63.982197) + (xy 146.794588 63.947541) + (xy 146.855753 63.949142) + (xy 146.901247 63.982196) + (xy 146.942518 64.035982) (xy 147.067959 64.132236) (xy 147.214038 64.192744) (xy 147.3708 64.213382) @@ -56106,28 +56318,22 @@ (xy 147.214038 63.022656) (xy 147.067959 63.083164) (xy 146.942518 63.179418) - (xy 146.846264 63.304859) - (xy 146.785756 63.450938) - (xy 146.765118 63.6077) - (xy 146.765965 63.614133) - (xy 146.770711 63.650182) - (xy 146.759561 63.710342) - (xy 146.715179 63.75246) - (xy 146.654517 63.760446) - (xy 146.617903 63.744145) - (xy 146.617607 63.744658) - (xy 146.612728 63.741841) - (xy 146.612293 63.741647) - (xy 146.606841 63.737464) - (xy 146.460762 63.676956) - (xy 146.304 63.656318) - (xy 146.147238 63.676956) - (xy 146.001159 63.737464) - (xy 145.875718 63.833718) - (xy 145.779464 63.959159) - (xy 145.718956 64.105238) - (xy 145.698318 64.262) - (xy 85.2 64.262) + (xy 146.938564 63.184571) + (xy 146.930636 63.194903) + (xy 146.880212 63.229559) + (xy 146.819047 63.227958) + (xy 146.773553 63.194904) + (xy 146.732282 63.141118) + (xy 146.606841 63.044864) + (xy 146.460762 62.984356) + (xy 146.304 62.963718) + (xy 146.147238 62.984356) + (xy 146.001159 63.044864) + (xy 145.875718 63.141118) + (xy 145.779464 63.266559) + (xy 145.718956 63.412638) + (xy 145.698318 63.5694) + (xy 85.2 63.5694) (xy 85.2 62.3316) (xy 102.518318 62.3316) (xy 102.538956 62.488362) @@ -66344,38 +66550,28 @@ (xy 145.999504 59.831532) (xy 146.027281 59.886049) (xy 146.0285 59.901536) - (xy 146.0285 63.667663) - (xy 146.009593 63.725854) - (xy 145.989767 63.746205) - (xy 145.915958 63.802841) - (xy 145.875718 63.833718) - (xy 145.779464 63.959159) - (xy 145.718956 64.105238) - (xy 145.698318 64.262) - (xy 145.718956 64.418762) - (xy 145.779464 64.564841) - (xy 145.875718 64.690282) - (xy 146.001159 64.786536) - (xy 146.118954 64.835329) - (xy 146.13805 64.843238) - (xy 146.147238 64.847044) - (xy 146.304 64.867682) - (xy 146.460762 64.847044) - (xy 146.469951 64.843238) - (xy 146.489046 64.835329) - (xy 146.606841 64.786536) - (xy 146.732282 64.690282) - (xy 146.828536 64.564841) - (xy 146.889044 64.418762) - (xy 146.909682 64.262) - (xy 146.904089 64.219517) - (xy 146.915239 64.159358) - (xy 146.959621 64.11724) - (xy 147.020283 64.109254) - (xy 147.056897 64.125555) - (xy 147.057193 64.125042) - (xy 147.062072 64.127859) - (xy 147.062507 64.128053) + (xy 146.0285 62.975063) + (xy 146.009593 63.033254) + (xy 145.989767 63.053605) + (xy 145.942751 63.089682) + (xy 145.875718 63.141118) + (xy 145.779464 63.266559) + (xy 145.718956 63.412638) + (xy 145.698318 63.5694) + (xy 145.718956 63.726162) + (xy 145.779464 63.872241) + (xy 145.875718 63.997682) + (xy 146.001159 64.093936) + (xy 146.147238 64.154444) + (xy 146.304 64.175082) + (xy 146.460762 64.154444) + (xy 146.606841 64.093936) + (xy 146.732282 63.997682) + (xy 146.744164 63.982197) + (xy 146.794588 63.947541) + (xy 146.855753 63.949142) + (xy 146.901247 63.982196) + (xy 146.942518 64.035982) (xy 147.067959 64.132236) (xy 147.214038 64.192744) (xy 147.3708 64.213382) @@ -66425,7 +66621,7 @@ (xy 147.897819 63.310854) (xy 147.895336 63.304859) (xy 147.799082 63.179418) - (xy 147.730431 63.12674) + (xy 147.754884 63.145504) (xy 147.685033 63.091905) (xy 147.650377 63.04148) (xy 147.6463 63.013363) @@ -68870,13 +69066,9 @@ (xy 132.924536 64.697159) (xy 132.828282 64.571718) (xy 132.702841 64.475464) - (xy 132.585046 64.426671) - (xy 132.562759 64.41744) (xy 132.556762 64.414956) (xy 132.4 64.394318) (xy 132.243238 64.414956) - (xy 132.237241 64.41744) - (xy 132.214954 64.426671) (xy 132.097159 64.475464) (xy 131.971718 64.571718) (xy 131.967764 64.576871) @@ -71513,27 +71705,6 @@ (xy 129.132293 49.835302) ) ) - (filled_polygon - (layer "In2.Cu") - (pts - (xy 164.854506 123.295674) - (xy 164.879565 123.31388) - (xy 166.080232 124.514547) - (xy 166.108009 124.569064) - (xy 166.098438 124.629496) - (xy 166.080232 124.654555) - (xy 165.654555 125.080232) - (xy 165.600038 125.108009) - (xy 165.539606 125.098438) - (xy 165.514547 125.080232) - (xy 164.31388 123.879565) - (xy 164.286103 123.825048) - (xy 164.295674 123.764616) - (xy 164.31388 123.739557) - (xy 164.739557 123.31388) - (xy 164.794074 123.286103) - ) - ) (filled_polygon (layer "In2.Cu") (pts @@ -71555,6 +71726,27 @@ (xy 87.674952 123.286103) ) ) + (filled_polygon + (layer "In2.Cu") + (pts + (xy 164.854506 123.295674) + (xy 164.879565 123.31388) + (xy 166.080232 124.514547) + (xy 166.108009 124.569064) + (xy 166.098438 124.629496) + (xy 166.080232 124.654555) + (xy 165.654555 125.080232) + (xy 165.600038 125.108009) + (xy 165.539606 125.098438) + (xy 165.514547 125.080232) + (xy 164.31388 123.879565) + (xy 164.286103 123.825048) + (xy 164.295674 123.764616) + (xy 164.31388 123.739557) + (xy 164.739557 123.31388) + (xy 164.794074 123.286103) + ) + ) (filled_polygon (layer "In2.Cu") (pts @@ -82817,7 +83009,7 @@ (xy 125.524319 65.606381) (xy 125.524319 65.59795) (xy 125.52416 64.113393) - (xy 125.524159 64.105238) + (xy 125.524092 63.469231) (xy 125.524053 63.102504) (xy 125.521589 63.071225) (xy 125.51934 63.057029) @@ -88853,31 +89045,22 @@ (filled_polygon (layer "B.Cu") (pts - (xy 146.336791 63.189307) - (xy 146.372755 63.238807) - (xy 146.3776 63.2694) - (xy 146.3776 63.521593) - (xy 146.380778 63.547012) - (xy 146.369234 63.607096) - (xy 146.324577 63.648922) - (xy 146.295465 63.657442) - (xy 146.147238 63.676956) - (xy 146.001159 63.737464) - (xy 145.875718 63.833718) - (xy 145.779464 63.959159) - (xy 145.718956 64.105238) - (xy 145.717671 64.115) - (xy 145.699195 64.255342) - (xy 145.698318 64.262) - (xy 145.718956 64.418762) - (xy 145.779464 64.564841) - (xy 145.875718 64.690282) - (xy 146.001159 64.786536) - (xy 146.147238 64.847044) - (xy 146.291523 64.866039) - (xy 146.346747 64.89238) - (xy 146.375942 64.94615) - (xy 146.3776 64.964192) + (xy 145.729321 63.189307) + (xy 145.765285 63.238807) + (xy 145.765285 63.299993) + (xy 145.762594 63.307285) + (xy 145.733031 63.378658) + (xy 145.718956 63.412638) + (xy 145.698318 63.5694) + (xy 145.718956 63.726162) + (xy 145.779464 63.872241) + (xy 145.875718 63.997682) + (xy 146.001159 64.093936) + (xy 146.147238 64.154444) + (xy 146.291523 64.173439) + (xy 146.346747 64.19978) + (xy 146.375942 64.25355) + (xy 146.3776 64.271592) (xy 146.3776 66.3675) (xy 146.380062 66.398784) (xy 146.384907 66.429377) @@ -90114,7 +90297,7 @@ (xy 145.109742 63.199396) (xy 145.164258 63.171619) (xy 145.179745 63.1704) - (xy 146.2786 63.1704) + (xy 145.67113 63.1704) ) ) (filled_polygon @@ -91412,7 +91595,7 @@ (xy 157.246323 64.460833) (xy 157.246322 63.781168) (xy 157.243424 63.7505) - (xy 157.238847 63.737464) + (xy 157.212612 63.662759) (xy 157.202236 63.633214) (xy 157.199784 63.626232) (xy 157.121534 63.520289) @@ -91550,16 +91733,7 @@ (xy 146.618409 66.447593) (xy 146.582445 66.398093) (xy 146.5776 66.3675) - (xy 146.5776 64.857795) - (xy 146.596507 64.799604) - (xy 146.616333 64.779253) - (xy 146.727129 64.694236) - (xy 146.732282 64.690282) - (xy 146.828536 64.564841) - (xy 146.877513 64.4466) - (xy 146.88656 64.424759) - (xy 146.889044 64.418762) - (xy 146.893606 64.38411) + (xy 146.5776 64.38411) (xy 149.017122 64.38411) (xy 149.040026 64.457198) (xy 149.0449 64.467995) @@ -91641,16 +91815,17 @@ (xy 149.028192 64.3694) (xy 149.01718 64.372978) (xy 149.017122 64.38411) - (xy 146.893606 64.38411) - (xy 146.909682 64.262) - (xy 146.904089 64.219517) - (xy 146.915239 64.159358) - (xy 146.959621 64.11724) - (xy 147.020283 64.109254) - (xy 147.056897 64.125555) - (xy 147.057193 64.125042) - (xy 147.062072 64.127859) - (xy 147.062507 64.128053) + (xy 146.5776 64.38411) + (xy 146.5776 64.165195) + (xy 146.596507 64.107004) + (xy 146.616333 64.086653) + (xy 146.727129 64.001636) + (xy 146.732282 63.997682) + (xy 146.744164 63.982197) + (xy 146.794588 63.947541) + (xy 146.855753 63.949142) + (xy 146.901247 63.982196) + (xy 146.942518 64.035982) (xy 147.067959 64.132236) (xy 147.214038 64.192744) (xy 147.3708 64.213382) diff --git a/modules/Communication/comm.kicad_prl b/modules/Communication/comm.kicad_prl index f829ac9..f01c27b 100644 --- a/modules/Communication/comm.kicad_prl +++ b/modules/Communication/comm.kicad_prl @@ -1,6 +1,6 @@ { "board": { - "active_layer": 2, + "active_layer": 0, "active_layer_preset": "", "auto_track_width": true, "hidden_nets": [], diff --git a/modules/Communication/comm.kicad_sch b/modules/Communication/comm.kicad_sch index 89a2854..ea04b7a 100644 --- a/modules/Communication/comm.kicad_sch +++ b/modules/Communication/comm.kicad_sch @@ -1987,25 +1987,25 @@ (reference "J1") (unit 1) (value "iPEX_Coaxial") (footprint "footprints:iPEX") ) (path "/829b2795-9702-4633-a078-e2998d6d9402/2f812110-a1b0-44bb-bd91-00be9b91196c" - (reference "J2") (unit 1) (value "Conn_01x05_MountingPin") (footprint "TCY_Connector:Amphenol 10114826-10103LF 1x05 Vertical") + (reference "J2") (unit 1) (value "Conn_01x05_MountingPin") (footprint "TCY_Connector:Amphenol 10114830-10105LF 1x05 Horizontal") ) (path "/a345038c-0e2c-4410-9183-a80a047c8766/0a1608cb-cbde-4699-bfdb-da1d6897b8dd" (reference "J3") (unit 1) (value "iPEX_Coaxial") (footprint "footprints:iPEX") ) (path "/829b2795-9702-4633-a078-e2998d6d9402/b45d3cf0-73cc-45e6-84c0-33bd31af103b" - (reference "J4") (unit 1) (value "Conn_01x04_MountingPin") (footprint "TCY_Connector:Amphenol 10114830-11104LF 1x04 Vertical") + (reference "J4") (unit 1) (value "Conn_01x04_MountingPin") (footprint "TCY_Connector:Amphenol 10114830-10104LF 1x04 Horizontal") ) (path "/829b2795-9702-4633-a078-e2998d6d9402/bd95501b-0179-41e8-b4ae-aa683068528d" (reference "J6") (unit 1) (value "iPEX") (footprint "footprints:iPEX") ) (path "/81a5172c-b171-400d-8856-41d6e486bdd1/af67e199-e48e-4756-86dd-b11b5ab428d7" - (reference "J7") (unit 1) (value "Conn_01x04_MountingPin") (footprint "TCY_Connector:Amphenol 10114830-11104LF 1x04 Vertical") + (reference "J7") (unit 1) (value "Conn_01x04_MountingPin") (footprint "TCY_Connector:Amphenol 10114830-10104LF 1x04 Horizontal") ) (path "/81a5172c-b171-400d-8856-41d6e486bdd1/5bd7a265-5115-4077-b1c4-f017537909a2" - (reference "J8") (unit 1) (value "PROG") (footprint "TCY_Connector:Amphenol 10114826-10103LF 1x03 Vertical") + (reference "J8") (unit 1) (value "PROG") (footprint "TCY_Connector:Amphenol 10114830-10103LF 1x03 Horizontal") ) (path "/1e3f6e69-339a-4a82-8e4d-44c2adb747fb/da116425-550f-4045-b880-60492319835e" - (reference "J9") (unit 1) (value "Camera") (footprint "TCY_Connector:Amphenol 10114826-10108LF 1x08 Vertical") + (reference "J9") (unit 1) (value "Camera") (footprint "TCY_Connector:Amphenol 10114830-10108LF 1x08 Horizontal") ) (path "/3006f49f-d72b-4219-8dea-bda42cf88e84/26b7d535-d407-4f07-875b-96134c46f755" (reference "J12") (unit 1) (value "Stack_connector") (footprint "Connector_PinSocket_2.54mm:PinSocket_2x20_P2.54mm_Vertical") @@ -2194,7 +2194,7 @@ (reference "R39") (unit 1) (value "100k") (footprint "Resistor_SMD:R_0603_1608Metric") ) (path "/81a5172c-b171-400d-8856-41d6e486bdd1/67ee59c1-c965-44af-bd13-1b13402d9f28" - (reference "R40") (unit 1) (value "120R") (footprint "Resistor_SMD:R_0603_1608Metric") + (reference "R40") (unit 1) (value "120R") (footprint "Resistor_SMD:R_1206_3216Metric") ) (path "/81a5172c-b171-400d-8856-41d6e486bdd1/4c972d5a-774d-4596-91d0-6cab8980035e" (reference "R41") (unit 1) (value "60R") (footprint "Resistor_SMD:R_0603_1608Metric") diff --git a/modules/Communication/fp-info-cache b/modules/Communication/fp-info-cache index e152236..5ac2ff2 100644 --- a/modules/Communication/fp-info-cache +++ b/modules/Communication/fp-info-cache @@ -1,4 +1,4 @@ -19827139220302868 +19835436411800975 Audio_Module Reverb_BTDR-1H Digital Reverberation Unit, http://www.belton.co.kr/inc/downfile.php?seq=17&file=pdf (footprint from http://www.uk-electronic.de/PDF/BTDR-1.pdf) @@ -79030,7 +79030,14 @@ Amphenol 10114826-10103LF 1x03 Vertical 5 4 TCY_Connector -Amphenol 10114826-10103LF 1x05 Vertical +Amphenol 10114826-10104LF 1x04 Vertical + + +0 +6 +5 +TCY_Connector +Amphenol 10114826-10105LF 1x05 Vertical 0 @@ -79044,13 +79051,41 @@ Amphenol 10114826-10108LF 1x08 Vertical 10 9 TCY_Connector -Amphenol 10114830-11104LF 1x04 Vertical +Amphenol 10114830-10102LF 1x02 Horizontal + + +0 +4 +3 +TCY_Connector +Amphenol 10114830-10103LF 1x03 Horizontal + + +0 +5 +4 +TCY_Connector +Amphenol 10114830-10104LF 1x04 Horizontal 0 6 5 TCY_Connector +Amphenol 10114830-10105LF 1x05 Horizontal + + +0 +7 +6 +TCY_Connector +Amphenol 10114830-10108LF 1x08 Horizontal + + +0 +10 +9 +TCY_Connector JST S6B-XH-A-1 JST 01x06 @@ -79077,7 +79112,7 @@ Kyocera AVX CX3225SB16 0 4 -3 +4 TCY_Diode SL02-M-18 diff --git a/modules/Communication/mcu_comm.kicad_sch b/modules/Communication/mcu_comm.kicad_sch index 3b04ed6..5e7bee4 100644 --- a/modules/Communication/mcu_comm.kicad_sch +++ b/modules/Communication/mcu_comm.kicad_sch @@ -3783,7 +3783,7 @@ (property "Value" "PROG" (id 1) (at 72.5171 190.5886 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "TCY_Connector:Amphenol 10114826-10103LF 1x03 Vertical" (id 2) (at 70.485 186.69 0) + (property "Footprint" "TCY_Connector:Amphenol 10114830-10103LF 1x03 Horizontal" (id 2) (at 70.485 186.69 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 70.485 186.69 0) @@ -3896,7 +3896,7 @@ (property "Value" "120R" (id 1) (at 260.8581 100.2916 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_SMD:R_0603_1608Metric" (id 2) (at 257.302 98.425 90) + (property "Footprint" "Resistor_SMD:R_1206_3216Metric" (id 2) (at 257.302 98.425 90) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 259.08 98.425 0) @@ -4327,7 +4327,7 @@ (property "Value" "Conn_01x04_MountingPin" (id 1) (at 67.31 153.035 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "TCY_Connector:Amphenol 10114830-11104LF 1x04 Vertical" (id 2) (at 71.755 158.75 0) + (property "Footprint" "TCY_Connector:Amphenol 10114830-10104LF 1x04 Horizontal" (id 2) (at 71.755 158.75 0) (effects (font (size 1.27 1.27)) hide) ) (property "Datasheet" "~" (id 3) (at 71.755 158.75 0)