From 32a98163d8b630ac8263a44bffdca38849960b26 Mon Sep 17 00:00:00 2001 From: Quentin Date: Thu, 31 Aug 2023 16:43:21 +0200 Subject: [PATCH] prepping for release --- 3x5_3/dilemma.kicad_prl | 2 +- 4x6_4/dilemma.kicad_pcb | 1425 +++++++++++++++++++-------------------- 4x6_4/dilemma.kicad_prl | 4 +- 4x6_4/dilemma.kicad_pro | 2 +- 4 files changed, 715 insertions(+), 718 deletions(-) diff --git a/3x5_3/dilemma.kicad_prl b/3x5_3/dilemma.kicad_prl index 8ea7316..1023713 100644 --- a/3x5_3/dilemma.kicad_prl +++ b/3x5_3/dilemma.kicad_prl @@ -62,7 +62,7 @@ 35, 36 ], - "visible_layers": "409106f_80000007", + "visible_layers": "409906f_80000007", "zone_display_mode": 1 }, "meta": { diff --git a/4x6_4/dilemma.kicad_pcb b/4x6_4/dilemma.kicad_pcb index a1bbc5f..ac32be9 100644 --- a/4x6_4/dilemma.kicad_pcb +++ b/4x6_4/dilemma.kicad_pcb @@ -400080,12 +400080,11 @@ (xy 208.068484 112.229177) (xy 208.064519 112.227121) (xy 208.007018 112.200541) - (xy 207.997154 112.197193) - (xy 207.906764 112.176835) - (xy 207.869842 112.159993) - (xy 207.842779 112.129753) - (xy 207.812917 112.078029) - (xy 207.812913 112.078025) + (xy 207.997155 112.197193) + (xy 207.906762 112.176834) + (xy 207.869841 112.159992) + (xy 207.842778 112.129752) + (xy 207.842363 112.129034) (xy 207.809671 112.072408) (xy 207.784167 112.046904) (xy 209.878786 112.046904) @@ -704709,7 +704708,7 @@ (xy 116.449307 183.37685) (xy 116.440574 183.332948) (xy 116.407311 183.283166) - (xy 116.395491 183.275268) + (xy 116.396016 183.275619) (xy 116.365635 183.255319) (xy 116.365634 183.255318) (xy 116.357529 183.249903) @@ -704746,15 +704745,15 @@ (xy 129.237154 182.970275) (xy 130.538241 182.970275) (xy 131.074218 183.506253) - (xy 131.378255 183.506253) - (xy 131.324733 183.385037) - (xy 131.258452 183.244895) - (xy 131.180819 183.105519) - (xy 131.101234 182.972737) - (xy 131.010993 182.841002) - (xy 130.918868 182.716783) - (xy 130.81678 182.593843) - (xy 130.714052 182.480498) + (xy 131.378257 183.506253) + (xy 131.324322 183.3841) + (xy 131.258664 183.245277) + (xy 131.180349 183.104676) + (xy 131.101509 182.973137) + (xy 131.010551 182.840353) + (xy 130.919208 182.717191) + (xy 130.816354 182.593328) + (xy 130.714073 182.480477) (xy 130.538241 182.656311) (xy 130.538241 182.970275) (xy 129.237154 182.970275) @@ -710811,7 +710810,7 @@ (xy 87.802779 184.705235) (xy 87.808514 184.581172) (xy 87.818229 184.383421) - (xy 87.819056 184.374638) + (xy 87.819055 184.374644) (xy 87.822221 184.351948) (xy 88.623921 184.351948) (xy 88.643761 184.705235) @@ -712338,78 +712337,80 @@ (xy 117.7701 180.760498) (xy 128.322715 180.75482) (xy 128.32732 180.754925) - (xy 128.497482 180.762793) - (xy 128.49776 180.762879) - (xy 128.497762 180.762806) - (xy 128.497849 180.76281) - (xy 128.695914 180.772541) - (xy 128.704687 180.773366) - (xy 128.888217 180.798968) - (xy 128.888552 180.799017) - (xy 129.073296 180.826422) - (xy 129.081399 180.827973) - (xy 129.26376 180.870865) - (xy 129.264978 180.87116) - (xy 129.443791 180.915951) - (xy 129.451179 180.918111) - (xy 129.629656 180.97793) - (xy 129.631465 180.978557) - (xy 129.804092 181.040324) - (xy 129.810683 181.042955) - (xy 129.983301 181.119174) - (xy 129.985609 181.120229) - (xy 130.150883 181.198398) - (xy 130.156684 181.201382) - (xy 130.321764 181.293332) - (xy 130.324442 181.294879) - (xy 130.481025 181.388732) - (xy 130.48603 181.391941) - (xy 130.642125 181.49887) - (xy 130.645089 181.500984) - (xy 130.785818 181.605356) - (xy 130.791516 181.609582) - (xy 130.795788 181.612935) - (xy 130.941381 181.733835) - (xy 130.944619 181.736645) - (xy 130.989595 181.777409) - (xy 131.07963 181.859012) - (xy 131.083128 181.862343) - (xy 131.117752 181.896967) - (xy 131.216963 181.996179) - (xy 131.220304 181.999688) - (xy 131.323931 182.114023) - (xy 131.342681 182.134711) - (xy 131.34549 182.137949) - (xy 131.466361 182.283509) - (xy 131.469715 182.287781) - (xy 131.57833 182.434233) - (xy 131.580487 182.437259) - (xy 131.687356 182.593269) - (xy 131.690596 182.598321) - (xy 131.784394 182.754815) - (xy 131.785968 182.757537) - (xy 131.847143 182.867366) - (xy 131.874835 182.917084) - (xy 131.877928 182.922636) - (xy 131.880934 182.928483) - (xy 131.959058 183.093665) - (xy 131.960128 183.096005) - (xy 132.036349 183.268633) - (xy 132.038997 183.275268) - (xy 132.100732 183.447808) - (xy 132.101387 183.449699) - (xy 132.161193 183.628136) - (xy 132.163358 183.635542) - (xy 132.208119 183.814241) - (xy 132.208456 183.81563) - (xy 132.251326 183.997906) - (xy 132.252885 184.006046) - (xy 132.280256 184.190571) - (xy 132.280378 184.19142) - (xy 132.305935 184.374638) - (xy 132.306764 184.38345) - (xy 132.316243 184.576118) - (xy 132.321184 184.683) + (xy 128.502337 180.763017) + (xy 128.695598 180.772498) + (xy 128.704379 180.773323) + (xy 128.891639 180.799446) + (xy 128.891847 180.799476) + (xy 129.072945 180.82634) + (xy 129.081062 180.827894) + (xy 129.265838 180.871353) + (xy 129.266878 180.871606) + (xy 129.44344 180.915832) + (xy 129.450808 180.917986) + (xy 129.621864 180.975319) + (xy 129.631003 180.978382) + (xy 129.632894 180.979037) + (xy 129.803713 181.040158) + (xy 129.810321 181.042795) + (xy 129.854968 181.062509) + (xy 129.984314 181.119622) + (xy 129.986653 181.120691) + (xy 130.095367 181.172109) + (xy 130.148641 181.197306) + (xy 130.15046 181.198166) + (xy 130.156303 181.20117) + (xy 130.322591 181.293792) + (xy 130.325272 181.295342) + (xy 130.478112 181.386952) + (xy 130.480605 181.388446) + (xy 130.485656 181.391686) + (xy 130.538998 181.428226) + (xy 130.642744 181.499294) + (xy 130.645705 181.501405) + (xy 130.791142 181.609269) + (xy 130.795379 181.612595) + (xy 130.941873 181.734243) + (xy 130.945105 181.737047) + (xy 131.079234 181.858615) + (xy 131.082729 181.861944) + (xy 131.217384 181.996599) + (xy 131.220715 182.000098) + (xy 131.276877 182.062064) + (xy 131.342254 182.134197) + (xy 131.345064 182.137435) + (xy 131.377418 182.176397) + (xy 131.464626 182.281419) + (xy 131.466701 182.283917) + (xy 131.470049 182.288181) + (xy 131.575599 182.4305) + (xy 131.577895 182.433596) + (xy 131.580052 182.436622) + (xy 131.687625 182.593661) + (xy 131.690865 182.598713) + (xy 131.783954 182.754025) + (xy 131.785528 182.756747) + (xy 131.878134 182.923006) + (xy 131.88114 182.928852) + (xy 131.958631 183.092695) + (xy 131.959693 183.095017) + (xy 131.985764 183.154064) + (xy 132.036505 183.268983) + (xy 132.039153 183.275619) + (xy 132.100283 183.446467) + (xy 132.100938 183.448358) + (xy 132.161311 183.628488) + (xy 132.163476 183.635894) + (xy 132.207652 183.812258) + (xy 132.20799 183.813648) + (xy 132.251406 183.998249) + (xy 132.252963 184.006388) + (xy 132.279794 184.18727) + (xy 132.279917 184.188119) + (xy 132.305976 184.374936) + (xy 132.306806 184.383755) + (xy 132.316031 184.571539) + (xy 132.316044 184.571825) (xy 132.324404 184.752651) (xy 132.32451 184.757223) (xy 132.32451 188.729212) @@ -712579,14 +712580,16 @@ (xy 156.70051 178.559574) (xy 156.700616 178.555002) (xy 156.70104 178.545841) - (xy 156.708507 178.384326) - (xy 156.718232 178.186385) - (xy 156.719057 178.177617) - (xy 156.744683 177.993917) - (xy 156.772113 177.809) - (xy 156.773662 177.800907) - (xy 156.796706 177.702933) - (xy 157.514967 177.702933) + (xy 156.708607 178.382167) + (xy 156.709864 178.356569) + (xy 156.71821 178.186553) + (xy 156.719035 178.177774) + (xy 156.744897 177.992379) + (xy 156.74494 177.99208) + (xy 156.772076 177.809145) + (xy 156.773616 177.801102) + (xy 156.796708 177.702922) + (xy 157.514956 177.702922) (xy 157.944276 178.132242) (xy 158.25824 178.132242) (xy 158.794217 177.596264) @@ -712594,31 +712597,32 @@ (xy 158.25824 176.746322) (xy 157.944275 176.746322) (xy 157.943085 176.747511) - (xy 157.923757 176.775728) - (xy 157.844188 176.908479) - (xy 157.766544 177.047876) - (xy 157.700244 177.188055) - (xy 157.635914 177.333748) - (xy 157.583496 177.480249) - (xy 157.533041 177.630785) - (xy 157.514967 177.702933) - (xy 156.796706 177.702933) - (xy 156.816612 177.618297) - (xy 156.816793 177.617552) - (xy 156.861648 177.43848) - (xy 156.863791 177.431152) - (xy 156.923649 177.25256) - (xy 156.924233 177.250875) - (xy 156.986016 177.078201) - (xy 156.988632 177.071648) - (xy 157.064917 176.898878) - (xy 157.065877 176.896778) - (xy 157.144094 176.731404) - (xy 157.147054 176.725647) - (xy 157.23908 176.56043) - (xy 157.240544 176.557897) - (xy 157.334427 176.401264) - (xy 157.337625 176.396277) + (xy 157.923617 176.775932) + (xy 157.844404 176.908089) + (xy 157.766438 177.048065) + (xy 157.700479 177.187524) + (xy 157.635831 177.333937) + (xy 157.583746 177.479507) + (xy 157.53298 177.630969) + (xy 157.514956 177.702922) + (xy 156.796708 177.702922) + (xy 156.816808 177.617463) + (xy 156.817082 177.616336) + (xy 156.861587 177.438664) + (xy 156.863729 177.431337) + (xy 156.923872 177.251894) + (xy 156.92447 177.250169) + (xy 156.985933 177.078392) + (xy 156.98857 177.071788) + (xy 156.988647 177.071615) + (xy 157.065094 176.898479) + (xy 157.066137 176.896195) + (xy 157.143974 176.731621) + (xy 157.146949 176.725836) + (xy 157.23929 176.560051) + (xy 157.240785 176.557465) + (xy 157.334287 176.401468) + (xy 157.337502 176.396457) (xy 157.435936 176.252761) (xy 158.751801 176.252761) (xy 159.287779 176.788739) @@ -712626,47 +712630,47 @@ (xy 160.13772 176.252761) (xy 160.13772 175.938797) (xy 159.63551 175.436586) - (xy 159.62288 175.440819) - (xy 159.476477 175.493201) - (xy 159.33077 175.557537) - (xy 159.190571 175.623848) - (xy 159.051222 175.701462) - (xy 158.91843 175.781057) - (xy 158.890204 175.800391) + (xy 159.622214 175.441043) + (xy 159.47665 175.493126) + (xy 159.330227 175.557777) + (xy 159.190793 175.623724) + (xy 159.050759 175.701722) + (xy 158.918642 175.78091) + (xy 158.890209 175.800386) (xy 158.751801 175.938796) (xy 158.751801 176.252761) (xy 157.435936 176.252761) - (xy 157.444575 176.240149) - (xy 157.446624 176.237275) - (xy 157.55532 176.090716) - (xy 157.558597 176.086542) - (xy 157.679538 175.9409) - (xy 157.682305 175.937712) - (xy 157.804728 175.802639) - (xy 157.807998 175.799203) - (xy 157.941908 175.665293) - (xy 157.945344 175.662023) - (xy 158.080464 175.539558) - (xy 158.083572 175.53686) - (xy 158.229233 175.415906) - (xy 158.233458 175.41259) - (xy 158.379978 175.303923) - (xy 158.382875 175.301858) - (xy 158.538978 175.194925) - (xy 158.543965 175.191726) - (xy 158.700663 175.097805) - (xy 158.703131 175.096379) - (xy 158.868342 175.004358) - (xy 158.874135 175.001379) - (xy 159.039486 174.923174) - (xy 159.041574 174.922219) - (xy 159.214372 174.845922) - (xy 159.220914 174.843312) - (xy 159.393571 174.781534) - (xy 159.395281 174.780942) - (xy 159.573857 174.72109) - (xy 159.581204 174.718942) - (xy 159.60578 174.712786) + (xy 157.444788 176.239839) + (xy 157.446867 176.236924) + (xy 157.555133 176.090944) + (xy 157.558429 176.086745) + (xy 157.679772 175.940617) + (xy 157.682514 175.937459) + (xy 157.804506 175.802861) + (xy 157.807777 175.799424) + (xy 157.942129 175.665072) + (xy 157.945544 175.661821) + (xy 158.080195 175.539781) + (xy 158.083336 175.537056) + (xy 158.22946 175.415717) + (xy 158.233643 175.412434) + (xy 158.379662 175.304139) + (xy 158.382528 175.302096) + (xy 158.539204 175.19477) + (xy 158.544166 175.191588) + (xy 158.700174 175.098081) + (xy 158.70275 175.096591) + (xy 158.868556 175.004238) + (xy 158.874321 175.001274) + (xy 159.038969 174.923402) + (xy 159.041049 174.922451) + (xy 159.214541 174.845847) + (xy 159.221115 174.843224) + (xy 159.392855 174.781774) + (xy 159.394598 174.781171) + (xy 159.574038 174.721029) + (xy 159.5814 174.718877) + (xy 159.605717 174.712786) (xy 178.904344 174.712786) (xy 178.906065 174.712967) (xy 178.916298 174.714588) @@ -712719,8 +712723,8 @@ (xy 179.440322 174.059317) (xy 178.904344 174.595294) (xy 178.904344 174.712786) - (xy 159.60578 174.712786) - (xy 159.650836 174.7015) + (xy 159.605717 174.712786) + (xy 159.650773 174.7015) (xy 176.217339 174.7015) (xy 177.603258 174.7015) (xy 177.603258 174.595294) @@ -712736,22 +712740,21 @@ (xy 176.320986 174.491644) (xy 176.217339 174.595293) (xy 176.217339 174.7015) - (xy 159.650836 174.7015) - (xy 159.76021 174.674103) - (xy 159.761044 174.673901) - (xy 159.943631 174.630957) - (xy 159.951682 174.629415) - (xy 160.136482 174.602003) - (xy 160.136939 174.601937) - (xy 160.320342 174.576354) - (xy 160.329099 174.575529) - (xy 160.524331 174.565931) - (xy 160.524403 174.565928) - (xy 160.524407 174.566013) - (xy 160.524689 174.565914) - (xy 160.685495 174.55848) - (xy 160.698042 174.557901) - (xy 160.702613 174.557795) + (xy 159.650773 174.7015) + (xy 159.759178 174.674346) + (xy 159.759953 174.674158) + (xy 159.943801 174.630917) + (xy 159.951905 174.629366) + (xy 160.134858 174.602228) + (xy 160.134947 174.602215) + (xy 160.320499 174.576332) + (xy 160.329263 174.575507) + (xy 160.52177 174.566049) + (xy 160.522074 174.566035) + (xy 160.522078 174.566118) + (xy 160.522353 174.566022) + (xy 160.698041 174.5579) + (xy 160.702611 174.557795) (xy 165.694352 174.557795) (xy 165.694383 174.557795) (xy 165.694394 174.557789) @@ -789655,7 +789658,7 @@ (xy 210.072822 177.878845) (xy 210.069447 177.881921) (xy 210.06944 177.881927) - (xy 209.935522 178.004011) + (xy 209.948062 177.992579) (xy 209.91306 178.024488) (xy 209.910309 178.02813) (xy 209.910307 178.028133) @@ -789871,7 +789874,7 @@ (xy 213.399593 175.836435) (xy 213.287348 175.757841) (xy 213.217733 175.709096) - (xy 213.034917 175.623848) + (xy 213.034651 175.623724) (xy 213.016519 175.615269) (xy 213.016517 175.615268) (xy 213.012605 175.613444) @@ -789977,11 +789980,11 @@ (xy 212.966546 174.918261) (xy 212.968587 174.922361) (xy 212.968588 174.922362) - (xy 213.055947 175.097805) + (xy 213.055322 175.09655) (xy 213.062907 175.111781) (xy 213.065659 175.115425) (xy 213.065662 175.11543) - (xy 213.09695 175.156861) + (xy 213.124067 175.19277) (xy 213.193187 175.284299) (xy 213.352949 175.429942) (xy 213.536753 175.543748) @@ -794363,7 +794366,7 @@ (xy 179.2055 183.375508) (xy 179.2055 182.008631) (xy 179.205636 182.003449) - (xy 179.206161 181.993437) + (xy 179.205837 181.999612) (xy 179.207749 181.963136) (xy 179.199482 181.941603) (xy 179.19507 181.926704) @@ -794620,8 +794623,6 @@ (xy 189.982589 180.82076) (xy 189.88578 180.689369) (xy 191.979223 180.689369) - (xy 191.9797 180.694212) - (xy 191.992721 180.826422) (xy 191.999523 180.895479) (xy 192.000934 180.900131) (xy 192.000935 180.900135) @@ -795038,9 +795039,6 @@ (xy 179.755133 181.3) (xy 179.736697 181.171774) (xy 179.682882 181.053937) - (xy 179.617531 180.978517) - (xy 179.602684 180.961382) - (xy 179.602683 180.961381) (xy 179.598049 180.956033) (xy 179.575975 180.941846) (xy 179.54261 180.906009) @@ -795498,7 +795496,7 @@ (xy 206.633872 176.814211) (xy 206.630335 176.811734) (xy 206.630331 176.811731) - (xy 206.515611 176.731404) + (xy 206.515921 176.731621) (xy 206.448471 176.684392) (xy 206.284876 176.608107) (xy 206.247257 176.590565) @@ -795643,7 +795641,7 @@ (xy 204.2951 175.6417) (xy 204.179536 175.500885) (xy 204.176447 175.497121) - (xy 204.172682 175.494031) + (xy 204.142613 175.469354) (xy 204.020108 175.368816) (xy 204.020106 175.368814) (xy 204.016351 175.365733) @@ -798202,7 +798200,7 @@ (xy 195.487319 174.465291) (xy 195.575973 174.553945) (xy 195.57954 174.557704) - (xy 195.587021 174.566013) + (xy 195.587029 174.566022) (xy 195.606553 174.587705) (xy 195.627622 174.597085) (xy 195.641264 174.604491) @@ -798298,7 +798296,7 @@ (xy 190.396957 175.48349) (xy 190.377159 175.443344) (xy 190.362157 175.430188) - (xy 190.344523 175.414723) + (xy 190.339478 175.410299) (xy 190.332145 175.403868) (xy 190.32291 175.400733) (xy 190.322908 175.400732) @@ -879444,7 +879442,7 @@ (xy 233.008329 174.921457) (xy 233.008131 174.921241) (xy 233.007633 174.92209) - (xy 232.919642 175.001379) + (xy 232.919759 175.001274) (xy 232.571879 175.314746) (xy 231.607515 176.182246) (xy 231.606189 176.183418) @@ -889236,7 +889234,7 @@ (xy 87.802779 184.705235) (xy 87.808514 184.581172) (xy 87.818229 184.383421) - (xy 87.819056 184.374638) + (xy 87.819055 184.374644) (xy 87.822221 184.351948) (xy 88.623921 184.351948) (xy 88.643761 184.705235) @@ -889974,15 +889972,15 @@ (xy 129.237154 182.970275) (xy 130.538241 182.970275) (xy 131.074218 183.506253) - (xy 131.378255 183.506253) - (xy 131.324733 183.385037) - (xy 131.258452 183.244895) - (xy 131.180819 183.105519) - (xy 131.101234 182.972737) - (xy 131.010993 182.841002) - (xy 130.918868 182.716783) - (xy 130.81678 182.593843) - (xy 130.714052 182.480498) + (xy 131.378257 183.506253) + (xy 131.324322 183.3841) + (xy 131.258664 183.245277) + (xy 131.180349 183.104676) + (xy 131.101509 182.973137) + (xy 131.010551 182.840353) + (xy 130.919208 182.717191) + (xy 130.816354 182.593328) + (xy 130.714073 182.480477) (xy 130.538241 182.656311) (xy 130.538241 182.970275) (xy 129.237154 182.970275) @@ -891831,78 +891829,82 @@ (xy 117.7701 180.760498) (xy 128.322715 180.75482) (xy 128.32732 180.754925) - (xy 128.497482 180.762793) - (xy 128.49776 180.762879) - (xy 128.497762 180.762806) - (xy 128.497849 180.76281) - (xy 128.695914 180.772541) - (xy 128.704687 180.773366) - (xy 128.888217 180.798968) - (xy 128.888552 180.799017) - (xy 129.073296 180.826422) - (xy 129.081399 180.827973) - (xy 129.26376 180.870865) - (xy 129.264978 180.87116) - (xy 129.443791 180.915951) - (xy 129.451179 180.918111) - (xy 129.629656 180.97793) - (xy 129.631465 180.978557) - (xy 129.804092 181.040324) - (xy 129.810683 181.042955) - (xy 129.983301 181.119174) - (xy 129.985609 181.120229) - (xy 130.150883 181.198398) - (xy 130.156684 181.201382) - (xy 130.321764 181.293332) - (xy 130.324442 181.294879) - (xy 130.481025 181.388732) - (xy 130.48603 181.391941) - (xy 130.642125 181.49887) - (xy 130.645089 181.500984) - (xy 130.785818 181.605356) - (xy 130.791516 181.609582) - (xy 130.795788 181.612935) - (xy 130.941381 181.733835) - (xy 130.944619 181.736645) - (xy 130.990587 181.778308) - (xy 131.07963 181.859012) - (xy 131.083128 181.862343) - (xy 131.11936 181.898575) - (xy 131.216963 181.996179) - (xy 131.220304 181.999688) - (xy 131.336736 182.128152) - (xy 131.342681 182.134711) - (xy 131.34549 182.137949) - (xy 131.466361 182.283509) - (xy 131.469715 182.287781) - (xy 131.57833 182.434233) - (xy 131.580487 182.437259) - (xy 131.687356 182.593269) - (xy 131.690596 182.598321) - (xy 131.784394 182.754815) - (xy 131.785968 182.757537) - (xy 131.862284 182.89455) + (xy 128.502337 180.763017) + (xy 128.695598 180.772498) + (xy 128.704379 180.773323) + (xy 128.891639 180.799446) + (xy 128.891847 180.799476) + (xy 129.072945 180.82634) + (xy 129.081062 180.827894) + (xy 129.265838 180.871353) + (xy 129.266878 180.871606) + (xy 129.44344 180.915832) + (xy 129.450808 180.917986) + (xy 129.627521 180.977215) + (xy 129.631003 180.978382) + (xy 129.632894 180.979037) + (xy 129.803713 181.040158) + (xy 129.810321 181.042795) + (xy 129.890966 181.078404) + (xy 129.984314 181.119622) + (xy 129.986653 181.120691) + (xy 130.060667 181.155697) + (xy 130.139668 181.193062) + (xy 130.15046 181.198166) + (xy 130.156303 181.20117) + (xy 130.322591 181.293792) + (xy 130.325272 181.295342) + (xy 130.461605 181.377058) + (xy 130.480605 181.388446) + (xy 130.485656 181.391686) + (xy 130.538998 181.428226) + (xy 130.642744 181.499294) + (xy 130.645705 181.501405) + (xy 130.791142 181.609269) + (xy 130.795379 181.612595) + (xy 130.941873 181.734243) + (xy 130.945105 181.737047) + (xy 131.079234 181.858615) + (xy 131.082729 181.861944) + (xy 131.217384 181.996599) + (xy 131.220715 182.000098) + (xy 131.28274 182.068533) + (xy 131.342254 182.134197) + (xy 131.345064 182.137435) + (xy 131.373653 182.171863) + (xy 131.45975 182.275547) + (xy 131.466701 182.283917) + (xy 131.470049 182.288181) + (xy 131.56798 182.420227) + (xy 131.577895 182.433596) + (xy 131.580052 182.436622) + (xy 131.687625 182.593661) + (xy 131.690865 182.598713) + (xy 131.783954 182.754025) + (xy 131.785528 182.756747) + (xy 131.869153 182.906882) (xy 131.877298 182.921506) - (xy 131.877928 182.922636) - (xy 131.880934 182.928483) - (xy 131.959058 183.093665) - (xy 131.960128 183.096005) - (xy 132.036349 183.268633) - (xy 132.038997 183.275268) - (xy 132.100732 183.447808) - (xy 132.101387 183.449699) - (xy 132.161193 183.628136) - (xy 132.163358 183.635542) - (xy 132.208119 183.814241) - (xy 132.208456 183.81563) - (xy 132.251326 183.997906) - (xy 132.252885 184.006046) - (xy 132.280256 184.190571) - (xy 132.280378 184.19142) - (xy 132.305935 184.374638) - (xy 132.306764 184.38345) - (xy 132.316243 184.576118) - (xy 132.322117 184.70317) + (xy 131.878134 182.923006) + (xy 131.88114 182.928852) + (xy 131.958631 183.092695) + (xy 131.959693 183.095017) + (xy 131.983696 183.149379) + (xy 132.036505 183.268983) + (xy 132.039153 183.275619) + (xy 132.100283 183.446467) + (xy 132.100938 183.448358) + (xy 132.161311 183.628488) + (xy 132.163476 183.635894) + (xy 132.207652 183.812258) + (xy 132.20799 183.813648) + (xy 132.251406 183.998249) + (xy 132.252963 184.006388) + (xy 132.279794 184.18727) + (xy 132.279917 184.188119) + (xy 132.305976 184.374936) + (xy 132.306806 184.383755) + (xy 132.316031 184.571539) + (xy 132.316044 184.571825) (xy 132.324404 184.752651) (xy 132.32451 184.757223) (xy 132.32451 188.729212) @@ -894819,7 +894821,7 @@ (xy 194.266813 183.25547) (xy 194.266805 183.255467) (xy 194.262544 183.253817) - (xy 194.214816 183.244895) + (xy 194.245094 183.250555) (xy 194.054547 183.214935) (xy 194.054543 183.214934) (xy 194.050041 183.214093) @@ -896562,7 +896564,7 @@ (xy 186.133832 182.929936) (xy 186.13542 182.932834) (xy 186.135423 182.93284) - (xy 186.213621 183.075533) + (xy 186.223625 183.093788) (xy 186.275025 183.18758) (xy 186.27698 183.190233) (xy 186.276983 183.190238) @@ -896890,8 +896892,6 @@ (xy 189.946567 180.77187) (xy 189.88578 180.689369) (xy 191.979223 180.689369) - (xy 191.9797 180.694212) - (xy 191.992721 180.826422) (xy 191.999523 180.895479) (xy 192.000934 180.900131) (xy 192.000935 180.900135) @@ -897727,7 +897727,7 @@ (xy 185.989408 181.494325) (xy 185.988859 181.497579) (xy 185.988857 181.497588) - (xy 185.9479 181.740399) + (xy 185.948542 181.736593) (xy 185.940541 181.784028) (xy 185.94043 181.787331) (xy 185.94043 181.787337) @@ -897809,9 +897809,6 @@ (xy 179.755133 181.3) (xy 179.736697 181.171774) (xy 179.682882 181.053937) - (xy 179.617341 180.978297) - (xy 179.602684 180.961382) - (xy 179.602683 180.961381) (xy 179.598049 180.956033) (xy 179.589018 180.950229) (xy 179.495026 180.889824) @@ -898915,7 +898912,7 @@ (xy 213.399593 175.836435) (xy 213.27259 175.747507) (xy 213.217733 175.709096) - (xy 213.034917 175.623848) + (xy 213.034651 175.623724) (xy 213.016519 175.615269) (xy 213.016517 175.615268) (xy 213.012605 175.613444) @@ -898983,7 +898980,7 @@ (xy 206.633872 176.814211) (xy 206.630335 176.811734) (xy 206.630331 176.811731) - (xy 206.515611 176.731404) + (xy 206.515921 176.731621) (xy 206.448471 176.684392) (xy 206.294121 176.612418) (xy 206.247257 176.590565) @@ -899132,11 +899129,11 @@ (xy 202.029602 176.812756) (xy 202.031562 176.817049) (xy 202.031564 176.817053) - (xy 202.073317 176.908479) + (xy 202.073139 176.908089) (xy 202.116188 177.002352) (xy 202.118923 177.006193) (xy 202.118925 177.006196) - (xy 202.148605 177.047876) + (xy 202.14874 177.048065) (xy 202.23709 177.172136) (xy 202.240497 177.175385) (xy 202.240501 177.175389) @@ -899201,7 +899198,7 @@ (xy 204.2951 175.6417) (xy 204.179536 175.500885) (xy 204.176447 175.497121) - (xy 204.172682 175.494031) + (xy 204.144895 175.471227) (xy 204.020108 175.368816) (xy 204.020106 175.368814) (xy 204.016351 175.365733) @@ -899850,15 +899847,17 @@ (xy 156.70051 178.939768) (xy 156.70051 178.559574) (xy 156.700616 178.555002) - (xy 156.702988 178.503697) - (xy 156.708507 178.384326) - (xy 156.718232 178.186385) - (xy 156.719057 178.177617) - (xy 156.744683 177.993917) - (xy 156.772113 177.809) - (xy 156.773662 177.800907) - (xy 156.796706 177.702933) - (xy 157.514967 177.702933) + (xy 156.708592 178.382491) + (xy 156.708605 178.382209) + (xy 156.711607 178.321061) + (xy 156.71821 178.186553) + (xy 156.719035 178.177774) + (xy 156.744897 177.992379) + (xy 156.74494 177.99208) + (xy 156.772076 177.809145) + (xy 156.773616 177.801102) + (xy 156.796708 177.702922) + (xy 157.514956 177.702922) (xy 157.944276 178.132242) (xy 158.25824 178.132242) (xy 158.794217 177.596264) @@ -899876,31 +899875,32 @@ (xy 158.25824 176.746322) (xy 157.944275 176.746322) (xy 157.943085 176.747511) - (xy 157.923757 176.775728) - (xy 157.844188 176.908479) - (xy 157.766544 177.047876) - (xy 157.700244 177.188055) - (xy 157.635914 177.333748) - (xy 157.583496 177.480249) - (xy 157.533041 177.630785) - (xy 157.514967 177.702933) - (xy 156.796706 177.702933) - (xy 156.816612 177.618297) - (xy 156.816793 177.617552) - (xy 156.861648 177.43848) - (xy 156.863791 177.431152) - (xy 156.923649 177.25256) - (xy 156.924233 177.250875) - (xy 156.986016 177.078201) - (xy 156.988632 177.071648) - (xy 157.064917 176.898878) - (xy 157.065877 176.896778) - (xy 157.144094 176.731404) - (xy 157.147054 176.725647) - (xy 157.23908 176.56043) - (xy 157.240544 176.557897) - (xy 157.334427 176.401264) - (xy 157.337625 176.396277) + (xy 157.923617 176.775932) + (xy 157.844404 176.908089) + (xy 157.766438 177.048065) + (xy 157.700479 177.187524) + (xy 157.635831 177.333937) + (xy 157.583746 177.479507) + (xy 157.53298 177.630969) + (xy 157.514956 177.702922) + (xy 156.796708 177.702922) + (xy 156.816808 177.617463) + (xy 156.817082 177.616336) + (xy 156.861587 177.438664) + (xy 156.863729 177.431337) + (xy 156.923872 177.251894) + (xy 156.92447 177.250169) + (xy 156.985933 177.078392) + (xy 156.98857 177.071788) + (xy 156.989282 177.070177) + (xy 157.065094 176.898479) + (xy 157.066137 176.896195) + (xy 157.143974 176.731621) + (xy 157.146949 176.725836) + (xy 157.239294 176.560047) + (xy 157.240785 176.557465) + (xy 157.334287 176.401468) + (xy 157.337502 176.396457) (xy 157.435936 176.252761) (xy 158.751801 176.252761) (xy 159.287779 176.788739) @@ -899988,7 +899988,7 @@ (xy 178.207848 176.462704) (xy 178.213484 176.430735) (xy 178.21576 176.42083) - (xy 178.221117 176.402003) + (xy 178.221535 176.400534) (xy 178.225515 176.386548) (xy 178.224667 176.377404) (xy 178.224834 176.375605) @@ -900168,37 +900168,37 @@ (xy 160.13772 176.252761) (xy 160.13772 175.938797) (xy 159.63551 175.436586) - (xy 159.62288 175.440819) - (xy 159.476477 175.493201) - (xy 159.33077 175.557537) - (xy 159.190571 175.623848) - (xy 159.051222 175.701462) - (xy 158.91843 175.781057) - (xy 158.890204 175.800391) + (xy 159.622214 175.441043) + (xy 159.47665 175.493126) + (xy 159.330227 175.557777) + (xy 159.190793 175.623724) + (xy 159.050759 175.701722) + (xy 158.918642 175.78091) + (xy 158.890209 175.800386) (xy 158.751801 175.938796) (xy 158.751801 176.252761) (xy 157.435936 176.252761) - (xy 157.444575 176.240149) - (xy 157.446624 176.237275) - (xy 157.55532 176.090716) - (xy 157.558597 176.086542) - (xy 157.679538 175.9409) - (xy 157.682305 175.937712) - (xy 157.804728 175.802639) - (xy 157.807998 175.799203) - (xy 157.941908 175.665293) - (xy 157.945344 175.662023) - (xy 158.080464 175.539558) - (xy 158.083572 175.53686) - (xy 158.229233 175.415906) - (xy 158.233458 175.41259) - (xy 158.379978 175.303923) - (xy 158.382875 175.301858) - (xy 158.538978 175.194925) - (xy 158.543965 175.191726) - (xy 158.700663 175.097805) - (xy 158.703131 175.096379) - (xy 158.757784 175.065938) + (xy 157.444788 176.239839) + (xy 157.446867 176.236924) + (xy 157.555133 176.090944) + (xy 157.558429 176.086745) + (xy 157.679772 175.940617) + (xy 157.682514 175.937459) + (xy 157.804506 175.802861) + (xy 157.807777 175.799424) + (xy 157.942129 175.665072) + (xy 157.945544 175.661821) + (xy 158.080195 175.539781) + (xy 158.083336 175.537056) + (xy 158.22946 175.415717) + (xy 158.233643 175.412434) + (xy 158.379662 175.304139) + (xy 158.382528 175.302096) + (xy 158.539204 175.19477) + (xy 158.544166 175.191588) + (xy 158.700174 175.098081) + (xy 158.70275 175.096591) + (xy 158.757783 175.065938) (xy 171.000007 175.065938) (xy 171.379305 175.445236) (xy 171.693269 175.445236) @@ -900212,11 +900212,11 @@ (xy 171.494942 175.03254) (xy 171.494407 175.032577) (xy 171.000007 175.065938) - (xy 158.757784 175.065938) - (xy 158.868342 175.004358) - (xy 158.874135 175.001379) - (xy 159.039486 174.923174) - (xy 159.041574 174.922219) + (xy 158.757783 175.065938) + (xy 158.868556 175.004238) + (xy 158.874321 175.001274) + (xy 159.038969 174.923402) + (xy 159.041049 174.922451) (xy 159.070928 174.909258) (xy 173.530333 174.909258) (xy 174.066311 175.445236) @@ -900465,27 +900465,26 @@ (xy 173.530333 174.840877) (xy 173.530333 174.909258) (xy 159.070928 174.909258) - (xy 159.214372 174.845922) - (xy 159.220914 174.843312) - (xy 159.393571 174.781534) - (xy 159.395281 174.780942) - (xy 159.573857 174.72109) - (xy 159.581204 174.718942) - (xy 159.76021 174.674103) - (xy 159.761044 174.673901) - (xy 159.943631 174.630957) - (xy 159.951682 174.629415) - (xy 160.136482 174.602003) - (xy 160.136939 174.601937) - (xy 160.320342 174.576354) - (xy 160.329099 174.575529) - (xy 160.524331 174.565931) - (xy 160.524403 174.565928) - (xy 160.524407 174.566013) - (xy 160.524689 174.565914) - (xy 160.685495 174.55848) - (xy 160.698042 174.557901) - (xy 160.702613 174.557795) + (xy 159.214541 174.845847) + (xy 159.221115 174.843224) + (xy 159.392855 174.781774) + (xy 159.394598 174.781171) + (xy 159.574038 174.721029) + (xy 159.5814 174.718877) + (xy 159.759178 174.674346) + (xy 159.759953 174.674158) + (xy 159.943801 174.630917) + (xy 159.951905 174.629366) + (xy 160.134858 174.602228) + (xy 160.134947 174.602215) + (xy 160.320499 174.576332) + (xy 160.329263 174.575507) + (xy 160.52177 174.566049) + (xy 160.522074 174.566035) + (xy 160.522078 174.566118) + (xy 160.522353 174.566022) + (xy 160.698041 174.5579) + (xy 160.702611 174.557795) (xy 165.694352 174.557795) (xy 165.694383 174.557795) (xy 165.694394 174.557789) @@ -900688,7 +900687,7 @@ (xy 213.062907 175.111781) (xy 213.065659 175.115425) (xy 213.065662 175.11543) - (xy 213.09695 175.156861) + (xy 213.124067 175.19277) (xy 213.193187 175.284299) (xy 213.352949 175.429942) (xy 213.536753 175.543748) @@ -991965,7 +991964,7 @@ (xy 87.80287 184.703271) (xy 87.808514 184.581172) (xy 87.818229 184.383421) - (xy 87.819056 184.374638) + (xy 87.819055 184.374644) (xy 87.822221 184.351948) (xy 88.623921 184.351948) (xy 88.643761 184.705235) @@ -992543,15 +992542,15 @@ (xy 129.237154 182.970275) (xy 130.538241 182.970275) (xy 131.074218 183.506253) - (xy 131.378255 183.506253) - (xy 131.324733 183.385037) - (xy 131.258452 183.244895) - (xy 131.180819 183.105519) - (xy 131.101234 182.972737) - (xy 131.010993 182.841002) - (xy 130.918868 182.716783) - (xy 130.81678 182.593843) - (xy 130.714052 182.480498) + (xy 131.378257 183.506253) + (xy 131.324322 183.3841) + (xy 131.258664 183.245277) + (xy 131.180349 183.104676) + (xy 131.101509 182.973137) + (xy 131.010551 182.840353) + (xy 130.919208 182.717191) + (xy 130.816354 182.593328) + (xy 130.714073 182.480477) (xy 130.538241 182.656311) (xy 130.538241 182.970275) (xy 129.237154 182.970275) @@ -994400,78 +994399,82 @@ (xy 117.7701 180.760498) (xy 128.322715 180.75482) (xy 128.32732 180.754925) - (xy 128.497482 180.762793) - (xy 128.49776 180.762879) - (xy 128.497762 180.762806) - (xy 128.497849 180.76281) - (xy 128.695914 180.772541) - (xy 128.704687 180.773366) - (xy 128.888217 180.798968) - (xy 128.888552 180.799017) - (xy 129.073296 180.826422) - (xy 129.081399 180.827973) - (xy 129.26376 180.870865) - (xy 129.264978 180.87116) - (xy 129.443791 180.915951) - (xy 129.451179 180.918111) - (xy 129.629656 180.97793) - (xy 129.631465 180.978557) - (xy 129.804092 181.040324) - (xy 129.810683 181.042955) - (xy 129.983301 181.119174) - (xy 129.985609 181.120229) - (xy 130.150883 181.198398) - (xy 130.156684 181.201382) - (xy 130.321764 181.293332) - (xy 130.324442 181.294879) - (xy 130.481025 181.388732) - (xy 130.48603 181.391941) - (xy 130.642125 181.49887) - (xy 130.645089 181.500984) - (xy 130.785818 181.605356) - (xy 130.791516 181.609582) - (xy 130.795788 181.612935) - (xy 130.941381 181.733835) - (xy 130.944619 181.736645) - (xy 130.990587 181.778308) - (xy 131.07963 181.859012) - (xy 131.083128 181.862343) - (xy 131.11936 181.898575) - (xy 131.216963 181.996179) - (xy 131.220304 181.999688) - (xy 131.336736 182.128152) - (xy 131.342681 182.134711) - (xy 131.34549 182.137949) - (xy 131.466361 182.283509) - (xy 131.469715 182.287781) - (xy 131.57833 182.434233) - (xy 131.580487 182.437259) - (xy 131.687356 182.593269) - (xy 131.690596 182.598321) - (xy 131.784394 182.754815) - (xy 131.785968 182.757537) - (xy 131.862284 182.89455) + (xy 128.502337 180.763017) + (xy 128.695598 180.772498) + (xy 128.704379 180.773323) + (xy 128.891639 180.799446) + (xy 128.891847 180.799476) + (xy 129.072945 180.82634) + (xy 129.081062 180.827894) + (xy 129.265838 180.871353) + (xy 129.266878 180.871606) + (xy 129.44344 180.915832) + (xy 129.450808 180.917986) + (xy 129.627521 180.977215) + (xy 129.631003 180.978382) + (xy 129.632894 180.979037) + (xy 129.803713 181.040158) + (xy 129.810321 181.042795) + (xy 129.890966 181.078404) + (xy 129.984314 181.119622) + (xy 129.986653 181.120691) + (xy 130.060667 181.155697) + (xy 130.143444 181.194848) + (xy 130.15046 181.198166) + (xy 130.156303 181.20117) + (xy 130.322591 181.293792) + (xy 130.325272 181.295342) + (xy 130.461605 181.377058) + (xy 130.480605 181.388446) + (xy 130.485656 181.391686) + (xy 130.538998 181.428226) + (xy 130.642744 181.499294) + (xy 130.645705 181.501405) + (xy 130.791142 181.609269) + (xy 130.795379 181.612595) + (xy 130.941873 181.734243) + (xy 130.945105 181.737047) + (xy 131.079234 181.858615) + (xy 131.082729 181.861944) + (xy 131.217384 181.996599) + (xy 131.220715 182.000098) + (xy 131.28274 182.068533) + (xy 131.342254 182.134197) + (xy 131.345064 182.137435) + (xy 131.373653 182.171863) + (xy 131.45975 182.275547) + (xy 131.466701 182.283917) + (xy 131.470049 182.288181) + (xy 131.56798 182.420227) + (xy 131.577895 182.433596) + (xy 131.580052 182.436622) + (xy 131.687625 182.593661) + (xy 131.690865 182.598713) + (xy 131.783954 182.754025) + (xy 131.785528 182.756747) + (xy 131.869153 182.906882) (xy 131.877298 182.921506) - (xy 131.877928 182.922636) - (xy 131.880934 182.928483) - (xy 131.959058 183.093665) - (xy 131.960128 183.096005) - (xy 132.036349 183.268633) - (xy 132.038997 183.275268) - (xy 132.100732 183.447808) - (xy 132.101387 183.449699) - (xy 132.161193 183.628136) - (xy 132.163358 183.635542) - (xy 132.208119 183.814241) - (xy 132.208456 183.81563) - (xy 132.251326 183.997906) - (xy 132.252885 184.006046) - (xy 132.280256 184.190571) - (xy 132.280378 184.19142) - (xy 132.305935 184.374638) - (xy 132.306764 184.38345) - (xy 132.316243 184.576118) - (xy 132.324103 184.746139) + (xy 131.878134 182.923006) + (xy 131.88114 182.928852) + (xy 131.958631 183.092695) + (xy 131.959693 183.095017) + (xy 131.983696 183.149379) + (xy 132.036505 183.268983) + (xy 132.039153 183.275619) + (xy 132.100283 183.446467) + (xy 132.100938 183.448358) + (xy 132.161311 183.628488) + (xy 132.163476 183.635894) + (xy 132.207652 183.812258) + (xy 132.20799 183.813648) + (xy 132.251406 183.998249) + (xy 132.252963 184.006388) + (xy 132.279794 184.18727) + (xy 132.279917 184.188119) + (xy 132.305976 184.374936) + (xy 132.306806 184.383755) + (xy 132.316031 184.571539) + (xy 132.316044 184.571825) (xy 132.324404 184.752651) (xy 132.32451 184.757223) (xy 132.32451 188.729212) @@ -998615,7 +998618,7 @@ (xy 211.655914 175.704394) (xy 211.6455 175.755068) (xy 211.643708 175.762369) - (xy 211.633181 175.799162) + (xy 211.629476 175.81211) (xy 211.628095 175.816937) (xy 211.627714 175.821937) (xy 211.627713 175.821944) @@ -998755,7 +998758,7 @@ (xy 206.633872 176.814211) (xy 206.630335 176.811734) (xy 206.630331 176.811731) - (xy 206.515611 176.731404) + (xy 206.515921 176.731621) (xy 206.448471 176.684392) (xy 206.293585 176.612168) (xy 206.247257 176.590565) @@ -998889,7 +998892,7 @@ (xy 194.266813 183.25547) (xy 194.266805 183.255467) (xy 194.262544 183.253817) - (xy 194.214816 183.244895) + (xy 194.245094 183.250555) (xy 194.054547 183.214935) (xy 194.054543 183.214934) (xy 194.050041 183.214093) @@ -1001486,7 +1001489,7 @@ (xy 186.133832 182.929936) (xy 186.13542 182.932834) (xy 186.135423 182.93284) - (xy 186.213621 183.075533) + (xy 186.223625 183.093788) (xy 186.275025 183.18758) (xy 186.27698 183.190233) (xy 186.276983 183.190238) @@ -1001661,8 +1001664,6 @@ (xy 189.982589 180.82076) (xy 189.88578 180.689369) (xy 191.979223 180.689369) - (xy 191.9797 180.694212) - (xy 191.992721 180.826422) (xy 191.999523 180.895479) (xy 192.000934 180.900131) (xy 192.000935 180.900135) @@ -1001975,9 +1001976,6 @@ (xy 179.755133 181.3) (xy 179.736697 181.171774) (xy 179.682882 181.053937) - (xy 179.617341 180.978297) - (xy 179.602684 180.961382) - (xy 179.602683 180.961381) (xy 179.598049 180.956033) (xy 179.589018 180.950229) (xy 179.495026 180.889824) @@ -1002694,7 +1002692,7 @@ (xy 202.116188 177.002352) (xy 202.118923 177.006193) (xy 202.118925 177.006196) - (xy 202.147988 177.047009) + (xy 202.149679 177.049384) (xy 202.23709 177.172136) (xy 202.240497 177.175385) (xy 202.240501 177.175389) @@ -1002783,7 +1002781,7 @@ (xy 204.2951 175.6417) (xy 204.179536 175.500885) (xy 204.176447 175.497121) - (xy 204.172682 175.494031) + (xy 204.102387 175.436341) (xy 204.020108 175.368816) (xy 204.020106 175.368814) (xy 204.016351 175.365733) @@ -1003473,46 +1003471,47 @@ (xy 156.70051 179.212333) (xy 156.70051 178.559574) (xy 156.700616 178.555002) - (xy 156.702859 178.506488) - (xy 156.708507 178.384326) - (xy 156.718232 178.186385) - (xy 156.719057 178.177617) - (xy 156.744663 177.994058) - (xy 156.744695 177.993839) - (xy 156.772113 177.809) - (xy 156.773662 177.800907) - (xy 156.796706 177.702933) - (xy 157.514967 177.702933) + (xy 156.708592 178.382491) + (xy 156.708605 178.382209) + (xy 156.711157 178.330225) + (xy 156.71821 178.186553) + (xy 156.719035 178.177774) + (xy 156.744897 177.992379) + (xy 156.74494 177.99208) + (xy 156.772076 177.809145) + (xy 156.773616 177.801102) + (xy 156.796708 177.702922) + (xy 157.514956 177.702922) (xy 157.849465 178.037431) (xy 158.699407 177.187489) (xy 158.25824 176.746322) (xy 157.944275 176.746322) (xy 157.943085 176.747511) - (xy 157.923757 176.775728) - (xy 157.844188 176.908479) - (xy 157.766544 177.047876) - (xy 157.700244 177.188055) - (xy 157.635914 177.333748) - (xy 157.583496 177.480249) - (xy 157.533041 177.630785) - (xy 157.514967 177.702933) - (xy 156.796706 177.702933) - (xy 156.816612 177.618297) - (xy 156.816793 177.617552) - (xy 156.861648 177.43848) - (xy 156.863791 177.431152) - (xy 156.923649 177.25256) - (xy 156.924233 177.250875) - (xy 156.986016 177.078201) - (xy 156.988632 177.071648) - (xy 157.064917 176.898878) - (xy 157.065877 176.896778) - (xy 157.144094 176.731404) - (xy 157.147054 176.725647) - (xy 157.23908 176.56043) - (xy 157.240544 176.557897) - (xy 157.334427 176.401264) - (xy 157.337625 176.396277) + (xy 157.923617 176.775932) + (xy 157.844404 176.908089) + (xy 157.766441 177.048059) + (xy 157.700466 177.187554) + (xy 157.635833 177.333929) + (xy 157.583751 177.479491) + (xy 157.53298 177.630969) + (xy 157.514956 177.702922) + (xy 156.796708 177.702922) + (xy 156.816808 177.617463) + (xy 156.817082 177.616336) + (xy 156.861587 177.438664) + (xy 156.863729 177.431337) + (xy 156.923872 177.251894) + (xy 156.92447 177.250169) + (xy 156.98594 177.078373) + (xy 156.988553 177.071826) + (xy 157.065116 176.898427) + (xy 157.066124 176.896222) + (xy 157.143974 176.731621) + (xy 157.146949 176.725836) + (xy 157.239294 176.560047) + (xy 157.240785 176.557465) + (xy 157.334287 176.401468) + (xy 157.337502 176.396457) (xy 157.435936 176.252761) (xy 158.751801 176.252761) (xy 159.206155 176.707115) @@ -1003622,7 +1003621,7 @@ (xy 178.207848 176.462704) (xy 178.213484 176.430735) (xy 178.21576 176.42083) - (xy 178.221117 176.402003) + (xy 178.221535 176.400534) (xy 178.225515 176.386548) (xy 178.224667 176.377404) (xy 178.224834 176.375605) @@ -1003802,37 +1003801,37 @@ (xy 160.13772 176.252761) (xy 160.13772 175.938797) (xy 159.63551 175.436586) - (xy 159.62288 175.440819) - (xy 159.476477 175.493201) - (xy 159.33077 175.557537) - (xy 159.190571 175.623848) - (xy 159.051222 175.701462) - (xy 158.91843 175.781057) - (xy 158.890204 175.800391) + (xy 159.622214 175.441043) + (xy 159.47665 175.493126) + (xy 159.330227 175.557777) + (xy 159.190793 175.623724) + (xy 159.050759 175.701722) + (xy 158.918642 175.78091) + (xy 158.890209 175.800386) (xy 158.751801 175.938796) (xy 158.751801 176.252761) (xy 157.435936 176.252761) - (xy 157.444575 176.240149) - (xy 157.446624 176.237275) - (xy 157.55532 176.090716) - (xy 157.558597 176.086542) - (xy 157.679538 175.9409) - (xy 157.682305 175.937712) - (xy 157.804728 175.802639) - (xy 157.807998 175.799203) - (xy 157.941908 175.665293) - (xy 157.945344 175.662023) - (xy 158.080464 175.539558) - (xy 158.083572 175.53686) - (xy 158.229233 175.415906) - (xy 158.233458 175.41259) - (xy 158.379978 175.303923) - (xy 158.382875 175.301858) - (xy 158.538978 175.194925) - (xy 158.543965 175.191726) - (xy 158.700663 175.097805) - (xy 158.703131 175.096379) - (xy 158.757784 175.065938) + (xy 157.444788 176.239839) + (xy 157.446867 176.236924) + (xy 157.555133 176.090944) + (xy 157.558429 176.086745) + (xy 157.679772 175.940617) + (xy 157.682514 175.937459) + (xy 157.804506 175.802861) + (xy 157.807777 175.799424) + (xy 157.942129 175.665072) + (xy 157.945544 175.661821) + (xy 158.080195 175.539781) + (xy 158.083336 175.537056) + (xy 158.22946 175.415717) + (xy 158.233643 175.412434) + (xy 158.379662 175.304139) + (xy 158.382528 175.302096) + (xy 158.539204 175.19477) + (xy 158.544166 175.191588) + (xy 158.700174 175.098081) + (xy 158.70275 175.096591) + (xy 158.757783 175.065938) (xy 171.000007 175.065938) (xy 171.379305 175.445236) (xy 171.693269 175.445236) @@ -1003846,11 +1003845,11 @@ (xy 171.494942 175.03254) (xy 171.494407 175.032577) (xy 171.000007 175.065938) - (xy 158.757784 175.065938) - (xy 158.868342 175.004358) - (xy 158.874135 175.001379) - (xy 159.039486 174.923174) - (xy 159.041574 174.922219) + (xy 158.757783 175.065938) + (xy 158.868556 175.004238) + (xy 158.874321 175.001274) + (xy 159.038969 174.923402) + (xy 159.041049 174.922451) (xy 159.070928 174.909258) (xy 173.530333 174.909258) (xy 174.066311 175.445236) @@ -1004099,27 +1004098,26 @@ (xy 173.530333 174.840877) (xy 173.530333 174.909258) (xy 159.070928 174.909258) - (xy 159.214372 174.845922) - (xy 159.220914 174.843312) - (xy 159.393571 174.781534) - (xy 159.395281 174.780942) - (xy 159.573857 174.72109) - (xy 159.581204 174.718942) - (xy 159.76021 174.674103) - (xy 159.761044 174.673901) - (xy 159.943631 174.630957) - (xy 159.951682 174.629415) - (xy 160.136482 174.602003) - (xy 160.136939 174.601937) - (xy 160.320342 174.576354) - (xy 160.329099 174.575529) - (xy 160.524331 174.565931) - (xy 160.524403 174.565928) - (xy 160.524407 174.566013) - (xy 160.524689 174.565914) - (xy 160.685495 174.55848) - (xy 160.698042 174.557901) - (xy 160.702613 174.557795) + (xy 159.214541 174.845847) + (xy 159.221115 174.843224) + (xy 159.392855 174.781774) + (xy 159.394598 174.781171) + (xy 159.574038 174.721029) + (xy 159.5814 174.718877) + (xy 159.759178 174.674346) + (xy 159.759953 174.674158) + (xy 159.943801 174.630917) + (xy 159.951905 174.629366) + (xy 160.134858 174.602228) + (xy 160.134947 174.602215) + (xy 160.320499 174.576332) + (xy 160.329263 174.575507) + (xy 160.52177 174.566049) + (xy 160.522074 174.566035) + (xy 160.522078 174.566118) + (xy 160.522353 174.566022) + (xy 160.698041 174.5579) + (xy 160.702611 174.557795) (xy 165.694352 174.557795) (xy 165.694383 174.557795) (xy 165.694394 174.557789) @@ -1108111,10 +1108109,10 @@ (xy 87.804443 184.669236) (xy 87.808514 184.581172) (xy 87.818229 184.383421) - (xy 87.819056 184.374638) + (xy 87.819055 184.374644) (xy 87.822608 184.34917) (xy 89.173462 184.34917) - (xy 89.175087 184.376039) + (xy 89.173643 184.352162) (xy 89.190894 184.63737) (xy 89.192822 184.669236) (xy 89.193359 184.672169) @@ -1108504,7 +1108502,7 @@ (xy 93.866653 182.652544) (xy 93.816361 182.588351) (xy 93.589626 182.361616) - (xy 93.490807 182.284196) + (xy 93.499171 182.290749) (xy 93.339573 182.165711) (xy 93.339568 182.165708) (xy 93.337215 182.163864) @@ -1109272,78 +1109270,79 @@ (xy 117.7701 180.760498) (xy 128.322715 180.75482) (xy 128.32732 180.754925) - (xy 128.497482 180.762793) - (xy 128.49776 180.762879) - (xy 128.497762 180.762806) - (xy 128.497849 180.76281) - (xy 128.695914 180.772541) - (xy 128.704687 180.773366) - (xy 128.888217 180.798968) - (xy 128.888552 180.799017) - (xy 129.073296 180.826422) - (xy 129.081399 180.827973) - (xy 129.26376 180.870865) - (xy 129.264978 180.87116) - (xy 129.443791 180.915951) - (xy 129.451179 180.918111) - (xy 129.629656 180.97793) - (xy 129.631465 180.978557) - (xy 129.804092 181.040324) - (xy 129.810683 181.042955) - (xy 129.983301 181.119174) - (xy 129.985609 181.120229) - (xy 130.150883 181.198398) - (xy 130.156684 181.201382) - (xy 130.321764 181.293332) - (xy 130.324442 181.294879) - (xy 130.481025 181.388732) - (xy 130.48603 181.391941) - (xy 130.642125 181.49887) - (xy 130.645089 181.500984) - (xy 130.788049 181.607011) - (xy 130.791516 181.609582) - (xy 130.795788 181.612935) - (xy 130.941381 181.733835) - (xy 130.944619 181.736645) - (xy 130.990587 181.778308) - (xy 131.07963 181.859012) - (xy 131.083128 181.862343) - (xy 131.11936 181.898575) - (xy 131.216963 181.996179) - (xy 131.220304 181.999688) - (xy 131.288854 182.075321) - (xy 131.342681 182.134711) - (xy 131.34549 182.137949) - (xy 131.466361 182.283509) - (xy 131.469715 182.287781) - (xy 131.57833 182.434233) - (xy 131.580487 182.437259) - (xy 131.687356 182.593269) - (xy 131.690596 182.598321) - (xy 131.784394 182.754815) - (xy 131.785968 182.757537) - (xy 131.849023 182.870741) - (xy 131.873491 182.914671) - (xy 131.877928 182.922636) - (xy 131.880934 182.928483) - (xy 131.959058 183.093665) - (xy 131.960128 183.096005) - (xy 132.036349 183.268633) - (xy 132.038997 183.275268) - (xy 132.100732 183.447808) - (xy 132.101387 183.449699) - (xy 132.161193 183.628136) - (xy 132.163358 183.635542) - (xy 132.208119 183.814241) - (xy 132.208456 183.81563) - (xy 132.251326 183.997906) - (xy 132.252885 184.006046) - (xy 132.280256 184.190571) - (xy 132.280378 184.19142) - (xy 132.305935 184.374638) - (xy 132.306764 184.38345) - (xy 132.316243 184.576118) - (xy 132.320854 184.67586) + (xy 128.502337 180.763017) + (xy 128.695598 180.772498) + (xy 128.704379 180.773323) + (xy 128.891639 180.799446) + (xy 128.891847 180.799476) + (xy 129.072945 180.82634) + (xy 129.081062 180.827894) + (xy 129.265838 180.871353) + (xy 129.266878 180.871606) + (xy 129.44344 180.915832) + (xy 129.450808 180.917986) + (xy 129.629556 180.977897) + (xy 129.631003 180.978382) + (xy 129.632894 180.979037) + (xy 129.803713 181.040158) + (xy 129.810321 181.042795) + (xy 129.884387 181.075499) + (xy 129.984314 181.119622) + (xy 129.986653 181.120691) + (xy 130.08103 181.165328) + (xy 130.139668 181.193062) + (xy 130.15046 181.198166) + (xy 130.156303 181.20117) + (xy 130.322591 181.293792) + (xy 130.325272 181.295342) + (xy 130.47238 181.383516) + (xy 130.480605 181.388446) + (xy 130.485656 181.391686) + (xy 130.548407 181.434671) + (xy 130.642744 181.499294) + (xy 130.645705 181.501405) + (xy 130.791142 181.609269) + (xy 130.795379 181.612595) + (xy 130.941873 181.734243) + (xy 130.945105 181.737047) + (xy 131.079234 181.858615) + (xy 131.082729 181.861944) + (xy 131.217384 181.996599) + (xy 131.220715 182.000098) + (xy 131.27968 182.065157) + (xy 131.342254 182.134197) + (xy 131.345064 182.137435) + (xy 131.45975 182.275547) + (xy 131.466701 182.283917) + (xy 131.470049 182.288181) + (xy 131.533098 182.373194) + (xy 131.577895 182.433596) + (xy 131.580052 182.436622) + (xy 131.687625 182.593661) + (xy 131.690865 182.598713) + (xy 131.783954 182.754025) + (xy 131.785528 182.756747) + (xy 131.878134 182.923006) + (xy 131.88114 182.928852) + (xy 131.958631 183.092695) + (xy 131.959693 183.095017) + (xy 131.983696 183.149379) + (xy 132.036505 183.268983) + (xy 132.039153 183.275619) + (xy 132.100283 183.446467) + (xy 132.100938 183.448358) + (xy 132.161311 183.628488) + (xy 132.163476 183.635894) + (xy 132.207652 183.812258) + (xy 132.20799 183.813648) + (xy 132.251406 183.998249) + (xy 132.252963 184.006388) + (xy 132.279794 184.18727) + (xy 132.279917 184.188119) + (xy 132.305976 184.374936) + (xy 132.306806 184.383755) + (xy 132.316031 184.571539) + (xy 132.316044 184.571825) (xy 132.324404 184.752651) (xy 132.32451 184.757223) (xy 132.32451 188.729212) @@ -1111344,7 +1111343,7 @@ (xy 165.297352 181.173056) (xy 165.297349 181.173053) (xy 165.292713 181.167703) - (xy 165.218842 181.120229) + (xy 165.219561 181.120691) (xy 165.18969 181.101494) (xy 165.189688 181.101493) (xy 165.183733 181.097666) @@ -1111374,7 +1111373,7 @@ (xy 164.557967 181.383444) (xy 164.556959 181.390452) (xy 164.556958 181.390457) - (xy 164.542833 181.488703) + (xy 164.541199 181.500067) (xy 164.539531 181.51167) (xy 164.540539 181.518681) (xy 164.556958 181.632882) @@ -1111651,8 +1111650,6 @@ (xy 189.982589 180.82076) (xy 189.88578 180.689369) (xy 191.979223 180.689369) - (xy 191.9797 180.694212) - (xy 191.992721 180.826422) (xy 191.999523 180.895479) (xy 192.000934 180.900131) (xy 192.000935 180.900135) @@ -1111992,9 +1111989,6 @@ (xy 179.755133 181.3) (xy 179.736697 181.171774) (xy 179.682882 181.053937) - (xy 179.617531 180.978517) - (xy 179.602684 180.961382) - (xy 179.602683 180.961381) (xy 179.598049 180.956033) (xy 179.551558 180.926155) (xy 179.495026 180.889824) @@ -1112433,7 +1112427,7 @@ (xy 211.348377 176.389486) (xy 211.347259 176.393656) (xy 211.347259 176.393658) - (xy 211.307787 176.54097) + (xy 211.303367 176.557465) (xy 211.289797 176.608107) (xy 211.28942 176.612408) (xy 211.289419 176.612418) @@ -1112443,7 +1112437,7 @@ (xy 206.633872 176.814211) (xy 206.630335 176.811734) (xy 206.630331 176.811731) - (xy 206.515611 176.731404) + (xy 206.515921 176.731621) (xy 206.448471 176.684392) (xy 206.284876 176.608107) (xy 206.247257 176.590565) @@ -1113414,36 +1113408,40 @@ (xy 163.568307 176.476848) (xy 163.568307 178.506488) (xy 156.702859 178.506488) - (xy 156.708507 178.384326) - (xy 156.718232 178.186385) - (xy 156.719057 178.177617) - (xy 156.744683 177.993917) - (xy 156.772113 177.809) - (xy 156.773662 177.800907) - (xy 156.816612 177.618297) - (xy 156.816793 177.617552) - (xy 156.861648 177.43848) - (xy 156.863791 177.431152) - (xy 156.923649 177.25256) - (xy 156.924233 177.250875) - (xy 156.986016 177.078201) - (xy 156.988632 177.071648) - (xy 157.064917 176.898878) - (xy 157.065877 176.896778) - (xy 157.144094 176.731404) - (xy 157.147054 176.725647) - (xy 157.23908 176.56043) - (xy 157.240544 176.557897) - (xy 157.334427 176.401264) - (xy 157.337625 176.396277) - (xy 157.444575 176.240149) - (xy 157.446624 176.237275) - (xy 157.55532 176.090716) - (xy 157.558597 176.086542) - (xy 157.679538 175.9409) - (xy 157.682305 175.937712) - (xy 157.804728 175.802639) - (xy 157.807998 175.799203) + (xy 156.708592 178.382491) + (xy 156.708605 178.382209) + (xy 156.714289 178.266417) + (xy 156.71821 178.186553) + (xy 156.719035 178.177774) + (xy 156.744897 177.992379) + (xy 156.74494 177.99208) + (xy 156.772076 177.809145) + (xy 156.773616 177.801102) + (xy 156.816808 177.617463) + (xy 156.817082 177.616336) + (xy 156.861587 177.438664) + (xy 156.863729 177.431337) + (xy 156.923872 177.251894) + (xy 156.92447 177.250169) + (xy 156.985933 177.078392) + (xy 156.98857 177.071788) + (xy 156.989282 177.070177) + (xy 157.065094 176.898479) + (xy 157.066137 176.896195) + (xy 157.143974 176.731621) + (xy 157.146949 176.725836) + (xy 157.23929 176.560051) + (xy 157.240785 176.557465) + (xy 157.334287 176.401468) + (xy 157.337502 176.396457) + (xy 157.444788 176.239839) + (xy 157.446867 176.236924) + (xy 157.555133 176.090944) + (xy 157.558429 176.086745) + (xy 157.679772 175.940617) + (xy 157.682514 175.937459) + (xy 157.804506 175.802861) + (xy 157.807777 175.799424) (xy 157.916523 175.690678) (xy 177.399336 175.690678) (xy 177.404639 175.700444) @@ -1113468,43 +1113466,42 @@ (xy 177.406105 175.681857) (xy 177.399336 175.690678) (xy 157.916523 175.690678) - (xy 157.941908 175.665293) - (xy 157.945344 175.662023) - (xy 158.080464 175.539558) - (xy 158.083572 175.53686) - (xy 158.229233 175.415906) - (xy 158.233458 175.41259) - (xy 158.379978 175.303923) - (xy 158.382875 175.301858) - (xy 158.538978 175.194925) - (xy 158.543965 175.191726) - (xy 158.700663 175.097805) - (xy 158.703131 175.096379) - (xy 158.868342 175.004358) - (xy 158.874135 175.001379) - (xy 159.039486 174.923174) - (xy 159.041574 174.922219) - (xy 159.214372 174.845922) - (xy 159.220914 174.843312) - (xy 159.393571 174.781534) - (xy 159.395281 174.780942) - (xy 159.573857 174.72109) - (xy 159.581204 174.718942) - (xy 159.76021 174.674103) - (xy 159.761044 174.673901) - (xy 159.943631 174.630957) - (xy 159.951682 174.629415) - (xy 160.136482 174.602003) - (xy 160.136939 174.601937) - (xy 160.320342 174.576354) - (xy 160.329099 174.575529) - (xy 160.524331 174.565931) - (xy 160.524403 174.565928) - (xy 160.524407 174.566013) - (xy 160.524689 174.565914) - (xy 160.685495 174.55848) - (xy 160.698042 174.557901) - (xy 160.702613 174.557795) + (xy 157.942129 175.665072) + (xy 157.945544 175.661821) + (xy 158.080195 175.539781) + (xy 158.083336 175.537056) + (xy 158.22946 175.415717) + (xy 158.233643 175.412434) + (xy 158.379662 175.304139) + (xy 158.382528 175.302096) + (xy 158.539204 175.19477) + (xy 158.544166 175.191588) + (xy 158.700174 175.098081) + (xy 158.70275 175.096591) + (xy 158.868556 175.004238) + (xy 158.874321 175.001274) + (xy 159.038969 174.923402) + (xy 159.041049 174.922451) + (xy 159.214541 174.845847) + (xy 159.221115 174.843224) + (xy 159.392855 174.781774) + (xy 159.394598 174.781171) + (xy 159.574038 174.721029) + (xy 159.5814 174.718877) + (xy 159.759178 174.674346) + (xy 159.759953 174.674158) + (xy 159.943801 174.630917) + (xy 159.951905 174.629366) + (xy 160.134858 174.602228) + (xy 160.134947 174.602215) + (xy 160.320499 174.576332) + (xy 160.329263 174.575507) + (xy 160.52177 174.566049) + (xy 160.522074 174.566035) + (xy 160.522078 174.566118) + (xy 160.522353 174.566022) + (xy 160.698041 174.5579) + (xy 160.702611 174.557795) (xy 165.694352 174.557795) (xy 165.694383 174.557795) (xy 165.694394 174.557789) @@ -1113529,11 +1113526,11 @@ (xy 205.833832 174.629936) (xy 205.83542 174.632834) (xy 205.835423 174.63284) - (xy 205.916565 174.780905) + (xy 205.921656 174.790195) (xy 205.975025 174.88758) (xy 205.97698 174.890233) (xy 205.976983 174.890238) - (xy 206.058872 175.001379) + (xy 206.058795 175.001274) (xy 206.149298 175.124106) (xy 206.15159 175.126476) (xy 206.151591 175.126477) @@ -1113571,11 +1113568,11 @@ (xy 212.966546 174.918261) (xy 212.968587 174.922361) (xy 212.968588 174.922362) - (xy 213.055947 175.097805) + (xy 213.055322 175.09655) (xy 213.062907 175.111781) (xy 213.065659 175.115425) (xy 213.065662 175.11543) - (xy 213.09695 175.156861) + (xy 213.124067 175.19277) (xy 213.193187 175.284299) (xy 213.296687 175.378652) (xy 213.340598 175.418683) diff --git a/4x6_4/dilemma.kicad_prl b/4x6_4/dilemma.kicad_prl index 29f3dc2..a1df250 100644 --- a/4x6_4/dilemma.kicad_prl +++ b/4x6_4/dilemma.kicad_prl @@ -1,6 +1,6 @@ { "board": { - "active_layer": 2, + "active_layer": 0, "active_layer_preset": "", "auto_track_width": false, "hidden_netclasses": [], @@ -62,7 +62,7 @@ 35, 36 ], - "visible_layers": "f74954f_ffffffff", + "visible_layers": "f74956f_ffffffff", "zone_display_mode": 1 }, "meta": { diff --git a/4x6_4/dilemma.kicad_pro b/4x6_4/dilemma.kicad_pro index 1523cad..8df3e3e 100644 --- a/4x6_4/dilemma.kicad_pro +++ b/4x6_4/dilemma.kicad_pro @@ -65,7 +65,7 @@ "clearance": "error", "connection_width": "error", "copper_edge_clearance": "warning", - "copper_sliver": "error", + "copper_sliver": "warning", "courtyards_overlap": "warning", "diff_pair_gap_out_of_range": "error", "diff_pair_uncoupled_length_too_long": "error",