Browse Source

minor changes

Thomas Kopp 1 year ago
parent
commit
dcc4ce9290

+ 22
- 11
schematics/oko-weatherstation.bak View File

@@ -334,17 +334,6 @@ F 3 "~" H 8900 2750 50  0001 C CNN
334 334
 	1    8900 2750
335 335
 	1    0    0    -1  
336 336
 $EndComp
337
-$Comp
338
-L Device:R R3
339
-U 1 1 5C4D924A
340
-P 9200 2750
341
-F 0 "R3" H 9270 2796 50  0000 L CNN
342
-F 1 "4k7" H 9270 2705 50  0000 L CNN
343
-F 2 "Resistors_SMD:R_0603_1608Metric" V 9130 2750 50  0001 C CNN
344
-F 3 "~" H 9200 2750 50  0001 C CNN
345
-	1    9200 2750
346
-	1    0    0    -1  
347
-$EndComp
348 337
 Text GLabel 9250 2350 2    50   Input ~ 0
349 338
 3V3
350 339
 Text GLabel 8900 3100 2    50   Input ~ 0
@@ -357,8 +346,30 @@ Wire Wire Line
357 346
 	8900 2900 8900 3100
358 347
 Wire Wire Line
359 348
 	9200 2900 9200 3100
349
+NoConn ~ 5850 2800
350
+NoConn ~ 5850 2900
351
+NoConn ~ 5850 3200
352
+NoConn ~ 5850 3300
353
+NoConn ~ 6850 3000
354
+NoConn ~ 6850 2900
355
+NoConn ~ 6850 2700
356
+NoConn ~ 8000 4450
357
+NoConn ~ 8000 4950
358
+NoConn ~ 9000 4950
359
+NoConn ~ 9000 4850
360 360
 Wire Wire Line
361 361
 	8900 2350 9200 2350
362
+$Comp
363
+L Device:R R3
364
+U 1 1 5C4D924A
365
+P 9200 2750
366
+F 0 "R3" H 9270 2796 50  0000 L CNN
367
+F 1 "4k7" H 9270 2705 50  0000 L CNN
368
+F 2 "Resistors_SMD:R_0603_1608Metric" V 9130 2750 50  0001 C CNN
369
+F 3 "~" H 9200 2750 50  0001 C CNN
370
+	1    9200 2750
371
+	1    0    0    -1  
372
+$EndComp
362 373
 Wire Wire Line
363 374
 	9200 2600 9200 2350
364 375
 Connection ~ 9200 2350

+ 193
- 185
schematics/oko-weatherstation.kicad_pcb View File

@@ -3,7 +3,7 @@
3 3
   (general
4 4
     (thickness 1.6)
5 5
     (drawings 50)
6
-    (tracks 110)
6
+    (tracks 122)
7 7
     (zones 0)
8 8
     (modules 18)
9 9
     (nets 25)
@@ -869,46 +869,8 @@
869 869
       (xy 9.722176 -13.430868)) (layer F.SilkS) (width 0.338389))
870 870
   )
871 871
 
872
-  (module Resistors_ThroughHole:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer B.Cu) (tedit 5C3A6D8C) (tstamp 5C39B722)
873
-    (at 141.8 99.8)
874
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=7.62mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
875
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
876
-    (path /5C36B93E)
877
-    (fp_text reference R1 (at 1.4 -2.1) (layer B.SilkS) hide
878
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
879
-    )
880
-    (fp_text value 100k (at 3.81 -2.31) (layer B.Fab)
881
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
882
-    )
883
-    (fp_line (start 8.7 1.6) (end -1.05 1.6) (layer B.CrtYd) (width 0.05))
884
-    (fp_line (start 8.7 -1.6) (end 8.7 1.6) (layer B.CrtYd) (width 0.05))
885
-    (fp_line (start -1.05 -1.6) (end 8.7 -1.6) (layer B.CrtYd) (width 0.05))
886
-    (fp_line (start -1.05 1.6) (end -1.05 -1.6) (layer B.CrtYd) (width 0.05))
887
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer B.SilkS) (width 0.12))
888
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer B.SilkS) (width 0.12))
889
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer B.SilkS) (width 0.12))
890
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer B.SilkS) (width 0.12))
891
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer B.SilkS) (width 0.12))
892
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer B.SilkS) (width 0.12))
893
-    (fp_line (start 7.62 0) (end 6.96 0) (layer B.Fab) (width 0.1))
894
-    (fp_line (start 0 0) (end 0.66 0) (layer B.Fab) (width 0.1))
895
-    (fp_line (start 6.96 1.25) (end 0.66 1.25) (layer B.Fab) (width 0.1))
896
-    (fp_line (start 6.96 -1.25) (end 6.96 1.25) (layer B.Fab) (width 0.1))
897
-    (fp_line (start 0.66 -1.25) (end 6.96 -1.25) (layer B.Fab) (width 0.1))
898
-    (fp_line (start 0.66 1.25) (end 0.66 -1.25) (layer B.Fab) (width 0.1))
899
-    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
900
-      (net 14 "Net-(R1-Pad2)"))
901
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
902
-      (net 1 5V))
903
-    (model ${KISYS3DMOD}/Resistors_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
904
-      (at (xyz 0 0 0))
905
-      (scale (xyz 0.393701 0.393701 0.393701))
906
-      (rotate (xyz 0 0 0))
907
-    )
908
-  )
909
-
910 872
   (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5C4D95C9) (tstamp 5C4D9413)
911
-    (at 137.782986 92.71 180)
873
+    (at 137.782986 93.98 180)
912 874
     (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
913 875
     (tags resistor)
914 876
     (path /5C4D91C5)
@@ -979,6 +941,42 @@
979 941
     )
980 942
   )
981 943
 
944
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5C4D9C5E) (tstamp 5C4DA1EA)
945
+    (at 146.05 100.33)
946
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
947
+    (tags resistor)
948
+    (path /5C36B93E)
949
+    (attr smd)
950
+    (fp_text reference R1 (at 0 1.43) (layer B.SilkS) hide
951
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
952
+    )
953
+    (fp_text value 100k (at 0 -1.43) (layer B.Fab)
954
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
955
+    )
956
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
957
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
958
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
959
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
960
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
961
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
962
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
963
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
964
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
965
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
966
+    (fp_text user %R (at 0 0) (layer B.Fab)
967
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
968
+    )
969
+    (pad 1 smd roundrect (at -0.7875 0) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
970
+      (net 1 5V))
971
+    (pad 2 smd roundrect (at 0.7875 0) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
972
+      (net 14 "Net-(R1-Pad2)"))
973
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
974
+      (at (xyz 0 0 0))
975
+      (scale (xyz 1 1 1))
976
+      (rotate (xyz 0 0 0))
977
+    )
978
+  )
979
+
982 980
   (gr_text OUT+ (at 146 95.2) (layer B.SilkS) (tstamp 5C3A792E)
983 981
     (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
984 982
   )
@@ -1108,6 +1106,7 @@
1108 1106
   (gr_line (start 132 113.5) (end 132 101) (layer Edge.Cuts) (width 0.001))
1109 1107
   (gr_line (start 141 113.5) (end 132 113.5) (layer Edge.Cuts) (width 0.001))
1110 1108
 
1109
+  (via (at 142.24 99.73) (size 1.2) (drill 0.5) (layers F.Cu B.Cu) (net 1) (tstamp 5C4DA37D))
1111 1110
   (segment (start 149.05 94.15) (end 149 94.1) (width 0.6) (layer B.Cu) (net 1))
1112 1111
   (segment (start 152.85 94.15) (end 149.05 94.15) (width 0.6) (layer B.Cu) (net 1))
1113 1112
   (segment (start 154.212 94.15) (end 152.85 94.15) (width 0.6) (layer B.Cu) (net 1))
@@ -1115,11 +1114,15 @@
1115 1114
   (segment (start 163.932791 94.200001) (end 154.262001 94.200001) (width 0.6) (layer B.Cu) (net 1))
1116 1115
   (segment (start 168.29 89.842792) (end 163.932791 94.200001) (width 0.6) (layer B.Cu) (net 1))
1117 1116
   (segment (start 168.29 88.57) (end 168.29 89.842792) (width 0.6) (layer B.Cu) (net 1))
1118
-  (via (at 142 90.3) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 1))
1119
-  (segment (start 145.8 94.1) (end 142 90.3) (width 0.6) (layer B.Cu) (net 1))
1120
-  (segment (start 149 94.1) (end 145.8 94.1) (width 0.6) (layer B.Cu) (net 1))
1117
+  (via (at 140.97 90.3) (size 1.2) (drill 0.5) (layers F.Cu B.Cu) (net 1))
1118
+  (segment (start 144.77 94.1) (end 140.97 90.3) (width 0.6) (layer B.Cu) (net 1))
1119
+  (segment (start 147.98 94.1) (end 144.78 94.1) (width 0.6) (layer B.Cu) (net 1))
1121 1120
   (segment (start 142 99.6) (end 141.8 99.8) (width 0.25) (layer F.Cu) (net 1))
1122
-  (segment (start 142 90.3) (end 142 99.6) (width 0.6) (layer F.Cu) (net 1))
1121
+  (segment (start 144.6625 99.73) (end 145.2625 100.33) (width 0.6) (layer B.Cu) (net 1))
1122
+  (segment (start 141.76 99.73) (end 144.6625 99.73) (width 0.6) (layer B.Cu) (net 1))
1123
+  (segment (start 147.98 94.1) (end 149 94.1) (width 0.6) (layer B.Cu) (net 1))
1124
+  (segment (start 142.24 91.57) (end 140.97 90.3) (width 0.6) (layer F.Cu) (net 1))
1125
+  (segment (start 142.24 99.73) (end 142.24 91.57) (width 0.6) (layer F.Cu) (net 1))
1123 1126
   (segment (start 149.05 108.35) (end 149 108.4) (width 0.6) (layer B.Cu) (net 2))
1124 1127
   (segment (start 152.85 108.35) (end 149.05 108.35) (width 0.6) (layer B.Cu) (net 2))
1125 1128
   (segment (start 131.03763 93.42) (end 134.7 97.08237) (width 0.25) (layer B.Cu) (net 2))
@@ -1140,13 +1143,14 @@
1140 1143
   (segment (start 137.96 103.96) (end 137.96 104.34) (width 0.25) (layer F.Cu) (net 4))
1141 1144
   (segment (start 130.721999 89.101999) (end 129.96 88.34) (width 0.25) (layer B.Cu) (net 4))
1142 1145
   (segment (start 135.2 93.58) (end 130.721999 89.101999) (width 0.25) (layer B.Cu) (net 4))
1143
-  (segment (start 135.2 101.58) (end 135.2 93.58) (width 0.25) (layer B.Cu) (net 4))
1144 1146
   (segment (start 137.96 104.34) (end 135.2 101.58) (width 0.25) (layer B.Cu) (net 4))
1145
-  (segment (start 137.285486 92.89) (end 135.89 92.89) (width 0.25) (layer B.Cu) (net 4))
1146
-  (segment (start 135.89 92.89) (end 135.2 93.58) (width 0.25) (layer B.Cu) (net 4))
1147
+  (segment (start 137.16 93.98) (end 135.764514 93.98) (width 0.25) (layer B.Cu) (net 4))
1147 1148
   (segment (start 158.13 88.57) (end 156.28551 86.72551) (width 0.25) (layer F.Cu) (net 4))
1148 1149
   (segment (start 131.57449 86.72551) (end 129.96 88.34) (width 0.25) (layer F.Cu) (net 4))
1149 1150
   (segment (start 156.28551 86.72551) (end 131.57449 86.72551) (width 0.25) (layer F.Cu) (net 4))
1151
+  (segment (start 135.2 101.58) (end 135.2 93.98) (width 0.25) (layer B.Cu) (net 4))
1152
+  (segment (start 135.764514 93.98) (end 135.2 93.98) (width 0.25) (layer B.Cu) (net 4))
1153
+  (segment (start 135.2 93.98) (end 135.2 93.58) (width 0.25) (layer B.Cu) (net 4))
1150 1154
   (segment (start 167.064999 112.655001) (end 167.390001 112.329999) (width 0.25) (layer F.Cu) (net 5))
1151 1155
   (segment (start 167.390001 112.329999) (end 168.29 111.43) (width 0.25) (layer F.Cu) (net 5))
1152 1156
   (segment (start 143.735001 112.655001) (end 167.064999 112.655001) (width 0.25) (layer F.Cu) (net 5))
@@ -1158,7 +1162,6 @@
1158 1162
   (segment (start 138.570486 96.52) (end 138.570486 93.98) (width 0.25) (layer B.Cu) (net 5))
1159 1163
   (segment (start 139.047001 96.996515) (end 138.570486 96.52) (width 0.25) (layer B.Cu) (net 5))
1160 1164
   (segment (start 137.96 106.88) (end 139.047001 105.792999) (width 0.25) (layer B.Cu) (net 5))
1161
-  (segment (start 138.570486 93.98) (end 138.570486 92.71) (width 0.25) (layer B.Cu) (net 5))
1162 1165
   (segment (start 139.047001 105.792999) (end 139.047001 96.996515) (width 0.25) (layer B.Cu) (net 5))
1163 1166
   (segment (start 136.39949 86.90051) (end 174.20051 86.90051) (width 0.6) (layer B.Cu) (net 7))
1164 1167
   (segment (start 134.8 88.5) (end 136.39949 86.90051) (width 0.6) (layer B.Cu) (net 7) (status 10))
@@ -1169,7 +1172,10 @@
1169 1172
   (segment (start 164.450001 97.812001) (end 174.988 108.35) (width 0.6) (layer B.Cu) (net 8))
1170 1173
   (segment (start 174.988 108.35) (end 176.35 108.35) (width 0.6) (layer B.Cu) (net 8))
