Seperate EPD_RESET signal

1 files changed, 230 insertions, 423 deletions

diff --git a/laser-tag badge v2/laser-tag.kicad_pcb b/laser-tag badge v2/laser-tag.kicad_pcb
index 290c251..76350f3 100644
--- a/laser-tag badge v2/laser-tag.kicad_pcb
+++ b/laser-tag badge v2/laser-tag.kicad_pcb
@@ -172,8 +172,8 @@
   (net 82 "/USB0_D-")
   (net 83 "Net-(R2-Pad1)")
   (net 84 "Net-(LD1-Pad2)")
-  (net 85 "unconnected-(U1-Pad18)")
-  (net 86 "unconnected-(U1-Pad33)")
+  (net 85 "unconnected-(U1-Pad33)")
+  (net 86 "EPD_RESET")
 
   (footprint "Capacitor_SMD:C_0603_1608Metric_Pad1.08x0.95mm_HandSolder" placed (layer "F.Cu")
     (tedit 5F68FEEF) (tstamp 10089ee3-9e04-4e15-86f8-ce21a1e1ccea)
@@ -524,7 +524,7 @@
     (pad "17" smd roundrect (at -0.75 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 40 "SWD_CLK") (pinfunction "PTA0") (pintype "bidirectional") (tstamp 22699765-963e-4227-82c6-dd7c582b18b5))
     (pad "18" smd roundrect (at -0.25 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 85 "unconnected-(U1-Pad18)") (pinfunction "PTA1") (pintype "bidirectional+no_connect") (tstamp eb9f678f-fdc9-4d97-b262-1f1af980de62))
+      (net 86 "EPD_RESET") (pinfunction "PTA1") (pintype "bidirectional") (tstamp eb9f678f-fdc9-4d97-b262-1f1af980de62))
     (pad "19" smd roundrect (at 0.25 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 57 "TX") (pinfunction "PTA2") (pintype "bidirectional") (tstamp 1e822eb0-b2a0-43bf-9f29-09555a63277a))
     (pad "20" smd roundrect (at 0.75 3.4375) (size 0.25 0.875) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -554,7 +554,7 @@
     (pad "32" smd roundrect (at 3.4375 -0.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 78 "unconnected-(U1-Pad32)") (pinfunction "PTB17") (pintype "bidirectional+no_connect") (tstamp b9ae4894-5063-4577-a2a8-36709f12ec9a))
     (pad "33" smd roundrect (at 3.4375 -1.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
-      (net 86 "unconnected-(U1-Pad33)") (pinfunction "PTC0") (pintype "bidirectional+no_connect") (tstamp b49add4e-9c91-49a6-a05e-8bd537732e38))
+      (net 85 "unconnected-(U1-Pad33)") (pinfunction "PTC0") (pintype "bidirectional+no_connect") (tstamp b49add4e-9c91-49a6-a05e-8bd537732e38))
     (pad "34" smd roundrect (at 3.4375 -1.75) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
       (net 66 "SW1") (pinfunction "PTC1/LLWU_P6/RTC_CLKIN") (pintype "bidirectional") (tstamp 4c7d1788-dd0a-437f-be83-e3fe181cdb79))
     (pad "35" smd roundrect (at 3.4375 -2.25) (size 0.875 0.25) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25)
@@ -1953,7 +1953,7 @@
     (pad "6" smd rect (at 7.25 1.35 90) (size 0.3 1.1) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 49 "SPI_MISO") (pinfunction "SO") (pintype "output") (tstamp 6b914fbc-a32c-4a69-834c-4b39dc2e4eeb))
     (pad "7" smd rect (at 6.75 1.35 90) (size 0.3 1.1) (layers "B.Cu" "B.Paste" "B.Mask")
-      (net 43 "RESET") (pinfunction "/RESET") (pintype "input") (tstamp 8e7e6273-65c4-4a96-a9fb-8b3222e995d0))
+      (net 86 "EPD_RESET") (pinfunction "/RESET") (pintype "input") (tstamp 8e7e6273-65c4-4a96-a9fb-8b3222e995d0))
     (pad "8" smd rect (at 6.25 1.35 90) (size 0.3 1.1) (layers "B.Cu" "B.Paste" "B.Mask")
       (net 50 "unconnected-(P1-Pad8)") (pinfunction "PWRON") (pintype "no_connect") (tstamp 9b90187e-c5a8-42eb-82c7-33b1d737fcf6))
     (pad "9" smd rect (at 5.75 1.35 90) (size 0.3 1.1) (layers "B.Cu" "B.Paste" "B.Mask")
@@ -3529,19 +3529,16 @@
   (segment (start 125.857 118.11) (end 125.577 117.83) (width 0.25) (layer "F.Cu") (net 43) (tstamp 28c99613-b390-4ea5-934f-1e621afabe49))
   (segment (start 125.577 117.83) (end 120.2875 117.83) (width 0.25) (layer "F.Cu") (net 43) (tstamp e41a9310-5ce5-4d24-a35c-b2e9952c1018))
   (via (at 125.857 118.11) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 43) (tstamp 15edc24a-070f-4509-b3f8-3047c0dc714d))
