Some little fixes + add BOM

2026-02-28 20:04:30 +03:00 · 2023-01-12 18:17:48 +03:00
parent 87e702e600
commit b1c8012e11
19 changed files with 43340 additions and 135103 deletions
--- a/F3:F303/NitrogenFlooding/kicad/nitrogen/gerbers/nitrogen-drl_map.gbr
+++ b/F3:F303/NitrogenFlooding/kicad/nitrogen/gerbers/nitrogen-drl_map.gbr
@@ -1,53 +1,32 @@
 %TF.GenerationSoftware,KiCad,Pcbnew,6.0.10*%
-%TF.CreationDate,2023-01-12T12:24:53+03:00*%
+%TF.CreationDate,2023-01-12T17:29:33+03:00*%
 %TF.ProjectId,nitrogen,6e697472-6f67-4656-9e2e-6b696361645f,rev?*%
 %TF.SameCoordinates,Original*%
 %TF.FileFunction,Drillmap*%
 %TF.FilePolarity,Positive*%
 %FSLAX45Y45*%
 G04 Gerber Fmt 4.5, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 6.0.10) date 2023-01-12 12:24:53*
+G04 Created by KiCad (PCBNEW 6.0.10) date 2023-01-12 17:29:33*
 %MOMM*%
 %LPD*%
 G01*
 G04 APERTURE LIST*
 %ADD10C,0.200000*%
-%ADD11C,0.100000*%
-%ADD12C,0.150000*%
-%ADD13C,0.040000*%
-%ADD14C,0.060000*%
-%ADD15C,0.070000*%
-%ADD16C,0.092000*%
-%ADD17C,0.095000*%
-%ADD18C,0.130000*%
-%ADD19C,0.233000*%
-%ADD20C,0.320000*%
+%ADD11C,0.040000*%
+%ADD12C,0.060000*%
+%ADD13C,0.070000*%
+%ADD14C,0.092000*%
+%ADD15C,0.095000*%
+%ADD16C,0.100000*%
+%ADD17C,0.130000*%
+%ADD18C,0.230000*%
+%ADD19C,0.320000*%
 G04 APERTURE END LIST*
 D10*
 X16553298Y-12500002D02*
 X11246698Y-12500002D01*
-D11*
-X10400000Y-10200000D02*
-X11350000Y-10200000D01*
-X11350000Y-10200000D02*
-X11350000Y-11150000D01*
-X11350000Y-11150000D02*
-X10400000Y-11150000D01*
-X10400000Y-11150000D02*
-X10400000Y-10200000D01*
-D10*
 X11246698Y-4500002D02*
 X16553298Y-4500002D01*
-D12*
-X11285000Y-6660000D02*
-X13675000Y-6660000D01*
-X13675000Y-6660000D02*
-X13675000Y-7660000D01*
-X13675000Y-7660000D02*
-X11285000Y-7660000D01*
-X11285000Y-7660000D02*
-X11285000Y-6660000D01*
-D10*
 X9899998Y-11153302D02*
 G75*
 G03*
@@ -72,7 +51,7 @@ X9899998Y-5846702I2651122J-3997819D01*
 G01*
 X9899998Y-11153302D02*
 X9899998Y-5846702D01*
-D13*
+D11*
 X10000000Y-8660000D02*
 X10040000Y-8700000D01*
 X10040000Y-8660000D02*
@@ -241,10 +220,6 @@ X10750000Y-9560000D02*
 X10790000Y-9600000D01*
 X10790000Y-9560000D02*
 X10750000Y-9600000D01*
-X11430000Y-12000000D02*
-X11470000Y-12040000D01*
-X11470000Y-12000000D02*
-X11430000Y-12040000D01*
 X11650000Y-10740000D02*
 X11690000Y-10780000D01*
 X11690000Y-10740000D02*
@@ -285,6 +260,18 @@ X11750000Y-11140000D02*
 X11790000Y-11180000D01*
 X11790000Y-11140000D02*
 X11750000Y-11180000D01*