1171 1174
   (segment (start 146.652001 97.812001) (end 164.450001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1172
-  (segment (start 137.34 88.5) (end 146.652001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1175
+  (segment (start 146.652001 97.812001) (end 144.802001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1176
+  (segment (start 137.34 89.99) (end 137.34 88.5) (width 0.6) (layer B.Cu) (net 8))
1177
+  (segment (start 137.34 90.35) (end 144.802001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1178
+  (segment (start 137.34 90.35) (end 137.34 89.99) (width 0.6) (layer B.Cu) (net 8))
1173 1179
   (segment (start 163.21 110.157208) (end 165.2 108.167208) (width 0.25) (layer F.Cu) (net 9))
1174 1180
   (segment (start 163.21 111.43) (end 163.21 110.157208) (width 0.25) (layer F.Cu) (net 9))
1175 1181
   (via (at 163.1 93.3) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 9))
@@ -1200,26 +1206,30 @@
1200 1206
   (segment (start 149.55 96.55) (end 149.5 96.5) (width 0.6) (layer B.Cu) (net 12) (status 30))
1201 1207
   (segment (start 152.85 96.55) (end 149.55 96.55) (width 0.6) (layer B.Cu) (net 12) (status 30))
1202 1208
   (segment (start 146.677919 96.5) (end 149.5 96.5) (width 0.6) (layer B.Cu) (net 12) (status 20))
1203
-  (segment (start 139.88 89.702081) (end 146.677919 96.5) (width 0.6) (layer B.Cu) (net 12))
1204
-  (segment (start 139.88 88.5) (end 139.88 89.702081) (width 0.6) (layer B.Cu) (net 12) (status 10))
1209
+  (segment (start 146.677919 96.5) (end 144.8 96.5) (width 0.6) (layer B.Cu) (net 12))
1210
+  (segment (start 139.030001 89.349999) (end 139.88 88.5) (width 0.6) (layer B.Cu) (net 12))
1211
+  (segment (start 139.030001 89.349999) (end 139.030001 90.770001) (width 0.6) (layer B.Cu) (net 12))
1212
+  (segment (start 144.76 96.5) (end 139.030001 90.770001) (width 0.6) (layer B.Cu) (net 12))
1213
+  (segment (start 144.8 96.5) (end 144.76 96.5) (width 0.25) (layer B.Cu) (net 12))
1205 1214
   (segment (start 149.55 105.95) (end 149.5 106) (width 0.6) (layer B.Cu) (net 13) (status 30))
1206 1215
   (segment (start 152.85 105.95) (end 149.55 105.95) (width 0.6) (layer B.Cu) (net 13) (status 30))
1207
-  (via (at 146.3 105.9) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 13))
1216
+  (via (at 146.3 105.9) (size 1.2) (drill 0.5) (layers F.Cu B.Cu) (net 13))
1208 1217
   (segment (start 145.900001 105.500001) (end 146.3 105.9) (width 0.6) (layer F.Cu) (net 13))
1209
-  (segment (start 143.269999 102.869999) (end 145.900001 105.500001) (width 0.6) (layer F.Cu) (net 13))
1210
-  (segment (start 143.269999 89.349999) (end 143.269999 102.869999) (width 0.6) (layer F.Cu) (net 13))
1211
-  (segment (start 142.42 88.5) (end 143.269999 89.349999) (width 0.6) (layer F.Cu) (net 13))
1212 1218
   (segment (start 149.4 105.9) (end 149.5 106) (width 0.6) (layer B.Cu) (net 13))
1213 1219
   (segment (start 146.3 105.9) (end 149.4 105.9) (width 0.6) (layer B.Cu) (net 13))
1214
-  (segment (start 149.42 99.8) (end 152.6 99.8) (width 0.25) (layer B.Cu) (net 14))
1220
+  (segment (start 143.51 89.59) (end 143.51 102.87) (width 0.6) (layer F.Cu) (net 13))
1221
+  (segment (start 143.51 89.59) (end 142.42 88.5) (width 0.6) (layer F.Cu) (net 13))
1222
+  (segment (start 143.51 103.11) (end 146.3 105.9) (width 0.6) (layer F.Cu) (net 13))
1223
+  (segment (start 143.51 102.87) (end 143.51 103.11) (width 0.25) (layer F.Cu) (net 13))
1215 1224
   (via (at 155.3 106.68) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 14))
1216
-  (segment (start 152.6 99.8) (end 155.3 102.5) (width 0.25) (layer B.Cu) (net 14))
1217 1225
   (segment (start 153.05 111.05) (end 153.05 111.43) (width 0.25) (layer F.Cu) (net 14))
1218 1226
   (segment (start 155.3 108.8) (end 153.05 111.05) (width 0.25) (layer F.Cu) (net 14))
1219
-  (segment (start 155.3 102.5) (end 155.3 106.68) (width 0.25) (layer B.Cu) (net 14))
1220 1227
   (segment (start 155.3 108.8) (end 155.3 106.68) (width 0.25) (layer F.Cu) (net 14))
1228
+  (segment (start 155.3 106.68) (end 155.3 102.5) (width 0.25) (layer B.Cu) (net 14))
1229
+  (segment (start 153.13 100.33) (end 146.8375 100.33) (width 0.25) (layer B.Cu) (net 14))
1230
+  (segment (start 155.3 102.5) (end 153.13 100.33) (width 0.25) (layer B.Cu) (net 14))
1221 1231
 
1222
-  (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5C4DBD63) (hatch edge 0.508)
1232
+  (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5C4DAC3D) (hatch edge 0.508)
1223 1233
     (connect_pads (clearance 0.508))
1224 1234
     (min_thickness 0.254)
1225 1235
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -1230,82 +1240,86 @@
1230 1240
     )
1231 1241
     (filled_polygon
1232 1242
       (pts
1233
-        (xy 145.925741 98.408031) (xy 145.977904 98.486098) (xy 146.287182 98.692751) (xy 146.652 98.765318) (xy 146.744086 98.747001)
1234
-        (xy 148.412993 98.747001) (xy 148.385423 98.765423) (xy 148.06826 99.240091) (xy 147.956887 99.8) (xy 148.06826 100.359909)
1235
-        (xy 148.385423 100.834577) (xy 148.860091 101.15174) (xy 149.278667 101.235) (xy 149.561333 101.235) (xy 149.979909 101.15174)
1236
-        (xy 150.454577 100.834577) (xy 150.638043 100.56) (xy 152.285199 100.56) (xy 154.54 102.814802) (xy 154.540001 105.976288)
1237
-        (xy 154.422569 106.09372) (xy 154.265 106.474126) (xy 154.265 106.885874) (xy 154.422569 107.26628) (xy 154.71372 107.557431)
1238
-        (xy 155.094126 107.715) (xy 155.505874 107.715) (xy 155.88628 107.557431) (xy 156.177431 107.26628) (xy 156.335 106.885874)
1239
-        (xy 156.335 106.474126) (xy 156.177431 106.09372) (xy 156.06 105.976289) (xy 156.06 102.574848) (xy 156.074888 102.5)
1240
-        (xy 156.06 102.425152) (xy 156.06 102.425148) (xy 156.015904 102.203463) (xy 155.847929 101.952071) (xy 155.784473 101.909671)
1241
-        (xy 153.190331 99.31553) (xy 153.147929 99.252071) (xy 152.896537 99.084096) (xy 152.674852 99.04) (xy 152.674847 99.04)
1242
-        (xy 152.6 99.025112) (xy 152.525153 99.04) (xy 150.638043 99.04) (xy 150.454577 98.765423) (xy 150.427007 98.747001)
1243
-        (xy 164.062712 98.747001) (xy 174.26174 108.94603) (xy 174.313903 109.024097) (xy 174.391969 109.076259) (xy 174.623181 109.23075)
1244
-        (xy 174.978228 109.301373) (xy 174.989843 109.359765) (xy 175.130191 109.569809) (xy 175.340235 109.710157) (xy 175.465001 109.734974)
1245
-        (xy 175.465 110.339358) (xy 175.402235 110.351843) (xy 175.192191 110.492191) (xy 175.051843 110.702235) (xy 175.00256 110.95)
1246
-        (xy 175.00256 112.45) (xy 175.051843 112.697765) (xy 175.163253 112.8645) (xy 168.837958 112.8645) (xy 169.159507 112.73131)
1247
-        (xy 169.59131 112.299507) (xy 169.825 111.73533) (xy 169.825 111.12467) (xy 169.59131 110.560493) (xy 169.159507 110.12869)
1248
-        (xy 168.59533 109.895) (xy 167.98467 109.895) (xy 167.420493 110.12869) (xy 167.02 110.529183) (xy 166.619507 110.12869)
1249
-        (xy 166.05533 109.895) (xy 165.44467 109.895) (xy 164.880493 110.12869) (xy 164.48 110.529183) (xy 164.079507 110.12869)
1250
-        (xy 163.51533 109.895) (xy 162.90467 109.895) (xy 162.340493 110.12869) (xy 161.94 110.529183) (xy 161.539507 110.12869)
1251
-        (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869) (xy 159.4 110.529183) (xy 158.999507 110.12869)
1252
-        (xy 158.43533 109.895) (xy 158.199802 109.895) (xy 162.134803 105.96) (xy 168.206289 105.96) (xy 168.32372 106.077431)
1253
-        (xy 168.704126 106.235) (xy 169.115874 106.235) (xy 169.49628 106.077431) (xy 169.787431 105.78628) (xy 169.945 105.405874)
1254
-        (xy 169.945 104.994126) (xy 169.787431 104.61372) (xy 169.49628 104.322569) (xy 169.115874 104.165) (xy 168.704126 104.165)
1255
-        (xy 168.675 104.177064) (xy 168.675 103.794126) (xy 168.517431 103.41372) (xy 168.22628 103.122569) (xy 167.845874 102.965)
1256
-        (xy 167.434126 102.965) (xy 167.05372 103.122569) (xy 166.936289 103.24) (xy 162.457848 103.24) (xy 162.383 103.225112)
1257
-        (xy 162.308152 103.24) (xy 162.308148 103.24) (xy 162.134605 103.27452) (xy 162.086462 103.284096) (xy 161.899418 103.409076)
1258
-        (xy 161.835071 103.452071) (xy 161.792671 103.515527) (xy 155.8632 109.444999) (xy 154.161387 109.444999) (xy 154.247 109.23831)
1259
-        (xy 154.247 108.63575) (xy 154.08825 108.477) (xy 152.977 108.477) (xy 152.977 108.497) (xy 152.723 108.497)
1260
-        (xy 152.723 108.477) (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 151.453 109.23831) (xy 151.547865 109.467334)
1261
-        (xy 151.438464 109.489095) (xy 151.187072 109.65707) (xy 151.144672 109.720526) (xy 150.924838 109.94036) (xy 150.81533 109.895)
1262
-        (xy 150.20467 109.895) (xy 149.640493 110.12869) (xy 149.20869 110.560493) (xy 148.975 111.12467) (xy 148.975 111.73533)
1263
-        (xy 149.20869 112.299507) (xy 149.640493 112.73131) (xy 149.962042 112.8645) (xy 139.031157 112.8645) (xy 139.14432 112.751337)
1264
-        (xy 139.357 112.237881) (xy 139.357 111.682119) (xy 139.14432 111.168663) (xy 138.751337 110.77568) (xy 138.560353 110.696572)
1265
-        (xy 138.691143 110.642397) (xy 138.760608 110.400213) (xy 138.027 109.666605) (xy 138.027 109.42) (xy 138.139605 109.42)
1266
-        (xy 138.940213 110.220608) (xy 139.182397 110.151143) (xy 139.369144 109.627698) (xy 139.341362 109.072632) (xy 139.182397 108.688857)
1267
-        (xy 139.171565 108.68575) (xy 147.615 108.68575) (xy 147.615 109.27631) (xy 147.711673 109.509699) (xy 147.890302 109.688327)
1268
-        (xy 148.123691 109.785) (xy 148.71425 109.785) (xy 148.873 109.62625) (xy 148.873 108.527) (xy 149.127 108.527)
1269
-        (xy 149.127 109.62625) (xy 149.28575 109.785) (xy 149.876309 109.785) (xy 150.109698 109.688327) (xy 150.288327 109.509699)
1270
-        (xy 150.385 109.27631) (xy 150.385 108.68575) (xy 150.22625 108.527) (xy 149.127 108.527) (xy 148.873 108.527)
1271
-        (xy 147.77375 108.527) (xy 147.615 108.68575) (xy 139.171565 108.68575) (xy 138.940213 108.619392) (xy 138.139605 109.42)
1272
-        (xy 138.027 109.42) (xy 138.027 109.173395) (xy 138.760608 108.439787) (xy 138.691143 108.197603) (xy 138.550607 108.147465)
1273
-        (xy 138.751337 108.06432) (xy 139.14432 107.671337) (xy 139.357 107.157881) (xy 139.357 106.602119) (xy 139.34402 106.570782)
1274
-        (xy 139.531474 106.383328) (xy 139.59493 106.340928) (xy 139.762905 106.089536) (xy 139.807001 105.867851) (xy 139.807001 105.867847)
1275
-        (xy 139.821889 105.792999) (xy 139.807001 105.718151) (xy 139.807001 105.694126) (xy 145.265 105.694126) (xy 145.265 106.105874)
1276
-        (xy 145.422569 106.48628) (xy 145.71372 106.777431) (xy 146.094126 106.935) (xy 146.505874 106.935) (xy 146.747296 106.835)
1277
-        (xy 148.119467 106.835) (xy 148.151843 106.997765) (xy 148.163359 107.015) (xy 148.123691 107.015) (xy 147.890302 107.111673)
1278
-        (xy 147.711673 107.290301) (xy 147.615 107.52369) (xy 147.615 108.11425) (xy 147.77375 108.273) (xy 148.873 108.273)
1279
-        (xy 148.873 108.253) (xy 149.127 108.253) (xy 149.127 108.273) (xy 150.22625 108.273) (xy 150.385 108.11425)
1280
-        (xy 150.385 107.52369) (xy 150.32641 107.382241) (xy 150.497765 107.348157) (xy 150.707809 107.207809) (xy 150.848157 106.997765)
1281
-        (xy 150.870587 106.885) (xy 151.474971 106.885) (xy 151.489843 106.959765) (xy 151.621369 107.156606) (xy 151.549673 107.228301)
1282
-        (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223) (xy 152.723 108.223) (xy 152.723 108.203)
1283
-        (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223) (xy 154.247 108.06425) (xy 154.247 107.46169)
1284
-        (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765) (xy 154.25944 106.712) (xy 154.25944 105.188)
1285
-        (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843) (xy 153.612 104.54056) (xy 152.088 104.54056)
1286
-        (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.474971 105.015) (xy 150.850696 105.015)
1287
-        (xy 150.848157 105.002235) (xy 150.707809 104.792191) (xy 150.497765 104.651843) (xy 150.25 104.60256) (xy 148.75 104.60256)
1288
-        (xy 148.502235 104.651843) (xy 148.292191 104.792191) (xy 148.176723 104.965) (xy 146.747296 104.965) (xy 146.505874 104.865)
1289
-        (xy 146.094126 104.865) (xy 145.71372 105.022569) (xy 145.422569 105.31372) (xy 145.265 105.694126) (xy 139.807001 105.694126)
1290
-        (xy 139.807001 104.035275) (xy 145.844331 104.035275) (xy 145.906169 104.271042) (xy 146.407122 104.447419) (xy 146.93744 104.418664)
1291
-        (xy 147.293831 104.271042) (xy 147.355669 104.035275) (xy 146.6 103.279605) (xy 145.844331 104.035275) (xy 139.807001 104.035275)
1292
-        (xy 139.807001 102.907122) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.428958 103.793831) (xy 145.664725 103.855669)
1293
-        (xy 146.420395 103.1) (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212)
1294
-        (xy 147.968242 103.856217) (xy 148.343783 104.231758) (xy 148.834452 104.435) (xy 149.365548 104.435) (xy 149.856217 104.231758)
1295
-        (xy 150.231758 103.856217) (xy 150.435 103.365548) (xy 150.435 102.834452) (xy 150.231758 102.343783) (xy 149.856217 101.968242)
1296
-        (xy 149.365548 101.765) (xy 148.834452 101.765) (xy 148.343783 101.968242) (xy 147.968242 102.343783) (xy 147.856721 102.613017)
1297
-        (xy 147.771042 102.406169) (xy 147.535275 102.344331) (xy 146.779605 103.1) (xy 146.420395 103.1) (xy 145.664725 102.344331)
1298
-        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 139.807001 102.907122) (xy 139.807001 102.164725) (xy 145.844331 102.164725)
1299
-        (xy 146.6 102.920395) (xy 147.355669 102.164725) (xy 147.293831 101.928958) (xy 146.792878 101.752581) (xy 146.26256 101.781336)
1300
-        (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 139.807001 102.164725) (xy 139.807001 99.514561) (xy 140.365 99.514561)
1301
-        (xy 140.365 100.085439) (xy 140.583466 100.612862) (xy 140.987138 101.016534) (xy 141.514561 101.235) (xy 142.085439 101.235)
1302
-        (xy 142.612862 101.016534) (xy 143.016534 100.612862) (xy 143.235 100.085439) (xy 143.235 99.514561) (xy 143.016534 98.987138)
1303
-        (xy 142.612862 98.583466) (xy 142.085439 98.365) (xy 141.514561 98.365) (xy 140.987138 98.583466) (xy 140.583466 98.987138)
1304
-        (xy 140.365 99.514561) (xy 139.807001 99.514561) (xy 139.807001 97.071362) (xy 139.821889 96.996515) (xy 139.807001 96.921668)
1305
-        (xy 139.807001 96.921663) (xy 139.762905 96.699978) (xy 139.59493 96.448586) (xy 139.531471 96.406184) (xy 139.330486 96.205199)
1306
-        (xy 139.330486 96.166339) (xy 139.401725 96.118739) (xy 139.589491 95.837727) (xy 139.655426 95.50625) (xy 139.655426 94.99375)
1307
-        (xy 139.589491 94.662273) (xy 139.401725 94.381261) (xy 139.330486 94.333661) (xy 139.330486 93.626339) (xy 139.401725 93.578739)
1308
-        (xy 139.589491 93.297727) (xy 139.655426 92.96625) (xy 139.655426 92.45375) (xy 139.589491 92.122273) (xy 139.487816 91.970105)
1243
+        (xy 144.075741 98.408031) (xy 144.127904 98.486098) (xy 144.20597 98.53826) (xy 144.437182 98.692751) (xy 144.802 98.765318)
1244
+        (xy 144.894086 98.747001) (xy 164.062712 98.747001) (xy 174.26174 108.94603) (xy 174.313903 109.024097) (xy 174.391969 109.076259)
1245
+        (xy 174.623181 109.23075) (xy 174.978228 109.301373) (xy 174.989843 109.359765) (xy 175.130191 109.569809) (xy 175.340235 109.710157)
1246
+        (xy 175.465001 109.734974) (xy 175.465 110.339358) (xy 175.402235 110.351843) (xy 175.192191 110.492191) (xy 175.051843 110.702235)
1247
+        (xy 175.00256 110.95) (xy 175.00256 112.45) (xy 175.051843 112.697765) (xy 175.163253 112.8645) (xy 168.837958 112.8645)
1248
+        (xy 169.159507 112.73131) (xy 169.59131 112.299507) (xy 169.825 111.73533) (xy 169.825 111.12467) (xy 169.59131 110.560493)
1249
+        (xy 169.159507 110.12869) (xy 168.59533 109.895) (xy 167.98467 109.895) (xy 167.420493 110.12869) (xy 167.02 110.529183)
1250
+        (xy 166.619507 110.12869) (xy 166.05533 109.895) (xy 165.44467 109.895) (xy 164.880493 110.12869) (xy 164.48 110.529183)
1251
+        (xy 164.079507 110.12869) (xy 163.51533 109.895) (xy 162.90467 109.895) (xy 162.340493 110.12869) (xy 161.94 110.529183)
1252
+        (xy 161.539507 110.12869) (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869) (xy 159.4 110.529183)
1253
+        (xy 158.999507 110.12869) (xy 158.43533 109.895) (xy 158.199802 109.895) (xy 162.134803 105.96) (xy 168.206289 105.96)
1254
+        (xy 168.32372 106.077431) (xy 168.704126 106.235) (xy 169.115874 106.235) (xy 169.49628 106.077431) (xy 169.787431 105.78628)
1255
+        (xy 169.945 105.405874) (xy 169.945 104.994126) (xy 169.787431 104.61372) (xy 169.49628 104.322569) (xy 169.115874 104.165)
1256
+        (xy 168.704126 104.165) (xy 168.675 104.177064) (xy 168.675 103.794126) (xy 168.517431 103.41372) (xy 168.22628 103.122569)
1257
+        (xy 167.845874 102.965) (xy 167.434126 102.965) (xy 167.05372 103.122569) (xy 166.936289 103.24) (xy 162.457848 103.24)
1258
+        (xy 162.383 103.225112) (xy 162.308152 103.24) (xy 162.308148 103.24) (xy 162.134605 103.27452) (xy 162.086462 103.284096)
1259
+        (xy 161.899418 103.409076) (xy 161.835071 103.452071) (xy 161.792671 103.515527) (xy 155.8632 109.444999) (xy 154.161387 109.444999)
1260
+        (xy 154.247 109.23831) (xy 154.247 108.63575) (xy 154.08825 108.477) (xy 152.977 108.477) (xy 152.977 108.497)
1261
+        (xy 152.723 108.497) (xy 152.723 108.477) (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 151.453 109.23831)
1262
+        (xy 151.547865 109.467334) (xy 151.438464 109.489095) (xy 151.187072 109.65707) (xy 151.144672 109.720526) (xy 150.924838 109.94036)
1263
+        (xy 150.81533 109.895) (xy 150.20467 109.895) (xy 149.640493 110.12869) (xy 149.20869 110.560493) (xy 148.975 111.12467)
1264
+        (xy 148.975 111.73533) (xy 149.20869 112.299507) (xy 149.640493 112.73131) (xy 149.962042 112.8645) (xy 139.031157 112.8645)
1265
+        (xy 139.14432 112.751337) (xy 139.357 112.237881) (xy 139.357 111.682119) (xy 139.14432 111.168663) (xy 138.751337 110.77568)
1266
+        (xy 138.560353 110.696572) (xy 138.691143 110.642397) (xy 138.760608 110.400213) (xy 138.027 109.666605) (xy 138.027 109.42)
1267
+        (xy 138.139605 109.42) (xy 138.940213 110.220608) (xy 139.182397 110.151143) (xy 139.369144 109.627698) (xy 139.341362 109.072632)
1268
+        (xy 139.182397 108.688857) (xy 139.171565 108.68575) (xy 147.615 108.68575) (xy 147.615 109.27631) (xy 147.711673 109.509699)
1269
+        (xy 147.890302 109.688327) (xy 148.123691 109.785) (xy 148.71425 109.785) (xy 148.873 109.62625) (xy 148.873 108.527)
1270
+        (xy 149.127 108.527) (xy 149.127 109.62625) (xy 149.28575 109.785) (xy 149.876309 109.785) (xy 150.109698 109.688327)
1271
+        (xy 150.288327 109.509699) (xy 150.385 109.27631) (xy 150.385 108.68575) (xy 150.22625 108.527) (xy 149.127 108.527)
1272
+        (xy 148.873 108.527) (xy 147.77375 108.527) (xy 147.615 108.68575) (xy 139.171565 108.68575) (xy 138.940213 108.619392)
1273
+        (xy 138.139605 109.42) (xy 138.027 109.42) (xy 138.027 109.173395) (xy 138.760608 108.439787) (xy 138.691143 108.197603)
1274
+        (xy 138.550607 108.147465) (xy 138.751337 108.06432) (xy 139.14432 107.671337) (xy 139.357 107.157881) (xy 139.357 106.602119)
1275
+        (xy 139.34402 106.570782) (xy 139.531474 106.383328) (xy 139.59493 106.340928) (xy 139.762905 106.089536) (xy 139.807001 105.867851)
1276
+        (xy 139.807001 105.867847) (xy 139.821889 105.792999) (xy 139.807001 105.718151) (xy 139.807001 105.654343) (xy 145.065 105.654343)
1277
+        (xy 145.065 106.145657) (xy 145.253018 106.599571) (xy 145.600429 106.946982) (xy 146.054343 107.135) (xy 146.545657 107.135)
1278
+        (xy 146.999571 106.946982) (xy 147.111553 106.835) (xy 148.119467 106.835) (xy 148.151843 106.997765) (xy 148.163359 107.015)
1279
+        (xy 148.123691 107.015) (xy 147.890302 107.111673) (xy 147.711673 107.290301) (xy 147.615 107.52369) (xy 147.615 108.11425)
1280
+        (xy 147.77375 108.273) (xy 148.873 108.273) (xy 148.873 108.253) (xy 149.127 108.253) (xy 149.127 108.273)
1281
+        (xy 150.22625 108.273) (xy 150.385 108.11425) (xy 150.385 107.52369) (xy 150.32641 107.382241) (xy 150.497765 107.348157)
1282
+        (xy 150.707809 107.207809) (xy 150.848157 106.997765) (xy 150.870587 106.885) (xy 151.474971 106.885) (xy 151.489843 106.959765)
1283
+        (xy 151.621369 107.156606) (xy 151.549673 107.228301) (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223)
1284
+        (xy 152.723 108.223) (xy 152.723 108.203) (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223)
1285
+        (xy 154.247 108.06425) (xy 154.247 107.46169) (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765)
1286
+        (xy 154.25944 106.712) (xy 154.25944 105.188) (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843)
1287
+        (xy 153.612 104.54056) (xy 152.088 104.54056) (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235)
1288
+        (xy 151.474971 105.015) (xy 150.850696 105.015) (xy 150.848157 105.002235) (xy 150.707809 104.792191) (xy 150.497765 104.651843)
1289
+        (xy 150.25 104.60256) (xy 148.75 104.60256) (xy 148.502235 104.651843) (xy 148.292191 104.792191) (xy 148.176723 104.965)
1290
+        (xy 147.111553 104.965) (xy 146.999571 104.853018) (xy 146.545657 104.665) (xy 146.054343 104.665) (xy 145.600429 104.853018)
1291
+        (xy 145.253018 105.200429) (xy 145.065 105.654343) (xy 139.807001 105.654343) (xy 139.807001 104.035275) (xy 145.844331 104.035275)
1292
+        (xy 145.906169 104.271042) (xy 146.407122 104.447419) (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275)
1293
+        (xy 146.6 103.279605) (xy 145.844331 104.035275) (xy 139.807001 104.035275) (xy 139.807001 102.907122) (xy 145.252581 102.907122)
1294
+        (xy 145.281336 103.43744) (xy 145.428958 103.793831) (xy 145.664725 103.855669) (xy 146.420395 103.1) (xy 146.779605 103.1)
1295
+        (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212) (xy 147.968242 103.856217) (xy 148.343783 104.231758)
1296
+        (xy 148.834452 104.435) (xy 149.365548 104.435) (xy 149.856217 104.231758) (xy 150.231758 103.856217) (xy 150.435 103.365548)
1297
+        (xy 150.435 102.834452) (xy 150.231758 102.343783) (xy 149.856217 101.968242) (xy 149.365548 101.765) (xy 148.834452 101.765)
1298
+        (xy 148.343783 101.968242) (xy 147.968242 102.343783) (xy 147.856721 102.613017) (xy 147.771042 102.406169) (xy 147.535275 102.344331)
1299
+        (xy 146.779605 103.1) (xy 146.420395 103.1) (xy 145.664725 102.344331) (xy 145.428958 102.406169) (xy 145.252581 102.907122)
1300
+        (xy 139.807001 102.907122) (xy 139.807001 102.164725) (xy 145.844331 102.164725) (xy 146.6 102.920395) (xy 147.355669 102.164725)
1301
+        (xy 147.293831 101.928958) (xy 146.792878 101.752581) (xy 146.26256 101.781336) (xy 145.906169 101.928958) (xy 145.844331 102.164725)
1302
+        (xy 139.807001 102.164725) (xy 139.807001 99.73) (xy 140.806683 99.73) (xy 140.87925 100.094819) (xy 141.085903 100.404097)
1303
+        (xy 141.331942 100.568495) (xy 141.540429 100.776982) (xy 141.994343 100.965) (xy 142.485657 100.965) (xy 142.939571 100.776982)
1304
+        (xy 143.051553 100.665) (xy 144.193224 100.665) (xy 144.243495 100.917727) (xy 144.431261 101.198739) (xy 144.712273 101.386505)
1305
+        (xy 145.04375 101.45244) (xy 145.48125 101.45244) (xy 145.812727 101.386505) (xy 146.05 101.227964) (xy 146.287273 101.386505)
1306
+        (xy 146.61875 101.45244) (xy 147.05625 101.45244) (xy 147.387727 101.386505) (xy 147.668739 101.198739) (xy 147.741396 101.09)
1307
+        (xy 152.815199 101.09) (xy 154.540001 102.814804) (xy 154.54 105.976289) (xy 154.422569 106.09372) (xy 154.265 106.474126)
1308
+        (xy 154.265 106.885874) (xy 154.422569 107.26628) (xy 154.71372 107.557431) (xy 155.094126 107.715) (xy 155.505874 107.715)
1309
+        (xy 155.88628 107.557431) (xy 156.177431 107.26628) (xy 156.335 106.885874) (xy 156.335 106.474126) (xy 156.177431 106.09372)
1310
+        (xy 156.06 105.976289) (xy 156.06 102.574846) (xy 156.074888 102.499999) (xy 156.06 102.425152) (xy 156.06 102.425148)
1311
+        (xy 156.015904 102.203463) (xy 155.923033 102.064472) (xy 155.890329 102.015526) (xy 155.890327 102.015524) (xy 155.847929 101.952071)
1312
+        (xy 155.784476 101.909673) (xy 153.720331 99.84553) (xy 153.677929 99.782071) (xy 153.426537 99.614096) (xy 153.204852 99.57)
1313
+        (xy 153.204847 99.57) (xy 153.13 99.555112) (xy 153.055153 99.57) (xy 147.741396 99.57) (xy 147.668739 99.461261)
1314
+        (xy 147.387727 99.273495) (xy 147.05625 99.20756) (xy 146.61875 99.20756) (xy 146.287273 99.273495) (xy 146.05 99.432036)
1315
+        (xy 145.812727 99.273495) (xy 145.48125 99.20756) (xy 145.462349 99.20756) (xy 145.388761 99.133972) (xy 145.336597 99.055903)
1316
+        (xy 145.027319 98.84925) (xy 144.754586 98.795) (xy 144.6625 98.776683) (xy 144.570414 98.795) (xy 143.051553 98.795)
1317
+        (xy 142.939571 98.683018) (xy 142.485657 98.495) (xy 141.994343 98.495) (xy 141.540429 98.683018) (xy 141.331942 98.891505)
1318
+        (xy 141.085903 99.055903) (xy 140.87925 99.365181) (xy 140.806683 99.73) (xy 139.807001 99.73) (xy 139.807001 97.071362)
1319
+        (xy 139.821889 96.996515) (xy 139.807001 96.921668) (xy 139.807001 96.921663) (xy 139.762905 96.699978) (xy 139.59493 96.448586)
1320
+        (xy 139.531471 96.406184) (xy 139.330486 96.205199) (xy 139.330486 96.166339) (xy 139.401725 96.118739) (xy 139.589491 95.837727)
1321
+        (xy 139.655426 95.50625) (xy 139.655426 94.99375) (xy 139.589491 94.662273) (xy 139.557904 94.615) (xy 139.589491 94.567727)
1322
+        (xy 139.655426 94.23625) (xy 139.655426 93.987715)
1309 1323
       )
1310 1324
     )
1311 1325
     (filled_polygon
@@ -1332,7 +1346,7 @@
1332 1346
       )
1333 1347
     )
1334 1348
   )