+  (segment (start 78.359 80.33) (end 81.28 83.251) (width 0.25) (layer "B.Cu") (net 43) (tstamp 081c506c-0172-48ec-99dd-c405dd34bec9))
   (segment (start 125.349 123.19) (end 125.857 122.682) (width 0.25) (layer "B.Cu") (net 43) (tstamp 099fef22-4711-484d-8e9f-e31af48b250e))
   (segment (start 125.857 122.682) (end 125.857 118.11) (width 0.25) (layer "B.Cu") (net 43) (tstamp 0ba47826-bd5f-43b5-a63d-0d1805b4cd62))
   (segment (start 97.155 123.19) (end 125.349 123.19) (width 0.25) (layer "B.Cu") (net 43) (tstamp 21fc9ee1-41a8-4ceb-850d-f30bce8a4583))
-  (segment (start 78.359 69.141) (end 80.285 67.215) (width 0.25) (layer "B.Cu") (net 43) (tstamp 5484cb06-25b4-48e6-8a91-259b5d05f7fb))
-  (segment (start 96.403 123.942) (end 97.155 123.19) (width 0.25) (layer "B.Cu") (net 43) (tstamp 56bb57a6-837a-4331-9a62-b1bbca2232ef))
-  (segment (start 81.28 117.348) (end 87.874 123.942) (width 0.25) (layer "B.Cu") (net 43) (tstamp 57412ec8-5f3f-4b39-a426-f27b52d806d8))
-  (segment (start 81.28 86.36) (end 81.28 117.348) (width 0.25) (layer "B.Cu") (net 43) (tstamp 5b11d73a-849e-4792-a67b-abdc9c754f10))
-  (segment (start 82.8345 84.8055) (end 81.28 86.36) (width 0.25) (layer "B.Cu") (net 43) (tstamp 70c5ae66-de23-4650-bd2e-d9790a8eafdd))
-  (segment (start 85.678 86.849) (end 84.878 86.849) (width 0.25) (layer "B.Cu") (net 43) (tstamp 7ca22aa3-84f2-4dc9-8579-5072934d6dae))
-  (segment (start 87.874 123.942) (end 96.403 123.942) (width 0.25) (layer "B.Cu") (net 43) (tstamp 868c9453-d084-4227-a00f-9f5cfab4c77d))
-  (segment (start 82.8345 84.8055) (end 78.359 80.33) (width 0.25) (layer "B.Cu") (net 43) (tstamp 8f3fa211-b6db-4b37-996a-02e28b769037))
-  (segment (start 84.878 86.849) (end 82.8345 84.8055) (width 0.25) (layer "B.Cu") (net 43) (tstamp b62e1228-3ffb-4033-8768-8c9e1788a1e3))
-  (segment (start 78.359 80.33) (end 78.359 69.141) (width 0.25) (layer "B.Cu") (net 43) (tstamp c379fba3-5871-4eb7-8d8b-9faf60611da8))
+  (segment (start 81.28 83.251) (end 81.28 117.348) (width 0.25) (layer "B.Cu") (net 43) (tstamp 326f4f36-aecb-4cab-9c0f-49aa6578da47))
+  (segment (start 80.285 67.215) (end 78.359 69.141) (width 0.25) (layer "B.Cu") (net 43) (tstamp 52be02cb-9370-4640-8005-5fd6a0527f60))
+  (segment (start 78.359 69.141) (end 78.359 80.33) (width 0.25) (layer "B.Cu") (net 43) (tstamp a4f1390d-8966-4b45-ac4a-965ba0060a09))
+  (segment (start 81.28 117.348) (end 87.874 123.942) (width 0.25) (layer "B.Cu") (net 43) (tstamp b04ec4b2-1cf3-4bca-8d2b-deb2ed3a42c6))
+  (segment (start 87.874 123.942) (end 96.403 123.942) (width 0.25) (layer "B.Cu") (net 43) (tstamp c089a957-e756-499f-b7d4-df3caa16095c))
+  (segment (start 96.403 123.942) (end 97.155 123.19) (width 0.25) (layer "B.Cu") (net 43) (tstamp f20c405f-c876-49bd-bde3-e8270a0ef67b))
   (segment (start 80.285 67.215) (end 86.085 67.215) (width 0.25) (layer "B.Cu") (net 43) (tstamp fa435435-d35c-4986-95f5-864881f85096))
   (segment (start 137.668 120.142) (end 139.446 120.142) (width 0.25) (layer "F.Cu") (net 44) (tstamp 11dc0f93-9dfb-4e50-a289-3c6a1e57088f))
   (segment (start 139.446 120.142) (end 140.208 120.904) (width 0.25) (layer "F.Cu") (net 44) (tstamp 91f6359e-57a3-4eca-a249-275845658733))
@@ -3738,6 +3735,16 @@
   (segment (start 85.09 139.7) (end 86.487 141.097) (width 0.25) (layer "F.Cu") (net 84) (tstamp 7b2a2ac6-c591-4b3d-b298-952f9763ad4e))
   (segment (start 90.5 136.55) (end 88.24 136.55) (width 0.25) (layer "F.Cu") (net 84) (tstamp 8891c416-f7b4-49df-90cc-9e7d21b7b988))
   (segment (start 88.24 136.55) (end 85.09 139.7) (width 0.25) (layer "F.Cu") (net 84) (tstamp a6c33eec-2436-4140-8b4f-8a7d6c8822f0))