+X11825000Y-5500000D02*
+X11865000Y-5540000D01*
+X11865000Y-5500000D02*
+X11825000Y-5540000D01*
+X11826560Y-5705350D02*
+X11866560Y-5745350D01*
+X11866560Y-5705350D02*
+X11826560Y-5745350D01*
+X11826560Y-5887850D02*
+X11866560Y-5927850D01*
+X11866560Y-5887850D02*
+X11826560Y-5927850D01*
 X11850000Y-10740000D02*
 X11890000Y-10780000D01*
 X11890000Y-10740000D02*
@@ -493,10 +480,6 @@ X13030000Y-11140000D02*
 X13070000Y-11180000D01*
 X13070000Y-11140000D02*
 X13030000Y-11180000D01*
-X13289600Y-4817100D02*
-X13329600Y-4857100D01*
-X13329600Y-4817100D02*
-X13289600Y-4857100D01*
 X13330000Y-10740000D02*
 X13370000Y-10780000D01*
 X13370000Y-10740000D02*
@@ -737,43 +720,27 @@ X16144560Y-5496880D02*
 X16184560Y-5536880D01*
 X16184560Y-5496880D02*
 X16144560Y-5536880D01*
-X16230000Y-9710000D02*
-X16270000Y-9750000D01*
-X16270000Y-9710000D02*
-X16230000Y-9750000D01*
+X16178130Y-9753920D02*
+X16218130Y-9793920D01*
+X16218130Y-9753920D02*
+X16178130Y-9793920D01*
 X16290000Y-11428690D02*
 X16330000Y-11468690D01*
 X16330000Y-11428690D02*
 X16290000Y-11468690D01*
-X16316280Y-9811140D02*
-X16356280Y-9851140D01*
-X16356280Y-9811140D02*
-X16316280Y-9851140D01*
-X16470000Y-9460000D02*
-X16510000Y-9500000D01*
-X16510000Y-9460000D02*
-X16470000Y-9500000D01*
-X16475190Y-9329580D02*
-X16515190Y-9369580D01*
-X16515190Y-9329580D02*
-X16475190Y-9369580D01*
-X16550960Y-9708200D02*
-X16590960Y-9748200D01*
-X16590960Y-9708200D02*
-X16550960Y-9748200D01*
-X16596870Y-10058720D02*
-X16636870Y-10098720D01*
-X16636870Y-10058720D02*
-X16596870Y-10098720D01*
-X16911640Y-9990000D02*
-X16951640Y-10030000D01*
-X16951640Y-9990000D02*
-X16911640Y-10030000D01*
-X16911640Y-10226360D02*
-X16951640Y-10266360D01*
-X16951640Y-10226360D02*
-X16911640Y-10266360D01*
-D14*
+X16382400Y-9211400D02*
+X16422400Y-9251400D01*
+X16422400Y-9211400D02*
+X16382400Y-9251400D01*
+X16911640Y-10079040D02*
+X16951640Y-10119040D01*
+X16951640Y-10079040D02*
+X16911640Y-10119040D01*
+X16911640Y-10287320D02*
+X16951640Y-10327320D01*
+X16951640Y-10287320D02*
+X16911640Y-10327320D01*
+D12*
 X10100000Y-5960000D02*
 G75*
 G03*
@@ -814,6 +781,11 @@ G75*
 G03*
 X11340000Y-9320000I-30000J0D01*
 G01*
+X11480000Y-12095800D02*
+G75*
+G03*
+X11480000Y-12095800I-30000J0D01*
+G01*
 X11500000Y-9915000D02*
 G75*
 G03*
@@ -1154,6 +1126,16 @@ G75*
 G03*
 X16336800Y-11267440I-30000J0D01*
 G01*
+X16494280Y-10226040D02*
+G75*
+G03*
+X16494280Y-10226040I-30000J0D01*
+G01*
+X16611120Y-9773920D02*
+G75*
+G03*
+X16611120Y-9773920I-30000J0D01*
+G01*
 X16788920Y-11084560D02*
 G75*
 G03*
@@ -1174,7 +1156,7 @@ G75*
 G03*
 X17200000Y-8050000I-30000J0D01*
 G01*
-D15*
+D13*
 X10180000Y-9965000D02*
 X10180000Y-10035000D01*
 X10145000Y-10000000D02*
@@ -1195,10 +1177,6 @@ X13250000Y-8695000D02*
 X13250000Y-8765000D01*
 X13215000Y-8730000D02*
 X13285000Y-8730000D01*
