From 33953910dd160707a296523094f97f1a06da17db Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 12:53:55 -0400 Subject: [PATCH 01/10] hardware: update version to 0.7+ --- rev0/luna_rev0.kicad_pcb | 2 +- rev0/luna_rev0.kicad_pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rev0/luna_rev0.kicad_pcb b/rev0/luna_rev0.kicad_pcb index de3ce49..27424fa 100644 --- a/rev0/luna_rev0.kicad_pcb +++ b/rev0/luna_rev0.kicad_pcb @@ -94,7 +94,7 @@ ) (property "DATE" "2023-05-01") - (property "VERSION" "0.7") + (property "VERSION" "0.7+") (net 0 "") (net 1 "+3V3") diff --git a/rev0/luna_rev0.kicad_pro b/rev0/luna_rev0.kicad_pro index d37e685..6434eac 100644 --- a/rev0/luna_rev0.kicad_pro +++ b/rev0/luna_rev0.kicad_pro @@ -524,6 +524,6 @@ ], "text_variables": { "DATE": "2023-05-01", - "VERSION": "0.7" + "VERSION": "0.7+" } } From cc3ea351b896ab7aecec3ef485656bd31e6539d3 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 13:02:59 -0400 Subject: [PATCH 02/10] hardware: update FET component selection --- rev0/luna_rev0.kicad_pcb | 48 ++++++++++++------------- rev0/luna_rev0.kicad_sch | 2 +- rev0/power_distribution.kicad_sch | 60 +++++++++++++++---------------- 3 files changed, 55 insertions(+), 55 deletions(-) diff --git a/rev0/luna_rev0.kicad_pcb b/rev0/luna_rev0.kicad_pcb index 27424fa..c18b261 100644 --- a/rev0/luna_rev0.kicad_pcb +++ b/rev0/luna_rev0.kicad_pcb @@ -4355,12 +4355,12 @@ (at 143.7 90.5 90) (descr "Vishay PowerPAK SC70 single transistor package http://www.vishay.com/docs/70486/70486.pdf") (tags "powerpak sc70 sc-70") - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN") - (property "Manufacturer" "Diodes Inc.") - (property "Part Number" "DMP3028LFDE-7") + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK") + (property "Manufacturer" "Vishay Siliconix") + (property "Part Number" "SIA483ADJ-T1-GE3") (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF") + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115") (path "/490fda6e-4eae-4b35-a875-405b51914829/d685803c-628b-4733-ad4a-1ba6dca0048e") (attr smd) (fp_text reference "Q1" (at 0 -1.9 90) (layer "F.SilkS") hide @@ -4657,12 +4657,12 @@ (at 152.2 101 90) (descr "Vishay PowerPAK SC70 single transistor package http://www.vishay.com/docs/70486/70486.pdf") (tags "powerpak sc70 sc-70") - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN") - (property "Manufacturer" "Diodes Inc.") - (property "Part Number" "DMP3028LFDE-7") + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK") + (property "Manufacturer" "Vishay Siliconix") + (property "Part Number" "SIA483ADJ-T1-GE3") (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF") + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115") (path "/490fda6e-4eae-4b35-a875-405b51914829/f801e3f4-9e94-4250-9948-27010da7a48e") (attr smd) (fp_text reference "Q6" (at 0 -1.9 90) (layer "F.SilkS") hide @@ -5016,12 +5016,12 @@ (at 155.1 94.4 -90) (descr "Vishay PowerPAK SC70 single transistor package http://www.vishay.com/docs/70486/70486.pdf") (tags "powerpak sc70 sc-70") - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN") - (property "Manufacturer" "Diodes Inc.") - (property "Part Number" "DMP3028LFDE-7") + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK") + (property "Manufacturer" "Vishay Siliconix") + (property "Part Number" "SIA483ADJ-T1-GE3") (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF") + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115") (path "/490fda6e-4eae-4b35-a875-405b51914829/e91eafdc-da2e-43ef-81d1-183880acf026") (attr smd) (fp_text reference "Q4" (at 0 -1.9 -90) (layer "F.SilkS") hide @@ -5131,12 +5131,12 @@ (at 152.2 94.4 90) (descr "Vishay PowerPAK SC70 single transistor package http://www.vishay.com/docs/70486/70486.pdf") (tags "powerpak sc70 sc-70") - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN") - (property "Manufacturer" "Diodes Inc.") - (property "Part Number" "DMP3028LFDE-7") + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK") + (property "Manufacturer" "Vishay Siliconix") + (property "Part Number" "SIA483ADJ-T1-GE3") (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF") + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115") (path "/490fda6e-4eae-4b35-a875-405b51914829/36e76636-9fc8-4c1a-b468-6ea55d62524d") (attr smd) (fp_text reference "Q5" (at 0 -1.9 90) (layer "F.SilkS") hide @@ -5533,12 +5533,12 @@ (at 155.1 101 -90) (descr "Vishay PowerPAK SC70 single transistor package http://www.vishay.com/docs/70486/70486.pdf") (tags "powerpak sc70 sc-70") - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN") - (property "Manufacturer" "Diodes Inc.") - (property "Part Number" "DMP3028LFDE-7") + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK") + (property "Manufacturer" "Vishay Siliconix") + (property "Part Number" "SIA483ADJ-T1-GE3") (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF") + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115") (path "/490fda6e-4eae-4b35-a875-405b51914829/0eab371e-ae03-4df3-a908-023cad97da21") (attr smd) (fp_text reference "Q7" (at 0 -1.9 -90) (layer "F.SilkS") hide @@ -5632,12 +5632,12 @@ (at 146.6 90.5 -90) (descr "Vishay PowerPAK SC70 single transistor package http://www.vishay.com/docs/70486/70486.pdf") (tags "powerpak sc70 sc-70") - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN") - (property "Manufacturer" "Diodes Inc.") - (property "Part Number" "DMP3028LFDE-7") + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK") + (property "Manufacturer" "Vishay Siliconix") + (property "Part Number" "SIA483ADJ-T1-GE3") (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF") + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115") (path "/490fda6e-4eae-4b35-a875-405b51914829/fa4d7819-d329-4528-8f48-2f24cef1f9c6") (attr smd) (fp_text reference "Q2" (at 0 -1.9 -90) (layer "F.SilkS") hide diff --git a/rev0/luna_rev0.kicad_sch b/rev0/luna_rev0.kicad_sch index a0d37cb..ec23627 100644 --- a/rev0/luna_rev0.kicad_sch +++ b/rev0/luna_rev0.kicad_sch @@ -1142,8 +1142,8 @@ ) ) - (bus_alias "ULPI" (members "DATA[0..7]" "CLK" "DIR" "STP" "NXT" "~{RESET}")) (bus_alias "TYPE_C" (members "SDA" "SCL" "SBU1S" "SBU2S" "~{INT}" "~{FAULT}")) + (bus_alias "ULPI" (members "DATA[0..7]" "CLK" "DIR" "STP" "NXT" "~{RESET}")) (junction (at 76.2 128.27) (diameter 0) (color 0 0 0 0) (uuid 01b76df7-fd1d-4696-a018-c17e903f0523) ) diff --git a/rev0/power_distribution.kicad_sch b/rev0/power_distribution.kicad_sch index 59044ed..e5512ff 100644 --- a/rev0/power_distribution.kicad_sch +++ b/rev0/power_distribution.kicad_sch @@ -2824,19 +2824,19 @@ (property "Footprint" "luna:Vishay_PowerPAK_SC70-6L_Single" (id 2) (at 257.81 91.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3028LFDE.pdf" (id 3) (at 255.27 96.52 0) + (property "Datasheet" "https://www.vishay.com/docs/77080/sia483adj.pdf" (id 3) (at 255.27 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Manufacturer" "Diodes Inc." (id 4) (at 255.27 96.52 0) + (property "Manufacturer" "Vishay Siliconix" (id 4) (at 255.27 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "DMP3028LFDE-7" (id 5) (at 255.27 96.52 0) + (property "Part Number" "SIA483ADJ-T1-GE3" (id 5) (at 255.27 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN" (id 6) (at 255.27 96.52 0) + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK" (id 6) (at 255.27 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF" (id 7) (at 255.27 96.52 0) + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115" (id 7) (at 255.27 96.52 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 185ead5f-a656-4e59-90d4-b1ee6168c272)) @@ -3190,19 +3190,19 @@ (property "Footprint" "luna:Vishay_PowerPAK_SC70-6L_Single" (id 2) (at 200.025 91.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3028LFDE.pdf" (id 3) (at 197.485 96.52 0) + (property "Datasheet" "https://www.vishay.com/docs/77080/sia483adj.pdf" (id 3) (at 197.485 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Manufacturer" "Diodes Inc." (id 4) (at 197.485 96.52 0) + (property "Manufacturer" "Vishay Siliconix" (id 4) (at 197.485 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "DMP3028LFDE-7" (id 5) (at 197.485 96.52 0) + (property "Part Number" "SIA483ADJ-T1-GE3" (id 5) (at 197.485 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN" (id 6) (at 197.485 96.52 0) + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK" (id 6) (at 197.485 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF" (id 7) (at 197.485 96.52 0) + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115" (id 7) (at 197.485 96.52 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 88c66b8a-2ba5-4653-899d-3280d33408c8)) @@ -5033,19 +5033,19 @@ (property "Footprint" "luna:Vishay_PowerPAK_SC70-6L_Single" (id 2) (at 156.845 42.545 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3028LFDE.pdf" (id 3) (at 159.385 47.625 0) + (property "Datasheet" "https://www.vishay.com/docs/77080/sia483adj.pdf" (id 3) (at 159.385 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Manufacturer" "Diodes Inc." (id 4) (at 159.385 47.625 0) + (property "Manufacturer" "Vishay Siliconix" (id 4) (at 159.385 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "DMP3028LFDE-7" (id 5) (at 159.385 47.625 0) + (property "Part Number" "SIA483ADJ-T1-GE3" (id 5) (at 159.385 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN" (id 6) (at 159.385 47.625 0) + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK" (id 6) (at 159.385 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF" (id 7) (at 159.385 47.625 0) + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115" (id 7) (at 159.385 47.625 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 07f0dd5f-67a9-4fca-a17a-f62c2bd5738d)) @@ -5234,19 +5234,19 @@ (property "Footprint" "luna:Vishay_PowerPAK_SC70-6L_Single" (id 2) (at 155.575 91.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3028LFDE.pdf" (id 3) (at 158.115 96.52 0) + (property "Datasheet" "https://www.vishay.com/docs/77080/sia483adj.pdf" (id 3) (at 158.115 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Manufacturer" "Diodes Inc." (id 4) (at 158.115 96.52 0) + (property "Manufacturer" "Vishay Siliconix" (id 4) (at 158.115 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "DMP3028LFDE-7" (id 5) (at 158.115 96.52 0) + (property "Part Number" "SIA483ADJ-T1-GE3" (id 5) (at 158.115 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN" (id 6) (at 158.115 96.52 0) + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK" (id 6) (at 158.115 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF" (id 7) (at 158.115 96.52 0) + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115" (id 7) (at 158.115 96.52 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 48836720-3d48-4a13-966c-2ffd976770cd)) @@ -5421,19 +5421,19 @@ (property "Footprint" "luna:Vishay_PowerPAK_SC70-6L_Single" (id 2) (at 220.345 91.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3028LFDE.pdf" (id 3) (at 222.885 96.52 0) + (property "Datasheet" "https://www.vishay.com/docs/77080/sia483adj.pdf" (id 3) (at 222.885 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Manufacturer" "Diodes Inc." (id 4) (at 222.885 96.52 0) + (property "Manufacturer" "Vishay Siliconix" (id 4) (at 222.885 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "DMP3028LFDE-7" (id 5) (at 222.885 96.52 0) + (property "Part Number" "SIA483ADJ-T1-GE3" (id 5) (at 222.885 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN" (id 6) (at 222.885 96.52 0) + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK" (id 6) (at 222.885 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF" (id 7) (at 222.885 96.52 0) + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115" (id 7) (at 222.885 96.52 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 3a18724f-24f4-4264-818c-59746e366383)) @@ -5465,19 +5465,19 @@ (property "Footprint" "luna:Vishay_PowerPAK_SC70-6L_Single" (id 2) (at 201.295 42.545 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMP3028LFDE.pdf" (id 3) (at 198.755 47.625 0) + (property "Datasheet" "https://www.vishay.com/docs/77080/sia483adj.pdf" (id 3) (at 198.755 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Manufacturer" "Diodes Inc." (id 4) (at 198.755 47.625 0) + (property "Manufacturer" "Vishay Siliconix" (id 4) (at 198.755 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "DMP3028LFDE-7" (id 5) (at 198.755 47.625 0) + (property "Part Number" "SIA483ADJ-T1-GE3" (id 5) (at 198.755 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "MOSFET P-CH 30V 6.8A 6UDFN" (id 6) (at 198.755 47.625 0) + (property "Description" "MOSFET P-CH 30V 10.6A/12A PPAK" (id 6) (at 198.755 47.625 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Substitution" "DMP3028LFDE-13, Nexperia PMPB27EP,115, PMPB16EPX, Vishay SIA469DJ-T1-GE3, SIA483ADJ-T1-GE3, SIA483DJ-T1-GE3, Toshiba SSM6J507NU,LF" (id 7) (at 198.755 47.625 0) + (property "Substitution" "SIA483DJ-T1-GE3, Nexperia PMPB16EPX, PMPB27EP,115" (id 7) (at 198.755 47.625 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 625fe841-783c-4236-9433-53a2911badbe)) From 85998026f97f94d03fa6fdb1bd483483cf30a3b2 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 13:22:54 -0400 Subject: [PATCH 03/10] hardware: fix via/silkscreen interference --- rev0/luna_rev0.kicad_pcb | 1087 ++++++++++++++++++-------------------- rev0/luna_rev0.kicad_pro | 2 +- 2 files changed, 529 insertions(+), 560 deletions(-) diff --git a/rev0/luna_rev0.kicad_pcb b/rev0/luna_rev0.kicad_pcb index c18b261..ef4611b 100644 --- a/rev0/luna_rev0.kicad_pcb +++ b/rev0/luna_rev0.kicad_pcb @@ -16866,15 +16866,13 @@ (segment (start 116.4 68.475) (end 116.6 68.275) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 2dba2dce-14ea-4711-92b0-ee3312c69901)) (segment (start 143.98 107.9) (end 144.7 107.9) (width 0.508) (layer "F.Cu") (net 1) (tstamp 2e283075-2f7c-4a3a-8fe3-2ae00e43c8d3)) (segment (start 114.02 104.7) (end 113.3 104.7) (width 0.508) (layer "F.Cu") (net 1) (tstamp 34971674-1802-408a-a413-6df52895d4c7)) - (segment (start 117.645 112.73) (end 119.66 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 35d59c78-ca74-435d-ace7-3325b8526a78)) + (segment (start 114.4375 112.85) (end 114.5 112.7875) (width 0.127) (layer "F.Cu") (net 1) (tstamp 36ad63cc-91af-4674-9938-11f31bb5206f)) (segment (start 145.25 85.95) (end 145.17 86.03) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 372d08bd-f505-4a68-a369-e5fb2fc1c006)) - (segment (start 120.5 112.875) (end 120.355 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 3e8884bd-febf-4e39-ac28-7810a66e9e3d)) (segment (start 149.88 112.3) (end 150.6 112.3) (width 0.508) (layer "F.Cu") (net 1) (tstamp 40c3c3e7-acf4-4516-b0ff-72daf70517b7)) (segment (start 148.3 82.35) (end 148.5 82.35) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 411f0c1d-0f8a-4118-9107-a4aac74af2b7)) - (segment (start 123.645 112.73) (end 125.67 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 4537f9a6-e540-4fd4-ad6e-64a4ba7af511)) (segment (start 119.9625 107.7775) (end 119.7775 107.9625) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 4565cf55-5b81-442c-ab20-f8a0b4413800)) (segment (start 116.0125 88.25) (end 115.44 88.25) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 46c3c177-4a77-41bc-b75a-a76b1148d202)) - (segment (start 113.665 112.875) (end 113.66 112.88) (width 0.127) (layer "F.Cu") (net 1) (tstamp 479c104f-a0c7-44a1-b8a3-8832adec5173)) + (segment (start 123.5565 112.731) (end 123.5 112.7875) (width 0.127) (layer "F.Cu") (net 1) (tstamp 497b8937-caa1-4d08-898e-37faf2fd333c)) (segment (start 117.75 96.16) (end 117.74 96.15) (width 0.127) (layer "F.Cu") (net 1) (tstamp 4a2eb217-2ac3-4342-85b1-ff146e98ecc4)) (segment (start 133.2 91.6) (end 134 91.6) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 4ba3e262-16da-4e76-ae75-cd9d1e8919f7)) (segment (start 132.15 110.98) (end 131.8 110.63) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 4c48201e-83fe-41c8-824b-7197861b2ad8)) @@ -16884,28 +16882,32 @@ (segment (start 147.9 82.75) (end 148.3 82.35) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 5351ebaa-5bab-4e15-91fe-34115141208c)) (segment (start 119.2 107.9625) (end 119.2 109.1) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 542334cc-4d4c-4142-b994-cace6f3b79bd)) (segment (start 118.25 100.9875) (end 118.25 101.28) (width 0.127) (layer "F.Cu") (net 1) (tstamp 56daedc1-74b9-42e9-91e8-d805e69be5f5)) + (segment (start 113.52 112.85) (end 114.4375 112.85) (width 0.127) (layer "F.Cu") (net 1) (tstamp 577118d0-bc6c-41ba-b6a9-f8781a021440)) (segment (start 128.25 66.55) (end 128.7 66.1) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 57ca2b61-8962-43ad-8026-b75cf5a7e8b9)) (segment (start 114.92 81.3) (end 114.92 80.61) (width 0.508) (layer "F.Cu") (net 1) (tstamp 5828318e-6e60-4a81-b24f-522385bd8907)) (segment (start 126.57 77.25) (end 126.21 77.61) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 584cedbe-62d0-40a2-85b4-5e00b3e3f3e8)) (segment (start 127.8375 66.55) (end 128.25 66.55) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 58e6cac3-b55c-46d5-943e-fa012a214a3f)) + (segment (start 117.5575 112.73) (end 117.5 112.7875) (width 0.127) (layer "F.Cu") (net 1) (tstamp 59dc0f53-fa75-44b5-94b6-17fe2a678919)) (segment (start 130 94) (end 130.4 94.4) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 66199fe8-a08e-4762-afc7-6201a20afa9a)) (segment (start 117.25 100.9875) (end 117.25 101.38) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 66584383-0251-40bb-b275-05313fef9533)) - (segment (start 126.355 112.73) (end 125.67 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 67495af8-ba95-4e1b-bbee-87c5cb8de083)) (segment (start 114.275 104.955) (end 114.02 104.7) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 6783fa92-e5e8-4f86-ab6d-d148e45cadb4)) - (segment (start 129.5 112.875) (end 126.5 112.875) (width 0.127) (layer "F.Cu") (net 1) (tstamp 6af8216b-ecd9-4784-a014-cb0875059ba5)) (segment (start 143 104.32) (end 143 103.6) (width 0.508) (layer "F.Cu") (net 1) (tstamp 6bda3b7a-b473-4d41-a16d-b61cd248b98a)) - (segment (start 126.5 112.875) (end 126.355 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 70627459-713c-413a-8393-d039cfe68134)) + (segment (start 126.4435 112.731) (end 126.5 112.7875) (width 0.127) (layer "F.Cu") (net 1) (tstamp 7039868a-ae89-4150-96ee-c7cdf7ed1a14)) + (segment (start 119.3 112.73) (end 117.5575 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 70c280cd-cf47-486f-a8ce-725ea31e7f65)) (segment (start 150.215 70.915) (end 150.5 71.2) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 7366daad-25cb-44a5-8d15-1b9045db2b5e)) (segment (start 133.6 94.4) (end 134 94) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 7aa53df3-8bc4-46bf-870e-da2a7d88d264)) + (segment (start 124.851 112.731) (end 123.5565 112.731) (width 0.127) (layer "F.Cu") (net 1) (tstamp 7c33414a-eb7a-4ddc-8fd0-0207f520b8ab)) (segment (start 119.2 109.1) (end 118.48 109.1) (width 0.508) (layer "F.Cu") (net 1) (tstamp 7d01dc86-640d-4f52-8344-b9c453a7b5b3)) (segment (start 134 90) (end 134.4 90.4) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 7d71d804-264b-4134-8bc0-87f080ccb800)) (segment (start 129.5 66.1) (end 130 66.6) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 7d777676-9fdb-4fb7-b743-cf5095efb6a8)) (segment (start 130 92.4) (end 129.6 92) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 7e3e4f28-1d89-40cf-88ba-fc6d5a151316)) (segment (start 136.7 112.08) (end 136.18 112.08) (width 0.508) (layer "F.Cu") (net 1) (tstamp 817fa6b6-2b42-4a99-858e-2bb40b7d8cbb)) (segment (start 147.4875 82.75) (end 147.9 82.75) (width 0.2032) (layer "F.Cu") (net 1) (tstamp 82434b29-9080-4c28-85ec-3b11da175de3)) + (segment (start 124.851 112.731) (end 126.4435 112.731) (width 0.127) (layer "F.Cu") (net 1) (tstamp 84d10f6f-c5a1-4900-bd74-70a363418ee6)) (segment (start 123.8 107.5) (end 123.8 106.86) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 89398f42-c3d3-4971-a3c8-f8204cb917a8)) (segment (start 150.215 70.3) (end 150.215 70.915) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 8a12a07e-1bf6-4e4d-9a2e-89bb3444c0cd)) (segment (start 136.465 77.405) (end 136.4 77.405) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 8aa11f71-de4e-4c58-83bc-19dcc7b2b39a)) + (segment (start 119.3 112.73) (end 120.4425 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp 90466912-1c0e-44e2-8343-d199bd04c5f5)) (segment (start 123.8 103.9) (end 123.8 103.39) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 90d6fde8-ca74-42e2-95f7-da60ae711c1e)) (segment (start 115.15 68.475) (end 116.4 68.475) (width 0.3048) (layer "F.Cu") (net 1) (tstamp 9354d1d2-765b-43a3-be04-31c213f71d71)) (segment (start 119.9875 88.75) (end 120.83 88.75) (width 0.127) (layer "F.Cu") (net 1) (tstamp 935dd687-566c-4eea-bcff-4b08804dc732)) @@ -16926,23 +16928,21 @@ (segment (start 143.5125 82.25) (end 142.75 82.25) (width 0.127) (layer "F.Cu") (net 1) (tstamp b856417f-bb79-4e99-a884-9ecf45a69b96)) (segment (start 131.52 109.8) (end 131.52 110.35) (width 0.508) (layer "F.Cu") (net 1) (tstamp b94b3c2d-e47b-43d8-b338-be794b97fb84)) (segment (start 149.625 111.225) (end 149.625 112.045) (width 0.3048) (layer "F.Cu") (net 1) (tstamp b9e71c28-f354-44f1-8b56-36c19e91c964)) - (segment (start 120.355 112.73) (end 119.66 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp bd77b4c9-df7b-4758-acb5-e713d2da3cb3)) (segment (start 123.8 103.39) (end 123.52 103.11) (width 0.3048) (layer "F.Cu") (net 1) (tstamp bd8460f6-f70f-4e53-9fc9-21089613a4d5)) - (segment (start 114.5 112.875) (end 113.665 112.875) (width 0.127) (layer "F.Cu") (net 1) (tstamp bf9f94a4-427f-4f0b-8477-37e791f71742)) (segment (start 136.78 78.9) (end 137.57 78.9) (width 0.3048) (layer "F.Cu") (net 1) (tstamp c02d4d53-dd0a-45fe-8e22-7aa23006b136)) - (segment (start 117.5 112.875) (end 117.645 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp c7d71f54-c2a3-4916-b19b-4665b00c3141)) + (segment (start 120.4425 112.73) (end 120.5 112.7875) (width 0.127) (layer "F.Cu") (net 1) (tstamp c5e5bb3d-30e7-4de8-b0b2-22c521da535b)) (segment (start 130 67.8) (end 129.32 68.48) (width 0.2032) (layer "F.Cu") (net 1) (tstamp cd2d86e0-bf24-4fe5-a042-5ba2950bc4a9)) (segment (start 118.25 86.0125) (end 118.25 85.04) (width 0.2032) (layer "F.Cu") (net 1) (tstamp cdafe0c5-452d-4316-95b7-5a52f33c2222)) (segment (start 129.3 68.48) (end 127.8675 68.48) (width 0.508) (layer "F.Cu") (net 1) (tstamp d0522999-b849-4a79-9529-617849f323fc)) (segment (start 115.0125 98.75) (end 114.17 98.75) (width 0.2032) (layer "F.Cu") (net 1) (tstamp d09517d7-5eab-41f4-a1f6-b0b23d6c699f)) (segment (start 130 90) (end 130.4 89.6) (width 0.3048) (layer "F.Cu") (net 1) (tstamp d134dbeb-f023-4468-a6ff-677ca2a9df9a)) (segment (start 115.2 81.58) (end 114.92 81.3) (width 0.1524) (layer "F.Cu") (net 1) (tstamp d5d1d8dd-adbf-447a-b964-89ae01bd82e7)) + (segment (start 126.5 112.7875) (end 129.5 112.7875) (width 0.127) (layer "F.Cu") (net 1) (tstamp d72b24fb-e817-42a3-94db-1a743cdc1f16)) (segment (start 117.75 97.0125) (end 117.75 96.16) (width 0.127) (layer "F.Cu") (net 1) (tstamp d7a45bbc-b9e7-4a79-8937-c16870af0058)) (segment (start 136.78 77.72) (end 136.465 77.405) (width 0.3048) (layer "F.Cu") (net 1) (tstamp d8316ee1-e67f-4001-94c8-039c1f73e52e)) (segment (start 128.7 66.1) (end 129.5 66.1) (width 0.2032) (layer "F.Cu") (net 1) (tstamp d9c94526-e641-4b3c-8ea0-5282750cee4b)) (segment (start 123.52 103.11) (end 121.88 103.11) (width 0.3048) (layer "F.Cu") (net 1) (tstamp dfe1fc57-b630-4628-b66e-decb8eecf491)) (segment (start 134 91.6) (end 134.4 92) (width 0.3048) (layer "F.Cu") (net 1) (tstamp e2c5643c-6a93-4eda-97b8-7d0b3c453d5f)) - (segment (start 123.5 112.875) (end 123.645 112.73) (width 0.127) (layer "F.Cu") (net 1) (tstamp e2e206a9-4c9d-4824-bf43-a8404462e05c)) (segment (start 114.275 105.775) (end 114.275 104.955) (width 0.3048) (layer "F.Cu") (net 1) (tstamp e5195754-5526-4908-8ad4-56abaf361b79)) (segment (start 143.9375 109.55) (end 143.9375 107.9425) (width 0.2032) (layer "F.Cu") (net 1) (tstamp e5cd2adf-0b2a-4b76-bdeb-522a43d77274)) (segment (start 147.4875 81.75) (end 147.79 81.75) (width 0.127) (layer "F.Cu") (net 1) (tstamp ec0fdd6a-d176-4c3c-bf34-5a636f57c647)) @@ -16962,7 +16962,7 @@ (via (at 123.5 74.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp 0e179320-f29a-4dad-8e38-c9a334bf20d3)) (via (at 114.5 74.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp 14e20c45-b3a3-41d8-a913-8e5831a70d9b)) (via (at 121.88 103.11) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp 1e2d26b7-9eea-4417-a91c-51160ed87e8d)) - (via (at 125.67 112.73) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp 20103bf9-0029-449a-9a43-fcd921bdc570)) + (via (at 124.851 112.731) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp 20103bf9-0029-449a-9a43-fcd921bdc570)) (via (at 117.3 69.7) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (free) (net 1) (tstamp 24ee3994-ce8c-46d4-8b09-6cb51625d87b)) (via (at 123.4 106.46) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp 2645377b-019a-4d8e-be5e-1b54f3a092ab)) (via (at 142.75 82.25) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp 2654d2d1-8217-414b-a461-dc1209f02536)) @@ -16992,7 +16992,7 @@ (via (at 135.68 109.46) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp a45da453-0b57-4f7f-ab43-5e06a926516b)) (via (at 144.7 107.9) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp a5344833-88f5-41ae-a936-419e28f89e01)) (via (at 126.8 81.6) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp a535a7ba-8b50-4e2f-aace-01b50f713b03)) - (via (at 119.66 112.73) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp abb9b858-a805-4241-aba9-faf4a224066b)) + (via (at 119.3 112.73) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp abb9b858-a805-4241-aba9-faf4a224066b)) (via (at 140.41 99.82) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp b020afea-37c9-4098-bedc-a64e50c552c4)) (via (at 116.8 69.2) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (free) (net 1) (tstamp b1b597a8-b784-4aa7-889f-aa78b440c185)) (via (at 117.74 96.15) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp bba610e1-f684-4a9c-8adf-b372818c280e)) @@ -17003,7 +17003,7 @@ (via (at 119.2 109.1) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp c9cff015-abe1-4b87-977f-c8badcd7d4cb)) (via (at 134.4 90.4) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp ca4160eb-1b33-4dba-9018-d7b469b88641)) (via (at 120.83 88.75) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp cad57898-2b95-4de0-acd8-f9da7200abff)) - (via (at 113.66 112.88) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp ce582621-d4a0-4065-ac4f-ad832417ee2c)) + (via (at 113.52 112.85) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 1) (tstamp ce582621-d4a0-4065-ac4f-ad832417ee2c)) (via (at 116.8 69.7) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (free) (net 1) (tstamp d063bc73-04d7-4a2b-9238-8051ebdae4ed)) (via (at 116.3 69.2) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (free) (net 1) (tstamp d4a9f43a-ad08-4151-ae96-2ae2a2d86499)) (via (at 118.33 84.96) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp dbdbc7a2-e355-454c-884e-ce6d49e6c9d3)) @@ -17015,8 +17015,10 @@ (via (at 114.06 98.64) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp fa49f38d-1bf6-4ae1-903f-19d81d47363e)) (via (at 126.21 77.61) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp fb46761d-1b7a-45ec-9840-a992373bf8f9)) (via (at 114.95 80.58) (size 0.762) (drill 0.381) (layers "F.Cu" "B.Cu") (net 1) (tstamp feda93f7-32b2-43c2-8959-bc96c8c22c5f)) + (segment (start 114.22 115.5) (end 114.22 113.55) (width 0.508) (layer "B.Cu") (net 1) (tstamp 022fbe04-87d0-471e-8de9-b959c3fa7197)) (segment (start 150.1 70.41) (end 150.5 70.81) (width 0.127) (layer "B.Cu") (net 1) (tstamp 07e7efe0-cbbc-4e98-8bb5-a61431b9ec03)) (segment (start 123.96 107.02) (end 123.4 106.46) (width 0.508) (layer "B.Cu") (net 1) (tstamp 08716476-c8e1-4b9a-87d2-62185180bd65)) + (segment (start 114.22 113.55) (end 113.52 112.85) (width 0.508) (layer "B.Cu") (net 1) (tstamp 16e09fdd-8912-46ae-9e7d-748d8e07d38d)) (segment (start 137.08 115.5) (end 137.08 112.98) (width 0.508) (layer "B.Cu") (net 1) (tstamp 170c651a-6b82-4465-9896-c8547c97e020)) (segment (start 114.5 75.49) (end 114.5 74.8) (width 0.127) (layer "B.Cu") (net 1) (tstamp 1845abdd-f270-4341-922c-0b814bcfd44e)) (segment (start 139.88 106.39) (end 139.89 106.4) (width 0.127) (layer "B.Cu") (net 1) (tstamp 1a7793e0-d477-439e-a5b4-6d815aa68102)) @@ -17031,11 +17033,9 @@ (segment (start 137.58 78.91) (end 137.58 77.72) (width 0.3048) (layer "B.Cu") (net 1) (tstamp 3172726d-8470-4034-91d8-19c6ab9834fe)) (segment (start 127.49 81.6) (end 126.8 81.6) (width 0.127) (layer "B.Cu") (net 1) (tstamp 329832fe-f969-4435-8cd1-ea23a02561c7)) (segment (start 131.12 94.5) (end 130.5 94.5) (width 0.508) (layer "B.Cu") (net 1) (tstamp 32ccc017-b867-4454-93f2-e778d40cc087)) - (segment (start 114.22 115.5) (end 114.22 113.44) (width 0.508) (layer "B.Cu") (net 1) (tstamp 376fe64f-d27d-4264-bfec-86c798284eb2)) (segment (start 134.98 92) (end 135.2 91.78) (width 0.508) (layer "B.Cu") (net 1) (tstamp 3a731a55-4490-4076-859f-a114eb1dee3c)) (segment (start 114.95 80.58) (end 114.95 81.34) (width 0.127) (layer "B.Cu") (net 1) (tstamp 3dac278e-31d4-4e38-a19c-c58d56196397)) (segment (start 152.84 82.46) (end 152.9 82.4) (width 0.508) (layer "B.Cu") (net 1) (tstamp 3e0813a5-429d-4f81-b8cf-fdf4a6567518)) - (segment (start 114.22 113.44) (end 113.66 112.88) (width 0.508) (layer "B.Cu") (net 1) (tstamp 3f4afeb7-c114-493c-8d12-5db37e411c36)) (segment (start 147.7 82.18) (end 148.33 82.18) (width 0.508) (layer "B.Cu") (net 1) (tstamp 40d02749-b297-4031-8a65-63f79fd2249b)) (segment (start 139.89 104.2) (end 139.89 105.29) (width 0.127) (layer "B.Cu") (net 1) (tstamp 4191e219-2dec-4c78-bcd1-50ae689001f2)) (segment (start 123.82 92.4) (end 123.19 92.4) (width 0.508) (layer "B.Cu") (net 1) (tstamp 44c0333d-7e4d-46e1-b5b3-5cc441224a83)) @@ -17315,6 +17315,7 @@ (via (at 111.3 79.2) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 28b3a287-23bc-4a97-8cdf-d51c78a0e9c9)) (via (at 145.9 82.6) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 2a7dfa50-80ee-4c77-97d5-77569030e424)) (via (at 124.3 108.67) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 2be7dd86-e4c1-4356-8e50-3a36bb577628)) + (via (at 114.19 94.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 2c9373dd-d41e-4d76-90d0-19e37308b717)) (via (at 134.3 112.9) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 2d49e954-1731-4cd6-8a84-4b914a889f42)) (via (at 114.1 66.625) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 315e8e8c-3ce4-486a-8c12-47539e911f64)) (via (at 113.6 68.125) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp 31b16dff-cd52-403d-8ecc-d8e1ad1dfb1f)) @@ -17410,7 +17411,6 @@ (via (at 143.8 95.97) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp bfe347e3-dd06-48ba-8587-223daded9564)) (via (at 132 92.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp c213beea-a8d0-4f06-9970-03ba4efd6bc7)) (via (at 125.9 98.6) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp c39e7dc3-78e0-4345-9372-1bb95bbd4aa8)) - (via (at 114.62 95.45) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp c3affffd-f9ce-4288-bf89-074354729f13)) (via (at 117.6 87.6) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp c4ae7813-48fe-48f2-af46-2c1ee14aec4a)) (via (at 136.8 89.6) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp c5480b94-9a27-4cc9-8368-a940b57ad192)) (via (at 119.1 107.1) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 2) (tstamp c6513124-50cc-499d-930e-06a9261ad8c6)) @@ -17485,6 +17485,7 @@ (segment (start 129.4 79.88) (end 130.054 79.88) (width 0.508) (layer "B.Cu") (net 2) (tstamp 247f7604-4841-4ec9-a40e-6d4ba7324eb1)) (segment (start 137.48 86.02) (end 137.48 86.3) (width 0.508) (layer "B.Cu") (net 2) (tstamp 2545d4a2-1030-4889-9c00-cee8c2d3355c)) (segment (start 119.9 99.84) (end 121.08 99.84) (width 0.127) (layer "B.Cu") (net 2) (tstamp 2767406c-11d9-43f3-897e-93dc9d86ff76)) + (segment (start 114.19 95.31) (end 114.19 94.8) (width 0.127) (layer "B.Cu") (net 2) (tstamp 2812c69f-46b0-46eb-b5e9-bbf5398536bd)) (segment (start 109.2 108.28) (end 110.2 108.28) (width 0.2032) (layer "B.Cu") (net 2) (tstamp 28526f78-a492-4d83-9520-e9981ae7bd6c)) (segment (start 146.9 108.62) (end 146.9 107.9) (width 0.508) (layer "B.Cu") (net 2) (tstamp 2858155b-3799-416c-8802-7a00433f6f5c)) (segment (start 136.08 88.7) (end 136.7 88.7) (width 0.508) (layer "B.Cu") (net 2) (tstamp 28f80ca2-a228-4752-aea8-51ac2ef82af5)) @@ -17505,7 +17506,6 @@ (segment (start 115.23 101.9) (end 115.23 102.88) (width 0.127) (layer "B.Cu") (net 2) (tstamp 408ad611-5942-417f-b4a6-78a80c57dea3)) (segment (start 108.45 85.6) (end 108.45 85.43) (width 0.3048) (layer "B.Cu") (net 2) (tstamp 41bb2f56-738c-4088-a413-430794586242)) (segment (start 115.72 101.41) (end 115.23 101.9) (width 0.508) (layer "B.Cu") (net 2) (tstamp 463b421a-8932-4b7b-bd3f-a0558114c485)) - (segment (start 114.05 95.45) (end 114.62 95.45) (width 0.127) (layer "B.Cu") (net 2) (tstamp 4b58b04b-f7f0-4b3a-9ea8-fe36ec05d2f3)) (segment (start 124.525 85.9) (end 124.5 85.925) (width 0.508) (layer "B.Cu") (net 2) (tstamp 4cf0628a-9a5b-4bb8-bcc2-b9c4f7bddfd1)) (segment (start 132.8 90.48) (end 132.8 91.2) (width 0.508) (layer "B.Cu") (net 2) (tstamp 4d3927c0-c163-4f9f-840a-93ce05fe2af1)) (segment (start 132.08 94.5) (end 132.7 94.5) (width 0.508) (layer "B.Cu") (net 2) (tstamp 4dfe2eef-5119-4f06-9fd3-74a228b52229)) @@ -17546,6 +17546,7 @@ (segment (start 126.13 76.71) (end 127.09 76.71) (width 0.3048) (layer "B.Cu") (net 2) (tstamp 77ffe5a1-3054-4a67-b8ed-412dc84a66a3)) (segment (start 114.9 97.72) (end 114.37 97.19) (width 0.508) (layer "B.Cu") (net 2) (tstamp 78207590-b8d2-46f0-b6fc-d56928baf8ee)) (segment (start 108.45 107.4) (end 108.45 107.53) (width 0.3048) (layer "B.Cu") (net 2) (tstamp 7a095a15-0c28-464a-9ffc-74f2dd763856)) + (segment (start 114.05 95.45) (end 114.19 95.31) (width 0.127) (layer "B.Cu") (net 2) (tstamp 7bea75ba-bd4c-4f72-ad4e-7e3434cfdbe0)) (segment (start 136.8 96) (end 136.8 95.775) (width 0.508) (layer "B.Cu") (net 2) (tstamp 7e1f93a1-9866-4434-abce-c1113548925b)) (segment (start 108.87 85.01) (end 109.16 84.72) (width 0.2032) (layer "B.Cu") (net 2) (tstamp 7e36362b-ca66-442c-acb9-8a72c4741b29)) (segment (start 112.11 89.49) (end 112.35 89.25) (width 0.2032) (layer "B.Cu") (net 2) (tstamp 7e86bf96-8c1a-4069-9503-5ac5b97388f6)) @@ -18001,35 +18002,35 @@ (via (at 118.16 102.56) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 37) (tstamp 9888d482-4a3a-4d36-b4f3-e5270b8bfb57)) (segment (start 117.7 103.02) (end 118.16 102.56) (width 0.127) (layer "B.Cu") (net 37) (tstamp 801df6c6-1753-470b-90b6-bab3a85adb7e)) (segment (start 117.7 104.39) (end 117.7 103.02) (width 0.127) (layer "B.Cu") (net 37) (tstamp 8c93b451-398b-45db-a65e-7cc3b90e48ae)) - (segment (start 113.775 111.125) (end 113.3 111.6) (width 0.127) (layer "F.Cu") (net 38) (tstamp 44085750-f8c9-4bbb-82d3-a0fe0a02a272)) + (segment (start 113.6875 111.2125) (end 114.5 111.2125) (width 0.127) (layer "F.Cu") (net 38) (tstamp 285ad8a8-1d31-4dcb-9cc4-187b76206307)) + (segment (start 113.3 111.6) (end 113.6875 111.2125) (width 0.127) (layer "F.Cu") (net 38) (tstamp 570927af-22c9-45dc-86db-1c1168307bd8)) (segment (start 113.3 111.6) (end 113.3 112.1) (width 0.127) (layer "F.Cu") (net 38) (tstamp 82952b51-51cd-4d69-9d20-28a19f378b74)) - (segment (start 114.5 111.125) (end 113.775 111.125) (width 0.127) (layer "F.Cu") (net 38) (tstamp daf56846-4cf6-4c24-8102-aed40336b226)) (via (at 113.3 112.1) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 38) (tstamp 8096616d-cf09-4c7c-9ea8-7a830986df9e)) (segment (start 110.9 111.7) (end 112.19 111.7) (width 0.127) (layer "B.Cu") (net 38) (tstamp 494f1376-d68a-4983-9c3a-e87ecc097368)) (segment (start 112.6 112.11) (end 113.29 112.11) (width 0.127) (layer "B.Cu") (net 38) (tstamp 73e8c764-62d8-4472-80ca-09319e01ee81)) (segment (start 113.29 112.11) (end 113.3 112.1) (width 0.127) (layer "B.Cu") (net 38) (tstamp 7b0d64b0-bd79-410f-87f7-c6a4d7b0174d)) (segment (start 112.19 111.7) (end 112.6 112.11) (width 0.127) (layer "B.Cu") (net 38) (tstamp a60877fc-2a41-40e2-a274-0def75e7d6b0)) - (segment (start 117.5 111.125) (end 116.775 111.125) (width 0.127) (layer "F.Cu") (net 39) (tstamp 15f4f9cf-db75-4079-bd77-67b177c1f113)) + (segment (start 116.3 111.6) (end 116.6875 111.2125) (width 0.127) (layer "F.Cu") (net 39) (tstamp 22a830fe-0854-4577-86d9-859211a9b059)) (segment (start 116.3 111.6) (end 116.3 112) (width 0.127) (layer "F.Cu") (net 39) (tstamp 7907c787-9a46-43e4-abf6-d67ae6245e13)) - (segment (start 116.775 111.125) (end 116.3 111.6) (width 0.127) (layer "F.Cu") (net 39) (tstamp 8b245099-8673-4b63-b97c-240340eceb99)) + (segment (start 116.6875 111.2125) (end 117.5 111.2125) (width 0.127) (layer "F.Cu") (net 39) (tstamp a183a71d-8b5d-4d10-aac9-5de00353da40)) (via (at 116.3 112) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 39) (tstamp 1d649fc8-0fb9-42e8-96c1-bb733ef736dc)) (segment (start 115.6 112.11) (end 115.1 112.11) (width 0.127) (layer "B.Cu") (net 39) (tstamp 88b3c7a3-bea3-4c4c-b185-10ee70b21f6a)) (segment (start 116.19 112.11) (end 116.3 112) (width 0.127) (layer "B.Cu") (net 39) (tstamp 9b47e737-fb4f-4791-bbff-f10cca12222e)) (segment (start 115.1 112.11) (end 114.1 111.11) (width 0.127) (layer "B.Cu") (net 39) (tstamp bd03d405-6c23-4ee9-8a10-5c7c4fc714a4)) (segment (start 115.6 112.11) (end 116.19 112.11) (width 0.127) (layer "B.Cu") (net 39) (tstamp c4cdd983-c29b-4050-bb9d-886c2476af95)) (segment (start 114.1 111.11) (end 114.1 110.2) (width 0.127) (layer "B.Cu") (net 39) (tstamp d7bcc70b-69db-41c2-99b9-21926f8c109b)) + (segment (start 119.6875 111.2125) (end 120.5 111.2125) (width 0.127) (layer "F.Cu") (net 40) (tstamp 324403b2-d39f-4a0c-b0c1-d01047882da7)) + (segment (start 119.3 111.6) (end 119.6875 111.2125) (width 0.127) (layer "F.Cu") (net 40) (tstamp 5037843a-3664-4f0e-b0af-efd7708e2c90)) (segment (start 119.3 111.6) (end 119.3 112.1) (width 0.127) (layer "F.Cu") (net 40) (tstamp 9d1a363f-e747-4a04-bf4f-dca109d42c67)) - (segment (start 119.775 111.125) (end 119.3 111.6) (width 0.127) (layer "F.Cu") (net 40) (tstamp d142aa28-9b82-4974-811c-34dec0225d69)) - (segment (start 120.5 111.125) (end 119.775 111.125) (width 0.127) (layer "F.Cu") (net 40) (tstamp fedc078a-5d82-4dfe-aef7-e45ed7a56e43)) (via (at 119.3 112.1) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 40) (tstamp cda8fc47-a2c6-4563-b477-351f3281272f)) (segment (start 118.6 112.11) (end 118.11 112.11) (width 0.127) (layer "B.Cu") (net 40) (tstamp 1c895c0e-ecdb-4f28-b929-8bf25452a0c4)) (segment (start 118.11 112.11) (end 117.1 111.1) (width 0.127) (layer "B.Cu") (net 40) (tstamp ae577ad4-1b93-442c-a13c-8fb56f5b8a96)) (segment (start 119.29 112.11) (end 119.3 112.1) (width 0.127) (layer "B.Cu") (net 40) (tstamp baa3bb58-5962-420e-bd1c-3caee8b1872a)) (segment (start 117.1 111.1) (end 117.1 110.2) (width 0.127) (layer "B.Cu") (net 40) (tstamp d83d4d5c-51a3-4f32-8c19-8f777825771a)) (segment (start 118.6 112.11) (end 119.29 112.11) (width 0.127) (layer "B.Cu") (net 40) (tstamp e18afadd-d3b8-4e30-a203-f6efdce79c10)) - (segment (start 122.775 111.125) (end 122.3 111.6) (width 0.127) (layer "F.Cu") (net 41) (tstamp 07103e0c-a31d-452d-b1dc-c43b6445de4a)) + (segment (start 122.3 111.6) (end 122.6875 111.2125) (width 0.127) (layer "F.Cu") (net 41) (tstamp 54003320-74dc-4663-9632-5cd9ca833efb)) (segment (start 122.3 111.6) (end 122.3 112.1) (width 0.127) (layer "F.Cu") (net 41) (tstamp 993e79a5-91ce-47d5-9a07-bb6d7065665c)) - (segment (start 123.5 111.125) (end 122.775 111.125) (width 0.127) (layer "F.Cu") (net 41) (tstamp ebf5b203-4c44-434c-8500-49d1cb0b6fc9)) + (segment (start 122.6875 111.2125) (end 123.5 111.2125) (width 0.127) (layer "F.Cu") (net 41) (tstamp ccccdd6a-1259-4da1-9677-fbe86dfe85d0)) (via (at 122.3 112.1) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 41) (tstamp 9876db6f-f0d2-4184-86df-1e84d028381e)) (segment (start 120.1 111.11) (end 120.1 110.2) (width 0.127) (layer "B.Cu") (net 41) (tstamp 1fae73e3-bd20-47b5-8e3c-61928041d0de)) (segment (start 121.6 112.11) (end 122.29 112.11) (width 0.127) (layer "B.Cu") (net 41) (tstamp 474ebfb6-2c6d-4995-accd-2f8c668bf957)) @@ -18037,16 +18038,16 @@ (segment (start 121.6 112.11) (end 121.1 112.11) (width 0.127) (layer "B.Cu") (net 41) (tstamp 50b9b0f5-3253-48cf-93a1-bd18fba33a07)) (segment (start 122.29 112.11) (end 122.3 112.1) (width 0.127) (layer "B.Cu") (net 41) (tstamp 766878fc-5d30-4173-be1b-2cfbd5493d92)) (segment (start 125.3 111.6) (end 125.3 112.1) (width 0.127) (layer "F.Cu") (net 42) (tstamp 0b5fa859-9f7f-4ec7-b60b-2814d7026be3)) - (segment (start 125.775 111.125) (end 125.3 111.6) (width 0.127) (layer "F.Cu") (net 42) (tstamp b21d86ca-f3b9-45c8-bfc8-9fea68f8af3d)) - (segment (start 126.5 111.125) (end 125.775 111.125) (width 0.127) (layer "F.Cu") (net 42) (tstamp c39615f0-bbad-407e-9bd0-1d45ac37003b)) + (segment (start 125.3 111.6) (end 125.6875 111.2125) (width 0.127) (layer "F.Cu") (net 42) (tstamp 4ae6b502-9ebf-496f-83d5-44941829d64a)) + (segment (start 125.6875 111.2125) (end 126.5 111.2125) (width 0.127) (layer "F.Cu") (net 42) (tstamp 6d481528-e99e-43cb-819d-4f1b763fcb6c)) (via (at 125.3 112.1) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 42) (tstamp 2ff36bc0-39d5-4dea-9887-b35c0aea7f31)) (segment (start 124.11 112.11) (end 123.1 111.1) (width 0.127) (layer "B.Cu") (net 42) (tstamp 12d6f58d-459b-4356-bb8b-105cf7d4769d)) (segment (start 123.1 111.1) (end 123.1 110.2) (width 0.127) (layer "B.Cu") (net 42) (tstamp 53684644-a191-4469-9924-eda392588570)) (segment (start 125.29 112.11) (end 125.3 112.1) (width 0.127) (layer "B.Cu") (net 42) (tstamp 951b4283-c5d7-43dd-aab2-63ac3eb0a32d)) (segment (start 124.6 112.11) (end 125.29 112.11) (width 0.127) (layer "B.Cu") (net 42) (tstamp a59d381d-08c0-4f66-ab37-38cf8acce551)) (segment (start 124.6 112.11) (end 124.11 112.11) (width 0.127) (layer "B.Cu") (net 42) (tstamp b0976451-a18f-48f1-88bc-89c880d28121)) - (segment (start 129.5 111.125) (end 128.575 110.2) (width 0.127) (layer "F.Cu") (net 43) (tstamp 362bff43-e5f7-47eb-9b42-a287db985beb)) - (segment (start 128.575 110.2) (end 125.21 110.2) (width 0.127) (layer "F.Cu") (net 43) (tstamp 4bfef4b7-4ce6-42b2-82a8-d668ab5739bc)) + (segment (start 128.4875 110.2) (end 125.21 110.2) (width 0.127) (layer "F.Cu") (net 43) (tstamp 446a4fbe-0c05-44d4-81b6-271f6858e690)) + (segment (start 128.4875 110.2) (end 129.5 111.2125) (width 0.127) (layer "F.Cu") (net 43) (tstamp 85160567-bb87-4611-8e73-661b9eaee2dc)) (via (at 125.21 110.2) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 43) (tstamp 1c3cb764-389f-4f1e-a9d3-184b81d7088e)) (segment (start 126.1 110.2) (end 127.01 111.11) (width 0.127) (layer "B.Cu") (net 43) (tstamp 80416a7a-edc5-4d74-a09a-c2af3eb3acfc)) (segment (start 125.21 110.2) (end 126.1 110.2) (width 0.127) (layer "B.Cu") (net 43) (tstamp 92fb8662-eed3-4929-b336-21ff5d4b0d00)) @@ -19160,12 +19161,12 @@ (segment (start 107 101.45) (end 107 100.38) (width 0.2032) (layer "B.Cu") (net 148) (tstamp fb6ef884-958f-43c2-bed1-41d2c2f94213)) (segment (start 108.05 101.8) (end 108.05 102.84) (width 0.2032) (layer "B.Cu") (net 149) (tstamp 4f218e8c-8452-4c14-a6fd-125987671efb)) (segment (start 108.05 102.84) (end 107.99 102.9) (width 0.2032) (layer "B.Cu") (net 149) (tstamp 56211002-1c38-448c-8c40-84a818f41acf)) - (segment (start 114.92 94.74) (end 115.28 95.1) (width 0.127) (layer "B.Cu") (net 150) (tstamp 1028f9cf-fb59-4656-8993-502b7476ef44)) - (segment (start 113.4 95.45) (end 113.4 95.25) (width 0.127) (layer "B.Cu") (net 150) (tstamp 2234d35c-a720-4948-8eac-9274db6ef4a5)) + (segment (start 113.4 95.45) (end 113.4 94.88) (width 0.127) (layer "B.Cu") (net 150) (tstamp 1edd6a1e-69fb-4f28-8b20-af054e7fd562)) (segment (start 115.28 95.1) (end 115.31 95.1) (width 0.127) (layer "B.Cu") (net 150) (tstamp 3f91f7d4-1e65-4b9f-8aba-3c78b7c5052c)) - (segment (start 113.4 95.25) (end 113.91 94.74) (width 0.127) (layer "B.Cu") (net 150) (tstamp 74f22221-9b82-41ae-be84-0877401cbac5)) - (segment (start 113.91 94.74) (end 114.92 94.74) (width 0.127) (layer "B.Cu") (net 150) (tstamp b7d6c04f-85b7-453a-9d59-730d6b8b5133)) + (segment (start 113.4 94.88) (end 113.92 94.36) (width 0.127) (layer "B.Cu") (net 150) (tstamp 5beeb2e7-8fca-4f41-a52f-b0c48167dab0)) + (segment (start 113.92 94.36) (end 114.54 94.36) (width 0.127) (layer "B.Cu") (net 150) (tstamp 635bfb66-1db7-4ef3-ae59-1626e3f16efa)) (segment (start 115.31 95.1) (end 116.3 94.11) (width 0.127) (layer "B.Cu") (net 150) (tstamp cdbbf5e1-6fe0-43a7-b7cc-db88a856171c)) + (segment (start 114.54 94.36) (end 115.28 95.1) (width 0.127) (layer "B.Cu") (net 150) (tstamp f843642a-c64f-4026-ba89-277799bf4484)) (segment (start 110.85 99.4) (end 111.36 98.89) (width 0.2032) (layer "B.Cu") (net 151) (tstamp 2dd5cb2b-0a82-4b1c-a298-902635c60ad0)) (segment (start 111.36 96.02) (end 111.93 95.45) (width 0.2032) (layer "B.Cu") (net 151) (tstamp 86e7f1bc-08c2-415d-bacb-e6b3ebfe4c1f)) (segment (start 111.93 95.45) (end 112.75 95.45) (width 0.2032) (layer "B.Cu") (net 151) (tstamp a595918c-16b1-430d-81ff-c96f117f41bd)) @@ -25022,9 +25023,6 @@ (xy 106.598627 113.414231) (xy 106.598627 113.414228) (xy 106.600081 113.408441) - (xy 106.600765 113.277859) - (xy 106.600938 113.244861) - (xy 106.600938 113.244859) (xy 106.600969 113.238895) (xy 106.596858 113.221768) (xy 106.562781 113.079835) @@ -25034,7 +25032,7 @@ (xy 106.486362 112.928673) (xy 106.483625 112.923369) (xy 106.372169 112.795604) - (xy 106.31191 112.753253) + (xy 106.307993 112.7505) (xy 106.238335 112.701544) (xy 106.238334 112.701544) (xy 106.233453 112.698113) @@ -25056,9 +25054,9 @@ (xy 104.72056 112.917279) (xy 104.71777 112.922549) (xy 104.717769 112.92255) - (xy 104.714526 112.928675) + (xy 104.716439 112.925062) (xy 104.641224 113.067119) - (xy 104.63977 113.072909) + (xy 104.63803 113.079835) (xy 104.602311 113.222038) (xy 104.599919 113.231559) (xy 104.599031 113.401105) @@ -25292,7 +25290,7 @@ (xy 105.585126 95.972275) (xy 105.585125 95.972274) (xy 105.582533 95.967784) - (xy 105.566199 95.949643) + (xy 105.512801 95.890339) (xy 105.459341 95.830965) (xy 105.459337 95.830962) (xy 105.455871 95.827112) @@ -25430,7 +25428,7 @@ (xy 106.24727 95.784151) (xy 106.252002 95.786258) (xy 106.252004 95.786259) - (xy 106.410851 95.856983) + (xy 106.414043 95.858404) (xy 106.420197 95.861144) (xy 106.425267 95.862222) (xy 106.425268 95.862222) @@ -25441,7 +25439,7 @@ (xy 106.974732 95.862222) (xy 106.974733 95.862222) (xy 106.979803 95.861144) - (xy 106.989149 95.856983) + (xy 106.985957 95.858404) (xy 107.147996 95.786259) (xy 107.147998 95.786258) (xy 107.15273 95.784151) @@ -25461,7 +25459,7 @@ (xy 109.009641 95.264) (xy 109.067832 95.282907) (xy 109.079643 95.292995) - (xy 109.114974 95.328327) + (xy 109.119055 95.332408) (xy 109.148046 95.361399) (xy 109.160354 95.376395) (xy 109.169667 95.390333) @@ -25728,7 +25726,7 @@ (xy 108.743808 112.18225) (xy 108.836696 112.303304) (xy 108.95775 112.396192) - (xy 109.000438 112.413874) + (xy 108.969027 112.400863) (xy 109.080048 112.44685) (xy 109.126574 112.486587) (xy 109.140857 112.546082) @@ -25743,9 +25741,9 @@ (xy 108.65056 112.917279) (xy 108.64777 112.922549) (xy 108.647769 112.92255) - (xy 108.644526 112.928675) + (xy 108.646439 112.925062) (xy 108.571224 113.067119) - (xy 108.56977 113.072909) + (xy 108.56803 113.079835) (xy 108.532311 113.222038) (xy 108.529919 113.231559) (xy 108.529031 113.401105) @@ -25897,9 +25895,6 @@ (xy 159.398627 113.414231) (xy 159.398627 113.414228) (xy 159.400081 113.408441) - (xy 159.400765 113.277859) - (xy 159.400938 113.244861) - (xy 159.400938 113.244859) (xy 159.400969 113.238895) (xy 159.396858 113.221768) (xy 159.362781 113.079835) @@ -25909,7 +25904,7 @@ (xy 159.286362 112.928673) (xy 159.283625 112.923369) (xy 159.172169 112.795604) - (xy 159.11191 112.753253) + (xy 159.107993 112.7505) (xy 159.038335 112.701544) (xy 159.038334 112.701544) (xy 159.033453 112.698113) @@ -25931,16 +25926,13 @@ (xy 157.52056 112.917279) (xy 157.51777 112.922549) (xy 157.517769 112.92255) - (xy 157.514526 112.928675) + (xy 157.516439 112.925062) (xy 157.441224 113.067119) - (xy 157.43977 113.072909) + (xy 157.43803 113.079835) (xy 157.402311 113.222038) (xy 157.399919 113.231559) (xy 157.399031 113.401105) (xy 155.470119 113.401105) - (xy 155.470765 113.277859) - (xy 155.470938 113.244861) - (xy 155.470938 113.244859) (xy 155.470969 113.238895) (xy 155.466858 113.221768) (xy 155.432781 113.079835) @@ -25950,7 +25942,7 @@ (xy 155.356362 112.928673) (xy 155.353625 112.923369) (xy 155.242169 112.795604) - (xy 155.18191 112.753253) + (xy 155.177993 112.7505) (xy 155.108335 112.701544) (xy 155.108334 112.701544) (xy 155.103453 112.698113) @@ -26823,61 +26815,6 @@ (xy 114.944285 93.004648) (xy 114.989665 93.059248) (xy 115 93.109224) - (xy 115 94.949275) - (xy 114.979998 95.017396) - (xy 114.926342 95.063889) - (xy 114.856068 95.073993) - (xy 114.819718 95.060354) - (xy 114.818874 95.062181) - (xy 114.81073 95.058418) - (xy 114.803194 95.053533) - (xy 114.794592 95.05096) - (xy 114.794589 95.050959) - (xy 114.693158 95.020625) - (xy 114.693159 95.020625) - (xy 114.684555 95.018052) - (xy 114.675579 95.017997) - (xy 114.675578 95.017997) - (xy 114.623464 95.017679) - (xy 114.560727 95.017296) - (xy 114.552096 95.019763) - (xy 114.552094 95.019763) - (xy 114.450294 95.048857) - (xy 114.450291 95.048859) - (xy 114.441664 95.051324) - (xy 114.434077 95.056111) - (xy 114.434075 95.056112) - (xy 114.347361 95.110825) - (xy 114.336937 95.117402) - (xy 114.254965 95.210217) - (xy 114.25115 95.218343) - (xy 114.221746 95.280973) - (xy 114.202339 95.322308) - (xy 114.200958 95.331176) - (xy 114.200958 95.331177) - (xy 114.184669 95.435791) - (xy 114.184669 95.435795) - (xy 114.183288 95.444664) - (xy 114.184452 95.453566) - (xy 114.184452 95.453569) - (xy 114.191316 95.506056) - (xy 114.199344 95.567449) - (xy 114.249216 95.680793) - (xy 114.328895 95.775583) - (xy 114.431976 95.8442) - (xy 114.550173 95.881127) - (xy 114.673982 95.883396) - (xy 114.692124 95.87845) - (xy 114.784793 95.853186) - (xy 114.784795 95.853185) - (xy 114.793452 95.850825) - (xy 114.801099 95.84613) - (xy 114.801103 95.846128) - (xy 114.808072 95.841849) - (xy 114.876589 95.823251) - (xy 114.944285 95.844648) - (xy 114.989665 95.899248) - (xy 115 95.949224) (xy 115 96.419932) (xy 114.979998 96.488053) (xy 114.963095 96.509027) @@ -27066,21 +27003,81 @@ (xy 110.7009 95.145264) (xy 110.72999 95.142406) (xy 110.783982 95.143396) - (xy 110.792646 95.141034) + (xy 110.810997 95.136031) (xy 110.894793 95.113186) (xy 110.894795 95.113185) (xy 110.903452 95.110825) - (xy 110.963439 95.073993) - (xy 111.001331 95.050727) (xy 111.008979 95.046031) - (xy 111.015003 95.039376) + (xy 111.030212 95.022573) (xy 111.08605 94.960885) (xy 111.086051 94.960883) (xy 111.092078 94.954225) - (xy 111.102459 94.9328) + (xy 111.098551 94.940866) (xy 111.142155 94.850866) (xy 111.142155 94.850865) (xy 111.14607 94.842785) + (xy 111.154166 94.794664) + (xy 113.753288 94.794664) + (xy 113.754452 94.803566) + (xy 113.754452 94.803569) + (xy 113.760637 94.850866) + (xy 113.769344 94.917449) + (xy 113.819216 95.030793) + (xy 113.898895 95.125583) + (xy 114.001976 95.1942) + (xy 114.120173 95.231127) + (xy 114.243982 95.233396) + (xy 114.262124 95.22845) + (xy 114.354793 95.203186) + (xy 114.354795 95.203185) + (xy 114.363452 95.200825) + (xy 114.468979 95.136031) + (xy 114.48466 95.118707) + (xy 114.54605 95.050885) + (xy 114.546051 95.050883) + (xy 114.552078 95.044225) + (xy 114.562569 95.022573) + (xy 114.602155 94.940866) + (xy 114.602155 94.940865) + (xy 114.60607 94.932785) + (xy 114.617449 94.865152) + (xy 114.625809 94.815464) + (xy 114.625809 94.815459) + (xy 114.626615 94.810671) + (xy 114.626745 94.8) + (xy 114.613409 94.706877) + (xy 114.610463 94.686307) + (xy 114.610462 94.686305) + (xy 114.60919 94.67742) + (xy 114.557937 94.564695) + (xy 114.477105 94.470885) + (xy 114.373194 94.403533) + (xy 114.364592 94.40096) + (xy 114.364589 94.400959) + (xy 114.263158 94.370625) + (xy 114.263159 94.370625) + (xy 114.254555 94.368052) + (xy 114.245579 94.367997) + (xy 114.245578 94.367997) + (xy 114.193464 94.367679) + (xy 114.130727 94.367296) + (xy 114.122096 94.369763) + (xy 114.122094 94.369763) + (xy 114.020294 94.398857) + (xy 114.020291 94.398859) + (xy 114.011664 94.401324) + (xy 114.004077 94.406111) + (xy 114.004075 94.406112) + (xy 113.945952 94.442785) + (xy 113.906937 94.467402) + (xy 113.824965 94.560217) + (xy 113.772339 94.672308) + (xy 113.770958 94.681176) + (xy 113.770958 94.681177) + (xy 113.754669 94.785791) + (xy 113.754669 94.785795) + (xy 113.753288 94.794664) + (xy 111.154166 94.794664) (xy 111.162792 94.743396) (xy 111.165809 94.725464) (xy 111.165809 94.725459) @@ -27099,6 +27096,9 @@ (xy 112.315381 94.320671) (xy 112.329344 94.427449) (xy 112.379216 94.540793) + (xy 112.384993 94.547666) + (xy 112.384994 94.547667) + (xy 112.411542 94.57925) (xy 112.458895 94.635583) (xy 112.561976 94.7042) (xy 112.680173 94.741127) @@ -31372,7 +31372,7 @@ (xy 154.337265 112.467088) (xy 154.281191 112.4845) (xy 154.174646 112.4845) - (xy 154.14819 112.487374) + (xy 154.154376 112.486702) (xy 154.044856 112.498599) (xy 154.044851 112.4986) (xy 154.039531 112.499178) @@ -31388,17 +31388,17 @@ (xy 153.343077 112.694655) (xy 153.33816 112.698035) (xy 153.338157 112.698036) - (xy 153.225769 112.775279) + (xy 153.270755 112.744361) (xy 153.203349 112.790688) (xy 153.09056 112.917279) (xy 153.08777 112.922549) (xy 153.087769 112.92255) (xy 153.084526 112.928675) (xy 153.011224 113.067119) - (xy 153.000683 113.109085) + (xy 152.995967 113.127859) (xy 152.978417 113.197729) (xy 152.969919 113.231559) - (xy 152.9697 113.273385) + (xy 152.969674 113.278334) (xy 152.969149 113.378664) (xy 152.969031 113.401105) (xy 153.008612 113.565968) @@ -34511,7 +34511,7 @@ (xy 134.374681 113.366314) (xy 134.37468 113.366313) (xy 134.37176 113.35989) - (xy 134.302676 113.279713) + (xy 134.299333 113.275833) (xy 134.296132 113.272118) (xy 134.296131 113.272117) (xy 134.291527 113.266774) @@ -34578,7 +34578,7 @@ (xy 132.161589 113.366314) (xy 132.161588 113.366313) (xy 132.158668 113.35989) - (xy 132.089584 113.279713) + (xy 132.086241 113.275833) (xy 132.08304 113.272118) (xy 132.083039 113.272117) (xy 132.078435 113.266774) @@ -34610,26 +34610,26 @@ (xy 111.028627 113.414231) (xy 111.028627 113.414228) (xy 111.030081 113.408441) - (xy 111.030784 113.27417) + (xy 111.030753 113.280189) (xy 111.030938 113.244861) (xy 111.030938 113.244859) (xy 111.030969 113.238895) - (xy 111.02577 113.217237) + (xy 111.022534 113.203759) (xy 110.992781 113.079835) (xy 110.991388 113.074032) - (xy 110.947804 112.989589) + (xy 110.942157 112.978648) (xy 110.916364 112.928675) (xy 110.916362 112.928673) (xy 110.913625 112.923369) (xy 110.802169 112.795604) - (xy 110.759067 112.765311) + (xy 110.729258 112.744361) (xy 110.668335 112.701544) (xy 110.668334 112.701544) (xy 110.663453 112.698113) (xy 110.505487 112.636524) (xy 110.499572 112.635745) (xy 110.499571 112.635745) - (xy 110.382289 112.620305) + (xy 110.379387 112.619923) (xy 110.376174 112.6195) (xy 110.272222 112.6195) (xy 110.220938 112.605182) @@ -34640,6 +34640,8 @@ (xy 110.055703 112.526677) (xy 110.055701 112.526676) (xy 110.050841 112.52441) + (xy 110.028799 112.519483) + (xy 109.945603 112.500887) (xy 109.873682 112.484811) (xy 109.869573 112.484581) (xy 109.869504 112.484577) @@ -34660,300 +34662,139 @@ (xy 112.867434 112.101702) (xy 112.86938 112.11658) (xy 112.882457 112.21658) - (xy 112.885295 112.223031) - (xy 112.885296 112.223033) - (xy 112.887959 112.229085) (xy 112.93196 112.329085) - (xy 112.943167 112.342417) + (xy 112.963438 112.366533) (xy 113.006511 112.417775) (xy 113.006514 112.417777) (xy 113.01105 112.423174) + (xy 113.103295 112.484577) (xy 113.113368 112.491282) - (xy 113.120096 112.493384) - (xy 113.120098 112.493385) - (xy 113.150884 112.503003) - (xy 113.227476 112.526932) - (xy 113.27738 112.562332) - (xy 113.296947 112.620305) - (xy 113.287568 112.6635) - (xy 113.245429 112.753253) - (xy 113.244344 112.760224) - (xy 113.244343 112.760226) - (xy 113.236914 112.807939) - (xy 113.226519 112.874704) - (xy 113.227434 112.881701) - (xy 113.227434 112.881702) - (xy 113.231504 112.912826) - (xy 113.242457 112.99658) - (xy 113.29196 113.109085) - (xy 113.331256 113.155833) - (xy 113.366511 113.197775) - (xy 113.366514 113.197777) - (xy 113.37105 113.203174) - (xy 113.473368 113.271282) - (xy 113.480096 113.273384) - (xy 113.480098 113.273385) - (xy 113.552926 113.296138) - (xy 113.590689 113.307936) - (xy 113.652136 113.309063) - (xy 113.706529 113.31006) - (xy 113.706531 113.31006) - (xy 113.713583 113.310189) - (xy 113.720386 113.308334) - (xy 113.720388 113.308334) - (xy 113.81121 113.283573) - (xy 113.832169 113.277859) - (xy 113.936914 113.213545) - (xy 113.947132 113.202257) - (xy 114.014664 113.127648) - (xy 114.019399 113.122417) - (xy 114.072991 113.011802) - (xy 114.086977 112.928675) - (xy 114.09275 112.894361) - (xy 114.09275 112.89436) - (xy 114.093384 112.890592) - (xy 114.093513 112.88) - (xy 114.076088 112.758327) - (xy 114.048675 112.698036) - (xy 114.028135 112.65286) - (xy 114.028134 112.652859) - (xy 114.025214 112.646436) - (xy 113.944981 112.55332) - (xy 113.939064 112.549485) - (xy 113.939062 112.549483) - (xy 113.84776 112.490305) - (xy 113.847758 112.490304) - (xy 113.841838 112.486467) - (xy 113.77204 112.465593) - (xy 113.732976 112.45391) - (xy 113.682642 112.419122) - (xy 113.662369 112.361393) - (xy 113.672248 112.315896) - (xy 113.712991 112.231802) - (xy 113.729816 112.131802) - (xy 113.73275 112.114361) - (xy 113.73275 112.114359) - (xy 113.733384 112.110592) - (xy 113.733513 112.1) - (xy 113.718433 111.994704) - (xy 115.866519 111.994704) - (xy 115.867434 112.001701) - (xy 115.867434 112.001702) - (xy 115.871768 112.034844) - (xy 115.882457 112.11658) - (xy 115.93196 112.229085) - (xy 115.969651 112.273924) - (xy 116.006511 112.317775) - (xy 116.006514 112.317777) - (xy 116.01105 112.323174) - (xy 116.113368 112.391282) - (xy 116.120096 112.393384) - (xy 116.120098 112.393385) - (xy 116.192782 112.416093) - (xy 116.230689 112.427936) - (xy 116.292136 112.429063) - (xy 116.346529 112.43006) - (xy 116.346531 112.43006) - (xy 116.353583 112.430189) - (xy 116.360386 112.428334) - (xy 116.360388 112.428334) - (xy 116.452138 112.40332) - (xy 116.472169 112.397859) - (xy 116.576914 112.333545) - (xy 116.659399 112.242417) - (xy 116.712991 112.131802) - (xy 116.715926 112.114359) - (xy 116.719233 112.094704) - (xy 118.866519 112.094704) - (xy 118.867434 112.101701) - (xy 118.867434 112.101702) - (xy 118.86938 112.11658) - (xy 118.882457 112.21658) - (xy 118.885295 112.223031) - (xy 118.885296 112.223033) - (xy 118.887959 112.229085) - (xy 118.93196 112.329085) - (xy 118.943167 112.342417) - (xy 119.006511 112.417775) - (xy 119.006514 112.417777) - (xy 119.01105 112.423174) - (xy 119.113368 112.491282) - (xy 119.120096 112.493384) - (xy 119.120098 112.493385) - (xy 119.174506 112.510383) - (xy 119.22441 112.545784) - (xy 119.243977 112.603756) - (xy 119.242804 112.62011) - (xy 119.239911 112.638692) - (xy 119.226519 112.724704) - (xy 119.227434 112.731701) - (xy 119.227434 112.731702) - (xy 119.229418 112.74687) - (xy 119.242457 112.84658) - (xy 119.245295 112.853031) - (xy 119.245296 112.853033) - (xy 119.257162 112.88) - (xy 119.29196 112.959085) - (xy 119.323478 112.99658) - (xy 119.366511 113.047775) - (xy 119.366514 113.047777) - (xy 119.37105 113.053174) - (xy 119.473368 113.121282) - (xy 119.480096 113.123384) - (xy 119.480098 113.123385) - (xy 119.519241 113.135614) - (xy 119.590689 113.157936) - (xy 119.652136 113.159062) - (xy 119.706529 113.16006) - (xy 119.706531 113.16006) - (xy 119.713583 113.160189) - (xy 119.720386 113.158334) - (xy 119.720388 113.158334) - (xy 119.803724 113.135614) - (xy 119.832169 113.127859) - (xy 119.936914 113.063545) - (xy 120.019399 112.972417) - (xy 120.072991 112.861802) - (xy 120.083372 112.800101) - (xy 120.09275 112.744361) - (xy 120.09275 112.74436) - (xy 120.093384 112.740592) - (xy 120.093513 112.73) - (xy 120.076088 112.608327) - (xy 120.054042 112.55984) - (xy 120.028135 112.50286) - (xy 120.028134 112.502859) - (xy 120.025214 112.496436) - (xy 119.968133 112.430189) - (xy 119.949586 112.408664) - (xy 119.949585 112.408663) - (xy 119.944981 112.40332) - (xy 119.939064 112.399485) - (xy 119.939062 112.399483) - (xy 119.84776 112.340305) - (xy 119.847758 112.340304) - (xy 119.841838 112.336467) - (xy 119.835078 112.334445) - (xy 119.835075 112.334444) - (xy 119.795567 112.322629) - (xy 119.786167 112.319818) - (xy 119.735833 112.285031) - (xy 119.715559 112.227302) - (xy 119.716904 112.208544) - (xy 119.73275 112.114361) - (xy 119.73275 112.114359) - (xy 119.733384 112.110592) - (xy 119.733513 112.1) - (xy 119.732755 112.094704) - (xy 121.866519 112.094704) - (xy 121.867434 112.101701) - (xy 121.867434 112.101702) - (xy 121.86938 112.11658) - (xy 121.882457 112.21658) - (xy 121.885295 112.223031) - (xy 121.885296 112.223033) - (xy 121.887959 112.229085) - (xy 121.93196 112.329085) - (xy 121.943167 112.342417) - (xy 122.006511 112.417775) - (xy 122.006514 112.417777) - (xy 122.01105 112.423174) - (xy 122.113368 112.491282) - (xy 122.120096 112.493384) - (xy 122.120098 112.493385) - (xy 122.184041 112.513362) - (xy 122.230689 112.527936) - (xy 122.292136 112.529062) - (xy 122.346529 112.53006) - (xy 122.346531 112.53006) - (xy 122.353583 112.530189) - (xy 122.360386 112.528334) - (xy 122.360388 112.528334) - (xy 122.426231 112.510383) - (xy 122.472169 112.497859) - (xy 122.576914 112.433545) - (xy 122.585643 112.423902) - (xy 122.654664 112.347648) - (xy 122.659399 112.342417) - (xy 122.712991 112.231802) - (xy 122.729816 112.131802) - (xy 122.73275 112.114361) - (xy 122.73275 112.114359) - (xy 122.733384 112.110592) - (xy 122.733513 112.1) - (xy 122.732755 112.094704) - (xy 124.866519 112.094704) - (xy 124.867434 112.101701) - (xy 124.867434 112.101702) - (xy 124.86938 112.11658) - (xy 124.882457 112.21658) - (xy 124.885295 112.223031) - (xy 124.885296 112.223033) - (xy 124.887959 112.229085) - (xy 124.93196 112.329085) - (xy 124.943167 112.342417) - (xy 125.006511 112.417775) - (xy 125.006514 112.417777) - (xy 125.01105 112.423174) - (xy 125.113368 112.491282) - (xy 125.120095 112.493384) - (xy 125.1201 112.493386) - (xy 125.184041 112.513362) - (xy 125.233946 112.548762) - (xy 125.253513 112.606735) - (xy 125.25234 112.623088) - (xy 125.240997 112.695945) - (xy 125.236519 112.724704) - (xy 125.237434 112.731701) - (xy 125.237434 112.731702) - (xy 125.239418 112.74687) - (xy 125.252457 112.84658) - (xy 125.255295 112.853031) - (xy 125.255296 112.853033) - (xy 125.267162 112.88) - (xy 125.30196 112.959085) - (xy 125.333478 112.99658) - (xy 125.376511 113.047775) - (xy 125.376514 113.047777) - (xy 125.38105 113.053174) - (xy 125.483368 113.121282) - (xy 125.490096 113.123384) - (xy 125.490098 113.123385) - (xy 125.529241 113.135614) - (xy 125.600689 113.157936) - (xy 125.662136 113.159062) - (xy 125.716529 113.16006) - (xy 125.716531 113.16006) - (xy 125.723583 113.160189) - (xy 125.730386 113.158334) - (xy 125.730388 113.158334) - (xy 125.813724 113.135614) - (xy 125.842169 113.127859) - (xy 125.946914 113.063545) - (xy 126.029399 112.972417) - (xy 126.082991 112.861802) - (xy 126.093372 112.800101) - (xy 126.10275 112.744361) - (xy 126.10275 112.74436) - (xy 126.103384 112.740592) - (xy 126.103513 112.73) - (xy 126.086088 112.608327) - (xy 126.064042 112.55984) - (xy 126.038135 112.50286) - (xy 126.038134 112.502859) - (xy 126.035214 112.496436) - (xy 125.978133 112.430189) - (xy 125.959586 112.408664) - (xy 125.959585 112.408663) - (xy 125.954981 112.40332) - (xy 125.949064 112.399485) - (xy 125.949062 112.399483) - (xy 125.85776 112.340305) - (xy 125.857758 112.340304) - (xy 125.851838 112.336467) - (xy 125.796168 112.319818) - (xy 125.786645 112.31697) - (xy 125.742998 112.286804) + (xy 113.112687 112.492306) + (xy 113.151865 112.52949) + (xy 113.16301 112.589652) + (xy 113.154472 112.618796) + (xy 113.105429 112.723253) + (xy 113.104344 112.730224) + (xy 113.104343 112.730226) + (xy 113.102142 112.744361) + (xy 113.086519 112.844704) + (xy 113.087434 112.851701) + (xy 113.087434 112.851702) + (xy 113.089374 112.866533) + (xy 113.102457 112.96658) + (xy 113.15196 113.079085) + (xy 113.163167 113.092417) + (xy 113.226511 113.167775) + (xy 113.226514 113.167777) + (xy 113.23105 113.173174) + (xy 113.333368 113.241282) + (xy 113.340096 113.243384) + (xy 113.340098 113.243385) + (xy 113.403897 113.263317) + (xy 113.450689 113.277936) + (xy 113.512136 113.279063) + (xy 113.566529 113.28006) + (xy 113.566531 113.28006) + (xy 113.573583 113.280189) + (xy 113.580386 113.278334) + (xy 113.580388 113.278334) + (xy 113.649272 113.259554) + (xy 113.692169 113.247859) + (xy 113.796914 113.183545) + (xy 113.812896 113.165889) + (xy 113.851368 113.123385) + (xy 113.879399 113.092417) + (xy 113.932991 112.981802) + (xy 113.949165 112.885671) + (xy 113.95275 112.864361) + (xy 113.95275 112.86436) + (xy 113.953384 112.860592) + (xy 113.953513 112.85) + (xy 113.936088 112.728327) + (xy 113.934441 112.724704) + (xy 118.866519 112.724704) + (xy 118.867434 112.731701) + (xy 118.867434 112.731702) + (xy 118.86922 112.745361) + (xy 118.882457 112.84658) + (xy 118.885295 112.853031) + (xy 118.885296 112.853033) + (xy 118.888622 112.860592) + (xy 118.93196 112.959085) + (xy 118.951056 112.981802) + (xy 119.006511 113.047775) + (xy 119.006514 113.047777) + (xy 119.01105 113.053174) + (xy 119.113368 113.121282) + (xy 119.120096 113.123384) + (xy 119.120098 113.123385) + (xy 119.159241 113.135614) + (xy 119.230689 113.157936) + (xy 119.292136 113.159062) + (xy 119.346529 113.16006) + (xy 119.346531 113.16006) + (xy 119.353583 113.160189) + (xy 119.360386 113.158334) + (xy 119.360388 113.158334) + (xy 119.443724 113.135614) + (xy 119.472169 113.127859) + (xy 119.576914 113.063545) + (xy 119.659399 112.972417) + (xy 119.712991 112.861802) + (xy 119.723372 112.800101) + (xy 119.73275 112.744361) + (xy 119.73275 112.74436) + (xy 119.733384 112.740592) + (xy 119.733513 112.73) + (xy 119.732898 112.725704) + (xy 124.417519 112.725704) + (xy 124.418434 112.732701) + (xy 124.418434 112.732702) + (xy 124.423889 112.774416) + (xy 124.433457 112.84758) + (xy 124.436295 112.854031) + (xy 124.436296 112.854033) + (xy 124.440155 112.862802) + (xy 124.48296 112.960085) + (xy 124.522505 113.00713) + (xy 124.557511 113.048775) + (xy 124.557514 113.048777) + (xy 124.56205 113.054174) + (xy 124.664368 113.122282) + (xy 124.671096 113.124384) + (xy 124.671098 113.124385) + (xy 124.748212 113.148477) + (xy 124.781689 113.158936) + (xy 124.843 113.16006) + (xy 124.897529 113.16106) + (xy 124.897531 113.16106) + (xy 124.904583 113.161189) + (xy 124.911386 113.159334) + (xy 124.911388 113.159334) + (xy 124.975993 113.141721) + (xy 125.023169 113.128859) + (xy 125.127914 113.064545) + (xy 125.143094 113.047775) + (xy 125.205664 112.978648) + (xy 125.210399 112.973417) + (xy 125.263991 112.862802) + (xy 125.267728 112.840589) + (xy 125.28375 112.745361) + (xy 125.28375 112.74536) + (xy 125.284384 112.741592) + (xy 125.284513 112.731) + (xy 125.283755 112.725704) + (xy 125.271622 112.640983) + (xy 125.282089 112.5807) + (xy 125.325991 112.538082) + (xy 125.352492 112.530169) + (xy 125.353583 112.530189) + (xy 125.472169 112.497859) + (xy 125.576914 112.433545) + (xy 125.585643 112.423902) + (xy 125.648094 112.354907) + (xy 125.659399 112.342417) + (xy 125.686343 112.286804) (xy 130.966519 112.286804) (xy 130.967434 112.293801) (xy 130.967434 112.293802) @@ -34963,7 +34804,7 @@ (xy 130.985296 112.415133) (xy 130.991096 112.428314) (xy 131.03196 112.521185) - (xy 131.064453 112.55984) + (xy 131.062132 112.557079) (xy 131.106511 112.609875) (xy 131.106514 112.609877) (xy 131.11105 112.615274) @@ -34981,7 +34822,7 @@ (xy 131.54226 112.698113) (xy 131.572169 112.689959) (xy 131.676914 112.625645) - (xy 131.69259 112.608327) + (xy 131.683114 112.618796) (xy 131.754664 112.539748) (xy 131.759399 112.534517) (xy 131.812991 112.423902) @@ -35056,13 +34897,13 @@ (xy 130.985429 112.165353) (xy 130.984344 112.172324) (xy 130.984343 112.172326) - (xy 130.975506 112.229085) + (xy 130.978543 112.209578) (xy 130.966519 112.286804) - (xy 125.742998 112.286804) - (xy 125.736311 112.282182) - (xy 125.716038 112.224453) - (xy 125.717383 112.205695) - (xy 125.720462 112.187399) + (xy 125.686343 112.286804) + (xy 125.712991 112.231802) + (xy 125.729816 112.131802) + (xy 125.73275 112.114361) + (xy 125.73275 112.11436) (xy 125.733384 112.110592) (xy 125.733513 112.1) (xy 125.716088 111.978327) @@ -35093,7 +34934,79 @@ (xy 124.884343 111.980226) (xy 124.880215 112.006741) (xy 124.866519 112.094704) - (xy 122.732755 112.094704) + (xy 124.867434 112.101701) + (xy 124.867434 112.101702) + (xy 124.879148 112.191277) + (xy 124.867946 112.251428) + (xy 124.823527 112.293507) + (xy 124.796673 112.301526) + (xy 124.792166 112.301498) + (xy 124.752852 112.312734) + (xy 124.680763 112.333337) + (xy 124.680761 112.333338) + (xy 124.673983 112.335275) + (xy 124.570032 112.400863) + (xy 124.488667 112.492991) + (xy 124.436429 112.604253) + (xy 124.435344 112.611224) + (xy 124.435343 112.611226) + (xy 124.431404 112.636524) + (xy 124.417519 112.725704) + (xy 119.732898 112.725704) + (xy 119.716088 112.608327) + (xy 119.684149 112.538082) + (xy 119.668135 112.50286) + (xy 119.668134 112.502859) + (xy 119.665214 112.496436) + (xy 119.651462 112.480476) + (xy 119.627801 112.424051) + (xy 119.641825 112.364494) + (xy 119.653063 112.349417) + (xy 119.654664 112.347649) + (xy 119.654666 112.347646) + (xy 119.659399 112.342417) + (xy 119.712991 112.231802) + (xy 119.729816 112.131802) + (xy 119.73275 112.114361) + (xy 119.73275 112.11436) + (xy 119.733384 112.110592) + (xy 119.733513 112.1) + (xy 119.732755 112.094704) + (xy 121.866519 112.094704) + (xy 121.867434 112.101701) + (xy 121.867434 112.101702) + (xy 121.86938 112.11658) + (xy 121.882457 112.21658) + (xy 121.93196 112.329085) + (xy 121.963438 112.366533) + (xy 122.006511 112.417775) + (xy 122.006514 112.417777) + (xy 122.01105 112.423174) + (xy 122.061066 112.456467) + (xy 122.106488 112.486702) + (xy 122.113368 112.491282) + (xy 122.120096 112.493384) + (xy 122.120098 112.493385) + (xy 122.188416 112.514729) + (xy 122.230689 112.527936) + (xy 122.292136 112.529062) + (xy 122.346529 112.53006) + (xy 122.346531 112.53006) + (xy 122.353583 112.530189) + (xy 122.360386 112.528334) + (xy 122.360388 112.528334) + (xy 122.461062 112.500887) + (xy 122.472169 112.497859) + (xy 122.576914 112.433545) + (xy 122.585643 112.423902) + (xy 122.648094 112.354907) + (xy 122.659399 112.342417) + (xy 122.712991 112.231802) + (xy 122.729816 112.131802) + (xy 122.73275 112.114361) + (xy 122.73275 112.11436) + (xy 122.733384 112.110592) + (xy 122.733513 112.1) (xy 122.716088 111.978327) (xy 122.665214 111.866436) (xy 122.606191 111.797936) @@ -35151,7 +35064,71 @@ (xy 118.884343 111.980226) (xy 118.880215 112.006741) (xy 118.866519 112.094704) - (xy 116.719233 112.094704) + (xy 118.867434 112.101701) + (xy 118.867434 112.101702) + (xy 118.86938 112.11658) + (xy 118.882457 112.21658) + (xy 118.93196 112.329085) + (xy 118.936498 112.334484) + (xy 118.936499 112.334485) + (xy 118.950013 112.350562) + (xy 118.972983 112.407273) + (xy 118.958232 112.466653) + (xy 118.948436 112.479797) + (xy 118.942338 112.486702) + (xy 118.937667 112.491991) + (xy 118.885429 112.603253) + (xy 118.884344 112.610224) + (xy 118.884343 112.610226) + (xy 118.879911 112.638692) + (xy 118.866519 112.724704) + (xy 113.934441 112.724704) + (xy 113.885214 112.616436) + (xy 113.8109 112.530189) + (xy 113.809586 112.528664) + (xy 113.809585 112.528663) + (xy 113.804981 112.52332) + (xy 113.799064 112.519485) + (xy 113.799062 112.519483) + (xy 113.701838 112.456467) + (xy 113.703511 112.453886) + (xy 113.668221 112.421216) + (xy 113.656329 112.361197) + (xy 113.665539 112.329745) + (xy 113.712991 112.231802) + (xy 113.729816 112.131802) + (xy 113.73275 112.114361) + (xy 113.73275 112.11436) + (xy 113.733384 112.110592) + (xy 113.733513 112.1) + (xy 113.718433 111.994704) + (xy 115.866519 111.994704) + (xy 115.867434 112.001701) + (xy 115.867434 112.001702) + (xy 115.871768 112.034844) + (xy 115.882457 112.11658) + (xy 115.93196 112.229085) + (xy 115.969651 112.273924) + (xy 116.006511 112.317775) + (xy 116.006514 112.317777) + (xy 116.01105 112.323174) + (xy 116.113368 112.391282) + (xy 116.120096 112.393384) + (xy 116.120098 112.393385) + (xy 116.192782 112.416093) + (xy 116.230689 112.427936) + (xy 116.292136 112.429063) + (xy 116.346529 112.43006) + (xy 116.346531 112.43006) + (xy 116.353583 112.430189) + (xy 116.360386 112.428334) + (xy 116.360388 112.428334) + (xy 116.432478 112.40868) + (xy 116.472169 112.397859) + (xy 116.576914 112.333545) + (xy 116.659399 112.242417) + (xy 116.712991 112.131802) + (xy 116.715925 112.114361) (xy 116.73275 112.014361) (xy 116.73275 112.01436) (xy 116.733384 112.010592) @@ -35347,7 +35324,7 @@ (xy 133.985429 112.165353) (xy 133.984344 112.172324) (xy 133.984343 112.172326) - (xy 133.975506 112.229085) + (xy 133.978543 112.209578) (xy 133.966519 112.286804) (xy 133.967434 112.293801) (xy 133.967434 112.293802) @@ -35357,7 +35334,7 @@ (xy 133.985296 112.415133) (xy 133.991096 112.428314) (xy 134.03196 112.521185) - (xy 134.064453 112.55984) + (xy 134.062132 112.557079) (xy 134.106511 112.609875) (xy 134.106514 112.609877) (xy 134.11105 112.615274) @@ -35375,7 +35352,7 @@ (xy 134.54226 112.698113) (xy 134.572169 112.689959) (xy 134.676914 112.625645) - (xy 134.69259 112.608327) + (xy 134.683114 112.618796) (xy 134.754664 112.539748) (xy 134.759399 112.534517) (xy 134.812991 112.423902) @@ -57523,13 +57500,13 @@ (xy 153.280906 94.881511) (xy 153.266721 94.972618) (xy 153.263288 94.994664) - (xy 153.266253 95.01734) + (xy 153.264794 95.00618) (xy 153.275925 95.0913) (xy 153.279344 95.117449) (xy 153.329216 95.230793) (xy 153.333826 95.236277) (xy 153.333827 95.236279) - (xy 153.3544 95.260753) + (xy 153.346364 95.251193) (xy 153.408895 95.325583) (xy 153.511976 95.3942) (xy 153.630173 95.431127) @@ -65035,7 +65012,7 @@ (xy 129.231919 95.766704) (xy 129.187288 95.861767) (xy 129.182339 95.872308) - (xy 129.180906 95.881511) + (xy 129.181236 95.879393) (xy 129.16743 95.968065) (xy 129.163288 95.994664) (xy 129.164217 96.001767) @@ -65189,7 +65166,7 @@ (xy 130.831919 95.766704) (xy 130.787288 95.861767) (xy 130.782339 95.872308) - (xy 130.780906 95.881511) + (xy 130.781236 95.879393) (xy 130.76743 95.968065) (xy 130.763288 95.994664) (xy 130.764217 96.001767) @@ -65412,7 +65389,7 @@ (xy 134.031919 95.766704) (xy 133.987288 95.861767) (xy 133.982339 95.872308) - (xy 133.980906 95.881511) + (xy 133.981236 95.879393) (xy 133.96743 95.968065) (xy 133.963288 95.994664) (xy 133.964217 96.001767) @@ -65655,7 +65632,7 @@ (xy 145.91919 95.87742) (xy 145.908843 95.854664) (xy 147.523288 95.854664) - (xy 147.526766 95.881258) + (xy 147.524217 95.861767) (xy 147.538117 95.968065) (xy 147.539344 95.977449) (xy 147.589216 96.090793) @@ -65777,7 +65754,7 @@ (xy 147.570289 95.672775) (xy 147.542339 95.732308) (xy 147.536983 95.766706) - (xy 147.52447 95.847075) + (xy 147.525395 95.841134) (xy 147.523288 95.854664) (xy 145.908843 95.854664) (xy 145.888978 95.810973) @@ -65957,7 +65934,7 @@ (xy 136.431919 95.766704) (xy 136.387288 95.861767) (xy 136.382339 95.872308) - (xy 136.380906 95.881511) + (xy 136.381236 95.879393) (xy 136.36743 95.968065) (xy 136.363288 95.994664) (xy 135.635981 95.994664) @@ -65996,7 +65973,7 @@ (xy 136.410315 95.344664) (xy 140.713288 95.344664) (xy 140.714217 95.351767) - (xy 140.72795 95.456787) + (xy 140.727566 95.453851) (xy 140.729344 95.467449) (xy 140.779216 95.580793) (xy 140.783826 95.586277) @@ -66025,7 +66002,7 @@ (xy 141.584745 95.336031) (xy 141.573964 95.260753) (xy 141.56919 95.22742) - (xy 141.523219 95.126312) + (xy 141.524693 95.129553) (xy 141.520904 95.12122) (xy 141.520903 95.121219) (xy 141.517937 95.114695) @@ -66051,8 +66028,8 @@ (xy 140.781919 95.116704) (xy 140.745318 95.194664) (xy 140.732339 95.222308) - (xy 140.726469 95.260007) - (xy 140.715138 95.332785) + (xy 140.727842 95.251193) + (xy 140.714893 95.334358) (xy 140.713288 95.344664) (xy 136.410315 95.344664) (xy 136.412947 95.339232) @@ -66087,7 +66064,7 @@ (xy 149.646815 95.233265) (xy 149.646817 95.233265) (xy 149.653982 95.233396) - (xy 149.742491 95.209266) + (xy 149.737337 95.210671) (xy 149.766538 95.20271) (xy 149.773452 95.200825) (xy 149.779558 95.197076) @@ -66518,7 +66495,7 @@ (xy 132.36449 94.386947) (xy 132.363288 94.394664) (xy 132.364217 94.401767) - (xy 132.3728 94.467402) + (xy 132.373965 94.476312) (xy 132.379344 94.517449) (xy 132.429216 94.630793) (xy 132.433826 94.636277) @@ -66533,12 +66510,12 @@ (xy 132.434965 94.960217) (xy 132.43192 94.966702) (xy 132.431919 94.966704) - (xy 132.398374 95.038154) + (xy 132.395524 95.044225) (xy 132.382339 95.072308) (xy 132.381236 95.079393) (xy 132.367892 95.165097) (xy 132.363288 95.194664) - (xy 132.365381 95.210671) + (xy 132.364217 95.201767) (xy 132.377637 95.304393) (xy 132.379344 95.317449) (xy 132.429216 95.430793) @@ -66555,7 +66532,7 @@ (xy 132.42188 95.74601) (xy 132.359987 95.740105) (xy 132.323809 95.713482) - (xy 132.301659 95.687776) + (xy 132.303385 95.689779) (xy 132.287105 95.670885) (xy 132.183194 95.603533) (xy 132.176329 95.60148) @@ -66577,7 +66554,7 @@ (xy 131.62188 95.74601) (xy 131.559987 95.740105) (xy 131.523809 95.713482) - (xy 131.501659 95.687776) + (xy 131.503385 95.689779) (xy 131.487105 95.670885) (xy 131.487765 95.670316) (xy 131.458957 95.622183) @@ -69275,7 +69252,7 @@ (xy 127.56449 94.386947) (xy 127.563288 94.394664) (xy 127.564217 94.401767) - (xy 127.5728 94.467402) + (xy 127.573965 94.476312) (xy 127.579344 94.517449) (xy 127.629216 94.630793) (xy 127.633826 94.636277) @@ -69312,12 +69289,12 @@ (xy 126.834965 94.960217) (xy 126.83192 94.966702) (xy 126.831919 94.966704) - (xy 126.798374 95.038154) + (xy 126.795524 95.044225) (xy 126.782339 95.072308) (xy 126.781236 95.079393) (xy 126.767892 95.165097) (xy 126.763288 95.194664) - (xy 126.765381 95.210671) + (xy 126.764217 95.201767) (xy 126.777637 95.304393) (xy 126.779344 95.317449) (xy 126.829216 95.430793) @@ -69352,7 +69329,7 @@ (xy 127.631919 95.766704) (xy 127.587288 95.861767) (xy 127.582339 95.872308) - (xy 127.580906 95.881511) + (xy 127.581236 95.879393) (xy 127.56743 95.968065) (xy 127.563288 95.994664) (xy 127.564217 96.001767) @@ -69408,55 +69385,31 @@ (xy 114.390851 96.583622) (xy 114.361185 96.528982) (xy 114.3595 96.510649) - (xy 114.3595 95.958382) - (xy 114.378713 95.899251) - (xy 114.429013 95.862706) - (xy 114.490099 95.862359) - (xy 114.543332 95.87899) - (xy 114.543334 95.87899) - (xy 114.550173 95.881127) - (xy 114.610592 95.882234) - (xy 114.666815 95.883265) - (xy 114.666817 95.883265) - (xy 114.673982 95.883396) - (xy 114.793452 95.850825) - (xy 114.799558 95.847076) - (xy 114.79956 95.847075) - (xy 114.892875 95.789779) - (xy 114.892876 95.789779) - (xy 114.898979 95.786031) - (xy 114.982078 95.694225) - (xy 114.986048 95.686031) - (xy 115.032947 95.589232) - (xy 115.032948 95.589229) - (xy 115.03607 95.582785) - (xy 115.056615 95.460671) - (xy 115.056745 95.45) - (xy 115.054995 95.437776) - (xy 115.045835 95.373818) - (xy 115.03919 95.32742) - (xy 115.008878 95.260753) - (xy 114.990904 95.22122) - (xy 114.990903 95.221219) - (xy 114.987937 95.214695) - (xy 114.907105 95.120885) - (xy 114.803194 95.053533) - (xy 114.796329 95.05148) - (xy 114.796327 95.051479) - (xy 114.691421 95.020105) - (xy 114.691418 95.020105) - (xy 114.684555 95.018052) - (xy 114.67739 95.018008) - (xy 114.677388 95.018008) - (xy 114.623318 95.017678) - (xy 114.560727 95.017296) - (xy 114.553839 95.019265) - (xy 114.553836 95.019265) - (xy 114.487744 95.038154) - (xy 114.42561 95.03593) - (xy 114.376649 94.997608) - (xy 114.3595 94.941427) - (xy 114.3595 94.444664) + (xy 114.3595 95.370692) + (xy 114.358989 95.354412) + (xy 114.357997 95.338631) + (xy 114.356968 95.334369) + (xy 114.356966 95.334358) + (xy 114.346886 95.292621) + (xy 114.35168 95.230632) + (xy 114.392035 95.183275) + (xy 114.468979 95.136031) + (xy 114.552078 95.044225) + (xy 114.55996 95.027957) + (xy 114.602947 94.939232) + (xy 114.602948 94.939229) + (xy 114.60607 94.932785) + (xy 114.626615 94.810671) + (xy 114.626745 94.8) + (xy 114.625915 94.7942) + (xy 114.617037 94.732212) + (xy 114.60919 94.67742) + (xy 114.568255 94.587388) + (xy 114.560904 94.57122) + (xy 114.560903 94.571219) + (xy 114.557937 94.564695) + (xy 114.477105 94.470885) + (xy 114.436651 94.444664) (xy 117.423288 94.444664) (xy 117.424217 94.451767) (xy 117.435726 94.539779) @@ -69512,12 +69465,19 @@ (xy 117.494965 94.210217) (xy 117.49192 94.216702) (xy 117.491919 94.216704) - (xy 117.462487 94.279393) + (xy 117.448928 94.308273) (xy 117.442339 94.322308) (xy 117.441236 94.329393) (xy 117.425063 94.433265) (xy 117.423288 94.444664) - (xy 114.3595 94.444664) + (xy 114.436651 94.444664) + (xy 114.390583 94.414804) + (xy 114.351413 94.36652) + (xy 114.349034 94.308669) + (xy 114.347213 94.308273) + (xy 114.347977 94.304761) + (xy 114.348989 94.301314) + (xy 114.3595 94.228205) (xy 114.3595 93.118382) (xy 114.378713 93.059251) (xy 114.429013 93.022706) @@ -75235,9 +75195,6 @@ (xy 157.164669 95.185791) (xy 157.164669 95.185795) (xy 157.163288 95.194664) - (xy 157.164452 95.203566) - (xy 157.164452 95.203569) - (xy 157.165381 95.210671) (xy 157.179344 95.317449) (xy 157.182961 95.325669) (xy 157.22505 95.421324) @@ -75290,7 +75247,7 @@ (xy 159.133022 95.657253) (xy 159.116937 95.667402) (xy 159.034965 95.760217) - (xy 159.02242 95.786938) + (xy 159.03115 95.768343) (xy 158.988118 95.86) (xy 158.982339 95.872308) (xy 158.980958 95.881176) @@ -76465,8 +76422,6 @@ (xy 106.56618 113.080283) (xy 106.564409 113.072908) (xy 106.486291 112.921557) - (xy 106.459348 112.890671) - (xy 106.379319 112.798933) (xy 106.374325 112.793208) (xy 106.278413 112.7258) (xy 106.241193 112.699641) @@ -78061,8 +78016,6 @@ (xy 159.36618 113.080283) (xy 159.364409 113.072908) (xy 159.286291 112.921557) - (xy 159.259348 112.890671) - (xy 159.179319 112.798933) (xy 159.174325 112.793208) (xy 159.078413 112.7258) (xy 159.041193 112.699641) @@ -81173,6 +81126,35 @@ (xy 114.07045 88.417425) (xy 114.098972 88.48244) (xy 114.1 88.498501) + (xy 114.1 94.228205) + (xy 114.079998 94.296326) + (xy 114.026342 94.342819) + (xy 114.008624 94.349354) + (xy 113.990707 94.354475) + (xy 113.873673 94.428318) + (xy 113.782069 94.53204) + (xy 113.778255 94.540163) + (xy 113.778254 94.540165) + (xy 113.766667 94.564845) + (xy 113.723258 94.657303) + (xy 113.721878 94.666168) + (xy 113.721877 94.66617) + (xy 113.707223 94.760289) + (xy 113.701968 94.794037) + (xy 113.703132 94.802939) + (xy 113.703132 94.802942) + (xy 113.718746 94.922346) + (xy 113.718747 94.92235) + (xy 113.719911 94.931251) + (xy 113.775644 95.057914) + (xy 113.789034 95.073843) + (xy 113.855741 95.1532) + (xy 113.864687 95.163843) + (xy 113.979881 95.240523) + (xy 114.011577 95.250426) + (xy 114.070632 95.289832) + (xy 114.099008 95.354911) + (xy 114.1 95.370692) (xy 114.1 96.537406) (xy 114.079998 96.605527) (xy 114.03179 96.649371) @@ -83978,24 +83960,22 @@ (xy 105.853443 94.573658) (xy 105.863547 94.643932) (xy 105.858662 94.664936) + (xy 105.826059 94.76528) (xy 105.811179 94.811075) - (xy 105.810489 94.817638) - (xy 105.810489 94.817639) - (xy 105.800747 94.910329) (xy 105.791322 95) (xy 105.811179 95.188925) (xy 105.869881 95.369593) (xy 105.964864 95.534108) (xy 105.969282 95.539015) (xy 105.969283 95.539016) - (xy 106.058843 95.638481) + (xy 106.065362 95.645721) (xy 106.091976 95.675279) (xy 106.245661 95.786938) (xy 106.251689 95.789622) (xy 106.251691 95.789623) - (xy 106.382233 95.847744) + (xy 106.382141 95.847703) (xy 106.419203 95.864204) - (xy 106.487063 95.878628) + (xy 106.51211 95.883952) (xy 106.59856 95.902328) (xy 106.598564 95.902328) (xy 106.605017 95.9037) @@ -85185,7 +85165,7 @@ (xy 110.926111 112.477891) (xy 110.935113 112.548314) (xy 110.924747 112.58198) - (xy 110.908558 112.616463) + (xy 110.897282 112.64048) (xy 110.882339 112.672308) (xy 110.880958 112.681176) (xy 110.880958 112.681177) @@ -85200,7 +85180,7 @@ (xy 110.915608 112.999866) (xy 110.924735 113.070274) (xy 110.914334 113.10416) - (xy 110.891842 113.152068) + (xy 110.903654 113.126909) (xy 110.882339 113.172308) (xy 110.880958 113.181176) (xy 110.880958 113.181177) @@ -85269,7 +85249,7 @@ (xy 111.720463 113.186307) (xy 111.720462 113.186305) (xy 111.71919 113.17742) - (xy 111.714876 113.167932) + (xy 111.715475 113.169249) (xy 111.684784 113.101747) (xy 111.674798 113.031456) (xy 111.686093 112.994658) @@ -85313,42 +85293,35 @@ (xy 112.325986 112.577206) (xy 112.335539 112.578464) (xy 112.33554 112.578464) - (xy 112.362084 112.581958) + (xy 112.355252 112.581059) (xy 112.375312 112.5837) (xy 112.824688 112.5837) - (xy 112.837916 112.581958) + (xy 112.844748 112.581059) (xy 112.86446 112.578464) (xy 112.864461 112.578464) (xy 112.874014 112.577206) - (xy 112.882746 112.573134) - (xy 112.882747 112.573134) - (xy 112.972274 112.531387) - (xy 112.972275 112.531386) - (xy 112.982267 112.526727) - (xy 112.990065 112.518929) - (xy 112.999089 112.51261) - (xy 113.00115 112.515554) - (xy 113.046478 112.490802) - (xy 113.111583 112.495459) - (xy 113.111976 112.4942) - (xy 113.16888 112.511978) - (xy 113.227937 112.551384) - (xy 113.256314 112.616463) - (xy 113.246546 112.683193) - (xy 113.217344 112.749246) - (xy 113.217343 112.74925) - (xy 113.213536 112.757861) - (xy 113.197358 112.89454) - (xy 113.19905 112.903804) - (xy 113.19905 112.903805) - (xy 113.220392 113.020664) - (xy 113.220393 113.020667) - (xy 113.222085 113.029931) - (xy 113.28553 113.152068) - (xy 113.289909 113.157194) - (xy 113.463095 113.33038) - (xy 113.497121 113.392692) - (xy 113.5 113.419475) + (xy 112.882744 112.573135) + (xy 112.882748 112.573134) + (xy 112.905042 112.562738) + (xy 112.975234 112.552078) + (xy 113.040046 112.581059) + (xy 113.078901 112.64048) + (xy 113.079824 112.710184) + (xy 113.077345 112.719246) + (xy 113.073536 112.727861) + (xy 113.057358 112.86454) + (xy 113.05905 112.873804) + (xy 113.05905 112.873805) + (xy 113.080392 112.990664) + (xy 113.080393 112.990667) + (xy 113.082085 112.999931) + (xy 113.086428 113.008291) + (xy 113.136228 113.10416) + (xy 113.14553 113.122068) + (xy 113.149909 113.127194) + (xy 113.463095 113.44038) + (xy 113.497121 113.502692) + (xy 113.5 113.529475) (xy 113.5 114.672867) (xy 113.479998 114.740988) (xy 113.470522 114.753857) @@ -85446,7 +85419,7 @@ (xy 110.583394 113.8925) (xy 110.572585 113.882722) (xy 110.565903 113.876677) - (xy 110.541307 113.864802) + (xy 110.55779 113.87276) (xy 110.488635 113.839372) (xy 110.488632 113.839371) (xy 110.482261 113.836295) @@ -85472,8 +85445,6 @@ (xy 108.75351 113.476149) (xy 108.751622 113.47249) (xy 108.720562 113.427789) - (xy 108.713001 113.419475) - (xy 108.677769 113.380738) (xy 108.676717 113.379581) (xy 108.662181 113.365097) (xy 108.58112 113.319756) @@ -85554,8 +85525,6 @@ (xy 104.82351 113.476149) (xy 104.821622 113.47249) (xy 104.790562 113.427789) - (xy 104.783001 113.419475) - (xy 104.747769 113.380738) (xy 104.746717 113.379581) (xy 104.732181 113.365097) (xy 104.65112 113.319756) @@ -85611,7 +85580,7 @@ (xy 105.682161 96.136692) (xy 105.680119 96.130407) (xy 105.585136 95.965892) - (xy 105.527902 95.902328) + (xy 105.537553 95.913046) (xy 105.462439 95.829624) (xy 105.462438 95.829623) (xy 105.458024 95.824721) @@ -94308,7 +94277,7 @@ (xy 109.8763 93.71975) (xy 109.856298 93.787871) (xy 109.839395 93.808846) - (xy 109.604177 94.044063) + (xy 109.602725 94.045515) (xy 109.391796 94.256444) (xy 109.389656 94.258291) (xy 109.38482 94.260655) @@ -94358,7 +94327,7 @@ (xy 108.935302 93.977763) (xy 108.952205 93.956789) (xy 109.026727 93.882267) - (xy 109.032242 93.87044) + (xy 109.031387 93.872274) (xy 109.073134 93.782747) (xy 109.073134 93.782746) (xy 109.077206 93.774014) diff --git a/rev0/luna_rev0.kicad_pro b/rev0/luna_rev0.kicad_pro index 6434eac..2c1aee3 100644 --- a/rev0/luna_rev0.kicad_pro +++ b/rev0/luna_rev0.kicad_pro @@ -45,7 +45,7 @@ "silk_text_upright": false, "zones": { "45_degree_only": false, - "min_clearance": 0.19999999999999998 + "min_clearance": 0.2032 } }, "diff_pair_dimensions": [ From ec6dc904e4f7064a9db265925907c4544a9dd767 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 14:54:00 -0400 Subject: [PATCH 04/10] hardware: reduce paste area for 1006 diodes --- libraries/luna.pretty/DFN1006-2.kicad_mod | 1 + libraries/luna.pretty/DSN1006-2.kicad_mod | 1 + rev0/luna_rev0.kicad_pcb | 464 +++++++++++----------- 3 files changed, 242 insertions(+), 224 deletions(-) diff --git a/libraries/luna.pretty/DFN1006-2.kicad_mod b/libraries/luna.pretty/DFN1006-2.kicad_mod index 7dec399..a16b7b5 100644 --- a/libraries/luna.pretty/DFN1006-2.kicad_mod +++ b/libraries/luna.pretty/DFN1006-2.kicad_mod @@ -2,6 +2,7 @@ (layer "F.Cu") (tedit 0) (tags "SOD-882 SOD882") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "REF**" (at 0 -1.2) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) diff --git a/libraries/luna.pretty/DSN1006-2.kicad_mod b/libraries/luna.pretty/DSN1006-2.kicad_mod index 0ab8e06..307f0a2 100644 --- a/libraries/luna.pretty/DSN1006-2.kicad_mod +++ b/libraries/luna.pretty/DSN1006-2.kicad_mod @@ -2,6 +2,7 @@ (layer "F.Cu") (tedit 0) (tags "SOD-993 SOD993") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "REF**" (at 0 -0.9) (layer "F.SilkS") (effects (font (size 0.5 0.5) (thickness 0.1))) diff --git a/rev0/luna_rev0.kicad_pcb b/rev0/luna_rev0.kicad_pcb index ef4611b..f8d88c3 100644 --- a/rev0/luna_rev0.kicad_pcb +++ b/rev0/luna_rev0.kicad_pcb @@ -9982,31 +9982,32 @@ (property "Sheetname" "Debugger and FPGA Configuration") (property "Substitution" "Diodes Inc. BAT54LP-7, Micro Commercial SM5819L2-TP") (path "/00000000-0000-0000-0000-00005dcaa6d2/00000000-0000-0000-0000-0000604e0bb6") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D9" (at 0 0.9) (layer "B.SilkS") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp ce17df80-75a3-4be9-b176-1c6bbed5a2f8) + (tstamp e92b9f62-d15f-4d8f-a6b8-fc7b5c593b7c) ) (fp_text value "SCHOTTKY" (at 0 -0.9 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp afa309ed-2f63-423b-a4c9-01d33f8b1f90) + (tstamp e9597686-2466-438c-95d4-ad2d64cd3a49) ) (fp_text user "${REFERENCE}" (at 0 0.8 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 4db59f92-c992-4ebf-93fc-689c0209b2f0) - ) - (fp_line (start -0.85 0.4) (end -0.85 -0.4) (layer "B.SilkS") (width 0.12) (tstamp 3bb6c901-e400-4260-9c5d-48770154d9e6)) - (fp_rect (start -0.62 0.42) (end 0.62 -0.42) (layer "B.SilkS") (width 0.12) (fill none) (tstamp d966ed24-5030-4a42-baaf-e236a4f22a5c)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 5f025fa5-fd3b-49b4-8ba6-2f6f34bb0633)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 01c0d364-232c-4687-b69a-35ffd7aee7d5)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 51befec9-3fb4-451c-a844-fa536d217e17)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 688e4d87-2471-4911-9590-a10438709cd5)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp fe5ca1fa-8b12-4792-9ec3-b5f24925e56e)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 212c87bb-60a7-4e20-bec9-52bc30c48e78)) + (tstamp 34a8e192-684a-4208-944a-c00f8fd8415a) + ) + (fp_line (start -0.85 0.4) (end -0.85 -0.4) (layer "B.SilkS") (width 0.12) (tstamp eb7bac3e-a6bc-4098-b13d-20e3e37bca0e)) + (fp_rect (start -0.62 0.42) (end 0.62 -0.42) (layer "B.SilkS") (width 0.12) (fill none) (tstamp a6e167a1-c35d-41e1-889e-058cb6bae263)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 74d11ff4-72e5-48b4-9d92-3e688c5504fa)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 0eb5a723-dad0-4cb3-844a-f88ed18e7913)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 8b0f316a-11f3-42d5-b4d1-a1ae813aa8c4)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp c7fd4ff8-2702-4c3d-bae6-5a1875fa2a99)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp c8506b6a-1b27-4ef4-b600-76b8f679f66d)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 4e69591b-6a96-4bef-8e5e-59c10bb49019)) (pad "1" smd rect (at -0.325 0) (size 0.35 0.6) (layers "B.Cu" "B.Paste" "B.Mask") - (net 3 "+5V") (pinfunction "K") (pintype "passive") (tstamp 072889b4-5df0-4268-b4a8-8ed2db50f2d8)) + (net 3 "+5V") (pinfunction "K") (pintype "passive") (tstamp 5559b9c0-ddff-4f72-8e89-ed65bd89885e)) (pad "2" smd rect (at 0.325 0) (size 0.35 0.6) (layers "B.Cu" "B.Paste" "B.Mask") - (net 118 "Net-(D9-Pad2)") (pinfunction "A") (pintype "passive") (tstamp c52166a3-a91b-4299-b82e-048f1c0e0693)) + (net 118 "Net-(D9-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 2862ca64-0a8a-4ef9-84a6-bc1247235f3d)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -10292,31 +10293,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/cb18d347-ba67-49c7-912b-56574ed82c52") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D19" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 4ac14e02-506e-427e-bb6c-ff838246149c) + (tstamp 8499c397-692f-49a4-853d-e5a3b22ff15e) ) (fp_text value "6.2±2%" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 7dfd0135-3324-48a4-873b-2b1afad193ec) + (tstamp ee0c0cd8-2b9b-46e4-9e71-202e3a275267) ) (fp_text user "${REFERENCE}" (at 0 -0.9 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 216b2429-c1cc-463d-96f7-a81dbe9e8a4e) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp feeb68ed-41bf-4b89-83bf-20936300263d)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 985a2108-96d6-48b0-aa43-cd02e2812312)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp af2f7b17-03ce-4ab9-8521-ee8410815f59)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 0e589491-e734-4449-890c-c2fe70fe7497)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 3bd53c39-4341-467d-8e3f-07d82ba42c8a)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 5d5986d4-a28b-4763-80bd-a9ff8547f9bb)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 7ca17f60-5a27-471c-a041-381c7407ad6c)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 9db837bf-8d16-4d1d-a348-d7b6cdd5c303)) + (tstamp a4cee553-b9a7-4c1e-87a9-f91d4ea384bd) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 3e78fece-9510-4264-9e50-c0a9fe5e51b7)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 7c7ab136-a12f-413c-97ba-0e97bc06e9bf)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 3770ed40-d76e-4769-854f-964356f91782)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 41de97fc-a0d7-4aa8-8eb0-8ce0439cc33f)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 5553755f-45b0-4815-a048-52dd07501e9e)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 7d41e76e-0d57-419f-b294-109e2f2e4627)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 8bd79a1b-2838-4793-8535-d7fd388803c2)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp de1bcca8-353c-4fc1-823f-7aaef96e98c5)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 3 "+5V") (pinfunction "K") (pintype "passive") (tstamp b3fdc3d2-3650-4330-9169-015bc50c0dd9)) + (net 3 "+5V") (pinfunction "K") (pintype "passive") (tstamp 96ba449b-0c03-47ad-8a19-e0b0b65014d4)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 1096dc01-ff6f-43a6-b780-b437338aeea1)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp ab2171f1-8d6a-433a-aa01-5a3172ea1fbb)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -10733,31 +10735,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/e6c4b3a7-500f-4b69-a740-33e8866297d6") + (solder_paste_margin -0.05) (attr smd exclude_from_pos_files) (fp_text reference "D20" (at 0 1.2 90) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp ee5c40ab-4760-4db1-89ff-3666a3049018) + (tstamp d8ecf86f-79fe-45c8-8fb1-d0e911a14d76) ) (fp_text value "6.2±2%" (at 0 -1.6 90 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp e0733e99-07c7-4580-8d43-7e80371fd2f8) + (tstamp c9a4d3d5-7513-45e2-832b-a7dfe95e16c3) ) (fp_text user "${REFERENCE}" (at 1.1 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 906f65af-ae81-41fa-82a3-12dcde42cc58) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 7dea2218-92ce-4244-b4c4-42b42b0b532f)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp e406302b-cbd2-440b-be05-00a0fa17b363)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 857ef383-ae22-499f-b929-f35d523fc213)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 05fd5795-e719-47cf-889f-f4de9049e2b1)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 314b86fa-bf65-4788-b449-c6c3beffb156)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 31f084b6-5d36-4271-93da-5a70c8547b5f)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 45dde9f8-2523-437b-a948-9237f018bda6)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 0fe8ac06-3202-4979-ab30-6ea8562338e0)) + (tstamp 45acacf7-9157-46fd-b75c-23816964e9a5) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 6be82dbb-20a2-4e6c-a82b-52c5dece47d3)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 3f483af1-04b3-4da5-a317-9c49a441b9ee)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 210ad2e7-a42f-40c3-9f01-77b91b144119)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 32dcd885-1743-40db-96b5-a709b0f390f6)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 83db9548-8313-42a9-8ad7-720279054c56)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 93ed1314-8ed9-4194-8813-9ff2b8e1c1dc)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp ea90392b-39d5-4222-9dbb-caab6534b9c5)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp a61a1d64-5b52-40e4-b022-9cafec661792)) (pad "1" smd roundrect (at -0.35 0 270) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 136 "AUX_VBUS_IN") (pinfunction "K") (pintype "passive") (tstamp a89ca878-820c-4271-8bb2-c92c7219c5eb)) + (net 136 "AUX_VBUS_IN") (pinfunction "K") (pintype "passive") (tstamp 250d181b-9a46-4028-80ed-1e95da2c81c3)) (pad "2" smd roundrect (at 0.35 0 270) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 147 "Net-(D20-Pad2)") (pinfunction "A") (pintype "passive") (tstamp c09a0f72-c253-48ea-add0-f22821a1933c)) + (net 147 "Net-(D20-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 535e1819-dc9b-4570-8512-8530411771db)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -10775,31 +10778,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/cb2c9aff-0f34-4ebb-aea1-aaa7fc8c8e2a") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D29" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp bc2c0e11-b2dd-4873-b2b7-e50cabee6727) + (tstamp 7f55d749-ac05-40c4-97ac-75aa6c20dcd1) ) (fp_text value "6.2±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 7e4a8907-1af6-4512-8909-26735a610f43) + (tstamp 0705e33e-36c8-45b5-82c5-94d8a83a019a) ) (fp_text user "${REFERENCE}" (at 1.5 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp f81a4f54-ccd4-4bda-bb6c-89a86724bfbc) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 4c51d33f-8776-4956-a4d3-78d164c2db8a)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp c3bbf895-3bd0-49ab-88ab-065ec0a48c2c)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 38908da6-8e38-4887-a977-6b3baabe7684)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 0b84068a-b426-4a93-a803-d5ac83b1abe3)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 26aaa69d-353d-474f-8965-d593bbba80f7)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 2bbe40c5-9f29-4789-a873-1714ab80c871)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp de04d438-7757-4ef0-a169-56ea0a793257)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 0c69e7fc-592b-4169-9120-5049a80e9ab6)) + (tstamp b3a93a63-8bce-48e7-ba71-f488f8937761) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 6d1435e5-88f0-49bc-a619-3fffa6fcea3d)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp c27fb699-ca23-4f03-8444-26a9ff15ed94)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 76ef676f-ff80-48bd-9605-3c2a694e7c9d)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 94f10309-ffef-4ab2-803d-8dec2464d099)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp db1642d1-1664-4777-b4bf-8ab8b17ce10a)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp e626bd3d-0ccb-46bd-95ee-a1403b8930c8)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp eabbd2af-8773-499b-801d-2f40b167c23b)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp f5d51874-de6b-4f80-a76a-dd34be5a3fd2)) (pad "1" smd roundrect (at -0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 138 "Net-(D29-Pad1)") (pinfunction "K") (pintype "passive") (tstamp b2b0a6dd-9774-4178-9b60-fc9c04a5c6dc)) + (net 138 "Net-(D29-Pad1)") (pinfunction "K") (pintype "passive") (tstamp d804380c-7385-4307-a4ec-b7b7de3a3503)) (pad "2" smd roundrect (at 0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 166 "Net-(D29-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 0f762cc5-4ce1-4e56-aa9d-3486a78c52a4)) + (net 166 "Net-(D29-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 3bf3a186-7183-41fb-aad6-0bd80e4fc326)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -10910,31 +10914,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/474fdb47-d8fb-4b72-92f0-5082db72e823") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D28" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 01aa37b7-dc59-41c2-9dfa-7fb7a8dc6b1c) + (tstamp ecb789e5-10e7-42c9-8479-5aca8c63876d) ) (fp_text value "6.2±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 297c22b4-2dba-43b4-8361-c7eea8fe0560) + (tstamp ea1cf005-767c-4d94-bdad-87716eaec00b) ) (fp_text user "${REFERENCE}" (at 0 1.4 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp e5a4b8af-25ac-41b7-b14c-87b76611a791) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 93ca3f40-da0e-4706-9292-86020a434a4f)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 0db22276-cde3-4c73-bbf5-d8912cc7b23c)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 4c4b8ed8-aa55-4e3a-8bf2-29eb24e978e1)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 15515799-3fee-42d2-bfd9-91c8fcd98966)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 36d625fa-4d25-4388-81fc-52f02e46f714)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 76ab2bd9-ee64-438d-9b43-2d790434c49a)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 9ca4396c-54fb-49a8-8c04-49e777421afc)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 465b0044-b85f-4fd7-acf4-d8088612196a)) + (tstamp d9b24d27-6153-4eb0-a503-6446e104cf46) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 991854ba-cc94-43ef-a2dd-919351da36ec)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp b5c9b921-91ee-459f-bfb5-159c2df2a7d9)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp c9934f0a-2d2a-428d-abdb-d294682e0b19)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 0c030875-b404-4a4b-aa70-035344a20b8e)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 58744ced-8167-4bd5-b90e-5ac6a64fc43f)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 9fe2e8fb-fbd4-4144-932c-6645044ab586)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp d84a1b4f-9985-4b63-891e-32637f64c268)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 2145e5eb-2418-4488-a1b9-5635fc098848)) (pad "1" smd roundrect (at -0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 135 "Net-(D28-Pad1)") (pinfunction "K") (pintype "passive") (tstamp 01efd083-2ef2-4006-a70c-199cd990edb7)) + (net 135 "Net-(D28-Pad1)") (pinfunction "K") (pintype "passive") (tstamp c8aba45b-6225-49b7-9106-0426fb59600f)) (pad "2" smd roundrect (at 0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 137 "Net-(D28-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 8d550ff2-60ce-4755-82de-58845bd55fdc)) + (net 137 "Net-(D28-Pad2)") (pinfunction "A") (pintype "passive") (tstamp ad46f4a8-15b6-497a-8311-e8435b41739e)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -10952,31 +10957,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/80e07bdc-eefd-4c91-9f28-1e79d13997a4") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D21" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp b1c39319-a015-4f97-abd1-e1d2ec1e565f) + (tstamp 2df045de-3700-47a0-8b75-518d3d3f234c) ) (fp_text value "5.6±2%" (at 0 -1.6 180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 674aee2d-a0ff-4ea6-970e-3f38f516b38e) + (tstamp 28c5efe5-bb24-4c43-b721-a3ea0db07181) ) (fp_text user "${REFERENCE}" (at -1.7 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 6d4f88a1-e0c7-4479-8e98-720c215144f4) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp d5ab153f-3dec-4f8f-9712-b2b4062b9d84)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 54c680b7-92c5-427f-83e1-bc32bb94341a)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp e916714b-a3cd-4f59-9dfc-dc6897ec42a2)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 04b20330-8f19-4191-99f0-35c8dfce5822)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 46a6767e-49c5-4928-8e4e-7cf7d8ddce17)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 6826dbe6-0765-45f8-9678-f16026958e2a)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp c2ec7764-f2e4-45ab-b8f2-89eb7bba91dd)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 912e4c2a-de4b-4434-80f5-446915d225d2)) + (tstamp c2e32915-0948-410e-b096-a7c374a5867c) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp f470bf99-b54e-4e26-ba48-ea9764d2eba3)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp f6c7a17b-4e23-4581-8ed9-b239743c14fa)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp b20b6830-5a3e-4791-a0ad-c4bb93db322c)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 34c0f3e9-4644-452a-b68f-3bea1197e809)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 916d2c50-b923-4178-829a-bb8c0e482c1e)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp a51017ce-0b03-4eb4-b621-4a9049beab2e)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp e01a3fd2-9e74-45c3-a773-98719d9ab482)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 32ad659e-fe8d-4c02-ad70-01fef34b3701)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 148 "Net-(D21-Pad1)") (pinfunction "K") (pintype "passive") (tstamp b629b4a8-ec5b-4c1a-9608-ebb6ce3c9e28)) + (net 148 "Net-(D21-Pad1)") (pinfunction "K") (pintype "passive") (tstamp d6b1b847-30f4-4ae4-bf97-acf694661322)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 149 "Net-(D21-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 27289d95-1853-4318-9733-d9d5393cd230)) + (net 149 "Net-(D21-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 975da80e-a9e8-4b0e-b2ca-705c6a4d8c46)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -11510,31 +11516,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/4a690c0d-8549-48df-8553-fdad4695ecdb") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D17" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp ad217db9-75fd-4c73-a16f-ccc13f3e6fa3) + (tstamp 702466ad-528c-49c2-9153-b3c1a44b2425) ) (fp_text value "5.6±2%" (at 0 -1.6 180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp ff48dfad-2e59-4e3c-a203-ba67e9610272) + (tstamp ae38d392-d64e-4de0-b53e-07a34ccd681e) ) (fp_text user "${REFERENCE}" (at 0 -0.9 180 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp b2299ba0-d233-4608-a9dd-a2b78e9f54b1) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 68eb6a14-857c-4434-8f78-32ad1ee01d77)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 48a6015a-2265-44e5-9f6e-e372a5bbe86f)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 82c1171a-9b68-46d6-a7fd-0c1c78a2879d)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 17095ee4-85f5-4633-8595-5f81a8094a8d)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 52404128-496f-4f9b-8346-a6b0ef627042)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 89719e8c-c730-4499-b36d-c125ef573cec)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp d24d09a9-c687-426c-87d8-b5e43012675c)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 5bd6ecef-07ee-454b-8893-042a68c20bfb)) + (tstamp 2398823c-13b5-4a7d-906f-52eadf05fa07) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 5c2109e5-4a8e-41b9-8f8d-916d8c571221)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 3b8ccce2-355e-475f-8337-3d9aed0bfa77)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 369e0317-fb5c-40fc-a87b-889a46bb9a78)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 0a8c8a80-91ae-4363-92ea-e8438567ab90)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 7854e000-f9a2-4646-8e70-c562b5b83c39)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp ce74f855-08e3-4a65-86c9-62e8115f3cde)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp fea2e5ba-a365-4efe-8aa0-c7c5ad1f7a3f)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp ba52d1ce-9636-4766-8e5e-3d1fbe9f2edd)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 145 "Net-(D17-Pad1)") (pinfunction "K") (pintype "passive") (tstamp 42bd0ffa-4fd2-475f-838e-3cf712b763c2)) + (net 145 "Net-(D17-Pad1)") (pinfunction "K") (pintype "passive") (tstamp 6b8ea7d1-5b97-452b-b768-b1d2966309af)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 146 "Net-(D17-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 4f4f5cc3-7d7c-4062-b6c1-80cd591909f0)) + (net 146 "Net-(D17-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 7f051eff-9186-42c8-a860-65dff650c8af)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -12348,31 +12355,32 @@ (property "Sheetfile" "aux_port.kicad_sch") (property "Sheetname" "AUX Port") (path "/00000000-0000-0000-0000-00005dd754d4/9f41c787-6283-449d-8d52-4eb0df932dea") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D15" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp f9bb8ff8-6485-472d-b964-bfe0bddb4027) + (tstamp 7492762e-ca36-4351-abb3-1d23ef54d6fd) ) (fp_text value "24±2%" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 27256759-fc60-46cc-a8af-250b623d00fd) + (tstamp b9ab9422-005a-46b8-91dc-e5ae3162531b) ) (fp_text user "${REFERENCE}" (at 0 -0.9 -180 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 06cec2ca-e237-4e33-a540-a7580fb8e3bf) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp c261e8dc-95a9-42b2-9c6b-f06f71128dc6)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp e55f5648-5401-440f-8d73-05d08c815043)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp f3fa6b3a-1ec5-4f09-a349-4efe9c4e8fd3)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 6494b445-2e62-4ea8-a4a1-e64e9dd405b1)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 794aac6d-6157-4815-92fd-5745e7696bc1)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp b35b4a44-e60b-452d-a498-ccc51a0df370)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp b582d2de-dcb4-4304-8f1b-a69ec8398e2f)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 9e442173-4e65-4c25-ba66-eecc9afd31f6)) + (tstamp 03ff693b-216d-4298-a217-2170ed91292d) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp f8a14e38-c664-4197-ba8b-05bd801b9770)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 2b3cf611-f63b-4220-bd28-f4a4ace4b47f)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp a233bbad-cd8a-43de-b316-3a63a1af90b5)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 094ec1f6-c6cf-4483-ad6a-1a8937673afa)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 9ee2e286-e4d4-4b71-8ca8-7d3f8ceebaec)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp f435fef1-aba0-40c4-8ca1-20cfa75182b9)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp f793b4e0-5874-4587-b78e-90c5edaf8740)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 0ce6bd83-c2df-4b1f-af69-7189a9dcf297)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 164 "AUX_VBUS_CLAMPED") (pinfunction "K") (pintype "passive") (tstamp b621e647-7cd5-4a99-84bc-d41f5c2e5e05)) + (net 164 "AUX_VBUS_CLAMPED") (pinfunction "K") (pintype "passive") (tstamp 47641634-4213-4e87-938e-5203e9403ac3)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 27769997-87cc-42e0-bdb8-f801ccee75eb)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 937fd7b6-ff3c-4bcb-ab34-cbf68803fa26)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -12946,31 +12954,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/0588e302-14a5-49ac-8f07-a224586c5478") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D27" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 645a044b-60a9-46fd-b59a-7d0b57a9ce41) + (tstamp 31346822-1ae9-4329-9d8b-0abb1521888b) ) (fp_text value "6.2±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 72989ba0-0665-4ac7-a682-69639c9ea7e2) + (tstamp 856aaaa8-6817-4648-a8dc-88f31029d47f) ) (fp_text user "${REFERENCE}" (at 0 0.9 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp ee84dce2-934e-4747-910a-3142cac55664) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 5033adce-5f8e-4b3b-8418-575677e2171e)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 92a0a385-9736-4260-a6f5-6fc231b9da5a)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp c8ac2bf1-b229-43cb-b483-f3a93418415b)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 3c186aa9-f33a-4c2a-943b-a00328f84e58)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 74055b70-d6fe-409e-b9cd-76174c4915fb)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 9158e366-6382-4487-97d6-aa8d94b8451a)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp bffcd2b3-0d56-47ab-a4d9-145cc9906034)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 5e6da249-641d-47cc-ae84-d2c0ea64f19a)) + (tstamp edd49834-532f-464a-9634-2008fd50b456) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp e5433c67-bfa5-4baa-9267-f83d020a1b97)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp debc4c60-ef3b-4287-89da-172b5149975b)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 579007d5-ca74-489e-89eb-b78cda3f5208)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 1212ecbf-a822-425c-b3c5-c91626cd6d0c)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 8a9dbd91-c873-4a4c-8d00-27c36fcb3c58)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp cb806cfb-a4b9-48f8-bb42-073a0fe91370)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp ce9b69fe-18e9-49b4-a423-b63beb4f1cfe)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 3898b8a3-731f-43ec-a914-88fa7674af89)) (pad "1" smd roundrect (at -0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 128 "Net-(D27-Pad1)") (pinfunction "K") (pintype "passive") (tstamp 848faf40-324d-43b1-99d6-46738a86cd21)) + (net 128 "Net-(D27-Pad1)") (pinfunction "K") (pintype "passive") (tstamp 9865625c-e6f8-47d2-994e-8ab4913c6901)) (pad "2" smd roundrect (at 0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 129 "Net-(D27-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 2c7c0256-1ec9-4764-aa7b-19cdaef3095b)) + (net 129 "Net-(D27-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 48b734b6-a951-485e-94bd-20489dd018fe)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -13108,31 +13117,32 @@ (property "Sheetfile" "control_port.kicad_sch") (property "Sheetname" "CONTROL Port") (path "/00000000-0000-0000-0000-00005dcd9772/c1d8541f-409c-44c1-a2de-b83f432e030a") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D22" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 44b01b7d-ca79-406d-b400-6d5b84cf1905) + (tstamp e6f4589c-676e-4318-a89d-4211dbf00f0b) ) (fp_text value "24±2%" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 96c1a6e5-4e8e-47c7-9116-84636c5f4001) + (tstamp a3329d71-ab42-46d1-a6b4-4e463b8838d7) ) (fp_text user "${REFERENCE}" (at 0 -0.9 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp e0df910c-f959-485f-b676-ead4d0a974bd) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 062a9550-3ca7-4515-bb43-25be1c4dc05e)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 30f6f457-a49f-442b-ae1a-38d702abd29c)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 75d45bb2-cc29-4213-9c24-a04fbbb216ca)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 27635da1-2b99-44d8-975e-7d4ffe1d96d7)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 7de837fd-dbbf-4e17-8748-431ebffa852b)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp a899f563-c716-4c90-a49f-07a5f9c81992)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp e60c7c24-50fe-4863-a72b-ed06e67a526c)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 76f1cc41-89fb-41dd-9e96-671cbc328b35)) + (tstamp a2a171d0-906d-48a1-a4b6-92d44e8c6cc4) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 0e4fefec-c495-4451-a5c3-4866976b4cdf)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp bc41a23f-f6bd-4092-8b6a-8a74628caf4e)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 133f561e-793c-4153-b6aa-1c363c11ab38)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 110af216-c3e7-4000-93d5-f8e2b049ca4e)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 1f67da34-c05a-4b4e-80a1-e312db9dece0)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 47a1d873-f098-4516-ab61-9ac5f67785e2)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp a055e05d-e966-4d9f-a001-b07d5e048816)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp e72667a8-a793-4fab-b3d3-94a1431dac81)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 181 "/CONTROL Port/CONTROL_VBUS_CLAMPED") (pinfunction "K") (pintype "passive") (tstamp bb5c23b7-2e32-42e6-8130-00ee3466ae93)) + (net 181 "/CONTROL Port/CONTROL_VBUS_CLAMPED") (pinfunction "K") (pintype "passive") (tstamp c603ced4-b1af-4b71-a282-276d9ddc2231)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 5e0e33c0-b430-4af4-99ed-4770c586df1b)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp ae405bed-4112-4b23-93a2-764a098ba37d)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -13250,31 +13260,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/5c6bf828-c783-4de8-8f68-5be84c3319aa") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D23" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp e34b5755-e86d-4590-9bc2-15612db0589f) + (tstamp 80fce2c9-e47d-4126-9ffe-c011d7325929) ) (fp_text value "TVS" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp bf287e51-5b2f-469c-b858-9c5abff139a1) + (tstamp 4a03ab39-fa78-4920-88fa-9fdffba85ed0) ) (fp_text user "${REFERENCE}" (at -1.7 0 -180 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 28a6a01a-be2b-43ac-b15b-9308e9841225) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp a6c1894f-b75f-4a3a-b749-e4e5d0f86c87)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 97cb135e-b707-49c8-abae-d9becf28d34e)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 1096c579-64b7-4b68-a990-381f2f4b4bd8)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 1f19c638-5546-4c76-bfce-3d0691b1e770)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 7bb60b6d-8e7c-46fa-be24-bc9eaca77c4d)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 7cfdd5d9-e1bb-48dc-b29d-14f6647356d7)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 84a081f5-3da7-4a1d-9289-7aac5dad972c)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 76a09930-0ef1-477c-9b49-037b6c73c224)) + (tstamp ab3757cf-f2ab-4459-bd1f-821f25dfce02) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp a02d1059-ff96-4c7b-8371-d7fe7478250f)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 40328453-e6b2-4907-9168-94030ba032d5)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp b12d4799-b4de-44dd-86ea-7db754f93cde)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 04f93b96-39fa-4be7-9d0c-f7b729ab5d86)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 868ac1e3-e200-46b7-a9a9-9b04e6ffff04)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 872279ba-f98d-4b32-96b4-111c58ab687b)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp cc7c613a-d885-445b-85ce-314f0835e732)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 9fa96c10-1d0d-439b-9509-c454c874fe6f)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 182 "/Power Distribution and Monitoring/CONTROL_VBUS") (pinfunction "K") (pintype "passive") (tstamp 42f7ae75-ebfd-4d76-8f13-8cc16166a122)) + (net 182 "/Power Distribution and Monitoring/CONTROL_VBUS") (pinfunction "K") (pintype "passive") (tstamp 64628554-3699-49ff-8ba2-f4fa22dcd980)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 2564f4a3-0403-4315-b001-6470515f9e81)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp aea397e7-ef73-4a02-a805-65f26eb6ff2b)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -13349,31 +13360,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/fe3e14ea-628d-4c9f-b618-84020255cb02") + (solder_paste_margin -0.05) (attr smd exclude_from_pos_files) (fp_text reference "D16" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp fe5bed6f-0e5c-4376-81d0-4c43b6e763dd) + (tstamp f1f93e50-14d7-45ef-9bec-fbe38da819bc) ) (fp_text value "6.2±2%" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 451c4f7b-80c3-402d-89af-2b3fa52b5c2a) + (tstamp c2175d0a-ca0d-4e9e-a416-8c2c118ccf9f) ) (fp_text user "${REFERENCE}" (at 0 -0.9 -180 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 55fea942-e39f-4ee8-847c-e026db16d775) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 1d59abe5-644f-4d84-9e2b-ab810260d598)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp c6520550-698c-413a-b624-44fe6845f4cf)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp d0495148-ece6-42f6-b344-d297df3f396e)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 0349fdfb-05fc-4f14-8ead-659dbd440abc)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 2ef8a3da-9c15-474f-9961-c9e300139513)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp a04e5ebc-d5dc-41a7-8ce6-7b758376b257)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp e98d32b2-e61d-4869-9dda-f104d9fda66a)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 3dd7fccb-e44a-4ba9-8577-cd672ec4646f)) + (tstamp 05d954a5-c265-4fc3-bf52-67f174fe000b) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp b6ac41ed-d916-46d1-a7e6-c34a6332f7ac)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 52e04a2a-d9f9-4bd6-b395-8ef9e6d1e3da)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 6d42b08b-e4b5-4bcb-8ae5-968d15764ebc)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 02df5485-c601-48f0-b0cd-0d0cafd3f522)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 1221e522-84b1-428a-8731-31a7f67ca5ae)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 502985de-02c9-42ab-a946-6d7b0aeba235)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 73b38d69-c03f-40bc-8045-ea0987b87335)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp b35bd062-f47d-4970-9da4-a0c221aa21c9)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 130 "CONTROL_VBUS_IN") (pinfunction "K") (pintype "passive") (tstamp 2c53cf66-b03d-4b86-8b3e-b71d8f237f26)) + (net 130 "CONTROL_VBUS_IN") (pinfunction "K") (pintype "passive") (tstamp d3d25a3e-4595-4542-926a-7f4adea80c2c)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 51 "Net-(D16-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 4c1b790a-2627-4bd2-b486-04f3cda2ea43)) + (net 51 "Net-(D16-Pad2)") (pinfunction "A") (pintype "passive") (tstamp 64598daa-0278-494b-9c6d-b607aef5329b)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -13540,31 +13552,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/2acc1c39-f59d-491a-8948-bb09db0aa928") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D25" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 07957296-a402-474e-81a9-70abb8564d40) + (tstamp 852f2eba-38c0-4755-99f5-15750f5ca7ac) ) (fp_text value "TVS" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 80459746-503d-4aa5-8e33-fc304d8e6ce7) + (tstamp a25da9e8-139a-4411-8fd7-eb6acda29e31) ) (fp_text user "${REFERENCE}" (at -1.7 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 9a45a736-cbfb-4327-a638-50bae068788c) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp db477592-07cf-4ad6-937a-ce6a136577b5)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 2476f4f2-e308-45ea-a010-c2348122c1dd)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp c9d2744b-c0bf-4e13-8b4a-ae981bc69361)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 5968ada1-9cff-4620-acee-a3a0f336ab09)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 9058fa99-b78e-4e12-8e27-a0b52730c6a7)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 9c7e04f3-57ab-48c5-925b-fdc3f08eb1b7)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp a46498d7-cc16-4411-8130-8af66e021d95)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp b5c110fb-5598-4df0-be74-2942583ee4e4)) + (tstamp e2f14e77-8d00-47a4-97bf-03d79d3d67ff) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp c4beb7a0-c48f-4667-abdb-f695e7e469a6)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 077d171d-8645-4050-9513-77d40ad5ac15)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 8230e7ef-9dab-4e50-a223-0d63b853b4af)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 7122386d-7e41-4c78-ae38-395f361a2b74)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp a4fd0ff9-dff9-4044-bab8-9037d19803c7)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp d2ee3897-5b70-4d6d-82cc-de11b9b7b06b)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp dec33cd3-278f-411a-a71c-3f4a938f1b32)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 76dc9e90-6067-4447-8a90-7a1d9551a07a)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 183 "/Power Distribution and Monitoring/AUX_VBUS") (pinfunction "K") (pintype "passive") (tstamp bcdbe965-200f-4b26-b36f-6e3e3075441e)) + (net 183 "/Power Distribution and Monitoring/AUX_VBUS") (pinfunction "K") (pintype "passive") (tstamp 70263918-2802-471a-aa32-9161023eeaef)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 51ce3965-ea10-48b6-9fe1-f48fb299fd54)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 182c393a-c227-4c56-b5a7-03aeec4b3949)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -13887,31 +13900,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/249aee13-6a20-4791-b059-2e26da70a0b4") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D24" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp c2a1f18f-034a-4bad-b518-fce48f38063f) + (tstamp e2373ba4-f772-42f7-80c4-f1d58e6e4c0d) ) (fp_text value "TVS" (at 0 -1.6 180 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 5217205e-1bc9-4550-9ae7-07b53143cef0) + (tstamp dc6567d9-bac4-4e5d-a19d-a07a8c17ea43) ) (fp_text user "${REFERENCE}" (at 1.5 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 38ea4f80-70d1-402d-b3db-8c88dcc19a15) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 02722b44-2b02-449b-b503-7414087ac8aa)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 94222131-8e47-44bb-a850-b9ad20c9832d)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp b279b695-f57f-4476-9fab-35cd593e9a81)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 054a0aa0-b0d3-4e9a-a42e-c8449537d34c)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 8eda9339-a28f-4b47-9647-95ff90f39d73)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp b1631a51-7591-4fc5-89b7-3d3eae46bffd)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp b6d024e9-fac8-425b-812b-d50224fcdb97)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp f3e3f6df-b969-4793-bbbf-e5fae023f295)) + (tstamp c5acebf5-55bc-43ac-aa78-71c135a302d2) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 1dff3657-7f49-4ea1-b28c-0bb1b2b5888e)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp a0a4414b-10d8-4771-b513-c3a21261e753)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp a0354e49-f8f9-47f7-baa9-6aff5938718a)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 166f8362-3b0d-46e6-8c1c-56a08106f090)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 345dbef5-f993-4d5b-b000-4fd3846e2102)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 3cb33ccc-3e95-48bd-9db6-1ca701c9e713)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 420fb56a-7d63-43ec-a02d-5ac521c6042e)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 239c6e92-1151-4aa8-8c36-96e917475fc1)) (pad "1" smd roundrect (at -0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 126 "/Power Distribution and Monitoring/TARGET_A_VBUS") (pinfunction "K") (pintype "passive") (tstamp 41414f44-21a9-4dea-8773-a288a613d9f7)) + (net 126 "/Power Distribution and Monitoring/TARGET_A_VBUS") (pinfunction "K") (pintype "passive") (tstamp 1768628b-6abd-40a9-bd38-6115355cfdf1)) (pad "2" smd roundrect (at 0.35 0) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 0ed1f0d9-aa0d-4df5-ac08-e22f5dfc2e25)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp e5116539-2bdb-467a-ad76-ebcb7d56c9fc)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -14390,31 +14404,32 @@ (property "Sheetfile" "power_distribution.kicad_sch") (property "Sheetname" "Power Distribution and Monitoring") (path "/490fda6e-4eae-4b35-a875-405b51914829/6bb63b7f-8397-47d5-9150-f00fee8a9164") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D26" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 6006b2c9-394a-4612-8f43-1d5f3f49f0ff) + (tstamp 5538f6f6-7999-47b7-a89f-db3bf01a5a37) ) (fp_text value "TVS" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp fcfc28f5-0758-4cb6-a1b9-d555ed2613f7) + (tstamp 3be427f1-c3b1-4979-bdbd-c88ba5aa74e2) ) (fp_text user "${REFERENCE}" (at -1.7 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 39d001cf-7fc5-41fe-ae1e-683fafde9a3e) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 4d47aed2-00f9-4357-a8c0-9fac0dbe2840)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 9bc02cce-6856-4ddd-95cb-1ea3bf75779c)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 6060f562-b636-447b-b70b-887e673eb639)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 286868ca-ffed-4883-ae45-1219bfbb5024)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 3d26957b-d69a-4e61-acbe-1e48101ed79c)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 7c075254-f1f4-4a9c-9ff1-dc7ff4fdb85a)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp a4714644-b61a-4469-8351-515d18db5639)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp 3eb0457b-1644-402a-8259-3b6d612742ac)) + (tstamp ed6da0a5-1cf6-47ac-8c3f-876e713d5e69) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp e9d75f23-ee00-47f6-be20-89e8ca7c1f1c)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 2139ff9b-d8b4-4230-9421-62ffa3845f7e)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 1e84a6e1-84f5-4035-bec4-608420816705)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 3418aa61-9555-43f5-91c7-fc60c08faa86)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 46e82aa4-eb88-4fe7-8aeb-0246714c475f)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp a6943530-35dc-4970-8305-e87ff694cb72)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp d74e19ec-0ccc-43f6-b51d-43b970840187)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp e5b89e95-9fba-4880-9781-704142f430b9)) (pad "1" smd roundrect (at -0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 127 "/Power Distribution and Monitoring/TARGET_C_VBUS") (pinfunction "K") (pintype "passive") (tstamp e6328891-546d-419e-8ccf-1a601b983aa0)) + (net 127 "/Power Distribution and Monitoring/TARGET_C_VBUS") (pinfunction "K") (pintype "passive") (tstamp 369047cd-ee92-48f5-bdb1-ad779dd46b63)) (pad "2" smd roundrect (at 0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 9d8d6074-7aba-4202-b11c-11ad334835b8)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp f3b717b8-73d5-4a1c-a11c-a58a61c87b33)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) @@ -15892,31 +15907,32 @@ (property "Sheetfile" "target_port.kicad_sch") (property "Sheetname" "TARGET Port") (path "/00000000-0000-0000-0000-00005dddb747/eabde9f9-a10a-4d23-8e1d-9babff7fe981") + (solder_paste_margin -0.05) (attr smd) (fp_text reference "D18" (at 0 1.2) (layer "B.SilkS") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) - (tstamp 443c3d92-4c32-4e2d-9e35-d8aa8a819353) + (tstamp d23031e5-e25c-4622-be43-35f64579dcae) ) (fp_text value "24±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp a4714e6f-2079-4abd-b1e8-bd66e0e0de8d) + (tstamp 3bb5f141-61d5-4f2b-9b39-36026ad88f1a) ) (fp_text user "${REFERENCE}" (at 1.475 0.025 180 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) - (tstamp 285db083-3260-4cd9-807f-11e8aa70baa1) - ) - (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 5d8bf786-a118-48df-879a-90ef687ccf62)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp 54c7aa91-110d-4a92-a32c-5d95707901c6)) - (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp a40de123-9494-4856-88c9-5f00ccd79dc8)) - (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 40a13000-778e-4e2e-b8ba-2702db691063)) - (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 4d944cef-2f52-46dd-96a1-1dca835161d5)) - (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp 7761c16f-1484-42b3-9ace-91d14fb3e78b)) - (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp b3b6ed0b-0782-49ad-9681-26d644fc0aed)) - (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp ceb7b2f7-d542-40b0-8615-9cea6e0175fb)) + (tstamp c35c14c0-25e2-468b-955a-3b7df6c5fc9d) + ) + (fp_line (start -0.85 0.45) (end -0.85 -0.45) (layer "B.SilkS") (width 0.1) (tstamp 1a468e4c-4063-48de-bfe8-ce571f3fdfc3)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.SilkS") (width 0.1) (fill none) (tstamp be8842ac-47e6-4060-bc69-e91a6fa2008d)) + (fp_rect (start -0.65 0.45) (end 0.65 -0.45) (layer "B.CrtYd") (width 0.05) (fill none) (tstamp 48524ddf-5849-4d62-84f7-825ee2c0d65b)) + (fp_line (start 0.15 -0.15) (end -0.1 0) (layer "B.Fab") (width 0.1) (tstamp 3ece6377-58c9-463b-9549-51d335c98a6f)) + (fp_line (start -0.2 0.15) (end -0.2 -0.15) (layer "B.Fab") (width 0.1) (tstamp 522a76d6-5789-4f87-9275-d3f6e55c9aeb)) + (fp_line (start -0.1 0) (end 0.15 0.15) (layer "B.Fab") (width 0.1) (tstamp 990c3c7b-5eb4-43b8-be47-a33726c52a1b)) + (fp_line (start 0.15 0.15) (end 0.15 -0.15) (layer "B.Fab") (width 0.1) (tstamp c5ca7be1-f1b9-4fa3-b478-5690ba32009c)) + (fp_rect (start -0.5 0.3) (end 0.5 -0.3) (layer "B.Fab") (width 0.1) (fill none) (tstamp f70c4878-c58b-473d-ab76-f76c3dfd05b3)) (pad "1" smd roundrect (at -0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 165 "TARGET_C_VBUS_CLAMPED") (pinfunction "K") (pintype "passive") (tstamp 14b1199f-9dc7-4dd9-bb16-eff2d99d5102)) + (net 165 "TARGET_C_VBUS_CLAMPED") (pinfunction "K") (pintype "passive") (tstamp 1c692758-70e3-408f-8c7e-e96efc7d94af)) (pad "2" smd roundrect (at 0.35 0 180) (size 0.4 0.7) (layers "B.Cu" "B.Paste" "B.Mask") (roundrect_rratio 0.125) - (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp 9a553cda-beea-4b1e-ad52-5eb9883d9277)) + (net 2 "GND") (pinfunction "A") (pintype "passive") (tstamp ce8dca01-255d-43aa-b1b7-76c32a93aa47)) (model "${KICAD6_3DMODEL_DIR}/Diode_SMD.3dshapes/D_SMA.wrl" (offset (xyz 0 0 0)) (scale (xyz 0.19 0.24 0.126)) From 354279d355c2543ad3acdd7025f28d0e4d61ce13 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 15:00:45 -0400 Subject: [PATCH 05/10] hardware: update version detection pin strap --- rev0/fpga_configuration.kicad_sch | 20 ++++++++++++++------ rev0/luna_rev0.kicad_pcb | 6 +++--- rev0/luna_rev0.kicad_sch | 4 ++-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/rev0/fpga_configuration.kicad_sch b/rev0/fpga_configuration.kicad_sch index 8bd5285..1404682 100644 --- a/rev0/fpga_configuration.kicad_sch +++ b/rev0/fpga_configuration.kicad_sch @@ -2938,7 +2938,7 @@ (effects (font (size 3.5052 3.5052)) (justify left bottom)) (uuid 1ae62583-e384-4c67-b315-b8054a1430d7) ) - (text "reserved" (at 135.89 177.8 0) + (text "reserved" (at 135.89 180.34 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 60150419-de30-4e0d-ae6f-02415f17e8ff) ) @@ -2947,7 +2947,7 @@ (effects (font (size 1.1176 1.1176)) (justify left bottom)) (uuid 78cccd9b-f46a-419d-ad03-f5a2e9ab61be) ) - (text "52-100" (at 146.05 177.8 0) + (text "52-100" (at 146.05 180.34 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 82fc291e-bddc-4f54-8890-eb7f1f328b58) ) @@ -2959,6 +2959,10 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 8b01472a-735f-46f3-bd21-251e8a853d64) ) + (text "1.0" (at 135.89 177.8 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 9420e2bb-2112-4796-ac91-2f072b024f1e) + ) (text "JTAG pins may be\nused for UART when\nJTAG is not in use" (at 170.18 68.58 0) (effects (font (size 1.27 1.27)) (justify left bottom)) @@ -2972,6 +2976,10 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid ae6b4f1d-227d-4fcc-bec2-adac79ed142c) ) + (text "29-31" (at 146.05 177.8 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid b97a22fc-0e2b-43d9-b23a-da2611603ce2) + ) (text "rail monitors\nfor test" (at 119.38 65.405 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid bebd4fdc-8fdd-4867-a58f-50944f335ea7) @@ -2995,7 +3003,7 @@ (uuid ec78abb0-de9d-4e7d-90d6-4c56eec82b68) ) (text "reserved range is for future\nhardware versions incompatible\nwith existing firmware" - (at 135.89 187.325 0) + (at 135.89 187.96 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid f453e92a-98d7-4aa8-b224-0d67dc40ad61) ) @@ -4840,7 +4848,7 @@ (property "Reference" "R53" (id 0) (at 149.733 56.007 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "18.7k±1%" (id 1) (at 149.86 58.42 0) + (property "Value" "8.06k±1%" (id 1) (at 149.86 58.42 0) (effects (font (size 1.27 1.27)) (justify left)) ) (property "Footprint" "Resistor_SMD:R_0402_1005Metric" (id 2) (at 146.177 57.15 90) @@ -4849,13 +4857,13 @@ (property "Datasheet" "~" (id 3) (at 147.955 57.15 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Part Number" "ERJ-2RKF1872X" (id 4) (at 147.955 57.15 0) + (property "Part Number" "ERJ-2RKF8061X" (id 4) (at 147.955 57.15 0) (effects (font (size 1.27 1.27)) hide) ) (property "Substitution" "any equivalent" (id 5) (at 147.955 57.15 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Description" "RES SMD 18.7K OHM 1% 1/10W 0402" (id 6) (at 147.955 57.15 0) + (property "Description" "RES SMD 8.06K OHM 1% 1/10W 0402" (id 6) (at 147.955 57.15 0) (effects (font (size 1.27 1.27)) hide) ) (property "Manufacturer" "Panasonic" (id 7) (at 147.955 57.15 0) diff --git a/rev0/luna_rev0.kicad_pcb b/rev0/luna_rev0.kicad_pcb index f8d88c3..94f784a 100644 --- a/rev0/luna_rev0.kicad_pcb +++ b/rev0/luna_rev0.kicad_pcb @@ -11298,9 +11298,9 @@ (at 128.6 76.6 180) (descr "Resistor SMD 0402 (1005 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "resistor") - (property "Description" "RES SMD 18.7K OHM 1% 1/10W 0402") + (property "Description" "RES SMD 8.06K OHM 1% 1/10W 0402") (property "Manufacturer" "Panasonic") - (property "Part Number" "ERJ-2RKF1872X") + (property "Part Number" "ERJ-2RKF8061X") (property "Sheetfile" "fpga_configuration.kicad_sch") (property "Sheetname" "Debugger and FPGA Configuration") (property "Substitution" "any equivalent") @@ -11310,7 +11310,7 @@ (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp 5a33e042-5dbb-4372-94ef-6abec7ddeef8) ) - (fp_text value "18.7k±1%" (at 0 -1.17) (layer "B.Fab") hide + (fp_text value "8.06k±1%" (at 0 -1.17) (layer "B.Fab") hide (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp 24524e14-0522-4620-9577-d6aad6e456de) ) diff --git a/rev0/luna_rev0.kicad_sch b/rev0/luna_rev0.kicad_sch index ec23627..1df8676 100644 --- a/rev0/luna_rev0.kicad_sch +++ b/rev0/luna_rev0.kicad_sch @@ -1142,8 +1142,8 @@ ) ) - (bus_alias "TYPE_C" (members "SDA" "SCL" "SBU1S" "SBU2S" "~{INT}" "~{FAULT}")) (bus_alias "ULPI" (members "DATA[0..7]" "CLK" "DIR" "STP" "NXT" "~{RESET}")) + (bus_alias "TYPE_C" (members "SDA" "SCL" "SBU1S" "SBU2S" "~{INT}" "~{FAULT}")) (junction (at 76.2 128.27) (diameter 0) (color 0 0 0 0) (uuid 01b76df7-fd1d-4696-a018-c17e903f0523) ) @@ -4956,7 +4956,7 @@ (reference "R52") (unit 1) (value "18.7k±1%") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/00000000-0000-0000-0000-00005dcaa6d2/57d1f2f5-5ee0-43e9-b0ba-a36105cedf19" - (reference "R53") (unit 1) (value "18.7k±1%") (footprint "Resistor_SMD:R_0402_1005Metric") + (reference "R53") (unit 1) (value "8.06k±1%") (footprint "Resistor_SMD:R_0402_1005Metric") ) (path "/00000000-0000-0000-0000-00005da7baf4/f360bbb6-dba4-49b3-bc6e-9dcdcbc6265b" (reference "R54") (unit 1) (value "0") (footprint "Resistor_SMD:R_0402_1005Metric") From 01f4d6c04284871a27754e687537abfd484779d4 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 15:32:16 -0400 Subject: [PATCH 06/10] hardware: rename to Cynthion --- {rev0 => cynthion}/aux_port.kicad_sch | 2 +- {rev0 => cynthion}/clock_pmod.kicad_sch | 2 +- {rev0 => cynthion}/control_port.kicad_sch | 2 +- .../cynthion-cache.lib | 0 .../cynthion.kicad_pcb | 62 +++++++++---------- .../cynthion.kicad_pro | 2 +- .../cynthion.kicad_sch | 2 +- {rev0 => cynthion}/fp-lib-table | 0 .../fpga_configuration.kicad_sch | 2 +- {rev0 => cynthion}/indicators_pmod.kicad_sch | 2 +- .../power_distribution.kicad_sch | 2 +- {rev0 => cynthion}/power_supplies.kicad_sch | 2 +- {rev0 => cynthion}/ram_section.kicad_sch | 2 +- {rev0 => cynthion}/sym-lib-table | 0 {rev0 => cynthion}/target_port.kicad_sch | 2 +- 15 files changed, 42 insertions(+), 42 deletions(-) rename {rev0 => cynthion}/aux_port.kicad_sch (99%) rename {rev0 => cynthion}/clock_pmod.kicad_sch (99%) rename {rev0 => cynthion}/control_port.kicad_sch (99%) rename rev0/luna_rev0-cache.lib => cynthion/cynthion-cache.lib (100%) rename rev0/luna_rev0.kicad_pcb => cynthion/cynthion.kicad_pcb (99%) rename rev0/luna_rev0.kicad_pro => cynthion/cynthion.kicad_pro (99%) rename rev0/luna_rev0.kicad_sch => cynthion/cynthion.kicad_sch (99%) rename {rev0 => cynthion}/fp-lib-table (100%) rename {rev0 => cynthion}/fpga_configuration.kicad_sch (99%) rename {rev0 => cynthion}/indicators_pmod.kicad_sch (99%) rename {rev0 => cynthion}/power_distribution.kicad_sch (99%) rename {rev0 => cynthion}/power_supplies.kicad_sch (99%) rename {rev0 => cynthion}/ram_section.kicad_sch (99%) rename {rev0 => cynthion}/sym-lib-table (100%) rename {rev0 => cynthion}/target_port.kicad_sch (99%) diff --git a/rev0/aux_port.kicad_sch b/cynthion/aux_port.kicad_sch similarity index 99% rename from rev0/aux_port.kicad_sch rename to cynthion/aux_port.kicad_sch index 8b48889..c916ac7 100644 --- a/rev0/aux_port.kicad_sch +++ b/cynthion/aux_port.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/clock_pmod.kicad_sch b/cynthion/clock_pmod.kicad_sch similarity index 99% rename from rev0/clock_pmod.kicad_sch rename to cynthion/clock_pmod.kicad_sch index 3db12f7..def0e8b 100644 --- a/rev0/clock_pmod.kicad_sch +++ b/cynthion/clock_pmod.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/control_port.kicad_sch b/cynthion/control_port.kicad_sch similarity index 99% rename from rev0/control_port.kicad_sch rename to cynthion/control_port.kicad_sch index dcab69e..bf738e0 100644 --- a/rev0/control_port.kicad_sch +++ b/cynthion/control_port.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/luna_rev0-cache.lib b/cynthion/cynthion-cache.lib similarity index 100% rename from rev0/luna_rev0-cache.lib rename to cynthion/cynthion-cache.lib diff --git a/rev0/luna_rev0.kicad_pcb b/cynthion/cynthion.kicad_pcb similarity index 99% rename from rev0/luna_rev0.kicad_pcb rename to cynthion/cynthion.kicad_pcb index 94f784a..7d11124 100644 --- a/rev0/luna_rev0.kicad_pcb +++ b/cynthion/cynthion.kicad_pcb @@ -6,7 +6,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") @@ -1958,7 +1958,7 @@ (property "Description" "USB A TYPE RECEPTACLE, SHORT BODY") (property "Manufacturer" "Jing Extension of the Electronic Co.") (property "Part Number" "C42411") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "Kycon KUSBXHT-SB-AS1N-B30-NF, Tensility 54-00015, GCT USB1125-GF-B") (path "/00000000-0000-0000-0000-00005dd6def2") @@ -2569,7 +2569,7 @@ (property "Description" "SWITCH TACTILE SPST-NO 0.05A 12V") (property "Manufacturer" "XKB") (property "Part Number" "TC-1109DE-B-F") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "DEALON TC-1150DL-6.0H-160") (path "/00000000-0000-0000-0000-00005e2b35a7") @@ -2627,7 +2627,7 @@ (property "Description" "SWITCH TACTILE SPST-NO 0.05A 12V") (property "Manufacturer" "XKB") (property "Part Number" "TC-1109DE-B-F") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "DEALON TC-1150DL-6.0H-160") (path "/00000000-0000-0000-0000-00005e0e6b65") @@ -2757,7 +2757,7 @@ (property "Manufacturer" "DEALON") (property "Note" "populate only when assembling for installation in enclosure") (property "Part Number" "DW254W-22-12-85") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "HCTL PM254-2-06-W-8.5, Sullins PPPC062LJBN-RC") (path "/00000000-0000-0000-0000-0000615abeb3") @@ -2846,7 +2846,7 @@ (property "Manufacturer" "DEALON") (property "Note" "populate only when assembling for installation in enclosure") (property "Part Number" "DW254W-22-12-85") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "HCTL PM254-2-06-W-8.5, Sullins PPPC062LJBN-RC") (path "/00000000-0000-0000-0000-000060c61cd0") @@ -3493,7 +3493,7 @@ (property "Description" "CONN RCPT USB2.0 TYPE-C 16POS") (property "Manufacturer" "HRO") (property "Part Number" "TYPE-C-31-M-12") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "XKB U262-161N-4BVC11, GCT USB4105-GF-A, Cvilux USA CU3216SASDLR009-NH") (path "/00000000-0000-0000-0000-00005fe4b57f") @@ -3579,7 +3579,7 @@ (property "Description" "CONN RCPT USB2.0 TYPE-C 16POS") (property "Manufacturer" "HRO") (property "Part Number" "TYPE-C-31-M-12") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "XKB U262-161N-4BVC11, GCT USB4105-GF-A, Cvilux USA CU3216SASDLR009-NH") (path "/00000000-0000-0000-0000-000060532fe5") @@ -3665,7 +3665,7 @@ (property "Description" "CONN RCPT USB2.0 TYPE-C 16POS") (property "Manufacturer" "HRO") (property "Part Number" "TYPE-C-31-M-12") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "XKB U262-161N-4BVC11, GCT USB4105-GF-A, Cvilux USA CU3216SASDLR009-NH") (path "/00000000-0000-0000-0000-000060048a13") @@ -4230,7 +4230,7 @@ (at 153 117) (descr "Circular Fiducial, 0.5mm bare copper, 1mm soldermask opening (Level C)") (tags "fiducial") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/f9a07a96-2245-4773-a589-1e3981b37642") @@ -4898,7 +4898,7 @@ (at 157 117) (descr "Mounting Hole 2.2mm, M2") (tags "mounting hole 2.2mm m2") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/1c113cd6-b6c8-4346-9061-43d6c68672ce") @@ -5087,7 +5087,7 @@ (at 107 67) (descr "Mounting Hole 2.2mm, M2") (tags "mounting hole 2.2mm m2") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/564cec62-8044-497b-b9b3-960da2971588") @@ -5278,7 +5278,7 @@ (property "Description" "SWITCH TACTILE SPST-NO 0.05A 12V") (property "Manufacturer" "XKB") (property "Part Number" "TC-1109DE-B-F") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "DEALON TC-1150DL-6.0H-160") (path "/c13e7595-773c-4d5f-8e2e-e407450aaeda") @@ -5333,7 +5333,7 @@ (at 157 67) (descr "Mounting Hole 2.2mm, M2") (tags "mounting hole 2.2mm m2") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/0f4f1809-7884-4c35-a52d-9eda978e070f") @@ -5377,7 +5377,7 @@ (at 107 117) (descr "Mounting Hole 2.2mm, M2") (tags "mounting hole 2.2mm m2") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/c3b33086-5ce5-4936-a6c7-930a54f1b69b") @@ -5604,7 +5604,7 @@ (at 110 65) (descr "Circular Fiducial, 0.5mm bare copper, 1mm soldermask opening (Level C)") (tags "fiducial") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/4fa35f20-f7b1-40ae-985b-8f844ad5a33e") @@ -9354,7 +9354,7 @@ (at 108.1 105.9) (descr "SMD pad as test Point, diameter 1.0mm") (tags "test point SMD pad") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/19f9f2ec-9e4a-4a6d-a65f-d24ffeeb25ac") @@ -9438,7 +9438,7 @@ (at 108.1 87.1) (descr "SMD pad as test Point, diameter 1.0mm") (tags "test point SMD pad") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/651ff6fd-51d1-4897-ac87-77a27a2a661a") @@ -10426,7 +10426,7 @@ (property "Description" "RES 0 OHM JUMPER 1/8W 0805") (property "Manufacturer" "Yageo") (property "Part Number" "RC0805JR-070RL") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/024ab0e4-0477-4f98-a5bd-b1644d899ab9") @@ -10519,7 +10519,7 @@ (property "Description" "CAP CER 0.1UF 25V X5R 0402") (property "Manufacturer" "Samsung") (property "Part Number" "CL05A104KA5NNNC") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/b2890dde-c203-4fa7-b995-2f01190e1f17") @@ -11225,7 +11225,7 @@ (at 155.9 105.9 180) (descr "SMD pad as test Point, diameter 1.0mm") (tags "test point SMD pad") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/e0a0915f-52f8-486c-a0c0-f2dd27fcbe98") @@ -11649,7 +11649,7 @@ (property "Description" "RES 0 OHM JUMPER 1/8W 0805") (property "Manufacturer" "Yageo") (property "Part Number" "RC0805JR-070RL") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/775f364f-8943-4e48-a7a1-c8434dc5bc58") @@ -11955,7 +11955,7 @@ (property "Description" "RES 0 OHM JUMPER 1/8W 0805") (property "Manufacturer" "Yageo") (property "Part Number" "RC0805JR-070RL") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/f6108cb7-40a6-4553-9a00-77d0617219c3") @@ -13519,7 +13519,7 @@ (at 154 119 180) (descr "Circular Fiducial, 0.5mm bare copper, 1mm soldermask opening (Level C)") (tags "fiducial") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/29cfba47-59f0-4bed-bf51-ac6521a51735") @@ -14080,7 +14080,7 @@ (property "Description" "CAP CER 0.1UF 25V X5R 0402") (property "Manufacturer" "Samsung") (property "Part Number" "CL05A104KA5NNNC") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/bbb8234b-addf-4fb4-8ec5-cddc89f3761c") @@ -14446,7 +14446,7 @@ (property "Description" "CAP CER 0.1UF 25V X5R 0402") (property "Manufacturer" "Samsung") (property "Part Number" "CL05A104KA5NNNC") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/3336e189-fc6c-4fb1-b558-c09be10e3e14") @@ -14933,7 +14933,7 @@ (at 105 74 180) (descr "Circular Fiducial, 0.5mm bare copper, 1mm soldermask opening (Level C)") (tags "fiducial") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "exclude_from_bom" "") (path "/33d0fe54-8fc4-450e-aee2-594166322a74") @@ -15018,7 +15018,7 @@ (property "Description" "RES 0 OHM JUMPER 1/8W 0805") (property "Manufacturer" "Yageo") (property "Part Number" "RC0805JR-070RL") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/6804d769-581c-4d51-b41a-cec49c974b91") @@ -15092,7 +15092,7 @@ (property "Description" "RES 0 OHM JUMPER 1/8W 0805") (property "Manufacturer" "Yageo") (property "Part Number" "RC0805JR-070RL") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/0b02b4ed-e4d3-4c77-938a-69444adb94c5") @@ -15571,7 +15571,7 @@ (property "Description" "CAP CER 0.1UF 25V X5R 0402") (property "Manufacturer" "Samsung") (property "Part Number" "CL05A104KA5NNNC") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/de83904f-2bea-4be9-86dd-f8c263891c73") @@ -15859,7 +15859,7 @@ (property "Description" "CAP CER 0.1UF 25V X5R 0402") (property "Manufacturer" "Samsung") (property "Part Number" "CL05A104KA5NNNC") - (property "Sheetfile" "luna_rev0.kicad_sch") + (property "Sheetfile" "cynthion.kicad_sch") (property "Sheetname" "") (property "Substitution" "any equivalent") (path "/8bd8e677-7567-4bc3-ae5b-ba1f7f385f96") diff --git a/rev0/luna_rev0.kicad_pro b/cynthion/cynthion.kicad_pro similarity index 99% rename from rev0/luna_rev0.kicad_pro rename to cynthion/cynthion.kicad_pro index 2c1aee3..befd935 100644 --- a/rev0/luna_rev0.kicad_pro +++ b/cynthion/cynthion.kicad_pro @@ -371,7 +371,7 @@ "pinned_symbol_libs": [] }, "meta": { - "filename": "luna_rev0.kicad_pro", + "filename": "cynthion.kicad_pro", "version": 1 }, "net_settings": { diff --git a/rev0/luna_rev0.kicad_sch b/cynthion/cynthion.kicad_sch similarity index 99% rename from rev0/luna_rev0.kicad_sch rename to cynthion/cynthion.kicad_sch index 1df8676..34740c6 100644 --- a/rev0/luna_rev0.kicad_sch +++ b/cynthion/cynthion.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/fp-lib-table b/cynthion/fp-lib-table similarity index 100% rename from rev0/fp-lib-table rename to cynthion/fp-lib-table diff --git a/rev0/fpga_configuration.kicad_sch b/cynthion/fpga_configuration.kicad_sch similarity index 99% rename from rev0/fpga_configuration.kicad_sch rename to cynthion/fpga_configuration.kicad_sch index 1404682..7e91602 100644 --- a/rev0/fpga_configuration.kicad_sch +++ b/cynthion/fpga_configuration.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/indicators_pmod.kicad_sch b/cynthion/indicators_pmod.kicad_sch similarity index 99% rename from rev0/indicators_pmod.kicad_sch rename to cynthion/indicators_pmod.kicad_sch index fb88643..52dccb1 100644 --- a/rev0/indicators_pmod.kicad_sch +++ b/cynthion/indicators_pmod.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/power_distribution.kicad_sch b/cynthion/power_distribution.kicad_sch similarity index 99% rename from rev0/power_distribution.kicad_sch rename to cynthion/power_distribution.kicad_sch index e5512ff..ba005f6 100644 --- a/rev0/power_distribution.kicad_sch +++ b/cynthion/power_distribution.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/power_supplies.kicad_sch b/cynthion/power_supplies.kicad_sch similarity index 99% rename from rev0/power_supplies.kicad_sch rename to cynthion/power_supplies.kicad_sch index ba3638c..ce2ca10 100644 --- a/rev0/power_supplies.kicad_sch +++ b/cynthion/power_supplies.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/ram_section.kicad_sch b/cynthion/ram_section.kicad_sch similarity index 99% rename from rev0/ram_section.kicad_sch rename to cynthion/ram_section.kicad_sch index 4609dee..099c080 100644 --- a/rev0/ram_section.kicad_sch +++ b/cynthion/ram_section.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") diff --git a/rev0/sym-lib-table b/cynthion/sym-lib-table similarity index 100% rename from rev0/sym-lib-table rename to cynthion/sym-lib-table diff --git a/rev0/target_port.kicad_sch b/cynthion/target_port.kicad_sch similarity index 99% rename from rev0/target_port.kicad_sch rename to cynthion/target_port.kicad_sch index b9419de..5741f85 100644 --- a/rev0/target_port.kicad_sch +++ b/cynthion/target_port.kicad_sch @@ -5,7 +5,7 @@ (paper "A4") (title_block - (title "LUNA USB Multitool") + (title "Cynthion") (date "${DATE}") (rev "${VERSION}") (company "Copyright 2019-2023 Great Scott Gadgets") From e07b8644743a892d8ab48a916c610227bf878fc9 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Mon, 1 May 2023 15:19:21 -0400 Subject: [PATCH 07/10] hardware: update version to 1.0.0 --- cynthion/cynthion.kicad_pcb | 8 ++++---- cynthion/cynthion.kicad_pro | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cynthion/cynthion.kicad_pcb b/cynthion/cynthion.kicad_pcb index 7d11124..94e702c 100644 --- a/cynthion/cynthion.kicad_pcb +++ b/cynthion/cynthion.kicad_pcb @@ -64,7 +64,7 @@ (usegerberextensions true) (usegerberattributes false) (usegerberadvancedattributes false) - (creategerberjobfile false) + (creategerberjobfile true) (svguseinch false) (svgprecision 6) (excludeedgelayer true) @@ -94,7 +94,7 @@ ) (property "DATE" "2023-05-01") - (property "VERSION" "0.7+") + (property "VERSION" "1.0.0") (net 0 "") (net 1 "+3V3") @@ -16387,8 +16387,8 @@ (gr_text "FPGA LEDs" (at 126.2 109.4) (layer "F.SilkS") (tstamp 00000000-0000-0000-0000-00005feae838) (effects (font (size 0.9144 0.9238) (thickness 0.15))) ) - (gr_text "r${VERSION}" (at 134.2 102.3) (layer "F.SilkS") (tstamp 00000000-0000-0000-0000-00005fed9a6a) - (effects (font (size 1.5 1.5) (thickness 0.25)) (justify left)) + (gr_text "r${VERSION}" (at 137.25 101.9) (layer "F.SilkS") (tstamp 00000000-0000-0000-0000-00005fed9a6a) + (effects (font (size 1.2 1.2) (thickness 0.2))) ) (gr_text "${DATE}" (at 137.25 105.3) (layer "F.SilkS") (tstamp 00000000-0000-0000-0000-00005fedac72) (effects (font (size 0.7 0.65) (thickness 0.125))) diff --git a/cynthion/cynthion.kicad_pro b/cynthion/cynthion.kicad_pro index befd935..0069545 100644 --- a/cynthion/cynthion.kicad_pro +++ b/cynthion/cynthion.kicad_pro @@ -524,6 +524,6 @@ ], "text_variables": { "DATE": "2023-05-01", - "VERSION": "0.7+" + "VERSION": "1.0.0" } } From 79fd6aea1b72a83b1c034e8dd9546625a33369a1 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 4 May 2023 11:06:13 -0400 Subject: [PATCH 08/10] hardware: rotate fab layer text --- cynthion/cynthion.kicad_pcb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cynthion/cynthion.kicad_pcb b/cynthion/cynthion.kicad_pcb index 94e702c..1264292 100644 --- a/cynthion/cynthion.kicad_pcb +++ b/cynthion/cynthion.kicad_pcb @@ -11522,11 +11522,11 @@ (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp 702466ad-528c-49c2-9153-b3c1a44b2425) ) - (fp_text value "5.6±2%" (at 0 -1.6 180 unlocked) (layer "B.Fab") hide + (fp_text value "5.6±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp ae38d392-d64e-4de0-b53e-07a34ccd681e) ) - (fp_text user "${REFERENCE}" (at 0 -0.9 180 unlocked) (layer "B.Fab") + (fp_text user "${REFERENCE}" (at 0 -0.9 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp 2398823c-13b5-4a7d-906f-52eadf05fa07) ) @@ -12361,11 +12361,11 @@ (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp 7492762e-ca36-4351-abb3-1d23ef54d6fd) ) - (fp_text value "24±2%" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide + (fp_text value "24±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp b9ab9422-005a-46b8-91dc-e5ae3162531b) ) - (fp_text user "${REFERENCE}" (at 0 -0.9 -180 unlocked) (layer "B.Fab") + (fp_text user "${REFERENCE}" (at 0 -0.9 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp 03ff693b-216d-4298-a217-2170ed91292d) ) @@ -13266,11 +13266,11 @@ (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp 80fce2c9-e47d-4126-9ffe-c011d7325929) ) - (fp_text value "TVS" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide + (fp_text value "TVS" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp 4a03ab39-fa78-4920-88fa-9fdffba85ed0) ) - (fp_text user "${REFERENCE}" (at -1.7 0 -180 unlocked) (layer "B.Fab") + (fp_text user "${REFERENCE}" (at -1.7 0 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp ab3757cf-f2ab-4459-bd1f-821f25dfce02) ) @@ -13366,11 +13366,11 @@ (effects (font (size 1 1) (thickness 0.15)) (justify mirror)) (tstamp f1f93e50-14d7-45ef-9bec-fbe38da819bc) ) - (fp_text value "6.2±2%" (at 0 -1.6 -180 unlocked) (layer "B.Fab") hide + (fp_text value "6.2±2%" (at 0 -1.6 unlocked) (layer "B.Fab") hide (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp c2175d0a-ca0d-4e9e-a416-8c2c118ccf9f) ) - (fp_text user "${REFERENCE}" (at 0 -0.9 -180 unlocked) (layer "B.Fab") + (fp_text user "${REFERENCE}" (at 0 -0.9 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp 05d954a5-c265-4fc3-bf52-67f174fe000b) ) @@ -15917,7 +15917,7 @@ (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp 3bb5f141-61d5-4f2b-9b39-36026ad88f1a) ) - (fp_text user "${REFERENCE}" (at 1.475 0.025 180 unlocked) (layer "B.Fab") + (fp_text user "${REFERENCE}" (at 1.475 0.025 unlocked) (layer "B.Fab") (effects (font (size 0.5 0.5) (thickness 0.1)) (justify mirror)) (tstamp c35c14c0-25e2-468b-955a-3b7df6c5fc9d) ) From 2be15ac89d6d577f8fcb224be416535e889f0f50 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Thu, 4 May 2023 11:36:13 -0400 Subject: [PATCH 09/10] hardware: nudge vias out of title silkscreen area --- cynthion/cynthion.kicad_pcb | 1852 +++++++++++++++++------------------ cynthion/cynthion.kicad_pro | 2 +- 2 files changed, 920 insertions(+), 934 deletions(-) diff --git a/cynthion/cynthion.kicad_pcb b/cynthion/cynthion.kicad_pcb index 1264292..96beae9 100644 --- a/cynthion/cynthion.kicad_pcb +++ b/cynthion/cynthion.kicad_pcb @@ -93,7 +93,7 @@ ) ) - (property "DATE" "2023-05-01") + (property "DATE" "2023-05-04") (property "VERSION" "1.0.0") (net 0 "") @@ -17838,28 +17838,27 @@ (segment (start 124.72 74.38) (end 122.47 74.38) (width 0.127) (layer "F.Cu") (net 14) (tstamp c1091d59-1fd4-4e62-a387-361b860a604d)) (segment (start 122 74.85) (end 122 75.625) (width 0.127) (layer "F.Cu") (net 14) (tstamp dd0c6e87-74e8-42b0-b3a4-fa4ab7712ce7)) (segment (start 125.954 73.146) (end 124.72 74.38) (width 0.127) (layer "F.Cu") (net 14) (tstamp e0165bdb-5bc3-4206-a1b4-df1feddce60a)) + (segment (start 131.79 83.79) (end 130.71 83.79) (width 0.127) (layer "F.Cu") (net 15) (tstamp 00b307a7-4efe-42a6-aeef-51e9dc7ae020)) (segment (start 130 86) (end 130 84.7) (width 0.127) (layer "F.Cu") (net 15) (tstamp 05e9cb11-fddc-4752-bc4b-63e6376992f1)) - (segment (start 131.25 83.35) (end 130 84.6) (width 0.127) (layer "F.Cu") (net 15) (tstamp 1439aa5b-890f-49eb-9b1e-c6eaa98f8d87)) - (segment (start 131.63 75.75) (end 130.9375 75.75) (width 0.127) (layer "F.Cu") (net 15) (tstamp 194e733d-0025-4263-9eeb-c5f15e24ccea)) - (segment (start 131.25 83.35) (end 131.55 83.35) (width 0.127) (layer "F.Cu") (net 15) (tstamp 3a461a13-8ac0-4763-8926-10d0c44ff502)) - (segment (start 130 84.6) (end 129.9 84.6) (width 0.127) (layer "F.Cu") (net 15) (tstamp 3a604b70-1cec-4f25-a049-f94c8b4b7543)) - (segment (start 132.22 76.34) (end 131.63 75.75) (width 0.127) (layer "F.Cu") (net 15) (tstamp 3b3221fc-0f5b-47c5-9130-588da7e46a1c)) + (segment (start 132.22 76.39) (end 132.22 83.36) (width 0.127) (layer "F.Cu") (net 15) (tstamp 0be9ba3f-991e-48fa-85c3-7c26e5ccc954)) (segment (start 127.6 86) (end 128 86.4) (width 0.127) (layer "F.Cu") (net 15) (tstamp 4ae9c2f2-7dc3-4f97-aee0-6bdad7512a4f)) (segment (start 129.6 86.4) (end 130 86) (width 0.127) (layer "F.Cu") (net 15) (tstamp 58643d6d-a323-49b1-9b63-6412b94178ca)) + (segment (start 130.9375 75.75) (end 131.58 75.75) (width 0.127) (layer "F.Cu") (net 15) (tstamp 60ab774a-d63f-4315-aceb-bcbc369c6f36)) + (segment (start 130.71 83.79) (end 129.9 84.6) (width 0.127) (layer "F.Cu") (net 15) (tstamp 6e7048ae-3e9d-4afd-b3f8-b456e5c47746)) + (segment (start 132.22 83.36) (end 131.79 83.79) (width 0.127) (layer "F.Cu") (net 15) (tstamp 7bca89f5-ab4c-47c7-bea5-d11329ac696c)) (segment (start 128 86.4) (end 129.6 86.4) (width 0.127) (layer "F.Cu") (net 15) (tstamp 82781d82-55cc-483e-99a7-645de6d9d040)) (segment (start 130 84.7) (end 129.9 84.6) (width 0.127) (layer "F.Cu") (net 15) (tstamp a10f95e2-09cd-44c0-9cb7-58edd68c9b40)) - (segment (start 132.22 82.68) (end 132.22 76.34) (width 0.127) (layer "F.Cu") (net 15) (tstamp b1b27b18-4623-4a49-9f78-0e179864e2d9)) - (segment (start 131.55 83.35) (end 132.22 82.68) (width 0.127) (layer "F.Cu") (net 15) (tstamp c178e5b4-ab32-4846-a4d1-ff70189142f8)) + (segment (start 131.58 75.75) (end 132.22 76.39) (width 0.127) (layer "F.Cu") (net 15) (tstamp e3cbd9ed-7a5d-4906-a764-0e87ff4f0090)) (via (at 129.9 84.6) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 15) (tstamp 45621bcc-9532-4f3c-886f-31c94301d321)) (segment (start 129.9 84.6) (end 127.9 84.6) (width 0.127) (layer "B.Cu") (net 15) (tstamp 4c38d251-cf50-4e34-aaa2-7b57c70be900)) (segment (start 130.9375 74.75) (end 131.73 74.75) (width 0.127) (layer "F.Cu") (net 16) (tstamp 067978d3-47b8-464f-9946-f223031da08f)) - (segment (start 130.8 86) (end 130.8 84.53) (width 0.127) (layer "F.Cu") (net 16) (tstamp 0aabbbba-f52f-44a2-b0c7-d67075ab4bb2)) - (segment (start 131.46 83.87) (end 131.77 83.87) (width 0.127) (layer "F.Cu") (net 16) (tstamp 347f58fc-cc00-48bb-a443-a5684b872f26)) - (segment (start 132.14 74.75) (end 132.74 75.35) (width 0.127) (layer "F.Cu") (net 16) (tstamp 3f606a52-3f79-4ad1-9e82-2a0e5afbfdc8)) - (segment (start 131.73 74.75) (end 132.14 74.75) (width 0.127) (layer "F.Cu") (net 16) (tstamp 4a2a680a-d0d4-413f-b431-0b1fcb83da5a)) - (segment (start 131.77 83.87) (end 132.74 82.9) (width 0.127) (layer "F.Cu") (net 16) (tstamp 8e1deed8-3eb0-4126-8ee6-155d7707ae7e)) - (segment (start 130.8 84.53) (end 131.46 83.87) (width 0.127) (layer "F.Cu") (net 16) (tstamp a8ebb59d-fb7f-495f-beab-340fc6c7a8a6)) - (segment (start 132.74 82.9) (end 132.74 75.35) (width 0.127) (layer "F.Cu") (net 16) (tstamp f33e5ddb-4311-40ec-a035-dacc74ffbfdb)) + (segment (start 131.99 84.31) (end 132.74 83.56) (width 0.127) (layer "F.Cu") (net 16) (tstamp 201daf3f-f8dc-4054-8163-29b99e958b7f)) + (segment (start 130.8 86) (end 130.8 84.53) (width 0.127) (layer "F.Cu") (net 16) (tstamp 44d0e9db-0201-45eb-b578-842de52247a3)) + (segment (start 132.74 75.35) (end 132.14 74.75) (width 0.127) (layer "F.Cu") (net 16) (tstamp 47e29a67-2428-4f5a-a80f-4e3a2fa492d5)) + (segment (start 130.8 84.53) (end 131.02 84.31) (width 0.127) (layer "F.Cu") (net 16) (tstamp 530aec29-e1ed-4715-b722-5f43fc35d9b9)) + (segment (start 132.74 83.56) (end 132.74 75.35) (width 0.127) (layer "F.Cu") (net 16) (tstamp 97354363-943f-4879-ae74-116b398ebd76)) + (segment (start 131.02 84.31) (end 131.99 84.31) (width 0.127) (layer "F.Cu") (net 16) (tstamp a6d1534b-ffcb-49db-94be-d4ad18c22d8a)) + (segment (start 132.14 74.75) (end 131.73 74.75) (width 0.127) (layer "F.Cu") (net 16) (tstamp f4206fc9-86a3-478c-b20e-487d9e714a4c)) (via (at 131.73 74.75) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 16) (tstamp 114c10fb-e930-4182-96f5-6045f1af7d5b)) (segment (start 130.7 75.7) (end 130.78 75.7) (width 0.127) (layer "B.Cu") (net 16) (tstamp 3ac513a0-7f3e-4dfb-898b-09ea65b51d9f)) (segment (start 130.78 75.7) (end 131.73 74.75) (width 0.127) (layer "B.Cu") (net 16) (tstamp e3826636-2fd1-4c87-800c-87ab537e016a)) @@ -17868,11 +17867,11 @@ (segment (start 131.53 85.4) (end 131.6 85.4) (width 0.127) (layer "B.Cu") (net 17) (tstamp 12e6ba44-4657-4a92-8051-9601f8775e5c)) (segment (start 130.7 86.11) (end 130.82 86.11) (width 0.127) (layer "B.Cu") (net 17) (tstamp 7f3e5ca2-96b0-40a7-a31b-6ba9760ed840)) (segment (start 130.82 86.11) (end 131.53 85.4) (width 0.127) (layer "B.Cu") (net 17) (tstamp a33641ba-dabd-48e1-ba30-6abeb6ae67e3)) - (segment (start 133.51 82.87) (end 133.51 75.44) (width 0.127) (layer "F.Cu") (net 18) (tstamp 53680aff-c06c-421b-a9fc-fb070be82469)) - (segment (start 132.4 83.98) (end 133.51 82.87) (width 0.127) (layer "F.Cu") (net 18) (tstamp 7f2c462d-74a7-4d7d-af6e-68416ab70a01)) - (segment (start 132.4 86) (end 132.4 83.98) (width 0.127) (layer "F.Cu") (net 18) (tstamp a60ce31a-af25-4b7f-8657-c485ab01c54c)) - (segment (start 135.355 73.595) (end 136.4 73.595) (width 0.127) (layer "F.Cu") (net 18) (tstamp e92b9cbc-c83e-4478-9307-fbf11037475f)) - (segment (start 133.51 75.44) (end 135.355 73.595) (width 0.127) (layer "F.Cu") (net 18) (tstamp fd318b82-a7f5-47ca-8dfd-a45887fd355c)) + (segment (start 135.355 73.595) (end 136.4 73.595) (width 0.127) (layer "F.Cu") (net 18) (tstamp 1b57d6bd-e0eb-46f8-a077-9aaad92cedb7)) + (segment (start 132.4 84.63) (end 133.51 83.52) (width 0.127) (layer "F.Cu") (net 18) (tstamp 2a7e22ab-b72e-472c-b86d-f6a6bd0a989c)) + (segment (start 133.51 75.44) (end 135.355 73.595) (width 0.127) (layer "F.Cu") (net 18) (tstamp a12a07a7-613f-46d2-8382-4126df1bc501)) + (segment (start 133.51 83.52) (end 133.51 75.44) (width 0.127) (layer "F.Cu") (net 18) (tstamp bbd1f8a5-8f54-4235-8163-b563e36ee523)) + (segment (start 132.4 86) (end 132.4 84.63) (width 0.127) (layer "F.Cu") (net 18) (tstamp c1b91d95-ad12-4a9e-b5c0-a62fd8affb90)) (segment (start 133.78 77.07) (end 135.35 75.5) (width 0.127) (layer "F.Cu") (net 19) (tstamp 32554268-8fbf-4fae-8d62-cfdf942337d9)) (segment (start 135.35 75.5) (end 137.8 75.5) (width 0.127) (layer "F.Cu") (net 19) (tstamp 39a31937-1a88-43dc-985f-1a10e5c735ea)) (segment (start 133.78 84.89) (end 133.78 77.07) (width 0.127) (layer "F.Cu") (net 19) (tstamp a1a74815-0ead-47fa-bc74-92245da2a092)) @@ -17892,17 +17891,17 @@ (via (at 140.5 90.1) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 21) (tstamp 928e293b-37c5-4aec-bd47-3681153f8595)) (segment (start 140.5 92.69) (end 140.5 90.1) (width 0.127) (layer "B.Cu") (net 21) (tstamp 4938f413-cc9e-42d2-8347-1ada23c85283)) (segment (start 131.73 75.25) (end 132.26 75.78) (width 0.127) (layer "F.Cu") (net 22) (tstamp 169e81b3-7bb6-47a2-aa96-13c885fb2c88)) - (segment (start 130.4 84.57) (end 130.4 86.4) (width 0.127) (layer "F.Cu") (net 22) (tstamp 1ee331e8-ee8f-4483-86f1-0c9b325f657d)) - (segment (start 130.4 86.4) (end 130 86.8) (width 0.127) (layer "F.Cu") (net 22) (tstamp 388aeea8-c798-4eca-8d5e-b498a8de4bd0)) - (segment (start 132.48 82.79) (end 131.66 83.61) (width 0.127) (layer "F.Cu") (net 22) (tstamp 4b34fbae-4e42-4855-aded-3efb22dd3270)) - (segment (start 131.66 83.61) (end 131.36 83.61) (width 0.127) (layer "F.Cu") (net 22) (tstamp 6f7eb9ff-b429-4c72-9636-ef756d88f66d)) + (segment (start 130.4 84.56) (end 130.4 86.4) (width 0.127) (layer "F.Cu") (net 22) (tstamp 4642479c-00d9-435a-810a-c3086362baaa)) + (segment (start 132.48 76) (end 132.48 83.46) (width 0.127) (layer "F.Cu") (net 22) (tstamp 59458b86-5c33-45a4-8a06-6d6950200f90)) + (segment (start 131.89 84.05) (end 130.91 84.05) (width 0.127) (layer "F.Cu") (net 22) (tstamp 667c07b7-7230-42b3-b449-431e8b4b91e5)) + (segment (start 132.48 83.46) (end 131.89 84.05) (width 0.127) (layer "F.Cu") (net 22) (tstamp 6837f786-689f-4db4-94b1-55ba8334bbe9)) + (segment (start 130.91 84.05) (end 130.4 84.56) (width 0.127) (layer "F.Cu") (net 22) (tstamp 92e680d9-9be2-4208-8a43-fc6221bb77db)) + (segment (start 132.26 75.78) (end 132.48 76) (width 0.127) (layer "F.Cu") (net 22) (tstamp 9e0a4dd6-b411-4231-be0e-b1aec38464c0)) (segment (start 128 87.2) (end 127.6 86.8) (width 0.127) (layer "F.Cu") (net 22) (tstamp ce41bacb-e60f-4f15-abc5-fb1c114fc935)) (segment (start 129.6 87.2) (end 128 87.2) (width 0.127) (layer "F.Cu") (net 22) (tstamp d6087285-0796-41c8-8e73-6b0dd0e0cae7)) - (segment (start 132.48 76) (end 132.48 82.79) (width 0.127) (layer "F.Cu") (net 22) (tstamp d853d0b1-36f5-4cf3-ba4d-36a5301c96ec)) - (segment (start 132.26 75.78) (end 132.48 76) (width 0.127) (layer "F.Cu") (net 22) (tstamp db0a2cb4-78a7-4fb7-90bb-dcd433bc14ed)) - (segment (start 131.36 83.61) (end 130.4 84.57) (width 0.127) (layer "F.Cu") (net 22) (tstamp e3423ea6-b321-46a6-bae0-0c262e1b5d7f)) (segment (start 130 86.8) (end 129.6 87.2) (width 0.127) (layer "F.Cu") (net 22) (tstamp ea67be91-df94-4195-a44b-1f1a9732be6d)) (segment (start 130.9375 75.25) (end 131.73 75.25) (width 0.127) (layer "F.Cu") (net 22) (tstamp ec061f41-7828-475e-b132-7d463d8293b3)) + (segment (start 130.4 86.4) (end 130 86.8) (width 0.127) (layer "F.Cu") (net 22) (tstamp ee874fab-a04f-4b94-a743-ccbcda6806f5)) (via (at 132.26 75.78) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 22) (tstamp 78eed9d2-3a4d-4368-911a-df44940ae0cf)) (segment (start 133.08 76.6) (end 133.8 76.6) (width 0.127) (layer "B.Cu") (net 22) (tstamp 40448e3f-002b-4f7e-b8a1-f845fad5eada)) (segment (start 132.26 75.78) (end 133.08 76.6) (width 0.127) (layer "B.Cu") (net 22) (tstamp ca6abde3-5b93-4a02-9a5d-3dcc84fbe40c)) @@ -17910,38 +17909,36 @@ (via (at 130.4 87.2) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 23) (tstamp 717b22e1-8700-48a2-b3df-ebe410b4fe6d)) (segment (start 130.4 86.69) (end 129.71 86) (width 0.127) (layer "B.Cu") (net 23) (tstamp 1ac929f9-2ed1-43c7-8206-a7f0bc348fb2)) (segment (start 130.4 87.2) (end 130.4 86.69) (width 0.127) (layer "B.Cu") (net 23) (tstamp 2bada6cd-e4f9-4e4e-ac19-252b7c70aeb1)) - (segment (start 131.2 86.4) (end 131.2 85.7) (width 0.127) (layer "F.Cu") (net 24) (tstamp 146e897c-a078-4809-9962-093a76d49363)) - (segment (start 131.2 85.7) (end 131.1 85.6) (width 0.127) (layer "F.Cu") (net 24) (tstamp 23805e9b-1a7c-473e-aa85-5e23f21b01fa)) - (segment (start 131.1 84.84) (end 131.36 84.58) (width 0.127) (layer "F.Cu") (net 24) (tstamp 3a0f4db4-fe58-4004-a124-ca98a228bc78)) + (segment (start 131.2 86.4) (end 131.6 86.8) (width 0.127) (layer "F.Cu") (net 24) (tstamp 0b5fa6c2-72e3-4da7-843f-bbb38eeac47b)) + (segment (start 131.1 85.6) (end 131.2 85.7) (width 0.127) (layer "F.Cu") (net 24) (tstamp 13619c87-fc93-4b32-8b5a-bc098473245a)) (segment (start 131.2 77.25) (end 130.9375 77.25) (width 0.127) (layer "F.Cu") (net 24) (tstamp 3a36af27-ca08-4c01-89d2-f8f4005a70ae)) (segment (start 131.44 77.49) (end 131.2 77.25) (width 0.127) (layer "F.Cu") (net 24) (tstamp 44f1948e-8775-4bbe-ad80-e554720472ae)) (segment (start 131.44 81.21) (end 131.44 77.49) (width 0.127) (layer "F.Cu") (net 24) (tstamp 7ba363fd-0ff9-481c-bce7-dfb914d615f4)) + (segment (start 131.1 85.6) (end 131.1 85.07) (width 0.127) (layer "F.Cu") (net 24) (tstamp 7fcdd096-9b17-4c53-8222-5a86a3ab1924)) (segment (start 130 82.65) (end 131.44 81.21) (width 0.127) (layer "F.Cu") (net 24) (tstamp 8a519d30-675b-4a61-b050-8d7571e386fa)) - (segment (start 131.1 85.6) (end 131.1 84.84) (width 0.127) (layer "F.Cu") (net 24) (tstamp 8e4ba300-17bf-45e6-a153-e7213b483d60)) + (segment (start 131.1 85.07) (end 131.42 84.75) (width 0.127) (layer "F.Cu") (net 24) (tstamp 94a34f9d-b64f-4722-84fa-b93867ea868b)) (segment (start 130 83.62) (end 130 82.65) (width 0.127) (layer "F.Cu") (net 24) (tstamp ad4e15c1-c1a3-4927-b529-a02e4941db5d)) - (segment (start 131.6 86.8) (end 131.2 86.4) (width 0.127) (layer "F.Cu") (net 24) (tstamp f110fa16-2db0-4241-b906-dded1619fd76)) + (segment (start 131.2 85.7) (end 131.2 86.4) (width 0.127) (layer "F.Cu") (net 24) (tstamp d541de08-8a4a-46c3-901a-2e687f550df8)) (via (at 130 83.62) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 24) (tstamp 0d817cb7-4225-42b7-b88a-275ea9a95452)) - (via (at 131.36 84.58) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 24) (tstamp 40befaf1-3657-428d-948d-28d2a808dea9)) - (segment (start 131.36 84.58) (end 130.96 84.58) (width 0.127) (layer "B.Cu") (net 24) (tstamp 37fb7a08-b6c3-43c9-bcbd-34a325b344ff)) - (segment (start 130.96 84.58) (end 130 83.62) (width 0.127) (layer "B.Cu") (net 24) (tstamp 563919a8-35f9-4557-b8e8-29f383cd4c61)) + (via (at 131.42 84.75) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 24) (tstamp 40befaf1-3657-428d-948d-28d2a808dea9)) + (segment (start 130 83.62) (end 130.88 84.5) (width 0.127) (layer "B.Cu") (net 24) (tstamp 00cb5eb9-f220-412f-ba36-db34f505f560)) + (segment (start 131.17 84.5) (end 131.42 84.75) (width 0.127) (layer "B.Cu") (net 24) (tstamp 091c1bb1-7255-4ab7-a778-4ef2963e01b2)) + (segment (start 130.88 84.5) (end 131.17 84.5) (width 0.127) (layer "B.Cu") (net 24) (tstamp 33a2cbbc-dd45-417c-b143-bb2fca66f539)) (segment (start 128.51 82.7) (end 130 82.7) (width 0.127) (layer "B.Cu") (net 24) (tstamp 76448301-b218-4ba1-860e-c34e2af58433)) (segment (start 130 82.7) (end 130 83.62) (width 0.127) (layer "B.Cu") (net 24) (tstamp 7b776d52-7d75-4183-b66e-93f55f2bdd32)) (segment (start 128.51 82.7) (end 128.51 81.6) (width 0.127) (layer "B.Cu") (net 24) (tstamp 8349d6c7-3abd-4de1-b536-677a33fa6e03)) + (segment (start 131.7 76.9) (end 131.7 82.28) (width 0.127) (layer "F.Cu") (net 25) (tstamp 2d3c68e9-7ebd-422c-a96e-8b798ef8da0a)) + (segment (start 131.7 82.28) (end 130.65 83.33) (width 0.127) (layer "F.Cu") (net 25) (tstamp 2ea1ed98-a18b-4da7-bc54-f4c163b97087)) (segment (start 130.9375 76.75) (end 131.55 76.75) (width 0.127) (layer "F.Cu") (net 25) (tstamp 3f19f9ec-d84b-4539-be0d-cde72b0e4ef2)) - (segment (start 131.7 81.55) (end 130.93 82.32) (width 0.127) (layer "F.Cu") (net 25) (tstamp 5d6fe623-597c-45e5-90cb-62e2aa875af1)) (segment (start 132.4 86.6) (end 132.8 86.2) (width 0.127) (layer "F.Cu") (net 25) (tstamp 75a4dad5-6cdc-49ea-9a83-002c9a3389af)) (segment (start 132.4 86.8) (end 132.4 86.6) (width 0.127) (layer "F.Cu") (net 25) (tstamp 7b173540-e4ba-4162-bf11-b6303f96bc3e)) (segment (start 131.55 76.75) (end 131.7 76.9) (width 0.127) (layer "F.Cu") (net 25) (tstamp 7f2f801e-fb21-45e2-ab1c-cdabd4f50a52)) - (segment (start 131.7 76.9) (end 131.7 81.55) (width 0.127) (layer "F.Cu") (net 25) (tstamp 9d649031-2796-495e-89d2-f9c2c72579c7)) (segment (start 132.8 84.86) (end 133.2 84.46) (width 0.127) (layer "F.Cu") (net 25) (tstamp ca223f0b-2459-446d-be15-16032eeb4c37)) (segment (start 132.8 86.2) (end 132.8 84.86) (width 0.127) (layer "F.Cu") (net 25) (tstamp dacfe1d8-54be-4314-9f8c-1728eafeb996)) - (segment (start 130.93 82.32) (end 130.93 82.33) (width 0.127) (layer "F.Cu") (net 25) (tstamp ea4a2bd3-7dd1-4d73-a506-56e641403a87)) (via (at 133.2 84.46) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 25) (tstamp 280f1651-052e-4c75-bc6b-370f51475d66)) - (via (at 130.93 82.33) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 25) (tstamp 9959cf2c-9e81-42c6-9c69-513da2120a75)) - (segment (start 132.5 83.36) (end 131.96 83.36) (width 0.127) (layer "B.Cu") (net 25) (tstamp 0021d012-1ac9-4368-8a48-fb0b7df6799d)) - (segment (start 131.96 83.36) (end 130.93 82.33) (width 0.127) (layer "B.Cu") (net 25) (tstamp 22025820-2802-48ea-904c-28b833043347)) - (segment (start 133.2 84.46) (end 133.2 84.06) (width 0.127) (layer "B.Cu") (net 25) (tstamp b0e43baf-4aff-4cd3-9689-759a5838b6a8)) - (segment (start 133.2 84.06) (end 132.5 83.36) (width 0.127) (layer "B.Cu") (net 25) (tstamp d7545e37-68f1-499a-884e-e597698e0930)) + (via (at 130.65 83.33) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 25) (tstamp 62adec07-1193-4845-8d72-6a78d09cae14)) + (segment (start 131.78 84.46) (end 133.2 84.46) (width 0.127) (layer "B.Cu") (net 25) (tstamp 85eba381-bce8-464f-854d-65de1040e86e)) + (segment (start 130.65 83.33) (end 131.78 84.46) (width 0.127) (layer "B.Cu") (net 25) (tstamp e6491d7e-444d-475a-acd9-26330772ce67)) (segment (start 146.1933 93.55) (end 142.63 93.55) (width 0.127) (layer "F.Cu") (net 26) (tstamp 1973c942-7441-4268-844b-d39a783e0ef1)) (segment (start 135.2 91.2) (end 134.8 90.8) (width 0.127) (layer "F.Cu") (net 26) (tstamp 2f25bbf0-f422-4eb7-a234-4d5e2f7ac1bc)) (segment (start 147.96 95.3167) (end 147.96 95.86) (width 0.127) (layer "F.Cu") (net 26) (tstamp 7ede1dee-0d15-4de0-9a8f-c86f41c50ff0)) @@ -18088,41 +18085,41 @@ (via (at 130.4 88.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 46) (tstamp b19c44a4-f8cc-47c6-810a-9020fa0153dc)) (segment (start 129.71 88.11) (end 129.71 88) (width 0.127) (layer "B.Cu") (net 46) (tstamp 3de3f5cd-a724-484f-abd2-8eb959e95f87)) (segment (start 130.4 88.8) (end 129.71 88.11) (width 0.127) (layer "B.Cu") (net 46) (tstamp ae5b8d88-eb1b-48cc-a15f-86195bf4dc9f)) + (segment (start 133.25 83.42) (end 133.25 74.85) (width 0.127) (layer "F.Cu") (net 47) (tstamp 126189c0-e33b-436c-b218-f4a289631295)) + (segment (start 132 88) (end 132 85.7) (width 0.127) (layer "F.Cu") (net 47) (tstamp 13c5f1ec-d7ed-4dfa-83dd-00b266bb9ac3)) + (segment (start 137.33 72.92) (end 137.57 73.16) (width 0.127) (layer "F.Cu") (net 47) (tstamp 3ef1613d-5ab6-4ccd-a904-e1ddcb0d9b13)) (segment (start 137.57 74.7) (end 137.405 74.865) (width 0.127) (layer "F.Cu") (net 47) (tstamp 57e4fead-e9ef-448d-b382-a6792b23f1af)) (segment (start 137.57 73.16) (end 137.57 74.7) (width 0.127) (layer "F.Cu") (net 47) (tstamp 5e7e7a7d-5338-4780-a3c7-3f59d4ec4ed8)) - (segment (start 137.33 72.92) (end 137.57 73.16) (width 0.127) (layer "F.Cu") (net 47) (tstamp 78542dab-4c2b-440c-8a12-c7a988e1b164)) - (segment (start 131.6 88.4) (end 132 88) (width 0.127) (layer "F.Cu") (net 47) (tstamp 7d3c22c0-30d4-496c-aefd-3c7043aadede)) - (segment (start 133.25 74.85) (end 135.18 72.92) (width 0.127) (layer "F.Cu") (net 47) (tstamp 85764ae4-8ef0-48a7-96f1-dbb89ff467c4)) + (segment (start 133.25 74.85) (end 135.18 72.92) (width 0.127) (layer "F.Cu") (net 47) (tstamp 5f046fe7-7947-460b-9d9d-2b6cca04b6d1)) + (segment (start 135.18 72.92) (end 137.33 72.92) (width 0.127) (layer "F.Cu") (net 47) (tstamp 7111cd20-b8c8-40c5-a65a-8578ac9b7d1b)) + (segment (start 131.6 88.4) (end 132 88) (width 0.127) (layer "F.Cu") (net 47) (tstamp 7d5dc321-1275-46b5-91d2-f7be5ea2c311)) (segment (start 137.405 74.865) (end 136.4 74.865) (width 0.127) (layer "F.Cu") (net 47) (tstamp 8ae3b048-c6a9-43b2-9551-6d83c9e95c51)) - (segment (start 132 85.7) (end 132.1 85.6) (width 0.127) (layer "F.Cu") (net 47) (tstamp 8d0d26b8-288f-40b9-9db6-bb4363396419)) - (segment (start 132.1 83.91) (end 133.25 82.76) (width 0.127) (layer "F.Cu") (net 47) (tstamp a13ed200-7f02-46b2-8213-a871a0c483ad)) - (segment (start 132 88) (end 132 85.7) (width 0.127) (layer "F.Cu") (net 47) (tstamp bdccb2b3-07dc-41ba-8148-6e5175048476)) - (segment (start 133.25 82.76) (end 133.25 74.85) (width 0.127) (layer "F.Cu") (net 47) (tstamp caacd65b-1d78-44ca-b621-6c32d12010ba)) - (segment (start 132.1 85.6) (end 132.1 83.91) (width 0.127) (layer "F.Cu") (net 47) (tstamp cab8a07c-cef9-4de4-8546-2fccee4c3201)) - (segment (start 135.18 72.92) (end 137.33 72.92) (width 0.127) (layer "F.Cu") (net 47) (tstamp cfeacbd3-8ff9-457b-99de-7c673428fcb0)) + (segment (start 132.1 85.6) (end 132.1 84.57) (width 0.127) (layer "F.Cu") (net 47) (tstamp 8cb3e158-01f0-4a9f-ba86-4d8c55e8d8f0)) + (segment (start 132 85.7) (end 132.1 85.6) (width 0.127) (layer "F.Cu") (net 47) (tstamp df7843be-335a-4b98-a929-85e25bb11f1f)) + (segment (start 132.1 84.57) (end 133.25 83.42) (width 0.127) (layer "F.Cu") (net 47) (tstamp e2648ddf-d5a8-418d-80c5-c592931775c7)) (via (at 137.57 73.16) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 47) (tstamp 801d760f-7d69-4e4b-aa2e-6438401472e2)) (segment (start 137.57 73.16) (end 138.54 73.16) (width 0.127) (layer "B.Cu") (net 47) (tstamp 362c9d8a-1b87-4331-ab1c-78951351191b)) (segment (start 138.6 74.59) (end 138.6 73.1) (width 0.127) (layer "B.Cu") (net 47) (tstamp 8d5c469c-4453-411f-9eb9-898c1f10c522)) (segment (start 138.54 73.16) (end 138.6 73.1) (width 0.127) (layer "B.Cu") (net 47) (tstamp ffa9d180-36e5-46af-b1b7-06f5c8fd9216)) + (segment (start 134.79 83.03) (end 134.56 82.8) (width 0.127) (layer "F.Cu") (net 49) (tstamp 11d224c9-d325-478d-a30c-d901b94c354e)) (segment (start 138.275 77.405) (end 137.77 76.9) (width 0.127) (layer "F.Cu") (net 49) (tstamp 1df7baa4-7627-4512-95f4-8d41fe5773e5)) (segment (start 139.905 77.405) (end 138.275 77.405) (width 0.127) (layer "F.Cu") (net 49) (tstamp 259ca17f-13c9-41e1-9b70-7a66ea545565)) (segment (start 135.32 76.9) (end 134.56 77.66) (width 0.127) (layer "F.Cu") (net 49) (tstamp 478870ce-8c5f-4d07-b5b3-611437129f1c)) - (segment (start 134.72 82.08) (end 134.72 81.64) (width 0.127) (layer "F.Cu") (net 49) (tstamp 665a92e6-0ffb-4eb2-959e-ae754f17cc42)) - (segment (start 134.56 81.48) (end 134.56 77.66) (width 0.127) (layer "F.Cu") (net 49) (tstamp cb62a2ef-672f-467e-9581-8a58d4d00547)) - (segment (start 134.72 81.64) (end 134.56 81.48) (width 0.127) (layer "F.Cu") (net 49) (tstamp cdd275c6-edd7-4dd3-bdd3-25f4790e1d6a)) + (segment (start 134.79 83.43) (end 134.79 83.03) (width 0.127) (layer "F.Cu") (net 49) (tstamp 9b7343fe-0987-4c03-ac98-059b001c037a)) + (segment (start 134.56 82.8) (end 134.56 77.66) (width 0.127) (layer "F.Cu") (net 49) (tstamp cc987ece-0aea-445b-8eea-622a68d07087)) (segment (start 137.77 76.9) (end 135.32 76.9) (width 0.127) (layer "F.Cu") (net 49) (tstamp d511e704-9d3a-4483-aabf-3aaa89600e7f)) (segment (start 132.4 88.4) (end 132.8 88.8) (width 0.127) (layer "F.Cu") (net 49) (tstamp e7f1ee50-c036-42d9-9045-3ab0ce6a6295)) (segment (start 143.6 77.405) (end 139.905 77.405) (width 0.127) (layer "F.Cu") (net 49) (tstamp ec7baff2-ccaa-4867-817a-d3363464b2b7)) (via (at 132.8 88.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 49) (tstamp 176b78b8-e972-4cd4-be9e-f1673a432494)) - (via (at 134.72 82.08) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 49) (tstamp 5f5020f8-7f06-42a1-a92d-ccb4d7aad4b1)) + (via (at 134.79 83.43) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 49) (tstamp 5c43adfb-b419-4960-8aac-4c9b4a459968)) (via (at 139.905 77.405) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 49) (tstamp dd342ee3-f1a6-436e-82cc-3279958f89ce)) - (segment (start 133.9 87.7) (end 133.9 82.9) (width 0.127) (layer "B.Cu") (net 49) (tstamp 215513e7-b54f-4033-961d-e4a9ade1210c)) (segment (start 132.8 88.8) (end 133.9 87.7) (width 0.127) (layer "B.Cu") (net 49) (tstamp 2c880b5c-5480-4e8d-a52d-50776eff0a5a)) - (segment (start 133.9 82.9) (end 134.72 82.08) (width 0.127) (layer "B.Cu") (net 49) (tstamp 7509f194-77f4-4db4-8e58-4ead2a5ea51d)) (segment (start 139.91 76.6) (end 139.91 77.4) (width 0.127) (layer "B.Cu") (net 49) (tstamp 78a78cc1-e529-4ca8-a913-51d902f7fdd5)) (segment (start 139.91 77.4) (end 139.905 77.405) (width 0.127) (layer "B.Cu") (net 49) (tstamp 831bd7d6-87c1-40b3-b4ff-4e36cbf7da3b)) - (segment (start 135.68 82.08) (end 135.7 82.1) (width 0.127) (layer "B.Cu") (net 49) (tstamp cfcef637-5a4c-49a9-966b-86c527570bb1)) - (segment (start 134.72 82.08) (end 135.68 82.08) (width 0.127) (layer "B.Cu") (net 49) (tstamp dba71d09-2595-498c-a723-b84b6f34741b)) + (segment (start 134.79 83.43) (end 134.79 83.01) (width 0.127) (layer "B.Cu") (net 49) (tstamp 83c2383c-779e-499a-8723-bff6d7a8a919)) + (segment (start 134.79 83.01) (end 135.7 82.1) (width 0.127) (layer "B.Cu") (net 49) (tstamp a580fa2a-628b-4067-af12-12cda6803040)) + (segment (start 133.9 84.32) (end 134.79 83.43) (width 0.127) (layer "B.Cu") (net 49) (tstamp be545826-4b41-4758-8adc-8957c35cc5c5)) + (segment (start 133.9 87.7) (end 133.9 84.32) (width 0.127) (layer "B.Cu") (net 49) (tstamp bf5b1a3d-0d00-49e2-822a-667d2db97156)) (segment (start 133.2 88.4) (end 132.8 88) (width 0.127) (layer "F.Cu") (net 50) (tstamp 046118d2-6860-4d0c-ab21-81e5e9f32a29)) (segment (start 133.6 86.2) (end 133.6 85.43) (width 0.127) (layer "F.Cu") (net 50) (tstamp 27539637-0667-4e6c-96b9-7fd0641509b3)) (segment (start 133 86.4) (end 133.4 86.4) (width 0.127) (layer "F.Cu") (net 50) (tstamp 3edd221b-c0a9-4d52-bee3-baf486dcc0a4)) @@ -18147,19 +18144,20 @@ (segment (start 108.45 93.34) (end 108.61 93.5) (width 0.2032) (layer "B.Cu") (net 51) (tstamp f29e38dd-ba5e-40c4-870c-778b924dceae)) (segment (start 108.61 94.21) (end 108.61 95.71) (width 0.2032) (layer "B.Cu") (net 51) (tstamp fb100085-240a-4442-8183-d2d81ab6fe19)) (segment (start 130.9375 76.25) (end 131.62 76.25) (width 0.127) (layer "F.Cu") (net 52) (tstamp 08dc4f0a-6a4b-4730-8067-5021b63bf4e0)) + (segment (start 131.96 82.96) (end 131.59 83.33) (width 0.127) (layer "F.Cu") (net 52) (tstamp 11db0456-a846-4af8-ac7a-adc33732d8e2)) (segment (start 130.8 89.2) (end 131.2 88.8) (width 0.127) (layer "F.Cu") (net 52) (tstamp 50c24c1b-172d-4b48-b8f4-4cbf4d01143a)) - (segment (start 131.96 82.31) (end 131.79 82.48) (width 0.127) (layer "F.Cu") (net 52) (tstamp 6d64e063-8c0e-41a3-b363-5b360e4b3505)) - (segment (start 131.96 76.59) (end 131.96 82.31) (width 0.127) (layer "F.Cu") (net 52) (tstamp a1c5d7c4-8777-4441-b04b-fc27ecf463a3)) + (segment (start 131.96 76.59) (end 131.96 82.96) (width 0.127) (layer "F.Cu") (net 52) (tstamp adb06bc9-5222-405d-b79e-47285a3d4a2f)) (segment (start 131.2 88.8) (end 132 88.8) (width 0.127) (layer "F.Cu") (net 52) (tstamp b64a0d8e-69b7-4a05-8274-3c4b574667cf)) (segment (start 131.62 76.25) (end 131.96 76.59) (width 0.127) (layer "F.Cu") (net 52) (tstamp e115457c-b390-4d59-8301-55c0a7a0a0a7)) + (via (at 131.59 83.33) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 52) (tstamp 5a948842-324b-4945-b580-30ac4dc0da4f)) (via (at 132 88.8) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 52) (tstamp 83c81c40-70d3-4527-8f06-3f3055e8cac0)) - (via (at 131.79 82.48) (size 0.4572) (drill 0.2032) (layers "F.Cu" "B.Cu") (net 52) (tstamp 8f36af40-72f8-4cae-a14b-7957b9d9204d)) - (segment (start 131.79 82.48) (end 131.82 82.48) (width 0.127) (layer "B.Cu") (net 52) (tstamp 207abf10-23da-45fe-a4bb-1623d45b699a)) - (segment (start 131.79 82.48) (end 131.8 82.47) (width 0.127) (layer "B.Cu") (net 52) (tstamp 21445de1-1171-4868-a568-6689e520e230)) + (segment (start 132.27 84.01) (end 131.59 83.33) (width 0.127) (layer "B.Cu") (net 52) (tstamp 324fdd2c-9a30-4517-b6c7-a80cca7e355b)) (segment (start 132 88.8) (end 133.64 87.16) (width 0.127) (layer "B.Cu") (net 52) (tstamp 3fd8e054-d8fd-4972-9d5b-2aa194675eb7)) - (segment (start 133.64 82.74) (end 132.6 81.7) (width 0.127) (layer "B.Cu") (net 52) (tstamp 573ce2a0-815e-4647-a5ba-65adc647fd41)) - (segment (start 133.64 87.16) (end 133.64 82.74) (width 0.127) (layer "B.Cu") (net 52) (tstamp caff312e-704b-40b9-9345-35978c4dbb08)) - (segment (start 131.82 82.48) (end 132.6 81.7) (width 0.127) (layer "B.Cu") (net 52) (tstamp e8acce63-5212-4880-ba9c-8f2e810fcb04)) + (segment (start 133.39 84.01) (end 132.27 84.01) (width 0.127) (layer "B.Cu") (net 52) (tstamp 8bd40a74-cd33-4bd7-bc9d-5036faab3bd1)) + (segment (start 133.64 87.16) (end 133.64 84.26) (width 0.127) (layer "B.Cu") (net 52) (tstamp b8355a4f-f7d1-487f-9a83-a52149a80035)) + (segment (start 133.64 84.26) (end 133.39 84.01) (width 0.127) (layer "B.Cu") (net 52) (tstamp bafdd271-657f-4e23-97d0-172a612fdf67)) + (segment (start 131.59 83.33) (end 131.59 82.71) (width 0.127) (layer "B.Cu") (net 52) (tstamp d36e0aa9-3936-442b-8e58-345ece0c467e)) + (segment (start 131.59 82.71) (end 132.6 81.7) (width 0.127) (layer "B.Cu") (net 52) (tstamp ff3dea5f-dce5-449d-bf26-f07aa9ac797f)) (segment (start 134.3 77.56) (end 135.23 76.63) (width 0.127) (layer "F.Cu") (net 53) (tstamp 0c5e4fae-1bb1-4d9e-b08a-42f8d179985f)) (segment (start 134.4 85.7) (end 134.3 85.6) (width 0.127) (layer "F.Cu") (net 53) (tstamp 1f107896-a40a-46a4-bc95-ca45f81babeb)) (segment (start 133.6 88.8) (end 133.6 86.6) (width 0.127) (layer "F.Cu") (net 53) (tstamp 20b31506-0478-42a0-a4fd-47cd57a1024d)) @@ -49208,6 +49206,8 @@ (xy 109.89275 85.24436) (xy 109.893384 85.240592) (xy 109.893513 85.23) + (xy 109.892885 85.225611) + (xy 109.886565 85.181483) (xy 109.876088 85.108327) (xy 109.829775 85.006467) (xy 109.828135 85.00286) @@ -49382,7 +49382,7 @@ (xy 117.372169 84.297859) (xy 117.476914 84.233545) (xy 117.487103 84.222289) - (xy 117.551405 84.151249) + (xy 117.554664 84.147648) (xy 117.559399 84.142417) (xy 117.612991 84.031802) (xy 117.615863 84.014729) @@ -49391,9 +49391,9 @@ (xy 117.633384 83.910592) (xy 117.633513 83.9) (xy 117.632265 83.891282) - (xy 117.623016 83.826703) + (xy 117.623187 83.827898) (xy 117.616088 83.778327) - (xy 117.582496 83.704445) + (xy 117.593224 83.72804) (xy 117.568135 83.67286) (xy 117.568134 83.672859) (xy 117.565214 83.666436) @@ -49473,7 +49473,7 @@ (xy 109.513583 83.180189) (xy 109.520386 83.178334) (xy 109.520388 83.178334) - (xy 109.584993 83.160721) + (xy 109.586638 83.160272) (xy 109.632169 83.147859) (xy 109.710115 83.1) (xy 125.313482 83.1) @@ -49519,14 +49519,14 @@ (xy 127.672169 83.897859) (xy 127.776914 83.833545) (xy 127.782026 83.827898) - (xy 127.854664 83.747648) + (xy 127.840275 83.763545) (xy 127.859399 83.742417) (xy 127.912991 83.631802) (xy 127.915868 83.614704) (xy 128.956519 83.614704) (xy 128.957434 83.621701) (xy 128.957434 83.621702) - (xy 128.959361 83.636434) + (xy 128.958519 83.63) (xy 128.972457 83.73658) (xy 128.975295 83.743031) (xy 128.975296 83.743033) @@ -49568,12 +49568,15 @@ (xy 129.485429 84.473253) (xy 129.484344 84.480224) (xy 129.484343 84.480226) - (xy 129.481913 84.495833) + (xy 129.477705 84.52286) (xy 129.466519 84.594704) (xy 129.467434 84.601701) (xy 129.467434 84.601702) - (xy 129.472889 84.643416) + (xy 129.470076 84.621905) (xy 129.482457 84.71658) + (xy 129.485295 84.723031) + (xy 129.485296 84.723033) + (xy 129.497162 84.75) (xy 129.53196 84.829085) (xy 129.563357 84.866436) (xy 129.606511 84.917775) @@ -49582,7 +49585,7 @@ (xy 129.713368 84.991282) (xy 129.720096 84.993384) (xy 129.720098 84.993385) - (xy 129.774256 85.010305) + (xy 129.767 85.008038) (xy 129.830689 85.027936) (xy 129.892136 85.029062) (xy 129.946529 85.03006) @@ -49590,43 +49593,30 @@ (xy 129.953583 85.030189) (xy 129.960386 85.028334) (xy 129.960388 85.028334) - (xy 130.02699 85.010176) + (xy 130.026517 85.010305) (xy 130.072169 84.997859) (xy 130.176914 84.933545) - (xy 130.204405 84.903174) - (xy 130.243743 84.859713) (xy 130.259399 84.842417) - (xy 130.312991 84.731802) - (xy 130.323937 84.666741) - (xy 130.33275 84.614361) - (xy 130.33275 84.61436) - (xy 130.333384 84.610592) - (xy 130.333513 84.6) - (xy 130.32989 84.574704) - (xy 130.926519 84.574704) - (xy 130.927434 84.581701) - (xy 130.927434 84.581702) - (xy 130.929134 84.594704) - (xy 130.942457 84.69658) - (xy 130.945295 84.703031) - (xy 130.945296 84.703033) - (xy 130.954895 84.724848) - (xy 130.99196 84.809085) - (xy 131.023315 84.846386) - (xy 131.066511 84.897775) - (xy 131.066514 84.897777) - (xy 131.07105 84.903174) - (xy 131.173368 84.971282) - (xy 131.180098 84.973385) - (xy 131.180105 84.973388) - (xy 131.209978 84.982721) - (xy 131.259883 85.018121) - (xy 131.279449 85.076093) - (xy 131.261202 85.134495) - (xy 131.254659 85.14275) - (xy 131.24234 85.156698) - (xy 131.242337 85.156703) - (xy 131.237667 85.161991) + (xy 130.30674 84.744704) + (xy 130.986519 84.744704) + (xy 130.987434 84.751701) + (xy 130.987434 84.751702) + (xy 130.990844 84.777775) + (xy 131.002457 84.86658) + (xy 131.005295 84.873031) + (xy 131.005296 84.873033) + (xy 131.017102 84.899863) + (xy 131.05196 84.979085) + (xy 131.074977 85.006467) + (xy 131.126511 85.067775) + (xy 131.126514 85.067777) + (xy 131.13105 85.073174) + (xy 131.13692 85.077082) + (xy 131.136923 85.077084) + (xy 131.173041 85.101126) + (xy 131.211004 85.149109) + (xy 131.213513 85.210243) + (xy 131.207801 85.225602) (xy 131.185429 85.273253) (xy 131.184344 85.280224) (xy 131.184343 85.280226) @@ -49676,13 +49666,11 @@ (xy 131.884981 85.07332) (xy 131.879064 85.069485) (xy 131.879062 85.069483) - (xy 131.78776 85.010305) - (xy 131.787758 85.010304) - (xy 131.781838 85.006467) - (xy 131.751921 84.99752) - (xy 131.735199 84.985963) + (xy 131.848172 85.049462) + (xy 131.809625 85.001946) + (xy 131.808773 84.985963) (xy 149.519757 84.985963) - (xy 149.52306 85.025296) + (xy 149.521176 85.00286) (xy 149.535611 85.174764) (xy 149.536175 85.181483) (xy 149.537508 85.186131) @@ -49765,7 +49753,7 @@ (xy 156.133513 85.3079) (xy 156.116088 85.186227) (xy 156.065214 85.074336) - (xy 156.006735 85.006467) + (xy 156.004846 85.004275) (xy 155.989586 84.986564) (xy 155.989585 84.986563) (xy 155.984981 84.98122) @@ -49789,7 +49777,7 @@ (xy 155.285429 85.181153) (xy 155.284344 85.188124) (xy 155.284343 85.188126) - (xy 155.281001 85.209589) + (xy 155.279913 85.21658) (xy 155.266519 85.302604) (xy 155.267434 85.309601) (xy 155.267434 85.309602) @@ -49837,11 +49825,11 @@ (xy 151.518422 84.878441) (xy 151.511194 84.804728) (xy 151.454484 84.616894) - (xy 151.392362 84.50006) + (xy 151.402104 84.518381) (xy 151.364643 84.447927) (xy 151.364641 84.447923) (xy 151.36237 84.443653) - (xy 151.323466 84.395951) + (xy 151.350146 84.428664) (xy 151.241422 84.295355) (xy 151.241421 84.295354) (xy 151.238361 84.291602) @@ -49905,7 +49893,7 @@ (xy 155.572169 84.297859) (xy 155.676914 84.233545) (xy 155.687103 84.222289) - (xy 155.751405 84.151249) + (xy 155.754664 84.147648) (xy 155.759399 84.142417) (xy 155.812991 84.031802) (xy 155.815863 84.014729) @@ -49914,7 +49902,7 @@ (xy 155.833384 83.910592) (xy 155.833513 83.9) (xy 155.832265 83.891282) - (xy 155.823016 83.826703) + (xy 155.823187 83.827898) (xy 155.816088 83.778327) (xy 155.776003 83.690165) (xy 155.76913 83.629367) @@ -49925,15 +49913,12 @@ (xy 155.83275 83.41436) (xy 155.833384 83.410592) (xy 155.833513 83.4) - (xy 155.832491 83.39286) - (xy 155.824878 83.339702) (xy 155.816088 83.278327) (xy 155.776003 83.190165) (xy 155.76913 83.129367) (xy 155.777031 83.106024) - (xy 155.783067 83.093566) (xy 155.812991 83.031802) - (xy 155.816728 83.009589) + (xy 155.817791 83.003271) (xy 155.83275 82.914361) (xy 155.83275 82.91436) (xy 155.833384 82.910592) @@ -49941,11 +49926,11 @@ (xy 155.82979 82.874) (xy 155.820658 82.810237) (xy 155.816088 82.778327) - (xy 155.793984 82.729713) + (xy 155.771467 82.680189) (xy 155.768135 82.67286) (xy 155.768134 82.672859) (xy 155.765214 82.666436) - (xy 155.715344 82.608559) + (xy 155.707718 82.599708) (xy 155.689586 82.578664) (xy 155.689585 82.578663) (xy 155.684981 82.57332) @@ -49982,11 +49967,11 @@ (xy 154.485429 82.773253) (xy 154.484344 82.780224) (xy 154.484343 82.780226) - (xy 154.478971 82.814731) + (xy 154.479369 82.812175) (xy 154.466519 82.894704) (xy 154.467434 82.901701) (xy 154.467434 82.901702) - (xy 154.472651 82.941592) + (xy 154.47144 82.932337) (xy 154.482457 83.01658) (xy 154.485295 83.023031) (xy 154.485296 83.023033) @@ -50002,7 +49987,7 @@ (xy 154.466519 83.394704) (xy 154.467434 83.401701) (xy 154.467434 83.401702) - (xy 154.471204 83.430533) + (xy 154.46953 83.41773) (xy 154.482457 83.51658) (xy 154.485295 83.523031) (xy 154.485296 83.523033) @@ -50023,11 +50008,11 @@ (xy 151.214487 83.731022) (xy 151.214491 83.731018) (xy 151.218303 83.72804) - (xy 151.228093 83.716699) + (xy 151.221644 83.72417) (xy 151.343345 83.583177) (xy 151.343347 83.583175) (xy 151.346509 83.579511) - (xy 151.358425 83.558536) + (xy 151.36052 83.554848) (xy 151.441036 83.413115) (xy 151.441037 83.413112) (xy 151.443425 83.408909) @@ -50035,11 +50020,11 @@ (xy 151.503831 83.227323) (xy 151.503831 83.227321) (xy 151.505358 83.222732) - (xy 151.506801 83.211315) + (xy 151.506133 83.216602) (xy 151.524239 83.073271) (xy 151.529949 83.028071) (xy 151.53002 83.023033) - (xy 151.530302 83.00277) + (xy 151.530269 83.005148) (xy 151.530341 83) (xy 151.529598 82.992417) (xy 151.519333 82.88773) @@ -50053,7 +50038,7 @@ (xy 151.326768 82.4) (xy 152.313482 82.4) (xy 152.314329 82.406434) - (xy 152.314414 82.407082) + (xy 152.314876 82.410592) (xy 152.333467 82.551802) (xy 152.392061 82.693259) (xy 152.485269 82.814731) @@ -50065,7 +50050,7 @@ (xy 153.314731 82.814731) (xy 153.407939 82.693259) (xy 153.466533 82.551802) - (xy 153.485586 82.407082) + (xy 153.485124 82.410592) (xy 153.485671 82.406434) (xy 153.486518 82.4) (xy 153.466533 82.248198) @@ -50074,13 +50059,13 @@ (xy 153.407939 82.106741) (xy 153.314731 81.985269) (xy 153.193259 81.892061) - (xy 153.059614 81.836703) + (xy 153.066555 81.839578) (xy 153.057799 81.835951) (xy 153.051802 81.833467) (xy 152.9 81.813482) (xy 152.748198 81.833467) (xy 152.742201 81.835951) - (xy 152.740386 81.836703) + (xy 152.733445 81.839578) (xy 152.606741 81.892061) (xy 152.485269 81.985269) (xy 152.392061 82.106741) @@ -50092,13 +50077,7 @@ (xy 151.241422 82.295355) (xy 151.241421 82.295354) (xy 151.238361 82.291602) - (xy 151.123842 82.196864) - (xy 151.090907 82.169618) - (xy 151.090906 82.169617) (xy 151.08718 82.166535) - (xy 150.934215 82.083827) - (xy 150.918839 82.075513) - (xy 150.918838 82.075513) (xy 150.914585 82.073213) (xy 150.727152 82.015193) (xy 150.722342 82.014687) @@ -50118,7 +50097,7 @@ (xy 149.974512 82.158767) (xy 149.970743 82.161797) (xy 149.970742 82.161798) - (xy 149.951779 82.177045) + (xy 149.946418 82.181355) (xy 149.8216 82.281711) (xy 149.80805 82.297859) (xy 149.698589 82.42831) @@ -50127,13 +50106,13 @@ (xy 149.600956 82.603954) (xy 149.599492 82.608568) (xy 149.599491 82.608571) - (xy 149.552777 82.755833) + (xy 149.552479 82.756772) (xy 149.541628 82.790978) (xy 149.541088 82.79579) (xy 149.541088 82.795791) (xy 149.52156 82.969891) (xy 149.519757 82.985963) - (xy 149.521741 83.009589) + (xy 149.521368 83.005148) (xy 149.53549 83.17332) (xy 149.536175 83.181483) (xy 149.537508 83.186131) @@ -50176,18 +50155,19 @@ (xy 149.541088 84.795791) (xy 149.520401 84.980226) (xy 149.519757 84.985963) - (xy 131.735199 84.985963) - (xy 131.70159 84.962735) - (xy 131.681317 84.905006) - (xy 131.698847 84.846386) - (xy 131.70689 84.836237) - (xy 131.714664 84.827648) - (xy 131.719399 84.822417) - (xy 131.772991 84.711802) - (xy 131.793384 84.590592) - (xy 131.793513 84.58) - (xy 131.776088 84.458327) - (xy 131.774441 84.454704) + (xy 131.808773 84.985963) + (xy 131.806369 84.940847) + (xy 131.812924 84.923221) + (xy 131.829916 84.888149) + (xy 131.832991 84.881802) + (xy 131.845958 84.804728) + (xy 131.85275 84.764361) + (xy 131.85275 84.76436) + (xy 131.853384 84.760592) + (xy 131.853513 84.75) + (xy 131.836088 84.628327) + (xy 131.785214 84.516436) + (xy 131.732023 84.454704) (xy 132.766519 84.454704) (xy 132.767434 84.461701) (xy 132.767434 84.461702) @@ -50197,7 +50177,7 @@ (xy 132.785296 84.583033) (xy 132.798316 84.612622) (xy 132.83196 84.689085) - (xy 132.851056 84.711802) + (xy 132.855072 84.71658) (xy 132.906511 84.777775) (xy 132.906514 84.777777) (xy 132.91105 84.783174) @@ -50212,22 +50192,19 @@ (xy 133.253583 84.890189) (xy 133.260386 84.888334) (xy 133.260388 84.888334) - (xy 133.324993 84.870721) + (xy 133.34018 84.86658) (xy 133.372169 84.857859) (xy 133.476914 84.793545) (xy 133.559399 84.702417) (xy 133.612991 84.591802) - (xy 133.621485 84.541315) + (xy 133.62657 84.51109) (xy 133.63275 84.474361) (xy 133.63275 84.47436) (xy 133.633384 84.470592) (xy 133.633513 84.46) (xy 133.616088 84.338327) - (xy 133.578269 84.255148) - (xy 133.568135 84.23286) - (xy 133.568134 84.232859) (xy 133.565214 84.226436) - (xy 133.502172 84.153271) + (xy 133.497327 84.147648) (xy 133.489586 84.138664) (xy 133.489585 84.138663) (xy 133.484981 84.13332) @@ -50253,39 +50230,41 @@ (xy 132.784343 84.340226) (xy 132.776112 84.393092) (xy 132.766519 84.454704) - (xy 131.774441 84.454704) - (xy 131.748802 84.398314) - (xy 131.728135 84.35286) - (xy 131.728134 84.352859) - (xy 131.725214 84.346436) - (xy 131.672007 84.284686) - (xy 131.649586 84.258664) - (xy 131.649585 84.258663) - (xy 131.644981 84.25332) - (xy 131.639064 84.249485) - (xy 131.639062 84.249483) - (xy 131.54776 84.190305) - (xy 131.547758 84.190304) - (xy 131.541838 84.186467) - (xy 131.424077 84.151249) - (xy 131.352719 84.150813) - (xy 131.308217 84.150541) - (xy 131.308216 84.150541) - (xy 131.301166 84.150498) - (xy 131.294389 84.152435) - (xy 131.294388 84.152435) - (xy 131.189763 84.182337) - (xy 131.189761 84.182338) - (xy 131.182983 84.184275) - (xy 131.079032 84.249863) - (xy 130.997667 84.341991) - (xy 130.945429 84.453253) - (xy 130.944344 84.460224) - (xy 130.944343 84.460226) - (xy 130.938799 84.495833) - (xy 130.926519 84.574704) - (xy 130.32989 84.574704) + (xy 131.732023 84.454704) + (xy 131.704981 84.42332) + (xy 131.699064 84.419485) + (xy 131.699062 84.419483) + (xy 131.60776 84.360305) + (xy 131.607758 84.360304) + (xy 131.601838 84.356467) + (xy 131.484077 84.321249) + (xy 131.412719 84.320813) + (xy 131.368217 84.320541) + (xy 131.368216 84.320541) + (xy 131.361166 84.320498) + (xy 131.354389 84.322435) + (xy 131.354388 84.322435) + (xy 131.249763 84.352337) + (xy 131.249761 84.352338) + (xy 131.242983 84.354275) + (xy 131.139032 84.419863) + (xy 131.057667 84.511991) + (xy 131.005429 84.623253) + (xy 131.004344 84.630224) + (xy 131.004343 84.630226) + (xy 130.998658 84.666741) + (xy 130.986519 84.744704) + (xy 130.30674 84.744704) + (xy 130.312991 84.731802) + (xy 130.323937 84.666741) + (xy 130.33275 84.614361) + (xy 130.33275 84.61436) + (xy 130.333384 84.610592) + (xy 130.333513 84.6) (xy 130.316088 84.478327) + (xy 130.295032 84.432016) + (xy 130.268135 84.37286) + (xy 130.268134 84.372859) (xy 130.265214 84.366436) (xy 130.207723 84.299714) (xy 130.189586 84.278664) @@ -50303,14 +50282,87 @@ (xy 130.304319 83.923269) (xy 130.354664 83.867648) (xy 130.359399 83.862417) - (xy 130.412991 83.751802) - (xy 130.416989 83.72804) - (xy 130.43275 83.634361) - (xy 130.43275 83.63436) - (xy 130.433384 83.630592) - (xy 130.433391 83.63) + (xy 130.395263 83.788393) + (xy 130.437649 83.74427) + (xy 130.497877 83.733487) + (xy 130.513879 83.737063) + (xy 130.547759 83.747648) + (xy 130.580689 83.757936) + (xy 130.642136 83.759063) + (xy 130.696529 83.76006) + (xy 130.696531 83.76006) + (xy 130.703583 83.760189) + (xy 130.710386 83.758334) + (xy 130.710388 83.758334) + (xy 130.792066 83.736066) + (xy 130.822169 83.727859) + (xy 130.926914 83.663545) + (xy 131.009399 83.572417) + (xy 131.030448 83.528971) + (xy 131.072835 83.484847) + (xy 131.133063 83.474064) + (xy 131.188126 83.500741) + (xy 131.210157 83.532263) + (xy 131.219117 83.552626) + (xy 131.21912 83.552631) + (xy 131.22196 83.559085) + (xy 131.259705 83.603988) + (xy 131.296511 83.647775) + (xy 131.296514 83.647777) + (xy 131.30105 83.653174) + (xy 131.403368 83.721282) + (xy 131.410096 83.723384) + (xy 131.410098 83.723385) + (xy 131.487759 83.747648) + (xy 131.520689 83.757936) + (xy 131.582136 83.759063) + (xy 131.636529 83.76006) + (xy 131.636531 83.76006) + (xy 131.643583 83.760189) + (xy 131.650386 83.758334) + (xy 131.650388 83.758334) + (xy 131.732066 83.736066) + (xy 131.762169 83.727859) + (xy 131.866914 83.663545) + (xy 131.949399 83.572417) + (xy 132.002991 83.461802) + (xy 132.005991 83.443969) + (xy 132.009232 83.424704) + (xy 134.356519 83.424704) + (xy 134.357434 83.431701) + (xy 134.357434 83.431702) + (xy 134.359125 83.444631) + (xy 134.372457 83.54658) + (xy 134.375295 83.553031) + (xy 134.375296 83.553033) + (xy 134.386127 83.577648) + (xy 134.42196 83.659085) + (xy 134.450546 83.693092) + (xy 134.496511 83.747775) + (xy 134.496514 83.747777) + (xy 134.50105 83.753174) + (xy 134.603368 83.821282) + (xy 134.610096 83.823384) + (xy 134.610098 83.823385) + (xy 134.691565 83.848837) + (xy 134.720689 83.857936) + (xy 134.782136 83.859062) + (xy 134.836529 83.86006) + (xy 134.836531 83.86006) + (xy 134.843583 83.860189) + (xy 134.850386 83.858334) + (xy 134.850388 83.858334) + (xy 134.923574 83.838381) + (xy 134.962169 83.827859) + (xy 135.066914 83.763545) + (xy 135.102555 83.72417) + (xy 135.144664 83.677648) + (xy 135.149399 83.672417) + (xy 135.16995 83.63) (xy 138.923482 83.63) (xy 138.943467 83.781802) + (xy 138.945951 83.787799) + (xy 138.947733 83.7921) (xy 139.002061 83.923259) (xy 139.095269 84.044731) (xy 139.216741 84.137939) @@ -50320,11 +50372,13 @@ (xy 139.803259 84.137939) (xy 139.924731 84.044731) (xy 140.017939 83.923259) + (xy 140.072267 83.7921) + (xy 140.074049 83.787799) (xy 140.076533 83.781802) (xy 140.096518 83.63) - (xy 140.095202 83.62) - (xy 140.089871 83.579511) (xy 140.076533 83.478198) + (xy 140.069742 83.461802) + (xy 140.056789 83.430533) (xy 140.017939 83.336741) (xy 139.943708 83.24) (xy 147.813482 83.24) @@ -50353,7 +50407,7 @@ (xy 148.909578 82.768685) (xy 148.914731 82.764731) (xy 149.007939 82.643259) - (xy 149.063112 82.51006) + (xy 149.063011 82.510305) (xy 149.064049 82.507799) (xy 149.066533 82.501802) (xy 149.086518 82.35) @@ -50371,7 +50425,7 @@ (xy 147.913482 82.35) (xy 147.933467 82.501802) (xy 147.935951 82.507799) - (xy 147.936888 82.51006) + (xy 147.936989 82.510305) (xy 147.992061 82.643259) (xy 147.996012 82.648408) (xy 148.017181 82.675996) @@ -50395,28 +50449,116 @@ (xy 139.216741 83.122061) (xy 139.095269 83.215269) (xy 139.002061 83.336741) + (xy 138.963211 83.430533) + (xy 138.950259 83.461802) (xy 138.943467 83.478198) - (xy 138.930129 83.579511) - (xy 138.924799 83.62) (xy 138.923482 83.63) - (xy 130.433391 83.63) - (xy 130.433513 83.62) - (xy 130.431512 83.606024) - (xy 130.429224 83.590052) - (xy 130.416088 83.498327) - (xy 130.37446 83.406772) - (xy 130.368135 83.39286) - (xy 130.368134 83.392859) - (xy 130.365214 83.386436) - (xy 130.305227 83.316817) - (xy 130.289586 83.298664) - (xy 130.289585 83.298663) - (xy 130.284981 83.29332) - (xy 130.279064 83.289485) - (xy 130.279062 83.289483) - (xy 130.18776 83.230305) - (xy 130.187758 83.230304) - (xy 130.181838 83.226467) + (xy 135.16995 83.63) + (xy 135.202991 83.561802) + (xy 135.210599 83.51658) + (xy 135.22275 83.444361) + (xy 135.22275 83.44436) + (xy 135.223384 83.440592) + (xy 135.223513 83.43) + (xy 135.206088 83.308327) + (xy 135.177461 83.245366) + (xy 135.158135 83.20286) + (xy 135.158134 83.202859) + (xy 135.155214 83.196436) + (xy 135.097127 83.129022) + (xy 135.079586 83.108664) + (xy 135.079585 83.108663) + (xy 135.074981 83.10332) + (xy 135.069064 83.099485) + (xy 135.069062 83.099483) + (xy 134.97776 83.040305) + (xy 134.977758 83.040304) + (xy 134.971838 83.036467) + (xy 134.854077 83.001249) + (xy 134.782719 83.000813) + (xy 134.738217 83.000541) + (xy 134.738216 83.000541) + (xy 134.731166 83.000498) + (xy 134.724389 83.002435) + (xy 134.724388 83.002435) + (xy 134.619763 83.032337) + (xy 134.619761 83.032338) + (xy 134.612983 83.034275) + (xy 134.509032 83.099863) + (xy 134.427667 83.191991) + (xy 134.375429 83.303253) + (xy 134.374344 83.310224) + (xy 134.374343 83.310226) + (xy 134.365525 83.366864) + (xy 134.356519 83.424704) + (xy 132.009232 83.424704) + (xy 132.02275 83.344361) + (xy 132.02275 83.34436) + (xy 132.023384 83.340592) + (xy 132.023513 83.33) + (xy 132.022723 83.32448) + (xy 132.017113 83.285311) + (xy 132.006088 83.208327) + (xy 131.979438 83.149713) + (xy 131.958135 83.10286) + (xy 131.958134 83.102859) + (xy 131.955214 83.096436) + (xy 131.891967 83.023033) + (xy 131.879586 83.008664) + (xy 131.879585 83.008663) + (xy 131.874981 83.00332) + (xy 131.869064 82.999485) + (xy 131.869062 82.999483) + (xy 131.77776 82.940305) + (xy 131.777758 82.940304) + (xy 131.771838 82.936467) + (xy 131.654077 82.901249) + (xy 131.582719 82.900813) + (xy 131.538217 82.900541) + (xy 131.538216 82.900541) + (xy 131.531166 82.900498) + (xy 131.524389 82.902435) + (xy 131.524388 82.902435) + (xy 131.419763 82.932337) + (xy 131.419761 82.932338) + (xy 131.412983 82.934275) + (xy 131.309032 82.999863) + (xy 131.227667 83.091991) + (xy 131.209764 83.130122) + (xy 131.167921 83.174758) + (xy 131.10783 83.186275) + (xy 131.052445 83.160272) + (xy 131.030031 83.129022) + (xy 131.018137 83.102863) + (xy 131.018134 83.102859) + (xy 131.015214 83.096436) + (xy 130.951967 83.023033) + (xy 130.939586 83.008664) + (xy 130.939585 83.008663) + (xy 130.934981 83.00332) + (xy 130.929064 82.999485) + (xy 130.929062 82.999483) + (xy 130.83776 82.940305) + (xy 130.837758 82.940304) + (xy 130.831838 82.936467) + (xy 130.714077 82.901249) + (xy 130.642719 82.900813) + (xy 130.598217 82.900541) + (xy 130.598216 82.900541) + (xy 130.591166 82.900498) + (xy 130.584389 82.902435) + (xy 130.584388 82.902435) + (xy 130.479763 82.932337) + (xy 130.479761 82.932338) + (xy 130.472983 82.934275) + (xy 130.369032 82.999863) + (xy 130.287667 83.091991) + (xy 130.278674 83.111146) + (xy 130.255527 83.160446) + (xy 130.213682 83.205085) + (xy 130.15359 83.216602) + (xy 130.137547 83.213221) + (xy 130.070838 83.193271) (xy 130.064077 83.191249) (xy 129.992719 83.190813) (xy 129.948217 83.190541) @@ -50452,7 +50594,7 @@ (xy 128.965956 83.554091) (xy 128.956519 83.614704) (xy 127.915868 83.614704) - (xy 127.927662 83.544601) + (xy 127.923476 83.569483) (xy 127.93275 83.514361) (xy 127.93275 83.51436) (xy 127.933384 83.510592) @@ -50464,7 +50606,7 @@ (xy 127.868135 83.27286) (xy 127.868134 83.272859) (xy 127.865214 83.266436) - (xy 127.813904 83.206887) + (xy 127.810434 83.20286) (xy 127.789586 83.178664) (xy 127.789585 83.178663) (xy 127.784981 83.17332) @@ -50564,11 +50706,11 @@ (xy 108.466519 83.202604) (xy 108.467434 83.209601) (xy 108.467434 83.209602) - (xy 108.470142 83.230306) + (xy 108.469845 83.228038) (xy 108.482457 83.32448) (xy 108.485295 83.330931) (xy 108.485296 83.330933) - (xy 108.507366 83.38109) + (xy 108.529121 83.430533) (xy 108.53196 83.436985) (xy 108.536495 83.44238) (xy 108.539893 83.447839) @@ -50632,15 +50774,15 @@ (xy 106.285429 84.473253) (xy 106.284344 84.480224) (xy 106.284343 84.480226) - (xy 106.281913 84.495833) + (xy 106.277705 84.52286) (xy 106.266519 84.594704) (xy 106.267434 84.601701) (xy 106.267434 84.601702) - (xy 106.272889 84.643416) + (xy 106.270076 84.621905) (xy 106.282457 84.71658) (xy 106.285295 84.723031) (xy 106.285296 84.723033) - (xy 106.291947 84.738148) + (xy 106.297162 84.75) (xy 106.319401 84.800541) (xy 106.324067 84.811146) (xy 106.330197 84.872024) @@ -50648,15 +50790,18 @@ (xy 106.285429 84.973253) (xy 106.284344 84.980224) (xy 106.284343 84.980226) - (xy 106.280029 85.007936) + (xy 106.280013 85.008038) (xy 106.266519 85.094704) (xy 105.7355 85.094704) (xy 105.7355 82.894704) (xy 106.266519 82.894704) (xy 106.267434 82.901701) (xy 106.267434 82.901702) - (xy 106.272651 82.941592) + (xy 106.27144 82.932337) (xy 106.282457 83.01658) + (xy 106.285295 83.023031) + (xy 106.285296 83.023033) + (xy 106.291947 83.038148) (xy 106.33196 83.129085) (xy 106.368054 83.172024) (xy 106.406511 83.217775) @@ -50693,14 +50838,14 @@ (xy 107.253583 83.330189) (xy 107.260386 83.328334) (xy 107.260388 83.328334) - (xy 107.324993 83.310721) + (xy 107.326807 83.310226) (xy 107.372169 83.297859) (xy 107.476914 83.233545) (xy 107.486702 83.222732) (xy 107.552795 83.149713) (xy 107.559399 83.142417) (xy 107.612991 83.031802) - (xy 107.616728 83.009589) + (xy 107.617791 83.003271) (xy 107.63275 82.914361) (xy 107.63275 82.91436) (xy 107.633384 82.910592) @@ -50711,7 +50856,7 @@ (xy 107.576003 82.690165) (xy 107.56913 82.629367) (xy 107.577031 82.606024) - (xy 107.580091 82.599708) + (xy 107.592876 82.57332) (xy 107.612991 82.531802) (xy 107.617214 82.506703) (xy 107.63275 82.414361) @@ -50722,7 +50867,7 @@ (xy 107.576003 82.190165) (xy 107.56913 82.129367) (xy 107.577031 82.106024) - (xy 107.585745 82.088038) + (xy 107.591813 82.075513) (xy 107.612991 82.031802) (xy 107.619322 81.99417) (xy 107.63275 81.914361) @@ -50776,7 +50921,7 @@ (xy 106.282457 82.01658) (xy 106.285295 82.023031) (xy 106.285296 82.023033) - (xy 106.298233 82.052435) + (xy 106.300128 82.056741) (xy 106.322129 82.106741) (xy 106.324067 82.111146) (xy 106.330197 82.172024) @@ -50792,15 +50937,13 @@ (xy 106.282457 82.51658) (xy 106.285295 82.523031) (xy 106.285296 82.523033) - (xy 106.303535 82.564484) - (xy 106.322646 82.607916) (xy 106.324067 82.611146) (xy 106.330197 82.672024) (xy 106.323065 82.693092) (xy 106.285429 82.773253) (xy 106.284344 82.780224) (xy 106.284343 82.780226) - (xy 106.278971 82.814731) + (xy 106.279369 82.812175) (xy 106.266519 82.894704) (xy 105.7355 82.894704) (xy 105.7355 80.767083) @@ -50848,7 +50991,7 @@ (xy 113.982457 82.01658) (xy 113.985295 82.023031) (xy 113.985296 82.023033) - (xy 113.998233 82.052435) + (xy 114.000128 82.056741) (xy 114.03196 82.129085) (xy 114.061506 82.164234) (xy 114.106511 82.217775) @@ -50857,7 +51000,7 @@ (xy 114.213368 82.291282) (xy 114.220096 82.293384) (xy 114.220098 82.293385) - (xy 114.270351 82.309085) + (xy 114.306882 82.320498) (xy 114.330689 82.327936) (xy 114.392136 82.329062) (xy 114.446529 82.33006) @@ -50865,111 +51008,9 @@ (xy 114.453583 82.330189) (xy 114.460386 82.328334) (xy 114.460388 82.328334) - (xy 114.473703 82.324704) - (xy 130.496519 82.324704) - (xy 130.512457 82.44658) - (xy 130.515295 82.453031) - (xy 130.515296 82.453033) - (xy 130.52622 82.477859) - (xy 130.56196 82.559085) - (xy 130.593478 82.59658) - (xy 130.636511 82.647775) - (xy 130.636514 82.647777) - (xy 130.64105 82.653174) - (xy 130.743368 82.721282) - (xy 130.750096 82.723384) - (xy 130.750098 82.723385) - (xy 130.783022 82.733671) - (xy 130.860689 82.757936) - (xy 130.922136 82.759063) - (xy 130.976529 82.76006) - (xy 130.976531 82.76006) - (xy 130.983583 82.760189) - (xy 130.990386 82.758334) - (xy 130.990388 82.758334) - (xy 131.054993 82.740721) - (xy 131.102169 82.727859) - (xy 131.206914 82.663545) - (xy 131.213107 82.656703) - (xy 131.235636 82.631814) - (xy 131.288704 82.601361) - (xy 131.349537 82.607916) - (xy 131.394899 82.648976) - (xy 131.399649 82.658379) - (xy 131.42196 82.709085) - (xy 131.4393 82.729713) - (xy 131.496511 82.797775) - (xy 131.496514 82.797777) - (xy 131.50105 82.803174) - (xy 131.603368 82.871282) - (xy 131.610096 82.873384) - (xy 131.610098 82.873385) - (xy 131.656014 82.88773) - (xy 131.720689 82.907936) - (xy 131.782136 82.909063) - (xy 131.836529 82.91006) - (xy 131.836531 82.91006) - (xy 131.843583 82.910189) - (xy 131.850386 82.908334) - (xy 131.850388 82.908334) - (xy 131.925962 82.88773) - (xy 131.962169 82.877859) - (xy 132.066914 82.813545) - (xy 132.098728 82.778398) - (xy 132.115326 82.76006) - (xy 132.149399 82.722417) - (xy 132.202991 82.611802) - (xy 132.208625 82.578314) - (xy 132.22275 82.494361) - (xy 132.22275 82.49436) - (xy 132.223384 82.490592) - (xy 132.223513 82.48) - (xy 132.222265 82.471282) - (xy 132.21611 82.42831) - (xy 132.206088 82.358327) - (xy 132.177456 82.295355) - (xy 132.158135 82.25286) - (xy 132.158134 82.252859) - (xy 132.155214 82.246436) - (xy 132.086368 82.166535) - (xy 132.079586 82.158664) - (xy 132.079585 82.158663) - (xy 132.074981 82.15332) - (xy 132.069064 82.149485) - (xy 132.069062 82.149483) - (xy 131.97776 82.090305) - (xy 131.977758 82.090304) - (xy 131.971838 82.086467) - (xy 131.932505 82.074704) - (xy 134.286519 82.074704) - (xy 134.287434 82.081701) - (xy 134.287434 82.081702) - (xy 134.292032 82.116864) - (xy 134.302457 82.19658) - (xy 134.305295 82.203031) - (xy 134.305296 82.203033) - (xy 134.315878 82.227082) - (xy 134.35196 82.309085) - (xy 134.380944 82.343566) - (xy 134.426511 82.397775) - (xy 134.426514 82.397777) - (xy 134.43105 82.403174) - (xy 134.533368 82.471282) - (xy 134.540096 82.473384) - (xy 134.540098 82.473385) - (xy 134.610455 82.495366) - (xy 134.650689 82.507936) - (xy 134.712136 82.509063) - (xy 134.766529 82.51006) - (xy 134.766531 82.51006) - (xy 134.773583 82.510189) - (xy 134.780386 82.508334) - (xy 134.780388 82.508334) - (xy 134.862066 82.486066) - (xy 134.892169 82.477859) - (xy 134.996914 82.413545) - (xy 135.079399 82.322417) - (xy 135.11705 82.244704) + (xy 114.524993 82.310721) + (xy 114.572169 82.297859) + (xy 114.65874 82.244704) (xy 142.316519 82.244704) (xy 142.317434 82.251701) (xy 142.317434 82.251702) @@ -50977,7 +51018,7 @@ (xy 142.332457 82.36658) (xy 142.335295 82.373031) (xy 142.335296 82.373033) - (xy 142.346183 82.397775) + (xy 142.347162 82.4) (xy 142.38196 82.479085) (xy 142.410874 82.513482) (xy 142.456511 82.567775) @@ -50994,7 +51035,7 @@ (xy 142.803583 82.680189) (xy 142.810386 82.678334) (xy 142.810388 82.678334) - (xy 142.889729 82.656703) + (xy 142.911238 82.650839) (xy 142.922169 82.647859) (xy 143.026914 82.583545) (xy 143.042705 82.5661) @@ -51011,7 +51052,7 @@ (xy 143.118135 82.02286) (xy 143.118134 82.022859) (xy 143.115214 82.016436) - (xy 143.044567 81.934445) + (xy 143.045277 81.935269) (xy 143.039586 81.928664) (xy 143.039585 81.928663) (xy 143.034981 81.92332) @@ -51034,99 +51075,7 @@ (xy 142.387667 82.011991) (xy 142.335429 82.123253) (xy 142.316519 82.244704) - (xy 135.11705 82.244704) - (xy 135.132991 82.211802) - (xy 135.138839 82.177045) - (xy 135.15275 82.094361) - (xy 135.15275 82.09436) - (xy 135.153384 82.090592) - (xy 135.153432 82.086703) - (xy 135.153466 82.083827) - (xy 135.153513 82.08) - (xy 135.152097 82.070109) - (xy 135.144437 82.016624) - (xy 135.136088 81.958327) - (xy 135.089775 81.856467) - (xy 135.088135 81.85286) - (xy 135.088134 81.852859) - (xy 135.085214 81.846436) - (xy 135.030227 81.78262) - (xy 135.009586 81.758664) - (xy 135.009585 81.758663) - (xy 135.004981 81.75332) - (xy 134.999064 81.749485) - (xy 134.999062 81.749483) - (xy 134.90776 81.690305) - (xy 134.907758 81.690304) - (xy 134.901838 81.686467) - (xy 134.784077 81.651249) - (xy 134.712719 81.650813) - (xy 134.668217 81.650541) - (xy 134.668216 81.650541) - (xy 134.661166 81.650498) - (xy 134.654389 81.652435) - (xy 134.654388 81.652435) - (xy 134.549763 81.682337) - (xy 134.549761 81.682338) - (xy 134.542983 81.684275) - (xy 134.439032 81.749863) - (xy 134.357667 81.841991) - (xy 134.305429 81.953253) - (xy 134.304344 81.960224) - (xy 134.304343 81.960226) - (xy 134.294591 82.02286) - (xy 134.286519 82.074704) - (xy 131.932505 82.074704) - (xy 131.854077 82.051249) - (xy 131.782719 82.050813) - (xy 131.738217 82.050541) - (xy 131.738216 82.050541) - (xy 131.731166 82.050498) - (xy 131.724389 82.052435) - (xy 131.724388 82.052435) - (xy 131.619763 82.082337) - (xy 131.619761 82.082338) - (xy 131.612983 82.084275) - (xy 131.509032 82.149863) - (xy 131.504364 82.155148) - (xy 131.504361 82.155151) - (xy 131.485025 82.177045) - (xy 131.432333 82.208145) - (xy 131.371425 82.202335) - (xy 131.325564 82.161832) - (xy 131.320699 82.152487) - (xy 131.298135 82.10286) - (xy 131.298134 82.102859) - (xy 131.295214 82.096436) - (xy 131.238133 82.030189) - (xy 131.219586 82.008664) - (xy 131.219585 82.008663) - (xy 131.214981 82.00332) - (xy 131.209064 81.999485) - (xy 131.209062 81.999483) - (xy 131.11776 81.940305) - (xy 131.117758 81.940304) - (xy 131.111838 81.936467) - (xy 130.994077 81.901249) - (xy 130.922719 81.900813) - (xy 130.878217 81.900541) - (xy 130.878216 81.900541) - (xy 130.871166 81.900498) - (xy 130.864389 81.902435) - (xy 130.864388 81.902435) - (xy 130.759763 81.932337) - (xy 130.759761 81.932338) - (xy 130.752983 81.934275) - (xy 130.649032 81.999863) - (xy 130.567667 82.091991) - (xy 130.515429 82.203253) - (xy 130.514344 82.210224) - (xy 130.514343 82.210226) - (xy 130.507429 82.254634) - (xy 130.496519 82.324704) - (xy 114.473703 82.324704) - (xy 114.530992 82.309085) - (xy 114.572169 82.297859) + (xy 114.65874 82.244704) (xy 114.676914 82.233545) (xy 114.759399 82.142417) (xy 114.812991 82.031802) @@ -51144,9 +51093,6 @@ (xy 126.367434 81.601702) (xy 126.369329 81.616192) (xy 126.382457 81.71658) - (xy 126.385295 81.723031) - (xy 126.385296 81.723033) - (xy 126.397102 81.749863) (xy 126.43196 81.829085) (xy 126.454977 81.856467) (xy 126.506511 81.917775) @@ -51170,9 +51116,6 @@ (xy 127.118384 81.88773) (xy 127.159399 81.842417) (xy 127.212991 81.731802) - (xy 127.225626 81.656703) - (xy 127.23275 81.614361) - (xy 127.23275 81.61436) (xy 127.233384 81.610592) (xy 127.233513 81.6) (xy 127.216088 81.478327) @@ -57348,11 +57291,11 @@ (xy 154.531919 82.666704) (xy 154.497868 82.739232) (xy 154.482339 82.772308) - (xy 154.478012 82.800099) - (xy 154.465443 82.880825) + (xy 154.477388 82.804104) + (xy 154.472146 82.837776) (xy 154.463288 82.894664) - (xy 154.466614 82.9201) - (xy 154.47698 82.999367) + (xy 154.464217 82.901767) + (xy 154.477888 83.006312) (xy 154.479344 83.017449) (xy 154.499458 83.063162) (xy 154.520259 83.110437) @@ -57360,7 +57303,7 @@ (xy 154.519241 83.193706) (xy 154.485913 83.264695) (xy 154.482339 83.272308) - (xy 154.480438 83.284516) + (xy 154.477888 83.300893) (xy 154.464622 83.386099) (xy 154.463288 83.394664) (xy 154.464217 83.401767) @@ -57370,7 +57313,7 @@ (xy 154.520259 83.610437) (xy 154.526487 83.672299) (xy 154.519241 83.693706) - (xy 154.491282 83.753259) + (xy 154.486523 83.763396) (xy 154.482339 83.772308) (xy 154.481236 83.779393) (xy 154.469032 83.857776) @@ -57394,10 +57337,12 @@ (xy 154.691433 84.62538) (xy 154.691754 84.634368) (xy 154.70478 84.699852) + (xy 154.706191 84.703635) + (xy 154.726016 84.756787) (xy 154.729591 84.766373) (xy 154.739957 84.7897) (xy 154.800061 84.860512) - (xy 154.840957 84.891127) + (xy 154.838426 84.889232) (xy 154.84958 84.897582) (xy 154.885403 84.948399) (xy 154.887959 84.997743) @@ -71043,7 +70988,7 @@ (xy 114.955616 85.166704) (xy 115.010734 85.094872) (xy 115.014177 85.086562) - (xy 115.039529 85.025354) + (xy 115.047898 85.00515) (xy 115.06965 84.952637) (xy 115.072536 84.93072) (xy 115.088884 84.80654) @@ -71082,35 +71027,21 @@ (xy 130.178979 84.936031) (xy 130.262078 84.844225) (xy 130.265926 84.836283) - (xy 130.312947 84.739232) - (xy 130.312948 84.739229) - (xy 130.31607 84.732785) - (xy 130.336615 84.610671) - (xy 130.336745 84.6) - (xy 130.333516 84.577449) - (xy 130.333117 84.574664) - (xy 130.923288 84.574664) - (xy 130.925381 84.590671) - (xy 130.937616 84.684233) - (xy 130.939344 84.697449) - (xy 130.989216 84.810793) - (xy 130.993826 84.816277) - (xy 130.993827 84.816279) - (xy 131.010642 84.836283) - (xy 131.068895 84.905583) - (xy 131.171976 84.9742) - (xy 131.178816 84.976337) - (xy 131.201955 84.983566) - (xy 131.252667 85.019538) - (xy 131.27255 85.078447) - (xy 131.254009 85.137793) - (xy 131.24736 85.146182) - (xy 131.239709 85.154845) - (xy 131.239708 85.154847) - (xy 131.234965 85.160217) - (xy 131.23192 85.166702) - (xy 131.231919 85.166704) - (xy 131.196862 85.241375) + (xy 130.310315 84.744664) + (xy 130.983288 84.744664) + (xy 130.984873 84.756787) + (xy 130.997874 84.856205) + (xy 130.999344 84.867449) + (xy 131.049216 84.980793) + (xy 131.053826 84.986277) + (xy 131.053827 84.986279) + (xy 131.06969 85.00515) + (xy 131.128895 85.075583) + (xy 131.134859 85.079553) + (xy 131.167826 85.101498) + (xy 131.206402 85.150257) + (xy 131.208951 85.212379) + (xy 131.203145 85.227992) (xy 131.182339 85.272308) (xy 131.181236 85.279393) (xy 131.167049 85.370511) @@ -71369,29 +71300,27 @@ (xy 131.970903 85.171219) (xy 131.967937 85.164695) (xy 131.887105 85.070885) - (xy 131.783194 85.003533) - (xy 131.760128 84.996635) - (xy 131.708982 84.961287) - (xy 131.68838 84.902625) - (xy 131.706193 84.843057) - (xy 131.714368 84.832744) - (xy 131.717266 84.829542) - (xy 131.717268 84.829539) - (xy 131.722078 84.824225) - (xy 131.729453 84.809003) - (xy 131.772947 84.719232) - (xy 131.772948 84.719229) - (xy 131.77607 84.712785) - (xy 131.796615 84.590671) - (xy 131.796745 84.58) - (xy 131.77919 84.45742) - (xy 131.777937 84.454664) + (xy 131.853468 85.049082) + (xy 131.814299 85.0008) + (xy 131.81099 84.938713) + (xy 131.817651 84.920802) + (xy 131.832947 84.889232) + (xy 131.832948 84.889229) + (xy 131.83607 84.882785) + (xy 131.856615 84.760671) + (xy 131.856682 84.755143) + (xy 131.856698 84.753878) + (xy 131.856698 84.753875) + (xy 131.856745 84.75) + (xy 131.83919 84.62742) + (xy 131.787937 84.514695) + (xy 131.736211 84.454664) (xy 132.763288 84.454664) (xy 132.779344 84.577449) (xy 132.829216 84.690793) (xy 132.833826 84.696277) (xy 132.833827 84.696279) - (xy 132.853121 84.719232) + (xy 132.857132 84.724003) (xy 132.908895 84.785583) (xy 133.011976 84.8542) (xy 133.130173 84.891127) @@ -71407,7 +71336,7 @@ (xy 147.611116 84.80654) (xy 147.627465 84.93072) (xy 147.63035 84.952637) - (xy 147.660471 85.025354) + (xy 147.652102 85.00515) (xy 147.685824 85.086562) (xy 147.689266 85.094872) (xy 147.744384 85.166704) @@ -71429,7 +71358,7 @@ (xy 148.655616 85.166704) (xy 148.710734 85.094872) (xy 148.714177 85.086562) - (xy 148.739529 85.025354) + (xy 148.747898 85.00515) (xy 148.755864 84.985918) (xy 149.516542 84.985918) (xy 149.533013 85.182064) @@ -71479,7 +71408,7 @@ (xy 151.533163 85.028161) (xy 151.533556 85) (xy 151.53327 84.997075) - (xy 151.523785 84.90035) + (xy 151.520094 84.86271) (xy 151.514348 84.804104) (xy 151.512926 84.799394) (xy 151.512925 84.799389) @@ -71497,26 +71426,29 @@ (xy 150.897138 83.981118) (xy 150.926709 83.926426) (xy 150.950726 83.909484) - (xy 151.061022 83.853769) + (xy 151.045696 83.861511) (xy 151.065411 83.851552) (xy 151.088818 83.833265) (xy 151.216643 83.733397) (xy 151.22052 83.730368) - (xy 151.224651 83.725583) + (xy 151.224 83.726337) (xy 151.269578 83.673533) (xy 151.349136 83.581364) + (xy 151.412818 83.469265) + (xy 151.443932 83.414495) + (xy 151.443933 83.414493) (xy 151.446362 83.410217) - (xy 151.488177 83.284516) + (xy 151.480558 83.30742) (xy 151.506939 83.228116) (xy 151.506939 83.228114) (xy 151.508493 83.223444) - (xy 151.51306 83.187296) + (xy 151.509887 83.212407) (xy 151.532812 83.030941) (xy 151.532812 83.030938) (xy 151.533163 83.028161) (xy 151.533556 83) (xy 151.532988 82.9942) - (xy 151.521503 82.877075) + (xy 151.518282 82.844225) (xy 151.514348 82.804104) (xy 151.512926 82.799394) (xy 151.512925 82.799389) @@ -71525,15 +71457,15 @@ (xy 151.457456 82.615669) (xy 151.365048 82.441874) (xy 151.240642 82.289337) - (xy 151.180737 82.239779) + (xy 151.141636 82.207432) (xy 151.092765 82.167002) (xy 151.09276 82.166999) (xy 151.088977 82.163869) - (xy 151.064964 82.150885) + (xy 151.070344 82.153794) (xy 150.920154 82.072586) (xy 150.92015 82.072584) (xy 150.915831 82.070249) - (xy 150.894006 82.063493) + (xy 150.81563 82.039232) (xy 150.732499 82.013499) (xy 150.732497 82.013499) (xy 150.727798 82.012044) @@ -71545,15 +71477,15 @@ (xy 150.336015 82.009308) (xy 150.331301 82.010695) (xy 150.331298 82.010696) - (xy 150.203148 82.048413) + (xy 150.256247 82.032785) (xy 150.147188 82.064883) (xy 150.142828 82.067162) (xy 150.142824 82.067164) - (xy 149.99666 82.143577) + (xy 149.995421 82.144225) (xy 149.972752 82.156076) (xy 149.968913 82.159163) (xy 149.968911 82.159164) - (xy 149.955303 82.170105) + (xy 149.957857 82.168052) (xy 149.81935 82.279414) (xy 149.692827 82.430199) (xy 149.598001 82.602688) @@ -71566,7 +71498,7 @@ (xy 149.549626 83.24) (xy 149.585704 83.365818) (xy 149.587268 83.371274) - (xy 149.656913 83.506787) + (xy 149.660878 83.514502) (xy 149.674034 83.5401) (xy 149.677242 83.546343) (xy 149.799506 83.700602) @@ -71583,12 +71515,14 @@ (xy 149.968911 84.159164) (xy 149.959163 84.167002) (xy 149.81935 84.279414) + (xy 149.752347 84.359266) + (xy 149.696089 84.426312) (xy 149.692827 84.430199) (xy 149.598001 84.602688) (xy 149.538483 84.790309) (xy 149.537935 84.795196) (xy 149.537934 84.7952) - (xy 149.51709 84.98103) + (xy 149.517117 84.980793) (xy 149.516542 84.985918) (xy 148.755864 84.985918) (xy 148.76965 84.952637) @@ -71611,7 +71545,7 @@ (xy 148.053901 84.229489) (xy 148.053899 84.22949) (xy 148.047363 84.23035) - (xy 147.993225 84.252775) + (xy 147.990311 84.253982) (xy 147.911218 84.286743) (xy 147.911215 84.286745) (xy 147.905128 84.289266) @@ -71633,7 +71567,7 @@ (xy 133.61607 84.592785) (xy 133.636615 84.470671) (xy 133.636745 84.46) - (xy 133.635644 84.452308) + (xy 133.635021 84.447958) (xy 133.62434 84.373384) (xy 133.61919 84.33742) (xy 133.587355 84.267402) @@ -71665,37 +71599,39 @@ (xy 132.776469 84.370007) (xy 132.764604 84.446213) (xy 132.763288 84.454664) - (xy 131.777937 84.454664) - (xy 131.737944 84.366704) - (xy 131.730904 84.35122) - (xy 131.730903 84.351219) - (xy 131.727937 84.344695) - (xy 131.647105 84.250885) - (xy 131.543194 84.183533) - (xy 131.536329 84.18148) - (xy 131.536327 84.181479) - (xy 131.431421 84.150105) - (xy 131.431418 84.150105) - (xy 131.424555 84.148052) - (xy 131.41739 84.148008) - (xy 131.417388 84.148008) - (xy 131.363318 84.147678) - (xy 131.300727 84.147296) - (xy 131.293839 84.149265) - (xy 131.293836 84.149265) - (xy 131.188559 84.179353) - (xy 131.188556 84.179354) - (xy 131.181664 84.181324) - (xy 131.076937 84.247402) - (xy 130.994965 84.340217) - (xy 130.99192 84.346702) - (xy 130.991919 84.346704) - (xy 130.968971 84.395583) - (xy 130.942339 84.452308) - (xy 130.940155 84.466337) - (xy 130.934385 84.503396) - (xy 130.923288 84.574664) - (xy 130.333117 84.574664) + (xy 131.736211 84.454664) + (xy 131.707105 84.420885) + (xy 131.603194 84.353533) + (xy 131.596329 84.35148) + (xy 131.596327 84.351479) + (xy 131.491421 84.320105) + (xy 131.491418 84.320105) + (xy 131.484555 84.318052) + (xy 131.47739 84.318008) + (xy 131.477388 84.318008) + (xy 131.423318 84.317678) + (xy 131.360727 84.317296) + (xy 131.353839 84.319265) + (xy 131.353836 84.319265) + (xy 131.248559 84.349353) + (xy 131.248556 84.349354) + (xy 131.241664 84.351324) + (xy 131.136937 84.417402) + (xy 131.054965 84.510217) + (xy 131.05192 84.516702) + (xy 131.051919 84.516704) + (xy 131.013173 84.599232) + (xy 131.002339 84.622308) + (xy 130.998438 84.647363) + (xy 130.985138 84.732785) + (xy 130.983288 84.744664) + (xy 130.310315 84.744664) + (xy 130.312947 84.739232) + (xy 130.312948 84.739229) + (xy 130.31607 84.732785) + (xy 130.336615 84.610671) + (xy 130.336745 84.6) + (xy 130.333516 84.577449) (xy 130.320206 84.484516) (xy 130.31919 84.47742) (xy 130.279488 84.390099) @@ -71717,20 +71653,93 @@ (xy 130.272876 83.959779) (xy 130.278979 83.956031) (xy 130.362078 83.864225) - (xy 130.368586 83.850793) - (xy 130.412947 83.759232) - (xy 130.412948 83.759229) - (xy 130.41607 83.752785) - (xy 130.436615 83.630671) - (xy 130.436682 83.625143) - (xy 130.436698 83.623878) - (xy 130.436698 83.623875) - (xy 130.436745 83.62) - (xy 130.435376 83.610437) - (xy 130.425178 83.539232) - (xy 130.41919 83.49742) - (xy 130.390193 83.433645) - (xy 130.37247 83.394664) + (xy 130.377015 83.833396) + (xy 130.396339 83.79351) + (xy 130.439412 83.748672) + (xy 130.500613 83.737716) + (xy 130.516863 83.741348) + (xy 130.580173 83.761127) + (xy 130.640592 83.762234) + (xy 130.696815 83.763265) + (xy 130.696817 83.763265) + (xy 130.703982 83.763396) + (xy 130.77962 83.742775) + (xy 130.816538 83.73271) + (xy 130.823452 83.730825) + (xy 130.829558 83.727076) + (xy 130.82956 83.727075) + (xy 130.922875 83.669779) + (xy 130.922876 83.669779) + (xy 130.928979 83.666031) + (xy 131.012078 83.574225) + (xy 131.015203 83.567775) + (xy 131.015205 83.567772) + (xy 131.0288 83.539713) + (xy 131.071873 83.494876) + (xy 131.133074 83.48392) + (xy 131.189027 83.51103) + (xy 131.211414 83.543062) + (xy 131.216328 83.554231) + (xy 131.21633 83.554235) + (xy 131.219216 83.560793) + (xy 131.223826 83.566277) + (xy 131.223827 83.566279) + (xy 131.239638 83.585088) + (xy 131.298895 83.655583) + (xy 131.401976 83.7242) + (xy 131.520173 83.761127) + (xy 131.580592 83.762234) + (xy 131.636815 83.763265) + (xy 131.636817 83.763265) + (xy 131.643982 83.763396) + (xy 131.71962 83.742775) + (xy 131.756538 83.73271) + (xy 131.763452 83.730825) + (xy 131.769558 83.727076) + (xy 131.76956 83.727075) + (xy 131.862875 83.669779) + (xy 131.862876 83.669779) + (xy 131.868979 83.666031) + (xy 131.952078 83.574225) + (xy 131.955203 83.567776) + (xy 132.002947 83.469232) + (xy 132.002948 83.469229) + (xy 132.00607 83.462785) + (xy 132.012484 83.424664) + (xy 134.353288 83.424664) + (xy 134.357349 83.455721) + (xy 134.36827 83.539232) + (xy 134.369344 83.547449) + (xy 134.419216 83.660793) + (xy 134.423826 83.666277) + (xy 134.423827 83.666279) + (xy 134.446882 83.693706) + (xy 134.498895 83.755583) + (xy 134.601976 83.8242) + (xy 134.608816 83.826337) + (xy 134.631411 83.833396) + (xy 134.720173 83.861127) + (xy 134.780592 83.862234) + (xy 134.836815 83.863265) + (xy 134.836817 83.863265) + (xy 134.843982 83.863396) + (xy 134.941888 83.836704) + (xy 134.956538 83.83271) + (xy 134.963452 83.830825) + (xy 134.969558 83.827076) + (xy 134.96956 83.827075) + (xy 135.062875 83.769779) + (xy 135.062876 83.769779) + (xy 135.068979 83.766031) + (xy 135.152078 83.674225) + (xy 135.156048 83.666031) + (xy 135.202947 83.569232) + (xy 135.202948 83.569229) + (xy 135.20607 83.562785) + (xy 135.226615 83.440671) + (xy 135.226745 83.43) + (xy 135.224526 83.414502) + (xy 135.221685 83.394664) (xy 144.663288 83.394664) (xy 144.664217 83.401767) (xy 144.67795 83.506787) @@ -71738,7 +71747,7 @@ (xy 144.729216 83.630793) (xy 144.733826 83.636277) (xy 144.733827 83.636279) - (xy 144.751256 83.657013) + (xy 144.759045 83.666279) (xy 144.808895 83.725583) (xy 144.911976 83.7942) (xy 145.030173 83.831127) @@ -71777,17 +71786,17 @@ (xy 146.336615 83.410671) (xy 146.336745 83.4) (xy 146.334528 83.384516) - (xy 146.32844 83.342012) + (xy 146.322754 83.302308) (xy 146.31919 83.27742) (xy 146.302176 83.24) (xy 147.810255 83.24) (xy 147.811116 83.24654) - (xy 147.82859 83.379266) + (xy 147.828347 83.37742) (xy 147.83035 83.392637) (xy 147.864331 83.474674) (xy 147.885476 83.525721) (xy 147.889266 83.534872) - (xy 147.91835 83.572775) + (xy 147.921064 83.576312) (xy 147.973175 83.644225) (xy 147.982987 83.657013) (xy 148.105127 83.750734) @@ -71803,15 +71812,15 @@ (xy 148.694873 83.750734) (xy 148.817013 83.657013) (xy 148.826826 83.644225) - (xy 148.88165 83.572775) + (xy 148.878936 83.576312) (xy 148.910734 83.534872) (xy 148.914525 83.525721) (xy 148.935669 83.474674) (xy 148.96965 83.392637) - (xy 148.971411 83.379266) + (xy 148.971654 83.37742) (xy 148.988884 83.24654) (xy 148.989745 83.24) - (xy 148.980133 83.166988) + (xy 148.98464 83.20122) (xy 148.970511 83.093901) (xy 148.97051 83.093899) (xy 148.96965 83.087363) @@ -71827,7 +71836,7 @@ (xy 148.253901 82.669489) (xy 148.253899 82.66949) (xy 148.247363 82.67035) - (xy 148.165567 82.704231) + (xy 148.165326 82.704331) (xy 148.111218 82.726743) (xy 148.111215 82.726745) (xy 148.105128 82.729266) @@ -71836,10 +71845,10 @@ (xy 147.83035 83.087363) (xy 147.82949 83.093899) (xy 147.829489 83.093901) - (xy 147.819867 83.166988) + (xy 147.81536 83.20122) (xy 147.810255 83.24) (xy 146.302176 83.24) - (xy 146.271611 83.172775) + (xy 146.273602 83.177155) (xy 146.270904 83.17122) (xy 146.270903 83.171219) (xy 146.267937 83.164695) @@ -71878,7 +71887,7 @@ (xy 145.52188 82.34601) (xy 145.459987 82.340105) (xy 145.423809 82.313482) - (xy 145.421492 82.310793) + (xy 145.409672 82.297075) (xy 145.387105 82.270885) (xy 145.283194 82.203533) (xy 145.276329 82.20148) @@ -71901,16 +71910,16 @@ (xy 144.731919 82.366704) (xy 144.69459 82.446213) (xy 144.682339 82.472308) - (xy 144.680538 82.483878) + (xy 144.681236 82.479393) (xy 144.667533 82.567402) (xy 144.663288 82.594664) - (xy 144.665658 82.612785) - (xy 144.677616 82.704231) + (xy 144.665882 82.614502) + (xy 144.673073 82.669489) (xy 144.679344 82.717449) (xy 144.729216 82.830793) (xy 144.733826 82.836277) (xy 144.733827 82.836279) - (xy 144.796854 82.911258) + (xy 144.79636 82.910671) (xy 144.808895 82.925583) (xy 144.810786 82.926842) (xy 144.840932 82.978637) @@ -71922,17 +71931,104 @@ (xy 144.731919 83.166704) (xy 144.704479 83.22515) (xy 144.682339 83.272308) - (xy 144.680438 83.284516) + (xy 144.677888 83.300893) (xy 144.664622 83.386099) (xy 144.663288 83.394664) - (xy 130.37247 83.394664) - (xy 130.370904 83.39122) - (xy 130.370903 83.391219) - (xy 130.367937 83.384695) - (xy 130.287105 83.290885) - (xy 130.183194 83.223533) - (xy 130.176329 83.22148) - (xy 130.176327 83.221479) + (xy 135.221685 83.394664) + (xy 135.217553 83.365818) + (xy 135.20919 83.30742) + (xy 135.171049 83.223533) + (xy 135.160904 83.20122) + (xy 135.160903 83.201219) + (xy 135.157937 83.194695) + (xy 135.077105 83.100885) + (xy 134.973194 83.033533) + (xy 134.966329 83.03148) + (xy 134.966327 83.031479) + (xy 134.861421 83.000105) + (xy 134.861418 83.000105) + (xy 134.854555 82.998052) + (xy 134.84739 82.998008) + (xy 134.847388 82.998008) + (xy 134.793318 82.997678) + (xy 134.730727 82.997296) + (xy 134.723839 82.999265) + (xy 134.723836 82.999265) + (xy 134.618559 83.029353) + (xy 134.618556 83.029354) + (xy 134.611664 83.031324) + (xy 134.506937 83.097402) + (xy 134.424965 83.190217) + (xy 134.42192 83.196702) + (xy 134.421919 83.196704) + (xy 134.403964 83.234948) + (xy 134.372339 83.302308) + (xy 134.371236 83.309393) + (xy 134.355467 83.410671) + (xy 134.353288 83.424664) + (xy 132.012484 83.424664) + (xy 132.026615 83.340671) + (xy 132.026745 83.33) + (xy 132.024528 83.314516) + (xy 132.017553 83.265815) + (xy 132.00919 83.20742) + (xy 131.968643 83.118242) + (xy 131.960904 83.10122) + (xy 131.960903 83.101218) + (xy 131.957937 83.094695) + (xy 131.877105 83.000885) + (xy 131.773194 82.933533) + (xy 131.766329 82.93148) + (xy 131.766327 82.931479) + (xy 131.661421 82.900105) + (xy 131.661418 82.900105) + (xy 131.654555 82.898052) + (xy 131.64739 82.898008) + (xy 131.647388 82.898008) + (xy 131.593318 82.897678) + (xy 131.530727 82.897296) + (xy 131.523839 82.899265) + (xy 131.523836 82.899265) + (xy 131.418559 82.929353) + (xy 131.418556 82.929354) + (xy 131.411664 82.931324) + (xy 131.306937 82.997402) + (xy 131.224965 83.090217) + (xy 131.22192 83.096704) + (xy 131.221918 83.096706) + (xy 131.211284 83.119356) + (xy 131.168763 83.164717) + (xy 131.1077 83.176421) + (xy 131.05142 83.149998) + (xy 131.028643 83.118242) + (xy 131.020903 83.101218) + (xy 131.020902 83.101217) + (xy 131.017937 83.094695) + (xy 130.937105 83.000885) + (xy 130.833194 82.933533) + (xy 130.826329 82.93148) + (xy 130.826327 82.931479) + (xy 130.721421 82.900105) + (xy 130.721418 82.900105) + (xy 130.714555 82.898052) + (xy 130.70739 82.898008) + (xy 130.707388 82.898008) + (xy 130.653318 82.897678) + (xy 130.590727 82.897296) + (xy 130.583839 82.899265) + (xy 130.583836 82.899265) + (xy 130.478559 82.929353) + (xy 130.478556 82.929354) + (xy 130.471664 82.931324) + (xy 130.366937 82.997402) + (xy 130.284965 83.090217) + (xy 130.28192 83.096704) + (xy 130.281918 83.096706) + (xy 130.254389 83.155342) + (xy 130.211868 83.200703) + (xy 130.150805 83.212407) + (xy 130.134506 83.208972) + (xy 130.093485 83.196704) (xy 130.071421 83.190105) (xy 130.071418 83.190105) (xy 130.064555 83.188052) @@ -71951,6 +72047,8 @@ (xy 129.631919 83.386704) (xy 129.592763 83.470105) (xy 129.582339 83.492308) + (xy 129.580085 83.506787) + (xy 129.570589 83.567776) (xy 129.563288 83.614664) (xy 129.566253 83.63734) (xy 129.577616 83.724233) @@ -72045,9 +72143,9 @@ (xy 117.636615 83.910671) (xy 117.636745 83.9) (xy 117.635915 83.8942) - (xy 117.627188 83.833265) + (xy 117.627108 83.83271) (xy 117.61919 83.77742) - (xy 117.572691 83.67515) + (xy 117.57227 83.674225) (xy 117.570904 83.67122) (xy 117.570903 83.671219) (xy 117.567937 83.664695) @@ -72058,12 +72156,12 @@ (xy 117.35354 83.494664) (xy 127.063288 83.494664) (xy 127.067125 83.524003) - (xy 127.073965 83.576312) + (xy 127.074387 83.579538) (xy 127.079344 83.617449) (xy 127.129216 83.730793) (xy 127.133826 83.736277) (xy 127.133827 83.736279) - (xy 127.153121 83.759232) + (xy 127.159784 83.767159) (xy 127.208895 83.825583) (xy 127.311976 83.8942) (xy 127.318816 83.896337) @@ -72089,7 +72187,7 @@ (xy 127.936615 83.510671) (xy 127.936745 83.5) (xy 127.935644 83.492308) - (xy 127.92844 83.442012) + (xy 127.924942 83.417584) (xy 127.91919 83.37742) (xy 127.873723 83.27742) (xy 127.870904 83.27122) @@ -72111,11 +72209,14 @@ (xy 127.328559 83.099353) (xy 127.328556 83.099354) (xy 127.321664 83.101324) + (xy 127.315601 83.10515) + (xy 127.3156 83.10515) + (xy 127.311983 83.107432) (xy 127.216937 83.167402) (xy 127.134965 83.260217) (xy 127.13192 83.266702) (xy 127.131919 83.266704) - (xy 127.085386 83.365818) + (xy 127.104006 83.326158) (xy 127.082339 83.372308) (xy 127.076971 83.406787) (xy 127.067243 83.469265) @@ -72158,7 +72259,7 @@ (xy 116.241664 83.671324) (xy 116.235601 83.67515) (xy 116.2356 83.67515) - (xy 116.225986 83.681216) + (xy 116.228646 83.679538) (xy 116.136937 83.737402) (xy 116.054965 83.830217) (xy 116.05192 83.836702) @@ -72176,175 +72277,6 @@ (xy 114.453982 82.333396) (xy 114.460895 82.331511) (xy 114.460897 82.331511) - (xy 114.486012 82.324664) - (xy 130.493288 82.324664) - (xy 130.494217 82.331767) - (xy 130.508117 82.438062) - (xy 130.509344 82.447449) - (xy 130.559216 82.560793) - (xy 130.563826 82.566277) - (xy 130.563827 82.566279) - (xy 130.581736 82.587584) - (xy 130.638895 82.655583) - (xy 130.741976 82.7242) - (xy 130.860173 82.761127) - (xy 130.920592 82.762234) - (xy 130.976815 82.763265) - (xy 130.976817 82.763265) - (xy 130.983982 82.763396) - (xy 131.072615 82.739232) - (xy 131.096538 82.73271) - (xy 131.103452 82.730825) - (xy 131.109558 82.727076) - (xy 131.10956 82.727075) - (xy 131.202875 82.669779) - (xy 131.202876 82.669779) - (xy 131.208979 82.666031) - (xy 131.233038 82.639451) - (xy 131.286964 82.608505) - (xy 131.34878 82.615166) - (xy 131.394876 82.656889) - (xy 131.399703 82.666446) - (xy 131.416328 82.704231) - (xy 131.41633 82.704235) - (xy 131.419216 82.710793) - (xy 131.423826 82.716277) - (xy 131.423827 82.716279) - (xy 131.443121 82.739232) - (xy 131.498895 82.805583) - (xy 131.601976 82.8742) - (xy 131.720173 82.911127) - (xy 131.780592 82.912234) - (xy 131.836815 82.913265) - (xy 131.836817 82.913265) - (xy 131.843982 82.913396) - (xy 131.963452 82.880825) - (xy 131.969558 82.877076) - (xy 131.96956 82.877075) - (xy 132.062875 82.819779) - (xy 132.062876 82.819779) - (xy 132.068979 82.816031) - (xy 132.152078 82.724225) - (xy 132.158586 82.710793) - (xy 132.202947 82.619232) - (xy 132.202948 82.619229) - (xy 132.20607 82.612785) - (xy 132.226615 82.490671) - (xy 132.226745 82.48) - (xy 132.225915 82.4742) - (xy 132.216656 82.409553) - (xy 132.20919 82.35742) - (xy 132.157937 82.244695) - (xy 132.077105 82.150885) - (xy 131.973194 82.083533) - (xy 131.966329 82.08148) - (xy 131.966327 82.081479) - (xy 131.94354 82.074664) - (xy 134.283288 82.074664) - (xy 134.285322 82.090217) - (xy 134.295659 82.169265) - (xy 134.299344 82.197449) - (xy 134.349216 82.310793) - (xy 134.353826 82.316277) - (xy 134.353827 82.316279) - (xy 134.368216 82.333396) - (xy 134.428895 82.405583) - (xy 134.531976 82.4742) - (xy 134.650173 82.511127) - (xy 134.710592 82.512234) - (xy 134.766815 82.513265) - (xy 134.766817 82.513265) - (xy 134.773982 82.513396) - (xy 134.857337 82.490671) - (xy 134.886538 82.48271) - (xy 134.893452 82.480825) - (xy 134.899558 82.477076) - (xy 134.89956 82.477075) - (xy 134.992875 82.419779) - (xy 134.992876 82.419779) - (xy 134.998979 82.416031) - (xy 135.082078 82.324225) - (xy 135.085928 82.316279) - (xy 135.132947 82.219232) - (xy 135.132948 82.219229) - (xy 135.13607 82.212785) - (xy 135.156615 82.090671) - (xy 135.156745 82.08) - (xy 135.13919 81.95742) - (xy 135.087937 81.844695) - (xy 135.007105 81.750885) - (xy 134.903194 81.683533) - (xy 134.896329 81.68148) - (xy 134.896327 81.681479) - (xy 134.791421 81.650105) - (xy 134.791418 81.650105) - (xy 134.784555 81.648052) - (xy 134.77739 81.648008) - (xy 134.777388 81.648008) - (xy 134.723318 81.647678) - (xy 134.660727 81.647296) - (xy 134.653839 81.649265) - (xy 134.653836 81.649265) - (xy 134.548559 81.679353) - (xy 134.548556 81.679354) - (xy 134.541664 81.681324) - (xy 134.436937 81.747402) - (xy 134.354965 81.840217) - (xy 134.35192 81.846702) - (xy 134.351919 81.846704) - (xy 134.323711 81.906787) - (xy 134.302339 81.952308) - (xy 134.301236 81.959393) - (xy 134.284456 82.067164) - (xy 134.283288 82.074664) - (xy 131.94354 82.074664) - (xy 131.861421 82.050105) - (xy 131.861418 82.050105) - (xy 131.854555 82.048052) - (xy 131.84739 82.048008) - (xy 131.847388 82.048008) - (xy 131.793318 82.047678) - (xy 131.730727 82.047296) - (xy 131.723839 82.049265) - (xy 131.723836 82.049265) - (xy 131.618559 82.079353) - (xy 131.618556 82.079354) - (xy 131.611664 82.081324) - (xy 131.506937 82.147402) - (xy 131.487528 82.169379) - (xy 131.433986 82.200981) - (xy 131.372092 82.195077) - (xy 131.32549 82.15392) - (xy 131.320547 82.144423) - (xy 131.300904 82.10122) - (xy 131.300903 82.101219) - (xy 131.297937 82.094695) - (xy 131.217105 82.000885) - (xy 131.113194 81.933533) - (xy 131.106329 81.93148) - (xy 131.106327 81.931479) - (xy 131.001421 81.900105) - (xy 131.001418 81.900105) - (xy 130.994555 81.898052) - (xy 130.98739 81.898008) - (xy 130.987388 81.898008) - (xy 130.933318 81.897678) - (xy 130.870727 81.897296) - (xy 130.863839 81.899265) - (xy 130.863836 81.899265) - (xy 130.758559 81.929353) - (xy 130.758556 81.929354) - (xy 130.751664 81.931324) - (xy 130.646937 81.997402) - (xy 130.564965 82.090217) - (xy 130.56192 82.096702) - (xy 130.561919 82.096704) - (xy 130.530386 82.163869) - (xy 130.512339 82.202308) - (xy 130.511236 82.209393) - (xy 130.494594 82.316279) - (xy 130.493288 82.324664) - (xy 114.486012 82.324664) (xy 114.566538 82.30271) (xy 114.573452 82.300825) (xy 114.579558 82.297076) @@ -72352,8 +72284,6 @@ (xy 114.672875 82.239779) (xy 114.672876 82.239779) (xy 114.678979 82.236031) - (xy 114.751351 82.156076) - (xy 114.757269 82.149538) (xy 114.762078 82.144225) (xy 114.774034 82.119548) (xy 114.812947 82.039232) @@ -72362,9 +72292,6 @@ (xy 114.836615 81.910671) (xy 114.836745 81.9) (xy 114.81919 81.77742) - (xy 114.778275 81.687432) - (xy 114.770904 81.67122) - (xy 114.770903 81.671219) (xy 114.767937 81.664695) (xy 114.687105 81.570885) (xy 114.590603 81.508335) @@ -78839,10 +78766,9 @@ (xy 155.861701 84.716177) (xy 156.061549 84.516328) (xy 156.080644 84.500657) - (xy 156.082322 84.499536) - (xy 156.082323 84.499535) + (xy 156.082326 84.499533) (xy 156.092641 84.492641) - (xy 156.149153 84.408064) + (xy 156.140586 84.420885) (xy 156.151697 84.404257) (xy 156.154464 84.39035) (xy 156.170014 84.312171) @@ -78851,9 +78777,10 @@ (xy 156.1672 84.261272) (xy 156.1672 82.638733) (xy 156.169621 82.61415) + (xy 156.170015 82.612169) (xy 156.172436 82.6) (xy 156.151697 82.495744) - (xy 156.129675 82.462785) + (xy 156.107549 82.429671) (xy 156.092641 82.407359) (xy 156.080645 82.399343) (xy 156.06155 82.383672) @@ -87410,35 +87337,43 @@ (xy 134.223965 85.270964) (xy 134.178041 85.216821) (xy 134.1672 85.16569) - (xy 134.1672 83.062869) - (xy 134.187202 82.994748) - (xy 134.204104 82.973774) - (xy 134.628587 82.54929) - (xy 134.6909 82.515265) - (xy 134.71999 82.512406) - (xy 134.773982 82.513396) - (xy 134.787543 82.509699) - (xy 134.884793 82.483186) - (xy 134.884795 82.483185) - (xy 134.893452 82.480825) - (xy 134.937486 82.453788) - (xy 134.942307 82.450828) - (xy 135.010825 82.432231) - (xy 135.07852 82.453628) - (xy 135.112817 82.487928) - (xy 135.150871 82.544558) - (xy 135.16339 82.563189) - (xy 135.169009 82.568302) - (xy 135.16901 82.568303) - (xy 135.265606 82.656198) - (xy 135.289366 82.677818) - (xy 135.296039 82.681441) - (xy 135.432371 82.755464) - (xy 135.432373 82.755465) - (xy 135.439048 82.759089) - (xy 135.446397 82.761017) - (xy 135.596445 82.800381) - (xy 135.596449 82.800382) + (xy 134.1672 84.482868) + (xy 134.187202 84.414747) + (xy 134.204105 84.393773) + (xy 134.698588 83.89929) + (xy 134.7609 83.865264) + (xy 134.78999 83.862406) + (xy 134.843982 83.863396) + (xy 134.898804 83.84845) + (xy 134.954793 83.833186) + (xy 134.954795 83.833185) + (xy 134.963452 83.830825) + (xy 135.068979 83.766031) + (xy 135.077048 83.757117) + (xy 135.14605 83.680885) + (xy 135.146051 83.680883) + (xy 135.152078 83.674225) + (xy 135.168827 83.639656) + (xy 135.202155 83.570866) + (xy 135.202155 83.570865) + (xy 135.20607 83.562785) + (xy 135.217449 83.495152) + (xy 135.225809 83.445464) + (xy 135.225809 83.445459) + (xy 135.226615 83.440671) + (xy 135.226745 83.43) + (xy 135.20919 83.30742) + (xy 135.157937 83.194695) + (xy 135.152075 83.187892) + (xy 135.147241 83.180333) + (xy 135.148826 83.179319) + (xy 135.124103 83.124798) + (xy 135.134395 83.054551) + (xy 135.159773 83.018105) + (xy 135.37187 82.806008) + (xy 135.434182 82.771982) + (xy 135.492937 82.773227) + (xy 135.594622 82.799902) (xy 135.603796 82.802309) (xy 135.693367 82.803716) (xy 135.766499 82.804866) @@ -87449,23 +87384,20 @@ (xy 135.93272 82.768655) (xy 135.94012 82.76696) (xy 136.092282 82.690431) - (xy 136.139939 82.649728) + (xy 136.183577 82.612458) (xy 136.216022 82.584748) (xy 136.216024 82.584745) (xy 136.221796 82.579816) (xy 136.321186 82.4415) - (xy 136.330027 82.419509) - (xy 136.352707 82.363088) + (xy 136.326276 82.42884) + (xy 136.351019 82.367288) (xy 136.384714 82.283469) (xy 136.408713 82.114845) (xy 136.408868 82.1) - (xy 136.407302 82.087052) - (xy 136.392895 81.96801) + (xy 136.407059 82.085046) + (xy 136.389318 81.938451) (xy 136.388406 81.930911) (xy 136.328201 81.771584) - (xy 136.296568 81.725557) - (xy 136.236032 81.637476) - (xy 136.23603 81.637474) (xy 136.23173 81.631217) (xy 136.104561 81.517914) (xy 136.07408 81.501775) @@ -87491,52 +87423,77 @@ (xy 135.22499 81.580502) (xy 135.173208 81.625675) (xy 135.168841 81.631889) - (xy 135.130546 81.686377) - (xy 135.075012 81.730608) - (xy 135.00438 81.737794) - (xy 134.958931 81.71966) - (xy 134.903194 81.683533) - (xy 134.894592 81.68096) - (xy 134.894589 81.680959) - (xy 134.793158 81.650625) - (xy 134.793159 81.650625) - (xy 134.784555 81.648052) - (xy 134.775579 81.647997) - (xy 134.775578 81.647997) - (xy 134.723464 81.647679) - (xy 134.660727 81.647296) - (xy 134.652096 81.649763) - (xy 134.652094 81.649763) - (xy 134.550294 81.678857) - (xy 134.550291 81.678859) - (xy 134.541664 81.681324) - (xy 134.534077 81.686111) - (xy 134.534075 81.686112) - (xy 134.44453 81.742611) - (xy 134.436937 81.747402) - (xy 134.354965 81.840217) - (xy 134.302339 81.952308) - (xy 134.300958 81.961176) - (xy 134.300958 81.961177) - (xy 134.284669 82.065791) - (xy 134.284669 82.065795) - (xy 134.283288 82.074664) - (xy 134.284452 82.083569) - (xy 134.28441 82.087052) - (xy 134.263578 82.154923) - (xy 134.247514 82.174609) - (xy 133.939096 82.483027) - (xy 133.876784 82.517053) - (xy 133.805969 82.511988) - (xy 133.760906 82.483027) - (xy 133.308201 82.030322) - (xy 133.274175 81.96801) - (xy 133.280079 81.897899) - (xy 133.279915 81.897855) - (xy 133.28016 81.896941) - (xy 133.280388 81.894233) - (xy 133.28188 81.890521) - (xy 133.281882 81.890515) + (xy 135.121237 81.699623) + (xy 135.075272 81.765024) + (xy 135.05257 81.823251) + (xy 135.025141 81.893604) + (xy 135.013402 81.923712) + (xy 135.01241 81.931245) + (xy 135.01241 81.931246) + (xy 134.997084 82.047666) + (xy 134.991171 82.092577) + (xy 135.009861 82.261871) + (xy 135.012469 82.268998) + (xy 135.012471 82.269006) + (xy 135.022512 82.296443) + (xy 135.02714 82.367288) + (xy 134.993282 82.42884) + (xy 134.62845 82.793672) + (xy 134.609355 82.809343) + (xy 134.597359 82.817359) + (xy 134.590467 82.827674) + (xy 134.590466 82.827675) + (xy 134.582453 82.839668) + (xy 134.582451 82.839671) + (xy 134.559029 82.874725) + (xy 134.538303 82.905743) + (xy 134.535883 82.917911) + (xy 134.535882 82.917912) + (xy 134.531727 82.9388) + (xy 134.517564 83.01) + (xy 134.519985 83.022171) + (xy 134.519985 83.034582) + (xy 134.515461 83.034582) + (xy 134.511256 83.081118) + (xy 134.488486 83.118293) + (xy 134.45497 83.156243) + (xy 134.424965 83.190217) + (xy 134.372339 83.302308) + (xy 134.370958 83.311176) + (xy 134.370958 83.311177) + (xy 134.354669 83.415791) + (xy 134.354669 83.415795) + (xy 134.353288 83.424664) + (xy 134.354452 83.433568) + (xy 134.35441 83.437051) + (xy 134.333578 83.504922) + (xy 134.317514 83.524608) + (xy 133.889095 83.953027) + (xy 133.826783 83.987053) + (xy 133.755968 83.981988) + (xy 133.710905 83.953027) + (xy 133.606328 83.84845) + (xy 133.590657 83.829356) + (xy 133.589533 83.827674) + (xy 133.582641 83.817359) + (xy 133.544914 83.792151) + (xy 133.494257 83.758303) + (xy 133.416322 83.7428) + (xy 133.402171 83.739985) + (xy 133.39 83.737564) + (xy 133.375847 83.740379) + (xy 133.351267 83.7428) + (xy 133.126 83.7428) + (xy 133.057879 83.722798) + (xy 133.011386 83.669142) + (xy 133 83.6168) + (xy 133 82.341925) + (xy 133.020002 82.273804) + (xy 133.044164 82.246119) + (xy 133.121796 82.179816) + (xy 133.221186 82.0415) + (xy 133.226938 82.027193) + (xy 133.268536 81.923712) (xy 133.284714 81.883469) (xy 133.308713 81.714845) (xy 133.308868 81.7) @@ -88757,44 +88714,75 @@ (xy 132.016361 81.931155) (xy 132.018639 81.993287) (xy 131.993023 82.036862) - (xy 131.947684 82.082201) - (xy 131.892286 82.110427) - (xy 131.860815 82.110428) - (xy 131.79 82.099212) - (xy 131.782177 82.100451) - (xy 131.680151 82.11661) - (xy 131.680149 82.116611) - (xy 131.67233 82.117849) - (xy 131.566178 82.171936) - (xy 131.481936 82.256178) - (xy 131.478339 82.263237) - (xy 131.474852 82.268037) - (xy 131.424553 82.304583) - (xy 131.362378 82.304585) - (xy 131.312077 82.268041) - (xy 131.294102 82.224649) - (xy 131.293389 82.220149) - (xy 131.292151 82.21233) - (xy 131.238064 82.106178) - (xy 131.153822 82.021936) - (xy 131.04767 81.967849) - (xy 131.039851 81.966611) - (xy 131.039849 81.96661) - (xy 130.937823 81.950451) - (xy 130.93 81.949212) - (xy 130.922177 81.950451) - (xy 130.820151 81.96661) - (xy 130.820149 81.966611) - (xy 130.81233 81.967849) - (xy 130.706178 82.021936) - (xy 130.621936 82.106178) - (xy 130.588431 82.171936) - (xy 130.573385 82.201465) - (xy 130.529421 82.245428) - (xy 130.468012 82.255154) - (xy 130.416828 82.230905) - (xy 130.365282 82.184979) - (xy 130.365281 82.184978) + (xy 131.481592 82.548293) + (xy 131.477036 82.55236) + (xy 131.468042 82.556678) + (xy 131.460969 82.565523) + (xy 131.460967 82.565524) + (xy 131.450904 82.578108) + (xy 131.443917 82.585916) + (xy 131.443712 82.586173) + (xy 131.439716 82.590169) + (xy 131.43671 82.594952) + (xy 131.436252 82.595526) + (xy 131.430488 82.603637) + (xy 131.413617 82.624733) + (xy 131.411338 82.634644) + (xy 131.410812 82.635594) + (xy 131.410511 82.636637) + (xy 131.405098 82.645248) + (xy 131.403825 82.656506) + (xy 131.403825 82.656507) + (xy 131.402064 82.672086) + (xy 131.400342 82.682159) + (xy 131.400274 82.682756) + (xy 131.399 82.688297) + (xy 131.399 82.693984) + (xy 131.398948 82.694442) + (xy 131.398363 82.704823) + (xy 131.395309 82.731838) + (xy 131.398643 82.741386) + (xy 131.399 82.747764) + (xy 131.399 82.948362) + (xy 131.379787 83.007493) + (xy 131.365761 83.021519) + (xy 131.366178 83.021936) + (xy 131.281936 83.106178) + (xy 131.227849 83.21233) + (xy 131.226611 83.220149) + (xy 131.22661 83.220151) + (xy 131.219361 83.265921) + (xy 131.191135 83.321319) + (xy 131.135737 83.349545) + (xy 131.074329 83.339819) + (xy 131.030365 83.295855) + (xy 131.020639 83.265921) + (xy 131.01339 83.220151) + (xy 131.013389 83.220149) + (xy 131.012151 83.21233) + (xy 130.958064 83.106178) + (xy 130.873822 83.021936) + (xy 130.76767 82.967849) + (xy 130.698408 82.956879) + (xy 130.697335 82.956709) + (xy 130.641938 82.928483) + (xy 130.613712 82.873085) + (xy 130.613477 82.843173) + (xy 130.615241 82.830785) + (xy 130.630925 82.72058) + (xy 130.631506 82.716501) + (xy 130.631506 82.716495) + (xy 130.63197 82.713238) + (xy 130.632109 82.7) + (xy 130.631713 82.696726) + (xy 130.614592 82.555243) + (xy 130.614591 82.555241) + (xy 130.613863 82.549221) + (xy 130.57446 82.444943) + (xy 130.562319 82.412814) + (xy 130.562318 82.412812) + (xy 130.560177 82.407146) + (xy 130.474152 82.281979) (xy 130.360753 82.180944) (xy 130.226528 82.109875) (xy 130.079224 82.072875) @@ -88804,11 +88792,11 @@ (xy 129.927347 82.07208) (xy 129.92145 82.073496) (xy 129.921448 82.073496) - (xy 129.786914 82.105795) + (xy 129.838623 82.093381) (xy 129.779664 82.107536) (xy 129.774278 82.110316) (xy 129.774275 82.110317) - (xy 129.661856 82.168341) + (xy 129.65009 82.174414) (xy 129.644702 82.177195) (xy 129.640132 82.181182) (xy 129.54092 82.26773) @@ -88816,7 +88804,7 @@ (xy 129.526765 82.281997) (xy 129.496737 82.324722) (xy 129.44292 82.401296) - (xy 129.426992 82.442151) + (xy 129.432499 82.428026) (xy 129.425903 82.444943) (xy 129.386524 82.493056) (xy 129.332175 82.509) @@ -88892,14 +88880,14 @@ (xy 128.193985 83.079756) (xy 128.204295 83.086645) (xy 128.272577 83.13227) - (xy 128.309101 83.139535) + (xy 128.322599 83.14222) (xy 128.344292 83.146535) (xy 128.344293 83.146535) (xy 128.349144 83.1475) (xy 128.670856 83.1475) (xy 128.675707 83.146535) (xy 128.675708 83.146535) - (xy 128.710899 83.139535) + (xy 128.697401 83.14222) (xy 128.747423 83.13227) (xy 128.815705 83.086645) (xy 128.826015 83.079756) @@ -88932,9 +88920,8 @@ (xy 129.027849 83.50233) (xy 129.026611 83.510149) (xy 129.02661 83.510151) - (xy 129.019757 83.553418) + (xy 129.017544 83.567392) (xy 129.009212 83.62) - (xy 129.010451 83.627821) (xy 129.010451 83.627823) (xy 129.025656 83.723822) (xy 129.027849 83.73767) @@ -88964,12 +88951,7 @@ (xy 128.456742 84.302147) (xy 128.377585 84.186974) (xy 128.374152 84.181979) - (xy 128.298978 84.115001) - (xy 128.265282 84.084979) - (xy 128.265281 84.084978) (xy 128.260753 84.080944) - (xy 128.201104 84.049361) - (xy 128.13189 84.012714) (xy 128.126528 84.009875) (xy 127.979224 83.972875) (xy 127.973167 83.972843) @@ -88986,10 +88968,10 @@ (xy 127.727508 83.804378) (xy 127.808064 83.723822) (xy 127.862151 83.61767) - (xy 127.869668 83.570213) + (xy 127.866925 83.587532) (xy 127.879549 83.507823) (xy 127.880788 83.5) - (xy 127.879051 83.489033) + (xy 127.879549 83.492177) (xy 127.86339 83.390151) (xy 127.863389 83.390149) (xy 127.862151 83.38233) @@ -89007,14 +88989,14 @@ (xy 127.87227 82.412577) (xy 127.814252 82.325748) (xy 127.727423 82.26773) - (xy 127.664199 82.255154) + (xy 127.677401 82.25778) (xy 127.655708 82.253465) (xy 127.655707 82.253465) (xy 127.650856 82.2525) (xy 127.329144 82.2525) (xy 127.324293 82.253465) (xy 127.324292 82.253465) - (xy 127.315801 82.255154) + (xy 127.302599 82.25778) (xy 127.252577 82.26773) (xy 127.165748 82.325748) (xy 127.10773 82.412577) @@ -89032,10 +89014,10 @@ (xy 127.137849 83.38233) (xy 127.136611 83.390149) (xy 127.13661 83.390151) - (xy 127.120949 83.489033) + (xy 127.120451 83.492177) (xy 127.119212 83.5) (xy 127.120451 83.507823) - (xy 127.130333 83.570213) + (xy 127.133076 83.587532) (xy 127.137849 83.61767) (xy 127.191936 83.723822) (xy 127.276178 83.808064) @@ -89054,7 +89036,7 @@ (xy 127.550092 84.074412) (xy 127.550086 84.074416) (xy 127.544702 84.077195) - (xy 127.487477 84.127116) + (xy 127.516237 84.102027) (xy 127.451659 84.158362) (xy 127.430251 84.177037) (xy 127.426765 84.181997) @@ -89064,7 +89046,7 @@ (xy 127.267926 84.593381) (xy 127.268591 84.599405) (xy 127.268591 84.599409) - (xy 127.27071 84.618599) + (xy 127.276408 84.670213) (xy 127.284592 84.744343) (xy 127.336787 84.886971) (xy 127.340173 84.89201) @@ -90472,6 +90454,9 @@ (xy 126.336535 83.991199) (xy 126.3375 83.986348) (xy 126.3375 83.653652) + (xy 126.336535 83.6488) + (xy 126.323913 83.585344) + (xy 126.323913 83.585343) (xy 126.32198 83.575627) (xy 126.298453 83.540416) (xy 126.2815 83.484528) @@ -90486,17 +90471,17 @@ (xy 126.386288 83.262635) (xy 126.38941 83.256191) (xy 126.413576 83.112552) + (xy 126.413656 83.105987) + (xy 126.413682 83.103878) + (xy 126.413682 83.103875) (xy 126.413729 83.1) (xy 126.412831 83.093724) (xy 126.394096 82.962906) (xy 126.394096 82.962905) (xy 126.39308 82.955813) - (xy 126.342423 82.8444) - (xy 126.335758 82.829741) - (xy 126.335758 82.82974) (xy 126.332792 82.823218) (xy 126.237713 82.712873) - (xy 126.14849 82.655041) + (xy 126.150752 82.656507) (xy 126.121501 82.637547) (xy 126.121499 82.637546) (xy 126.115485 82.633648) @@ -90516,13 +90501,13 @@ (xy 125.470622 82.817951) (xy 125.467577 82.824436) (xy 125.467576 82.824438) - (xy 125.437563 82.888364) + (xy 125.45244 82.856678) (xy 125.408719 82.9498) (xy 125.386309 83.093724) (xy 125.405195 83.238152) (xy 125.408081 83.244712) (xy 125.408082 83.244714) - (xy 125.41142 83.2523) + (xy 125.415969 83.262638) (xy 125.463859 83.371474) (xy 125.479918 83.390579) (xy 125.494908 83.408412) @@ -90531,6 +90516,9 @@ (xy 125.5185 83.484528) (xy 125.501547 83.540416) (xy 125.47802 83.575627) + (xy 125.476087 83.585343) + (xy 125.476087 83.585344) + (xy 125.463465 83.6488) (xy 125.4625 83.653652) (xy 125.4625 83.986348) (xy 125.463465 83.991199) @@ -90601,8 +90589,6 @@ (xy 122.5 85.666589) (xy 122.5 81.6) (xy 126.419212 81.6) - (xy 126.420451 81.607823) - (xy 126.434926 81.699212) (xy 126.437849 81.71767) (xy 126.491936 81.823822) (xy 126.576178 81.908064) @@ -90619,7 +90605,7 @@ (xy 127.078464 81.901785) (xy 127.133862 81.930011) (xy 127.146373 81.945256) - (xy 127.157782 81.96233) + (xy 127.155261 81.958557) (xy 127.165748 81.974252) (xy 127.173985 81.979756) (xy 127.181854 81.985014) diff --git a/cynthion/cynthion.kicad_pro b/cynthion/cynthion.kicad_pro index 0069545..affebdc 100644 --- a/cynthion/cynthion.kicad_pro +++ b/cynthion/cynthion.kicad_pro @@ -523,7 +523,7 @@ ] ], "text_variables": { - "DATE": "2023-05-01", + "DATE": "2023-05-04", "VERSION": "1.0.0" } } From dcaa7140cc8dbedb42fa94cfb2c285b0417662ce Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Wed, 17 May 2023 14:10:02 -0400 Subject: [PATCH 10/10] hardware: adjust table in schematic --- cynthion/cynthion.kicad_pcb | 2 +- cynthion/cynthion.kicad_pro | 2 +- cynthion/cynthion.kicad_sch | 2 +- cynthion/fpga_configuration.kicad_sch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cynthion/cynthion.kicad_pcb b/cynthion/cynthion.kicad_pcb index 96beae9..38b4083 100644 --- a/cynthion/cynthion.kicad_pcb +++ b/cynthion/cynthion.kicad_pcb @@ -93,7 +93,7 @@ ) ) - (property "DATE" "2023-05-04") + (property "DATE" "2023-05-17") (property "VERSION" "1.0.0") (net 0 "") diff --git a/cynthion/cynthion.kicad_pro b/cynthion/cynthion.kicad_pro index affebdc..84b2408 100644 --- a/cynthion/cynthion.kicad_pro +++ b/cynthion/cynthion.kicad_pro @@ -523,7 +523,7 @@ ] ], "text_variables": { - "DATE": "2023-05-04", + "DATE": "2023-05-17", "VERSION": "1.0.0" } } diff --git a/cynthion/cynthion.kicad_sch b/cynthion/cynthion.kicad_sch index 34740c6..35c61cb 100644 --- a/cynthion/cynthion.kicad_sch +++ b/cynthion/cynthion.kicad_sch @@ -1142,8 +1142,8 @@ ) ) - (bus_alias "ULPI" (members "DATA[0..7]" "CLK" "DIR" "STP" "NXT" "~{RESET}")) (bus_alias "TYPE_C" (members "SDA" "SCL" "SBU1S" "SBU2S" "~{INT}" "~{FAULT}")) + (bus_alias "ULPI" (members "DATA[0..7]" "CLK" "DIR" "STP" "NXT" "~{RESET}")) (junction (at 76.2 128.27) (diameter 0) (color 0 0 0 0) (uuid 01b76df7-fd1d-4696-a018-c17e903f0523) ) diff --git a/cynthion/fpga_configuration.kicad_sch b/cynthion/fpga_configuration.kicad_sch index 7e91602..d4fbb3d 100644 --- a/cynthion/fpga_configuration.kicad_sch +++ b/cynthion/fpga_configuration.kicad_sch @@ -2784,7 +2784,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e017394d-48a5-47e3-84cc-98518ec322b0) ) - (polyline (pts (xy 144.78 167.64) (xy 144.78 178.435)) + (polyline (pts (xy 144.78 167.64) (xy 144.78 180.975)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e025a9cc-da63-43c3-9c7c-49b5d8130934) )