1335
-  (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 5C4DBD60) (hatch edge 0.508)
1349
+  (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 5C4DAC3A) (hatch edge 0.508)
1336 1350
     (connect_pads (clearance 0.508))
1337 1351
     (min_thickness 0.254)
1338 1352
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -1424,56 +1438,50 @@
1424 1438
         (xy 133.401161 89.079418) (xy 133.729375 89.570625) (xy 134.220582 89.898839) (xy 134.653744 89.985) (xy 134.946256 89.985)
1425 1439
         (xy 135.379418 89.898839) (xy 135.870625 89.570625) (xy 136.07 89.272239) (xy 136.269375 89.570625) (xy 136.760582 89.898839)
1426 1440
         (xy 137.193744 89.985) (xy 137.486256 89.985) (xy 137.919418 89.898839) (xy 138.410625 89.570625) (xy 138.61 89.272239)
1427
-        (xy 138.809375 89.570625) (xy 139.300582 89.898839) (xy 139.733744 89.985) (xy 140.026256 89.985) (xy 140.459418 89.898839)
1428
-        (xy 140.950625 89.570625) (xy 141.15 89.272239) (xy 141.315845 89.520444) (xy 141.122569 89.71372) (xy 140.965 90.094126)
1429
-        (xy 140.965 90.505874) (xy 141.065 90.747296) (xy 141.065001 98.551214) (xy 140.987138 98.583466) (xy 140.583466 98.987138)
1430
-        (xy 140.365 99.514561) (xy 140.365 100.085439) (xy 140.583466 100.612862) (xy 140.987138 101.016534) (xy 141.514561 101.235)
1431
-        (xy 142.085439 101.235) (xy 142.335 101.131628) (xy 142.335 102.777909) (xy 142.316682 102.869999) (xy 142.389249 103.234817)
1432
-        (xy 142.54374 103.466029) (xy 142.595903 103.544096) (xy 142.673969 103.596258) (xy 145.30397 106.22626) (xy 145.303973 106.226262)
1433
-        (xy 145.322569 106.244858) (xy 145.422569 106.48628) (xy 145.71372 106.777431) (xy 146.094126 106.935) (xy 146.505874 106.935)
1434
-        (xy 146.88628 106.777431) (xy 147.177431 106.48628) (xy 147.335 106.105874) (xy 147.335 105.694126) (xy 147.177431 105.31372)
1435
-        (xy 147.051711 105.188) (xy 151.44056 105.188) (xy 151.44056 106.712) (xy 151.489843 106.959765) (xy 151.621369 107.156606)
1436
-        (xy 151.549673 107.228301) (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223) (xy 152.723 108.223)
1437
-        (xy 152.723 108.203) (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223) (xy 154.247 108.06425)
1438
-        (xy 154.247 107.46169) (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765) (xy 154.25944 106.712)
1439
-        (xy 154.25944 105.188) (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843) (xy 153.612 104.54056)
1440
-        (xy 152.088 104.54056) (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.44056 105.188)
1441
-        (xy 147.051711 105.188) (xy 146.88628 105.022569) (xy 146.644858 104.922569) (xy 146.626262 104.903973) (xy 146.62626 104.90397)
1442
-        (xy 146.040697 104.318407) (xy 146.407122 104.447419) (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275)
1441
+        (xy 138.809375 89.570625) (xy 139.300582 89.898839) (xy 139.733744 89.985) (xy 139.763723 89.985) (xy 139.735 90.054343)
1442
+        (xy 139.735 90.545657) (xy 139.923018 90.999571) (xy 140.270429 91.346982) (xy 140.724343 91.535) (xy 140.882711 91.535)
1443
+        (xy 141.305001 91.957291) (xy 141.305 98.918447) (xy 141.193018 99.030429) (xy 141.005 99.484343) (xy 141.005 99.975657)
1444
+        (xy 141.193018 100.429571) (xy 141.540429 100.776982) (xy 141.994343 100.965) (xy 142.485657 100.965) (xy 142.575001 100.927992)
1445
+        (xy 142.575001 102.962086) (xy 142.580553 102.989998) (xy 142.556683 103.11) (xy 142.62925 103.474818) (xy 142.783741 103.70603)
1446
+        (xy 145.065 105.98729) (xy 145.065 106.145657) (xy 145.253018 106.599571) (xy 145.600429 106.946982) (xy 146.054343 107.135)
1447
+        (xy 146.545657 107.135) (xy 146.999571 106.946982) (xy 147.346982 106.599571) (xy 147.535 106.145657) (xy 147.535 105.654343)
1448
+        (xy 147.346982 105.200429) (xy 147.334553 105.188) (xy 151.44056 105.188) (xy 151.44056 106.712) (xy 151.489843 106.959765)
1449
+        (xy 151.621369 107.156606) (xy 151.549673 107.228301) (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223)
1450
+        (xy 152.723 108.223) (xy 152.723 108.203) (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223)
1451
+        (xy 154.247 108.06425) (xy 154.247 107.46169) (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765)
1452
+        (xy 154.25944 106.712) (xy 154.25944 105.188) (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843)
1453
+        (xy 153.612 104.54056) (xy 152.088 104.54056) (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235)
1454
+        (xy 151.44056 105.188) (xy 147.334553 105.188) (xy 146.999571 104.853018) (xy 146.545657 104.665) (xy 146.38729 104.665)
1455
+        (xy 146.040696 104.318407) (xy 146.407122 104.447419) (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275)
1443 1456
         (xy 146.6 103.279605) (xy 146.585858 103.293748) (xy 146.406252 103.114142) (xy 146.420395 103.1) (xy 145.664725 102.344331)
1444
-        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.367325 103.645035) (xy 144.204999 102.48271)
1445
-        (xy 144.204999 99.059978) (xy 144.244097 99.256537) (xy 144.283514 99.315528) (xy 144.412072 99.507929) (xy 144.475528 99.550329)
1446
-        (xy 146.683699 101.758501) (xy 146.26256 101.781336) (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 146.6 102.920395)
1447
-        (xy 146.614142 102.906252) (xy 146.793748 103.085858) (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831)
1448
-        (xy 147.849775 103.570212) (xy 147.968242 103.856217) (xy 148.343783 104.231758) (xy 148.834452 104.435) (xy 149.365548 104.435)
1449
-        (xy 149.856217 104.231758) (xy 150.231758 103.856217) (xy 150.435 103.365548) (xy 150.435 102.834452) (xy 150.231758 102.343783)
1450
-        (xy 149.856217 101.968242) (xy 149.365548 101.765) (xy 148.839802 101.765) (xy 146.874802 99.8) (xy 147.956887 99.8)
1451
-        (xy 148.06826 100.359909) (xy 148.385423 100.834577) (xy 148.860091 101.15174) (xy 149.278667 101.235) (xy 149.561333 101.235)
1452
-        (xy 149.979909 101.15174) (xy 150.454577 100.834577) (xy 150.77174 100.359909) (xy 150.883113 99.8) (xy 150.77174 99.240091)
1453
-        (xy 150.454577 98.765423) (xy 149.979909 98.44826) (xy 149.561333 98.365) (xy 149.278667 98.365) (xy 148.860091 98.44826)
1454
-        (xy 148.385423 98.765423) (xy 148.06826 99.240091) (xy 147.956887 99.8) (xy 146.874802 99.8) (xy 145.72 98.645199)
1455
-        (xy 145.72 93.388) (xy 151.44056 93.388) (xy 151.44056 94.912) (xy 151.489843 95.159765) (xy 151.616955 95.35)
1456
-        (xy 151.489843 95.540235) (xy 151.44056 95.788) (xy 151.44056 97.312) (xy 151.489843 97.559765) (xy 151.630191 97.769809)
1457
-        (xy 151.840235 97.910157) (xy 152.088 97.95944) (xy 153.612 97.95944) (xy 153.859765 97.910157) (xy 154.069809 97.769809)
1458
-        (xy 154.210157 97.559765) (xy 154.25944 97.312) (xy 154.25944 95.788) (xy 154.210157 95.540235) (xy 154.083045 95.35)
1459
-        (xy 154.210157 95.159765) (xy 154.25944 94.912) (xy 154.25944 93.388) (xy 154.210157 93.140235) (xy 154.069809 92.930191)
1460
-        (xy 153.859765 92.789843) (xy 153.612 92.74056) (xy 152.088 92.74056) (xy 151.840235 92.789843) (xy 151.630191 92.930191)
1461
-        (xy 151.489843 93.140235) (xy 151.44056 93.388) (xy 145.72 93.388) (xy 145.72 89.778178) (xy 146.030625 89.570625)
1462
-        (xy 146.045096 89.548967) (xy 146.111673 89.709698) (xy 146.290301 89.888327) (xy 146.52369 89.985) (xy 147.21425 89.985)
1463
-        (xy 147.373 89.82625) (xy 147.373 88.627) (xy 147.353 88.627) (xy 147.353 88.373) (xy 147.373 88.373)
1464
-        (xy 147.373 88.353) (xy 147.627 88.353) (xy 147.627 88.373) (xy 147.647 88.373) (xy 147.647 88.627)
1465
-        (xy 147.627 88.627) (xy 147.627 89.82625) (xy 147.78575 89.985) (xy 148.47631 89.985) (xy 148.709699 89.888327)
1466
-        (xy 148.888327 89.709698) (xy 148.985 89.476309) (xy 148.985 88.899472) (xy 149.20869 89.439507) (xy 149.640493 89.87131)
1467
-        (xy 150.20467 90.105) (xy 150.81533 90.105) (xy 151.379507 89.87131) (xy 151.78 89.470817) (xy 152.180493 89.87131)
1468
-        (xy 152.74467 90.105) (xy 153.35533 90.105) (xy 153.919507 89.87131) (xy 154.32 89.470817) (xy 154.720493 89.87131)
1469
-        (xy 155.28467 90.105) (xy 155.89533 90.105) (xy 156.459507 89.87131) (xy 156.86 89.470817) (xy 157.260493 89.87131)
1470
-        (xy 157.82467 90.105) (xy 158.43533 90.105) (xy 158.999507 89.87131) (xy 159.4 89.470817) (xy 159.800493 89.87131)
1471
-        (xy 160.36467 90.105) (xy 160.97533 90.105) (xy 161.539507 89.87131) (xy 161.94 89.470817) (xy 162.340493 89.87131)
1472
-        (xy 162.90467 90.105) (xy 163.51533 90.105) (xy 164.079507 89.87131) (xy 164.300658 89.650159) (xy 164.849446 89.650159)
1473
-        (xy 164.935852 89.906643) (xy 165.509336 90.116458) (xy 166.11946 90.090839) (xy 166.564148 89.906643) (xy 166.650554 89.650159)
1474
-        (xy 165.75 88.749605) (xy 164.849446 89.650159) (xy 164.300658 89.650159) (xy 164.51131 89.439507) (xy 164.519438 89.419885)
1475
-        (xy 164.669841 89.470554) (xy 165.570395 88.57) (xy 164.669841 87.669446) (xy 164.519438 87.720115) (xy 164.51131 87.700493)
1476
-        (xy 164.079507 87.26869) (xy 163.516537 87.0355) (xy 165.705881 87.0355)
1457
+        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.367325 103.645035) (xy 144.445 102.722711)
1458
+        (xy 144.445 99.529931) (xy 144.475528 99.550329) (xy 146.683699 101.758501) (xy 146.26256 101.781336) (xy 145.906169 101.928958)
1459
+        (xy 145.844331 102.164725) (xy 146.6 102.920395) (xy 146.614142 102.906252) (xy 146.793748 103.085858) (xy 146.779605 103.1)
1460
+        (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212) (xy 147.968242 103.856217) (xy 148.343783 104.231758)
1461
+        (xy 148.834452 104.435) (xy 149.365548 104.435) (xy 149.856217 104.231758) (xy 150.231758 103.856217) (xy 150.435 103.365548)
1462
+        (xy 150.435 102.834452) (xy 150.231758 102.343783) (xy 149.856217 101.968242) (xy 149.365548 101.765) (xy 148.839802 101.765)
1463
+        (xy 145.72 98.645199) (xy 145.72 93.388) (xy 151.44056 93.388) (xy 151.44056 94.912) (xy 151.489843 95.159765)
1464
+        (xy 151.616955 95.35) (xy 151.489843 95.540235) (xy 151.44056 95.788) (xy 151.44056 97.312) (xy 151.489843 97.559765)
1465
+        (xy 151.630191 97.769809) (xy 151.840235 97.910157) (xy 152.088 97.95944) (xy 153.612 97.95944) (xy 153.859765 97.910157)
1466
+        (xy 154.069809 97.769809) (xy 154.210157 97.559765) (xy 154.25944 97.312) (xy 154.25944 95.788) (xy 154.210157 95.540235)
1467
+        (xy 154.083045 95.35) (xy 154.210157 95.159765) (xy 154.25944 94.912) (xy 154.25944 93.388) (xy 154.210157 93.140235)
1468
+        (xy 154.069809 92.930191) (xy 153.859765 92.789843) (xy 153.612 92.74056) (xy 152.088 92.74056) (xy 151.840235 92.789843)
1469
+        (xy 151.630191 92.930191) (xy 151.489843 93.140235) (xy 151.44056 93.388) (xy 145.72 93.388) (xy 145.72 89.778178)
1470
+        (xy 146.030625 89.570625) (xy 146.045096 89.548967) (xy 146.111673 89.709698) (xy 146.290301 89.888327) (xy 146.52369 89.985)
1471
+        (xy 147.21425 89.985) (xy 147.373 89.82625) (xy 147.373 88.627) (xy 147.353 88.627) (xy 147.353 88.373)
1472
+        (xy 147.373 88.373) (xy 147.373 88.353) (xy 147.627 88.353) (xy 147.627 88.373) (xy 147.647 88.373)
1473
+        (xy 147.647 88.627) (xy 147.627 88.627) (xy 147.627 89.82625) (xy 147.78575 89.985) (xy 148.47631 89.985)
1474
+        (xy 148.709699 89.888327) (xy 148.888327 89.709698) (xy 148.985 89.476309) (xy 148.985 88.899472) (xy 149.20869 89.439507)
1475
+        (xy 149.640493 89.87131) (xy 150.20467 90.105) (xy 150.81533 90.105) (xy 151.379507 89.87131) (xy 151.78 89.470817)
1476
+        (xy 152.180493 89.87131) (xy 152.74467 90.105) (xy 153.35533 90.105) (xy 153.919507 89.87131) (xy 154.32 89.470817)
1477
+        (xy 154.720493 89.87131) (xy 155.28467 90.105) (xy 155.89533 90.105) (xy 156.459507 89.87131) (xy 156.86 89.470817)
1478
+        (xy 157.260493 89.87131) (xy 157.82467 90.105) (xy 158.43533 90.105) (xy 158.999507 89.87131) (xy 159.4 89.470817)
1479
+        (xy 159.800493 89.87131) (xy 160.36467 90.105) (xy 160.97533 90.105) (xy 161.539507 89.87131) (xy 161.94 89.470817)
1480
+        (xy 162.340493 89.87131) (xy 162.90467 90.105) (xy 163.51533 90.105) (xy 164.079507 89.87131) (xy 164.300658 89.650159)
1481
+        (xy 164.849446 89.650159) (xy 164.935852 89.906643) (xy 165.509336 90.116458) (xy 166.11946 90.090839) (xy 166.564148 89.906643)
1482
+        (xy 166.650554 89.650159) (xy 165.75 88.749605) (xy 164.849446 89.650159) (xy 164.300658 89.650159) (xy 164.51131 89.439507)
1483
+        (xy 164.519438 89.419885) (xy 164.669841 89.470554) (xy 165.570395 88.57) (xy 164.669841 87.669446) (xy 164.519438 87.720115)
1484
+        (xy 164.51131 87.700493) (xy 164.079507 87.26869) (xy 163.516537 87.0355) (xy 165.705881 87.0355)
1477 1485
       )