-X17641650Y-8495660D02*
-X17641650Y-8565660D01*
-X17606650Y-8530660D02*
-X17676650Y-8530660D01*
 X17663160Y-10429800D02*
 X17663160Y-10499800D01*
 X17628160Y-10464800D02*
@@ -1223,28 +1201,32 @@ X17663160Y-11064800D02*
 X17663160Y-11134800D01*
 X17628160Y-11099800D02*
 X17698160Y-11099800D01*
-D16*
-X17201527Y-9425527D02*
-X17201527Y-9360473D01*
-X17136473Y-9360473D01*
-X17136473Y-9425527D01*
-X17201527Y-9425527D01*
-X17201527Y-9675527D02*
-X17201527Y-9610473D01*
-X17136473Y-9610473D01*
-X17136473Y-9675527D01*
-X17201527Y-9675527D01*
-X17401527Y-9425527D02*
-X17401527Y-9360473D01*
-X17336473Y-9360473D01*
-X17336473Y-9425527D01*
-X17401527Y-9425527D01*
-X17401527Y-9675527D02*
-X17401527Y-9610473D01*
-X17336473Y-9610473D01*
-X17336473Y-9675527D01*
-X17401527Y-9675527D01*
-D17*
+X17720000Y-8335000D02*
+X17720000Y-8405000D01*
+X17685000Y-8370000D02*
+X17755000Y-8370000D01*
+D14*
+X16974277Y-9197527D02*
+X16974277Y-9132473D01*
+X16909223Y-9132473D01*
+X16909223Y-9197527D01*
+X16974277Y-9197527D01*
+X16974277Y-9447527D02*
+X16974277Y-9382473D01*
+X16909223Y-9382473D01*
+X16909223Y-9447527D01*
+X16974277Y-9447527D01*
+X17294277Y-9197527D02*
+X17294277Y-9132473D01*
+X17229223Y-9132473D01*
+X17229223Y-9197527D01*
+X17294277Y-9197527D01*
+X17294277Y-9447527D02*
+X17294277Y-9382473D01*
+X17229223Y-9382473D01*
+X17229223Y-9447527D01*
+X17294277Y-9447527D01*
+D15*
 X10210000Y-6977500D02*
 X10257500Y-6930000D01*
 X10210000Y-6882500D01*
@@ -1390,7 +1372,7 @@ X17113380Y-10561320D01*
 X17065880Y-10513820D01*
 X17018380Y-10561320D01*
 X17065880Y-10608820D01*
-D11*
+D16*
 X11728500Y-9011100D02*
 X11828500Y-9111100D01*
 X11828500Y-9011100D02*
@@ -1409,23 +1391,23 @@ G75*
 G03*
 X11828500Y-10061100I-50000J0D01*
 G01*
-X12242000Y-4986000D02*
-X12342000Y-5086000D01*
-X12342000Y-4986000D02*
-X12242000Y-5086000D01*
-X12342000Y-5036000D02*
+X12245000Y-4992000D02*
+X12345000Y-5092000D01*
+X12345000Y-4992000D02*
+X12245000Y-5092000D01*
+X12345000Y-5042000D02*
 G75*
 G03*
-X12342000Y-5036000I-50000J0D01*
+X12345000Y-5042000I-50000J0D01*
 G01*
-X12242000Y-5240000D02*
-X12342000Y-5340000D01*
-X12342000Y-5240000D02*
-X12242000Y-5340000D01*
-X12342000Y-5290000D02*
+X12245000Y-5246000D02*
+X12345000Y-5346000D01*
+X12345000Y-5246000D02*
+X12245000Y-5346000D01*
+X12345000Y-5296000D02*
 G75*
 G03*
-X12342000Y-5290000I-50000J0D01*
+X12345000Y-5296000I-50000J0D01*
 G01*
 X12461000Y-8680000D02*
 X12561000Y-8780000D01*
@@ -1436,23 +1418,23 @@ G75*
 G03*
 X12561000Y-8730000I-50000J0D01*
 G01*
-X12496000Y-4986000D02*
-X12596000Y-5086000D01*
-X12596000Y-4986000D02*
-X12496000Y-5086000D01*
-X12596000Y-5036000D02*
+X12499000Y-4992000D02*
+X12599000Y-5092000D01*
+X12599000Y-4992000D02*
+X12499000Y-5092000D01*
+X12599000Y-5042000D02*
 G75*
 G03*
