From eb1f1ad71c8c06a623bceb74dffdb7961032e2e5 Mon Sep 17 00:00:00 2001 From: s3lph Date: Sat, 6 May 2023 16:42:37 +0200 Subject: [PATCH] feat(pcb): add test points --- pcb/APRSuino/APRSuino.kicad_pcb | 2827 +++++++++++------ pcb/APRSuino/APRSuino.kicad_sch | 441 ++- ...int_2Pads_Pitch2.54mm_Drill0.8mm.kicad_mod | 57 + .../APRSuino.pretty/WC1602A_I2C.kicad_mod | 16 +- 4 files changed, 2201 insertions(+), 1140 deletions(-) create mode 100644 pcb/APRSuino/APRSuino.pretty/TestPoint_2Pads_Pitch2.54mm_Drill0.8mm.kicad_mod diff --git a/pcb/APRSuino/APRSuino.kicad_pcb b/pcb/APRSuino/APRSuino.kicad_pcb index bb75673..7054657 100644 --- a/pcb/APRSuino/APRSuino.kicad_pcb +++ b/pcb/APRSuino/APRSuino.kicad_pcb @@ -308,6 +308,72 @@ ) ) + (footprint "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (layer "B.Cu") + (tstamp 0ad094b3-6d4e-4c87-a72d-034c951af861) + (at 44.45 80.01 -90) + (descr "Test point with 2 pins, pitch 2.54mm, drill diameter 0.8mm") + (tags "CONN DEV") + (property "Sheetfile" "APRSuino.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "test point (alternative probe-style design)") + (property "ki_keywords" "test point tp") + (path "/ccb3e474-8169-45cd-a450-f2b0f3dd2268") + (attr exclude_from_pos_files) + (fp_text reference "TP2" (at 1.27 -1.905 90) (layer "B.SilkS") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 056a9617-7157-45ba-a737-93b74e99265f) + ) + (fp_text value "PTT" (at 1.27 1.905 -90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 589c552f-199e-47c0-812a-c34d1f244b43) + ) + (fp_text user "${REFERENCE}" (at 1.3 2 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp a057f220-a07d-4fbf-a824-9074ecfbda3f) + ) + (fp_line (start -1.03 -0.4) (end -1.03 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp f899f770-cc1e-4e05-a5e4-245da930f92f)) + (fp_line (start -1.03 0.4) (end -0.53 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 78aa17dc-26ce-4647-9834-ccabe7b36e29)) + (fp_line (start -0.53 -0.9) (end -1.03 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 1a726cb5-cb88-409c-964c-14ebb2df45c4)) + (fp_line (start -0.53 0.9) (end 3.07 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 9b2a1a45-ba28-4faf-8148-878ebfd46b9e)) + (fp_line (start 3.07 -0.9) (end -0.53 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp a05afb14-6464-4e29-87c3-98542b6eeed4)) + (fp_line (start 3.07 0.9) (end 3.57 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 994c1a1d-ea6b-4f99-a366-e88da19d2892)) + (fp_line (start 3.57 -0.4) (end 3.07 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp c46bbba2-11bb-492d-bb57-590b304e6e1b)) + (fp_line (start 3.57 0.4) (end 3.57 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 87e12f02-8521-4562-ba63-c320a04e87ee)) + (fp_line (start -1.3 -0.5) (end -0.65 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9811ed0a-201b-4cf7-96fb-97a3af130c2e)) + (fp_line (start -1.3 0.5) (end -1.3 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp fc9e6945-bf28-419b-a58a-e768ed79ca5f)) + (fp_line (start -0.65 -1.15) (end 3.15 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3d816c5e-a222-4800-b040-ee1db0e37d2b)) + (fp_line (start -0.65 1.15) (end -1.3 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp d6e88750-fc7a-4a15-9603-a2f256178cc2)) + (fp_line (start 3.15 -1.15) (end 3.8 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ad7d1480-ccad-41d0-92e2-7b670c51aadf)) + (fp_line (start 3.15 1.15) (end -0.65 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 847e3a1b-b2ad-4995-b253-418e90402373)) + (fp_line (start 3.8 -0.5) (end 3.8 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 81dadebb-a344-4f25-97d0-ff4029df866f)) + (fp_line (start 3.8 0.5) (end 3.15 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 13be5e65-08e8-4fea-aa9b-fd3f640e7c91)) + (pad "1" thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 33 "Net-(Q1-E)") (pinfunction "1") (pintype "passive") (tstamp eabbdc7b-6e6f-46ad-9571-c534e5afcd69)) + (pad "1" thru_hole circle (at 2.54 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 33 "Net-(Q1-E)") (pinfunction "1") (pintype "passive") (tstamp 2be8c585-fd3f-4e16-9a62-d9015f397732)) + (model "${KICAD7_3DMODEL_DIR}/TestPoint.3dshapes/TestPoint_Bridge_Pitch2.54mm_Drill0.7mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (layer "B.Cu") (tstamp 1244d37f-3944-421e-aae6-ded07b619dfb) (at 58.166 93.726) @@ -662,6 +728,72 @@ ) ) + (footprint "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (layer "B.Cu") + (tstamp 66c4b740-c302-4c82-a92a-640ed8a1c8ca) + (at 44.45 91.44 -90) + (descr "Test point with 2 pins, pitch 2.54mm, drill diameter 0.8mm") + (tags "CONN DEV") + (property "Sheetfile" "APRSuino.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "test point (alternative probe-style design)") + (property "ki_keywords" "test point tp") + (path "/378f8a92-9809-45ba-9471-68999ab87ce7") + (attr exclude_from_pos_files) + (fp_text reference "TP3" (at 1.3 -1.905 90) (layer "B.SilkS") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 999fe99a-a37e-4000-a7e4-dd5ba8425f7a) + ) + (fp_text value "DAC" (at 1.27 1.905 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 04df6b37-245b-40fd-af9a-3a173a7da126) + ) + (fp_text user "${REFERENCE}" (at 1.3 2 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp f7252c91-b8d2-44b0-94c6-136c6bd3f42a) + ) + (fp_line (start -1.03 -0.4) (end -1.03 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp cd7bb048-cbb5-48d7-ba38-ab9aeac85ae3)) + (fp_line (start -1.03 0.4) (end -0.53 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp cda109e4-5308-4db7-95d5-b8bd9483a2a3)) + (fp_line (start -0.53 -0.9) (end -1.03 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp b6ec2e24-674e-48ff-8989-986ce7dd2d81)) + (fp_line (start -0.53 0.9) (end 3.07 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 80079a93-5f1f-4377-aa33-a75fdfbb8493)) + (fp_line (start 3.07 -0.9) (end -0.53 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 4fa3ccbe-854b-472f-a0e9-851d368f4c89)) + (fp_line (start 3.07 0.9) (end 3.57 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 1bb3ef65-b110-4cb7-b34a-d2220cccae59)) + (fp_line (start 3.57 -0.4) (end 3.07 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 110cad55-aad4-4be0-bd33-d76a703becbb)) + (fp_line (start 3.57 0.4) (end 3.57 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 9b3ab61d-fc12-400c-ac87-cbcd82b85ae6)) + (fp_line (start -1.3 -0.5) (end -0.65 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 02872cd1-8925-4998-b305-cf511c63093d)) + (fp_line (start -1.3 0.5) (end -1.3 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 3e5ac343-73a5-4d77-a1f8-c78242ac6f5b)) + (fp_line (start -0.65 -1.15) (end 3.15 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0908c41a-155a-4979-978d-ba6d2efcb0a6)) + (fp_line (start -0.65 1.15) (end -1.3 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5c3c0e65-b3c9-45d2-b979-f1d818229562)) + (fp_line (start 3.15 -1.15) (end 3.8 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a33db982-e4ba-4450-9711-52227b5ae965)) + (fp_line (start 3.15 1.15) (end -0.65 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4140345b-9ada-4dca-bece-fec76e3f4914)) + (fp_line (start 3.8 -0.5) (end 3.8 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 65ac10e8-f0ca-41b0-a86f-e12dfa60941b)) + (fp_line (start 3.8 0.5) (end 3.15 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2fb15da8-009e-4ae6-adfb-f29801451cd5)) + (pad "1" thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 30 "Net-(C3-Pad2)") (pinfunction "1") (pintype "passive") (tstamp 861ab930-d5c0-402a-996c-4aaf7c953423)) + (pad "1" thru_hole circle (at 2.54 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 30 "Net-(C3-Pad2)") (pinfunction "1") (pintype "passive") (tstamp 432e6399-c52d-4b9b-bec5-c44b29df1357)) + (model "${KICAD7_3DMODEL_DIR}/TestPoint.3dshapes/TestPoint_Bridge_Pitch2.54mm_Drill0.7mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "Capacitor_THT:CP_Radial_D4.0mm_P2.00mm" (layer "B.Cu") (tstamp 7288c2ba-27bf-4c6f-8275-b351e9dbcac0) (at 52.324 83.344 -90) @@ -1088,6 +1220,72 @@ ) ) + (footprint "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (layer "B.Cu") + (tstamp 90f494b7-0173-4cdc-a100-0a7e6d7c17be) + (at 44.45 97.175 -90) + (descr "Test point with 2 pins, pitch 2.54mm, drill diameter 0.8mm") + (tags "CONN DEV") + (property "Sheetfile" "APRSuino.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "test point (alternative probe-style design)") + (property "ki_keywords" "test point tp") + (path "/5fce8f5e-307a-47ee-a401-6b8d8e7be127") + (attr exclude_from_pos_files) + (fp_text reference "TP4" (at 1.3 -1.905 90) (layer "B.SilkS") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp d03c2d9c-b6cf-444f-b8db-7521c96a5ee1) + ) + (fp_text value "GND" (at 1.25 1.905 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp eaecc30b-5cae-4574-908e-447736d39d57) + ) + (fp_text user "${REFERENCE}" (at 1.3 2 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 3d600fc3-a671-4f4a-874b-67498e4d3c0d) + ) + (fp_line (start -1.03 -0.4) (end -1.03 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp e724fa2f-1e09-4582-81a0-86bdf88728ea)) + (fp_line (start -1.03 0.4) (end -0.53 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 79baee9f-f45c-4174-ae69-2ba744e14630)) + (fp_line (start -0.53 -0.9) (end -1.03 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 8ef48406-1bd3-4b7a-8a44-4ef1a140f3d0)) + (fp_line (start -0.53 0.9) (end 3.07 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 2df4238f-3308-4553-ba93-84f25130845a)) + (fp_line (start 3.07 -0.9) (end -0.53 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp bbeb0cc9-e91a-4f60-8240-35fd4b5b4a60)) + (fp_line (start 3.07 0.9) (end 3.57 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 8a392006-4043-40fc-b7fe-0ddc5d3f5ffa)) + (fp_line (start 3.57 -0.4) (end 3.07 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp ea7f8aec-b4b1-402f-9086-3f722aaf29f4)) + (fp_line (start 3.57 0.4) (end 3.57 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 066ec9c2-2b3a-4d4f-b74b-87dc593aa53f)) + (fp_line (start -1.3 -0.5) (end -0.65 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 8f70b118-bd97-45a0-9748-642fbd6ee34f)) + (fp_line (start -1.3 0.5) (end -1.3 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 699a4555-d655-48ef-b005-de00469a2f38)) + (fp_line (start -0.65 -1.15) (end 3.15 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 9aa14d39-8365-466e-b0dc-cd5fcb04d32d)) + (fp_line (start -0.65 1.15) (end -1.3 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 4221b925-9d16-4fa9-9cc4-817e23604cd4)) + (fp_line (start 3.15 -1.15) (end 3.8 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 02f01a07-68e1-4e37-a9e8-24fea4f3172c)) + (fp_line (start 3.15 1.15) (end -0.65 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 45ba1e37-ccf7-434d-86e3-8cf8f0b1b177)) + (fp_line (start 3.8 -0.5) (end 3.8 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 46cb81fc-2200-4fbc-934f-04fa44a91400)) + (fp_line (start 3.8 0.5) (end 3.15 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bcef0189-6cd3-46a4-8a79-6642204ff106)) + (pad "1" thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 4 "GND") (pinfunction "1") (pintype "passive") (tstamp 8e0cf4fb-b8d8-4282-8683-16d320efddf5)) + (pad "1" thru_hole circle (at 2.54 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 4 "GND") (pinfunction "1") (pintype "passive") (tstamp 5706c2ba-eb45-4ee7-ada0-6795106d58bd)) + (model "${KICAD7_3DMODEL_DIR}/TestPoint.3dshapes/TestPoint_Bridge_Pitch2.54mm_Drill0.7mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (layer "B.Cu") (tstamp 95298b8f-ee88-45a1-8202-75799539888b) (at 56.007 88.646 -90) @@ -1624,6 +1822,72 @@ ) ) + (footprint "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (layer "B.Cu") + (tstamp badd293b-03f9-467c-805c-d5f503d85463) + (at 44.45 85.725 -90) + (descr "Test point with 2 pins, pitch 2.54mm, drill diameter 0.8mm") + (tags "CONN DEV") + (property "Sheetfile" "APRSuino.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "test point (alternative probe-style design)") + (property "ki_keywords" "test point tp") + (path "/13b8fb05-6500-445e-b000-51ef6216faa9") + (attr exclude_from_pos_files) + (fp_text reference "TP1" (at 1.3 -1.905 90) (layer "B.SilkS") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp a67f9604-f32a-4e6c-8a4c-b7337e67df7a) + ) + (fp_text value "AF" (at 1.27 1.905 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 54651d04-92d5-4704-88ca-a60a1297ee9e) + ) + (fp_text user "${REFERENCE}" (at 1.3 2 90) (layer "B.Fab") + (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) + (tstamp 86437901-e916-46d8-8695-ee5a36814d86) + ) + (fp_line (start -1.03 -0.4) (end -1.03 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp b454e8d5-0865-4467-831a-08ab5b7977eb)) + (fp_line (start -1.03 0.4) (end -0.53 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp f267c413-5bfb-4cc3-a9cd-ee78c1a7f1a0)) + (fp_line (start -0.53 -0.9) (end -1.03 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 6e1e3e5d-adf3-4b48-bc21-d7faa22f5c73)) + (fp_line (start -0.53 0.9) (end 3.07 0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp ae0e8f17-eb53-4d0f-8cdb-48b2b206334f)) + (fp_line (start 3.07 -0.9) (end -0.53 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp fd866ab3-05b2-4907-80f3-52beb1cd2ec1)) + (fp_line (start 3.07 0.9) (end 3.57 0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp c74b5d70-43d0-4eaa-b3f6-8d791e4d6c9a)) + (fp_line (start 3.57 -0.4) (end 3.07 -0.9) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp 1d3ab5be-5fd6-4013-8660-e53ce02a8cf9)) + (fp_line (start 3.57 0.4) (end 3.57 -0.4) + (stroke (width 0.15) (type solid)) (layer "B.SilkS") (tstamp d7f6422b-3abd-4a81-8322-bca46cd1822c)) + (fp_line (start -1.3 -0.5) (end -0.65 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cde4fa8d-3f2f-4917-ae02-deab7c9aa9a4)) + (fp_line (start -1.3 0.5) (end -1.3 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bab77372-7dde-4c81-b056-497fa332d786)) + (fp_line (start -0.65 -1.15) (end 3.15 -1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp bc8581b1-181c-4a79-ad0e-2355b837efaa)) + (fp_line (start -0.65 1.15) (end -1.3 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 1fe1e648-fbbb-4b78-a356-dab6cfa67d39)) + (fp_line (start 3.15 -1.15) (end 3.8 -0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp dc0ad85e-4b65-4252-bde7-fe7a69aae0d3)) + (fp_line (start 3.15 1.15) (end -0.65 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 0ba35b6b-a3e1-4536-8c4f-37ed27ca1e85)) + (fp_line (start 3.8 -0.5) (end 3.8 0.5) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 278fd9f5-5282-47a0-bcc1-15c5fa993022)) + (fp_line (start 3.8 0.5) (end 3.15 1.15) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp ac5f4697-dadb-4f1e-80ca-34c82dfe8813)) + (pad "1" thru_hole circle (at 0 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 29 "AF_OUT") (pinfunction "1") (pintype "passive") (tstamp 640aa0c5-5d24-4f53-82a0-862796d72816)) + (pad "1" thru_hole circle (at 2.54 0 270) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") + (net 29 "AF_OUT") (pinfunction "1") (pintype "passive") (tstamp 104bb0f2-95e4-4185-9e22-e6a4c35919cc)) + (model "${KICAD7_3DMODEL_DIR}/TestPoint.3dshapes/TestPoint_Bridge_Pitch2.54mm_Drill0.7mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + (footprint "APRSuino:WC1602A_I2C" (layer "B.Cu") (tstamp c6b7b20e-863f-4d20-9f40-a3bdba70e633) (at 128.096 77.47 180) @@ -1635,86 +1899,86 @@ (attr through_hole) (fp_text reference "U1" (at -5.82 3.81) (layer "B.SilkS") (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp ec501513-8453-43c4-a0f0-e7772ed0b94c) + (tstamp 41bd8aa0-e400-43b4-b059-81b5bdcaeaab) ) (fp_text value "~" (at -4.31 -34.66) (layer "B.Fab") (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp b7bd8d4d-a2eb-4204-b49a-aee4d0773f4a) + (tstamp b4ce318b-799d-4dde-9c31-4eec0294be45) ) (fp_text user "${REFERENCE}" (at 86.4012 0.2164) (layer "B.Fab") (effects (font (size 1 1) (thickness 0.1)) (justify mirror)) - (tstamp fed0794e-c69b-42f5-93e9-2602a1c3c02c) + (tstamp 267004b9-85c6-4b61-90ff-f742ae748456) ) (fp_line (start -8.14 -33.64) (end 72.14 -33.64) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 04db92e3-24e8-4d99-a9a5-e657d186784a)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 41cd9cb3-ee25-4d71-b6ff-899f8828ac02)) (fp_line (start -8.14 2.64) (end -8.14 -33.64) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp fae3033c-76f6-424c-89b9-c227ac464951)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 8efa0ccc-3d1d-4c4d-91d3-0dd93844843c)) (fp_line (start -8.13 2.64) (end -7.34 2.64) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 811c78da-9330-4cbb-838c-3b8b0d97e86a)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 851a9db2-e1b7-4c0c-b3fe-6cd2cc9e89dd)) (fp_line (start -5 -28) (end -5 -3) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 2029b58d-1367-4d83-8439-4728b820502a)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 64477f58-67c0-4c8d-9415-2e0929982c3d)) (fp_line (start -5 -3) (end 68 -3) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1a432501-86b8-40e5-937b-641a64931998)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a06fa8a2-d805-4459-91ce-ab3a5075cd2e)) (fp_line (start -1.5 3) (end 1.5 3) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e49a5694-2a98-49c7-a12c-4cb29d06ddc5)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7b5bbf29-8df8-484b-950c-29570823275d)) (fp_line (start -0.29972 -22.49932) (end -0.29972 -8.5) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp a1f203e6-9da5-40ca-8f83-57b47630d2a6)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3591f099-9311-4264-bbfd-f42b18d688bb)) (fp_line (start 0.2 -8) (end 63.7 -8) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6e5c0452-0b86-4fa7-9cf7-092f26d56b1a)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 081c6215-8fcc-41a8-88da-4bf27d1b3675)) (fp_line (start 63.70066 -23) (end 0.2 -23) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3d1a19b8-cf9a-49f7-ac50-a355825e53e9)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 6030698d-b089-4159-bc0f-8190356e591b)) (fp_line (start 64.2 -8.5) (end 64.2 -22.5) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 970fec36-da68-4d5a-811f-03337af2f4ed)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f77d7779-b640-465c-aecf-00bc97457087)) (fp_line (start 68 -28) (end -5 -28) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 1c45b67c-0620-4cfa-820f-4131cc59ed3e)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 3fc1cbd4-d20e-410d-90bd-d203bd910f57)) (fp_line (start 68 -3) (end 68 -28) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp f66792df-3a2d-4f41-ac72-14f074686fa5)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 62dea6a2-3d69-4941-bdef-878fcd4bfd3a)) (fp_line (start 72.14 -33.64) (end 72.14 2.64) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 0b490776-d778-483e-ab8d-f4fc09760715)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 7195a9fa-0d01-4f81-9154-d1e7f69a6af6)) (fp_line (start 72.14 2.64) (end -7.34 2.64) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b74e64a9-e408-4d15-acc0-cfbac11ce1e3)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 50531d22-af06-44dc-b925-e63837c51645)) (fp_arc (start -0.29972 -22.49932) (mid -0.153162 -22.853142) (end 0.20066 -22.9997) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 38729ca4-8572-46fb-8a9d-f5bdcfc334f5)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp b6b0d4fb-8770-4bbd-8bce-3a88603f893c)) (fp_arc (start 0.20066 -7.99846) (mid -0.153162 -8.145018) (end -0.29972 -8.49884) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp e1618436-cefa-4d08-af09-3ffe741af22f)) - (fp_arc (start 63.70066 -22.9997) (mid 64.05448 -22.853151) (end 64.20104 -22.49932) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 55cc9866-6204-483d-8e1f-8f522b701d0e)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 55a4fd69-f5fd-40ae-a9c7-35594d54828c)) + (fp_arc (start 63.70066 -22.9997) (mid 64.054515 -22.853157) (end 64.20104 -22.49932) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 131c1280-b963-4727-bd3b-7268f7846bd2)) (fp_arc (start 64.2 -8.5) (mid 64.053553 -8.146447) (end 63.7 -8) - (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp 22fb715a-81b8-479f-abdb-9ab0336450cf)) + (stroke (width 0.12) (type solid)) (layer "B.SilkS") (tstamp c420495f-d3e7-4a42-92c0-64796ffbd74e)) (fp_line (start -8.25 -33.75) (end 72.25 -33.75) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp a6b71a5e-542d-4266-992d-22f0b373b9a3)) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5b141348-4f78-4042-8962-18029e09f43b)) (fp_line (start -8.25 2.75) (end -8.25 -33.75) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 317c103b-ee2a-4177-bd6e-ee94b6d1a22c)) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 2bfe8059-7652-43a3-b317-5ead5f9fb4d8)) (fp_line (start -8.25 2.75) (end 72.25 2.75) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 5c74f266-01fa-4d89-8af0-e30e42bb40c6)) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp 27c0d9fc-21a6-4d28-8d4b-905d67aa3e6d)) (fp_line (start 72.25 2.75) (end 72.25 -33.75) - (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp cbd05020-761c-48ce-b215-d41b5ca0638f)) + (stroke (width 0.05) (type solid)) (layer "B.CrtYd") (tstamp e10df234-810e-4328-901e-c7a7121e7476)) (fp_line (start -8 -33.5) (end -8 2.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 95c69412-b558-4ffd-ad0f-fdc252643bc5)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 63611a8b-b83f-4934-bd1e-8351282dd1a9)) (fp_line (start -1 2.5) (end -8 2.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp d4341f8f-c625-4059-bec3-fde3d9982d66)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 849601db-38ae-4626-ac70-a8d6b93e543d)) (fp_line (start 0 1.5) (end -1 2.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp fb57acb9-63fd-49a7-8c3b-6adedc09c584)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 5a92704c-7d3f-4110-89dc-464c600336fd)) (fp_line (start 1 2.5) (end 0 1.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 65813b13-67f4-45db-9474-f539c0c74686)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp c5f0affb-936f-4db5-b0b8-888e915560fa)) (fp_line (start 1 2.5) (end 72 2.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp f631307b-fd9e-49e9-a4aa-946d09b71af6)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp ed5d75e8-a0af-4334-8f6a-f2b650acab8f)) (fp_line (start 72 -33.5) (end -8 -33.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp dbb3800e-c602-4dd6-9309-9139001ac5b6)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 995be5cf-cb79-4ff9-bbb4-cd952b5bdfee)) (fp_line (start 72 2.5) (end 72 -33.5) - (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 1339f69a-4dbc-4106-ac54-053c8fb563e6)) - (pad "" thru_hole circle (at -5.4991 -31.0007 180) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp b8e700d4-e242-41a7-9151-1b1954eee4ba)) - (pad "" thru_hole circle (at -5.4991 0 180) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp 23d96db9-2897-4722-add8-4e76b6a0000d)) - (pad "" thru_hole circle (at 69.49948 -31.0007 180) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp 504ecc0c-fc69-4c6d-ac37-5cc6eff4fe63)) - (pad "" thru_hole circle (at 69.5 0 180) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp 26c9cb9a-acae-4dc8-b921-bba4141977b9)) - (pad "1" thru_hole rect (at 0 -5.08) (size 2.5 2) (drill 1) (layers "*.Cu" "*.Mask") - (net 4 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 2949a249-d97a-4a18-83b4-801d34f47442)) - (pad "2" thru_hole oval (at 0 -7.62) (size 2.5 2) (drill 1) (layers "*.Cu" "*.Mask") - (net 26 "+5V") (pinfunction "VCC") (pintype "power_in") (tstamp 42ed7628-d606-4699-9e41-1375b9a0534d)) - (pad "3" thru_hole oval (at 0 -10.16) (size 2.5 2) (drill 1) (layers "*.Cu" "*.Mask") - (net 22 "SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp 4fd43bda-d442-414a-8a94-f0641b6d3066)) - (pad "4" thru_hole oval (at 0 -12.7) (size 2.5 2) (drill 1) (layers "*.Cu" "*.Mask") - (net 23 "SCL") (pinfunction "SCL") (pintype "input") (tstamp 4fd3cba4-2fc1-40da-bce9-3a78f626377f)) + (stroke (width 0.1) (type solid)) (layer "B.Fab") (tstamp 4b33bd72-aba1-44b9-a5cf-160aeac01fb4)) + (pad "" np_thru_hole circle (at -5.4991 -31.0007 180) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp ba484f96-95fe-47a6-9c48-d8cefee394d8)) + (pad "" np_thru_hole circle (at -5.4991 0 180) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp 2ea29aaf-705e-460b-b8d0-2ba74a153401)) + (pad "" np_thru_hole circle (at 69.49948 -31.0007 180) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp 9bae3673-3572-404a-88ce-a42abd277f1e)) + (pad "" np_thru_hole circle (at 69.5 0 180) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp afbc0cc1-5a22-4436-98a3-ae984d8bba2f)) + (pad "1" thru_hole rect (at 0 -3.81) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") + (net 4 "GND") (pinfunction "GND") (pintype "power_in") (tstamp 308f33a3-077d-4c3d-b56c-f655f661c629)) + (pad "2" thru_hole oval (at 0 -6.35) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") + (net 26 "+5V") (pinfunction "VCC") (pintype "power_in") (tstamp 18a08b54-b2cd-4f0b-96bc-4e009dc03ff5)) + (pad "3" thru_hole oval (at 0 -8.89) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") + (net 22 "SDA") (pinfunction "SDA") (pintype "bidirectional") (tstamp 4ae4c30e-8d3e-4709-b73a-d127a80e1f48)) + (pad "4" thru_hole oval (at 0 -11.43) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") + (net 23 "SCL") (pinfunction "SCL") (pintype "input") (tstamp 860af8fb-b26d-401b-b0e2-b5dfd5b2b94a)) (model "${KIPRJMOD}/LCD AP214.STEP" (offset (xyz 32 -15.5 12)) (scale (xyz 1 1 1)) @@ -2028,11 +2292,11 @@ ) ) - (gr_rect (start 80.518 79.756) (end 92.202 87.63) + (gr_rect (start 80.518 81.661) (end 92.202 89.535) (stroke (width 0.1) (type default)) (fill none) (layer "Edge.Cuts") (tstamp 98cb7f1d-bc34-42c9-a4b2-615c29cf4bd3)) (gr_rect (start 39.5224 61.0108) (end 136.2456 111.252) (stroke (width 0.1) (type default)) (fill none) (layer "Edge.Cuts") (tstamp ba9bd4e2-3b75-4401-a378-d2a24f746b8b)) - (gr_rect (start 115.316 80.518) (end 123.19 89.408) + (gr_rect (start 113.03 79.375) (end 120.904 88.265) (stroke (width 0.1) (type default)) (fill none) (layer "Edge.Cuts") (tstamp cdc10c5a-0605-4b40-96a8-2577c0d8d8bc)) (gr_text "SET" (at 113.03 73.025) (layer "B.Cu") (tstamp 100a9e64-48be-44c3-a085-a2d0f35219b0) (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify mirror)) @@ -2043,6 +2307,18 @@ (gr_text "RESET" (at 99.695 73.025) (layer "B.Cu") (tstamp 48d77cec-838f-472f-960a-adca66ded283) (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify mirror)) ) + (gr_text "PTT" (at 42.545 81.28 270) (layer "B.Cu") (tstamp 5db3e7a0-019f-4f59-bec1-ae35ee361249) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify top mirror)) + ) + (gr_text "GND" (at 42.545 98.425 270) (layer "B.Cu") (tstamp b798240c-8a18-41ac-9c60-10209754e347) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify top mirror)) + ) + (gr_text "AF" (at 42.545 86.995 270) (layer "B.Cu") (tstamp d7469126-fc76-4813-a92f-113b6db3decf) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify top mirror)) + ) + (gr_text "DAC" (at 42.545 92.71 270) (layer "B.Cu") (tstamp e11c340a-3c46-4ca8-9fc1-27e208dc300f) + (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify top mirror)) + ) (gr_text "TX" (at 46.99 107.95) (layer "B.SilkS") (tstamp 0cd774e4-61f5-441b-8926-3aa1ccd9c1a4) (effects (font (size 1.5 1.5) (thickness 0.3) bold) (justify mirror)) ) @@ -2060,28 +2336,25 @@ (segment (start 91.44 72.39) (end 93.29 70.54) (width 0.5) (layer "F.Cu") (net 3) (tstamp 40e37194-f963-45ac-a688-b830e3062435)) (segment (start 78.486 72.39) (end 91.44 72.39) (width 0.5) (layer "F.Cu") (net 3) (tstamp 9fb77857-30cb-44bc-80de-de1047196ed1)) (segment (start 93.29 70.54) (end 103.782 70.54) (width 0.5) (layer "F.Cu") (net 3) (tstamp f62f0bb5-95b7-4546-9c97-7899f2cd9596)) - (segment (start 102.235 74.89) (end 102.235 74.93) (width 0.5) (layer "F.Cu") (net 5) (tstamp 0cac3934-e2d7-437f-800e-d03f69e61ec8)) + (segment (start 84.455 73.66) (end 80.645 77.47) (width 0.5) (layer "F.Cu") (net 5) (tstamp 1201aea6-fc72-4221-9c4d-96bce4123b63)) (segment (start 106.72 70.485) (end 106.68 70.445) (width 0.5) (layer "F.Cu") (net 5) (tstamp 22c4a05f-2c5c-44ae-9e52-c939b2325c02)) + (segment (start 103.465 73.66) (end 84.455 73.66) (width 0.5) (layer "F.Cu") (net 5) (tstamp 2885f544-f002-4b4f-8df0-73bb8b1c3928)) + (segment (start 106.68 70.445) (end 103.465 73.66) (width 0.5) (layer "F.Cu") (net 5) (tstamp 35e3eff5-7dc1-4acf-8bbd-38a4cb836b94)) + (segment (start 80.645 77.47) (end 78.486 77.47) (width 0.5) (layer "F.Cu") (net 5) (tstamp 4dd87dbc-0e39-479b-984d-b1bf0366ce88)) (segment (start 109.855 70.485) (end 106.72 70.485) (width 0.5) (layer "F.Cu") (net 5) (tstamp 54fc4b5b-f578-442d-ab49-c9ef936cacdf)) - (segment (start 78.486 77.47) (end 90.17 77.47) (width 0.5) (layer "F.Cu") (net 5) (tstamp 606cd286-7a60-4d5d-9f3d-a65bfe148a37)) - (segment (start 102.235 74.93) (end 92.71 74.93) (width 0.5) (layer "F.Cu") (net 5) (tstamp aa89ef31-b993-423d-b12f-2b0586a2c7fa)) - (segment (start 92.71 74.93) (end 90.17 77.47) (width 0.5) (layer "F.Cu") (net 5) (tstamp ab2f4793-0a72-4f72-8a23-d09d6546f4f6)) (segment (start 109.855 70.485) (end 116.355 70.485) (width 0.5) (layer "F.Cu") (net 5) (tstamp e3828a8a-347b-4150-8d4e-046de4a2b9cb)) - (segment (start 106.68 70.445) (end 102.235 74.89) (width 0.5) (layer "F.Cu") (net 5) (tstamp ecd6e21b-0b80-432f-902f-16dcbb65412a)) - (segment (start 120.015 70.485) (end 114.3 76.2) (width 0.5) (layer "F.Cu") (net 6) (tstamp 028aecca-2027-4aa0-95de-7a9654e16981)) - (segment (start 78.486 80.01) (end 79.756 78.74) (width 0.5) (layer "F.Cu") (net 6) (tstamp 32447c47-3b73-4afb-9e0e-a627eb319261)) (segment (start 123.19 70.485) (end 120.015 70.485) (width 0.5) (layer "F.Cu") (net 6) (tstamp 3aaf8b5c-8160-4afe-9eec-003c2346b111)) - (segment (start 79.756 78.74) (end 95.25 78.74) (width 0.5) (layer "F.Cu") (net 6) (tstamp 5958f019-10c2-4fa7-9e7e-4c46dfe5b423)) - (segment (start 97.673 76.2) (end 114.3 76.2) (width 0.5) (layer "F.Cu") (net 6) (tstamp 83c19ae3-f703-4f8f-ac25-c7297f42c2a2)) - (segment (start 95.25 78.74) (end 95.25 78.623) (width 0.5) (layer "F.Cu") (net 6) (tstamp be5d83f5-4e80-43a3-99ea-9b9ed56c1c91)) - (segment (start 95.25 78.623) (end 97.673 76.2) (width 0.5) (layer "F.Cu") (net 6) (tstamp e3b1d9d5-4fe4-424d-ba0c-4a643b2034a3)) + (segment (start 80.645 80.01) (end 78.486 80.01) (width 0.5) (layer "F.Cu") (net 6) (tstamp 4b8e0d23-1d4f-40a2-8a95-1d0cfd0a73b4)) + (segment (start 85.725 74.93) (end 80.645 80.01) (width 0.5) (layer "F.Cu") (net 6) (tstamp 8de8ef00-6617-4ef4-8d49-672e064b3045)) + (segment (start 115.57 74.93) (end 85.725 74.93) (width 0.5) (layer "F.Cu") (net 6) (tstamp ba4dce6d-b603-4629-a8bc-1444c2ddece4)) + (segment (start 120.015 70.485) (end 115.57 74.93) (width 0.5) (layer "F.Cu") (net 6) (tstamp e9a364df-0eff-4ffb-b87b-6fc27aaf1920)) (segment (start 129.055 70.485) (end 122.555 70.485) (width 0.5) (layer "F.Cu") (net 6) (tstamp ff12ae26-efc8-43b4-ab88-6f47eead11bd)) - (segment (start 57.785 69.215) (end 57.15 69.215) (width 0.5) (layer "F.Cu") (net 7) (tstamp 1edb5c35-0fcd-4abe-a714-912a6cb7ea91)) - (segment (start 60.96 77.47) (end 60.96 72.39) (width 0.5) (layer "F.Cu") (net 7) (tstamp 2164d1bc-0c28-473e-93b3-be086c7f358f)) - (segment (start 62.23 78.74) (end 60.96 77.47) (width 0.5) (layer "F.Cu") (net 7) (tstamp 32ebf747-b99e-49ed-99f0-6194ad94f2bf)) - (segment (start 74.676 78.74) (end 62.23 78.74) (width 0.5) (layer "F.Cu") (net 7) (tstamp 9885bf65-cb7d-496d-9040-63a1f5bcd0a9)) - (segment (start 78.486 82.55) (end 74.676 78.74) (width 0.5) (layer "F.Cu") (net 7) (tstamp ba32f504-d696-454a-954b-a93b0c0709bf)) - (segment (start 60.96 72.39) (end 57.785 69.215) (width 0.5) (layer "F.Cu") (net 7) (tstamp cf493595-205e-40c8-8d94-7aacc40bb927)) + (segment (start 61.595 78.105) (end 61.595 73.025) (width 0.5) (layer "F.Cu") (net 7) (tstamp 03f1f4fc-77a1-445d-99a7-b202fae09899)) + (segment (start 61.595 73.025) (end 57.785 69.215) (width 0.5) (layer "F.Cu") (net 7) (tstamp 83e22c3b-ce83-4e3b-8a62-234f252bd7ac)) + (segment (start 62.23 78.74) (end 61.595 78.105) (width 0.5) (layer "F.Cu") (net 7) (tstamp 8f231eb8-29cc-403a-ae8a-3d87a31edd83)) + (segment (start 74.676 78.74) (end 62.23 78.74) (width 0.5) (layer "F.Cu") (net 7) (tstamp 99c79390-41c9-4db0-9c54-9122f2159f20)) + (segment (start 78.486 82.55) (end 74.676 78.74) (width 0.5) (layer "F.Cu") (net 7) (tstamp b91744fe-14da-4589-a468-9c2a3985ea15)) + (segment (start 57.785 69.215) (end 57.15 69.215) (width 0.5) (layer "F.Cu") (net 7) (tstamp cf820ce7-e286-4bc8-b5ba-2cf431c83626)) (segment (start 61.722 95.25) (end 60.706 96.266) (width 0.5) (layer "F.Cu") (net 18) (tstamp be96f6c9-6236-470a-9f4d-1c93612cd56d)) (segment (start 63.246 95.25) (end 61.722 95.25) (width 0.5) (layer "F.Cu") (net 18) (tstamp e82e95ed-f2cd-4c99-8e18-89d611ea4496)) (segment (start 63.246 92.71) (end 61.722 92.71) (width 0.5) (layer "F.Cu") (net 19) (tstamp 310ffe56-a30a-48b2-a364-186a7e1062f1)) @@ -2090,46 +2363,58 @@ (segment (start 61.722 90.17) (end 60.706 91.186) (width 0.5) (layer "F.Cu") (net 20) (tstamp cce245bb-bf0b-4573-8d1b-aa148a327a18)) (segment (start 63.246 87.63) (end 61.722 87.63) (width 0.5) (layer "F.Cu") (net 21) (tstamp c3a9a5e2-f9a9-485b-a13d-dff41721d6a2)) (segment (start 61.722 87.63) (end 60.706 88.646) (width 0.5) (layer "F.Cu") (net 21) (tstamp d462f3ac-e2f9-4094-8a29-48f97580a99f)) - (segment (start 63.246 85.09) (end 72.136 93.98) (width 0.5) (layer "F.Cu") (net 22) (tstamp 23f270b8-2061-4608-b795-f395a7b9afaa)) - (segment (start 130.81 91.44) (end 130.81 88.9) (width 0.5) (layer "F.Cu") (net 22) (tstamp 535fbc5a-5bd8-491c-b14a-f72e80923df4)) - (segment (start 72.136 93.98) (end 128.27 93.98) (width 0.5) (layer "F.Cu") (net 22) (tstamp 9066d30d-eec3-4a7c-81d6-c3ce65eaf232)) - (segment (start 128.27 93.98) (end 130.81 91.44) (width 0.5) (layer "F.Cu") (net 22) (tstamp 98af7f16-b36a-4b2b-8fff-96e865e126de)) - (segment (start 130.81 88.9) (end 129.54 87.63) (width 0.5) (layer "F.Cu") (net 22) (tstamp a8959011-b05c-4996-ac3a-615a0c3626ee)) - (segment (start 129.54 87.63) (end 128.096 87.63) (width 0.5) (layer "F.Cu") (net 22) (tstamp ff40b374-3434-4296-be03-9e96885f21b2)) + (segment (start 129.54 86.36) (end 128.096 86.36) (width 0.5) (layer "F.Cu") (net 22) (tstamp 0d244b3d-ff36-4f52-b4e9-9a256e12d27e)) + (segment (start 63.246 85.09) (end 72.136 93.98) (width 0.5) (layer "F.Cu") (net 22) (tstamp 3e90d23b-fe25-4156-abcd-96f43227b44c)) + (segment (start 130.81 91.44) (end 130.81 87.63) (width 0.5) (layer "F.Cu") (net 22) (tstamp 5f844a24-71b3-44b0-bb83-a08dbb7bf72a)) + (segment (start 72.136 93.98) (end 128.27 93.98) (width 0.5) (layer "F.Cu") (net 22) (tstamp 84306229-b07b-406e-8ee6-3bae32fc4ce1)) + (segment (start 128.27 93.98) (end 130.81 91.44) (width 0.5) (layer "F.Cu") (net 22) (tstamp ed1822cb-3e1b-4fc8-a939-3460da9cff1f)) + (segment (start 130.81 87.63) (end 129.54 86.36) (width 0.5) (layer "F.Cu") (net 22) (tstamp f3395cf7-aec0-471b-abfb-26f536a84665)) (segment (start 76.708 91.44) (end 126.826 91.44) (width 0.5) (layer "F.Cu") (net 23) (tstamp 282a3a12-e72f-4e37-9e1f-6ddabae7a6b3)) + (segment (start 128.096 90.17) (end 128.096 88.9) (width 0.5) (layer "F.Cu") (net 23) (tstamp 5d69ade4-de74-4560-97c3-dea38f6f1489)) (segment (start 63.246 82.55) (end 67.818 82.55) (width 0.5) (layer "F.Cu") (net 23) (tstamp 63f0fd25-da32-4f01-87c4-1f25130f9b27)) (segment (start 67.818 82.55) (end 76.708 91.44) (width 0.5) (layer "F.Cu") (net 23) (tstamp 8c912eb9-91fc-4a57-b546-21c304a793c4)) (segment (start 126.826 91.44) (end 128.096 90.17) (width 0.5) (layer "F.Cu") (net 23) (tstamp ea230a12-13e8-47fb-981a-896335cb7033)) - (segment (start 125.73 85.09) (end 128.096 85.09) (width 0.8) (layer "F.Cu") (net 26) (tstamp 2136778d-7991-4cd0-8ca4-d79c1037eebf)) - (segment (start 124.46 79.256) (end 124.46 83.82) (width 0.8) (layer "F.Cu") (net 26) (tstamp 261755f3-229c-4dc2-9484-6cc03586d8fe)) + (segment (start 131.445 67.945) (end 132.715 69.215) (width 0.8) (layer "F.Cu") (net 26) (tstamp 1f5bbd48-91d7-452f-bc57-6fab893b3223)) + (segment (start 132.715 71.001) (end 125.095 78.621) (width 0.8) (layer "F.Cu") (net 26) (tstamp 28520ca4-e5c3-4c57-a2c5-6548fdb0016c)) + (segment (start 125.095 78.621) (end 125.095 82.55) (width 0.8) (layer "F.Cu") (net 26) (tstamp 28b9d245-3293-44b6-b459-7b557edd5155)) + (segment (start 93.98 67.945) (end 131.445 67.945) (width 0.8) (layer "F.Cu") (net 26) (tstamp 2a8b3249-9e84-4c05-bc76-f1871ae617c0)) (segment (start 93.98 67.945) (end 90.16 67.945) (width 0.8) (layer "F.Cu") (net 26) (tstamp 2b323eca-950a-4575-ac96-1a61469b450d)) + (segment (start 132.715 69.215) (end 132.715 71.001) (width 0.8) (layer "F.Cu") (net 26) (tstamp 2f6b6c75-55de-4b9e-844a-6439ad907881)) (segment (start 86.995 63.5) (end 76.2 63.5) (width 0.8) (layer "F.Cu") (net 26) (tstamp 332b42b4-1553-4ac0-85dd-3aede69b6f65)) (segment (start 90.16 67.945) (end 89.525 67.31) (width 0.8) (layer "F.Cu") (net 26) (tstamp 4a375ec3-9162-4667-a942-0fbb8135a3f4)) (segment (start 86.995 63.5) (end 89.525 66.03) (width 0.8) (layer "F.Cu") (net 26) (tstamp 4bb81a32-3d84-4a7f-ba6e-00bec832592b)) (segment (start 89.525 66.03) (end 89.525 67.31) (width 0.8) (layer "F.Cu") (net 26) (tstamp 4df25ed2-073a-417a-8719-94373e05711a)) (segment (start 76.2 63.5) (end 64.77 74.93) (width 0.8) (layer "F.Cu") (net 26) (tstamp 6d5a4b79-e398-4eef-9e5b-d26b96ecd116)) - (segment (start 132.715 71.001) (end 124.46 79.256) (width 0.8) (layer "F.Cu") (net 26) (tstamp 7b7d6376-5ae7-49cf-bb63-665d70dbfc03)) - (segment (start 132.715 69.215) (end 132.715 71.001) (width 0.8) (layer "F.Cu") (net 26) (tstamp 7d337b8a-3e52-4338-b558-dbbe8a6cddb6)) - (segment (start 131.445 67.945) (end 132.715 69.215) (width 0.8) (layer "F.Cu") (net 26) (tstamp aa41a416-ce69-43f0-95b6-a725d6394c25)) (segment (start 64.77 74.93) (end 63.246 74.93) (width 0.8) (layer "F.Cu") (net 26) (tstamp b4e9580b-30d4-48a3-83ae-bf995dd47d9b)) + (segment (start 125.095 82.55) (end 126.365 83.82) (width 0.8) (layer "F.Cu") (net 26) (tstamp cb0902a0-4e23-4b46-a792-ee99cb01624e)) (segment (start 93.345 67.945) (end 93.98 67.945) (width 0.8) (layer "F.Cu") (net 26) (tstamp cec4e96f-7707-4eb3-9ff7-278cfd32f225)) - (segment (start 124.46 83.82) (end 125.73 85.09) (width 0.8) (layer "F.Cu") (net 26) (tstamp e24efb07-31ba-46f6-8d73-370d0ca31aa1)) - (segment (start 93.98 67.945) (end 131.445 67.945) (width 0.8) (layer "F.Cu") (net 26) (tstamp f18c7087-1cbc-4ab0-b33e-a13016bd3877)) + (segment (start 126.365 83.82) (end 128.096 83.82) (width 0.8) (layer "F.Cu") (net 26) (tstamp fc5db6d7-7ec2-4fcd-8a41-aac62cfb1426)) + (segment (start 49.371 83.344) (end 46.99 85.725) (width 0.5) (layer "F.Cu") (net 29) (tstamp 04d2449a-139f-4255-b5aa-07feb1125f80)) (segment (start 54.61 74.738) (end 54.61 81.058) (width 0.5) (layer "F.Cu") (net 29) (tstamp 174d0825-bd57-4595-8947-143e6fd418a7)) (segment (start 54.61 74.295) (end 55.88 73.025) (width 0.5) (layer "F.Cu") (net 29) (tstamp 29ca7d55-ee19-40ef-9a97-fde880745934)) (segment (start 54.61 81.058) (end 52.324 83.344) (width 0.5) (layer "F.Cu") (net 29) (tstamp 2b5ea374-22ef-4b98-8152-34d2e25bc313)) + (segment (start 44.45 85.725) (end 44.45 88.265) (width 0.5) (layer "F.Cu") (net 29) (tstamp 5729d3e6-8bcb-4476-a515-d45623670f2a)) (segment (start 52.352 68.58) (end 52.352 72.48) (width 0.5) (layer "F.Cu") (net 29) (tstamp 93f7fc26-b0a3-455e-bcd2-dea66abc5e03)) (segment (start 54.61 74.738) (end 54.61 74.295) (width 0.5) (layer "F.Cu") (net 29) (tstamp c5c6b511-0365-4e1f-9424-33d7b5c05cd2)) + (segment (start 49.371 83.344) (end 52.324 83.344) (width 0.5) (layer "F.Cu") (net 29) (tstamp ce236b94-22de-4a8a-9aad-28168e64f518)) + (segment (start 46.99 85.725) (end 44.45 85.725) (width 0.5) (layer "F.Cu") (net 29) (tstamp ec08db6d-5fbf-42ea-9610-9718915a9cd9)) (segment (start 52.352 72.48) (end 54.61 74.738) (width 0.5) (layer "F.Cu") (net 29) (tstamp f197b9e7-52cd-4242-956b-44c9ba0869b2)) + (segment (start 44.45 91.44) (end 44.45 93.98) (width 0.5) (layer "F.Cu") (net 30) (tstamp 47e6f867-64ac-41d6-b9bd-2b775a6ef840)) + (segment (start 52.324 87.63) (end 49.53 87.63) (width 0.5) (layer "F.Cu") (net 30) (tstamp 50629ff0-f18a-433c-920b-511bb9831692)) (segment (start 52.324 87.63) (end 52.324 85.344) (width 0.5) (layer "F.Cu") (net 30) (tstamp 85853aa0-e1a1-4a6f-a849-76c429c06891)) (segment (start 53.34 88.646) (end 52.324 87.63) (width 0.5) (layer "F.Cu") (net 30) (tstamp a43f7ac3-922c-4359-9bbc-3c2768816ad3)) (segment (start 53.848 88.646) (end 53.34 88.646) (width 0.5) (layer "F.Cu") (net 30) (tstamp a4727d69-3576-4ee0-93de-1a25dee98ba4)) (segment (start 53.848 88.646) (end 56.007 88.646) (width 0.5) (layer "F.Cu") (net 30) (tstamp bcbca6bc-165e-4c9f-bd90-b267ab354d89)) (segment (start 53.5832 88.3812) (end 53.848 88.646) (width 0.5) (layer "F.Cu") (net 30) (tstamp c7888a6d-cdb3-4c54-9666-ea39e8d9bd50)) + (segment (start 45.72 91.44) (end 44.45 91.44) (width 0.5) (layer "F.Cu") (net 30) (tstamp caf45b75-9194-4376-a0c6-458fbeec1ec4)) (segment (start 56.007 88.646) (end 58.166 88.646) (width 0.5) (layer "F.Cu") (net 30) (tstamp fcdc9783-2055-4c41-a7ed-f058e098b5e6)) + (segment (start 49.53 87.63) (end 45.72 91.44) (width 0.5) (layer "F.Cu") (net 30) (tstamp fd0a9d9c-b171-44f8-978b-74e962623b39)) (segment (start 56.515 64.77) (end 47.842 64.77) (width 0.5) (layer "F.Cu") (net 33) (tstamp 116bf6e2-1c1a-4592-b356-ba1d32e28199)) + (segment (start 44.45 80.01) (end 44.45 82.55) (width 0.5) (layer "F.Cu") (net 33) (tstamp 383bdb0d-7ad3-4808-8196-c6f41a0d6e0a)) (segment (start 57.15 64.135) (end 56.515 64.77) (width 0.5) (layer "F.Cu") (net 33) (tstamp 4ff93066-1337-4c8a-b878-c5274e08f9bb)) + (segment (start 47.752 64.68) (end 47.752 76.708) (width 0.5) (layer "F.Cu") (net 33) (tstamp a58a234f-bcad-4a3c-b9b3-f18b33f6f183)) (segment (start 47.842 64.77) (end 47.752 64.68) (width 0.5) (layer "F.Cu") (net 33) (tstamp b7690712-5bd0-4803-ad19-68eeaeb4e9cb)) + (segment (start 47.752 76.708) (end 44.45 80.01) (width 0.5) (layer "F.Cu") (net 33) (tstamp e73ff2c7-5b0a-4005-a0ae-0a350e47e89a)) (segment (start 49.53 91.186) (end 51.689 91.186) (width 0.5) (layer "F.Cu") (net 35) (tstamp 2da06ef5-d103-4629-a570-1411181ed591)) (segment (start 51.689 91.186) (end 53.848 91.186) (width 0.5) (layer "F.Cu") (net 35) (tstamp 35ee2a79-5c23-47b5-8440-30ac9c96041f)) (segment (start 53.848 91.186) (end 56.007 91.186) (width 0.5) (layer "F.Cu") (net 35) (tstamp a3a5c855-0047-454d-9af5-d272150d3bd1)) @@ -2436,7 +2721,7 @@ (xy 77.355432 78.122735) (xy 77.485953 78.30914) (xy 77.646859 78.470046) - (xy 77.808333 78.58311) + (xy 77.819167 78.590696) (xy 77.833266 78.600568) (xy 77.891275 78.627618) (xy 77.94345 78.673375) @@ -2456,7 +2741,9 @@ (xy 76.978567 79.981199) (xy 75.251728 78.25436) (xy 75.239946 78.240727) - (xy 75.225609 78.221469) + (xy 75.235318 78.234511) + (xy 75.22561 78.22147) + (xy 75.211939 78.209999) (xy 75.187666 78.189631) (xy 75.179691 78.182323) (xy 75.175782 78.178414) @@ -2483,11 +2770,11 @@ (xy 64.495003 77.833407) (xy 64.531635 77.696691) (xy 64.551468 77.47) - (xy 64.544965 77.395667) + (xy 64.545945 77.406873) (xy 64.531635 77.243308) (xy 64.472739 77.023504) (xy 64.376568 76.817266) - (xy 64.359375 76.792712) + (xy 64.361482 76.795721) (xy 64.246046 76.630859) (xy 64.08514 76.469953) (xy 63.898733 76.339431) @@ -2592,129 +2879,817 @@ (xy 136.1831 61.027913) (xy 136.228487 61.0733) (xy 136.2451 61.1353) - (xy 136.2451 111.1275) - (xy 136.228487 111.1895) - (xy 136.1831 111.234887) - (xy 136.1211 111.2515) + (xy 136.2451 76.444104) + (xy 136.227217 76.508254) + (xy 136.178726 76.553901) + (xy 136.113613 76.567878) + (xy 136.05066 76.546154) + (xy 136.008024 76.494995) + (xy 135.901937 76.259279) + (xy 135.825825 76.133375) + (xy 135.739181 75.990047) + (xy 135.61538 75.832027) + (xy 135.54516 75.742398) + (xy 135.322702 75.51994) + (xy 135.235601 75.451701) + (xy 135.075052 75.325918) + (xy 134.882121 75.209288) + (xy 134.805821 75.163163) + (xy 134.518935 75.034046) + (xy 134.518933 75.034045) + (xy 134.518928 75.034043) + (xy 134.218583 74.940452) + (xy 134.19615 74.936341) + (xy 133.909129 74.883742) + (xy 133.909128 74.883741) + (xy 133.5951 74.864746) + (xy 133.28107 74.883742) + (xy 132.971616 74.940452) + (xy 132.671271 75.034043) + (xy 132.384377 75.163164) + (xy 132.115147 75.325918) + (xy 131.867495 75.519942) + (xy 131.645042 75.742395) + (xy 131.451018 75.990047) + (xy 131.324098 76.2) + (xy 131.288263 76.259279) + (xy 131.284957 76.266625) + (xy 131.159143 76.546171) + (xy 131.065552 76.846516) + (xy 131.008842 77.15597) + (xy 130.989846 77.469999) + (xy 131.003559 77.696689) + (xy 131.008842 77.784029) + (xy 131.055011 78.035966) + (xy 131.065552 78.093483) + (xy 131.159143 78.393828) + (xy 131.159145 78.393833) + (xy 131.159146 78.393835) + (xy 131.288263 78.680721) + (xy 131.334388 78.757021) + (xy 131.451018 78.949952) + (xy 131.527737 79.047876) + (xy 131.64504 79.197602) + (xy 131.867498 79.42006) + (xy 131.914977 79.457257) + (xy 132.115147 79.614081) + (xy 132.168929 79.646593) + (xy 132.384379 79.776837) + (xy 132.671265 79.905954) + (xy 132.971622 79.999549) + (xy 133.281071 80.056258) + (xy 133.5951 80.075253) + (xy 133.909129 80.056258) + (xy 134.218578 79.999549) + (xy 134.518935 79.905954) + (xy 134.805821 79.776837) + (xy 135.075052 79.614081) + (xy 135.322702 79.42006) + (xy 135.54516 79.197602) + (xy 135.739181 78.949952) + (xy 135.901937 78.680721) + (xy 136.008024 78.445004) + (xy 136.05066 78.393846) + (xy 136.113613 78.372122) + (xy 136.178726 78.386099) + (xy 136.227217 78.431746) + (xy 136.2451 78.495896) + (xy 136.2451 107.444804) + (xy 136.227217 107.508954) + (xy 136.178726 107.554601) + (xy 136.113613 107.568578) + (xy 136.05066 107.546854) + (xy 136.008024 107.495695) + (xy 135.98512 107.444804) + (xy 135.901937 107.259979) + (xy 135.837569 107.153502) + (xy 135.739181 106.990747) + (xy 135.597966 106.8105) + (xy 135.54516 106.743098) + (xy 135.322702 106.52064) + (xy 135.224766 106.443912) + (xy 135.075052 106.326618) + (xy 134.881765 106.209773) + (xy 134.805821 106.163863) + (xy 134.518935 106.034746) + (xy 134.518933 106.034745) + (xy 134.518928 106.034743) + (xy 134.218583 105.941152) + (xy 133.909129 105.884442) + (xy 133.5951 105.865446) + (xy 133.28107 105.884442) + (xy 132.971616 105.941152) + (xy 132.671271 106.034743) + (xy 132.384377 106.163864) + (xy 132.115147 106.326618) + (xy 131.867495 106.520642) + (xy 131.645042 106.743095) + (xy 131.451018 106.990747) + (xy 131.288264 107.259977) + (xy 131.159143 107.546871) + (xy 131.065552 107.847216) + (xy 131.008842 108.15667) + (xy 130.989846 108.4707) + (xy 131.008842 108.784729) + (xy 131.065552 109.094183) + (xy 131.159143 109.394528) + (xy 131.159145 109.394533) + (xy 131.159146 109.394535) + (xy 131.288263 109.681421) + (xy 131.288264 109.681422) + (xy 131.451018 109.950652) + (xy 131.586405 110.12346) + (xy 131.64504 110.198302) + (xy 131.867498 110.42076) + (xy 131.97976 110.508712) + (xy 132.115147 110.614781) + (xy 132.231777 110.685286) + (xy 132.384379 110.777537) + (xy 132.671265 110.906654) + (xy 132.67127 110.906655) + (xy 132.671271 110.906656) + (xy 132.971617 111.000248) + (xy 133.000445 111.005531) + (xy 133.055545 111.030664) + (xy 133.092171 111.078896) + (xy 133.101584 111.138722) + (xy 133.081541 111.195871) + (xy 133.036821 111.236711) + (xy 132.978093 111.2515) + (xy 59.213527 111.2515) + (xy 59.154799 111.236711) + (xy 59.110079 111.195871) + (xy 59.090036 111.138722) + (xy 59.099449 111.078896) + (xy 59.136075 111.030664) + (xy 59.191175 111.005531) + (xy 59.219998 111.000249) + (xy 59.22 111.000248) + (xy 59.220002 111.000248) + (xy 59.393052 110.946322) + (xy 59.520355 110.906654) + (xy 59.807241 110.777537) + (xy 60.076472 110.614781) + (xy 60.324122 110.42076) + (xy 60.54658 110.198302) + (xy 60.740601 109.950652) + (xy 60.903357 109.681421) + (xy 61.032474 109.394535) + (xy 61.126069 109.094178) + (xy 61.182778 108.784729) + (xy 61.201773 108.4707) + (xy 61.182778 108.156671) + (xy 61.126069 107.847222) + (xy 61.032474 107.546865) + (xy 60.903357 107.259979) + (xy 60.811106 107.107377) + (xy 60.740601 106.990747) + (xy 60.599386 106.8105) + (xy 60.54658 106.743098) + (xy 60.324122 106.52064) + (xy 60.226186 106.443912) + (xy 60.076472 106.326618) + (xy 59.883185 106.209773) + (xy 59.807241 106.163863) + (xy 59.520355 106.034746) + (xy 59.520353 106.034745) + (xy 59.520348 106.034743) + (xy 59.220003 105.941152) + (xy 58.910549 105.884442) + (xy 58.59652 105.865446) + (xy 58.28249 105.884442) + (xy 57.973036 105.941152) + (xy 57.672691 106.034743) + (xy 57.385797 106.163864) + (xy 57.116567 106.326618) + (xy 56.868915 106.520642) + (xy 56.646462 106.743095) + (xy 56.452438 106.990747) + (xy 56.289684 107.259977) + (xy 56.160563 107.546871) + (xy 56.066972 107.847216) + (xy 56.010262 108.15667) + (xy 55.991266 108.470699) + (xy 56.010262 108.784729) + (xy 56.066972 109.094183) + (xy 56.160563 109.394528) + (xy 56.160565 109.394533) + (xy 56.160566 109.394535) + (xy 56.289683 109.681421) + (xy 56.289684 109.681422) + (xy 56.452438 109.950652) + (xy 56.587825 110.12346) + (xy 56.64646 110.198302) + (xy 56.868918 110.42076) + (xy 56.98118 110.508712) + (xy 57.116567 110.614781) + (xy 57.233197 110.685286) + (xy 57.385799 110.777537) + (xy 57.672685 110.906654) + (xy 57.67269 110.906655) + (xy 57.672691 110.906656) + (xy 57.973037 111.000248) + (xy 58.001865 111.005531) + (xy 58.056965 111.030664) + (xy 58.093591 111.078896) + (xy 58.103004 111.138722) + (xy 58.082961 111.195871) + (xy 58.038241 111.236711) + (xy 57.979513 111.2515) (xy 39.6469 111.2515) (xy 39.5849 111.234887) (xy 39.539513 111.1895) (xy 39.5229 111.1275) - (xy 39.5229 108.470699) - (xy 56.590909 108.470699) - (xy 56.611324 108.756129) - (xy 56.672149 109.035741) - (xy 56.772154 109.303863) - (xy 56.909292 109.555013) - (xy 56.995037 109.669554) - (xy 57.080781 109.784095) - (xy 57.283125 109.986439) - (xy 57.454934 110.115054) - (xy 57.512206 110.157927) - (xy 57.651955 110.234235) - (xy 57.763359 110.295067) - (xy 58.031474 110.395069) - (xy 58.031477 110.395069) - (xy 58.031478 110.39507) - (xy 58.083737 110.406438) - (xy 58.311092 110.455896) - (xy 58.59652 110.47631) - (xy 58.881948 110.455896) - (xy 59.161566 110.395069) - (xy 59.429681 110.295067) - (xy 59.680835 110.157926) - (xy 59.909915 109.986439) - (xy 60.112259 109.784095) - (xy 60.283746 109.555015) - (xy 60.420887 109.303861) - (xy 60.520889 109.035746) - (xy 60.581716 108.756128) - (xy 60.60213 108.4707) - (xy 60.60213 108.470699) - (xy 131.589489 108.470699) - (xy 131.609904 108.756129) - (xy 131.670729 109.035741) - (xy 131.770734 109.303863) - (xy 131.907872 109.555013) - (xy 131.993617 109.669554) - (xy 132.079361 109.784095) - (xy 132.281705 109.986439) - (xy 132.453514 110.115054) - (xy 132.510786 110.157927) - (xy 132.650535 110.234235) - (xy 132.761939 110.295067) - (xy 133.030054 110.395069) - (xy 133.030057 110.395069) - (xy 133.030058 110.39507) - (xy 133.082317 110.406438) - (xy 133.309672 110.455896) - (xy 133.5951 110.47631) - (xy 133.880528 110.455896) - (xy 134.160146 110.395069) - (xy 134.428261 110.295067) - (xy 134.679415 110.157926) - (xy 134.908495 109.986439) - (xy 135.110839 109.784095) - (xy 135.282326 109.555015) - (xy 135.419467 109.303861) - (xy 135.519469 109.035746) - (xy 135.580296 108.756128) - (xy 135.60071 108.4707) - (xy 135.580296 108.185272) - (xy 135.519469 107.905654) - (xy 135.419467 107.637539) - (xy 135.282326 107.386385) - (xy 135.110839 107.157305) - (xy 134.908495 106.954961) - (xy 134.715518 106.8105) - (xy 134.679413 106.783472) - (xy 134.428263 106.646334) - (xy 134.428262 106.646333) - (xy 134.428261 106.646333) - (xy 134.160146 106.546331) - (xy 134.160141 106.546329) - (xy 133.880529 106.485504) - (xy 133.5951 106.465089) - (xy 133.30967 106.485504) - (xy 133.030058 106.546329) - (xy 132.761936 106.646334) - (xy 132.510786 106.783472) - (xy 132.281702 106.954963) - (xy 132.079363 107.157302) - (xy 131.907872 107.386386) - (xy 131.770734 107.637536) - (xy 131.670729 107.905658) - (xy 131.609904 108.18527) - (xy 131.589489 108.470699) - (xy 60.60213 108.470699) - (xy 60.581716 108.185272) - (xy 60.520889 107.905654) - (xy 60.420887 107.637539) - (xy 60.283746 107.386385) - (xy 60.112259 107.157305) - (xy 59.909915 106.954961) - (xy 59.716938 106.8105) - (xy 59.680833 106.783472) - (xy 59.429683 106.646334) - (xy 59.429682 106.646333) - (xy 59.429681 106.646333) - (xy 59.161566 106.546331) - (xy 59.161561 106.546329) - (xy 58.881949 106.485504) - (xy 58.59652 106.465089) - (xy 58.31109 106.485504) - (xy 58.031478 106.546329) - (xy 57.763356 106.646334) - (xy 57.512206 106.783472) - (xy 57.283122 106.954963) - (xy 57.080783 107.157302) - (xy 56.909292 107.386386) - (xy 56.772154 107.637536) - (xy 56.672149 107.905658) - (xy 56.611324 108.18527) - (xy 56.590909 108.470699) - (xy 39.5229 108.470699) - (xy 39.5229 105.41) + (xy 39.5229 102.62) + (xy 45.59 102.62) + (xy 46.74 102.62) + (xy 46.74 101.47) + (xy 47.24 101.47) + (xy 47.24 102.62) + (xy 48.39 102.62) + (xy 48.39 101.922176) + (xy 48.383597 101.862624) + (xy 48.333352 101.72791) + (xy 48.247188 101.612811) + (xy 48.132089 101.526647) + (xy 47.997375 101.476402) + (xy 47.937824 101.47) + (xy 47.24 101.47) + (xy 46.74 101.47) + (xy 46.042176 101.47) + (xy 45.982624 101.476402) + (xy 45.84791 101.526647) + (xy 45.732811 101.612811) + (xy 45.646647 101.72791) + (xy 45.596402 101.862624) + (xy 45.59 101.922176) + (xy 45.59 102.62) + (xy 39.5229 102.62) + (xy 39.5229 100.721881) + (xy 43.796672 100.721881) + (xy 43.912816 100.793795) + (xy 44.120198 100.874135) + (xy 44.338806 100.915) + (xy 44.561194 100.915) + (xy 44.779801 100.874135) + (xy 44.98718 100.793797) + (xy 45.103326 100.72188) + (xy 45.103326 100.721879) + (xy 44.450001 100.068553) + (xy 44.45 100.068553) + (xy 43.796672 100.721879) + (xy 43.796672 100.721881) + (xy 39.5229 100.721881) + (xy 39.5229 99.715) + (xy 43.244859 99.715) + (xy 43.265378 99.936445) + (xy 43.326238 100.150347) + (xy 43.425367 100.349425) + (xy 43.441137 100.370308) + (xy 43.441138 100.370308) + (xy 44.096447 99.715001) + (xy 44.803553 99.715001) + (xy 45.458861 100.370308) + (xy 45.474632 100.349424) + (xy 45.573761 100.150347) + (xy 45.634621 99.936445) + (xy 45.65514 99.715) + (xy 45.634621 99.493554) + (xy 45.573762 99.279654) + (xy 45.47463 99.080572) + (xy 45.45886 99.05969) + (xy 44.803553 99.715) + (xy 44.803553 99.715001) + (xy 44.096447 99.715001) + (xy 44.096447 99.715) + (xy 43.441138 99.059691) + (xy 43.441137 99.059691) + (xy 43.425368 99.080574) + (xy 43.326237 99.279654) + (xy 43.265378 99.493554) + (xy 43.244859 99.715) + (xy 39.5229 99.715) + (xy 39.5229 98.708119) + (xy 43.796671 98.708119) + (xy 44.45 99.361447) + (xy 44.450001 99.361447) + (xy 45.103327 98.708119) + (xy 44.987178 98.636202) + (xy 44.792094 98.560626) + (xy 44.743723 98.526829) + (xy 44.716449 98.474503) + (xy 44.716449 98.415494) + (xy 44.743723 98.363168) + (xy 44.792095 98.329372) + (xy 44.987178 98.253797) + (xy 45.103326 98.18188) + (xy 45.103326 98.181879) + (xy 44.450001 97.528553) + (xy 44.45 97.528553) + (xy 43.796672 98.181879) + (xy 43.796672 98.181881) + (xy 43.912816 98.253795) + (xy 44.107905 98.329373) + (xy 44.156276 98.363169) + (xy 44.18355 98.415496) + (xy 44.18355 98.474504) + (xy 44.156276 98.526831) + (xy 44.107905 98.560627) + (xy 43.912821 98.636202) + (xy 43.796671 98.708119) + (xy 39.5229 98.708119) + (xy 39.5229 97.175) + (xy 43.244859 97.175) + (xy 43.265378 97.396445) + (xy 43.326238 97.610347) + (xy 43.425367 97.809425) + (xy 43.441137 97.830308) + (xy 43.441138 97.830308) + (xy 44.096447 97.175001) + (xy 44.803553 97.175001) + (xy 45.458861 97.830308) + (xy 45.474632 97.809424) + (xy 45.573761 97.610347) + (xy 45.634621 97.396445) + (xy 45.65514 97.175) + (xy 45.634621 96.953554) + (xy 45.573762 96.739654) + (xy 45.47463 96.540572) + (xy 45.45886 96.51969) + (xy 44.803553 97.175) + (xy 44.803553 97.175001) + (xy 44.096447 97.175001) + (xy 44.096447 97.175) + (xy 43.441138 96.519691) + (xy 43.441137 96.519691) + (xy 43.425368 96.540574) + (xy 43.326237 96.739654) + (xy 43.265378 96.953554) + (xy 43.244859 97.175) + (xy 39.5229 97.175) + (xy 39.5229 96.168119) + (xy 43.796671 96.168119) + (xy 44.45 96.821447) + (xy 44.450001 96.821447) + (xy 44.755447 96.516) + (xy 47.947105 96.516) + (xy 47.99984 96.701351) + (xy 48.098965 96.900422) + (xy 48.23299 97.077899) + (xy 48.397337 97.227721) + (xy 48.586421 97.344797) + (xy 48.793799 97.425135) + (xy 48.8736 97.440052) + (xy 48.8736 96.516) + (xy 47.947105 96.516) + (xy 44.755447 96.516) + (xy 45.103327 96.168119) + (xy 44.987179 96.096202) + (xy 44.779801 96.015864) + (xy 44.561194 95.975) + (xy 44.338806 95.975) + (xy 44.120198 96.015864) + (xy 43.912821 96.096202) + (xy 43.796671 96.168119) + (xy 39.5229 96.168119) + (xy 39.5229 93.98) + (xy 43.244357 93.98) + (xy 43.264885 94.201537) + (xy 43.325769 94.415526) + (xy 43.424941 94.614688) + (xy 43.559019 94.792237) + (xy 43.723437 94.942124) + (xy 43.912595 95.059245) + (xy 43.912597 95.059245) + (xy 43.912599 95.059247) + (xy 44.12006 95.139618) + (xy 44.338757 95.1805) + (xy 44.561241 95.1805) + (xy 44.561243 95.1805) + (xy 44.77994 95.139618) + (xy 44.987401 95.059247) + (xy 45.176562 94.942124) + (xy 45.212625 94.909248) + (xy 45.34098 94.792237) + (xy 45.340981 94.792236) + (xy 45.475058 94.614689) + (xy 45.574229 94.415528) + (xy 45.575558 94.410859) + (xy 45.621339 94.249953) + (xy 45.635115 94.201536) + (xy 45.655643 93.98) + (xy 45.635115 93.758464) + (xy 45.612227 93.678021) + (xy 45.57423 93.544473) + (xy 45.475058 93.345311) + (xy 45.34098 93.167762) + (xy 45.240962 93.076584) + (xy 45.211066 93.035033) + (xy 45.2005 92.984947) + (xy 45.2005 92.435053) + (xy 45.211066 92.384967) + (xy 45.240962 92.343416) + (xy 45.299217 92.290309) + (xy 45.340981 92.252236) + (xy 45.350392 92.239773) + (xy 45.394076 92.2035) + (xy 45.449347 92.1905) + (xy 45.656294 92.1905) + (xy 45.674264 92.191809) + (xy 45.67832 92.192402) + (xy 45.698023 92.195289) + (xy 45.747368 92.190972) + (xy 45.758176 92.1905) + (xy 45.763706 92.1905) + (xy 45.763709 92.1905) + (xy 45.79455 92.186894) + (xy 45.798031 92.186539) + (xy 45.872797 92.179999) + (xy 45.872797 92.179998) + (xy 45.874052 92.179889) + (xy 45.893062 92.175674) + (xy 45.89425 92.175241) + (xy 45.894255 92.175241) + (xy 45.96482 92.149557) + (xy 45.968095 92.148419) + (xy 46.039334 92.124814) + (xy 46.039336 92.124812) + (xy 46.040536 92.124415) + (xy 46.058063 92.115929) + (xy 46.059112 92.115238) + (xy 46.059117 92.115237) + (xy 46.121806 92.074005) + (xy 46.124798 92.072099) + (xy 46.188656 92.032712) + (xy 46.188656 92.032711) + (xy 46.189729 92.03205) + (xy 46.204824 92.019753) + (xy 46.205692 92.018832) + (xy 46.205696 92.01883) + (xy 46.257185 91.964253) + (xy 46.259631 91.961735) + (xy 49.804548 88.416818) + (xy 49.844776 88.389939) + (xy 49.892229 88.3805) + (xy 51.96177 88.3805) + (xy 52.009223 88.389939) + (xy 52.049451 88.416819) + (xy 52.718999 89.086367) + (xy 52.742318 89.118776) + (xy 52.822943 89.280691) + (xy 52.957017 89.458235) + (xy 53.121437 89.608124) + (xy 53.275209 89.703334) + (xy 53.310599 89.725247) + (xy 53.504523 89.800373) + (xy 53.552893 89.834169) + (xy 53.580167 89.886496) + (xy 53.580167 89.945504) + (xy 53.552893 89.997831) + (xy 53.504523 90.031626) + (xy 53.373346 90.082444) + (xy 53.310596 90.106754) + (xy 53.121437 90.223875) + (xy 52.957019 90.373763) + (xy 52.947607 90.386227) + (xy 52.903924 90.4225) + (xy 52.848653 90.4355) + (xy 52.688347 90.4355) + (xy 52.633076 90.4225) + (xy 52.589393 90.386227) + (xy 52.57998 90.373763) + (xy 52.415562 90.223875) + (xy 52.226404 90.106754) + (xy 52.165174 90.083033) + (xy 52.01894 90.026382) + (xy 51.800243 89.9855) + (xy 51.577757 89.9855) + (xy 51.35906 90.026381) + (xy 51.35906 90.026382) + (xy 51.151595 90.106754) + (xy 50.962437 90.223875) + (xy 50.798019 90.373763) + (xy 50.788607 90.386227) + (xy 50.744924 90.4225) + (xy 50.689653 90.4355) + (xy 50.529347 90.4355) + (xy 50.474076 90.4225) + (xy 50.430393 90.386227) + (xy 50.42098 90.373763) + (xy 50.256562 90.223875) + (xy 50.067404 90.106754) + (xy 50.006174 90.083033) + (xy 49.85994 90.026382) + (xy 49.641243 89.9855) + (xy 49.418757 89.9855) + (xy 49.20006 90.026381) + (xy 49.20006 90.026382) + (xy 48.992595 90.106754) + (xy 48.803437 90.223875) + (xy 48.639019 90.373762) + (xy 48.504941 90.551311) + (xy 48.405769 90.750473) + (xy 48.344885 90.964462) + (xy 48.324357 91.186) + (xy 48.344885 91.407537) + (xy 48.405769 91.621526) + (xy 48.504941 91.820688) + (xy 48.639019 91.998237) + (xy 48.803437 92.148124) + (xy 48.950231 92.239014) + (xy 48.992599 92.265247) + (xy 49.186523 92.340373) + (xy 49.234893 92.374169) + (xy 49.262167 92.426496) + (xy 49.262167 92.485504) + (xy 49.234893 92.537831) + (xy 49.186523 92.571626) + (xy 49.055346 92.622444) + (xy 48.992596 92.646754) + (xy 48.803437 92.763875) + (xy 48.639019 92.913762) + (xy 48.504941 93.091311) + (xy 48.405769 93.290473) + (xy 48.344885 93.504462) + (xy 48.324357 93.726) + (xy 48.344885 93.947537) + (xy 48.405769 94.161526) + (xy 48.504941 94.360688) + (xy 48.639019 94.538237) + (xy 48.803437 94.688124) + (xy 48.992595 94.805245) + (xy 48.992597 94.805245) + (xy 48.992599 94.805247) + (xy 49.047134 94.826374) + (xy 49.101293 94.867273) + (xy 49.12581 94.930559) + (xy 49.113339 94.997271) + (xy 49.067617 95.047427) + (xy 49.022994 95.060122) + (xy 49.023699 95.063889) + (xy 48.793798 95.106864) + (xy 48.586421 95.187202) + (xy 48.397337 95.304278) + (xy 48.23299 95.4541) + (xy 48.098965 95.631577) + (xy 47.99984 95.830648) + (xy 47.947105 96.016) + (xy 49.2496 96.016) + (xy 49.3116 96.032613) + (xy 49.356987 96.078) + (xy 49.3736 96.14) + (xy 49.3736 97.440052) + (xy 49.4534 97.425135) + (xy 49.660778 97.344797) + (xy 49.849862 97.227721) + (xy 50.014209 97.077899) + (xy 50.148234 96.900422) + (xy 50.247359 96.701351) + (xy 50.274073 96.607461) + (xy 50.306472 96.552907) + (xy 50.361615 96.521521) + (xy 50.425064 96.521521) + (xy 50.480207 96.552906) + (xy 50.512606 96.60746) + (xy 50.539369 96.701526) + (xy 50.638541 96.900688) + (xy 50.772619 97.078237) + (xy 50.937037 97.228124) + (xy 51.126195 97.345245) + (xy 51.126197 97.345245) + (xy 51.126199 97.345247) + (xy 51.33366 97.425618) + (xy 51.552357 97.4665) + (xy 51.774841 97.4665) + (xy 51.774843 97.4665) + (xy 51.99354 97.425618) + (xy 52.201001 97.345247) + (xy 52.390162 97.228124) + (xy 52.554581 97.078236) + (xy 52.563992 97.065773) + (xy 52.607676 97.0295) + (xy 52.662947 97.0165) + (xy 52.848653 97.0165) + (xy 52.903924 97.0295) + (xy 52.947607 97.065773) + (xy 52.957019 97.078236) + (xy 53.121437 97.228124) + (xy 53.310595 97.345245) + (xy 53.310597 97.345245) + (xy 53.310599 97.345247) + (xy 53.51806 97.425618) + (xy 53.736757 97.4665) + (xy 53.959241 97.4665) + (xy 53.959243 97.4665) + (xy 54.17794 97.425618) + (xy 54.385401 97.345247) + (xy 54.574562 97.228124) + (xy 54.738981 97.078236) + (xy 54.748392 97.065773) + (xy 54.792076 97.0295) + (xy 54.847347 97.0165) + (xy 55.007653 97.0165) + (xy 55.062924 97.0295) + (xy 55.106607 97.065773) + (xy 55.116019 97.078236) + (xy 55.280437 97.228124) + (xy 55.469595 97.345245) + (xy 55.469597 97.345245) + (xy 55.469599 97.345247) + (xy 55.67706 97.425618) + (xy 55.895757 97.4665) + (xy 56.118241 97.4665) + (xy 56.118243 97.4665) + (xy 56.33694 97.425618) + (xy 56.544401 97.345247) + (xy 56.733562 97.228124) + (xy 56.897981 97.078236) + (xy 56.907392 97.065773) + (xy 56.951076 97.0295) + (xy 57.006347 97.0165) + (xy 57.166653 97.0165) + (xy 57.221924 97.0295) + (xy 57.265607 97.065773) + (xy 57.275019 97.078236) + (xy 57.439437 97.228124) + (xy 57.628595 97.345245) + (xy 57.628597 97.345245) + (xy 57.628599 97.345247) + (xy 57.83606 97.425618) + (xy 58.054757 97.4665) + (xy 58.277241 97.4665) + (xy 58.277243 97.4665) + (xy 58.49594 97.425618) + (xy 58.703401 97.345247) + (xy 58.892562 97.228124) + (xy 58.992228 97.137266) + (xy 59.05698 97.078237) + (xy 59.057235 97.077899) + (xy 59.191058 96.900689) + (xy 59.290229 96.701528) + (xy 59.29028 96.701351) + (xy 59.316734 96.608374) + (xy 59.349133 96.55382) + (xy 59.404275 96.522435) + (xy 59.467725 96.522435) + (xy 59.522867 96.55382) + (xy 59.555266 96.608374) + (xy 59.581769 96.701526) + (xy 59.680941 96.900688) + (xy 59.815019 97.078237) + (xy 59.979437 97.228124) + (xy 60.168595 97.345245) + (xy 60.168597 97.345245) + (xy 60.168599 97.345247) + (xy 60.37606 97.425618) + (xy 60.594757 97.4665) + (xy 60.817241 97.4665) + (xy 60.817243 97.4665) + (xy 61.03594 97.425618) + (xy 61.243401 97.345247) + (xy 61.432562 97.228124) + (xy 61.532228 97.137266) + (xy 61.59698 97.078237) + (xy 61.597235 97.077899) + (xy 61.731058 96.900689) + (xy 61.830229 96.701528) + (xy 61.83028 96.701351) + (xy 61.869569 96.563261) + (xy 61.891115 96.487536) + (xy 61.911643 96.266) + (xy 61.904778 96.191921) + (xy 61.911619 96.13837) + (xy 61.940569 96.092799) + (xy 61.996551 96.036818) + (xy 62.036779 96.009939) + (xy 62.084231 96.0005) + (xy 62.119337 96.0005) + (xy 62.176594 96.014511) + (xy 62.220912 96.053377) + (xy 62.245953 96.08914) + (xy 62.406859 96.250046) + (xy 62.429644 96.266) + (xy 62.593266 96.380568) + (xy 62.651275 96.407618) + (xy 62.70345 96.453375) + (xy 62.722869 96.52) + (xy 62.70345 96.586625) + (xy 62.651275 96.632382) + (xy 62.593263 96.659433) + (xy 62.406859 96.789953) + (xy 62.245953 96.950859) + (xy 62.115432 97.137264) + (xy 62.019261 97.343502) + (xy 61.960364 97.56331) + (xy 61.940531 97.79) + (xy 61.960364 98.016689) + (xy 62.019261 98.236497) + (xy 62.115432 98.442735) + (xy 62.245953 98.62914) + (xy 62.406859 98.790046) + (xy 62.593262 98.920565) + (xy 62.593266 98.920568) + (xy 62.651273 98.947617) + (xy 62.703449 98.993373) + (xy 62.722869 99.059997) + (xy 62.703451 99.126622) + (xy 62.651276 99.17238) + (xy 62.593266 99.199431) + (xy 62.406859 99.329953) + (xy 62.245953 99.490859) + (xy 62.115432 99.677264) + (xy 62.019261 99.883502) + (xy 61.960364 100.10331) + (xy 61.940531 100.33) + (xy 61.960364 100.556689) + (xy 62.019261 100.776497) + (xy 62.115432 100.982735) + (xy 62.245953 101.16914) + (xy 62.406859 101.330046) + (xy 62.593263 101.460566) + (xy 62.593266 101.460568) + (xy 62.651275 101.487618) + (xy 62.70345 101.533375) + (xy 62.722869 101.6) + (xy 62.70345 101.666625) + (xy 62.651275 101.712382) + (xy 62.593263 101.739433) + (xy 62.406859 101.869953) + (xy 62.245953 102.030859) + (xy 62.220912 102.066623) + (xy 62.176594 102.105489) + (xy 62.119337 102.1195) + (xy 54.339347 102.1195) + (xy 54.284076 102.1065) + (xy 54.240393 102.070227) + (xy 54.23098 102.057763) + (xy 54.066562 101.907875) + (xy 53.877404 101.790754) + (xy 53.744929 101.739433) + (xy 53.66994 101.710382) + (xy 53.451243 101.6695) + (xy 53.228757 101.6695) + (xy 53.01006 101.710381) + (xy 53.01006 101.710382) + (xy 52.802595 101.790754) + (xy 52.613437 101.907875) + (xy 52.449019 102.057762) + (xy 52.314941 102.235311) + (xy 52.215769 102.434473) + (xy 52.154885 102.648462) + (xy 52.134357 102.87) + (xy 52.154885 103.091537) + (xy 52.215769 103.305526) + (xy 52.314941 103.504688) + (xy 52.449019 103.682237) + (xy 52.613437 103.832124) + (xy 52.686521 103.877375) + (xy 52.802599 103.949247) + (xy 52.996523 104.024373) + (xy 53.044893 104.058169) + (xy 53.072167 104.110496) + (xy 53.072167 104.169504) + (xy 53.044893 104.221831) + (xy 52.996523 104.255626) + (xy 52.940474 104.27734) + (xy 52.802596 104.330754) + (xy 52.613437 104.447875) + (xy 52.449019 104.597763) + (xy 52.439607 104.610227) + (xy 52.395924 104.6465) + (xy 52.340653 104.6595) + (xy 48.239685 104.6595) + (xy 48.180668 104.644555) + (xy 48.135877 104.603322) + (xy 48.098981 104.54685) + (xy 48.09898 104.546849) + (xy 48.098979 104.546847) + (xy 48.003831 104.443488) + (xy 47.975059 104.390737) + (xy 47.974466 104.33065) + (xy 48.002193 104.27734) + (xy 48.051729 104.243325) + (xy 48.132088 104.213352) + (xy 48.247188 104.127188) + (xy 48.333352 104.012089) + (xy 48.383597 103.877375) + (xy 48.39 103.817824) + (xy 48.39 103.12) + (xy 45.59 103.12) + (xy 45.59 103.817824) + (xy 45.596402 103.877375) + (xy 45.646647 104.012089) + (xy 45.732811 104.127188) + (xy 45.84791 104.213352) + (xy 45.928271 104.243325) + (xy 45.977806 104.27734) + (xy 46.005533 104.33065) + (xy 46.00494 104.390736) + (xy 45.976167 104.443489) + (xy 45.881022 104.546844) + (xy 45.754076 104.74115) + (xy 45.660844 104.953696) + (xy 45.603865 105.1787) (xy 45.584699 105.41) (xy 45.603865 105.641299) (xy 45.603865 105.641301) @@ -2901,7 +3876,7 @@ (xy 64.531635 89.943308) (xy 64.472739 89.723504) (xy 64.376568 89.517266) - (xy 64.335235 89.458236) + (xy 64.371648 89.51024) (xy 64.246046 89.330859) (xy 64.08514 89.169953) (xy 63.898733 89.039431) @@ -3156,7 +4131,7 @@ (xy 131.52004 91.698429) (xy 131.52061 91.697296) (xy 131.526999 91.678917) - (xy 131.529765 91.665522) + (xy 131.527256 91.677673) (xy 131.542431 91.604171) (xy 131.543186 91.600767) (xy 131.5605 91.527721) @@ -3167,191 +4142,120 @@ (xy 131.562733 91.505856) (xy 131.560552 91.430889) (xy 131.5605 91.427284) - (xy 131.5605 88.963706) - (xy 131.561809 88.945736) - (xy 131.563554 88.93382) - (xy 131.565289 88.921977) - (xy 131.560971 88.872633) - (xy 131.5605 88.861827) - (xy 131.5605 88.856292) - (xy 131.5605 88.856291) - (xy 131.556893 88.825436) - (xy 131.556537 88.821956) - (xy 131.549998 88.747203) - (xy 131.549888 88.745943) - (xy 131.545674 88.726936) - (xy 131.545241 88.725745) - (xy 131.519569 88.655211) - (xy 131.518422 88.651913) - (xy 131.494814 88.580665) - (xy 131.494812 88.580662) - (xy 131.494415 88.579463) - (xy 131.485929 88.561936) - (xy 131.485237 88.560884) - (xy 131.485237 88.560883) - (xy 131.444025 88.498224) - (xy 131.442106 88.495212) - (xy 131.402048 88.430267) - (xy 131.38975 88.415172) - (xy 131.33429 88.362848) - (xy 131.331703 88.360335) - (xy 130.115728 87.14436) - (xy 130.103946 87.130727) - (xy 130.089609 87.111469) - (xy 130.051666 87.079631) - (xy 130.043691 87.072323) - (xy 130.039782 87.068414) - (xy 130.039781 87.068413) - (xy 130.039777 87.068409) - (xy 130.015423 87.049152) - (xy 130.012647 87.04689) - (xy 129.954251 86.99789) - (xy 129.937821 86.987422) - (xy 129.868691 86.955186) - (xy 129.865447 86.953615) - (xy 129.797306 86.919394) - (xy 129.778903 86.912997) - (xy 129.706184 86.897981) - (xy 129.657287 86.876062) - (xy 129.622204 86.835558) - (xy 129.606474 86.80649) - (xy 129.453738 86.610256) - (xy 129.333351 86.499432) - (xy 129.280988 86.451228) - (xy 129.245651 86.393741) - (xy 129.245651 86.326259) - (xy 129.280988 86.268771) - (xy 129.453738 86.109744) - (xy 129.606474 85.913509) - (xy 129.724828 85.69481) - (xy 129.805571 85.459614) - (xy 129.8465 85.214335) - (xy 129.8465 84.965665) - (xy 129.805571 84.720386) - (xy 129.724828 84.48519) - (xy 129.606474 84.266491) - (xy 129.606471 84.266487) - (xy 129.60647 84.266485) - (xy 129.541335 84.1828) - (xy 129.517481 84.130372) - (xy 129.519888 84.072822) - (xy 129.548038 84.022569) - (xy 129.574423 84.004848) - (xy 129.573816 84.004037) - (xy 129.703188 83.907188) - (xy 129.789352 83.792089) - (xy 129.839597 83.657375) - (xy 129.846 83.597824) - (xy 129.846 82.8) - (xy 126.346 82.8) - (xy 126.346 83.597824) - (xy 126.352402 83.657375) - (xy 126.402647 83.792089) - (xy 126.488811 83.907188) - (xy 126.567684 83.966233) - (xy 126.606168 84.013989) - (xy 126.617057 84.074346) - (xy 126.597688 84.13254) - (xy 126.5528 84.174332) - (xy 126.493373 84.1895) - (xy 126.154361 84.1895) - (xy 126.106908 84.180061) - (xy 126.06668 84.153181) - (xy 125.396819 83.48332) - (xy 125.369939 83.443092) - (xy 125.3605 83.395639) - (xy 125.3605 82.3) - (xy 126.346 82.3) - (xy 127.846 82.3) - (xy 127.846 81.05) - (xy 128.346 81.05) - (xy 128.346 82.3) - (xy 129.846 82.3) - (xy 129.846 81.502176) - (xy 129.839597 81.442624) - (xy 129.789352 81.30791) - (xy 129.703188 81.192811) - (xy 129.588089 81.106647) - (xy 129.453375 81.056402) - (xy 129.393824 81.05) - (xy 128.346 81.05) - (xy 127.846 81.05) - (xy 126.798176 81.05) - (xy 126.738624 81.056402) - (xy 126.60391 81.106647) - (xy 126.488811 81.192811) - (xy 126.402647 81.30791) - (xy 126.352402 81.442624) - (xy 126.346 81.502176) - (xy 126.346 82.3) - (xy 125.3605 82.3) - (xy 125.3605 79.680361) - (xy 125.369939 79.632908) - (xy 125.396819 79.59268) - (xy 127.29281 77.696689) - (xy 127.519499 77.47) - (xy 131.589489 77.47) - (xy 131.609904 77.755429) - (xy 131.670729 78.035041) - (xy 131.670731 78.035046) - (xy 131.740263 78.221469) - (xy 131.770734 78.303163) - (xy 131.907872 78.554313) - (xy 131.962748 78.627618) - (xy 132.079361 78.783395) - (xy 132.281705 78.985739) - (xy 132.422833 79.091386) - (xy 132.510786 79.157227) - (xy 132.573036 79.191218) - (xy 132.761939 79.294367) - (xy 133.030054 79.394369) - (xy 133.030057 79.394369) - (xy 133.030058 79.39437) - (xy 133.050487 79.398814) - (xy 133.309672 79.455196) - (xy 133.5951 79.47561) - (xy 133.880528 79.455196) - (xy 134.160146 79.394369) - (xy 134.428261 79.294367) - (xy 134.679415 79.157226) - (xy 134.908495 78.985739) - (xy 135.110839 78.783395) - (xy 135.282326 78.554315) - (xy 135.419467 78.303161) - (xy 135.519469 78.035046) - (xy 135.580296 77.755428) - (xy 135.60071 77.47) - (xy 135.580296 77.184572) - (xy 135.520477 76.909588) - (xy 135.51947 76.904958) - (xy 135.511808 76.884415) - (xy 135.419467 76.636839) - (xy 135.282326 76.385685) - (xy 135.247701 76.339432) - (xy 135.193199 76.266625) - (xy 135.110839 76.156605) - (xy 134.908495 75.954261) - (xy 134.791686 75.866819) - (xy 134.679413 75.782772) - (xy 134.428263 75.645634) - (xy 134.428262 75.645633) - (xy 134.428261 75.645633) - (xy 134.160146 75.545631) - (xy 134.160141 75.545629) - (xy 133.880529 75.484804) - (xy 133.595099 75.464389) - (xy 133.30967 75.484804) - (xy 133.030058 75.545629) - (xy 132.761936 75.645634) - (xy 132.510786 75.782772) - (xy 132.281702 75.954263) - (xy 132.079363 76.156602) - (xy 131.907872 76.385686) - (xy 131.770734 76.636836) - (xy 131.670729 76.904958) - (xy 131.609904 77.18457) - (xy 131.589489 77.47) - (xy 127.519499 77.47) + (xy 131.5605 87.693706) + (xy 131.561809 87.675736) + (xy 131.562503 87.670995) + (xy 131.565289 87.651977) + (xy 131.560971 87.602633) + (xy 131.5605 87.591827) + (xy 131.5605 87.586292) + (xy 131.558216 87.566754) + (xy 131.556893 87.555436) + (xy 131.556537 87.551956) + (xy 131.549998 87.477203) + (xy 131.549888 87.475943) + (xy 131.545674 87.456936) + (xy 131.544155 87.452762) + (xy 131.519569 87.385211) + (xy 131.518422 87.381913) + (xy 131.494814 87.310665) + (xy 131.494812 87.310662) + (xy 131.494415 87.309463) + (xy 131.485929 87.291936) + (xy 131.485237 87.290884) + (xy 131.485237 87.290883) + (xy 131.444025 87.228224) + (xy 131.442106 87.225212) + (xy 131.402048 87.160267) + (xy 131.38975 87.145172) + (xy 131.33429 87.092848) + (xy 131.331703 87.090335) + (xy 130.115728 85.87436) + (xy 130.103946 85.860727) + (xy 130.089609 85.841469) + (xy 130.051666 85.809631) + (xy 130.043691 85.802323) + (xy 130.039782 85.798414) + (xy 130.039777 85.798409) + (xy 130.015423 85.779152) + (xy 130.012647 85.77689) + (xy 129.954251 85.72789) + (xy 129.937821 85.717422) + (xy 129.868691 85.685186) + (xy 129.865447 85.683615) + (xy 129.797306 85.649394) + (xy 129.778903 85.642997) + (xy 129.706184 85.627981) + (xy 129.657287 85.606062) + (xy 129.622204 85.565558) + (xy 129.606474 85.53649) + (xy 129.453738 85.340256) + (xy 129.398572 85.289472) + (xy 129.280988 85.181228) + (xy 129.245651 85.123741) + (xy 129.245651 85.056259) + (xy 129.280988 84.998771) + (xy 129.453738 84.839744) + (xy 129.606474 84.643509) + (xy 129.724828 84.42481) + (xy 129.805571 84.189614) + (xy 129.8465 83.944335) + (xy 129.8465 83.695665) + (xy 129.805571 83.450386) + (xy 129.724828 83.21519) + (xy 129.606474 82.996491) + (xy 129.606471 82.996487) + (xy 129.60647 82.996485) + (xy 129.541335 82.9128) + (xy 129.517481 82.860372) + (xy 129.519888 82.802822) + (xy 129.548038 82.752569) + (xy 129.574423 82.734848) + (xy 129.573816 82.734037) + (xy 129.703188 82.637188) + (xy 129.789352 82.522089) + (xy 129.839597 82.387375) + (xy 129.846 82.327824) + (xy 129.846 81.53) + (xy 126.346 81.53) + (xy 126.346 82.228139) + (xy 126.332485 82.284434) + (xy 126.294885 82.328457) + (xy 126.241398 82.350612) + (xy 126.183682 82.34607) + (xy 126.134319 82.31582) + (xy 126.031819 82.21332) + (xy 126.004939 82.173092) + (xy 125.9955 82.125639) + (xy 125.9955 81.03) + (xy 126.346 81.03) + (xy 127.846 81.03) + (xy 127.846 79.78) + (xy 128.346 79.78) + (xy 128.346 81.03) + (xy 129.846 81.03) + (xy 129.846 80.232176) + (xy 129.839597 80.172624) + (xy 129.789352 80.03791) + (xy 129.703188 79.922811) + (xy 129.588089 79.836647) + (xy 129.453375 79.786402) + (xy 129.393824 79.78) + (xy 128.346 79.78) + (xy 127.846 79.78) + (xy 126.798176 79.78) + (xy 126.738624 79.786402) + (xy 126.60391 79.836647) + (xy 126.488811 79.922811) + (xy 126.402647 80.03791) + (xy 126.352402 80.172624) + (xy 126.346 80.232176) + (xy 126.346 81.03) + (xy 125.9955 81.03) + (xy 125.9955 79.045361) + (xy 126.004939 78.997908) + (xy 126.031819 78.95768) + (xy 127.833529 77.15597) (xy 133.294737 71.69476) (xy 133.309526 71.682129) (xy 133.320871 71.673888) @@ -3368,23 +4272,24 @@ (xy 133.505193 71.433677) (xy 133.508248 71.428051) (xy 133.542179 71.369284) - (xy 133.546509 71.355953) - (xy 133.553956 71.337974) + (xy 133.546509 71.355956) + (xy 133.55396 71.337968) + (xy 133.55406 71.337772) (xy 133.56032 71.325488) - (xy 133.577875 71.25997) - (xy 133.579707 71.253782) + (xy 133.577882 71.259937) + (xy 133.579703 71.253794) (xy 133.600674 71.189256) - (xy 133.60214 71.175305) - (xy 133.605683 71.15619) - (xy 133.609313 71.142645) - (xy 133.612862 71.074903) - (xy 133.613371 71.068448) - (xy 133.6155 71.048196) - (xy 133.6155 71.027825) - (xy 133.61567 71.021336) + (xy 133.602139 71.175305) + (xy 133.605683 71.156186) + (xy 133.609312 71.142646) + (xy 133.612862 71.074906) + (xy 133.61337 71.068455) + (xy 133.6155 71.048194) + (xy 133.6155 71.02782) + (xy 133.61567 71.02133) (xy 133.616679 71.002077) (xy 133.619219 70.953612) - (xy 133.617026 70.939771) + (xy 133.617027 70.939772) (xy 133.6155 70.920374) (xy 133.6155 69.295626) (xy 133.617027 69.276228) @@ -4121,28 +5026,12 @@ (xy 62.245953 71.550859) (xy 62.115432 71.737264) (xy 62.019261 71.943502) - (xy 61.960364 72.16331) - (xy 61.950477 72.276321) - (xy 61.930549 72.333653) - (xy 61.885799 72.374659) - (xy 61.826948 72.389514) - (xy 61.768098 72.374659) - (xy 61.723348 72.333652) - (xy 61.703421 72.27632) - (xy 61.699889 72.235949) - (xy 61.695672 72.21693) - (xy 61.669592 72.145274) - (xy 61.668408 72.141868) - (xy 61.644417 72.069468) - (xy 61.635929 72.051936) - (xy 61.635237 72.050884) - (xy 61.635237 72.050883) - (xy 61.593999 71.988184) - (xy 61.592087 71.985181) - (xy 61.55205 71.92027) - (xy 61.53975 71.905172) - (xy 61.48429 71.852848) - (xy 61.481703 71.850335) + (xy 61.980937 72.086527) + (xy 61.948843 72.142115) + (xy 61.893255 72.174208) + (xy 61.829068 72.174208) + (xy 61.773481 72.142114) + (xy 60.295687 70.66432) (xy 58.686818 69.05545) (xy 58.659938 69.015222) (xy 58.650499 68.967769) @@ -4286,7 +5175,8 @@ (xy 55.650227 68.207872) (xy 55.6495 68.21463) (xy 55.6495 70.215369) - (xy 55.655909 70.274983) + (xy 55.655909 70.274984) + (xy 55.663869 70.296326) (xy 55.706204 70.409831) (xy 55.792454 70.525046) (xy 55.907669 70.611296) @@ -4295,88 +5185,98 @@ (xy 58.125269 70.667999) (xy 58.172722 70.677438) (xy 58.21295 70.704318) - (xy 60.173181 72.664549) - (xy 60.200061 72.704777) - (xy 60.2095 72.75223) - (xy 60.2095 75.955004) - (xy 60.195985 76.011299) - (xy 60.158385 76.055322) - (xy 60.104898 76.077477) - (xy 60.047182 76.072935) - (xy 59.997819 76.042685) - (xy 59.909397 75.954263) - (xy 59.909395 75.954261) - (xy 59.792586 75.866819) - (xy 59.680313 75.782772) - (xy 59.429163 75.645634) - (xy 59.429162 75.645633) - (xy 59.429161 75.645633) - (xy 59.161046 75.545631) - (xy 59.161041 75.545629) - (xy 58.881429 75.484804) - (xy 58.595999 75.464389) - (xy 58.31057 75.484804) - (xy 58.030958 75.545629) - (xy 57.762836 75.645634) - (xy 57.511686 75.782772) - (xy 57.282602 75.954263) - (xy 57.080263 76.156602) - (xy 56.908772 76.385686) - (xy 56.771634 76.636836) - (xy 56.671629 76.904958) - (xy 56.610804 77.18457) - (xy 56.590389 77.47) - (xy 56.610804 77.755429) - (xy 56.671629 78.035041) - (xy 56.671631 78.035046) - (xy 56.741163 78.221469) - (xy 56.771634 78.303163) - (xy 56.908772 78.554313) - (xy 56.963648 78.627618) - (xy 57.080261 78.783395) - (xy 57.282605 78.985739) - (xy 57.423733 79.091386) - (xy 57.511686 79.157227) - (xy 57.573936 79.191218) - (xy 57.762839 79.294367) - (xy 58.030954 79.394369) - (xy 58.030957 79.394369) - (xy 58.030958 79.39437) - (xy 58.051387 79.398814) - (xy 58.310572 79.455196) - (xy 58.596 79.47561) - (xy 58.881428 79.455196) - (xy 59.161046 79.394369) - (xy 59.429161 79.294367) - (xy 59.680315 79.157226) - (xy 59.909395 78.985739) - (xy 60.111739 78.783395) - (xy 60.283226 78.554315) - (xy 60.420367 78.303161) - (xy 60.43754 78.257116) - (xy 60.472518 78.206739) - (xy 60.527362 78.179285) - (xy 60.588655 78.181474) - (xy 60.641402 78.21277) - (xy 61.654267 79.225634) - (xy 61.666048 79.239266) - (xy 61.680387 79.258526) + (xy 60.808181 73.299548) + (xy 60.835061 73.339776) + (xy 60.8445 73.387229) + (xy 60.8445 75.76399) + (xy 60.829592 75.822938) + (xy 60.788454 75.867712) + (xy 60.730976 75.887547) + (xy 60.670979 75.877672) + (xy 60.622889 75.840463) + (xy 60.586263 75.793714) + (xy 60.54606 75.742398) + (xy 60.323602 75.51994) + (xy 60.236501 75.451701) + (xy 60.075952 75.325918) + (xy 59.883021 75.209288) + (xy 59.806721 75.163163) + (xy 59.519835 75.034046) + (xy 59.519833 75.034045) + (xy 59.519828 75.034043) + (xy 59.219483 74.940452) + (xy 59.19705 74.936341) + (xy 58.910029 74.883742) + (xy 58.910028 74.883741) + (xy 58.596 74.864746) + (xy 58.28197 74.883742) + (xy 57.972516 74.940452) + (xy 57.672171 75.034043) + (xy 57.385277 75.163164) + (xy 57.116047 75.325918) + (xy 56.868395 75.519942) + (xy 56.645942 75.742395) + (xy 56.451918 75.990047) + (xy 56.324998 76.2) + (xy 56.289163 76.259279) + (xy 56.285857 76.266625) + (xy 56.160043 76.546171) + (xy 56.066452 76.846516) + (xy 56.009742 77.15597) + (xy 55.990746 77.47) + (xy 56.004459 77.696689) + (xy 56.009742 77.784029) + (xy 56.055911 78.035966) + (xy 56.066452 78.093483) + (xy 56.160043 78.393828) + (xy 56.160045 78.393833) + (xy 56.160046 78.393835) + (xy 56.289163 78.680721) + (xy 56.335288 78.757021) + (xy 56.451918 78.949952) + (xy 56.528637 79.047876) + (xy 56.64594 79.197602) + (xy 56.868398 79.42006) + (xy 56.915877 79.457257) + (xy 57.116047 79.614081) + (xy 57.169829 79.646593) + (xy 57.385279 79.776837) + (xy 57.672165 79.905954) + (xy 57.972522 79.999549) + (xy 58.281971 80.056258) + (xy 58.596 80.075253) + (xy 58.910029 80.056258) + (xy 59.219478 79.999549) + (xy 59.519835 79.905954) + (xy 59.806721 79.776837) + (xy 60.075952 79.614081) + (xy 60.323602 79.42006) + (xy 60.54606 79.197602) + (xy 60.740081 78.949952) + (xy 60.898764 78.687456) + (xy 60.937553 78.647478) + (xy 60.989932 78.628513) + (xy 61.045328 78.634392) + (xy 61.09256 78.663928) + (xy 61.654268 79.225635) + (xy 61.666044 79.23926) (xy 61.68039 79.25853) - (xy 61.718355 79.290386) - (xy 61.726317 79.297684) + (xy 61.718339 79.290373) + (xy 61.726313 79.29768) (xy 61.730224 79.301591) - (xy 61.754542 79.320819) - (xy 61.757298 79.323063) + (xy 61.748672 79.316178) + (xy 61.754543 79.32082) + (xy 61.75733 79.32309) (xy 61.814786 79.371302) (xy 61.814788 79.371303) - (xy 61.815757 79.372116) - (xy 61.832177 79.382576) - (xy 61.833321 79.383109) + (xy 61.81575 79.37211) + (xy 61.83218 79.382578) + (xy 61.833322 79.38311) (xy 61.833323 79.383111) - (xy 61.901357 79.414835) - (xy 61.904483 79.416348) - (xy 61.950136 79.439277) - (xy 61.993223 79.475077) + (xy 61.90135 79.414832) + (xy 61.904499 79.416357) + (xy 61.950137 79.439277) + (xy 61.993222 79.475076) (xy 62.016158 79.526189) (xy 62.014257 79.582178) (xy 61.960364 79.783308) @@ -4405,7 +5305,7 @@ (xy 62.115432 83.202735) (xy 62.245953 83.38914) (xy 62.406859 83.550046) - (xy 62.463206 83.5895) + (xy 62.519968 83.629245) (xy 62.593266 83.680568) (xy 62.651273 83.707617) (xy 62.703449 83.753373) @@ -4424,7 +5324,7 @@ (xy 62.115432 85.742735) (xy 62.245953 85.92914) (xy 62.406859 86.090046) - (xy 62.434991 86.109744) + (xy 62.493736 86.150877) (xy 62.593266 86.220568) (xy 62.651275 86.247618) (xy 62.70345 86.293375) @@ -4439,7 +5339,7 @@ (xy 62.119337 86.8795) (xy 61.785706 86.8795) (xy 61.767736 86.878191) - (xy 61.7532 86.876062) + (xy 61.753853 86.876157) (xy 61.743977 86.874711) (xy 61.743976 86.874711) (xy 61.694631 86.879028) @@ -4463,7 +5363,7 @@ (xy 60.841222 87.436061) (xy 60.793769 87.4455) (xy 60.594757 87.4455) - (xy 60.376059 87.486382) + (xy 60.425163 87.477203) (xy 60.37606 87.486382) (xy 60.168595 87.566754) (xy 59.979437 87.683875) @@ -4485,7 +5385,7 @@ (xy 58.49594 87.486382) (xy 58.277243 87.4455) (xy 58.054757 87.4455) - (xy 57.836059 87.486382) + (xy 57.885163 87.477203) (xy 57.83606 87.486382) (xy 57.628595 87.566754) (xy 57.439437 87.683875) @@ -4503,7 +5403,7 @@ (xy 56.33694 87.486382) (xy 56.118243 87.4455) (xy 55.895757 87.4455) - (xy 55.677059 87.486382) + (xy 55.726163 87.477203) (xy 55.67706 87.486382) (xy 55.469595 87.566754) (xy 55.280437 87.683875) @@ -4540,6 +5440,8 @@ (xy 53.503575 85.77333) (xy 53.560207 85.561977) (xy 53.579277 85.344) + (xy 53.578949 85.340256) + (xy 53.560207 85.126025) (xy 53.560207 85.126023) (xy 53.503575 84.91467) (xy 53.411102 84.716362) @@ -4587,7 +5489,7 @@ (xy 55.3605 81.045284) (xy 55.3605 74.801706) (xy 55.361809 74.783736) - (xy 55.362409 74.779639) + (xy 55.362338 74.780118) (xy 55.365289 74.759977) (xy 55.360971 74.710633) (xy 55.3605 74.699827) @@ -4604,7 +5506,7 @@ (xy 56.606562 73.987124) (xy 56.66885 73.930341) (xy 56.77098 73.837237) - (xy 56.771235 73.836899) + (xy 56.771693 73.836293) (xy 56.905058 73.659689) (xy 57.004229 73.460528) (xy 57.030994 73.366456) @@ -4658,15 +5560,15 @@ (xy 57.030994 72.683541) (xy 57.004229 72.589472) (xy 56.905058 72.390311) - (xy 56.862271 72.333652) + (xy 56.904823 72.39) (xy 56.77098 72.212762) (xy 56.606562 72.062875) (xy 56.417404 71.945754) - (xy 56.351622 71.92027) + (xy 56.356174 71.922033) (xy 56.20994 71.865382) (xy 55.991243 71.8245) (xy 55.768757 71.8245) - (xy 55.615233 71.853199) + (xy 55.617453 71.852784) (xy 55.55006 71.865382) (xy 55.342595 71.945754) (xy 55.153437 72.062875) @@ -4714,7 +5616,7 @@ (xy 50.7515 66.53213) (xy 50.7515 70.627869) (xy 50.757909 70.687484) - (xy 50.764773 70.705887) + (xy 50.774817 70.732816) (xy 50.808204 70.822331) (xy 50.894454 70.937546) (xy 51.009669 71.023796) @@ -4743,7 +5645,7 @@ (xy 51.676075 72.818072) (xy 51.717979 72.881784) (xy 51.719889 72.884782) - (xy 51.759288 72.948656) + (xy 51.738269 72.914579) (xy 51.759952 72.949732) (xy 51.772253 72.96483) (xy 51.773168 72.965693) @@ -4771,7 +5673,7 @@ (xy 49.346551 75.88) (xy 49.366317 76.131149) (xy 49.425126 76.37611) - (xy 49.429093 76.385686) + (xy 49.463997 76.469953) (xy 49.521534 76.608859) (xy 49.653164 76.823659) (xy 49.816776 77.015224) @@ -4801,11 +5703,153 @@ (xy 51.331669 82.150204) (xy 51.216454 82.236454) (xy 51.130204 82.351668) - (xy 51.079909 82.486516) - (xy 51.0735 82.54613) - (xy 51.0735 84.141869) - (xy 51.079909 84.201484) - (xy 51.104153 84.266485) + (xy 51.074466 82.50111) + (xy 51.073695 82.500822) + (xy 51.059716 82.539) + (xy 51.015153 82.579031) + (xy 50.957024 82.5935) + (xy 49.434706 82.5935) + (xy 49.416736 82.592191) + (xy 49.402853 82.590157) + (xy 49.392977 82.588711) + (xy 49.392976 82.588711) + (xy 49.343634 82.593028) + (xy 49.332827 82.5935) + (xy 49.327291 82.5935) + (xy 49.296483 82.5971) + (xy 49.2929 82.597466) + (xy 49.21695 82.604111) + (xy 49.197926 82.608328) + (xy 49.126251 82.634415) + (xy 49.122849 82.635597) + (xy 49.05047 82.659582) + (xy 49.032929 82.668074) + (xy 48.969197 82.709991) + (xy 48.966156 82.711928) + (xy 48.90128 82.751943) + (xy 48.886164 82.764257) + (xy 48.833831 82.819726) + (xy 48.831319 82.822312) + (xy 46.715451 84.938181) + (xy 46.675223 84.965061) + (xy 46.62777 84.9745) + (xy 45.449347 84.9745) + (xy 45.394076 84.9615) + (xy 45.350393 84.925227) + (xy 45.34098 84.912763) + (xy 45.176562 84.762875) + (xy 44.987404 84.645754) + (xy 44.895538 84.610165) + (xy 44.77994 84.565382) + (xy 44.561243 84.5245) + (xy 44.338757 84.5245) + (xy 44.188785 84.552535) + (xy 44.12006 84.565382) + (xy 43.912595 84.645754) + (xy 43.723437 84.762875) + (xy 43.559019 84.912762) + (xy 43.424941 85.090311) + (xy 43.325769 85.289473) + (xy 43.264885 85.503462) + (xy 43.244357 85.725) + (xy 43.264885 85.946537) + (xy 43.325769 86.160526) + (xy 43.424941 86.359688) + (xy 43.559019 86.537237) + (xy 43.659038 86.628416) + (xy 43.688934 86.669967) + (xy 43.6995 86.720053) + (xy 43.6995 87.269947) + (xy 43.688934 87.320033) + (xy 43.659038 87.361584) + (xy 43.559019 87.452762) + (xy 43.424941 87.630311) + (xy 43.325769 87.829473) + (xy 43.264885 88.043462) + (xy 43.244357 88.265) + (xy 43.264885 88.486537) + (xy 43.325769 88.700526) + (xy 43.424941 88.899688) + (xy 43.559019 89.077237) + (xy 43.723437 89.227124) + (xy 43.912595 89.344245) + (xy 43.912597 89.344245) + (xy 43.912599 89.344247) + (xy 44.12006 89.424618) + (xy 44.338757 89.4655) + (xy 44.561241 89.4655) + (xy 44.561243 89.4655) + (xy 44.77994 89.424618) + (xy 44.987401 89.344247) + (xy 45.176562 89.227124) + (xy 45.222396 89.185341) + (xy 45.34098 89.077237) + (xy 45.389956 89.012382) + (xy 45.475058 88.899689) + (xy 45.574229 88.700528) + (xy 45.583144 88.669197) + (xy 45.615453 88.555641) + (xy 45.635115 88.486536) + (xy 45.655643 88.265) + (xy 45.635115 88.043464) + (xy 45.589317 87.8825) + (xy 45.57423 87.829473) + (xy 45.475058 87.630311) + (xy 45.34098 87.452762) + (xy 45.240962 87.361584) + (xy 45.211066 87.320033) + (xy 45.2005 87.269947) + (xy 45.2005 86.720053) + (xy 45.211066 86.669967) + (xy 45.240962 86.628416) + (xy 45.256927 86.613861) + (xy 45.340981 86.537236) + (xy 45.350392 86.524773) + (xy 45.394076 86.4885) + (xy 45.449347 86.4755) + (xy 46.926294 86.4755) + (xy 46.944264 86.476809) + (xy 46.94832 86.477402) + (xy 46.968023 86.480289) + (xy 47.017368 86.475972) + (xy 47.028176 86.4755) + (xy 47.033706 86.4755) + (xy 47.033709 86.4755) + (xy 47.06455 86.471894) + (xy 47.068031 86.471539) + (xy 47.142797 86.464999) + (xy 47.142797 86.464998) + (xy 47.144052 86.464889) + (xy 47.163062 86.460674) + (xy 47.16425 86.460241) + (xy 47.164255 86.460241) + (xy 47.23482 86.434557) + (xy 47.238095 86.433419) + (xy 47.309334 86.409814) + (xy 47.309336 86.409812) + (xy 47.310536 86.409415) + (xy 47.328063 86.400929) + (xy 47.329112 86.400238) + (xy 47.329117 86.400237) + (xy 47.391806 86.359005) + (xy 47.394798 86.357099) + (xy 47.458656 86.317712) + (xy 47.458656 86.317711) + (xy 47.459729 86.31705) + (xy 47.474824 86.304753) + (xy 47.475692 86.303832) + (xy 47.475696 86.30383) + (xy 47.527185 86.249253) + (xy 47.529631 86.246735) + (xy 49.645548 84.130818) + (xy 49.685776 84.103939) + (xy 49.733229 84.0945) + (xy 50.957024 84.0945) + (xy 51.015153 84.108969) + (xy 51.059716 84.148999) + (xy 51.073696 84.187177) + (xy 51.074466 84.18689) + (xy 51.079909 84.201483) (xy 51.130204 84.336331) (xy 51.216454 84.451546) (xy 51.216455 84.451547) @@ -4819,7 +5863,7 @@ (xy 51.068722 85.343999) (xy 51.087792 85.561974) (xy 51.144425 85.773331) - (xy 51.170635 85.829537) + (xy 51.161352 85.809631) (xy 51.236898 85.971639) (xy 51.362402 86.150877) (xy 51.362405 86.15088) @@ -4827,431 +5871,72 @@ (xy 51.520626 86.308051) (xy 51.55949 86.352369) (xy 51.5735 86.409624) - (xy 51.5735 87.566294) - (xy 51.572191 87.584264) - (xy 51.568711 87.608023) - (xy 51.573028 87.657369) - (xy 51.5735 87.668176) - (xy 51.5735 87.673708) - (xy 51.577098 87.704496) - (xy 51.577464 87.708081) - (xy 51.58411 87.784041) - (xy 51.588329 87.803071) - (xy 51.588758 87.804251) - (xy 51.588759 87.804255) - (xy 51.614413 87.874742) - (xy 51.615582 87.878107) - (xy 51.63958 87.950524) - (xy 51.648075 87.968072) - (xy 51.689979 88.031784) - (xy 51.691889 88.034782) - (xy 51.731288 88.098656) - (xy 51.731952 88.099732) - (xy 51.744253 88.11483) - (xy 51.745168 88.115693) - (xy 51.74517 88.115696) - (xy 51.799708 88.16715) - (xy 51.802295 88.169663) - (xy 52.718999 89.086367) - (xy 52.742318 89.118776) - (xy 52.822943 89.280691) - (xy 52.957017 89.458235) - (xy 53.121437 89.608124) - (xy 53.275209 89.703334) - (xy 53.310599 89.725247) - (xy 53.504523 89.800373) - (xy 53.552893 89.834169) - (xy 53.580167 89.886496) - (xy 53.580167 89.945504) - (xy 53.552893 89.997831) - (xy 53.504523 90.031626) - (xy 53.373346 90.082444) - (xy 53.310596 90.106754) - (xy 53.121437 90.223875) - (xy 52.957019 90.373763) - (xy 52.947607 90.386227) - (xy 52.903924 90.4225) - (xy 52.848653 90.4355) - (xy 52.688347 90.4355) - (xy 52.633076 90.4225) - (xy 52.589393 90.386227) - (xy 52.57998 90.373763) - (xy 52.415562 90.223875) - (xy 52.226404 90.106754) - (xy 52.165174 90.083033) - (xy 52.01894 90.026382) - (xy 51.800243 89.9855) - (xy 51.577757 89.9855) - (xy 51.35906 90.026381) - (xy 51.35906 90.026382) - (xy 51.151595 90.106754) - (xy 50.962437 90.223875) - (xy 50.798019 90.373763) - (xy 50.788607 90.386227) - (xy 50.744924 90.4225) - (xy 50.689653 90.4355) - (xy 50.529347 90.4355) - (xy 50.474076 90.4225) - (xy 50.430393 90.386227) - (xy 50.42098 90.373763) - (xy 50.256562 90.223875) - (xy 50.067404 90.106754) - (xy 50.006174 90.083033) - (xy 49.85994 90.026382) - (xy 49.641243 89.9855) - (xy 49.418757 89.9855) - (xy 49.20006 90.026381) - (xy 49.20006 90.026382) - (xy 48.992595 90.106754) - (xy 48.803437 90.223875) - (xy 48.639019 90.373762) - (xy 48.504941 90.551311) - (xy 48.405769 90.750473) - (xy 48.344885 90.964462) - (xy 48.324357 91.186) - (xy 48.344885 91.407537) - (xy 48.405769 91.621526) - (xy 48.504941 91.820688) - (xy 48.639019 91.998237) - (xy 48.803437 92.148124) - (xy 48.879612 92.195289) - (xy 48.992599 92.265247) - (xy 49.186523 92.340373) - (xy 49.234893 92.374169) - (xy 49.262167 92.426496) - (xy 49.262167 92.485504) - (xy 49.234893 92.537831) - (xy 49.186523 92.571626) - (xy 49.055346 92.622444) - (xy 48.992596 92.646754) - (xy 48.803437 92.763875) - (xy 48.639019 92.913762) - (xy 48.504941 93.091311) - (xy 48.405769 93.290473) - (xy 48.344885 93.504462) - (xy 48.324357 93.726) - (xy 48.344885 93.947537) - (xy 48.405769 94.161526) - (xy 48.504941 94.360688) - (xy 48.639019 94.538237) - (xy 48.803437 94.688124) - (xy 48.992595 94.805245) - (xy 48.992597 94.805245) - (xy 48.992599 94.805247) - (xy 49.047134 94.826374) - (xy 49.101293 94.867273) - (xy 49.12581 94.930559) - (xy 49.113339 94.997271) - (xy 49.067617 95.047427) - (xy 49.022994 95.060122) - (xy 49.023699 95.063889) - (xy 48.793798 95.106864) - (xy 48.586421 95.187202) - (xy 48.397337 95.304278) - (xy 48.23299 95.4541) - (xy 48.098965 95.631577) - (xy 47.99984 95.830648) - (xy 47.947105 96.016) - (xy 49.2496 96.016) - (xy 49.3116 96.032613) - (xy 49.356987 96.078) - (xy 49.3736 96.14) - (xy 49.3736 97.440052) - (xy 49.4534 97.425135) - (xy 49.660778 97.344797) - (xy 49.849862 97.227721) - (xy 50.014209 97.077899) - (xy 50.148234 96.900422) - (xy 50.247359 96.701351) - (xy 50.274073 96.607461) - (xy 50.306472 96.552907) - (xy 50.361615 96.521521) - (xy 50.425064 96.521521) - (xy 50.480207 96.552906) - (xy 50.512606 96.60746) - (xy 50.539369 96.701526) - (xy 50.638541 96.900688) - (xy 50.772619 97.078237) - (xy 50.937037 97.228124) - (xy 51.126195 97.345245) - (xy 51.126197 97.345245) - (xy 51.126199 97.345247) - (xy 51.33366 97.425618) - (xy 51.552357 97.4665) - (xy 51.774841 97.4665) - (xy 51.774843 97.4665) - (xy 51.99354 97.425618) - (xy 52.201001 97.345247) - (xy 52.390162 97.228124) - (xy 52.554581 97.078236) - (xy 52.563992 97.065773) - (xy 52.607676 97.0295) - (xy 52.662947 97.0165) - (xy 52.848653 97.0165) - (xy 52.903924 97.0295) - (xy 52.947607 97.065773) - (xy 52.957019 97.078236) - (xy 53.121437 97.228124) - (xy 53.310595 97.345245) - (xy 53.310597 97.345245) - (xy 53.310599 97.345247) - (xy 53.51806 97.425618) - (xy 53.736757 97.4665) - (xy 53.959241 97.4665) - (xy 53.959243 97.4665) - (xy 54.17794 97.425618) - (xy 54.385401 97.345247) - (xy 54.574562 97.228124) - (xy 54.738981 97.078236) - (xy 54.748392 97.065773) - (xy 54.792076 97.0295) - (xy 54.847347 97.0165) - (xy 55.007653 97.0165) - (xy 55.062924 97.0295) - (xy 55.106607 97.065773) - (xy 55.116019 97.078236) - (xy 55.280437 97.228124) - (xy 55.469595 97.345245) - (xy 55.469597 97.345245) - (xy 55.469599 97.345247) - (xy 55.67706 97.425618) - (xy 55.895757 97.4665) - (xy 56.118241 97.4665) - (xy 56.118243 97.4665) - (xy 56.33694 97.425618) - (xy 56.544401 97.345247) - (xy 56.733562 97.228124) - (xy 56.897981 97.078236) - (xy 56.907392 97.065773) - (xy 56.951076 97.0295) - (xy 57.006347 97.0165) - (xy 57.166653 97.0165) - (xy 57.221924 97.0295) - (xy 57.265607 97.065773) - (xy 57.275019 97.078236) - (xy 57.439437 97.228124) - (xy 57.628595 97.345245) - (xy 57.628597 97.345245) - (xy 57.628599 97.345247) - (xy 57.83606 97.425618) - (xy 58.054757 97.4665) - (xy 58.277241 97.4665) - (xy 58.277243 97.4665) - (xy 58.49594 97.425618) - (xy 58.703401 97.345247) - (xy 58.892562 97.228124) - (xy 58.992228 97.137266) - (xy 59.05698 97.078237) - (xy 59.057235 97.077899) - (xy 59.191058 96.900689) - (xy 59.290229 96.701528) - (xy 59.29028 96.701351) - (xy 59.316734 96.608374) - (xy 59.349133 96.55382) - (xy 59.404275 96.522435) - (xy 59.467725 96.522435) - (xy 59.522867 96.55382) - (xy 59.555266 96.608374) - (xy 59.581769 96.701526) - (xy 59.680941 96.900688) - (xy 59.815019 97.078237) - (xy 59.979437 97.228124) - (xy 60.168595 97.345245) - (xy 60.168597 97.345245) - (xy 60.168599 97.345247) - (xy 60.37606 97.425618) - (xy 60.594757 97.4665) - (xy 60.817241 97.4665) - (xy 60.817243 97.4665) - (xy 61.03594 97.425618) - (xy 61.243401 97.345247) - (xy 61.432562 97.228124) - (xy 61.532228 97.137266) - (xy 61.59698 97.078237) - (xy 61.597235 97.077899) - (xy 61.731058 96.900689) - (xy 61.830229 96.701528) - (xy 61.83028 96.701351) - (xy 61.869569 96.563261) - (xy 61.891115 96.487536) - (xy 61.911643 96.266) - (xy 61.904778 96.191921) - (xy 61.911619 96.13837) - (xy 61.940569 96.092799) - (xy 61.996551 96.036818) - (xy 62.036779 96.009939) - (xy 62.084231 96.0005) - (xy 62.119337 96.0005) - (xy 62.176594 96.014511) - (xy 62.220912 96.053377) - (xy 62.245953 96.08914) - (xy 62.406859 96.250046) - (xy 62.429644 96.266) - (xy 62.593266 96.380568) - (xy 62.651275 96.407618) - (xy 62.70345 96.453375) - (xy 62.722869 96.52) - (xy 62.70345 96.586625) - (xy 62.651275 96.632382) - (xy 62.593263 96.659433) - (xy 62.406859 96.789953) - (xy 62.245953 96.950859) - (xy 62.115432 97.137264) - (xy 62.019261 97.343502) - (xy 61.960364 97.56331) - (xy 61.940531 97.79) - (xy 61.960364 98.016689) - (xy 62.019261 98.236497) - (xy 62.115432 98.442735) - (xy 62.245953 98.62914) - (xy 62.406859 98.790046) - (xy 62.593262 98.920565) - (xy 62.593266 98.920568) - (xy 62.651273 98.947617) - (xy 62.703449 98.993373) - (xy 62.722869 99.059997) - (xy 62.703451 99.126622) - (xy 62.651276 99.17238) - (xy 62.593266 99.199431) - (xy 62.406859 99.329953) - (xy 62.245953 99.490859) - (xy 62.115432 99.677264) - (xy 62.019261 99.883502) - (xy 61.960364 100.10331) - (xy 61.940531 100.33) - (xy 61.960364 100.556689) - (xy 62.019261 100.776497) - (xy 62.115432 100.982735) - (xy 62.245953 101.16914) - (xy 62.406859 101.330046) - (xy 62.593263 101.460566) - (xy 62.593266 101.460568) - (xy 62.651275 101.487618) - (xy 62.70345 101.533375) - (xy 62.722869 101.6) - (xy 62.70345 101.666625) - (xy 62.651275 101.712382) - (xy 62.593263 101.739433) - (xy 62.406859 101.869953) - (xy 62.245953 102.030859) - (xy 62.220912 102.066623) - (xy 62.176594 102.105489) - (xy 62.119337 102.1195) - (xy 54.339347 102.1195) - (xy 54.284076 102.1065) - (xy 54.240393 102.070227) - (xy 54.23098 102.057763) - (xy 54.066562 101.907875) - (xy 53.877404 101.790754) - (xy 53.744929 101.739433) - (xy 53.66994 101.710382) - (xy 53.451243 101.6695) - (xy 53.228757 101.6695) - (xy 53.01006 101.710381) - (xy 53.01006 101.710382) - (xy 52.802595 101.790754) - (xy 52.613437 101.907875) - (xy 52.449019 102.057762) - (xy 52.314941 102.235311) - (xy 52.215769 102.434473) - (xy 52.154885 102.648462) - (xy 52.134357 102.87) - (xy 52.154885 103.091537) - (xy 52.215769 103.305526) - (xy 52.314941 103.504688) - (xy 52.449019 103.682237) - (xy 52.613437 103.832124) - (xy 52.686521 103.877375) - (xy 52.802599 103.949247) - (xy 52.996523 104.024373) - (xy 53.044893 104.058169) - (xy 53.072167 104.110496) - (xy 53.072167 104.169504) - (xy 53.044893 104.221831) - (xy 52.996523 104.255626) - (xy 52.940474 104.27734) - (xy 52.802596 104.330754) - (xy 52.613437 104.447875) - (xy 52.449019 104.597763) - (xy 52.439607 104.610227) - (xy 52.395924 104.6465) - (xy 52.340653 104.6595) - (xy 48.239685 104.6595) - (xy 48.180668 104.644555) - (xy 48.135877 104.603322) - (xy 48.098981 104.54685) - (xy 48.09898 104.546849) - (xy 48.098979 104.546847) - (xy 48.003831 104.443488) - (xy 47.975059 104.390737) - (xy 47.974466 104.33065) - (xy 48.002193 104.27734) - (xy 48.051729 104.243325) - (xy 48.132088 104.213352) - (xy 48.247188 104.127188) - (xy 48.333352 104.012089) - (xy 48.383597 103.877375) - (xy 48.39 103.817824) - (xy 48.39 103.12) - (xy 45.59 103.12) - (xy 45.59 103.817824) - (xy 45.596402 103.877375) - (xy 45.646647 104.012089) - (xy 45.732811 104.127188) - (xy 45.84791 104.213352) - (xy 45.928271 104.243325) - (xy 45.977806 104.27734) - (xy 46.005533 104.33065) - (xy 46.00494 104.390736) - (xy 45.976167 104.443489) - (xy 45.881022 104.546844) - (xy 45.754076 104.74115) - (xy 45.660844 104.953696) - (xy 45.603865 105.1787) - (xy 45.584699 105.41) - (xy 39.5229 105.41) - (xy 39.5229 102.62) - (xy 45.59 102.62) - (xy 46.74 102.62) - (xy 46.74 101.47) - (xy 47.24 101.47) - (xy 47.24 102.62) - (xy 48.39 102.62) - (xy 48.39 101.922176) - (xy 48.383597 101.862624) - (xy 48.333352 101.72791) - (xy 48.247188 101.612811) - (xy 48.132089 101.526647) - (xy 47.997375 101.476402) - (xy 47.937824 101.47) - (xy 47.24 101.47) - (xy 46.74 101.47) - (xy 46.042176 101.47) - (xy 45.982624 101.476402) - (xy 45.84791 101.526647) - (xy 45.732811 101.612811) - (xy 45.646647 101.72791) - (xy 45.596402 101.862624) - (xy 45.59 101.922176) - (xy 45.59 102.62) - (xy 39.5229 102.62) - (xy 39.5229 96.516) - (xy 47.947105 96.516) - (xy 47.99984 96.701351) - (xy 48.098965 96.900422) - (xy 48.23299 97.077899) - (xy 48.397337 97.227721) - (xy 48.586421 97.344797) - (xy 48.793799 97.425135) - (xy 48.8736 97.440052) - (xy 48.8736 96.516) - (xy 47.947105 96.516) - (xy 39.5229 96.516) + (xy 51.5735 86.7555) + (xy 51.556887 86.8175) + (xy 51.5115 86.862887) + (xy 51.4495 86.8795) + (xy 49.593706 86.8795) + (xy 49.575736 86.878191) + (xy 49.561853 86.876157) + (xy 49.551977 86.874711) + (xy 49.551976 86.874711) + (xy 49.502631 86.879028) + (xy 49.491824 86.8795) + (xy 49.486291 86.8795) + (xy 49.455501 86.883098) + (xy 49.451917 86.883464) + (xy 49.375961 86.890109) + (xy 49.356921 86.89433) + (xy 49.285232 86.920421) + (xy 49.281831 86.921603) + (xy 49.209474 86.94558) + (xy 49.191927 86.954075) + (xy 49.128221 86.995975) + (xy 49.125181 86.997912) + (xy 49.06028 87.037944) + (xy 49.045164 87.050257) + (xy 48.992831 87.105726) + (xy 48.990319 87.108312) + (xy 45.492648 90.605983) + (xy 45.438901 90.637568) + (xy 45.376577 90.639008) + (xy 45.321429 90.609939) + (xy 45.176562 90.477876) + (xy 44.987404 90.360754) + (xy 44.892693 90.324063) + (xy 44.77994 90.280382) + (xy 44.561243 90.2395) + (xy 44.338757 90.2395) + (xy 44.158833 90.273134) + (xy 44.12006 90.280382) + (xy 43.912595 90.360754) + (xy 43.723437 90.477875) + (xy 43.559019 90.627762) + (xy 43.424941 90.805311) + (xy 43.325769 91.004473) + (xy 43.264885 91.218462) + (xy 43.244357 91.44) + (xy 43.264885 91.661537) + (xy 43.325769 91.875526) + (xy 43.424941 92.074688) + (xy 43.559019 92.252237) + (xy 43.659038 92.343416) + (xy 43.688934 92.384967) + (xy 43.6995 92.435053) + (xy 43.6995 92.984947) + (xy 43.688934 93.035033) + (xy 43.659038 93.076584) + (xy 43.559019 93.167762) + (xy 43.424941 93.345311) + (xy 43.325769 93.544473) + (xy 43.264885 93.758462) + (xy 43.244357 93.98) + (xy 39.5229 93.98) (xy 39.5229 73.642879) (xy 40.9515 73.642879) (xy 40.966317 73.831149) (xy 41.025126 74.07611) - (xy 41.03678 74.104245) + (xy 41.052908 74.143181) (xy 41.121534 74.308859) (xy 41.253164 74.523659) (xy 41.416776 74.715224) @@ -5285,70 +5970,120 @@ (xy 46.387224 73.515224) (xy 46.550836 73.323659) (xy 46.682466 73.108859) - (xy 46.778873 72.876111) - (xy 46.837683 72.631148) - (xy 46.8525 72.442882) - (xy 46.8525 70.517118) - (xy 46.837683 70.328852) - (xy 46.778873 70.083889) - (xy 46.682466 69.851141) - (xy 46.550836 69.636341) - (xy 46.387224 69.444776) - (xy 46.195659 69.281164) - (xy 45.980859 69.149534) - (xy 45.837278 69.090061) - (xy 45.74811 69.053126) - (xy 45.503149 68.994317) - (xy 45.252 68.974551) - (xy 45.00085 68.994317) - (xy 44.755889 69.053126) - (xy 44.523139 69.149535) - (xy 44.308342 69.281163) - (xy 44.116776 69.444776) - (xy 43.953163 69.636342) - (xy 43.821535 69.851139) - (xy 43.725126 70.083889) - (xy 43.666317 70.32885) - (xy 43.662905 70.3722) - (xy 43.642388 70.431361) - (xy 43.595581 70.472954) - (xy 43.534418 70.486373) - (xy 43.474497 70.468196) - (xy 43.385932 70.413923) - (xy 43.280859 70.349534) - (xy 43.100879 70.274984) - (xy 43.04811 70.253126) - (xy 42.803149 70.194317) - (xy 42.552 70.174551) - (xy 42.30085 70.194317) - (xy 42.055889 70.253126) - (xy 41.823139 70.349535) - (xy 41.608342 70.481163) - (xy 41.416776 70.644776) - (xy 41.253163 70.836342) - (xy 41.121535 71.051139) - (xy 41.121534 71.051141) - (xy 41.120723 71.053099) - (xy 41.025126 71.283889) - (xy 40.966317 71.52885) - (xy 40.965818 71.535186) - (xy 40.952417 71.705474) - (xy 40.9515 71.717121) - (xy 40.9515 73.642879) - (xy 39.5229 73.642879) - (xy 39.5229 64.68) - (xy 45.246551 64.68) - (xy 45.266317 64.931149) - (xy 45.325126 65.17611) - (xy 45.363449 65.26863) - (xy 45.421534 65.408859) - (xy 45.553164 65.623659) - (xy 45.716776 65.815224) - (xy 45.908341 65.978836) - (xy 46.123141 66.110466) - (xy 46.355889 66.206873) - (xy 46.600852 66.265683) - (xy 46.789118 66.2805) + (xy 46.762939 72.914578) + (xy 46.804615 72.861714) + (xy 46.867771 72.838414) + (xy 46.933795 72.851547) + (xy 46.983227 72.897242) + (xy 47.0015 72.962032) + (xy 47.0015 76.34577) + (xy 46.992061 76.393223) + (xy 46.965181 76.433451) + (xy 44.62545 78.773181) + (xy 44.585222 78.800061) + (xy 44.537769 78.8095) + (xy 44.338757 78.8095) + (xy 44.120059 78.850382) + (xy 44.12006 78.850382) + (xy 43.912595 78.930754) + (xy 43.723437 79.047875) + (xy 43.559019 79.197762) + (xy 43.424941 79.375311) + (xy 43.325769 79.574473) + (xy 43.264885 79.788462) + (xy 43.244357 80.01) + (xy 43.264885 80.231537) + (xy 43.325769 80.445526) + (xy 43.424941 80.644688) + (xy 43.559019 80.822237) + (xy 43.659038 80.913416) + (xy 43.688934 80.954967) + (xy 43.6995 81.005053) + (xy 43.6995 81.554947) + (xy 43.688934 81.605033) + (xy 43.659038 81.646584) + (xy 43.559019 81.737762) + (xy 43.424941 81.915311) + (xy 43.325769 82.114473) + (xy 43.264885 82.328462) + (xy 43.244357 82.55) + (xy 43.264885 82.771537) + (xy 43.325769 82.985526) + (xy 43.424941 83.184688) + (xy 43.559019 83.362237) + (xy 43.723437 83.512124) + (xy 43.912595 83.629245) + (xy 43.912597 83.629245) + (xy 43.912599 83.629247) + (xy 44.12006 83.709618) + (xy 44.338757 83.7505) + (xy 44.561241 83.7505) + (xy 44.561243 83.7505) + (xy 44.77994 83.709618) + (xy 44.987401 83.629247) + (xy 45.176562 83.512124) + (xy 45.340981 83.362236) + (xy 45.475058 83.184689) + (xy 45.574229 82.985528) + (xy 45.576654 82.977008) + (xy 45.60227 82.886974) + (xy 45.635115 82.771536) + (xy 45.655643 82.55) + (xy 45.635115 82.328464) + (xy 45.584396 82.150204) + (xy 45.57423 82.114473) + (xy 45.475058 81.915311) + (xy 45.34098 81.737762) + (xy 45.240962 81.646584) + (xy 45.211066 81.605033) + (xy 45.2005 81.554947) + (xy 45.2005 81.005053) + (xy 45.211066 80.954967) + (xy 45.240962 80.913416) + (xy 45.34098 80.822237) + (xy 45.387245 80.760972) + (xy 45.475058 80.644689) + (xy 45.574229 80.445528) + (xy 45.635115 80.231536) + (xy 45.655643 80.01) + (xy 45.648778 79.935919) + (xy 45.655619 79.882367) + (xy 45.684566 79.836799) + (xy 48.237638 77.283727) + (xy 48.251256 77.271957) + (xy 48.27053 77.25761) + (xy 48.302382 77.219649) + (xy 48.309668 77.211697) + (xy 48.31359 77.207777) + (xy 48.332863 77.183399) + (xy 48.33503 77.180739) + (xy 48.383302 77.123214) + (xy 48.383303 77.12321) + (xy 48.384119 77.122239) + (xy 48.394575 77.105825) + (xy 48.395109 77.104679) + (xy 48.395111 77.104677) + (xy 48.426816 77.036682) + (xy 48.428369 77.033475) + (xy 48.46204 76.966433) + (xy 48.46204 76.966429) + (xy 48.46261 76.965296) + (xy 48.468999 76.946917) + (xy 48.469256 76.945673) + (xy 48.484431 76.872171) + (xy 48.485186 76.868767) + (xy 48.5025 76.795721) + (xy 48.5025 76.795719) + (xy 48.50279 76.794495) + (xy 48.504769 76.775123) + (xy 48.504732 76.773859) + (xy 48.504733 76.773856) + (xy 48.502552 76.698889) + (xy 48.5025 76.695284) + (xy 48.5025 66.4045) + (xy 48.519113 66.3425) + (xy 48.5645 66.297113) + (xy 48.6265 66.2805) (xy 48.714879 66.2805) (xy 48.714882 66.2805) (xy 48.903148 66.265683) @@ -5457,7 +6192,73 @@ (xy 45.325126 64.183889) (xy 45.266317 64.42885) (xy 45.246551 64.68) - (xy 39.5229 64.68) + (xy 45.266317 64.931149) + (xy 45.325126 65.17611) + (xy 45.363449 65.26863) + (xy 45.421534 65.408859) + (xy 45.553164 65.623659) + (xy 45.716776 65.815224) + (xy 45.908341 65.978836) + (xy 46.123141 66.110466) + (xy 46.355889 66.206873) + (xy 46.600852 66.265683) + (xy 46.789118 66.2805) + (xy 46.8775 66.2805) + (xy 46.9395 66.297113) + (xy 46.984887 66.3425) + (xy 47.0015 66.4045) + (xy 47.0015 69.997968) + (xy 46.983227 70.062758) + (xy 46.933795 70.108453) + (xy 46.867771 70.121586) + (xy 46.804615 70.098286) + (xy 46.762939 70.045421) + (xy 46.743283 69.997968) + (xy 46.682466 69.851141) + (xy 46.550836 69.636341) + (xy 46.387224 69.444776) + (xy 46.195659 69.281164) + (xy 45.980859 69.149534) + (xy 45.837278 69.090061) + (xy 45.74811 69.053126) + (xy 45.503149 68.994317) + (xy 45.252 68.974551) + (xy 45.00085 68.994317) + (xy 44.755889 69.053126) + (xy 44.523139 69.149535) + (xy 44.308342 69.281163) + (xy 44.116776 69.444776) + (xy 43.953163 69.636342) + (xy 43.821535 69.851139) + (xy 43.725126 70.083889) + (xy 43.666317 70.32885) + (xy 43.662905 70.3722) + (xy 43.642388 70.431361) + (xy 43.595581 70.472954) + (xy 43.534418 70.486373) + (xy 43.474497 70.468196) + (xy 43.385932 70.413923) + (xy 43.280859 70.349534) + (xy 43.152403 70.296326) + (xy 43.04811 70.253126) + (xy 42.803149 70.194317) + (xy 42.552 70.174551) + (xy 42.30085 70.194317) + (xy 42.055889 70.253126) + (xy 41.823139 70.349535) + (xy 41.608342 70.481163) + (xy 41.416776 70.644776) + (xy 41.253163 70.836342) + (xy 41.138291 71.023796) + (xy 41.121534 71.051141) + (xy 41.109374 71.080499) + (xy 41.025126 71.283889) + (xy 40.966317 71.52885) + (xy 40.965841 71.534898) + (xy 40.952417 71.705474) + (xy 40.9515 71.717121) + (xy 40.9515 73.642879) + (xy 39.5229 73.642879) (xy 39.5229 61.1353) (xy 39.539513 61.0733) (xy 39.5849 61.027913) @@ -5466,22 +6267,18 @@ ) ) ) - (zone (net 0) (net_name "") (layer "F.Cu") (tstamp 89bc6492-64bb-49d9-bbc8-cf600aa309ec) (hatch edge 0.5) + (zone (net 0) (net_name "") (layer "F.Cu") (tstamp bea7bdcc-6cc5-4c77-91b8-b4150f216c83) (hatch edge 0.5) (connect_pads (clearance 0)) (min_thickness 0.25) (filled_areas_thickness no) (keepout (tracks allowed) (vias allowed) (pads allowed) (copperpour not_allowed) (footprints allowed)) (fill (thermal_gap 0.5) (thermal_bridge_width 0.5)) (polygon (pts + (xy 78.74 72.39) (xy 78.74 77.47) - (xy 78.74 69.85) - (xy 90.805 69.85) - (xy 94.615 68.58) - (xy 106.68 68.58) - (xy 106.68 70.485) - (xy 102.235 74.93) - (xy 92.71 74.93) - (xy 90.17 77.47) + (xy 80.645 77.47) + (xy 84.455 73.66) + (xy 84.455 72.39) ) ) ) diff --git a/pcb/APRSuino/APRSuino.kicad_sch b/pcb/APRSuino/APRSuino.kicad_sch index bf80278..ae145ce 100644 --- a/pcb/APRSuino/APRSuino.kicad_sch +++ b/pcb/APRSuino/APRSuino.kicad_sch @@ -77,6 +77,58 @@ ) ) ) + (symbol "Connector:TestPoint_Probe" (pin_numbers hide) (pin_names (offset 0.762) hide) (in_bom yes) (on_board yes) + (property "Reference" "TP" (at 1.651 5.842 0) + (effects (font (size 1.27 1.27))) + ) + (property "Value" "TestPoint_Probe" (at 1.651 4.064 0) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "" (at 5.08 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 5.08 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_keywords" "test point tp" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "test point (alternative probe-style design)" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_fp_filters" "Pin* Test*" (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "TestPoint_Probe_0_1" + (polyline + (pts + (xy 1.27 0.762) + (xy 0 0) + (xy 0.762 1.27) + (xy 1.27 0.762) + ) + (stroke (width 0) (type default)) + (fill (type outline)) + ) + (polyline + (pts + (xy 1.397 0.635) + (xy 0.635 1.397) + (xy 2.413 3.175) + (xy 3.175 2.413) + (xy 1.397 0.635) + ) + (stroke (width 0) (type default)) + (fill (type background)) + ) + ) + (symbol "TestPoint_Probe_1_1" + (pin passive line (at 0 0 90) (length 0) + (name "1" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + ) + ) (symbol "Connector_Audio:AudioJack3_SwitchTR" (in_bom yes) (on_board yes) (property "Reference" "J" (at 0 8.89 0) (effects (font (size 1.27 1.27))) @@ -789,25 +841,31 @@ ) ) - (junction (at 274.32 101.6) (diameter 0) (color 0 0 0 0) + (junction (at 254 88.9) (diameter 0) (color 0 0 0 0) (uuid 0e0b214d-33a3-45f9-8602-d729ffdbcfa6) ) - (junction (at 274.32 139.7) (diameter 0) (color 0 0 0 0) + (junction (at 254 127) (diameter 0) (color 0 0 0 0) (uuid 75c0d6bd-c91c-4020-bc0a-d85606514a52) ) - (junction (at 274.32 127) (diameter 0) (color 0 0 0 0) + (junction (at 49.53 165.354) (diameter 0) (color 0 0 0 0) + (uuid 765e0c4b-71cb-47f3-aa1b-ec9356d5ca1f) + ) + (junction (at 254 114.3) (diameter 0) (color 0 0 0 0) (uuid 7be9d11e-a42e-4920-ba3b-7eb535f82236) ) (junction (at 101.6 19.05) (diameter 0) (color 0 0 0 0) (uuid 8840663b-4b9a-4760-b2fa-21ea373543f5) ) - (junction (at 269.24 101.6) (diameter 0) (color 0 0 0 0) + (junction (at 59.69 172.974) (diameter 0) (color 0 0 0 0) + (uuid 90be5de9-47e3-4ce1-a967-29c2a6e09129) + ) + (junction (at 248.92 88.9) (diameter 0) (color 0 0 0 0) (uuid c31d82cb-271a-471c-ac59-cbcc11c6ea51) ) (junction (at 68.58 22.86) (diameter 0) (color 0 0 0 0) (uuid c702463c-a824-44ba-98a8-0856cc232a2b) ) - (junction (at 269.24 127) (diameter 0) (color 0 0 0 0) + (junction (at 248.92 114.3) (diameter 0) (color 0 0 0 0) (uuid c928d8b9-1184-4d4e-ae86-d71e3fef1ee5) ) (junction (at 35.56 22.86) (diameter 0) (color 0 0 0 0) @@ -816,13 +874,13 @@ (junction (at 38.1 165.354) (diameter 0) (color 0 0 0 0) (uuid da018b96-c5f3-4473-ab43-5801115327c9) ) - (junction (at 274.32 114.3) (diameter 0) (color 0 0 0 0) + (junction (at 254 101.6) (diameter 0) (color 0 0 0 0) (uuid e06e4168-4ba2-4026-b773-dad88ea6c2e4) ) - (junction (at 269.24 114.3) (diameter 0) (color 0 0 0 0) + (junction (at 248.92 101.6) (diameter 0) (color 0 0 0 0) (uuid e75740f2-0f02-40c7-9473-e6d8a48538a8) ) - (junction (at 269.24 139.7) (diameter 0) (color 0 0 0 0) + (junction (at 248.92 127) (diameter 0) (color 0 0 0 0) (uuid fc6617b1-b7af-47a7-82e2-f46f663ff1e4) ) @@ -856,7 +914,7 @@ (stroke (width 0) (type default)) (uuid 0f38d1cb-60aa-4fe1-9207-31df85bb8880) ) - (wire (pts (xy 269.24 124.46) (xy 269.24 127)) + (wire (pts (xy 248.92 111.76) (xy 248.92 114.3)) (stroke (width 0) (type default)) (uuid 1399a696-1141-4db5-ab50-164394e9efa8) ) @@ -864,11 +922,15 @@ (stroke (width 0) (type default)) (uuid 13f82437-df13-4637-b8e7-bd548e45ec99) ) - (wire (pts (xy 274.32 88.9) (xy 274.32 91.44)) + (wire (pts (xy 254 76.2) (xy 254 78.74)) (stroke (width 0) (type default)) (uuid 1661a3a8-54f7-4de5-b971-f8938f21c989) ) - (wire (pts (xy 266.7 139.7) (xy 269.24 139.7)) + (wire (pts (xy 49.53 162.56) (xy 49.53 165.354)) + (stroke (width 0) (type default)) + (uuid 1acba268-a1ea-46b5-80c2-51d3653bb0ca) + ) + (wire (pts (xy 246.38 127) (xy 248.92 127)) (stroke (width 0) (type default)) (uuid 216e8be1-efd0-4687-a5ac-658bd5b0b700) ) @@ -880,7 +942,11 @@ (stroke (width 0) (type default)) (uuid 2903f15a-6d20-4447-a31d-cb6cb03c493c) ) - (wire (pts (xy 274.32 101.6) (xy 274.32 104.14)) + (wire (pts (xy 55.88 172.974) (xy 59.69 172.974)) + (stroke (width 0) (type default)) + (uuid 29169e96-0d87-4431-8f2a-db57758a2f13) + ) + (wire (pts (xy 254 88.9) (xy 254 91.44)) (stroke (width 0) (type default)) (uuid 30b4ea3e-f16e-4dd9-bddb-594036803542) ) @@ -900,7 +966,7 @@ (stroke (width 0) (type default)) (uuid 3c833c18-d4b4-4887-a185-349dc99b618b) ) - (wire (pts (xy 269.24 139.7) (xy 274.32 139.7)) + (wire (pts (xy 248.92 127) (xy 254 127)) (stroke (width 0) (type default)) (uuid 402e038d-1dcd-419c-a549-161e36d9384d) ) @@ -916,7 +982,7 @@ (stroke (width 0) (type default)) (uuid 45badc19-e8b7-4daa-8f57-915297e0a4ac) ) - (wire (pts (xy 269.24 127) (xy 269.24 129.54)) + (wire (pts (xy 248.92 114.3) (xy 248.92 116.84)) (stroke (width 0) (type default)) (uuid 47d53cd5-81aa-49fa-9e35-9ef10bbc1839) ) @@ -932,19 +998,23 @@ (stroke (width 0) (type default)) (uuid 4fa9b12c-525b-47e6-bd75-19523e224531) ) - (wire (pts (xy 269.24 101.6) (xy 274.32 101.6)) + (wire (pts (xy 248.92 88.9) (xy 254 88.9)) (stroke (width 0) (type default)) (uuid 517fb44b-ed9b-4ecc-8b46-a1b57216915b) ) - (wire (pts (xy 266.7 127) (xy 269.24 127)) + (wire (pts (xy 246.38 114.3) (xy 248.92 114.3)) (stroke (width 0) (type default)) (uuid 52f18d60-be56-4b23-8835-3fce5bfda567) ) + (wire (pts (xy 254 88.9) (xy 259.08 88.9)) + (stroke (width 0) (type default)) + (uuid 5a1d5533-acdc-4190-aa72-e6462c2df26a) + ) (wire (pts (xy 59.69 185.42) (xy 59.69 187.071)) (stroke (width 0) (type default)) (uuid 5b5b90a2-b9d3-4d69-8ef1-53281387d07e) ) - (wire (pts (xy 269.24 114.3) (xy 269.24 116.84)) + (wire (pts (xy 248.92 101.6) (xy 248.92 104.14)) (stroke (width 0) (type default)) (uuid 5b5f4ce7-e7cb-4387-88df-d5f5e41c1b50) ) @@ -964,7 +1034,7 @@ (stroke (width 0) (type default)) (uuid 69de1fb7-ed0c-4dbe-bd51-4c192a15a75f) ) - (wire (pts (xy 274.32 127) (xy 274.32 129.54)) + (wire (pts (xy 254 114.3) (xy 254 116.84)) (stroke (width 0) (type default)) (uuid 6edc01ef-712c-42f0-b703-201fc9ea3d69) ) @@ -988,7 +1058,7 @@ (stroke (width 0) (type default)) (uuid 793cc4c6-2b36-488a-8dd4-c21ea32d352a) ) - (wire (pts (xy 254 127) (xy 259.08 127)) + (wire (pts (xy 233.68 114.3) (xy 238.76 114.3)) (stroke (width 0) (type default)) (uuid 7cc82db8-2754-4e67-aa20-cac074842266) ) @@ -996,7 +1066,7 @@ (stroke (width 0) (type default)) (uuid 7dee5a33-9b10-4a84-bf21-a28453ef44c8) ) - (wire (pts (xy 274.32 149.86) (xy 274.32 152.4)) + (wire (pts (xy 254 137.16) (xy 254 139.7)) (stroke (width 0) (type default)) (uuid 81747670-276d-40c3-a519-bfba662f5743) ) @@ -1008,15 +1078,15 @@ (stroke (width 0) (type default)) (uuid 86b8a162-9a2a-44ea-a7ea-36c6c0a781a5) ) - (wire (pts (xy 274.32 111.76) (xy 274.32 114.3)) + (wire (pts (xy 254 99.06) (xy 254 101.6)) (stroke (width 0) (type default)) (uuid 8caad245-d1a9-4d77-b3a3-d4fe490fe5a5) ) - (wire (pts (xy 274.32 139.7) (xy 274.32 142.24)) + (wire (pts (xy 254 127) (xy 254 129.54)) (stroke (width 0) (type default)) (uuid 8cc6bba7-5104-4517-8b77-e145e7e36832) ) - (wire (pts (xy 266.7 101.6) (xy 269.24 101.6)) + (wire (pts (xy 246.38 88.9) (xy 248.92 88.9)) (stroke (width 0) (type default)) (uuid 8d380262-e9ae-4152-a4a4-d15b22644620) ) @@ -1028,7 +1098,7 @@ (stroke (width 0) (type default)) (uuid 93681b16-d4d6-4874-89cb-515206f1813e) ) - (wire (pts (xy 258.064 88.9) (xy 274.32 88.9)) + (wire (pts (xy 237.744 76.2) (xy 254 76.2)) (stroke (width 0) (type default)) (uuid 975fb6a4-4cb5-4112-95df-47f4d88c288d) ) @@ -1036,7 +1106,7 @@ (stroke (width 0) (type default)) (uuid 997cf0b7-e0c5-4cc2-9006-c9c9ebc9b5bf) ) - (wire (pts (xy 266.7 114.3) (xy 269.24 114.3)) + (wire (pts (xy 246.38 101.6) (xy 248.92 101.6)) (stroke (width 0) (type default)) (uuid 9ed8b2c9-5a20-419a-a14a-51896d25dcf4) ) @@ -1044,7 +1114,11 @@ (stroke (width 0) (type default)) (uuid 9f3aa3be-9f10-442f-8a75-314ea8585c5f) ) - (wire (pts (xy 269.24 114.3) (xy 274.32 114.3)) + (wire (pts (xy 55.88 171.45) (xy 55.88 172.974)) + (stroke (width 0) (type default)) + (uuid a102471f-536c-4ded-9f13-8aee8f55ddad) + ) + (wire (pts (xy 248.92 101.6) (xy 254 101.6)) (stroke (width 0) (type default)) (uuid a156d35c-65e7-472a-bc59-87008b1808bb) ) @@ -1052,7 +1126,7 @@ (stroke (width 0) (type default)) (uuid a52be453-1f19-4063-8075-4013178a5491) ) - (wire (pts (xy 254 114.3) (xy 259.08 114.3)) + (wire (pts (xy 233.68 101.6) (xy 238.76 101.6)) (stroke (width 0) (type default)) (uuid a7f6c4a5-63ab-4c7d-9171-c73eb6aa7c74) ) @@ -1068,7 +1142,7 @@ (stroke (width 0) (type default)) (uuid b08818bb-af94-4208-9b4a-d04af2b4c2a4) ) - (wire (pts (xy 274.32 99.06) (xy 274.32 101.6)) + (wire (pts (xy 254 86.36) (xy 254 88.9)) (stroke (width 0) (type default)) (uuid b255bffa-a25f-4ab8-a230-cfb6f2320611) ) @@ -1076,6 +1150,10 @@ (stroke (width 0) (type default)) (uuid b4eae5ce-ec0b-41d2-b660-83b3a363270c) ) + (wire (pts (xy 63.5 127) (xy 63.5 133.35)) + (stroke (width 0) (type default)) + (uuid b53e1fd5-26d8-4090-8f8f-ae3f5f6e9298) + ) (wire (pts (xy 62.992 172.974) (xy 59.69 172.974)) (stroke (width 0) (type default)) (uuid b5bac52a-6a1c-4f97-95a5-284d372d0e41) @@ -1092,7 +1170,7 @@ (stroke (width 0) (type default)) (uuid b9d479d0-6b85-4b24-91ce-6873ee39b71f) ) - (wire (pts (xy 38.1 165.354) (xy 62.992 165.354)) + (wire (pts (xy 38.1 165.354) (xy 49.53 165.354)) (stroke (width 0) (type default)) (uuid ba00de62-ec1a-4aea-bf93-f7f03ed3c836) ) @@ -1100,11 +1178,11 @@ (stroke (width 0) (type default)) (uuid ba1d7b10-bc64-4b36-9d7a-fa0af6bbaca4) ) - (wire (pts (xy 269.24 127) (xy 274.32 127)) + (wire (pts (xy 248.92 114.3) (xy 254 114.3)) (stroke (width 0) (type default)) (uuid c001e0ab-c2a3-453f-8b8f-571e27e90f92) ) - (wire (pts (xy 269.24 101.6) (xy 269.24 104.14)) + (wire (pts (xy 248.92 88.9) (xy 248.92 91.44)) (stroke (width 0) (type default)) (uuid c6cee182-1b4f-4779-a3a8-842d06f0f950) ) @@ -1116,15 +1194,19 @@ (stroke (width 0) (type default)) (uuid d93751de-575b-4085-ac0c-242476c309e7) ) + (wire (pts (xy 49.53 165.354) (xy 62.992 165.354)) + (stroke (width 0) (type default)) + (uuid e0b92dc0-9e4f-4c4a-9c88-dedbfaf81318) + ) (wire (pts (xy 25.4 123.19) (xy 27.94 123.19)) (stroke (width 0) (type default)) (uuid e149bfd3-3573-4fed-8515-70a61df8a230) ) - (wire (pts (xy 274.32 124.46) (xy 274.32 127)) + (wire (pts (xy 254 111.76) (xy 254 114.3)) (stroke (width 0) (type default)) (uuid e3c5474b-a455-4977-b17c-26ddab9976c4) ) - (wire (pts (xy 274.32 114.3) (xy 274.32 116.84)) + (wire (pts (xy 254 101.6) (xy 254 104.14)) (stroke (width 0) (type default)) (uuid e6bef738-823e-4238-bb72-3723ab1a3eeb) ) @@ -1136,11 +1218,11 @@ (stroke (width 0) (type default)) (uuid eb28dfc5-ff09-4bd0-87f5-5c016fc099f7) ) - (wire (pts (xy 274.32 137.16) (xy 274.32 139.7)) + (wire (pts (xy 254 124.46) (xy 254 127)) (stroke (width 0) (type default)) (uuid ec32baca-4608-43ed-aee1-962e889ece73) ) - (wire (pts (xy 254 101.6) (xy 259.08 101.6)) + (wire (pts (xy 233.68 88.9) (xy 238.76 88.9)) (stroke (width 0) (type default)) (uuid ec58209c-da86-4ea2-ac6f-8abbbc6e1d69) ) @@ -1160,11 +1242,11 @@ (stroke (width 0) (type default)) (uuid f3133e95-4d4d-4a3a-b9a7-7d74b587266f) ) - (wire (pts (xy 269.24 137.16) (xy 269.24 139.7)) + (wire (pts (xy 248.92 124.46) (xy 248.92 127)) (stroke (width 0) (type default)) (uuid f8762fca-4258-418c-a459-e037f67f0822) ) - (wire (pts (xy 269.24 111.76) (xy 269.24 114.3)) + (wire (pts (xy 248.92 99.06) (xy 248.92 101.6)) (stroke (width 0) (type default)) (uuid f88ee40d-ae6e-4827-9ea6-d09702bfa9f2) ) @@ -1180,7 +1262,7 @@ (stroke (width 0) (type default)) (uuid fceb95be-36f9-4c06-8d7f-fe3638328484) ) - (wire (pts (xy 254 139.7) (xy 259.08 139.7)) + (wire (pts (xy 233.68 127) (xy 238.76 127)) (stroke (width 0) (type default)) (uuid fd868f5a-1386-48bd-bdb5-690f4611a07e) ) @@ -1238,10 +1320,10 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "A3" (shape input) (at 254 101.6 180) (fields_autoplaced) + (global_label "A3" (shape input) (at 233.68 88.9 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 3e882005-ae07-4694-9eff-a72453d247e6) - (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 248.7961 101.6 0) + (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 228.4761 88.9 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) @@ -1280,17 +1362,17 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "A1" (shape input) (at 254 127 180) (fields_autoplaced) + (global_label "A1" (shape input) (at 233.68 114.3 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 6bf1b53c-c13f-4822-9878-79d47cda8a53) - (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 248.7961 127 0) + (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 228.4761 114.3 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "A2" (shape input) (at 254 114.3 180) (fields_autoplaced) + (global_label "A2" (shape input) (at 233.68 101.6 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 6c882d6d-3507-4b23-9905-82fee2e4ceae) - (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 248.7961 114.3 0) + (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 228.4761 101.6 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) @@ -1301,10 +1383,10 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "A0" (shape input) (at 254 139.7 180) (fields_autoplaced) + (global_label "A0" (shape input) (at 233.68 127 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 77018913-5364-4af9-8f62-01533d435a38) - (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 248.7961 139.7 0) + (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 228.4761 127 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) @@ -1371,10 +1453,10 @@ (effects (font (size 1.27 1.27)) (justify right) hide) ) ) - (global_label "AF_OUT" (shape output) (at 258.064 88.9 180) (fields_autoplaced) + (global_label "AF_OUT" (shape output) (at 237.744 76.2 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid e7d40ff3-021d-49a5-8bd2-24fd4cab4f54) - (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 248.3848 88.9 0) + (property "Intersheetrefs" "${INTERSHEET_REFS}" (at 228.0648 76.2 0) (effects (font (size 1.27 1.27)) (justify right) hide) ) ) @@ -1464,19 +1546,44 @@ ) ) - (symbol (lib_id "Device:R") (at 274.32 133.35 0) (unit 1) + (symbol (lib_id "Connector:TestPoint_Probe") (at 49.53 162.56 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) - (uuid 13f58cf4-8597-4777-b9f0-7236538cc023) - (property "Reference" "R15" (at 276.098 132.7063 0) + (uuid 13b8fb05-6500-445e-b000-51ef6216faa9) + (property "Reference" "TP1" (at 53.34 160.3288 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 276.098 134.6273 0) + (property "Value" "AF" (at 53.34 162.2498 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 272.542 133.35 90) + (property "Footprint" "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (at 54.61 162.56 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 274.32 133.35 0) + (property "Datasheet" "~" (at 54.61 162.56 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid d0077455-9343-402e-89ff-523091dbc97b)) + (instances + (project "APRSuino" + (path "/00a491a7-4e45-457f-8a18-4b30e0002695" + (reference "TP1") (unit 1) + ) + ) + ) + ) + + (symbol (lib_id "Device:R") (at 254 120.65 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (uuid 13f58cf4-8597-4777-b9f0-7236538cc023) + (property "Reference" "R15" (at 255.778 120.0063 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "1k1" (at 255.778 121.9273 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 252.222 120.65 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 254 120.65 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid ef10a726-147a-4e21-a3eb-2679c772dcb9)) @@ -1490,19 +1597,19 @@ ) ) - (symbol (lib_id "Device:R") (at 262.89 127 270) (unit 1) + (symbol (lib_id "Device:R") (at 242.57 114.3 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 1d417721-1ef9-405a-8ee0-b7329dcc88de) - (property "Reference" "R13" (at 262.89 122.9741 90) + (property "Reference" "R13" (at 242.57 110.2741 90) (effects (font (size 1.27 1.27))) ) - (property "Value" "1k1" (at 262.89 124.8951 90) + (property "Value" "1k1" (at 242.57 112.1951 90) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 262.89 125.222 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 242.57 112.522 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 262.89 127 0) + (property "Datasheet" "~" (at 242.57 114.3 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid a3e29124-a3b0-48e2-b036-f643631ea5db)) @@ -1545,19 +1652,19 @@ ) ) - (symbol (lib_id "Device:R") (at 269.24 133.35 0) (unit 1) + (symbol (lib_id "Device:R") (at 248.92 120.65 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 2e89608f-0af6-4738-a374-3de8d718146e) - (property "Reference" "R14" (at 271.018 132.7063 0) + (property "Reference" "R14" (at 250.698 120.0063 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 271.018 134.6273 0) + (property "Value" "1k1" (at 250.698 121.9273 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 267.462 133.35 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 247.142 120.65 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 269.24 133.35 0) + (property "Datasheet" "~" (at 248.92 120.65 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid e7f7d9fe-884b-46ce-918d-9ac8d9d47d05)) @@ -1571,19 +1678,19 @@ ) ) - (symbol (lib_id "Device:R") (at 262.89 101.6 270) (unit 1) + (symbol (lib_id "Device:R") (at 242.57 88.9 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 3018e4a2-3567-4e70-8b77-2e558615f7e7) - (property "Reference" "R7" (at 262.89 97.5741 90) + (property "Reference" "R7" (at 242.57 84.8741 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "1k1" (at 262.89 99.4951 90) + (property "Value" "1k1" (at 242.57 86.7951 90) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 262.89 99.822 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 242.57 87.122 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 262.89 101.6 0) + (property "Datasheet" "~" (at 242.57 88.9 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid aad00d04-6566-4582-8cd0-9e178a6d9013)) @@ -1597,6 +1704,31 @@ ) ) + (symbol (lib_id "power:GND") (at 63.5 133.35 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (uuid 31cb7b85-3b86-46ff-9b84-2dd8a584114c) + (property "Reference" "#PWR019" (at 63.5 139.7 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GND" (at 63.5 137.4855 0) + (effects (font (size 1.27 1.27))) + ) + (property "Footprint" "" (at 63.5 133.35 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (at 63.5 133.35 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid f5a6f8a4-492e-4f8d-a3a0-d81a024c6843)) + (instances + (project "APRSuino" + (path "/00a491a7-4e45-457f-8a18-4b30e0002695" + (reference "#PWR019") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "Device:R") (at 31.75 123.19 90) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 324b34d0-8563-4798-8cfe-3069f3cb7f85) @@ -1649,19 +1781,44 @@ ) ) - (symbol (lib_id "Device:R") (at 269.24 120.65 0) (unit 1) + (symbol (lib_id "Connector:TestPoint_Probe") (at 259.08 88.9 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) - (uuid 3a22c87c-c4c5-48e5-9b28-6b8028d20850) - (property "Reference" "R11" (at 271.018 120.0063 0) + (uuid 378f8a92-9809-45ba-9471-68999ab87ce7) + (property "Reference" "TP3" (at 262.89 86.6688 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 271.018 121.9273 0) + (property "Value" "DAC" (at 262.89 88.5898 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 267.462 120.65 90) + (property "Footprint" "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (at 264.16 88.9 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 269.24 120.65 0) + (property "Datasheet" "~" (at 264.16 88.9 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 1aac8004-c720-4289-8af5-9f68995548f6)) + (instances + (project "APRSuino" + (path "/00a491a7-4e45-457f-8a18-4b30e0002695" + (reference "TP3") (unit 1) + ) + ) + ) + ) + + (symbol (lib_id "Device:R") (at 248.92 107.95 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (uuid 3a22c87c-c4c5-48e5-9b28-6b8028d20850) + (property "Reference" "R11" (at 250.698 107.3063 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "1k1" (at 250.698 109.2273 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 247.142 107.95 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 248.92 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid c813d067-cda2-41be-8dc8-b584a9fee0f9)) @@ -1802,6 +1959,31 @@ ) ) + (symbol (lib_id "Connector:TestPoint_Probe") (at 63.5 127 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (uuid 5fce8f5e-307a-47ee-a401-6b8d8e7be127) + (property "Reference" "TP4" (at 67.31 124.7688 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "GND" (at 67.31 126.6898 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (at 68.58 127 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 68.58 127 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid c9ee1cc0-fe14-4ba4-acc6-f7879408e88d)) + (instances + (project "APRSuino" + (path "/00a491a7-4e45-457f-8a18-4b30e0002695" + (reference "TP4") (unit 1) + ) + ) + ) + ) + (symbol (lib_id "power:GND") (at 59.69 187.071 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 634490ac-f3a2-4d37-8079-54257d637a89) @@ -2033,19 +2215,19 @@ ) ) - (symbol (lib_id "Device:R") (at 274.32 120.65 0) (unit 1) + (symbol (lib_id "Device:R") (at 254 107.95 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid 99521b0f-1889-4b5d-a0fc-643630e9cfad) - (property "Reference" "R12" (at 276.098 120.0063 0) + (property "Reference" "R12" (at 255.778 107.3063 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 276.098 121.9273 0) + (property "Value" "1k1" (at 255.778 109.2273 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 272.542 120.65 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 252.222 107.95 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 274.32 120.65 0) + (property "Datasheet" "~" (at 254 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid ec6894b8-b44e-4bf7-b0d0-6a47aa7e9165)) @@ -2059,19 +2241,19 @@ ) ) - (symbol (lib_id "Device:R") (at 262.89 114.3 270) (unit 1) + (symbol (lib_id "Device:R") (at 242.57 101.6 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid ae8c53a4-bf50-40d3-ad98-ea10415be85d) - (property "Reference" "R10" (at 262.89 110.2741 90) + (property "Reference" "R10" (at 242.57 97.5741 90) (effects (font (size 1.27 1.27))) ) - (property "Value" "1k1" (at 262.89 112.1951 90) + (property "Value" "1k1" (at 242.57 99.4951 90) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 262.89 112.522 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 242.57 99.822 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 262.89 114.3 0) + (property "Datasheet" "~" (at 242.57 101.6 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 910379ff-8267-48f1-9271-0031a5a916f5)) @@ -2161,19 +2343,19 @@ ) ) - (symbol (lib_id "Device:R") (at 262.89 139.7 270) (unit 1) + (symbol (lib_id "Device:R") (at 242.57 127 270) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid b31d9575-a70e-49e4-95fa-3f4b3a04c6bb) - (property "Reference" "R16" (at 262.89 135.6741 90) + (property "Reference" "R16" (at 242.57 122.9741 90) (effects (font (size 1.27 1.27))) ) - (property "Value" "1k1" (at 262.89 137.5951 90) + (property "Value" "1k1" (at 242.57 124.8951 90) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 262.89 137.922 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 242.57 125.222 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 262.89 139.7 0) + (property "Datasheet" "~" (at 242.57 127 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 5a44b99d-01df-4b07-887f-b71239e4d259)) @@ -2187,19 +2369,19 @@ ) ) - (symbol (lib_id "Device:R") (at 269.24 107.95 0) (unit 1) + (symbol (lib_id "Device:R") (at 248.92 95.25 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid ba6df108-9f24-44d6-abbf-b92ada82fc52) - (property "Reference" "R8" (at 271.018 107.3063 0) + (property "Reference" "R8" (at 250.698 94.6063 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 271.018 109.2273 0) + (property "Value" "1k1" (at 250.698 96.5273 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 267.462 107.95 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 247.142 95.25 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 269.24 107.95 0) + (property "Datasheet" "~" (at 248.92 95.25 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 2521d2f0-4408-44d5-bccc-51f47a31dc97)) @@ -2241,19 +2423,19 @@ ) ) - (symbol (lib_id "power:GND") (at 274.32 152.4 0) (unit 1) + (symbol (lib_id "power:GND") (at 254 139.7 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid bec211fd-e9b3-48a9-9653-03e0a8d5dbfb) - (property "Reference" "#PWR06" (at 274.32 158.75 0) + (property "Reference" "#PWR06" (at 254 146.05 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (at 274.32 156.5355 0) + (property "Value" "GND" (at 254 143.8355 0) (effects (font (size 1.27 1.27))) ) - (property "Footprint" "" (at 274.32 152.4 0) + (property "Footprint" "" (at 254 139.7 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (at 274.32 152.4 0) + (property "Datasheet" "" (at 254 139.7 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid ac330713-5f33-4a9d-9b7b-2d7705bb10d1)) @@ -2266,19 +2448,19 @@ ) ) - (symbol (lib_id "Device:C") (at 274.32 95.25 0) (unit 1) + (symbol (lib_id "Device:C") (at 254 82.55 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid c555f676-806e-4d09-b96f-13ca7cd0a4a1) - (property "Reference" "C3" (at 277.241 94.6063 0) + (property "Reference" "C3" (at 256.921 81.9063 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "22uF" (at 277.241 96.5273 0) + (property "Value" "22uF" (at 256.921 83.8273 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Capacitor_THT:CP_Radial_D4.0mm_P2.00mm" (at 275.2852 99.06 0) + (property "Footprint" "Capacitor_THT:CP_Radial_D4.0mm_P2.00mm" (at 254.9652 86.36 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 274.32 95.25 0) + (property "Datasheet" "~" (at 254 82.55 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 38f62b32-a04f-4d57-a231-aabbc2e17a56)) @@ -2317,19 +2499,19 @@ ) ) - (symbol (lib_id "Device:R") (at 274.32 107.95 0) (unit 1) + (symbol (lib_id "Device:R") (at 254 95.25 0) (unit 1) (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) (uuid c9cbbd9c-c62e-4c7e-8492-3902d5b705f7) - (property "Reference" "R9" (at 276.098 107.3063 0) + (property "Reference" "R9" (at 255.778 94.6063 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 276.098 109.2273 0) + (property "Value" "1k1" (at 255.778 96.5273 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 272.542 107.95 90) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 252.222 95.25 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 274.32 107.95 0) + (property "Datasheet" "~" (at 254 95.25 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 34001d45-4ecc-4171-b2f2-fb4990929f10)) @@ -2343,19 +2525,44 @@ ) ) - (symbol (lib_id "Device:R") (at 274.32 146.05 0) (unit 1) - (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) - (uuid d3ab0571-4dda-40fd-b097-b46f7756d831) - (property "Reference" "R18" (at 276.098 145.4063 0) + (symbol (lib_id "Connector:TestPoint_Probe") (at 55.88 171.45 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) + (uuid ccb3e474-8169-45cd-a450-f2b0f3dd2268) + (property "Reference" "TP2" (at 52.197 168.783 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "1k1" (at 276.098 147.3273 0) + (property "Value" "PTT" (at 51.816 171.45 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 272.542 146.05 90) + (property "Footprint" "APRSuino:TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (at 60.96 171.45 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (at 274.32 146.05 0) + (property "Datasheet" "~" (at 60.96 171.45 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid adb57e72-a27e-411d-ad59-602a963e5d4c)) + (instances + (project "APRSuino" + (path "/00a491a7-4e45-457f-8a18-4b30e0002695" + (reference "TP2") (unit 1) + ) + ) + ) + ) + + (symbol (lib_id "Device:R") (at 254 133.35 0) (unit 1) + (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced) + (uuid d3ab0571-4dda-40fd-b097-b46f7756d831) + (property "Reference" "R18" (at 255.778 132.7063 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "1k1" (at 255.778 134.6273 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P2.54mm_Vertical" (at 252.222 133.35 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (at 254 133.35 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 17c94564-9860-4418-8f09-91ae449bb263)) diff --git a/pcb/APRSuino/APRSuino.pretty/TestPoint_2Pads_Pitch2.54mm_Drill0.8mm.kicad_mod b/pcb/APRSuino/APRSuino.pretty/TestPoint_2Pads_Pitch2.54mm_Drill0.8mm.kicad_mod new file mode 100644 index 0000000..f2cb273 --- /dev/null +++ b/pcb/APRSuino/APRSuino.pretty/TestPoint_2Pads_Pitch2.54mm_Drill0.8mm.kicad_mod @@ -0,0 +1,57 @@ +(footprint "TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (version 20221018) (generator pcbnew) + (layer "F.Cu") + (descr "Test point with 2 pins, pitch 2.54mm, drill diameter 0.8mm") + (tags "CONN DEV") + (attr exclude_from_pos_files exclude_from_bom) + (fp_text reference "REF**" (at 1.3 -2) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 023cc058-e855-4fd8-8f90-f4d850da118c) + ) + (fp_text value "TestPoint_2Pads_Pitch2.54mm_Drill0.8mm" (at 1.27 2) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 38785b6e-504f-4fb3-a46e-3e4504bf8a8c) + ) + (fp_text user "${REFERENCE}" (at 1.3 -2) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp eeffcb6e-6d4d-4c14-ac82-1649c3be6c28) + ) + (fp_line (start -1.03 -0.4) (end -0.53 -0.9) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 101ac06b-6bff-4167-a369-04c9dfc4ea4a)) + (fp_line (start -1.03 0.4) (end -1.03 -0.4) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 92cad5c2-7663-49d6-bc71-192811498795)) + (fp_line (start -0.53 -0.9) (end 3.07 -0.9) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 67b328f1-52fb-4438-b61c-bf14df1ac0b9)) + (fp_line (start -0.53 0.9) (end -1.03 0.4) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 770ac8e4-24b1-4c30-93cd-e3c476cea3d7)) + (fp_line (start 3.07 -0.9) (end 3.57 -0.4) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 29c17a76-92dc-42b5-a584-4d4fea7f452d)) + (fp_line (start 3.07 0.9) (end -0.53 0.9) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp f1c1c55e-3434-4dd8-b1f2-d3fe6756a1ef)) + (fp_line (start 3.57 -0.4) (end 3.57 0.4) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 9f13f552-a76b-49bc-8a62-109ec502b145)) + (fp_line (start 3.57 0.4) (end 3.07 0.9) + (stroke (width 0.15) (type solid)) (layer "F.SilkS") (tstamp 1aef98a6-ce67-462d-ac36-f75b7ba5b0ef)) + (fp_line (start -1.3 -0.5) (end -1.3 0.5) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d271bbfa-53f4-432d-85ee-1dca7602ce7b)) + (fp_line (start -1.3 0.5) (end -0.65 1.15) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1566413c-0655-4b38-9a5d-5e8ff6c460c2)) + (fp_line (start -0.65 -1.15) (end -1.3 -0.5) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 869fc95b-7e89-4388-816b-14a6a7bb5d95)) + (fp_line (start -0.65 1.15) (end 3.15 1.15) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 7420099c-2b2e-4ae2-93a7-601c5599c4cb)) + (fp_line (start 3.15 -1.15) (end -0.65 -1.15) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 8c6d0809-c5e9-4d23-b6db-18ec3aca5c1e)) + (fp_line (start 3.15 1.15) (end 3.8 0.5) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp d136bc5a-3266-4b5a-a2c2-3c361dab4588)) + (fp_line (start 3.8 -0.5) (end 3.15 -1.15) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 03663bc4-6ac1-4d1b-ad11-aa0db1e5e90c)) + (fp_line (start 3.8 0.5) (end 3.8 -0.5) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp ed00d28d-62dc-458d-a1f7-59931555aa1d)) + (pad "1" thru_hole circle (at 0 0) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp 60c383a7-a2a2-4fe2-ae6b-917b87ebbf36)) + (pad "1" thru_hole circle (at 2.54 0) (size 1.4 1.4) (drill 0.8) (layers "*.Cu" "*.Mask") (tstamp 8d9352cb-2131-4e21-b9fc-9a69d16ec262)) + (model "${KICAD7_3DMODEL_DIR}/TestPoint.3dshapes/TestPoint_Bridge_Pitch2.54mm_Drill0.7mm.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) +) diff --git a/pcb/APRSuino/APRSuino.pretty/WC1602A_I2C.kicad_mod b/pcb/APRSuino/APRSuino.pretty/WC1602A_I2C.kicad_mod index 78b3f32..ce685c5 100644 --- a/pcb/APRSuino/APRSuino.pretty/WC1602A_I2C.kicad_mod +++ b/pcb/APRSuino/APRSuino.pretty/WC1602A_I2C.kicad_mod @@ -73,14 +73,14 @@ (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp ac57bd12-aa33-4218-aac7-3f1ec03d4385)) (fp_line (start 72 33.5) (end -8 33.5) (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 3c9de89a-6b10-4fb1-a0d0-45fce1761086)) - (pad "" thru_hole circle (at -5.4991 0) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp 7d6b6865-5f46-4943-9866-108ba627b66e)) - (pad "" thru_hole circle (at -5.4991 31.0007) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp 8ecbe0d5-53b9-43e0-9981-c26113cf0fb4)) - (pad "" thru_hole circle (at 69.49948 31.0007) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp 394402fc-db1e-433a-a996-ade75afab6cc)) - (pad "" thru_hole circle (at 69.5 0) (size 3 3) (drill 2.5) (layers "*.Cu" "*.Mask") (tstamp be922913-01e0-46c5-aef2-a051d6986502)) - (pad "1" thru_hole rect (at 0 5.08 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp b6f3a671-13a5-412d-91f8-b0bbc352aa5e)) - (pad "2" thru_hole oval (at 0 7.62 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp 5378c5bb-b754-418d-b4df-75777102ba2f)) - (pad "3" thru_hole oval (at 0 10.16 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp 8750ab72-19ce-40a8-9273-acae8a518ec7)) - (pad "4" thru_hole oval (at 0 12.7 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp 3e0a1223-766f-4505-bf51-09970bc76dd7)) + (pad "" np_thru_hole circle (at -5.4991 0) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp 7d6b6865-5f46-4943-9866-108ba627b66e)) + (pad "" np_thru_hole circle (at -5.4991 31.0007) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp 8ecbe0d5-53b9-43e0-9981-c26113cf0fb4)) + (pad "" np_thru_hole circle (at 69.49948 31.0007) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp 394402fc-db1e-433a-a996-ade75afab6cc)) + (pad "" np_thru_hole circle (at 69.5 0) (size 4.2 4.2) (drill 3.4) (layers "F&B.Cu" "*.Mask") (tstamp be922913-01e0-46c5-aef2-a051d6986502)) + (pad "1" thru_hole rect (at 0 3.81 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp b6f3a671-13a5-412d-91f8-b0bbc352aa5e)) + (pad "2" thru_hole oval (at 0 6.35 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp 5378c5bb-b754-418d-b4df-75777102ba2f)) + (pad "3" thru_hole oval (at 0 8.89 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp 8750ab72-19ce-40a8-9273-acae8a518ec7)) + (pad "4" thru_hole oval (at 0 11.43 180) (size 2.5 2) (drill 1.3) (layers "*.Cu" "*.Mask") (tstamp 3e0a1223-766f-4505-bf51-09970bc76dd7)) (model "${KIPRJMOD}/LCD AP214.STEP" (offset (xyz 32 -15.5 12)) (scale (xyz 1 1 1))