1478 1486
     )
1479 1487
   )

+ 377
- 227
schematics/oko-weatherstation.kicad_pcb-bak View File

@@ -3,9 +3,9 @@
3 3
   (general
4 4
     (thickness 1.6)
5 5
     (drawings 50)
6
-    (tracks 104)
6
+    (tracks 110)
7 7
     (zones 0)
8
-    (modules 15)
8
+    (modules 18)
9 9
     (nets 25)
10 10
   )
11 11
 
@@ -116,8 +116,8 @@
116 116
   (net 20 "Net-(U2-Pad7)")
117 117
   (net 21 "Net-(U2-Pad8)")
118 118
   (net 22 "Net-(U3-Pad1)")
119
-  (net 23 "Net-(U4-Pad5)")
120
-  (net 24 "Net-(U4-Pad6)")
119
+  (net 23 "Net-(U4-Pad1)")
120
+  (net 24 "Net-(U4-Pad2)")
121 121
 
122 122
   (net_class Default "This is the default net class."
123 123
     (clearance 0.2)
@@ -144,14 +144,110 @@
144 144
     (add_net "Net-(U2-Pad8)")
145 145
     (add_net "Net-(U3-Pad1)")
146 146
     (add_net "Net-(U3-Pad6)")
147
-    (add_net "Net-(U4-Pad5)")
148
-    (add_net "Net-(U4-Pad6)")
147
+    (add_net "Net-(U4-Pad1)")
148
+    (add_net "Net-(U4-Pad2)")
149 149
     (add_net SCL)
150 150
     (add_net SDA)
151 151
     (add_net VCC_BAT)
152 152
     (add_net VCC_SOLAR)
153 153
   )
154 154
 