-X12596000Y-5036000I-50000J0D01*
+X12599000Y-5042000I-50000J0D01*
 G01*
-X12496000Y-5240000D02*
-X12596000Y-5340000D01*
-X12596000Y-5240000D02*
-X12496000Y-5340000D01*
-X12596000Y-5290000D02*
+X12499000Y-5246000D02*
+X12599000Y-5346000D01*
+X12599000Y-5246000D02*
+X12499000Y-5346000D01*
+X12599000Y-5296000D02*
 G75*
 G03*
-X12596000Y-5290000I-50000J0D01*
+X12599000Y-5296000I-50000J0D01*
 G01*
 X12715000Y-8680000D02*
 X12815000Y-8780000D01*
@@ -1463,59 +1445,59 @@ G75*
 G03*
 X12815000Y-8730000I-50000J0D01*
 G01*
-X12750000Y-4986000D02*
-X12850000Y-5086000D01*
-X12850000Y-4986000D02*
-X12750000Y-5086000D01*
-X12850000Y-5036000D02*
+X12753000Y-4992000D02*
+X12853000Y-5092000D01*
+X12853000Y-4992000D02*
+X12753000Y-5092000D01*
+X12853000Y-5042000D02*
 G75*
 G03*
-X12850000Y-5036000I-50000J0D01*
+X12853000Y-5042000I-50000J0D01*
 G01*
-X12750000Y-5240000D02*
-X12850000Y-5340000D01*
-X12850000Y-5240000D02*
-X12750000Y-5340000D01*
-X12850000Y-5290000D02*
+X12753000Y-5246000D02*
+X12853000Y-5346000D01*
+X12853000Y-5246000D02*
+X12753000Y-5346000D01*
+X12853000Y-5296000D02*
 G75*
 G03*
-X12850000Y-5290000I-50000J0D01*
+X12853000Y-5296000I-50000J0D01*
 G01*
-X13004000Y-4986000D02*
-X13104000Y-5086000D01*
-X13104000Y-4986000D02*
-X13004000Y-5086000D01*
-X13104000Y-5036000D02*
+X13007000Y-4992000D02*
+X13107000Y-5092000D01*
+X13107000Y-4992000D02*
+X13007000Y-5092000D01*
+X13107000Y-5042000D02*
 G75*
 G03*
-X13104000Y-5036000I-50000J0D01*
+X13107000Y-5042000I-50000J0D01*
 G01*
-X13004000Y-5240000D02*
-X13104000Y-5340000D01*
-X13104000Y-5240000D02*
-X13004000Y-5340000D01*
-X13104000Y-5290000D02*
+X13007000Y-5246000D02*
+X13107000Y-5346000D01*
+X13107000Y-5246000D02*
+X13007000Y-5346000D01*
+X13107000Y-5296000D02*
 G75*
 G03*
-X13104000Y-5290000I-50000J0D01*
+X13107000Y-5296000I-50000J0D01*
 G01*
-X13258000Y-4986000D02*
-X13358000Y-5086000D01*
-X13358000Y-4986000D02*
-X13258000Y-5086000D01*
-X13358000Y-5036000D02*
+X13261000Y-4992000D02*
+X13361000Y-5092000D01*
+X13361000Y-4992000D02*
+X13261000Y-5092000D01*
+X13361000Y-5042000D02*
 G75*
 G03*
-X13358000Y-5036000I-50000J0D01*
+X13361000Y-5042000I-50000J0D01*
 G01*
-X13258000Y-5240000D02*
-X13358000Y-5340000D01*
-X13358000Y-5240000D02*
-X13258000Y-5340000D01*
-X13358000Y-5290000D02*
+X13261000Y-5246000D02*
+X13361000Y-5346000D01*
+X13361000Y-5246000D02*
+X13261000Y-5346000D01*
+X13361000Y-5296000D02*
 G75*
 G03*
-X13358000Y-5290000I-50000J0D01*
+X13361000Y-5296000I-50000J0D01*
 G01*
 X14882000Y-4811250D02*
 X14982000Y-4911250D01*
@@ -1697,7 +1679,7 @@ G75*
 G03*
 X17568750Y-7648000I-50000J0D01*
 G01*
