diff --git a/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights-backups/esp32-wroom-table-lights-2024-07-22_195844.zip b/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights-backups/esp32-wroom-table-lights-2024-07-22_195844.zip deleted file mode 100644 index 001a8a83..00000000 Binary files a/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights-backups/esp32-wroom-table-lights-2024-07-22_195844.zip and /dev/null differ diff --git a/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights-backups/esp32-wroom-table-lights-2024-07-22_205818.zip b/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights-backups/esp32-wroom-table-lights-2024-07-22_205818.zip new file mode 100644 index 00000000..565457fe Binary files /dev/null and b/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights-backups/esp32-wroom-table-lights-2024-07-22_205818.zip differ diff --git a/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights.kicad_pcb b/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights.kicad_pcb index d0adc4a0..1fb0c514 100644 --- a/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights.kicad_pcb +++ b/esp32-wroom-table-lights/esp32-wroom-table-lights/esp32-wroom-table-lights.kicad_pcb @@ -99,8 +99,277 @@ (net 17 "+3V3") (net 18 "+5V") (net 19 "/Power Supply/VDC") - (net 20 "Net-(D2-K)") + (net 20 "Net-(D3-AB)") (net 21 "/Lights LEDs Array/GPIO-N") + (footprint "LED_SMD:LED_Cree-PLCC6_4.7x1.5mm" + (layer "F.Cu") + (uuid "0423d901-63a3-425f-918f-0d08c986244d") + (at 100.08 72.265) + (descr "4.7mm x 1.5mm PLCC6 LED, http://www.cree.com/led-components/media/documents/1381-QLS6AFKW.pdf") + (tags "LED Cree PLCC-6") + (property "Reference" "D3" + (at 0 1.8 0) + (layer "F.SilkS") + (uuid "462b5291-e6d1-4fdf-9d29-743cb7be8570") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Value" "LED-5050" + (at 0 3.1 0) + (layer "F.Fab") + (uuid "b15dcee3-fe46-4486-96b0-efbe6b01efea") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Footprint" "LED_SMD:LED_Cree-PLCC6_4.7x1.5mm" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "1d05399d-b70c-4921-a632-be4b1c730021") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Datasheet" "https://www.cree.com/led-components/media/documents/CLS6B-FKW.pdf" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "d1bd775c-0952-4cc5-bc75-2bd56bdc75c2") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property "Description" "Cree PLCC6 3 in 1 SMD LED, PLCC-6" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "084ac5d8-22d4-4d1d-b68c-6f28585c7a02") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + ) + ) + (property ki_fp_filters "LED*Cree*PLCC*4.7x1.5mm*") + (path "/d5fc8cf4-d8a2-46b6-9b2c-3f15f2406209/ad649c19-cddb-4b65-877e-a432208f49c9") + (sheetname "Lights LEDs Array") + (sheetfile "led-lights-array.kicad_sch") + (attr smd) + (fp_line + (start -2.46 0.4) + (end -2.46 0.86) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c74bfd6a-d817-4e95-a228-abe072502d87") + ) + (fp_line + (start -2.46 0.86) + (end 2.46 0.86) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c2478ace-cf65-42aa-96e5-aa21876ba881") + ) + (fp_line + (start -2.35 -0.86) + (end 2.46 -0.86) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "d669413f-14b5-4651-885a-16a415e8fc72") + ) + (fp_line + (start 2.46 -0.86) + (end 2.46 0.86) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "cf3071ea-12db-43b6-a962-305108a7c55e") + ) + (fp_line + (start -2.6 -1) + (end -2.6 1) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "5c179440-cf9e-462b-bd4f-75a90833d603") + ) + (fp_line + (start -2.6 -1) + (end 2.6 -1) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "5248157c-301d-439a-b76d-6c39e5a9f200") + ) + (fp_line + (start 2.6 -1) + (end 2.6 1) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "27b45f3a-31dd-435f-b815-6a8369abd665") + ) + (fp_line + (start 2.6 1) + (end -2.6 1) + (stroke + (width 0.05) + (type solid) + ) + (layer "F.CrtYd") + (uuid "ba6996d1-a7db-44d6-8fd7-62cea95d03db") + ) + (fp_line + (start -2.35 -0.75) + (end -2.35 0.75) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "61f897bc-2832-4d0e-b330-6822942acab2") + ) + (fp_line + (start -2.35 -0.75) + (end 2.35 -0.75) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "ffdec0d5-f891-4c2a-9d4d-6160bb2533b1") + ) + (fp_line + (start -2.35 0.75) + (end 2.35 0.75) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "182ba665-44a5-4ba0-a4e4-561b5b77d2d1") + ) + (fp_line + (start 2.35 -0.75) + (end 2.35 0.75) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "b8c242f8-0579-475f-a183-057e7a835b0e") + ) + (fp_text user "${REFERENCE}" + (at 0 1.8 0) + (layer "F.Fab") + (uuid "9cd036b8-bd5e-48cb-9063-c6c54807dac2") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (pad "1" smd rect + (at -2.02 0.335) + (size 0.66 0.63) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 20 "Net-(D3-AB)") + (pinfunction "AB") + (pintype "passive") + (uuid "33db5dcd-a265-4924-a6d7-12f72c020c6d") + ) + (pad "2" smd rect + (at -1.21 -0.25) + (size 0.4 0.8) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 20 "Net-(D3-AB)") + (pinfunction "KB") + (pintype "passive") + (uuid "5506fed9-02db-4d21-82c3-308ad8198d1b") + ) + (pad "3" smd rect + (at -0.53 -0.25) + (size 0.4 0.8) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 20 "Net-(D3-AB)") + (pinfunction "AR") + (pintype "passive") + (uuid "e87bbf6e-7b98-4a41-acb0-68b103064351") + ) + (pad "4" smd rect + (at 0.53 -0.25) + (size 0.4 0.8) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 15 "GND") + (pinfunction "KR") + (pintype "passive") + (uuid "74829506-bec0-4328-8a3a-5b2dcd3ce4b9") + ) + (pad "5" smd rect + (at 1.21 -0.25) + (size 0.4 0.8) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 15 "GND") + (pinfunction "AG") + (pintype "passive") + (uuid "41ffe6e3-e751-43d1-87ce-d14e0e3c9f92") + ) + (pad "6" smd rect + (at 2.02 0.335) + (size 0.66 0.63) + (layers "F.Cu" "F.Paste" "F.Mask") + (net 15 "GND") + (pinfunction "KR") + (pintype "passive") + (uuid "7bba64ad-3319-4350-a2c1-309407e9e7af") + ) + (model "${KICAD8_3DMODEL_DIR}/LED_SMD.3dshapes/LED_Cree-PLCC6_4.7x1.5mm.wrl" + (offset + (xyz 0 0 0) + ) + (scale + (xyz 1 1 1) + ) + (rotate + (xyz 0 0 0) + ) + ) + ) (footprint "TestPoint:TestPoint_Pad_D1.5mm" (layer "F.Cu") (uuid "0a4cb26a-7490-44d0-a07f-43e655104e73") @@ -1135,7 +1404,7 @@ (footprint "Resistor_SMD:R_1206_3216Metric_Pad1.30x1.75mm_HandSolder" (layer "F.Cu") (uuid "5f5bc4f4-8626-4014-a467-d3e317408481") - (at 94.1 67 90) + (at 91.3 67 90) (descr "Resistor SMD 1206 (3216 Metric), square (rectangular) end terminal, IPC_7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "resistor handsolder") (property "Reference" "R1" @@ -1200,7 +1469,7 @@ ) ) (property ki_fp_filters "R_*") - (path "/d5fc8cf4-d8a2-46b6-9b2c-3f15f2406209/e66a1fb7-37b7-4918-877e-a5ddcb1b0f6e") + (path "/d5fc8cf4-d8a2-46b6-9b2c-3f15f2406209/e26efeca-c85d-48bb-a458-dcb8f4450196") (sheetname "Lights LEDs Array") (sheetfile "led-lights-array.kicad_sch") (attr smd) @@ -1320,7 +1589,7 @@ (size 1.3 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) - (net 15 "GND") + (net 20 "Net-(D3-AB)") (pintype "passive") (uuid "616cd50b-ecaf-44f6-ba3d-4886022a52af") ) @@ -1329,7 +1598,7 @@ (size 1.3 1.75) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.192308) - (net 20 "Net-(D2-K)") + (net 21 "/Lights LEDs Array/GPIO-N") (pintype "passive") (uuid "7c77650a-7dd4-4067-807c-5103c3820e13") ) @@ -5391,274 +5660,6 @@ (uuid "d8e014fc-6ac8-47e8-bfb2-ed1ac5b68edc") ) ) - (footprint "Alexander Footprint Library:LED_5050-6" - (layer "F.Cu") - (uuid "f36670df-2956-4059-8117-a32cd6dbbdc6") - (at 99.9125 67.1) - (descr "http://cdn.sparkfun.com/datasheets/Components/LED/5060BRG4.pdf") - (tags "RGB LED 5050-6") - (property "Reference" "D2" - (at 0 -3.5 180) - (layer "F.SilkS") - (uuid "e1faf0ad-e1c8-4735-9675-b204b6278ffb") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (property "Value" "5050" - (at 0 3.3 0) - (layer "F.Fab") - (uuid "ed200bda-9e13-4090-afb1-af0162dfe0b4") - (effects - (font - (size 1 1) - (thickness 0.15) - ) - ) - ) - (property "Footprint" "Alexander Footprint Library:LED_5050-6" - (at 0 0 0) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "bd62d417-f954-4be0-82a7-7a6ec3fd9566") - (effects - (font - (size 1.27 1.27) - (thickness 0.15) - ) - ) - ) - (property "Datasheet" "" - (at 0 0 0) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "b4ae7ec3-540a-4177-9f4b-c057a3d554f3") - (effects - (font - (size 1.27 1.27) - (thickness 0.15) - ) - ) - ) - (property "Description" "Light emitting diode" - (at 0 0 0) - (unlocked yes) - (layer "F.Fab") - (hide yes) - (uuid "42378936-1f6a-4ac4-9a81-d64c13bd8231") - (effects - (font - (size 1.27 1.27) - (thickness 0.15) - ) - ) - ) - (property ki_fp_filters "LED* LED_SMD:* LED_THT:*") - (path "/d5fc8cf4-d8a2-46b6-9b2c-3f15f2406209/99a7db5a-c2f2-451f-818c-36ca3e730092") - (sheetname "Lights LEDs Array") - (sheetfile "led-lights-array.kicad_sch") - (attr smd) - (fp_line - (start -3.6 -2.7) - (end 2.5 -2.7) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "2da34138-07f0-48bb-a0a1-4bb685132896") - ) - (fp_line - (start -3.6 -1.6) - (end -3.6 -2.7) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "2ea56f59-ac54-4f60-9df1-a4be8e7031ae") - ) - (fp_line - (start 2.5 2.7) - (end -2.5 2.7) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "b9e53d50-3b2f-4c28-9831-eff7835f0606") - ) - (fp_line - (start -3.65 -2.75) - (end -3.65 2.75) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "16778bb6-83f5-495d-a3d1-74f2e08ce1de") - ) - (fp_line - (start -3.65 2.75) - (end 3.65 2.75) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "f3e75dfb-9db3-4155-9de3-cacc735ef062") - ) - (fp_line - (start 3.65 -2.75) - (end -3.65 -2.75) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "e8611c7f-d947-41d6-a38d-1b7eec19fbbe") - ) - (fp_line - (start 3.65 2.75) - (end 3.65 -2.75) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") - (uuid "5805270b-1094-4c67-a81a-ec94cd9cd2b9") - ) - (fp_line - (start -2.5 -2.5) - (end -2.5 2.5) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "131b1779-f408-4e59-9606-50e3002e5777") - ) - (fp_line - (start -2.5 -1.9) - (end -1.9 -2.5) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "c2745993-e062-4004-9a57-bd15150852c7") - ) - (fp_line - (start -2.5 2.5) - (end 2.5 2.5) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "d0274a8b-32a3-49c0-94a4-06b04c77a8d6") - ) - (fp_line - (start 2.5 -2.5) - (end -2.5 -2.5) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "90bd53bb-8f12-4ef1-8bc2-46123d796d39") - ) - (fp_line - (start 2.5 2.5) - (end 2.5 -2.5) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "1a733e7a-c553-456e-b1da-b55ab1e1ef61") - ) - (fp_circle - (center 0 0) - (end 0 -1.9) - (stroke - (width 0.1) - (type solid) - ) - (fill none) - (layer "F.Fab") - (uuid "5277106b-05a9-446b-bb1f-8b32ae5d7664") - ) - (fp_text user "${REFERENCE}" - (at 0 0 0) - (layer "F.Fab") - (uuid "6746b5d1-6d1a-4970-a214-a2fa8953498f") - (effects - (font - (size 0.6 0.6) - (thickness 0.06) - ) - ) - ) - (pad "1" smd rect - (at -2.4 -1.7 90) - (size 1.1 2) - (layers "F.Cu" "F.Paste" "F.Mask") - (net 20 "Net-(D2-K)") - (pinfunction "K") - (pintype "passive") - (uuid "badc4c12-493a-4902-a260-3d89aac393e0") - ) - (pad "2" smd rect - (at -2.4 0 90) - (size 1.1 2) - (layers "F.Cu" "F.Paste" "F.Mask") - (net 21 "/Lights LEDs Array/GPIO-N") - (pinfunction "A") - (pintype "passive") - (uuid "f3fe4f0b-dd71-4aef-83f4-e170e370b484") - ) - (pad "3" smd rect - (at -2.4 1.7 90) - (size 1.1 2) - (layers "F.Cu" "F.Paste" "F.Mask") - (uuid "127d7710-fa14-4b6d-af89-818e8107ff8b") - ) - (pad "4" smd rect - (at 2.4 1.7 90) - (size 1.1 2) - (layers "F.Cu" "F.Paste" "F.Mask") - (uuid "763044bd-df2a-4bfe-8e27-ae13e19fdefa") - ) - (pad "5" smd rect - (at 2.4 0 90) - (size 1.1 2) - (layers "F.Cu" "F.Paste" "F.Mask") - (uuid "d78b1b20-2b29-459b-aa89-9fda5a9c3e96") - ) - (pad "6" smd rect - (at 2.4 -1.7 90) - (size 1.1 2) - (layers "F.Cu" "F.Paste" "F.Mask") - (uuid "ff3960eb-eadf-4c76-a05c-91e51c9dc430") - ) - (model "${KICAD8_3DMODEL_DIR}/LED_SMD.3dshapes/LED_RGB_5050-6.wrl" - (offset - (xyz 0 0 0) - ) - (scale - (xyz 1 1 1) - ) - (rotate - (xyz 0 0 0) - ) - ) - ) (footprint "MountingHole:MountingHole_3.2mm_M3" (layer "F.Cu") (uuid "f88de03a-8d4f-4ae9-a07c-11f6d15b3afc") @@ -6030,112 +6031,112 @@ (xy 120.313591 61.282279) (xy 120.316816 61.283971) (xy 121.467716 61.91036) (xy 121.470899 61.912155) (xy 122.602357 62.573021) (xy 122.605509 62.574927) (xy 123.332183 63.029342) (xy 123.716419 63.269619) (xy 123.719565 63.271653) (xy 124.808967 63.999567) (xy 124.812049 64.001695) (xy 125.878984 64.762192) - (xy 125.882001 64.764411) (xy 126.192236 64.999991) (xy 126.925462 65.556772) (xy 126.928404 65.559077) - (xy 127.947503 66.382629) (xy 127.950348 66.385001) (xy 128.124688 66.534814) (xy 128.94408 67.238934) - (xy 128.946884 67.241418) (xy 129.44671 67.697883) (xy 129.914401 68.125001) (xy 129.917059 68.127503) - (xy 130.857514 69.03997) (xy 130.860029 69.042485) (xy 131.772494 69.982938) (xy 131.775 69.9856) - (xy 131.863995 70.083049) (xy 132.658581 70.953115) (xy 132.661065 70.955919) (xy 133.514985 71.949635) - (xy 133.517375 71.952503) (xy 133.965959 72.507599) (xy 134.340917 72.971588) (xy 134.343227 72.974537) - (xy 135.135588 74.017998) (xy 135.137807 74.021015) (xy 135.898304 75.08795) (xy 135.900432 75.091032) - (xy 136.628346 76.180434) (xy 136.63038 76.18358) (xy 137.325056 77.294463) (xy 137.326994 77.297668) - (xy 137.987821 78.42906) (xy 137.989651 78.432305) (xy 138.482803 79.338402) (xy 138.616004 79.583138) - (xy 138.617733 79.586433) (xy 139.074587 80.489796) (xy 139.209036 80.755649) (xy 139.210673 80.759012) - (xy 139.364979 81.088477) (xy 139.766392 81.945551) (xy 139.767929 81.948966) (xy 140.188469 82.922389) - (xy 140.28755 83.15173) (xy 140.288978 83.155177) (xy 140.688269 84.161895) (xy 140.77205 84.373127) - (xy 140.773371 84.376611) (xy 140.911389 84.7578) (xy 141.21943 85.608578) (xy 141.220652 85.612119) - (xy 141.629296 86.856987) (xy 141.63041 86.860563) (xy 142.001266 88.117195) (xy 142.002272 88.120803) - (xy 142.335011 89.38809) (xy 142.335907 89.391727) (xy 142.630211 90.668454) (xy 142.630997 90.672116) - (xy 142.886602 91.95713) (xy 142.887278 91.960814) (xy 143.103969 93.25304) (xy 143.104532 93.256743) - (xy 143.282083 94.554841) (xy 143.282535 94.558559) (xy 143.420804 95.861479) (xy 143.421143 95.865209) - (xy 143.519997 97.171703) (xy 143.520223 97.175442) (xy 143.57957 98.484316) (xy 143.579683 98.48806) - (xy 143.599471 99.798127) (xy 143.599471 99.801873) (xy 143.579683 101.111939) (xy 143.57957 101.115683) - (xy 143.520223 102.424557) (xy 143.519997 102.428296) (xy 143.421143 103.73479) (xy 143.420804 103.73852) - (xy 143.282535 105.04144) (xy 143.282083 105.045158) (xy 143.104532 106.343256) (xy 143.103969 106.346959) - (xy 142.887278 107.639185) (xy 142.886602 107.642869) (xy 142.630997 108.927883) (xy 142.630211 108.931545) - (xy 142.335907 110.208272) (xy 142.335011 110.211909) (xy 142.002272 111.479196) (xy 142.001266 111.482804) - (xy 141.630413 112.739427) (xy 141.629299 112.743003) (xy 141.220652 113.98788) (xy 141.21943 113.991421) - (xy 140.773378 115.22337) (xy 140.77205 115.226872) (xy 140.288984 116.444808) (xy 140.28755 116.448269) - (xy 139.767929 117.651033) (xy 139.766392 117.654448) (xy 139.210676 118.840982) (xy 139.209036 118.84435) - (xy 138.617744 120.013545) (xy 138.616004 120.016861) (xy 137.989661 121.167676) (xy 137.987821 121.170939) - (xy 137.326994 122.302331) (xy 137.325056 122.305536) (xy 136.63038 123.416419) (xy 136.628346 123.419565) - (xy 135.900432 124.508967) (xy 135.898304 124.512049) (xy 135.137807 125.578984) (xy 135.135588 125.582001) - (xy 134.343227 126.625462) (xy 134.340917 126.628411) (xy 133.517383 127.647487) (xy 133.514985 127.650364) - (xy 132.661065 128.64408) (xy 132.658581 128.646884) (xy 131.775014 129.614384) (xy 131.772463 129.617093) - (xy 130.860062 130.55748) (xy 130.85748 130.560062) (xy 129.917093 131.472463) (xy 129.914384 131.475014) - (xy 128.946884 132.358581) (xy 128.94408 132.361065) (xy 127.950364 133.214985) (xy 127.947487 133.217383) - (xy 126.928411 134.040917) (xy 126.925462 134.043227) (xy 125.882001 134.835588) (xy 125.878984 134.837807) - (xy 124.812049 135.598304) (xy 124.808967 135.600432) (xy 123.719565 136.328346) (xy 123.716419 136.33038) - (xy 122.605536 137.025056) (xy 122.602331 137.026994) (xy 121.470939 137.687821) (xy 121.467676 137.689661) - (xy 120.316861 138.316004) (xy 120.313545 138.317744) (xy 119.14435 138.909036) (xy 119.140982 138.910676) - (xy 117.954448 139.466392) (xy 117.951033 139.467929) (xy 116.748269 139.98755) (xy 116.744808 139.988984) - (xy 115.526872 140.47205) (xy 115.52337 140.473378) (xy 114.291421 140.91943) (xy 114.28788 140.920652) - (xy 113.043003 141.329299) (xy 113.039427 141.330413) (xy 111.782804 141.701266) (xy 111.779196 141.702272) - (xy 110.511909 142.035011) (xy 110.508272 142.035907) (xy 109.231545 142.330211) (xy 109.227883 142.330997) - (xy 107.942869 142.586602) (xy 107.939185 142.587278) (xy 106.646959 142.803969) (xy 106.643256 142.804532) - (xy 105.345158 142.982083) (xy 105.34144 142.982535) (xy 104.03852 143.120804) (xy 104.03479 143.121143) - (xy 102.728296 143.219997) (xy 102.724557 143.220223) (xy 101.415683 143.27957) (xy 101.411939 143.279683) - (xy 100.101873 143.299471) (xy 100.098127 143.299471) (xy 98.78806 143.279683) (xy 98.784316 143.27957) - (xy 97.475442 143.220223) (xy 97.471703 143.219997) (xy 96.165209 143.121143) (xy 96.161479 143.120804) - (xy 94.858559 142.982535) (xy 94.854841 142.982083) (xy 93.556743 142.804532) (xy 93.55304 142.803969) - (xy 92.260814 142.587278) (xy 92.25713 142.586602) (xy 90.972116 142.330997) (xy 90.968454 142.330211) - (xy 89.691727 142.035907) (xy 89.68809 142.035011) (xy 88.420803 141.702272) (xy 88.417195 141.701266) - (xy 88.402255 141.696857) (xy 87.160571 141.330412) (xy 87.156996 141.329299) (xy 85.912119 140.920652) - (xy 85.908578 140.91943) (xy 85.292603 140.696404) (xy 84.676611 140.473371) (xy 84.673146 140.472057) - (xy 83.455177 139.988978) (xy 83.451744 139.987556) (xy 82.248966 139.467929) (xy 82.245551 139.466392) - (xy 81.059017 138.910676) (xy 81.055649 138.909036) (xy 79.886433 138.317733) (xy 79.883158 138.316015) - (xy 78.732305 137.689651) (xy 78.729078 137.687831) (xy 77.597661 137.02699) (xy 77.594463 137.025056) - (xy 77.548158 136.9961) (xy 77.374167 136.887297) (xy 76.48358 136.33038) (xy 76.480434 136.328346) - (xy 76.40615 136.278711) (xy 86.7495 136.278711) (xy 86.7495 136.521288) (xy 86.781161 136.761785) - (xy 86.843947 136.996104) (xy 86.936773 137.220205) (xy 86.936776 137.220212) (xy 87.058064 137.430289) - (xy 87.058066 137.430292) (xy 87.058067 137.430293) (xy 87.205733 137.622736) (xy 87.205739 137.622743) - (xy 87.377256 137.79426) (xy 87.377262 137.794265) (xy 87.569711 137.941936) (xy 87.779788 138.063224) - (xy 88.0039 138.156054) (xy 88.238211 138.218838) (xy 88.418586 138.242584) (xy 88.478711 138.2505) - (xy 88.478712 138.2505) (xy 88.721289 138.2505) (xy 88.769388 138.244167) (xy 88.961789 138.218838) - (xy 89.1961 138.156054) (xy 89.420212 138.063224) (xy 89.630289 137.941936) (xy 89.822738 137.794265) - (xy 89.994265 137.622738) (xy 90.141936 137.430289) (xy 90.263224 137.220212) (xy 90.356054 136.9961) - (xy 90.418838 136.761789) (xy 90.4505 136.521288) (xy 90.4505 136.278712) (xy 90.418838 136.038211) - (xy 90.356054 135.8039) (xy 90.263224 135.579788) (xy 90.141936 135.369711) (xy 89.994265 135.177262) - (xy 89.99426 135.177256) (xy 89.822743 135.005739) (xy 89.822736 135.005733) (xy 89.630293 134.858067) - (xy 89.630292 134.858066) (xy 89.630289 134.858064) (xy 89.420212 134.736776) (xy 89.420205 134.736773) - (xy 89.196104 134.643947) (xy 88.961785 134.581161) (xy 88.721289 134.5495) (xy 88.721288 134.5495) - (xy 88.478712 134.5495) (xy 88.478711 134.5495) (xy 88.238214 134.581161) (xy 88.003895 134.643947) - (xy 87.779794 134.736773) (xy 87.779785 134.736777) (xy 87.569706 134.858067) (xy 87.377263 135.005733) - (xy 87.377256 135.005739) (xy 87.205739 135.177256) (xy 87.205733 135.177263) (xy 87.058067 135.369706) - (xy 86.936777 135.579785) (xy 86.936773 135.579794) (xy 86.843947 135.803895) (xy 86.781161 136.038214) - (xy 86.7495 136.278711) (xy 76.40615 136.278711) (xy 75.391032 135.600432) (xy 75.38795 135.598304) - (xy 74.321015 134.837807) (xy 74.317998 134.835588) (xy 73.274537 134.043227) (xy 73.271588 134.040917) - (xy 72.252512 133.217383) (xy 72.249635 133.214985) (xy 71.255919 132.361065) (xy 71.253115 132.358581) - (xy 70.285615 131.475014) (xy 70.282938 131.472494) (xy 69.342485 130.560029) (xy 69.33997 130.557514) - (xy 68.427503 129.617059) (xy 68.425001 129.614401) (xy 67.820962 128.952983) (xy 67.541418 128.646884) - (xy 67.538934 128.64408) (xy 66.814803 127.801401) (xy 124.232632 127.801401) (xy 124.232632 128.043978) - (xy 124.264293 128.284475) (xy 124.327079 128.518794) (xy 124.380136 128.646884) (xy 124.419908 128.742902) - (xy 124.541196 128.952979) (xy 124.541198 128.952982) (xy 124.541199 128.952983) (xy 124.688865 129.145426) - (xy 124.688871 129.145433) (xy 124.860388 129.31695) (xy 124.860394 129.316955) (xy 125.052843 129.464626) - (xy 125.26292 129.585914) (xy 125.487032 129.678744) (xy 125.721343 129.741528) (xy 125.901718 129.765274) - (xy 125.961843 129.77319) (xy 125.961844 129.77319) (xy 126.204421 129.77319) (xy 126.25252 129.766857) - (xy 126.444921 129.741528) (xy 126.679232 129.678744) (xy 126.903344 129.585914) (xy 127.113421 129.464626) - (xy 127.30587 129.316955) (xy 127.477397 129.145428) (xy 127.625068 128.952979) (xy 127.746356 128.742902) - (xy 127.839186 128.51879) (xy 127.90197 128.284479) (xy 127.933632 128.043978) (xy 127.933632 127.801402) - (xy 127.90197 127.560901) (xy 127.839186 127.32659) (xy 127.746356 127.102478) (xy 127.625068 126.892401) - (xy 127.477397 126.699952) (xy 127.477392 126.699946) (xy 127.305875 126.528429) (xy 127.305868 126.528423) - (xy 127.113425 126.380757) (xy 127.113424 126.380756) (xy 127.113421 126.380754) (xy 126.903344 126.259466) - (xy 126.903337 126.259463) (xy 126.679236 126.166637) (xy 126.444917 126.103851) (xy 126.204421 126.07219) - (xy 126.20442 126.07219) (xy 125.961844 126.07219) (xy 125.961843 126.07219) (xy 125.721346 126.103851) - (xy 125.487027 126.166637) (xy 125.262926 126.259463) (xy 125.262917 126.259467) (xy 125.052838 126.380757) - (xy 124.860395 126.528423) (xy 124.860388 126.528429) (xy 124.688871 126.699946) (xy 124.688865 126.699953) - (xy 124.541199 126.892396) (xy 124.419909 127.102475) (xy 124.419905 127.102484) (xy 124.327079 127.326585) - (xy 124.264293 127.560904) (xy 124.232632 127.801401) (xy 66.814803 127.801401) (xy 66.685014 127.650364) - (xy 66.682616 127.647487) (xy 66.612644 127.560901) (xy 65.859077 126.628404) (xy 65.856772 126.625462) - (xy 65.064411 125.582001) (xy 65.062192 125.578984) (xy 64.301695 124.512049) (xy 64.299567 124.508967) - (xy 64.269991 124.464704) (xy 64.058272 124.147844) (xy 100.6 124.147844) (xy 100.606401 124.207372) - (xy 100.606403 124.207379) (xy 100.656645 124.342086) (xy 100.656649 124.342093) (xy 100.742809 124.457187) - (xy 100.742812 124.45719) (xy 100.857906 124.54335) (xy 100.857913 124.543354) (xy 100.99262 124.593596) - (xy 100.992627 124.593598) (xy 101.052155 124.599999) (xy 101.052172 124.6) (xy 101.65 124.6) (xy 102.15 124.6) - (xy 102.747828 124.6) (xy 102.747844 124.599999) (xy 102.807372 124.593598) (xy 102.807379 124.593596) - (xy 102.942086 124.543354) (xy 102.942093 124.54335) (xy 103.057187 124.45719) (xy 103.05719 124.457187) - (xy 103.14335 124.342093) (xy 103.143354 124.342086) (xy 103.193596 124.207379) (xy 103.193598 124.207372) - (xy 103.199999 124.147844) (xy 103.2 124.147827) (xy 103.2 123.25) (xy 102.15 123.25) (xy 102.15 124.6) - (xy 101.65 124.6) (xy 101.65 123.25) (xy 100.6 123.25) (xy 100.6 124.147844) (xy 64.058272 124.147844) + (xy 125.882001 64.764411) (xy 125.953676 64.818838) (xy 126.389783 65.15) (xy 126.925462 65.556772) + (xy 126.928404 65.559077) (xy 127.947503 66.382629) (xy 127.950348 66.385001) (xy 128.124688 66.534814) + (xy 128.94408 67.238934) (xy 128.946884 67.241418) (xy 129.44671 67.697883) (xy 129.914401 68.125001) + (xy 129.917059 68.127503) (xy 130.857514 69.03997) (xy 130.860029 69.042485) (xy 131.772494 69.982938) + (xy 131.775 69.9856) (xy 131.863995 70.083049) (xy 132.658581 70.953115) (xy 132.661065 70.955919) + (xy 133.514985 71.949635) (xy 133.517375 71.952503) (xy 133.965959 72.507599) (xy 134.340917 72.971588) + (xy 134.343227 72.974537) (xy 135.135588 74.017998) (xy 135.137807 74.021015) (xy 135.898304 75.08795) + (xy 135.900432 75.091032) (xy 136.628346 76.180434) (xy 136.63038 76.18358) (xy 137.325056 77.294463) + (xy 137.326994 77.297668) (xy 137.987821 78.42906) (xy 137.989651 78.432305) (xy 138.482803 79.338402) + (xy 138.616004 79.583138) (xy 138.617733 79.586433) (xy 139.074587 80.489796) (xy 139.209036 80.755649) + (xy 139.210673 80.759012) (xy 139.364979 81.088477) (xy 139.766392 81.945551) (xy 139.767929 81.948966) + (xy 140.188469 82.922389) (xy 140.28755 83.15173) (xy 140.288978 83.155177) (xy 140.688269 84.161895) + (xy 140.77205 84.373127) (xy 140.773371 84.376611) (xy 140.911389 84.7578) (xy 141.21943 85.608578) + (xy 141.220652 85.612119) (xy 141.629296 86.856987) (xy 141.63041 86.860563) (xy 142.001266 88.117195) + (xy 142.002272 88.120803) (xy 142.335011 89.38809) (xy 142.335907 89.391727) (xy 142.630211 90.668454) + (xy 142.630997 90.672116) (xy 142.886602 91.95713) (xy 142.887278 91.960814) (xy 143.103969 93.25304) + (xy 143.104532 93.256743) (xy 143.282083 94.554841) (xy 143.282535 94.558559) (xy 143.420804 95.861479) + (xy 143.421143 95.865209) (xy 143.519997 97.171703) (xy 143.520223 97.175442) (xy 143.57957 98.484316) + (xy 143.579683 98.48806) (xy 143.599471 99.798127) (xy 143.599471 99.801873) (xy 143.579683 101.111939) + (xy 143.57957 101.115683) (xy 143.520223 102.424557) (xy 143.519997 102.428296) (xy 143.421143 103.73479) + (xy 143.420804 103.73852) (xy 143.282535 105.04144) (xy 143.282083 105.045158) (xy 143.104532 106.343256) + (xy 143.103969 106.346959) (xy 142.887278 107.639185) (xy 142.886602 107.642869) (xy 142.630997 108.927883) + (xy 142.630211 108.931545) (xy 142.335907 110.208272) (xy 142.335011 110.211909) (xy 142.002272 111.479196) + (xy 142.001266 111.482804) (xy 141.630413 112.739427) (xy 141.629299 112.743003) (xy 141.220652 113.98788) + (xy 141.21943 113.991421) (xy 140.773378 115.22337) (xy 140.77205 115.226872) (xy 140.288984 116.444808) + (xy 140.28755 116.448269) (xy 139.767929 117.651033) (xy 139.766392 117.654448) (xy 139.210676 118.840982) + (xy 139.209036 118.84435) (xy 138.617744 120.013545) (xy 138.616004 120.016861) (xy 137.989661 121.167676) + (xy 137.987821 121.170939) (xy 137.326994 122.302331) (xy 137.325056 122.305536) (xy 136.63038 123.416419) + (xy 136.628346 123.419565) (xy 135.900432 124.508967) (xy 135.898304 124.512049) (xy 135.137807 125.578984) + (xy 135.135588 125.582001) (xy 134.343227 126.625462) (xy 134.340917 126.628411) (xy 133.517383 127.647487) + (xy 133.514985 127.650364) (xy 132.661065 128.64408) (xy 132.658581 128.646884) (xy 131.775014 129.614384) + (xy 131.772463 129.617093) (xy 130.860062 130.55748) (xy 130.85748 130.560062) (xy 129.917093 131.472463) + (xy 129.914384 131.475014) (xy 128.946884 132.358581) (xy 128.94408 132.361065) (xy 127.950364 133.214985) + (xy 127.947487 133.217383) (xy 126.928411 134.040917) (xy 126.925462 134.043227) (xy 125.882001 134.835588) + (xy 125.878984 134.837807) (xy 124.812049 135.598304) (xy 124.808967 135.600432) (xy 123.719565 136.328346) + (xy 123.716419 136.33038) (xy 122.605536 137.025056) (xy 122.602331 137.026994) (xy 121.470939 137.687821) + (xy 121.467676 137.689661) (xy 120.316861 138.316004) (xy 120.313545 138.317744) (xy 119.14435 138.909036) + (xy 119.140982 138.910676) (xy 117.954448 139.466392) (xy 117.951033 139.467929) (xy 116.748269 139.98755) + (xy 116.744808 139.988984) (xy 115.526872 140.47205) (xy 115.52337 140.473378) (xy 114.291421 140.91943) + (xy 114.28788 140.920652) (xy 113.043003 141.329299) (xy 113.039427 141.330413) (xy 111.782804 141.701266) + (xy 111.779196 141.702272) (xy 110.511909 142.035011) (xy 110.508272 142.035907) (xy 109.231545 142.330211) + (xy 109.227883 142.330997) (xy 107.942869 142.586602) (xy 107.939185 142.587278) (xy 106.646959 142.803969) + (xy 106.643256 142.804532) (xy 105.345158 142.982083) (xy 105.34144 142.982535) (xy 104.03852 143.120804) + (xy 104.03479 143.121143) (xy 102.728296 143.219997) (xy 102.724557 143.220223) (xy 101.415683 143.27957) + (xy 101.411939 143.279683) (xy 100.101873 143.299471) (xy 100.098127 143.299471) (xy 98.78806 143.279683) + (xy 98.784316 143.27957) (xy 97.475442 143.220223) (xy 97.471703 143.219997) (xy 96.165209 143.121143) + (xy 96.161479 143.120804) (xy 94.858559 142.982535) (xy 94.854841 142.982083) (xy 93.556743 142.804532) + (xy 93.55304 142.803969) (xy 92.260814 142.587278) (xy 92.25713 142.586602) (xy 90.972116 142.330997) + (xy 90.968454 142.330211) (xy 89.691727 142.035907) (xy 89.68809 142.035011) (xy 88.420803 141.702272) + (xy 88.417195 141.701266) (xy 88.402255 141.696857) (xy 87.160571 141.330412) (xy 87.156996 141.329299) + (xy 85.912119 140.920652) (xy 85.908578 140.91943) (xy 85.292603 140.696404) (xy 84.676611 140.473371) + (xy 84.673146 140.472057) (xy 83.455177 139.988978) (xy 83.451744 139.987556) (xy 82.248966 139.467929) + (xy 82.245551 139.466392) (xy 81.059017 138.910676) (xy 81.055649 138.909036) (xy 79.886433 138.317733) + (xy 79.883158 138.316015) (xy 78.732305 137.689651) (xy 78.729078 137.687831) (xy 77.597661 137.02699) + (xy 77.594463 137.025056) (xy 77.548158 136.9961) (xy 77.374167 136.887297) (xy 76.48358 136.33038) + (xy 76.480434 136.328346) (xy 76.40615 136.278711) (xy 86.7495 136.278711) (xy 86.7495 136.521288) + (xy 86.781161 136.761785) (xy 86.843947 136.996104) (xy 86.936773 137.220205) (xy 86.936776 137.220212) + (xy 87.058064 137.430289) (xy 87.058066 137.430292) (xy 87.058067 137.430293) (xy 87.205733 137.622736) + (xy 87.205739 137.622743) (xy 87.377256 137.79426) (xy 87.377262 137.794265) (xy 87.569711 137.941936) + (xy 87.779788 138.063224) (xy 88.0039 138.156054) (xy 88.238211 138.218838) (xy 88.418586 138.242584) + (xy 88.478711 138.2505) (xy 88.478712 138.2505) (xy 88.721289 138.2505) (xy 88.769388 138.244167) + (xy 88.961789 138.218838) (xy 89.1961 138.156054) (xy 89.420212 138.063224) (xy 89.630289 137.941936) + (xy 89.822738 137.794265) (xy 89.994265 137.622738) (xy 90.141936 137.430289) (xy 90.263224 137.220212) + (xy 90.356054 136.9961) (xy 90.418838 136.761789) (xy 90.4505 136.521288) (xy 90.4505 136.278712) + (xy 90.418838 136.038211) (xy 90.356054 135.8039) (xy 90.263224 135.579788) (xy 90.141936 135.369711) + (xy 89.994265 135.177262) (xy 89.99426 135.177256) (xy 89.822743 135.005739) (xy 89.822736 135.005733) + (xy 89.630293 134.858067) (xy 89.630292 134.858066) (xy 89.630289 134.858064) (xy 89.420212 134.736776) + (xy 89.420205 134.736773) (xy 89.196104 134.643947) (xy 88.961785 134.581161) (xy 88.721289 134.5495) + (xy 88.721288 134.5495) (xy 88.478712 134.5495) (xy 88.478711 134.5495) (xy 88.238214 134.581161) + (xy 88.003895 134.643947) (xy 87.779794 134.736773) (xy 87.779785 134.736777) (xy 87.569706 134.858067) + (xy 87.377263 135.005733) (xy 87.377256 135.005739) (xy 87.205739 135.177256) (xy 87.205733 135.177263) + (xy 87.058067 135.369706) (xy 86.936777 135.579785) (xy 86.936773 135.579794) (xy 86.843947 135.803895) + (xy 86.781161 136.038214) (xy 86.7495 136.278711) (xy 76.40615 136.278711) (xy 75.391032 135.600432) + (xy 75.38795 135.598304) (xy 74.321015 134.837807) (xy 74.317998 134.835588) (xy 73.274537 134.043227) + (xy 73.271588 134.040917) (xy 72.252512 133.217383) (xy 72.249635 133.214985) (xy 71.255919 132.361065) + (xy 71.253115 132.358581) (xy 70.285615 131.475014) (xy 70.282938 131.472494) (xy 69.342485 130.560029) + (xy 69.33997 130.557514) (xy 68.427503 129.617059) (xy 68.425001 129.614401) (xy 67.820962 128.952983) + (xy 67.541418 128.646884) (xy 67.538934 128.64408) (xy 66.814803 127.801401) (xy 124.232632 127.801401) + (xy 124.232632 128.043978) (xy 124.264293 128.284475) (xy 124.327079 128.518794) (xy 124.380136 128.646884) + (xy 124.419908 128.742902) (xy 124.541196 128.952979) (xy 124.541198 128.952982) (xy 124.541199 128.952983) + (xy 124.688865 129.145426) (xy 124.688871 129.145433) (xy 124.860388 129.31695) (xy 124.860394 129.316955) + (xy 125.052843 129.464626) (xy 125.26292 129.585914) (xy 125.487032 129.678744) (xy 125.721343 129.741528) + (xy 125.901718 129.765274) (xy 125.961843 129.77319) (xy 125.961844 129.77319) (xy 126.204421 129.77319) + (xy 126.25252 129.766857) (xy 126.444921 129.741528) (xy 126.679232 129.678744) (xy 126.903344 129.585914) + (xy 127.113421 129.464626) (xy 127.30587 129.316955) (xy 127.477397 129.145428) (xy 127.625068 128.952979) + (xy 127.746356 128.742902) (xy 127.839186 128.51879) (xy 127.90197 128.284479) (xy 127.933632 128.043978) + (xy 127.933632 127.801402) (xy 127.90197 127.560901) (xy 127.839186 127.32659) (xy 127.746356 127.102478) + (xy 127.625068 126.892401) (xy 127.477397 126.699952) (xy 127.477392 126.699946) (xy 127.305875 126.528429) + (xy 127.305868 126.528423) (xy 127.113425 126.380757) (xy 127.113424 126.380756) (xy 127.113421 126.380754) + (xy 126.903344 126.259466) (xy 126.903337 126.259463) (xy 126.679236 126.166637) (xy 126.444917 126.103851) + (xy 126.204421 126.07219) (xy 126.20442 126.07219) (xy 125.961844 126.07219) (xy 125.961843 126.07219) + (xy 125.721346 126.103851) (xy 125.487027 126.166637) (xy 125.262926 126.259463) (xy 125.262917 126.259467) + (xy 125.052838 126.380757) (xy 124.860395 126.528423) (xy 124.860388 126.528429) (xy 124.688871 126.699946) + (xy 124.688865 126.699953) (xy 124.541199 126.892396) (xy 124.419909 127.102475) (xy 124.419905 127.102484) + (xy 124.327079 127.326585) (xy 124.264293 127.560904) (xy 124.232632 127.801401) (xy 66.814803 127.801401) + (xy 66.685014 127.650364) (xy 66.682616 127.647487) (xy 66.612644 127.560901) (xy 65.859077 126.628404) + (xy 65.856772 126.625462) (xy 65.064411 125.582001) (xy 65.062192 125.578984) (xy 64.301695 124.512049) + (xy 64.299567 124.508967) (xy 64.269991 124.464704) (xy 64.058272 124.147844) (xy 100.6 124.147844) + (xy 100.606401 124.207372) (xy 100.606403 124.207379) (xy 100.656645 124.342086) (xy 100.656649 124.342093) + (xy 100.742809 124.457187) (xy 100.742812 124.45719) (xy 100.857906 124.54335) (xy 100.857913 124.543354) + (xy 100.99262 124.593596) (xy 100.992627 124.593598) (xy 101.052155 124.599999) (xy 101.052172 124.6) + (xy 101.65 124.6) (xy 102.15 124.6) (xy 102.747828 124.6) (xy 102.747844 124.599999) (xy 102.807372 124.593598) + (xy 102.807379 124.593596) (xy 102.942086 124.543354) (xy 102.942093 124.54335) (xy 103.057187 124.45719) + (xy 103.05719 124.457187) (xy 103.14335 124.342093) (xy 103.143354 124.342086) (xy 103.193596 124.207379) + (xy 103.193598 124.207372) (xy 103.199999 124.147844) (xy 103.2 124.147827) (xy 103.2 123.25) (xy 102.15 123.25) + (xy 102.15 124.6) (xy 101.65 124.6) (xy 101.65 123.25) (xy 100.6 123.25) (xy 100.6 124.147844) (xy 64.058272 124.147844) (xy 63.625606 123.500312) (xy 63.571653 123.419565) (xy 63.569619 123.416419) (xy 63.421938 123.180256) (xy 108.612016 123.180256) (xy 108.632496 123.322711) (xy 108.632497 123.322715) (xy 108.692283 123.453626) (xy 108.692284 123.453627) (xy 108.692285 123.453629) (xy 108.729904 123.500312) (xy 108.729907 123.500315) @@ -6849,37 +6850,28 @@ (xy 72.374935 70.447016) (xy 72.253645 70.657095) (xy 72.253641 70.657104) (xy 72.160815 70.881205) (xy 72.098029 71.115524) (xy 72.066368 71.356021) (xy 67.195118 71.356021) (xy 67.53894 70.955911) (xy 67.541418 70.953115) (xy 67.60709 70.881205) (xy 68.425032 69.985564) (xy 68.427471 69.982973) - (xy 69.340002 69.042452) (xy 69.342452 69.040002) (xy 69.383695 68.999986) (xy 92.725001 68.999986) - (xy 92.735494 69.102697) (xy 92.790641 69.269119) (xy 92.790643 69.269124) (xy 92.882684 69.418345) - (xy 93.006654 69.542315) (xy 93.155875 69.634356) (xy 93.15588 69.634358) (xy 93.322302 69.689505) - (xy 93.322309 69.689506) (xy 93.425019 69.699999) (xy 93.849999 69.699999) (xy 94.35 69.699999) - (xy 94.774972 69.699999) (xy 94.774986 69.699998) (xy 94.877697 69.689505) (xy 95.044119 69.634358) - (xy 95.044124 69.634356) (xy 95.193345 69.542315) (xy 95.317315 69.418345) (xy 95.409356 69.269124) - (xy 95.409358 69.269119) (xy 95.464505 69.102697) (xy 95.464506 69.10269) (xy 95.474999 68.999986) - (xy 95.475 68.999973) (xy 95.475 68.8) (xy 94.35 68.8) (xy 94.35 69.699999) (xy 93.849999 69.699999) - (xy 93.85 69.699998) (xy 93.85 68.8) (xy 92.725001 68.8) (xy 92.725001 68.999986) (xy 69.383695 68.999986) - (xy 70.282973 68.127471) (xy 70.285564 68.125032) (xy 70.31296 68.100013) (xy 92.725 68.100013) - (xy 92.725 68.3) (xy 93.85 68.3) (xy 94.35 68.3) (xy 95.474999 68.3) (xy 95.474999 68.100028) (xy 95.474998 68.100013) - (xy 95.464505 67.997302) (xy 95.409358 67.83088) (xy 95.409356 67.830875) (xy 95.317315 67.681654) - (xy 95.193345 67.557684) (xy 95.044124 67.465643) (xy 95.044119 67.465641) (xy 94.877697 67.410494) - (xy 94.87769 67.410493) (xy 94.774986 67.4) (xy 94.35 67.4) (xy 94.35 68.3) (xy 93.85 68.3) (xy 93.85 67.4) - (xy 93.425028 67.4) (xy 93.425012 67.400001) (xy 93.322302 67.410494) (xy 93.15588 67.465641) (xy 93.155875 67.465643) - (xy 93.006654 67.557684) (xy 92.882684 67.681654) (xy 92.790643 67.830875) (xy 92.790641 67.83088) - (xy 92.735494 67.997302) (xy 92.735493 67.997309) (xy 92.725 68.100013) (xy 70.31296 68.100013) + (xy 69.340002 69.042452) (xy 69.342452 69.040002) (xy 70.282973 68.127471) (xy 70.285564 68.125032) + (xy 70.312992 68.099983) (xy 89.9245 68.099983) (xy 89.9245 69.000001) (xy 89.924501 69.000019) + (xy 89.935 69.102796) (xy 89.935001 69.102799) (xy 89.990185 69.269331) (xy 89.990186 69.269334) + (xy 90.082288 69.418656) (xy 90.206344 69.542712) (xy 90.355666 69.634814) (xy 90.522203 69.689999) + (xy 90.624991 69.7005) (xy 91.975008 69.700499) (xy 92.077797 69.689999) (xy 92.244334 69.634814) + (xy 92.393656 69.542712) (xy 92.517712 69.418656) (xy 92.609814 69.269334) (xy 92.664999 69.102797) + (xy 92.6755 69.000009) (xy 92.675499 68.099992) (xy 92.664999 67.997203) (xy 92.609814 67.830666) + (xy 92.517712 67.681344) (xy 92.393656 67.557288) (xy 92.244334 67.465186) (xy 92.077797 67.410001) + (xy 92.077795 67.41) (xy 91.97501 67.3995) (xy 90.624998 67.3995) (xy 90.624981 67.399501) (xy 90.522203 67.41) + (xy 90.5222 67.410001) (xy 90.355668 67.465185) (xy 90.355663 67.465187) (xy 90.206342 67.557289) + (xy 90.082289 67.681342) (xy 89.990187 67.830663) (xy 89.990185 67.830668) (xy 89.966876 67.901011) + (xy 89.935001 67.997203) (xy 89.935001 67.997204) (xy 89.935 67.997204) (xy 89.9245 68.099983) (xy 70.312992 68.099983) (xy 71.253122 67.241411) (xy 71.255919 67.238934) (xy 72.249683 66.384973) (xy 72.252463 66.382656) - (xy 73.271626 65.559051) (xy 73.274496 65.556803) (xy 74.007773 64.999983) (xy 92.7245 64.999983) - (xy 92.7245 65.900001) (xy 92.724501 65.900019) (xy 92.735 66.002796) (xy 92.735001 66.002799) (xy 92.790185 66.169331) - (xy 92.790187 66.169336) (xy 92.809496 66.200641) (xy 92.882288 66.318656) (xy 93.006344 66.442712) - (xy 93.155666 66.534814) (xy 93.322203 66.589999) (xy 93.424991 66.6005) (xy 94.775008 66.600499) - (xy 94.877797 66.589999) (xy 95.044334 66.534814) (xy 95.193656 66.442712) (xy 95.317712 66.318656) - (xy 95.409814 66.169334) (xy 95.464999 66.002797) (xy 95.4755 65.900009) (xy 95.475499 64.999992) - (xy 95.464999 64.897203) (xy 95.433497 64.802135) (xy 96.012 64.802135) (xy 96.012 65.99787) (xy 96.012001 65.997876) - (xy 96.018408 66.057483) (xy 96.071803 66.200641) (xy 96.070075 66.201285) (xy 96.082595 66.258853) - (xy 96.07081 66.298988) (xy 96.071803 66.299359) (xy 96.018408 66.442517) (xy 96.012001 66.502116) - (xy 96.012001 66.502123) (xy 96.012 66.502135) (xy 96.012 67.69787) (xy 96.012001 67.697876) (xy 96.018408 67.757483) - (xy 96.071803 67.900641) (xy 96.070075 67.901285) (xy 96.082595 67.958853) (xy 96.07081 67.998988) - (xy 96.071803 67.999359) (xy 96.018408 68.142517) (xy 96.012001 68.202116) (xy 96.012001 68.202123) - (xy 96.012 68.202135) (xy 96.012 69.39787) (xy 96.012001 69.397876) (xy 96.018408 69.457483) (xy 96.068702 69.592328) + (xy 73.271626 65.559051) (xy 73.274496 65.556803) (xy 74.007773 64.999983) (xy 89.9245 64.999983) + (xy 89.9245 65.900001) (xy 89.924501 65.900019) (xy 89.935 66.002796) (xy 89.935001 66.002799) (xy 89.990185 66.169331) + (xy 89.990187 66.169336) (xy 90.009893 66.201285) (xy 90.082288 66.318656) (xy 90.206344 66.442712) + (xy 90.355666 66.534814) (xy 90.522203 66.589999) (xy 90.624991 66.6005) (xy 91.975008 66.600499) + (xy 92.077797 66.589999) (xy 92.244334 66.534814) (xy 92.297315 66.502135) (xy 96.012 66.502135) + (xy 96.012 67.69787) (xy 96.012001 67.697876) (xy 96.018408 67.757483) (xy 96.071803 67.900641) + (xy 96.070075 67.901285) (xy 96.082595 67.958853) (xy 96.07081 67.998988) (xy 96.071803 67.999359) + (xy 96.018408 68.142517) (xy 96.012001 68.202116) (xy 96.012001 68.202123) (xy 96.012 68.202135) + (xy 96.012 69.39787) (xy 96.012001 69.397876) (xy 96.018408 69.457483) (xy 96.068702 69.592328) (xy 96.068706 69.592335) (xy 96.154952 69.707544) (xy 96.154955 69.707547) (xy 96.270164 69.793793) (xy 96.270171 69.793797) (xy 96.405017 69.844091) (xy 96.405016 69.844091) (xy 96.411944 69.844835) (xy 96.464627 69.8505) (xy 98.560372 69.850499) (xy 98.619983 69.844091) (xy 98.754831 69.793796) @@ -6887,77 +6879,83 @@ (xy 99.012999 68.202128) (xy 99.006591 68.142517) (xy 98.956296 68.007669) (xy 98.956294 68.007666) (xy 98.953196 67.99936) (xy 98.954926 67.998714) (xy 98.942402 67.941163) (xy 98.954191 67.901011) (xy 98.953196 67.90064) (xy 98.956294 67.892333) (xy 98.956296 67.892331) (xy 99.006591 67.757483) - (xy 99.013 67.697873) (xy 99.012999 66.502128) (xy 99.006591 66.442517) (xy 98.956296 66.307669) - (xy 98.956294 66.307666) (xy 98.953196 66.29936) (xy 98.954926 66.298714) (xy 98.942402 66.241163) - (xy 98.954191 66.201011) (xy 98.953196 66.20064) (xy 98.956294 66.192333) (xy 98.956296 66.192331) - (xy 99.006591 66.057483) (xy 99.013 65.997873) (xy 99.012999 64.802135) (xy 100.812 64.802135) (xy 100.812 65.99787) - (xy 100.812001 65.997876) (xy 100.818408 66.057483) (xy 100.871803 66.200641) (xy 100.870075 66.201285) - (xy 100.882595 66.258853) (xy 100.87081 66.298988) (xy 100.871803 66.299359) (xy 100.818408 66.442517) - (xy 100.812001 66.502116) (xy 100.812001 66.502123) (xy 100.812 66.502135) (xy 100.812 67.69787) - (xy 100.812001 67.697876) (xy 100.818408 67.757483) (xy 100.871803 67.900641) (xy 100.870075 67.901285) - (xy 100.882595 67.958853) (xy 100.87081 67.998988) (xy 100.871803 67.999359) (xy 100.818408 68.142517) - (xy 100.812001 68.202116) (xy 100.812001 68.202123) (xy 100.812 68.202135) (xy 100.812 69.39787) - (xy 100.812001 69.397876) (xy 100.818408 69.457483) (xy 100.868702 69.592328) (xy 100.868706 69.592335) - (xy 100.954952 69.707544) (xy 100.954955 69.707547) (xy 101.070164 69.793793) (xy 101.070171 69.793797) - (xy 101.205017 69.844091) (xy 101.205016 69.844091) (xy 101.211944 69.844835) (xy 101.264627 69.8505) - (xy 103.360372 69.850499) (xy 103.419983 69.844091) (xy 103.554831 69.793796) (xy 103.670046 69.707546) - (xy 103.756296 69.592331) (xy 103.806591 69.457483) (xy 103.813 69.397873) (xy 103.812999 68.202128) - (xy 103.806591 68.142517) (xy 103.756296 68.007669) (xy 103.756294 68.007666) (xy 103.753196 67.99936) - (xy 103.754926 67.998714) (xy 103.742402 67.941163) (xy 103.754191 67.901011) (xy 103.753196 67.90064) - (xy 103.756294 67.892333) (xy 103.756296 67.892331) (xy 103.806591 67.757483) (xy 103.813 67.697873) - (xy 103.812999 66.502128) (xy 103.806591 66.442517) (xy 103.756296 66.307669) (xy 103.756294 66.307666) - (xy 103.753196 66.29936) (xy 103.754926 66.298714) (xy 103.742402 66.241163) (xy 103.754191 66.201011) - (xy 103.753196 66.20064) (xy 103.756294 66.192333) (xy 103.756296 66.192331) (xy 103.806591 66.057483) - (xy 103.813 65.997873) (xy 103.812999 64.802128) (xy 103.806591 64.742517) (xy 103.777017 64.663226) - (xy 103.756297 64.607671) (xy 103.756293 64.607664) (xy 103.670047 64.492455) (xy 103.670044 64.492452) - (xy 103.554835 64.406206) (xy 103.554828 64.406202) (xy 103.419982 64.355908) (xy 103.419983 64.355908) - (xy 103.360383 64.349501) (xy 103.360381 64.3495) (xy 103.360373 64.3495) (xy 103.360364 64.3495) - (xy 101.264629 64.3495) (xy 101.264623 64.349501) (xy 101.205016 64.355908) (xy 101.070171 64.406202) - (xy 101.070164 64.406206) (xy 100.954955 64.492452) (xy 100.954952 64.492455) (xy 100.868706 64.607664) - (xy 100.868702 64.607671) (xy 100.818408 64.742517) (xy 100.812001 64.802116) (xy 100.812001 64.802123) - (xy 100.812 64.802135) (xy 99.012999 64.802135) (xy 99.012999 64.802128) (xy 99.006591 64.742517) - (xy 98.977017 64.663226) (xy 98.956297 64.607671) (xy 98.956293 64.607664) (xy 98.870047 64.492455) - (xy 98.870044 64.492452) (xy 98.754835 64.406206) (xy 98.754828 64.406202) (xy 98.619982 64.355908) - (xy 98.619983 64.355908) (xy 98.560383 64.349501) (xy 98.560381 64.3495) (xy 98.560373 64.3495) - (xy 98.560364 64.3495) (xy 96.464629 64.3495) (xy 96.464623 64.349501) (xy 96.405016 64.355908) - (xy 96.270171 64.406202) (xy 96.270164 64.406206) (xy 96.154955 64.492452) (xy 96.154952 64.492455) - (xy 96.068706 64.607664) (xy 96.068702 64.607671) (xy 96.018408 64.742517) (xy 96.012001 64.802116) - (xy 96.012001 64.802123) (xy 96.012 64.802135) (xy 95.433497 64.802135) (xy 95.409814 64.730666) - (xy 95.317712 64.581344) (xy 95.193656 64.457288) (xy 95.100888 64.400069) (xy 95.044336 64.365187) - (xy 95.044331 64.365185) (xy 95.016335 64.355908) (xy 94.877797 64.310001) (xy 94.877795 64.31) - (xy 94.77501 64.2995) (xy 93.424998 64.2995) (xy 93.424981 64.299501) (xy 93.322203 64.31) (xy 93.3222 64.310001) - (xy 93.155668 64.365185) (xy 93.155663 64.365187) (xy 93.006342 64.457289) (xy 92.882289 64.581342) - (xy 92.790187 64.730663) (xy 92.790186 64.730666) (xy 92.735001 64.897203) (xy 92.735001 64.897204) - (xy 92.735 64.897204) (xy 92.7245 64.999983) (xy 74.007773 64.999983) (xy 74.318028 64.764388) (xy 74.321015 64.762192) - (xy 75.38795 64.001695) (xy 75.390988 63.999597) (xy 76.48045 63.271642) (xy 76.483563 63.269629) - (xy 77.108696 62.878711) (xy 109.5495 62.878711) (xy 109.5495 63.121288) (xy 109.581161 63.361785) - (xy 109.643947 63.596104) (xy 109.736773 63.820205) (xy 109.736776 63.820212) (xy 109.858064 64.030289) - (xy 109.858066 64.030292) (xy 109.858067 64.030293) (xy 110.005733 64.222736) (xy 110.005739 64.222743) - (xy 110.177256 64.39426) (xy 110.177263 64.394266) (xy 110.192821 64.406204) (xy 110.369711 64.541936) - (xy 110.579788 64.663224) (xy 110.8039 64.756054) (xy 111.038211 64.818838) (xy 111.218586 64.842584) - (xy 111.278711 64.8505) (xy 111.278712 64.8505) (xy 111.521289 64.8505) (xy 111.569388 64.844167) - (xy 111.761789 64.818838) (xy 111.9961 64.756054) (xy 112.220212 64.663224) (xy 112.430289 64.541936) - (xy 112.622738 64.394265) (xy 112.794265 64.222738) (xy 112.941936 64.030289) (xy 113.063224 63.820212) - (xy 113.156054 63.5961) (xy 113.218838 63.361789) (xy 113.2505 63.121288) (xy 113.2505 62.878712) - (xy 113.218838 62.638211) (xy 113.156054 62.4039) (xy 113.063224 62.179788) (xy 112.941936 61.969711) - (xy 112.794265 61.777262) (xy 112.79426 61.777256) (xy 112.622743 61.605739) (xy 112.622736 61.605733) - (xy 112.430293 61.458067) (xy 112.430292 61.458066) (xy 112.430289 61.458064) (xy 112.220212 61.336776) - (xy 112.220205 61.336773) (xy 111.996104 61.243947) (xy 111.761785 61.181161) (xy 111.521289 61.1495) - (xy 111.521288 61.1495) (xy 111.278712 61.1495) (xy 111.278711 61.1495) (xy 111.038214 61.181161) - (xy 110.803895 61.243947) (xy 110.579794 61.336773) (xy 110.579785 61.336777) (xy 110.369706 61.458067) - (xy 110.177263 61.605733) (xy 110.177256 61.605739) (xy 110.005739 61.777256) (xy 110.005733 61.777263) - (xy 109.858067 61.969706) (xy 109.736777 62.179785) (xy 109.736773 62.179794) (xy 109.643947 62.403895) - (xy 109.581161 62.638214) (xy 109.5495 62.878711) (xy 77.108696 62.878711) (xy 77.594519 62.574908) - (xy 77.597613 62.573038) (xy 78.729128 61.912139) (xy 78.732254 61.910376) (xy 79.88321 61.283957) - (xy 79.886381 61.282293) (xy 81.055707 60.690934) (xy 81.058958 60.689351) (xy 82.245594 60.133587) - (xy 82.248922 60.132089) (xy 83.451801 59.612419) (xy 83.455121 59.611043) (xy 84.673203 59.127919) - (xy 84.676552 59.126649) (xy 85.908618 58.680554) (xy 85.912078 58.67936) (xy 87.157057 58.27068) - (xy 87.16051 58.269605) (xy 88.417262 57.898714) (xy 88.420736 57.897745) (xy 89.688095 57.564986) - (xy 89.691727 57.564092) (xy 90.968468 57.269784) (xy 90.972103 57.269004) (xy 92.257141 57.013394) - (xy 92.260804 57.012722) (xy 93.553084 56.796023) (xy 93.556698 56.795473) (xy 94.854862 56.617913) - (xy 94.858538 56.617466) (xy 96.161539 56.479189) (xy 96.16515 56.478861) (xy 97.471766 56.379998) - (xy 97.475379 56.379779) (xy 98.784359 56.320427) (xy 98.788017 56.320317) (xy 100.098146 56.300528) - (xy 100.101854 56.300528) + (xy 99.013 67.697873) (xy 99.012999 66.502128) (xy 99.006591 66.442517) (xy 98.984687 66.383789) + (xy 98.953197 66.299359) (xy 98.954766 66.298773) (xy 98.942116 66.24063) (xy 98.953814 66.200793) + (xy 98.952753 66.200398) (xy 99.006097 66.057376) (xy 99.006098 66.057372) (xy 99.012499 65.997844) + (xy 99.0125 65.997827) (xy 99.0125 65.65) (xy 96.0125 65.65) (xy 96.0125 65.997844) (xy 96.018901 66.057372) + (xy 96.018903 66.057379) (xy 96.072246 66.200399) (xy 96.07043 66.201076) (xy 96.082883 66.258316) + (xy 96.070928 66.299033) (xy 96.071803 66.299359) (xy 96.018408 66.442517) (xy 96.012001 66.502116) + (xy 96.012001 66.502123) (xy 96.012 66.502135) (xy 92.297315 66.502135) (xy 92.393656 66.442712) + (xy 92.517712 66.318656) (xy 92.609814 66.169334) (xy 92.664999 66.002797) (xy 92.6755 65.900009) + (xy 92.675499 64.999992) (xy 92.664999 64.897203) (xy 92.633503 64.802155) (xy 96.0125 64.802155) + (xy 96.0125 65.15) (xy 97.2625 65.15) (xy 97.7625 65.15) (xy 99.0125 65.15) (xy 99.0125 64.802172) + (xy 99.012499 64.802155) (xy 99.012497 64.802135) (xy 100.812 64.802135) (xy 100.812 65.99787) (xy 100.812001 65.997876) + (xy 100.818408 66.057483) (xy 100.871803 66.200641) (xy 100.870075 66.201285) (xy 100.882595 66.258853) + (xy 100.87081 66.298988) (xy 100.871803 66.299359) (xy 100.818408 66.442517) (xy 100.812001 66.502116) + (xy 100.812001 66.502123) (xy 100.812 66.502135) (xy 100.812 67.69787) (xy 100.812001 67.697876) + (xy 100.818408 67.757483) (xy 100.871803 67.900641) (xy 100.870075 67.901285) (xy 100.882595 67.958853) + (xy 100.87081 67.998988) (xy 100.871803 67.999359) (xy 100.818408 68.142517) (xy 100.812001 68.202116) + (xy 100.812001 68.202123) (xy 100.812 68.202135) (xy 100.812 69.39787) (xy 100.812001 69.397876) + (xy 100.818408 69.457483) (xy 100.868702 69.592328) (xy 100.868706 69.592335) (xy 100.954952 69.707544) + (xy 100.954955 69.707547) (xy 101.070164 69.793793) (xy 101.070171 69.793797) (xy 101.205017 69.844091) + (xy 101.205016 69.844091) (xy 101.211944 69.844835) (xy 101.264627 69.8505) (xy 103.360372 69.850499) + (xy 103.419983 69.844091) (xy 103.554831 69.793796) (xy 103.670046 69.707546) (xy 103.756296 69.592331) + (xy 103.806591 69.457483) (xy 103.813 69.397873) (xy 103.812999 68.202128) (xy 103.806591 68.142517) + (xy 103.756296 68.007669) (xy 103.756294 68.007666) (xy 103.753196 67.99936) (xy 103.754926 67.998714) + (xy 103.742402 67.941163) (xy 103.754191 67.901011) (xy 103.753196 67.90064) (xy 103.756294 67.892333) + (xy 103.756296 67.892331) (xy 103.806591 67.757483) (xy 103.813 67.697873) (xy 103.812999 66.502128) + (xy 103.806591 66.442517) (xy 103.756296 66.307669) (xy 103.756294 66.307666) (xy 103.753196 66.29936) + (xy 103.754926 66.298714) (xy 103.742402 66.241163) (xy 103.754191 66.201011) (xy 103.753196 66.20064) + (xy 103.756294 66.192333) (xy 103.756296 66.192331) (xy 103.806591 66.057483) (xy 103.813 65.997873) + (xy 103.812999 64.802128) (xy 103.806591 64.742517) (xy 103.777017 64.663226) (xy 103.756297 64.607671) + (xy 103.756293 64.607664) (xy 103.670047 64.492455) (xy 103.670044 64.492452) (xy 103.554835 64.406206) + (xy 103.554828 64.406202) (xy 103.419982 64.355908) (xy 103.419983 64.355908) (xy 103.360383 64.349501) + (xy 103.360381 64.3495) (xy 103.360373 64.3495) (xy 103.360364 64.3495) (xy 101.264629 64.3495) + (xy 101.264623 64.349501) (xy 101.205016 64.355908) (xy 101.070171 64.406202) (xy 101.070164 64.406206) + (xy 100.954955 64.492452) (xy 100.954952 64.492455) (xy 100.868706 64.607664) (xy 100.868702 64.607671) + (xy 100.818408 64.742517) (xy 100.812001 64.802116) (xy 100.812001 64.802123) (xy 100.812 64.802135) + (xy 99.012497 64.802135) (xy 99.006098 64.742627) (xy 99.006096 64.74262) (xy 98.955854 64.607913) + (xy 98.95585 64.607906) (xy 98.86969 64.492812) (xy 98.869687 64.492809) (xy 98.754593 64.406649) + (xy 98.754586 64.406645) (xy 98.619879 64.356403) (xy 98.619872 64.356401) (xy 98.560344 64.35) + (xy 97.7625 64.35) (xy 97.7625 65.15) (xy 97.2625 65.15) (xy 97.2625 64.35) (xy 96.464655 64.35) + (xy 96.405127 64.356401) (xy 96.40512 64.356403) (xy 96.270413 64.406645) (xy 96.270406 64.406649) + (xy 96.155312 64.492809) (xy 96.155309 64.492812) (xy 96.069149 64.607906) (xy 96.069145 64.607913) + (xy 96.018903 64.74262) (xy 96.018901 64.742627) (xy 96.0125 64.802155) (xy 92.633503 64.802155) + (xy 92.609814 64.730666) (xy 92.517712 64.581344) (xy 92.393656 64.457288) (xy 92.300888 64.400069) + (xy 92.244336 64.365187) (xy 92.244331 64.365185) (xy 92.242862 64.364698) (xy 92.077797 64.310001) + (xy 92.077795 64.31) (xy 91.97501 64.2995) (xy 90.624998 64.2995) (xy 90.624981 64.299501) (xy 90.522203 64.31) + (xy 90.5222 64.310001) (xy 90.355668 64.365185) (xy 90.355663 64.365187) (xy 90.206342 64.457289) + (xy 90.082289 64.581342) (xy 89.990187 64.730663) (xy 89.990185 64.730668) (xy 89.981774 64.756052) + (xy 89.935001 64.897203) (xy 89.935001 64.897204) (xy 89.935 64.897204) (xy 89.9245 64.999983) (xy 74.007773 64.999983) + (xy 74.318028 64.764388) (xy 74.321015 64.762192) (xy 75.38795 64.001695) (xy 75.390988 63.999597) + (xy 76.48045 63.271642) (xy 76.483563 63.269629) (xy 77.108696 62.878711) (xy 109.5495 62.878711) + (xy 109.5495 63.121288) (xy 109.581161 63.361785) (xy 109.643947 63.596104) (xy 109.736773 63.820205) + (xy 109.736776 63.820212) (xy 109.858064 64.030289) (xy 109.858066 64.030292) (xy 109.858067 64.030293) + (xy 110.005733 64.222736) (xy 110.005739 64.222743) (xy 110.177256 64.39426) (xy 110.177263 64.394266) + (xy 110.192821 64.406204) (xy 110.369711 64.541936) (xy 110.579788 64.663224) (xy 110.8039 64.756054) + (xy 111.038211 64.818838) (xy 111.218586 64.842584) (xy 111.278711 64.8505) (xy 111.278712 64.8505) + (xy 111.521289 64.8505) (xy 111.569388 64.844167) (xy 111.761789 64.818838) (xy 111.9961 64.756054) + (xy 112.220212 64.663224) (xy 112.430289 64.541936) (xy 112.622738 64.394265) (xy 112.794265 64.222738) + (xy 112.941936 64.030289) (xy 113.063224 63.820212) (xy 113.156054 63.5961) (xy 113.218838 63.361789) + (xy 113.2505 63.121288) (xy 113.2505 62.878712) (xy 113.218838 62.638211) (xy 113.156054 62.4039) + (xy 113.063224 62.179788) (xy 112.941936 61.969711) (xy 112.794265 61.777262) (xy 112.79426 61.777256) + (xy 112.622743 61.605739) (xy 112.622736 61.605733) (xy 112.430293 61.458067) (xy 112.430292 61.458066) + (xy 112.430289 61.458064) (xy 112.220212 61.336776) (xy 112.220205 61.336773) (xy 111.996104 61.243947) + (xy 111.761785 61.181161) (xy 111.521289 61.1495) (xy 111.521288 61.1495) (xy 111.278712 61.1495) + (xy 111.278711 61.1495) (xy 111.038214 61.181161) (xy 110.803895 61.243947) (xy 110.579794 61.336773) + (xy 110.579785 61.336777) (xy 110.369706 61.458067) (xy 110.177263 61.605733) (xy 110.177256 61.605739) + (xy 110.005739 61.777256) (xy 110.005733 61.777263) (xy 109.858067 61.969706) (xy 109.736777 62.179785) + (xy 109.736773 62.179794) (xy 109.643947 62.403895) (xy 109.581161 62.638214) (xy 109.5495 62.878711) + (xy 77.108696 62.878711) (xy 77.594519 62.574908) (xy 77.597613 62.573038) (xy 78.729128 61.912139) + (xy 78.732254 61.910376) (xy 79.88321 61.283957) (xy 79.886381 61.282293) (xy 81.055707 60.690934) + (xy 81.058958 60.689351) (xy 82.245594 60.133587) (xy 82.248922 60.132089) (xy 83.451801 59.612419) + (xy 83.455121 59.611043) (xy 84.673203 59.127919) (xy 84.676552 59.126649) (xy 85.908618 58.680554) + (xy 85.912078 58.67936) (xy 87.157057 58.27068) (xy 87.16051 58.269605) (xy 88.417262 57.898714) + (xy 88.420736 57.897745) (xy 89.688095 57.564986) (xy 89.691727 57.564092) (xy 90.968468 57.269784) + (xy 90.972103 57.269004) (xy 92.257141 57.013394) (xy 92.260804 57.012722) (xy 93.553084 56.796023) + (xy 93.556698 56.795473) (xy 94.854862 56.617913) (xy 94.858538 56.617466) (xy 96.161539 56.479189) + (xy 96.16515 56.478861) (xy 97.471766 56.379998) (xy 97.475379 56.379779) (xy 98.784359 56.320427) + (xy 98.788017 56.320317) (xy 100.098146 56.300528) (xy 100.101854 56.300528) ) ) ) diff --git a/esp32-wroom-table-lights/esp32-wroom-table-lights/led-lights-array.kicad_sch b/esp32-wroom-table-lights/esp32-wroom-table-lights/led-lights-array.kicad_sch index 7bd0e7fe..868ae9b3 100644 --- a/esp32-wroom-table-lights/esp32-wroom-table-lights/led-lights-array.kicad_sch +++ b/esp32-wroom-table-lights/esp32-wroom-table-lights/led-lights-array.kicad_sch @@ -5,6 +5,480 @@ (uuid "2485688b-0a71-47a7-8ceb-0c223c4ed6bd") (paper "A4") (lib_symbols + (symbol "Alexander Symbol Library:LED_SMD_5050" + (pin_names hide) + (exclude_from_sim no) + (in_bom yes) + (on_board yes) + (property "Reference" "D" + (at -5.08 6.35 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + ) + ) + (property "Value" "LED_SMD_5050" + (at -5.08 -6.35 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + ) + ) + (property "Footprint" "LED_SMD:LED_Cree-PLCC6_4.7x1.5mm" + (at -5.08 -8.128 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + (hide yes) + ) + ) + (property "Datasheet" "https://www.cree.com/led-components/media/documents/CLS6B-FKW.pdf" + (at -5.08 -10.16 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + (hide yes) + ) + ) + (property "Description" "Cree PLCC6 3 in 1 SMD LED, PLCC-6" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "ki_keywords" "LED RGB" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "ki_fp_filters" "LED*Cree*PLCC*4.7x1.5mm*" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (symbol "LED_SMD_5050_0_0" + (text "B" + (at -0.635 -3.3274 0) + (effects + (font + (size 0.762 0.762) + ) + ) + ) + ) + (symbol "LED_SMD_5050_0_1" + (rectangle + (start -5.08 5.08) + (end 5.08 -5.08) + (stroke + (width 0.254) + (type default) + ) + (fill + (type background) + ) + ) + (polyline + (pts + (xy -5.08 -2.54) (xy 5.08 -2.54) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -5.08 0) (xy 5.08 0) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -5.08 2.54) (xy 5.08 2.54) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -2.794 -1.27) (xy -1.778 -0.254) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -2.794 3.81) (xy -1.778 4.826) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -1.778 -1.27) (xy -0.762 -0.254) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -1.778 3.81) (xy -0.762 4.826) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -1.27 -1.27) (xy -1.27 -3.81) + ) + (stroke + (width 0.254) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -1.27 3.81) (xy -1.27 1.27) + ) + (stroke + (width 0.254) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy 2.286 1.27) (xy 3.302 2.286) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy 3.302 1.27) (xy 4.318 2.286) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy 3.81 1.27) (xy 3.81 -1.27) + ) + (stroke + (width 0.254) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -2.54 4.572) (xy -1.778 4.826) (xy -2.032 4.064) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -2.032 -1.016) (xy -1.778 -0.254) (xy -2.54 -0.508) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -1.524 -0.508) (xy -0.762 -0.254) (xy -1.016 -1.016) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -1.524 4.572) (xy -0.762 4.826) (xy -1.016 4.064) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy 3.048 1.524) (xy 3.302 2.286) (xy 2.54 2.032) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy 3.556 2.032) (xy 4.318 2.286) (xy 4.064 1.524) + ) + (stroke + (width 0) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -3.81 -1.27) (xy -3.81 -3.81) (xy -1.27 -2.54) (xy -3.81 -1.27) + ) + (stroke + (width 0.254) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy -3.81 3.81) (xy -3.81 1.27) (xy -1.27 2.54) (xy -3.81 3.81) + ) + (stroke + (width 0.254) + (type default) + ) + (fill + (type none) + ) + ) + (polyline + (pts + (xy 1.27 1.27) (xy 1.27 -1.27) (xy 3.81 0) (xy 1.27 1.27) + ) + (stroke + (width 0.254) + (type default) + ) + (fill + (type none) + ) + ) + ) + (symbol "LED_SMD_5050_1_0" + (text "B" + (at -0.635 1.8034 0) + (effects + (font + (size 0.762 0.762) + ) + ) + ) + (text "B" + (at 4.4196 -0.7112 0) + (effects + (font + (size 0.762 0.762) + ) + ) + ) + ) + (symbol "LED_SMD_5050_1_1" + (pin passive line + (at -7.62 -2.54 0) + (length 2.54) + (name "AB" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "1" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at -7.62 0 0) + (length 2.54) + (name "KB" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "2" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at -7.62 2.54 0) + (length 2.54) + (name "AR" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "3" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at 7.62 2.54 180) + (length 2.54) + (name "KR" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "4" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at 7.62 -2.54 180) + (length 2.54) + (name "AG" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "5" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at 7.62 0 180) + (length 2.54) + (name "KR" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "6" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + ) + ) (symbol "Device:LED" (pin_numbers hide) (pin_names @@ -392,9 +866,51 @@ ) ) ) + (junction + (at 63.5 38.1) + (diameter 0) + (color 0 0 0 0) + (uuid "03844eed-5a8b-4d64-8e81-7f957a130176") + ) + (junction + (at 45.72 38.1) + (diameter 0) + (color 0 0 0 0) + (uuid "9241e119-8dce-4a75-b856-beb7a40ba603") + ) (wire (pts - (xy 30.48 38.1) (xy 40.64 38.1) + (xy 46.99 40.64) (xy 45.72 40.64) + ) + (stroke + (width 0) + (type default) + ) + (uuid "1fbbfddf-068e-4a57-b149-56551231efa4") + ) + (wire + (pts + (xy 62.23 40.64) (xy 63.5 40.64) + ) + (stroke + (width 0) + (type default) + ) + (uuid "3227349a-382a-4cc7-9d23-2442573b27c3") + ) + (wire + (pts + (xy 45.72 38.1) (xy 46.99 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "359c0d21-cee3-4359-9a21-d4e734b54611") + ) + (wire + (pts + (xy 27.94 38.1) (xy 35.56 38.1) ) (stroke (width 0) @@ -404,33 +920,93 @@ ) (wire (pts - (xy 48.26 38.1) (xy 52.07 38.1) + (xy 63.5 38.1) (xy 67.31 38.1) ) (stroke (width 0) (type default) ) - (uuid "af82a15e-4ee7-4abe-aed5-93cf73547c7d") + (uuid "7f5e249e-53af-499c-8973-9ef949361bbb") ) (wire (pts - (xy 67.31 44.45) (xy 67.31 38.1) + (xy 62.23 35.56) (xy 63.5 35.56) ) (stroke (width 0) (type default) ) - (uuid "c29e6582-b2d0-498e-80b3-9aa4e38fa175") + (uuid "84093b88-09f7-44e4-9b48-722e595b7b9c") ) (wire (pts - (xy 59.69 38.1) (xy 67.31 38.1) + (xy 46.99 35.56) (xy 45.72 35.56) ) (stroke (width 0) (type default) ) - (uuid "fd3cfa47-7263-4b78-a3a3-2d03215f84ed") + (uuid "88711588-9bac-4733-9e3a-e7e8a4289c13") + ) + (wire + (pts + (xy 43.18 38.1) (xy 45.72 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "8ec71e7e-9270-49a9-891f-7998d8568c04") + ) + (wire + (pts + (xy 63.5 40.64) (xy 63.5 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "a2a4a32e-ea3a-4be5-b0a8-1f7a6e97e6a7") + ) + (wire + (pts + (xy 63.5 35.56) (xy 63.5 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "a334706d-b12e-4087-82f4-070ec53be608") + ) + (wire + (pts + (xy 62.23 38.1) (xy 63.5 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "a42683f5-6d3c-4bce-a4e8-f960945406a3") + ) + (wire + (pts + (xy 45.72 40.64) (xy 45.72 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "b83d98ce-029b-4351-b6aa-a8db4c8573f4") + ) + (wire + (pts + (xy 45.72 35.56) (xy 45.72 38.1) + ) + (stroke + (width 0) + (type default) + ) + (uuid "d688ba63-38ab-41f2-bd44-0e9245807abf") ) (rectangle (start 25.4 25.4) @@ -454,19 +1030,8 @@ ) (uuid "9036fa29-996c-439e-bf44-462eebac0f36") ) - (label "GND" - (at 63.5 38.1 0) - (fields_autoplaced yes) - (effects - (font - (size 1.27 1.27) - ) - (justify left bottom) - ) - (uuid "56510378-e305-47fc-985c-cceb8cee80bd") - ) (label "GPIO-N" - (at 30.48 38.1 0) + (at 27.94 38.1 0) (fields_autoplaced yes) (effects (font @@ -476,10 +1041,77 @@ ) (uuid "ae9891e3-9e8b-4351-83eb-413ccfdd7e19") ) + (symbol + (lib_id "Device:LED") + (at 66.04 21.59 180) + (unit 1) + (exclude_from_sim no) + (in_bom yes) + (on_board no) + (dnp no) + (uuid "0f6e7792-e92c-4c6c-b6fd-a7c69621f588") + (property "Reference" "D2" + (at 66.04 15.24 0) + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (property "Value" "5050" + (at 66.04 17.78 0) + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (property "Footprint" "Alexander Footprint Library:LED_5050-6" + (at 66.04 21.59 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "Datasheet" "~" + (at 66.04 21.59 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "Description" "Light emitting diode" + (at 66.04 21.59 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (pin "2" + (uuid "48b78827-3829-44ab-9b0c-cc07b54d4293") + ) + (pin "1" + (uuid "a5b3185d-1ba5-46ad-808c-9ba491ccd8df") + ) + (instances + (project "esp32-wroom-table-lights" + (path "/d3041bbb-21f1-431e-bbf9-53a09e8890bd/d5fc8cf4-d8a2-46b6-9b2c-3f15f2406209" + (reference "D2") + (unit 1) + ) + ) + ) + ) (symbol (lib_name "GND_4") (lib_id "power:GND") - (at 67.31 44.45 0) + (at 67.31 38.1 90) (unit 1) (exclude_from_sim no) (in_bom yes) @@ -488,7 +1120,7 @@ (fields_autoplaced yes) (uuid "10465a58-4f06-493c-b9ae-515cefaf97d3") (property "Reference" "#PWR07" - (at 67.31 50.8 0) + (at 73.66 38.1 0) (effects (font (size 1.27 1.27) @@ -497,17 +1129,17 @@ ) ) (property "Value" "GND" - (at 69.85 45.72 0) + (at 71.12 38.1 90) (effects (font (size 1.27 1.27) (bold yes) ) - (justify left) + (justify right) ) ) (property "Footprint" "" - (at 67.31 44.45 0) + (at 67.31 38.1 0) (effects (font (size 1.27 1.27) @@ -516,7 +1148,7 @@ ) ) (property "Datasheet" "" - (at 67.31 44.45 0) + (at 67.31 38.1 0) (effects (font (size 1.27 1.27) @@ -525,7 +1157,7 @@ ) ) (property "Description" "Power symbol creates a global label with name \"GND\" , ground" - (at 67.31 44.45 0) + (at 67.31 38.1 0) (effects (font (size 1.27 1.27) @@ -546,32 +1178,53 @@ ) ) (symbol - (lib_id "Device:LED") - (at 55.88 38.1 180) + (lib_id "Alexander Symbol Library:LED_SMD_5050") + (at 54.61 38.1 0) (unit 1) (exclude_from_sim no) (in_bom yes) (on_board yes) (dnp no) - (uuid "99a7db5a-c2f2-451f-818c-36ca3e730092") - (property "Reference" "D2" - (at 55.88 31.75 0) + (fields_autoplaced yes) + (uuid "ad649c19-cddb-4b65-877e-a432208f49c9") + (property "Reference" "D3" + (at 54.61 27.94 0) (effects (font (size 1.27 1.27) ) ) ) - (property "Value" "5050" - (at 55.88 34.29 0) + (property "Value" "LED-5050" + (at 54.61 30.48 0) (effects (font (size 1.27 1.27) ) ) ) - (property "Footprint" "Alexander Footprint Library:LED_5050-6" - (at 55.88 38.1 0) + (property "Footprint" "LED_SMD:LED_Cree-PLCC6_4.7x1.5mm" + (at 49.53 46.228 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + (hide yes) + ) + ) + (property "Datasheet" "https://www.cree.com/led-components/media/documents/CLS6B-FKW.pdf" + (at 49.53 48.26 0) + (effects + (font + (size 1.27 1.27) + ) + (justify left) + (hide yes) + ) + ) + (property "Description" "Cree PLCC6 3 in 1 SMD LED, PLCC-6" + (at 54.61 38.1 0) (effects (font (size 1.27 1.27) @@ -579,34 +1232,28 @@ (hide yes) ) ) - (property "Datasheet" "~" - (at 55.88 38.1 0) - (effects - (font - (size 1.27 1.27) - ) - (hide yes) - ) - ) - (property "Description" "Light emitting diode" - (at 55.88 38.1 0) - (effects - (font - (size 1.27 1.27) - ) - (hide yes) - ) - ) - (pin "2" - (uuid "4e2cc3bc-ad66-4488-9d92-31b4b45add10") + (pin "4" + (uuid "f4d2a18b-941d-4871-a125-810aab10ea9a") ) (pin "1" - (uuid "323b10e6-8ab8-453c-9c22-6d8d34d73657") + (uuid "a86553be-a4e0-42d7-83de-f59ead1d1f45") + ) + (pin "2" + (uuid "37fdd57a-7ca7-4bfa-94b3-ac51ba3e1768") + ) + (pin "3" + (uuid "7b4bdc65-c60c-4b20-be3a-d2019be3b943") + ) + (pin "5" + (uuid "afe33e05-ee77-4d15-98aa-4cfc86136fde") + ) + (pin "6" + (uuid "6b324e5f-2b5c-4920-baa1-47ff80548f73") ) (instances - (project "esp32-wroom-table-lights" + (project "" (path "/d3041bbb-21f1-431e-bbf9-53a09e8890bd/d5fc8cf4-d8a2-46b6-9b2c-3f15f2406209" - (reference "D2") + (reference "D3") (unit 1) ) ) @@ -614,7 +1261,7 @@ ) (symbol (lib_id "Device:R") - (at 44.45 38.1 270) + (at 39.37 38.1 270) (unit 1) (exclude_from_sim no) (in_bom yes) @@ -622,7 +1269,7 @@ (dnp no) (uuid "e26efeca-c85d-48bb-a458-dcb8f4450196") (property "Reference" "R1" - (at 44.45 31.75 90) + (at 39.37 31.75 90) (effects (font (size 1.27 1.27) @@ -630,7 +1277,7 @@ ) ) (property "Value" "R" - (at 44.45 34.29 90) + (at 39.37 34.29 90) (effects (font (size 1.27 1.27) @@ -638,7 +1285,7 @@ ) ) (property "Footprint" "Resistor_SMD:R_1206_3216Metric_Pad1.30x1.75mm_HandSolder" - (at 44.45 36.322 90) + (at 39.37 36.322 90) (effects (font (size 1.27 1.27) @@ -647,7 +1294,7 @@ ) ) (property "Datasheet" "~" - (at 44.45 38.1 0) + (at 39.37 38.1 0) (effects (font (size 1.27 1.27) @@ -656,7 +1303,7 @@ ) ) (property "Description" "Resistor" - (at 44.45 38.1 0) + (at 39.37 38.1 0) (effects (font (size 1.27 1.27)