155
+  (module oko:GY-BME280 (layer F.Cu) (tedit 5C4D9339) (tstamp 5C37DABA)
156
+    (at 132.5 98.5 180)
157
+    (path /5C36680F)
158
+    (fp_text reference U4 (at 3.2 17.4 180) (layer F.SilkS) hide
159
+      (effects (font (size 1 1) (thickness 0.15)))
160
+    )
161
+    (fp_text value GY-BME280 (at 9.2 0.4 180) (layer F.Fab) hide
162
+      (effects (font (size 1 1) (thickness 0.15)))
163
+    )
164
+    (fp_text user SDO (at -0.3 8.8 180) (layer F.SilkS)
165
+      (effects (font (size 1 1) (thickness 0.15)))
166
+    )
167
+    (fp_text user CSB (at -0.2 7.4 180) (layer F.SilkS)
168
+      (effects (font (size 1 1) (thickness 0.15)))
169
+    )
170
+    (fp_text user SDA (at -0.2 6 180) (layer F.SilkS)
171
+      (effects (font (size 1 1) (thickness 0.15)))
172
+    )
173
+    (fp_text user SCL (at -0.2 4.6 180) (layer F.SilkS)
174
+      (effects (font (size 1 1) (thickness 0.15)))
175
+    )
176
+    (fp_text user GND (at -0.3 3.1 180) (layer F.SilkS)
177
+      (effects (font (size 1 1) (thickness 0.15)))
178
+    )
179
+    (fp_text user VCC (at -0.3 1.5 180) (layer F.SilkS)
180
+      (effects (font (size 1 1) (thickness 0.15)))
181
+    )
182
+    (fp_text user BME280 (at 3.8 4.5 270) (layer F.SilkS)
183
+      (effects (font (size 1 1) (thickness 0.15)))
184
+    )
185
+    (fp_line (start 13.4 1.4) (end 13.4 16.4) (layer F.SilkS) (width 0.15))
186
+    (fp_line (start 1.4 16.4) (end 13.4 16.4) (layer F.SilkS) (width 0.15))
187
+    (fp_line (start 1.4 1.4) (end 13.4 1.4) (layer F.SilkS) (width 0.15))
188
+    (fp_line (start 1.4 1.4) (end 1.4 16.4) (layer F.SilkS) (width 0.15))
189
+    (pad 6 thru_hole circle (at 2.54 2.54 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
190
+      (net 5 3V3))
191
+    (pad 5 thru_hole circle (at 2.54 5.08 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
192
+      (net 2 GND))
193
+    (pad 4 thru_hole circle (at 2.54 7.62 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
194
+      (net 3 SCL))
195
+    (pad 3 thru_hole circle (at 2.54 10.16 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
196
+      (net 4 SDA))
197
+    (pad 2 thru_hole circle (at 2.54 12.7 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
198
+      (net 24 "Net-(U4-Pad2)"))
199
+    (pad 1 thru_hole circle (at 2.54 15.24 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
200
+      (net 23 "Net-(U4-Pad1)"))
201
+  )
202
+
203
+  (module oko:GY-BME280 (layer F.Cu) (tedit 5C4D92CB) (tstamp 5C37DABA)
204
+    (at 132.5 98.5 180)
205
+    (path /5C36680F)
206
+    (fp_text reference U4 (at 3.2 17.4 180) (layer F.SilkS) hide
207
+      (effects (font (size 1 1) (thickness 0.15)))
208
+    )
209
+    (fp_text value GY-BME280 (at 9.2 0.4 180) (layer F.Fab) hide
210
+      (effects (font (size 1 1) (thickness 0.15)))
211
+    )
212
+    (fp_text user SDO (at -0.3 8.8 180) (layer F.SilkS)
213
+      (effects (font (size 1 1) (thickness 0.15)))
214
+    )
215
+    (fp_text user CSB (at -0.2 7.4 180) (layer F.SilkS)
216
+      (effects (font (size 1 1) (thickness 0.15)))
217
+    )
218
+    (fp_text user SDA (at -0.2 6 180) (layer F.SilkS)
219
+      (effects (font (size 1 1) (thickness 0.15)))
220
+    )
221
+    (fp_text user SCL (at -0.2 4.6 180) (layer F.SilkS)
222
+      (effects (font (size 1 1) (thickness 0.15)))
223
+    )
224
+    (fp_text user GND (at -0.3 3.1 180) (layer F.SilkS)
225
+      (effects (font (size 1 1) (thickness 0.15)))
226
+    )
227
+    (fp_text user VCC (at -0.3 1.5 180) (layer F.SilkS)
228
+      (effects (font (size 1 1) (thickness 0.15)))
229
+    )
230
+    (fp_text user BME280 (at 3.8 4.5 270) (layer F.SilkS)
231
+      (effects (font (size 1 1) (thickness 0.15)))
232
+    )
233
+    (fp_line (start 13.4 1.4) (end 13.4 16.4) (layer F.SilkS) (width 0.15))
234
+    (fp_line (start 1.4 16.4) (end 13.4 16.4) (layer F.SilkS) (width 0.15))
235
+    (fp_line (start 1.4 1.4) (end 13.4 1.4) (layer F.SilkS) (width 0.15))
236
+    (fp_line (start 1.4 1.4) (end 1.4 16.4) (layer F.SilkS) (width 0.15))
237
+    (pad 6 thru_hole circle (at 2.54 2.54 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
238
+      (net 5 3V3))
239
+    (pad 5 thru_hole circle (at 2.54 5.08 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
240
+      (net 2 GND))
241
+    (pad 4 thru_hole circle (at 2.54 7.62 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
242
+      (net 3 SCL))
243
+    (pad 3 thru_hole circle (at 2.54 10.16 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
244
+      (net 4 SDA))
245
+    (pad 2 thru_hole circle (at 2.54 12.7 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
246
+      (net 24 "Net-(U4-Pad2)"))
247
+    (pad 1 thru_hole circle (at 2.54 15.24 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
248
+      (net 23 "Net-(U4-Pad1)"))
249
+  )
250
+
155 251
   (module oko:APDS-9960 (layer F.Cu) (tedit 5C390407) (tstamp 5C37DAA5)
156 252
     (at 140.5 114.5 180)
157 253
     (path /5C366782)
@@ -471,54 +567,6 @@
471 567
       (net 8 GND_SOLAR))
472 568
   )
473 569
 
474
-  (module oko:GY-BME280 (layer F.Cu) (tedit 5C39040C) (tstamp 5C37DABA)
475
-    (at 132.5 98.5 180)
476
-    (path /5C36680F)
477
-    (fp_text reference U4 (at 3.2 17.4 180) (layer F.SilkS) hide
478
-      (effects (font (size 1 1) (thickness 0.15)))
479
-    )
480
-    (fp_text value GY-BME280 (at 9.2 0.4 180) (layer F.Fab) hide
481
-      (effects (font (size 1 1) (thickness 0.15)))
482
-    )
483
-    (fp_line (start 1.4 1.4) (end 1.4 16.4) (layer F.SilkS) (width 0.15))
484
-    (fp_line (start 1.4 1.4) (end 13.4 1.4) (layer F.SilkS) (width 0.15))
485
-    (fp_line (start 1.4 16.4) (end 13.4 16.4) (layer F.SilkS) (width 0.15))
486
-    (fp_line (start 13.4 1.4) (end 13.4 16.4) (layer F.SilkS) (width 0.15))
487
-    (fp_text user BME280 (at 3.8 4.5 270) (layer F.SilkS)
488
-      (effects (font (size 1 1) (thickness 0.15)))
489
-    )
490
-    (fp_text user VCC (at -0.3 1.5 180) (layer F.SilkS)
491
-      (effects (font (size 1 1) (thickness 0.15)))
492
-    )
493
-    (fp_text user GND (at -0.3 3.1 180) (layer F.SilkS)
494
-      (effects (font (size 1 1) (thickness 0.15)))
495
-    )
496
-    (fp_text user SCL (at -0.2 4.6 180) (layer F.SilkS)
497
-      (effects (font (size 1 1) (thickness 0.15)))
498
-    )
499
-    (fp_text user SDA (at -0.2 6 180) (layer F.SilkS)
500
-      (effects (font (size 1 1) (thickness 0.15)))
501
-    )
502
-    (fp_text user CSB (at -0.2 7.4 180) (layer F.SilkS)
503
-      (effects (font (size 1 1) (thickness 0.15)))
504
-    )
505
-    (fp_text user SDO (at -0.3 8.8 180) (layer F.SilkS)
506
-      (effects (font (size 1 1) (thickness 0.15)))
507
-    )
508
-    (pad 1 thru_hole circle (at 2.54 2.54 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
509
-      (net 5 3V3))
510
-    (pad 2 thru_hole circle (at 2.54 5.08 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
511
-      (net 2 GND))
512
-    (pad 3 thru_hole circle (at 2.54 7.62 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
513
-      (net 3 SCL))
514
-    (pad 4 thru_hole circle (at 2.54 10.16 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
515
-      (net 4 SDA))
516
-    (pad 5 thru_hole circle (at 2.54 12.7 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
517
-      (net 23 "Net-(U4-Pad5)"))
518
-    (pad 6 thru_hole circle (at 2.54 15.24 180) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
519
-      (net 24 "Net-(U4-Pad6)"))
520
-  )
521
-
522 570
   (module oko:wemos-d1-mini-connectors-only (layer F.Cu) (tedit 5C3934BE) (tstamp 5C38D9A2)
523 571
     (at 159.4 100 180)
524 572
     (path /5C36643E)
@@ -859,6 +907,78 @@
859 907
     )
860 908
   )
861 909
 
910
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5C4D95C9) (tstamp 5C4D9413)
911
+    (at 137.782986 92.71 180)
912
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
913
+    (tags resistor)
914
+    (path /5C4D91C5)
915
+    (attr smd)
916
+    (fp_text reference R2 (at 0 1.43 180) (layer B.SilkS) hide
917
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
918
+    )
919
+    (fp_text value 4k7 (at 0 -1.43 180) (layer B.Fab)
920
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
921
+    )
922
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
923
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
924
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
925
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
926
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
927
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
928
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
929
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
930
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
931
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
932
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
933
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
934
+    )
935
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
936
+      (net 5 3V3))
937
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
938
+      (net 4 SDA))
939
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
940
+      (at (xyz 0 0 0))
941
+      (scale (xyz 1 1 1))
942
+      (rotate (xyz 0 0 0))
943
+    )
944
+  )
945
+
946
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5C4D95D0) (tstamp 5C4D9424)
947
+    (at 137.782986 95.25 180)
948
+    (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: http://www.tortai-tech.com/upload/download/2011102023233369053.pdf), generated with kicad-footprint-generator")
949
+    (tags resistor)
950
+    (path /5C4D924A)
951
+    (attr smd)
952
+    (fp_text reference R3 (at 0 1.43 180) (layer B.SilkS) hide
953
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
954
+    )
955
+    (fp_text value 4k7 (at 0 -1.43 180) (layer B.Fab)
956
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
957
+    )
958
+    (fp_text user %R (at 0 0 180) (layer B.Fab)
959
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
960
+    )
961
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
962
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
963
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
964
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
965
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
966
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
967
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
968
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
969
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
970
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
971
+    (pad 2 smd roundrect (at 0.7875 0 180) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
972
+      (net 3 SCL))
973
+    (pad 1 smd roundrect (at -0.7875 0 180) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
974
+      (net 5 3V3))
975
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
976
+      (at (xyz 0 0 0))
977
+      (scale (xyz 1 1 1))
978
+      (rotate (xyz 0 0 0))
979
+    )
980
+  )
981
+
862 982
   (gr_text OUT+ (at 146 95.2) (layer B.SilkS) (tstamp 5C3A792E)
863 983
     (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
864 984
   )
@@ -1002,33 +1122,31 @@
1002 1122
   (segment (start 142 90.3) (end 142 99.6) (width 0.6) (layer F.Cu) (net 1))
1003 1123
   (segment (start 149.05 108.35) (end 149 108.4) (width 0.6) (layer B.Cu) (net 2))
1004 1124
   (segment (start 152.85 108.35) (end 149.05 108.35) (width 0.6) (layer B.Cu) (net 2))
1005
-  (segment (start 162.199999 92.120001) (end 164.850001 89.469999) (width 0.6) (layer F.Cu) (net 2))
1006
-  (segment (start 164.850001 89.469999) (end 165.75 88.57) (width 0.6) (layer F.Cu) (net 2))
1007
-  (segment (start 162.199999 100.362001) (end 162.199999 92.120001) (width 0.6) (layer F.Cu) (net 2))
1008
-  (segment (start 154.212 108.35) (end 162.199999 100.362001) (width 0.6) (layer F.Cu) (net 2))
1009
-  (segment (start 152.85 108.35) (end 154.212 108.35) (width 0.6) (layer F.Cu) (net 2))
1010 1125
   (segment (start 131.03763 93.42) (end 134.7 97.08237) (width 0.25) (layer B.Cu) (net 2))
1011 1126
   (segment (start 129.96 93.42) (end 131.03763 93.42) (width 0.25) (layer B.Cu) (net 2))
1012 1127
   (segment (start 134.7 106.16) (end 137.96 109.42) (width 0.25) (layer B.Cu) (net 2))
1013 1128
   (segment (start 134.7 97.08237) (end 134.7 106.16) (width 0.25) (layer B.Cu) (net 2))
1014 1129
   (segment (start 137.96 101.42) (end 137.96 101.8) (width 0.25) (layer F.Cu) (net 3))
1015
-  (segment (start 133 93.92) (end 130.721999 91.641999) (width 0.25) (layer F.Cu) (net 3))
1016 1130
   (segment (start 133 96.84) (end 133 93.92) (width 0.25) (layer F.Cu) (net 3))
1017 1131
   (segment (start 137.96 101.8) (end 133 96.84) (width 0.25) (layer F.Cu) (net 3))
1018
-  (segment (start 130.721999 91.641999) (end 129.96 90.88) (width 0.25) (layer F.Cu) (net 3))
1132
+  (segment (start 135.89 96.355486) (end 136.995486 95.25) (width 0.25) (layer B.Cu) (net 3))
1133
+  (segment (start 137.96 101.8) (end 135.89 99.73) (width 0.25) (layer B.Cu) (net 3))
1134
+  (segment (start 135.89 99.73) (end 135.89 96.355486) (width 0.25) (layer B.Cu) (net 3))
1019 1135
   (segment (start 130.721999 90.118001) (end 129.96 90.88) (width 0.25) (layer F.Cu) (net 3))
1020
-  (segment (start 133.515001 87.324999) (end 130.721999 90.118001) (width 0.25) (layer F.Cu) (net 3))
1021
-  (segment (start 154.344999 87.324999) (end 133.515001 87.324999) (width 0.25) (layer F.Cu) (net 3))
1022
-  (segment (start 155.59 88.57) (end 154.344999 87.324999) (width 0.25) (layer F.Cu) (net 3))
1136
+  (segment (start 133.587001 87.252999) (end 130.721999 90.118001) (width 0.25) (layer F.Cu) (net 3))
1137
+  (segment (start 154.272999 87.252999) (end 133.587001 87.252999) (width 0.25) (layer F.Cu) (net 3))
1138
+  (segment (start 155.59 88.57) (end 154.272999 87.252999) (width 0.25) (layer F.Cu) (net 3))
1139
+  (segment (start 129.96 90.88) (end 133 93.92) (width 0.25) (layer F.Cu) (net 3))
1023 1140
   (segment (start 137.96 103.96) (end 137.96 104.34) (width 0.25) (layer F.Cu) (net 4))
1024 1141
   (segment (start 130.721999 89.101999) (end 129.96 88.34) (width 0.25) (layer B.Cu) (net 4))
1025 1142
   (segment (start 135.2 93.58) (end 130.721999 89.101999) (width 0.25) (layer B.Cu) (net 4))
1026 1143
   (segment (start 135.2 101.58) (end 135.2 93.58) (width 0.25) (layer B.Cu) (net 4))
1027 1144
   (segment (start 137.96 104.34) (end 135.2 101.58) (width 0.25) (layer B.Cu) (net 4))
1028
-  (segment (start 130.721999 87.578001) (end 129.96 88.34) (width 0.25) (layer F.Cu) (net 4))
1029
-  (segment (start 131.42501 86.87499) (end 130.721999 87.578001) (width 0.25) (layer F.Cu) (net 4))
1030
-  (segment (start 156.43499 86.87499) (end 131.42501 86.87499) (width 0.25) (layer F.Cu) (net 4))
1031
-  (segment (start 158.13 88.57) (end 156.43499 86.87499) (width 0.25) (layer F.Cu) (net 4))
1145
+  (segment (start 137.285486 92.89) (end 135.89 92.89) (width 0.25) (layer B.Cu) (net 4))
1146
+  (segment (start 135.89 92.89) (end 135.2 93.58) (width 0.25) (layer B.Cu) (net 4))
1147
+  (segment (start 158.13 88.57) (end 156.28551 86.72551) (width 0.25) (layer F.Cu) (net 4))
1148
+  (segment (start 131.57449 86.72551) (end 129.96 88.34) (width 0.25) (layer F.Cu) (net 4))
1149
+  (segment (start 156.28551 86.72551) (end 131.57449 86.72551) (width 0.25) (layer F.Cu) (net 4))
1032 1150
   (segment (start 167.064999 112.655001) (end 167.390001 112.329999) (width 0.25) (layer F.Cu) (net 5))
1033 1151
   (segment (start 167.390001 112.329999) (end 168.29 111.43) (width 0.25) (layer F.Cu) (net 5))
1034 1152
   (segment (start 143.735001 112.655001) (end 167.064999 112.655001) (width 0.25) (layer F.Cu) (net 5))
@@ -1037,6 +1155,11 @@
1037 1155
   (segment (start 130.721999 96.721999) (end 129.96 95.96) (width 0.25) (layer F.Cu) (net 5))
1038 1156
   (segment (start 136.872999 102.872999) (end 130.721999 96.721999) (width 0.25) (layer F.Cu) (net 5))
1039 1157
   (segment (start 137.96 106.88) (end 136.872999 105.792999) (width 0.25) (layer F.Cu) (net 5))
1158
+  (segment (start 138.570486 96.52) (end 138.570486 93.98) (width 0.25) (layer B.Cu) (net 5))
1159
+  (segment (start 139.047001 96.996515) (end 138.570486 96.52) (width 0.25) (layer B.Cu) (net 5))
1160
+  (segment (start 137.96 106.88) (end 139.047001 105.792999) (width 0.25) (layer B.Cu) (net 5))
1161
+  (segment (start 138.570486 93.98) (end 138.570486 92.71) (width 0.25) (layer B.Cu) (net 5))
1162
+  (segment (start 139.047001 105.792999) (end 139.047001 96.996515) (width 0.25) (layer B.Cu) (net 5))
1040 1163
   (segment (start 136.39949 86.90051) (end 174.20051 86.90051) (width 0.6) (layer B.Cu) (net 7))
1041 1164
   (segment (start 134.8 88.5) (end 136.39949 86.90051) (width 0.6) (layer B.Cu) (net 7) (status 10))
1042 1165
   (segment (start 176.35 89.05) (end 176.35 94.15) (width 0.6) (layer B.Cu) (net 7) (status 20))
@@ -1060,18 +1183,20 @@
1060 1183
   (segment (start 162.134315 92.9) (end 146.1 92.9) (width 0.25) (layer B.Cu) (net 9))
1061 1184
   (segment (start 163.1 93.3) (end 162.534315 93.3) (width 0.25) (layer B.Cu) (net 9))
1062 1185
   (segment (start 162.534315 93.3) (end 162.134315 92.9) (width 0.25) (layer B.Cu) (net 9))
1063
-  (via (at 168.8 104) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 10))
1064
-  (segment (start 162.383 104) (end 168.8 104) (width 0.25) (layer B.Cu) (net 10))
1186
+  (via (at 167.64 104) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 10))
1065 1187
   (segment (start 156.178001 110.204999) (end 162.383 104) (width 0.25) (layer B.Cu) (net 10))
1066 1188
   (segment (start 150.51 111.43) (end 151.735001 110.204999) (width 0.25) (layer B.Cu) (net 10))
1067 1189
   (segment (start 151.735001 110.204999) (end 156.178001 110.204999) (width 0.25) (layer B.Cu) (net 10))
1068 1190
   (segment (start 170.96 101.84) (end 170.96 89.5) (width 0.25) (layer F.Cu) (net 10))
1069 1191
   (segment (start 168.8 104) (end 170.96 101.84) (width 0.25) (layer F.Cu) (net 10))
1070
-  (via (at 170 105.2) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 11))
1192
+  (segment (start 162.383 104) (end 167.64 104) (width 0.25) (layer B.Cu) (net 10))
1193
+  (segment (start 167.64 104) (end 168.8 104) (width 0.25) (layer F.Cu) (net 10))
1194
+  (via (at 168.91 105.2) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 11))
1071 1195
   (segment (start 155.59 111.43) (end 161.82 105.2) (width 0.25) (layer B.Cu) (net 11))
1072
-  (segment (start 161.82 105.2) (end 170 105.2) (width 0.25) (layer B.Cu) (net 11))
1073 1196
   (segment (start 173.5 101.7) (end 173.5 89.5) (width 0.25) (layer F.Cu) (net 11))
1074 1197
   (segment (start 170 105.2) (end 173.5 101.7) (width 0.25) (layer F.Cu) (net 11))
1198
+  (segment (start 161.82 105.2) (end 168.91 105.2) (width 0.25) (layer B.Cu) (net 11))
1199
+  (segment (start 168.91 105.2) (end 170 105.2) (width 0.25) (layer F.Cu) (net 11))
1075 1200
   (segment (start 149.55 96.55) (end 149.5 96.5) (width 0.6) (layer B.Cu) (net 12) (status 30))
1076 1201
   (segment (start 152.85 96.55) (end 149.55 96.55) (width 0.6) (layer B.Cu) (net 12) (status 30))
1077 1202
   (segment (start 146.677919 96.5) (end 149.5 96.5) (width 0.6) (layer B.Cu) (net 12) (status 20))
@@ -1087,13 +1212,14 @@
1087 1212
   (segment (start 149.4 105.9) (end 149.5 106) (width 0.6) (layer B.Cu) (net 13))
1088 1213
   (segment (start 146.3 105.9) (end 149.4 105.9) (width 0.6) (layer B.Cu) (net 13))
1089 1214
   (segment (start 149.42 99.8) (end 152.6 99.8) (width 0.25) (layer B.Cu) (net 14))
1090
-  (via (at 155.3 108.8) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 14))
1215
+  (via (at 155.3 106.68) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 14))
1091 1216
   (segment (start 152.6 99.8) (end 155.3 102.5) (width 0.25) (layer B.Cu) (net 14))
1092
-  (segment (start 155.3 102.5) (end 155.3 108.8) (width 0.25) (layer B.Cu) (net 14))
1093 1217
   (segment (start 153.05 111.05) (end 153.05 111.43) (width 0.25) (layer F.Cu) (net 14))
1094 1218
   (segment (start 155.3 108.8) (end 153.05 111.05) (width 0.25) (layer F.Cu) (net 14))
1219
+  (segment (start 155.3 102.5) (end 155.3 106.68) (width 0.25) (layer B.Cu) (net 14))
1220
+  (segment (start 155.3 108.8) (end 155.3 106.68) (width 0.25) (layer F.Cu) (net 14))
1095 1221
 
1096
-  (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 0) (hatch edge 0.508)
1222
+  (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5C4DBD63) (hatch edge 0.508)
1097 1223
     (connect_pads (clearance 0.508))
1098 1224
     (min_thickness 0.254)
1099 1225
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -1107,58 +1233,79 @@
1107 1233
         (xy 145.925741 98.408031) (xy 145.977904 98.486098) (xy 146.287182 98.692751) (xy 146.652 98.765318) (xy 146.744086 98.747001)
1108 1234
         (xy 148.412993 98.747001) (xy 148.385423 98.765423) (xy 148.06826 99.240091) (xy 147.956887 99.8) (xy 148.06826 100.359909)
1109 1235
         (xy 148.385423 100.834577) (xy 148.860091 101.15174) (xy 149.278667 101.235) (xy 149.561333 101.235) (xy 149.979909 101.15174)
1110
-        (xy 150.454577 100.834577) (xy 150.638043 100.56) (xy 152.285199 100.56) (xy 154.54 102.814802) (xy 154.540001 108.096288)
1111
-        (xy 154.422569 108.21372) (xy 154.265 108.594126) (xy 154.265 109.005874) (xy 154.422569 109.38628) (xy 154.481288 109.444999)
1112
-        (xy 154.161387 109.444999) (xy 154.247 109.23831) (xy 154.247 108.63575) (xy 154.08825 108.477) (xy 152.977 108.477)
1113
-        (xy 152.977 108.497) (xy 152.723 108.497) (xy 152.723 108.477) (xy 151.61175 108.477) (xy 151.453 108.63575)
1114
-        (xy 151.453 109.23831) (xy 151.547865 109.467334) (xy 151.438464 109.489095) (xy 151.187072 109.65707) (xy 151.144672 109.720526)
1115
-        (xy 150.924838 109.94036) (xy 150.81533 109.895) (xy 150.20467 109.895) (xy 149.640493 110.12869) (xy 149.20869 110.560493)
1116
-        (xy 148.975 111.12467) (xy 148.975 111.73533) (xy 149.20869 112.299507) (xy 149.640493 112.73131) (xy 149.962042 112.8645)
1117
-        (xy 139.031157 112.8645) (xy 139.14432 112.751337) (xy 139.357 112.237881) (xy 139.357 111.682119) (xy 139.14432 111.168663)
1118
-        (xy 138.751337 110.77568) (xy 138.560353 110.696572) (xy 138.691143 110.642397) (xy 138.760608 110.400213) (xy 138.027 109.666605)
1119
-        (xy 138.027 109.42) (xy 138.139605 109.42) (xy 138.940213 110.220608) (xy 139.182397 110.151143) (xy 139.369144 109.627698)
1120
-        (xy 139.341362 109.072632) (xy 139.182397 108.688857) (xy 139.171565 108.68575) (xy 147.615 108.68575) (xy 147.615 109.27631)
1121
-        (xy 147.711673 109.509699) (xy 147.890302 109.688327) (xy 148.123691 109.785) (xy 148.71425 109.785) (xy 148.873 109.62625)
1122
-        (xy 148.873 108.527) (xy 149.127 108.527) (xy 149.127 109.62625) (xy 149.28575 109.785) (xy 149.876309 109.785)
1123
-        (xy 150.109698 109.688327) (xy 150.288327 109.509699) (xy 150.385 109.27631) (xy 150.385 108.68575) (xy 150.22625 108.527)
1124
-        (xy 149.127 108.527) (xy 148.873 108.527) (xy 147.77375 108.527) (xy 147.615 108.68575) (xy 139.171565 108.68575)
1125
-        (xy 138.940213 108.619392) (xy 138.139605 109.42) (xy 138.027 109.42) (xy 138.027 109.173395) (xy 138.760608 108.439787)
1126
-        (xy 138.691143 108.197603) (xy 138.550607 108.147465) (xy 138.751337 108.06432) (xy 139.14432 107.671337) (xy 139.357 107.157881)
1127
-        (xy 139.357 106.602119) (xy 139.14432 106.088663) (xy 138.751337 105.69568) (xy 138.747586 105.694126) (xy 145.265 105.694126)
1128
-        (xy 145.265 106.105874) (xy 145.422569 106.48628) (xy 145.71372 106.777431) (xy 146.094126 106.935) (xy 146.505874 106.935)
1129
-        (xy 146.747296 106.835) (xy 148.119467 106.835) (xy 148.151843 106.997765) (xy 148.163359 107.015) (xy 148.123691 107.015)
1130
-        (xy 147.890302 107.111673) (xy 147.711673 107.290301) (xy 147.615 107.52369) (xy 147.615 108.11425) (xy 147.77375 108.273)
1131
-        (xy 148.873 108.273) (xy 148.873 108.253) (xy 149.127 108.253) (xy 149.127 108.273) (xy 150.22625 108.273)
1132
-        (xy 150.385 108.11425) (xy 150.385 107.52369) (xy 150.32641 107.382241) (xy 150.497765 107.348157) (xy 150.707809 107.207809)
1133
-        (xy 150.848157 106.997765) (xy 150.870587 106.885) (xy 151.474971 106.885) (xy 151.489843 106.959765) (xy 151.621369 107.156606)
1134
-        (xy 151.549673 107.228301) (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223) (xy 152.723 108.223)
1135
-        (xy 152.723 108.203) (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223) (xy 154.247 108.06425)
1136
-        (xy 154.247 107.46169) (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765) (xy 154.25944 106.712)
1137
-        (xy 154.25944 105.188) (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843) (xy 153.612 104.54056)
1138
-        (xy 152.088 104.54056) (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.474971 105.015)
1139
-        (xy 150.850696 105.015) (xy 150.848157 105.002235) (xy 150.707809 104.792191) (xy 150.497765 104.651843) (xy 150.25 104.60256)
1140
-        (xy 148.75 104.60256) (xy 148.502235 104.651843) (xy 148.292191 104.792191) (xy 148.176723 104.965) (xy 146.747296 104.965)
1141
-        (xy 146.505874 104.865) (xy 146.094126 104.865) (xy 145.71372 105.022569) (xy 145.422569 105.31372) (xy 145.265 105.694126)
1142
-        (xy 138.747586 105.694126) (xy 138.544487 105.61) (xy 138.751337 105.52432) (xy 139.14432 105.131337) (xy 139.357 104.617881)
1143
-        (xy 139.357 104.062119) (xy 139.345881 104.035275) (xy 145.844331 104.035275) (xy 145.906169 104.271042) (xy 146.407122 104.447419)
1144
-        (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275) (xy 146.6 103.279605) (xy 145.844331 104.035275)
1145
-        (xy 139.345881 104.035275) (xy 139.14432 103.548663) (xy 138.751337 103.15568) (xy 138.544487 103.07) (xy 138.751337 102.98432)
1146
-        (xy 138.828535 102.907122) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.428958 103.793831) (xy 145.664725 103.855669)
1236
+        (xy 150.454577 100.834577) (xy 150.638043 100.56) (xy 152.285199 100.56) (xy 154.54 102.814802) (xy 154.540001 105.976288)
1237
+        (xy 154.422569 106.09372) (xy 154.265 106.474126) (xy 154.265 106.885874) (xy 154.422569 107.26628) (xy 154.71372 107.557431)
1238
+        (xy 155.094126 107.715) (xy 155.505874 107.715) (xy 155.88628 107.557431) (xy 156.177431 107.26628) (xy 156.335 106.885874)
1239
+        (xy 156.335 106.474126) (xy 156.177431 106.09372) (xy 156.06 105.976289) (xy 156.06 102.574848) (xy 156.074888 102.5)
1240
+        (xy 156.06 102.425152) (xy 156.06 102.425148) (xy 156.015904 102.203463) (xy 155.847929 101.952071) (xy 155.784473 101.909671)
1241
+        (xy 153.190331 99.31553) (xy 153.147929 99.252071) (xy 152.896537 99.084096) (xy 152.674852 99.04) (xy 152.674847 99.04)
1242
+        (xy 152.6 99.025112) (xy 152.525153 99.04) (xy 150.638043 99.04) (xy 150.454577 98.765423) (xy 150.427007 98.747001)
1243
+        (xy 164.062712 98.747001) (xy 174.26174 108.94603) (xy 174.313903 109.024097) (xy 174.391969 109.076259) (xy 174.623181 109.23075)
1244
+        (xy 174.978228 109.301373) (xy 174.989843 109.359765) (xy 175.130191 109.569809) (xy 175.340235 109.710157) (xy 175.465001 109.734974)
1245
+        (xy 175.465 110.339358) (xy 175.402235 110.351843) (xy 175.192191 110.492191) (xy 175.051843 110.702235) (xy 175.00256 110.95)
1246
+        (xy 175.00256 112.45) (xy 175.051843 112.697765) (xy 175.163253 112.8645) (xy 168.837958 112.8645) (xy 169.159507 112.73131)
1247
+        (xy 169.59131 112.299507) (xy 169.825 111.73533) (xy 169.825 111.12467) (xy 169.59131 110.560493) (xy 169.159507 110.12869)
1248
+        (xy 168.59533 109.895) (xy 167.98467 109.895) (xy 167.420493 110.12869) (xy 167.02 110.529183) (xy 166.619507 110.12869)
1249
+        (xy 166.05533 109.895) (xy 165.44467 109.895) (xy 164.880493 110.12869) (xy 164.48 110.529183) (xy 164.079507 110.12869)
1250
+        (xy 163.51533 109.895) (xy 162.90467 109.895) (xy 162.340493 110.12869) (xy 161.94 110.529183) (xy 161.539507 110.12869)
1251
+        (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869) (xy 159.4 110.529183) (xy 158.999507 110.12869)
1252
+        (xy 158.43533 109.895) (xy 158.199802 109.895) (xy 162.134803 105.96) (xy 168.206289 105.96) (xy 168.32372 106.077431)
1253
+        (xy 168.704126 106.235) (xy 169.115874 106.235) (xy 169.49628 106.077431) (xy 169.787431 105.78628) (xy 169.945 105.405874)
1254
+        (xy 169.945 104.994126) (xy 169.787431 104.61372) (xy 169.49628 104.322569) (xy 169.115874 104.165) (xy 168.704126 104.165)
1255
+        (xy 168.675 104.177064) (xy 168.675 103.794126) (xy 168.517431 103.41372) (xy 168.22628 103.122569) (xy 167.845874 102.965)
1256
+        (xy 167.434126 102.965) (xy 167.05372 103.122569) (xy 166.936289 103.24) (xy 162.457848 103.24) (xy 162.383 103.225112)
1257
+        (xy 162.308152 103.24) (xy 162.308148 103.24) (xy 162.134605 103.27452) (xy 162.086462 103.284096) (xy 161.899418 103.409076)
1258
+        (xy 161.835071 103.452071) (xy 161.792671 103.515527) (xy 155.8632 109.444999) (xy 154.161387 109.444999) (xy 154.247 109.23831)
1259
+        (xy 154.247 108.63575) (xy 154.08825 108.477) (xy 152.977 108.477) (xy 152.977 108.497) (xy 152.723 108.497)
1260
+        (xy 152.723 108.477) (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 151.453 109.23831) (xy 151.547865 109.467334)
1261
+        (xy 151.438464 109.489095) (xy 151.187072 109.65707) (xy 151.144672 109.720526) (xy 150.924838 109.94036) (xy 150.81533 109.895)
1262
+        (xy 150.20467 109.895) (xy 149.640493 110.12869) (xy 149.20869 110.560493) (xy 148.975 111.12467) (xy 148.975 111.73533)
1263
+        (xy 149.20869 112.299507) (xy 149.640493 112.73131) (xy 149.962042 112.8645) (xy 139.031157 112.8645) (xy 139.14432 112.751337)
1264
+        (xy 139.357 112.237881) (xy 139.357 111.682119) (xy 139.14432 111.168663) (xy 138.751337 110.77568) (xy 138.560353 110.696572)
1265
+        (xy 138.691143 110.642397) (xy 138.760608 110.400213) (xy 138.027 109.666605) (xy 138.027 109.42) (xy 138.139605 109.42)
1266
+        (xy 138.940213 110.220608) (xy 139.182397 110.151143) (xy 139.369144 109.627698) (xy 139.341362 109.072632) (xy 139.182397 108.688857)
1267
+        (xy 139.171565 108.68575) (xy 147.615 108.68575) (xy 147.615 109.27631) (xy 147.711673 109.509699) (xy 147.890302 109.688327)
1268
+        (xy 148.123691 109.785) (xy 148.71425 109.785) (xy 148.873 109.62625) (xy 148.873 108.527) (xy 149.127 108.527)
1269
+        (xy 149.127 109.62625) (xy 149.28575 109.785) (xy 149.876309 109.785) (xy 150.109698 109.688327) (xy 150.288327 109.509699)
1270
+        (xy 150.385 109.27631) (xy 150.385 108.68575) (xy 150.22625 108.527) (xy 149.127 108.527) (xy 148.873 108.527)
1271
+        (xy 147.77375 108.527) (xy 147.615 108.68575) (xy 139.171565 108.68575) (xy 138.940213 108.619392) (xy 138.139605 109.42)
1272
+        (xy 138.027 109.42) (xy 138.027 109.173395) (xy 138.760608 108.439787) (xy 138.691143 108.197603) (xy 138.550607 108.147465)
1273
+        (xy 138.751337 108.06432) (xy 139.14432 107.671337) (xy 139.357 107.157881) (xy 139.357 106.602119) (xy 139.34402 106.570782)
1274
+        (xy 139.531474 106.383328) (xy 139.59493 106.340928) (xy 139.762905 106.089536) (xy 139.807001 105.867851) (xy 139.807001 105.867847)
1275
+        (xy 139.821889 105.792999) (xy 139.807001 105.718151) (xy 139.807001 105.694126) (xy 145.265 105.694126) (xy 145.265 106.105874)
1276
+        (xy 145.422569 106.48628) (xy 145.71372 106.777431) (xy 146.094126 106.935) (xy 146.505874 106.935) (xy 146.747296 106.835)
1277
+        (xy 148.119467 106.835) (xy 148.151843 106.997765) (xy 148.163359 107.015) (xy 148.123691 107.015) (xy 147.890302 107.111673)
1278
+        (xy 147.711673 107.290301) (xy 147.615 107.52369) (xy 147.615 108.11425) (xy 147.77375 108.273) (xy 148.873 108.273)
1279
+        (xy 148.873 108.253) (xy 149.127 108.253) (xy 149.127 108.273) (xy 150.22625 108.273) (xy 150.385 108.11425)
1280
+        (xy 150.385 107.52369) (xy 150.32641 107.382241) (xy 150.497765 107.348157) (xy 150.707809 107.207809) (xy 150.848157 106.997765)
1281
+        (xy 150.870587 106.885) (xy 151.474971 106.885) (xy 151.489843 106.959765) (xy 151.621369 107.156606) (xy 151.549673 107.228301)
1282
+        (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223) (xy 152.723 108.223) (xy 152.723 108.203)
1283
+        (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223) (xy 154.247 108.06425) (xy 154.247 107.46169)
1284
+        (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765) (xy 154.25944 106.712) (xy 154.25944 105.188)
1285
+        (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843) (xy 153.612 104.54056) (xy 152.088 104.54056)
1286
+        (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.474971 105.015) (xy 150.850696 105.015)
1287
+        (xy 150.848157 105.002235) (xy 150.707809 104.792191) (xy 150.497765 104.651843) (xy 150.25 104.60256) (xy 148.75 104.60256)
1288
+        (xy 148.502235 104.651843) (xy 148.292191 104.792191) (xy 148.176723 104.965) (xy 146.747296 104.965) (xy 146.505874 104.865)
1289
+        (xy 146.094126 104.865) (xy 145.71372 105.022569) (xy 145.422569 105.31372) (xy 145.265 105.694126) (xy 139.807001 105.694126)
1290
+        (xy 139.807001 104.035275) (xy 145.844331 104.035275) (xy 145.906169 104.271042) (xy 146.407122 104.447419) (xy 146.93744 104.418664)
1291
+        (xy 147.293831 104.271042) (xy 147.355669 104.035275) (xy 146.6 103.279605) (xy 145.844331 104.035275) (xy 139.807001 104.035275)
1292
+        (xy 139.807001 102.907122) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.428958 103.793831) (xy 145.664725 103.855669)
1147 1293
         (xy 146.420395 103.1) (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212)