-D18*
+D17*
 X10138100Y-7733200D02*
 X10268100Y-7863200D01*
 X10268100Y-7733200D02*
@@ -1722,14 +1704,14 @@ X11780500Y-8551600D02*
 X11780500Y-8681600D01*
 X11715500Y-8616600D02*
 X11845500Y-8616600D01*
-X11785000Y-11885000D02*
-X11915000Y-12015000D01*
-X11915000Y-11885000D02*
-X11785000Y-12015000D01*
-X11850000Y-11885000D02*
-X11850000Y-12015000D01*
-X11785000Y-11950000D02*
-X11915000Y-11950000D01*
+X11785000Y-11884000D02*
+X11915000Y-12014000D01*
+X11915000Y-11884000D02*
+X11785000Y-12014000D01*
+X11850000Y-11884000D02*
+X11850000Y-12014000D01*
+X11785000Y-11949000D02*
+X11915000Y-11949000D01*
 X12096500Y-8551600D02*
 X12226500Y-8681600D01*
 X12226500Y-8551600D02*
@@ -1738,14 +1720,14 @@ X12161500Y-8551600D02*
 X12161500Y-8681600D01*
 X12096500Y-8616600D02*
 X12226500Y-8616600D01*
-X12285000Y-11885000D02*
-X12415000Y-12015000D01*
-X12415000Y-11885000D02*
-X12285000Y-12015000D01*
-X12350000Y-11885000D02*
-X12350000Y-12015000D01*
-X12285000Y-11950000D02*
-X12415000Y-11950000D01*
+X12285000Y-11884000D02*
+X12415000Y-12014000D01*
+X12415000Y-11884000D02*
+X12285000Y-12014000D01*
+X12350000Y-11884000D02*
+X12350000Y-12014000D01*
+X12285000Y-11949000D02*
+X12415000Y-11949000D01*
 X12885000Y-11885000D02*
 X13015000Y-12015000D01*
 X13015000Y-11885000D02*
@@ -1762,26 +1744,26 @@ X13450000Y-11885000D02*
 X13450000Y-12015000D01*
 X13385000Y-11950000D02*
 X13515000Y-11950000D01*
+D18*
+X17097750Y-8573000D02*
+X17327750Y-8803000D01*
+X17327750Y-8573000D02*
+X17097750Y-8803000D01*
+X17294068Y-8769318D02*
+X17294068Y-8606682D01*
+X17131432Y-8606682D01*
+X17131432Y-8769318D01*
+X17294068Y-8769318D01*
+X17097750Y-9777000D02*
+X17327750Y-10007000D01*
+X17327750Y-9777000D02*
+X17097750Y-10007000D01*
+X17294068Y-9973318D02*
+X17294068Y-9810682D01*
+X17131432Y-9810682D01*
+X17131432Y-9973318D01*
+X17294068Y-9973318D01*
 D19*
-X17523500Y-8799500D02*
-X17756500Y-9032500D01*
-X17756500Y-8799500D02*
-X17523500Y-9032500D01*
-X17722379Y-8998379D02*
-X17722379Y-8833621D01*
-X17557621Y-8833621D01*
-X17557621Y-8998379D01*
-X17722379Y-8998379D01*
-X17523500Y-10003500D02*
-X17756500Y-10236500D01*
-X17756500Y-10003500D02*
-X17523500Y-10236500D01*
-X17722379Y-10202379D02*
-X17722379Y-10037621D01*
-X17557621Y-10037621D01*
-X17557621Y-10202379D01*
-X17722379Y-10202379D01*
-D20*
 X10740000Y-5340000D02*
 X11060000Y-5660000D01*
 X11060000Y-5340000D02*
@@ -1902,7 +1884,7 @@ X11519046Y-12715716D01*
 X11509522Y-12706192D01*
 X11519046Y-12696669D01*
 X11519046Y-12715716D01*
-D13*
+D11*
 X9849998Y-13130002D02*
 X9889998Y-13170002D01*
 X9889998Y-13130002D02*
@@ -2116,22 +2098,17 @@ X13528569Y-13097621D01*
 X13709522Y-13040478D02*
 X13842855Y-13040478D01*
 X13757141Y-13240478D01*
