diff --git a/Hardware/FabReader2/FabReader2.kicad_pcb b/Hardware/FabReader2/FabReader2.kicad_pcb index c3213e6..96dc14a 100644 --- a/Hardware/FabReader2/FabReader2.kicad_pcb +++ b/Hardware/FabReader2/FabReader2.kicad_pcb @@ -677,9 +677,11 @@ (net 3 "GND") (pinfunction "SHIELD") (pintype "passive") (tstamp b2b55a46-d545-4609-922e-9bfec12c1eda)) ) - (footprint "FS8205A:SOP65P640X120-8N" (layer "F.Cu") - (tedit 627423F8) (tstamp 067063ef-affc-4d22-8463-eb3e4abccdc8) - (at 32.25 33.5 90) + (footprint "Package_TO_SOT_SMD:SOT-23-6" (layer "F.Cu") + (tedit 5F6F9B37) (tstamp 067063ef-affc-4d22-8463-eb3e4abccdc8) + (at 33 35.75) + (descr "SOT, 6 Pin (https://www.jedec.org/sites/default/files/docs/Mo-178c.PDF variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py") + (tags "SOT TO_SOT_SMD") (property "MANUFACTURER" "Fortune Semiconductor") (property "MAXIMUM_PACKAGE_HEIGHT" "1.2mm") (property "MPN" "FS8205A") @@ -688,43 +690,49 @@ (property "Sheetfile" "power.kicad_sch") (property "Sheetname" "Powersupply") (path "/eb3fecf8-4fa7-43fa-aae0-ff9f0c13929a/6b94c34f-b9f8-4432-bd32-91c8999e4659") - (attr through_hole) - (fp_text reference "Q301" (at 4.5 0) (layer "F.SilkS") + (attr smd) + (fp_text reference "Q301" (at 0 -2.4) (layer "F.SilkS") (effects (font (size 1 1) (thickness 0.15))) - (tstamp f61f10b3-7454-4f1e-bcb8-96e9d8c7e006) + (tstamp 46806ba9-495b-43f4-9fdc-3d99b28d1cad) ) - (fp_text value "FS8205A" (at 6.35 2.327 90) (layer "F.Fab") + (fp_text value "FS8205A" (at 0 2.4) (layer "F.Fab") (effects (font (size 1 1) (thickness 0.15))) - (tstamp e2cfb055-efcc-4c97-8848-6b15df2b09ea) + (tstamp abccb772-4623-4cfd-910d-9931c6541998) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.4 0.4) (thickness 0.06))) + (tstamp e91d9e5d-c4fa-497a-8d8d-531d387f4996) + ) + (fp_line (start 0 -1.56) (end 0.8 -1.56) (layer "F.SilkS") (width 0.12) (tstamp 173001f4-4dd7-4c14-8435-ced2c98d6df9)) + (fp_line (start 0 1.56) (end -0.8 1.56) (layer "F.SilkS") (width 0.12) (tstamp 27535e0d-a621-4bf3-bc34-9cf27d6686cc)) + (fp_line (start 0 1.56) (end 0.8 1.56) (layer "F.SilkS") (width 0.12) (tstamp 2cecc108-c355-4572-9da6-50862241988e)) + (fp_line (start 0 -1.56) (end -1.8 -1.56) (layer "F.SilkS") (width 0.12) (tstamp ac62e724-1152-446f-81b2-f7a36ff2a811)) + (fp_line (start 2.05 -1.7) (end -2.05 -1.7) (layer "F.CrtYd") (width 0.05) (tstamp 4094d28b-3569-422c-96a1-89ffb6ef666a)) + (fp_line (start 2.05 1.7) (end 2.05 -1.7) (layer "F.CrtYd") (width 0.05) (tstamp 9c5bbfd5-b2ba-4b12-b681-a9b6d23f3a98)) + (fp_line (start -2.05 1.7) (end 2.05 1.7) (layer "F.CrtYd") (width 0.05) (tstamp e36fbb61-e98c-42f6-97c1-8ff7ef5f8563)) + (fp_line (start -2.05 -1.7) (end -2.05 1.7) (layer "F.CrtYd") (width 0.05) (tstamp fe714d11-cc49-4139-b144-dd5d5fe615ed)) + (fp_line (start 0.8 -1.45) (end 0.8 1.45) (layer "F.Fab") (width 0.1) (tstamp 26cb8558-c69e-4076-a732-a46af39d7791)) + (fp_line (start 0.8 1.45) (end -0.8 1.45) (layer "F.Fab") (width 0.1) (tstamp 3787ca6c-97ef-4ab0-a9ae-fdb9bc29c2ff)) + (fp_line (start -0.8 1.45) (end -0.8 -1.05) (layer "F.Fab") (width 0.1) (tstamp 44a5c8d5-bb0d-4b98-9c81-1bf05310adea)) + (fp_line (start -0.4 -1.45) (end 0.8 -1.45) (layer "F.Fab") (width 0.1) (tstamp 4ce6e1bd-7b3b-4888-a8ae-8b49a58e6d4d)) + (fp_line (start -0.8 -1.05) (end -0.4 -1.45) (layer "F.Fab") (width 0.1) (tstamp d8e2485d-9075-4e44-b14d-21d40db674bc)) + (pad "1" smd roundrect (at -1.1375 -0.95) (size 1.325 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 35 "unconnected-(Q301-Pad1)") (pintype "passive+no_connect") (tstamp 655d3614-5054-4e28-a9b3-bc692273ab69)) + (pad "2" smd roundrect (at -1.1375 0) (size 1.325 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 21 "-BATT") (pintype "passive") (tstamp 41e98e04-48ea-4bc1-a44e-cc64a846ff1c)) + (pad "3" smd roundrect (at -1.1375 0.95) (size 1.325 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 21 "-BATT") (pintype "passive") (tstamp 04cac02e-3840-4682-bc13-6bf42256df0e)) + (pad "4" smd roundrect (at 1.1375 0.95) (size 1.325 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 36 "Net-(Q301-Pad4)") (pintype "passive") (tstamp 97edde6e-7f75-401d-a243-3f310a7d070a)) + (pad "5" smd roundrect (at 1.1375 0) (size 1.325 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 37 "Net-(Q301-Pad5)") (pintype "passive") (tstamp c753f57e-ac30-48ce-8b4c-43c54940ef26)) + (pad "6" smd roundrect (at 1.1375 -0.95) (size 1.325 0.6) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 3 "GND") (pintype "passive") (tstamp cbd8730d-5e22-484a-b7ac-f1bcc414feed)) + (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23-6.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) ) - (fp_line (start -2.25 1.515) (end 2.25 1.515) (layer "F.SilkS") (width 0.127) (tstamp 012a915c-709e-455d-bac2-5b6584633696)) - (fp_line (start -2.25 -1.515) (end 2.25 -1.515) (layer "F.SilkS") (width 0.127) (tstamp 0b10ecd4-82a8-43f8-b9e0-b61c04048660)) - (fp_circle (center -4.44 -1.375) (end -4.34 -1.375) (layer "F.SilkS") (width 0.2) (fill none) (tstamp 028a00ba-a3c6-4aa8-8c5f-07b13489396e)) - (fp_line (start -3.91 -1.765) (end -3.91 1.765) (layer "F.CrtYd") (width 0.05) (tstamp 0152c820-a048-48b5-8d26-b43fb14acddc)) - (fp_line (start -3.91 -1.765) (end 3.91 -1.765) (layer "F.CrtYd") (width 0.05) (tstamp 38aa3c94-d5eb-4d40-8101-afee844eb749)) - (fp_line (start -3.91 1.765) (end 3.91 1.765) (layer "F.CrtYd") (width 0.05) (tstamp 7ddbd33d-a08e-4c5a-b7c6-30a1377d7df3)) - (fp_line (start 3.91 -1.765) (end 3.91 1.765) (layer "F.CrtYd") (width 0.05) (tstamp c3660842-a958-461e-a00a-9b28bb53775d)) - (fp_line (start 2.25 -1.515) (end 2.25 1.515) (layer "F.Fab") (width 0.127) (tstamp 18b3db94-13f7-4fea-a711-93ff4aa36e36)) - (fp_line (start -2.25 -1.515) (end -2.25 1.515) (layer "F.Fab") (width 0.127) (tstamp 8c2c7488-ee2b-43b1-96b6-a7ff8cd8a64a)) - (fp_line (start -2.25 -1.515) (end 2.25 -1.515) (layer "F.Fab") (width 0.127) (tstamp e9c8a1a0-b8ee-47a9-94b3-2ee829456805)) - (fp_line (start -2.25 1.515) (end 2.25 1.515) (layer "F.Fab") (width 0.127) (tstamp ebf9946a-b124-43d5-be3c-7d67cb81276b)) - (fp_circle (center -4.44 -1.375) (end -4.34 -1.375) (layer "F.Fab") (width 0.2) (fill none) (tstamp 1e605c23-5549-43ac-aeaa-114b3fe27ed1)) - (pad "1" smd roundrect locked (at -2.88 -0.975 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 35 "unconnected-(Q301-Pad1)") (pintype "passive+no_connect") (tstamp 1e4144a2-dcd0-4d77-89a0-3c43ef7bd94c)) - (pad "2" smd roundrect locked (at -2.88 -0.325 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 21 "-BATT") (pintype "passive") (tstamp 40b1f97f-e04b-4d3c-b960-bed063aa2f91)) - (pad "3" smd roundrect locked (at -2.88 0.325 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 21 "-BATT") (pintype "passive") (tstamp f09226eb-f337-40ac-978d-992910b9e751)) - (pad "4" smd roundrect locked (at -2.88 0.975 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 36 "Net-(Q301-Pad4)") (pintype "passive") (tstamp c017037e-7903-4aa4-9b1d-4fffb4056f2f)) - (pad "5" smd roundrect locked (at 2.88 0.975 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 37 "Net-(Q301-Pad5)") (pintype "passive") (tstamp 4c12a19f-f97f-45c8-8cfd-4d705aa2b9e7)) - (pad "6" smd roundrect locked (at 2.88 0.325 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 3 "GND") (pintype "passive") (tstamp 3b4cf256-46be-450a-b8f9-0847521f9e38)) - (pad "7" smd roundrect locked (at 2.88 -0.325 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 3 "GND") (pintype "passive") (tstamp fff9b20e-7505-4a6b-b5db-21cbc6cc3503)) - (pad "8" smd roundrect locked (at 2.88 -0.975 90) (size 1.56 0.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.05) - (net 35 "unconnected-(Q301-Pad1)") (pintype "passive+no_connect") (tstamp 4c264080-df59-434e-81a9-f1e7feb4e388)) ) (footprint "Capacitor_SMD:C_0402_1005Metric" (layer "F.Cu") @@ -8379,19 +8387,15 @@ (segment (start 36.25 37.75) (end 36.5 37.5) (width 0.4) (layer "B.Cu") (net 20) (tstamp 725f3314-168f-4bf7-8459-880664da1395)) (segment (start 36.5 37.5) (end 39.5 37.5) (width 0.4) (layer "B.Cu") (net 20) (tstamp 775765a5-e2eb-4adb-8600-79a04654377b)) (segment (start 33 37.75) (end 37 37.75) (width 0.4) (layer "F.Cu") (net 21) (tstamp 030c4efc-6932-48c0-8f43-e3096d91886d)) - (segment (start 32.25 36.5) (end 32.045 36.5) (width 0.4) (layer "F.Cu") (net 21) (tstamp 091d5e07-dafa-4b88-b325-9352477ae715)) (segment (start 39.6 32.5) (end 39.55 32.55) (width 0.4) (layer "F.Cu") (net 21) (tstamp 0e5b7289-6358-4d25-9a04-7996927d0149)) + (segment (start 33 37.75) (end 32.9125 37.75) (width 0.4) (layer "F.Cu") (net 21) (tstamp 24141d4f-f2cd-4509-bfd0-e013cd3a8202)) (segment (start 40.75 32.5) (end 39.6 32.5) (width 0.4) (layer "F.Cu") (net 21) (tstamp 31aceed2-f085-4423-b09a-18d393fb324e)) - (segment (start 32.25 36.5) (end 32.455 36.5) (width 0.4) (layer "F.Cu") (net 21) (tstamp 3e40c310-0f24-416c-842c-4b25eaa44ec8)) + (segment (start 31.8625 36.7) (end 31.8625 35.75) (width 0.4) (layer "F.Cu") (net 21) (tstamp 33e77f02-e040-4946-a9d4-a72d97a109cd)) (segment (start 37 37.75) (end 38.75 36) (width 0.4) (layer "F.Cu") (net 21) (tstamp 3e8f140a-8575-4371-b038-68d203130ca0)) (segment (start 40 36) (end 41.01 34.99) (width 0.4) (layer "F.Cu") (net 21) (tstamp 6b78f405-75ba-4e05-9af3-0e24a1dd3f91)) - (segment (start 32.045 36.5) (end 31.925 36.38) (width 0.4) (layer "F.Cu") (net 21) (tstamp 6e42619b-e129-4e47-a145-a106ff435b90)) - (segment (start 32.75 37.75) (end 32.25 37.25) (width 0.4) (layer "F.Cu") (net 21) (tstamp 76f90e0c-0c90-4b46-8d45-a1080c76660a)) - (segment (start 32.25 37.25) (end 32.25 36.5) (width 0.4) (layer "F.Cu") (net 21) (tstamp 91d812b6-ee1b-44be-b95d-966162f76247)) (segment (start 41.01 34.99) (end 41.01 34.46) (width 0.4) (layer "F.Cu") (net 21) (tstamp 9fcce295-5a36-43fd-9341-81cbcd52d44d)) + (segment (start 32.9125 37.75) (end 31.8625 36.7) (width 0.4) (layer "F.Cu") (net 21) (tstamp c2f05364-942e-4c36-9c1d-c1238bbf8c44)) (segment (start 38.75 36) (end 40 36) (width 0.4) (layer "F.Cu") (net 21) (tstamp f1d06e49-2b10-4c1b-a92d-3ba77b869d82)) - (segment (start 32.455 36.5) (end 32.575 36.38) (width 0.4) (layer "F.Cu") (net 21) (tstamp f7576b64-23f3-4ecd-b992-95cbb8af8335)) - (segment (start 33 37.75) (end 32.75 37.75) (width 0.4) (layer "F.Cu") (net 21) (tstamp fc0a14ef-c1e8-4340-b33d-d2b9767cb602)) (via (at 40.75 32.5) (size 0.46) (drill 0.2) (layers "F.Cu" "B.Cu") (net 21) (tstamp 146b2d86-e0b7-49b7-b78a-6e87dad1e876)) (via (at 33 37.75) (size 0.46) (drill 0.2) (layers "F.Cu" "B.Cu") (net 21) (tstamp 7ab5e85d-2dfe-4f17-985a-8a2c95f83a3c)) (segment (start 34.25 34.5) (end 36.25 32.5) (width 0.4) (layer "B.Cu") (net 21) (tstamp 26d2775e-bf37-40f0-82b9-af1a53d80aef)) @@ -8466,15 +8470,13 @@ (via (at 97.25 53.75) (size 0.46) (drill 0.2) (layers "F.Cu" "B.Cu") (net 34) (tstamp e91a5966-049d-4b12-a02e-e7a1eb30a624)) (segment (start 97.05 53.75) (end 97.25 53.75) (width 0.2) (layer "B.Cu") (net 34) (tstamp 7e5f1b29-0cbf-46fc-b49f-d06fa112f96b)) (segment (start 93.5 57.3) (end 97.05 53.75) (width 0.2) (layer "B.Cu") (net 34) (tstamp a927939d-1b73-40e8-a479-1e952ce078dc)) - (segment (start 38.25 33.125978) (end 37.674022 32.55) (width 0.4) (layer "F.Cu") (net 36) (tstamp 6b9d120c-4a12-4511-9c9e-be46b7c8493b)) - (segment (start 37.662011 35.75) (end 38.25 35.162011) (width 0.4) (layer "F.Cu") (net 36) (tstamp 7def68af-0e73-4145-b7ff-a972c5ae3923)) - (segment (start 33.225 36.38) (end 33.855 35.75) (width 0.4) (layer "F.Cu") (net 36) (tstamp 8b4352b9-974d-46ae-b76f-17e37fa36fc9)) - (segment (start 37.674022 32.55) (end 36.95 32.55) (width 0.4) (layer "F.Cu") (net 36) (tstamp 9fb28183-72ee-4cbe-853e-165c4f561e41)) - (segment (start 33.855 35.75) (end 37.662011 35.75) (width 0.4) (layer "F.Cu") (net 36) (tstamp ae0faa00-e859-427a-9204-e31146410e14)) - (segment (start 38.25 35.162011) (end 38.25 33.125978) (width 0.4) (layer "F.Cu") (net 36) (tstamp d239c49e-96fa-4a2a-a9e7-c523740a4b8c)) - (segment (start 33.225 33.642962) (end 34.032038 34.45) (width 0.4) (layer "F.Cu") (net 37) (tstamp 2b46b18f-6d8e-4445-8a87-b5d340b65d34)) - (segment (start 34.032038 34.45) (end 36.95 34.45) (width 0.4) (layer "F.Cu") (net 37) (tstamp 50ffc48f-0046-4fb4-a0f8-3306d3c5f2da)) - (segment (start 33.225 30.62) (end 33.225 33.642962) (width 0.4) (layer "F.Cu") (net 37) (tstamp 691b5528-1b1b-4bda-a90b-70646e953782)) + (segment (start 38.25 35.162011) (end 36.712011 36.7) (width 0.4) (layer "F.Cu") (net 36) (tstamp 00a88542-5c68-48d3-8781-d49665e88457)) + (segment (start 36.712011 36.7) (end 34.1375 36.7) (width 0.4) (layer "F.Cu") (net 36) (tstamp 05620ca8-a698-4647-aed9-38a2f3082ebc)) + (segment (start 38.25 33.125978) (end 38.25 35.162011) (width 0.4) (layer "F.Cu") (net 36) (tstamp 1f8c13ef-99b1-4189-b415-abfc62d0f1b4)) + (segment (start 36.95 32.55) (end 37.674022 32.55) (width 0.4) (layer "F.Cu") (net 36) (tstamp 3675649d-b05e-4c02-bd65-bb791618ff6e)) + (segment (start 37.674022 32.55) (end 38.25 33.125978) (width 0.4) (layer "F.Cu") (net 36) (tstamp d31a2572-899c-4cc6-974c-8e96f16c1090)) + (segment (start 36.95 34.45) (end 35.65 35.75) (width 0.4) (layer "F.Cu") (net 37) (tstamp 9d841ca7-6676-4f2d-a6c3-a7a12349cfed)) + (segment (start 35.65 35.75) (end 34.1375 35.75) (width 0.4) (layer "F.Cu") (net 37) (tstamp b7ce326a-2d97-4df9-837b-06eb760cd13a)) (segment (start 42.04 57.76) (end 42.04 56.05) (width 0.2) (layer "F.Cu") (net 40) (tstamp 369e4554-7a43-454b-976d-6fc0bf692460)) (segment (start 40.25 58) (end 41.8 58) (width 0.2) (layer "F.Cu") (net 40) (tstamp 497a7611-14a1-437d-a56a-86458ad01aee)) (segment (start 41.8 58) (end 42.04 57.76) (width 0.2) (layer "F.Cu") (net 40) (tstamp adb58cc0-fe91-45f9-8352-1b1c84bde459)) @@ -8953,7 +8955,7 @@ (xy 109.760555 35.99402) (xy 109.761007 35.997477) (xy 109.761007 35.99748) - (xy 109.777447 36.123204) + (xy 109.777861 36.126371) (xy 109.778549 36.131631) (xy 109.834444 36.258661) (xy 109.83669 36.261333) @@ -10549,7 +10551,7 @@ (xy 98.6045 43.15439) (xy 98.6045 35.349272) (xy 98.617172 35.316389) - (xy 98.619481 35.313838) + (xy 98.622159 35.31088) (xy 98.655799 35.273715) (xy 98.692262 35.198455) (xy 98.714788 35.151963) @@ -10561,10 +10563,10 @@ (xy 98.739336 35.011959) (xy 98.739482 35) (xy 98.739008 34.996685) - (xy 98.72247 34.881215) + (xy 98.723177 34.886152) (xy 98.719807 34.862619) (xy 98.71831 34.859325) - (xy 98.687229 34.790967) + (xy 98.682558 34.780693) (xy 98.662365 34.736281) (xy 98.659753 34.733249) (xy 98.574053 34.63379) @@ -10572,7 +10574,7 @@ (xy 98.455314 34.555659) (xy 98.45197 34.554659) (xy 98.451968 34.554658) - (xy 98.361974 34.527745) + (xy 98.357149 34.526302) (xy 98.32235 34.515895) (xy 98.253563 34.515475) (xy 98.187062 34.515068) @@ -10646,7 +10648,7 @@ (xy 97.62212 34.120781) (xy 97.499043 33.997705) (xy 97.485186 33.970004) - (xy 97.477695 33.917699) + (xy 97.478479 33.923172) (xy 97.469807 33.862619) (xy 97.46716 33.856796) (xy 97.436189 33.788679) @@ -10839,6 +10841,8 @@ (xy 96.536351 36.129513) (xy 96.536351 36.129512) (xy 96.537482 36.126371) + (xy 96.537948 36.120034) + (xy 96.544458 36.031381) (xy 96.548609 35.974855) (xy 96.53992 35.93176) (xy 96.521848 35.842138) @@ -10849,7 +10853,7 @@ (xy 96.427314 35.666319) (xy 96.380095 35.61497) (xy 96.346774 35.578734) - (xy 96.234115 35.508882) + (xy 96.23521 35.509561) (xy 96.22049 35.500434) (xy 96.220489 35.500434) (xy 96.217656 35.498677) @@ -10941,7 +10945,7 @@ (xy 92.311206 35.671843) (xy 92.3145 35.651045) (xy 92.314499 35.308956) - (xy 92.304804 35.247742) + (xy 92.304608 35.2465) (xy 92.300471 35.220379) (xy 92.300471 35.220378) (xy 92.299868 35.216573) @@ -11240,8 +11244,8 @@ (xy 90.466245 31.898663) (xy 90.460658 31.837859) (xy 90.405557 31.642487) - (xy 90.404092 31.639515) - (xy 90.342769 31.515165) + (xy 90.381831 31.594374) + (xy 90.329688 31.488639) (xy 90.315776 31.460428) (xy 90.19432 31.297779) (xy 90.09705 31.207863) @@ -11286,7 +11290,7 @@ (xy 88.441107 31.43411) (xy 88.43972 31.435869) (xy 88.438672 31.437861) - (xy 88.367102 31.573893) + (xy 88.377552 31.554031) (xy 88.345203 31.615515) (xy 88.285007 31.809378) (xy 88.284743 31.81161) @@ -11297,8 +11301,8 @@ (xy 87.926245 31.898663) (xy 87.920658 31.837859) (xy 87.865557 31.642487) - (xy 87.864092 31.639515) - (xy 87.802769 31.515165) + (xy 87.841831 31.594374) + (xy 87.789688 31.488639) (xy 87.775776 31.460428) (xy 87.65432 31.297779) (xy 87.55705 31.207863) @@ -11343,7 +11347,7 @@ (xy 85.901107 31.43411) (xy 85.89972 31.435869) (xy 85.898672 31.437861) - (xy 85.827102 31.573893) + (xy 85.837552 31.554031) (xy 85.805203 31.615515) (xy 85.745007 31.809378) (xy 85.744743 31.81161) @@ -18913,13 +18917,13 @@ (xy 57.647749 36.290101) (xy 57.64775 36.290101) (xy 57.651555 36.289498) - (xy 57.734155 36.247411) + (xy 57.737905 36.2455) (xy 57.762289 36.233076) (xy 57.76229 36.233075) (xy 57.765723 36.231326) (xy 57.856326 36.140723) (xy 57.858269 36.136911) - (xy 57.908981 36.037383) + (xy 57.90564 36.043939) (xy 57.914498 36.026555) (xy 57.916408 36.014499) (xy 57.922108 35.978506) @@ -19038,13 +19042,13 @@ (xy 55.952892 35.978506) (xy 55.958593 36.014499) (xy 55.960502 36.026555) - (xy 55.966019 36.037383) + (xy 55.96936 36.043939) (xy 56.016732 36.136911) (xy 56.018674 36.140723) (xy 56.109277 36.231326) (xy 56.11271 36.233075) (xy 56.112711 36.233076) - (xy 56.140845 36.247411) + (xy 56.137095 36.2455) (xy 56.223445 36.289498) (xy 56.22725 36.290101) (xy 56.227251 36.290101) @@ -20376,101 +20380,51 @@ (xy 32.910266 39.188199) (xy 32.8955 39.262433) (xy 30.2545 39.262433) - (xy 30.2545 37.167038) - (xy 30.8205 37.167038) - (xy 30.836426 37.247105) - (xy 30.839106 37.251116) - (xy 30.839107 37.251118) - (xy 30.876821 37.30756) - (xy 30.897096 37.337904) - (xy 30.901107 37.340584) - (xy 30.983882 37.395893) - (xy 30.983884 37.395894) - (xy 30.987895 37.398574) - (xy 31.040281 37.408994) - (xy 31.065608 37.414032) - (xy 31.06561 37.414032) - (xy 31.067962 37.4145) - (xy 31.482038 37.4145) - (xy 31.48439 37.414032) - (xy 31.484392 37.414032) - (xy 31.509719 37.408994) - (xy 31.562105 37.398574) - (xy 31.566116 37.395894) - (xy 31.566118 37.395893) - (xy 31.572777 37.391443) - (xy 31.609559 37.384126) - (xy 31.627223 37.391443) - (xy 31.633882 37.395893) - (xy 31.633884 37.395894) - (xy 31.637895 37.398574) - (xy 31.690281 37.408994) - (xy 31.715608 37.414032) - (xy 31.71561 37.414032) - (xy 31.717962 37.4145) - (xy 31.793496 37.4145) - (xy 31.828144 37.428852) - (xy 31.836977 37.440909) - (xy 31.843023 37.452546) - (xy 31.843684 37.453871) - (xy 31.869846 37.508353) - (xy 31.872332 37.511042) - (xy 31.874393 37.514075) - (xy 31.874114 37.514265) - (xy 31.875022 37.515556) - (xy 31.875299 37.515369) - (xy 31.876858 37.517682) - (xy 31.878148 37.520166) - (xy 31.882494 37.525254) - (xy 31.921157 37.563917) - (xy 31.922491 37.565304) - (xy 31.958012 37.60373) - (xy 31.962617 37.608712) - (xy 31.965785 37.610552) - (xy 31.968642 37.612841) - (xy 31.968619 37.61287) - (xy 31.975089 37.617849) - (xy 32.407466 38.050226) - (xy 32.411298 38.054538) - (xy 32.435359 38.085059) - (xy 32.485114 38.119446) - (xy 32.486301 38.120295) - (xy 32.534924 38.156209) - (xy 32.538381 38.157423) - (xy 32.541545 38.159099) - (xy 32.544775 38.160681) - (xy 32.547789 38.162764) - (xy 32.581181 38.173324) - (xy 32.605385 38.180979) - (xy 32.606846 38.181466) - (xy 32.660419 38.20028) - (xy 32.660421 38.20028) - (xy 32.663874 38.201493) - (xy 32.667533 38.201637) - (xy 32.671131 38.202323) - (xy 32.671068 38.202651) - (xy 32.672631 38.202924) - (xy 32.672694 38.202599) - (xy 32.675435 38.203133) - (xy 32.678097 38.203975) - (xy 32.680878 38.204194) - (xy 32.680879 38.204194) - (xy 32.682147 38.204294) - (xy 32.684768 38.2045) - (xy 32.739458 38.2045) - (xy 32.741383 38.204538) - (xy 32.800437 38.206858) - (xy 32.803975 38.20592) - (xy 32.807619 38.205518) - (xy 32.807623 38.205555) - (xy 32.815717 38.2045) - (xy 32.822449 38.2045) - (xy 32.83706 38.206729) + (xy 30.2545 36.881834) + (xy 30.9455 36.881834) + (xy 30.950167 36.911298) + (xy 30.957396 36.956941) + (xy 30.960502 36.976555) + (xy 30.981742 37.018241) + (xy 31.01077 37.07521) + (xy 31.018674 37.090723) + (xy 31.109277 37.181326) + (xy 31.11271 37.183075) + (xy 31.112711 37.183076) + (xy 31.151502 37.202841) + (xy 31.223445 37.239498) + (xy 31.22725 37.240101) + (xy 31.227251 37.240101) + (xy 31.25749 37.24489) + (xy 31.318166 37.2545) + (xy 31.753944 37.2545) + (xy 31.788592 37.268852) + (xy 32.569966 38.050226) + (xy 32.573798 38.054538) + (xy 32.597859 38.085059) + (xy 32.60087 38.08714) + (xy 32.600871 38.087141) + (xy 32.647569 38.119416) + (xy 32.648821 38.120311) + (xy 32.687418 38.148819) + (xy 32.697423 38.156209) + (xy 32.700878 38.157422) + (xy 32.704022 38.159087) + (xy 32.707275 38.160681) + (xy 32.710289 38.162764) + (xy 32.713783 38.163869) + (xy 32.713785 38.16387) + (xy 32.745463 38.173888) + (xy 32.767921 38.180991) + (xy 32.769317 38.181456) + (xy 32.772872 38.182704) + (xy 32.78378 38.188142) + (xy 32.789273 38.191799) (xy 32.921741 38.233185) (xy 32.925231 38.233249) (xy 32.944351 38.2336) (xy 33.060501 38.235729) - (xy 33.166924 38.206714) + (xy 33.15946 38.208749) (xy 33.168718 38.206225) (xy 33.181607 38.2045) (xy 36.970091 38.2045) @@ -20621,11 +20575,11 @@ (xy 39.182757 37.127241) (xy 39.180449 37.129854) (xy 39.180448 37.129855) - (xy 39.168659 37.143204) + (xy 39.164057 37.148414) (xy 39.090887 37.231263) (xy 39.089405 37.234419) (xy 39.089404 37.234421) - (xy 39.040819 37.337904) + (xy 39.048613 37.321304) (xy 39.031906 37.356889) (xy 39.031369 37.360336) (xy 39.031369 37.360337) @@ -20634,7 +20588,7 @@ (xy 39.010555 37.49402) (xy 39.011007 37.497477) (xy 39.011007 37.49748) - (xy 39.026747 37.617849) + (xy 39.026878 37.618852) (xy 39.028549 37.631631) (xy 39.084444 37.758661) (xy 39.08669 37.761333) @@ -20800,7 +20754,7 @@ (xy 43.455314 37.555659) (xy 43.45197 37.554659) (xy 43.451968 37.554658) - (xy 43.353645 37.525254) + (xy 43.377982 37.532532) (xy 43.32235 37.515895) (xy 43.253563 37.515475) (xy 43.187062 37.515068) @@ -20917,7 +20871,7 @@ (xy 47.399121 38.1855) (xy 47.230001 38.185501) (xy 47.058956 38.185501) - (xy 47.01792 38.192) + (xy 47.019189 38.191799) (xy 46.970379 38.199529) (xy 46.970378 38.199529) (xy 46.966573 38.200132) @@ -21494,7 +21448,7 @@ (xy 52.465766 37.60373) (xy 52.42588 37.516006) (xy 52.412365 37.486281) - (xy 52.383264 37.452507) + (xy 52.361651 37.427424) (xy 52.324053 37.38379) (xy 52.321773 37.381144) (xy 52.205314 37.305659) @@ -21536,7 +21490,7 @@ (xy 51.0045 37.75) (xy 51.004499 37.577337) (xy 51.004499 37.574934) - (xy 51.002445 37.564603) + (xy 51.001558 37.560144) (xy 50.991496 37.509557) (xy 50.991496 37.490443) (xy 51.0045 37.425067) @@ -21556,12 +21510,12 @@ (xy 54.082396 36.956941) (xy 54.085502 36.976555) (xy 54.106742 37.018241) - (xy 54.125496 37.055046) + (xy 54.13577 37.07521) (xy 54.143674 37.090723) (xy 54.234277 37.181326) (xy 54.23771 37.183075) (xy 54.237711 37.183076) - (xy 54.278541 37.20388) + (xy 54.276502 37.202841) (xy 54.348445 37.239498) (xy 54.35225 37.240101) (xy 54.352251 37.240101) @@ -21572,12 +21526,12 @@ (xy 55.772749 37.240101) (xy 55.77275 37.240101) (xy 55.776555 37.239498) - (xy 55.846459 37.20388) + (xy 55.848498 37.202841) (xy 55.887289 37.183076) (xy 55.88729 37.183075) (xy 55.890723 37.181326) (xy 55.981326 37.090723) - (xy 55.999505 37.055046) + (xy 55.989231 37.07521) (xy 56.018258 37.018241) (xy 56.039498 36.976555) (xy 56.042605 36.956941) @@ -21687,7 +21641,7 @@ (xy 54.994987 35.368852) (xy 55.029635 35.3545) (xy 55.681834 35.3545) - (xy 55.754444 35.343) + (xy 55.74251 35.34489) (xy 55.772749 35.340101) (xy 55.77275 35.340101) (xy 55.776555 35.339498) @@ -21703,9 +21657,6 @@ (xy 56.050498 35.007102) (xy 56.0545 34.981834) (xy 56.0545 34.618166) - (xy 56.042813 34.544373) - (xy 56.040101 34.527251) - (xy 56.040101 34.52725) (xy 56.039498 34.523445) (xy 56.001499 34.448869) (xy 55.983076 34.412711) @@ -21734,9 +21685,6 @@ (xy 54.141924 34.412711) (xy 54.123501 34.448869) (xy 54.085502 34.523445) - (xy 54.084899 34.52725) - (xy 54.084899 34.527251) - (xy 54.082187 34.544373) (xy 54.0705 34.618166) (xy 54.0705 34.8465) (xy 54.056148 34.881148) @@ -21949,10 +21897,10 @@ (xy 44.134087 33.733478) (xy 44.135681 33.730225) (xy 44.137764 33.727211) - (xy 44.140806 33.717594) + (xy 44.144601 33.705594) (xy 44.155984 33.669598) (xy 44.156471 33.668138) - (xy 44.160242 33.6574) + (xy 44.160189 33.657551) (xy 44.173472 33.619726) (xy 44.198493 33.59179) (xy 44.235939 33.589729) @@ -22059,7 +22007,7 @@ (xy 52.196001 34.459747) (xy 52.196001 34.472613) (xy 45.430558 34.472613) - (xy 45.446423 34.439867) + (xy 45.459434 34.413013) (xy 45.464788 34.401963) (xy 45.464789 34.401961) (xy 45.466311 34.398819) @@ -22068,7 +22016,7 @@ (xy 45.489023 34.263817) (xy 45.489336 34.261959) (xy 45.489482 34.25) - (xy 45.488177 34.240884) + (xy 45.488953 34.246302) (xy 45.472153 34.129) (xy 45.469807 34.112619) (xy 45.466202 34.104689) @@ -22393,7 +22341,7 @@ (xy 68.392 31.695635) (xy 68.377519 31.571431) (xy 68.320473 31.414271) - (xy 68.317275 31.409392) + (xy 68.31329 31.403314) (xy 68.269791 31.336968) (xy 68.228802 31.27445) (xy 68.107424 31.159467) @@ -22416,7 +22364,7 @@ (xy 67.074428 31.336968) (xy 66.998394 31.485872) (xy 66.997717 31.488639) - (xy 66.960913 31.639044) + (xy 66.966145 31.617663) (xy 66.958654 31.648274) (xy 66.958 31.658817) (xy 66.958 32.704365) @@ -22479,12 +22427,10 @@ (xy 46.940265 29.875067) (xy 47.047622 29.785778) (xy 47.049345 29.784345) - (xy 47.077497 29.750496) + (xy 47.125461 29.692826) (xy 47.177711 29.630003) (xy 47.177713 29.630001) (xy 47.179147 29.628276) - (xy 47.185925 29.616174) - (xy 47.277238 29.453122) (xy 47.278334 29.451165) (xy 47.309144 29.360401) (xy 47.342863 29.26107) @@ -22541,11 +22487,11 @@ (xy 49.480265 29.875067) (xy 49.587622 29.785778) (xy 49.589345 29.784345) - (xy 49.617497 29.750496) + (xy 49.665461 29.692826) (xy 49.717711 29.630003) (xy 49.717713 29.630001) (xy 49.719147 29.628276) - (xy 49.725925 29.616174) + (xy 49.759284 29.556607) (xy 49.802433 29.479558) (xy 49.831884 29.45634) (xy 49.845185 29.4545) @@ -22940,7 +22886,7 @@ (xy 81.160317 37.281148) (xy 81.176693 37.269681) (xy 81.180298 37.267384) - (xy 81.203135 37.254199) + (xy 81.211267 37.249504) (xy 81.214981 37.24736) (xy 81.24073 37.216674) (xy 81.243617 37.213524) @@ -22951,7 +22897,7 @@ (xy 81.581615 37.031335) (xy 81.584502 37.034485) (xy 81.61025 37.06517) - (xy 81.613964 37.067314) + (xy 81.621824 37.071852) (xy 81.644933 37.085194) (xy 81.648538 37.087491) (xy 81.677557 37.10781) @@ -22988,7 +22934,7 @@ (xy 83.072444 37.10781) (xy 83.101462 37.087491) (xy 83.105067 37.085194) - (xy 83.136036 37.067314) + (xy 83.128176 37.071852) (xy 83.13975 37.06517) (xy 83.165498 37.034485) (xy 83.168385 37.031335) @@ -23025,7 +22971,7 @@ (xy 83.455314 36.055659) (xy 83.45197 36.054659) (xy 83.451968 36.054658) - (xy 83.357995 36.026555) + (xy 83.377982 36.032532) (xy 83.32235 36.015895) (xy 83.253563 36.015475) (xy 83.187062 36.015068) @@ -23120,7 +23066,7 @@ (xy 82.768805 35.240083) (xy 82.766433 35.236235) (xy 82.766432 35.236232) - (xy 82.75165 35.212252) + (xy 82.751404 35.211852) (xy 82.748113 35.206514) (xy 82.74581 35.202333) (xy 82.728492 35.166906) @@ -23131,7 +23077,7 @@ (xy 82.709282 35.143519) (xy 82.677899 35.119655) (xy 82.674235 35.116576) - (xy 82.672791 35.115236) + (xy 82.661101 35.104392) (xy 82.645328 35.089761) (xy 82.63734 35.086574) (xy 82.62584 35.080068) @@ -23244,9 +23190,9 @@ (xy 86.694397 35.449224) (xy 86.697368 35.4474) (xy 86.69737 35.447399) - (xy 86.803077 35.382494) + (xy 86.800447 35.384109) (xy 86.812665 35.376607) - (xy 86.82022 35.368261) + (xy 86.82299 35.365201) (xy 86.872159 35.31088) (xy 86.905799 35.273715) (xy 86.942262 35.198455) @@ -23259,10 +23205,10 @@ (xy 86.989336 35.011959) (xy 86.989482 35) (xy 86.989008 34.996685) - (xy 86.97247 34.881215) + (xy 86.973177 34.886152) (xy 86.969807 34.862619) (xy 86.96831 34.859325) - (xy 86.937229 34.790967) + (xy 86.932558 34.780693) (xy 86.912365 34.736281) (xy 86.909753 34.733249) (xy 86.824053 34.63379) @@ -23301,8 +23247,8 @@ (xy 85.386245 31.898663) (xy 85.380658 31.837859) (xy 85.325557 31.642487) - (xy 85.324092 31.639515) - (xy 85.262769 31.515165) + (xy 85.301831 31.594374) + (xy 85.249688 31.488639) (xy 85.235776 31.460428) (xy 85.11432 31.297779) (xy 85.01705 31.207863) @@ -23387,7 +23333,7 @@ (xy 85.215664 30.107712) (xy 85.30213 29.953315) (xy 85.303334 29.951165) - (xy 85.335775 29.855597) + (xy 85.344202 29.830773) (xy 85.367863 29.76107) (xy 85.367864 29.761067) (xy 85.368212 29.760042) @@ -23642,7 +23588,7 @@ (xy 83.194424 29.673522) (xy 83.194977 29.675701) (xy 83.194978 29.675705) - (xy 83.230716 29.816421) + (xy 83.222934 29.785778) (xy 83.244392 29.870269) (xy 83.245328 29.872299) (xy 83.24533 29.872305) @@ -23705,7 +23651,7 @@ (xy 79.932 30.95103) (xy 79.932 33.757771) (xy 79.931814 33.762042) - (xy 79.929207 33.791845) + (xy 79.929484 33.788679) (xy 79.928323 33.801944) (xy 79.938689 33.840629) (xy 79.939611 33.844786) @@ -23779,7 +23725,6 @@ (xy 80.2157 35.297816) (xy 80.2157 35.301312) (xy 80.213766 35.314941) - (xy 80.213163 35.317024) (xy 80.211904 35.321372) (xy 80.212294 35.325878) (xy 80.212294 35.32588) @@ -24041,7 +23986,7 @@ (xy 75.974428 31.336968) (xy 75.898394 31.485872) (xy 75.897717 31.488639) - (xy 75.860913 31.639044) + (xy 75.866145 31.617663) (xy 75.858654 31.648274) (xy 75.858 31.658817) (xy 75.858 31.703628) @@ -24088,7 +24033,7 @@ (xy 77.292 31.695635) (xy 77.277519 31.571431) (xy 77.220473 31.414271) - (xy 77.217275 31.409392) + (xy 77.21329 31.403314) (xy 77.169791 31.336968) (xy 77.128802 31.27445) (xy 77.044802 31.194876) @@ -24604,7 +24549,7 @@ (xy 42.392652 33.956342) (xy 42.416796 33.94404) (xy 42.50404 33.856796) - (xy 42.50911 33.846847) + (xy 42.511226 33.842694) (xy 42.558303 33.750299) (xy 42.558303 33.750298) (xy 42.560054 33.746862) @@ -24793,24 +24738,272 @@ (xy 35.000385 32.942302) (xy 34.996372 32.943265) (xy 34.994 32.947135) - (xy 34.994 33.705) - (xy 34.979648 33.739648) - (xy 34.945 33.754) - (xy 34.231826 33.754) - (xy 34.224934 33.756855) + (xy 34.994 34.050255) + (xy 34.996855 34.057147) + (xy 34.999214 34.058124) + (xy 35.000142 34.057822) + (xy 35.103061 34.005383) + (xy 35.109227 34.000903) + (xy 35.190903 33.919227) + (xy 35.195381 33.913063) + (xy 35.206061 33.892103) + (xy 35.234578 33.867747) + (xy 35.271966 33.87069) + (xy 35.293378 33.892103) + (xy 35.30596 33.916796) + (xy 35.393204 34.00404) + (xy 35.396641 34.005791) + (xy 35.396642 34.005792) + (xy 35.498514 34.057698) + (xy 35.503138 34.060054) + (xy 35.594347 34.0745) + (xy 35.759956 34.0745) + (xy 35.925652 34.074499) + (xy 36.016862 34.060054) + (xy 36.034253 34.051193) + (xy 36.07164 34.048252) + (xy 36.100157 34.072609) + (xy 36.104555 34.104411) + (xy 36.0955 34.149933) + (xy 36.095501 34.405653) + (xy 36.095501 34.641443) + (xy 36.081149 34.676091) + (xy 35.476092 35.281148) + (xy 35.441444 35.2955) + (xy 34.994138 35.2955) + (xy 34.95949 35.281148) + (xy 34.945138 35.2465) + (xy 34.95949 35.211852) + (xy 34.978189 35.193153) + (xy 34.982669 35.186987) + (xy 35.037264 35.079838) + (xy 35.039619 35.07259) + (xy 35.041039 35.063626) + (xy 35.039298 35.056373) + (xy 35.035426 35.054) + (xy 33.242184 35.054) + (xy 33.235292 35.056855) + (xy 33.233554 35.061051) + (xy 33.235381 35.072592) + (xy 33.237735 35.079835) + (xy 33.292331 35.186987) + (xy 33.296811 35.193153) + (xy 33.343657 35.239999) + (xy 33.358009 35.274647) + (xy 33.343658 35.309293) + (xy 33.293674 35.359277) + (xy 33.291925 35.36271) + (xy 33.291924 35.362711) + (xy 33.275504 35.394938) + (xy 33.235502 35.473445) + (xy 33.234899 35.47725) + (xy 33.234899 35.477251) + (xy 33.233556 35.485729) + (xy 33.2205 35.568166) + (xy 33.2205 35.931834) + (xy 33.227892 35.978506) + (xy 33.233593 36.014499) + (xy 33.235502 36.026555) + (xy 33.24436 36.043939) + (xy 33.291732 36.136911) + (xy 33.293674 36.140723) + (xy 33.343303 36.190352) + (xy 33.357655 36.225) + (xy 33.343303 36.259648) + (xy 33.293674 36.309277) + (xy 33.291925 36.31271) + (xy 33.291924 36.312711) + (xy 33.271141 36.3535) + (xy 33.235502 36.423445) + (xy 33.2205 36.518166) + (xy 33.2205 36.881834) + (xy 33.225167 36.911298) + (xy 33.232396 36.956941) + (xy 33.235502 36.976555) + (xy 33.256742 37.018241) + (xy 33.28577 37.07521) + (xy 33.293674 37.090723) + (xy 33.384277 37.181326) + (xy 33.38771 37.183075) + (xy 33.387711 37.183076) + (xy 33.426502 37.202841) + (xy 33.450858 37.231358) + (xy 33.447915 37.268746) + (xy 33.419398 37.293102) + (xy 33.404256 37.2955) + (xy 33.178515 37.2955) + (xy 33.164476 37.293446) + (xy 33.082502 37.268931) + (xy 33.061893 37.256633) + (xy 32.78452 36.97926) + (xy 32.770168 36.944612) + (xy 32.770771 36.936947) + (xy 32.770896 36.936162) + (xy 32.7795 36.881834) + (xy 32.7795 36.518166) + (xy 32.764498 36.423445) + (xy 32.728859 36.3535) + (xy 32.708076 36.312711) + (xy 32.708075 36.31271) + (xy 32.706326 36.309277) + (xy 32.656697 36.259648) + (xy 32.642345 36.225) + (xy 32.656697 36.190352) + (xy 32.706326 36.140723) + (xy 32.708269 36.136911) + (xy 32.75564 36.043939) + (xy 32.764498 36.026555) + (xy 32.766408 36.014499) + (xy 32.772108 35.978506) + (xy 32.7795 35.931834) + (xy 32.7795 35.568166) + (xy 32.766444 35.485729) + (xy 32.765101 35.477251) + (xy 32.765101 35.47725) + (xy 32.764498 35.473445) + (xy 32.724496 35.394938) + (xy 32.708076 35.362711) + (xy 32.708075 35.36271) + (xy 32.706326 35.359277) + (xy 32.656697 35.309648) + (xy 32.642345 35.275) + (xy 32.656697 35.240352) + (xy 32.706326 35.190723) + (xy 32.708696 35.186073) + (xy 32.747857 35.109215) + (xy 32.764498 35.076555) + (xy 32.765706 35.068932) + (xy 32.775498 35.007102) + (xy 32.7795 34.981834) + (xy 32.7795 34.618166) + (xy 32.766546 34.536374) + (xy 33.233961 34.536374) + (xy 33.235702 34.543627) + (xy 33.239574 34.546) + (xy 33.873753 34.546) + (xy 33.880645 34.543145) + (xy 33.8835 34.536253) + (xy 34.3915 34.536253) + (xy 34.394355 34.543145) + (xy 34.401247 34.546) + (xy 35.032816 34.546) + (xy 35.039708 34.543145) + (xy 35.041446 34.538949) + (xy 35.039619 34.527408) + (xy 35.037265 34.520165) + (xy 34.982669 34.413013) + (xy 34.978189 34.406847) + (xy 34.893153 34.321811) + (xy 34.886987 34.317331) + (xy 34.779836 34.262735) + (xy 34.77259 34.260381) + (xy 34.683693 34.246301) + (xy 34.679871 34.246) + (xy 34.401247 34.246) + (xy 34.394355 34.248855) + (xy 34.3915 34.255747) + (xy 34.3915 34.536253) + (xy 33.8835 34.536253) + (xy 33.8835 34.255748) + (xy 33.880645 34.248856) + (xy 33.873753 34.246001) + (xy 33.59513 34.246001) + (xy 33.591307 34.246302) + (xy 33.502409 34.260381) + (xy 33.495164 34.262735) + (xy 33.388013 34.317331) + (xy 33.381847 34.321811) + (xy 33.296811 34.406847) + (xy 33.292331 34.413013) + (xy 33.237736 34.520162) + (xy 33.235381 34.52741) + (xy 33.233961 34.536374) + (xy 32.766546 34.536374) + (xy 32.764498 34.523445) + (xy 32.726499 34.448869) + (xy 32.708076 34.412711) + (xy 32.708075 34.41271) + (xy 32.706326 34.409277) + (xy 32.615723 34.318674) + (xy 32.61229 34.316925) + (xy 32.612289 34.316924) + (xy 32.552219 34.286317) + (xy 32.501555 34.260502) + (xy 32.49775 34.259899) + (xy 32.497749 34.259899) + (xy 32.456044 34.253294) + (xy 32.406834 34.2455) + (xy 31.318166 34.2455) + (xy 31.268956 34.253294) + (xy 31.227251 34.259899) + (xy 31.22725 34.259899) + (xy 31.223445 34.260502) + (xy 31.172781 34.286317) + (xy 31.112711 34.316924) + (xy 31.11271 34.316925) + (xy 31.109277 34.318674) + (xy 31.018674 34.409277) + (xy 31.016925 34.41271) + (xy 31.016924 34.412711) + (xy 30.998501 34.448869) + (xy 30.960502 34.523445) + (xy 30.9455 34.618166) + (xy 30.9455 34.981834) + (xy 30.949502 35.007102) + (xy 30.959295 35.068932) + (xy 30.960502 35.076555) + (xy 30.977143 35.109215) + (xy 31.016305 35.186073) + (xy 31.018674 35.190723) + (xy 31.068303 35.240352) + (xy 31.082655 35.275) + (xy 31.068303 35.309648) + (xy 31.018674 35.359277) + (xy 31.016925 35.36271) + (xy 31.016924 35.362711) + (xy 31.000504 35.394938) + (xy 30.960502 35.473445) + (xy 30.959899 35.47725) + (xy 30.959899 35.477251) + (xy 30.958556 35.485729) + (xy 30.9455 35.568166) + (xy 30.9455 35.931834) + (xy 30.952892 35.978506) + (xy 30.958593 36.014499) + (xy 30.960502 36.026555) + (xy 30.96936 36.043939) + (xy 31.016732 36.136911) + (xy 31.018674 36.140723) + (xy 31.068303 36.190352) + (xy 31.082655 36.225) + (xy 31.068303 36.259648) + (xy 31.018674 36.309277) + (xy 31.016925 36.31271) + (xy 31.016924 36.312711) + (xy 30.996141 36.3535) + (xy 30.960502 36.423445) + (xy 30.9455 36.518166) + (xy 30.9455 36.881834) + (xy 30.2545 36.881834) + (xy 30.2545 33.761051) (xy 34.223196 33.761051) (xy 34.229824 33.802897) (xy 34.232178 33.810144) (xy 34.284617 33.913061) - (xy 34.287987 33.917699) - (xy 34.296742 33.954166) - (xy 34.277146 33.986142) - (xy 34.248345 33.9955) - (xy 34.240594 33.9955) - (xy 34.205946 33.981148) - (xy 33.693852 33.469054) - (xy 33.6795 33.434406) - (xy 33.6795 33.236374) + (xy 34.289097 33.919227) + (xy 34.370773 34.000903) + (xy 34.376939 34.005383) + (xy 34.479615 34.057698) + (xy 34.483628 34.056735) + (xy 34.486 34.052865) + (xy 34.486 33.763747) + (xy 34.483145 33.756855) + (xy 34.476253 33.754) + (xy 34.231826 33.754) + (xy 34.224934 33.756855) + (xy 34.223196 33.761051) + (xy 30.2545 33.761051) + (xy 30.2545 33.236374) (xy 34.223604 33.236374) (xy 34.225345 33.243627) (xy 34.229218 33.246) @@ -24828,349 +25021,7 @@ (xy 34.232178 33.189856) (xy 34.229824 33.197103) (xy 34.223604 33.236374) - (xy 33.6795 33.236374) - (xy 33.6795 29.832962) - (xy 33.663574 29.752895) - (xy 33.649311 29.731548) - (xy 33.605584 29.666107) - (xy 33.602904 29.662096) - (xy 33.587149 29.651569) - (xy 33.516118 29.604107) - (xy 33.516116 29.604106) - (xy 33.512105 29.601426) - (xy 33.459719 29.591006) - (xy 33.434392 29.585968) - (xy 33.43439 29.585968) - (xy 33.432038 29.5855) - (xy 33.017962 29.5855) - (xy 33.01561 29.585968) - (xy 33.015608 29.585968) - (xy 32.990281 29.591006) - (xy 32.937895 29.601426) - (xy 32.933884 29.604106) - (xy 32.933882 29.604107) - (xy 32.926772 29.608858) - (xy 32.889989 29.616174) - (xy 32.872325 29.608858) - (xy 32.865921 29.604579) - (xy 32.857173 29.600956) - (xy 32.784352 29.586471) - (xy 32.783753 29.586412) - (xy 32.777855 29.588855) - (xy 32.775 29.595747) - (xy 32.775 29.805516) - (xy 32.774058 29.815073) - (xy 32.7705 29.832962) - (xy 32.7705 33.613051) - (xy 32.77016 33.61881) - (xy 32.768925 33.629244) - (xy 32.765593 33.6574) - (xy 32.776232 33.715652) - (xy 32.776452 33.716858) - (xy 32.776699 33.718349) - (xy 32.779396 33.736281) - (xy 32.785024 33.773715) - (xy 32.785685 33.778113) - (xy 32.78727 33.781415) - (xy 32.788324 33.78484) - (xy 32.789489 33.788241) - (xy 32.790147 33.791845) - (xy 32.791835 33.795096) - (xy 32.791836 33.795097) - (xy 32.795393 33.801944) - (xy 32.816153 33.841908) - (xy 32.818003 33.84547) - (xy 32.818684 33.846833) - (xy 32.844846 33.901315) - (xy 32.847332 33.904004) - (xy 32.849393 33.907037) - (xy 32.849114 33.907227) - (xy 32.850022 33.908518) - (xy 32.850299 33.908331) - (xy 32.851858 33.910644) - (xy 32.853148 33.913128) - (xy 32.857494 33.918216) - (xy 32.896157 33.956879) - (xy 32.897491 33.958266) - (xy 32.933906 33.997659) - (xy 32.937617 34.001674) - (xy 32.940785 34.003514) - (xy 32.943642 34.005803) - (xy 32.943619 34.005832) - (xy 32.950089 34.010811) - (xy 33.689504 34.750226) - (xy 33.693336 34.754538) - (xy 33.717397 34.785059) - (xy 33.767152 34.819446) - (xy 33.768339 34.820295) - (xy 33.816962 34.856209) - (xy 33.820419 34.857423) - (xy 33.823583 34.859099) - (xy 33.826813 34.860681) - (xy 33.829827 34.862764) - (xy 33.850931 34.869438) - (xy 33.887423 34.880979) - (xy 33.888884 34.881466) - (xy 33.942457 34.90028) - (xy 33.942459 34.90028) - (xy 33.945912 34.901493) - (xy 33.949571 34.901637) - (xy 33.953169 34.902323) - (xy 33.953106 34.902651) - (xy 33.954669 34.902924) - (xy 33.954732 34.902599) - (xy 33.957473 34.903133) - (xy 33.960135 34.903975) - (xy 33.962916 34.904194) - (xy 33.962917 34.904194) - (xy 33.964185 34.904294) - (xy 33.966806 34.9045) - (xy 34.021496 34.9045) - (xy 34.023421 34.904538) - (xy 34.082475 34.906858) - (xy 34.086018 34.905919) - (xy 34.089655 34.905517) - (xy 34.089659 34.905555) - (xy 34.097752 34.9045) - (xy 36.145689 34.9045) - (xy 36.172912 34.912758) - (xy 36.221915 34.945501) - (xy 36.250699 34.964734) - (xy 36.324933 34.9795) - (xy 36.327343 34.9795) - (xy 36.950909 34.979499) - (xy 37.575066 34.979499) - (xy 37.577418 34.979031) - (xy 37.57742 34.979031) - (xy 37.613403 34.971874) - (xy 37.649301 34.964734) - (xy 37.653312 34.962054) - (xy 37.653314 34.962053) - (xy 37.703413 34.928577) - (xy 37.740195 34.92126) - (xy 37.771378 34.942096) - (xy 37.778695 34.978878) - (xy 37.765284 35.003967) - (xy 37.488103 35.281148) - (xy 37.453455 35.2955) - (xy 33.884916 35.2955) - (xy 33.879157 35.29516) - (xy 33.876707 35.29487) - (xy 33.840563 35.290592) - (xy 33.781055 35.30146) - (xy 33.779599 35.301701) - (xy 33.746846 35.306626) - (xy 33.723472 35.31014) - (xy 33.72347 35.310141) - (xy 33.719849 35.310685) - (xy 33.716547 35.31227) - (xy 33.713122 35.313324) - (xy 33.709721 35.314489) - (xy 33.706117 35.315147) - (xy 33.702867 35.316835) - (xy 33.702865 35.316836) - (xy 33.694133 35.321372) - (xy 33.652484 35.343007) - (xy 33.651135 35.343681) - (xy 33.596647 35.369846) - (xy 33.593958 35.372332) - (xy 33.590927 35.374392) - (xy 33.590738 35.374114) - (xy 33.589459 35.375012) - (xy 33.589646 35.375289) - (xy 33.588651 35.37596) - (xy 33.58789 35.376115) - (xy 33.585453 35.377827) - (xy 33.584833 35.378149) - (xy 33.584169 35.376871) - (xy 33.5519 35.383434) - (xy 33.534034 35.376079) - (xy 33.512105 35.361426) - (xy 33.451002 35.349272) - (xy 33.434392 35.345968) - (xy 33.43439 35.345968) - (xy 33.432038 35.3455) - (xy 33.017962 35.3455) - (xy 33.01561 35.345968) - (xy 33.015608 35.345968) - (xy 32.998998 35.349272) - (xy 32.937895 35.361426) - (xy 32.933884 35.364106) - (xy 32.933882 35.364107) - (xy 32.927223 35.368557) - (xy 32.890441 35.375874) - (xy 32.872777 35.368557) - (xy 32.866118 35.364107) - (xy 32.866116 35.364106) - (xy 32.862105 35.361426) - (xy 32.801002 35.349272) - (xy 32.784392 35.345968) - (xy 32.78439 35.345968) - (xy 32.782038 35.3455) - (xy 32.367962 35.3455) - (xy 32.36561 35.345968) - (xy 32.365608 35.345968) - (xy 32.348998 35.349272) - (xy 32.287895 35.361426) - (xy 32.283884 35.364106) - (xy 32.283882 35.364107) - (xy 32.277223 35.368557) - (xy 32.240441 35.375874) - (xy 32.222777 35.368557) - (xy 32.216118 35.364107) - (xy 32.216116 35.364106) - (xy 32.212105 35.361426) - (xy 32.151002 35.349272) - (xy 32.134392 35.345968) - (xy 32.13439 35.345968) - (xy 32.132038 35.3455) - (xy 31.717962 35.3455) - (xy 31.71561 35.345968) - (xy 31.715608 35.345968) - (xy 31.698998 35.349272) - (xy 31.637895 35.361426) - (xy 31.633884 35.364106) - (xy 31.633882 35.364107) - (xy 31.627223 35.368557) - (xy 31.590441 35.375874) - (xy 31.572777 35.368557) - (xy 31.566118 35.364107) - (xy 31.566116 35.364106) - (xy 31.562105 35.361426) - (xy 31.501002 35.349272) - (xy 31.484392 35.345968) - (xy 31.48439 35.345968) - (xy 31.482038 35.3455) - (xy 31.067962 35.3455) - (xy 31.06561 35.345968) - (xy 31.065608 35.345968) - (xy 31.048998 35.349272) - (xy 30.987895 35.361426) - (xy 30.983884 35.364106) - (xy 30.983882 35.364107) - (xy 30.930819 35.399563) - (xy 30.897096 35.422096) - (xy 30.894416 35.426107) - (xy 30.848179 35.495306) - (xy 30.836426 35.512895) - (xy 30.8205 35.592962) - (xy 30.8205 37.167038) - (xy 30.2545 37.167038) - (xy 30.2545 31.407038) - (xy 30.8205 31.407038) - (xy 30.836426 31.487105) - (xy 30.839106 31.491116) - (xy 30.839107 31.491118) - (xy 30.87222 31.540675) - (xy 30.897096 31.577904) - (xy 30.901107 31.580584) - (xy 30.983882 31.635893) - (xy 30.983884 31.635894) - (xy 30.987895 31.638574) - (xy 31.036661 31.648274) - (xy 31.065608 31.654032) - (xy 31.06561 31.654032) - (xy 31.067962 31.6545) - (xy 31.482038 31.6545) - (xy 31.48439 31.654032) - (xy 31.484392 31.654032) - (xy 31.513339 31.648274) - (xy 31.562105 31.638574) - (xy 31.566116 31.635894) - (xy 31.566118 31.635893) - (xy 31.573228 31.631142) - (xy 31.610011 31.623826) - (xy 31.627675 31.631142) - (xy 31.634079 31.635421) - (xy 31.642827 31.639044) - (xy 31.715648 31.653529) - (xy 31.716247 31.653588) - (xy 31.722145 31.651145) - (xy 31.725 31.644253) - (xy 32.125 31.644253) - (xy 32.127855 31.651145) - (xy 32.133753 31.653588) - (xy 32.134352 31.653529) - (xy 32.207173 31.639044) - (xy 32.215925 31.63542) - (xy 32.222777 31.630841) - (xy 32.25956 31.623525) - (xy 32.277223 31.630841) - (xy 32.284075 31.63542) - (xy 32.292827 31.639044) - (xy 32.365648 31.653529) - (xy 32.366247 31.653588) - (xy 32.372145 31.651145) - (xy 32.375 31.644253) - (xy 32.375 30.829747) - (xy 32.372145 30.822855) - (xy 32.365253 30.82) - (xy 32.134747 30.82) - (xy 32.127855 30.822855) - (xy 32.125 30.829747) - (xy 32.125 31.644253) - (xy 31.725 31.644253) - (xy 31.725 31.434484) - (xy 31.725942 31.424924) - (xy 31.7295 31.407038) - (xy 31.7295 30.410253) - (xy 32.125 30.410253) - (xy 32.127855 30.417145) - (xy 32.134747 30.42) - (xy 32.365253 30.42) - (xy 32.372145 30.417145) - (xy 32.375 30.410253) - (xy 32.375 29.595747) - (xy 32.372145 29.588855) - (xy 32.366247 29.586412) - (xy 32.365648 29.586471) - (xy 32.292827 29.600956) - (xy 32.284075 29.60458) - (xy 32.277223 29.609159) - (xy 32.24044 29.616475) - (xy 32.222777 29.609159) - (xy 32.215925 29.60458) - (xy 32.207173 29.600956) - (xy 32.134352 29.586471) - (xy 32.133753 29.586412) - (xy 32.127855 29.588855) - (xy 32.125 29.595747) - (xy 32.125 30.410253) - (xy 31.7295 30.410253) - (xy 31.7295 29.832962) - (xy 31.725942 29.815073) - (xy 31.725 29.805516) - (xy 31.725 29.595747) - (xy 31.722145 29.588855) - (xy 31.716247 29.586412) - (xy 31.715648 29.586471) - (xy 31.642827 29.600956) - (xy 31.634079 29.604579) - (xy 31.627675 29.608858) - (xy 31.590892 29.616175) - (xy 31.573228 29.608858) - (xy 31.566118 29.604107) - (xy 31.566116 29.604106) - (xy 31.562105 29.601426) - (xy 31.509719 29.591006) - (xy 31.484392 29.585968) - (xy 31.48439 29.585968) - (xy 31.482038 29.5855) - (xy 31.067962 29.5855) - (xy 31.06561 29.585968) - (xy 31.065608 29.585968) - (xy 31.040281 29.591006) - (xy 30.987895 29.601426) - (xy 30.983884 29.604106) - (xy 30.983882 29.604107) - (xy 30.912851 29.651569) - (xy 30.897096 29.662096) - (xy 30.894416 29.666107) - (xy 30.85069 29.731548) - (xy 30.836426 29.752895) - (xy 30.8205 29.832962) - (xy 30.8205 31.407038) - (xy 30.2545 31.407038) + (xy 30.2545 33.236374) (xy 30.2545 27.3035) (xy 30.268852 27.268852) (xy 30.3035 27.2545) diff --git a/Hardware/FabReader2/FabReader2.kicad_sch b/Hardware/FabReader2/FabReader2.kicad_sch index fd4fd63..ed85938 100644 --- a/Hardware/FabReader2/FabReader2.kicad_sch +++ b/Hardware/FabReader2/FabReader2.kicad_sch @@ -4191,7 +4191,7 @@ (reference "LS101") (unit 1) (value "CMI-9705-0380-SMT-TR") (footprint "CMI-9705-0380-SMT-TR:CUI_CMI-9705-0380-SMT-TR") ) (path "/eb3fecf8-4fa7-43fa-aae0-ff9f0c13929a/6b94c34f-b9f8-4432-bd32-91c8999e4659" - (reference "Q301") (unit 1) (value "FS8205A") (footprint "FS8205A:SOP65P640X120-8N") + (reference "Q301") (unit 1) (value "FS8205A") (footprint "Package_TO_SOT_SMD:SOT-23-6") ) (path "/2554d929-75d5-4ab7-9c2e-489d136f8c7a/cbd861ce-5c57-4969-8f87-6982c1ddc5de" (reference "Q401") (unit 1) (value "AO3400A") (footprint "Package_TO_SOT_SMD:SOT-23") diff --git a/Hardware/FabReader2/power.kicad_sch b/Hardware/FabReader2/power.kicad_sch index 015fd59..7d78a0e 100644 --- a/Hardware/FabReader2/power.kicad_sch +++ b/Hardware/FabReader2/power.kicad_sch @@ -1276,7 +1276,7 @@ (property "Value" "FS8205A" (id 1) (at 119.7611 105.41 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "FS8205A:SOP65P640X120-8N" (id 2) (at 115.57 110.49 0) + (property "Footprint" "Package_TO_SOT_SMD:SOT-23-6" (id 2) (at 115.57 110.49 0) (effects (font (size 1.27 1.27)) (justify left bottom) hide) ) (property "Datasheet" "https://datasheet.lcsc.com/lcsc/1809050110_Fortune-Semicon-FS8205A_C16052.pdf" (id 3) (at 115.57 110.49 0)