1148 1294
         (xy 147.968242 103.856217) (xy 148.343783 104.231758) (xy 148.834452 104.435) (xy 149.365548 104.435) (xy 149.856217 104.231758)
1149 1295
         (xy 150.231758 103.856217) (xy 150.435 103.365548) (xy 150.435 102.834452) (xy 150.231758 102.343783) (xy 149.856217 101.968242)
1150 1296
         (xy 149.365548 101.765) (xy 148.834452 101.765) (xy 148.343783 101.968242) (xy 147.968242 102.343783) (xy 147.856721 102.613017)
1151 1297
         (xy 147.771042 102.406169) (xy 147.535275 102.344331) (xy 146.779605 103.1) (xy 146.420395 103.1) (xy 145.664725 102.344331)
1152
-        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 138.828535 102.907122) (xy 139.14432 102.591337) (xy 139.321028 102.164725)
1153
-        (xy 145.844331 102.164725) (xy 146.6 102.920395) (xy 147.355669 102.164725) (xy 147.293831 101.928958) (xy 146.792878 101.752581)
1154
-        (xy 146.26256 101.781336) (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 139.321028 102.164725) (xy 139.357 102.077881)
1155
-        (xy 139.357 101.522119) (xy 139.14432 101.008663) (xy 138.751337 100.61568) (xy 138.544487 100.53) (xy 138.751337 100.44432)
1156
-        (xy 139.14432 100.051337) (xy 139.357 99.537881) (xy 139.357 99.514561) (xy 140.365 99.514561) (xy 140.365 100.085439)
1157
-        (xy 140.583466 100.612862) (xy 140.987138 101.016534) (xy 141.514561 101.235) (xy 142.085439 101.235) (xy 142.612862 101.016534)
1158
-        (xy 143.016534 100.612862) (xy 143.235 100.085439) (xy 143.235 99.514561) (xy 143.016534 98.987138) (xy 142.612862 98.583466)
1159
-        (xy 142.085439 98.365) (xy 141.514561 98.365) (xy 140.987138 98.583466) (xy 140.583466 98.987138) (xy 140.365 99.514561)
1160
-        (xy 139.357 99.514561) (xy 139.357 98.982119) (xy 139.14432 98.468663) (xy 138.751337 98.07568) (xy 138.237881 97.863)
1161
-        (xy 138.027 97.863) (xy 138.027 90.509289)
1298
+        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 139.807001 102.907122) (xy 139.807001 102.164725) (xy 145.844331 102.164725)
1299
+        (xy 146.6 102.920395) (xy 147.355669 102.164725) (xy 147.293831 101.928958) (xy 146.792878 101.752581) (xy 146.26256 101.781336)
1300
+        (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 139.807001 102.164725) (xy 139.807001 99.514561) (xy 140.365 99.514561)
1301
+        (xy 140.365 100.085439) (xy 140.583466 100.612862) (xy 140.987138 101.016534) (xy 141.514561 101.235) (xy 142.085439 101.235)
1302
+        (xy 142.612862 101.016534) (xy 143.016534 100.612862) (xy 143.235 100.085439) (xy 143.235 99.514561) (xy 143.016534 98.987138)
1303
+        (xy 142.612862 98.583466) (xy 142.085439 98.365) (xy 141.514561 98.365) (xy 140.987138 98.583466) (xy 140.583466 98.987138)
1304
+        (xy 140.365 99.514561) (xy 139.807001 99.514561) (xy 139.807001 97.071362) (xy 139.821889 96.996515) (xy 139.807001 96.921668)
1305
+        (xy 139.807001 96.921663) (xy 139.762905 96.699978) (xy 139.59493 96.448586) (xy 139.531471 96.406184) (xy 139.330486 96.205199)
1306
+        (xy 139.330486 96.166339) (xy 139.401725 96.118739) (xy 139.589491 95.837727) (xy 139.655426 95.50625) (xy 139.655426 94.99375)
1307
+        (xy 139.589491 94.662273) (xy 139.401725 94.381261) (xy 139.330486 94.333661) (xy 139.330486 93.626339) (xy 139.401725 93.578739)
1308
+        (xy 139.589491 93.297727) (xy 139.655426 92.96625) (xy 139.655426 92.45375) (xy 139.589491 92.122273) (xy 139.487816 91.970105)
1162 1309
       )
1163 1310
     )
1164 1311
     (filled_polygon
@@ -1185,7 +1332,7 @@
1185 1332
       )
1186 1333
     )
1187 1334
   )