-X14014284Y-13040478D02*
-X13919046Y-13040478D01*
-X13909522Y-13135716D01*
-X13919046Y-13126192D01*
-X13938093Y-13116669D01*
-X13985712Y-13116669D01*
-X14004760Y-13126192D01*
-X14014284Y-13135716D01*
-X14023807Y-13154764D01*
-X14023807Y-13202383D01*
-X14014284Y-13221430D01*
-X14004760Y-13230954D01*
-X13985712Y-13240478D01*
-X13938093Y-13240478D01*
-X13919046Y-13230954D01*
-X13909522Y-13221430D01*
+X13909522Y-13059526D02*
+X13919046Y-13050002D01*
+X13938093Y-13040478D01*
+X13985712Y-13040478D01*
+X14004760Y-13050002D01*
+X14014284Y-13059526D01*
+X14023807Y-13078573D01*
+X14023807Y-13097621D01*
+X14014284Y-13126192D01*
+X13899998Y-13240478D01*
+X14023807Y-13240478D01*
 X14261903Y-13240478D02*
 X14261903Y-13040478D01*
 X14347617Y-13240478D02*
@@ -2203,7 +2180,7 @@ X15080950Y-13069050D01*
 X15071426Y-13050002D01*
 X15052379Y-13021430D01*
 X15042855Y-13011907D01*
-D14*
+D12*
 X9889998Y-13414002D02*
 G75*
 G03*
@@ -2478,27 +2455,20 @@ X13642855Y-13428288D01*
 X13633331Y-13409240D01*
 X13623807Y-13399716D01*
 X13604760Y-13390192D01*
-X13766665Y-13304478D02*
-X13785712Y-13304478D01*
-X13804760Y-13314002D01*
-X13814284Y-13323526D01*
-X13823807Y-13342573D01*
-X13833331Y-13380669D01*
-X13833331Y-13428288D01*
-X13823807Y-13466383D01*
-X13814284Y-13485430D01*
-X13804760Y-13494954D01*
-X13785712Y-13504478D01*
-X13766665Y-13504478D01*
-X13747617Y-13494954D01*
-X13738093Y-13485430D01*
-X13728569Y-13466383D01*
-X13719046Y-13428288D01*
-X13719046Y-13380669D01*
-X13728569Y-13342573D01*
-X13738093Y-13323526D01*
-X13747617Y-13314002D01*
-X13766665Y-13304478D01*
+X13709522Y-13304478D02*
+X13833331Y-13304478D01*
+X13766665Y-13380669D01*
+X13795236Y-13380669D01*
+X13814284Y-13390192D01*
+X13823807Y-13399716D01*
+X13833331Y-13418764D01*
+X13833331Y-13466383D01*
+X13823807Y-13485430D01*
+X13814284Y-13494954D01*
+X13795236Y-13504478D01*
+X13738093Y-13504478D01*
+X13719046Y-13494954D01*
+X13709522Y-13485430D01*
 X14071426Y-13504478D02*
 X14071426Y-13304478D01*
 X14157141Y-13504478D02*
@@ -2570,7 +2540,7 @@ X14890474Y-13333050D01*
 X14880950Y-13314002D01*
 X14861903Y-13285430D01*
 X14852379Y-13275907D01*
-D15*
+D13*
 X9854998Y-13643002D02*
 X9854998Y-13713002D01*
 X9819998Y-13678002D02*
@@ -2871,7 +2841,7 @@ X14890474Y-13597050D01*
 X14880950Y-13578002D01*
 X14861903Y-13549430D01*
 X14852379Y-13539907D01*
-D16*
+D14*
 X9876525Y-13974529D02*
 X9876525Y-13909475D01*
 X9811471Y-13909475D01*
@@ -3180,7 +3150,7 @@ X14699998Y-13861050D01*
 X14690474Y-13842002D01*
 X14671426Y-13813430D01*
 X14661903Y-13803907D01*
-D17*
+D15*
 X9842498Y-14253502D02*
 X9889998Y-14206002D01*
 X9842498Y-14158502D01*
@@ -3497,7 +3467,7 @@ X14890474Y-14125050D01*
 X14880950Y-14106002D01*
 X14861903Y-14077430D01*
 X14852379Y-14067907D01*
-D11*
+D16*
 X9789998Y-14420002D02*
 X9889998Y-14520002D01*
 X9889998Y-14420002D02*
