diff --git a/.cargo/config.toml b/.cargo/config.toml index 61e6a86..19590b7 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -27,4 +27,4 @@ rustflags = [ target = "thumbv6m-none-eabi" [env] -DEFMT_LOG = "info" +DEFMT_LOG = "embedded_sdmmc=info,debug" diff --git a/Cargo.toml b/Cargo.toml index 9f44087..073cd5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,7 @@ license = "MIT OR Apache-2.0" name = "rp2040-rust-robot" test = false bench = false +doctest = false [dependencies] cortex-m = "0.7" @@ -26,7 +27,7 @@ mpu6050 = { git = "https://github.com/michaelkamprath/mpu6050.git", branch = "em "defmt", ] } embedded-alloc = "0.6" -i2c-character-display = { version = "0.2", features = ["defmt"] } +i2c-character-display = { version = "0.4", features = ["defmt"] } ini_core = "0.2" # We're using a Pico by default on this template diff --git a/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pcb b/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pcb index c188e2c..f12f4a7 100644 --- a/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pcb +++ b/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pcb @@ -76,7 +76,7 @@ (mirror no) (drillshape 0) (scaleselection 1) - (outputdirectory "gerbers_v1.2a") + (outputdirectory "gerbers_v1.3") ) ) (net 0 "") @@ -113,14 +113,14 @@ (net 31 "ADC1") (net 32 "ADC2") (net 33 "Net-(Q1-G)") - (net 34 "Net-(Q1-S)") + (net 34 "VSYS") (net 35 "RESET") (net 36 "SWDIO") (net 37 "SWCLK") (net 38 "unconnected-(U2-3V3_EN-Pad37)") (net 39 "Net-(J29-Pin_1)") (net 40 "Net-(J29-Pin_3)") - (net 41 "unconnected-(U2-3V3_EN-Pad37)_0") + (net 41 "unconnected-(U2-3V3_EN-Pad37)_1") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (layer "F.Cu") (uuid "001cbdec-11e4-4a21-8b53-47344f1576c2") @@ -159,6 +159,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -171,6 +172,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -183,6 +185,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -435,6 +438,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -447,6 +451,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -459,6 +464,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -548,6 +554,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -560,6 +567,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -572,6 +580,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -841,6 +850,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -853,6 +863,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -865,6 +876,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1052,6 +1064,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1064,6 +1077,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1076,6 +1090,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1251,7 +1266,7 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 3 "+5V") + (net 34 "VSYS") (pinfunction "Pin_1") (pintype "passive") (uuid "2b704c9b-38c8-4550-b613-653db40c76bc") @@ -1262,7 +1277,7 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 3 "+5V") + (net 34 "VSYS") (pinfunction "Pin_2") (pintype "passive") (uuid "9e1d58c2-e57d-40d4-9e47-cd1116ce1f0a") @@ -1273,7 +1288,7 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 3 "+5V") + (net 34 "VSYS") (pinfunction "Pin_3") (pintype "passive") (uuid "5de0688e-775c-40f2-94fa-dc70853f0f25") @@ -1284,7 +1299,7 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 3 "+5V") + (net 34 "VSYS") (pinfunction "Pin_4") (pintype "passive") (uuid "195c1a0b-051d-48be-bdcc-2791d8e50d24") @@ -1339,6 +1354,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1351,6 +1367,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1363,6 +1380,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1626,6 +1644,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1638,6 +1657,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1650,6 +1670,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1913,6 +1934,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1925,6 +1947,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -1937,6 +1960,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2235,7 +2259,7 @@ (footprint "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" (layer "F.Cu") (uuid "4c5f7dfd-6914-4936-a579-74009751e295") - (at 113.411 65.278 -90) + (at 114.794 69.3928 -90) (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "capacitor handsolder") (property "Reference" "C2" @@ -2269,6 +2293,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2281,6 +2306,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2293,6 +2319,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2479,6 +2506,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2491,6 +2519,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2503,6 +2532,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2706,6 +2736,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2718,6 +2749,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2730,6 +2762,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -2955,17 +2988,17 @@ ) ) ) - (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal" (layer "F.Cu") - (uuid "636e4f94-7e4e-4a45-a9bf-21b47ce4cb93") - (at 101.33 59.92 -90) - (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") - (tags "Through hole pin header THT 1x04 2.54mm single row") - (property "Reference" "J16" - (at 0 -2.33 90) + (uuid "5a078009-c5f2-4687-99fa-9585ac02fed9") + (at 105.6132 60.128 90) + (descr "Through hole angled pin header, 1x03, 2.54mm pitch, 6mm pin length, single row") + (tags "Through hole angled pin header THT 1x03 2.54mm single row") + (property "Reference" "J31" + (at 4.385 -2.27 90) (layer "F.SilkS") (hide yes) - (uuid "1828c7e4-eac1-471a-b1f0-f04b5a18cd55") + (uuid "2bd3a406-a7a8-465d-9d07-65cd75f45225") (effects (font (size 1 1) @@ -2973,10 +3006,10 @@ ) ) ) - (property "Value" "Conn_01x04" - (at 0 9.95 90) + (property "Value" "Conn_01x03" + (at 4.385 7.35 90) (layer "F.Fab") - (uuid "728e3929-8a96-4162-b250-6374d4fd2b6d") + (uuid "a7961c79-0104-425b-9ba0-012068d1ac29") (effects (font (size 1 1) @@ -2984,488 +3017,614 @@ ) ) ) - (property "Footprint" "" - (at 0 0 -90) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal" + (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "7f6e899e-a7c8-413e-afd4-6b79e93e0422") + (uuid "461961d1-46f4-4ca8-8b88-40488ae58034") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) (property "Datasheet" "" - (at 0 0 -90) + (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "4d06deb0-884e-4c0e-bc98-9879e1f524b2") + (uuid "9e080f7b-83b7-4b10-b1d3-d883d32fab78") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Description" "" - (at 0 0 -90) + (property "Description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" + (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "bc2fb2fc-56f6-4c92-8852-23e34cc273ce") + (uuid "74c39695-3046-4593-958c-1a075dee7adc") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) (property ki_fp_filters "Connector*:*_1x??_*") - (path "/1a37bc33-8286-4932-b3df-88272b9d34af") + (path "/f912a5d2-013d-4d6f-bcdf-9576aafd68ad") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") (attr through_hole) (fp_line - (start -1.33 8.95) - (end 1.33 8.95) + (start 4.1 -1.33) + (end 1.44 -1.33) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "67ad5669-2574-4c96-8a99-6e4d85190f4a") + (uuid "a132dc54-8104-43bd-9060-a99ca907451f") ) (fp_line - (start -1.33 1.27) - (end -1.33 8.95) + (start 1.44 -1.33) + (end 1.44 6.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "df31bfd6-a56f-4f9e-ab07-36c660c02425") + (uuid "1cdec7a0-1fea-4873-a295-d7f3b97e3ae5") ) (fp_line - (start -1.33 1.27) - (end 1.33 1.27) + (start -1.27 -1.27) + (end 0 -1.27) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "c7facc57-240f-4ecd-b11d-cb15468c290a") + (uuid "c4948409-826f-406e-a630-4ee6538174dc") ) (fp_line - (start 1.33 1.27) - (end 1.33 8.95) + (start 10.1 -0.38) + (end 10.1 0.38) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "84cf29dc-3b80-4cff-8e5e-00aec2f2d1ef") + (uuid "09895dd2-fbd2-440e-bc5b-5f7be643bcdc") ) (fp_line - (start -1.33 0) - (end -1.33 -1.33) + (start 4.1 -0.38) + (end 10.1 -0.38) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "63619ae3-c626-4c82-9b2d-05f1c4d53093") + (uuid "697f2cc7-806b-45a5-a63f-e93a25f08554") ) (fp_line - (start -1.33 -1.33) - (end 0 -1.33) + (start 1.11 -0.38) + (end 1.44 -0.38) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "db08d38a-d464-461a-b900-73b8a0a0d84e") + (uuid "c2fb928c-c52f-4fa1-ae14-f840909b3975") ) (fp_line - (start -1.8 9.4) - (end 1.8 9.4) + (start 4.1 -0.32) + (end 10.1 -0.32) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "e630d1dd-21a3-4fa3-bbe8-75b3064ad470") + (layer "F.SilkS") + (uuid "400f8f88-3742-424f-aa02-0fd25a79fa6c") ) (fp_line - (start 1.8 9.4) - (end 1.8 -1.8) + (start 4.1 -0.2) + (end 10.1 -0.2) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "479251cc-5978-425a-aa86-206f7a7c6456") + (layer "F.SilkS") + (uuid "30f8333b-7f46-4751-a037-90eda3f44e73") ) (fp_line - (start -1.8 -1.8) - (end -1.8 9.4) + (start 4.1 -0.08) + (end 10.1 -0.08) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "29b93af0-ce8a-4af1-8a58-880c2a196e43") + (layer "F.SilkS") + (uuid "6959a0a4-f65e-4cfb-ad2b-7f3d6f1b02a5") ) (fp_line - (start 1.8 -1.8) - (end -1.8 -1.8) + (start -1.27 0) + (end -1.27 -1.27) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "c139a9f9-139e-476c-b6a4-2933c78b67f1") + (layer "F.SilkS") + (uuid "7c2dc0c6-5b33-4617-89cd-126b60e67d9a") ) (fp_line - (start -1.27 8.89) - (end -1.27 -0.635) + (start 4.1 0.04) + (end 10.1 0.04) (stroke - (width 0.1) + (width 0.12) (type solid) ) - (layer "F.Fab") - (uuid "50815643-d628-47de-99a9-02d908f03d0b") + (layer "F.SilkS") + (uuid "aafd1b4a-9d31-4781-8c2b-c5fcc8ef6ad4") ) (fp_line - (start 1.27 8.89) - (end -1.27 8.89) + (start 4.1 0.16) + (end 10.1 0.16) (stroke - (width 0.1) + (width 0.12) (type solid) ) - (layer "F.Fab") - (uuid "6b1517d9-5f4b-448f-98c6-be335f091368") + (layer "F.SilkS") + (uuid "9fe5a5d6-bb9a-430e-803d-04d8ef05ad83") ) (fp_line - (start -1.27 -0.635) - (end -0.635 -1.27) + (start 4.1 0.28) + (end 10.1 0.28) (stroke - (width 0.1) + (width 0.12) (type solid) ) - (layer "F.Fab") - (uuid "6db4eade-85b4-45fc-b003-4d06c642f05a") + (layer "F.SilkS") + (uuid "677340c6-dfa4-435c-8d56-af9866843bf9") ) (fp_line - (start -0.635 -1.27) - (end 1.27 -1.27) + (start 10.1 0.38) + (end 4.1 0.38) (stroke - (width 0.1) + (width 0.12) (type solid) ) - (layer "F.Fab") - (uuid "4b87b5e5-0288-410c-baa5-25d60af8b4dc") + (layer "F.SilkS") + (uuid "be5f6628-e095-49bd-a189-161fa67fcf51") ) (fp_line - (start 1.27 -1.27) - (end 1.27 8.89) + (start 1.11 0.38) + (end 1.44 0.38) (stroke - (width 0.1) + (width 0.12) (type solid) ) - (layer "F.Fab") - (uuid "3c32f94d-d442-4ddf-a93a-d189c25cddf2") + (layer "F.SilkS") + (uuid "713068f1-91c0-453e-8337-64f9157d1781") ) - (fp_text user "${REFERENCE}" - (at 0 3.81 0) - (layer "F.Fab") - (uuid "e7e42ce1-ae84-4067-941e-b63a21827756") - (effects - (font - (size 1 1) - (thickness 0.15) - ) + (fp_line + (start 1.44 1.27) + (end 4.1 1.27) + (stroke + (width 0.12) + (type solid) ) + (layer "F.SilkS") + (uuid "9227f9d4-edc3-42a7-b17d-79126f476ea3") ) - (pad "1" thru_hole rect - (at 0 0 270) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 22 "GPIO16") - (pinfunction "Pin_1") - (pintype "passive") - (uuid "e9c9a3a9-776b-4086-b4bc-dc65429c0be0") - ) - (pad "2" thru_hole oval - (at 0 2.54 270) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 23 "GPIO17") - (pinfunction "Pin_2") - (pintype "passive") - (uuid "2ad5bf57-92e4-4699-8253-ef89954b3ddc") + (fp_line + (start 10.1 2.16) + (end 10.1 2.92) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "6061bf64-a9db-4a9e-ba30-3285eb45a883") ) - (pad "3" thru_hole oval - (at 0 5.08 270) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 24 "GPIO18") - (pinfunction "Pin_3") - (pintype "passive") - (uuid "6f4c11a1-58f4-484f-8d3c-a74d91ea0911") + (fp_line + (start 4.1 2.16) + (end 10.1 2.16) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "0873d2ec-8592-4e6a-a1b6-e1720834389b") ) - (pad "4" thru_hole oval - (at 0 7.62 270) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 25 "GPIO19") - (pinfunction "Pin_4") - (pintype "passive") - (uuid "363149c7-a246-49f9-a580-906133fbbb78") + (fp_line + (start 1.042929 2.16) + (end 1.44 2.16) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "bafedc07-86c0-487a-a9f1-f7797a5bac60") ) - (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" - (offset - (xyz 0 0 0) + (fp_line + (start 10.1 2.92) + (end 4.1 2.92) + (stroke + (width 0.12) + (type solid) ) - (scale - (xyz 1 1 1) + (layer "F.SilkS") + (uuid "87101f6b-d4eb-4221-8643-c343180f29c3") + ) + (fp_line + (start 1.042929 2.92) + (end 1.44 2.92) + (stroke + (width 0.12) + (type solid) ) - (rotate - (xyz 0 0 0) + (layer "F.SilkS") + (uuid "5253f022-2a8a-4f4a-b1ee-301036a0ab28") + ) + (fp_line + (start 1.44 3.81) + (end 4.1 3.81) + (stroke + (width 0.12) + (type solid) ) + (layer "F.SilkS") + (uuid "bd9d49a7-7ece-4247-8ee9-ab5761449247") ) - ) - (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" - (layer "F.Cu") - (uuid "660cd8f8-90e0-43cf-a286-621d3d26bac1") - (at 81.25 100 90) - (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") - (tags "Through hole pin header THT 1x04 2.54mm single row") - (property "Reference" "J5" - (at 0 -2.33 90) + (fp_line + (start 10.1 4.7) + (end 10.1 5.46) + (stroke + (width 0.12) + (type solid) + ) (layer "F.SilkS") - (hide yes) - (uuid "93b9b0ff-ee65-48f2-bc7b-48cb73277144") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (property "Value" "Conn_01x04" - (at 0 9.95 90) - (layer "F.Fab") - (uuid "b985cac3-630f-46ce-beb9-148f7610d795") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (property "Footprint" "" - (at 0 0 90) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "a1bcdfe2-b1ba-4f8b-950b-93e00e8e6a35") - (effects - (font - (size 1.27 1.27) - ) - ) - ) - (property "Datasheet" "" - (at 0 0 90) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "238f64b9-0256-4322-9c46-afb846b6911b") - (effects - (font - (size 1.27 1.27) - ) - ) - ) - (property "Description" "" - (at 0 0 90) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "77093f30-08eb-478a-bc81-b79d529d596b") - (effects - (font - (size 1.27 1.27) - ) - ) + (uuid "9a21c16e-ff26-4051-85c7-1a176e1c06b9") ) - (property ki_fp_filters "Connector*:*_1x??_*") - (path "/338afa53-9750-4612-a4bf-ac36c113c3f6") - (sheetname "Root") - (sheetfile "rp-pico-sensor-shield.kicad_sch") - (attr through_hole) (fp_line - (start -1.33 -1.33) - (end 0 -1.33) + (start 4.1 4.7) + (end 10.1 4.7) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "2fd9c405-89ee-40c0-a90a-4f1ac68a51f6") + (uuid "59cc7ae5-e242-472c-9bbe-f9dc29b4fe3e") ) (fp_line - (start -1.33 0) - (end -1.33 -1.33) + (start 1.042929 4.7) + (end 1.44 4.7) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "092af64a-7b06-4c9b-923e-0bee6a3ea307") + (uuid "afac4134-8c80-4490-aa65-6981cdad1da0") ) (fp_line - (start 1.33 1.27) - (end 1.33 8.95) + (start 10.1 5.46) + (end 4.1 5.46) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "8e046df1-16e8-48d4-956c-8dd8fe66de9f") + (uuid "9d46dbb5-90cd-4d58-8d23-4dead545af73") ) (fp_line - (start -1.33 1.27) - (end 1.33 1.27) + (start 1.042929 5.46) + (end 1.44 5.46) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "e4da9f54-6539-466c-bf0a-a444eee34ba9") + (uuid "add144d6-77fd-4edd-a771-511356fb1c08") ) (fp_line - (start -1.33 1.27) - (end -1.33 8.95) + (start 4.1 6.41) + (end 4.1 -1.33) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "01c47df5-0843-45eb-be2e-c68ee409cf3e") + (uuid "8fb592f7-1fa5-4458-9ec0-af993bc5fc75") ) (fp_line - (start -1.33 8.95) - (end 1.33 8.95) + (start 1.44 6.41) + (end 4.1 6.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "ea2d21d3-9e4e-4654-9c18-e48e961c8aba") + (uuid "76b375a2-81a0-47d1-9e95-024d41eba7c3") ) (fp_line - (start 1.8 -1.8) + (start 10.55 -1.8) (end -1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "7f84c500-09e4-4c38-92dd-d8672ecfb44c") + (uuid "6a890f70-425a-4425-a0fa-cde816601c59") ) (fp_line (start -1.8 -1.8) - (end -1.8 9.4) + (end -1.8 6.85) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "d9ebfd21-0f8e-463a-abde-64dbfe5fa580") + (uuid "22fa3e71-854d-4976-8ab4-0c98c7ce63cd") ) (fp_line - (start 1.8 9.4) - (end 1.8 -1.8) + (start 10.55 6.85) + (end 10.55 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "64d12b4e-dc89-46a0-bee9-d8e25f67120d") + (uuid "f7fa7a46-d6a1-421a-bf0f-5530d6da6b71") ) (fp_line - (start -1.8 9.4) - (end 1.8 9.4) + (start -1.8 6.85) + (end 10.55 6.85) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "a14e7551-c068-4e5c-bead-bafa95d2e7fc") + (uuid "cc80692a-72a1-4e50-83d3-eb4e8511689a") ) (fp_line - (start 1.27 -1.27) - (end 1.27 8.89) + (start 4.04 -1.27) + (end 4.04 6.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "02bffb52-eb9b-46d3-a731-870c224387d4") + (uuid "0d3c7bb2-d712-4e77-8899-9e071b4a2b9f") ) (fp_line - (start -0.635 -1.27) - (end 1.27 -1.27) + (start 2.135 -1.27) + (end 4.04 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "abf772e4-3cdc-43c0-a5f4-27a443bdd34d") + (uuid "acc9301b-fd26-46be-aad4-cbfda485d798") ) (fp_line - (start -1.27 -0.635) - (end -0.635 -1.27) + (start 1.5 -0.635) + (end 2.135 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "7549894c-4817-47c3-9fea-e985bd0580e5") + (uuid "e703355e-f9f9-496f-9bbc-2b28cf2629eb") ) (fp_line - (start 1.27 8.89) - (end -1.27 8.89) + (start 10.04 -0.32) + (end 10.04 0.32) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "5ea8fbc0-c78b-4402-b404-31e7acab0923") + (uuid "5d0fa37d-e5e2-45bf-85fc-de61a941d8ba") ) (fp_line - (start -1.27 8.89) - (end -1.27 -0.635) + (start 4.04 -0.32) + (end 10.04 -0.32) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "c3dffb73-e14b-4d49-b608-8d80ed94a2d8") + (uuid "cc781bee-f94f-4c05-a446-b3d4f1be4eaf") + ) + (fp_line + (start -0.32 -0.32) + (end 1.5 -0.32) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "f92211d7-11ce-4387-aee5-520924228da7") + ) + (fp_line + (start -0.32 -0.32) + (end -0.32 0.32) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "8af626f8-89da-427a-9f54-f8c262e5c60e") + ) + (fp_line + (start 4.04 0.32) + (end 10.04 0.32) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "865c6c32-52d0-46dc-a884-1139d2027388") + ) + (fp_line + (start -0.32 0.32) + (end 1.5 0.32) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "e7e67a5d-4c47-473a-aa62-9fa8adb80526") + ) + (fp_line + (start 10.04 2.22) + (end 10.04 2.86) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "f641988c-b4a5-43b1-9125-a26bcca7eaad") + ) + (fp_line + (start 4.04 2.22) + (end 10.04 2.22) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "13d7ae26-5692-4f6b-ab94-1a1ff373de01") + ) + (fp_line + (start -0.32 2.22) + (end 1.5 2.22) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "37ab310a-03fb-487e-9d7f-f102e0a464de") + ) + (fp_line + (start -0.32 2.22) + (end -0.32 2.86) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "fd882b63-2940-436f-9c45-a5cfa3be6d91") + ) + (fp_line + (start 4.04 2.86) + (end 10.04 2.86) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "da513452-94f3-4ca8-a981-97dca672975c") + ) + (fp_line + (start -0.32 2.86) + (end 1.5 2.86) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "ed3fc458-9c4e-4db7-8bd3-e4146239fe61") + ) + (fp_line + (start 10.04 4.76) + (end 10.04 5.4) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "212c7369-208c-4f13-bfe4-3715615227c5") + ) + (fp_line + (start 4.04 4.76) + (end 10.04 4.76) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "bc15d59d-b8f9-4cb8-b008-c805163ba1ed") + ) + (fp_line + (start -0.32 4.76) + (end 1.5 4.76) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "83f6fc55-2d01-4aa4-a426-bd9bf375ab41") + ) + (fp_line + (start -0.32 4.76) + (end -0.32 5.4) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "2f5f462c-dddf-4164-b640-ca8351f79145") + ) + (fp_line + (start 4.04 5.4) + (end 10.04 5.4) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "221dc156-ef80-4695-ae4e-d2a5a9bb773a") + ) + (fp_line + (start -0.32 5.4) + (end 1.5 5.4) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "4e8d31d2-1598-450f-8133-88757e592ef3") + ) + (fp_line + (start 4.04 6.35) + (end 1.5 6.35) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "66a37c91-be2f-4fd8-b25d-d62d702dad0b") + ) + (fp_line + (start 1.5 6.35) + (end 1.5 -0.635) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "36724299-64c1-4493-8dae-d2188857a1b6") ) (fp_text user "${REFERENCE}" - (at 0 3.81 0) + (at 2.77 2.54 0) (layer "F.Fab") - (uuid "70a6a1dc-8781-433f-a0ea-59f79bbd8c28") + (uuid "e7592c7e-9197-4dc8-a4dc-b52b30c6a5c6") (effects (font (size 1 1) @@ -3479,10 +3638,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 2 "GND") + (net 39 "Net-(J29-Pin_1)") (pinfunction "Pin_1") (pintype "passive") - (uuid "6b463641-60bf-40bc-a3a4-13ea0fb77fd9") + (uuid "c7f488a7-eb09-4ece-8bd3-701e01f5eab7") ) (pad "2" thru_hole oval (at 0 2.54 90) @@ -3493,7 +3652,7 @@ (net 2 "GND") (pinfunction "Pin_2") (pintype "passive") - (uuid "8491e031-6844-417e-9755-af4f16a439fa") + (uuid "a631a7de-8a8a-4776-b34c-e5c65db08765") ) (pad "3" thru_hole oval (at 0 5.08 90) @@ -3501,23 +3660,12 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 2 "GND") + (net 40 "Net-(J29-Pin_3)") (pinfunction "Pin_3") (pintype "passive") - (uuid "571a29c0-2ce1-4906-a9bf-3ab3615712a2") - ) - (pad "4" thru_hole oval - (at 0 7.62 90) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 2 "GND") - (pinfunction "Pin_4") - (pintype "passive") - (uuid "e8feb2b0-b197-445b-be40-d7354df97cb8") + (uuid "f3ea90a5-20ce-45ed-9231-1794de5a496c") ) - (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" + (model "${KICAD8_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x03_P2.54mm_Horizontal.wrl" (offset (xyz 0 0 0) ) @@ -3529,16 +3677,17 @@ ) ) ) - (footprint "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (layer "F.Cu") - (uuid "67d09852-e338-45d3-9a5e-3748107ad713") - (at 118.364 65.278 -90) - (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") - (tags "capacitor handsolder") - (property "Reference" "C1" - (at 0 -0.011 90) + (uuid "636e4f94-7e4e-4a45-a9bf-21b47ce4cb93") + (at 101.33 59.92 -90) + (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x04 2.54mm single row") + (property "Reference" "J16" + (at 0 -2.33 90) (layer "F.SilkS") - (uuid "5a47710a-0fc3-4aed-9043-1a6e8a9e5454") + (hide yes) + (uuid "1828c7e4-eac1-471a-b1f0-f04b5a18cd55") (effects (font (size 1 1) @@ -3546,10 +3695,10 @@ ) ) ) - (property "Value" "10 µF" - (at 0 1.85 90) + (property "Value" "Conn_01x04" + (at 0 9.95 90) (layer "F.Fab") - (uuid "a96ae187-baf4-4dfa-9a87-143409b071c0") + (uuid "728e3929-8a96-4162-b250-6374d4fd2b6d") (effects (font (size 1 1) @@ -3562,22 +3711,24 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "0303c007-4c2b-4f6c-b290-5ce36502306b") + (uuid "7f6e899e-a7c8-413e-afd4-6b79e93e0422") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Datasheet" "CL31B105KAHNFNE" + (property "Datasheet" "" (at 0 0 -90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "8bd634fd-c73c-45e7-a96a-d17e2baa9c55") + (uuid "4d06deb0-884e-4c0e-bc98-9879e1f524b2") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -3586,148 +3737,225 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "9f4614a8-bd3f-46c7-b977-e9975601e6dd") + (uuid "bc2fb2fc-56f6-4c92-8852-23e34cc273ce") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property ki_fp_filters "CP_*") - (path "/da1e1be3-0c35-4cda-9b21-8ac6c36a6bc5") + (property ki_fp_filters "Connector*:*_1x??_*") + (path "/1a37bc33-8286-4932-b3df-88272b9d34af") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") - (attr smd) + (attr through_hole) (fp_line - (start -0.711252 0.91) - (end 0.711252 0.91) + (start -1.33 8.95) + (end 1.33 8.95) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "d763d97f-243c-419d-ae87-d9127b797a43") + (uuid "67ad5669-2574-4c96-8a99-6e4d85190f4a") ) (fp_line - (start -0.711252 -0.91) - (end 0.711252 -0.91) + (start -1.33 1.27) + (end -1.33 8.95) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "528628d0-16b7-4a66-bb7b-78743f3abbff") + (uuid "df31bfd6-a56f-4f9e-ab07-36c660c02425") ) (fp_line - (start -2.48 1.15) - (end -2.48 -1.15) + (start -1.33 1.27) + (end 1.33 1.27) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c7facc57-240f-4ecd-b11d-cb15468c290a") + ) + (fp_line + (start 1.33 1.27) + (end 1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "84cf29dc-3b80-4cff-8e5e-00aec2f2d1ef") + ) + (fp_line + (start -1.33 0) + (end -1.33 -1.33) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "63619ae3-c626-4c82-9b2d-05f1c4d53093") + ) + (fp_line + (start -1.33 -1.33) + (end 0 -1.33) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "db08d38a-d464-461a-b900-73b8a0a0d84e") + ) + (fp_line + (start -1.8 9.4) + (end 1.8 9.4) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "b11c4f17-a662-4f7b-8a5b-f0d45cc33773") + (uuid "e630d1dd-21a3-4fa3-bbe8-75b3064ad470") ) (fp_line - (start 2.48 1.15) - (end -2.48 1.15) + (start 1.8 9.4) + (end 1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "c1edd35b-540a-4bd0-be7c-44cc3d509994") + (uuid "479251cc-5978-425a-aa86-206f7a7c6456") ) (fp_line - (start -2.48 -1.15) - (end 2.48 -1.15) + (start -1.8 -1.8) + (end -1.8 9.4) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "90857c2c-df33-4103-8cb1-a3d958ff0bf1") + (uuid "29b93af0-ce8a-4af1-8a58-880c2a196e43") ) (fp_line - (start 2.48 -1.15) - (end 2.48 1.15) + (start 1.8 -1.8) + (end -1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "a80f5ba4-c2d9-4e96-a9e9-53135bf6f125") + (uuid "c139a9f9-139e-476c-b6a4-2933c78b67f1") ) (fp_line - (start -1.6 0.8) - (end -1.6 -0.8) + (start -1.27 8.89) + (end -1.27 -0.635) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "61b34506-13dd-4693-b2da-5e90d2554b3c") + (uuid "50815643-d628-47de-99a9-02d908f03d0b") ) (fp_line - (start 1.6 0.8) - (end -1.6 0.8) + (start 1.27 8.89) + (end -1.27 8.89) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "6b3c7741-b2e0-4329-9b3d-81ef200615a0") + (uuid "6b1517d9-5f4b-448f-98c6-be335f091368") ) (fp_line - (start -1.6 -0.8) - (end 1.6 -0.8) + (start -1.27 -0.635) + (end -0.635 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "f1ad20e0-d43c-4494-be38-f04239ba141f") + (uuid "6db4eade-85b4-45fc-b003-4d06c642f05a") ) (fp_line - (start 1.6 -0.8) - (end 1.6 0.8) + (start -0.635 -1.27) + (end 1.27 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "8d067e45-0b50-49ed-93be-819e1e0fd57c") + (uuid "4b87b5e5-0288-410c-baa5-25d60af8b4dc") + ) + (fp_line + (start 1.27 -1.27) + (end 1.27 8.89) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "3c32f94d-d442-4ddf-a93a-d189c25cddf2") ) (fp_text user "${REFERENCE}" - (at 0 0 90) + (at 0 3.81 0) (layer "F.Fab") - (uuid "bd8880c7-f401-448f-8eba-b75dff79576e") + (uuid "e7e42ce1-ae84-4067-941e-b63a21827756") (effects (font - (size 0.8 0.8) - (thickness 0.12) + (size 1 1) + (thickness 0.15) ) ) ) - (pad "1" smd roundrect - (at -1.5625 0 270) - (size 1.325 1.8) - (layers "F.Cu" "F.Paste" "F.Mask") - (roundrect_rratio 0.1886792453) - (net 1 "+12V") + (pad "1" thru_hole rect + (at 0 0 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 22 "GPIO16") + (pinfunction "Pin_1") (pintype "passive") - (uuid "bc6238cd-9cf8-44af-8b0d-77ff2bd41d36") + (uuid "e9c9a3a9-776b-4086-b4bc-dc65429c0be0") ) - (pad "2" smd roundrect - (at 1.5625 0 270) - (size 1.325 1.8) - (layers "F.Cu" "F.Paste" "F.Mask") - (roundrect_rratio 0.1886792453) - (net 2 "GND") + (pad "2" thru_hole oval + (at 0 2.54 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 23 "GPIO17") + (pinfunction "Pin_2") (pintype "passive") - (uuid "5238a422-8219-4813-b543-7d3cd720c47f") + (uuid "2ad5bf57-92e4-4699-8253-ef89954b3ddc") ) - (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl" + (pad "3" thru_hole oval + (at 0 5.08 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 24 "GPIO18") + (pinfunction "Pin_3") + (pintype "passive") + (uuid "6f4c11a1-58f4-484f-8d3c-a74d91ea0911") + ) + (pad "4" thru_hole oval + (at 0 7.62 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 25 "GPIO19") + (pinfunction "Pin_4") + (pintype "passive") + (uuid "363149c7-a246-49f9-a580-906133fbbb78") + ) + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0) ) @@ -3739,16 +3967,17 @@ ) ) ) - (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2" + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (layer "F.Cu") - (uuid "6c2dedc7-ec6f-4ab7-a978-88c5cec7cee3") - (at 115.951 57.658 90) - (descr "module CMS SOT223 4 pins") - (tags "CMS SOT") - (property "Reference" "U1" - (at 0.083 -0.026 90) + (uuid "660cd8f8-90e0-43cf-a286-621d3d26bac1") + (at 81.25 100 90) + (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x04 2.54mm single row") + (property "Reference" "J5" + (at 0 -2.33 90) (layer "F.SilkS") - (uuid "b01834e0-d3f1-49d3-b612-4ede09df0391") + (hide yes) + (uuid "93b9b0ff-ee65-48f2-bc7b-48cb73277144") (effects (font (size 1 1) @@ -3756,10 +3985,10 @@ ) ) ) - (property "Value" "NCP1117-5.0_SOT223" - (at 0 4.5 90) + (property "Value" "Conn_01x04" + (at 0 9.95 90) (layer "F.Fab") - (uuid "6cc008ec-77f4-446f-b950-4e9f2044e76e") + (uuid "b985cac3-630f-46ce-beb9-148f7610d795") (effects (font (size 1 1) @@ -3772,22 +4001,24 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "88680de5-129a-47f2-abf9-e1f791aa6ce2") + (uuid "a1bcdfe2-b1ba-4f8b-950b-93e00e8e6a35") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Datasheet" "http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF" + (property "Datasheet" "" (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "599e1f9b-de1e-45fa-99ff-8e2702e39bfd") + (uuid "238f64b9-0256-4322-9c46-afb846b6911b") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -3796,196 +4027,225 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "48c87ecc-9eb4-495b-8476-60d8c34de286") + (uuid "77093f30-08eb-478a-bc81-b79d529d596b") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property ki_fp_filters "SOT?223*TabPin2*") - (path "/e7fb06f1-da95-41dd-89b4-9a3a9a58e831") + (property ki_fp_filters "Connector*:*_1x??_*") + (path "/338afa53-9750-4612-a4bf-ac36c113c3f6") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") - (attr smd) + (attr through_hole) (fp_line - (start 1.91 -3.41) - (end 1.91 -2.15) + (start -1.33 -1.33) + (end 0 -1.33) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "4294bca9-dc76-47f5-9c7c-ef89ece0b329") + (uuid "2fd9c405-89ee-40c0-a90a-4f1ac68a51f6") ) (fp_line - (start -4.1 -3.41) - (end 1.91 -3.41) + (start -1.33 0) + (end -1.33 -1.33) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "cbade3ff-b7bf-489d-8b92-5b2795624d6f") + (uuid "092af64a-7b06-4c9b-923e-0bee6a3ea307") ) (fp_line - (start 1.91 3.41) - (end 1.91 2.15) + (start 1.33 1.27) + (end 1.33 8.95) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "bbc9b74a-a2da-47dc-bc92-6b0dc2af604c") + (uuid "8e046df1-16e8-48d4-956c-8dd8fe66de9f") ) (fp_line - (start -1.85 3.41) - (end 1.91 3.41) + (start -1.33 1.27) + (end 1.33 1.27) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "da42a7af-d5f3-40ad-a44c-bfbfa39d3724") + (uuid "e4da9f54-6539-466c-bf0a-a444eee34ba9") ) (fp_line - (start 4.4 -3.6) - (end -4.4 -3.6) + (start -1.33 1.27) + (end -1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "01c47df5-0843-45eb-be2e-c68ee409cf3e") + ) + (fp_line + (start -1.33 8.95) + (end 1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "ea2d21d3-9e4e-4654-9c18-e48e961c8aba") + ) + (fp_line + (start 1.8 -1.8) + (end -1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "8dc1b6c8-7459-4886-805a-756fd5ad39e0") + (uuid "7f84c500-09e4-4c38-92dd-d8672ecfb44c") ) (fp_line - (start -4.4 -3.6) - (end -4.4 3.6) + (start -1.8 -1.8) + (end -1.8 9.4) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "82218f4d-e454-4715-9e60-830836da86ec") + (uuid "d9ebfd21-0f8e-463a-abde-64dbfe5fa580") ) (fp_line - (start 4.4 3.6) - (end 4.4 -3.6) + (start 1.8 9.4) + (end 1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "3fc3ea2f-ebd9-4d9f-8c96-afcb15f87c2e") + (uuid "64d12b4e-dc89-46a0-bee9-d8e25f67120d") ) (fp_line - (start -4.4 3.6) - (end 4.4 3.6) + (start -1.8 9.4) + (end 1.8 9.4) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "afb946d9-9ff1-4bb0-9ba7-993d12f21435") + (uuid "a14e7551-c068-4e5c-bead-bafa95d2e7fc") ) (fp_line - (start 1.85 -3.35) - (end 1.85 3.35) + (start 1.27 -1.27) + (end 1.27 8.89) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "73a6bd06-bf2a-4b89-b575-487ee0a02643") + (uuid "02bffb52-eb9b-46d3-a731-870c224387d4") ) (fp_line - (start -0.85 -3.35) - (end 1.85 -3.35) + (start -0.635 -1.27) + (end 1.27 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "deca0397-f825-416f-a163-03ebd0c5adf3") + (uuid "abf772e4-3cdc-43c0-a5f4-27a443bdd34d") ) (fp_line - (start -1.85 -2.35) - (end -0.85 -3.35) + (start -1.27 -0.635) + (end -0.635 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "6f51b09c-1459-412c-a5d1-84b5c79cb8cc") + (uuid "7549894c-4817-47c3-9fea-e985bd0580e5") ) (fp_line - (start -1.85 -2.35) - (end -1.85 3.35) + (start 1.27 8.89) + (end -1.27 8.89) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "075d92e8-19a0-44d7-a485-002da77a6323") + (uuid "5ea8fbc0-c78b-4402-b404-31e7acab0923") ) (fp_line - (start -1.85 3.35) - (end 1.85 3.35) + (start -1.27 8.89) + (end -1.27 -0.635) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "9b038fc5-f27d-47cf-ae87-3da0220e20cb") + (uuid "c3dffb73-e14b-4d49-b608-8d80ed94a2d8") ) (fp_text user "${REFERENCE}" - (at 0 0 0) + (at 0 3.81 0) (layer "F.Fab") - (uuid "850b206f-9b71-46cb-896e-5f5cb09384cd") + (uuid "70a6a1dc-8781-433f-a0ea-59f79bbd8c28") (effects (font - (size 0.8 0.8) - (thickness 0.12) + (size 1 1) + (thickness 0.15) ) ) ) - (pad "1" smd rect - (at -3.15 -2.3 90) - (size 2 1.5) - (layers "F.Cu" "F.Paste" "F.Mask") + (pad "1" thru_hole rect + (at 0 0 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) (net 2 "GND") - (pinfunction "GND") - (pintype "power_in") - (uuid "946e0d74-0c66-45c9-8c64-2a7b65374f8f") + (pinfunction "Pin_1") + (pintype "passive") + (uuid "6b463641-60bf-40bc-a3a4-13ea0fb77fd9") ) - (pad "2" smd rect - (at -3.15 0 90) - (size 2 1.5) - (layers "F.Cu" "F.Paste" "F.Mask") - (net 3 "+5V") - (pinfunction "VO") - (pintype "power_out") - (uuid "e253a7b1-f009-4238-8bc9-3b6e3ca02fb8") + (pad "2" thru_hole oval + (at 0 2.54 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 2 "GND") + (pinfunction "Pin_2") + (pintype "passive") + (uuid "8491e031-6844-417e-9755-af4f16a439fa") ) - (pad "2" smd rect - (at 3.15 0 90) - (size 2 3.8) - (layers "F.Cu" "F.Paste" "F.Mask") - (net 3 "+5V") - (pinfunction "VO") - (pintype "power_out") - (uuid "387343ff-a242-4b64-9b01-41a7f30c9e1d") + (pad "3" thru_hole oval + (at 0 5.08 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 2 "GND") + (pinfunction "Pin_3") + (pintype "passive") + (uuid "571a29c0-2ce1-4906-a9bf-3ab3615712a2") ) - (pad "3" smd rect - (at -3.15 2.3 90) - (size 2 1.5) - (layers "F.Cu" "F.Paste" "F.Mask") - (net 1 "+12V") - (pinfunction "VI") - (pintype "power_in") - (uuid "d3612866-785b-4740-808a-d606973ae61b") + (pad "4" thru_hole oval + (at 0 7.62 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 2 "GND") + (pinfunction "Pin_4") + (pintype "passive") + (uuid "e8feb2b0-b197-445b-be40-d7354df97cb8") ) - (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-223.wrl" + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0) ) @@ -3997,17 +4257,16 @@ ) ) ) - (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" + (footprint "Capacitor_SMD:C_1206_3216Metric_Pad1.33x1.80mm_HandSolder" (layer "F.Cu") - (uuid "7445b85c-943a-40ea-912b-86660b4dce0e") - (at 81.25 105.08 90) - (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") - (tags "Through hole pin header THT 1x04 2.54mm single row") - (property "Reference" "J7" - (at 0 -2.33 90) + (uuid "67d09852-e338-45d3-9a5e-3748107ad713") + (at 119.5692 69.3928 -90) + (descr "Capacitor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") + (tags "capacitor handsolder") + (property "Reference" "C1" + (at 0 -0.011 90) (layer "F.SilkS") - (hide yes) - (uuid "b3b64365-5e7d-4d0d-9aeb-5fad7d5179ce") + (uuid "5a47710a-0fc3-4aed-9043-1a6e8a9e5454") (effects (font (size 1 1) @@ -4015,10 +4274,10 @@ ) ) ) - (property "Value" "Conn_01x04" - (at 0 9.95 90) + (property "Value" "10 µF" + (at 0 1.85 90) (layer "F.Fab") - (uuid "8babb8b0-a59b-474d-bbca-25369131b513") + (uuid "a96ae187-baf4-4dfa-9a87-143409b071c0") (effects (font (size 1 1) @@ -4027,252 +4286,179 @@ ) ) (property "Footprint" "" - (at 0 0 90) + (at 0 0 -90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "667bfad9-b5d7-4385-acc1-a411142a6d75") + (uuid "0303c007-4c2b-4f6c-b290-5ce36502306b") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Datasheet" "" - (at 0 0 90) + (property "Datasheet" "CL31B105KAHNFNE" + (at 0 0 -90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "e70508e8-e89c-4389-9588-ee879f11815a") + (uuid "8bd634fd-c73c-45e7-a96a-d17e2baa9c55") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) (property "Description" "" - (at 0 0 90) + (at 0 0 -90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "8cde00f5-2467-4e63-a7e6-312859249ab9") + (uuid "9f4614a8-bd3f-46c7-b977-e9975601e6dd") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property ki_fp_filters "Connector*:*_1x??_*") - (path "/126c617f-201b-4874-a06a-a1e3df83da0a") + (property ki_fp_filters "CP_*") + (path "/da1e1be3-0c35-4cda-9b21-8ac6c36a6bc5") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") - (attr through_hole) + (attr smd) (fp_line - (start -1.33 -1.33) - (end 0 -1.33) + (start -0.711252 0.91) + (end 0.711252 0.91) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "43725071-3289-4341-b75c-35ead19ce967") + (uuid "d763d97f-243c-419d-ae87-d9127b797a43") ) (fp_line - (start -1.33 0) - (end -1.33 -1.33) + (start -0.711252 -0.91) + (end 0.711252 -0.91) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "f7ef76bc-bcc0-48c9-b73a-23eba3368048") + (uuid "528628d0-16b7-4a66-bb7b-78743f3abbff") ) (fp_line - (start 1.33 1.27) - (end 1.33 8.95) + (start -2.48 1.15) + (end -2.48 -1.15) (stroke - (width 0.12) + (width 0.05) (type solid) ) - (layer "F.SilkS") - (uuid "98d6bdff-ce80-407a-9302-a91b736afb26") + (layer "F.CrtYd") + (uuid "b11c4f17-a662-4f7b-8a5b-f0d45cc33773") ) (fp_line - (start -1.33 1.27) - (end 1.33 1.27) + (start 2.48 1.15) + (end -2.48 1.15) (stroke - (width 0.12) + (width 0.05) (type solid) ) - (layer "F.SilkS") - (uuid "a234502d-1f37-472a-9df0-1048dba1ee06") + (layer "F.CrtYd") + (uuid "c1edd35b-540a-4bd0-be7c-44cc3d509994") ) (fp_line - (start -1.33 1.27) - (end -1.33 8.95) + (start -2.48 -1.15) + (end 2.48 -1.15) (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "973af336-a11c-48aa-bd0d-d6ed5d3648e0") - ) - (fp_line - (start -1.33 8.95) - (end 1.33 8.95) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "0244a71b-1fb5-43c7-9e07-28074b2e315f") - ) - (fp_line - (start 1.8 -1.8) - (end -1.8 -1.8) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "08ab9ccc-5def-41b9-b0b7-808e81c82500") - ) - (fp_line - (start -1.8 -1.8) - (end -1.8 9.4) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "f6e1d2f2-a07c-44b6-ad6e-d92333efa8e5") - ) - (fp_line - (start 1.8 9.4) - (end 1.8 -1.8) - (stroke - (width 0.05) + (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "ffd22b07-859e-4c4e-84f1-126c847c9a79") + (uuid "90857c2c-df33-4103-8cb1-a3d958ff0bf1") ) (fp_line - (start -1.8 9.4) - (end 1.8 9.4) + (start 2.48 -1.15) + (end 2.48 1.15) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "410a45af-4816-46b9-96cc-34cf46178c1a") - ) - (fp_line - (start 1.27 -1.27) - (end 1.27 8.89) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "27c55e56-366a-4659-ab5d-9f0d6b8dffab") + (uuid "a80f5ba4-c2d9-4e96-a9e9-53135bf6f125") ) (fp_line - (start -0.635 -1.27) - (end 1.27 -1.27) + (start -1.6 0.8) + (end -1.6 -0.8) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "c83ab876-2248-4d57-b51f-f27a2584527e") + (uuid "61b34506-13dd-4693-b2da-5e90d2554b3c") ) (fp_line - (start -1.27 -0.635) - (end -0.635 -1.27) + (start 1.6 0.8) + (end -1.6 0.8) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "1cb9deee-666a-4910-8ba4-971861bb1916") + (uuid "6b3c7741-b2e0-4329-9b3d-81ef200615a0") ) (fp_line - (start 1.27 8.89) - (end -1.27 8.89) + (start -1.6 -0.8) + (end 1.6 -0.8) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "9e38f52b-819f-4306-b57b-74426fb47289") + (uuid "f1ad20e0-d43c-4494-be38-f04239ba141f") ) (fp_line - (start -1.27 8.89) - (end -1.27 -0.635) + (start 1.6 -0.8) + (end 1.6 0.8) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "51ef9149-222c-43c5-a3c0-515dd95bc594") + (uuid "8d067e45-0b50-49ed-93be-819e1e0fd57c") ) (fp_text user "${REFERENCE}" - (at 0 3.81 0) + (at 0 0 90) (layer "F.Fab") - (uuid "18260050-effd-4ce6-8d9b-cbf224c6a932") + (uuid "bd8880c7-f401-448f-8eba-b75dff79576e") (effects (font - (size 1 1) - (thickness 0.15) + (size 0.8 0.8) + (thickness 0.12) ) ) ) - (pad "1" thru_hole rect - (at 0 0 90) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 10 "GPIO4") - (pinfunction "Pin_1") - (pintype "passive") - (uuid "cfab3b49-f6b2-4eca-bb14-26ce3480cac7") - ) - (pad "2" thru_hole oval - (at 0 2.54 90) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 11 "GPIO5") - (pinfunction "Pin_2") - (pintype "passive") - (uuid "e101d95f-0fcf-49c4-8f52-4d5cafc860c0") - ) - (pad "3" thru_hole oval - (at 0 5.08 90) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 12 "GPIO6") - (pinfunction "Pin_3") + (pad "1" smd roundrect + (at -1.5625 0 270) + (size 1.325 1.8) + (layers "F.Cu" "F.Paste" "F.Mask") + (roundrect_rratio 0.1886792453) + (net 1 "+12V") (pintype "passive") - (uuid "577f9d45-fb6c-40fb-b541-e28eaf4972d7") + (uuid "bc6238cd-9cf8-44af-8b0d-77ff2bd41d36") ) - (pad "4" thru_hole oval - (at 0 7.62 90) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 13 "GPIO7") - (pinfunction "Pin_4") + (pad "2" smd roundrect + (at 1.5625 0 270) + (size 1.325 1.8) + (layers "F.Cu" "F.Paste" "F.Mask") + (roundrect_rratio 0.1886792453) + (net 2 "GND") (pintype "passive") - (uuid "6da95a49-c071-4929-9f22-286cb1bde2ff") + (uuid "5238a422-8219-4813-b543-7d3cd720c47f") ) - (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" + (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_1206_3216Metric.wrl" (offset (xyz 0 0 0) ) @@ -4284,27 +4470,27 @@ ) ) ) - (footprint "Package_TO_SOT_SMD:SOT-23" + (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (layer "F.Cu") - (uuid "7540d78f-dc5d-4d90-a5ab-25dfeb46abbe") - (at 115.8748 70.1779 90) - (descr "SOT, 3 Pin (https://www.jedec.org/system/files/docs/to-236h.pdf variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py") - (tags "SOT TO_SOT_SMD") - (property "Reference" "Q1" - (at 2.6529 -0.0248 180) + (uuid "6c2dedc7-ec6f-4ab7-a978-88c5cec7cee3") + (at 117.2464 61.7728 90) + (descr "module CMS SOT223 4 pins") + (tags "CMS SOT") + (property "Reference" "U1" + (at 0.083 -0.026 90) (layer "F.SilkS") - (uuid "dceefb3e-850b-46ab-ae84-b92eeb5178af") + (uuid "b01834e0-d3f1-49d3-b612-4ede09df0391") (effects (font - (size 0.8 0.8) - (thickness 0.1) + (size 1 1) + (thickness 0.15) ) ) ) - (property "Value" "DMG2305UX" - (at 0 2.4 90) + (property "Value" "NCP1117-5.0_SOT223" + (at 0 4.5 90) (layer "F.Fab") - (uuid "e708c350-6017-439b-b071-8d5341435bf5") + (uuid "6cc008ec-77f4-446f-b950-4e9f2044e76e") (effects (font (size 1 1) @@ -4317,22 +4503,24 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "b24c41a4-5441-4c78-887e-3ff0a504ecbc") + (uuid "88680de5-129a-47f2-abf9-e1f791aa6ce2") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMG2305UX.pdf" + (property "Datasheet" "http://www.onsemi.com/pub_link/Collateral/NCP1117-D.PDF" (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "ceda689a-d030-4a3c-b868-b0229e6ec503") + (uuid "599e1f9b-de1e-45fa-99ff-8e2702e39bfd") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -4341,190 +4529,197 @@ (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "a988e625-87e3-43d1-b92a-bd44efd54be9") + (uuid "48c87ecc-9eb4-495b-8476-60d8c34de286") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property ki_fp_filters "SOT?23*") - (path "/036b2666-9def-43da-9049-d69dbeaeb346") + (property ki_fp_filters "SOT?223*TabPin2*") + (path "/e7fb06f1-da95-41dd-89b4-9a3a9a58e831") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") (attr smd) (fp_line - (start 0 -1.56) - (end 0.65 -1.56) + (start 1.91 -3.41) + (end 1.91 -2.15) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "db7820c8-e6ce-41ce-9d39-8c3a5c3b04b8") + (uuid "4294bca9-dc76-47f5-9c7c-ef89ece0b329") ) (fp_line - (start 0 -1.56) - (end -1.675 -1.56) + (start -4.1 -3.41) + (end 1.91 -3.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "c3385414-cfe1-425b-b11e-cf2fedd933bb") + (uuid "cbade3ff-b7bf-489d-8b92-5b2795624d6f") ) (fp_line - (start 0 1.56) - (end 0.65 1.56) + (start 1.91 3.41) + (end 1.91 2.15) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "c4e3ffad-529b-4012-bb00-7588fe663aa3") + (uuid "bbc9b74a-a2da-47dc-bc92-6b0dc2af604c") ) (fp_line - (start 0 1.56) - (end -0.65 1.56) + (start -1.85 3.41) + (end 1.91 3.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "c5a33b97-3501-43cb-8a22-2930dc971403") + (uuid "da42a7af-d5f3-40ad-a44c-bfbfa39d3724") ) (fp_line - (start 1.92 -1.7) - (end -1.92 -1.7) + (start 4.4 -3.6) + (end -4.4 -3.6) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "b11f612f-38a9-4fde-a80b-aafe52d45ce6") + (uuid "8dc1b6c8-7459-4886-805a-756fd5ad39e0") ) (fp_line - (start -1.92 -1.7) - (end -1.92 1.7) + (start -4.4 -3.6) + (end -4.4 3.6) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "815370c8-5bbe-4eaa-b7e4-ba99a764b15f") + (uuid "82218f4d-e454-4715-9e60-830836da86ec") ) (fp_line - (start 1.92 1.7) - (end 1.92 -1.7) + (start 4.4 3.6) + (end 4.4 -3.6) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "db801231-c6c2-42ce-b476-9630102422cd") + (uuid "3fc3ea2f-ebd9-4d9f-8c96-afcb15f87c2e") ) (fp_line - (start -1.92 1.7) - (end 1.92 1.7) + (start -4.4 3.6) + (end 4.4 3.6) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "6c054751-d866-4ea2-9060-af8ccdcbfe87") + (uuid "afb946d9-9ff1-4bb0-9ba7-993d12f21435") ) (fp_line - (start 0.65 -1.45) - (end 0.65 1.45) + (start 1.85 -3.35) + (end 1.85 3.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "b9b52289-4c98-42b6-a0be-6b99c82bd86f") + (uuid "73a6bd06-bf2a-4b89-b575-487ee0a02643") ) (fp_line - (start -0.325 -1.45) - (end 0.65 -1.45) + (start -0.85 -3.35) + (end 1.85 -3.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "931ddba8-b63e-4f8b-9a24-a4d54bcb5988") + (uuid "deca0397-f825-416f-a163-03ebd0c5adf3") ) (fp_line - (start -0.65 -1.125) - (end -0.325 -1.45) + (start -1.85 -2.35) + (end -0.85 -3.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "fc46ba26-6de7-468c-8f20-20aa7420a37c") + (uuid "6f51b09c-1459-412c-a5d1-84b5c79cb8cc") ) (fp_line - (start 0.65 1.45) - (end -0.65 1.45) + (start -1.85 -2.35) + (end -1.85 3.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "415496aa-915a-4160-a8d3-a141c2b997a5") + (uuid "075d92e8-19a0-44d7-a485-002da77a6323") ) (fp_line - (start -0.65 1.45) - (end -0.65 -1.125) - (stroke + (start -1.85 3.35) + (end 1.85 3.35) + (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "2ee13c36-69ed-4258-96d1-51fd2316a636") + (uuid "9b038fc5-f27d-47cf-ae87-3da0220e20cb") ) (fp_text user "${REFERENCE}" - (at 0 0 90) + (at 0 0 0) (layer "F.Fab") - (uuid "dfe2fc2b-f37a-4f3b-b54e-03a1a632cc7f") + (uuid "850b206f-9b71-46cb-896e-5f5cb09384cd") (effects (font - (size 0.32 0.32) - (thickness 0.05) + (size 0.8 0.8) + (thickness 0.12) ) ) ) - (pad "1" smd roundrect - (at -0.9375 -0.95 90) - (size 1.475 0.6) + (pad "1" smd rect + (at -3.15 -2.3 90) + (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask") - (roundrect_rratio 0.25) - (net 33 "Net-(Q1-G)") - (pinfunction "G") - (pintype "input") - (uuid "36a6d734-5279-44d8-9758-2112ef3da746") + (net 2 "GND") + (pinfunction "GND") + (pintype "power_in") + (uuid "946e0d74-0c66-45c9-8c64-2a7b65374f8f") ) - (pad "2" smd roundrect - (at -0.9375 0.95 90) - (size 1.475 0.6) + (pad "2" smd rect + (at -3.15 0 90) + (size 2 1.5) (layers "F.Cu" "F.Paste" "F.Mask") - (roundrect_rratio 0.25) - (net 34 "Net-(Q1-S)") - (pinfunction "S") - (pintype "passive") - (uuid "a473d112-afd6-4294-83c5-ac3f21a8a2db") + (net 3 "+5V") + (pinfunction "VO") + (pintype "power_out") + (uuid "e253a7b1-f009-4238-8bc9-3b6e3ca02fb8") ) - (pad "3" smd roundrect - (at 0.9375 0 90) - (size 1.475 0.6) + (pad "2" smd rect + (at 3.15 0 90) + (size 2 3.8) (layers "F.Cu" "F.Paste" "F.Mask") - (roundrect_rratio 0.25) (net 3 "+5V") - (pinfunction "D") - (pintype "passive") - (uuid "c68e8d43-fd4c-4492-877a-987058e63892") + (pinfunction "VO") + (pintype "power_out") + (uuid "387343ff-a242-4b64-9b01-41a7f30c9e1d") ) - (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl" + (pad "3" smd rect + (at -3.15 2.3 90) + (size 2 1.5) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 1 "+12V") + (pinfunction "VI") + (pintype "power_in") + (uuid "d3612866-785b-4740-808a-d606973ae61b") + ) + (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-223.wrl" (offset (xyz 0 0 0) ) @@ -4536,17 +4731,17 @@ ) ) ) - (footprint "MountingHole:MountingHole_3.2mm_M3_ISO7380_Pad" + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (layer "F.Cu") - (uuid "760539c8-5789-4a22-bbd9-02e100887075") - (at 132 55) - (descr "Mounting Hole 3.2mm, M3, ISO7380") - (tags "mounting hole 3.2mm m3 iso7380") - (property "Reference" "H2" - (at 0 -3.85 0) + (uuid "7445b85c-943a-40ea-912b-86660b4dce0e") + (at 81.25 105.08 90) + (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x04 2.54mm single row") + (property "Reference" "J7" + (at 0 -2.33 90) (layer "F.SilkS") (hide yes) - (uuid "c461ebd7-32c1-4209-9d2b-d989b355ae48") + (uuid "b3b64365-5e7d-4d0d-9aeb-5fad7d5179ce") (effects (font (size 1 1) @@ -4554,10 +4749,10 @@ ) ) ) - (property "Value" "MountingHole" - (at 0 3.85 0) + (property "Value" "Conn_01x04" + (at 0 9.95 90) (layer "F.Fab") - (uuid "9fadbc01-4128-4f19-94fe-fae5e71f26ef") + (uuid "8babb8b0-a59b-474d-bbca-25369131b513") (effects (font (size 1 1) @@ -4565,100 +4760,938 @@ ) ) ) - (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_ISO7380_Pad" - (at 0 0 0) + (property "Footprint" "" + (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "520f5ccd-93a6-477f-a2dd-71cb8dc4c359") + (uuid "667bfad9-b5d7-4385-acc1-a411142a6d75") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) (property "Datasheet" "" - (at 0 0 0) + (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "2bf00dc3-f913-4b0d-9acd-a242edc63a4d") + (uuid "e70508e8-e89c-4389-9588-ee879f11815a") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Description" "Mounting Hole without connection" - (at 0 0 0) + (property "Description" "" + (at 0 0 90) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "d65a3455-c431-4ee4-a1ee-a565a7bb0e11") + (uuid "8cde00f5-2467-4e63-a7e6-312859249ab9") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property ki_fp_filters "MountingHole*") - (path "/07b1ae31-67a8-46f5-a1e7-adcfb4342f52") + (property ki_fp_filters "Connector*:*_1x??_*") + (path "/126c617f-201b-4874-a06a-a1e3df83da0a") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") - (attr exclude_from_pos_files) - (fp_circle - (center 0 0) - (end 2.85 0) + (attr through_hole) + (fp_line + (start -1.33 -1.33) + (end 0 -1.33) (stroke - (width 0.15) + (width 0.12) (type solid) ) - (fill none) - (layer "Cmts.User") - (uuid "c26615d0-ee95-4b2e-985e-7c269954229a") + (layer "F.SilkS") + (uuid "43725071-3289-4341-b75c-35ead19ce967") ) - (fp_circle - (center 0 0) - (end 3.1 0) + (fp_line + (start -1.33 0) + (end -1.33 -1.33) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "f7ef76bc-bcc0-48c9-b73a-23eba3368048") + ) + (fp_line + (start 1.33 1.27) + (end 1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "98d6bdff-ce80-407a-9302-a91b736afb26") + ) + (fp_line + (start -1.33 1.27) + (end 1.33 1.27) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "a234502d-1f37-472a-9df0-1048dba1ee06") + ) + (fp_line + (start -1.33 1.27) + (end -1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "973af336-a11c-48aa-bd0d-d6ed5d3648e0") + ) + (fp_line + (start -1.33 8.95) + (end 1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "0244a71b-1fb5-43c7-9e07-28074b2e315f") + ) + (fp_line + (start 1.8 -1.8) + (end -1.8 -1.8) (stroke (width 0.05) (type solid) ) - (fill none) (layer "F.CrtYd") - (uuid "696a8946-cdc3-44d7-9c36-d350e934ce1b") + (uuid "08ab9ccc-5def-41b9-b0b7-808e81c82500") + ) + (fp_line + (start -1.8 -1.8) + (end -1.8 9.4) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "f6e1d2f2-a07c-44b6-ad6e-d92333efa8e5") + ) + (fp_line + (start 1.8 9.4) + (end 1.8 -1.8) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "ffd22b07-859e-4c4e-84f1-126c847c9a79") + ) + (fp_line + (start -1.8 9.4) + (end 1.8 9.4) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "410a45af-4816-46b9-96cc-34cf46178c1a") + ) + (fp_line + (start 1.27 -1.27) + (end 1.27 8.89) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "27c55e56-366a-4659-ab5d-9f0d6b8dffab") + ) + (fp_line + (start -0.635 -1.27) + (end 1.27 -1.27) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "c83ab876-2248-4d57-b51f-f27a2584527e") + ) + (fp_line + (start -1.27 -0.635) + (end -0.635 -1.27) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "1cb9deee-666a-4910-8ba4-971861bb1916") + ) + (fp_line + (start 1.27 8.89) + (end -1.27 8.89) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "9e38f52b-819f-4306-b57b-74426fb47289") + ) + (fp_line + (start -1.27 8.89) + (end -1.27 -0.635) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "51ef9149-222c-43c5-a3c0-515dd95bc594") + ) + (fp_text user "${REFERENCE}" + (at 0 3.81 0) + (layer "F.Fab") + (uuid "18260050-effd-4ce6-8d9b-cbf224c6a932") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (pad "1" thru_hole rect + (at 0 0 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 10 "GPIO4") + (pinfunction "Pin_1") + (pintype "passive") + (uuid "cfab3b49-f6b2-4eca-bb14-26ce3480cac7") + ) + (pad "2" thru_hole oval + (at 0 2.54 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 11 "GPIO5") + (pinfunction "Pin_2") + (pintype "passive") + (uuid "e101d95f-0fcf-49c4-8f52-4d5cafc860c0") + ) + (pad "3" thru_hole oval + (at 0 5.08 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 12 "GPIO6") + (pinfunction "Pin_3") + (pintype "passive") + (uuid "577f9d45-fb6c-40fb-b541-e28eaf4972d7") + ) + (pad "4" thru_hole oval + (at 0 7.62 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 13 "GPIO7") + (pinfunction "Pin_4") + (pintype "passive") + (uuid "6da95a49-c071-4929-9f22-286cb1bde2ff") + ) + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" + (offset + (xyz 0 0 0) + ) + (scale + (xyz 1 1 1) + ) + (rotate + (xyz 0 0 0) + ) + ) + ) + (footprint "Package_TO_SOT_SMD:SOT-23" + (layer "F.Cu") + (uuid "7540d78f-dc5d-4d90-a5ab-25dfeb46abbe") + (at 117.221 54.5361 -90) + (descr "SOT, 3 Pin (https://www.jedec.org/system/files/docs/to-236h.pdf variant AB), generated with kicad-footprint-generator ipc_gullwing_generator.py") + (tags "SOT TO_SOT_SMD") + (property "Reference" "Q1" + (at 2.6529 -0.0248 0) + (layer "F.SilkS") + (uuid "dceefb3e-850b-46ab-ae84-b92eeb5178af") + (effects + (font + (size 0.8 0.8) + (thickness 0.1) + ) + ) + ) + (property "Value" "DMG2305UX" + (at 0 2.4 90) + (layer "F.Fab") + (uuid "e708c350-6017-439b-b071-8d5341435bf5") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Footprint" "" + (at 0 0 -90) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "b24c41a4-5441-4c78-887e-3ff0a504ecbc") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Datasheet" "https://www.diodes.com/assets/Datasheets/DMG2305UX.pdf" + (at 0 0 -90) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "ceda689a-d030-4a3c-b868-b0229e6ec503") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Description" "" + (at 0 0 -90) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "a988e625-87e3-43d1-b92a-bd44efd54be9") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property ki_fp_filters "SOT?23*") + (path "/036b2666-9def-43da-9049-d69dbeaeb346") + (sheetname "Root") + (sheetfile "rp-pico-sensor-shield.kicad_sch") + (attr smd) + (fp_line + (start 0 1.56) + (end -0.65 1.56) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c5a33b97-3501-43cb-8a22-2930dc971403") + ) + (fp_line + (start 0 1.56) + (end 0.65 1.56) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c4e3ffad-529b-4012-bb00-7588fe663aa3") + ) + (fp_line + (start 0 -1.56) + (end -1.675 -1.56) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c3385414-cfe1-425b-b11e-cf2fedd933bb") + ) + (fp_line + (start 0 -1.56) + (end 0.65 -1.56) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "db7820c8-e6ce-41ce-9d39-8c3a5c3b04b8") + ) + (fp_line + (start -1.92 1.7) + (end 1.92 1.7) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "6c054751-d866-4ea2-9060-af8ccdcbfe87") + ) + (fp_line + (start 1.92 1.7) + (end 1.92 -1.7) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "db801231-c6c2-42ce-b476-9630102422cd") + ) + (fp_line + (start -1.92 -1.7) + (end -1.92 1.7) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "815370c8-5bbe-4eaa-b7e4-ba99a764b15f") + ) + (fp_line + (start 1.92 -1.7) + (end -1.92 -1.7) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "b11f612f-38a9-4fde-a80b-aafe52d45ce6") + ) + (fp_line + (start -0.65 1.45) + (end -0.65 -1.125) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "2ee13c36-69ed-4258-96d1-51fd2316a636") + ) + (fp_line + (start 0.65 1.45) + (end -0.65 1.45) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "415496aa-915a-4160-a8d3-a141c2b997a5") + ) + (fp_line + (start -0.65 -1.125) + (end -0.325 -1.45) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "fc46ba26-6de7-468c-8f20-20aa7420a37c") + ) + (fp_line + (start -0.325 -1.45) + (end 0.65 -1.45) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "931ddba8-b63e-4f8b-9a24-a4d54bcb5988") + ) + (fp_line + (start 0.65 -1.45) + (end 0.65 1.45) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "b9b52289-4c98-42b6-a0be-6b99c82bd86f") + ) + (fp_text user "${REFERENCE}" + (at 0 0 90) + (layer "F.Fab") + (uuid "dfe2fc2b-f37a-4f3b-b54e-03a1a632cc7f") + (effects + (font + (size 0.32 0.32) + (thickness 0.05) + ) + ) + ) + (pad "1" smd roundrect + (at -0.9375 -0.95 270) + (size 1.475 0.6) + (layers "F.Cu" "F.Paste" "F.Mask") + (roundrect_rratio 0.25) + (net 33 "Net-(Q1-G)") + (pinfunction "G") + (pintype "input") + (uuid "36a6d734-5279-44d8-9758-2112ef3da746") + ) + (pad "2" smd roundrect + (at -0.9375 0.95 270) + (size 1.475 0.6) + (layers "F.Cu" "F.Paste" "F.Mask") + (roundrect_rratio 0.25) + (net 34 "VSYS") + (pinfunction "S") + (pintype "passive") + (uuid "a473d112-afd6-4294-83c5-ac3f21a8a2db") + ) + (pad "3" smd roundrect + (at 0.9375 0 270) + (size 1.475 0.6) + (layers "F.Cu" "F.Paste" "F.Mask") + (roundrect_rratio 0.25) + (net 3 "+5V") + (pinfunction "D") + (pintype "passive") + (uuid "c68e8d43-fd4c-4492-877a-987058e63892") + ) + (model "${KICAD6_3DMODEL_DIR}/Package_TO_SOT_SMD.3dshapes/SOT-23.wrl" + (offset + (xyz 0 0 0) + ) + (scale + (xyz 1 1 1) + ) + (rotate + (xyz 0 0 0) + ) + ) + ) + (footprint "MountingHole:MountingHole_3.2mm_M3_ISO7380_Pad" + (layer "F.Cu") + (uuid "760539c8-5789-4a22-bbd9-02e100887075") + (at 132 55) + (descr "Mounting Hole 3.2mm, M3, ISO7380") + (tags "mounting hole 3.2mm m3 iso7380") + (property "Reference" "H2" + (at 0 -3.85 0) + (layer "F.SilkS") + (hide yes) + (uuid "c461ebd7-32c1-4209-9d2b-d989b355ae48") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Value" "MountingHole" + (at 0 3.85 0) + (layer "F.Fab") + (uuid "9fadbc01-4128-4f19-94fe-fae5e71f26ef") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Footprint" "MountingHole:MountingHole_3.2mm_M3_ISO7380_Pad" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "520f5ccd-93a6-477f-a2dd-71cb8dc4c359") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Datasheet" "" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "2bf00dc3-f913-4b0d-9acd-a242edc63a4d") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Description" "Mounting Hole without connection" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "d65a3455-c431-4ee4-a1ee-a565a7bb0e11") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property ki_fp_filters "MountingHole*") + (path "/07b1ae31-67a8-46f5-a1e7-adcfb4342f52") + (sheetname "Root") + (sheetfile "rp-pico-sensor-shield.kicad_sch") + (attr exclude_from_pos_files) + (fp_circle + (center 0 0) + (end 2.85 0) + (stroke + (width 0.15) + (type solid) + ) + (fill none) + (layer "Cmts.User") + (uuid "c26615d0-ee95-4b2e-985e-7c269954229a") + ) + (fp_circle + (center 0 0) + (end 3.1 0) + (stroke + (width 0.05) + (type solid) + ) + (fill none) + (layer "F.CrtYd") + (uuid "696a8946-cdc3-44d7-9c36-d350e934ce1b") + ) + (fp_text user "${REFERENCE}" + (at 0 0 0) + (layer "F.Fab") + (uuid "b8c1acef-54c8-4671-8396-e13f380b0e7f") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (pad "1" thru_hole circle + (at 0 0) + (size 5.7 5.7) + (drill 3.2) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (uuid "94ff4848-f155-4eae-8435-3b1fa7500f12") + ) + ) + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" + (layer "F.Cu") + (uuid "79bc4d79-22b4-426f-8d7e-2b7aed3d885a") + (at 101.33 65 -90) + (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x04 2.54mm single row") + (property "Reference" "J14" + (at 0 -2.33 90) + (layer "F.SilkS") + (hide yes) + (uuid "38d6522f-49af-4909-966c-68758f88673c") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Value" "Conn_01x04" + (at 0 9.95 90) + (layer "F.Fab") + (uuid "4426c00c-f0d9-4cc3-91ed-01e6f116dd1f") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Footprint" "" + (at 0 0 -90) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "b5e6f5d5-2118-4957-a54c-0d99dfd23a22") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Datasheet" "" + (at 0 0 -90) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "167e1a73-d7d9-41dc-b2ee-88063fa35f6a") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Description" "" + (at 0 0 -90) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "cfd6fd8a-9aa0-4f84-85bb-c0842ef22eac") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property ki_fp_filters "Connector*:*_1x??_*") + (path "/ea599c94-b5b3-4d95-8136-5249efa80aaa") + (sheetname "Root") + (sheetfile "rp-pico-sensor-shield.kicad_sch") + (attr through_hole) + (fp_line + (start -1.33 8.95) + (end 1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "4e6a545c-f193-4378-9801-668c116dd9a1") + ) + (fp_line + (start -1.33 1.27) + (end -1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "6525ee30-2589-4980-8765-2805e19b4bd3") + ) + (fp_line + (start -1.33 1.27) + (end 1.33 1.27) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "2bd80222-cea6-4514-a6b8-0a8dde4557fb") + ) + (fp_line + (start 1.33 1.27) + (end 1.33 8.95) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "b517d620-f358-4d15-bbeb-79f1db056a71") + ) + (fp_line + (start -1.33 0) + (end -1.33 -1.33) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "481ca0ff-faa5-4c75-b249-6e681be46b48") + ) + (fp_line + (start -1.33 -1.33) + (end 0 -1.33) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "ba66ea27-86fa-445b-8f04-aa73829ab423") + ) + (fp_line + (start -1.8 9.4) + (end 1.8 9.4) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "32234d3a-8d00-4a19-96d8-6e2a1c01a50f") + ) + (fp_line + (start 1.8 9.4) + (end 1.8 -1.8) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "ba077275-d833-4990-a614-f94f3371d73b") + ) + (fp_line + (start -1.8 -1.8) + (end -1.8 9.4) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "8397a0fc-c752-45a0-aee9-37fc3f834dc7") + ) + (fp_line + (start 1.8 -1.8) + (end -1.8 -1.8) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "61de72dc-d5fa-4ed7-9421-22aa8cf091bf") + ) + (fp_line + (start -1.27 8.89) + (end -1.27 -0.635) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "71649ef5-aa74-4159-9e35-e8312516c9c8") + ) + (fp_line + (start 1.27 8.89) + (end -1.27 8.89) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "916624bc-86df-44ac-a369-ad2d5967e2fd") + ) + (fp_line + (start -1.27 -0.635) + (end -0.635 -1.27) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "045de791-c931-4464-9bd0-ead3d21580a5") + ) + (fp_line + (start -0.635 -1.27) + (end 1.27 -1.27) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "36249bb2-0b78-471c-91bd-23ae12200e55") + ) + (fp_line + (start 1.27 -1.27) + (end 1.27 8.89) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "1df3b49f-c3e6-4908-a631-18c022df3678") + ) + (fp_text user "${REFERENCE}" + (at 0 3.81 0) + (layer "F.Fab") + (uuid "314f009a-aea5-4b67-8bc5-09927fb284d9") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (pad "1" thru_hole rect + (at 0 0 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 2 "GND") + (pinfunction "Pin_1") + (pintype "passive") + (uuid "549f36d8-cc0c-4fcd-b145-e50576c8526f") + ) + (pad "2" thru_hole oval + (at 0 2.54 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 2 "GND") + (pinfunction "Pin_2") + (pintype "passive") + (uuid "ee83a6e3-74ab-4771-9e91-ea239159eea1") ) - (fp_text user "${REFERENCE}" - (at 0 0 0) - (layer "F.Fab") - (uuid "b8c1acef-54c8-4671-8396-e13f380b0e7f") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) + (pad "3" thru_hole oval + (at 0 5.08 270) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 2 "GND") + (pinfunction "Pin_3") + (pintype "passive") + (uuid "4eec8534-4d91-4a81-a353-8f3d093d1076") ) - (pad "1" thru_hole circle - (at 0 0) - (size 5.7 5.7) - (drill 3.2) + (pad "4" thru_hole oval + (at 0 7.62 270) + (size 1.7 1.7) + (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "94ff4848-f155-4eae-8435-3b1fa7500f12") + (net 2 "GND") + (pinfunction "Pin_4") + (pintype "passive") + (uuid "40146eb3-e31b-4cc2-9759-d0cd26aab935") + ) + (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" + (offset + (xyz 0 0 0) + ) + (scale + (xyz 1 1 1) + ) + (rotate + (xyz 0 0 0) + ) ) ) - (footprint "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" + (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (layer "F.Cu") - (uuid "79bc4d79-22b4-426f-8d7e-2b7aed3d885a") - (at 101.33 65 -90) - (descr "Through hole straight pin header, 1x04, 2.54mm pitch, single row") - (tags "Through hole pin header THT 1x04 2.54mm single row") - (property "Reference" "J14" - (at 0 -2.33 90) + (uuid "7dd97b24-95f6-43f0-a272-a2353e4cd2fa") + (at 81.7432 81.96155 180) + (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row") + (tags "Through hole pin header THT 1x03 2.54mm single row") + (property "Reference" "J30" + (at 0 -2.33 180) (layer "F.SilkS") (hide yes) - (uuid "38d6522f-49af-4909-966c-68758f88673c") + (uuid "a3725636-dd46-4f29-9556-293ba73bc5fb") (effects (font (size 1 1) @@ -4666,10 +5699,10 @@ ) ) ) - (property "Value" "Conn_01x04" - (at 0 9.95 90) + (property "Value" "Conn_01x03" + (at 0 7.41 180) (layer "F.Fab") - (uuid "4426c00c-f0d9-4cc3-91ed-01e6f116dd1f") + (uuid "e21192c5-bd5d-46a6-adcc-a4b54e836075") (effects (font (size 1 1) @@ -4677,66 +5710,69 @@ ) ) ) - (property "Footprint" "" - (at 0 0 -90) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" + (at 0 0 180) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "b5e6f5d5-2118-4957-a54c-0d99dfd23a22") + (uuid "8cba26f8-c089-4001-b80c-d3af14e60e95") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) (property "Datasheet" "" - (at 0 0 -90) + (at 0 0 180) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "167e1a73-d7d9-41dc-b2ee-88063fa35f6a") + (uuid "a22968e9-8e3b-4bc6-9779-b7ddc6da88fb") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) - (property "Description" "" - (at 0 0 -90) + (property "Description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" + (at 0 0 180) (unlocked yes) (layer "F.Fab") (hide yes) - (uuid "cfd6fd8a-9aa0-4f84-85bb-c0842ef22eac") + (uuid "fae02a57-3c0a-4f34-b9a6-5cb6343379d4") (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) (property ki_fp_filters "Connector*:*_1x??_*") - (path "/ea599c94-b5b3-4d95-8136-5249efa80aaa") + (path "/89b2656b-9113-40b2-a671-8cdae09d97f1") (sheetname "Root") (sheetfile "rp-pico-sensor-shield.kicad_sch") (attr through_hole) (fp_line - (start -1.33 8.95) - (end 1.33 8.95) + (start 1.33 1.27) + (end 1.33 6.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "4e6a545c-f193-4378-9801-668c116dd9a1") + (uuid "0790edd5-0725-4c43-a88d-a4743b3942e5") ) (fp_line - (start -1.33 1.27) - (end -1.33 8.95) + (start -1.33 6.41) + (end 1.33 6.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "6525ee30-2589-4980-8765-2805e19b4bd3") + (uuid "3909f67b-d600-4bb3-bfba-2652aaca0e9c") ) (fp_line (start -1.33 1.27) @@ -4746,17 +5782,17 @@ (type solid) ) (layer "F.SilkS") - (uuid "2bd80222-cea6-4514-a6b8-0a8dde4557fb") + (uuid "766e1252-3305-49e5-883c-a3805d4fe358") ) (fp_line - (start 1.33 1.27) - (end 1.33 8.95) + (start -1.33 1.27) + (end -1.33 6.41) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "b517d620-f358-4d15-bbeb-79f1db056a71") + (uuid "70198d6f-2b15-426c-9893-25999aabaa7f") ) (fp_line (start -1.33 0) @@ -4766,7 +5802,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "481ca0ff-faa5-4c75-b249-6e681be46b48") + (uuid "fb9c0964-69f7-44aa-992e-350e94f3b05c") ) (fp_line (start -1.33 -1.33) @@ -4776,102 +5812,102 @@ (type solid) ) (layer "F.SilkS") - (uuid "ba66ea27-86fa-445b-8f04-aa73829ab423") + (uuid "7cc11ccc-354f-498b-899e-329c01c469ae") ) (fp_line - (start -1.8 9.4) - (end 1.8 9.4) + (start 1.8 6.85) + (end 1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "32234d3a-8d00-4a19-96d8-6e2a1c01a50f") + (uuid "e7428100-3ddc-4949-b74d-a6c36fd76e9b") ) (fp_line - (start 1.8 9.4) - (end 1.8 -1.8) + (start 1.8 -1.8) + (end -1.8 -1.8) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "ba077275-d833-4990-a614-f94f3371d73b") + (uuid "07f8af9a-a6b4-401b-a273-6770c1eaa577") ) (fp_line - (start -1.8 -1.8) - (end -1.8 9.4) + (start -1.8 6.85) + (end 1.8 6.85) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "8397a0fc-c752-45a0-aee9-37fc3f834dc7") + (uuid "a9bcb579-3f64-4ca0-bf4f-1ae530c3a8f4") ) (fp_line - (start 1.8 -1.8) - (end -1.8 -1.8) + (start -1.8 -1.8) + (end -1.8 6.85) (stroke (width 0.05) (type solid) ) (layer "F.CrtYd") - (uuid "61de72dc-d5fa-4ed7-9421-22aa8cf091bf") + (uuid "b8992b71-f028-4f35-ae08-f45374a9ed1e") ) (fp_line - (start -1.27 8.89) - (end -1.27 -0.635) + (start 1.27 6.35) + (end -1.27 6.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "71649ef5-aa74-4159-9e35-e8312516c9c8") + (uuid "582c3062-e8b0-4a60-bb2a-552b6bc41d58") ) (fp_line - (start 1.27 8.89) - (end -1.27 8.89) + (start 1.27 -1.27) + (end 1.27 6.35) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "916624bc-86df-44ac-a369-ad2d5967e2fd") + (uuid "7be48681-e4cb-4e26-97d1-f2b1de2d62d5") ) (fp_line - (start -1.27 -0.635) - (end -0.635 -1.27) + (start -0.635 -1.27) + (end 1.27 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "045de791-c931-4464-9bd0-ead3d21580a5") + (uuid "ea415846-af47-41c0-a248-1e6dfb3b2031") ) (fp_line - (start -0.635 -1.27) - (end 1.27 -1.27) + (start -1.27 6.35) + (end -1.27 -0.635) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "36249bb2-0b78-471c-91bd-23ae12200e55") + (uuid "fd941aa7-9f98-402b-be4a-225a4903dc5f") ) (fp_line - (start 1.27 -1.27) - (end 1.27 8.89) + (start -1.27 -0.635) + (end -0.635 -1.27) (stroke (width 0.1) (type solid) ) (layer "F.Fab") - (uuid "1df3b49f-c3e6-4908-a631-18c022df3678") + (uuid "1f6515c0-8b68-4a3d-abab-a2a7be6a0429") ) (fp_text user "${REFERENCE}" - (at 0 3.81 0) + (at 0 2.54 -90) (layer "F.Fab") - (uuid "314f009a-aea5-4b67-8bc5-09927fb284d9") + (uuid "bfdf0e5f-53fe-4a94-8ed9-f3f833ae0f4a") (effects (font (size 1 1) @@ -4880,18 +5916,18 @@ ) ) (pad "1" thru_hole rect - (at 0 0 270) + (at 0 0 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 2 "GND") + (net 37 "SWCLK") (pinfunction "Pin_1") (pintype "passive") - (uuid "549f36d8-cc0c-4fcd-b145-e50576c8526f") + (uuid "e92ddae6-b86e-49f7-870e-e01813632a26") ) (pad "2" thru_hole oval - (at 0 2.54 270) + (at 0 2.54 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask") @@ -4899,31 +5935,20 @@ (net 2 "GND") (pinfunction "Pin_2") (pintype "passive") - (uuid "ee83a6e3-74ab-4771-9e91-ea239159eea1") + (uuid "8d6d185a-1789-49c6-9074-83e45afefb39") ) (pad "3" thru_hole oval - (at 0 5.08 270) + (at 0 5.08 180) (size 1.7 1.7) (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 2 "GND") + (net 36 "SWDIO") (pinfunction "Pin_3") (pintype "passive") - (uuid "4eec8534-4d91-4a81-a353-8f3d093d1076") - ) - (pad "4" thru_hole oval - (at 0 7.62 270) - (size 1.7 1.7) - (drill 1) - (layers "*.Cu" "*.Mask") - (remove_unused_layers no) - (net 2 "GND") - (pinfunction "Pin_4") - (pintype "passive") - (uuid "40146eb3-e31b-4cc2-9759-d0cd26aab935") + (uuid "dbbf235e-8dc0-462d-a5c2-f8850f9fabe7") ) - (model "${KICAD6_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x04_P2.54mm_Vertical.wrl" + (model "${KICAD8_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x03_P2.54mm_Vertical.wrl" (offset (xyz 0 0 0) ) @@ -4973,6 +5998,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -4985,6 +6011,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -4997,6 +6024,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5249,6 +6277,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5261,6 +6290,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5273,6 +6303,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5536,6 +6567,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5548,6 +6580,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5560,6 +6593,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5811,6 +6845,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5823,6 +6858,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5835,6 +6871,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5923,6 +6960,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5935,6 +6973,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -5947,6 +6986,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -7920,7 +8960,7 @@ (offset 0.9 0) ) (layers "F.Cu" "F.Mask") - (net 41 "unconnected-(U2-3V3_EN-Pad37)_0") + (net 41 "unconnected-(U2-3V3_EN-Pad37)_1") (pinfunction "3V3_EN") (pintype "input+no_connect") (uuid "fbfdfd13-e91a-4820-bb84-66555ceca700") @@ -7954,7 +8994,7 @@ (drill 1.02) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (net 34 "Net-(Q1-S)") + (net 34 "VSYS") (pinfunction "VSYS") (pintype "power_in") (uuid "1a692e9d-1417-4dbe-8f7d-0f80c34dd88c") @@ -7966,7 +9006,7 @@ (offset 0.9 0) ) (layers "F.Cu" "F.Mask") - (net 34 "Net-(Q1-S)") + (net 34 "VSYS") (pinfunction "VSYS") (pintype "power_in") (uuid "003db9b2-03cc-4293-b631-a2673ae8ad62") @@ -8113,6 +9153,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8125,6 +9166,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8137,6 +9179,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8399,6 +9442,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8411,6 +9455,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8423,6 +9468,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8610,6 +9656,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8622,6 +9669,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8634,6 +9682,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8886,6 +9935,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8898,6 +9948,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -8910,6 +9961,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9174,6 +10226,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9186,6 +10239,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9198,6 +10252,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9468,6 +10523,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9480,6 +10536,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9492,6 +10549,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9744,6 +10802,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9756,6 +10815,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9768,6 +10828,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9856,6 +10917,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9868,6 +10930,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -9880,6 +10943,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10142,6 +11206,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10154,6 +11219,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10166,6 +11232,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10369,6 +11436,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10381,6 +11449,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10393,6 +11462,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10656,6 +11726,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10668,6 +11739,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -10680,6 +11752,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11049,6 +12122,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11061,6 +12135,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11073,6 +12148,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11314,6 +12390,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11326,6 +12403,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11338,6 +12416,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11572,6 +12651,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11584,6 +12664,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11596,6 +12677,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11859,6 +12941,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11871,6 +12954,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -11883,6 +12967,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12146,6 +13231,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12158,6 +13244,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12170,6 +13257,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12433,6 +13521,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12445,6 +13534,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12457,6 +13547,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12709,6 +13800,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12721,6 +13813,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12733,6 +13826,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -12996,6 +14090,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -13008,6 +14103,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -13020,6 +14116,7 @@ (effects (font (size 1.27 1.27) + (thickness 0.15) ) ) ) @@ -13495,7 +14592,27 @@ (layer "Edge.Cuts") (uuid "e6e70dda-1f6f-4a94-91f9-d01a3915c6db") ) - (gr_text "v1.2" + (gr_line + (start 81.7432 79.42155) + (end 101.5432 79.42155) + (stroke + (width 0.15) + (type default) + ) + (layer "User.1") + (uuid "d57dca33-762b-4abc-bf04-3543a90506c7") + ) + (gr_line + (start 81.7432 72.04565) + (end 81.7432 79.42155) + (stroke + (width 0.15) + (type default) + ) + (layer "User.1") + (uuid "da71402e-835d-44ee-a735-249d4af5fbd5") + ) + (gr_text "v1.3" (at 67.275 108.5 180) (layer "B.SilkS") (uuid "18b4795b-6332-4b27-a5c2-04d3003f5c18") @@ -16032,7 +17149,7 @@ ) ) (gr_text "Raspberry Pi Pico" - (at 69.4 83.425 0) + (at 69.4436 88.0364 0) (layer "F.SilkS") (uuid "1da9f126-170c-4b32-a514-598868d81c9c") (effects @@ -16468,6 +17585,18 @@ ) ) ) + (gr_text "GND" + (at 108.712 64.4652 90) + (layer "F.SilkS") + (uuid "49c71d49-8fb9-4870-9c5f-cb665eb0470c") + (effects + (font + (size 0.8 0.8) + (thickness 0.1) + ) + (justify left bottom) + ) + ) (gr_text "GP2" (at 68.53 107.5 270) (layer "F.SilkS") @@ -17056,13 +18185,13 @@ ) ) (gr_text "GND" - (at 126 82.5 270) + (at 126.492 82.7024 270) (layer "F.SilkS") (uuid "6ce65b73-076a-4d21-8672-e8e38eef6fa6") (effects (font - (size 1 1) - (thickness 0.15) + (size 0.8 0.8) + (thickness 0.11) ) (justify left bottom) ) @@ -17317,6 +18446,18 @@ (justify left bottom) ) ) + (gr_text "SWCLK" + (at 106.1212 65.9892 90) + (layer "F.SilkS") + (uuid "890f6c41-43b0-4fc3-ade6-1183927c066e") + (effects + (font + (size 0.8 0.8) + (thickness 0.1) + ) + (justify left bottom) + ) + ) (gr_text "GP0" (at 63.45 107.5 270) (layer "F.SilkS") @@ -18096,6 +19237,19 @@ ) ) ) + (gr_text "Pico W SWD" + (at 79.756 82.0928 90) + (layer "F.SilkS") + (uuid "d34ac0b4-c285-40f2-a07c-580ad3d914bb") + (effects + (font + (size 0.6 0.6) + (thickness 0.1) + (bold yes) + ) + (justify left bottom) + ) + ) (gr_text "GP18\n" (at 97.065 57.5 90) (layer "F.SilkS") @@ -18191,7 +19345,7 @@ ) ) ) - (gr_text "+5V" + (gr_text "VSYS" (at 128.56 89.75 0) (layer "F.SilkS") (uuid "dff7cab8-0aef-497b-900b-91132fccd8f6") @@ -18203,14 +19357,14 @@ (justify left bottom) ) ) - (gr_text "+12V" - (at 130.175 61.275 0) + (gr_text "7.5V - 12V" + (at 127.762 59.4868 0) (layer "F.SilkS") (uuid "e224ef9c-467b-43de-bd2e-acf26ad6bef2") (effects (font - (size 1 1) - (thickness 0.15) + (size 0.9 0.9) + (thickness 0.13) ) (justify left bottom) ) @@ -18239,14 +19393,14 @@ (justify left bottom) ) ) - (gr_text "+12V" - (at 126 76.75 270) + (gr_text "7.5V-12V" + (at 126.5268 75.7428 270) (layer "F.SilkS") (uuid "ea668643-4902-4a51-8115-860b3e249339") (effects (font - (size 1 1) - (thickness 0.15) + (size 0.8 0.8) + (thickness 0.11) ) (justify left bottom) ) @@ -18365,6 +19519,19 @@ (justify left bottom) ) ) + (gr_text "Pico SWD" + (at 98.3996 84.7344 90) + (layer "F.SilkS") + (uuid "f1630307-dad1-415b-8db4-91801928eded") + (effects + (font + (size 0.6 0.6) + (thickness 0.1) + (bold yes) + ) + (justify left bottom) + ) + ) (gr_text "GP14" (at 119.51 107.5 270) (layer "F.SilkS") @@ -18456,37 +19623,49 @@ (justify left bottom) ) ) + (gr_text "SWDIO" + (at 111.2012 65.7352 90) + (layer "F.SilkS") + (uuid "f7e8f11f-efec-4e32-9e1e-7ab90bfd3bee") + (effects + (font + (size 0.8 0.8) + (thickness 0.1) + ) + (justify left bottom) + ) + ) (segment - (start 123.159 66.6165) - (end 121.265 66.6165) + (start 119.5692 67.8303) + (end 119.5692 64.9456) (width 0.8) (layer "F.Cu") (net 1) - (uuid "7f6ae89d-025c-4b4d-a57d-c79f7ee817c1") + (uuid "367abc4f-c065-485c-beb9-10bcbfe8a76a") ) (segment - (start 118.364 63.7155) - (end 118.364 60.921) + (start 121.9452 67.8303) + (end 123.159 66.6165) (width 0.8) (layer "F.Cu") (net 1) - (uuid "ae4c553a-c5ce-450e-b69f-8ec7bc8db110") + (uuid "5bbeac7e-2ee6-4b83-8ce8-3a15d49029f6") ) (segment - (start 118.364 60.921) - (end 118.251 60.808) + (start 119.5692 64.9456) + (end 119.5464 64.9228) (width 0.8) (layer "F.Cu") (net 1) - (uuid "babd135c-98b6-4008-9458-2fb7703b66e0") + (uuid "658f6a50-b527-428d-9fec-88e8916e4310") ) (segment - (start 121.265 66.6165) - (end 118.364 63.7155) + (start 119.5692 67.8303) + (end 121.9452 67.8303) (width 0.8) (layer "F.Cu") (net 1) - (uuid "c7be79cf-7577-4eca-8526-34ddc8a04dd0") + (uuid "e0cf6a42-5934-4077-8a69-b60c1e064f10") ) (segment (start 123.159 66.6165) @@ -18505,20 +19684,28 @@ (uuid "4f788537-3520-4c83-bb8b-a0e42c8d3b72") ) (segment - (start 125.675 52.675) - (end 127.4 54.4) + (start 119.5692 70.9553) + (end 114.794 70.9553) + (width 0.8) + (layer "F.Cu") + (net 2) + (uuid "20b0bef4-2234-4bbf-81cd-8e63cb1e1bea") + ) + (segment + (start 114.794 70.9553) + (end 113.9829 70.9553) (width 0.8) (layer "F.Cu") (net 2) - (uuid "08848014-a607-4f25-8a91-5ead6a43e1bd") + (uuid "3b30d81b-df61-402d-b29a-18afbf3f1d6b") ) (segment - (start 118.364 66.8405) - (end 113.411 66.8405) + (start 124.8202 70.9553) + (end 119.5692 70.9553) (width 0.8) (layer "F.Cu") (net 2) - (uuid "12e6abf0-ef5b-4de3-bf1b-71e2de57e01a") + (uuid "3ee95f2c-a11e-4df1-af4c-29f873502efd") ) (segment (start 55.0985 99.5) @@ -18531,31 +19718,15 @@ (segment (start 129.1 96.925) (end 133.425 96.925) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "49a7f603-ee53-4a27-84bc-9b3ae335d879") ) - (segment - (start 118.364 68.464) - (end 118.364 66.8405) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "5649d14c-9b5e-43dd-a201-d07c88013344") - ) - (segment - (start 112.575 53.784) - (end 113.684 52.675) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "64cce4c6-7b85-4276-b52f-395e7955e2d9") - ) (segment (start 133.4762 102.5) (end 131.9015 102.5) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "677773d8-45d5-4a4e-adde-14dd721b18b1") @@ -18563,23 +19734,15 @@ (segment (start 114.814 82.564) (end 117 84.75) - (width 0.25) + (width 0.5) (layer "F.Cu") (net 2) (uuid "6c211b2e-ec90-49c7-97a2-72caf99a5db9") ) - (segment - (start 127.4 58.025) - (end 129.159 59.784) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "6e70ad22-d188-474e-a5d6-d060b8a188b9") - ) (segment (start 113.284 82.564) (end 114.814 82.564) - (width 0.25) + (width 0.5) (layer "F.Cu") (net 2) (uuid "716cae97-5dff-479c-973f-5ccc4e2138cf") @@ -18587,7 +19750,7 @@ (segment (start 117.62 92) (end 124.175 92) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "7478acb7-9efd-471e-b066-259cb40521e0") @@ -18595,7 +19758,7 @@ (segment (start 134.224001 97.724001) (end 134.224001 99.447701) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "77b1aaab-f9e4-4669-a946-6bf4960d7850") @@ -18603,7 +19766,7 @@ (segment (start 134.225 101.7512) (end 133.4762 102.5) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "782d34ef-3e32-4ccb-9dba-9547708e2d4f") @@ -18611,31 +19774,15 @@ (segment (start 124.175 92) (end 129.1 96.925) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "7a6c4110-ef5f-4615-9b23-0c64cf8e19e5") ) - (segment - (start 113.651 58.576) - (end 112.575 57.5) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "7b74461b-ce15-49f9-b309-dbefe4acd0f8") - ) - (segment - (start 112.575 57.5) - (end 112.575 53.784) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "8277afba-fcdb-41dc-bec6-a264f6f9a53e") - ) (segment (start 133.425 96.925) (end 134.224001 97.724001) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "84eceb1d-b8bf-4905-8da3-cd27fa37baca") @@ -18649,33 +19796,17 @@ (uuid "851c32c2-804c-4514-a8b8-159110ef8969") ) (segment - (start 129.159 66.6165) - (end 129.159 69.441) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "8dcffde6-e8cf-451d-b29e-36c8ac1083c3") - ) - (segment - (start 113.651 60.808) - (end 113.651 58.576) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "934ba0a5-fea4-48b8-bc69-b63ebe5111be") - ) - (segment - (start 127.4 54.4) - (end 127.4 58.025) + (start 112.8776 69.85) + (end 112.8776 66.9916) (width 0.8) (layer "F.Cu") (net 2) - (uuid "979ab798-e00a-4700-8c5c-84343c13d6fe") + (uuid "9ca362bd-a598-4e59-a042-12b7bb73aa39") ) (segment (start 134.224001 99.447701) (end 134.225 99.4487) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "9f72ef11-72dd-496f-95f6-b577329fde65") @@ -18683,7 +19814,7 @@ (segment (start 134.225 99.4487) (end 134.225 101.7512) - (width 0.8) + (width 0.5) (layer "F.Cu") (net 2) (uuid "aba4252d-3aaf-4068-b027-d52228f313d1") @@ -18696,14 +19827,6 @@ (net 2) (uuid "b2d86c78-c407-4438-a24e-53ea4d5827fc") ) - (segment - (start 113.684 52.675) - (end 125.675 52.675) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "c3e907a6-90fa-4d97-bffe-d7d4bdbba11d") - ) (segment (start 61.525 99.5) (end 62.025 100) @@ -18713,44 +19836,28 @@ (uuid "c47c696d-2d3e-44b7-a107-2a963f018702") ) (segment - (start 129.159 69.441) - (end 128.025 70.575) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "c7b47e7a-4d40-40c4-9e3a-a6d578b4f8e4") - ) - (segment - (start 129.159 59.784) - (end 129.159 66.6165) - (width 0.8) - (layer "F.Cu") - (net 2) - (uuid "d2c99fbf-b90a-4839-8acc-caa74593eb49") - ) - (segment - (start 120.475 70.575) - (end 118.364 68.464) + (start 112.8776 66.9916) + (end 114.9464 64.9228) (width 0.8) (layer "F.Cu") (net 2) - (uuid "f3af2e5d-316a-4d3a-94f2-a9a03dace161") + (uuid "cf1e763c-57f0-4ff9-9cbc-9f7e5ee367aa") ) (segment - (start 82.423 73.61) - (end 82.423 73.97) + (start 129.159 66.6165) + (end 124.8202 70.9553) (width 0.8) (layer "F.Cu") (net 2) - (uuid "f5f760fa-bab5-4f30-8477-710d59b29fba") + (uuid "d08b5476-87df-49be-af18-cb0b31c358e0") ) (segment - (start 128.025 70.575) - (end 120.475 70.575) + (start 113.9829 70.9553) + (end 112.8776 69.85) (width 0.8) (layer "F.Cu") (net 2) - (uuid "fae41824-bbc2-4f1d-848f-defbc752d1a5") + (uuid "d7944be7-5f7f-454d-9538-74edec70a8ac") ) (segment (start 117.62 85.37) @@ -18809,36 +19916,36 @@ (uuid "1e302ce7-1801-45c1-9265-eee9a4d3af07") ) (segment - (start 127.325 57.75) - (end 110.23 57.75) + (start 100.79 100) + (end 103.33 100) (width 0.8) (layer "B.Cu") (net 2) - (uuid "1e468f0e-4110-4cb8-9f76-0bce48f45b11") + (uuid "205f0ccc-d119-4062-be2a-10d2447f96d4") ) (segment - (start 100.79 100) - (end 103.33 100) + (start 109.382 57.75) + (end 108.1532 58.9788) (width 0.8) (layer "B.Cu") (net 2) - (uuid "205f0ccc-d119-4062-be2a-10d2447f96d4") + (uuid "286d1cca-d006-4a74-90b6-0e3d56748a4b") ) (segment - (start 103.33 100) - (end 105.87 100) + (start 95.123 80.198) + (end 94.34655 79.42155) (width 0.8) (layer "B.Cu") (net 2) - (uuid "312a9b1f-3d24-4109-9f15-ff0cd1b3bd78") + (uuid "2db89f0b-40c2-472e-8dd2-212af113503f") ) (segment - (start 110.23 57.75) - (end 102.98 65) + (start 103.33 100) + (end 105.87 100) (width 0.8) (layer "B.Cu") (net 2) - (uuid "3167bf17-3eef-4c77-83ae-ae9cf04d30ad") + (uuid "312a9b1f-3d24-4109-9f15-ff0cd1b3bd78") ) (segment (start 83.873 72.16) @@ -18864,6 +19971,14 @@ (net 2) (uuid "407a6b3d-1a0d-483b-a1c1-1b32aaf2689a") ) + (segment + (start 127.325 57.75) + (end 109.382 57.75) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "40c5893c-95c3-418c-8340-917589a5b989") + ) (segment (start 88.87 100) (end 98.25 100) @@ -18872,6 +19987,14 @@ (net 2) (uuid "4144068e-b0d1-42f3-8f73-a731074c020b") ) + (segment + (start 108.1532 58.9788) + (end 108.1532 60.128) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "46373eb1-33ff-4ab2-9097-824d73ee7c7a") + ) (segment (start 81.79 65) (end 79.25 65) @@ -18912,6 +20035,14 @@ (net 2) (uuid "51e52748-4d92-44da-9daf-d343474d2ad2") ) + (segment + (start 104.164 65) + (end 108.1532 61.0108) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "52cd0bd4-dcce-4889-9182-c785150776bb") + ) (segment (start 96.25 65) (end 93.71 65) @@ -18960,6 +20091,14 @@ (net 2) (uuid "7322e948-04fb-4ff0-ba2e-f160391a14f6") ) + (segment + (start 129.159 59.584) + (end 127.325 57.75) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "7564e604-c687-4b39-8fd3-59b92ba6a590") + ) (segment (start 117.79 92.17) (end 117.62 92) @@ -18976,6 +20115,14 @@ (net 2) (uuid "789910b8-a65c-4a02-9479-78988ae9bc3c") ) + (segment + (start 129.159 66.6165) + (end 129.159 59.584) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "7a4b5be3-8d67-4ad2-9ae2-7ba491422e1a") + ) (segment (start 84.33 65) (end 81.79 65) @@ -19008,6 +20155,14 @@ (net 2) (uuid "8d5a9803-8423-4052-a3de-665c8612f0fd") ) + (segment + (start 101.33 65) + (end 104.164 65) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "92073af1-ef50-4b12-9640-c4d2c47660fe") + ) (segment (start 112.54 92) (end 110 92) @@ -19016,6 +20171,14 @@ (net 2) (uuid "93a883db-73f6-4762-a10d-d9a9ca7268bb") ) + (segment + (start 108.1532 61.0108) + (end 108.1532 60.128) + (width 0.8) + (layer "B.Cu") + (net 2) + (uuid "95179f3f-7d05-4ce8-b496-36bc2e146002") + ) (segment (start 82.423 95.702) (end 82.423 91.39) @@ -19088,14 +20251,6 @@ (net 2) (uuid "ac042cd9-5e29-4ad0-8ccc-7c0b18aac8f4") ) - (segment - (start 129.159 66.6165) - (end 129.159 59.584) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "adedb0ce-969a-44d7-978f-6307e2a424c0") - ) (segment (start 97.425 82.5) (end 95.123 80.198) @@ -19144,14 +20299,6 @@ (net 2) (uuid "d387b7ae-b449-4a45-8f58-281d09170df6") ) - (segment - (start 129.159 59.584) - (end 127.325 57.75) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "d431b915-8c2f-42da-ae6f-932b2c1f2792") - ) (segment (start 69.33 100) (end 71.87 100) @@ -19184,14 +20331,6 @@ (net 2) (uuid "ddb18819-a2b3-4df7-af7e-d956b305e44a") ) - (segment - (start 102.98 65) - (end 101.33 65) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "e21af156-a6a1-4f7e-89e1-3a5223678154") - ) (segment (start 95.123 98.598) (end 95.123 91.39) @@ -19238,143 +20377,87 @@ (width 0.8) (layer "B.Cu") (net 2) - (uuid "ed1aaa48-1dc4-44e6-9ea2-4c1913919043") - ) - (segment - (start 81.25 96.875) - (end 82.423 95.702) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "f0fd6831-6a94-413d-b7f3-ef929fefb57c") - ) - (segment - (start 58.473 75.06) - (end 80.973 75.06) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "f1a94145-cfbc-4d69-ad50-c869f00bb0b4") - ) - (segment - (start 66.79 100) - (end 63.64 96.85) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "f73051d4-c60a-4c7d-a4c5-f50a61c94bdc") - ) - (segment - (start 58.325 96.85) - (end 57.023 95.548) - (width 0.8) - (layer "B.Cu") - (net 2) - (uuid "f8882b10-4d7f-4fda-94b7-dffe14d365fc") - ) - (segment - (start 115.951 60.808) - (end 115.951 61.1755) - (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "003a894d-121c-4ec4-8720-fc8aed5629ac") - ) - (segment - (start 111.575 65.5515) - (end 111.575 67.27601) - (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "07187075-6831-4852-b278-abfd66b83d6e") - ) - (segment - (start 113.411 63.7155) - (end 111.575 65.5515) - (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "0da05c5f-d6b2-4303-869a-65d36dffc19b") + (uuid "ed1aaa48-1dc4-44e6-9ea2-4c1913919043") ) (segment - (start 115.951 54.508) - (end 115.951 60.808) + (start 94.34655 79.42155) + (end 81.7432 79.42155) (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "2caa858a-1157-4d51-a223-de52ebc0710a") + (layer "B.Cu") + (net 2) + (uuid "ed6d852e-6485-412d-b2bb-b8872c2e3a6a") ) (segment - (start 132.08 92) - (end 134.62 92) + (start 81.25 96.875) + (end 82.423 95.702) (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "357d4b43-5c28-482f-a1f5-605d1b4d051c") + (layer "B.Cu") + (net 2) + (uuid "f0fd6831-6a94-413d-b7f3-ef929fefb57c") ) (segment - (start 127 79.05) - (end 127 92) + (start 58.473 75.06) + (end 80.973 75.06) (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "435a2268-46fb-4813-a4a2-67e6f106a756") + (layer "B.Cu") + (net 2) + (uuid "f1a94145-cfbc-4d69-ad50-c869f00bb0b4") ) (segment - (start 115.951 61.1755) - (end 113.411 63.7155) + (start 66.79 100) + (end 63.64 96.85) (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "47c2abba-099f-421a-ac72-207c345920cb") + (layer "B.Cu") + (net 2) + (uuid "f73051d4-c60a-4c7d-a4c5-f50a61c94bdc") ) (segment - (start 129.54 92) - (end 132.08 92) + (start 58.325 96.85) + (end 57.023 95.548) (width 0.8) - (layer "F.Cu") - (net 3) - (uuid "77712d33-b5ef-4b7c-8b9d-5b24ad420b81") + (layer "B.Cu") + (net 2) + (uuid "f8882b10-4d7f-4fda-94b7-dffe14d365fc") ) (segment - (start 117.1904 69.2404) - (end 127 79.05) + (start 114.794 67.8303) + (end 117.2464 65.3779) (width 0.8) (layer "F.Cu") (net 3) - (uuid "93e76821-22e2-4eba-b21a-ea5757db9e90") + (uuid "337821b5-eb7c-4822-a8f8-a820fa8d7dbb") ) (segment - (start 111.575 67.27601) - (end 113.53939 69.2404) + (start 117.2464 65.3779) + (end 117.2464 64.9228) (width 0.8) (layer "F.Cu") (net 3) - (uuid "9d3d4979-c9be-4b84-b52c-3ef751270964") + (uuid "3b0dab9a-f6dc-4bb7-8e1e-2ecb161d4019") ) (segment - (start 113.53939 69.2404) - (end 115.8748 69.2404) + (start 117.2464 55.499) + (end 117.221 55.4736) (width 0.8) (layer "F.Cu") (net 3) - (uuid "d40b0343-ea8a-4aed-841e-6675b257021c") + (uuid "5c08f490-92f4-4309-a327-bc93a207b440") ) (segment - (start 115.8748 69.2404) - (end 117.1904 69.2404) + (start 117.2464 58.6228) + (end 117.2464 55.499) (width 0.8) (layer "F.Cu") (net 3) - (uuid "e6193fcc-9a2c-4098-898a-fabc23326731") + (uuid "62a375fd-0ca8-47ae-ba01-17cfd1188a14") ) (segment - (start 127 92) - (end 129.54 92) + (start 117.2464 64.9228) + (end 117.2464 58.6228) (width 0.8) (layer "F.Cu") (net 3) - (uuid "fcaf769f-cf5a-47e8-b476-bc3a332aa9b3") + (uuid "999e47dd-f71f-45aa-82b9-aa1475398dde") ) (segment (start 69.723 65.147) @@ -21297,100 +22380,124 @@ (uuid "c89f59d3-0791-4257-9c15-caee63a86591") ) (segment - (start 108.725 60.399695) - (end 104.075305 55.75) + (start 51.943 73.61) + (end 51.943 72) (width 0.25) (layer "F.Cu") (net 33) - (uuid "1d7d5b55-d158-44ab-8c4c-7e6722f64195") + (uuid "074edadc-2dfd-4283-8e2c-7d3182656821") ) (segment - (start 62.475 55.75) + (start 60.378 64.529696) (end 60.378 57.847) (width 0.25) (layer "F.Cu") (net 33) - (uuid "263fd2d2-e41f-4f3a-9743-088cdb2ecefa") + (uuid "0bc732e3-e8e7-4815-9675-bc38d0c2069e") ) (segment - (start 60.378 64.529696) - (end 57.428848 67.478848) + (start 113.094296 55.75) + (end 115.1636 53.680696) (width 0.25) (layer "F.Cu") (net 33) - (uuid "28c4efc2-bf4f-4e18-9c6b-3fcac73ea3ee") + (uuid "1c96a897-c475-4a3c-9083-ad587f36ca58") ) (segment - (start 112.0846 71.1154) - (end 111.6404 71.1154) + (start 51.943 72) + (end 56.464152 67.478848) (width 0.25) (layer "F.Cu") (net 33) - (uuid "47d1d026-7bbb-48f3-8144-1b68694ddda2") + (uuid "4f4ef597-9dd5-47e5-8c54-88436e491f40") ) (segment - (start 57.428848 67.478848) - (end 56.464152 67.478848) + (start 117.7544 52.2224) + (end 118.171 52.639) (width 0.25) (layer "F.Cu") (net 33) - (uuid "52b76599-3209-470a-a6f4-72d5813c431d") + (uuid "54098d6c-3231-48e5-8af3-4694baef6735") ) (segment - (start 104.075305 55.75) - (end 62.475 55.75) + (start 115.1636 53.680696) + (end 115.1636 52.6288) (width 0.25) (layer "F.Cu") (net 33) - (uuid "7fc9986d-16e5-44b9-ab73-d93eea4fb6eb") + (uuid "5cf53b23-aa25-43e3-8223-17dc1a97c62d") ) (segment - (start 111.6404 71.1154) - (end 108.725 68.2) + (start 56.464152 67.478848) + (end 57.428848 67.478848) (width 0.25) (layer "F.Cu") (net 33) - (uuid "92fe4d79-f201-4ce2-9b06-0da8a4972951") + (uuid "754fa001-105a-4e08-9f66-974d92f8a54e") ) (segment - (start 108.725 68.2) - (end 108.725 60.399695) + (start 118.171 52.639) + (end 118.171 53.5986) (width 0.25) (layer "F.Cu") (net 33) - (uuid "93206fa5-9a0a-44c1-b8a7-eb7ab8836e96") + (uuid "811dc325-c932-4566-9621-40f7b4f9c6b2") ) (segment - (start 56.464152 67.478848) - (end 51.943 72) + (start 57.428848 67.478848) + (end 60.378 64.529696) (width 0.25) (layer "F.Cu") (net 33) - (uuid "b2b04652-a7dc-4aeb-be51-c2d2c84e6455") + (uuid "992105af-3452-49a8-b7b5-351d0654a366") ) (segment - (start 51.943 72) - (end 51.943 73.61) + (start 60.378 57.847) + (end 62.475 55.75) (width 0.25) (layer "F.Cu") (net 33) - (uuid "ba52aceb-7c75-4a5b-b177-af95efda968d") + (uuid "b4784b0b-73f9-4b4b-b750-e20b9ffdf84e") ) (segment - (start 60.378 57.847) - (end 60.378 64.529696) + (start 115.1636 52.6288) + (end 115.57 52.2224) + (width 0.25) + (layer "F.Cu") + (net 33) + (uuid "b54ea0a1-bd1c-4bd2-8f0c-a2cb11a97123") + ) + (segment + (start 62.475 55.75) + (end 113.094296 55.75) (width 0.25) (layer "F.Cu") (net 33) - (uuid "db2e38ca-9860-4f33-a528-c60ca57d7e9e") + (uuid "d98c3921-bee7-49e3-8d88-cf27fc1f033c") ) (segment - (start 112.0846 71.1154) - (end 114.9248 71.1154) + (start 115.57 52.2224) + (end 117.7544 52.2224) (width 0.25) (layer "F.Cu") (net 33) - (uuid "de56e770-9ab6-4b30-9eee-ee8a2dd9c842") + (uuid "f5e73175-aa0e-48a2-be79-1a5695dc6050") + ) + (segment + (start 127 79.0956) + (end 125.1204 77.216) + (width 0.8) + (layer "F.Cu") + (net 34) + (uuid "083e08ce-9497-44a6-92d5-6b6714b04b71") + ) + (segment + (start 116.271 53.5986) + (end 113.4096 56.46) + (width 0.8) + (layer "F.Cu") + (net 34) + (uuid "13f6c15c-f3b6-4509-bcdc-a8713fe2c24d") ) (segment (start 54.483 73.61) @@ -21398,47 +22505,71 @@ (width 0.8) (layer "F.Cu") (net 34) - (uuid "09d6345c-cd24-4aa3-88b6-bbb9834d2cce") + (uuid "180d2992-7448-4966-8e34-e748c9b8652b") ) (segment - (start 62.835786 56.475) - (end 103.775 56.475) + (start 54.483 71.45) + (end 61.103 64.83) (width 0.8) (layer "F.Cu") (net 34) - (uuid "11f8b1c8-21f4-499e-8fcb-56474a8e581a") + (uuid "211f43f6-0190-4af2-849f-979542d721ee") ) (segment - (start 61.103 58.207786) - (end 62.835786 56.475) + (start 125.1204 77.216) + (end 115.679786 77.216) (width 0.8) (layer "F.Cu") (net 34) - (uuid "243fa3f4-d108-45a5-bb76-a84d267cf532") + (uuid "2558c85e-9592-427e-a996-5758282b18b7") ) (segment - (start 108 60.7) - (end 108 72.125) + (start 113.3946 63.5246) + (end 111.877599 65.041601) (width 0.8) (layer "F.Cu") (net 34) - (uuid "2fce50f3-36ac-4670-8504-48831baa2974") + (uuid "255955bf-39fa-4a58-9868-dbe0c9c4cef7") ) (segment - (start 54.483 71.45) - (end 61.103 64.83) + (start 132.08 92) + (end 134.62 92) + (width 0.8) + (layer "F.Cu") + (net 34) + (uuid "357d4b43-5c28-482f-a1f5-605d1b4d051c") + ) + (segment + (start 111.877599 65.041601) + (end 111.877599 73.413813) + (width 0.8) + (layer "F.Cu") + (net 34) + (uuid "5582a557-ea32-44e2-9e3d-418ecb06d607") + ) + (segment + (start 129.54 92) + (end 132.08 92) + (width 0.8) + (layer "F.Cu") + (net 34) + (uuid "77712d33-b5ef-4b7c-8b9d-5b24ad420b81") + ) + (segment + (start 62.835786 56.475) + (end 113.3946 56.475) (width 0.8) (layer "F.Cu") (net 34) - (uuid "3b549584-db2a-4c9c-bfdb-ebe848fad660") + (uuid "8b06cb97-8383-44bf-a906-77bd9acdf128") ) (segment - (start 116.8248 72.0502) - (end 116.8248 71.1154) + (start 61.103 58.207786) + (end 62.835786 56.475) (width 0.8) (layer "F.Cu") (net 34) - (uuid "797937e0-86ba-48d5-bb83-046dfdb9a0c4") + (uuid "cda989cb-45d7-4a73-8879-6edf4d507d96") ) (segment (start 61.103 64.83) @@ -21446,39 +22577,47 @@ (width 0.8) (layer "F.Cu") (net 34) - (uuid "ada87ced-5aee-46eb-a781-c521f6693f6e") + (uuid "d751dfcf-4a4e-4c88-b91d-31db6ed18310") + ) + (segment + (start 111.877599 73.413813) + (end 115.679786 77.216) + (width 0.8) + (layer "F.Cu") + (net 34) + (uuid "ecc416f0-d0ba-4e7c-a91a-62a6bf44d89e") ) (segment - (start 103.775 56.475) - (end 108 60.7) + (start 113.3946 63.5246) + (end 113.3946 56.475) (width 0.8) (layer "F.Cu") (net 34) - (uuid "b340e6ea-fa72-4341-b2ef-1c95dd8473e0") + (uuid "f7a5becd-4e64-42aa-b7aa-b98ad72f11ff") ) (segment - (start 115.275 73.6) - (end 116.8248 72.0502) + (start 113.3946 56.475) + (end 116.271 53.5986) (width 0.8) (layer "F.Cu") (net 34) - (uuid "c58f2c9e-1836-4560-bb82-fc5685fd8d77") + (uuid "faae90de-1ec7-44ad-9ff4-62cc8a7f18f4") ) (segment - (start 109.475 73.6) - (end 115.275 73.6) + (start 127 92) + (end 129.54 92) (width 0.8) (layer "F.Cu") (net 34) - (uuid "cf585c14-ee1f-4620-bfe0-6a926c23c2f9") + (uuid "fcaf769f-cf5a-47e8-b476-bc3a332aa9b3") ) (segment - (start 108 72.125) - (end 109.475 73.6) + (start 127 92) + (end 127 79.0956) (width 0.8) (layer "F.Cu") (net 34) - (uuid "e50b3b8e-b464-4874-a857-a7e4031329ad") + (uuid "fcc7bba0-8732-4243-b664-6f93b7293729") ) (segment (start 123.5 80.25) @@ -21489,28 +22628,68 @@ (uuid "1fcf539b-e254-470c-9bd0-826ed5de13e0") ) (segment - (start 114.325 77.575) - (end 81.308 77.575) + (start 120.142 83.608) + (end 120.142 85.852) (width 0.25) (layer "F.Cu") (net 35) - (uuid "3a4d5f20-a1d2-44bf-ac69-78733af02881") + (uuid "80265395-4db8-4d9b-86fd-091842c65f56") ) (segment - (start 117 80.25) - (end 114.325 77.575) + (start 79.6036 86.868) + (end 77.343 84.6074) (width 0.25) (layer "F.Cu") (net 35) - (uuid "9e4e5949-524b-40ca-8287-c01512118ba6") + (uuid "a18d0001-ff63-4dba-9954-9f4b065d2b55") ) (segment - (start 81.308 77.575) + (start 77.343 84.6074) (end 77.343 73.61) (width 0.25) (layer "F.Cu") (net 35) - (uuid "ea1b9700-c33f-4885-b852-8c4ee6fc480e") + (uuid "b0371735-fe7e-43bd-8874-a7a8f0a913f5") + ) + (segment + (start 123.5 80.25) + (end 120.142 83.608) + (width 0.25) + (layer "F.Cu") + (net 35) + (uuid "b56d004f-1fe6-45f5-a3db-aca07313542f") + ) + (segment + (start 119.126 86.868) + (end 79.6036 86.868) + (width 0.25) + (layer "F.Cu") + (net 35) + (uuid "be7fcf8c-c9a0-4287-a80d-fa21b42ef636") + ) + (segment + (start 120.142 85.852) + (end 119.126 86.868) + (width 0.25) + (layer "F.Cu") + (net 35) + (uuid "e665e81e-e0c6-44aa-9555-5cb4dca1906b") + ) + (segment + (start 104.775 80.85) + (end 104.7768 80.85) + (width 0.25) + (layer "F.Cu") + (net 36) + (uuid "274395e0-dff6-4a30-9a4f-35446cce0253") + ) + (segment + (start 84.82165 79.96) + (end 81.7432 76.88155) + (width 0.25) + (layer "F.Cu") + (net 36) + (uuid "6f32b5c9-308f-4a58-9e06-57f0fd7c43c9") ) (segment (start 99.973 79.96) @@ -21520,6 +22699,14 @@ (net 36) (uuid "75d07d0e-5d41-446c-b16b-4ae90ae97875") ) + (segment + (start 99.973 79.96) + (end 84.82165 79.96) + (width 0.25) + (layer "F.Cu") + (net 36) + (uuid "afa6b608-05cf-4ef4-9bde-e597ebba591e") + ) (segment (start 103.885 79.96) (end 104.775 80.85) @@ -21528,6 +22715,14 @@ (net 36) (uuid "d759d827-4753-4b08-a313-ebc1d30ed374") ) + (segment + (start 96.89455 81.96155) + (end 81.7432 81.96155) + (width 0.25) + (layer "F.Cu") + (net 37) + (uuid "29614b32-d04d-45d1-ac0e-311044b28fe3") + ) (segment (start 99.973 85.04) (end 103.875 85.04) @@ -21536,6 +22731,14 @@ (net 37) (uuid "5a8c6a3e-c6c7-4d1c-9273-fa4d3f3b3543") ) + (segment + (start 98.5012 83.5682) + (end 96.89455 81.96155) + (width 0.25) + (layer "F.Cu") + (net 37) + (uuid "b9193c67-025d-489f-8795-c311bc5405e9") + ) (segment (start 103.875 85.04) (end 104.775 84.14) @@ -21544,6 +22747,22 @@ (net 37) (uuid "d030f6b4-f38f-4a3c-a325-4c11f90dab2c") ) + (segment + (start 99.973 85.04) + (end 98.5012 83.5682) + (width 0.25) + (layer "F.Cu") + (net 37) + (uuid "da54e2b0-99ae-4c43-83d2-44691309b006") + ) + (segment + (start 105.6132 71.9698) + (end 106.2228 72.5794) + (width 0.25) + (layer "F.Cu") + (net 39) + (uuid "323a5da1-7d3f-4f11-a7ca-2499bc52be63") + ) (segment (start 113.284 83.564) (end 108.451 83.564) @@ -21560,6 +22779,54 @@ (net 39) (uuid "8638b31d-0250-47ca-b6c4-3f8cd126aeb5") ) + (segment + (start 106.2228 82.3976) + (end 107.875 84.0498) + (width 0.25) + (layer "F.Cu") + (net 39) + (uuid "91c6f403-8842-42bb-9309-52a87783111e") + ) + (segment + (start 107.875 84.0498) + (end 107.875 84.14) + (width 0.25) + (layer "F.Cu") + (net 39) + (uuid "9a6d12e6-af6b-4685-be41-cb1d415f2613") + ) + (segment + (start 105.6132 60.128) + (end 105.6132 71.9698) + (width 0.25) + (layer "F.Cu") + (net 39) + (uuid "d8e9b964-a52f-4d5f-9ef6-3d6f06201e83") + ) + (segment + (start 106.2228 72.5794) + (end 106.2228 82.3976) + (width 0.25) + (layer "F.Cu") + (net 39) + (uuid "eef4f995-ec0a-4aba-ac6a-d742e455165a") + ) + (segment + (start 110.6932 67.526196) + (end 110.6932 60.128) + (width 0.25) + (layer "F.Cu") + (net 40) + (uuid "113c7b59-8e2f-4a48-99da-c75effff0d04") + ) + (segment + (start 107.875 80.85) + (end 107.875 70.344396) + (width 0.25) + (layer "F.Cu") + (net 40) + (uuid "35023a3f-548b-4c63-a87e-59521fa1dee1") + ) (segment (start 108.589 81.564) (end 107.875 80.85) @@ -21576,6 +22843,14 @@ (net 40) (uuid "83f1e261-9309-4d4e-bff4-a1b669557184") ) + (segment + (start 107.875 70.344396) + (end 110.6932 67.526196) + (width 0.25) + (layer "F.Cu") + (net 40) + (uuid "8d0ca610-d02d-4c4c-80ad-9fac8a0c999c") + ) (zone (net 2) (net_name "GND") @@ -21800,18 +23075,18 @@ (xy 53.09504 107.611269) (xy 52.839573 107.83957) (xy 52.83957 107.839573) (xy 52.611269 108.09504) (xy 52.412998 108.374478) (xy 52.247263 108.674353) (xy 52.116146 108.990899) (xy 52.021297 109.320124) (xy 52.021295 109.320133) (xy 51.963905 109.657906) (xy 51.963903 109.657918) (xy 51.944693 110) - (xy 50 110) (xy 50 105.949752) (xy 63.1995 105.949752) (xy 63.211131 106.008229) (xy 63.211132 106.00823) - (xy 63.255447 106.074552) (xy 63.321769 106.118867) (xy 63.32177 106.118868) (xy 63.380247 106.130499) - (xy 63.38025 106.1305) (xy 63.380252 106.1305) (xy 65.11975 106.1305) (xy 65.119751 106.130499) - (xy 65.134568 106.127552) (xy 65.178229 106.118868) (xy 65.178229 106.118867) (xy 65.178231 106.118867) - (xy 65.244552 106.074552) (xy 65.288867 106.008231) (xy 65.288867 106.008229) (xy 65.288868 106.008229) - (xy 65.300499 105.949752) (xy 65.3005 105.94975) (xy 65.3005 105.08) (xy 65.734417 105.08) (xy 65.754699 105.285932) - (xy 65.7547 105.285934) (xy 65.814768 105.483954) (xy 65.912315 105.66645) (xy 65.912317 105.666452) - (xy 66.043589 105.82641) (xy 66.140209 105.905702) (xy 66.20355 105.957685) (xy 66.386046 106.055232) - (xy 66.584066 106.1153) (xy 66.584065 106.1153) (xy 66.602529 106.117118) (xy 66.79 106.135583) - (xy 66.995934 106.1153) (xy 67.193954 106.055232) (xy 67.37645 105.957685) (xy 67.53641 105.82641) - (xy 67.667685 105.66645) (xy 67.765232 105.483954) (xy 67.8253 105.285934) (xy 67.845583 105.08) - (xy 68.274417 105.08) (xy 68.294699 105.285932) (xy 68.2947 105.285934) (xy 68.354768 105.483954) + (xy 50 110) (xy 50 104.210247) (xy 63.1995 104.210247) (xy 63.1995 105.949752) (xy 63.211131 106.008229) + (xy 63.211132 106.00823) (xy 63.255447 106.074552) (xy 63.321769 106.118867) (xy 63.32177 106.118868) + (xy 63.380247 106.130499) (xy 63.38025 106.1305) (xy 63.380252 106.1305) (xy 65.11975 106.1305) + (xy 65.119751 106.130499) (xy 65.134568 106.127552) (xy 65.178229 106.118868) (xy 65.178229 106.118867) + (xy 65.178231 106.118867) (xy 65.244552 106.074552) (xy 65.288867 106.008231) (xy 65.288867 106.008229) + (xy 65.288868 106.008229) (xy 65.300499 105.949752) (xy 65.3005 105.94975) (xy 65.3005 105.08) (xy 65.734417 105.08) + (xy 65.754699 105.285932) (xy 65.7547 105.285934) (xy 65.814768 105.483954) (xy 65.912315 105.66645) + (xy 65.912317 105.666452) (xy 66.043589 105.82641) (xy 66.140209 105.905702) (xy 66.20355 105.957685) + (xy 66.386046 106.055232) (xy 66.584066 106.1153) (xy 66.584065 106.1153) (xy 66.602529 106.117118) + (xy 66.79 106.135583) (xy 66.995934 106.1153) (xy 67.193954 106.055232) (xy 67.37645 105.957685) + (xy 67.53641 105.82641) (xy 67.667685 105.66645) (xy 67.765232 105.483954) (xy 67.8253 105.285934) + (xy 67.845583 105.08) (xy 68.274417 105.08) (xy 68.294699 105.285932) (xy 68.2947 105.285934) (xy 68.354768 105.483954) (xy 68.452315 105.66645) (xy 68.452317 105.666452) (xy 68.583589 105.82641) (xy 68.680209 105.905702) (xy 68.74355 105.957685) (xy 68.926046 106.055232) (xy 69.124066 106.1153) (xy 69.124065 106.1153) (xy 69.142529 106.117118) (xy 69.33 106.135583) (xy 69.535934 106.1153) (xy 69.733954 106.055232) @@ -21820,7 +23095,10 @@ (xy 70.894768 105.483954) (xy 70.992315 105.66645) (xy 70.992317 105.666452) (xy 71.123589 105.82641) (xy 71.220209 105.905702) (xy 71.28355 105.957685) (xy 71.466046 106.055232) (xy 71.664066 106.1153) (xy 71.664065 106.1153) (xy 71.682529 106.117118) (xy 71.87 106.135583) (xy 72.075934 106.1153) - (xy 72.273954 106.055232) (xy 72.45645 105.957685) (xy 72.466116 105.949752) (xy 80.1995 105.949752) + (xy 72.273954 106.055232) (xy 72.45645 105.957685) (xy 72.61641 105.82641) (xy 72.747685 105.66645) + (xy 72.845232 105.483954) (xy 72.9053 105.285934) (xy 72.925583 105.08) (xy 72.9053 104.874066) + (xy 72.845232 104.676046) (xy 72.747685 104.49355) (xy 72.695702 104.430209) (xy 72.61641 104.333589) + (xy 72.466121 104.210252) (xy 72.466115 104.210247) (xy 80.1995 104.210247) (xy 80.1995 105.949752) (xy 80.211131 106.008229) (xy 80.211132 106.00823) (xy 80.255447 106.074552) (xy 80.321769 106.118867) (xy 80.32177 106.118868) (xy 80.380247 106.130499) (xy 80.38025 106.1305) (xy 80.380252 106.1305) (xy 82.11975 106.1305) (xy 82.119751 106.130499) (xy 82.134568 106.127552) (xy 82.178229 106.118868) @@ -21840,7 +23118,10 @@ (xy 87.8347 105.285934) (xy 87.894768 105.483954) (xy 87.992315 105.66645) (xy 87.992317 105.666452) (xy 88.123589 105.82641) (xy 88.220209 105.905702) (xy 88.28355 105.957685) (xy 88.466046 106.055232) (xy 88.664066 106.1153) (xy 88.664065 106.1153) (xy 88.682529 106.117118) (xy 88.87 106.135583) - (xy 89.075934 106.1153) (xy 89.273954 106.055232) (xy 89.45645 105.957685) (xy 89.466116 105.949752) + (xy 89.075934 106.1153) (xy 89.273954 106.055232) (xy 89.45645 105.957685) (xy 89.61641 105.82641) + (xy 89.747685 105.66645) (xy 89.845232 105.483954) (xy 89.9053 105.285934) (xy 89.925583 105.08) + (xy 89.9053 104.874066) (xy 89.845232 104.676046) (xy 89.747685 104.49355) (xy 89.695702 104.430209) + (xy 89.61641 104.333589) (xy 89.466121 104.210252) (xy 89.466115 104.210247) (xy 97.1995 104.210247) (xy 97.1995 105.949752) (xy 97.211131 106.008229) (xy 97.211132 106.00823) (xy 97.255447 106.074552) (xy 97.321769 106.118867) (xy 97.32177 106.118868) (xy 97.380247 106.130499) (xy 97.38025 106.1305) (xy 97.380252 106.1305) (xy 99.11975 106.1305) (xy 99.119751 106.130499) (xy 99.134568 106.127552) @@ -21861,7 +23142,10 @@ (xy 104.894768 105.483954) (xy 104.992315 105.66645) (xy 104.992317 105.666452) (xy 105.123589 105.82641) (xy 105.220209 105.905702) (xy 105.28355 105.957685) (xy 105.466046 106.055232) (xy 105.664066 106.1153) (xy 105.664065 106.1153) (xy 105.682529 106.117118) (xy 105.87 106.135583) (xy 106.075934 106.1153) - (xy 106.273954 106.055232) (xy 106.45645 105.957685) (xy 106.466116 105.949752) (xy 114.1995 105.949752) + (xy 106.273954 106.055232) (xy 106.45645 105.957685) (xy 106.61641 105.82641) (xy 106.747685 105.66645) + (xy 106.845232 105.483954) (xy 106.9053 105.285934) (xy 106.925583 105.08) (xy 106.9053 104.874066) + (xy 106.845232 104.676046) (xy 106.747685 104.49355) (xy 106.695702 104.430209) (xy 106.61641 104.333589) + (xy 106.466121 104.210252) (xy 106.466115 104.210247) (xy 114.1995 104.210247) (xy 114.1995 105.949752) (xy 114.211131 106.008229) (xy 114.211132 106.00823) (xy 114.255447 106.074552) (xy 114.321769 106.118867) (xy 114.32177 106.118868) (xy 114.380247 106.130499) (xy 114.38025 106.1305) (xy 114.380252 106.1305) (xy 116.11975 106.1305) (xy 116.119751 106.130499) (xy 116.134568 106.127552) (xy 116.178229 106.118868) @@ -21906,10 +23190,7 @@ (xy 116.17823 104.041132) (xy 116.178229 104.041131) (xy 116.119752 104.0295) (xy 116.119748 104.0295) (xy 114.380252 104.0295) (xy 114.380247 104.0295) (xy 114.32177 104.041131) (xy 114.321769 104.041132) (xy 114.255447 104.085447) (xy 114.211132 104.151769) (xy 114.211131 104.15177) (xy 114.1995 104.210247) - (xy 114.1995 105.949752) (xy 106.466116 105.949752) (xy 106.61641 105.82641) (xy 106.747685 105.66645) - (xy 106.845232 105.483954) (xy 106.9053 105.285934) (xy 106.925583 105.08) (xy 106.9053 104.874066) - (xy 106.845232 104.676046) (xy 106.747685 104.49355) (xy 106.695702 104.430209) (xy 106.61641 104.333589) - (xy 106.466121 104.210252) (xy 106.45645 104.202315) (xy 106.273954 104.104768) (xy 106.075934 104.0447) + (xy 106.466115 104.210247) (xy 106.45645 104.202315) (xy 106.273954 104.104768) (xy 106.075934 104.0447) (xy 106.075932 104.044699) (xy 106.075934 104.044699) (xy 105.87 104.024417) (xy 105.664067 104.044699) (xy 105.466043 104.104769) (xy 105.378114 104.151769) (xy 105.28355 104.202315) (xy 105.283548 104.202316) (xy 105.283547 104.202317) (xy 105.123589 104.333589) (xy 104.992317 104.493547) (xy 104.894769 104.676043) @@ -21929,10 +23210,7 @@ (xy 99.288868 104.15177) (xy 99.288867 104.151769) (xy 99.244552 104.085447) (xy 99.17823 104.041132) (xy 99.178229 104.041131) (xy 99.119752 104.0295) (xy 99.119748 104.0295) (xy 97.380252 104.0295) (xy 97.380247 104.0295) (xy 97.32177 104.041131) (xy 97.321769 104.041132) (xy 97.255447 104.085447) - (xy 97.211132 104.151769) (xy 97.211131 104.15177) (xy 97.1995 104.210247) (xy 97.1995 105.949752) - (xy 89.466116 105.949752) (xy 89.61641 105.82641) (xy 89.747685 105.66645) (xy 89.845232 105.483954) - (xy 89.9053 105.285934) (xy 89.925583 105.08) (xy 89.9053 104.874066) (xy 89.845232 104.676046) - (xy 89.747685 104.49355) (xy 89.695702 104.430209) (xy 89.61641 104.333589) (xy 89.466121 104.210252) + (xy 97.211132 104.151769) (xy 97.211131 104.15177) (xy 97.1995 104.210247) (xy 89.466115 104.210247) (xy 89.45645 104.202315) (xy 89.273954 104.104768) (xy 89.075934 104.0447) (xy 89.075932 104.044699) (xy 89.075934 104.044699) (xy 88.87 104.024417) (xy 88.664067 104.044699) (xy 88.466043 104.104769) (xy 88.378114 104.151769) (xy 88.28355 104.202315) (xy 88.283548 104.202316) (xy 88.283547 104.202317) @@ -21953,10 +23231,7 @@ (xy 82.244552 104.085447) (xy 82.17823 104.041132) (xy 82.178229 104.041131) (xy 82.119752 104.0295) (xy 82.119748 104.0295) (xy 80.380252 104.0295) (xy 80.380247 104.0295) (xy 80.32177 104.041131) (xy 80.321769 104.041132) (xy 80.255447 104.085447) (xy 80.211132 104.151769) (xy 80.211131 104.15177) - (xy 80.1995 104.210247) (xy 80.1995 105.949752) (xy 72.466116 105.949752) (xy 72.61641 105.82641) - (xy 72.747685 105.66645) (xy 72.845232 105.483954) (xy 72.9053 105.285934) (xy 72.925583 105.08) - (xy 72.9053 104.874066) (xy 72.845232 104.676046) (xy 72.747685 104.49355) (xy 72.695702 104.430209) - (xy 72.61641 104.333589) (xy 72.466121 104.210252) (xy 72.45645 104.202315) (xy 72.273954 104.104768) + (xy 80.1995 104.210247) (xy 72.466115 104.210247) (xy 72.45645 104.202315) (xy 72.273954 104.104768) (xy 72.075934 104.0447) (xy 72.075932 104.044699) (xy 72.075934 104.044699) (xy 71.87 104.024417) (xy 71.664067 104.044699) (xy 71.466043 104.104769) (xy 71.378114 104.151769) (xy 71.28355 104.202315) (xy 71.283548 104.202316) (xy 71.283547 104.202317) (xy 71.123589 104.333589) (xy 70.992317 104.493547) @@ -21977,107 +23252,108 @@ (xy 65.17823 104.041132) (xy 65.178229 104.041131) (xy 65.119752 104.0295) (xy 65.119748 104.0295) (xy 63.380252 104.0295) (xy 63.380247 104.0295) (xy 63.32177 104.041131) (xy 63.321769 104.041132) (xy 63.255447 104.085447) (xy 63.211132 104.151769) (xy 63.211131 104.15177) (xy 63.1995 104.210247) - (xy 63.1995 105.949752) (xy 50 105.949752) (xy 50 100.897844) (xy 62.9 100.897844) (xy 62.906401 100.957372) - (xy 62.906403 100.957379) (xy 62.956645 101.092086) (xy 62.956649 101.092093) (xy 63.042809 101.207187) - (xy 63.042812 101.20719) (xy 63.157906 101.29335) (xy 63.157913 101.293354) (xy 63.235617 101.322336) - (xy 63.291551 101.364207) (xy 63.315968 101.429672) (xy 63.301116 101.497945) (xy 63.261179 101.541617) - (xy 63.255448 101.545446) (xy 63.211132 101.611769) (xy 63.211131 101.61177) (xy 63.1995 101.670247) - (xy 63.1995 103.409752) (xy 63.211131 103.468229) (xy 63.211132 103.46823) (xy 63.255447 103.534552) - (xy 63.321769 103.578867) (xy 63.32177 103.578868) (xy 63.380247 103.590499) (xy 63.38025 103.5905) - (xy 63.380252 103.5905) (xy 65.11975 103.5905) (xy 65.119751 103.590499) (xy 65.134568 103.587552) - (xy 65.178229 103.578868) (xy 65.178229 103.578867) (xy 65.178231 103.578867) (xy 65.244552 103.534552) - (xy 65.288867 103.468231) (xy 65.288867 103.468229) (xy 65.288868 103.468229) (xy 65.300499 103.409752) - (xy 65.3005 103.40975) (xy 65.3005 103.2645) (xy 65.320185 103.197461) (xy 65.372989 103.151706) - (xy 65.4245 103.1405) (xy 65.865197 103.1405) (xy 65.932236 103.160185) (xy 65.96105 103.185835) - (xy 65.983335 103.212989) (xy 66.04359 103.28641) (xy 66.20355 103.417685) (xy 66.386046 103.515232) - (xy 66.584066 103.5753) (xy 66.584065 103.5753) (xy 66.602529 103.577118) (xy 66.79 103.595583) - (xy 66.995934 103.5753) (xy 67.193954 103.515232) (xy 67.37645 103.417685) (xy 67.53641 103.28641) - (xy 67.596665 103.212989) (xy 67.61895 103.185835) (xy 67.676695 103.146501) (xy 67.714803 103.1405) - (xy 68.405197 103.1405) (xy 68.472236 103.160185) (xy 68.50105 103.185835) (xy 68.523335 103.212989) - (xy 68.58359 103.28641) (xy 68.74355 103.417685) (xy 68.926046 103.515232) (xy 69.124066 103.5753) - (xy 69.124065 103.5753) (xy 69.142529 103.577118) (xy 69.33 103.595583) (xy 69.535934 103.5753) - (xy 69.733954 103.515232) (xy 69.91645 103.417685) (xy 70.07641 103.28641) (xy 70.136665 103.212989) - (xy 70.15895 103.185835) (xy 70.216695 103.146501) (xy 70.254803 103.1405) (xy 70.945197 103.1405) - (xy 71.012236 103.160185) (xy 71.04105 103.185835) (xy 71.063335 103.212989) (xy 71.12359 103.28641) - (xy 71.28355 103.417685) (xy 71.466046 103.515232) (xy 71.664066 103.5753) (xy 71.664065 103.5753) - (xy 71.682529 103.577118) (xy 71.87 103.595583) (xy 72.075934 103.5753) (xy 72.273954 103.515232) - (xy 72.45645 103.417685) (xy 72.61641 103.28641) (xy 72.676665 103.212989) (xy 72.69895 103.185835) - (xy 72.756695 103.146501) (xy 72.794803 103.1405) (xy 80.0755 103.1405) (xy 80.142539 103.160185) - (xy 80.188294 103.212989) (xy 80.1995 103.2645) (xy 80.1995 103.409752) (xy 80.211131 103.468229) - (xy 80.211132 103.46823) (xy 80.255447 103.534552) (xy 80.321769 103.578867) (xy 80.32177 103.578868) - (xy 80.380247 103.590499) (xy 80.38025 103.5905) (xy 80.380252 103.5905) (xy 82.11975 103.5905) - (xy 82.119751 103.590499) (xy 82.134568 103.587552) (xy 82.178229 103.578868) (xy 82.178229 103.578867) - (xy 82.178231 103.578867) (xy 82.244552 103.534552) (xy 82.288867 103.468231) (xy 82.288867 103.468229) - (xy 82.288868 103.468229) (xy 82.300499 103.409752) (xy 82.3005 103.40975) (xy 82.3005 103.2645) - (xy 82.320185 103.197461) (xy 82.372989 103.151706) (xy 82.4245 103.1405) (xy 82.865197 103.1405) - (xy 82.932236 103.160185) (xy 82.96105 103.185835) (xy 82.983335 103.212989) (xy 83.04359 103.28641) - (xy 83.20355 103.417685) (xy 83.386046 103.515232) (xy 83.584066 103.5753) (xy 83.584065 103.5753) - (xy 83.602529 103.577118) (xy 83.79 103.595583) (xy 83.995934 103.5753) (xy 84.193954 103.515232) - (xy 84.37645 103.417685) (xy 84.53641 103.28641) (xy 84.596665 103.212989) (xy 84.61895 103.185835) - (xy 84.676695 103.146501) (xy 84.714803 103.1405) (xy 85.405197 103.1405) (xy 85.472236 103.160185) - (xy 85.50105 103.185835) (xy 85.523335 103.212989) (xy 85.58359 103.28641) (xy 85.74355 103.417685) - (xy 85.926046 103.515232) (xy 86.124066 103.5753) (xy 86.124065 103.5753) (xy 86.142529 103.577118) - (xy 86.33 103.595583) (xy 86.535934 103.5753) (xy 86.733954 103.515232) (xy 86.91645 103.417685) - (xy 87.07641 103.28641) (xy 87.136665 103.212989) (xy 87.15895 103.185835) (xy 87.216695 103.146501) - (xy 87.254803 103.1405) (xy 87.945197 103.1405) (xy 88.012236 103.160185) (xy 88.04105 103.185835) - (xy 88.063335 103.212989) (xy 88.12359 103.28641) (xy 88.28355 103.417685) (xy 88.466046 103.515232) - (xy 88.664066 103.5753) (xy 88.664065 103.5753) (xy 88.682529 103.577118) (xy 88.87 103.595583) - (xy 89.075934 103.5753) (xy 89.273954 103.515232) (xy 89.45645 103.417685) (xy 89.61641 103.28641) - (xy 89.676665 103.212989) (xy 89.69895 103.185835) (xy 89.756695 103.146501) (xy 89.794803 103.1405) - (xy 97.0755 103.1405) (xy 97.142539 103.160185) (xy 97.188294 103.212989) (xy 97.1995 103.2645) - (xy 97.1995 103.409752) (xy 97.211131 103.468229) (xy 97.211132 103.46823) (xy 97.255447 103.534552) - (xy 97.321769 103.578867) (xy 97.32177 103.578868) (xy 97.380247 103.590499) (xy 97.38025 103.5905) - (xy 97.380252 103.5905) (xy 99.11975 103.5905) (xy 99.119751 103.590499) (xy 99.134568 103.587552) - (xy 99.178229 103.578868) (xy 99.178229 103.578867) (xy 99.178231 103.578867) (xy 99.244552 103.534552) - (xy 99.288867 103.468231) (xy 99.288867 103.468229) (xy 99.288868 103.468229) (xy 99.300499 103.409752) - (xy 99.3005 103.40975) (xy 99.3005 103.2645) (xy 99.320185 103.197461) (xy 99.372989 103.151706) - (xy 99.4245 103.1405) (xy 99.865197 103.1405) (xy 99.932236 103.160185) (xy 99.96105 103.185835) - (xy 99.983335 103.212989) (xy 100.04359 103.28641) (xy 100.20355 103.417685) (xy 100.386046 103.515232) - (xy 100.584066 103.5753) (xy 100.584065 103.5753) (xy 100.602529 103.577118) (xy 100.79 103.595583) - (xy 100.995934 103.5753) (xy 101.193954 103.515232) (xy 101.37645 103.417685) (xy 101.53641 103.28641) - (xy 101.596665 103.212989) (xy 101.61895 103.185835) (xy 101.676695 103.146501) (xy 101.714803 103.1405) - (xy 102.405197 103.1405) (xy 102.472236 103.160185) (xy 102.50105 103.185835) (xy 102.523335 103.212989) - (xy 102.58359 103.28641) (xy 102.74355 103.417685) (xy 102.926046 103.515232) (xy 103.124066 103.5753) - (xy 103.124065 103.5753) (xy 103.142529 103.577118) (xy 103.33 103.595583) (xy 103.535934 103.5753) - (xy 103.733954 103.515232) (xy 103.91645 103.417685) (xy 104.07641 103.28641) (xy 104.136665 103.212989) - (xy 104.15895 103.185835) (xy 104.216695 103.146501) (xy 104.254803 103.1405) (xy 104.945197 103.1405) - (xy 105.012236 103.160185) (xy 105.04105 103.185835) (xy 105.063335 103.212989) (xy 105.12359 103.28641) - (xy 105.28355 103.417685) (xy 105.466046 103.515232) (xy 105.664066 103.5753) (xy 105.664065 103.5753) - (xy 105.682529 103.577118) (xy 105.87 103.595583) (xy 106.075934 103.5753) (xy 106.273954 103.515232) - (xy 106.45645 103.417685) (xy 106.61641 103.28641) (xy 106.676665 103.212989) (xy 106.69895 103.185835) - (xy 106.756695 103.146501) (xy 106.794803 103.1405) (xy 114.0755 103.1405) (xy 114.142539 103.160185) - (xy 114.188294 103.212989) (xy 114.1995 103.2645) (xy 114.1995 103.409752) (xy 114.211131 103.468229) - (xy 114.211132 103.46823) (xy 114.255447 103.534552) (xy 114.321769 103.578867) (xy 114.32177 103.578868) - (xy 114.380247 103.590499) (xy 114.38025 103.5905) (xy 114.380252 103.5905) (xy 116.11975 103.5905) - (xy 116.119751 103.590499) (xy 116.134568 103.587552) (xy 116.178229 103.578868) (xy 116.178229 103.578867) - (xy 116.178231 103.578867) (xy 116.244552 103.534552) (xy 116.288867 103.468231) (xy 116.288867 103.468229) - (xy 116.288868 103.468229) (xy 116.300499 103.409752) (xy 116.3005 103.40975) (xy 116.3005 103.2645) - (xy 116.320185 103.197461) (xy 116.372989 103.151706) (xy 116.4245 103.1405) (xy 116.865197 103.1405) - (xy 116.932236 103.160185) (xy 116.96105 103.185835) (xy 116.983335 103.212989) (xy 117.04359 103.28641) - (xy 117.20355 103.417685) (xy 117.386046 103.515232) (xy 117.584066 103.5753) (xy 117.584065 103.5753) - (xy 117.602529 103.577118) (xy 117.79 103.595583) (xy 117.995934 103.5753) (xy 118.193954 103.515232) - (xy 118.37645 103.417685) (xy 118.53641 103.28641) (xy 118.596665 103.212989) (xy 118.61895 103.185835) - (xy 118.676695 103.146501) (xy 118.714803 103.1405) (xy 119.405197 103.1405) (xy 119.472236 103.160185) - (xy 119.50105 103.185835) (xy 119.523335 103.212989) (xy 119.58359 103.28641) (xy 119.74355 103.417685) - (xy 119.926046 103.515232) (xy 120.124066 103.5753) (xy 120.124065 103.5753) (xy 120.142529 103.577118) - (xy 120.33 103.595583) (xy 120.535934 103.5753) (xy 120.733954 103.515232) (xy 120.91645 103.417685) - (xy 121.07641 103.28641) (xy 121.136665 103.212989) (xy 121.15895 103.185835) (xy 121.216695 103.146501) - (xy 121.254803 103.1405) (xy 121.945197 103.1405) (xy 122.012236 103.160185) (xy 122.04105 103.185835) - (xy 122.063335 103.212989) (xy 122.12359 103.28641) (xy 122.28355 103.417685) (xy 122.466046 103.515232) - (xy 122.664066 103.5753) (xy 122.664065 103.5753) (xy 122.682529 103.577118) (xy 122.87 103.595583) - (xy 123.075934 103.5753) (xy 123.273954 103.515232) (xy 123.45645 103.417685) (xy 123.61641 103.28641) - (xy 123.747685 103.12645) (xy 123.845232 102.943954) (xy 123.9053 102.745934) (xy 123.925583 102.54) - (xy 123.9053 102.334066) (xy 123.845232 102.136046) (xy 123.747685 101.95355) (xy 123.676665 101.867011) - (xy 123.61641 101.793589) (xy 123.466121 101.670252) (xy 123.45645 101.662315) (xy 123.273954 101.564768) - (xy 123.207447 101.544593) (xy 123.149009 101.506296) (xy 123.120553 101.442484) (xy 123.131113 101.373417) - (xy 123.177337 101.321023) (xy 123.21135 101.306158) (xy 123.333483 101.273433) (xy 123.333492 101.273429) - (xy 123.547578 101.1736) (xy 123.741082 101.038105) (xy 123.908105 100.871082) (xy 124.0436 100.677578) - (xy 124.143429 100.463492) (xy 124.143432 100.463486) (xy 124.200636 100.25) (xy 123.303012 100.25) - (xy 123.335925 100.192993) (xy 123.37 100.065826) (xy 123.37 99.934174) (xy 123.335925 99.807007) - (xy 123.303012 99.75) (xy 124.200636 99.75) (xy 124.200635 99.749999) (xy 124.143432 99.536513) - (xy 124.143429 99.536507) (xy 124.0436 99.322422) (xy 124.043599 99.32242) (xy 123.908113 99.128926) - (xy 123.908108 99.12892) (xy 123.741082 98.961894) (xy 123.547578 98.826399) (xy 123.333492 98.72657) - (xy 123.333486 98.726567) (xy 123.12 98.669364) (xy 123.12 99.566988) (xy 123.062993 99.534075) + (xy 50 104.210247) (xy 50 99.102155) (xy 62.9 99.102155) (xy 62.9 99.75) (xy 63.816988 99.75) (xy 63.784075 99.807007) + (xy 63.75 99.934174) (xy 63.75 100.065826) (xy 63.784075 100.192993) (xy 63.816988 100.25) (xy 62.9 100.25) + (xy 62.9 100.897844) (xy 62.906401 100.957372) (xy 62.906403 100.957379) (xy 62.956645 101.092086) + (xy 62.956649 101.092093) (xy 63.042809 101.207187) (xy 63.042812 101.20719) (xy 63.157906 101.29335) + (xy 63.157913 101.293354) (xy 63.235617 101.322336) (xy 63.291551 101.364207) (xy 63.315968 101.429672) + (xy 63.301116 101.497945) (xy 63.261179 101.541617) (xy 63.255448 101.545446) (xy 63.211132 101.611769) + (xy 63.211131 101.61177) (xy 63.1995 101.670247) (xy 63.1995 103.409752) (xy 63.211131 103.468229) + (xy 63.211132 103.46823) (xy 63.255447 103.534552) (xy 63.321769 103.578867) (xy 63.32177 103.578868) + (xy 63.380247 103.590499) (xy 63.38025 103.5905) (xy 63.380252 103.5905) (xy 65.11975 103.5905) + (xy 65.119751 103.590499) (xy 65.134568 103.587552) (xy 65.178229 103.578868) (xy 65.178229 103.578867) + (xy 65.178231 103.578867) (xy 65.244552 103.534552) (xy 65.288867 103.468231) (xy 65.288867 103.468229) + (xy 65.288868 103.468229) (xy 65.300499 103.409752) (xy 65.3005 103.40975) (xy 65.3005 103.2645) + (xy 65.320185 103.197461) (xy 65.372989 103.151706) (xy 65.4245 103.1405) (xy 65.865197 103.1405) + (xy 65.932236 103.160185) (xy 65.96105 103.185835) (xy 65.983335 103.212989) (xy 66.04359 103.28641) + (xy 66.20355 103.417685) (xy 66.386046 103.515232) (xy 66.584066 103.5753) (xy 66.584065 103.5753) + (xy 66.602529 103.577118) (xy 66.79 103.595583) (xy 66.995934 103.5753) (xy 67.193954 103.515232) + (xy 67.37645 103.417685) (xy 67.53641 103.28641) (xy 67.596665 103.212989) (xy 67.61895 103.185835) + (xy 67.676695 103.146501) (xy 67.714803 103.1405) (xy 68.405197 103.1405) (xy 68.472236 103.160185) + (xy 68.50105 103.185835) (xy 68.523335 103.212989) (xy 68.58359 103.28641) (xy 68.74355 103.417685) + (xy 68.926046 103.515232) (xy 69.124066 103.5753) (xy 69.124065 103.5753) (xy 69.142529 103.577118) + (xy 69.33 103.595583) (xy 69.535934 103.5753) (xy 69.733954 103.515232) (xy 69.91645 103.417685) + (xy 70.07641 103.28641) (xy 70.136665 103.212989) (xy 70.15895 103.185835) (xy 70.216695 103.146501) + (xy 70.254803 103.1405) (xy 70.945197 103.1405) (xy 71.012236 103.160185) (xy 71.04105 103.185835) + (xy 71.063335 103.212989) (xy 71.12359 103.28641) (xy 71.28355 103.417685) (xy 71.466046 103.515232) + (xy 71.664066 103.5753) (xy 71.664065 103.5753) (xy 71.682529 103.577118) (xy 71.87 103.595583) + (xy 72.075934 103.5753) (xy 72.273954 103.515232) (xy 72.45645 103.417685) (xy 72.61641 103.28641) + (xy 72.676665 103.212989) (xy 72.69895 103.185835) (xy 72.756695 103.146501) (xy 72.794803 103.1405) + (xy 80.0755 103.1405) (xy 80.142539 103.160185) (xy 80.188294 103.212989) (xy 80.1995 103.2645) + (xy 80.1995 103.409752) (xy 80.211131 103.468229) (xy 80.211132 103.46823) (xy 80.255447 103.534552) + (xy 80.321769 103.578867) (xy 80.32177 103.578868) (xy 80.380247 103.590499) (xy 80.38025 103.5905) + (xy 80.380252 103.5905) (xy 82.11975 103.5905) (xy 82.119751 103.590499) (xy 82.134568 103.587552) + (xy 82.178229 103.578868) (xy 82.178229 103.578867) (xy 82.178231 103.578867) (xy 82.244552 103.534552) + (xy 82.288867 103.468231) (xy 82.288867 103.468229) (xy 82.288868 103.468229) (xy 82.300499 103.409752) + (xy 82.3005 103.40975) (xy 82.3005 103.2645) (xy 82.320185 103.197461) (xy 82.372989 103.151706) + (xy 82.4245 103.1405) (xy 82.865197 103.1405) (xy 82.932236 103.160185) (xy 82.96105 103.185835) + (xy 82.983335 103.212989) (xy 83.04359 103.28641) (xy 83.20355 103.417685) (xy 83.386046 103.515232) + (xy 83.584066 103.5753) (xy 83.584065 103.5753) (xy 83.602529 103.577118) (xy 83.79 103.595583) + (xy 83.995934 103.5753) (xy 84.193954 103.515232) (xy 84.37645 103.417685) (xy 84.53641 103.28641) + (xy 84.596665 103.212989) (xy 84.61895 103.185835) (xy 84.676695 103.146501) (xy 84.714803 103.1405) + (xy 85.405197 103.1405) (xy 85.472236 103.160185) (xy 85.50105 103.185835) (xy 85.523335 103.212989) + (xy 85.58359 103.28641) (xy 85.74355 103.417685) (xy 85.926046 103.515232) (xy 86.124066 103.5753) + (xy 86.124065 103.5753) (xy 86.142529 103.577118) (xy 86.33 103.595583) (xy 86.535934 103.5753) + (xy 86.733954 103.515232) (xy 86.91645 103.417685) (xy 87.07641 103.28641) (xy 87.136665 103.212989) + (xy 87.15895 103.185835) (xy 87.216695 103.146501) (xy 87.254803 103.1405) (xy 87.945197 103.1405) + (xy 88.012236 103.160185) (xy 88.04105 103.185835) (xy 88.063335 103.212989) (xy 88.12359 103.28641) + (xy 88.28355 103.417685) (xy 88.466046 103.515232) (xy 88.664066 103.5753) (xy 88.664065 103.5753) + (xy 88.682529 103.577118) (xy 88.87 103.595583) (xy 89.075934 103.5753) (xy 89.273954 103.515232) + (xy 89.45645 103.417685) (xy 89.61641 103.28641) (xy 89.676665 103.212989) (xy 89.69895 103.185835) + (xy 89.756695 103.146501) (xy 89.794803 103.1405) (xy 97.0755 103.1405) (xy 97.142539 103.160185) + (xy 97.188294 103.212989) (xy 97.1995 103.2645) (xy 97.1995 103.409752) (xy 97.211131 103.468229) + (xy 97.211132 103.46823) (xy 97.255447 103.534552) (xy 97.321769 103.578867) (xy 97.32177 103.578868) + (xy 97.380247 103.590499) (xy 97.38025 103.5905) (xy 97.380252 103.5905) (xy 99.11975 103.5905) + (xy 99.119751 103.590499) (xy 99.134568 103.587552) (xy 99.178229 103.578868) (xy 99.178229 103.578867) + (xy 99.178231 103.578867) (xy 99.244552 103.534552) (xy 99.288867 103.468231) (xy 99.288867 103.468229) + (xy 99.288868 103.468229) (xy 99.300499 103.409752) (xy 99.3005 103.40975) (xy 99.3005 103.2645) + (xy 99.320185 103.197461) (xy 99.372989 103.151706) (xy 99.4245 103.1405) (xy 99.865197 103.1405) + (xy 99.932236 103.160185) (xy 99.96105 103.185835) (xy 99.983335 103.212989) (xy 100.04359 103.28641) + (xy 100.20355 103.417685) (xy 100.386046 103.515232) (xy 100.584066 103.5753) (xy 100.584065 103.5753) + (xy 100.602529 103.577118) (xy 100.79 103.595583) (xy 100.995934 103.5753) (xy 101.193954 103.515232) + (xy 101.37645 103.417685) (xy 101.53641 103.28641) (xy 101.596665 103.212989) (xy 101.61895 103.185835) + (xy 101.676695 103.146501) (xy 101.714803 103.1405) (xy 102.405197 103.1405) (xy 102.472236 103.160185) + (xy 102.50105 103.185835) (xy 102.523335 103.212989) (xy 102.58359 103.28641) (xy 102.74355 103.417685) + (xy 102.926046 103.515232) (xy 103.124066 103.5753) (xy 103.124065 103.5753) (xy 103.142529 103.577118) + (xy 103.33 103.595583) (xy 103.535934 103.5753) (xy 103.733954 103.515232) (xy 103.91645 103.417685) + (xy 104.07641 103.28641) (xy 104.136665 103.212989) (xy 104.15895 103.185835) (xy 104.216695 103.146501) + (xy 104.254803 103.1405) (xy 104.945197 103.1405) (xy 105.012236 103.160185) (xy 105.04105 103.185835) + (xy 105.063335 103.212989) (xy 105.12359 103.28641) (xy 105.28355 103.417685) (xy 105.466046 103.515232) + (xy 105.664066 103.5753) (xy 105.664065 103.5753) (xy 105.682529 103.577118) (xy 105.87 103.595583) + (xy 106.075934 103.5753) (xy 106.273954 103.515232) (xy 106.45645 103.417685) (xy 106.61641 103.28641) + (xy 106.676665 103.212989) (xy 106.69895 103.185835) (xy 106.756695 103.146501) (xy 106.794803 103.1405) + (xy 114.0755 103.1405) (xy 114.142539 103.160185) (xy 114.188294 103.212989) (xy 114.1995 103.2645) + (xy 114.1995 103.409752) (xy 114.211131 103.468229) (xy 114.211132 103.46823) (xy 114.255447 103.534552) + (xy 114.321769 103.578867) (xy 114.32177 103.578868) (xy 114.380247 103.590499) (xy 114.38025 103.5905) + (xy 114.380252 103.5905) (xy 116.11975 103.5905) (xy 116.119751 103.590499) (xy 116.134568 103.587552) + (xy 116.178229 103.578868) (xy 116.178229 103.578867) (xy 116.178231 103.578867) (xy 116.244552 103.534552) + (xy 116.288867 103.468231) (xy 116.288867 103.468229) (xy 116.288868 103.468229) (xy 116.300499 103.409752) + (xy 116.3005 103.40975) (xy 116.3005 103.2645) (xy 116.320185 103.197461) (xy 116.372989 103.151706) + (xy 116.4245 103.1405) (xy 116.865197 103.1405) (xy 116.932236 103.160185) (xy 116.96105 103.185835) + (xy 116.983335 103.212989) (xy 117.04359 103.28641) (xy 117.20355 103.417685) (xy 117.386046 103.515232) + (xy 117.584066 103.5753) (xy 117.584065 103.5753) (xy 117.602529 103.577118) (xy 117.79 103.595583) + (xy 117.995934 103.5753) (xy 118.193954 103.515232) (xy 118.37645 103.417685) (xy 118.53641 103.28641) + (xy 118.596665 103.212989) (xy 118.61895 103.185835) (xy 118.676695 103.146501) (xy 118.714803 103.1405) + (xy 119.405197 103.1405) (xy 119.472236 103.160185) (xy 119.50105 103.185835) (xy 119.523335 103.212989) + (xy 119.58359 103.28641) (xy 119.74355 103.417685) (xy 119.926046 103.515232) (xy 120.124066 103.5753) + (xy 120.124065 103.5753) (xy 120.142529 103.577118) (xy 120.33 103.595583) (xy 120.535934 103.5753) + (xy 120.733954 103.515232) (xy 120.91645 103.417685) (xy 121.07641 103.28641) (xy 121.136665 103.212989) + (xy 121.15895 103.185835) (xy 121.216695 103.146501) (xy 121.254803 103.1405) (xy 121.945197 103.1405) + (xy 122.012236 103.160185) (xy 122.04105 103.185835) (xy 122.063335 103.212989) (xy 122.12359 103.28641) + (xy 122.28355 103.417685) (xy 122.466046 103.515232) (xy 122.664066 103.5753) (xy 122.664065 103.5753) + (xy 122.682529 103.577118) (xy 122.87 103.595583) (xy 123.075934 103.5753) (xy 123.273954 103.515232) + (xy 123.45645 103.417685) (xy 123.61641 103.28641) (xy 123.747685 103.12645) (xy 123.845232 102.943954) + (xy 123.9053 102.745934) (xy 123.925583 102.54) (xy 123.9053 102.334066) (xy 123.845232 102.136046) + (xy 123.747685 101.95355) (xy 123.676665 101.867011) (xy 123.61641 101.793589) (xy 123.466121 101.670252) + (xy 123.45645 101.662315) (xy 123.273954 101.564768) (xy 123.207447 101.544593) (xy 123.149009 101.506296) + (xy 123.120553 101.442484) (xy 123.131113 101.373417) (xy 123.177337 101.321023) (xy 123.21135 101.306158) + (xy 123.333483 101.273433) (xy 123.333492 101.273429) (xy 123.547578 101.1736) (xy 123.741082 101.038105) + (xy 123.908105 100.871082) (xy 124.0436 100.677578) (xy 124.143429 100.463492) (xy 124.143432 100.463486) + (xy 124.200636 100.25) (xy 123.303012 100.25) (xy 123.335925 100.192993) (xy 123.37 100.065826) + (xy 123.37 99.934174) (xy 123.335925 99.807007) (xy 123.303012 99.75) (xy 124.200636 99.75) (xy 124.200635 99.749999) + (xy 124.143432 99.536513) (xy 124.143429 99.536507) (xy 124.0436 99.322422) (xy 124.043599 99.32242) + (xy 123.908113 99.128926) (xy 123.908108 99.12892) (xy 123.741082 98.961894) (xy 123.547578 98.826399) + (xy 123.333492 98.72657) (xy 123.333486 98.726567) (xy 123.12 98.669364) (xy 123.12 99.566988) (xy 123.062993 99.534075) (xy 122.935826 99.5) (xy 122.804174 99.5) (xy 122.677007 99.534075) (xy 122.62 99.566988) (xy 122.62 98.669364) (xy 122.619999 98.669364) (xy 122.406513 98.726567) (xy 122.406507 98.72657) (xy 122.192422 98.826399) (xy 122.19242 98.8264) (xy 121.998926 98.961886) (xy 121.99892 98.961891) (xy 121.831891 99.12892) @@ -22222,110 +23498,10 @@ (xy 64.057007 99.534075) (xy 64 99.566988) (xy 64 98.65) (xy 63.352155 98.65) (xy 63.292627 98.656401) (xy 63.29262 98.656403) (xy 63.157913 98.706645) (xy 63.157906 98.706649) (xy 63.042812 98.792809) (xy 63.042809 98.792812) (xy 62.956649 98.907906) (xy 62.956645 98.907913) (xy 62.906403 99.04262) - (xy 62.906401 99.042627) (xy 62.9 99.102155) (xy 62.9 99.75) (xy 63.816988 99.75) (xy 63.784075 99.807007) - (xy 63.75 99.934174) (xy 63.75 100.065826) (xy 63.784075 100.192993) (xy 63.816988 100.25) (xy 62.9 100.25) - (xy 62.9 100.897844) (xy 50 100.897844) (xy 50 92.897844) (xy 108.65 92.897844) (xy 108.656401 92.957372) - (xy 108.656403 92.957379) (xy 108.706645 93.092086) (xy 108.706649 93.092093) (xy 108.792809 93.207187) - (xy 108.792812 93.20719) (xy 108.907906 93.29335) (xy 108.907913 93.293354) (xy 109.04262 93.343596) - (xy 109.042627 93.343598) (xy 109.102155 93.349999) (xy 109.102172 93.35) (xy 109.75 93.35) (xy 109.75 92.433012) - (xy 109.807007 92.465925) (xy 109.934174 92.5) (xy 110.065826 92.5) (xy 110.192993 92.465925) (xy 110.25 92.433012) - (xy 110.25 93.35) (xy 110.897828 93.35) (xy 110.897844 93.349999) (xy 110.957372 93.343598) (xy 110.957379 93.343596) - (xy 111.092086 93.293354) (xy 111.092093 93.29335) (xy 111.207187 93.20719) (xy 111.20719 93.207187) - (xy 111.29335 93.092093) (xy 111.293354 93.092086) (xy 111.342614 92.960013) (xy 111.384485 92.904079) - (xy 111.449949 92.879662) (xy 111.518222 92.894513) (xy 111.546477 92.915665) (xy 111.668917 93.038105) - (xy 111.862421 93.1736) (xy 112.076507 93.273429) (xy 112.076516 93.273433) (xy 112.29 93.330634) - (xy 112.29 92.433012) (xy 112.347007 92.465925) (xy 112.474174 92.5) (xy 112.605826 92.5) (xy 112.732993 92.465925) - (xy 112.79 92.433012) (xy 112.79 93.330633) (xy 113.003483 93.273433) (xy 113.003492 93.273429) - (xy 113.217578 93.1736) (xy 113.411082 93.038105) (xy 113.578105 92.871082) (xy 113.708425 92.684968) - (xy 113.763002 92.641344) (xy 113.832501 92.634151) (xy 113.894855 92.665673) (xy 113.911575 92.684968) - (xy 114.041894 92.871082) (xy 114.208917 93.038105) (xy 114.402421 93.1736) (xy 114.616507 93.273429) - (xy 114.616516 93.273433) (xy 114.83 93.330634) (xy 114.83 92.433012) (xy 114.887007 92.465925) - (xy 115.014174 92.5) (xy 115.145826 92.5) (xy 115.272993 92.465925) (xy 115.33 92.433012) (xy 115.33 93.330633) - (xy 115.543483 93.273433) (xy 115.543492 93.273429) (xy 115.757578 93.1736) (xy 115.951082 93.038105) - (xy 116.118105 92.871082) (xy 116.248425 92.684968) (xy 116.303002 92.641344) (xy 116.372501 92.634151) - (xy 116.434855 92.665673) (xy 116.451575 92.684968) (xy 116.581894 92.871082) (xy 116.748917 93.038105) - (xy 116.942421 93.1736) (xy 117.156507 93.273429) (xy 117.156516 93.273433) (xy 117.37 93.330634) - (xy 117.37 92.433012) (xy 117.427007 92.465925) (xy 117.554174 92.5) (xy 117.685826 92.5) (xy 117.812993 92.465925) - (xy 117.87 92.433012) (xy 117.87 93.330633) (xy 118.083483 93.273433) (xy 118.083492 93.273429) - (xy 118.297578 93.1736) (xy 118.491082 93.038105) (xy 118.658105 92.871082) (xy 118.659036 92.869752) - (xy 125.9495 92.869752) (xy 125.961131 92.928229) (xy 125.961132 92.92823) (xy 126.005447 92.994552) - (xy 126.071769 93.038867) (xy 126.07177 93.038868) (xy 126.130247 93.050499) (xy 126.13025 93.0505) - (xy 126.130252 93.0505) (xy 127.86975 93.0505) (xy 127.869751 93.050499) (xy 127.884568 93.047552) - (xy 127.928229 93.038868) (xy 127.928229 93.038867) (xy 127.928231 93.038867) (xy 127.994552 92.994552) - (xy 128.038867 92.928231) (xy 128.038867 92.928229) (xy 128.038868 92.928229) (xy 128.048922 92.877682) - (xy 128.0505 92.869748) (xy 128.0505 92) (xy 128.484417 92) (xy 128.504699 92.205932) (xy 128.5047 92.205934) - (xy 128.564768 92.403954) (xy 128.662315 92.58645) (xy 128.662317 92.586452) (xy 128.793589 92.74641) - (xy 128.890209 92.825702) (xy 128.95355 92.877685) (xy 129.136046 92.975232) (xy 129.334066 93.0353) - (xy 129.334065 93.0353) (xy 129.352529 93.037118) (xy 129.54 93.055583) (xy 129.745934 93.0353) - (xy 129.943954 92.975232) (xy 130.12645 92.877685) (xy 130.28641 92.74641) (xy 130.417685 92.58645) - (xy 130.515232 92.403954) (xy 130.5753 92.205934) (xy 130.595583 92) (xy 131.024417 92) (xy 131.044699 92.205932) - (xy 131.0447 92.205934) (xy 131.104768 92.403954) (xy 131.202315 92.58645) (xy 131.202317 92.586452) - (xy 131.333589 92.74641) (xy 131.430209 92.825702) (xy 131.49355 92.877685) (xy 131.676046 92.975232) - (xy 131.874066 93.0353) (xy 131.874065 93.0353) (xy 131.892529 93.037118) (xy 132.08 93.055583) - (xy 132.285934 93.0353) (xy 132.483954 92.975232) (xy 132.66645 92.877685) (xy 132.82641 92.74641) - (xy 132.957685 92.58645) (xy 133.055232 92.403954) (xy 133.1153 92.205934) (xy 133.135583 92) (xy 133.564417 92) - (xy 133.584699 92.205932) (xy 133.5847 92.205934) (xy 133.644768 92.403954) (xy 133.742315 92.58645) - (xy 133.742317 92.586452) (xy 133.873589 92.74641) (xy 133.970209 92.825702) (xy 134.03355 92.877685) - (xy 134.216046 92.975232) (xy 134.414066 93.0353) (xy 134.414065 93.0353) (xy 134.432529 93.037118) - (xy 134.62 93.055583) (xy 134.825934 93.0353) (xy 135.023954 92.975232) (xy 135.20645 92.877685) - (xy 135.36641 92.74641) (xy 135.497685 92.58645) (xy 135.595232 92.403954) (xy 135.6553 92.205934) - (xy 135.675583 92) (xy 135.6553 91.794066) (xy 135.595232 91.596046) (xy 135.497685 91.41355) (xy 135.416833 91.315031) - (xy 135.36641 91.253589) (xy 135.216121 91.130252) (xy 135.20645 91.122315) (xy 135.023954 91.024768) - (xy 134.825934 90.9647) (xy 134.825932 90.964699) (xy 134.825934 90.964699) (xy 134.62 90.944417) - (xy 134.414067 90.964699) (xy 134.216043 91.024769) (xy 134.182634 91.042627) (xy 134.03355 91.122315) - (xy 134.033548 91.122316) (xy 134.033547 91.122317) (xy 133.873589 91.253589) (xy 133.742317 91.413547) - (xy 133.644769 91.596043) (xy 133.584699 91.794067) (xy 133.564417 92) (xy 133.135583 92) (xy 133.1153 91.794066) - (xy 133.055232 91.596046) (xy 132.957685 91.41355) (xy 132.876833 91.315031) (xy 132.82641 91.253589) - (xy 132.676121 91.130252) (xy 132.66645 91.122315) (xy 132.483954 91.024768) (xy 132.285934 90.9647) - (xy 132.285932 90.964699) (xy 132.285934 90.964699) (xy 132.08 90.944417) (xy 131.874067 90.964699) - (xy 131.676043 91.024769) (xy 131.642634 91.042627) (xy 131.49355 91.122315) (xy 131.493548 91.122316) - (xy 131.493547 91.122317) (xy 131.333589 91.253589) (xy 131.202317 91.413547) (xy 131.104769 91.596043) - (xy 131.044699 91.794067) (xy 131.024417 92) (xy 130.595583 92) (xy 130.5753 91.794066) (xy 130.515232 91.596046) - (xy 130.417685 91.41355) (xy 130.336833 91.315031) (xy 130.28641 91.253589) (xy 130.136121 91.130252) - (xy 130.12645 91.122315) (xy 129.943954 91.024768) (xy 129.745934 90.9647) (xy 129.745932 90.964699) - (xy 129.745934 90.964699) (xy 129.54 90.944417) (xy 129.334067 90.964699) (xy 129.136043 91.024769) - (xy 129.102634 91.042627) (xy 128.95355 91.122315) (xy 128.953548 91.122316) (xy 128.953547 91.122317) - (xy 128.793589 91.253589) (xy 128.662317 91.413547) (xy 128.564769 91.596043) (xy 128.504699 91.794067) - (xy 128.484417 92) (xy 128.0505 92) (xy 128.0505 91.130252) (xy 128.0505 91.130249) (xy 128.050499 91.130247) - (xy 128.038868 91.07177) (xy 128.038867 91.071769) (xy 127.994552 91.005447) (xy 127.92823 90.961132) - (xy 127.928229 90.961131) (xy 127.869752 90.9495) (xy 127.869748 90.9495) (xy 126.130252 90.9495) - (xy 126.130247 90.9495) (xy 126.07177 90.961131) (xy 126.071769 90.961132) (xy 126.005447 91.005447) - (xy 125.961132 91.071769) (xy 125.961131 91.07177) (xy 125.9495 91.130247) (xy 125.9495 92.869752) - (xy 118.659036 92.869752) (xy 118.7936 92.677578) (xy 118.893429 92.463492) (xy 118.893432 92.463486) - (xy 118.950636 92.25) (xy 118.053012 92.25) (xy 118.085925 92.192993) (xy 118.12 92.065826) (xy 118.12 91.934174) - (xy 118.085925 91.807007) (xy 118.053012 91.75) (xy 118.950636 91.75) (xy 118.950635 91.749999) - (xy 118.893432 91.536513) (xy 118.893429 91.536507) (xy 118.7936 91.322422) (xy 118.793599 91.32242) - (xy 118.658113 91.128926) (xy 118.658108 91.12892) (xy 118.491082 90.961894) (xy 118.297578 90.826399) - (xy 118.083492 90.72657) (xy 118.083486 90.726567) (xy 117.87 90.669364) (xy 117.87 91.566988) (xy 117.812993 91.534075) - (xy 117.685826 91.5) (xy 117.554174 91.5) (xy 117.427007 91.534075) (xy 117.37 91.566988) (xy 117.37 90.669364) - (xy 117.369999 90.669364) (xy 117.156513 90.726567) (xy 117.156507 90.72657) (xy 116.942422 90.826399) - (xy 116.94242 90.8264) (xy 116.748926 90.961886) (xy 116.74892 90.961891) (xy 116.581891 91.12892) - (xy 116.58189 91.128922) (xy 116.451575 91.315031) (xy 116.396998 91.358655) (xy 116.327499 91.365848) - (xy 116.265145 91.334326) (xy 116.248425 91.315031) (xy 116.118109 91.128922) (xy 116.118108 91.12892) - (xy 115.951082 90.961894) (xy 115.757578 90.826399) (xy 115.543492 90.72657) (xy 115.543486 90.726567) - (xy 115.33 90.669364) (xy 115.33 91.566988) (xy 115.272993 91.534075) (xy 115.145826 91.5) (xy 115.014174 91.5) - (xy 114.887007 91.534075) (xy 114.83 91.566988) (xy 114.83 90.669364) (xy 114.829999 90.669364) - (xy 114.616513 90.726567) (xy 114.616507 90.72657) (xy 114.402422 90.826399) (xy 114.40242 90.8264) - (xy 114.208926 90.961886) (xy 114.20892 90.961891) (xy 114.041891 91.12892) (xy 114.04189 91.128922) - (xy 113.911575 91.315031) (xy 113.856998 91.358655) (xy 113.787499 91.365848) (xy 113.725145 91.334326) - (xy 113.708425 91.315031) (xy 113.578109 91.128922) (xy 113.578108 91.12892) (xy 113.411082 90.961894) - (xy 113.217578 90.826399) (xy 113.003492 90.72657) (xy 113.003486 90.726567) (xy 112.79 90.669364) - (xy 112.79 91.566988) (xy 112.732993 91.534075) (xy 112.605826 91.5) (xy 112.474174 91.5) (xy 112.347007 91.534075) - (xy 112.29 91.566988) (xy 112.29 90.669364) (xy 112.289999 90.669364) (xy 112.076513 90.726567) - (xy 112.076507 90.72657) (xy 111.862422 90.826399) (xy 111.86242 90.8264) (xy 111.668926 90.961886) - (xy 111.546477 91.084335) (xy 111.485154 91.117819) (xy 111.415462 91.112835) (xy 111.359529 91.070963) - (xy 111.342614 91.039986) (xy 111.293354 90.907913) (xy 111.29335 90.907906) (xy 111.20719 90.792812) - (xy 111.207187 90.792809) (xy 111.092093 90.706649) (xy 111.092086 90.706645) (xy 110.957379 90.656403) - (xy 110.957372 90.656401) (xy 110.897844 90.65) (xy 110.25 90.65) (xy 110.25 91.566988) (xy 110.192993 91.534075) - (xy 110.065826 91.5) (xy 109.934174 91.5) (xy 109.807007 91.534075) (xy 109.75 91.566988) (xy 109.75 90.65) - (xy 109.102155 90.65) (xy 109.042627 90.656401) (xy 109.04262 90.656403) (xy 108.907913 90.706645) - (xy 108.907906 90.706649) (xy 108.792812 90.792809) (xy 108.792809 90.792812) (xy 108.706649 90.907906) - (xy 108.706645 90.907913) (xy 108.656403 91.04262) (xy 108.656401 91.042627) (xy 108.65 91.102155) - (xy 108.65 91.75) (xy 109.566988 91.75) (xy 109.534075 91.807007) (xy 109.5 91.934174) (xy 109.5 92.065826) - (xy 109.534075 92.192993) (xy 109.566988 92.25) (xy 108.65 92.25) (xy 108.65 92.897844) (xy 50 92.897844) - (xy 50 91.39) (xy 50.887417 91.39) (xy 50.907699 91.595932) (xy 50.9077 91.595934) (xy 50.967768 91.793954) - (xy 51.065315 91.97645) (xy 51.065317 91.976452) (xy 51.196589 92.13641) (xy 51.265537 92.192993) - (xy 51.35655 92.267685) (xy 51.539046 92.365232) (xy 51.737066 92.4253) (xy 51.737065 92.4253) (xy 51.755529 92.427118) + (xy 62.906401 99.042627) (xy 62.9 99.102155) (xy 50 99.102155) (xy 50 91.39) (xy 50.887417 91.39) + (xy 50.907699 91.595932) (xy 50.9077 91.595934) (xy 50.967768 91.793954) (xy 51.065315 91.97645) + (xy 51.065317 91.976452) (xy 51.196589 92.13641) (xy 51.265537 92.192993) (xy 51.35655 92.267685) + (xy 51.539046 92.365232) (xy 51.737066 92.4253) (xy 51.737065 92.4253) (xy 51.755529 92.427118) (xy 51.943 92.445583) (xy 52.148934 92.4253) (xy 52.346954 92.365232) (xy 52.52945 92.267685) (xy 52.68941 92.13641) (xy 52.820685 91.97645) (xy 52.918232 91.793954) (xy 52.9783 91.595934) (xy 52.998583 91.39) (xy 53.427417 91.39) (xy 53.447699 91.595932) (xy 53.4477 91.595934) (xy 53.507768 91.793954) (xy 53.605315 91.97645) @@ -22439,16 +23615,115 @@ (xy 99.799046 92.365232) (xy 99.997066 92.4253) (xy 99.997065 92.4253) (xy 100.015529 92.427118) (xy 100.203 92.445583) (xy 100.408934 92.4253) (xy 100.606954 92.365232) (xy 100.78945 92.267685) (xy 100.94941 92.13641) (xy 101.080685 91.97645) (xy 101.178232 91.793954) (xy 101.2383 91.595934) - (xy 101.258583 91.39) (xy 101.2383 91.184066) (xy 101.178232 90.986046) (xy 101.080685 90.80355) - (xy 101.001158 90.706645) (xy 100.94941 90.643589) (xy 100.789452 90.512317) (xy 100.789453 90.512317) - (xy 100.78945 90.512315) (xy 100.606954 90.414768) (xy 100.408934 90.3547) (xy 100.408932 90.354699) - (xy 100.408934 90.354699) (xy 100.203 90.334417) (xy 99.997067 90.354699) (xy 99.799043 90.414769) - (xy 99.765634 90.432627) (xy 99.61655 90.512315) (xy 99.616548 90.512316) (xy 99.616547 90.512317) - (xy 99.456589 90.643589) (xy 99.334127 90.792812) (xy 99.325315 90.80355) (xy 99.286643 90.875898) - (xy 99.227769 90.986043) (xy 99.167699 91.184067) (xy 99.147417 91.39) (xy 98.718583 91.39) (xy 98.6983 91.184066) - (xy 98.638232 90.986046) (xy 98.540685 90.80355) (xy 98.461158 90.706645) (xy 98.40941 90.643589) - (xy 98.249452 90.512317) (xy 98.249453 90.512317) (xy 98.24945 90.512315) (xy 98.066954 90.414768) - (xy 97.868934 90.3547) (xy 97.868932 90.354699) (xy 97.868934 90.354699) (xy 97.663 90.334417) (xy 97.457067 90.354699) + (xy 101.258583 91.39) (xy 101.2383 91.184066) (xy 101.213453 91.102155) (xy 108.65 91.102155) (xy 108.65 91.75) + (xy 109.566988 91.75) (xy 109.534075 91.807007) (xy 109.5 91.934174) (xy 109.5 92.065826) (xy 109.534075 92.192993) + (xy 109.566988 92.25) (xy 108.65 92.25) (xy 108.65 92.897844) (xy 108.656401 92.957372) (xy 108.656403 92.957379) + (xy 108.706645 93.092086) (xy 108.706649 93.092093) (xy 108.792809 93.207187) (xy 108.792812 93.20719) + (xy 108.907906 93.29335) (xy 108.907913 93.293354) (xy 109.04262 93.343596) (xy 109.042627 93.343598) + (xy 109.102155 93.349999) (xy 109.102172 93.35) (xy 109.75 93.35) (xy 109.75 92.433012) (xy 109.807007 92.465925) + (xy 109.934174 92.5) (xy 110.065826 92.5) (xy 110.192993 92.465925) (xy 110.25 92.433012) (xy 110.25 93.35) + (xy 110.897828 93.35) (xy 110.897844 93.349999) (xy 110.957372 93.343598) (xy 110.957379 93.343596) + (xy 111.092086 93.293354) (xy 111.092093 93.29335) (xy 111.207187 93.20719) (xy 111.20719 93.207187) + (xy 111.29335 93.092093) (xy 111.293354 93.092086) (xy 111.342614 92.960013) (xy 111.384485 92.904079) + (xy 111.449949 92.879662) (xy 111.518222 92.894513) (xy 111.546477 92.915665) (xy 111.668917 93.038105) + (xy 111.862421 93.1736) (xy 112.076507 93.273429) (xy 112.076516 93.273433) (xy 112.29 93.330634) + (xy 112.29 92.433012) (xy 112.347007 92.465925) (xy 112.474174 92.5) (xy 112.605826 92.5) (xy 112.732993 92.465925) + (xy 112.79 92.433012) (xy 112.79 93.330633) (xy 113.003483 93.273433) (xy 113.003492 93.273429) + (xy 113.217578 93.1736) (xy 113.411082 93.038105) (xy 113.578105 92.871082) (xy 113.708425 92.684968) + (xy 113.763002 92.641344) (xy 113.832501 92.634151) (xy 113.894855 92.665673) (xy 113.911575 92.684968) + (xy 114.041894 92.871082) (xy 114.208917 93.038105) (xy 114.402421 93.1736) (xy 114.616507 93.273429) + (xy 114.616516 93.273433) (xy 114.83 93.330634) (xy 114.83 92.433012) (xy 114.887007 92.465925) + (xy 115.014174 92.5) (xy 115.145826 92.5) (xy 115.272993 92.465925) (xy 115.33 92.433012) (xy 115.33 93.330633) + (xy 115.543483 93.273433) (xy 115.543492 93.273429) (xy 115.757578 93.1736) (xy 115.951082 93.038105) + (xy 116.118105 92.871082) (xy 116.248425 92.684968) (xy 116.303002 92.641344) (xy 116.372501 92.634151) + (xy 116.434855 92.665673) (xy 116.451575 92.684968) (xy 116.581894 92.871082) (xy 116.748917 93.038105) + (xy 116.942421 93.1736) (xy 117.156507 93.273429) (xy 117.156516 93.273433) (xy 117.37 93.330634) + (xy 117.37 92.433012) (xy 117.427007 92.465925) (xy 117.554174 92.5) (xy 117.685826 92.5) (xy 117.812993 92.465925) + (xy 117.87 92.433012) (xy 117.87 93.330633) (xy 118.083483 93.273433) (xy 118.083492 93.273429) + (xy 118.297578 93.1736) (xy 118.491082 93.038105) (xy 118.658105 92.871082) (xy 118.7936 92.677578) + (xy 118.893429 92.463492) (xy 118.893432 92.463486) (xy 118.950636 92.25) (xy 118.053012 92.25) + (xy 118.085925 92.192993) (xy 118.12 92.065826) (xy 118.12 91.934174) (xy 118.085925 91.807007) + (xy 118.053012 91.75) (xy 118.950636 91.75) (xy 118.950635 91.749999) (xy 118.893432 91.536513) + (xy 118.893429 91.536507) (xy 118.7936 91.322422) (xy 118.793599 91.32242) (xy 118.659038 91.130247) + (xy 125.9495 91.130247) (xy 125.9495 92.869752) (xy 125.961131 92.928229) (xy 125.961132 92.92823) + (xy 126.005447 92.994552) (xy 126.071769 93.038867) (xy 126.07177 93.038868) (xy 126.130247 93.050499) + (xy 126.13025 93.0505) (xy 126.130252 93.0505) (xy 127.86975 93.0505) (xy 127.869751 93.050499) + (xy 127.884568 93.047552) (xy 127.928229 93.038868) (xy 127.928229 93.038867) (xy 127.928231 93.038867) + (xy 127.994552 92.994552) (xy 128.038867 92.928231) (xy 128.038867 92.928229) (xy 128.038868 92.928229) + (xy 128.048922 92.877682) (xy 128.0505 92.869748) (xy 128.0505 92) (xy 128.484417 92) (xy 128.504699 92.205932) + (xy 128.5047 92.205934) (xy 128.564768 92.403954) (xy 128.662315 92.58645) (xy 128.662317 92.586452) + (xy 128.793589 92.74641) (xy 128.890209 92.825702) (xy 128.95355 92.877685) (xy 129.136046 92.975232) + (xy 129.334066 93.0353) (xy 129.334065 93.0353) (xy 129.352529 93.037118) (xy 129.54 93.055583) + (xy 129.745934 93.0353) (xy 129.943954 92.975232) (xy 130.12645 92.877685) (xy 130.28641 92.74641) + (xy 130.417685 92.58645) (xy 130.515232 92.403954) (xy 130.5753 92.205934) (xy 130.595583 92) (xy 131.024417 92) + (xy 131.044699 92.205932) (xy 131.0447 92.205934) (xy 131.104768 92.403954) (xy 131.202315 92.58645) + (xy 131.202317 92.586452) (xy 131.333589 92.74641) (xy 131.430209 92.825702) (xy 131.49355 92.877685) + (xy 131.676046 92.975232) (xy 131.874066 93.0353) (xy 131.874065 93.0353) (xy 131.892529 93.037118) + (xy 132.08 93.055583) (xy 132.285934 93.0353) (xy 132.483954 92.975232) (xy 132.66645 92.877685) + (xy 132.82641 92.74641) (xy 132.957685 92.58645) (xy 133.055232 92.403954) (xy 133.1153 92.205934) + (xy 133.135583 92) (xy 133.564417 92) (xy 133.584699 92.205932) (xy 133.5847 92.205934) (xy 133.644768 92.403954) + (xy 133.742315 92.58645) (xy 133.742317 92.586452) (xy 133.873589 92.74641) (xy 133.970209 92.825702) + (xy 134.03355 92.877685) (xy 134.216046 92.975232) (xy 134.414066 93.0353) (xy 134.414065 93.0353) + (xy 134.432529 93.037118) (xy 134.62 93.055583) (xy 134.825934 93.0353) (xy 135.023954 92.975232) + (xy 135.20645 92.877685) (xy 135.36641 92.74641) (xy 135.497685 92.58645) (xy 135.595232 92.403954) + (xy 135.6553 92.205934) (xy 135.675583 92) (xy 135.6553 91.794066) (xy 135.595232 91.596046) (xy 135.497685 91.41355) + (xy 135.416833 91.315031) (xy 135.36641 91.253589) (xy 135.216121 91.130252) (xy 135.20645 91.122315) + (xy 135.023954 91.024768) (xy 134.825934 90.9647) (xy 134.825932 90.964699) (xy 134.825934 90.964699) + (xy 134.62 90.944417) (xy 134.414067 90.964699) (xy 134.216043 91.024769) (xy 134.182634 91.042627) + (xy 134.03355 91.122315) (xy 134.033548 91.122316) (xy 134.033547 91.122317) (xy 133.873589 91.253589) + (xy 133.742317 91.413547) (xy 133.644769 91.596043) (xy 133.584699 91.794067) (xy 133.564417 92) + (xy 133.135583 92) (xy 133.1153 91.794066) (xy 133.055232 91.596046) (xy 132.957685 91.41355) (xy 132.876833 91.315031) + (xy 132.82641 91.253589) (xy 132.676121 91.130252) (xy 132.66645 91.122315) (xy 132.483954 91.024768) + (xy 132.285934 90.9647) (xy 132.285932 90.964699) (xy 132.285934 90.964699) (xy 132.08 90.944417) + (xy 131.874067 90.964699) (xy 131.676043 91.024769) (xy 131.642634 91.042627) (xy 131.49355 91.122315) + (xy 131.493548 91.122316) (xy 131.493547 91.122317) (xy 131.333589 91.253589) (xy 131.202317 91.413547) + (xy 131.104769 91.596043) (xy 131.044699 91.794067) (xy 131.024417 92) (xy 130.595583 92) (xy 130.5753 91.794066) + (xy 130.515232 91.596046) (xy 130.417685 91.41355) (xy 130.336833 91.315031) (xy 130.28641 91.253589) + (xy 130.136121 91.130252) (xy 130.12645 91.122315) (xy 129.943954 91.024768) (xy 129.745934 90.9647) + (xy 129.745932 90.964699) (xy 129.745934 90.964699) (xy 129.54 90.944417) (xy 129.334067 90.964699) + (xy 129.136043 91.024769) (xy 129.102634 91.042627) (xy 128.95355 91.122315) (xy 128.953548 91.122316) + (xy 128.953547 91.122317) (xy 128.793589 91.253589) (xy 128.662317 91.413547) (xy 128.564769 91.596043) + (xy 128.504699 91.794067) (xy 128.484417 92) (xy 128.0505 92) (xy 128.0505 91.130252) (xy 128.0505 91.130249) + (xy 128.050499 91.130247) (xy 128.038868 91.07177) (xy 128.038867 91.071769) (xy 127.994552 91.005447) + (xy 127.92823 90.961132) (xy 127.928229 90.961131) (xy 127.869752 90.9495) (xy 127.869748 90.9495) + (xy 126.130252 90.9495) (xy 126.130247 90.9495) (xy 126.07177 90.961131) (xy 126.071769 90.961132) + (xy 126.005447 91.005447) (xy 125.961132 91.071769) (xy 125.961131 91.07177) (xy 125.9495 91.130247) + (xy 118.659038 91.130247) (xy 118.658113 91.128926) (xy 118.658108 91.12892) (xy 118.491082 90.961894) + (xy 118.297578 90.826399) (xy 118.083492 90.72657) (xy 118.083486 90.726567) (xy 117.87 90.669364) + (xy 117.87 91.566988) (xy 117.812993 91.534075) (xy 117.685826 91.5) (xy 117.554174 91.5) (xy 117.427007 91.534075) + (xy 117.37 91.566988) (xy 117.37 90.669364) (xy 117.369999 90.669364) (xy 117.156513 90.726567) + (xy 117.156507 90.72657) (xy 116.942422 90.826399) (xy 116.94242 90.8264) (xy 116.748926 90.961886) + (xy 116.74892 90.961891) (xy 116.581891 91.12892) (xy 116.58189 91.128922) (xy 116.451575 91.315031) + (xy 116.396998 91.358655) (xy 116.327499 91.365848) (xy 116.265145 91.334326) (xy 116.248425 91.315031) + (xy 116.118109 91.128922) (xy 116.118108 91.12892) (xy 115.951082 90.961894) (xy 115.757578 90.826399) + (xy 115.543492 90.72657) (xy 115.543486 90.726567) (xy 115.33 90.669364) (xy 115.33 91.566988) (xy 115.272993 91.534075) + (xy 115.145826 91.5) (xy 115.014174 91.5) (xy 114.887007 91.534075) (xy 114.83 91.566988) (xy 114.83 90.669364) + (xy 114.829999 90.669364) (xy 114.616513 90.726567) (xy 114.616507 90.72657) (xy 114.402422 90.826399) + (xy 114.40242 90.8264) (xy 114.208926 90.961886) (xy 114.20892 90.961891) (xy 114.041891 91.12892) + (xy 114.04189 91.128922) (xy 113.911575 91.315031) (xy 113.856998 91.358655) (xy 113.787499 91.365848) + (xy 113.725145 91.334326) (xy 113.708425 91.315031) (xy 113.578109 91.128922) (xy 113.578108 91.12892) + (xy 113.411082 90.961894) (xy 113.217578 90.826399) (xy 113.003492 90.72657) (xy 113.003486 90.726567) + (xy 112.79 90.669364) (xy 112.79 91.566988) (xy 112.732993 91.534075) (xy 112.605826 91.5) (xy 112.474174 91.5) + (xy 112.347007 91.534075) (xy 112.29 91.566988) (xy 112.29 90.669364) (xy 112.289999 90.669364) + (xy 112.076513 90.726567) (xy 112.076507 90.72657) (xy 111.862422 90.826399) (xy 111.86242 90.8264) + (xy 111.668926 90.961886) (xy 111.546477 91.084335) (xy 111.485154 91.117819) (xy 111.415462 91.112835) + (xy 111.359529 91.070963) (xy 111.342614 91.039986) (xy 111.293354 90.907913) (xy 111.29335 90.907906) + (xy 111.20719 90.792812) (xy 111.207187 90.792809) (xy 111.092093 90.706649) (xy 111.092086 90.706645) + (xy 110.957379 90.656403) (xy 110.957372 90.656401) (xy 110.897844 90.65) (xy 110.25 90.65) (xy 110.25 91.566988) + (xy 110.192993 91.534075) (xy 110.065826 91.5) (xy 109.934174 91.5) (xy 109.807007 91.534075) (xy 109.75 91.566988) + (xy 109.75 90.65) (xy 109.102155 90.65) (xy 109.042627 90.656401) (xy 109.04262 90.656403) (xy 108.907913 90.706645) + (xy 108.907906 90.706649) (xy 108.792812 90.792809) (xy 108.792809 90.792812) (xy 108.706649 90.907906) + (xy 108.706645 90.907913) (xy 108.656403 91.04262) (xy 108.656401 91.042627) (xy 108.65 91.102155) + (xy 101.213453 91.102155) (xy 101.178232 90.986046) (xy 101.080685 90.80355) (xy 101.001158 90.706645) + (xy 100.94941 90.643589) (xy 100.789452 90.512317) (xy 100.789453 90.512317) (xy 100.78945 90.512315) + (xy 100.606954 90.414768) (xy 100.408934 90.3547) (xy 100.408932 90.354699) (xy 100.408934 90.354699) + (xy 100.203 90.334417) (xy 99.997067 90.354699) (xy 99.799043 90.414769) (xy 99.765634 90.432627) + (xy 99.61655 90.512315) (xy 99.616548 90.512316) (xy 99.616547 90.512317) (xy 99.456589 90.643589) + (xy 99.334127 90.792812) (xy 99.325315 90.80355) (xy 99.286643 90.875898) (xy 99.227769 90.986043) + (xy 99.167699 91.184067) (xy 99.147417 91.39) (xy 98.718583 91.39) (xy 98.6983 91.184066) (xy 98.638232 90.986046) + (xy 98.540685 90.80355) (xy 98.461158 90.706645) (xy 98.40941 90.643589) (xy 98.249452 90.512317) + (xy 98.249453 90.512317) (xy 98.24945 90.512315) (xy 98.066954 90.414768) (xy 97.868934 90.3547) + (xy 97.868932 90.354699) (xy 97.868934 90.354699) (xy 97.663 90.334417) (xy 97.457067 90.354699) (xy 97.259043 90.414769) (xy 97.225634 90.432627) (xy 97.07655 90.512315) (xy 97.076548 90.512316) (xy 97.076547 90.512317) (xy 96.916589 90.643589) (xy 96.794127 90.792812) (xy 96.785315 90.80355) (xy 96.744451 90.88) (xy 96.706358 90.951267) (xy 96.657395 91.001111) (xy 96.589257 91.016571) @@ -22579,22 +23854,22 @@ (xy 51.539043 90.414769) (xy 51.505634 90.432627) (xy 51.35655 90.512315) (xy 51.356548 90.512316) (xy 51.356547 90.512317) (xy 51.196589 90.643589) (xy 51.074127 90.792812) (xy 51.065315 90.80355) (xy 51.026643 90.875898) (xy 50.967769 90.986043) (xy 50.907699 91.184067) (xy 50.887417 91.39) - (xy 50 91.39) (xy 50 85.315551) (xy 50.9225 85.315551) (xy 50.950829 85.49441) (xy 51.006787 85.666636) - (xy 51.006788 85.666639) (xy 51.089006 85.827997) (xy 51.195441 85.974494) (xy 51.195445 85.974499) - (xy 51.3235 86.102554) (xy 51.323505 86.102558) (xy 51.451287 86.195396) (xy 51.470006 86.208996) - (xy 51.575484 86.26274) (xy 51.63136 86.291211) (xy 51.631363 86.291212) (xy 51.717476 86.319191) - (xy 51.803591 86.347171) (xy 51.886429 86.360291) (xy 51.982449 86.3755) (xy 51.982454 86.3755) - (xy 52.163551 86.3755) (xy 52.250259 86.361765) (xy 52.342409 86.347171) (xy 52.514639 86.291211) - (xy 52.675994 86.208996) (xy 52.822501 86.102553) (xy 52.950553 85.974501) (xy 53.056996 85.827994) - (xy 53.139211 85.666639) (xy 53.195171 85.494409) (xy 53.210297 85.398907) (xy 53.2235 85.315551) - (xy 53.2235 85.134448) (xy 53.205934 85.023543) (xy 54.102499 85.023543) (xy 54.140947 85.216829) - (xy 54.14095 85.216839) (xy 54.216364 85.398907) (xy 54.216371 85.39892) (xy 54.32586 85.562781) - (xy 54.325863 85.562785) (xy 54.465214 85.702136) (xy 54.465218 85.702139) (xy 54.629079 85.811628) - (xy 54.629092 85.811635) (xy 54.81116 85.887049) (xy 54.811165 85.887051) (xy 54.811169 85.887051) - (xy 54.81117 85.887052) (xy 55.004456 85.9255) (xy 55.004459 85.9255) (xy 55.201543 85.9255) (xy 55.331582 85.899632) - (xy 55.394835 85.887051) (xy 55.576914 85.811632) (xy 55.740782 85.702139) (xy 55.880139 85.562782) - (xy 55.989632 85.398914) (xy 56.065051 85.216835) (xy 56.081439 85.134448) (xy 56.1035 85.023543) - (xy 56.1035 84.826456) (xy 56.065052 84.63317) (xy 56.065051 84.633169) (xy 56.065051 84.633165) + (xy 50 91.39) (xy 50 85.134448) (xy 50.9225 85.134448) (xy 50.9225 85.315551) (xy 50.950829 85.49441) + (xy 51.006787 85.666636) (xy 51.006788 85.666639) (xy 51.089006 85.827997) (xy 51.195441 85.974494) + (xy 51.195445 85.974499) (xy 51.3235 86.102554) (xy 51.323505 86.102558) (xy 51.451287 86.195396) + (xy 51.470006 86.208996) (xy 51.575484 86.26274) (xy 51.63136 86.291211) (xy 51.631363 86.291212) + (xy 51.717476 86.319191) (xy 51.803591 86.347171) (xy 51.886429 86.360291) (xy 51.982449 86.3755) + (xy 51.982454 86.3755) (xy 52.163551 86.3755) (xy 52.250259 86.361765) (xy 52.342409 86.347171) + (xy 52.514639 86.291211) (xy 52.675994 86.208996) (xy 52.822501 86.102553) (xy 52.950553 85.974501) + (xy 53.056996 85.827994) (xy 53.139211 85.666639) (xy 53.195171 85.494409) (xy 53.210297 85.398907) + (xy 53.2235 85.315551) (xy 53.2235 85.134448) (xy 53.205934 85.023543) (xy 54.102499 85.023543) + (xy 54.140947 85.216829) (xy 54.14095 85.216839) (xy 54.216364 85.398907) (xy 54.216371 85.39892) + (xy 54.32586 85.562781) (xy 54.325863 85.562785) (xy 54.465214 85.702136) (xy 54.465218 85.702139) + (xy 54.629079 85.811628) (xy 54.629092 85.811635) (xy 54.81116 85.887049) (xy 54.811165 85.887051) + (xy 54.811169 85.887051) (xy 54.81117 85.887052) (xy 55.004456 85.9255) (xy 55.004459 85.9255) (xy 55.201543 85.9255) + (xy 55.331582 85.899632) (xy 55.394835 85.887051) (xy 55.576914 85.811632) (xy 55.740782 85.702139) + (xy 55.880139 85.562782) (xy 55.989632 85.398914) (xy 56.065051 85.216835) (xy 56.081439 85.134448) + (xy 56.1035 85.023543) (xy 56.1035 84.826456) (xy 56.065052 84.63317) (xy 56.065051 84.633169) (xy 56.065051 84.633165) (xy 56.060427 84.622002) (xy 55.989635 84.451092) (xy 55.989628 84.451079) (xy 55.880139 84.287218) (xy 55.880136 84.287214) (xy 55.740785 84.147863) (xy 55.740781 84.14786) (xy 55.57692 84.038371) (xy 55.576907 84.038364) (xy 55.394839 83.96295) (xy 55.394829 83.962947) (xy 55.201543 83.9245) @@ -22611,19 +23886,50 @@ (xy 51.631363 84.158787) (xy 51.63136 84.158788) (xy 51.470002 84.241006) (xy 51.323505 84.347441) (xy 51.3235 84.347445) (xy 51.195445 84.4755) (xy 51.195441 84.475505) (xy 51.089006 84.622002) (xy 51.006788 84.78336) (xy 51.006787 84.783363) (xy 50.950829 84.955589) (xy 50.9225 85.134448) - (xy 50.9225 85.315551) (xy 50 85.315551) (xy 50 83.397844) (xy 98.623 83.397844) (xy 98.629401 83.457372) - (xy 98.629403 83.457379) (xy 98.679645 83.592086) (xy 98.679649 83.592093) (xy 98.765809 83.707187) - (xy 98.765812 83.70719) (xy 98.880906 83.79335) (xy 98.880913 83.793354) (xy 99.01562 83.843596) - (xy 99.015627 83.843598) (xy 99.075155 83.849999) (xy 99.075172 83.85) (xy 99.475813 83.85) (xy 99.542852 83.869685) - (xy 99.588607 83.922489) (xy 99.598551 83.991647) (xy 99.569526 84.055203) (xy 99.534267 84.083357) - (xy 99.38655 84.162315) (xy 99.386548 84.162316) (xy 99.386547 84.162317) (xy 99.226589 84.293589) - (xy 99.097337 84.451086) (xy 99.095315 84.45355) (xy 99.056981 84.525268) (xy 98.997769 84.636043) - (xy 98.937699 84.834067) (xy 98.917417 85.04) (xy 98.937699 85.245932) (xy 98.954146 85.300149) - (xy 98.997768 85.443954) (xy 99.095315 85.62645) (xy 99.095317 85.626452) (xy 99.226589 85.78641) - (xy 99.277264 85.827997) (xy 99.38655 85.917685) (xy 99.569046 86.015232) (xy 99.767066 86.0753) - (xy 99.767065 86.0753) (xy 99.785529 86.077118) (xy 99.973 86.095583) (xy 100.178934 86.0753) (xy 100.376954 86.015232) - (xy 100.55945 85.917685) (xy 100.71941 85.78641) (xy 100.850685 85.62645) (xy 100.948232 85.443954) - (xy 101.0083 85.245934) (xy 101.028583 85.04) (xy 101.0083 84.834066) (xy 100.982801 84.750005) + (xy 50 85.134448) (xy 50 79.684448) (xy 50.9225 79.684448) (xy 50.9225 79.865551) (xy 50.950829 80.04441) + (xy 51.006787 80.216636) (xy 51.006788 80.216639) (xy 51.062664 80.3263) (xy 51.08332 80.366839) + (xy 51.089006 80.377997) (xy 51.195441 80.524494) (xy 51.195445 80.524499) (xy 51.3235 80.652554) + (xy 51.323505 80.652558) (xy 51.417488 80.72084) (xy 51.470006 80.758996) (xy 51.575484 80.81274) + (xy 51.63136 80.841211) (xy 51.631363 80.841212) (xy 51.664985 80.852136) (xy 51.803591 80.897171) + (xy 51.886429 80.910291) (xy 51.982449 80.9255) (xy 51.982454 80.9255) (xy 52.163551 80.9255) (xy 52.25478 80.91105) + (xy 52.342409 80.897171) (xy 52.514639 80.841211) (xy 52.675994 80.758996) (xy 52.822501 80.652553) + (xy 52.950553 80.524501) (xy 53.056996 80.377994) (xy 53.139211 80.216639) (xy 53.153214 80.173543) + (xy 54.102499 80.173543) (xy 54.140947 80.366829) (xy 54.14095 80.366839) (xy 54.216364 80.548907) + (xy 54.216371 80.54892) (xy 54.32586 80.712781) (xy 54.325863 80.712785) (xy 54.465214 80.852136) + (xy 54.465218 80.852139) (xy 54.629079 80.961628) (xy 54.629092 80.961635) (xy 54.710368 80.9953) + (xy 54.811165 81.037051) (xy 54.811169 81.037051) (xy 54.81117 81.037052) (xy 55.004456 81.0755) + (xy 55.004459 81.0755) (xy 55.201543 81.0755) (xy 55.331582 81.049632) (xy 55.394835 81.037051) + (xy 55.576914 80.961632) (xy 55.740782 80.852139) (xy 55.880139 80.712782) (xy 55.989632 80.548914) + (xy 56.065051 80.366835) (xy 56.088291 80.25) (xy 56.1035 80.173543) (xy 56.1035 79.976456) (xy 56.065052 79.78317) + (xy 56.065051 79.783169) (xy 56.065051 79.783165) (xy 56.024164 79.684454) (xy 55.989635 79.601092) + (xy 55.989628 79.601079) (xy 55.880139 79.437218) (xy 55.880136 79.437214) (xy 55.740785 79.297863) + (xy 55.740781 79.29786) (xy 55.57692 79.188371) (xy 55.576907 79.188364) (xy 55.536311 79.171549) + (xy 80.412564 79.171549) (xy 80.412564 79.17155) (xy 81.310188 79.17155) (xy 81.277275 79.228557) + (xy 81.2432 79.355724) (xy 81.2432 79.487376) (xy 81.277275 79.614543) (xy 81.310188 79.67155) (xy 80.412564 79.67155) + (xy 80.469767 79.885036) (xy 80.46977 79.885042) (xy 80.569599 80.099128) (xy 80.705094 80.292632) + (xy 80.872117 80.459655) (xy 81.065621 80.59515) (xy 81.236148 80.674668) (xy 81.288587 80.72084) + (xy 81.307739 80.788034) (xy 81.287523 80.854915) (xy 81.234358 80.90025) (xy 81.183743 80.91105) + (xy 80.873447 80.91105) (xy 80.81497 80.922681) (xy 80.814969 80.922682) (xy 80.748647 80.966997) + (xy 80.704332 81.033319) (xy 80.704331 81.03332) (xy 80.6927 81.091797) (xy 80.6927 82.831302) (xy 80.704331 82.889779) + (xy 80.704332 82.88978) (xy 80.748647 82.956102) (xy 80.814969 83.000417) (xy 80.81497 83.000418) + (xy 80.873447 83.012049) (xy 80.87345 83.01205) (xy 80.873452 83.01205) (xy 82.61295 83.01205) (xy 82.612951 83.012049) + (xy 82.627768 83.009102) (xy 82.671429 83.000418) (xy 82.671429 83.000417) (xy 82.671431 83.000417) + (xy 82.737752 82.956102) (xy 82.782067 82.889781) (xy 82.782067 82.889779) (xy 82.782068 82.889779) + (xy 82.793699 82.831302) (xy 82.7937 82.8313) (xy 82.7937 81.602155) (xy 98.623 81.602155) (xy 98.623 82.25) + (xy 99.52844 82.25) (xy 99.497755 82.303147) (xy 99.463 82.432857) (xy 99.463 82.567143) (xy 99.497755 82.696853) + (xy 99.52844 82.75) (xy 98.623 82.75) (xy 98.623 83.397844) (xy 98.629401 83.457372) (xy 98.629403 83.457379) + (xy 98.679645 83.592086) (xy 98.679649 83.592093) (xy 98.765809 83.707187) (xy 98.765812 83.70719) + (xy 98.880906 83.79335) (xy 98.880913 83.793354) (xy 99.01562 83.843596) (xy 99.015627 83.843598) + (xy 99.075155 83.849999) (xy 99.075172 83.85) (xy 99.475813 83.85) (xy 99.542852 83.869685) (xy 99.588607 83.922489) + (xy 99.598551 83.991647) (xy 99.569526 84.055203) (xy 99.534267 84.083357) (xy 99.38655 84.162315) + (xy 99.386548 84.162316) (xy 99.386547 84.162317) (xy 99.226589 84.293589) (xy 99.097337 84.451086) + (xy 99.095315 84.45355) (xy 99.056981 84.525268) (xy 98.997769 84.636043) (xy 98.937699 84.834067) + (xy 98.917417 85.04) (xy 98.937699 85.245932) (xy 98.954146 85.300149) (xy 98.997768 85.443954) + (xy 99.095315 85.62645) (xy 99.095317 85.626452) (xy 99.226589 85.78641) (xy 99.277264 85.827997) + (xy 99.38655 85.917685) (xy 99.569046 86.015232) (xy 99.767066 86.0753) (xy 99.767065 86.0753) (xy 99.785529 86.077118) + (xy 99.973 86.095583) (xy 100.178934 86.0753) (xy 100.376954 86.015232) (xy 100.55945 85.917685) + (xy 100.71941 85.78641) (xy 100.850685 85.62645) (xy 100.948232 85.443954) (xy 101.0083 85.245934) + (xy 101.028583 85.04) (xy 101.0083 84.834066) (xy 100.982797 84.749994) (xy 115.494859 84.749994) (xy 115.494859 84.750005) (xy 115.515385 84.997729) (xy 115.515387 84.997738) (xy 115.576412 85.238717) (xy 115.676266 85.466364) (xy 115.776564 85.619882) (xy 116.476212 84.920234) (xy 116.487482 84.962292) (xy 116.55989 85.087708) (xy 116.662292 85.19011) (xy 116.787708 85.262518) (xy 116.829765 85.273787) @@ -22633,46 +23939,46 @@ (xy 117.823231 86.010055) (xy 117.870056 85.973609) (xy 117.170234 85.273787) (xy 117.212292 85.262518) (xy 117.337708 85.19011) (xy 117.44011 85.087708) (xy 117.512518 84.962292) (xy 117.523787 84.920235) (xy 118.223434 85.619882) (xy 118.323731 85.466369) (xy 118.423587 85.238717) (xy 118.484612 84.997738) - (xy 118.484614 84.997729) (xy 118.505141 84.750005) (xy 121.994859 84.750005) (xy 122.015385 84.997729) - (xy 122.015387 84.997738) (xy 122.076412 85.238717) (xy 122.176266 85.466364) (xy 122.276564 85.619882) - (xy 122.976212 84.920234) (xy 122.987482 84.962292) (xy 123.05989 85.087708) (xy 123.162292 85.19011) - (xy 123.287708 85.262518) (xy 123.329765 85.273787) (xy 122.629942 85.973609) (xy 122.676768 86.010055) - (xy 122.67677 86.010056) (xy 122.895385 86.128364) (xy 122.895396 86.128369) (xy 123.130506 86.209083) - (xy 123.375707 86.25) (xy 123.624293 86.25) (xy 123.869493 86.209083) (xy 124.104603 86.128369) - (xy 124.104614 86.128364) (xy 124.323228 86.010057) (xy 124.323231 86.010055) (xy 124.370056 85.973609) - (xy 123.670234 85.273787) (xy 123.712292 85.262518) (xy 123.837708 85.19011) (xy 123.94011 85.087708) - (xy 124.012518 84.962292) (xy 124.023787 84.920235) (xy 124.723434 85.619882) (xy 124.823731 85.466369) - (xy 124.923587 85.238717) (xy 124.984612 84.997738) (xy 124.984614 84.997729) (xy 125.005141 84.750005) - (xy 125.005141 84.749994) (xy 124.984614 84.50227) (xy 124.984612 84.502261) (xy 124.923587 84.261282) - (xy 124.844073 84.080005) (xy 131.042522 84.080005) (xy 131.062399 84.319889) (xy 131.121491 84.55324) - (xy 131.218185 84.773682) (xy 131.31088 84.915563) (xy 131.861837 84.364607) (xy 131.880997 84.410864) - (xy 131.957439 84.525268) (xy 132.054732 84.622561) (xy 132.169136 84.699003) (xy 132.21539 84.718162) - (xy 131.66379 85.269761) (xy 131.663791 85.269762) (xy 131.702832 85.300149) (xy 131.702838 85.300153) - (xy 131.914531 85.414715) (xy 131.914545 85.414721) (xy 132.142207 85.492879) (xy 132.379642 85.5325) - (xy 132.620358 85.5325) (xy 132.857792 85.492879) (xy 133.085454 85.414721) (xy 133.085468 85.414715) - (xy 133.29716 85.300154) (xy 133.297168 85.300149) (xy 133.336207 85.269762) (xy 133.336208 85.26976) - (xy 132.784609 84.718161) (xy 132.830864 84.699003) (xy 132.945268 84.622561) (xy 133.042561 84.525268) - (xy 133.119003 84.410864) (xy 133.138162 84.364609) (xy 133.689117 84.915564) (xy 133.781815 84.773679) - (xy 133.878508 84.55324) (xy 133.9376 84.319889) (xy 133.957478 84.080005) (xy 133.957478 84.079994) - (xy 133.9376 83.84011) (xy 133.878508 83.606759) (xy 133.781815 83.38632) (xy 133.689117 83.244434) - (xy 133.138161 83.795389) (xy 133.119003 83.749136) (xy 133.042561 83.634732) (xy 132.945268 83.537439) - (xy 132.830864 83.460997) (xy 132.784608 83.441837) (xy 133.336208 82.890237) (xy 133.336208 82.890236) - (xy 133.297166 82.859849) (xy 133.297161 82.859846) (xy 133.085468 82.745284) (xy 133.085454 82.745278) - (xy 132.857792 82.66712) (xy 132.620358 82.6275) (xy 132.379642 82.6275) (xy 132.142207 82.66712) - (xy 131.914545 82.745278) (xy 131.914531 82.745284) (xy 131.702837 82.859846) (xy 131.702826 82.859853) - (xy 131.663791 82.890235) (xy 131.663791 82.890237) (xy 132.215391 83.441837) (xy 132.169136 83.460997) - (xy 132.054732 83.537439) (xy 131.957439 83.634732) (xy 131.880997 83.749136) (xy 131.861837 83.795391) - (xy 131.310881 83.244435) (xy 131.218185 83.386317) (xy 131.121491 83.606759) (xy 131.062399 83.84011) - (xy 131.042522 84.079994) (xy 131.042522 84.080005) (xy 124.844073 84.080005) (xy 124.823731 84.03363) - (xy 124.723434 83.880116) (xy 124.023787 84.579764) (xy 124.012518 84.537708) (xy 123.94011 84.412292) - (xy 123.837708 84.30989) (xy 123.712292 84.237482) (xy 123.670235 84.226212) (xy 124.370057 83.52639) - (xy 124.370056 83.526389) (xy 124.323229 83.489943) (xy 124.104614 83.371635) (xy 124.104603 83.37163) - (xy 123.869493 83.290916) (xy 123.624293 83.25) (xy 123.375707 83.25) (xy 123.130506 83.290916) - (xy 122.895396 83.37163) (xy 122.89539 83.371632) (xy 122.676761 83.489949) (xy 122.629942 83.526388) - (xy 122.629942 83.52639) (xy 123.329765 84.226212) (xy 123.287708 84.237482) (xy 123.162292 84.30989) - (xy 123.05989 84.412292) (xy 122.987482 84.537708) (xy 122.976212 84.579764) (xy 122.276564 83.880116) - (xy 122.176267 84.033632) (xy 122.076412 84.261282) (xy 122.015387 84.502261) (xy 122.015385 84.50227) - (xy 121.994859 84.749994) (xy 121.994859 84.750005) (xy 118.505141 84.750005) (xy 118.505141 84.749994) + (xy 118.484614 84.997729) (xy 118.505141 84.750005) (xy 118.505141 84.749994) (xy 121.994859 84.749994) + (xy 121.994859 84.750005) (xy 122.015385 84.997729) (xy 122.015387 84.997738) (xy 122.076412 85.238717) + (xy 122.176266 85.466364) (xy 122.276564 85.619882) (xy 122.976212 84.920234) (xy 122.987482 84.962292) + (xy 123.05989 85.087708) (xy 123.162292 85.19011) (xy 123.287708 85.262518) (xy 123.329765 85.273787) + (xy 122.629942 85.973609) (xy 122.676768 86.010055) (xy 122.67677 86.010056) (xy 122.895385 86.128364) + (xy 122.895396 86.128369) (xy 123.130506 86.209083) (xy 123.375707 86.25) (xy 123.624293 86.25) + (xy 123.869493 86.209083) (xy 124.104603 86.128369) (xy 124.104614 86.128364) (xy 124.323228 86.010057) + (xy 124.323231 86.010055) (xy 124.370056 85.973609) (xy 123.670234 85.273787) (xy 123.712292 85.262518) + (xy 123.837708 85.19011) (xy 123.94011 85.087708) (xy 124.012518 84.962292) (xy 124.023787 84.920235) + (xy 124.723434 85.619882) (xy 124.823731 85.466369) (xy 124.923587 85.238717) (xy 124.984612 84.997738) + (xy 124.984614 84.997729) (xy 125.005141 84.750005) (xy 125.005141 84.749994) (xy 124.984614 84.50227) + (xy 124.984612 84.502261) (xy 124.923587 84.261282) (xy 124.844068 84.079994) (xy 131.042522 84.079994) + (xy 131.042522 84.080005) (xy 131.062399 84.319889) (xy 131.121491 84.55324) (xy 131.218185 84.773682) + (xy 131.31088 84.915563) (xy 131.861837 84.364607) (xy 131.880997 84.410864) (xy 131.957439 84.525268) + (xy 132.054732 84.622561) (xy 132.169136 84.699003) (xy 132.21539 84.718162) (xy 131.66379 85.269761) + (xy 131.663791 85.269762) (xy 131.702832 85.300149) (xy 131.702838 85.300153) (xy 131.914531 85.414715) + (xy 131.914545 85.414721) (xy 132.142207 85.492879) (xy 132.379642 85.5325) (xy 132.620358 85.5325) + (xy 132.857792 85.492879) (xy 133.085454 85.414721) (xy 133.085468 85.414715) (xy 133.29716 85.300154) + (xy 133.297168 85.300149) (xy 133.336207 85.269762) (xy 133.336208 85.26976) (xy 132.784609 84.718161) + (xy 132.830864 84.699003) (xy 132.945268 84.622561) (xy 133.042561 84.525268) (xy 133.119003 84.410864) + (xy 133.138162 84.364609) (xy 133.689117 84.915564) (xy 133.781815 84.773679) (xy 133.878508 84.55324) + (xy 133.9376 84.319889) (xy 133.957478 84.080005) (xy 133.957478 84.079994) (xy 133.9376 83.84011) + (xy 133.878508 83.606759) (xy 133.781815 83.38632) (xy 133.689117 83.244434) (xy 133.138161 83.795389) + (xy 133.119003 83.749136) (xy 133.042561 83.634732) (xy 132.945268 83.537439) (xy 132.830864 83.460997) + (xy 132.784608 83.441837) (xy 133.336208 82.890237) (xy 133.336208 82.890236) (xy 133.297166 82.859849) + (xy 133.297161 82.859846) (xy 133.085468 82.745284) (xy 133.085454 82.745278) (xy 132.857792 82.66712) + (xy 132.620358 82.6275) (xy 132.379642 82.6275) (xy 132.142207 82.66712) (xy 131.914545 82.745278) + (xy 131.914531 82.745284) (xy 131.702837 82.859846) (xy 131.702826 82.859853) (xy 131.663791 82.890235) + (xy 131.663791 82.890237) (xy 132.215391 83.441837) (xy 132.169136 83.460997) (xy 132.054732 83.537439) + (xy 131.957439 83.634732) (xy 131.880997 83.749136) (xy 131.861837 83.795391) (xy 131.310881 83.244435) + (xy 131.218185 83.386317) (xy 131.121491 83.606759) (xy 131.062399 83.84011) (xy 131.042522 84.079994) + (xy 124.844068 84.079994) (xy 124.823731 84.03363) (xy 124.723434 83.880116) (xy 124.023787 84.579764) + (xy 124.012518 84.537708) (xy 123.94011 84.412292) (xy 123.837708 84.30989) (xy 123.712292 84.237482) + (xy 123.670235 84.226212) (xy 124.370057 83.52639) (xy 124.370056 83.526389) (xy 124.323229 83.489943) + (xy 124.104614 83.371635) (xy 124.104603 83.37163) (xy 123.869493 83.290916) (xy 123.624293 83.25) + (xy 123.375707 83.25) (xy 123.130506 83.290916) (xy 122.895396 83.37163) (xy 122.89539 83.371632) + (xy 122.676761 83.489949) (xy 122.629942 83.526388) (xy 122.629942 83.52639) (xy 123.329765 84.226212) + (xy 123.287708 84.237482) (xy 123.162292 84.30989) (xy 123.05989 84.412292) (xy 122.987482 84.537708) + (xy 122.976212 84.579764) (xy 122.276564 83.880116) (xy 122.176267 84.033632) (xy 122.076412 84.261282) + (xy 122.015387 84.502261) (xy 122.015385 84.50227) (xy 121.994859 84.749994) (xy 118.505141 84.749994) (xy 118.484614 84.50227) (xy 118.484612 84.502261) (xy 118.423587 84.261282) (xy 118.323731 84.03363) (xy 118.223434 83.880116) (xy 117.523787 84.579764) (xy 117.512518 84.537708) (xy 117.44011 84.412292) (xy 117.337708 84.30989) (xy 117.212292 84.237482) (xy 117.170235 84.226212) (xy 117.870057 83.52639) @@ -22682,113 +23988,120 @@ (xy 116.129942 83.52639) (xy 116.829765 84.226212) (xy 116.787708 84.237482) (xy 116.662292 84.30989) (xy 116.55989 84.412292) (xy 116.487482 84.537708) (xy 116.476212 84.579764) (xy 115.776564 83.880116) (xy 115.676267 84.033632) (xy 115.576412 84.261282) (xy 115.515387 84.502261) (xy 115.515385 84.50227) - (xy 115.494859 84.749994) (xy 115.494859 84.750005) (xy 100.982801 84.750005) (xy 100.948232 84.636046) - (xy 100.850685 84.45355) (xy 100.763609 84.347447) (xy 100.71941 84.293589) (xy 100.559452 84.162317) - (xy 100.559453 84.162317) (xy 100.55945 84.162315) (xy 100.411732 84.083357) (xy 100.361889 84.034395) - (xy 100.346429 83.966257) (xy 100.370261 83.900578) (xy 100.425819 83.858209) (xy 100.470187 83.85) - (xy 100.870828 83.85) (xy 100.870844 83.849999) (xy 100.930372 83.843598) (xy 100.930379 83.843596) - (xy 101.065086 83.793354) (xy 101.065093 83.79335) (xy 101.180187 83.70719) (xy 101.18019 83.707187) - (xy 101.26635 83.592093) (xy 101.266354 83.592086) (xy 101.316596 83.457379) (xy 101.316598 83.457372) - (xy 101.322999 83.397844) (xy 101.323 83.397827) (xy 101.323 82.75) (xy 100.41756 82.75) (xy 100.448245 82.696853) - (xy 100.483 82.567143) (xy 100.483 82.432857) (xy 100.448245 82.303147) (xy 100.41756 82.25) (xy 101.323 82.25) - (xy 101.323 81.602172) (xy 101.322999 81.602155) (xy 101.316598 81.542627) (xy 101.316596 81.54262) - (xy 101.266354 81.407913) (xy 101.26635 81.407906) (xy 101.18019 81.292812) (xy 101.180187 81.292809) - (xy 101.065093 81.206649) (xy 101.065086 81.206645) (xy 100.930379 81.156403) (xy 100.930372 81.156401) - (xy 100.870844 81.15) (xy 100.470187 81.15) (xy 100.403148 81.130315) (xy 100.357393 81.077511) - (xy 100.347449 81.008353) (xy 100.376474 80.944797) (xy 100.411733 80.916642) (xy 100.44816 80.897171) - (xy 100.55945 80.837685) (xy 100.71941 80.70641) (xy 100.850685 80.54645) (xy 100.948232 80.363954) - (xy 100.982799 80.25) (xy 115.794357 80.25) (xy 115.814884 80.471535) (xy 115.814885 80.471537) + (xy 115.494859 84.749994) (xy 100.982797 84.749994) (xy 100.948232 84.636046) (xy 100.850685 84.45355) + (xy 100.763609 84.347447) (xy 100.71941 84.293589) (xy 100.559452 84.162317) (xy 100.559453 84.162317) + (xy 100.55945 84.162315) (xy 100.411732 84.083357) (xy 100.361889 84.034395) (xy 100.346429 83.966257) + (xy 100.370261 83.900578) (xy 100.425819 83.858209) (xy 100.470187 83.85) (xy 100.870828 83.85) + (xy 100.870844 83.849999) (xy 100.930372 83.843598) (xy 100.930379 83.843596) (xy 101.065086 83.793354) + (xy 101.065093 83.79335) (xy 101.180187 83.70719) (xy 101.18019 83.707187) (xy 101.26635 83.592093) + (xy 101.266354 83.592086) (xy 101.316596 83.457379) (xy 101.316598 83.457372) (xy 101.322999 83.397844) + (xy 101.323 83.397827) (xy 101.323 82.75) (xy 100.41756 82.75) (xy 100.448245 82.696853) (xy 100.483 82.567143) + (xy 100.483 82.432857) (xy 100.448245 82.303147) (xy 100.41756 82.25) (xy 101.323 82.25) (xy 101.323 81.602172) + (xy 101.322999 81.602155) (xy 101.316598 81.542627) (xy 101.316596 81.54262) (xy 101.266354 81.407913) + (xy 101.26635 81.407906) (xy 101.18019 81.292812) (xy 101.180187 81.292809) (xy 101.065093 81.206649) + (xy 101.065086 81.206645) (xy 100.930379 81.156403) (xy 100.930372 81.156401) (xy 100.870844 81.15) + (xy 100.470187 81.15) (xy 100.403148 81.130315) (xy 100.357393 81.077511) (xy 100.347449 81.008353) + (xy 100.376474 80.944797) (xy 100.411733 80.916642) (xy 100.422195 80.91105) (xy 100.55945 80.837685) + (xy 100.71941 80.70641) (xy 100.850685 80.54645) (xy 100.948232 80.363954) (xy 100.982799 80.249999) + (xy 115.794357 80.249999) (xy 115.794357 80.25) (xy 115.814884 80.471535) (xy 115.814885 80.471537) (xy 115.875769 80.685523) (xy 115.875775 80.685538) (xy 115.974938 80.884683) (xy 115.974943 80.884691) (xy 116.10902 81.062238) (xy 116.273437 81.212123) (xy 116.273439 81.212125) (xy 116.462595 81.329245) (xy 116.462596 81.329245) (xy 116.462599 81.329247) (xy 116.67006 81.409618) (xy 116.888757 81.4505) (xy 116.888759 81.4505) (xy 117.111241 81.4505) (xy 117.111243 81.4505) (xy 117.32994 81.409618) (xy 117.537401 81.329247) (xy 117.726562 81.212124) (xy 117.890981 81.062236) (xy 118.025058 80.884689) - (xy 118.124229 80.685528) (xy 118.185115 80.471536) (xy 118.205643 80.25) (xy 122.294357 80.25) - (xy 122.314884 80.471535) (xy 122.314885 80.471537) (xy 122.375769 80.685523) (xy 122.375775 80.685538) - (xy 122.474938 80.884683) (xy 122.474943 80.884691) (xy 122.60902 81.062238) (xy 122.773437 81.212123) - (xy 122.773439 81.212125) (xy 122.962595 81.329245) (xy 122.962596 81.329245) (xy 122.962599 81.329247) - (xy 123.17006 81.409618) (xy 123.388757 81.4505) (xy 123.388759 81.4505) (xy 123.611241 81.4505) - (xy 123.611243 81.4505) (xy 123.82994 81.409618) (xy 124.037401 81.329247) (xy 124.226562 81.212124) - (xy 124.390981 81.062236) (xy 124.525058 80.884689) (xy 124.624229 80.685528) (xy 124.685115 80.471536) - (xy 124.705643 80.25) (xy 124.686592 80.044409) (xy 124.685115 80.028464) (xy 124.685114 80.028462) - (xy 124.684629 80.026759) (xy 124.624229 79.814472) (xy 124.624224 79.814461) (xy 124.525061 79.615316) - (xy 124.525056 79.615308) (xy 124.390979 79.437761) (xy 124.226562 79.287876) (xy 124.22656 79.287874) - (xy 124.037404 79.170754) (xy 124.037398 79.170752) (xy 123.82994 79.090382) (xy 123.611243 79.0495) - (xy 123.388757 79.0495) (xy 123.17006 79.090382) (xy 123.038864 79.141207) (xy 122.962601 79.170752) - (xy 122.962595 79.170754) (xy 122.773439 79.287874) (xy 122.773437 79.287876) (xy 122.60902 79.437761) - (xy 122.474943 79.615308) (xy 122.474938 79.615316) (xy 122.375775 79.814461) (xy 122.375769 79.814476) - (xy 122.314885 80.028462) (xy 122.314884 80.028464) (xy 122.294357 80.249999) (xy 122.294357 80.25) - (xy 118.205643 80.25) (xy 118.186592 80.044409) (xy 118.185115 80.028464) (xy 118.185114 80.028462) - (xy 118.184629 80.026759) (xy 118.124229 79.814472) (xy 118.124224 79.814461) (xy 118.025061 79.615316) - (xy 118.025056 79.615308) (xy 117.890979 79.437761) (xy 117.726562 79.287876) (xy 117.72656 79.287874) - (xy 117.537404 79.170754) (xy 117.537398 79.170752) (xy 117.32994 79.090382) (xy 117.111243 79.0495) - (xy 116.888757 79.0495) (xy 116.67006 79.090382) (xy 116.538864 79.141207) (xy 116.462601 79.170752) - (xy 116.462595 79.170754) (xy 116.273439 79.287874) (xy 116.273437 79.287876) (xy 116.10902 79.437761) - (xy 115.974943 79.615308) (xy 115.974938 79.615316) (xy 115.875775 79.814461) (xy 115.875769 79.814476) - (xy 115.814885 80.028462) (xy 115.814884 80.028464) (xy 115.794357 80.249999) (xy 115.794357 80.25) - (xy 100.982799 80.25) (xy 101.0083 80.165934) (xy 101.028583 79.96) (xy 101.0083 79.754066) (xy 100.948232 79.556046) - (xy 100.850685 79.37355) (xy 100.780373 79.287874) (xy 100.71941 79.213589) (xy 100.596775 79.112947) - (xy 100.55945 79.082315) (xy 100.376954 78.984768) (xy 100.178934 78.9247) (xy 100.178932 78.924699) - (xy 100.178934 78.924699) (xy 99.973 78.904417) (xy 99.767067 78.924699) (xy 99.569043 78.984769) - (xy 99.492844 79.025499) (xy 99.38655 79.082315) (xy 99.386548 79.082316) (xy 99.386547 79.082317) - (xy 99.226589 79.213589) (xy 99.095317 79.373547) (xy 98.997769 79.556043) (xy 98.937699 79.754067) - (xy 98.917417 79.96) (xy 98.937699 80.165932) (xy 98.963201 80.25) (xy 98.997768 80.363954) (xy 99.095315 80.54645) - (xy 99.097337 80.548914) (xy 99.226589 80.70641) (xy 99.323209 80.785702) (xy 99.38655 80.837685) - (xy 99.497838 80.89717) (xy 99.534267 80.916642) (xy 99.584111 80.965605) (xy 99.599571 81.033743) - (xy 99.575739 81.099422) (xy 99.520181 81.141791) (xy 99.475813 81.15) (xy 99.075155 81.15) (xy 99.015627 81.156401) - (xy 99.01562 81.156403) (xy 98.880913 81.206645) (xy 98.880906 81.206649) (xy 98.765812 81.292809) - (xy 98.765809 81.292812) (xy 98.679649 81.407906) (xy 98.679645 81.407913) (xy 98.629403 81.54262) - (xy 98.629401 81.542627) (xy 98.623 81.602155) (xy 98.623 82.25) (xy 99.52844 82.25) (xy 99.497755 82.303147) - (xy 99.463 82.432857) (xy 99.463 82.567143) (xy 99.497755 82.696853) (xy 99.52844 82.75) (xy 98.623 82.75) - (xy 98.623 83.397844) (xy 50 83.397844) (xy 50 79.865551) (xy 50.9225 79.865551) (xy 50.950829 80.04441) - (xy 51.006787 80.216636) (xy 51.006788 80.216639) (xy 51.023787 80.25) (xy 51.08332 80.366839) (xy 51.089006 80.377997) - (xy 51.195441 80.524494) (xy 51.195445 80.524499) (xy 51.3235 80.652554) (xy 51.323505 80.652558) - (xy 51.451287 80.745396) (xy 51.470006 80.758996) (xy 51.575484 80.81274) (xy 51.63136 80.841211) - (xy 51.631363 80.841212) (xy 51.664985 80.852136) (xy 51.803591 80.897171) (xy 51.886429 80.910291) - (xy 51.982449 80.9255) (xy 51.982454 80.9255) (xy 52.163551 80.9255) (xy 52.250259 80.911765) (xy 52.342409 80.897171) - (xy 52.514639 80.841211) (xy 52.675994 80.758996) (xy 52.822501 80.652553) (xy 52.950553 80.524501) - (xy 53.056996 80.377994) (xy 53.139211 80.216639) (xy 53.153214 80.173543) (xy 54.102499 80.173543) - (xy 54.140947 80.366829) (xy 54.14095 80.366839) (xy 54.216364 80.548907) (xy 54.216371 80.54892) - (xy 54.32586 80.712781) (xy 54.325863 80.712785) (xy 54.465214 80.852136) (xy 54.465218 80.852139) - (xy 54.629079 80.961628) (xy 54.629092 80.961635) (xy 54.710368 80.9953) (xy 54.811165 81.037051) - (xy 54.811169 81.037051) (xy 54.81117 81.037052) (xy 55.004456 81.0755) (xy 55.004459 81.0755) (xy 55.201543 81.0755) - (xy 55.331582 81.049632) (xy 55.394835 81.037051) (xy 55.576914 80.961632) (xy 55.740782 80.852139) - (xy 55.880139 80.712782) (xy 55.989632 80.548914) (xy 56.065051 80.366835) (xy 56.088291 80.25) - (xy 56.1035 80.173543) (xy 56.1035 79.976456) (xy 56.065052 79.78317) (xy 56.065051 79.783169) (xy 56.065051 79.783165) - (xy 56.024164 79.684454) (xy 55.989635 79.601092) (xy 55.989628 79.601079) (xy 55.880139 79.437218) - (xy 55.880136 79.437214) (xy 55.740785 79.297863) (xy 55.740781 79.29786) (xy 55.57692 79.188371) - (xy 55.576907 79.188364) (xy 55.394839 79.11295) (xy 55.394829 79.112947) (xy 55.201543 79.0745) - (xy 55.201541 79.0745) (xy 55.004459 79.0745) (xy 55.004457 79.0745) (xy 54.81117 79.112947) (xy 54.81116 79.11295) - (xy 54.629092 79.188364) (xy 54.629079 79.188371) (xy 54.465218 79.29786) (xy 54.465214 79.297863) - (xy 54.325863 79.437214) (xy 54.32586 79.437218) (xy 54.216371 79.601079) (xy 54.216364 79.601092) - (xy 54.14095 79.78316) (xy 54.140947 79.78317) (xy 54.1025 79.976456) (xy 54.1025 79.976459) (xy 54.1025 80.173541) - (xy 54.1025 80.173543) (xy 54.102499 80.173543) (xy 53.153214 80.173543) (xy 53.195171 80.044409) - (xy 53.215558 79.91569) (xy 53.2235 79.865551) (xy 53.2235 79.684448) (xy 53.203162 79.556043) (xy 53.195171 79.505591) - (xy 53.139211 79.333361) (xy 53.139211 79.33336) (xy 53.078184 79.21359) (xy 53.056996 79.172006) - (xy 53.014089 79.112949) (xy 52.950558 79.025505) (xy 52.950554 79.0255) (xy 52.822499 78.897445) - (xy 52.822494 78.897441) (xy 52.675997 78.791006) (xy 52.675996 78.791005) (xy 52.675994 78.791004) - (xy 52.6243 78.764664) (xy 52.514639 78.708788) (xy 52.514636 78.708787) (xy 52.34241 78.652829) - (xy 52.163551 78.6245) (xy 52.163546 78.6245) (xy 51.982454 78.6245) (xy 51.982449 78.6245) (xy 51.803589 78.652829) - (xy 51.631363 78.708787) (xy 51.63136 78.708788) (xy 51.470002 78.791006) (xy 51.323505 78.897441) - (xy 51.3235 78.897445) (xy 51.195445 79.0255) (xy 51.195441 79.025505) (xy 51.089006 79.172002) - (xy 51.006788 79.33336) (xy 51.006787 79.333363) (xy 50.950829 79.505589) (xy 50.9225 79.684448) - (xy 50.9225 79.865551) (xy 50 79.865551) (xy 50 73.61) (xy 50.887417 73.61) (xy 50.907699 73.815932) - (xy 50.9077 73.815934) (xy 50.967768 74.013954) (xy 51.065315 74.19645) (xy 51.065317 74.196452) - (xy 51.196589 74.35641) (xy 51.293209 74.435702) (xy 51.35655 74.487685) (xy 51.539046 74.585232) - (xy 51.737066 74.6453) (xy 51.737065 74.6453) (xy 51.755529 74.647118) (xy 51.943 74.665583) (xy 52.148934 74.6453) - (xy 52.346954 74.585232) (xy 52.52945 74.487685) (xy 52.68941 74.35641) (xy 52.820685 74.19645) - (xy 52.918232 74.013954) (xy 52.9783 73.815934) (xy 52.998583 73.61) (xy 53.427417 73.61) (xy 53.447699 73.815932) - (xy 53.4477 73.815934) (xy 53.507768 74.013954) (xy 53.605315 74.19645) (xy 53.605317 74.196452) - (xy 53.736589 74.35641) (xy 53.833209 74.435702) (xy 53.89655 74.487685) (xy 54.079046 74.585232) - (xy 54.277066 74.6453) (xy 54.277065 74.6453) (xy 54.295529 74.647118) (xy 54.483 74.665583) (xy 54.688934 74.6453) - (xy 54.886954 74.585232) (xy 55.06945 74.487685) (xy 55.22941 74.35641) (xy 55.360685 74.19645) - (xy 55.439643 74.04873) (xy 55.488605 73.998888) (xy 55.556742 73.983428) (xy 55.622422 74.00726) - (xy 55.664791 74.062818) (xy 55.673 74.107186) (xy 55.673 74.507844) (xy 55.679401 74.567372) (xy 55.679403 74.567379) - (xy 55.729645 74.702086) (xy 55.729649 74.702093) (xy 55.815809 74.817187) (xy 55.815812 74.81719) - (xy 55.930906 74.90335) (xy 55.930913 74.903354) (xy 56.06562 74.953596) (xy 56.065627 74.953598) - (xy 56.125155 74.959999) (xy 56.125172 74.96) (xy 56.773 74.96) (xy 56.773 74.05456) (xy 56.826147 74.085245) - (xy 56.955857 74.12) (xy 57.090143 74.12) (xy 57.219853 74.085245) (xy 57.273 74.05456) (xy 57.273 74.96) - (xy 57.920828 74.96) (xy 57.920844 74.959999) (xy 57.980372 74.953598) (xy 57.980379 74.953596) + (xy 118.124229 80.685528) (xy 118.185115 80.471536) (xy 118.205643 80.25) (xy 118.205643 80.249999) + (xy 122.294357 80.249999) (xy 122.294357 80.25) (xy 122.314884 80.471535) (xy 122.314885 80.471537) + (xy 122.375769 80.685523) (xy 122.375775 80.685538) (xy 122.474938 80.884683) (xy 122.474943 80.884691) + (xy 122.60902 81.062238) (xy 122.773437 81.212123) (xy 122.773439 81.212125) (xy 122.962595 81.329245) + (xy 122.962596 81.329245) (xy 122.962599 81.329247) (xy 123.17006 81.409618) (xy 123.388757 81.4505) + (xy 123.388759 81.4505) (xy 123.611241 81.4505) (xy 123.611243 81.4505) (xy 123.82994 81.409618) + (xy 124.037401 81.329247) (xy 124.226562 81.212124) (xy 124.390981 81.062236) (xy 124.525058 80.884689) + (xy 124.624229 80.685528) (xy 124.685115 80.471536) (xy 124.705643 80.25) (xy 124.686592 80.044409) + (xy 124.685115 80.028464) (xy 124.685114 80.028462) (xy 124.684629 80.026759) (xy 124.624229 79.814472) + (xy 124.624224 79.814461) (xy 124.525061 79.615316) (xy 124.525056 79.615308) (xy 124.390979 79.437761) + (xy 124.226562 79.287876) (xy 124.22656 79.287874) (xy 124.037404 79.170754) (xy 124.037398 79.170752) + (xy 123.82994 79.090382) (xy 123.611243 79.0495) (xy 123.388757 79.0495) (xy 123.17006 79.090382) + (xy 123.038864 79.141207) (xy 122.962601 79.170752) (xy 122.962595 79.170754) (xy 122.773439 79.287874) + (xy 122.773437 79.287876) (xy 122.60902 79.437761) (xy 122.474943 79.615308) (xy 122.474938 79.615316) + (xy 122.375775 79.814461) (xy 122.375769 79.814476) (xy 122.314885 80.028462) (xy 122.314884 80.028464) + (xy 122.294357 80.249999) (xy 118.205643 80.249999) (xy 118.186592 80.044409) (xy 118.185115 80.028464) + (xy 118.185114 80.028462) (xy 118.184629 80.026759) (xy 118.124229 79.814472) (xy 118.124224 79.814461) + (xy 118.025061 79.615316) (xy 118.025056 79.615308) (xy 117.890979 79.437761) (xy 117.726562 79.287876) + (xy 117.72656 79.287874) (xy 117.537404 79.170754) (xy 117.537398 79.170752) (xy 117.32994 79.090382) + (xy 117.111243 79.0495) (xy 116.888757 79.0495) (xy 116.67006 79.090382) (xy 116.538864 79.141207) + (xy 116.462601 79.170752) (xy 116.462595 79.170754) (xy 116.273439 79.287874) (xy 116.273437 79.287876) + (xy 116.10902 79.437761) (xy 115.974943 79.615308) (xy 115.974938 79.615316) (xy 115.875775 79.814461) + (xy 115.875769 79.814476) (xy 115.814885 80.028462) (xy 115.814884 80.028464) (xy 115.794357 80.249999) + (xy 100.982799 80.249999) (xy 101.0083 80.165934) (xy 101.028583 79.96) (xy 101.0083 79.754066) + (xy 100.948232 79.556046) (xy 100.850685 79.37355) (xy 100.780373 79.287874) (xy 100.71941 79.213589) + (xy 100.596775 79.112947) (xy 100.55945 79.082315) (xy 100.376954 78.984768) (xy 100.178934 78.9247) + (xy 100.178932 78.924699) (xy 100.178934 78.924699) (xy 99.973 78.904417) (xy 99.767067 78.924699) + (xy 99.569043 78.984769) (xy 99.492844 79.025499) (xy 99.38655 79.082315) (xy 99.386548 79.082316) + (xy 99.386547 79.082317) (xy 99.226589 79.213589) (xy 99.095317 79.373547) (xy 98.997769 79.556043) + (xy 98.937699 79.754067) (xy 98.917417 79.96) (xy 98.937699 80.165932) (xy 98.963201 80.25) (xy 98.997768 80.363954) + (xy 99.095315 80.54645) (xy 99.097337 80.548914) (xy 99.226589 80.70641) (xy 99.323209 80.785702) + (xy 99.38655 80.837685) (xy 99.523805 80.91105) (xy 99.534267 80.916642) (xy 99.584111 80.965605) + (xy 99.599571 81.033743) (xy 99.575739 81.099422) (xy 99.520181 81.141791) (xy 99.475813 81.15) + (xy 99.075155 81.15) (xy 99.015627 81.156401) (xy 99.01562 81.156403) (xy 98.880913 81.206645) (xy 98.880906 81.206649) + (xy 98.765812 81.292809) (xy 98.765809 81.292812) (xy 98.679649 81.407906) (xy 98.679645 81.407913) + (xy 98.629403 81.54262) (xy 98.629401 81.542627) (xy 98.623 81.602155) (xy 82.7937 81.602155) (xy 82.7937 81.091799) + (xy 82.793699 81.091797) (xy 82.782068 81.03332) (xy 82.782067 81.033319) (xy 82.737752 80.966997) + (xy 82.67143 80.922682) (xy 82.671429 80.922681) (xy 82.612952 80.91105) (xy 82.612948 80.91105) + (xy 82.302657 80.91105) (xy 82.235618 80.891365) (xy 82.189863 80.838561) (xy 82.179919 80.769403) + (xy 82.208944 80.705847) (xy 82.250252 80.674668) (xy 82.420778 80.59515) (xy 82.614282 80.459655) + (xy 82.781305 80.292632) (xy 82.9168 80.099128) (xy 83.016629 79.885042) (xy 83.016632 79.885036) + (xy 83.073836 79.67155) (xy 82.176212 79.67155) (xy 82.209125 79.614543) (xy 82.2432 79.487376) + (xy 82.2432 79.355724) (xy 82.209125 79.228557) (xy 82.176212 79.17155) (xy 83.073836 79.17155) + (xy 83.073835 79.171549) (xy 83.016632 78.958063) (xy 83.016629 78.958057) (xy 82.9168 78.743972) + (xy 82.916799 78.74397) (xy 82.781313 78.550476) (xy 82.781308 78.55047) (xy 82.614282 78.383444) + (xy 82.420778 78.247949) (xy 82.206692 78.14812) (xy 82.206686 78.148117) (xy 82.084549 78.115391) + (xy 82.024889 78.079026) (xy 81.99436 78.016179) (xy 82.002655 77.946803) (xy 82.04714 77.892925) + (xy 82.080644 77.876957) (xy 82.147154 77.856782) (xy 82.32965 77.759235) (xy 82.48961 77.62796) + (xy 82.620885 77.468) (xy 82.718432 77.285504) (xy 82.7785 77.087484) (xy 82.798783 76.88155) (xy 82.7785 76.675616) + (xy 82.718432 76.477596) (xy 82.620885 76.2951) (xy 82.568902 76.231759) (xy 82.48961 76.135139) + (xy 82.329652 76.003867) (xy 82.329653 76.003867) (xy 82.32965 76.003865) (xy 82.147154 75.906318) + (xy 81.949134 75.84625) (xy 81.949132 75.846249) (xy 81.949134 75.846249) (xy 81.7432 75.825967) + (xy 81.537267 75.846249) (xy 81.339243 75.906319) (xy 81.229098 75.965193) (xy 81.15675 76.003865) + (xy 81.156748 76.003866) (xy 81.156747 76.003867) (xy 80.996789 76.135139) (xy 80.865517 76.295097) + (xy 80.767969 76.477593) (xy 80.707899 76.675617) (xy 80.687617 76.88155) (xy 80.707899 77.087482) + (xy 80.7079 77.087484) (xy 80.767968 77.285504) (xy 80.865515 77.468) (xy 80.865517 77.468002) (xy 80.996789 77.62796) + (xy 81.093409 77.707252) (xy 81.15675 77.759235) (xy 81.339246 77.856782) (xy 81.405751 77.876955) + (xy 81.464189 77.915252) (xy 81.492646 77.979064) (xy 81.482087 78.048131) (xy 81.435863 78.100525) + (xy 81.40185 78.115391) (xy 81.279714 78.148117) (xy 81.279707 78.14812) (xy 81.065622 78.247949) + (xy 81.06562 78.24795) (xy 80.872126 78.383436) (xy 80.87212 78.383441) (xy 80.705091 78.55047) + (xy 80.705086 78.550476) (xy 80.5696 78.74397) (xy 80.569599 78.743972) (xy 80.46977 78.958057) + (xy 80.469767 78.958063) (xy 80.412564 79.171549) (xy 55.536311 79.171549) (xy 55.394839 79.11295) + (xy 55.394829 79.112947) (xy 55.201543 79.0745) (xy 55.201541 79.0745) (xy 55.004459 79.0745) (xy 55.004457 79.0745) + (xy 54.81117 79.112947) (xy 54.81116 79.11295) (xy 54.629092 79.188364) (xy 54.629079 79.188371) + (xy 54.465218 79.29786) (xy 54.465214 79.297863) (xy 54.325863 79.437214) (xy 54.32586 79.437218) + (xy 54.216371 79.601079) (xy 54.216364 79.601092) (xy 54.14095 79.78316) (xy 54.140947 79.78317) + (xy 54.1025 79.976456) (xy 54.1025 79.976459) (xy 54.1025 80.173541) (xy 54.1025 80.173543) (xy 54.102499 80.173543) + (xy 53.153214 80.173543) (xy 53.195171 80.044409) (xy 53.215558 79.91569) (xy 53.2235 79.865551) + (xy 53.2235 79.684448) (xy 53.203162 79.556043) (xy 53.195171 79.505591) (xy 53.139211 79.333361) + (xy 53.139211 79.33336) (xy 53.078184 79.21359) (xy 53.056996 79.172006) (xy 53.014089 79.112949) + (xy 52.950558 79.025505) (xy 52.950554 79.0255) (xy 52.822499 78.897445) (xy 52.822494 78.897441) + (xy 52.675997 78.791006) (xy 52.675996 78.791005) (xy 52.675994 78.791004) (xy 52.6243 78.764664) + (xy 52.514639 78.708788) (xy 52.514636 78.708787) (xy 52.34241 78.652829) (xy 52.163551 78.6245) + (xy 52.163546 78.6245) (xy 51.982454 78.6245) (xy 51.982449 78.6245) (xy 51.803589 78.652829) (xy 51.631363 78.708787) + (xy 51.63136 78.708788) (xy 51.470002 78.791006) (xy 51.323505 78.897441) (xy 51.3235 78.897445) + (xy 51.195445 79.0255) (xy 51.195441 79.025505) (xy 51.089006 79.172002) (xy 51.006788 79.33336) + (xy 51.006787 79.333363) (xy 50.950829 79.505589) (xy 50.9225 79.684448) (xy 50 79.684448) (xy 50 73.61) + (xy 50.887417 73.61) (xy 50.907699 73.815932) (xy 50.9077 73.815934) (xy 50.967768 74.013954) (xy 51.065315 74.19645) + (xy 51.065317 74.196452) (xy 51.196589 74.35641) (xy 51.293209 74.435702) (xy 51.35655 74.487685) + (xy 51.539046 74.585232) (xy 51.737066 74.6453) (xy 51.737065 74.6453) (xy 51.755529 74.647118) + (xy 51.943 74.665583) (xy 52.148934 74.6453) (xy 52.346954 74.585232) (xy 52.52945 74.487685) (xy 52.68941 74.35641) + (xy 52.820685 74.19645) (xy 52.918232 74.013954) (xy 52.9783 73.815934) (xy 52.998583 73.61) (xy 53.427417 73.61) + (xy 53.447699 73.815932) (xy 53.4477 73.815934) (xy 53.507768 74.013954) (xy 53.605315 74.19645) + (xy 53.605317 74.196452) (xy 53.736589 74.35641) (xy 53.833209 74.435702) (xy 53.89655 74.487685) + (xy 54.079046 74.585232) (xy 54.277066 74.6453) (xy 54.277065 74.6453) (xy 54.295529 74.647118) + (xy 54.483 74.665583) (xy 54.688934 74.6453) (xy 54.886954 74.585232) (xy 55.06945 74.487685) (xy 55.22941 74.35641) + (xy 55.360685 74.19645) (xy 55.439643 74.04873) (xy 55.488605 73.998888) (xy 55.556742 73.983428) + (xy 55.622422 74.00726) (xy 55.664791 74.062818) (xy 55.673 74.107186) (xy 55.673 74.507844) (xy 55.679401 74.567372) + (xy 55.679403 74.567379) (xy 55.729645 74.702086) (xy 55.729649 74.702093) (xy 55.815809 74.817187) + (xy 55.815812 74.81719) (xy 55.930906 74.90335) (xy 55.930913 74.903354) (xy 56.06562 74.953596) + (xy 56.065627 74.953598) (xy 56.125155 74.959999) (xy 56.125172 74.96) (xy 56.773 74.96) (xy 56.773 74.05456) + (xy 56.826147 74.085245) (xy 56.955857 74.12) (xy 57.090143 74.12) (xy 57.219853 74.085245) (xy 57.273 74.05456) + (xy 57.273 74.96) (xy 57.920828 74.96) (xy 57.920844 74.959999) (xy 57.980372 74.953598) (xy 57.980379 74.953596) (xy 58.115086 74.903354) (xy 58.115093 74.90335) (xy 58.230187 74.81719) (xy 58.23019 74.817187) (xy 58.31635 74.702093) (xy 58.316354 74.702086) (xy 58.366596 74.567379) (xy 58.366598 74.567372) (xy 58.372999 74.507844) (xy 58.373 74.507827) (xy 58.373 74.107186) (xy 58.392685 74.040147) (xy 58.445489 73.994392) @@ -22810,15 +24123,18 @@ (xy 66.147699 73.815932) (xy 66.1477 73.815934) (xy 66.207768 74.013954) (xy 66.305315 74.19645) (xy 66.305317 74.196452) (xy 66.436589 74.35641) (xy 66.533209 74.435702) (xy 66.59655 74.487685) (xy 66.779046 74.585232) (xy 66.977066 74.6453) (xy 66.977065 74.6453) (xy 66.995529 74.647118) - (xy 67.183 74.665583) (xy 67.388934 74.6453) (xy 67.586954 74.585232) (xy 67.76945 74.487685) (xy 67.779116 74.479752) - (xy 68.6725 74.479752) (xy 68.684131 74.538229) (xy 68.684132 74.53823) (xy 68.728447 74.604552) - (xy 68.794769 74.648867) (xy 68.79477 74.648868) (xy 68.853247 74.660499) (xy 68.85325 74.6605) - (xy 68.853252 74.6605) (xy 70.59275 74.6605) (xy 70.592751 74.660499) (xy 70.607568 74.657552) (xy 70.651229 74.648868) - (xy 70.651229 74.648867) (xy 70.651231 74.648867) (xy 70.717552 74.604552) (xy 70.761867 74.538231) - (xy 70.761867 74.538229) (xy 70.761868 74.538229) (xy 70.773499 74.479752) (xy 70.7735 74.47975) - (xy 70.7735 73.61) (xy 71.207417 73.61) (xy 71.227699 73.815932) (xy 71.2277 73.815934) (xy 71.287768 74.013954) - (xy 71.385315 74.19645) (xy 71.385317 74.196452) (xy 71.516589 74.35641) (xy 71.613209 74.435702) - (xy 71.67655 74.487685) (xy 71.859046 74.585232) (xy 72.057066 74.6453) (xy 72.057065 74.6453) (xy 72.075529 74.647118) + (xy 67.183 74.665583) (xy 67.388934 74.6453) (xy 67.586954 74.585232) (xy 67.76945 74.487685) (xy 67.92941 74.35641) + (xy 68.060685 74.19645) (xy 68.158232 74.013954) (xy 68.2183 73.815934) (xy 68.238583 73.61) (xy 68.2183 73.404066) + (xy 68.158232 73.206046) (xy 68.060685 73.02355) (xy 68.008702 72.960209) (xy 67.92941 72.863589) + (xy 67.779121 72.740252) (xy 67.779115 72.740247) (xy 68.6725 72.740247) (xy 68.6725 74.479752) + (xy 68.684131 74.538229) (xy 68.684132 74.53823) (xy 68.728447 74.604552) (xy 68.794769 74.648867) + (xy 68.79477 74.648868) (xy 68.853247 74.660499) (xy 68.85325 74.6605) (xy 68.853252 74.6605) (xy 70.59275 74.6605) + (xy 70.592751 74.660499) (xy 70.607568 74.657552) (xy 70.651229 74.648868) (xy 70.651229 74.648867) + (xy 70.651231 74.648867) (xy 70.717552 74.604552) (xy 70.761867 74.538231) (xy 70.761867 74.538229) + (xy 70.761868 74.538229) (xy 70.773499 74.479752) (xy 70.7735 74.47975) (xy 70.7735 73.61) (xy 71.207417 73.61) + (xy 71.227699 73.815932) (xy 71.2277 73.815934) (xy 71.287768 74.013954) (xy 71.385315 74.19645) + (xy 71.385317 74.196452) (xy 71.516589 74.35641) (xy 71.613209 74.435702) (xy 71.67655 74.487685) + (xy 71.859046 74.585232) (xy 72.057066 74.6453) (xy 72.057065 74.6453) (xy 72.075529 74.647118) (xy 72.263 74.665583) (xy 72.468934 74.6453) (xy 72.666954 74.585232) (xy 72.84945 74.487685) (xy 73.00941 74.35641) (xy 73.140685 74.19645) (xy 73.238232 74.013954) (xy 73.2983 73.815934) (xy 73.318583 73.61) (xy 73.747417 73.61) (xy 73.767699 73.815932) (xy 73.7677 73.815934) (xy 73.827768 74.013954) (xy 73.925315 74.19645) @@ -22963,97 +24279,55 @@ (xy 70.761868 72.68177) (xy 70.761867 72.681769) (xy 70.717552 72.615447) (xy 70.65123 72.571132) (xy 70.651229 72.571131) (xy 70.592752 72.5595) (xy 70.592748 72.5595) (xy 68.853252 72.5595) (xy 68.853247 72.5595) (xy 68.79477 72.571131) (xy 68.794769 72.571132) (xy 68.728447 72.615447) (xy 68.684132 72.681769) - (xy 68.684131 72.68177) (xy 68.6725 72.740247) (xy 68.6725 74.479752) (xy 67.779116 74.479752) (xy 67.92941 74.35641) - (xy 68.060685 74.19645) (xy 68.158232 74.013954) (xy 68.2183 73.815934) (xy 68.238583 73.61) (xy 68.2183 73.404066) - (xy 68.158232 73.206046) (xy 68.060685 73.02355) (xy 68.008702 72.960209) (xy 67.92941 72.863589) - (xy 67.779121 72.740252) (xy 67.76945 72.732315) (xy 67.586954 72.634768) (xy 67.388934 72.5747) - (xy 67.388932 72.574699) (xy 67.388934 72.574699) (xy 67.183 72.554417) (xy 66.977067 72.574699) - (xy 66.779043 72.634769) (xy 66.745634 72.652627) (xy 66.59655 72.732315) (xy 66.596548 72.732316) - (xy 66.596547 72.732317) (xy 66.436589 72.863589) (xy 66.305317 73.023547) (xy 66.207769 73.206043) - (xy 66.147699 73.404067) (xy 66.127417 73.61) (xy 65.698583 73.61) (xy 65.6783 73.404066) (xy 65.618232 73.206046) - (xy 65.520685 73.02355) (xy 65.468702 72.960209) (xy 65.38941 72.863589) (xy 65.239121 72.740252) - (xy 65.22945 72.732315) (xy 65.046954 72.634768) (xy 64.848934 72.5747) (xy 64.848932 72.574699) - (xy 64.848934 72.574699) (xy 64.643 72.554417) (xy 64.437067 72.574699) (xy 64.239043 72.634769) - (xy 64.205634 72.652627) (xy 64.05655 72.732315) (xy 64.056548 72.732316) (xy 64.056547 72.732317) - (xy 63.896589 72.863589) (xy 63.765317 73.023547) (xy 63.667769 73.206043) (xy 63.607699 73.404067) - (xy 63.587417 73.61) (xy 63.158583 73.61) (xy 63.1383 73.404066) (xy 63.078232 73.206046) (xy 62.980685 73.02355) - (xy 62.928702 72.960209) (xy 62.84941 72.863589) (xy 62.699121 72.740252) (xy 62.68945 72.732315) - (xy 62.506954 72.634768) (xy 62.308934 72.5747) (xy 62.308932 72.574699) (xy 62.308934 72.574699) - (xy 62.103 72.554417) (xy 61.897067 72.574699) (xy 61.699043 72.634769) (xy 61.665634 72.652627) - (xy 61.51655 72.732315) (xy 61.516548 72.732316) (xy 61.516547 72.732317) (xy 61.356589 72.863589) - (xy 61.225317 73.023547) (xy 61.127769 73.206043) (xy 61.067699 73.404067) (xy 61.047417 73.61) - (xy 60.618583 73.61) (xy 60.5983 73.404066) (xy 60.538232 73.206046) (xy 60.440685 73.02355) (xy 60.388702 72.960209) - (xy 60.30941 72.863589) (xy 60.159121 72.740252) (xy 60.14945 72.732315) (xy 59.966954 72.634768) - (xy 59.768934 72.5747) (xy 59.768932 72.574699) (xy 59.768934 72.574699) (xy 59.563 72.554417) (xy 59.357067 72.574699) - (xy 59.159043 72.634769) (xy 59.125634 72.652627) (xy 58.97655 72.732315) (xy 58.976548 72.732316) - (xy 58.976547 72.732317) (xy 58.816589 72.863589) (xy 58.685317 73.023547) (xy 58.606358 73.171267) - (xy 58.557395 73.221111) (xy 58.489257 73.236571) (xy 58.423578 73.212739) (xy 58.381209 73.157181) - (xy 58.373 73.112813) (xy 58.373 72.712172) (xy 58.372999 72.712155) (xy 58.366598 72.652627) (xy 58.366596 72.65262) - (xy 58.316354 72.517913) (xy 58.31635 72.517906) (xy 58.23019 72.402812) (xy 58.230187 72.402809) - (xy 58.115093 72.316649) (xy 58.115086 72.316645) (xy 57.980379 72.266403) (xy 57.980372 72.266401) - (xy 57.920844 72.26) (xy 57.273 72.26) (xy 57.273 73.165439) (xy 57.219853 73.134755) (xy 57.090143 73.1) - (xy 56.955857 73.1) (xy 56.826147 73.134755) (xy 56.773 73.165439) (xy 56.773 72.26) (xy 56.125155 72.26) - (xy 56.065627 72.266401) (xy 56.06562 72.266403) (xy 55.930913 72.316645) (xy 55.930906 72.316649) - (xy 55.815812 72.402809) (xy 55.815809 72.402812) (xy 55.729649 72.517906) (xy 55.729645 72.517913) - (xy 55.679403 72.65262) (xy 55.679401 72.652627) (xy 55.673 72.712155) (xy 55.673 73.112813) (xy 55.653315 73.179852) - (xy 55.600511 73.225607) (xy 55.531353 73.235551) (xy 55.467797 73.206526) (xy 55.439642 73.171267) - (xy 55.432113 73.157181) (xy 55.360685 73.02355) (xy 55.308702 72.960209) (xy 55.22941 72.863589) - (xy 55.079121 72.740252) (xy 55.06945 72.732315) (xy 54.886954 72.634768) (xy 54.688934 72.5747) - (xy 54.688932 72.574699) (xy 54.688934 72.574699) (xy 54.483 72.554417) (xy 54.277067 72.574699) - (xy 54.079043 72.634769) (xy 54.045634 72.652627) (xy 53.89655 72.732315) (xy 53.896548 72.732316) - (xy 53.896547 72.732317) (xy 53.736589 72.863589) (xy 53.605317 73.023547) (xy 53.507769 73.206043) - (xy 53.447699 73.404067) (xy 53.427417 73.61) (xy 52.998583 73.61) (xy 52.9783 73.404066) (xy 52.918232 73.206046) - (xy 52.820685 73.02355) (xy 52.768702 72.960209) (xy 52.68941 72.863589) (xy 52.539121 72.740252) - (xy 52.52945 72.732315) (xy 52.346954 72.634768) (xy 52.148934 72.5747) (xy 52.148932 72.574699) - (xy 52.148934 72.574699) (xy 51.943 72.554417) (xy 51.737067 72.574699) (xy 51.539043 72.634769) - (xy 51.505634 72.652627) (xy 51.35655 72.732315) (xy 51.356548 72.732316) (xy 51.356547 72.732317) - (xy 51.196589 72.863589) (xy 51.065317 73.023547) (xy 50.967769 73.206043) (xy 50.907699 73.404067) - (xy 50.887417 73.61) (xy 50 73.61) (xy 50 68.386252) (xy 121.2085 68.386252) (xy 121.220131 68.444729) - (xy 121.220132 68.44473) (xy 121.264447 68.511052) (xy 121.330769 68.555367) (xy 121.33077 68.555368) - (xy 121.389247 68.566999) (xy 121.38925 68.567) (xy 121.389252 68.567) (xy 121.8345 68.567) (xy 121.901539 68.586685) - (xy 121.947294 68.639489) (xy 121.9585 68.691) (xy 121.9585 69.753486) (xy 121.988059 69.940118) - (xy 122.046454 70.119836) (xy 122.13224 70.288199) (xy 122.24331 70.441074) (xy 131.717927 79.91569) - (xy 131.870801 80.02676) (xy 131.950347 80.06729) (xy 132.039163 80.112545) (xy 132.039165 80.112545) - (xy 132.039168 80.112547) (xy 132.135497 80.143846) (xy 132.218881 80.17094) (xy 132.405514 80.2005) - (xy 132.405519 80.2005) (xy 132.594487 80.2005) (xy 132.698168 80.184077) (xy 132.781118 80.17094) - (xy 132.960832 80.112547) (xy 133.129199 80.02676) (xy 133.282074 79.91569) (xy 133.41569 79.782074) - (xy 133.52676 79.629199) (xy 133.612547 79.460832) (xy 133.67094 79.281118) (xy 133.68842 79.170752) - (xy 133.7005 79.094487) (xy 133.7005 78.905513) (xy 133.67094 78.718881) (xy 133.612545 78.539163) - (xy 133.526759 78.3708) (xy 133.41569 78.217927) (xy 124.395819 69.198055) (xy 124.362334 69.136732) - (xy 124.3595 69.110374) (xy 124.3595 68.691) (xy 124.379185 68.623961) (xy 124.431989 68.578206) - (xy 124.4835 68.567) (xy 124.92875 68.567) (xy 124.928751 68.566999) (xy 124.943568 68.564052) (xy 124.987229 68.555368) - (xy 124.987229 68.555367) (xy 124.987231 68.555367) (xy 125.053552 68.511052) (xy 125.097867 68.444731) - (xy 125.097867 68.444729) (xy 125.097868 68.444729) (xy 125.109499 68.386252) (xy 125.1095 68.38625) - (xy 125.1095 66.3665) (xy 127.159 66.3665) (xy 128.659 66.3665) (xy 128.659 66.8665) (xy 127.159001 66.8665) - (xy 127.159001 67.680697) (xy 127.1694 67.812832) (xy 127.224377 68.031019) (xy 127.317428 68.235874) - (xy 127.317431 68.23588) (xy 127.445559 68.420823) (xy 127.445569 68.420835) (xy 127.604664 68.57993) - (xy 127.604676 68.57994) (xy 127.789619 68.708068) (xy 127.789625 68.708071) (xy 127.99448 68.801122) - (xy 128.212667 68.856099) (xy 128.34481 68.866499) (xy 128.908999 68.866499) (xy 128.909 68.866498) - (xy 128.909 68.049512) (xy 128.966007 68.082425) (xy 129.093174 68.1165) (xy 129.224826 68.1165) - (xy 129.351993 68.082425) (xy 129.409 68.049512) (xy 129.409 68.866499) (xy 129.973182 68.866499) - (xy 129.973197 68.866498) (xy 130.105332 68.856099) (xy 130.323519 68.801122) (xy 130.528374 68.708071) - (xy 130.52838 68.708068) (xy 130.713323 68.57994) (xy 130.713335 68.57993) (xy 130.87243 68.420835) - (xy 130.87244 68.420823) (xy 131.000568 68.23588) (xy 131.000571 68.235874) (xy 131.093622 68.031019) - (xy 131.148599 67.812832) (xy 131.158999 67.680696) (xy 131.159 67.680684) (xy 131.159 66.8665) - (xy 129.659 66.8665) (xy 129.659 66.3665) (xy 131.158999 66.3665) (xy 131.158999 65.552317) (xy 131.158998 65.552302) - (xy 131.148599 65.420167) (xy 131.093622 65.20198) (xy 131.000571 64.997125) (xy 131.000568 64.997119) - (xy 130.87244 64.812176) (xy 130.87243 64.812164) (xy 130.713335 64.653069) (xy 130.713323 64.653059) - (xy 130.52838 64.524931) (xy 130.528374 64.524928) (xy 130.323519 64.431877) (xy 130.105332 64.3769) - (xy 129.973196 64.3665) (xy 129.409 64.3665) (xy 129.409 65.183488) (xy 129.351993 65.150575) (xy 129.224826 65.1165) - (xy 129.093174 65.1165) (xy 128.966007 65.150575) (xy 128.909 65.183488) (xy 128.909 64.3665) (xy 128.344817 64.3665) - (xy 128.344802 64.366501) (xy 128.212667 64.3769) (xy 127.99448 64.431877) (xy 127.789625 64.524928) - (xy 127.789619 64.524931) (xy 127.604676 64.653059) (xy 127.604664 64.653069) (xy 127.445569 64.812164) - (xy 127.445559 64.812176) (xy 127.317431 64.997119) (xy 127.317428 64.997125) (xy 127.224377 65.20198) - (xy 127.1694 65.420167) (xy 127.159 65.552303) (xy 127.159 66.3665) (xy 125.1095 66.3665) (xy 125.1095 64.846749) - (xy 125.109499 64.846747) (xy 125.097868 64.78827) (xy 125.097867 64.788269) (xy 125.053552 64.721947) - (xy 124.98723 64.677632) (xy 124.987229 64.677631) (xy 124.928752 64.666) (xy 124.928748 64.666) - (xy 121.389252 64.666) (xy 121.389247 64.666) (xy 121.33077 64.677631) (xy 121.330769 64.677632) - (xy 121.264447 64.721947) (xy 121.220132 64.788269) (xy 121.220131 64.78827) (xy 121.2085 64.846747) - (xy 121.2085 68.386252) (xy 50 68.386252) (xy 50 64.515) (xy 52.919364 64.515) (xy 52.976567 64.728486) - (xy 52.97657 64.728492) (xy 53.076399 64.942578) (xy 53.211894 65.136082) (xy 53.378917 65.303105) - (xy 53.572421 65.4386) (xy 53.786507 65.538429) (xy 53.786516 65.538433) (xy 54 65.595634) (xy 54 64.698012) - (xy 54.057007 64.730925) (xy 54.184174 64.765) (xy 54.315826 64.765) (xy 54.442993 64.730925) (xy 54.5 64.698012) - (xy 54.5 65.595633) (xy 54.713483 65.538433) (xy 54.713492 65.538429) (xy 54.927578 65.4386) (xy 55.121082 65.303105) + (xy 68.684131 72.68177) (xy 68.6725 72.740247) (xy 67.779115 72.740247) (xy 67.76945 72.732315) + (xy 67.586954 72.634768) (xy 67.388934 72.5747) (xy 67.388932 72.574699) (xy 67.388934 72.574699) + (xy 67.183 72.554417) (xy 66.977067 72.574699) (xy 66.779043 72.634769) (xy 66.745634 72.652627) + (xy 66.59655 72.732315) (xy 66.596548 72.732316) (xy 66.596547 72.732317) (xy 66.436589 72.863589) + (xy 66.305317 73.023547) (xy 66.207769 73.206043) (xy 66.147699 73.404067) (xy 66.127417 73.61) + (xy 65.698583 73.61) (xy 65.6783 73.404066) (xy 65.618232 73.206046) (xy 65.520685 73.02355) (xy 65.468702 72.960209) + (xy 65.38941 72.863589) (xy 65.239121 72.740252) (xy 65.22945 72.732315) (xy 65.046954 72.634768) + (xy 64.848934 72.5747) (xy 64.848932 72.574699) (xy 64.848934 72.574699) (xy 64.643 72.554417) (xy 64.437067 72.574699) + (xy 64.239043 72.634769) (xy 64.205634 72.652627) (xy 64.05655 72.732315) (xy 64.056548 72.732316) + (xy 64.056547 72.732317) (xy 63.896589 72.863589) (xy 63.765317 73.023547) (xy 63.667769 73.206043) + (xy 63.607699 73.404067) (xy 63.587417 73.61) (xy 63.158583 73.61) (xy 63.1383 73.404066) (xy 63.078232 73.206046) + (xy 62.980685 73.02355) (xy 62.928702 72.960209) (xy 62.84941 72.863589) (xy 62.699121 72.740252) + (xy 62.68945 72.732315) (xy 62.506954 72.634768) (xy 62.308934 72.5747) (xy 62.308932 72.574699) + (xy 62.308934 72.574699) (xy 62.103 72.554417) (xy 61.897067 72.574699) (xy 61.699043 72.634769) + (xy 61.665634 72.652627) (xy 61.51655 72.732315) (xy 61.516548 72.732316) (xy 61.516547 72.732317) + (xy 61.356589 72.863589) (xy 61.225317 73.023547) (xy 61.127769 73.206043) (xy 61.067699 73.404067) + (xy 61.047417 73.61) (xy 60.618583 73.61) (xy 60.5983 73.404066) (xy 60.538232 73.206046) (xy 60.440685 73.02355) + (xy 60.388702 72.960209) (xy 60.30941 72.863589) (xy 60.159121 72.740252) (xy 60.14945 72.732315) + (xy 59.966954 72.634768) (xy 59.768934 72.5747) (xy 59.768932 72.574699) (xy 59.768934 72.574699) + (xy 59.563 72.554417) (xy 59.357067 72.574699) (xy 59.159043 72.634769) (xy 59.125634 72.652627) + (xy 58.97655 72.732315) (xy 58.976548 72.732316) (xy 58.976547 72.732317) (xy 58.816589 72.863589) + (xy 58.685317 73.023547) (xy 58.606358 73.171267) (xy 58.557395 73.221111) (xy 58.489257 73.236571) + (xy 58.423578 73.212739) (xy 58.381209 73.157181) (xy 58.373 73.112813) (xy 58.373 72.712172) (xy 58.372999 72.712155) + (xy 58.366598 72.652627) (xy 58.366596 72.65262) (xy 58.316354 72.517913) (xy 58.31635 72.517906) + (xy 58.23019 72.402812) (xy 58.230187 72.402809) (xy 58.115093 72.316649) (xy 58.115086 72.316645) + (xy 57.980379 72.266403) (xy 57.980372 72.266401) (xy 57.920844 72.26) (xy 57.273 72.26) (xy 57.273 73.165439) + (xy 57.219853 73.134755) (xy 57.090143 73.1) (xy 56.955857 73.1) (xy 56.826147 73.134755) (xy 56.773 73.165439) + (xy 56.773 72.26) (xy 56.125155 72.26) (xy 56.065627 72.266401) (xy 56.06562 72.266403) (xy 55.930913 72.316645) + (xy 55.930906 72.316649) (xy 55.815812 72.402809) (xy 55.815809 72.402812) (xy 55.729649 72.517906) + (xy 55.729645 72.517913) (xy 55.679403 72.65262) (xy 55.679401 72.652627) (xy 55.673 72.712155) + (xy 55.673 73.112813) (xy 55.653315 73.179852) (xy 55.600511 73.225607) (xy 55.531353 73.235551) + (xy 55.467797 73.206526) (xy 55.439642 73.171267) (xy 55.432113 73.157181) (xy 55.360685 73.02355) + (xy 55.308702 72.960209) (xy 55.22941 72.863589) (xy 55.079121 72.740252) (xy 55.06945 72.732315) + (xy 54.886954 72.634768) (xy 54.688934 72.5747) (xy 54.688932 72.574699) (xy 54.688934 72.574699) + (xy 54.483 72.554417) (xy 54.277067 72.574699) (xy 54.079043 72.634769) (xy 54.045634 72.652627) + (xy 53.89655 72.732315) (xy 53.896548 72.732316) (xy 53.896547 72.732317) (xy 53.736589 72.863589) + (xy 53.605317 73.023547) (xy 53.507769 73.206043) (xy 53.447699 73.404067) (xy 53.427417 73.61) + (xy 52.998583 73.61) (xy 52.9783 73.404066) (xy 52.918232 73.206046) (xy 52.820685 73.02355) (xy 52.768702 72.960209) + (xy 52.68941 72.863589) (xy 52.539121 72.740252) (xy 52.52945 72.732315) (xy 52.346954 72.634768) + (xy 52.148934 72.5747) (xy 52.148932 72.574699) (xy 52.148934 72.574699) (xy 51.943 72.554417) (xy 51.737067 72.574699) + (xy 51.539043 72.634769) (xy 51.505634 72.652627) (xy 51.35655 72.732315) (xy 51.356548 72.732316) + (xy 51.356547 72.732317) (xy 51.196589 72.863589) (xy 51.065317 73.023547) (xy 50.967769 73.206043) + (xy 50.907699 73.404067) (xy 50.887417 73.61) (xy 50 73.61) (xy 50 64.014999) (xy 52.919364 64.014999) + (xy 52.919364 64.015) (xy 53.816988 64.015) (xy 53.784075 64.072007) (xy 53.75 64.199174) (xy 53.75 64.330826) + (xy 53.784075 64.457993) (xy 53.816988 64.515) (xy 52.919364 64.515) (xy 52.976567 64.728486) (xy 52.97657 64.728492) + (xy 53.076399 64.942578) (xy 53.211894 65.136082) (xy 53.378917 65.303105) (xy 53.572421 65.4386) + (xy 53.786507 65.538429) (xy 53.786516 65.538433) (xy 54 65.595634) (xy 54 64.698012) (xy 54.057007 64.730925) + (xy 54.184174 64.765) (xy 54.315826 64.765) (xy 54.442993 64.730925) (xy 54.5 64.698012) (xy 54.5 65.595633) + (xy 54.713483 65.538433) (xy 54.713492 65.538429) (xy 54.927578 65.4386) (xy 55.121082 65.303105) (xy 55.288105 65.136082) (xy 55.4236 64.942578) (xy 55.523429 64.728492) (xy 55.523432 64.728486) (xy 55.580636 64.515) (xy 54.683012 64.515) (xy 54.715925 64.457993) (xy 54.75 64.330826) (xy 54.75 64.199174) (xy 54.715925 64.072007) (xy 54.683012 64.015) (xy 55.580636 64.015) (xy 55.580635 64.014999) (xy 55.523432 63.801513) @@ -23082,23 +24356,24 @@ (xy 68.94177 66.038868) (xy 69.000247 66.050499) (xy 69.00025 66.0505) (xy 69.000252 66.0505) (xy 70.73975 66.0505) (xy 70.739751 66.050499) (xy 70.754568 66.047552) (xy 70.798229 66.038868) (xy 70.798229 66.038867) (xy 70.798231 66.038867) (xy 70.864552 65.994552) (xy 70.908867 65.928231) (xy 70.908867 65.928229) - (xy 70.908868 65.928229) (xy 70.918922 65.877682) (xy 70.9205 65.869748) (xy 70.9205 65.25) (xy 77.919364 65.25) - (xy 77.976567 65.463486) (xy 77.97657 65.463492) (xy 78.076399 65.677578) (xy 78.211894 65.871082) - (xy 78.378917 66.038105) (xy 78.572421 66.1736) (xy 78.786507 66.273429) (xy 78.786516 66.273433) - (xy 79 66.330634) (xy 79 65.433012) (xy 79.057007 65.465925) (xy 79.184174 65.5) (xy 79.315826 65.5) - (xy 79.442993 65.465925) (xy 79.5 65.433012) (xy 79.5 66.330633) (xy 79.713483 66.273433) (xy 79.713492 66.273429) - (xy 79.927578 66.1736) (xy 80.121082 66.038105) (xy 80.288105 65.871082) (xy 80.418425 65.684968) - (xy 80.473002 65.641344) (xy 80.542501 65.634151) (xy 80.604855 65.665673) (xy 80.621575 65.684968) - (xy 80.751894 65.871082) (xy 80.918917 66.038105) (xy 81.112421 66.1736) (xy 81.326507 66.273429) - (xy 81.326516 66.273433) (xy 81.54 66.330634) (xy 81.54 65.433012) (xy 81.597007 65.465925) (xy 81.724174 65.5) - (xy 81.855826 65.5) (xy 81.982993 65.465925) (xy 82.04 65.433012) (xy 82.04 66.330633) (xy 82.253483 66.273433) - (xy 82.253492 66.273429) (xy 82.467578 66.1736) (xy 82.661078 66.038108) (xy 82.783521 65.915665) - (xy 82.844844 65.88218) (xy 82.914536 65.887164) (xy 82.97047 65.929035) (xy 82.987385 65.960013) - (xy 83.036645 66.092086) (xy 83.036649 66.092093) (xy 83.122809 66.207187) (xy 83.122812 66.20719) - (xy 83.237906 66.29335) (xy 83.237913 66.293354) (xy 83.37262 66.343596) (xy 83.372627 66.343598) - (xy 83.432155 66.349999) (xy 83.432172 66.35) (xy 84.08 66.35) (xy 84.08 65.433012) (xy 84.137007 65.465925) - (xy 84.264174 65.5) (xy 84.395826 65.5) (xy 84.522993 65.465925) (xy 84.58 65.433012) (xy 84.58 66.35) - (xy 85.227828 66.35) (xy 85.227844 66.349999) (xy 85.287372 66.343598) (xy 85.287379 66.343596) + (xy 70.908868 65.928229) (xy 70.918922 65.877682) (xy 70.9205 65.869748) (xy 70.9205 64.749999) + (xy 77.919364 64.749999) (xy 77.919364 64.75) (xy 78.816988 64.75) (xy 78.784075 64.807007) (xy 78.75 64.934174) + (xy 78.75 65.065826) (xy 78.784075 65.192993) (xy 78.816988 65.25) (xy 77.919364 65.25) (xy 77.976567 65.463486) + (xy 77.97657 65.463492) (xy 78.076399 65.677578) (xy 78.211894 65.871082) (xy 78.378917 66.038105) + (xy 78.572421 66.1736) (xy 78.786507 66.273429) (xy 78.786516 66.273433) (xy 79 66.330634) (xy 79 65.433012) + (xy 79.057007 65.465925) (xy 79.184174 65.5) (xy 79.315826 65.5) (xy 79.442993 65.465925) (xy 79.5 65.433012) + (xy 79.5 66.330633) (xy 79.713483 66.273433) (xy 79.713492 66.273429) (xy 79.927578 66.1736) (xy 80.121082 66.038105) + (xy 80.288105 65.871082) (xy 80.418425 65.684968) (xy 80.473002 65.641344) (xy 80.542501 65.634151) + (xy 80.604855 65.665673) (xy 80.621575 65.684968) (xy 80.751894 65.871082) (xy 80.918917 66.038105) + (xy 81.112421 66.1736) (xy 81.326507 66.273429) (xy 81.326516 66.273433) (xy 81.54 66.330634) (xy 81.54 65.433012) + (xy 81.597007 65.465925) (xy 81.724174 65.5) (xy 81.855826 65.5) (xy 81.982993 65.465925) (xy 82.04 65.433012) + (xy 82.04 66.330633) (xy 82.253483 66.273433) (xy 82.253492 66.273429) (xy 82.467578 66.1736) (xy 82.661078 66.038108) + (xy 82.783521 65.915665) (xy 82.844844 65.88218) (xy 82.914536 65.887164) (xy 82.97047 65.929035) + (xy 82.987385 65.960013) (xy 83.036645 66.092086) (xy 83.036649 66.092093) (xy 83.122809 66.207187) + (xy 83.122812 66.20719) (xy 83.237906 66.29335) (xy 83.237913 66.293354) (xy 83.37262 66.343596) + (xy 83.372627 66.343598) (xy 83.432155 66.349999) (xy 83.432172 66.35) (xy 84.08 66.35) (xy 84.08 65.433012) + (xy 84.137007 65.465925) (xy 84.264174 65.5) (xy 84.395826 65.5) (xy 84.522993 65.465925) (xy 84.58 65.433012) + (xy 84.58 66.35) (xy 85.227828 66.35) (xy 85.227844 66.349999) (xy 85.287372 66.343598) (xy 85.287379 66.343596) (xy 85.422086 66.293354) (xy 85.422093 66.29335) (xy 85.537187 66.20719) (xy 85.53719 66.207187) (xy 85.62335 66.092093) (xy 85.623354 66.092086) (xy 85.673596 65.957379) (xy 85.673598 65.957372) (xy 85.679999 65.897844) (xy 85.68 65.897827) (xy 85.68 65.25) (xy 84.763012 65.25) (xy 84.795925 65.192993) @@ -23140,33 +24415,54 @@ (xy 102.422086 66.293354) (xy 102.422093 66.29335) (xy 102.537187 66.20719) (xy 102.53719 66.207187) (xy 102.62335 66.092093) (xy 102.623354 66.092086) (xy 102.673596 65.957379) (xy 102.673598 65.957372) (xy 102.679999 65.897844) (xy 102.68 65.897827) (xy 102.68 65.25) (xy 101.763012 65.25) (xy 101.795925 65.192993) - (xy 101.83 65.065826) (xy 101.83 64.934174) (xy 101.795925 64.807007) (xy 101.763012 64.75) (xy 102.68 64.75) - (xy 102.68 64.102172) (xy 102.679999 64.102155) (xy 102.673598 64.042627) (xy 102.673596 64.04262) - (xy 102.623354 63.907913) (xy 102.62335 63.907906) (xy 102.53719 63.792812) (xy 102.537187 63.792809) - (xy 102.422093 63.706649) (xy 102.422087 63.706646) (xy 102.344381 63.677663) (xy 102.288448 63.635791) - (xy 102.264031 63.570327) (xy 102.278883 63.502054) (xy 102.318826 63.458377) (xy 102.324552 63.454552) - (xy 102.368867 63.388231) (xy 102.368867 63.388229) (xy 102.368868 63.388229) (xy 102.380499 63.329752) - (xy 102.3805 63.32975) (xy 102.3805 62.873618) (xy 124.2085 62.873618) (xy 124.211249 62.919763) - (xy 124.211249 62.919767) (xy 124.21125 62.919768) (xy 124.254907 63.120461) (xy 124.254909 63.120468) - (xy 124.33576 63.309271) (xy 124.335763 63.309277) (xy 124.349621 63.329752) (xy 124.450882 63.479368) - (xy 124.45089 63.479377) (xy 124.596122 63.624609) (xy 124.596131 63.624617) (xy 124.698411 63.693841) - (xy 124.766223 63.739737) (xy 124.766228 63.739739) (xy 124.955031 63.82059) (xy 124.955038 63.820592) - (xy 125.021935 63.835144) (xy 125.155737 63.864251) (xy 125.201882 63.867) (xy 125.201893 63.867) - (xy 127.116107 63.867) (xy 127.116118 63.867) (xy 127.162263 63.864251) (xy 127.337954 63.826031) - (xy 127.362961 63.820592) (xy 127.362968 63.82059) (xy 127.492782 63.765) (xy 127.551777 63.739737) - (xy 127.721875 63.624612) (xy 127.867112 63.479375) (xy 127.982237 63.309277) (xy 128.063091 63.120465) - (xy 128.063745 63.117461) (xy 128.07483 63.066501) (xy 128.106751 62.919763) (xy 128.1095 62.873618) - (xy 128.1095 60.959382) (xy 128.106751 60.913237) (xy 128.063091 60.712535) (xy 128.06309 60.712531) - (xy 127.982239 60.523728) (xy 127.982237 60.523723) (xy 127.936637 60.456349) (xy 127.867117 60.353631) - (xy 127.867109 60.353622) (xy 127.721877 60.20839) (xy 127.721868 60.208382) (xy 127.551781 60.093266) - (xy 127.551777 60.093263) (xy 127.551773 60.093261) (xy 127.551771 60.09326) (xy 127.362968 60.012409) - (xy 127.362961 60.012407) (xy 127.162268 59.96875) (xy 127.162267 59.968749) (xy 127.162263 59.968749) - (xy 127.116118 59.966) (xy 125.201882 59.966) (xy 125.155737 59.968749) (xy 125.155732 59.968749) - (xy 125.155731 59.96875) (xy 124.955038 60.012407) (xy 124.955031 60.012409) (xy 124.766228 60.09326) - (xy 124.766218 60.093266) (xy 124.596131 60.208382) (xy 124.596122 60.20839) (xy 124.45089 60.353622) - (xy 124.450882 60.353631) (xy 124.335766 60.523718) (xy 124.33576 60.523728) (xy 124.254909 60.712531) - (xy 124.254907 60.712538) (xy 124.21125 60.913231) (xy 124.211249 60.913237) (xy 124.2085 60.959382) - (xy 124.2085 62.873618) (xy 102.3805 62.873618) (xy 102.3805 61.590249) (xy 102.380499 61.590247) + (xy 101.83 65.065826) (xy 101.83 64.934174) (xy 101.806574 64.846747) (xy 121.2085 64.846747) (xy 121.2085 68.386252) + (xy 121.220131 68.444729) (xy 121.220132 68.44473) (xy 121.264447 68.511052) (xy 121.330769 68.555367) + (xy 121.33077 68.555368) (xy 121.389247 68.566999) (xy 121.38925 68.567) (xy 121.389252 68.567) + (xy 121.8345 68.567) (xy 121.901539 68.586685) (xy 121.947294 68.639489) (xy 121.9585 68.691) (xy 121.9585 69.753486) + (xy 121.988059 69.940118) (xy 122.046454 70.119836) (xy 122.13224 70.288199) (xy 122.24331 70.441074) + (xy 131.717927 79.91569) (xy 131.870801 80.02676) (xy 131.950347 80.06729) (xy 132.039163 80.112545) + (xy 132.039165 80.112545) (xy 132.039168 80.112547) (xy 132.135497 80.143846) (xy 132.218881 80.17094) + (xy 132.405514 80.2005) (xy 132.405519 80.2005) (xy 132.594487 80.2005) (xy 132.698168 80.184077) + (xy 132.781118 80.17094) (xy 132.960832 80.112547) (xy 133.129199 80.02676) (xy 133.282074 79.91569) + (xy 133.41569 79.782074) (xy 133.52676 79.629199) (xy 133.612547 79.460832) (xy 133.67094 79.281118) + (xy 133.697323 79.114543) (xy 133.7005 79.094487) (xy 133.7005 78.905513) (xy 133.67094 78.718881) + (xy 133.612545 78.539163) (xy 133.56729 78.450347) (xy 133.52676 78.370801) (xy 133.41569 78.217927) + (xy 124.395819 69.198055) (xy 124.362334 69.136732) (xy 124.3595 69.110374) (xy 124.3595 68.691) + (xy 124.379185 68.623961) (xy 124.431989 68.578206) (xy 124.4835 68.567) (xy 124.92875 68.567) (xy 124.928751 68.566999) + (xy 124.943568 68.564052) (xy 124.987229 68.555368) (xy 124.987229 68.555367) (xy 124.987231 68.555367) + (xy 125.053552 68.511052) (xy 125.097867 68.444731) (xy 125.097867 68.444729) (xy 125.097868 68.444729) + (xy 125.109499 68.386252) (xy 125.1095 68.38625) (xy 125.1095 65.552303) (xy 127.159 65.552303) + (xy 127.159 66.3665) (xy 128.659 66.3665) (xy 128.659 66.8665) (xy 127.159001 66.8665) (xy 127.159001 67.680697) + (xy 127.1694 67.812832) (xy 127.224377 68.031019) (xy 127.317428 68.235874) (xy 127.317431 68.23588) + (xy 127.445559 68.420823) (xy 127.445569 68.420835) (xy 127.604664 68.57993) (xy 127.604676 68.57994) + (xy 127.789619 68.708068) (xy 127.789625 68.708071) (xy 127.99448 68.801122) (xy 128.212667 68.856099) + (xy 128.34481 68.866499) (xy 128.908999 68.866499) (xy 128.909 68.866498) (xy 128.909 68.049512) + (xy 128.966007 68.082425) (xy 129.093174 68.1165) (xy 129.224826 68.1165) (xy 129.351993 68.082425) + (xy 129.409 68.049512) (xy 129.409 68.866499) (xy 129.973182 68.866499) (xy 129.973197 68.866498) + (xy 130.105332 68.856099) (xy 130.323519 68.801122) (xy 130.528374 68.708071) (xy 130.52838 68.708068) + (xy 130.713323 68.57994) (xy 130.713335 68.57993) (xy 130.87243 68.420835) (xy 130.87244 68.420823) + (xy 131.000568 68.23588) (xy 131.000571 68.235874) (xy 131.093622 68.031019) (xy 131.148599 67.812832) + (xy 131.158999 67.680696) (xy 131.159 67.680684) (xy 131.159 66.8665) (xy 129.659 66.8665) (xy 129.659 66.3665) + (xy 131.158999 66.3665) (xy 131.158999 65.552317) (xy 131.158998 65.552302) (xy 131.148599 65.420167) + (xy 131.093622 65.20198) (xy 131.000571 64.997125) (xy 131.000568 64.997119) (xy 130.87244 64.812176) + (xy 130.87243 64.812164) (xy 130.713335 64.653069) (xy 130.713323 64.653059) (xy 130.52838 64.524931) + (xy 130.528374 64.524928) (xy 130.323519 64.431877) (xy 130.105332 64.3769) (xy 129.973196 64.3665) + (xy 129.409 64.3665) (xy 129.409 65.183488) (xy 129.351993 65.150575) (xy 129.224826 65.1165) (xy 129.093174 65.1165) + (xy 128.966007 65.150575) (xy 128.909 65.183488) (xy 128.909 64.3665) (xy 128.344817 64.3665) (xy 128.344802 64.366501) + (xy 128.212667 64.3769) (xy 127.99448 64.431877) (xy 127.789625 64.524928) (xy 127.789619 64.524931) + (xy 127.604676 64.653059) (xy 127.604664 64.653069) (xy 127.445569 64.812164) (xy 127.445559 64.812176) + (xy 127.317431 64.997119) (xy 127.317428 64.997125) (xy 127.224377 65.20198) (xy 127.1694 65.420167) + (xy 127.159 65.552303) (xy 125.1095 65.552303) (xy 125.1095 64.846749) (xy 125.109499 64.846747) + (xy 125.097868 64.78827) (xy 125.097867 64.788269) (xy 125.053552 64.721947) (xy 124.98723 64.677632) + (xy 124.987229 64.677631) (xy 124.928752 64.666) (xy 124.928748 64.666) (xy 121.389252 64.666) (xy 121.389247 64.666) + (xy 121.33077 64.677631) (xy 121.330769 64.677632) (xy 121.264447 64.721947) (xy 121.220132 64.788269) + (xy 121.220131 64.78827) (xy 121.2085 64.846747) (xy 101.806574 64.846747) (xy 101.795925 64.807007) + (xy 101.763012 64.75) (xy 102.68 64.75) (xy 102.68 64.102172) (xy 102.679999 64.102155) (xy 102.673598 64.042627) + (xy 102.673596 64.04262) (xy 102.623354 63.907913) (xy 102.62335 63.907906) (xy 102.53719 63.792812) + (xy 102.537187 63.792809) (xy 102.422093 63.706649) (xy 102.422087 63.706646) (xy 102.344381 63.677663) + (xy 102.288448 63.635791) (xy 102.264031 63.570327) (xy 102.278883 63.502054) (xy 102.318826 63.458377) + (xy 102.324552 63.454552) (xy 102.368867 63.388231) (xy 102.368867 63.388229) (xy 102.368868 63.388229) + (xy 102.380499 63.329752) (xy 102.3805 63.32975) (xy 102.3805 61.590249) (xy 102.380499 61.590247) (xy 102.368868 61.53177) (xy 102.368867 61.531769) (xy 102.324552 61.465447) (xy 102.25823 61.421132) (xy 102.258229 61.421131) (xy 102.199752 61.4095) (xy 102.199748 61.4095) (xy 100.460252 61.4095) (xy 100.460247 61.4095) (xy 100.40177 61.421131) (xy 100.401769 61.421132) (xy 100.335447 61.465447) @@ -23209,219 +24505,279 @@ (xy 78.942663 63.678975) (xy 78.90865 63.693841) (xy 78.786514 63.726567) (xy 78.786507 63.72657) (xy 78.572422 63.826399) (xy 78.57242 63.8264) (xy 78.378926 63.961886) (xy 78.37892 63.961891) (xy 78.211891 64.12892) (xy 78.211886 64.128926) (xy 78.0764 64.32242) (xy 78.076399 64.322422) - (xy 77.97657 64.536507) (xy 77.976567 64.536513) (xy 77.919364 64.749999) (xy 77.919364 64.75) (xy 78.816988 64.75) - (xy 78.784075 64.807007) (xy 78.75 64.934174) (xy 78.75 65.065826) (xy 78.784075 65.192993) (xy 78.816988 65.25) - (xy 77.919364 65.25) (xy 70.9205 65.25) (xy 70.9205 64.130252) (xy 70.9205 64.130249) (xy 70.920499 64.130247) - (xy 70.908868 64.07177) (xy 70.908867 64.071769) (xy 70.864552 64.005447) (xy 70.79823 63.961132) - (xy 70.798229 63.961131) (xy 70.739752 63.9495) (xy 70.739748 63.9495) (xy 69.000252 63.9495) (xy 69.000247 63.9495) - (xy 68.94177 63.961131) (xy 68.941769 63.961132) (xy 68.875447 64.005447) (xy 68.831132 64.071769) - (xy 68.831131 64.07177) (xy 68.8195 64.130247) (xy 68.8195 64.4255) (xy 68.799815 64.492539) (xy 68.747011 64.538294) - (xy 68.6955 64.5495) (xy 68.354675 64.5495) (xy 68.287636 64.529815) (xy 68.245317 64.483953) (xy 68.207688 64.413555) - (xy 68.207684 64.413549) (xy 68.07641 64.253589) (xy 67.926121 64.130252) (xy 67.91645 64.122315) - (xy 67.733954 64.024768) (xy 67.535934 63.9647) (xy 67.535932 63.964699) (xy 67.535934 63.964699) - (xy 67.33 63.944417) (xy 67.124067 63.964699) (xy 66.926043 64.024769) (xy 66.892634 64.042627) - (xy 66.74355 64.122315) (xy 66.743548 64.122316) (xy 66.743547 64.122317) (xy 66.583589 64.253589) - (xy 66.452315 64.413549) (xy 66.452311 64.413555) (xy 66.414683 64.483953) (xy 66.365721 64.533797) - (xy 66.305325 64.5495) (xy 65.814675 64.5495) (xy 65.747636 64.529815) (xy 65.705317 64.483953) - (xy 65.667688 64.413555) (xy 65.667684 64.413549) (xy 65.53641 64.253589) (xy 65.386121 64.130252) - (xy 65.37645 64.122315) (xy 65.193954 64.024768) (xy 64.995934 63.9647) (xy 64.995932 63.964699) - (xy 64.995934 63.964699) (xy 64.79 63.944417) (xy 64.584067 63.964699) (xy 64.386043 64.024769) - (xy 64.352634 64.042627) (xy 64.20355 64.122315) (xy 64.203548 64.122316) (xy 64.203547 64.122317) - (xy 64.043589 64.253589) (xy 63.912315 64.413549) (xy 63.912311 64.413555) (xy 63.874683 64.483953) - (xy 63.825721 64.533797) (xy 63.765325 64.5495) (xy 61.512965 64.5495) (xy 61.445926 64.529815) - (xy 61.425284 64.513181) (xy 59.372103 62.46) (xy 63.734417 62.46) (xy 63.754699 62.665932) (xy 63.784407 62.763867) - (xy 63.814768 62.863954) (xy 63.912315 63.04645) (xy 63.946969 63.088677) (xy 64.043589 63.20641) - (xy 64.140209 63.285702) (xy 64.20355 63.337685) (xy 64.386046 63.435232) (xy 64.584066 63.4953) - (xy 64.584065 63.4953) (xy 64.602529 63.497118) (xy 64.79 63.515583) (xy 64.995934 63.4953) (xy 65.193954 63.435232) - (xy 65.37645 63.337685) (xy 65.53641 63.20641) (xy 65.667685 63.04645) (xy 65.702828 62.980703) - (xy 65.705317 62.976047) (xy 65.754279 62.926203) (xy 65.814675 62.9105) (xy 66.305325 62.9105) - (xy 66.372364 62.930185) (xy 66.414683 62.976047) (xy 66.452311 63.046444) (xy 66.452315 63.04645) - (xy 66.583589 63.20641) (xy 66.680209 63.285702) (xy 66.74355 63.337685) (xy 66.926046 63.435232) - (xy 67.124066 63.4953) (xy 67.124065 63.4953) (xy 67.142529 63.497118) (xy 67.33 63.515583) (xy 67.535934 63.4953) - (xy 67.733954 63.435232) (xy 67.91645 63.337685) (xy 68.07641 63.20641) (xy 68.207685 63.04645) - (xy 68.242828 62.980703) (xy 68.245317 62.976047) (xy 68.294279 62.926203) (xy 68.354675 62.9105) - (xy 68.6955 62.9105) (xy 68.762539 62.930185) (xy 68.808294 62.982989) (xy 68.8195 63.0345) (xy 68.8195 63.329752) - (xy 68.831131 63.388229) (xy 68.831132 63.38823) (xy 68.875447 63.454552) (xy 68.941769 63.498867) - (xy 68.94177 63.498868) (xy 69.000247 63.510499) (xy 69.00025 63.5105) (xy 69.000252 63.5105) (xy 70.73975 63.5105) - (xy 70.739751 63.510499) (xy 70.754568 63.507552) (xy 70.798229 63.498868) (xy 70.798229 63.498867) - (xy 70.798231 63.498867) (xy 70.864552 63.454552) (xy 70.908867 63.388231) (xy 70.908867 63.388229) - (xy 70.908868 63.388229) (xy 70.920499 63.329752) (xy 70.9205 63.32975) (xy 70.9205 61.590249) (xy 70.920499 61.590247) - (xy 70.908868 61.53177) (xy 70.908867 61.531769) (xy 70.864552 61.465447) (xy 70.79823 61.421132) - (xy 70.798229 61.421131) (xy 70.739752 61.4095) (xy 70.739748 61.4095) (xy 69.000252 61.4095) (xy 69.000247 61.4095) - (xy 68.94177 61.421131) (xy 68.941769 61.421132) (xy 68.875447 61.465447) (xy 68.831132 61.531769) - (xy 68.831131 61.53177) (xy 68.8195 61.590247) (xy 68.8195 61.8855) (xy 68.799815 61.952539) (xy 68.747011 61.998294) - (xy 68.6955 62.0095) (xy 68.354675 62.0095) (xy 68.287636 61.989815) (xy 68.245317 61.943953) (xy 68.207688 61.873555) - (xy 68.207684 61.873549) (xy 68.207682 61.873547) (xy 68.136665 61.787011) (xy 68.07641 61.713589) - (xy 67.926121 61.590252) (xy 67.91645 61.582315) (xy 67.733954 61.484768) (xy 67.535934 61.4247) - (xy 67.535932 61.424699) (xy 67.535934 61.424699) (xy 67.33 61.404417) (xy 67.124067 61.424699) - (xy 66.926043 61.484769) (xy 66.838114 61.531769) (xy 66.74355 61.582315) (xy 66.743548 61.582316) - (xy 66.743547 61.582317) (xy 66.583589 61.713589) (xy 66.452315 61.873549) (xy 66.452311 61.873555) - (xy 66.414683 61.943953) (xy 66.365721 61.993797) (xy 66.305325 62.0095) (xy 65.814675 62.0095) - (xy 65.747636 61.989815) (xy 65.705317 61.943953) (xy 65.667688 61.873555) (xy 65.667684 61.873549) - (xy 65.667682 61.873547) (xy 65.596665 61.787011) (xy 65.53641 61.713589) (xy 65.386121 61.590252) - (xy 65.37645 61.582315) (xy 65.193954 61.484768) (xy 64.995934 61.4247) (xy 64.995932 61.424699) - (xy 64.995934 61.424699) (xy 64.79 61.404417) (xy 64.584067 61.424699) (xy 64.386043 61.484769) - (xy 64.298114 61.531769) (xy 64.20355 61.582315) (xy 64.203548 61.582316) (xy 64.203547 61.582317) - (xy 64.043589 61.713589) (xy 63.92877 61.853499) (xy 63.912315 61.87355) (xy 63.905928 61.8855) - (xy 63.814769 62.056043) (xy 63.754699 62.254067) (xy 63.734417 62.46) (xy 59.372103 62.46) (xy 58.276616 61.364513) - (xy 58.276614 61.364511) (xy 58.22525 61.334856) (xy 58.173888 61.305201) (xy 58.16178 61.301957) - (xy 58.149673 61.298713) (xy 58.14967 61.298712) (xy 58.111478 61.288478) (xy 58.059309 61.2745) - (xy 58.059308 61.2745) (xy 55.4245 61.2745) (xy 55.357461 61.254815) (xy 55.311706 61.202011) (xy 55.3005 61.1505) - (xy 55.3005 60.855249) (xy 55.300499 60.855247) (xy 55.288868 60.79677) (xy 55.288867 60.796769) - (xy 55.244552 60.730447) (xy 55.17823 60.686132) (xy 55.178229 60.686131) (xy 55.119752 60.6745) - (xy 55.119748 60.6745) (xy 53.380252 60.6745) (xy 53.380247 60.6745) (xy 53.32177 60.686131) (xy 53.321769 60.686132) - (xy 53.255447 60.730447) (xy 53.211132 60.796769) (xy 53.211131 60.79677) (xy 53.1995 60.855247) - (xy 53.1995 62.594752) (xy 53.211131 62.653229) (xy 53.211132 62.65323) (xy 53.255447 62.719552) - (xy 53.321769 62.763867) (xy 53.32177 62.763868) (xy 53.380247 62.775499) (xy 53.38025 62.7755) - (xy 53.690543 62.7755) (xy 53.757582 62.795185) (xy 53.803337 62.847989) (xy 53.813281 62.917147) + (xy 77.97657 64.536507) (xy 77.976567 64.536513) (xy 77.919364 64.749999) (xy 70.9205 64.749999) + (xy 70.9205 64.130252) (xy 70.9205 64.130249) (xy 70.920499 64.130247) (xy 70.908868 64.07177) (xy 70.908867 64.071769) + (xy 70.864552 64.005447) (xy 70.79823 63.961132) (xy 70.798229 63.961131) (xy 70.739752 63.9495) + (xy 70.739748 63.9495) (xy 69.000252 63.9495) (xy 69.000247 63.9495) (xy 68.94177 63.961131) (xy 68.941769 63.961132) + (xy 68.875447 64.005447) (xy 68.831132 64.071769) (xy 68.831131 64.07177) (xy 68.8195 64.130247) + (xy 68.8195 64.4255) (xy 68.799815 64.492539) (xy 68.747011 64.538294) (xy 68.6955 64.5495) (xy 68.354675 64.5495) + (xy 68.287636 64.529815) (xy 68.245317 64.483953) (xy 68.207688 64.413555) (xy 68.207684 64.413549) + (xy 68.07641 64.253589) (xy 67.926121 64.130252) (xy 67.91645 64.122315) (xy 67.733954 64.024768) + (xy 67.535934 63.9647) (xy 67.535932 63.964699) (xy 67.535934 63.964699) (xy 67.33 63.944417) (xy 67.124067 63.964699) + (xy 66.926043 64.024769) (xy 66.892634 64.042627) (xy 66.74355 64.122315) (xy 66.743548 64.122316) + (xy 66.743547 64.122317) (xy 66.583589 64.253589) (xy 66.452315 64.413549) (xy 66.452311 64.413555) + (xy 66.414683 64.483953) (xy 66.365721 64.533797) (xy 66.305325 64.5495) (xy 65.814675 64.5495) + (xy 65.747636 64.529815) (xy 65.705317 64.483953) (xy 65.667688 64.413555) (xy 65.667684 64.413549) + (xy 65.53641 64.253589) (xy 65.386121 64.130252) (xy 65.37645 64.122315) (xy 65.193954 64.024768) + (xy 64.995934 63.9647) (xy 64.995932 63.964699) (xy 64.995934 63.964699) (xy 64.79 63.944417) (xy 64.584067 63.964699) + (xy 64.386043 64.024769) (xy 64.352634 64.042627) (xy 64.20355 64.122315) (xy 64.203548 64.122316) + (xy 64.203547 64.122317) (xy 64.043589 64.253589) (xy 63.912315 64.413549) (xy 63.912311 64.413555) + (xy 63.874683 64.483953) (xy 63.825721 64.533797) (xy 63.765325 64.5495) (xy 61.512965 64.5495) + (xy 61.445926 64.529815) (xy 61.425284 64.513181) (xy 59.372103 62.46) (xy 63.734417 62.46) (xy 63.754699 62.665932) + (xy 63.784407 62.763867) (xy 63.814768 62.863954) (xy 63.912315 63.04645) (xy 63.946969 63.088677) + (xy 64.043589 63.20641) (xy 64.140209 63.285702) (xy 64.20355 63.337685) (xy 64.386046 63.435232) + (xy 64.584066 63.4953) (xy 64.584065 63.4953) (xy 64.602529 63.497118) (xy 64.79 63.515583) (xy 64.995934 63.4953) + (xy 65.193954 63.435232) (xy 65.37645 63.337685) (xy 65.53641 63.20641) (xy 65.667685 63.04645) + (xy 65.702828 62.980703) (xy 65.705317 62.976047) (xy 65.754279 62.926203) (xy 65.814675 62.9105) + (xy 66.305325 62.9105) (xy 66.372364 62.930185) (xy 66.414683 62.976047) (xy 66.452311 63.046444) + (xy 66.452315 63.04645) (xy 66.583589 63.20641) (xy 66.680209 63.285702) (xy 66.74355 63.337685) + (xy 66.926046 63.435232) (xy 67.124066 63.4953) (xy 67.124065 63.4953) (xy 67.142529 63.497118) + (xy 67.33 63.515583) (xy 67.535934 63.4953) (xy 67.733954 63.435232) (xy 67.91645 63.337685) (xy 68.07641 63.20641) + (xy 68.207685 63.04645) (xy 68.242828 62.980703) (xy 68.245317 62.976047) (xy 68.294279 62.926203) + (xy 68.354675 62.9105) (xy 68.6955 62.9105) (xy 68.762539 62.930185) (xy 68.808294 62.982989) (xy 68.8195 63.0345) + (xy 68.8195 63.329752) (xy 68.831131 63.388229) (xy 68.831132 63.38823) (xy 68.875447 63.454552) + (xy 68.941769 63.498867) (xy 68.94177 63.498868) (xy 69.000247 63.510499) (xy 69.00025 63.5105) + (xy 69.000252 63.5105) (xy 70.73975 63.5105) (xy 70.739751 63.510499) (xy 70.754568 63.507552) (xy 70.798229 63.498868) + (xy 70.798229 63.498867) (xy 70.798231 63.498867) (xy 70.864552 63.454552) (xy 70.908867 63.388231) + (xy 70.908867 63.388229) (xy 70.908868 63.388229) (xy 70.920499 63.329752) (xy 70.9205 63.32975) + (xy 70.9205 61.590249) (xy 70.920499 61.590247) (xy 70.908868 61.53177) (xy 70.908867 61.531769) + (xy 70.864552 61.465447) (xy 70.79823 61.421132) (xy 70.798229 61.421131) (xy 70.739752 61.4095) + (xy 70.739748 61.4095) (xy 69.000252 61.4095) (xy 69.000247 61.4095) (xy 68.94177 61.421131) (xy 68.941769 61.421132) + (xy 68.875447 61.465447) (xy 68.831132 61.531769) (xy 68.831131 61.53177) (xy 68.8195 61.590247) + (xy 68.8195 61.8855) (xy 68.799815 61.952539) (xy 68.747011 61.998294) (xy 68.6955 62.0095) (xy 68.354675 62.0095) + (xy 68.287636 61.989815) (xy 68.245317 61.943953) (xy 68.207688 61.873555) (xy 68.207684 61.873549) + (xy 68.207682 61.873547) (xy 68.136665 61.787011) (xy 68.07641 61.713589) (xy 67.926121 61.590252) + (xy 67.91645 61.582315) (xy 67.733954 61.484768) (xy 67.535934 61.4247) (xy 67.535932 61.424699) + (xy 67.535934 61.424699) (xy 67.33 61.404417) (xy 67.124067 61.424699) (xy 66.926043 61.484769) + (xy 66.838114 61.531769) (xy 66.74355 61.582315) (xy 66.743548 61.582316) (xy 66.743547 61.582317) + (xy 66.583589 61.713589) (xy 66.452315 61.873549) (xy 66.452311 61.873555) (xy 66.414683 61.943953) + (xy 66.365721 61.993797) (xy 66.305325 62.0095) (xy 65.814675 62.0095) (xy 65.747636 61.989815) + (xy 65.705317 61.943953) (xy 65.667688 61.873555) (xy 65.667684 61.873549) (xy 65.667682 61.873547) + (xy 65.596665 61.787011) (xy 65.53641 61.713589) (xy 65.386121 61.590252) (xy 65.37645 61.582315) + (xy 65.193954 61.484768) (xy 64.995934 61.4247) (xy 64.995932 61.424699) (xy 64.995934 61.424699) + (xy 64.79 61.404417) (xy 64.584067 61.424699) (xy 64.386043 61.484769) (xy 64.298114 61.531769) + (xy 64.20355 61.582315) (xy 64.203548 61.582316) (xy 64.203547 61.582317) (xy 64.043589 61.713589) + (xy 63.92877 61.853499) (xy 63.912315 61.87355) (xy 63.905928 61.8855) (xy 63.814769 62.056043) + (xy 63.754699 62.254067) (xy 63.734417 62.46) (xy 59.372103 62.46) (xy 58.276616 61.364513) (xy 58.276614 61.364511) + (xy 58.22525 61.334856) (xy 58.173888 61.305201) (xy 58.160448 61.3016) (xy 58.149673 61.298713) + (xy 58.14967 61.298712) (xy 58.111478 61.288478) (xy 58.059309 61.2745) (xy 58.059308 61.2745) (xy 55.4245 61.2745) + (xy 55.357461 61.254815) (xy 55.311706 61.202011) (xy 55.3005 61.1505) (xy 55.3005 60.855249) (xy 55.300499 60.855247) + (xy 55.288868 60.79677) (xy 55.288867 60.796769) (xy 55.244552 60.730447) (xy 55.17823 60.686132) + (xy 55.178229 60.686131) (xy 55.119752 60.6745) (xy 55.119748 60.6745) (xy 53.380252 60.6745) (xy 53.380247 60.6745) + (xy 53.32177 60.686131) (xy 53.321769 60.686132) (xy 53.255447 60.730447) (xy 53.211132 60.796769) + (xy 53.211131 60.79677) (xy 53.1995 60.855247) (xy 53.1995 62.594752) (xy 53.211131 62.653229) (xy 53.211132 62.65323) + (xy 53.255447 62.719552) (xy 53.321769 62.763867) (xy 53.32177 62.763868) (xy 53.380247 62.775499) + (xy 53.38025 62.7755) (xy 53.690543 62.7755) (xy 53.757582 62.795185) (xy 53.803337 62.847989) (xy 53.813281 62.917147) (xy 53.784256 62.980703) (xy 53.742948 63.011882) (xy 53.572422 63.091399) (xy 53.57242 63.0914) (xy 53.378926 63.226886) (xy 53.37892 63.226891) (xy 53.211891 63.39392) (xy 53.211886 63.393926) (xy 53.0764 63.58742) (xy 53.076399 63.587422) (xy 52.97657 63.801507) (xy 52.976567 63.801513) - (xy 52.919364 64.014999) (xy 52.919364 64.015) (xy 53.816988 64.015) (xy 53.784075 64.072007) (xy 53.75 64.199174) - (xy 53.75 64.330826) (xy 53.784075 64.457993) (xy 53.816988 64.515) (xy 52.919364 64.515) (xy 50 64.515) - (xy 50 59.92) (xy 63.734417 59.92) (xy 63.754699 60.125932) (xy 63.7547 60.125934) (xy 63.814768 60.323954) - (xy 63.912315 60.50645) (xy 63.926491 60.523723) (xy 64.043589 60.66641) (xy 64.099797 60.712538) - (xy 64.20355 60.797685) (xy 64.386046 60.895232) (xy 64.584066 60.9553) (xy 64.584065 60.9553) (xy 64.602529 60.957118) - (xy 64.79 60.975583) (xy 64.995934 60.9553) (xy 65.193954 60.895232) (xy 65.37645 60.797685) (xy 65.53641 60.66641) - (xy 65.667685 60.50645) (xy 65.765232 60.323954) (xy 65.8253 60.125934) (xy 65.845583 59.92) (xy 66.274417 59.92) - (xy 66.294699 60.125932) (xy 66.2947 60.125934) (xy 66.354768 60.323954) (xy 66.452315 60.50645) - (xy 66.466491 60.523723) (xy 66.583589 60.66641) (xy 66.639797 60.712538) (xy 66.74355 60.797685) - (xy 66.926046 60.895232) (xy 67.124066 60.9553) (xy 67.124065 60.9553) (xy 67.142529 60.957118) - (xy 67.33 60.975583) (xy 67.535934 60.9553) (xy 67.733954 60.895232) (xy 67.91645 60.797685) (xy 67.926116 60.789752) - (xy 68.8195 60.789752) (xy 68.831131 60.848229) (xy 68.831132 60.84823) (xy 68.875447 60.914552) - (xy 68.941769 60.958867) (xy 68.94177 60.958868) (xy 69.000247 60.970499) (xy 69.00025 60.9705) - (xy 69.000252 60.9705) (xy 70.73975 60.9705) (xy 70.739751 60.970499) (xy 70.754568 60.967552) (xy 70.798229 60.958868) - (xy 70.798229 60.958867) (xy 70.798231 60.958867) (xy 70.864552 60.914552) (xy 70.908867 60.848231) - (xy 70.908867 60.848229) (xy 70.908868 60.848229) (xy 70.920499 60.789752) (xy 70.9205 60.78975) - (xy 70.9205 59.92) (xy 78.194417 59.92) (xy 78.214699 60.125932) (xy 78.2147 60.125934) (xy 78.274768 60.323954) - (xy 78.372315 60.50645) (xy 78.386491 60.523723) (xy 78.503589 60.66641) (xy 78.559797 60.712538) - (xy 78.66355 60.797685) (xy 78.846046 60.895232) (xy 79.044066 60.9553) (xy 79.044065 60.9553) (xy 79.062529 60.957118) - (xy 79.25 60.975583) (xy 79.455934 60.9553) (xy 79.653954 60.895232) (xy 79.83645 60.797685) (xy 79.99641 60.66641) - (xy 80.127685 60.50645) (xy 80.225232 60.323954) (xy 80.2853 60.125934) (xy 80.305583 59.92) (xy 80.734417 59.92) - (xy 80.754699 60.125932) (xy 80.7547 60.125934) (xy 80.814768 60.323954) (xy 80.912315 60.50645) - (xy 80.926491 60.523723) (xy 81.043589 60.66641) (xy 81.099797 60.712538) (xy 81.20355 60.797685) - (xy 81.386046 60.895232) (xy 81.584066 60.9553) (xy 81.584065 60.9553) (xy 81.602529 60.957118) - (xy 81.79 60.975583) (xy 81.995934 60.9553) (xy 82.193954 60.895232) (xy 82.37645 60.797685) (xy 82.386116 60.789752) - (xy 83.2795 60.789752) (xy 83.291131 60.848229) (xy 83.291132 60.84823) (xy 83.335447 60.914552) - (xy 83.401769 60.958867) (xy 83.40177 60.958868) (xy 83.460247 60.970499) (xy 83.46025 60.9705) - (xy 83.460252 60.9705) (xy 85.19975 60.9705) (xy 85.199751 60.970499) (xy 85.214568 60.967552) (xy 85.258229 60.958868) - (xy 85.258229 60.958867) (xy 85.258231 60.958867) (xy 85.324552 60.914552) (xy 85.368867 60.848231) - (xy 85.368867 60.848229) (xy 85.368868 60.848229) (xy 85.380499 60.789752) (xy 85.3805 60.78975) - (xy 85.3805 59.92) (xy 92.654417 59.92) (xy 92.674699 60.125932) (xy 92.6747 60.125934) (xy 92.734768 60.323954) - (xy 92.832315 60.50645) (xy 92.846491 60.523723) (xy 92.963589 60.66641) (xy 93.019797 60.712538) - (xy 93.12355 60.797685) (xy 93.306046 60.895232) (xy 93.504066 60.9553) (xy 93.504065 60.9553) (xy 93.522529 60.957118) - (xy 93.71 60.975583) (xy 93.915934 60.9553) (xy 94.113954 60.895232) (xy 94.29645 60.797685) (xy 94.45641 60.66641) - (xy 94.587685 60.50645) (xy 94.685232 60.323954) (xy 94.7453 60.125934) (xy 94.765583 59.92) (xy 95.194417 59.92) - (xy 95.214699 60.125932) (xy 95.2147 60.125934) (xy 95.274768 60.323954) (xy 95.372315 60.50645) - (xy 95.386491 60.523723) (xy 95.503589 60.66641) (xy 95.559797 60.712538) (xy 95.66355 60.797685) - (xy 95.846046 60.895232) (xy 96.044066 60.9553) (xy 96.044065 60.9553) (xy 96.062529 60.957118) - (xy 96.25 60.975583) (xy 96.455934 60.9553) (xy 96.653954 60.895232) (xy 96.83645 60.797685) (xy 96.99641 60.66641) - (xy 97.127685 60.50645) (xy 97.225232 60.323954) (xy 97.2853 60.125934) (xy 97.305583 59.92) (xy 97.734417 59.92) - (xy 97.754699 60.125932) (xy 97.7547 60.125934) (xy 97.814768 60.323954) (xy 97.912315 60.50645) - (xy 97.926491 60.523723) (xy 98.043589 60.66641) (xy 98.099797 60.712538) (xy 98.20355 60.797685) - (xy 98.386046 60.895232) (xy 98.584066 60.9553) (xy 98.584065 60.9553) (xy 98.602529 60.957118) - (xy 98.79 60.975583) (xy 98.995934 60.9553) (xy 99.193954 60.895232) (xy 99.37645 60.797685) (xy 99.386116 60.789752) - (xy 100.2795 60.789752) (xy 100.291131 60.848229) (xy 100.291132 60.84823) (xy 100.335447 60.914552) - (xy 100.401769 60.958867) (xy 100.40177 60.958868) (xy 100.460247 60.970499) (xy 100.46025 60.9705) - (xy 100.460252 60.9705) (xy 102.19975 60.9705) (xy 102.199751 60.970499) (xy 102.214568 60.967552) - (xy 102.258229 60.958868) (xy 102.258229 60.958867) (xy 102.258231 60.958867) (xy 102.324552 60.914552) - (xy 102.368867 60.848231) (xy 102.368867 60.848229) (xy 102.368868 60.848229) (xy 102.380499 60.789752) - (xy 102.3805 60.78975) (xy 102.3805 59.050249) (xy 102.380499 59.050247) (xy 102.368868 58.99177) - (xy 102.368867 58.991769) (xy 102.324552 58.925447) (xy 102.25823 58.881132) (xy 102.258229 58.881131) - (xy 102.199752 58.8695) (xy 102.199748 58.8695) (xy 100.460252 58.8695) (xy 100.460247 58.8695) - (xy 100.40177 58.881131) (xy 100.401769 58.881132) (xy 100.335447 58.925447) (xy 100.291132 58.991769) - (xy 100.291131 58.99177) (xy 100.2795 59.050247) (xy 100.2795 60.789752) (xy 99.386116 60.789752) - (xy 99.53641 60.66641) (xy 99.667685 60.50645) (xy 99.765232 60.323954) (xy 99.8253 60.125934) (xy 99.845583 59.92) - (xy 99.8253 59.714066) (xy 99.765232 59.516046) (xy 99.667685 59.33355) (xy 99.615702 59.270209) - (xy 99.53641 59.173589) (xy 99.386121 59.050252) (xy 99.37645 59.042315) (xy 99.193954 58.944768) - (xy 98.995934 58.8847) (xy 98.995932 58.884699) (xy 98.995934 58.884699) (xy 98.79 58.864417) (xy 98.584067 58.884699) + (xy 52.919364 64.014999) (xy 50 64.014999) (xy 50 59.92) (xy 63.734417 59.92) (xy 63.754699 60.125932) + (xy 63.77971 60.208382) (xy 63.814768 60.323954) (xy 63.912315 60.50645) (xy 63.933247 60.531956) + (xy 64.043589 60.66641) (xy 64.12162 60.730447) (xy 64.20355 60.797685) (xy 64.386046 60.895232) + (xy 64.584066 60.9553) (xy 64.584065 60.9553) (xy 64.602529 60.957118) (xy 64.79 60.975583) (xy 64.995934 60.9553) + (xy 65.193954 60.895232) (xy 65.37645 60.797685) (xy 65.53641 60.66641) (xy 65.667685 60.50645) + (xy 65.765232 60.323954) (xy 65.8253 60.125934) (xy 65.845583 59.92) (xy 66.274417 59.92) (xy 66.294699 60.125932) + (xy 66.31971 60.208382) (xy 66.354768 60.323954) (xy 66.452315 60.50645) (xy 66.473247 60.531956) + (xy 66.583589 60.66641) (xy 66.66162 60.730447) (xy 66.74355 60.797685) (xy 66.926046 60.895232) + (xy 67.124066 60.9553) (xy 67.124065 60.9553) (xy 67.142529 60.957118) (xy 67.33 60.975583) (xy 67.535934 60.9553) + (xy 67.733954 60.895232) (xy 67.91645 60.797685) (xy 68.07641 60.66641) (xy 68.207685 60.50645) + (xy 68.305232 60.323954) (xy 68.3653 60.125934) (xy 68.385583 59.92) (xy 68.3653 59.714066) (xy 68.305232 59.516046) + (xy 68.207685 59.33355) (xy 68.14589 59.258252) (xy 68.07641 59.173589) (xy 67.926121 59.050252) + (xy 67.926115 59.050247) (xy 68.8195 59.050247) (xy 68.8195 60.789752) (xy 68.831131 60.848229) + (xy 68.831132 60.84823) (xy 68.875447 60.914552) (xy 68.941769 60.958867) (xy 68.94177 60.958868) + (xy 69.000247 60.970499) (xy 69.00025 60.9705) (xy 69.000252 60.9705) (xy 70.73975 60.9705) (xy 70.739751 60.970499) + (xy 70.754568 60.967552) (xy 70.798229 60.958868) (xy 70.798229 60.958867) (xy 70.798231 60.958867) + (xy 70.864552 60.914552) (xy 70.908867 60.848231) (xy 70.908867 60.848229) (xy 70.908868 60.848229) + (xy 70.920499 60.789752) (xy 70.9205 60.78975) (xy 70.9205 59.92) (xy 78.194417 59.92) (xy 78.214699 60.125932) + (xy 78.23971 60.208382) (xy 78.274768 60.323954) (xy 78.372315 60.50645) (xy 78.393247 60.531956) + (xy 78.503589 60.66641) (xy 78.58162 60.730447) (xy 78.66355 60.797685) (xy 78.846046 60.895232) + (xy 79.044066 60.9553) (xy 79.044065 60.9553) (xy 79.062529 60.957118) (xy 79.25 60.975583) (xy 79.455934 60.9553) + (xy 79.653954 60.895232) (xy 79.83645 60.797685) (xy 79.99641 60.66641) (xy 80.127685 60.50645) + (xy 80.225232 60.323954) (xy 80.2853 60.125934) (xy 80.305583 59.92) (xy 80.734417 59.92) (xy 80.754699 60.125932) + (xy 80.77971 60.208382) (xy 80.814768 60.323954) (xy 80.912315 60.50645) (xy 80.933247 60.531956) + (xy 81.043589 60.66641) (xy 81.12162 60.730447) (xy 81.20355 60.797685) (xy 81.386046 60.895232) + (xy 81.584066 60.9553) (xy 81.584065 60.9553) (xy 81.602529 60.957118) (xy 81.79 60.975583) (xy 81.995934 60.9553) + (xy 82.193954 60.895232) (xy 82.37645 60.797685) (xy 82.53641 60.66641) (xy 82.667685 60.50645) + (xy 82.765232 60.323954) (xy 82.8253 60.125934) (xy 82.845583 59.92) (xy 82.8253 59.714066) (xy 82.765232 59.516046) + (xy 82.667685 59.33355) (xy 82.60589 59.258252) (xy 82.53641 59.173589) (xy 82.386121 59.050252) + (xy 82.386115 59.050247) (xy 83.2795 59.050247) (xy 83.2795 60.789752) (xy 83.291131 60.848229) + (xy 83.291132 60.84823) (xy 83.335447 60.914552) (xy 83.401769 60.958867) (xy 83.40177 60.958868) + (xy 83.460247 60.970499) (xy 83.46025 60.9705) (xy 83.460252 60.9705) (xy 85.19975 60.9705) (xy 85.199751 60.970499) + (xy 85.214568 60.967552) (xy 85.258229 60.958868) (xy 85.258229 60.958867) (xy 85.258231 60.958867) + (xy 85.324552 60.914552) (xy 85.368867 60.848231) (xy 85.368867 60.848229) (xy 85.368868 60.848229) + (xy 85.380499 60.789752) (xy 85.3805 60.78975) (xy 85.3805 59.92) (xy 92.654417 59.92) (xy 92.674699 60.125932) + (xy 92.69971 60.208382) (xy 92.734768 60.323954) (xy 92.832315 60.50645) (xy 92.853247 60.531956) + (xy 92.963589 60.66641) (xy 93.04162 60.730447) (xy 93.12355 60.797685) (xy 93.306046 60.895232) + (xy 93.504066 60.9553) (xy 93.504065 60.9553) (xy 93.522529 60.957118) (xy 93.71 60.975583) (xy 93.915934 60.9553) + (xy 94.113954 60.895232) (xy 94.29645 60.797685) (xy 94.45641 60.66641) (xy 94.587685 60.50645) + (xy 94.685232 60.323954) (xy 94.7453 60.125934) (xy 94.765583 59.92) (xy 95.194417 59.92) (xy 95.214699 60.125932) + (xy 95.23971 60.208382) (xy 95.274768 60.323954) (xy 95.372315 60.50645) (xy 95.393247 60.531956) + (xy 95.503589 60.66641) (xy 95.58162 60.730447) (xy 95.66355 60.797685) (xy 95.846046 60.895232) + (xy 96.044066 60.9553) (xy 96.044065 60.9553) (xy 96.062529 60.957118) (xy 96.25 60.975583) (xy 96.455934 60.9553) + (xy 96.653954 60.895232) (xy 96.83645 60.797685) (xy 96.99641 60.66641) (xy 97.127685 60.50645) + (xy 97.225232 60.323954) (xy 97.2853 60.125934) (xy 97.305583 59.92) (xy 97.734417 59.92) (xy 97.754699 60.125932) + (xy 97.77971 60.208382) (xy 97.814768 60.323954) (xy 97.912315 60.50645) (xy 97.933247 60.531956) + (xy 98.043589 60.66641) (xy 98.12162 60.730447) (xy 98.20355 60.797685) (xy 98.386046 60.895232) + (xy 98.584066 60.9553) (xy 98.584065 60.9553) (xy 98.602529 60.957118) (xy 98.79 60.975583) (xy 98.995934 60.9553) + (xy 99.193954 60.895232) (xy 99.37645 60.797685) (xy 99.53641 60.66641) (xy 99.667685 60.50645) + (xy 99.765232 60.323954) (xy 99.8253 60.125934) (xy 99.845583 59.92) (xy 99.8253 59.714066) (xy 99.765232 59.516046) + (xy 99.667685 59.33355) (xy 99.60589 59.258252) (xy 99.53641 59.173589) (xy 99.386121 59.050252) + (xy 99.386115 59.050247) (xy 100.2795 59.050247) (xy 100.2795 60.789752) (xy 100.291131 60.848229) + (xy 100.291132 60.84823) (xy 100.335447 60.914552) (xy 100.401769 60.958867) (xy 100.40177 60.958868) + (xy 100.460247 60.970499) (xy 100.46025 60.9705) (xy 100.460252 60.9705) (xy 102.19975 60.9705) + (xy 102.199751 60.970499) (xy 102.214568 60.967552) (xy 102.258229 60.958868) (xy 102.258229 60.958867) + (xy 102.258231 60.958867) (xy 102.324552 60.914552) (xy 102.368867 60.848231) (xy 102.368867 60.848229) + (xy 102.368868 60.848229) (xy 102.380499 60.789752) (xy 102.3805 60.78975) (xy 102.3805 59.258247) + (xy 104.5627 59.258247) (xy 104.5627 60.997752) (xy 104.574331 61.056229) (xy 104.574332 61.05623) + (xy 104.618647 61.122552) (xy 104.684969 61.166867) (xy 104.68497 61.166868) (xy 104.743447 61.178499) + (xy 104.74345 61.1785) (xy 104.743452 61.1785) (xy 106.48295 61.1785) (xy 106.482951 61.178499) + (xy 106.497768 61.175552) (xy 106.541429 61.166868) (xy 106.541429 61.166867) (xy 106.541431 61.166867) + (xy 106.607752 61.122552) (xy 106.652067 61.056231) (xy 106.652067 61.056229) (xy 106.652068 61.056229) + (xy 106.662122 61.005682) (xy 106.6637 60.997748) (xy 106.6637 60.687456) (xy 106.683385 60.620417) + (xy 106.736189 60.574662) (xy 106.805347 60.564718) (xy 106.868903 60.593743) (xy 106.900082 60.635051) + (xy 106.9796 60.805578) (xy 107.115094 60.999082) (xy 107.282117 61.166105) (xy 107.475621 61.3016) + (xy 107.689707 61.401429) (xy 107.689716 61.401433) (xy 107.9032 61.458634) (xy 107.9032 60.561012) + (xy 107.960207 60.593925) (xy 108.087374 60.628) (xy 108.219026 60.628) (xy 108.346193 60.593925) + (xy 108.4032 60.561012) (xy 108.4032 61.458633) (xy 108.616683 61.401433) (xy 108.616692 61.401429) + (xy 108.830778 61.3016) (xy 109.024282 61.166105) (xy 109.191305 60.999082) (xy 109.3268 60.805578) + (xy 109.426629 60.591492) (xy 109.426633 60.591483) (xy 109.459358 60.46935) (xy 109.495722 60.40969) + (xy 109.558569 60.37916) (xy 109.627945 60.387454) (xy 109.681823 60.431939) (xy 109.697793 60.465447) + (xy 109.717968 60.531954) (xy 109.815515 60.71445) (xy 109.828644 60.730448) (xy 109.946789 60.87441) + (xy 109.994101 60.913237) (xy 110.10675 61.005685) (xy 110.289246 61.103232) (xy 110.487266 61.1633) + (xy 110.487265 61.1633) (xy 110.505729 61.165118) (xy 110.6932 61.183583) (xy 110.899134 61.1633) + (xy 111.097154 61.103232) (xy 111.27965 61.005685) (xy 111.336071 60.959382) (xy 124.2085 60.959382) + (xy 124.2085 62.873618) (xy 124.211249 62.919763) (xy 124.211249 62.919767) (xy 124.21125 62.919768) + (xy 124.254907 63.120461) (xy 124.254909 63.120468) (xy 124.33576 63.309271) (xy 124.335763 63.309277) + (xy 124.349621 63.329752) (xy 124.450882 63.479368) (xy 124.45089 63.479377) (xy 124.596122 63.624609) + (xy 124.596131 63.624617) (xy 124.698411 63.693841) (xy 124.766223 63.739737) (xy 124.766228 63.739739) + (xy 124.955031 63.82059) (xy 124.955038 63.820592) (xy 125.021935 63.835144) (xy 125.155737 63.864251) + (xy 125.201882 63.867) (xy 125.201893 63.867) (xy 127.116107 63.867) (xy 127.116118 63.867) (xy 127.162263 63.864251) + (xy 127.337954 63.826031) (xy 127.362961 63.820592) (xy 127.362968 63.82059) (xy 127.492782 63.765) + (xy 127.551777 63.739737) (xy 127.721875 63.624612) (xy 127.867112 63.479375) (xy 127.982237 63.309277) + (xy 128.063091 63.120465) (xy 128.063745 63.117461) (xy 128.07483 63.066501) (xy 128.106751 62.919763) + (xy 128.1095 62.873618) (xy 128.1095 60.959382) (xy 128.106751 60.913237) (xy 128.063091 60.712535) + (xy 128.06309 60.712531) (xy 127.995599 60.554927) (xy 127.982237 60.523723) (xy 127.905058 60.40969) + (xy 127.867117 60.353631) (xy 127.867109 60.353622) (xy 127.721877 60.20839) (xy 127.721868 60.208382) + (xy 127.551781 60.093266) (xy 127.551777 60.093263) (xy 127.551773 60.093261) (xy 127.551771 60.09326) + (xy 127.362968 60.012409) (xy 127.362961 60.012407) (xy 127.162268 59.96875) (xy 127.162267 59.968749) + (xy 127.162263 59.968749) (xy 127.116118 59.966) (xy 125.201882 59.966) (xy 125.155737 59.968749) + (xy 125.155732 59.968749) (xy 125.155731 59.96875) (xy 124.955038 60.012407) (xy 124.955031 60.012409) + (xy 124.766228 60.09326) (xy 124.766218 60.093266) (xy 124.596131 60.208382) (xy 124.596122 60.20839) + (xy 124.45089 60.353622) (xy 124.450882 60.353631) (xy 124.335766 60.523718) (xy 124.33576 60.523728) + (xy 124.254909 60.712531) (xy 124.254907 60.712538) (xy 124.21125 60.913231) (xy 124.211249 60.913237) + (xy 124.2085 60.959382) (xy 111.336071 60.959382) (xy 111.43961 60.87441) (xy 111.570885 60.71445) + (xy 111.668432 60.531954) (xy 111.7285 60.333934) (xy 111.748783 60.128) (xy 111.7285 59.922066) + (xy 111.668432 59.724046) (xy 111.570885 59.54155) (xy 111.496097 59.45042) (xy 111.43961 59.381589) + (xy 111.289321 59.258252) (xy 111.27965 59.250315) (xy 111.097154 59.152768) (xy 110.899134 59.0927) + (xy 110.899132 59.092699) (xy 110.899134 59.092699) (xy 110.6932 59.072417) (xy 110.487267 59.092699) + (xy 110.289243 59.152769) (xy 110.201314 59.199769) (xy 110.10675 59.250315) (xy 110.106748 59.250316) + (xy 110.106747 59.250317) (xy 109.946789 59.381589) (xy 109.815517 59.541547) (xy 109.717967 59.724046) + (xy 109.697793 59.790552) (xy 109.659496 59.84899) (xy 109.595683 59.877447) (xy 109.526616 59.866886) + (xy 109.474223 59.820661) (xy 109.459358 59.786649) (xy 109.426633 59.664516) (xy 109.426629 59.664507) + (xy 109.3268 59.450422) (xy 109.326799 59.45042) (xy 109.191313 59.256926) (xy 109.191308 59.25692) + (xy 109.024282 59.089894) (xy 108.830778 58.954399) (xy 108.616692 58.85457) (xy 108.616686 58.854567) + (xy 108.4032 58.797364) (xy 108.4032 59.694988) (xy 108.346193 59.662075) (xy 108.219026 59.628) + (xy 108.087374 59.628) (xy 107.960207 59.662075) (xy 107.9032 59.694988) (xy 107.9032 58.797364) + (xy 107.903199 58.797364) (xy 107.689713 58.854567) (xy 107.689707 58.85457) (xy 107.475622 58.954399) + (xy 107.47562 58.9544) (xy 107.282126 59.089886) (xy 107.28212 59.089891) (xy 107.115091 59.25692) + (xy 107.115086 59.256926) (xy 106.9796 59.45042) (xy 106.979599 59.450422) (xy 106.900082 59.620948) + (xy 106.85391 59.673387) (xy 106.786716 59.692539) (xy 106.719835 59.672323) (xy 106.6745 59.619158) + (xy 106.6637 59.568543) (xy 106.6637 59.258249) (xy 106.663699 59.258247) (xy 106.652068 59.19977) + (xy 106.652067 59.199769) (xy 106.607752 59.133447) (xy 106.54143 59.089132) (xy 106.541429 59.089131) + (xy 106.482952 59.0775) (xy 106.482948 59.0775) (xy 104.743452 59.0775) (xy 104.743447 59.0775) + (xy 104.68497 59.089131) (xy 104.684969 59.089132) (xy 104.618647 59.133447) (xy 104.574332 59.199769) + (xy 104.574331 59.19977) (xy 104.5627 59.258247) (xy 102.3805 59.258247) (xy 102.3805 59.050249) + (xy 102.380499 59.050247) (xy 102.368868 58.99177) (xy 102.368867 58.991769) (xy 102.324552 58.925447) + (xy 102.25823 58.881132) (xy 102.258229 58.881131) (xy 102.199752 58.8695) (xy 102.199748 58.8695) + (xy 100.460252 58.8695) (xy 100.460247 58.8695) (xy 100.40177 58.881131) (xy 100.401769 58.881132) + (xy 100.335447 58.925447) (xy 100.291132 58.991769) (xy 100.291131 58.99177) (xy 100.2795 59.050247) + (xy 99.386115 59.050247) (xy 99.37645 59.042315) (xy 99.193954 58.944768) (xy 98.995934 58.8847) + (xy 98.995932 58.884699) (xy 98.995934 58.884699) (xy 98.79 58.864417) (xy 98.584067 58.884699) (xy 98.386043 58.944769) (xy 98.298114 58.991769) (xy 98.20355 59.042315) (xy 98.203548 59.042316) - (xy 98.203547 59.042317) (xy 98.043589 59.173589) (xy 97.912317 59.333547) (xy 97.814769 59.516043) - (xy 97.754699 59.714067) (xy 97.734417 59.92) (xy 97.305583 59.92) (xy 97.2853 59.714066) (xy 97.225232 59.516046) - (xy 97.127685 59.33355) (xy 97.075702 59.270209) (xy 96.99641 59.173589) (xy 96.846121 59.050252) - (xy 96.83645 59.042315) (xy 96.653954 58.944768) (xy 96.455934 58.8847) (xy 96.455932 58.884699) - (xy 96.455934 58.884699) (xy 96.25 58.864417) (xy 96.044067 58.884699) (xy 95.846043 58.944769) - (xy 95.758114 58.991769) (xy 95.66355 59.042315) (xy 95.663548 59.042316) (xy 95.663547 59.042317) - (xy 95.503589 59.173589) (xy 95.372317 59.333547) (xy 95.274769 59.516043) (xy 95.214699 59.714067) - (xy 95.194417 59.92) (xy 94.765583 59.92) (xy 94.7453 59.714066) (xy 94.685232 59.516046) (xy 94.587685 59.33355) - (xy 94.535702 59.270209) (xy 94.45641 59.173589) (xy 94.306121 59.050252) (xy 94.29645 59.042315) - (xy 94.113954 58.944768) (xy 93.915934 58.8847) (xy 93.915932 58.884699) (xy 93.915934 58.884699) - (xy 93.71 58.864417) (xy 93.504067 58.884699) (xy 93.306043 58.944769) (xy 93.218114 58.991769) - (xy 93.12355 59.042315) (xy 93.123548 59.042316) (xy 93.123547 59.042317) (xy 92.963589 59.173589) - (xy 92.832317 59.333547) (xy 92.734769 59.516043) (xy 92.674699 59.714067) (xy 92.654417 59.92) - (xy 85.3805 59.92) (xy 85.3805 59.050249) (xy 85.380499 59.050247) (xy 85.368868 58.99177) (xy 85.368867 58.991769) + (xy 98.203547 59.042317) (xy 98.043589 59.173589) (xy 97.912317 59.333547) (xy 97.912315 59.33355) + (xy 97.886637 59.38159) (xy 97.814769 59.516043) (xy 97.754699 59.714067) (xy 97.734417 59.92) (xy 97.305583 59.92) + (xy 97.2853 59.714066) (xy 97.225232 59.516046) (xy 97.127685 59.33355) (xy 97.06589 59.258252) + (xy 96.99641 59.173589) (xy 96.846121 59.050252) (xy 96.83645 59.042315) (xy 96.653954 58.944768) + (xy 96.455934 58.8847) (xy 96.455932 58.884699) (xy 96.455934 58.884699) (xy 96.25 58.864417) (xy 96.044067 58.884699) + (xy 95.846043 58.944769) (xy 95.758114 58.991769) (xy 95.66355 59.042315) (xy 95.663548 59.042316) + (xy 95.663547 59.042317) (xy 95.503589 59.173589) (xy 95.372317 59.333547) (xy 95.372315 59.33355) + (xy 95.346637 59.38159) (xy 95.274769 59.516043) (xy 95.214699 59.714067) (xy 95.194417 59.92) (xy 94.765583 59.92) + (xy 94.7453 59.714066) (xy 94.685232 59.516046) (xy 94.587685 59.33355) (xy 94.52589 59.258252) + (xy 94.45641 59.173589) (xy 94.306121 59.050252) (xy 94.29645 59.042315) (xy 94.113954 58.944768) + (xy 93.915934 58.8847) (xy 93.915932 58.884699) (xy 93.915934 58.884699) (xy 93.71 58.864417) (xy 93.504067 58.884699) + (xy 93.306043 58.944769) (xy 93.218114 58.991769) (xy 93.12355 59.042315) (xy 93.123548 59.042316) + (xy 93.123547 59.042317) (xy 92.963589 59.173589) (xy 92.832317 59.333547) (xy 92.832315 59.33355) + (xy 92.806637 59.38159) (xy 92.734769 59.516043) (xy 92.674699 59.714067) (xy 92.654417 59.92) (xy 85.3805 59.92) + (xy 85.3805 59.050249) (xy 85.380499 59.050247) (xy 85.368868 58.99177) (xy 85.368867 58.991769) (xy 85.324552 58.925447) (xy 85.25823 58.881132) (xy 85.258229 58.881131) (xy 85.199752 58.8695) (xy 85.199748 58.8695) (xy 83.460252 58.8695) (xy 83.460247 58.8695) (xy 83.40177 58.881131) (xy 83.401769 58.881132) (xy 83.335447 58.925447) (xy 83.291132 58.991769) (xy 83.291131 58.99177) (xy 83.2795 59.050247) - (xy 83.2795 60.789752) (xy 82.386116 60.789752) (xy 82.53641 60.66641) (xy 82.667685 60.50645) (xy 82.765232 60.323954) - (xy 82.8253 60.125934) (xy 82.845583 59.92) (xy 82.8253 59.714066) (xy 82.765232 59.516046) (xy 82.667685 59.33355) - (xy 82.615702 59.270209) (xy 82.53641 59.173589) (xy 82.386121 59.050252) (xy 82.37645 59.042315) - (xy 82.193954 58.944768) (xy 81.995934 58.8847) (xy 81.995932 58.884699) (xy 81.995934 58.884699) - (xy 81.79 58.864417) (xy 81.584067 58.884699) (xy 81.386043 58.944769) (xy 81.298114 58.991769) - (xy 81.20355 59.042315) (xy 81.203548 59.042316) (xy 81.203547 59.042317) (xy 81.043589 59.173589) - (xy 80.912317 59.333547) (xy 80.814769 59.516043) (xy 80.754699 59.714067) (xy 80.734417 59.92) - (xy 80.305583 59.92) (xy 80.2853 59.714066) (xy 80.225232 59.516046) (xy 80.127685 59.33355) (xy 80.075702 59.270209) + (xy 82.386115 59.050247) (xy 82.37645 59.042315) (xy 82.193954 58.944768) (xy 81.995934 58.8847) + (xy 81.995932 58.884699) (xy 81.995934 58.884699) (xy 81.79 58.864417) (xy 81.584067 58.884699) + (xy 81.386043 58.944769) (xy 81.298114 58.991769) (xy 81.20355 59.042315) (xy 81.203548 59.042316) + (xy 81.203547 59.042317) (xy 81.043589 59.173589) (xy 80.912317 59.333547) (xy 80.912315 59.33355) + (xy 80.886637 59.38159) (xy 80.814769 59.516043) (xy 80.754699 59.714067) (xy 80.734417 59.92) (xy 80.305583 59.92) + (xy 80.2853 59.714066) (xy 80.225232 59.516046) (xy 80.127685 59.33355) (xy 80.06589 59.258252) (xy 79.99641 59.173589) (xy 79.846121 59.050252) (xy 79.83645 59.042315) (xy 79.653954 58.944768) (xy 79.455934 58.8847) (xy 79.455932 58.884699) (xy 79.455934 58.884699) (xy 79.25 58.864417) (xy 79.044067 58.884699) (xy 78.846043 58.944769) (xy 78.758114 58.991769) (xy 78.66355 59.042315) (xy 78.663548 59.042316) - (xy 78.663547 59.042317) (xy 78.503589 59.173589) (xy 78.372317 59.333547) (xy 78.274769 59.516043) - (xy 78.214699 59.714067) (xy 78.194417 59.92) (xy 70.9205 59.92) (xy 70.9205 59.050249) (xy 70.920499 59.050247) - (xy 70.908868 58.99177) (xy 70.908867 58.991769) (xy 70.864552 58.925447) (xy 70.79823 58.881132) - (xy 70.798229 58.881131) (xy 70.739752 58.8695) (xy 70.739748 58.8695) (xy 69.000252 58.8695) (xy 69.000247 58.8695) - (xy 68.94177 58.881131) (xy 68.941769 58.881132) (xy 68.875447 58.925447) (xy 68.831132 58.991769) - (xy 68.831131 58.99177) (xy 68.8195 59.050247) (xy 68.8195 60.789752) (xy 67.926116 60.789752) (xy 68.07641 60.66641) - (xy 68.207685 60.50645) (xy 68.305232 60.323954) (xy 68.3653 60.125934) (xy 68.385583 59.92) (xy 68.3653 59.714066) - (xy 68.305232 59.516046) (xy 68.207685 59.33355) (xy 68.155702 59.270209) (xy 68.07641 59.173589) - (xy 67.926121 59.050252) (xy 67.91645 59.042315) (xy 67.733954 58.944768) (xy 67.535934 58.8847) + (xy 78.663547 59.042317) (xy 78.503589 59.173589) (xy 78.372317 59.333547) (xy 78.372315 59.33355) + (xy 78.346637 59.38159) (xy 78.274769 59.516043) (xy 78.214699 59.714067) (xy 78.194417 59.92) (xy 70.9205 59.92) + (xy 70.9205 59.050249) (xy 70.920499 59.050247) (xy 70.908868 58.99177) (xy 70.908867 58.991769) + (xy 70.864552 58.925447) (xy 70.79823 58.881132) (xy 70.798229 58.881131) (xy 70.739752 58.8695) + (xy 70.739748 58.8695) (xy 69.000252 58.8695) (xy 69.000247 58.8695) (xy 68.94177 58.881131) (xy 68.941769 58.881132) + (xy 68.875447 58.925447) (xy 68.831132 58.991769) (xy 68.831131 58.99177) (xy 68.8195 59.050247) + (xy 67.926115 59.050247) (xy 67.91645 59.042315) (xy 67.733954 58.944768) (xy 67.535934 58.8847) (xy 67.535932 58.884699) (xy 67.535934 58.884699) (xy 67.33 58.864417) (xy 67.124067 58.884699) (xy 66.926043 58.944769) (xy 66.838114 58.991769) (xy 66.74355 59.042315) (xy 66.743548 59.042316) - (xy 66.743547 59.042317) (xy 66.583589 59.173589) (xy 66.452317 59.333547) (xy 66.354769 59.516043) - (xy 66.294699 59.714067) (xy 66.274417 59.92) (xy 65.845583 59.92) (xy 65.8253 59.714066) (xy 65.765232 59.516046) - (xy 65.667685 59.33355) (xy 65.615702 59.270209) (xy 65.53641 59.173589) (xy 65.386121 59.050252) - (xy 65.37645 59.042315) (xy 65.193954 58.944768) (xy 64.995934 58.8847) (xy 64.995932 58.884699) - (xy 64.995934 58.884699) (xy 64.79 58.864417) (xy 64.584067 58.884699) (xy 64.386043 58.944769) - (xy 64.298114 58.991769) (xy 64.20355 59.042315) (xy 64.203548 59.042316) (xy 64.203547 59.042317) - (xy 64.043589 59.173589) (xy 63.912317 59.333547) (xy 63.814769 59.516043) (xy 63.754699 59.714067) - (xy 63.734417 59.92) (xy 50 59.92) (xy 50 55) (xy 51.944693 55) (xy 51.963903 55.342081) (xy 51.963904 55.342086) - (xy 52.021296 55.67987) (xy 52.116147 56.009104) (xy 52.220108 56.260087) (xy 52.247263 56.325646) - (xy 52.412998 56.625521) (xy 52.611269 56.904959) (xy 52.83957 57.160426) (xy 52.839573 57.160429) - (xy 53.09504 57.38873) (xy 53.095046 57.388734) (xy 53.095047 57.388735) (xy 53.374479 57.587002) - (xy 53.674352 57.752736) (xy 53.990896 57.883853) (xy 54.32013 57.978704) (xy 54.657914 58.036096) - (xy 55 58.055307) (xy 55.342086 58.036096) (xy 55.67987 57.978704) (xy 56.009104 57.883853) (xy 56.325648 57.752736) - (xy 56.625521 57.587002) (xy 56.904953 57.388735) (xy 57.160428 57.160428) (xy 57.388735 56.904953) - (xy 57.587002 56.625521) (xy 57.752736 56.325648) (xy 57.883853 56.009104) (xy 57.978704 55.67987) - (xy 58.036096 55.342086) (xy 58.055307 55) (xy 128.944693 55) (xy 128.963903 55.342081) (xy 128.963904 55.342086) - (xy 129.021296 55.67987) (xy 129.116147 56.009104) (xy 129.220108 56.260087) (xy 129.247263 56.325646) - (xy 129.412998 56.625521) (xy 129.611269 56.904959) (xy 129.83957 57.160426) (xy 129.839573 57.160429) - (xy 130.09504 57.38873) (xy 130.095046 57.388734) (xy 130.095047 57.388735) (xy 130.374479 57.587002) - (xy 130.674352 57.752736) (xy 130.990896 57.883853) (xy 131.32013 57.978704) (xy 131.657914 58.036096) - (xy 132 58.055307) (xy 132.342086 58.036096) (xy 132.67987 57.978704) (xy 133.009104 57.883853) - (xy 133.325648 57.752736) (xy 133.625521 57.587002) (xy 133.904953 57.388735) (xy 134.160428 57.160428) - (xy 134.388735 56.904953) (xy 134.587002 56.625521) (xy 134.752736 56.325648) (xy 134.883853 56.009104) - (xy 134.978704 55.67987) (xy 135.036096 55.342086) (xy 135.055307 55) (xy 135.036096 54.657914) - (xy 134.978704 54.32013) (xy 134.883853 53.990896) (xy 134.752736 53.674352) (xy 134.587002 53.374479) - (xy 134.388735 53.095047) (xy 134.388734 53.095046) (xy 134.38873 53.09504) (xy 134.160429 52.839573) - (xy 134.160426 52.83957) (xy 133.904959 52.611269) (xy 133.625521 52.412998) (xy 133.325646 52.247263) - (xy 133.260087 52.220108) (xy 133.009104 52.116147) (xy 132.924479 52.091766) (xy 132.679875 52.021297) - (xy 132.679866 52.021295) (xy 132.342093 51.963905) (xy 132.342081 51.963903) (xy 132 51.944693) - (xy 131.657918 51.963903) (xy 131.657906 51.963905) (xy 131.320133 52.021295) (xy 131.320124 52.021297) - (xy 130.990899 52.116146) (xy 130.990896 52.116147) (xy 130.898184 52.154549) (xy 130.674353 52.247263) - (xy 130.374478 52.412998) (xy 130.09504 52.611269) (xy 129.839573 52.83957) (xy 129.83957 52.839573) - (xy 129.611269 53.09504) (xy 129.412998 53.374478) (xy 129.247263 53.674353) (xy 129.116146 53.990899) - (xy 129.021297 54.320124) (xy 129.021295 54.320133) (xy 128.963905 54.657906) (xy 128.963903 54.657918) - (xy 128.944693 55) (xy 58.055307 55) (xy 58.036096 54.657914) (xy 57.978704 54.32013) (xy 57.883853 53.990896) - (xy 57.752736 53.674352) (xy 57.587002 53.374479) (xy 57.388735 53.095047) (xy 57.388734 53.095046) - (xy 57.38873 53.09504) (xy 57.160429 52.839573) (xy 57.160426 52.83957) (xy 56.904959 52.611269) - (xy 56.625521 52.412998) (xy 56.325646 52.247263) (xy 56.260087 52.220108) (xy 56.009104 52.116147) - (xy 55.924479 52.091766) (xy 55.679875 52.021297) (xy 55.679866 52.021295) (xy 55.342093 51.963905) - (xy 55.342081 51.963903) (xy 55 51.944693) (xy 54.657918 51.963903) (xy 54.657906 51.963905) (xy 54.320133 52.021295) - (xy 54.320124 52.021297) (xy 53.990899 52.116146) (xy 53.990896 52.116147) (xy 53.898184 52.154549) - (xy 53.674353 52.247263) (xy 53.374478 52.412998) (xy 53.09504 52.611269) (xy 52.839573 52.83957) - (xy 52.83957 52.839573) (xy 52.611269 53.09504) (xy 52.412998 53.374478) (xy 52.247263 53.674353) - (xy 52.116146 53.990899) (xy 52.021297 54.320124) (xy 52.021295 54.320133) (xy 51.963905 54.657906) - (xy 51.963903 54.657918) (xy 51.944693 55) (xy 50 55) (xy 50 50.124) (xy 50.019685 50.056961) (xy 50.072489 50.011206) - (xy 50.124 50) (xy 136.876 50) - ) - ) - ) -) \ No newline at end of file + (xy 66.743547 59.042317) (xy 66.583589 59.173589) (xy 66.452317 59.333547) (xy 66.452315 59.33355) + (xy 66.426637 59.38159) (xy 66.354769 59.516043) (xy 66.294699 59.714067) (xy 66.274417 59.92) (xy 65.845583 59.92) + (xy 65.8253 59.714066) (xy 65.765232 59.516046) (xy 65.667685 59.33355) (xy 65.60589 59.258252) + (xy 65.53641 59.173589) (xy 65.386121 59.050252) (xy 65.37645 59.042315) (xy 65.193954 58.944768) + (xy 64.995934 58.8847) (xy 64.995932 58.884699) (xy 64.995934 58.884699) (xy 64.79 58.864417) (xy 64.584067 58.884699) + (xy 64.386043 58.944769) (xy 64.298114 58.991769) (xy 64.20355 59.042315) (xy 64.203548 59.042316) + (xy 64.203547 59.042317) (xy 64.043589 59.173589) (xy 63.912317 59.333547) (xy 63.912315 59.33355) + (xy 63.886637 59.38159) (xy 63.814769 59.516043) (xy 63.754699 59.714067) (xy 63.734417 59.92) (xy 50 59.92) + (xy 50 55) (xy 51.944693 55) (xy 51.963903 55.342081) (xy 51.963904 55.342086) (xy 52.021296 55.67987) + (xy 52.116147 56.009104) (xy 52.220108 56.260087) (xy 52.247263 56.325646) (xy 52.412998 56.625521) + (xy 52.611269 56.904959) (xy 52.83957 57.160426) (xy 52.839573 57.160429) (xy 53.09504 57.38873) + (xy 53.095046 57.388734) (xy 53.095047 57.388735) (xy 53.374479 57.587002) (xy 53.674352 57.752736) + (xy 53.990896 57.883853) (xy 54.32013 57.978704) (xy 54.657914 58.036096) (xy 55 58.055307) (xy 55.342086 58.036096) + (xy 55.67987 57.978704) (xy 56.009104 57.883853) (xy 56.325648 57.752736) (xy 56.625521 57.587002) + (xy 56.904953 57.388735) (xy 57.160428 57.160428) (xy 57.388735 56.904953) (xy 57.587002 56.625521) + (xy 57.752736 56.325648) (xy 57.883853 56.009104) (xy 57.978704 55.67987) (xy 58.036096 55.342086) + (xy 58.055307 55) (xy 128.944693 55) (xy 128.963903 55.342081) (xy 128.963904 55.342086) (xy 129.021296 55.67987) + (xy 129.116147 56.009104) (xy 129.220108 56.260087) (xy 129.247263 56.325646) (xy 129.412998 56.625521) + (xy 129.611269 56.904959) (xy 129.83957 57.160426) (xy 129.839573 57.160429) (xy 130.09504 57.38873) + (xy 130.095046 57.388734) (xy 130.095047 57.388735) (xy 130.374479 57.587002) (xy 130.674352 57.752736) + (xy 130.990896 57.883853) (xy 131.32013 57.978704) (xy 131.657914 58.036096) (xy 132 58.055307) + (xy 132.342086 58.036096) (xy 132.67987 57.978704) (xy 133.009104 57.883853) (xy 133.325648 57.752736) + (xy 133.625521 57.587002) (xy 133.904953 57.388735) (xy 134.160428 57.160428) (xy 134.388735 56.904953) + (xy 134.587002 56.625521) (xy 134.752736 56.325648) (xy 134.883853 56.009104) (xy 134.978704 55.67987) + (xy 135.036096 55.342086) (xy 135.055307 55) (xy 135.036096 54.657914) (xy 134.978704 54.32013) + (xy 134.883853 53.990896) (xy 134.752736 53.674352) (xy 134.587002 53.374479) (xy 134.388735 53.095047) + (xy 134.388734 53.095046) (xy 134.38873 53.09504) (xy 134.160429 52.839573) (xy 134.160426 52.83957) + (xy 133.904959 52.611269) (xy 133.625521 52.412998) (xy 133.325646 52.247263) (xy 133.260087 52.220108) + (xy 133.009104 52.116147) (xy 132.924479 52.091766) (xy 132.679875 52.021297) (xy 132.679866 52.021295) + (xy 132.342093 51.963905) (xy 132.342081 51.963903) (xy 132 51.944693) (xy 131.657918 51.963903) + (xy 131.657906 51.963905) (xy 131.320133 52.021295) (xy 131.320124 52.021297) (xy 130.990899 52.116146) + (xy 130.990896 52.116147) (xy 130.898184 52.154549) (xy 130.674353 52.247263) (xy 130.374478 52.412998) + (xy 130.09504 52.611269) (xy 129.839573 52.83957) (xy 129.83957 52.839573) (xy 129.611269 53.09504) + (xy 129.412998 53.374478) (xy 129.247263 53.674353) (xy 129.116146 53.990899) (xy 129.021297 54.320124) + (xy 129.021295 54.320133) (xy 128.963905 54.657906) (xy 128.963903 54.657918) (xy 128.944693 55) + (xy 58.055307 55) (xy 58.036096 54.657914) (xy 57.978704 54.32013) (xy 57.883853 53.990896) (xy 57.752736 53.674352) + (xy 57.587002 53.374479) (xy 57.388735 53.095047) (xy 57.388734 53.095046) (xy 57.38873 53.09504) + (xy 57.160429 52.839573) (xy 57.160426 52.83957) (xy 56.904959 52.611269) (xy 56.625521 52.412998) + (xy 56.325646 52.247263) (xy 56.260087 52.220108) (xy 56.009104 52.116147) (xy 55.924479 52.091766) + (xy 55.679875 52.021297) (xy 55.679866 52.021295) (xy 55.342093 51.963905) (xy 55.342081 51.963903) + (xy 55 51.944693) (xy 54.657918 51.963903) (xy 54.657906 51.963905) (xy 54.320133 52.021295) (xy 54.320124 52.021297) + (xy 53.990899 52.116146) (xy 53.990896 52.116147) (xy 53.898184 52.154549) (xy 53.674353 52.247263) + (xy 53.374478 52.412998) (xy 53.09504 52.611269) (xy 52.839573 52.83957) (xy 52.83957 52.839573) + (xy 52.611269 53.09504) (xy 52.412998 53.374478) (xy 52.247263 53.674353) (xy 52.116146 53.990899) + (xy 52.021297 54.320124) (xy 52.021295 54.320133) (xy 51.963905 54.657906) (xy 51.963903 54.657918) + (xy 51.944693 55) (xy 50 55) (xy 50 50.124) (xy 50.019685 50.056961) (xy 50.072489 50.011206) (xy 50.124 50) + (xy 136.876 50) + ) + ) + ) +) diff --git a/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pro b/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pro index f9558f4..29e56b5 100644 --- a/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pro +++ b/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_pro @@ -6,14 +6,14 @@ "apply_defaults_to_fp_fields": false, "apply_defaults_to_fp_shapes": false, "apply_defaults_to_fp_text": false, - "board_outline_line_width": 0.09999999999999999, - "copper_line_width": 0.19999999999999998, + "board_outline_line_width": 0.1, + "copper_line_width": 0.2, "copper_text_italic": false, "copper_text_size_h": 1.5, "copper_text_size_v": 1.5, "copper_text_thickness": 0.3, "copper_text_upright": false, - "courtyard_line_width": 0.049999999999999996, + "courtyard_line_width": 0.05, "dimension_precision": 4, "dimension_units": 3, "dimensions": { @@ -24,7 +24,7 @@ "text_position": 0, "units_format": 1 }, - "fab_line_width": 0.09999999999999999, + "fab_line_width": 0.1, "fab_text_italic": false, "fab_text_size_h": 1.0, "fab_text_size_v": 1.0, @@ -79,6 +79,7 @@ "footprint_type_mismatch": "ignore", "hole_clearance": "error", "hole_near_hole": "error", + "holes_co_located": "warning", "invalid_outline": "error", "isolated_copper": "warning", "item_on_disabled_layer": "error", @@ -120,15 +121,15 @@ "min_copper_edge_clearance": 0.0, "min_hole_clearance": 0.25, "min_hole_to_hole": 0.25, - "min_microvia_diameter": 0.19999999999999998, - "min_microvia_drill": 0.09999999999999999, + "min_microvia_diameter": 0.2, + "min_microvia_drill": 0.1, "min_resolved_spokes": 2, "min_silk_clearance": 0.0, - "min_text_height": 0.7999999999999999, + "min_text_height": 0.8, "min_text_thickness": 0.08, "min_through_hole_diameter": 0.3, "min_track_width": 0.0, - "min_via_annular_width": 0.09999999999999999, + "min_via_annular_width": 0.1, "min_via_diameter": 0.5, "solder_mask_clearance": 0.0, "solder_mask_min_width": 0.0, @@ -483,7 +484,7 @@ "gencad": "", "idf": "", "netlist": "", - "plot": "", + "plot": "gerbers_v1.3", "pos_files": "", "specctra_dsn": "", "step": "", diff --git a/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_sch b/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_sch index c9d36e6..2852ff9 100644 --- a/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_sch +++ b/hardware/rp-pico-sensor-shield/rp-pico-sensor-shield.kicad_sch @@ -4053,6 +4053,12 @@ ) ) ) + (junction + (at 241.3 78.359) + (diameter 0) + (color 0 0 0 0) + (uuid "020fbc56-7a65-4fcb-9b52-61416d3b0ff1") + ) (junction (at 123.698 45.974) (diameter 0) @@ -4179,6 +4185,12 @@ (color 0 0 0 0) (uuid "53518383-e77a-4146-8720-b05bc0e37f92") ) + (junction + (at 243.84 80.899) + (diameter 0) + (color 0 0 0 0) + (uuid "56ce3177-b489-4043-900c-5fa67d78677f") + ) (junction (at 65.278 116.459) (diameter 0) @@ -4281,6 +4293,12 @@ (color 0 0 0 0) (uuid "9f70e039-a93f-4341-8f9d-98998af9be67") ) + (junction + (at 246.38 83.439) + (diameter 0) + (color 0 0 0 0) + (uuid "9fb626de-dda8-4a2a-8081-f7018ec2f86b") + ) (junction (at 36.957 116.459) (diameter 0) @@ -4717,7 +4735,7 @@ ) (polyline (pts - (xy 265.049 31.877) (xy 265.049 13.97) + (xy 264.922 35.56) (xy 264.922 13.97) ) (stroke (width 0) @@ -4777,7 +4795,7 @@ ) (polyline (pts - (xy 206.502 13.97) (xy 265.049 13.97) + (xy 206.502 13.97) (xy 264.922 13.97) ) (stroke (width 0) @@ -4805,16 +4823,6 @@ ) (uuid "34a4c66f-97ed-4bd0-a411-fc7f41328bf6") ) - (wire - (pts - (xy 224.79 19.05) (xy 229.87 19.05) - ) - (stroke - (width 0) - (type default) - ) - (uuid "3576ee96-46e3-41a4-8789-71f695c92dea") - ) (wire (pts (xy 232.918 80.899) (xy 232.918 85.471) @@ -4865,16 +4873,6 @@ ) (uuid "3c7855e5-77c7-446a-88e2-386888e35bd8") ) - (wire - (pts - (xy 210.82 21.59) (xy 229.87 21.59) - ) - (stroke - (width 0) - (type default) - ) - (uuid "407c90be-e682-4115-9091-4d3290533828") - ) (polyline (pts (xy 160.274 109.22) (xy 160.274 161.798) @@ -5177,7 +5175,7 @@ ) (polyline (pts - (xy 206.375 59.944) (xy 264.922 59.944) + (xy 206.375 63.754) (xy 264.922 63.754) ) (stroke (width 0) @@ -5307,7 +5305,27 @@ ) (wire (pts - (xy 236.22 83.439) (xy 226.949 83.439) + (xy 241.3 78.359) (xy 241.3 88.9) + ) + (stroke + (width 0) + (type default) + ) + (uuid "74428358-66d3-457c-ae0a-81036ccfcc1e") + ) + (wire + (pts + (xy 246.38 76.2) (xy 246.38 83.439) + ) + (stroke + (width 0) + (type default) + ) + (uuid "76f38d8b-8427-4eda-8baa-983a17b5c0e7") + ) + (wire + (pts + (xy 226.949 83.439) (xy 246.38 83.439) ) (stroke (width 0) @@ -5337,7 +5355,7 @@ ) (wire (pts - (xy 236.22 78.359) (xy 226.949 78.359) + (xy 226.949 78.359) (xy 241.3 78.359) ) (stroke (width 0) @@ -5407,7 +5425,7 @@ ) (polyline (pts - (xy 264.922 59.944) (xy 264.922 34.417) + (xy 264.922 63.754) (xy 264.922 38.227) ) (stroke (width 0) @@ -5457,7 +5475,7 @@ ) (wire (pts - (xy 232.918 80.899) (xy 236.22 80.899) + (xy 232.918 80.899) (xy 243.84 80.899) ) (stroke (width 0) @@ -5535,6 +5553,16 @@ ) (uuid "943138a2-571f-4784-b67f-3f6479e1679d") ) + (wire + (pts + (xy 240.03 21.59) (xy 233.68 21.59) + ) + (stroke + (width 0) + (type default) + ) + (uuid "975e0501-ccda-4448-8d8f-59edb96cd43e") + ) (wire (pts (xy 23.749 116.459) (xy 31.877 116.459) @@ -5615,6 +5643,16 @@ ) (uuid "a014b5ee-549f-42f1-8d3e-7fb0814e8246") ) + (wire + (pts + (xy 226.06 24.13) (xy 240.03 24.13) + ) + (stroke + (width 0) + (type default) + ) + (uuid "a3fc3839-f736-40e6-8e3d-7cdfef7d41d0") + ) (wire (pts (xy 161.798 25.654) (xy 161.798 28.194) @@ -5645,9 +5683,29 @@ ) (uuid "a58e77b4-a32c-4bc1-b609-79f9bacd7109") ) + (wire + (pts + (xy 246.38 83.439) (xy 246.38 88.9) + ) + (stroke + (width 0) + (type default) + ) + (uuid "a5dbce1a-a482-4750-8519-2da0d5e98abc") + ) + (wire + (pts + (xy 241.3 76.2) (xy 241.3 78.359) + ) + (stroke + (width 0) + (type default) + ) + (uuid "a7265b9d-c494-4153-93b1-14170055e22b") + ) (polyline (pts - (xy 206.248 31.877) (xy 264.795 31.877) + (xy 206.502 35.56) (xy 264.922 35.56) ) (stroke (width 0) @@ -5797,7 +5855,7 @@ ) (polyline (pts - (xy 206.502 13.97) (xy 206.502 31.877) + (xy 206.502 13.97) (xy 206.502 35.56) ) (stroke (width 0) @@ -5825,6 +5883,16 @@ ) (uuid "c023a9fe-1465-426c-be4a-21881923db4a") ) + (wire + (pts + (xy 233.68 21.59) (xy 233.68 25.4) + ) + (stroke + (width 0) + (type default) + ) + (uuid "c483f19e-36fa-4f8e-be00-c10d6dd70562") + ) (wire (pts (xy 36.957 149.479) (xy 36.957 141.859) @@ -6007,7 +6075,7 @@ ) (polyline (pts - (xy 206.375 34.417) (xy 206.375 59.944) + (xy 206.375 38.227) (xy 206.375 63.754) ) (stroke (width 0) @@ -6035,6 +6103,16 @@ ) (uuid "df96dcac-e468-406a-a45b-2a2a0a7aeec1") ) + (wire + (pts + (xy 243.84 76.2) (xy 243.84 80.899) + ) + (stroke + (width 0) + (type default) + ) + (uuid "e09c5d91-3dd0-4e57-800b-d2f2278d68a1") + ) (wire (pts (xy 118.618 76.454) (xy 126.238 76.454) @@ -6087,7 +6165,7 @@ ) (polyline (pts - (xy 206.375 34.417) (xy 264.922 34.417) + (xy 206.375 38.227) (xy 264.922 38.227) ) (stroke (width 0) @@ -6107,7 +6185,7 @@ ) (wire (pts - (xy 244.094 48.26) (xy 246.38 48.26) + (xy 244.094 52.07) (xy 246.38 52.07) ) (stroke (width 0) @@ -6195,6 +6273,16 @@ ) (uuid "ef69e812-52c4-4891-bd8a-166b3d5b57d3") ) + (wire + (pts + (xy 243.84 80.899) (xy 243.84 88.9) + ) + (stroke + (width 0) + (type default) + ) + (uuid "efbb7063-fd09-4473-a623-50ec89288c78") + ) (polyline (pts (xy 206.375 161.798) (xy 264.922 161.798) @@ -6237,33 +6325,33 @@ ) (wire (pts - (xy 224.79 24.13) (xy 229.87 24.13) + (xy 83.439 129.159) (xy 85.979 129.159) ) (stroke (width 0) (type default) ) - (uuid "f405b177-aa44-4efe-a419-e5ffb6cdba6b") + (uuid "f673aa6b-6502-449a-9fa5-dc1509e1485b") ) (wire (pts - (xy 83.439 129.159) (xy 85.979 129.159) + (xy 169.418 51.054) (xy 161.798 51.054) ) (stroke (width 0) (type default) ) - (uuid "f673aa6b-6502-449a-9fa5-dc1509e1485b") + (uuid "f8de63f6-7e94-426b-8834-09392699867f") ) (wire (pts - (xy 169.418 51.054) (xy 161.798 51.054) + (xy 225.806 19.05) (xy 240.03 19.05) ) (stroke (width 0) (type default) ) - (uuid "f8de63f6-7e94-426b-8834-09392699867f") + (uuid "fabe7ce9-fb66-4df8-9d63-623310d5407c") ) (polyline (pts @@ -6287,7 +6375,7 @@ ) (wire (pts - (xy 230.378 48.26) (xy 233.934 48.26) + (xy 230.378 52.07) (xy 233.934 52.07) ) (stroke (width 0) @@ -6358,7 +6446,7 @@ ) (text "Reset Button" (exclude_from_sim no) - (at 229.489 57.023 0) + (at 229.489 60.833 0) (effects (font (size 1.27 1.27) @@ -6413,7 +6501,7 @@ ) (text "Raspberry Pi Pico W SWD Connector" (exclude_from_sim no) - (at 217.424 29.972 0) + (at 218.44 35.052 0) (effects (font (size 1.27 1.27) @@ -6644,7 +6732,7 @@ ) (global_label "SWDIO" (shape input) - (at 224.79 24.13 180) + (at 226.06 24.13 180) (fields_autoplaced yes) (effects (font @@ -6654,7 +6742,7 @@ ) (uuid "210c8d97-3f3e-425c-8b1b-e66ab6f35f23") (property "Intersheetrefs" "${INTERSHEET_REFS}" - (at 215.9386 24.13 0) + (at 217.2086 24.13 0) (effects (font (size 1.27 1.27) @@ -7062,7 +7150,7 @@ ) (global_label "SWCLK" (shape input) - (at 224.79 19.05 180) + (at 225.806 19.05 180) (fields_autoplaced yes) (effects (font @@ -7072,7 +7160,7 @@ ) (uuid "6a888c92-0a61-4cc8-9f74-0824cd53c502") (property "Intersheetrefs" "${INTERSHEET_REFS}" - (at 215.5758 19.05 0) + (at 216.5918 19.05 0) (effects (font (size 1.27 1.27) @@ -7126,6 +7214,28 @@ ) ) ) + (global_label "VSYS" + (shape input) + (at 169.418 30.734 0) + (fields_autoplaced yes) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + ) + (uuid "722e8ae3-e28b-45fb-a64e-abe63b411503") + (property "Intersheetrefs" "${INTERSHEET_REFS}" + (at 176.9994 30.734 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + (hide yes) + ) + ) + ) (global_label "GPIO2" (shape input) (at 36.957 149.479 270) @@ -7478,6 +7588,28 @@ ) ) ) + (global_label "VSYS" + (shape input) + (at 165.481 153.67 90) + (fields_autoplaced yes) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + ) + (uuid "b04e22e6-6a1a-4003-97ec-8d14b6ce6a4c") + (property "Intersheetrefs" "${INTERSHEET_REFS}" + (at 165.481 146.0886 90) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + (hide yes) + ) + ) + ) (global_label "GPIO13" (shape input) (at 80.899 149.479 270) @@ -7898,7 +8030,7 @@ ) (global_label "RESET" (shape input) - (at 230.378 48.26 180) + (at 230.378 52.07 180) (fields_autoplaced yes) (effects (font @@ -7908,7 +8040,7 @@ ) (uuid "fc61dc2b-29f0-4139-a57e-5fc0058fcc8b") (property "Intersheetrefs" "${INTERSHEET_REFS}" - (at 221.7271 48.26 0) + (at 221.7271 52.07 0) (effects (font (size 1.27 1.27) @@ -8084,7 +8216,7 @@ ) (symbol (lib_id "power:GND") - (at 246.38 48.26 0) + (at 246.38 52.07 0) (unit 1) (exclude_from_sim no) (in_bom yes) @@ -8093,7 +8225,7 @@ (fields_autoplaced yes) (uuid "05b39a14-d8b9-4502-98f3-4ebe1fd7674f") (property "Reference" "#PWR018" - (at 246.38 54.61 0) + (at 246.38 58.42 0) (effects (font (size 1.27 1.27) @@ -8102,7 +8234,7 @@ ) ) (property "Value" "GND" - (at 246.38 52.205 0) + (at 246.38 56.015 0) (effects (font (size 1.27 1.27) @@ -8110,7 +8242,7 @@ ) ) (property "Footprint" "" - (at 246.38 48.26 0) + (at 246.38 52.07 0) (effects (font (size 1.27 1.27) @@ -8119,7 +8251,7 @@ ) ) (property "Datasheet" "" - (at 246.38 48.26 0) + (at 246.38 52.07 0) (effects (font (size 1.27 1.27) @@ -8128,7 +8260,7 @@ ) ) (property "Description" "" - (at 246.38 48.26 0) + (at 246.38 52.07 0) (effects (font (size 1.27 1.27) @@ -10374,16 +10506,15 @@ ) (symbol (lib_id "Connector_Generic:Conn_01x03") - (at 234.95 21.59 0) + (at 245.11 21.59 0) (unit 1) (exclude_from_sim no) (in_bom yes) (on_board yes) (dnp no) - (fields_autoplaced yes) (uuid "89b2656b-9113-40b2-a671-8cdae09d97f1") (property "Reference" "J30" - (at 236.982 20.3778 0) + (at 247.142 21.082 0) (effects (font (size 1.27 1.27) @@ -10392,7 +10523,7 @@ ) ) (property "Value" "Conn_01x03" - (at 236.982 22.8021 0) + (at 247.142 23.368 0) (effects (font (size 1.27 1.27) @@ -10401,7 +10532,7 @@ ) ) (property "Footprint" "Connector_PinHeader_1.00mm:PinHeader_1x03_P1.00mm_Vertical" - (at 234.95 21.59 0) + (at 245.11 21.59 0) (effects (font (size 1.27 1.27) @@ -10410,7 +10541,7 @@ ) ) (property "Datasheet" "~" - (at 234.95 21.59 0) + (at 245.11 21.59 0) (effects (font (size 1.27 1.27) @@ -10419,7 +10550,7 @@ ) ) (property "Description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" - (at 234.95 21.59 0) + (at 245.11 21.59 0) (effects (font (size 1.27 1.27) @@ -11482,7 +11613,7 @@ ) (symbol (lib_id "Switch:SW_Push") - (at 239.014 48.26 0) + (at 239.014 52.07 0) (unit 1) (exclude_from_sim no) (in_bom yes) @@ -11491,7 +11622,7 @@ (fields_autoplaced yes) (uuid "d1501e19-eef6-4e6d-bb33-fabe1cf8549a") (property "Reference" "SW1" - (at 239.014 41.759 0) + (at 239.014 45.569 0) (effects (font (size 1.27 1.27) @@ -11499,7 +11630,7 @@ ) ) (property "Value" "SW_Push" - (at 239.014 43.807 0) + (at 239.014 47.617 0) (effects (font (size 1.27 1.27) @@ -11507,7 +11638,7 @@ ) ) (property "Footprint" "Button_Switch_THT:SW_PUSH_6mm" - (at 239.014 43.18 0) + (at 239.014 46.99 0) (effects (font (size 1.27 1.27) @@ -11516,7 +11647,7 @@ ) ) (property "Datasheet" "~" - (at 239.014 43.18 0) + (at 239.014 46.99 0) (effects (font (size 1.27 1.27) @@ -11525,7 +11656,7 @@ ) ) (property "Description" "" - (at 239.014 48.26 0) + (at 239.014 52.07 0) (effects (font (size 1.27 1.27) @@ -11758,7 +11889,7 @@ (symbol (lib_name "GND_1") (lib_id "power:GND") - (at 210.82 21.59 0) + (at 233.68 25.4 0) (unit 1) (exclude_from_sim no) (in_bom yes) @@ -11767,7 +11898,7 @@ (fields_autoplaced yes) (uuid "e7af4553-2695-45c6-8e94-e9e6b13f0c6a") (property "Reference" "#PWR022" - (at 210.82 27.94 0) + (at 233.68 31.75 0) (effects (font (size 1.27 1.27) @@ -11776,7 +11907,7 @@ ) ) (property "Value" "GND" - (at 210.82 25.7231 0) + (at 233.68 29.5331 0) (effects (font (size 1.27 1.27) @@ -11784,7 +11915,7 @@ ) ) (property "Footprint" "" - (at 210.82 21.59 0) + (at 233.68 25.4 0) (effects (font (size 1.27 1.27) @@ -11793,7 +11924,7 @@ ) ) (property "Datasheet" "" - (at 210.82 21.59 0) + (at 233.68 25.4 0) (effects (font (size 1.27 1.27) @@ -11802,7 +11933,7 @@ ) ) (property "Description" "Power symbol creates a global label with name \"GND\" , ground" - (at 210.82 21.59 0) + (at 233.68 25.4 0) (effects (font (size 1.27 1.27) @@ -12040,33 +12171,35 @@ ) ) (symbol - (lib_id "power:+5V") - (at 165.481 153.67 0) + (lib_id "Connector_Generic:Conn_01x03") + (at 243.84 71.12 90) (unit 1) (exclude_from_sim no) (in_bom yes) (on_board yes) (dnp no) - (uuid "ecfde866-a88f-4182-907d-ba67ebd1d20a") - (property "Reference" "#PWR011" - (at 165.481 157.48 0) + (fields_autoplaced yes) + (uuid "f32ccd66-3719-484d-83d3-a8194f81ece9") + (property "Reference" "J29" + (at 248.412 69.9078 90) (effects (font (size 1.27 1.27) ) - (hide yes) + (justify right) ) ) - (property "Value" "+5V" - (at 165.481 149.725 0) + (property "Value" "Conn_01x03" + (at 248.412 72.3321 90) (effects (font (size 1.27 1.27) ) + (justify right) ) ) - (property "Footprint" "" - (at 165.481 153.67 0) + (property "Footprint" "Connector_JST:JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical" + (at 243.84 71.12 0) (effects (font (size 1.27 1.27) @@ -12074,8 +12207,8 @@ (hide yes) ) ) - (property "Datasheet" "" - (at 165.481 153.67 0) + (property "Datasheet" "~" + (at 243.84 71.12 0) (effects (font (size 1.27 1.27) @@ -12084,7 +12217,7 @@ ) ) (property "Description" "" - (at 165.481 153.67 0) + (at 243.84 71.12 0) (effects (font (size 1.27 1.27) @@ -12092,48 +12225,51 @@ (hide yes) ) ) + (pin "3" + (uuid "5968fb15-b580-49c2-be60-aa77c69328e5") + ) + (pin "2" + (uuid "43b479cb-26af-4e13-a0b9-73701e856716") + ) (pin "1" - (uuid "9acbfd3f-2dcb-450d-9ffa-4d9111527270") + (uuid "bf891feb-c63a-416a-a654-21cb0d55302c") ) (instances (project "rp-pico-sensor-shield" (path "/01191561-9ded-4746-bfa0-1bc8653df791" - (reference "#PWR011") + (reference "J29") (unit 1) ) ) ) ) (symbol - (lib_id "Connector_Generic:Conn_01x03") - (at 241.3 80.899 0) + (lib_id "Device:R") + (at 223.139 78.359 90) (unit 1) (exclude_from_sim no) (in_bom yes) (on_board yes) (dnp no) - (fields_autoplaced yes) - (uuid "f32ccd66-3719-484d-83d3-a8194f81ece9") - (property "Reference" "J29" - (at 243.332 79.6869 0) + (uuid "f76e948f-f6a5-4731-af6e-0dbb8897442b") + (property "Reference" "R2" + (at 223.1644 76.3016 90) (effects (font (size 1.27 1.27) ) - (justify left) ) ) - (property "Value" "Conn_01x03" - (at 243.332 82.1111 0) + (property "Value" "100" + (at 223.1644 78.3844 90) (effects (font (size 1.27 1.27) ) - (justify left) ) ) - (property "Footprint" "Connector_JST:JST_SH_BM03B-SRSS-TB_1x03-1MP_P1.00mm_Vertical" - (at 241.3 80.899 0) + (property "Footprint" "Resistor_SMD:R_1206_3216Metric_Pad1.30x1.75mm_HandSolder" + (at 223.139 80.137 90) (effects (font (size 1.27 1.27) @@ -12142,7 +12278,7 @@ ) ) (property "Datasheet" "~" - (at 241.3 80.899 0) + (at 223.139 78.359 0) (effects (font (size 1.27 1.27) @@ -12151,7 +12287,7 @@ ) ) (property "Description" "" - (at 241.3 80.899 0) + (at 223.139 78.359 0) (effects (font (size 1.27 1.27) @@ -12159,51 +12295,51 @@ (hide yes) ) ) - (pin "3" - (uuid "5968fb15-b580-49c2-be60-aa77c69328e5") + (pin "1" + (uuid "3cd27827-d7e2-43e5-ad61-43fe7d13fd63") ) (pin "2" - (uuid "43b479cb-26af-4e13-a0b9-73701e856716") - ) - (pin "1" - (uuid "bf891feb-c63a-416a-a654-21cb0d55302c") + (uuid "6d7a1d9c-d05f-4c4f-acdd-96403d27c4f9") ) (instances (project "rp-pico-sensor-shield" (path "/01191561-9ded-4746-bfa0-1bc8653df791" - (reference "J29") + (reference "R2") (unit 1) ) ) ) ) (symbol - (lib_id "Device:R") - (at 223.139 78.359 90) + (lib_id "Connector_Generic:Conn_01x03") + (at 243.84 93.98 90) + (mirror x) (unit 1) (exclude_from_sim no) (in_bom yes) (on_board yes) (dnp no) - (uuid "f76e948f-f6a5-4731-af6e-0dbb8897442b") - (property "Reference" "R2" - (at 223.1644 76.3016 90) + (uuid "f912a5d2-013d-4d6f-bcdf-9576aafd68ad") + (property "Reference" "J31" + (at 251.968 92.71 90) (effects (font (size 1.27 1.27) ) + (justify left) ) ) - (property "Value" "100" - (at 223.1644 78.3844 90) + (property "Value" "Conn_01x03" + (at 260.096 94.742 90) (effects (font (size 1.27 1.27) ) + (justify left) ) ) - (property "Footprint" "Resistor_SMD:R_1206_3216Metric_Pad1.30x1.75mm_HandSolder" - (at 223.139 80.137 90) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Horizontal" + (at 243.84 93.98 0) (effects (font (size 1.27 1.27) @@ -12212,7 +12348,7 @@ ) ) (property "Datasheet" "~" - (at 223.139 78.359 0) + (at 243.84 93.98 0) (effects (font (size 1.27 1.27) @@ -12220,8 +12356,8 @@ (hide yes) ) ) - (property "Description" "" - (at 223.139 78.359 0) + (property "Description" "Generic connector, single row, 01x03, script generated (kicad-library-utils/schlib/autogen/connector/)" + (at 243.84 93.98 0) (effects (font (size 1.27 1.27) @@ -12230,15 +12366,18 @@ ) ) (pin "1" - (uuid "3cd27827-d7e2-43e5-ad61-43fe7d13fd63") + (uuid "13ad207e-7094-4341-9300-f7865989cbc2") + ) + (pin "3" + (uuid "c5759bc6-359f-4d38-a976-4cd1108f4910") ) (pin "2" - (uuid "6d7a1d9c-d05f-4c4f-acdd-96403d27c4f9") + (uuid "a825f8ca-8643-43af-8cd1-4b4a5a6829db") ) (instances (project "rp-pico-sensor-shield" (path "/01191561-9ded-4746-bfa0-1bc8653df791" - (reference "R2") + (reference "J31") (unit 1) ) ) @@ -12530,4 +12669,4 @@ (page "1") ) ) -) \ No newline at end of file +) diff --git a/src/driver.rs b/src/driver.rs index c9f7022..a8db4ca 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -31,12 +31,13 @@ pub struct Driver< ENB: SetDutyCycle, BUTT1: InputPin, BUTT2: InputPin, - TWI: I2c, + TWI0: I2c, + TWI1: I2c, SPI_DEV: SpiDevice, DELAY: DelayNs + Clone, LED1: OutputPin, > { - robot: Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI, SPI_DEV, DELAY>, + robot: Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI0, TWI1, SPI_DEV, DELAY>, delay: DELAY, led1: LED1, selected_path: Option, @@ -52,14 +53,29 @@ impl< ENB: SetDutyCycle, BUTT1: InputPin, BUTT2: InputPin, - TWI: I2c, + TWI0: I2c, + TWI1: I2c, SPI_DEV: SpiDevice, DELAY: DelayNs + Clone, LED1: OutputPin, - > Driver<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI, SPI_DEV, DELAY, LED1> + > Driver<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI0, TWI1, SPI_DEV, DELAY, LED1> { pub fn new( - robot: Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI, SPI_DEV, DELAY>, + robot: Robot< + 'a, + INA1, + INA2, + INB1, + INB2, + ENA, + ENB, + BUTT1, + BUTT2, + TWI0, + TWI1, + SPI_DEV, + DELAY, + >, delay: DELAY, led1_pin: LED1, ) -> Self { diff --git a/src/main.rs b/src/main.rs index 139f259..554cb33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -89,20 +89,32 @@ fn main() -> ! { channel_b.output_to(pins.gpio9); // Configure two pins as being I²C, not GPIO - let sda_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio4.reconfigure(); - let scl_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio5.reconfigure(); - + let sda0_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio4.reconfigure(); + let scl0_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio5.reconfigure(); + let sda1_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio6.reconfigure(); + let scl1_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio7.reconfigure(); // set up I2C - let i2c = bsp::hal::I2C::new_controller( + let i2c0 = bsp::hal::I2C::new_controller( pac.I2C0, - sda_pin, - scl_pin, + sda0_pin, + scl0_pin, + HertzU32::from_raw(400_000), + &mut pac.RESETS, + clocks.system_clock.freq(), + ); + let i2c0_ref_cell = RefCell::new(i2c0); + let i2c0_mutex = critical_section::Mutex::new(i2c0_ref_cell); + + let i2c1 = bsp::hal::I2C::new_controller( + pac.I2C1, + sda1_pin, + scl1_pin, HertzU32::from_raw(400_000), &mut pac.RESETS, clocks.system_clock.freq(), ); - let i2c_ref_cell = RefCell::new(i2c); - let i2c_mutex = critical_section::Mutex::new(i2c_ref_cell); + let i2c1_ref_cell = RefCell::new(i2c1); + let i2c1_mutex = critical_section::Mutex::new(i2c1_ref_cell); // set up SPI #[allow(clippy::type_complexity)] @@ -152,7 +164,8 @@ fn main() -> ! { channel_b, pins.gpio14.into_pull_up_input(), pins.gpio15.into_pull_up_input(), - &i2c_mutex, + &i2c0_mutex, + &i2c1_mutex, pins.gpio21.into_pull_up_input(), pins.gpio20.into_pull_up_input(), sd, diff --git a/src/model/heading.rs b/src/model/heading.rs index f9f916a..38a83f8 100644 --- a/src/model/heading.rs +++ b/src/model/heading.rs @@ -13,7 +13,7 @@ use mpu6050::Mpu6050; // [-2241,-2240] --> [-1,15] [1803,1804] --> [-10,6] [1573,1574] --> [16371,16394] [98,99] --> [-2,1] [44,45] --> [0,5] [19,20] --> [0,4] // [-2239,-2238] --> [-3,16] [1804,1804] --> [0,5] [1575,1576] --> [16378,16395] [98,99] --> [-1,2] [43,44] --> [-2,1] [19,20] --> [-1,2] -const HEADING_UPDATE_INTERVAL_MS_TENTHS: u64 = 2; +const HEADING_UPDATE_INTERVAL_MS_TENTHS: u64 = 20; pub struct HeadingCalculator { heading: f64, diff --git a/src/robot.rs b/src/robot.rs index 11cf792..b3ade60 100644 --- a/src/robot.rs +++ b/src/robot.rs @@ -99,19 +99,21 @@ pub struct Robot< ENB: SetDutyCycle, BUTT1: InputPin, BUTT2: InputPin, - TWI, + TWI0, + TWI1, SPI_DEV: embedded_hal::spi::SpiDevice, DELAY, > where - TWI: embedded_hal::i2c::I2c, + TWI0: embedded_hal::i2c::I2c, + TWI1: embedded_hal::i2c::I2c, DELAY: DelayNs, { motors: MotorController, button1: DebouncedButton, button2: DebouncedButton, pub heading_calculator: - HeadingCalculator>, - lcd: AdafruitLCDBackpack, Timer>, + HeadingCalculator>, + lcd: AdafruitLCDBackpack, Timer>, pub sd_card: FileStorage, reset_display_start_millis: u64, log_index: u32, @@ -132,12 +134,14 @@ impl< ENB: SetDutyCycle, BUTT1: InputPin, BUTT2: InputPin, - TWI, + TWI0, + TWI1, SPI_DEV: embedded_hal::spi::SpiDevice, DELAY, - > Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI, SPI_DEV, DELAY> + > Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI0, TWI1, SPI_DEV, DELAY> where - TWI: embedded_hal::i2c::I2c, + TWI0: embedded_hal::i2c::I2c, + TWI1: embedded_hal::i2c::I2c, DELAY: DelayNs + Clone, { #[allow(clippy::too_many_arguments)] @@ -150,7 +154,8 @@ where duty_b: ENB, button1_pin: BUTT1, button2_pin: BUTT2, - i2c_refcell: &'a critical_section::Mutex>, + i2c0_refcell: &'a critical_section::Mutex>, + i2c1_refcell: &'a critical_section::Mutex>, left_counter_pin: LeftWheelCounterPin, right_counter_pin: RightWheelCounterPin, mut sd_card: FileStorage, @@ -174,9 +179,8 @@ where pac::NVIC::unmask(pac::Interrupt::IO_IRQ_BANK0); } - // let i2c_device = embedded_hal_bus::i2c::RefCellDevice::new(i2c_refcell); - let i2c_device = embedded_hal_bus::i2c::CriticalSectionDevice::new(i2c_refcell); - let mut lcd = AdafruitLCDBackpack::new(i2c_device, LcdDisplayType::Lcd16x2, *timer); + let i2c1_device = embedded_hal_bus::i2c::CriticalSectionDevice::new(i2c1_refcell); + let mut lcd = AdafruitLCDBackpack::new(i2c1_device, LcdDisplayType::Lcd16x2, *timer); match lcd.init() { Ok(_) => { info!("LCD initialized"); @@ -214,7 +218,7 @@ where debug!("LCD characters created"); let mut heading_calculator = HeadingCalculator::new( - embedded_hal_bus::i2c::CriticalSectionDevice::new(i2c_refcell), + embedded_hal_bus::i2c::CriticalSectionDevice::new(i2c0_refcell), timer, ); heading_calculator.reset(); @@ -229,7 +233,7 @@ where "SD: {} GB", sd_card.volume_size().unwrap_or(0) / 1_073_741_824 ) - .map_err(i2c_character_display::Error::FormattingError) + .map_err(i2c_character_display::CharacterDisplayError::FormattingError) }) { error!("Error writing to LCD"); @@ -693,7 +697,8 @@ where //-------------------------------------------------------------------------- pub fn display_heading( &mut self, - ) -> Result<(), i2c_character_display::Error>> { + ) -> Result<(), i2c_character_display::CharacterDisplayError>> + { write!(self.lcd.clear()?.set_cursor(0, 0)?, "Heading:").ok(); self.heading_calculator.reset(); let mut continue_loop = true; @@ -748,12 +753,15 @@ impl< ENB: SetDutyCycle, BUTT1: InputPin, BUTT2: InputPin, - TWI, + TWI0, + TWI1, SPI_DEV: SpiDevice, DELAY, - > Format for Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI, SPI_DEV, DELAY> + > Format + for Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI0, TWI1, SPI_DEV, DELAY> where - TWI: I2c, + TWI0: I2c, + TWI1: I2c, DELAY: DelayNs + Clone, { fn format(&self, f: defmt::Formatter) { @@ -777,13 +785,15 @@ impl< ENB: SetDutyCycle, BUTT1: InputPin, BUTT2: InputPin, - TWI, + TWI0, + TWI1, SPI_DEV: SpiDevice, DELAY, > core::fmt::Write - for Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI, SPI_DEV, DELAY> + for Robot<'a, INA1, INA2, INB1, INB2, ENA, ENB, BUTT1, BUTT2, TWI0, TWI1, SPI_DEV, DELAY> where - TWI: I2c, + TWI0: I2c, + TWI1: I2c, DELAY: DelayNs + Clone, { fn write_str(&mut self, s: &str) -> core::fmt::Result {