1188
-  (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
1335
+  (zone (net 2) (net_name GND) (layer F.Cu) (tstamp 5C4DBD60) (hatch edge 0.508)
1189 1336
     (connect_pads (clearance 0.508))
1190 1337
     (min_thickness 0.254)
1191 1338
     (fill yes (arc_segments 16) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -1220,110 +1367,113 @@
1220 1367
         (xy 166.980562 87.720115) (xy 166.830159 87.669446) (xy 165.929605 88.57) (xy 166.830159 89.470554) (xy 166.980562 89.419885)
1221 1368
         (xy 166.98869 89.439507) (xy 167.420493 89.87131) (xy 167.98467 90.105) (xy 168.59533 90.105) (xy 169.159507 89.87131)
1222 1369
         (xy 169.459995 89.570822) (xy 169.561161 90.079418) (xy 169.889375 90.570625) (xy 170.200001 90.778179) (xy 170.2 101.525197)
1223
-        (xy 168.760199 102.965) (xy 168.594126 102.965) (xy 168.21372 103.122569) (xy 167.922569 103.41372) (xy 167.765 103.794126)
1224
-        (xy 167.765 104.205874) (xy 167.922569 104.58628) (xy 168.21372 104.877431) (xy 168.594126 105.035) (xy 168.965 105.035)
1225
-        (xy 168.965 105.405874) (xy 169.122569 105.78628) (xy 169.41372 106.077431) (xy 169.794126 106.235) (xy 170.205874 106.235)
1226
-        (xy 170.58628 106.077431) (xy 170.877431 105.78628) (xy 171.035 105.405874) (xy 171.035 105.239801) (xy 173.984476 102.290327)
1227
-        (xy 174.047929 102.247929) (xy 174.090327 102.184476) (xy 174.090329 102.184474) (xy 174.215903 101.996538) (xy 174.215904 101.996537)
1228
-        (xy 174.26 101.774852) (xy 174.26 101.774848) (xy 174.274888 101.700001) (xy 174.26 101.625154) (xy 174.26 90.99744)
1229
-        (xy 174.35 90.99744) (xy 174.597765 90.948157) (xy 174.807809 90.807809) (xy 174.948157 90.597765) (xy 174.99744 90.35)
1230
-        (xy 174.99744 88.65) (xy 174.948157 88.402235) (xy 174.807809 88.192191) (xy 174.597765 88.051843) (xy 174.35 88.00256)
1231
-        (xy 172.65 88.00256) (xy 172.402235 88.051843) (xy 172.192191 88.192191) (xy 172.051843 88.402235) (xy 172.042816 88.447619)
1232
-        (xy 172.030625 88.429375) (xy 171.539418 88.101161) (xy 171.106256 88.015) (xy 170.813744 88.015) (xy 170.380582 88.101161)
1233
-        (xy 169.889375 88.429375) (xy 169.825 88.525719) (xy 169.825 88.26467) (xy 169.59131 87.700493) (xy 169.159507 87.26869)
1234
-        (xy 168.596537 87.0355) (xy 177.3645 87.0355) (xy 177.3645 92.793007) (xy 177.359765 92.789843) (xy 177.112 92.74056)
1235
-        (xy 175.588 92.74056) (xy 175.340235 92.789843) (xy 175.130191 92.930191) (xy 174.989843 93.140235) (xy 174.94056 93.388)
1236
-        (xy 174.94056 94.912) (xy 174.989843 95.159765) (xy 175.130191 95.369809) (xy 175.340235 95.510157) (xy 175.588 95.55944)
1237
-        (xy 177.112 95.55944) (xy 177.359765 95.510157) (xy 177.3645 95.506993) (xy 177.364501 106.993007) (xy 177.359765 106.989843)
1238
-        (xy 177.112 106.94056) (xy 175.588 106.94056) (xy 175.340235 106.989843) (xy 175.130191 107.130191) (xy 174.989843 107.340235)
1239
-        (xy 174.94056 107.588) (xy 174.94056 109.112) (xy 174.989843 109.359765) (xy 175.130191 109.569809) (xy 175.340235 109.710157)
1240
-        (xy 175.588 109.75944) (xy 177.112 109.75944) (xy 177.359765 109.710157) (xy 177.364501 109.706993) (xy 177.364501 112.8645)
1241
-        (xy 168.837958 112.8645) (xy 169.159507 112.73131) (xy 169.59131 112.299507) (xy 169.825 111.73533) (xy 169.825 111.12467)
1242
-        (xy 169.59131 110.560493) (xy 169.159507 110.12869) (xy 168.59533 109.895) (xy 167.98467 109.895) (xy 167.420493 110.12869)
1243
-        (xy 167.02 110.529183) (xy 166.619507 110.12869) (xy 166.05533 109.895) (xy 165.44467 109.895) (xy 164.880493 110.12869)
1244
-        (xy 164.48 110.529183) (xy 164.196413 110.245596) (xy 165.684473 108.757537) (xy 165.747929 108.715137) (xy 165.915904 108.463745)
1245
-        (xy 165.96 108.24206) (xy 165.96 108.242055) (xy 165.974888 108.167208) (xy 165.96 108.092361) (xy 165.96 94.774847)
1246
-        (xy 165.974888 94.7) (xy 165.96 94.625153) (xy 165.96 94.625148) (xy 165.915904 94.403463) (xy 165.747929 94.152071)
1247
-        (xy 165.684473 94.109671) (xy 164.390331 92.81553) (xy 164.347929 92.752071) (xy 164.096537 92.584096) (xy 163.874852 92.54)
1248
-        (xy 163.874847 92.54) (xy 163.8 92.525112) (xy 163.790677 92.526966) (xy 163.68628 92.422569) (xy 163.305874 92.265)
1249
-        (xy 162.894126 92.265) (xy 162.51372 92.422569) (xy 162.222569 92.71372) (xy 162.065 93.094126) (xy 162.065 93.505874)
1250
-        (xy 162.222569 93.88628) (xy 162.51372 94.177431) (xy 162.894126 94.335) (xy 163.305874 94.335) (xy 163.62713 94.201932)
1251
-        (xy 164.440001 95.014803) (xy 164.44 107.852406) (xy 162.725528 109.566879) (xy 162.662072 109.609279) (xy 162.619672 109.672735)
1252
-        (xy 162.619671 109.672736) (xy 162.494097 109.860671) (xy 162.44979 110.083418) (xy 162.340493 110.12869) (xy 161.94 110.529183)
1253
-        (xy 161.539507 110.12869) (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869) (xy 159.4 110.529183)
1254
-        (xy 158.999507 110.12869) (xy 158.43533 109.895) (xy 157.82467 109.895) (xy 157.260493 110.12869) (xy 156.86 110.529183)
1255
-        (xy 156.459507 110.12869) (xy 155.89533 109.895) (xy 155.28467 109.895) (xy 155.276359 109.898442) (xy 155.339802 109.835)
1256
-        (xy 155.505874 109.835) (xy 155.88628 109.677431) (xy 156.177431 109.38628) (xy 156.335 109.005874) (xy 156.335 108.594126)
1257
-        (xy 156.177431 108.21372) (xy 155.88628 107.922569) (xy 155.505874 107.765) (xy 155.094126 107.765) (xy 154.71372 107.922569)
1258
-        (xy 154.422569 108.21372) (xy 154.265 108.594126) (xy 154.265 108.760198) (xy 154.247 108.778198) (xy 154.247 108.63575)
1259
-        (xy 154.08825 108.477) (xy 152.977 108.477) (xy 152.977 109.58825) (xy 153.13575 109.747) (xy 153.278199 109.747)
1260
-        (xy 153.130199 109.895) (xy 152.74467 109.895) (xy 152.180493 110.12869) (xy 151.78 110.529183) (xy 151.379507 110.12869)
1261
-        (xy 150.81533 109.895) (xy 150.20467 109.895) (xy 149.640493 110.12869) (xy 149.20869 110.560493) (xy 148.975 111.12467)
1262
-        (xy 148.975 111.73533) (xy 149.041138 111.895001) (xy 144.049803 111.895001) (xy 140.790552 108.63575) (xy 151.453 108.63575)
1263
-        (xy 151.453 109.23831) (xy 151.549673 109.471699) (xy 151.728302 109.650327) (xy 151.961691 109.747) (xy 152.56425 109.747)
1264
-        (xy 152.723 109.58825) (xy 152.723 108.477) (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 140.790552 108.63575)
1265
-        (xy 139.34402 107.189218) (xy 139.357 107.157881) (xy 139.357 106.602119) (xy 139.14432 106.088663) (xy 138.751337 105.69568)
1266
-        (xy 138.544487 105.61) (xy 138.751337 105.52432) (xy 139.14432 105.131337) (xy 139.357 104.617881) (xy 139.357 104.062119)
1267
-        (xy 139.14432 103.548663) (xy 138.751337 103.15568) (xy 138.544487 103.07) (xy 138.751337 102.98432) (xy 139.14432 102.591337)
1268
-        (xy 139.357 102.077881) (xy 139.357 101.522119) (xy 139.14432 101.008663) (xy 138.751337 100.61568) (xy 138.544487 100.53)
1269
-        (xy 138.751337 100.44432) (xy 139.14432 100.051337) (xy 139.357 99.537881) (xy 139.357 98.982119) (xy 139.14432 98.468663)
1270
-        (xy 138.751337 98.07568) (xy 138.237881 97.863) (xy 137.682119 97.863) (xy 137.168663 98.07568) (xy 136.77568 98.468663)
1271
-        (xy 136.563 98.982119) (xy 136.563 99.328198) (xy 133.76 96.525199) (xy 133.76 93.994847) (xy 133.774888 93.92)
1272
-        (xy 133.76 93.845153) (xy 133.76 93.845148) (xy 133.715904 93.623463) (xy 133.547929 93.372071) (xy 133.484473 93.329671)
1273
-        (xy 132.207 92.052199) (xy 132.207 89.707802) (xy 133.307293 88.60751) (xy 133.401161 89.079418) (xy 133.729375 89.570625)
1274
-        (xy 134.220582 89.898839) (xy 134.653744 89.985) (xy 134.946256 89.985) (xy 135.379418 89.898839) (xy 135.870625 89.570625)
1275
-        (xy 136.07 89.272239) (xy 136.269375 89.570625) (xy 136.760582 89.898839) (xy 137.193744 89.985) (xy 137.486256 89.985)
1276
-        (xy 137.919418 89.898839) (xy 138.410625 89.570625) (xy 138.61 89.272239) (xy 138.809375 89.570625) (xy 139.300582 89.898839)
1277
-        (xy 139.733744 89.985) (xy 140.026256 89.985) (xy 140.459418 89.898839) (xy 140.950625 89.570625) (xy 141.15 89.272239)
1278
-        (xy 141.315845 89.520444) (xy 141.122569 89.71372) (xy 140.965 90.094126) (xy 140.965 90.505874) (xy 141.065 90.747296)
1279
-        (xy 141.065001 98.551214) (xy 140.987138 98.583466) (xy 140.583466 98.987138) (xy 140.365 99.514561) (xy 140.365 100.085439)
1280
-        (xy 140.583466 100.612862) (xy 140.987138 101.016534) (xy 141.514561 101.235) (xy 142.085439 101.235) (xy 142.335 101.131628)
1281
-        (xy 142.335 102.777909) (xy 142.316682 102.869999) (xy 142.389249 103.234817) (xy 142.54374 103.466029) (xy 142.595903 103.544096)
1282
-        (xy 142.673969 103.596258) (xy 145.30397 106.22626) (xy 145.303973 106.226262) (xy 145.322569 106.244858) (xy 145.422569 106.48628)
1283
-        (xy 145.71372 106.777431) (xy 146.094126 106.935) (xy 146.505874 106.935) (xy 146.88628 106.777431) (xy 147.177431 106.48628)
1284
-        (xy 147.335 106.105874) (xy 147.335 105.694126) (xy 147.177431 105.31372) (xy 147.051711 105.188) (xy 151.44056 105.188)
1285
-        (xy 151.44056 106.712) (xy 151.489843 106.959765) (xy 151.621369 107.156606) (xy 151.549673 107.228301) (xy 151.453 107.46169)
1286
-        (xy 151.453 108.06425) (xy 151.61175 108.223) (xy 152.723 108.223) (xy 152.723 108.203) (xy 152.977 108.203)
1287
-        (xy 152.977 108.223) (xy 154.08825 108.223) (xy 154.247 108.06425) (xy 154.247 107.46169) (xy 154.150327 107.228301)
1288
-        (xy 154.078631 107.156606) (xy 154.210157 106.959765) (xy 154.25944 106.712) (xy 154.25944 105.188) (xy 154.210157 104.940235)
1289
-        (xy 154.069809 104.730191) (xy 153.859765 104.589843) (xy 153.612 104.54056) (xy 152.088 104.54056) (xy 151.840235 104.589843)
1290
-        (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.44056 105.188) (xy 147.051711 105.188) (xy 146.88628 105.022569)
1291
-        (xy 146.644858 104.922569) (xy 146.626262 104.903973) (xy 146.62626 104.90397) (xy 146.040697 104.318407) (xy 146.407122 104.447419)
1292
-        (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275) (xy 146.6 103.279605) (xy 146.585858 103.293748)
1293
-        (xy 146.406252 103.114142) (xy 146.420395 103.1) (xy 145.664725 102.344331) (xy 145.428958 102.406169) (xy 145.252581 102.907122)
1294
-        (xy 145.281336 103.43744) (xy 145.367325 103.645035) (xy 144.204999 102.48271) (xy 144.204999 99.059978) (xy 144.244097 99.256537)
1295
-        (xy 144.283514 99.315528) (xy 144.412072 99.507929) (xy 144.475528 99.550329) (xy 146.683699 101.758501) (xy 146.26256 101.781336)
1296
-        (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 146.6 102.920395) (xy 146.614142 102.906252) (xy 146.793748 103.085858)
1297
-        (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212) (xy 147.968242 103.856217)
1298
-        (xy 148.343783 104.231758) (xy 148.834452 104.435) (xy 149.365548 104.435) (xy 149.856217 104.231758) (xy 150.231758 103.856217)
1299
-        (xy 150.435 103.365548) (xy 150.435 102.834452) (xy 150.231758 102.343783) (xy 149.856217 101.968242) (xy 149.365548 101.765)
1300
-        (xy 148.839802 101.765) (xy 146.874802 99.8) (xy 147.956887 99.8) (xy 148.06826 100.359909) (xy 148.385423 100.834577)
1301
-        (xy 148.860091 101.15174) (xy 149.278667 101.235) (xy 149.561333 101.235) (xy 149.979909 101.15174) (xy 150.454577 100.834577)
1302
-        (xy 150.77174 100.359909) (xy 150.883113 99.8) (xy 150.77174 99.240091) (xy 150.454577 98.765423) (xy 149.979909 98.44826)
1303
-        (xy 149.561333 98.365) (xy 149.278667 98.365) (xy 148.860091 98.44826) (xy 148.385423 98.765423) (xy 148.06826 99.240091)
1304
-        (xy 147.956887 99.8) (xy 146.874802 99.8) (xy 145.72 98.645199) (xy 145.72 93.388) (xy 151.44056 93.388)
1305
-        (xy 151.44056 94.912) (xy 151.489843 95.159765) (xy 151.616955 95.35) (xy 151.489843 95.540235) (xy 151.44056 95.788)
1306
-        (xy 151.44056 97.312) (xy 151.489843 97.559765) (xy 151.630191 97.769809) (xy 151.840235 97.910157) (xy 152.088 97.95944)
1307
-        (xy 153.612 97.95944) (xy 153.859765 97.910157) (xy 154.069809 97.769809) (xy 154.210157 97.559765) (xy 154.25944 97.312)
1308
-        (xy 154.25944 95.788) (xy 154.210157 95.540235) (xy 154.083045 95.35) (xy 154.210157 95.159765) (xy 154.25944 94.912)
1309
-        (xy 154.25944 93.388) (xy 154.210157 93.140235) (xy 154.069809 92.930191) (xy 153.859765 92.789843) (xy 153.612 92.74056)
1310
-        (xy 152.088 92.74056) (xy 151.840235 92.789843) (xy 151.630191 92.930191) (xy 151.489843 93.140235) (xy 151.44056 93.388)
1311
-        (xy 145.72 93.388) (xy 145.72 89.778178) (xy 146.030625 89.570625) (xy 146.045096 89.548967) (xy 146.111673 89.709698)
1312
-        (xy 146.290301 89.888327) (xy 146.52369 89.985) (xy 147.21425 89.985) (xy 147.373 89.82625) (xy 147.373 88.627)
1313
-        (xy 147.353 88.627) (xy 147.353 88.373) (xy 147.373 88.373) (xy 147.373 88.353) (xy 147.627 88.353)
1314
-        (xy 147.627 88.373) (xy 147.647 88.373) (xy 147.647 88.627) (xy 147.627 88.627) (xy 147.627 89.82625)
1315
-        (xy 147.78575 89.985) (xy 148.47631 89.985) (xy 148.709699 89.888327) (xy 148.888327 89.709698) (xy 148.985 89.476309)
1316
-        (xy 148.985 88.899472) (xy 149.20869 89.439507) (xy 149.640493 89.87131) (xy 150.20467 90.105) (xy 150.81533 90.105)
1317
-        (xy 151.379507 89.87131) (xy 151.78 89.470817) (xy 152.180493 89.87131) (xy 152.74467 90.105) (xy 153.35533 90.105)
1318
-        (xy 153.919507 89.87131) (xy 154.32 89.470817) (xy 154.720493 89.87131) (xy 155.28467 90.105) (xy 155.89533 90.105)
1319
-        (xy 156.459507 89.87131) (xy 156.86 89.470817) (xy 157.260493 89.87131) (xy 157.82467 90.105) (xy 158.43533 90.105)
1320
-        (xy 158.999507 89.87131) (xy 159.4 89.470817) (xy 159.800493 89.87131) (xy 160.36467 90.105) (xy 160.97533 90.105)
1321
-        (xy 161.539507 89.87131) (xy 161.94 89.470817) (xy 162.340493 89.87131) (xy 162.90467 90.105) (xy 163.51533 90.105)
1322
-        (xy 164.079507 89.87131) (xy 164.300658 89.650159) (xy 164.849446 89.650159) (xy 164.935852 89.906643) (xy 165.509336 90.116458)
1323
-        (xy 166.11946 90.090839) (xy 166.564148 89.906643) (xy 166.650554 89.650159) (xy 165.75 88.749605) (xy 164.849446 89.650159)
1324
-        (xy 164.300658 89.650159) (xy 164.51131 89.439507) (xy 164.519438 89.419885) (xy 164.669841 89.470554) (xy 165.570395 88.57)
1325
-        (xy 164.669841 87.669446) (xy 164.519438 87.720115) (xy 164.51131 87.700493) (xy 164.079507 87.26869) (xy 163.516537 87.0355)
1326
-        (xy 165.705881 87.0355)
1370
+        (xy 168.485199 103.24) (xy 168.343711 103.24) (xy 168.22628 103.122569) (xy 167.845874 102.965) (xy 167.434126 102.965)
1371
+        (xy 167.05372 103.122569) (xy 166.762569 103.41372) (xy 166.605 103.794126) (xy 166.605 104.205874) (xy 166.762569 104.58628)
1372
+        (xy 167.05372 104.877431) (xy 167.434126 105.035) (xy 167.845874 105.035) (xy 167.875 105.022936) (xy 167.875 105.405874)
1373
+        (xy 168.032569 105.78628) (xy 168.32372 106.077431) (xy 168.704126 106.235) (xy 169.115874 106.235) (xy 169.49628 106.077431)
1374
+        (xy 169.613711 105.96) (xy 169.925153 105.96) (xy 170 105.974888) (xy 170.074847 105.96) (xy 170.074852 105.96)
1375
+        (xy 170.296537 105.915904) (xy 170.547929 105.747929) (xy 170.590331 105.68447) (xy 173.984476 102.290327) (xy 174.047929 102.247929)
1376
+        (xy 174.090327 102.184476) (xy 174.090329 102.184474) (xy 174.215903 101.996538) (xy 174.215904 101.996537) (xy 174.26 101.774852)
1377
+        (xy 174.26 101.774848) (xy 174.274888 101.700001) (xy 174.26 101.625154) (xy 174.26 90.99744) (xy 174.35 90.99744)
1378
+        (xy 174.597765 90.948157) (xy 174.807809 90.807809) (xy 174.948157 90.597765) (xy 174.99744 90.35) (xy 174.99744 88.65)
1379
+        (xy 174.948157 88.402235) (xy 174.807809 88.192191) (xy 174.597765 88.051843) (xy 174.35 88.00256) (xy 172.65 88.00256)
1380
+        (xy 172.402235 88.051843) (xy 172.192191 88.192191) (xy 172.051843 88.402235) (xy 172.042816 88.447619) (xy 172.030625 88.429375)
1381
+        (xy 171.539418 88.101161) (xy 171.106256 88.015) (xy 170.813744 88.015) (xy 170.380582 88.101161) (xy 169.889375 88.429375)
1382
+        (xy 169.825 88.525719) (xy 169.825 88.26467) (xy 169.59131 87.700493) (xy 169.159507 87.26869) (xy 168.596537 87.0355)
1383
+        (xy 177.3645 87.0355) (xy 177.3645 92.793007) (xy 177.359765 92.789843) (xy 177.112 92.74056) (xy 175.588 92.74056)
1384
+        (xy 175.340235 92.789843) (xy 175.130191 92.930191) (xy 174.989843 93.140235) (xy 174.94056 93.388) (xy 174.94056 94.912)
1385
+        (xy 174.989843 95.159765) (xy 175.130191 95.369809) (xy 175.340235 95.510157) (xy 175.588 95.55944) (xy 177.112 95.55944)
1386
+        (xy 177.359765 95.510157) (xy 177.3645 95.506993) (xy 177.364501 106.993007) (xy 177.359765 106.989843) (xy 177.112 106.94056)
1387
+        (xy 175.588 106.94056) (xy 175.340235 106.989843) (xy 175.130191 107.130191) (xy 174.989843 107.340235) (xy 174.94056 107.588)
1388
+        (xy 174.94056 109.112) (xy 174.989843 109.359765) (xy 175.130191 109.569809) (xy 175.340235 109.710157) (xy 175.588 109.75944)
1389
+        (xy 177.112 109.75944) (xy 177.359765 109.710157) (xy 177.364501 109.706993) (xy 177.364501 112.8645) (xy 168.837958 112.8645)
1390
+        (xy 169.159507 112.73131) (xy 169.59131 112.299507) (xy 169.825 111.73533) (xy 169.825 111.12467) (xy 169.59131 110.560493)
1391
+        (xy 169.159507 110.12869) (xy 168.59533 109.895) (xy 167.98467 109.895) (xy 167.420493 110.12869) (xy 167.02 110.529183)
1392
+        (xy 166.619507 110.12869) (xy 166.05533 109.895) (xy 165.44467 109.895) (xy 164.880493 110.12869) (xy 164.48 110.529183)
1393
+        (xy 164.196413 110.245596) (xy 165.684473 108.757537) (xy 165.747929 108.715137) (xy 165.915904 108.463745) (xy 165.96 108.24206)
1394
+        (xy 165.96 108.242055) (xy 165.974888 108.167208) (xy 165.96 108.092361) (xy 165.96 94.774847) (xy 165.974888 94.7)
1395
+        (xy 165.96 94.625153) (xy 165.96 94.625148) (xy 165.915904 94.403463) (xy 165.747929 94.152071) (xy 165.684473 94.109671)
1396
+        (xy 164.390331 92.81553) (xy 164.347929 92.752071) (xy 164.096537 92.584096) (xy 163.874852 92.54) (xy 163.874847 92.54)
1397
+        (xy 163.8 92.525112) (xy 163.790677 92.526966) (xy 163.68628 92.422569) (xy 163.305874 92.265) (xy 162.894126 92.265)
1398
+        (xy 162.51372 92.422569) (xy 162.222569 92.71372) (xy 162.065 93.094126) (xy 162.065 93.505874) (xy 162.222569 93.88628)
1399
+        (xy 162.51372 94.177431) (xy 162.894126 94.335) (xy 163.305874 94.335) (xy 163.62713 94.201932) (xy 164.440001 95.014803)
1400
+        (xy 164.44 107.852406) (xy 162.725528 109.566879) (xy 162.662072 109.609279) (xy 162.619672 109.672735) (xy 162.619671 109.672736)
1401
+        (xy 162.494097 109.860671) (xy 162.44979 110.083418) (xy 162.340493 110.12869) (xy 161.94 110.529183) (xy 161.539507 110.12869)
1402
+        (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869) (xy 159.4 110.529183) (xy 158.999507 110.12869)
1403
+        (xy 158.43533 109.895) (xy 157.82467 109.895) (xy 157.260493 110.12869) (xy 156.86 110.529183) (xy 156.459507 110.12869)
1404
+        (xy 155.89533 109.895) (xy 155.28467 109.895) (xy 155.276359 109.898442) (xy 155.784473 109.390329) (xy 155.847929 109.347929)
1405
+        (xy 156.015904 109.096537) (xy 156.06 108.874852) (xy 156.06 108.874848) (xy 156.074888 108.8) (xy 156.06 108.725152)
1406
+        (xy 156.06 107.383711) (xy 156.177431 107.26628) (xy 156.335 106.885874) (xy 156.335 106.474126) (xy 156.177431 106.09372)
1407
+        (xy 155.88628 105.802569) (xy 155.505874 105.645) (xy 155.094126 105.645) (xy 154.71372 105.802569) (xy 154.422569 106.09372)
1408
+        (xy 154.265 106.474126) (xy 154.265 106.885874) (xy 154.422569 107.26628) (xy 154.540001 107.383712) (xy 154.54 108.485198)
1409
+        (xy 154.247 108.778198) (xy 154.247 108.63575) (xy 154.08825 108.477) (xy 152.977 108.477) (xy 152.977 109.58825)
1410
+        (xy 153.13575 109.747) (xy 153.278199 109.747) (xy 153.130199 109.895) (xy 152.74467 109.895) (xy 152.180493 110.12869)
1411
+        (xy 151.78 110.529183) (xy 151.379507 110.12869) (xy 150.81533 109.895) (xy 150.20467 109.895) (xy 149.640493 110.12869)
1412
+        (xy 149.20869 110.560493) (xy 148.975 111.12467) (xy 148.975 111.73533) (xy 149.041138 111.895001) (xy 144.049803 111.895001)
1413
+        (xy 140.790552 108.63575) (xy 151.453 108.63575) (xy 151.453 109.23831) (xy 151.549673 109.471699) (xy 151.728302 109.650327)
1414
+        (xy 151.961691 109.747) (xy 152.56425 109.747) (xy 152.723 109.58825) (xy 152.723 108.477) (xy 151.61175 108.477)
1415
+        (xy 151.453 108.63575) (xy 140.790552 108.63575) (xy 139.34402 107.189218) (xy 139.357 107.157881) (xy 139.357 106.602119)
1416
+        (xy 139.14432 106.088663) (xy 138.751337 105.69568) (xy 138.544487 105.61) (xy 138.751337 105.52432) (xy 139.14432 105.131337)
1417
+        (xy 139.357 104.617881) (xy 139.357 104.062119) (xy 139.14432 103.548663) (xy 138.751337 103.15568) (xy 138.544487 103.07)
1418
+        (xy 138.751337 102.98432) (xy 139.14432 102.591337) (xy 139.357 102.077881) (xy 139.357 101.522119) (xy 139.14432 101.008663)
1419
+        (xy 138.751337 100.61568) (xy 138.544487 100.53) (xy 138.751337 100.44432) (xy 139.14432 100.051337) (xy 139.357 99.537881)
1420
+        (xy 139.357 98.982119) (xy 139.14432 98.468663) (xy 138.751337 98.07568) (xy 138.237881 97.863) (xy 137.682119 97.863)
1421
+        (xy 137.168663 98.07568) (xy 136.77568 98.468663) (xy 136.563 98.982119) (xy 136.563 99.328198) (xy 133.76 96.525199)
1422
+        (xy 133.76 93.994846) (xy 133.774888 93.919999) (xy 133.76 93.845152) (xy 133.76 93.845148) (xy 133.715904 93.623463)
1423
+        (xy 133.547929 93.372071) (xy 133.484473 93.329671) (xy 132.207 92.052199) (xy 132.207 89.707801) (xy 133.307293 88.607509)
1424
+        (xy 133.401161 89.079418) (xy 133.729375 89.570625) (xy 134.220582 89.898839) (xy 134.653744 89.985) (xy 134.946256 89.985)
1425
+        (xy 135.379418 89.898839) (xy 135.870625 89.570625) (xy 136.07 89.272239) (xy 136.269375 89.570625) (xy 136.760582 89.898839)
1426
+        (xy 137.193744 89.985) (xy 137.486256 89.985) (xy 137.919418 89.898839) (xy 138.410625 89.570625) (xy 138.61 89.272239)
1427
+        (xy 138.809375 89.570625) (xy 139.300582 89.898839) (xy 139.733744 89.985) (xy 140.026256 89.985) (xy 140.459418 89.898839)
1428
+        (xy 140.950625 89.570625) (xy 141.15 89.272239) (xy 141.315845 89.520444) (xy 141.122569 89.71372) (xy 140.965 90.094126)
1429
+        (xy 140.965 90.505874) (xy 141.065 90.747296) (xy 141.065001 98.551214) (xy 140.987138 98.583466) (xy 140.583466 98.987138)
1430
+        (xy 140.365 99.514561) (xy 140.365 100.085439) (xy 140.583466 100.612862) (xy 140.987138 101.016534) (xy 141.514561 101.235)
1431
+        (xy 142.085439 101.235) (xy 142.335 101.131628) (xy 142.335 102.777909) (xy 142.316682 102.869999) (xy 142.389249 103.234817)
1432
+        (xy 142.54374 103.466029) (xy 142.595903 103.544096) (xy 142.673969 103.596258) (xy 145.30397 106.22626) (xy 145.303973 106.226262)
1433
+        (xy 145.322569 106.244858) (xy 145.422569 106.48628) (xy 145.71372 106.777431) (xy 146.094126 106.935) (xy 146.505874 106.935)
1434
+        (xy 146.88628 106.777431) (xy 147.177431 106.48628) (xy 147.335 106.105874) (xy 147.335 105.694126) (xy 147.177431 105.31372)
1435
+        (xy 147.051711 105.188) (xy 151.44056 105.188) (xy 151.44056 106.712) (xy 151.489843 106.959765) (xy 151.621369 107.156606)
1436
+        (xy 151.549673 107.228301) (xy 151.453 107.46169) (xy 151.453 108.06425) (xy 151.61175 108.223) (xy 152.723 108.223)
1437
+        (xy 152.723 108.203) (xy 152.977 108.203) (xy 152.977 108.223) (xy 154.08825 108.223) (xy 154.247 108.06425)
1438
+        (xy 154.247 107.46169) (xy 154.150327 107.228301) (xy 154.078631 107.156606) (xy 154.210157 106.959765) (xy 154.25944 106.712)
1439
+        (xy 154.25944 105.188) (xy 154.210157 104.940235) (xy 154.069809 104.730191) (xy 153.859765 104.589843) (xy 153.612 104.54056)
1440
+        (xy 152.088 104.54056) (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.44056 105.188)
1441
+        (xy 147.051711 105.188) (xy 146.88628 105.022569) (xy 146.644858 104.922569) (xy 146.626262 104.903973) (xy 146.62626 104.90397)
1442
+        (xy 146.040697 104.318407) (xy 146.407122 104.447419) (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275)
1443
+        (xy 146.6 103.279605) (xy 146.585858 103.293748) (xy 146.406252 103.114142) (xy 146.420395 103.1) (xy 145.664725 102.344331)
1444
+        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.367325 103.645035) (xy 144.204999 102.48271)
1445
+        (xy 144.204999 99.059978) (xy 144.244097 99.256537) (xy 144.283514 99.315528) (xy 144.412072 99.507929) (xy 144.475528 99.550329)
1446
+        (xy 146.683699 101.758501) (xy 146.26256 101.781336) (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 146.6 102.920395)
1447
+        (xy 146.614142 102.906252) (xy 146.793748 103.085858) (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831)
1448
+        (xy 147.849775 103.570212) (xy 147.968242 103.856217) (xy 148.343783 104.231758) (xy 148.834452 104.435) (xy 149.365548 104.435)
1449
+        (xy 149.856217 104.231758) (xy 150.231758 103.856217) (xy 150.435 103.365548) (xy 150.435 102.834452) (xy 150.231758 102.343783)
1450
+        (xy 149.856217 101.968242) (xy 149.365548 101.765) (xy 148.839802 101.765) (xy 146.874802 99.8) (xy 147.956887 99.8)
1451
+        (xy 148.06826 100.359909) (xy 148.385423 100.834577) (xy 148.860091 101.15174) (xy 149.278667 101.235) (xy 149.561333 101.235)
1452
+        (xy 149.979909 101.15174) (xy 150.454577 100.834577) (xy 150.77174 100.359909) (xy 150.883113 99.8) (xy 150.77174 99.240091)
1453
+        (xy 150.454577 98.765423) (xy 149.979909 98.44826) (xy 149.561333 98.365) (xy 149.278667 98.365) (xy 148.860091 98.44826)
1454
+        (xy 148.385423 98.765423) (xy 148.06826 99.240091) (xy 147.956887 99.8) (xy 146.874802 99.8) (xy 145.72 98.645199)
1455
+        (xy 145.72 93.388) (xy 151.44056 93.388) (xy 151.44056 94.912) (xy 151.489843 95.159765) (xy 151.616955 95.35)
1456
+        (xy 151.489843 95.540235) (xy 151.44056 95.788) (xy 151.44056 97.312) (xy 151.489843 97.559765) (xy 151.630191 97.769809)
1457
+        (xy 151.840235 97.910157) (xy 152.088 97.95944) (xy 153.612 97.95944) (xy 153.859765 97.910157) (xy 154.069809 97.769809)
1458
+        (xy 154.210157 97.559765) (xy 154.25944 97.312) (xy 154.25944 95.788) (xy 154.210157 95.540235) (xy 154.083045 95.35)
1459
+        (xy 154.210157 95.159765) (xy 154.25944 94.912) (xy 154.25944 93.388) (xy 154.210157 93.140235) (xy 154.069809 92.930191)
1460
+        (xy 153.859765 92.789843) (xy 153.612 92.74056) (xy 152.088 92.74056) (xy 151.840235 92.789843) (xy 151.630191 92.930191)
1461
+        (xy 151.489843 93.140235) (xy 151.44056 93.388) (xy 145.72 93.388) (xy 145.72 89.778178) (xy 146.030625 89.570625)
1462
+        (xy 146.045096 89.548967) (xy 146.111673 89.709698) (xy 146.290301 89.888327) (xy 146.52369 89.985) (xy 147.21425 89.985)
1463
+        (xy 147.373 89.82625) (xy 147.373 88.627) (xy 147.353 88.627) (xy 147.353 88.373) (xy 147.373 88.373)
1464
+        (xy 147.373 88.353) (xy 147.627 88.353) (xy 147.627 88.373) (xy 147.647 88.373) (xy 147.647 88.627)
1465
+        (xy 147.627 88.627) (xy 147.627 89.82625) (xy 147.78575 89.985) (xy 148.47631 89.985) (xy 148.709699 89.888327)
1466
+        (xy 148.888327 89.709698) (xy 148.985 89.476309) (xy 148.985 88.899472) (xy 149.20869 89.439507) (xy 149.640493 89.87131)
1467
+        (xy 150.20467 90.105) (xy 150.81533 90.105) (xy 151.379507 89.87131) (xy 151.78 89.470817) (xy 152.180493 89.87131)
1468
+        (xy 152.74467 90.105) (xy 153.35533 90.105) (xy 153.919507 89.87131) (xy 154.32 89.470817) (xy 154.720493 89.87131)
1469
+        (xy 155.28467 90.105) (xy 155.89533 90.105) (xy 156.459507 89.87131) (xy 156.86 89.470817) (xy 157.260493 89.87131)
1470
+        (xy 157.82467 90.105) (xy 158.43533 90.105) (xy 158.999507 89.87131) (xy 159.4 89.470817) (xy 159.800493 89.87131)
1471
+        (xy 160.36467 90.105) (xy 160.97533 90.105) (xy 161.539507 89.87131) (xy 161.94 89.470817) (xy 162.340493 89.87131)
1472
+        (xy 162.90467 90.105) (xy 163.51533 90.105) (xy 164.079507 89.87131) (xy 164.300658 89.650159) (xy 164.849446 89.650159)
1473
+        (xy 164.935852 89.906643) (xy 165.509336 90.116458) (xy 166.11946 90.090839) (xy 166.564148 89.906643) (xy 166.650554 89.650159)
1474
+        (xy 165.75 88.749605) (xy 164.849446 89.650159) (xy 164.300658 89.650159) (xy 164.51131 89.439507) (xy 164.519438 89.419885)
1475
+        (xy 164.669841 89.470554) (xy 165.570395 88.57) (xy 164.669841 87.669446) (xy 164.519438 87.720115) (xy 164.51131 87.700493)
1476
+        (xy 164.079507 87.26869) (xy 163.516537 87.0355) (xy 165.705881 87.0355)
1327 1477
       )
1328 1478
     )