@@ -3813,7 +3783,7 @@ X14890474Y-14389050D01*
 X14880950Y-14370002D01*
 X14861903Y-14341430D01*
 X14852379Y-14331907D01*
-D18*
+D17*
 X9759998Y-14669002D02*
 X9889998Y-14799002D01*
 X9889998Y-14669002D02*
@@ -4167,20 +4137,27 @@ X10499998Y-15088478D01*
 X10442855Y-15088478D01*
 X10423808Y-15078954D01*
 X10414284Y-15069430D01*
-X10604760Y-14888478D02*
-X10728569Y-14888478D01*
-X10661903Y-14964669D01*
-X10690474Y-14964669D01*
-X10709522Y-14974192D01*
-X10719046Y-14983716D01*
-X10728569Y-15002764D01*
-X10728569Y-15050383D01*
-X10719046Y-15069430D01*
-X10709522Y-15078954D01*
-X10690474Y-15088478D01*
-X10633331Y-15088478D01*
-X10614284Y-15078954D01*
-X10604760Y-15069430D01*
+X10661903Y-14888478D02*
+X10680950Y-14888478D01*
+X10699998Y-14898002D01*
+X10709522Y-14907526D01*
+X10719046Y-14926573D01*
+X10728569Y-14964669D01*
+X10728569Y-15012288D01*
+X10719046Y-15050383D01*
+X10709522Y-15069430D01*
+X10699998Y-15078954D01*
+X10680950Y-15088478D01*
+X10661903Y-15088478D01*
+X10642855Y-15078954D01*
+X10633331Y-15069430D01*
+X10623808Y-15050383D01*
+X10614284Y-15012288D01*
+X10614284Y-14964669D01*
+X10623808Y-14926573D01*
+X10633331Y-14907526D01*
+X10642855Y-14898002D01*
+X10661903Y-14888478D01*
 X10852379Y-14888478D02*
 X10871427Y-14888478D01*
 X10890474Y-14898002D01*
@@ -4306,16 +4283,49 @@ X12595236Y-15012288D01*
 X12614284Y-15002764D01*
 X12623807Y-14993240D01*
 X12633331Y-14974192D01*
-X12823807Y-15088478D02*
-X12709522Y-15088478D01*
-X12766665Y-15088478D02*
-X12766665Y-14888478D01*
-X12747617Y-14917050D01*
-X12728569Y-14936097D01*
-X12709522Y-14945621D01*
-X12890474Y-14888478D02*
-X13023807Y-14888478D01*
+X12757141Y-14888478D02*
+X12776188Y-14888478D01*
+X12795236Y-14898002D01*
+X12804760Y-14907526D01*
+X12814284Y-14926573D01*
+X12823807Y-14964669D01*
+X12823807Y-15012288D01*
+X12814284Y-15050383D01*
+X12804760Y-15069430D01*
+X12795236Y-15078954D01*
+X12776188Y-15088478D01*
+X12757141Y-15088478D01*
+X12738093Y-15078954D01*
+X12728569Y-15069430D01*
+X12719046Y-15050383D01*
+X12709522Y-15012288D01*
+X12709522Y-14964669D01*
+X12719046Y-14926573D01*
+X12728569Y-14907526D01*
+X12738093Y-14898002D01*
+X12757141Y-14888478D01*
+X12995236Y-14888478D02*
+X12957141Y-14888478D01*
+X12938093Y-14898002D01*
+X12928569Y-14907526D01*
+X12909522Y-14936097D01*
+X12899998Y-14974192D01*
+X12899998Y-15050383D01*
+X12909522Y-15069430D01*
+X12919046Y-15078954D01*
 X12938093Y-15088478D01*
+X12976188Y-15088478D01*
+X12995236Y-15078954D01*
+X13004760Y-15069430D01*
+X13014284Y-15050383D01*
+X13014284Y-15002764D01*
+X13004760Y-14983716D01*
+X12995236Y-14974192D01*
+X12976188Y-14964669D01*
+X12938093Y-14964669D01*
+X12919046Y-14974192D01*
+X12909522Y-14983716D01*
+X12899998Y-15002764D01*
 X13090474Y-14888478D02*
 X13090474Y-14926573D01*
 X13166665Y-14888478D02*