+  (segment (start 116.6 119.9) (end 112 124.5) (width 0.25) (layer "F.Cu") (net 86) (tstamp 0f906a62-ddca-4bca-a3f7-57cdc459dd2d))
+  (segment (start 94.25 124.5) (end 93 123.25) (width 0.25) (layer "F.Cu") (net 86) (tstamp 30f448e5-f5ba-4ba4-9f7b-40b119f75580))
+  (segment (start 116.6 119.0175) (end 116.6 119.9) (width 0.25) (layer "F.Cu") (net 86) (tstamp 3bfea8de-0e34-4168-8601-3998871b83db))
+  (segment (start 112 124.5) (end 94.25 124.5) (width 0.25) (layer "F.Cu") (net 86) (tstamp ee424dbe-871e-45d6-80d7-ddb286890bc2))
+  (via (at 93 123.25) (size 0.8) (drill 0.4) (layers "F.Cu" "B.Cu") (net 86) (tstamp 4ed924a1-9879-4335-b2a8-fe2dd8733d5f))
+  (segment (start 84.878 86.849) (end 85.678 86.849) (width 0.25) (layer "B.Cu") (net 86) (tstamp 05c49892-ea61-4059-8476-d2ae15cde65a))
+  (segment (start 81.75 89.977) (end 84.878 86.849) (width 0.25) (layer "B.Cu") (net 86) (tstamp 24b91055-954c-4366-a644-0c2e6364e670))
+  (segment (start 88 123.25) (end 81.75 117) (width 0.25) (layer "B.Cu") (net 86) (tstamp 64ccb44c-5078-40fd-ab40-30dab8444440))
+  (segment (start 93 123.25) (end 88 123.25) (width 0.25) (layer "B.Cu") (net 86) (tstamp b988b515-0ecd-4989-b558-926716c6b89e))
+  (segment (start 81.75 117) (end 81.75 89.977) (width 0.25) (layer "B.Cu") (net 86) (tstamp c148333f-b41c-44a6-b69f-b37c62389fae))
 
   (zone (net 1) (net_name "GND") (layer "B.Cu") (tstamp 7e2d9e43-5ea1-41f7-b60f-26c085136de1) (hatch edge 0.508)
     (priority 6)
@@ -4654,7 +4661,7 @@
         (xy 79.336987 106.971367)
         (xy 79.336989 106.971362)
         (xy 79.338855 106.968393)
-        (xy 79.355102 106.921963)
+        (xy 79.371961 106.873783)
         (xy 79.386856 106.831216)
         (xy 79.386857 106.831211)
         (xy 79.388014 106.827905)
@@ -4726,18 +4733,8 @@
         (xy 78.182074 80.515462)
         (xy 78.192926 80.522713)
         (xy 78.202397 80.530486)
-        (xy 82.433217 84.761306)
-        (xy 82.451523 84.8055)
-        (xy 82.433217 84.849694)
-        (xy 81.123397 86.159514)
-        (xy 81.113926 86.167287)
-        (xy 81.097957 86.177957)
-        (xy 81.04215 86.261479)
-        (xy 81.04215 86.26148)
-        (xy 81.022552 86.36)
-        (xy 81.023753 86.366037)
-        (xy 81.026299 86.378836)
-        (xy 81.0275 86.39103)
+        (xy 81.009194 83.337283)
+        (xy 81.0275 83.381477)
         (xy 81.0275 117.31697)
         (xy 81.026299 117.329163)
         (xy 81.022552 117.348)
@@ -4780,7 +4777,7 @@
         (xy 97.504804 123.716497)
         (xy 97.507669 123.71405)
         (xy 97.507672 123.714048)
-        (xy 97.617432 123.620303)
+        (xy 97.592136 123.641908)
         (xy 97.620294 123.617859)
         (xy 97.622489 123.614804)
         (xy 97.622492 123.614801)
@@ -4806,7 +4803,9 @@
         (xy 126.033926 122.867462)
         (xy 126.039043 122.864043)
         (xy 126.09485 122.780521)
-        (xy 126.1095 122.70687)
+        (xy 126.10369 122.736077)
+        (xy 126.113246 122.688039)
+        (xy 126.113246 122.688038)
         (xy 126.114447 122.682)
         (xy 126.110701 122.663168)
         (xy 126.1095 122.650975)
@@ -4961,6 +4960,8 @@
         (xy 123.216386 122.794051)
         (xy 123.216388 122.79405)
         (xy 123.222421 122.79285)
+        (xy 123.230186 122.787662)
+        (xy 123.300826 122.740462)
         (xy 123.305943 122.737043)
         (xy 123.316613 122.721074)
         (xy 123.324386 122.711603)
@@ -6030,7 +6031,7 @@
         (xy 92.967499 89.897906)
         (xy 92.956939 89.826163)
         (xy 92.954799 89.821803)
-        (xy 92.905921 89.722253)
+        (xy 92.944753 89.801342)
         (xy 92.903385 89.717087)
         (xy 92.899732 89.71344)
         (xy 92.821042 89.634887)
@@ -6251,9 +6252,6 @@
         (xy 92.900113 84.911042)
         (xy 92.900115 84.91104)
         (xy 92.903761 84.907387)
-        (xy 92.931962 84.849694)
-        (xy 92.954993 84.802578)
-        (xy 92.954993 84.802577)
         (xy 92.957124 84.798218)
         (xy 92.9675 84.727095)
         (xy 92.967499 84.182906)
@@ -6311,9 +6309,6 @@
         (xy 91.175113 84.911042)
         (xy 91.175115 84.91104)
         (xy 91.178761 84.907387)
-        (xy 91.206962 84.849694)
-        (xy 91.229993 84.802578)
-        (xy 91.229993 84.802577)
         (xy 91.232124 84.798218)
         (xy 91.2425 84.727095)
         (xy 91.242499 84.182906)
@@ -6367,7 +6362,7 @@
         (xy 90.912094 83.152499)
         (xy 90.983837 83.141939)
         (xy 91.092913 83.088385)
-        (xy 91.100873 83.080411)
+        (xy 91.107199 83.074074)
         (xy 91.175113 83.006042)
         (xy 91.175115 83.00604)
         (xy 91.178761 83.002387)
@@ -6920,20 +6915,39 @@
         (xy 85.027606 86.111194)
         (xy 85.018274 86.133723)
         (xy 85.007898 86.149252)
-        (xy 85.006698 86.155285)
-        (xy 85.006697 86.155287)
-        (xy 85.00431 86.167287)
         (xy 85.0005 86.186442)
-        (xy 85.0005 86.463523)
-        (xy 84.982194 86.507717)
-        (xy 84.938 86.526023)
-        (xy 84.893806 86.507717)
-        (xy 83.034986 84.648897)
-        (xy 83.027213 84.639426)
-        (xy 83.019962 84.628574)
-        (xy 83.016543 84.623457)
-        (xy 83.000574 84.612787)
-        (xy 82.991103 84.605014)
+        (xy 85.0005 86.511558)
+        (xy 85.001098 86.514565)
+        (xy 85.001099 86.514573)
+        (xy 85.002538 86.521804)
+        (xy 84.993209 86.56872)
+        (xy 84.953436 86.595298)
+        (xy 84.94124 86.5965)
+        (xy 84.90903 86.5965)
+        (xy 84.896836 86.595299)
+        (xy 84.896831 86.595298)
+        (xy 84.878 86.591552)
+        (xy 84.79995 86.607078)
+        (xy 84.779479 86.61115)
+        (xy 84.695957 86.666957)
+        (xy 84.692538 86.672074)
+        (xy 84.685287 86.682926)
+        (xy 84.677514 86.692397)
+        (xy 81.639194 89.730717)
+        (xy 81.595 89.749023)
+        (xy 81.550806 89.730717)
+        (xy 81.5325 89.686523)
+        (xy 81.5325 83.28203)
+        (xy 81.533701 83.269836)
+        (xy 81.536247 83.257037)
+        (xy 81.537448 83.251)
+        (xy 81.51785 83.15248)
+        (xy 81.51785 83.152479)
+        (xy 81.510808 83.141939)
+        (xy 81.465462 83.074074)
+        (xy 81.462043 83.068957)
+        (xy 81.446074 83.058287)
+        (xy 81.436603 83.050514)
         (xy 78.629806 80.243717)
         (xy 78.6115 80.199523)
         (xy 78.6115 72.019809)
@@ -10269,362 +10283,6 @@
     (filled_polygon
       (layer "B.Cu")
       (pts
-        (xy 82.878694 85.206783)
-        (xy 84.677514 87.005603)
-        (xy 84.685287 87.015074)
-        (xy 84.695957 87.031043)
-        (xy 84.701074 87.034462)
-        (xy 84.756506 87.0715)
-        (xy 84.77436 87.08343)
-        (xy 84.774362 87.083431)
-        (xy 84.779479 87.08685)
-        (xy 84.878 87.106447)
-        (xy 84.896832 87.102701)
-        (xy 84.909025 87.1015)
-        (xy 84.94124 87.1015)
-        (xy 84.985434 87.119806)
-        (xy 85.00374 87.164)
-        (xy 85.002538 87.176196)
-        (xy 85.001099 87.183427)
-        (xy 85.001099 87.183431)
-        (xy 85.0005 87.186442)
-        (xy 85.0005 87.511558)
-        (xy 85.007898 87.548748)
-        (xy 85.011317 87.553865)
-        (xy 85.018274 87.564277)
-        (xy 85.027606 87.611194)
-        (xy 85.018274 87.633723)
-        (xy 85.007898 87.649252)
-        (xy 85.006698 87.655285)
-        (xy 85.006697 87.655287)
-        (xy 85.003162 87.673061)
-        (xy 85.0005 87.686442)
-        (xy 85.0005 88.011558)
-        (xy 85.007898 88.048748)
-        (xy 85.011317 88.053865)
-        (xy 85.018274 88.064277)
-        (xy 85.027606 88.111194)
-        (xy 85.018274 88.133723)
-        (xy 85.007898 88.149252)
-        (xy 85.0005 88.186442)
-        (xy 85.0005 88.511558)
-        (xy 85.001099 88.514569)
-        (xy 85.006483 88.541634)
-        (xy 85.007898 88.548748)
-        (xy 85.011317 88.553865)
-        (xy 85.018274 88.564277)
-        (xy 85.027606 88.611194)
-        (xy 85.018274 88.633723)
-        (xy 85.007898 88.649252)
-        (xy 85.0005 88.686442)
-        (xy 85.0005 89.011558)
-        (xy 85.007898 89.048748)
-        (xy 85.011317 89.053865)
-        (xy 85.018274 89.064277)
-        (xy 85.027606 89.111194)
-        (xy 85.018274 89.133723)
-        (xy 85.007898 89.149252)
-        (xy 85.0005 89.186442)
-        (xy 85.0005 89.511558)
-        (xy 85.007898 89.548748)
-        (xy 85.011317 89.553865)
-        (xy 85.018274 89.564277)
-        (xy 85.027606 89.611194)
-        (xy 85.018274 89.633723)
-        (xy 85.007898 89.649252)
-        (xy 85.0005 89.686442)
-        (xy 85.0005 90.011558)
-        (xy 85.007898 90.048748)
-        (xy 85.011317 90.053865)
-        (xy 85.018274 90.064277)
-        (xy 85.027606 90.111194)
-        (xy 85.018274 90.133723)
-        (xy 85.007898 90.149252)
-        (xy 85.0005 90.186442)
-        (xy 85.0005 90.511558)
-        (xy 85.007898 90.548748)
-        (xy 85.011317 90.553865)
-        (xy 85.018274 90.564277)
-        (xy 85.027606 90.611194)
-        (xy 85.018274 90.633723)
-        (xy 85.007898 90.649252)
-        (xy 85.0005 90.686442)
-        (xy 85.0005 91.011558)
-        (xy 85.007898 91.048748)
-        (xy 85.011317 91.053865)
-        (xy 85.018274 91.064277)
-        (xy 85.027606 91.111194)
-        (xy 85.018274 91.133723)
-        (xy 85.011317 91.144135)
-        (xy 85.007898 91.149252)
-        (xy 85.0005 91.186442)
-        (xy 85.0005 91.511558)
-        (xy 85.001099 91.514569)
-        (xy 85.00541 91.536239)
-        (xy 85.007898 91.548748)
-        (xy 85.011317 91.553865)
-        (xy 85.018274 91.564277)
-        (xy 85.027606 91.611194)
-        (xy 85.018274 91.633723)
-        (xy 85.007898 91.649252)
-        (xy 85.0005 91.686442)
-        (xy 85.0005 92.011558)
-        (xy 85.007898 92.048748)
-        (xy 85.011317 92.053865)
-        (xy 85.018274 92.064277)
-        (xy 85.027606 92.111194)
-        (xy 85.018274 92.133723)
-        (xy 85.007898 92.149252)
-        (xy 85.0005 92.186442)
-        (xy 85.0005 92.511558)
-        (xy 85.007898 92.548748)
-        (xy 85.011317 92.553865)
-        (xy 85.018274 92.564277)
-        (xy 85.027606 92.611194)
-        (xy 85.018274 92.633723)
-        (xy 85.007898 92.649252)
-        (xy 85.006698 92.655285)
-        (xy 85.006697 92.655287)
-        (xy 85.004239 92.667646)
-        (xy 85.0005 92.686442)
-        (xy 85.0005 93.011558)
-        (xy 85.007898 93.048748)
-        (xy 85.011317 93.053865)
-        (xy 85.018274 93.064277)
-        (xy 85.027606 93.111194)
-        (xy 85.018274 93.133723)
-        (xy 85.007898 93.149252)
-        (xy 85.006698 93.155285)
-        (xy 85.006697 93.155287)
-        (xy 85.001506 93.181384)
-        (xy 85.0005 93.186442)
-        (xy 85.0005 93.511558)
-        (xy 85.001099 93.514569)
-        (xy 85.004617 93.532253)
-        (xy 85.007898 93.548748)
-        (xy 85.011317 93.553865)
-        (xy 85.018274 93.564277)
-        (xy 85.027606 93.611194)
-        (xy 85.018274 93.633723)
-        (xy 85.007898 93.649252)
-        (xy 85.0005 93.686442)
-        (xy 85.0005 94.011558)
-        (xy 85.007898 94.048748)
-        (xy 85.011317 94.053865)
-        (xy 85.018274 94.064277)
-        (xy 85.027606 94.111194)
-        (xy 85.018274 94.133723)
-        (xy 85.007898 94.149252)
-        (xy 85.0005 94.186442)
-        (xy 85.0005 94.511558)
-        (xy 85.007898 94.548748)
-        (xy 85.011317 94.553865)
-        (xy 85.018274 94.564277)
-        (xy 85.027606 94.611194)
-        (xy 85.018274 94.633723)
-        (xy 85.007898 94.649252)
-        (xy 85.0005 94.686442)
-        (xy 85.0005 95.011558)
-        (xy 85.001099 95.014569)
-        (xy 85.003045 95.02435)
-        (xy 85.007898 95.048748)
-        (xy 85.011317 95.053865)
-        (xy 85.018274 95.064277)
-        (xy 85.027606 95.111194)
-        (xy 85.018274 95.133723)
-        (xy 85.007898 95.149252)
-        (xy 85.0005 95.186442)
-        (xy 85.0005 95.511558)
-        (xy 85.007898 95.548748)
-        (xy 85.011317 95.553865)
-        (xy 85.018274 95.564277)
-        (xy 85.027606 95.611194)
-        (xy 85.018274 95.633723)
-        (xy 85.007898 95.649252)
-        (xy 85.0005 95.686442)
-        (xy 85.0005 96.011558)
-        (xy 85.001099 96.014569)
-        (xy 85.003824 96.028266)
-        (xy 85.007898 96.048748)
-        (xy 85.011317 96.053865)
-        (xy 85.018274 96.064277)
-        (xy 85.027606 96.111194)
-        (xy 85.018274 96.133723)
-        (xy 85.007898 96.149252)
-        (xy 85.006698 96.155285)
-        (xy 85.006697 96.155287)
-        (xy 85.001506 96.181384)
-        (xy 85.0005 96.186442)
-        (xy 85.0005 96.511558)
-        (xy 85.007898 96.548748)
-        (xy 85.011317 96.553865)
-        (xy 85.018274 96.564277)
-        (xy 85.027606 96.611194)
-        (xy 85.018274 96.633723)
-        (xy 85.007898 96.649252)
-        (xy 85.0005 96.686442)
-        (xy 85.0005 97.011558)
-        (xy 85.007898 97.048748)
-        (xy 85.011317 97.053865)
-        (xy 85.018274 97.064277)
-        (xy 85.027606 97.111194)
-        (xy 85.018274 97.133723)
-        (xy 85.007898 97.149252)
-        (xy 85.0005 97.186442)
-        (xy 85.0005 97.511558)
-        (xy 85.001099 97.514569)
-        (xy 85.002214 97.520172)
-        (xy 85.007898 97.548748)
-        (xy 85.011317 97.553865)
-        (xy 85.018274 97.564277)
-        (xy 85.027606 97.611194)
-        (xy 85.018274 97.633723)
-        (xy 85.007898 97.649252)
-        (xy 85.0005 97.686442)
-        (xy 85.0005 98.011558)
-        (xy 85.001098 98.014565)
-        (xy 85.001099 98.014573)
-        (xy 85.002538 98.021804)
-        (xy 84.993209 98.06872)
-        (xy 84.953436 98.095298)
-        (xy 84.94124 98.0965)
-        (xy 84.90903 98.0965)
-        (xy 84.896836 98.095299)
-        (xy 84.896831 98.095298)
-        (xy 84.878 98.091552)
-        (xy 84.871962 98.092753)
-        (xy 84.859163 98.095299)
-        (xy 84.779479 98.11115)
-        (xy 84.695957 98.166957)
-        (xy 84.692538 98.172074)
-        (xy 84.685287 98.182926)
-        (xy 84.677514 98.192397)
-        (xy 82.019397 100.850514)
-        (xy 82.009926 100.858287)
-        (xy 81.993957 100.868957)
-        (xy 81.93815 100.952479)
-        (xy 81.93695 100.958512)
-        (xy 81.936949 100.958514)
-        (xy 81.935105 100.967786)
-        (xy 81.927009 101.008488)
-        (xy 81.918552 101.051)
-        (xy 81.919753 101.057037)
-        (xy 81.922299 101.069836)
-        (xy 81.9235 101.08203)
-        (xy 81.9235 106.55247)
-        (xy 81.922299 106.564663)
-        (xy 81.918552 106.5835)
-        (xy 81.929219 106.637124)
-        (xy 81.93815 106.682021)
-        (xy 81.993957 106.765543)
-        (xy 81.999074 106.768962)
-        (xy 82.009926 106.776213)
-        (xy 82.019397 106.783986)
-        (xy 85.247012 110.0116)
-        (xy 85.254785 110.021071)
-        (xy 85.265457 110.037043)
-        (xy 85.348979 110.09285)
-        (xy 85.355012 110.09405)
-        (xy 85.355014 110.094051)
-        (xy 85.364286 110.095895)
-        (xy 85.422626 110.1075)
-        (xy 85.4475 110.112448)
-        (xy 85.466337 110.108701)
-        (xy 85.47853 110.1075)
-        (xy 86.045643 110.1075)
-        (xy 86.089837 110.125806)
-        (xy 86.107477 110.160899)
-        (xy 86.113061 110.198837)
-        (xy 86.166615 110.307913)
-        (xy 86.170267 110.311559)
-        (xy 86.170268 110.31156)
-        (xy 86.248958 110.390113)
-        (xy 86.24896 110.390115)
-        (xy 86.252613 110.393761)
-        (xy 86.257253 110.396029)
-        (xy 86.357026 110.444799)
-        (xy 86.361782 110.447124)
-        (xy 86.366585 110.447825)
-        (xy 86.366586 110.447825)
-        (xy 86.386709 110.450761)
-        (xy 86.432905 110.4575)
-        (xy 86.716748 110.4575)
-        (xy 87.002094 110.457499)
-        (xy 87.073837 110.446939)
-        (xy 87.182913 110.393385)
-        (xy 87.18656 110.389732)
-        (xy 87.265113 110.311042)
-        (xy 87.265115 110.31104)
-        (xy 87.268761 110.307387)
-        (xy 87.322124 110.198218)
-        (xy 87.3325 110.127095)
-        (xy 87.332499 109.582906)
-        (xy 87.321939 109.511163)
-        (xy 87.268385 109.402087)
-        (xy 87.264732 109.39844)
-        (xy 87.186042 109.319887)
-        (xy 87.18604 109.319885)
-        (xy 87.182387 109.316239)
-        (xy 87.137161 109.294132)
-        (xy 87.077578 109.265007)
-        (xy 87.077577 109.265007)
-        (xy 87.073218 109.262876)
-        (xy 87.068415 109.262175)
-        (xy 87.068414 109.262175)
-        (xy 87.048291 109.259239)
-        (xy 87.002095 109.2525)
-        (xy 86.718252 109.2525)
-        (xy 86.432906 109.252501)
-        (xy 86.361163 109.263061)
-        (xy 86.252087 109.316615)
-        (xy 86.248441 109.320267)
-        (xy 86.24844 109.320268)
-        (xy 86.169887 109.398958)
-        (xy 86.169885 109.39896)
-        (xy 86.166239 109.402613)
-        (xy 86.163971 109.407253)
-        (xy 86.145815 109.444397)
-        (xy 86.112876 109.511782)
-        (xy 86.112175 109.516585)
-        (xy 86.112175 109.516586)
-        (xy 86.107443 109.549023)
-        (xy 86.082949 109.590111)
-        (xy 86.045598 109.6025)
-        (xy 85.577976 109.6025)
-        (xy 85.533782 109.584194)
-        (xy 82.446806 106.497217)
-        (xy 82.4285 106.453023)
-        (xy 82.4285 106.359)
-        (xy 82.446806 106.314806)
-        (xy 82.491 106.2965)
-        (xy 85.540558 106.2965)
-        (xy 85.545616 106.295494)
-        (xy 85.571713 106.290303)
-        (xy 85.571715 106.290302)
-        (xy 85.577748 106.289102)
-        (xy 85.619922 106.260922)
-        (xy 85.648102 106.218748)
-        (xy 85.649956 106.209431)
-        (xy 85.654901 106.184569)
-        (xy 85.6555 106.181558)
-        (xy 85.6555 103.856442)
-        (xy 85.648102 103.819252)
-        (xy 85.619922 103.777078)
-        (xy 85.577748 103.748898)
-        (xy 85.571712 103.747697)
-        (xy 85.569406 103.746742)
-        (xy 85.535581 103.712918)
-        (xy 85.535582 103.665082)
-        (xy 85.569406 103.631257)
-        (xy 85.593324 103.6265)
-        (xy 86.240558 103.6265)
-        (xy 86.245616 103.625494)
-        (xy 86.271713 103.620303)
-        (xy 86.271715 103.620302)
-        (xy 86.277748 103.619102)
-        (xy 86.288326 103.612034)
-        (xy 86.32305 103.6015)
-        (xy 86.708523 103.6015)
         (xy 86.752717 103.619806)
         (xy 88.271694 105.138783)
         (xy 88.29 105.182977)
@@ -11470,9 +11128,54 @@
         (xy 95.197282 123.641908)
         (xy 95.168963 123.68046)
         (xy 95.136586 123.6895)
-        (xy 88.004477 123.6895)
-        (xy 87.960283 123.671194)
-        (xy 86.371141 122.082052)
+        (xy 93.454398 123.6895)
+        (xy 93.410204 123.671194)
+        (xy 93.391898 123.627)
+        (xy 93.404813 123.588952)
+        (xy 93.458278 123.519275)
+        (xy 93.460771 123.516026)
+        (xy 93.496797 123.429051)
+        (xy 93.512357 123.391486)
+        (xy 93.512357 123.391485)
+        (xy 93.513923 123.387705)
+        (xy 93.518088 123.356074)
+        (xy 93.531517 123.254064)
+        (xy 93.532052 123.25)
+        (xy 93.513923 123.112295)
+        (xy 93.468743 123.003219)
+        (xy 93.462338 122.987757)
+        (xy 93.460771 122.983974)
+        (xy 93.376218 122.873782)
+        (xy 93.294721 122.811247)
+        (xy 93.269275 122.791722)
+        (xy 93.266026 122.789229)
+        (xy 93.231882 122.775086)
+        (xy 93.141486 122.737643)
+        (xy 93.141485 122.737643)
+        (xy 93.137705 122.736077)
+        (xy 93.133649 122.735543)
+        (xy 93.133645 122.735542)
+        (xy 93.004064 122.718483)
+        (xy 93 122.717948)
+        (xy 92.995936 122.718483)
+        (xy 92.866355 122.735542)
+        (xy 92.866351 122.735543)
+        (xy 92.862295 122.736077)
+        (xy 92.858515 122.737643)
+        (xy 92.858514 122.737643)
+        (xy 92.768118 122.775086)
+        (xy 92.733974 122.789229)
+        (xy 92.730725 122.791722)
+        (xy 92.705279 122.811247)
+        (xy 92.623782 122.873782)
+        (xy 92.621292 122.877027)
+        (xy 92.621289 122.87703)
+        (xy 92.547613 122.973047)
+        (xy 92.506186 122.996965)
+        (xy 92.498028 122.9975)
+        (xy 88.130477 122.9975)
+        (xy 88.086283 122.979194)
+        (xy 87.189141 122.082052)
         (xy 95.092988 122.082052)
         (xy 95.093253 122.084746)
         (xy 95.094694 122.09153)
@@ -11501,8 +11204,8 @@
         (xy 95.104434 122.072)
         (xy 95.095644 122.075641)
         (xy 95.092988 122.082052)
-        (xy 86.371141 122.082052)
-        (xy 85.101141 120.812052)
+        (xy 87.189141 122.082052)
+        (xy 85.919141 120.812052)
         (xy 95.092988 120.812052)
         (xy 95.093253 120.814746)
         (xy 95.094694 120.82153)
@@ -11531,8 +11234,8 @@
         (xy 95.104434 120.802)
         (xy 95.095644 120.805641)
         (xy 95.092988 120.812052)
-        (xy 85.101141 120.812052)
-        (xy 83.831141 119.542052)
+        (xy 85.919141 120.812052)
+        (xy 84.649141 119.542052)
         (xy 95.092988 119.542052)
         (xy 95.093253 119.544746)
         (xy 95.094694 119.55153)
@@ -11561,13 +11264,118 @@
         (xy 95.104434 119.532)
         (xy 95.095644 119.535641)
         (xy 95.092988 119.542052)
-        (xy 83.831141 119.542052)
-        (xy 81.550806 117.261717)
-        (xy 81.5325 117.217523)
-        (xy 81.5325 86.490477)
-        (xy 81.550806 86.446283)
-        (xy 82.790306 85.206783)
-        (xy 82.8345 85.188477)
+        (xy 84.649141 119.542052)
+        (xy 82.020806 116.913717)
+        (xy 82.0025 116.869523)
+        (xy 82.0025 106.917977)
+        (xy 82.020806 106.873783)
+        (xy 82.065 106.855477)
+        (xy 82.109194 106.873783)
+        (xy 85.247012 110.0116)
+        (xy 85.254785 110.021071)
+        (xy 85.265457 110.037043)
+        (xy 85.348979 110.09285)
+        (xy 85.355012 110.09405)
+        (xy 85.355014 110.094051)
+        (xy 85.364286 110.095895)
+        (xy 85.422626 110.1075)
+        (xy 85.4475 110.112448)
+        (xy 85.466337 110.108701)
+        (xy 85.47853 110.1075)
+        (xy 86.045643 110.1075)
+        (xy 86.089837 110.125806)
+        (xy 86.107477 110.160899)
+        (xy 86.113061 110.198837)
+        (xy 86.166615 110.307913)
+        (xy 86.170267 110.311559)
+        (xy 86.170268 110.31156)
+        (xy 86.248958 110.390113)
+        (xy 86.24896 110.390115)
+        (xy 86.252613 110.393761)
+        (xy 86.257253 110.396029)
+        (xy 86.357026 110.444799)
+        (xy 86.361782 110.447124)
+        (xy 86.366585 110.447825)
+        (xy 86.366586 110.447825)
+        (xy 86.386709 110.450761)
+        (xy 86.432905 110.4575)
+        (xy 86.716748 110.4575)
+        (xy 87.002094 110.457499)
+        (xy 87.073837 110.446939)
+        (xy 87.182913 110.393385)
+        (xy 87.18656 110.389732)
+        (xy 87.265113 110.311042)
+        (xy 87.265115 110.31104)
+        (xy 87.268761 110.307387)
+        (xy 87.322124 110.198218)
+        (xy 87.3325 110.127095)
+        (xy 87.332499 109.582906)
+        (xy 87.321939 109.511163)
+        (xy 87.268385 109.402087)
+        (xy 87.264732 109.39844)
+        (xy 87.186042 109.319887)
+        (xy 87.18604 109.319885)
+        (xy 87.182387 109.316239)
+        (xy 87.137161 109.294132)
+        (xy 87.077578 109.265007)
+        (xy 87.077577 109.265007)
+        (xy 87.073218 109.262876)
+        (xy 87.068415 109.262175)
+        (xy 87.068414 109.262175)
+        (xy 87.048291 109.259239)
+        (xy 87.002095 109.2525)
+        (xy 86.718252 109.2525)
+        (xy 86.432906 109.252501)
+        (xy 86.361163 109.263061)
+        (xy 86.252087 109.316615)
+        (xy 86.248441 109.320267)
+        (xy 86.24844 109.320268)
+        (xy 86.169887 109.398958)
+        (xy 86.169885 109.39896)
+        (xy 86.166239 109.402613)
+        (xy 86.163971 109.407253)
+        (xy 86.145815 109.444397)
+        (xy 86.112876 109.511782)
+        (xy 86.112175 109.516585)
+        (xy 86.112175 109.516586)
+        (xy 86.107443 109.549023)
+        (xy 86.082949 109.590111)
+        (xy 86.045598 109.6025)
+        (xy 85.577976 109.6025)
+        (xy 85.533782 109.584194)
+        (xy 82.446806 106.497217)
+        (xy 82.4285 106.453023)
+        (xy 82.4285 106.359)
+        (xy 82.446806 106.314806)
+        (xy 82.491 106.2965)
+        (xy 85.540558 106.2965)
+        (xy 85.545616 106.295494)
+        (xy 85.571713 106.290303)
+        (xy 85.571715 106.290302)
+        (xy 85.577748 106.289102)
+        (xy 85.619922 106.260922)
+        (xy 85.648102 106.218748)
+        (xy 85.649956 106.209431)
+        (xy 85.654901 106.184569)
+        (xy 85.6555 106.181558)
+        (xy 85.6555 103.856442)
+        (xy 85.648102 103.819252)
+        (xy 85.619922 103.777078)
+        (xy 85.577748 103.748898)
+        (xy 85.571712 103.747697)
+        (xy 85.569406 103.746742)
+        (xy 85.535581 103.712918)
+        (xy 85.535582 103.665082)
+        (xy 85.569406 103.631257)
+        (xy 85.593324 103.6265)
+        (xy 86.240558 103.6265)
+        (xy 86.245616 103.625494)
+        (xy 86.271713 103.620303)
+        (xy 86.271715 103.620302)
+        (xy 86.277748 103.619102)
+        (xy 86.288326 103.612034)
+        (xy 86.32305 103.6015)
+        (xy 86.708523 103.6015)
       )
     )
     (filled_polygon
@@ -11794,7 +11602,6 @@
         (xy 87.039463 99.588552)
         (xy 88.406015 100.955104)
         (xy 88.413788 100.964575)
-        (xy 88.417414 100.970001)
         (xy 88.424458 100.980544)
         (xy 88.492683 101.02613)
         (xy 88.50798 101.036351)
@@ -12111,7 +11918,7 @@
         (xy 90.912094 106.647499)
         (xy 90.983837 106.636939)
         (xy 91.092913 106.583385)
-        (xy 91.098825 106.577463)
+        (xy 91.09656 106.579732)
         (xy 91.175113 106.501042)
         (xy 91.175115 106.50104)
         (xy 91.178761 106.497387)