1329 1479
   )

+ 59
- 59
schematics/oko-weatherstation.net View File

@@ -1,7 +1,7 @@
1 1
 (export (version D)
2 2
   (design
3 3
     (source /home/fowler/weatherstation/schematics/oko-weatherstation.sch)
4
-    (date "Sun 27 Jan 2019 11:54:32 AM CET")
4
+    (date "Sun 27 Jan 2019 12:53:23 PM CET")
5 5
     (tool "Eeschema 5.0.2-1.fc29")
6 6
     (sheet (number 1) (name /) (tstamps /)
7 7
       (title_block
@@ -48,7 +48,7 @@
48 48
       (tstamp 5C36B0BF))
49 49
     (comp (ref R1)
50 50
       (value 100k)
51
-      (footprint Resistors_ThroughHole:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal)
51
+      (footprint Resistors_SMD:R_0603_1608Metric)
52 52
       (datasheet ~)
53 53
       (libsource (lib Device) (part R) (description Resistor))
54 54
       (sheetpath (names /) (tstamps /))
@@ -246,52 +246,50 @@
246 246
     (library (logical wemos_mini)
247 247
       (uri /home/fowler/weatherstation/schematics/parts/wemos_mini.lib)))
248 248
   (nets
249
-    (net (code 1) (name VCC_BAT)
250
-      (node (ref J7) (pin 4))
251
-      (node (ref U1) (pin 3))
252
-      (node (ref J3) (pin 1)))
253
-    (net (code 2) (name GND_SOLAR)
254
-      (node (ref J7) (pin 5))
255
-      (node (ref J2) (pin 1))
256
-      (node (ref U1) (pin 6)))
257
-    (net (code 3) (name GND_BAT)
258
-      (node (ref U1) (pin 4))
259
-      (node (ref J7) (pin 3))
260
-      (node (ref J4) (pin 1)))
261
-    (net (code 4) (name ANEMOMETER)
249
+    (net (code 1) (name ANEMOMETER)
262 250
       (node (ref C1) (pin 2))
263 251
       (node (ref J7) (pin 2))
264 252
       (node (ref U2) (pin 14)))
265
-    (net (code 5) (name VCC_SOLAR)
266
-      (node (ref J1) (pin 1))
253
+    (net (code 2) (name VCC_SOLAR)
267 254
       (node (ref J7) (pin 6))
268
-      (node (ref U1) (pin 1)))
269
-    (net (code 6) (name "Net-(R1-Pad2)")
270
-      (node (ref U2) (pin 10))
271
-      (node (ref R1) (pin 2)))
272
-    (net (code 7) (name "Net-(JP1-Pad1)")
273
-      (node (ref JP1) (pin 1))
274
-      (node (ref U2) (pin 11)))
275
-    (net (code 8) (name "Net-(JP1-Pad2)")
276
-      (node (ref U2) (pin 9))
277
-      (node (ref JP1) (pin 2)))
278
-    (net (code 9) (name GND)
279
-      (node (ref U4) (pin 5))
280
-      (node (ref U3) (pin 2))
255
+      (node (ref U1) (pin 1))
256
+      (node (ref J1) (pin 1)))
257
+    (net (code 3) (name GND_SOLAR)
258
+      (node (ref J2) (pin 1))
259
+      (node (ref J7) (pin 5))
260
+      (node (ref U1) (pin 6)))
261
+    (net (code 4) (name VCC_BAT)
262
+      (node (ref J3) (pin 1))
263
+      (node (ref J7) (pin 4))
264
+      (node (ref U1) (pin 3)))
265
+    (net (code 5) (name GND_BAT)
266
+      (node (ref J4) (pin 1))
267
+      (node (ref J7) (pin 3))
268
+      (node (ref U1) (pin 4)))
269
+    (net (code 6) (name 5V)
270
+      (node (ref U1) (pin 2))
271
+      (node (ref J5) (pin 1))
272
+      (node (ref U2) (pin 1))
273
+      (node (ref R1) (pin 1)))
274
+    (net (code 7) (name GND)
281 275
       (node (ref U1) (pin 5))
276
+      (node (ref U3) (pin 2))
282 277
       (node (ref U2) (pin 2))
283
-      (node (ref J7) (pin 1))
278
+      (node (ref U4) (pin 5))
284 279
       (node (ref C1) (pin 1))
280
+      (node (ref J7) (pin 1))
285 281
       (node (ref J6) (pin 1)))
286
-    (net (code 10) (name 3V3)
287
-      (node (ref R3) (pin 1))
288
-      (node (ref U2) (pin 16))
289
-      (node (ref R2) (pin 1))
290
-      (node (ref U4) (pin 6))
291
-      (node (ref U3) (pin 3)))
282
+    (net (code 8) (name "Net-(JP1-Pad2)")
283
+      (node (ref U2) (pin 9))
284
+      (node (ref JP1) (pin 2)))
285
+    (net (code 9) (name "Net-(R1-Pad2)")
286
+      (node (ref R1) (pin 2))
287
+      (node (ref U2) (pin 10)))
288
+    (net (code 10) (name "Net-(U3-Pad6)")
289
+      (node (ref U3) (pin 6)))
292 290
     (net (code 11) (name SDA)
293
-      (node (ref R2) (pin 2))
294 291
       (node (ref U2) (pin 5))
292
+      (node (ref R2) (pin 2))
295 293
       (node (ref U4) (pin 3))
296 294
       (node (ref U3) (pin 4)))
297 295
     (net (code 12) (name SCL)
@@ -299,30 +297,32 @@
299 297
       (node (ref U3) (pin 5))
300 298
       (node (ref U4) (pin 4))
301 299
       (node (ref U2) (pin 6)))
302
-    (net (code 13) (name 5V)
303
-      (node (ref J5) (pin 1))
304
-      (node (ref U1) (pin 2))
305
-      (node (ref U2) (pin 1))
306
-      (node (ref R1) (pin 1)))
307
-    (net (code 14) (name "Net-(U3-Pad6)")
308
-      (node (ref U3) (pin 6)))
309
-    (net (code 15) (name "Net-(U3-Pad1)")
310
-      (node (ref U3) (pin 1)))
311
-    (net (code 16) (name "Net-(U4-Pad1)")
312
-      (node (ref U4) (pin 1)))
313
-    (net (code 17) (name "Net-(U4-Pad2)")
314
-      (node (ref U4) (pin 2)))
315
-    (net (code 18) (name "Net-(U2-Pad3)")
300
+    (net (code 13) (name "Net-(U2-Pad3)")
316 301
       (node (ref U2) (pin 3)))
317
-    (net (code 19) (name "Net-(U2-Pad4)")
302
+    (net (code 14) (name "Net-(U2-Pad4)")
318 303
       (node (ref U2) (pin 4)))
319
-    (net (code 20) (name "Net-(U2-Pad7)")
304
+    (net (code 15) (name "Net-(U2-Pad7)")
320 305
       (node (ref U2) (pin 7)))
321
-    (net (code 21) (name "Net-(U2-Pad8)")
306
+    (net (code 16) (name "Net-(U2-Pad8)")
322 307
       (node (ref U2) (pin 8)))
323
-    (net (code 22) (name "Net-(U2-Pad12)")
308
+    (net (code 17) (name "Net-(U2-Pad12)")
324 309
       (node (ref U2) (pin 12)))
325
-    (net (code 23) (name "Net-(U2-Pad13)")
310
+    (net (code 18) (name "Net-(U2-Pad13)")
326 311
       (node (ref U2) (pin 13)))
327
-    (net (code 24) (name "Net-(U2-Pad15)")
328
-      (node (ref U2) (pin 15)))))
312
+    (net (code 19) (name "Net-(U2-Pad15)")
313
+      (node (ref U2) (pin 15)))
314
+    (net (code 20) (name "Net-(U3-Pad1)")
315
+      (node (ref U3) (pin 1)))
316
+    (net (code 21) (name "Net-(U4-Pad1)")
317
+      (node (ref U4) (pin 1)))
318
+    (net (code 22) (name "Net-(U4-Pad2)")
319
+      (node (ref U4) (pin 2)))
320
+    (net (code 23) (name 3V3)
321
+      (node (ref R3) (pin 1))
322
+      (node (ref R2) (pin 1))
323
+      (node (ref U3) (pin 3))
324
+      (node (ref U2) (pin 16))
325
+      (node (ref U4) (pin 6)))
326
+    (net (code 24) (name "Net-(JP1-Pad1)")
327
+      (node (ref JP1) (pin 1))
328
+      (node (ref U2) (pin 11)))))

+ 1
- 1
schematics/oko-weatherstation.sch View File

@@ -133,7 +133,7 @@ U 1 1 5C36B93E
133 133
 P 7450 3750
134 134
 F 0 "R1" V 7243 3750 50  0000 C CNN
135 135
 F 1 "100k" V 7334 3750 50  0000 C CNN
136
-F 2 "Resistors_ThroughHole:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 7380 3750 50  0001 C CNN
136
+F 2 "Resistors_SMD:R_0603_1608Metric" V 7380 3750 50  0001 C CNN
137 137
 F 3 "~" H 7450 3750 50  0001 C CNN
138 138
 	1    7450 3750
139 139
 	0    1    1    0   

Loading…
Cancel
Save