Browse Source

adding series resistors to bat status, minor changes

Thomas Kopp 11 months ago
parent
commit
2826cbb983

+ 133
- 55
schematics/oko-weatherstation.bak View File

@@ -120,9 +120,9 @@ $Comp
120 120
 L Device:R R1
121 121
 U 1 1 5C36B93E
122 122
 P 7450 3750
123
-F 0 "R1" V 7243 3750 50  0000 C CNN
124
-F 1 "100k" V 7334 3750 50  0000 C CNN
125
-F 2 "Resistors_ThroughHole:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 7380 3750 50  0001 C CNN
123
+F 0 "R1" V 7350 3750 50  0000 C CNN
124
+F 1 "100k" V 7450 3750 50  0000 C CNN
125
+F 2 "Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal" V 7380 3750 50  0001 C CNN
126 126
 F 3 "~" H 7450 3750 50  0001 C CNN
127 127
 	1    7450 3750
128 128
 	0    1    1    0   
@@ -130,7 +130,7 @@ $EndComp
130 130
 Text GLabel 7800 3750 2    50   Input ~ 0
131 131
 5V
132 132
 Wire Wire Line
133
-	7600 3750 7800 3750
133
+	7600 3750 7650 3750
134 134
 Text GLabel 3300 2350 0    50   Input ~ 0
135 135
 VCC_SOLAR
136 136
 Text GLabel 3300 2450 0    50   Input ~ 0
@@ -296,10 +296,10 @@ Wire Wire Line
296 296
 Wire Wire Line
297 297
 	4450 2450 4600 2450
298 298
 Wire Wire Line
299
-	7650 2650 7900 2650
299
+	7650 2650 7800 2650
300 300
 Wire Wire Line
301 301
 	5300 4850 5600 4850
302
-Text GLabel 7350 2600 1    50   Input ~ 0
302
+Text GLabel 7250 2450 1    50   Input ~ 0
303 303
 ANEMOMETER
304 304
 Wire Wire Line
305 305
 	7350 2800 7350 2650
@@ -348,81 +348,66 @@ Wire Wire Line
348 348
 Connection ~ 9200 2350
349 349
 Wire Wire Line
350 350
 	9200 2350 9250 2350
351
-$Comp
352
-L Connector_Generic:Conn_01x01 J8
353
-U 1 1 5C5715CF
354
-P 3600 4550
355
-F 0 "J8" H 3679 4592 50  0000 L CNN
356
-F 1 "BAT_CHARGING" H 3679 4501 50  0000 L CNN
357
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3600 4550 50  0001 C CNN
358
-F 3 "~" H 3600 4550 50  0001 C CNN
359
-	1    3600 4550
360
-	1    0    0    -1  
361
-$EndComp
362
-Text GLabel 3150 4550 0    50   Input ~ 0
351
+Text GLabel 2800 4550 0    50   Input ~ 0
363 352
 BAT_CHARGING
364
-Wire Wire Line
365
-	3150 4550 3400 4550
366 353
 $Comp
367 354
 L Connector_Generic:Conn_01x01 J9
368 355
 U 1 1 5C57277C
369
-P 3600 4750
370
-F 0 "J9" H 3679 4792 50  0000 L CNN
371
-F 1 "BAT_CHARGED" H 3679 4701 50  0000 L CNN
372
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3600 4750 50  0001 C CNN
373
-F 3 "~" H 3600 4750 50  0001 C CNN
374
-	1    3600 4750
356
+P 3600 5000
357
+F 0 "J9" H 3679 5042 50  0000 L CNN
358
+F 1 "BAT_CHARGED" H 3679 4951 50  0000 L CNN
359
+F 2 "TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm" H 3600 5000 50  0001 C CNN
360
+F 3 "~" H 3600 5000 50  0001 C CNN
361
+	1    3600 5000
375 362
 	1    0    0    -1  
376 363
 $EndComp
377
-Text GLabel 3150 4750 0    50   Input ~ 0
364
+Text GLabel 2800 5000 0    50   Input ~ 0
378 365
 BAT_CHARGED
379
-Wire Wire Line
380
-	3150 4750 3400 4750
381 366
 $Comp
382 367
 L Connector_Generic:Conn_01x01 J10
383 368
 U 1 1 5C573A1A
384
-P 3600 5350
385
-F 0 "J10" H 3679 5392 50  0000 L CNN
386
-F 1 "GPIO3" H 3679 5301 50  0000 L CNN
387
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3600 5350 50  0001 C CNN
388
-F 3 "~" H 3600 5350 50  0001 C CNN
389
-	1    3600 5350
369
+P 3650 5400
370
+F 0 "J10" H 3729 5442 50  0000 L CNN
371
+F 1 "GPIO3" H 3729 5351 50  0000 L CNN
372
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3650 5400 50  0001 C CNN
373
+F 3 "~" H 3650 5400 50  0001 C CNN
374
+	1    3650 5400
390 375
 	1    0    0    -1  
391 376
 $EndComp
392
-Text GLabel 3150 5350 0    50   Input ~ 0
377
+Text GLabel 3200 5400 0    50   Input ~ 0
393 378
 GPIO3
394 379
 Wire Wire Line
395
-	3150 5350 3400 5350
380
+	3200 5400 3450 5400
396 381
 $Comp
397 382
 L Connector_Generic:Conn_01x01 J11
398 383
 U 1 1 5C574DB6
399
-P 3600 5550
400
-F 0 "J11" H 3679 5592 50  0000 L CNN
401
-F 1 "GPIO4" H 3679 5501 50  0000 L CNN
402
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3600 5550 50  0001 C CNN
403
-F 3 "~" H 3600 5550 50  0001 C CNN
404
-	1    3600 5550
384
+P 3650 5600
385
+F 0 "J11" H 3729 5642 50  0000 L CNN
386
+F 1 "GPIO4" H 3729 5551 50  0000 L CNN
387
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3650 5600 50  0001 C CNN
388
+F 3 "~" H 3650 5600 50  0001 C CNN
389
+	1    3650 5600
405 390
 	1    0    0    -1  
406 391
 $EndComp
407
-Text GLabel 3150 5550 0    50   Input ~ 0
392
+Text GLabel 3200 5600 0    50   Input ~ 0
408 393
 GPIO4
409 394
 Wire Wire Line
410
-	3150 5550 3400 5550
395
+	3200 5600 3450 5600
411 396
 $Comp
412 397
 L Connector_Generic:Conn_01x01 J12
413 398
 U 1 1 5C576251
414
-P 3600 5750
415
-F 0 "J12" H 3679 5792 50  0000 L CNN
416
-F 1 "GPIO8" H 3679 5701 50  0000 L CNN
417
-F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3600 5750 50  0001 C CNN
418
-F 3 "~" H 3600 5750 50  0001 C CNN
419
-	1    3600 5750
399
+P 3650 5800
400
+F 0 "J12" H 3729 5842 50  0000 L CNN
401
+F 1 "GPIO8" H 3729 5751 50  0000 L CNN
402
+F 2 "TestPoint:TestPoint_Pad_1.5x1.5mm" H 3650 5800 50  0001 C CNN
403
+F 3 "~" H 3650 5800 50  0001 C CNN
404
+	1    3650 5800
420 405
 	1    0    0    -1  
421 406
 $EndComp
422
-Text GLabel 3150 5750 0    50   Input ~ 0
407
+Text GLabel 3200 5800 0    50   Input ~ 0
423 408
 GPIO8
424 409
 Wire Wire Line
425
-	3150 5750 3400 5750
410
+	3200 5800 3450 5800
426 411
 Text GLabel 7100 3000 2    50   Input ~ 0
427 412
 BAT_CHARGING
428 413
 Text GLabel 7100 2900 2    50   Input ~ 0
@@ -434,8 +419,6 @@ Wire Wire Line
434 419
 Wire Wire Line
435 420
 	6850 3300 7100 3300
436 421
 Connection ~ 7350 2650
437
-Wire Wire Line
438
-	7350 2650 7350 2600
439 422
 Wire Wire Line
440 423
 	7100 3000 6850 3000
441 424
 Text GLabel 7050 2700 2    50   Input ~ 0
@@ -463,4 +446,99 @@ Wire Wire Line
463 446
 	5850 2800 5700 2800
464 447
 Wire Wire Line
465 448
 	5850 2900 5700 2900
449
+$Comp
450
+L Device:C C2
451
+U 1 1 5C576327
452
+P 7600 2300
453
+F 0 "C2" V 7348 2300 50  0000 C CNN
454
+F 1 "100n" V 7439 2300 50  0000 C CNN
455
+F 2 "Capacitors_SMD:C_0603_1608Metric" H 7638 2150 50  0001 C CNN
456
+F 3 "~" H 7600 2300 50  0001 C CNN
457
+	1    7600 2300
458
+	0    1    1    0   
459
+$EndComp
460
+Wire Wire Line
461
+	7750 2300 7800 2300
462
+Wire Wire Line
463
+	7350 2450 7250 2450
464
+Wire Wire Line
465
+	7350 2450 7350 2650
466
+Wire Wire Line
467
+	7350 2450 7350 2300
468
+Wire Wire Line
469
+	7350 2300 7450 2300
470
+Connection ~ 7350 2450
471
+Wire Wire Line
472
+	7800 2300 7800 2650
473
+Connection ~ 7800 2650
474
+Wire Wire Line
475
+	7800 2650 7900 2650
476
+Text Notes 7700 2250 0    50   ~ 0
477
+only one capacitor needed, \ndouble footprint for SMD/THT
478
+Text Notes 7550 3600 0    50   ~ 0
479
+only one resistor needed, \ndouble footprint for SMD/THT
480
+$Comp
481
+L Device:R R4
482
+U 1 1 5C57FF00
483
+P 7450 3950
484
+F 0 "R4" V 7350 3950 50  0000 C CNN
485
+F 1 "100k" V 7450 3950 50  0000 C CNN
486
+F 2 "Resistors_SMD:R_0603_1608Metric" V 7380 3950 50  0001 C CNN
487
+F 3 "~" H 7450 3950 50  0001 C CNN
488
+	1    7450 3950
489
+	0    1    1    0   
490
+$EndComp
491
+Wire Wire Line
492
+	7050 3950 7300 3950
493
+Wire Wire Line
494
+	7600 3950 7650 3950
495
+Connection ~ 7650 3750
496
+Wire Wire Line
497
+	7650 3750 7800 3750
498
+Connection ~ 7050 3750
499
+Wire Wire Line
500
+	7650 3750 7650 3950
501
+Wire Wire Line
502
+	7050 3750 7050 3950
503
+$Comp
504
+L Device:R R5
505
+U 1 1 5C58EB09
506
+P 3050 4550
507
+F 0 "R5" V 2950 4550 50  0000 C CNN
508
+F 1 "1k" V 3050 4550 50  0000 C CNN
509
+F 2 "Resistors_SMD:R_0603_1608Metric" V 2980 4550 50  0001 C CNN
510
+F 3 "~" H 3050 4550 50  0001 C CNN
511
+	1    3050 4550
512
+	0    1    1    0   
513
+$EndComp
514
+$Comp
515
+L Device:R R6
516
+U 1 1 5C58EB15
517
+P 3050 5000
518
+F 0 "R6" V 2950 5000 50  0000 C CNN
519
+F 1 "1k" V 3050 5000 50  0000 C CNN
520
+F 2 "Resistors_SMD:R_0603_1608Metric" V 2980 5000 50  0001 C CNN
521
+F 3 "~" H 3050 5000 50  0001 C CNN
522
+	1    3050 5000
523
+	0    1    1    0   
524
+$EndComp
525
+$Comp
526
+L Connector_Generic:Conn_01x01 J8
527
+U 1 1 5C5715CF
528
+P 3600 4550
529
+F 0 "J8" H 3679 4592 50  0000 L CNN
530
+F 1 "BAT_CHARGING" H 3679 4501 50  0000 L CNN
531
+F 2 "TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm" H 3600 4550 50  0001 C CNN
532
+F 3 "~" H 3600 4550 50  0001 C CNN
533
+	1    3600 4550
534
+	1    0    0    -1  
535
+$EndComp
536
+Wire Wire Line
537
+	2800 5000 2900 5000
538
+Wire Wire Line
539
+	3200 5000 3400 5000
540
+Wire Wire Line
541
+	2800 4550 2900 4550
542
+Wire Wire Line
543
+	3200 4550 3400 4550
466 544
 $EndSCHEMATC

+ 660
- 569
schematics/oko-weatherstation.kicad_pcb View File

@@ -1,12 +1,12 @@
1
-(kicad_pcb (version 20171130) (host pcbnew 5.0.1)
1
+(kicad_pcb (version 20171130) (host pcbnew 5.0.2-4.fc29)
2 2
 
3 3
   (general
4 4
     (thickness 1.6)
5
-    (drawings 48)
6
-    (tracks 173)
5
+    (drawings 45)
6
+    (tracks 175)
7 7
     (zones 0)
8
-    (modules 30)
9
-    (nets 25)
8
+    (modules 32)
9
+    (nets 27)
10 10
   )
11 11
 
12 12
   (page A4)
@@ -59,7 +59,7 @@
59 59
     (mod_text_size 1 1)
60 60
     (mod_text_width 0.15)
61 61
     (pad_size 1.5 1.5)
62
-    (pad_drill 0.7)
62
+    (pad_drill 0)
63 63
     (pad_to_mask_clearance 0)
64 64
     (solder_mask_min_width 0.25)
65 65
     (aux_axis_origin 128 81.5)
@@ -118,6 +118,8 @@
118 118
   (net 22 GPIO3)
119 119
   (net 23 GPIO4)
120 120
   (net 24 GPIO8)
121
+  (net 25 NCHRG)
122
+  (net 26 NSTBY)
121 123
 
122 124
   (net_class Default "This is the default net class."
123 125
     (clearance 0.2)
@@ -137,6 +139,8 @@
137 139
     (add_net GPIO3)
138 140
     (add_net GPIO4)
139 141
     (add_net GPIO8)
142
+    (add_net NCHRG)
143
+    (add_net NSTBY)
140 144
     (add_net "Net-(JP1-Pad1)")
141 145
     (add_net "Net-(JP1-Pad2)")
142 146
     (add_net "Net-(R1-Pad2)")
@@ -152,6 +156,102 @@
152 156
     (add_net VCC_SOLAR)
153 157
   )
154 158
 
159
+  (module ant:ant (layer F.Cu) (tedit 5C3908AA) (tstamp 5C3960ED)
160
+    (at 159.2 99.8)
161
+    (descr "Imported from ant.svg")
162
+    (tags svg2mod)
163
+    (attr smd)
164
+    (fp_text reference svg2mod (at 0 -16.47926) (layer F.SilkS) hide
165
+      (effects (font (size 1.524 1.524) (thickness 0.3048)))
166
+    )
167
+    (fp_text value G*** (at 0 16.47926) (layer F.SilkS) hide
168
+      (effects (font (size 1.524 1.524) (thickness 0.3048)))
169
+    )
170
+    (fp_poly (pts (xy 9.722176 -13.430868) (xy 9.013269 -13.233159) (xy 8.078872 -12.581828) (xy 7.656871 -12.249442)
171
+      (xy 7.000661 -11.837849) (xy 6.175762 -11.35736) (xy 5.247695 -10.818284) (xy 4.281981 -10.230933)
172
+      (xy 3.34414 -9.605615) (xy 2.499693 -8.952641) (xy 1.814161 -8.282321) (xy 1.353064 -7.604965)
173
+      (xy 0.978555 -6.785137) (xy 0.686542 -6.048574) (xy 0.443437 -5.326439) (xy 0.215651 -4.549897)
174
+      (xy -0.030405 -3.650112) (xy -0.32832 -2.558249) (xy -5.515097 -1.465832) (xy -5.634889 -1.180442)
175
+      (xy -6.155269 -1.391724) (xy -6.858126 -2.086419) (xy -7.637667 -2.341034) (xy -8.397204 -2.362056)
176
+      (xy -8.089313 -2.725043) (xy -7.523293 -3.329741) (xy -6.843526 -3.902506) (xy -6.194395 -4.16969)
177
+      (xy -6.045715 -4.15404) (xy -5.671569 -3.579635) (xy -5.298614 -2.866928) (xy -4.934528 -1.982531)
178
+      (xy -5.515097 -1.465832) (xy -0.32832 -2.558249) (xy -4.973655 0.658493) (xy -4.578479 0.752396)
179
+      (xy -4.159921 1.314501) (xy -3.913333 1.253212) (xy -3.896067 1.607991) (xy -3.962271 2.408809)
180
+      (xy -4.288946 3.260391) (xy -4.636152 3.645148) (xy -5.209552 4.158219) (xy -5.933996 4.743734)
181
+      (xy -6.734337 5.345822) (xy -7.182773 4.634602) (xy -7.676265 3.923319) (xy -8.158534 3.287779)
182
+      (xy -6.765864 2.890156) (xy -5.913305 2.381195) (xy -5.472916 1.842785) (xy -5.316755 1.356817)
183
+      (xy -5.316882 1.005184) (xy -5.345355 0.869775) (xy -4.973655 0.658493) (xy -0.32832 -2.558249)
184
+      (xy -1.121335 -2.414711) (xy -1.65586 -2.429032) (xy -2.052438 -2.391358) (xy -2.074026 -3.230892)
185
+      (xy -2.104448 -4.191108) (xy -2.155227 -5.161753) (xy -2.237881 -6.032575) (xy -2.363932 -6.693323)
186
+      (xy -3.075061 -7.421074) (xy -3.610929 -7.956757) (xy -4.218518 -8.481394) (xy -4.925312 -9.341115)
187
+      (xy -5.215108 -10.121126) (xy -5.271015 -10.461184) (xy -5.247521 -10.936886) (xy -5.497947 -11.897119)
188
+      (xy -6.030656 -11.291682) (xy -5.955725 -10.355543) (xy -5.692638 -9.489112) (xy -5.202427 -8.728631)
189
+      (xy -4.580008 -8.053065) (xy -3.920296 -7.441383) (xy -3.318209 -6.872551) (xy -2.868661 -6.325536)
190
+      (xy -2.805278 -5.574902) (xy -2.777344 -4.784992) (xy -2.804967 -3.977571) (xy -2.90826 -3.174405)
191
+      (xy -3.107331 -2.397257) (xy -3.721614 -2.346393) (xy -4.376761 -3.073463) (xy -5.087282 -3.883393)
192
+      (xy -5.697951 -4.56356) (xy -6.05354 -4.901339) (xy -6.56685 -4.74275) (xy -7.430915 -4.200304)
193
+      (xy -8.331107 -3.553532) (xy -8.952797 -3.081967) (xy -8.865389 -4.117298) (xy -8.878887 -5.030323)
194
+      (xy -9.054526 -5.609525) (xy -9.330712 -5.642097) (xy -9.881984 -5.472971) (xy -10.64317 -5.134487)
195
+      (xy -11.549096 -4.658984) (xy -12.534592 -4.078802) (xy -13.534485 -3.426278) (xy -14.551277 -2.63512)
196
+      (xy -15.433259 -1.809846) (xy -16.128072 -1.071053) (xy -16.583356 -0.539339) (xy -16.746752 -0.335302)
197
+      (xy -16.560128 -0.507497) (xy -16.051188 -0.954868) (xy -15.296336 -1.573593) (xy -14.371973 -2.259848)
198
+      (xy -13.354504 -2.909811) (xy -12.309629 -3.492526) (xy -11.34152 -4.008164) (xy -10.52728 -4.432381)
199
+      (xy -9.944009 -4.74083) (xy -9.668808 -4.909164) (xy -9.527359 -4.382748) (xy -9.594282 -3.522784)
200
+      (xy -9.782274 -2.538111) (xy -10.143084 -2.288954) (xy -9.930954 -2.08816) (xy -9.891828 -2.072509)
201
+      (xy -9.915304 -1.978605) (xy -10.560887 -1.497353) (xy -11.028345 -1.438072) (xy -11.664249 -1.333023)
202
+      (xy -12.823832 -0.929808) (xy -13.529655 -0.338759) (xy -13.894357 0.280745) (xy -14.030576 0.769325)
203
+      (xy -14.050952 0.967603) (xy -13.653409 0.670118) (xy -12.568066 0.650681) (xy -12.174604 0.425158)
204
+      (xy -12.016385 -0.163146) (xy -11.222121 -0.202273) (xy -11.218215 0.642855) (xy -11.002031 1.598729)
205
+      (xy -10.68051 2.317774) (xy -10.267447 2.826101) (xy -10.638795 3.033756) (xy -11.077361 2.935655)
206
+      (xy -11.760669 2.565859) (xy -12.067256 2.497441) (xy -12.591646 2.766637) (xy -13.530579 3.049122)
207
+      (xy -13.137571 3.497223) (xy -12.53247 3.898689) (xy -11.981178 4.066404) (xy -10.831498 3.984863)
208
+      (xy -9.978089 3.832478) (xy -9.378912 3.643486) (xy -8.99193 3.452122) (xy -8.135065 4.567221)
209
+      (xy -7.403397 5.823175) (xy -7.891333 6.145761) (xy -8.334602 6.417895) (xy -9.002784 6.670507)
210
+      (xy -9.768128 6.944804) (xy -10.592189 7.219983) (xy -11.617928 7.523549) (xy -12.601306 7.771443)
211
+      (xy -13.469269 7.949998) (xy -14.148768 8.045548) (xy -14.419248 8.085965) (xy -14.060445 8.093774)
212
+      (xy -13.399333 8.082547) (xy -12.762885 8.065858) (xy -12.478075 8.057279) (xy -12.183916 8.004387)
213
+      (xy -11.415024 7.863678) (xy -10.34178 7.662104) (xy -10.663774 8.277565) (xy -10.193101 8.620698)
214
+      (xy -9.58665 8.579926) (xy -9.361667 8.294612) (xy -9.136685 7.842702) (xy -8.530234 7.302142)
215
+      (xy -7.440049 7.062245) (xy -6.616923 6.848544) (xy -6.221783 6.683947) (xy -6.436978 5.88577)
216
+      (xy -5.545901 5.246402) (xy -4.891556 4.769867) (xy -4.637169 4.582866) (xy -4.07787 4.082568)
217
+      (xy -3.555131 3.411752) (xy -3.12854 2.607646) (xy -2.857682 1.707482) (xy -2.802147 0.74849)
218
+      (xy -2.101786 0.83848) (xy -1.688925 1.216003) (xy -1.413163 1.793161) (xy -0.783592 2.649953)
219
+      (xy -0.189714 3.076126) (xy 0.310832 3.283228) (xy 0.66041 3.482809) (xy 0.801384 3.886418)
220
+      (xy 0.801156 4.3937) (xy 0.769916 5.180743) (xy 0.692787 6.166729) (xy 0.554888 7.270841)
221
+      (xy 0.331159 8.464012) (xy 0.08465 9.463531) (xy -0.127261 10.201072) (xy -0.247201 10.608313)
222
+      (xy -0.363592 11.745402) (xy -0.305396 12.759733) (xy -0.247201 13.198473) (xy 0.017253 13.285768)
223
+      (xy 0.652704 13.198473) (xy 0.811928 12.887546) (xy 0.774217 12.289) (xy 0.656894 11.485173)
224
+      (xy 0.577282 10.558403) (xy 0.652704 9.59103) (xy 0.795096 9.015451) (xy 0.990652 8.275784)
225
+      (xy 1.180909 7.407783) (xy 1.364849 6.307643) (xy 1.505847 5.213554) (xy 1.572091 4.236017)
226
+      (xy 1.531767 3.48553) (xy 1.353064 3.072591) (xy 0.647697 2.594157) (xy 0.28716 2.480838)
227
+      (xy 0.074182 2.445266) (xy -0.188511 2.200075) (xy -0.626484 1.616275) (xy -0.902015 1.027289)
228
+      (xy -0.870748 0.393579) (xy -0.334169 0.177743) (xy 0.376585 0.484813) (xy 1.209481 0.814594)
229
+      (xy 2.088524 1.06787) (xy 2.937722 1.145422) (xy 3.681078 0.948034) (xy 4.960424 0.483979)
230
+      (xy 5.903627 0.414734) (xy 6.271239 0.455043) (xy 7.452724 1.176592) (xy 8.478769 1.779898)
231
+      (xy 9.383587 2.279874) (xy 10.201389 2.691438) (xy 10.966387 3.029504) (xy 11.712793 3.308988)
232
+      (xy 12.474818 3.544807) (xy 13.286674 3.751874) (xy 14.182573 3.945107) (xy 15.223839 4.043316)
233
+      (xy 15.872828 4.062486) (xy 16.215222 3.906674) (xy 15.990207 3.510805) (xy 15.047193 3.485576)
234
+      (xy 14.078574 3.351251) (xy 13.099045 3.12463) (xy 12.123299 2.82251) (xy 11.16603 2.461691)
235
+      (xy 10.241933 2.058971) (xy 9.365702 1.631149) (xy 8.55203 1.195022) (xy 7.815613 0.767391)
236
+      (xy 7.171143 0.365052) (xy 5.889508 -0.276471) (xy 4.970733 -0.424246) (xy 4.352031 -0.293773)
237
+      (xy 3.970613 -0.10055) (xy 3.342884 0.152915) (xy 2.462539 0.365912) (xy 1.699019 0.328399)
238
+      (xy 1.046067 -0.164068) (xy 0.785937 -0.874769) (xy 1.461573 -1.235088) (xy 2.243224 -1.530896)
239
+      (xy 3.041536 -1.726671) (xy 3.767156 -1.786893) (xy 4.064384 -1.774745) (xy 4.537229 -1.755665)
240
+      (xy 5.151035 -1.73824) (xy 5.871141 -1.731057) (xy 6.662891 -1.742704) (xy 7.491626 -1.781767)
241
+      (xy 8.322688 -1.856835) (xy 9.121418 -1.976492) (xy 9.853159 -2.149329) (xy 10.483253 -2.38393)
242
+      (xy 10.97704 -2.688884) (xy 11.299863 -3.072777) (xy 11.417063 -3.544197) (xy 11.293984 -4.111731)
243
+      (xy 10.895965 -4.783966) (xy 9.875565 -5.296398) (xy 9.038685 -5.633785) (xy 8.360635 -5.820147)
244
+      (xy 7.816727 -5.879502) (xy 7.691522 -5.875596) (xy 6.93934 -5.665623) (xy 6.402988 -5.265838)
245
+      (xy 5.872166 -4.883354) (xy 5.136576 -4.725284) (xy 4.352183 -4.558981) (xy 3.911148 -4.124152)
246
+      (xy 3.556578 -3.596671) (xy 3.031582 -3.152407) (xy 2.413883 -2.956301) (xy 1.624691 -2.812993)
247
+      (xy 0.907069 -2.721157) (xy 0.885692 -3.527729) (xy 0.942691 -4.296523) (xy 1.090363 -5.064656)
248
+      (xy 1.341004 -5.869249) (xy 1.706913 -6.74742) (xy 2.200386 -7.736288) (xy 2.652686 -8.25581)
249
+      (xy 3.306038 -8.835488) (xy 4.102272 -9.445507) (xy 4.983218 -10.056054) (xy 5.890709 -10.637314)
250
+      (xy 6.766574 -11.159472) (xy 7.552645 -11.592716) (xy 8.190753 -11.907229) (xy 8.622728 -12.073199)
251
+      (xy 9.274892 -12.393223) (xy 9.576685 -12.834045) (xy 9.83173 -13.352628) (xy 9.722176 -13.430881)
252
+      (xy 9.722176 -13.430868)) (layer F.SilkS) (width 0.338389))
253
+  )
254
+
155 255
   (module "" (layer F.Cu) (tedit 0) (tstamp 0)
156 256
     (at 168.91 82.55)
157 257
     (fp_text reference "" (at 170.18 78.74) (layer F.SilkS)
@@ -165,60 +265,6 @@
165 265
     )
166 266
   )
167 267
 
168
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570E85) (tstamp 5C5A5B51)
169
-    (at 171.45 83.82)
170
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
171
-    (tags "test point SMD pad rectangle square")
172
-    (path /5C5715CF)
173
-    (attr virtual)
174
-    (fp_text reference "" (at 0 5.08) (layer F.SilkS)
175
-      (effects (font (size 1 1) (thickness 0.15)))
176
-    )
177
-    (fp_text value BAT_CHARGING (at 0 1.75) (layer F.Fab)
178
-      (effects (font (size 1 1) (thickness 0.15)))
179
-    )
180
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
181
-      (effects (font (size 1 1) (thickness 0.15)))
182
-    )
183
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
184
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
185
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
186
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
187
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
188
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
189
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
190
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
191
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
192
-      (net 23 GPIO4))
193
-  )
194
-
195
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570E76) (tstamp 5C5A5A34)
196
-    (at 168.91 83.82)
197
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
198
-    (tags "test point SMD pad rectangle square")
199
-    (path /5C5715CF)
200
-    (attr virtual)
201
-    (fp_text reference "" (at 0 5.08) (layer F.SilkS)
202
-      (effects (font (size 1 1) (thickness 0.15)))
203
-    )
204
-    (fp_text value BAT_CHARGING (at 0 1.75) (layer F.Fab)
205
-      (effects (font (size 1 1) (thickness 0.15)))
206
-    )
207
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
208
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
209
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
210
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
211
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
212
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
213
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
214
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
215
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
216
-      (effects (font (size 1 1) (thickness 0.15)))
217
-    )
218
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
219
-      (net 22 GPIO3))
220
-  )
221
-
222 268
   (module "" (layer F.Cu) (tedit 0) (tstamp 0)
223 269
     (at 172.72 82.55)
224 270
     (fp_text reference "" (at 171.4 83.87) (layer F.SilkS)
@@ -232,26 +278,6 @@
232 278
     )
233 279
   )
234 280
 
235
-  (module Measurement_Points:Measurement_Point_Square-SMD-Pad_Small (layer B.Cu) (tedit 5C570A0D) (tstamp 5C5A46CA)
236
-    (at 172.67 110.54)
237
-    (descr "Mesurement Point, Square, SMD Pad,  1.5mm x 1.5mm,")
238
-    (tags "Mesurement Point Square SMD Pad 1.5x1.5mm")
239
-    (path /5C38D96A)
240
-    (attr virtual)
241
-    (fp_text reference J4 (at -2.4 0) (layer B.SilkS) hide
242
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
243
-    )
244
-    (fp_text value GND_BAT (at 0 -2) (layer B.Fab)
245
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
246
-    )
247
-    (fp_line (start -1 -1) (end -1 1) (layer B.CrtYd) (width 0.05))
248
-    (fp_line (start 1 -1) (end -1 -1) (layer B.CrtYd) (width 0.05))
249
-    (fp_line (start 1 1) (end 1 -1) (layer B.CrtYd) (width 0.05))
250
-    (fp_line (start -1 1) (end 1 1) (layer B.CrtYd) (width 0.05))
251
-    (pad 1 smd rect (at 0 0) (size 1.5 1.5) (layers B.Cu B.Mask)
252
-      (net 24 GPIO8))
253
-  )
254
-
255 281
   (module oko:GY-BME280 (layer F.Cu) (tedit 5C50A64F) (tstamp 5C37DABA)
256 282
     (at 132.5 98.5 180)
257 283
     (path /5C36680F)
@@ -361,22 +387,22 @@
361 387
     (fp_line (start 1.3 1.44) (end 21.3 1.44) (layer F.SilkS) (width 0.15))
362 388
     (fp_line (start 21.3 1.44) (end 21.3 16.44) (layer F.SilkS) (width 0.15))
363 389
     (fp_line (start 21.3 16.44) (end 1.3 16.44) (layer F.SilkS) (width 0.15))
364
-    (fp_text user "VL " (at -0.2 11.63 180) (layer F.SilkS)
390
+    (fp_text user "VL " (at -0.2 15.44 180) (layer F.SilkS)
365 391
       (effects (font (size 1 1) (thickness 0.15)))
366 392
     )
367
-    (fp_text user GND (at -0.3 12.9 180) (layer F.SilkS)
393
+    (fp_text user GND (at -0.3 16.71 180) (layer F.SilkS)
368 394
       (effects (font (size 1 1) (thickness 0.15)))
369 395
     )
370
-    (fp_text user VCC (at -0.4 14.17 180) (layer F.SilkS)
396
+    (fp_text user VCC (at -0.4 17.98 180) (layer F.SilkS)
371 397
       (effects (font (size 1 1) (thickness 0.15)))
372 398
     )
373
-    (fp_text user SDA (at -0.3 15.44 180) (layer F.SilkS)
399
+    (fp_text user SDA (at -0.3 19.25 180) (layer F.SilkS)
374 400
       (effects (font (size 1 1) (thickness 0.15)))
375 401
     )
376
-    (fp_text user SCL (at -0.3 16.71 180) (layer F.SilkS)
402
+    (fp_text user SCL (at -0.3 20.52 180) (layer F.SilkS)
377 403
       (effects (font (size 1 1) (thickness 0.15)))
378 404
     )
379
-    (fp_text user INT (at -0.1 17.98 180) (layer F.SilkS)
405
+    (fp_text user INT (at -0.1 21.79 180) (layer F.SilkS)
380 406
       (effects (font (size 1 1) (thickness 0.15)))
381 407
     )
382 408
     (fp_text user ADPS-9960 (at 4.5 6.4 270) (layer F.SilkS)
@@ -873,102 +899,6 @@
873 899
       (net 2 GND))
874 900
   )
875 901
 
876
-  (module ant:ant (layer F.Cu) (tedit 5C3908AA) (tstamp 5C3960ED)
877
-    (at 159.2 99.8)
878
-    (descr "Imported from ant.svg")
879
-    (tags svg2mod)
880
-    (attr smd)
881
-    (fp_text reference svg2mod (at 0 -16.47926) (layer F.SilkS) hide
882
-      (effects (font (size 1.524 1.524) (thickness 0.3048)))
883
-    )
884
-    (fp_text value G*** (at 0 16.47926) (layer F.SilkS) hide
885
-      (effects (font (size 1.524 1.524) (thickness 0.3048)))
886
-    )
887
-    (fp_poly (pts (xy 9.722176 -13.430868) (xy 9.013269 -13.233159) (xy 8.078872 -12.581828) (xy 7.656871 -12.249442)
888
-      (xy 7.000661 -11.837849) (xy 6.175762 -11.35736) (xy 5.247695 -10.818284) (xy 4.281981 -10.230933)
889
-      (xy 3.34414 -9.605615) (xy 2.499693 -8.952641) (xy 1.814161 -8.282321) (xy 1.353064 -7.604965)
890
-      (xy 0.978555 -6.785137) (xy 0.686542 -6.048574) (xy 0.443437 -5.326439) (xy 0.215651 -4.549897)
891
-      (xy -0.030405 -3.650112) (xy -0.32832 -2.558249) (xy -5.515097 -1.465832) (xy -5.634889 -1.180442)
892
-      (xy -6.155269 -1.391724) (xy -6.858126 -2.086419) (xy -7.637667 -2.341034) (xy -8.397204 -2.362056)
893
-      (xy -8.089313 -2.725043) (xy -7.523293 -3.329741) (xy -6.843526 -3.902506) (xy -6.194395 -4.16969)
894
-      (xy -6.045715 -4.15404) (xy -5.671569 -3.579635) (xy -5.298614 -2.866928) (xy -4.934528 -1.982531)
895
-      (xy -5.515097 -1.465832) (xy -0.32832 -2.558249) (xy -4.973655 0.658493) (xy -4.578479 0.752396)
896
-      (xy -4.159921 1.314501) (xy -3.913333 1.253212) (xy -3.896067 1.607991) (xy -3.962271 2.408809)
897
-      (xy -4.288946 3.260391) (xy -4.636152 3.645148) (xy -5.209552 4.158219) (xy -5.933996 4.743734)
898
-      (xy -6.734337 5.345822) (xy -7.182773 4.634602) (xy -7.676265 3.923319) (xy -8.158534 3.287779)
899
-      (xy -6.765864 2.890156) (xy -5.913305 2.381195) (xy -5.472916 1.842785) (xy -5.316755 1.356817)
900
-      (xy -5.316882 1.005184) (xy -5.345355 0.869775) (xy -4.973655 0.658493) (xy -0.32832 -2.558249)
901
-      (xy -1.121335 -2.414711) (xy -1.65586 -2.429032) (xy -2.052438 -2.391358) (xy -2.074026 -3.230892)
902
-      (xy -2.104448 -4.191108) (xy -2.155227 -5.161753) (xy -2.237881 -6.032575) (xy -2.363932 -6.693323)
903
-      (xy -3.075061 -7.421074) (xy -3.610929 -7.956757) (xy -4.218518 -8.481394) (xy -4.925312 -9.341115)
904
-      (xy -5.215108 -10.121126) (xy -5.271015 -10.461184) (xy -5.247521 -10.936886) (xy -5.497947 -11.897119)
905
-      (xy -6.030656 -11.291682) (xy -5.955725 -10.355543) (xy -5.692638 -9.489112) (xy -5.202427 -8.728631)
906
-      (xy -4.580008 -8.053065) (xy -3.920296 -7.441383) (xy -3.318209 -6.872551) (xy -2.868661 -6.325536)
907
-      (xy -2.805278 -5.574902) (xy -2.777344 -4.784992) (xy -2.804967 -3.977571) (xy -2.90826 -3.174405)
908
-      (xy -3.107331 -2.397257) (xy -3.721614 -2.346393) (xy -4.376761 -3.073463) (xy -5.087282 -3.883393)
909
-      (xy -5.697951 -4.56356) (xy -6.05354 -4.901339) (xy -6.56685 -4.74275) (xy -7.430915 -4.200304)
910
-      (xy -8.331107 -3.553532) (xy -8.952797 -3.081967) (xy -8.865389 -4.117298) (xy -8.878887 -5.030323)
911
-      (xy -9.054526 -5.609525) (xy -9.330712 -5.642097) (xy -9.881984 -5.472971) (xy -10.64317 -5.134487)
912
-      (xy -11.549096 -4.658984) (xy -12.534592 -4.078802) (xy -13.534485 -3.426278) (xy -14.551277 -2.63512)
913
-      (xy -15.433259 -1.809846) (xy -16.128072 -1.071053) (xy -16.583356 -0.539339) (xy -16.746752 -0.335302)
914
-      (xy -16.560128 -0.507497) (xy -16.051188 -0.954868) (xy -15.296336 -1.573593) (xy -14.371973 -2.259848)
915
-      (xy -13.354504 -2.909811) (xy -12.309629 -3.492526) (xy -11.34152 -4.008164) (xy -10.52728 -4.432381)
916
-      (xy -9.944009 -4.74083) (xy -9.668808 -4.909164) (xy -9.527359 -4.382748) (xy -9.594282 -3.522784)
917
-      (xy -9.782274 -2.538111) (xy -10.143084 -2.288954) (xy -9.930954 -2.08816) (xy -9.891828 -2.072509)
918
-      (xy -9.915304 -1.978605) (xy -10.560887 -1.497353) (xy -11.028345 -1.438072) (xy -11.664249 -1.333023)
919
-      (xy -12.823832 -0.929808) (xy -13.529655 -0.338759) (xy -13.894357 0.280745) (xy -14.030576 0.769325)
920
-      (xy -14.050952 0.967603) (xy -13.653409 0.670118) (xy -12.568066 0.650681) (xy -12.174604 0.425158)
921
-      (xy -12.016385 -0.163146) (xy -11.222121 -0.202273) (xy -11.218215 0.642855) (xy -11.002031 1.598729)
922
-      (xy -10.68051 2.317774) (xy -10.267447 2.826101) (xy -10.638795 3.033756) (xy -11.077361 2.935655)
923
-      (xy -11.760669 2.565859) (xy -12.067256 2.497441) (xy -12.591646 2.766637) (xy -13.530579 3.049122)
924
-      (xy -13.137571 3.497223) (xy -12.53247 3.898689) (xy -11.981178 4.066404) (xy -10.831498 3.984863)
925
-      (xy -9.978089 3.832478) (xy -9.378912 3.643486) (xy -8.99193 3.452122) (xy -8.135065 4.567221)
926
-      (xy -7.403397 5.823175) (xy -7.891333 6.145761) (xy -8.334602 6.417895) (xy -9.002784 6.670507)
927
-      (xy -9.768128 6.944804) (xy -10.592189 7.219983) (xy -11.617928 7.523549) (xy -12.601306 7.771443)
928
-      (xy -13.469269 7.949998) (xy -14.148768 8.045548) (xy -14.419248 8.085965) (xy -14.060445 8.093774)
929
-      (xy -13.399333 8.082547) (xy -12.762885 8.065858) (xy -12.478075 8.057279) (xy -12.183916 8.004387)
930
-      (xy -11.415024 7.863678) (xy -10.34178 7.662104) (xy -10.663774 8.277565) (xy -10.193101 8.620698)
931
-      (xy -9.58665 8.579926) (xy -9.361667 8.294612) (xy -9.136685 7.842702) (xy -8.530234 7.302142)
932
-      (xy -7.440049 7.062245) (xy -6.616923 6.848544) (xy -6.221783 6.683947) (xy -6.436978 5.88577)
933
-      (xy -5.545901 5.246402) (xy -4.891556 4.769867) (xy -4.637169 4.582866) (xy -4.07787 4.082568)
934
-      (xy -3.555131 3.411752) (xy -3.12854 2.607646) (xy -2.857682 1.707482) (xy -2.802147 0.74849)
935
-      (xy -2.101786 0.83848) (xy -1.688925 1.216003) (xy -1.413163 1.793161) (xy -0.783592 2.649953)
936
-      (xy -0.189714 3.076126) (xy 0.310832 3.283228) (xy 0.66041 3.482809) (xy 0.801384 3.886418)
937
-      (xy 0.801156 4.3937) (xy 0.769916 5.180743) (xy 0.692787 6.166729) (xy 0.554888 7.270841)
938
-      (xy 0.331159 8.464012) (xy 0.08465 9.463531) (xy -0.127261 10.201072) (xy -0.247201 10.608313)
939
-      (xy -0.363592 11.745402) (xy -0.305396 12.759733) (xy -0.247201 13.198473) (xy 0.017253 13.285768)
940
-      (xy 0.652704 13.198473) (xy 0.811928 12.887546) (xy 0.774217 12.289) (xy 0.656894 11.485173)
941
-      (xy 0.577282 10.558403) (xy 0.652704 9.59103) (xy 0.795096 9.015451) (xy 0.990652 8.275784)
942
-      (xy 1.180909 7.407783) (xy 1.364849 6.307643) (xy 1.505847 5.213554) (xy 1.572091 4.236017)
943
-      (xy 1.531767 3.48553) (xy 1.353064 3.072591) (xy 0.647697 2.594157) (xy 0.28716 2.480838)
944
-      (xy 0.074182 2.445266) (xy -0.188511 2.200075) (xy -0.626484 1.616275) (xy -0.902015 1.027289)
945
-      (xy -0.870748 0.393579) (xy -0.334169 0.177743) (xy 0.376585 0.484813) (xy 1.209481 0.814594)
946
-      (xy 2.088524 1.06787) (xy 2.937722 1.145422) (xy 3.681078 0.948034) (xy 4.960424 0.483979)
947
-      (xy 5.903627 0.414734) (xy 6.271239 0.455043) (xy 7.452724 1.176592) (xy 8.478769 1.779898)
948
-      (xy 9.383587 2.279874) (xy 10.201389 2.691438) (xy 10.966387 3.029504) (xy 11.712793 3.308988)
949
-      (xy 12.474818 3.544807) (xy 13.286674 3.751874) (xy 14.182573 3.945107) (xy 15.223839 4.043316)
950
-      (xy 15.872828 4.062486) (xy 16.215222 3.906674) (xy 15.990207 3.510805) (xy 15.047193 3.485576)
951
-      (xy 14.078574 3.351251) (xy 13.099045 3.12463) (xy 12.123299 2.82251) (xy 11.16603 2.461691)
952
-      (xy 10.241933 2.058971) (xy 9.365702 1.631149) (xy 8.55203 1.195022) (xy 7.815613 0.767391)
953
-      (xy 7.171143 0.365052) (xy 5.889508 -0.276471) (xy 4.970733 -0.424246) (xy 4.352031 -0.293773)
954
-      (xy 3.970613 -0.10055) (xy 3.342884 0.152915) (xy 2.462539 0.365912) (xy 1.699019 0.328399)
955
-      (xy 1.046067 -0.164068) (xy 0.785937 -0.874769) (xy 1.461573 -1.235088) (xy 2.243224 -1.530896)
956
-      (xy 3.041536 -1.726671) (xy 3.767156 -1.786893) (xy 4.064384 -1.774745) (xy 4.537229 -1.755665)
957
-      (xy 5.151035 -1.73824) (xy 5.871141 -1.731057) (xy 6.662891 -1.742704) (xy 7.491626 -1.781767)
958
-      (xy 8.322688 -1.856835) (xy 9.121418 -1.976492) (xy 9.853159 -2.149329) (xy 10.483253 -2.38393)
959
-      (xy 10.97704 -2.688884) (xy 11.299863 -3.072777) (xy 11.417063 -3.544197) (xy 11.293984 -4.111731)
960
-      (xy 10.895965 -4.783966) (xy 9.875565 -5.296398) (xy 9.038685 -5.633785) (xy 8.360635 -5.820147)
961
-      (xy 7.816727 -5.879502) (xy 7.691522 -5.875596) (xy 6.93934 -5.665623) (xy 6.402988 -5.265838)
962
-      (xy 5.872166 -4.883354) (xy 5.136576 -4.725284) (xy 4.352183 -4.558981) (xy 3.911148 -4.124152)
963
-      (xy 3.556578 -3.596671) (xy 3.031582 -3.152407) (xy 2.413883 -2.956301) (xy 1.624691 -2.812993)
964
-      (xy 0.907069 -2.721157) (xy 0.885692 -3.527729) (xy 0.942691 -4.296523) (xy 1.090363 -5.064656)
965
-      (xy 1.341004 -5.869249) (xy 1.706913 -6.74742) (xy 2.200386 -7.736288) (xy 2.652686 -8.25581)
966
-      (xy 3.306038 -8.835488) (xy 4.102272 -9.445507) (xy 4.983218 -10.056054) (xy 5.890709 -10.637314)
967
-      (xy 6.766574 -11.159472) (xy 7.552645 -11.592716) (xy 8.190753 -11.907229) (xy 8.622728 -12.073199)
968
-      (xy 9.274892 -12.393223) (xy 9.576685 -12.834045) (xy 9.83173 -13.352628) (xy 9.722176 -13.430881)
969
-      (xy 9.722176 -13.430868)) (layer F.SilkS) (width 0.338389))
970
-  )
971
-
972 902
   (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5C4D95C9) (tstamp 5C4D9413)
973 903
     (at 137.782986 93.98 180)
974 904
     (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")
@@ -1079,44 +1009,6 @@
1079 1009
     (pad 1 np_thru_hole circle (at 0 0) (size 2.5 2.5) (drill 2.5) (layers *.Cu *.Mask))
1080 1010
   )
1081 1011
 
1082
-  (module Resistors_ThroughHole:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer B.Cu) (tedit 5C57088B) (tstamp 5C50E1EE)
1083
-    (at 141.8 99.9)
1084
-    (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")
1085
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
1086
-    (path /5C36B93E)
1087
-    (fp_text reference R1 (at 3.81 2.31) (layer B.SilkS) hide
1088
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1089
-    )
1090
-    (fp_text value 100k (at 3.81 -2.31) (layer B.Fab) hide
1091
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1092
-    )
1093
-    (fp_line (start 8.7 1.6) (end -1.05 1.6) (layer B.CrtYd) (width 0.05))
1094
-    (fp_line (start 8.7 -1.6) (end 8.7 1.6) (layer B.CrtYd) (width 0.05))
1095
-    (fp_line (start -1.05 -1.6) (end 8.7 -1.6) (layer B.CrtYd) (width 0.05))
1096
-    (fp_line (start -1.05 1.6) (end -1.05 -1.6) (layer B.CrtYd) (width 0.05))
1097
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer B.SilkS) (width 0.12))
1098
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer B.SilkS) (width 0.12))
1099
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer B.SilkS) (width 0.12))
1100
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer B.SilkS) (width 0.12))
1101
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer B.SilkS) (width 0.12))
1102
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer B.SilkS) (width 0.12))
1103
-    (fp_line (start 7.62 0) (end 6.96 0) (layer B.Fab) (width 0.1))
1104
-    (fp_line (start 0 0) (end 0.66 0) (layer B.Fab) (width 0.1))
1105
-    (fp_line (start 6.96 1.25) (end 0.66 1.25) (layer B.Fab) (width 0.1))
1106
-    (fp_line (start 6.96 -1.25) (end 6.96 1.25) (layer B.Fab) (width 0.1))
1107
-    (fp_line (start 0.66 -1.25) (end 6.96 -1.25) (layer B.Fab) (width 0.1))
1108
-    (fp_line (start 0.66 1.25) (end 0.66 -1.25) (layer B.Fab) (width 0.1))
1109
-    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
1110
-      (net 14 "Net-(R1-Pad2)"))
1111
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
1112
-      (net 1 5V))
1113
-    (model ${KISYS3DMOD}/Resistors_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
1114
-      (at (xyz 0 0 0))
1115
-      (scale (xyz 0.393701 0.393701 0.393701))
1116
-      (rotate (xyz 0 0 0))
1117
-    )
1118
-  )
1119
-
1120 1012
   (module Symbols:OSHW-Logo_5.7x6mm_SilkScreen (layer B.Cu) (tedit 0) (tstamp 5C515B0D)
1121 1013
     (at 131.6 109.3 180)
1122 1014
     (descr "Open Source Hardware Logo")
@@ -1469,67 +1361,13 @@
1469 1361
       (xy 0.376964 2.709982)) (layer B.SilkS) (width 0.01))
1470 1362
   )
1471 1363
 
1472
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570DF4) (tstamp 5C59E441)
1473
-    (at 140.97 105.41)
1474
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
1475
-    (tags "test point SMD pad rectangle square")
1476
-    (path /5C5715CF)
1477
-    (attr virtual)
1478
-    (fp_text reference CHR. (at 2.53 -0.01) (layer B.SilkS)
1479
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1480
-    )
1481
-    (fp_text value BAT_CHARGING (at 0 1.75) (layer F.Fab)
1482
-      (effects (font (size 1 1) (thickness 0.15)))
1483
-    )
1484
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1485
-      (effects (font (size 1 1) (thickness 0.15)))
1486
-    )
1487
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1488
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1489
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1490
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1491
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1492
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1493
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1494
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1495
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1496
-      (net 20 BAT_CHARGING))
1497
-  )
1498
-
1499
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570DE9) (tstamp 5C59E44F)
1500
-    (at 140.97 107.95)
1501
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
1502
-    (tags "test point SMD pad rectangle square")
1503
-    (path /5C57277C)
1504
-    (attr virtual)
1505
-    (fp_text reference FULL (at 2.63 -0.15) (layer B.SilkS)
1506
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1507
-    )
1508
-    (fp_text value BAT_CHARGED (at 0 1.75) (layer F.Fab)
1509
-      (effects (font (size 1 1) (thickness 0.15)))
1510
-    )
1511
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1512
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1513
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1514
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1515
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1516
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1517
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1518
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1519
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1520
-      (effects (font (size 1 1) (thickness 0.15)))
1521
-    )
1522
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1523
-      (net 21 BAT_CHARGED))
1524
-  )
1525
-
1526
-  (module Capacitors_SMD:C_0603_1608Metric (layer B.Cu) (tedit 5C570518) (tstamp 5C5A1D6B)
1364
+  (module Capacitors_SMD:C_0603_1608Metric (layer B.Cu) (tedit 5C58C5EF) (tstamp 5C58F375)
1527 1365
     (at 143.51 102.87 90)
1528 1366
     (descr "Capacitor 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")
1529 1367
     (tags capacitor)
1530 1368
     (path /5C576327)
1531 1369
     (attr smd)
1532
-    (fp_text reference C2 (at 0 1.43 90) (layer B.SilkS) hide
1370
+    (fp_text reference C2 (at 0 1.27 90) (layer B.SilkS)
1533 1371
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1534 1372
     )
1535 1373
     (fp_text value 100n (at 0 -1.43 90) (layer B.Fab) hide
@@ -1595,14 +1433,265 @@
1595 1433
     )
1596 1434
   )
1597 1435
 
1598
-  (gr_text D8 (at 170.5 110.7) (layer B.SilkS)
1599
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1436
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5B301BBD) (tstamp 5C5E8343)
1437
+    (at 142.24 110.49 270)
1438
+    (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")
1439
+    (tags resistor)
1440
+    (path /5C58EB09)
1441
+    (attr smd)
1442
+    (fp_text reference R5 (at 0 -3.175 270) (layer B.SilkS)
1443
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1444
+    )
1445
+    (fp_text value 1k (at 0 -1.43 270) (layer B.Fab)
1446
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1447
+    )
1448
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
1449
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
1450
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
1451
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
1452
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
1453
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
1454
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
1455
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
1456
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
1457
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
1458
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
1459
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
1460
+    )
1461
+    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1462
+      (net 25 NCHRG))
1463
+    (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1464
+      (net 20 BAT_CHARGING))
1465
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
1466
+      (at (xyz 0 0 0))
1467
+      (scale (xyz 1 1 1))
1468
+      (rotate (xyz 0 0 0))
1469
+    )
1600 1470
   )
1601
-  (gr_text D4 (at 171.45 85.725) (layer F.SilkS) (tstamp 5C5A5C91)
1602
-    (effects (font (size 1 1) (thickness 0.15)))
1471
+
1472
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5B301BBD) (tstamp 5C5E8354)
1473
+    (at 140.97 110.49 270)
1474
+    (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")
1475
+    (tags resistor)
1476
+    (path /5C58EB15)
1477
+    (attr smd)
1478
+    (fp_text reference R6 (at 0 -3.175 270) (layer B.SilkS)
1479
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1480
+    )
1481
+    (fp_text value 1k (at 0 -1.43 270) (layer B.Fab)
1482
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1483
+    )
1484
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
1485
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
1486
+    )
1487
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
1488
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
1489
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
1490
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
1491
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
1492
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
1493
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
1494
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
1495
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
1496
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
1497
+    (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1498
+      (net 21 BAT_CHARGED))
1499
+    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1500
+      (net 26 NSTBY))
1501
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
1502
+      (at (xyz 0 0 0))
1503
+      (scale (xyz 1 1 1))
1504
+      (rotate (xyz 0 0 0))
1505
+    )
1603 1506
   )
1604
-  (gr_text D3 (at 168.91 85.725) (layer F.SilkS)
1605
-    (effects (font (size 1 1) (thickness 0.15)))
1507
+
1508
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer B.Cu) (tedit 5C58C0C0) (tstamp 5C58CF0C)
1509
+    (at 140.97 104.775)
1510
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1511
+    (tags "test point THT pad rectangle square")
1512
+    (path /5C5715CF)
1513
+    (attr virtual)
1514
+    (fp_text reference CHRG (at 3.175 0.635) (layer B.SilkS)
1515
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1516
+    )
1517
+    (fp_text value BAT_CHARGING (at 0 -1.75) (layer B.Fab)
1518
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1519
+    )
1520
+    (fp_text user %R (at 0 1.65) (layer B.Fab)
1521
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1522
+    )
1523
+    (fp_line (start -0.95 0.95) (end 0.95 0.95) (layer B.SilkS) (width 0.12))
1524
+    (fp_line (start 0.95 0.95) (end 0.95 -0.95) (layer B.SilkS) (width 0.12))
1525
+    (fp_line (start 0.95 -0.95) (end -0.95 -0.95) (layer B.SilkS) (width 0.12))
1526
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer B.SilkS) (width 0.12))
1527
+    (fp_line (start -1.25 1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1528
+    (fp_line (start -1.25 1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1529
+    (fp_line (start 1.25 -1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1530
+    (fp_line (start 1.25 -1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1531
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1532
+      (net 25 NCHRG))
1533
+  )
1534
+
1535
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer B.Cu) (tedit 5C58C0E6) (tstamp 5C5E8894)
1536
+    (at 140.97 107.315)
1537
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1538
+    (tags "test point THT pad rectangle square")
1539
+    (path /5C57277C)
1540
+    (attr virtual)
1541
+    (fp_text reference FULL (at 3.175 0) (layer B.SilkS)
1542
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1543
+    )
1544
+    (fp_text value BAT_CHARGED (at 0 -1.75) (layer B.Fab)
1545
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1546
+    )
1547
+    (fp_line (start 1.25 -1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1548
+    (fp_line (start 1.25 -1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1549
+    (fp_line (start -1.25 1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1550
+    (fp_line (start -1.25 1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1551
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer B.SilkS) (width 0.12))
1552
+    (fp_line (start 0.95 -0.95) (end -0.95 -0.95) (layer B.SilkS) (width 0.12))
1553
+    (fp_line (start 0.95 0.95) (end 0.95 -0.95) (layer B.SilkS) (width 0.12))
1554
+    (fp_line (start -0.95 0.95) (end 0.95 0.95) (layer B.SilkS) (width 0.12))
1555
+    (fp_text user %R (at 0 1.65) (layer B.Fab)
1556
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1557
+    )
1558
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1559
+      (net 26 NSTBY))
1560
+  )
1561
+
1562
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer F.Cu) (tedit 5C58C54A) (tstamp 5C58C310)
1563
+    (at 168.91 83.82)
1564
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1565
+    (tags "test point THT pad rectangle square")
1566
+    (path /5C573A1A)
1567
+    (attr virtual)
1568
+    (fp_text reference D3 (at 0 1.905) (layer B.SilkS)
1569
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1570
+    )
1571
+    (fp_text value GPIO3 (at 0 1.75) (layer F.Fab)
1572
+      (effects (font (size 1 1) (thickness 0.15)))
1573
+    )
1574
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1575
+      (effects (font (size 1 1) (thickness 0.15)))
1576
+    )
1577
+    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1578
+    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1579
+    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1580
+    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1581
+    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1582
+    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1583
+    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1584
+    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1585
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1586
+      (net 22 GPIO3))
1587
+  )
1588
+
1589
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer F.Cu) (tedit 5C58C55A) (tstamp 5C58EB25)
1590
+    (at 171.45 83.82)
1591
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1592
+    (tags "test point THT pad rectangle square")
1593
+    (path /5C574DB6)
1594
+    (attr virtual)
1595
+    (fp_text reference D4 (at 0 1.905) (layer B.SilkS)
1596
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1597
+    )
1598
+    (fp_text value GPIO4 (at 0 1.75) (layer F.Fab)
1599
+      (effects (font (size 1 1) (thickness 0.15)))
1600
+    )
1601
+    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1602
+    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1603
+    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1604
+    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1605
+    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1606
+    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1607
+    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1608
+    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1609
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1610
+      (effects (font (size 1 1) (thickness 0.15)))
1611
+    )
1612
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1613
+      (net 23 GPIO4))
1614
+  )
1615
+
1616
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer F.Cu) (tedit 5C58C53B) (tstamp 5C58F007)
1617
+    (at 172.72 110.49)
1618
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1619
+    (tags "test point THT pad rectangle square")
1620
+    (path /5C576251)
1621
+    (attr virtual)
1622
+    (fp_text reference D8 (at 0 1.905) (layer B.SilkS)
1623
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1624
+    )
1625
+    (fp_text value GPIO8 (at 0 1.75) (layer F.Fab)
1626
+      (effects (font (size 1 1) (thickness 0.15)))
1627
+    )
1628
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1629
+      (effects (font (size 1 1) (thickness 0.15)))
1630
+    )
1631
+    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1632
+    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1633
+    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1634
+    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1635
+    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1636
+    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1637
+    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1638
+    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1639
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1640
+      (net 24 GPIO8))
1641
+  )
1642
+
1643
+  (module Resistors_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer B.Cu) (tedit 5C58BFD6) (tstamp 5C58C5FC)
1644
+    (at 141.8 99.9)
1645
+    (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")
1646
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
1647
+    (path /5C36B93E)
1648
+    (fp_text reference R1 (at 1.075 -2.11) (layer B.SilkS)
1649
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1650
+    )
1651
+    (fp_text value 100k (at 3.81 -2.37) (layer B.Fab) hide
1652
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1653
+    )
1654
+    (fp_line (start 0.66 1.25) (end 0.66 -1.25) (layer B.Fab) (width 0.1))
1655
+    (fp_line (start 0.66 -1.25) (end 6.96 -1.25) (layer B.Fab) (width 0.1))
1656
+    (fp_line (start 6.96 -1.25) (end 6.96 1.25) (layer B.Fab) (width 0.1))
1657
+    (fp_line (start 6.96 1.25) (end 0.66 1.25) (layer B.Fab) (width 0.1))
1658
+    (fp_line (start 0 0) (end 0.66 0) (layer B.Fab) (width 0.1))
1659
+    (fp_line (start 7.62 0) (end 6.96 0) (layer B.Fab) (width 0.1))
1660
+    (fp_line (start 0.54 1.04) (end 0.54 1.37) (layer B.SilkS) (width 0.12))
1661
+    (fp_line (start 0.54 1.37) (end 7.08 1.37) (layer B.SilkS) (width 0.12))
1662
+    (fp_line (start 7.08 1.37) (end 7.08 1.04) (layer B.SilkS) (width 0.12))
1663
+    (fp_line (start 0.54 -1.04) (end 0.54 -1.37) (layer B.SilkS) (width 0.12))
1664
+    (fp_line (start 0.54 -1.37) (end 7.08 -1.37) (layer B.SilkS) (width 0.12))
1665
+    (fp_line (start 7.08 -1.37) (end 7.08 -1.04) (layer B.SilkS) (width 0.12))
1666
+    (fp_line (start -1.05 1.5) (end -1.05 -1.5) (layer B.CrtYd) (width 0.05))
1667
+    (fp_line (start -1.05 -1.5) (end 8.67 -1.5) (layer B.CrtYd) (width 0.05))
1668
+    (fp_line (start 8.67 -1.5) (end 8.67 1.5) (layer B.CrtYd) (width 0.05))
1669
+    (fp_line (start 8.67 1.5) (end -1.05 1.5) (layer B.CrtYd) (width 0.05))
1670
+    (fp_text user %R (at 3.81 0) (layer B.Fab)
1671
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1672
+    )
1673
+    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
1674
+      (net 1 5V))
1675
+    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
1676
+      (net 14 "Net-(R1-Pad2)"))
1677
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
1678
+      (at (xyz 0 0 0))
1679
+      (scale (xyz 1 1 1))
1680
+      (rotate (xyz 0 0 0))
1681
+    )
1682
+  )
1683
+
1684
+  (dimension 50 (width 0.3) (layer Dwgs.User)
1685
+    (gr_text "50.000 mm" (at 153 126.1) (layer Dwgs.User)
1686
+      (effects (font (size 1.5 1.5) (thickness 0.3)))
1687
+    )
1688
+    (feature1 (pts (xy 128 120) (xy 128 124.586421)))
1689
+    (feature2 (pts (xy 178 120) (xy 178 124.586421)))
1690
+    (crossbar (pts (xy 178 124) (xy 128 124)))
1691
+    (arrow1a (pts (xy 128 124) (xy 129.126504 123.413579)))
1692
+    (arrow1b (pts (xy 128 124) (xy 129.126504 124.586421)))
1693
+    (arrow2a (pts (xy 178 124) (xy 176.873496 123.413579)))
1694
+    (arrow2b (pts (xy 178 124) (xy 176.873496 124.586421)))
1606 1695
   )
1607 1696
   (gr_text øko (at 131.8 101.2 270) (layer B.SilkS)
1608 1697
     (effects (font (size 3 3) (thickness 0.5)) (justify mirror))
@@ -1639,7 +1728,7 @@
1639 1728
   (gr_text B+ (at 147.1 96.7) (layer B.SilkS) (tstamp 5C3A7894)
1640 1729
     (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1641 1730
   )
1642
-  (gr_text OUT- (at 145.8 109.7) (layer B.SilkS) (tstamp 5C3A77FA)
1731
+  (gr_text OUT- (at 146.05 108.585) (layer B.SilkS) (tstamp 5C3A77FA)
1643 1732
     (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1644 1733
   )
1645 1734
   (gr_text B- (at 147.2 106) (layer B.SilkS) (tstamp 5C3A7760)
@@ -1712,7 +1801,7 @@
1712 1801
   (gr_text BME280 (at 132 90.6 90) (layer B.SilkS)
1713 1802
     (effects (font (size 1 1) (thickness 0.2)) (justify mirror))
1714 1803
   )
1715
-  (gr_text ADPS-9960 (at 139.9 105.6 90) (layer B.SilkS)
1804
+  (gr_text ADPS-9960 (at 140.335 97.79 90) (layer B.SilkS)
1716 1805
     (effects (font (size 1 1) (thickness 0.2)) (justify mirror))
1717 1806
   )
1718 1807
   (gr_text + (at 176.4 88.8) (layer B.SilkS)
@@ -1721,18 +1810,6 @@
1721 1810
   (gr_text - (at 174.625 111.76) (layer B.SilkS)
1722 1811
     (effects (font (size 1.5 1.5) (thickness 0.3)))
1723 1812
   )
1724
-  (dimension 50 (width 0.3) (layer Dwgs.User)
1725
-    (gr_text "50.000 mm" (at 153 126.1) (layer Dwgs.User)
1726
-      (effects (font (size 1.5 1.5) (thickness 0.3)))
1727
-    )
1728
-    (feature1 (pts (xy 128 120) (xy 128 124.586421)))
1729
-    (feature2 (pts (xy 178 120) (xy 178 124.586421)))
1730
-    (crossbar (pts (xy 178 124) (xy 128 124)))
1731
-    (arrow1a (pts (xy 128 124) (xy 129.126504 123.413579)))
1732
-    (arrow1b (pts (xy 128 124) (xy 129.126504 124.586421)))
1733
-    (arrow2a (pts (xy 178 124) (xy 176.873496 123.413579)))
1734
-    (arrow2b (pts (xy 178 124) (xy 176.873496 124.586421)))
1735
-  )
1736 1813
   (dimension 32 (width 0.3) (layer Dwgs.User)
1737 1814
     (gr_text "32.000 mm" (at 109.9 97.5 90) (layer Dwgs.User)
1738 1815
       (effects (font (size 1.5 1.5) (thickness 0.3)))
@@ -1828,14 +1905,13 @@
1828 1905
   (segment (start 164.450001 97.812001) (end 174.988 108.35) (width 0.6) (layer B.Cu) (net 8))
1829 1906
   (segment (start 174.988 108.35) (end 176.35 108.35) (width 0.6) (layer B.Cu) (net 8))
1830 1907
   (segment (start 146.652001 97.812001) (end 164.450001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1831
-  (segment (start 142.539233 97.812001) (end 145.4 97.812001) (width 0.6) (layer B.Cu) (net 8))
1832 1908
   (segment (start 137.989999 91.489999) (end 141.558606 95.058606) (width 0.6) (layer B.Cu) (net 8))
1833 1909
   (segment (start 137.989999 86.449999) (end 137.989999 91.489999) (width 0.6) (layer B.Cu) (net 8))
1834 1910
   (segment (start 137.14 85.6) (end 137.989999 86.449999) (width 0.6) (layer B.Cu) (net 8))
1835 1911
   (segment (start 145.4 97.812001) (end 144.802001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1836
-  (segment (start 141.558606 96.831374) (end 142.539233 97.812001) (width 0.6) (layer B.Cu) (net 8))
1837
-  (segment (start 141.558606 95.058606) (end 141.558606 96.831374) (width 0.6) (layer B.Cu) (net 8))
1838 1912
   (segment (start 146.652001 97.812001) (end 145.4 97.812001) (width 0.6) (layer B.Cu) (net 8))
1913
+  (segment (start 144.312001 97.812001) (end 141.558606 95.058606) (width 0.6) (layer B.Cu) (net 8))
1914
+  (segment (start 144.802001 97.812001) (end 144.312001 97.812001) (width 0.6) (layer B.Cu) (net 8))
1839 1915
   (segment (start 163.21 110.157208) (end 165.2 108.167208) (width 0.25) (layer F.Cu) (net 9))
1840 1916
   (segment (start 163.21 111.43) (end 163.21 110.157208) (width 0.25) (layer F.Cu) (net 9))
1841 1917
   (via (at 163.1 93.3) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 9))
@@ -1879,15 +1955,15 @@
1879 1955
   (segment (start 149.55 105.95) (end 149.5 106) (width 0.6) (layer B.Cu) (net 13) (status 30))
1880 1956
   (segment (start 152.85 105.95) (end 149.55 105.95) (width 0.6) (layer B.Cu) (net 13) (status 30))
1881 1957
   (via (at 146.3 105.9) (size 1.2) (drill 0.5) (layers F.Cu B.Cu) (net 13))
1882
-  (segment (start 145.900001 105.500001) (end 146.3 105.9) (width 0.6) (layer F.Cu) (net 13))
1883 1958
   (segment (start 149.4 105.9) (end 149.5 106) (width 0.6) (layer B.Cu) (net 13))
1884 1959
   (segment (start 146.3 105.9) (end 149.4 105.9) (width 0.6) (layer B.Cu) (net 13))
1885 1960
   (segment (start 143.51 89.59) (end 143.51 102.87) (width 0.6) (layer F.Cu) (net 13))
1886 1961
   (segment (start 143.51 89.59) (end 142.42 88.5) (width 0.6) (layer F.Cu) (net 13))
1887
-  (segment (start 143.51 103.11) (end 146.3 105.9) (width 0.6) (layer F.Cu) (net 13))
1888 1962
   (segment (start 143.51 102.87) (end 143.51 103.11) (width 0.25) (layer F.Cu) (net 13))
1889 1963
   (segment (start 142.22 88.3) (end 143.51 89.59) (width 0.6) (layer F.Cu) (net 13))
1890 1964
   (segment (start 142.22 85.6) (end 142.22 88.3) (width 0.6) (layer F.Cu) (net 13))
1965
+  (segment (start 143.51 103.11) (end 146.3 105.9) (width 0.6) (layer F.Cu) (net 13))
1966
+  (segment (start 145.900001 105.500001) (end 146.3 105.9) (width 0.6) (layer F.Cu) (net 13))
1891 1967
   (via (at 155.3 106.68) (size 0.8) (drill 0.4) (layers F.Cu B.Cu) (net 14))
1892 1968
   (segment (start 153.05 111.05) (end 153.05 111.43) (width 0.25) (layer F.Cu) (net 14))
1893 1969
   (segment (start 155.3 108.8) (end 153.05 111.05) (width 0.25) (layer F.Cu) (net 14))
@@ -1899,15 +1975,13 @@
1899 1975
   (segment (start 153.4 100.6) (end 153.13 100.33) (width 0.25) (layer B.Cu) (net 14))
1900 1976
   (segment (start 147.2675 99.9) (end 146.8375 100.33) (width 0.25) (layer B.Cu) (net 14))
1901 1977
   (segment (start 149.42 99.9) (end 147.2675 99.9) (width 0.25) (layer B.Cu) (net 14))
1902
-  (segment (start 142.24 106.68) (end 140.97 105.41) (width 0.25) (layer B.Cu) (net 20))
1903
-  (segment (start 142.24 109.22) (end 142.24 106.68) (width 0.25) (layer B.Cu) (net 20))
1904
-  (segment (start 145.675001 112.655001) (end 142.24 109.22) (width 0.25) (layer B.Cu) (net 20))
1978
+  (segment (start 143.770001 112.655001) (end 142.24 111.125) (width 0.25) (layer B.Cu) (net 20))
1905 1979
   (segment (start 158.13 111.43) (end 156.904999 112.655001) (width 0.25) (layer B.Cu) (net 20))
1906
-  (segment (start 156.904999 112.655001) (end 145.675001 112.655001) (width 0.25) (layer B.Cu) (net 20))
1907
-  (segment (start 140.97 109.22) (end 140.97 107.95) (width 0.25) (layer B.Cu) (net 21))
1908
-  (segment (start 144.855011 113.105011) (end 140.97 109.22) (width 0.25) (layer B.Cu) (net 21))
1980
+  (segment (start 156.904999 112.655001) (end 143.770001 112.655001) (width 0.25) (layer B.Cu) (net 20))
1981
+  (segment (start 140.97 112.395) (end 140.97 111.2775) (width 0.25) (layer B.Cu) (net 21))
1982
+  (segment (start 141.680011 113.105011) (end 140.97 112.395) (width 0.25) (layer B.Cu) (net 21))
1909 1983
   (segment (start 160.67 111.43) (end 158.994989 113.105011) (width 0.25) (layer B.Cu) (net 21))
1910
-  (segment (start 158.994989 113.105011) (end 144.855011 113.105011) (width 0.25) (layer B.Cu) (net 21))
1984
+  (segment (start 158.994989 113.105011) (end 141.680011 113.105011) (width 0.25) (layer B.Cu) (net 21))
1911 1985
   (segment (start 162.345011 86.894989) (end 168.375011 86.894989) (width 0.25) (layer B.Cu) (net 22))
1912 1986
   (segment (start 160.67 88.57) (end 162.345011 86.894989) (width 0.25) (layer B.Cu) (net 22))
1913 1987
   (segment (start 168.91 84.82) (end 168.91 83.82) (width 0.25) (layer B.Cu) (net 22))
@@ -1921,6 +1995,11 @@
1921 1995
   (segment (start 165.75 111.43) (end 166.975001 112.655001) (width 0.25) (layer B.Cu) (net 24))
1922 1996
   (segment (start 172.72 111.76) (end 172.72 110.49) (width 0.25) (layer B.Cu) (net 24))
1923 1997
   (segment (start 171.824999 112.655001) (end 172.72 111.76) (width 0.25) (layer B.Cu) (net 24))
1998
+  (segment (start 141.97 104.775) (end 140.97 104.775) (width 0.25) (layer B.Cu) (net 25))
1999
+  (segment (start 142.24 105.045) (end 141.97 104.775) (width 0.25) (layer B.Cu) (net 25))
2000
+  (segment (start 142.24 109.7025) (end 142.24 105.045) (width 0.25) (layer B.Cu) (net 25))
2001
+  (segment (start 140.97 108.4325) (end 140.97 109.7025) (width 0.25) (layer B.Cu) (net 26))
2002
+  (segment (start 140.97 108.4325) (end 140.97 107.315) (width 0.25) (layer B.Cu) (net 26))
1924 2003
 
1925 2004
   (zone (net 2) (net_name GND) (layer B.Cu) (tstamp 5C5A56A1) (hatch edge 0.508)
1926 2005
     (connect_pads (clearance 0.508))
@@ -1940,111 +2019,119 @@
1940 2019
         (xy 136.563 107.157881) (xy 136.77568 107.671337) (xy 137.168663 108.06432) (xy 137.359647 108.143428) (xy 137.228857 108.197603)
1941 2020
         (xy 137.159392 108.439787) (xy 137.96 109.240395) (xy 138.760608 108.439787) (xy 138.691143 108.197603) (xy 138.550607 108.147465)
1942 2021
         (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)
1943
-        (xy 139.531474 106.383328) (xy 139.59493 106.340928) (xy 139.605424 106.325222) (xy 139.621843 106.407765) (xy 139.762191 106.617809)
1944
-        (xy 139.855266 106.68) (xy 139.762191 106.742191) (xy 139.621843 106.952235) (xy 139.57256 107.2) (xy 139.57256 108.7)
1945
-        (xy 139.621843 108.947765) (xy 139.762191 109.157809) (xy 139.972235 109.298157) (xy 140.22 109.34744) (xy 140.220461 109.34744)
1946
-        (xy 140.254096 109.516536) (xy 140.422071 109.767929) (xy 140.48553 109.810331) (xy 143.539698 112.8645) (xy 139.031157 112.8645)
1947
-        (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)
1948
-        (xy 138.560353 110.696572) (xy 138.691143 110.642397) (xy 138.760608 110.400213) (xy 137.96 109.599605) (xy 137.159392 110.400213)
1949
-        (xy 137.228857 110.642397) (xy 137.369393 110.692535) (xy 137.168663 110.77568) (xy 136.77568 111.168663) (xy 136.563 111.682119)
1950
-        (xy 136.563 112.237881) (xy 136.77568 112.751337) (xy 136.888843 112.8645) (xy 128.6355 112.8645) (xy 128.6355 109.212302)
1951
-        (xy 136.550856 109.212302) (xy 136.578638 109.767368) (xy 136.737603 110.151143) (xy 136.979787 110.220608) (xy 137.780395 109.42)
1952
-        (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)
1953
-        (xy 139.182397 108.688857) (xy 138.940213 108.619392) (xy 138.139605 109.42) (xy 137.780395 109.42) (xy 136.979787 108.619392)
1954
-        (xy 136.737603 108.688857) (xy 136.550856 109.212302) (xy 128.6355 109.212302) (xy 128.6355 96.412912) (xy 128.77568 96.751337)
1955
-        (xy 129.168663 97.14432) (xy 129.682119 97.357) (xy 130.237881 97.357) (xy 130.751337 97.14432) (xy 131.14432 96.751337)
1956
-        (xy 131.357 96.237881) (xy 131.357 95.682119) (xy 131.14432 95.168663) (xy 130.751337 94.77568) (xy 130.560353 94.696572)
1957
-        (xy 130.691143 94.642397) (xy 130.760608 94.400213) (xy 129.96 93.599605) (xy 129.159392 94.400213) (xy 129.228857 94.642397)
1958
-        (xy 129.369393 94.692535) (xy 129.168663 94.77568) (xy 128.77568 95.168663) (xy 128.6355 95.507088) (xy 128.6355 93.904645)
1959
-        (xy 128.737603 94.151143) (xy 128.979787 94.220608) (xy 129.780395 93.42) (xy 130.139605 93.42) (xy 130.940213 94.220608)
1960
-        (xy 131.182397 94.151143) (xy 131.369144 93.627698) (xy 131.341362 93.072632) (xy 131.182397 92.688857) (xy 130.940213 92.619392)
1961
-        (xy 130.139605 93.42) (xy 129.780395 93.42) (xy 128.979787 92.619392) (xy 128.737603 92.688857) (xy 128.6355 92.975048)
1962
-        (xy 128.6355 91.332912) (xy 128.77568 91.671337) (xy 129.168663 92.06432) (xy 129.359647 92.143428) (xy 129.228857 92.197603)
1963
-        (xy 129.159392 92.439787) (xy 129.96 93.240395) (xy 130.760608 92.439787) (xy 130.691143 92.197603) (xy 130.550607 92.147465)
1964
-        (xy 130.751337 92.06432) (xy 131.14432 91.671337) (xy 131.357 91.157881) (xy 131.357 90.811801)
2022
+        (xy 139.531474 106.383328) (xy 139.59493 106.340928) (xy 139.762905 106.089536) (xy 139.78156 105.995751) (xy 139.855266 106.045)
2023
+        (xy 139.762191 106.107191) (xy 139.621843 106.317235) (xy 139.57256 106.565) (xy 139.57256 108.065) (xy 139.621843 108.312765)
2024
+        (xy 139.762191 108.522809) (xy 139.972235 108.663157) (xy 140.21 108.710451) (xy 140.21 108.798604) (xy 140.101261 108.871261)
2025
+        (xy 139.913495 109.152273) (xy 139.84756 109.48375) (xy 139.84756 109.92125) (xy 139.913495 110.252727) (xy 140.072036 110.49)
2026
+        (xy 139.913495 110.727273) (xy 139.84756 111.05875) (xy 139.84756 111.49625) (xy 139.913495 111.827727) (xy 140.101261 112.108739)
2027
+        (xy 140.21 112.181396) (xy 140.21 112.320153) (xy 140.195112 112.395) (xy 140.21 112.469847) (xy 140.21 112.469851)
2028
+        (xy 140.254096 112.691536) (xy 140.369667 112.8645) (xy 139.031157 112.8645) (xy 139.14432 112.751337) (xy 139.357 112.237881)
2029
+        (xy 139.357 111.682119) (xy 139.14432 111.168663) (xy 138.751337 110.77568) (xy 138.560353 110.696572) (xy 138.691143 110.642397)
2030
+        (xy 138.760608 110.400213) (xy 137.96 109.599605) (xy 137.159392 110.400213) (xy 137.228857 110.642397) (xy 137.369393 110.692535)
2031
+        (xy 137.168663 110.77568) (xy 136.77568 111.168663) (xy 136.563 111.682119) (xy 136.563 112.237881) (xy 136.77568 112.751337)
2032
+        (xy 136.888843 112.8645) (xy 128.6355 112.8645) (xy 128.6355 109.212302) (xy 136.550856 109.212302) (xy 136.578638 109.767368)
2033
+        (xy 136.737603 110.151143) (xy 136.979787 110.220608) (xy 137.780395 109.42) (xy 138.139605 109.42) (xy 138.940213 110.220608)
2034
+        (xy 139.182397 110.151143) (xy 139.369144 109.627698) (xy 139.341362 109.072632) (xy 139.182397 108.688857) (xy 138.940213 108.619392)
2035
+        (xy 138.139605 109.42) (xy 137.780395 109.42) (xy 136.979787 108.619392) (xy 136.737603 108.688857) (xy 136.550856 109.212302)
2036
+        (xy 128.6355 109.212302) (xy 128.6355 96.412912) (xy 128.77568 96.751337) (xy 129.168663 97.14432) (xy 129.682119 97.357)
2037
+        (xy 130.237881 97.357) (xy 130.751337 97.14432) (xy 131.14432 96.751337) (xy 131.357 96.237881) (xy 131.357 95.682119)
2038
+        (xy 131.14432 95.168663) (xy 130.751337 94.77568) (xy 130.560353 94.696572) (xy 130.691143 94.642397) (xy 130.760608 94.400213)
2039
+        (xy 129.96 93.599605) (xy 129.159392 94.400213) (xy 129.228857 94.642397) (xy 129.369393 94.692535) (xy 129.168663 94.77568)
2040
+        (xy 128.77568 95.168663) (xy 128.6355 95.507088) (xy 128.6355 93.904645) (xy 128.737603 94.151143) (xy 128.979787 94.220608)
2041
+        (xy 129.780395 93.42) (xy 130.139605 93.42) (xy 130.940213 94.220608) (xy 131.182397 94.151143) (xy 131.369144 93.627698)
2042
+        (xy 131.341362 93.072632) (xy 131.182397 92.688857) (xy 130.940213 92.619392) (xy 130.139605 93.42) (xy 129.780395 93.42)
2043
+        (xy 128.979787 92.619392) (xy 128.737603 92.688857) (xy 128.6355 92.975048) (xy 128.6355 91.332912) (xy 128.77568 91.671337)
2044
+        (xy 129.168663 92.06432) (xy 129.359647 92.143428) (xy 129.228857 92.197603) (xy 129.159392 92.439787) (xy 129.96 93.240395)
2045
+        (xy 130.760608 92.439787) (xy 130.691143 92.197603) (xy 130.550607 92.147465) (xy 130.751337 92.06432) (xy 131.14432 91.671337)
2046
+        (xy 131.357 91.157881) (xy 131.357 90.811801)
1965 2047
       )
1966 2048
     )
1967 2049
     (filled_polygon
1968 2050
       (pts
1969
-        (xy 140.623606 95.445896) (xy 140.623607 96.739284) (xy 140.605289 96.831374) (xy 140.677856 97.196192) (xy 140.785305 97.357)
1970
-        (xy 140.88451 97.505471) (xy 140.962576 97.557633) (xy 141.812973 98.408031) (xy 141.851039 98.465) (xy 141.514561 98.465)
1971
-        (xy 140.987138 98.683466) (xy 140.583466 99.087138) (xy 140.365 99.614561) (xy 140.365 100.185439) (xy 140.583466 100.712862)
1972
-        (xy 140.987138 101.116534) (xy 141.514561 101.335) (xy 142.085439 101.335) (xy 142.612862 101.116534) (xy 142.639396 101.09)
1973
-        (xy 142.882605 101.09) (xy 142.641261 101.251261) (xy 142.453495 101.532273) (xy 142.38756 101.86375) (xy 142.38756 102.30125)
1974
-        (xy 142.453495 102.632727) (xy 142.561943 102.795031) (xy 142.496673 102.860302) (xy 142.4 103.093691) (xy 142.4 103.37175)
1975
-        (xy 142.55875 103.5305) (xy 143.383 103.5305) (xy 143.383 103.5105) (xy 143.637 103.5105) (xy 143.637 103.5305)
1976
-        (xy 144.46125 103.5305) (xy 144.62 103.37175) (xy 144.62 103.093691) (xy 144.523327 102.860302) (xy 144.458057 102.795031)
1977
-        (xy 144.566505 102.632727) (xy 144.620754 102.36) (xy 145.604984 102.36) (xy 145.428958 102.406169) (xy 145.252581 102.907122)
1978
-        (xy 145.281336 103.43744) (xy 145.428958 103.793831) (xy 145.664725 103.855669) (xy 146.420395 103.1) (xy 146.406252 103.085858)
1979
-        (xy 146.585858 102.906252) (xy 146.6 102.920395) (xy 146.614142 102.906252) (xy 146.793748 103.085858) (xy 146.779605 103.1)
1980
-        (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)
1981
-        (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)
1982
-        (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)
1983
-        (xy 148.190331 101.11553) (xy 148.147929 101.052071) (xy 147.896537 100.884096) (xy 147.864464 100.877716) (xy 147.90777 100.66)
1984
-        (xy 148.201957 100.66) (xy 148.385423 100.934577) (xy 148.860091 101.25174) (xy 149.278667 101.335) (xy 149.561333 101.335)
1985
-        (xy 149.979909 101.25174) (xy 150.454577 100.934577) (xy 150.638043 100.66) (xy 152.385198 100.66) (xy 152.915526 101.190329)
1986
-        (xy 152.915532 101.190333) (xy 154.540001 102.814803) (xy 154.54 105.976289) (xy 154.422569 106.09372) (xy 154.265 106.474126)
1987
-        (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)
1988
-        (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)
1989
-        (xy 156.06 105.976289) (xy 156.06 102.574848) (xy 156.074888 102.5) (xy 156.06 102.425152) (xy 156.06 102.425148)
1990
-        (xy 156.02548 102.251605) (xy 156.015904 102.203462) (xy 155.890329 102.015527) (xy 155.847929 101.952071) (xy 155.784473 101.909671)
1991
-        (xy 153.990333 100.115532) (xy 153.990329 100.115526) (xy 153.29033 99.415529) (xy 153.247929 99.352071) (xy 152.996537 99.184096)
1992
-        (xy 152.774852 99.14) (xy 152.774847 99.14) (xy 152.7 99.125112) (xy 152.625153 99.14) (xy 150.638043 99.14)
1993
-        (xy 150.454577 98.865423) (xy 150.277346 98.747001) (xy 164.062712 98.747001) (xy 174.26174 108.94603) (xy 174.313903 109.024097)
1994
-        (xy 174.391969 109.076259) (xy 174.623181 109.23075) (xy 174.978228 109.301373) (xy 174.989843 109.359765) (xy 175.130191 109.569809)
1995
-        (xy 175.340235 109.710157) (xy 175.465001 109.734974) (xy 175.465 110.339358) (xy 175.402235 110.351843) (xy 175.192191 110.492191)
1996
-        (xy 175.051843 110.702235) (xy 175.00256 110.95) (xy 175.00256 112.45) (xy 175.051843 112.697765) (xy 175.163253 112.8645)
1997
-        (xy 172.690301 112.8645) (xy 173.204473 112.350329) (xy 173.267929 112.307929) (xy 173.435904 112.056537) (xy 173.461225 111.92924)
1998
-        (xy 173.667765 111.888157) (xy 173.877809 111.747809) (xy 174.018157 111.537765) (xy 174.06744 111.29) (xy 174.06744 109.79)
1999
-        (xy 174.018157 109.542235) (xy 173.877809 109.332191) (xy 173.667765 109.191843) (xy 173.42 109.14256) (xy 171.92 109.14256)
2000
-        (xy 171.672235 109.191843) (xy 171.462191 109.332191) (xy 171.321843 109.542235) (xy 171.27256 109.79) (xy 171.27256 111.29)
2001
-        (xy 171.321843 111.537765) (xy 171.462191 111.747809) (xy 171.579204 111.825995) (xy 171.510198 111.895001) (xy 169.758862 111.895001)
2002
-        (xy 169.825 111.73533) (xy 169.825 111.12467) (xy 169.59131 110.560493) (xy 169.159507 110.12869) (xy 168.59533 109.895)
2003
-        (xy 167.98467 109.895) (xy 167.420493 110.12869) (xy 167.02 110.529183) (xy 166.619507 110.12869) (xy 166.05533 109.895)
2004
-        (xy 165.44467 109.895) (xy 164.880493 110.12869) (xy 164.48 110.529183) (xy 164.079507 110.12869) (xy 163.51533 109.895)
2005
-        (xy 162.90467 109.895) (xy 162.340493 110.12869) (xy 161.94 110.529183) (xy 161.539507 110.12869) (xy 160.97533 109.895)
2006
-        (xy 160.36467 109.895) (xy 159.800493 110.12869) (xy 159.4 110.529183) (xy 158.999507 110.12869) (xy 158.43533 109.895)
2007
-        (xy 158.199802 109.895) (xy 162.134803 105.96) (xy 168.206289 105.96) (xy 168.32372 106.077431) (xy 168.704126 106.235)
2008
-        (xy 169.115874 106.235) (xy 169.49628 106.077431) (xy 169.787431 105.78628) (xy 169.945 105.405874) (xy 169.945 104.994126)
2009
-        (xy 169.787431 104.61372) (xy 169.49628 104.322569) (xy 169.115874 104.165) (xy 168.704126 104.165) (xy 168.675 104.177064)
2010
-        (xy 168.675 103.794126) (xy 168.517431 103.41372) (xy 168.22628 103.122569) (xy 167.845874 102.965) (xy 167.434126 102.965)
2011
-        (xy 167.05372 103.122569) (xy 166.936289 103.24) (xy 162.457848 103.24) (xy 162.383 103.225112) (xy 162.308152 103.24)
2012
-        (xy 162.308148 103.24) (xy 162.134605 103.27452) (xy 162.086462 103.284096) (xy 161.918183 103.396537) (xy 161.835071 103.452071)
2013
-        (xy 161.792671 103.515527) (xy 155.8632 109.444999) (xy 154.161387 109.444999) (xy 154.247 109.23831) (xy 154.247 108.63575)
2014
-        (xy 154.08825 108.477) (xy 152.977 108.477) (xy 152.977 108.497) (xy 152.723 108.497) (xy 152.723 108.477)
2015
-        (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 151.453 109.23831) (xy 151.547865 109.467334) (xy 151.438464 109.489095)
2016
-        (xy 151.187072 109.65707) (xy 151.144672 109.720526) (xy 150.924838 109.94036) (xy 150.81533 109.895) (xy 150.20467 109.895)
2017
-        (xy 149.640493 110.12869) (xy 149.20869 110.560493) (xy 148.975 111.12467) (xy 148.975 111.73533) (xy 149.041138 111.895001)
2018
-        (xy 145.989803 111.895001) (xy 143 108.905199) (xy 143 108.68575) (xy 147.615 108.68575) (xy 147.615 109.27631)
2019
-        (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)
2020
-        (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)
2021
-        (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)
2022
-        (xy 149.127 108.527) (xy 148.873 108.527) (xy 147.77375 108.527) (xy 147.615 108.68575) (xy 143 108.68575)
2023
-        (xy 143 106.754846) (xy 143.014888 106.679999) (xy 143 106.605152) (xy 143 106.605148) (xy 142.955904 106.383463)
2024
-        (xy 142.787929 106.132071) (xy 142.724473 106.089671) (xy 142.36744 105.732638) (xy 142.36744 105.654343) (xy 145.065 105.654343)
2025
-        (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)
2026
-        (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)
2027
-        (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)
2028
-        (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)
2029
-        (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)
2030
-        (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)
2031
-        (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)
2032
-        (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)
2033
-        (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)
2034
-        (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)
2035
-        (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)
2036
-        (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)
2037
-        (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)
2038
-        (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)
2039
-        (xy 145.253018 105.200429) (xy 145.065 105.654343) (xy 142.36744 105.654343) (xy 142.36744 104.66) (xy 142.318157 104.412235)
2040
-        (xy 142.177809 104.202191) (xy 141.967765 104.061843) (xy 141.72 104.01256) (xy 140.22 104.01256) (xy 139.972235 104.061843)
2041
-        (xy 139.807001 104.17225) (xy 139.807001 103.94325) (xy 142.4 103.94325) (xy 142.4 104.221309) (xy 142.496673 104.454698)
2042
-        (xy 142.675301 104.633327) (xy 142.90869 104.73) (xy 143.22425 104.73) (xy 143.383 104.57125) (xy 143.383 103.7845)
2043
-        (xy 143.637 103.7845) (xy 143.637 104.57125) (xy 143.79575 104.73) (xy 144.11131 104.73) (xy 144.344699 104.633327)
2044
-        (xy 144.523327 104.454698) (xy 144.62 104.221309) (xy 144.62 104.035275) (xy 145.844331 104.035275) (xy 145.906169 104.271042)
2045
-        (xy 146.407122 104.447419) (xy 146.93744 104.418664) (xy 147.293831 104.271042) (xy 147.355669 104.035275) (xy 146.6 103.279605)
2046
-        (xy 145.844331 104.035275) (xy 144.62 104.035275) (xy 144.62 103.94325) (xy 144.46125 103.7845) (xy 143.637 103.7845)
2047
-        (xy 143.383 103.7845) (xy 142.55875 103.7845) (xy 142.4 103.94325) (xy 139.807001 103.94325) (xy 139.807001 97.071362)
2051
+        (xy 140.962575 95.784865) (xy 140.962578 95.784867) (xy 143.58574 98.408029) (xy 143.637904 98.486098) (xy 143.947182 98.692751)
2052
+        (xy 144.219915 98.747001) (xy 144.312001 98.765318) (xy 144.404087 98.747001) (xy 148.562654 98.747001) (xy 148.385423 98.865423)
2053
+        (xy 148.201957 99.14) (xy 147.342348 99.14) (xy 147.2675 99.125112) (xy 147.192652 99.14) (xy 147.192648 99.14)
2054
+        (xy 147.019105 99.17452) (xy 146.970962 99.184096) (xy 146.935846 99.20756) (xy 146.61875 99.20756) (xy 146.287273 99.273495)
2055
+        (xy 146.05 99.432036) (xy 145.812727 99.273495) (xy 145.48125 99.20756) (xy 145.04375 99.20756) (xy 144.712273 99.273495)
2056
+        (xy 144.431261 99.461261) (xy 144.358604 99.57) (xy 143.216542 99.57) (xy 143.016534 99.087138) (xy 142.612862 98.683466)
2057
+        (xy 142.085439 98.465) (xy 141.514561 98.465) (xy 140.987138 98.683466) (xy 140.583466 99.087138) (xy 140.365 99.614561)
2058
+        (xy 140.365 100.185439) (xy 140.583466 100.712862) (xy 140.987138 101.116534) (xy 141.514561 101.335) (xy 142.085439 101.335)
2059
+        (xy 142.612862 101.116534) (xy 142.639396 101.09) (xy 142.882605 101.09) (xy 142.641261 101.251261) (xy 142.453495 101.532273)
2060
+        (xy 142.38756 101.86375) (xy 142.38756 102.30125) (xy 142.453495 102.632727) (xy 142.561943 102.795031) (xy 142.496673 102.860302)
2061
+        (xy 142.4 103.093691) (xy 142.4 103.37175) (xy 142.55875 103.5305) (xy 143.383 103.5305) (xy 143.383 103.5105)
2062
+        (xy 143.637 103.5105) (xy 143.637 103.5305) (xy 144.46125 103.5305) (xy 144.62 103.37175) (xy 144.62 103.093691)
2063
+        (xy 144.523327 102.860302) (xy 144.458057 102.795031) (xy 144.566505 102.632727) (xy 144.620754 102.36) (xy 145.604984 102.36)
2064
+        (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.428958 103.793831) (xy 145.664725 103.855669)
2065
+        (xy 146.420395 103.1) (xy 146.406252 103.085858) (xy 146.585858 102.906252) (xy 146.6 102.920395) (xy 146.614142 102.906252)
2066
+        (xy 146.793748 103.085858) (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212)
2067
+        (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)
2068
+        (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)
2069
+        (xy 149.365548 101.765) (xy 148.839802 101.765) (xy 148.190331 101.11553) (xy 148.147929 101.052071) (xy 147.896537 100.884096)
2070
+        (xy 147.864464 100.877716) (xy 147.90777 100.66) (xy 148.201957 100.66) (xy 148.385423 100.934577) (xy 148.860091 101.25174)
2071
+        (xy 149.278667 101.335) (xy 149.561333 101.335) (xy 149.979909 101.25174) (xy 150.454577 100.934577) (xy 150.638043 100.66)
2072
+        (xy 152.385198 100.66) (xy 152.915526 101.190329) (xy 152.915532 101.190333) (xy 154.540001 102.814803) (xy 154.54 105.976289)
2073
+        (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)
2074
+        (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)
2075
+        (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)
2076
+        (xy 156.06 102.425152) (xy 156.06 102.425148) (xy 156.02548 102.251605) (xy 156.015904 102.203462) (xy 155.890329 102.015527)
2077
+        (xy 155.847929 101.952071) (xy 155.784473 101.909671) (xy 153.990333 100.115532) (xy 153.990329 100.115526) (xy 153.29033 99.415529)
2078
+        (xy 153.247929 99.352071) (xy 152.996537 99.184096) (xy 152.774852 99.14) (xy 152.774847 99.14) (xy 152.7 99.125112)
2079
+        (xy 152.625153 99.14) (xy 150.638043 99.14) (xy 150.454577 98.865423) (xy 150.277346 98.747001) (xy 164.062712 98.747001)
2080
+        (xy 174.26174 108.94603) (xy 174.313903 109.024097) (xy 174.391969 109.076259) (xy 174.623181 109.23075) (xy 174.978228 109.301373)
2081
+        (xy 174.989843 109.359765) (xy 175.130191 109.569809) (xy 175.340235 109.710157) (xy 175.465001 109.734974) (xy 175.465 110.339358)
2082
+        (xy 175.402235 110.351843) (xy 175.192191 110.492191) (xy 175.051843 110.702235) (xy 175.00256 110.95) (xy 175.00256 112.45)
2083
+        (xy 175.051843 112.697765) (xy 175.163253 112.8645) (xy 172.690301 112.8645) (xy 173.204473 112.350329) (xy 173.267929 112.307929)
2084
+        (xy 173.435904 112.056537) (xy 173.46954 111.88744) (xy 173.47 111.88744) (xy 173.717765 111.838157) (xy 173.927809 111.697809)
2085
+        (xy 174.068157 111.487765) (xy 174.11744 111.24) (xy 174.11744 109.74) (xy 174.068157 109.492235) (xy 173.927809 109.282191)
2086
+        (xy 173.717765 109.141843) (xy 173.47 109.09256) (xy 171.97 109.09256) (xy 171.722235 109.141843) (xy 171.512191 109.282191)
2087
+        (xy 171.371843 109.492235) (xy 171.32256 109.74) (xy 171.32256 111.24) (xy 171.371843 111.487765) (xy 171.512191 111.697809)
2088
+        (xy 171.629204 111.775995) (xy 171.510198 111.895001) (xy 169.758862 111.895001) (xy 169.825 111.73533) (xy 169.825 111.12467)
2089
+        (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)
2090
+        (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)
2091
+        (xy 164.48 110.529183) (xy 164.079507 110.12869) (xy 163.51533 109.895) (xy 162.90467 109.895) (xy 162.340493 110.12869)
2092
+        (xy 161.94 110.529183) (xy 161.539507 110.12869) (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869)
2093
+        (xy 159.4 110.529183) (xy 158.999507 110.12869) (xy 158.43533 109.895) (xy 158.199802 109.895) (xy 162.134803 105.96)
2094
+        (xy 168.206289 105.96) (xy 168.32372 106.077431) (xy 168.704126 106.235) (xy 169.115874 106.235) (xy 169.49628 106.077431)
2095
+        (xy 169.787431 105.78628) (xy 169.945 105.405874) (xy 169.945 104.994126) (xy 169.787431 104.61372) (xy 169.49628 104.322569)
2096
+        (xy 169.115874 104.165) (xy 168.704126 104.165) (xy 168.675 104.177064) (xy 168.675 103.794126) (xy 168.517431 103.41372)
2097
+        (xy 168.22628 103.122569) (xy 167.845874 102.965) (xy 167.434126 102.965) (xy 167.05372 103.122569) (xy 166.936289 103.24)
2098
+        (xy 162.457848 103.24) (xy 162.383 103.225112) (xy 162.308152 103.24) (xy 162.308148 103.24) (xy 162.134605 103.27452)
2099
+        (xy 162.086462 103.284096) (xy 161.946584 103.37756) (xy 161.835071 103.452071) (xy 161.792671 103.515527) (xy 155.8632 109.444999)
2100
+        (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)
2101
+        (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)
2102
+        (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)
2103
+        (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)
2104
+        (xy 148.975 111.12467) (xy 148.975 111.73533) (xy 149.041138 111.895001) (xy 144.084803 111.895001) (xy 143.36244 111.172639)
2105
+        (xy 143.36244 111.05875) (xy 143.296505 110.727273) (xy 143.137964 110.49) (xy 143.296505 110.252727) (xy 143.36244 109.92125)
2106
+        (xy 143.36244 109.48375) (xy 143.296505 109.152273) (xy 143.108739 108.871261) (xy 143 108.798604) (xy 143 108.68575)
2107
+        (xy 147.615 108.68575) (xy 147.615 109.27631) (xy 147.711673 109.509699) (xy 147.890302 109.688327) (xy 148.123691 109.785)
2108
+        (xy 148.71425 109.785) (xy 148.873 109.62625) (xy 148.873 108.527) (xy 149.127 108.527) (xy 149.127 109.62625)
2109
+        (xy 149.28575 109.785) (xy 149.876309 109.785) (xy 150.109698 109.688327) (xy 150.288327 109.509699) (xy 150.385 109.27631)
2110
+        (xy 150.385 108.68575) (xy 150.22625 108.527) (xy 149.127 108.527) (xy 148.873 108.527) (xy 147.77375 108.527)
2111
+        (xy 147.615 108.68575) (xy 143 108.68575) (xy 143 105.654343) (xy 145.065 105.654343) (xy 145.065 106.145657)
2112
+        (xy 145.253018 106.599571) (xy 145.600429 106.946982) (xy 146.054343 107.135) (xy 146.545657 107.135) (xy 146.999571 106.946982)
2113
+        (xy 147.111553 106.835) (xy 148.119467 106.835) (xy 148.151843 106.997765) (xy 148.163359 107.015) (xy 148.123691 107.015)
2114
+        (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)
2115
+        (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)
2116
+        (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)
2117
+        (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)
2118
+        (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)
2119
+        (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)
2120
+        (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)
2121
+        (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)
2122
+        (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)
2123
+        (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)
2124
+        (xy 148.75 104.60256) (xy 148.502235 104.651843) (xy 148.292191 104.792191) (xy 148.176723 104.965) (xy 147.111553 104.965)
2125
+        (xy 146.999571 104.853018) (xy 146.545657 104.665) (xy 146.054343 104.665) (xy 145.600429 104.853018) (xy 145.253018 105.200429)
2126
+        (xy 145.065 105.654343) (xy 143 105.654343) (xy 143 105.119848) (xy 143.014888 105.045) (xy 143 104.970152)
2127
+        (xy 143 104.970148) (xy 142.955904 104.748463) (xy 142.943567 104.73) (xy 143.22425 104.73) (xy 143.383 104.57125)
2128
+        (xy 143.383 103.7845) (xy 143.637 103.7845) (xy 143.637 104.57125) (xy 143.79575 104.73) (xy 144.11131 104.73)
2129
+        (xy 144.344699 104.633327) (xy 144.523327 104.454698) (xy 144.62 104.221309) (xy 144.62 104.035275) (xy 145.844331 104.035275)
2130
+        (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)
2131
+        (xy 146.6 103.279605) (xy 145.844331 104.035275) (xy 144.62 104.035275) (xy 144.62 103.94325) (xy 144.46125 103.7845)
2132
+        (xy 143.637 103.7845) (xy 143.383 103.7845) (xy 142.55875 103.7845) (xy 142.4 103.94325) (xy 142.4 104.148273)
2133
+        (xy 142.36744 104.126517) (xy 142.36744 104.025) (xy 142.318157 103.777235) (xy 142.177809 103.567191) (xy 141.967765 103.426843)
2134
+        (xy 141.72 103.37756) (xy 140.22 103.37756) (xy 139.972235 103.426843) (xy 139.807001 103.53725) (xy 139.807001 97.071362)
2048 2135
         (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)
2049 2136
         (xy 139.531471 96.406184) (xy 139.47875 96.353463) (xy 139.589491 96.187727) (xy 139.655426 95.85625) (xy 139.655426 95.34375)
2050 2137
         (xy 139.589491 95.012273) (xy 139.440973 94.79) (xy 139.589491 94.567727) (xy 139.615364 94.437654)
@@ -2124,6 +2211,18 @@
2124 2211
         (xy 128.27 81.28) (xy 177.8 81.28) (xy 177.8 113.03) (xy 128.27 113.03)
2125 2212
       )
2126 2213
     )
2214
+    (filled_polygon
2215
+      (pts
2216
+        (xy 128.77568 96.751337) (xy 129.168663 97.14432) (xy 129.682119 97.357) (xy 130.237881 97.357) (xy 130.269219 97.34402)
2217
+        (xy 136.113 103.187802) (xy 136.112999 105.718152) (xy 136.098111 105.792999) (xy 136.112999 105.867846) (xy 136.112999 105.86785)
2218
+        (xy 136.157095 106.089535) (xy 136.32507 106.340928) (xy 136.388529 106.38333) (xy 136.57598 106.570782) (xy 136.563 106.602119)
2219
+        (xy 136.563 107.157881) (xy 136.57598 107.189218) (xy 136.388529 107.37667) (xy 136.32507 107.419072) (xy 136.157095 107.670465)
2220
+        (xy 136.112999 107.89215) (xy 136.112999 107.892154) (xy 136.098111 107.967001) (xy 136.112999 108.041848) (xy 136.113 110.128147)
2221
+        (xy 136.098111 110.202999) (xy 136.157096 110.499536) (xy 136.261049 110.655112) (xy 136.325071 110.750928) (xy 136.388527 110.793328)
2222
+        (xy 136.772218 111.17702) (xy 136.563 111.682119) (xy 136.563 112.237881) (xy 136.77568 112.751337) (xy 136.888843 112.8645)
2223
+        (xy 128.6355 112.8645) (xy 128.6355 96.412912)
2224
+      )
2225
+    )
2127 2226
     (filled_polygon
2128 2227
       (pts
2129 2228
         (xy 177.3645 92.793007) (xy 177.359765 92.789843) (xy 177.112 92.74056) (xy 175.588 92.74056) (xy 175.340235 92.789843)
@@ -2136,166 +2235,158 @@
2136 2235
         (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)
2137 2236
         (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)
2138 2237
         (xy 166.05533 109.895) (xy 165.44467 109.895) (xy 164.880493 110.12869) (xy 164.48 110.529183) (xy 164.196413 110.245596)
2139
-        (xy 165.684473 108.757537) (xy 165.747929 108.715137) (xy 165.915904 108.463745) (xy 165.96 108.24206) (xy 165.96 108.242055)
2140
-        (xy 165.974888 108.167208) (xy 165.96 108.092361) (xy 165.96 103.794126) (xy 166.605 103.794126) (xy 166.605 104.205874)
2141
-        (xy 166.762569 104.58628) (xy 167.05372 104.877431) (xy 167.434126 105.035) (xy 167.845874 105.035) (xy 167.875 105.022936)
2142
-        (xy 167.875 105.405874) (xy 168.032569 105.78628) (xy 168.32372 106.077431) (xy 168.704126 106.235) (xy 169.115874 106.235)
2143
-        (xy 169.49628 106.077431) (xy 169.613711 105.96) (xy 169.925153 105.96) (xy 170 105.974888) (xy 170.074847 105.96)
2144
-        (xy 170.074852 105.96) (xy 170.296537 105.915904) (xy 170.547929 105.747929) (xy 170.590331 105.68447) (xy 171.934473 104.340329)
2145
-        (xy 171.997929 104.297929) (xy 172.061899 104.202191) (xy 172.165904 104.046538) (xy 172.198006 103.885148) (xy 172.21 103.824852)
2146
-        (xy 172.21 103.824848) (xy 172.224888 103.75) (xy 172.21 103.675152) (xy 172.21 88.164801) (xy 172.582098 87.792704)
2147
-        (xy 172.592191 87.807809) (xy 172.802235 87.948157) (xy 173.05 87.99744) (xy 174.75 87.99744) (xy 174.997765 87.948157)
2148
-        (xy 175.207809 87.807809) (xy 175.348157 87.597765) (xy 175.39744 87.35) (xy 175.39744 85.65) (xy 175.348157 85.402235)
2149
-        (xy 175.207809 85.192191) (xy 174.997765 85.051843) (xy 174.952381 85.042816) (xy 174.970625 85.030625) (xy 175.298839 84.539418)
2150
-        (xy 175.414092 83.96) (xy 175.298839 83.380582) (xy 174.970625 82.889375) (xy 174.479418 82.561161) (xy 174.046256 82.475)
2151
-        (xy 173.753744 82.475) (xy 173.320582 82.561161) (xy 172.829375 82.889375) (xy 172.81561 82.909976) (xy 172.798157 82.822235)
2152
-        (xy 172.657809 82.612191) (xy 172.447765 82.471843) (xy 172.2 82.42256) (xy 170.7 82.42256) (xy 170.452235 82.471843)
2153
-        (xy 170.242191 82.612191) (xy 170.18 82.705266) (xy 170.117809 82.612191) (xy 169.907765 82.471843) (xy 169.66 82.42256)
2154
-        (xy 168.16 82.42256) (xy 167.912235 82.471843) (xy 167.702191 82.612191) (xy 167.561843 82.822235) (xy 167.51256 83.07)
2155
-        (xy 167.51256 84.57) (xy 167.561843 84.817765) (xy 167.702191 85.027809) (xy 167.912235 85.168157) (xy 168.16 85.21744)
2156
-        (xy 169.66 85.21744) (xy 169.907765 85.168157) (xy 170.117809 85.027809) (xy 170.18 84.934734) (xy 170.242191 85.027809)
2157
-        (xy 170.452235 85.168157) (xy 170.7 85.21744) (xy 171.567759 85.21744) (xy 170.475528 86.309671) (xy 170.412072 86.352071)
2158
-        (xy 170.369672 86.415527) (xy 170.369671 86.415528) (xy 170.244097 86.603463) (xy 170.185112 86.9) (xy 170.200001 86.974852)
2159
-        (xy 170.2 101.525197) (xy 168.485199 103.24) (xy 168.343711 103.24) (xy 168.22628 103.122569) (xy 167.845874 102.965)
2160
-        (xy 167.434126 102.965) (xy 167.05372 103.122569) (xy 166.762569 103.41372) (xy 166.605 103.794126) (xy 165.96 103.794126)
2161
-        (xy 165.96 94.774847) (xy 165.974888 94.7) (xy 165.96 94.625153) (xy 165.96 94.625148) (xy 165.915904 94.403463)
2162
-        (xy 165.747929 94.152071) (xy 165.684473 94.109671) (xy 164.390331 92.81553) (xy 164.347929 92.752071) (xy 164.096537 92.584096)
2163
-        (xy 163.874852 92.54) (xy 163.874847 92.54) (xy 163.8 92.525112) (xy 163.790677 92.526966) (xy 163.68628 92.422569)
2164
-        (xy 163.305874 92.265) (xy 162.894126 92.265) (xy 162.51372 92.422569) (xy 162.222569 92.71372) (xy 162.065 93.094126)
2165
-        (xy 162.065 93.505874) (xy 162.222569 93.88628) (xy 162.51372 94.177431) (xy 162.894126 94.335) (xy 163.305874 94.335)
2166
-        (xy 163.62713 94.201932) (xy 164.440001 95.014803) (xy 164.44 107.852406) (xy 162.725528 109.566879) (xy 162.662072 109.609279)
2167
-        (xy 162.619672 109.672735) (xy 162.619671 109.672736) (xy 162.494097 109.860671) (xy 162.44979 110.083418) (xy 162.340493 110.12869)
2168
-        (xy 161.94 110.529183) (xy 161.539507 110.12869) (xy 160.97533 109.895) (xy 160.36467 109.895) (xy 159.800493 110.12869)
2169
-        (xy 159.4 110.529183) (xy 158.999507 110.12869) (xy 158.43533 109.895) (xy 157.82467 109.895) (xy 157.260493 110.12869)
2170
-        (xy 156.86 110.529183) (xy 156.459507 110.12869) (xy 155.89533 109.895) (xy 155.28467 109.895) (xy 155.276359 109.898442)
2171
-        (xy 155.784473 109.390329) (xy 155.847929 109.347929) (xy 156.015904 109.096537) (xy 156.06 108.874852) (xy 156.06 108.874848)
2172
-        (xy 156.074888 108.8) (xy 156.06 108.725152) (xy 156.06 107.383711) (xy 156.177431 107.26628) (xy 156.335 106.885874)
2173
-        (xy 156.335 106.474126) (xy 156.177431 106.09372) (xy 155.88628 105.802569) (xy 155.505874 105.645) (xy 155.094126 105.645)
2174
-        (xy 154.71372 105.802569) (xy 154.422569 106.09372) (xy 154.265 106.474126) (xy 154.265 106.885874) (xy 154.422569 107.26628)
2175
-        (xy 154.540001 107.383712) (xy 154.54 108.485198) (xy 154.247 108.778198) (xy 154.247 108.63575) (xy 154.08825 108.477)
2176
-        (xy 152.977 108.477) (xy 152.977 109.58825) (xy 153.13575 109.747) (xy 153.278199 109.747) (xy 153.130199 109.895)
2177
-        (xy 152.74467 109.895) (xy 152.180493 110.12869) (xy 151.78 110.529183) (xy 151.379507 110.12869) (xy 150.81533 109.895)
2178
-        (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)
2179
-        (xy 149.041138 111.895001) (xy 140.909804 111.895001) (xy 139.40333 110.388529) (xy 139.360928 110.32507) (xy 139.125187 110.167552)
2180
-        (xy 139.182397 110.151143) (xy 139.369144 109.627698) (xy 139.341362 109.072632) (xy 139.182397 108.688857) (xy 138.940213 108.619392)
2181
-        (xy 138.139605 109.42) (xy 138.153748 109.434143) (xy 137.974143 109.613748) (xy 137.96 109.599605) (xy 137.945858 109.613748)
2182
-        (xy 137.766253 109.434143) (xy 137.780395 109.42) (xy 137.766253 109.405858) (xy 137.945858 109.226253) (xy 137.96 109.240395)
2183
-        (xy 138.760608 108.439787) (xy 138.691143 108.197603) (xy 138.550607 108.147465) (xy 138.751337 108.06432) (xy 139.14432 107.671337)
2184
-        (xy 139.357 107.157881) (xy 139.357 106.602119) (xy 139.14432 106.088663) (xy 138.751337 105.69568) (xy 138.544487 105.61)
2185
-        (xy 138.751337 105.52432) (xy 139.14432 105.131337) (xy 139.339553 104.66) (xy 139.57256 104.66) (xy 139.57256 106.16)
2186
-        (xy 139.621843 106.407765) (xy 139.762191 106.617809) (xy 139.855266 106.68) (xy 139.762191 106.742191) (xy 139.621843 106.952235)
2187
-        (xy 139.57256 107.2) (xy 139.57256 108.7) (xy 139.621843 108.947765) (xy 139.762191 109.157809) (xy 139.972235 109.298157)
2188
-        (xy 140.22 109.34744) (xy 141.72 109.34744) (xy 141.967765 109.298157) (xy 142.177809 109.157809) (xy 142.318157 108.947765)
2189
-        (xy 142.36744 108.7) (xy 142.36744 108.63575) (xy 151.453 108.63575) (xy 151.453 109.23831) (xy 151.549673 109.471699)
2190
-        (xy 151.728302 109.650327) (xy 151.961691 109.747) (xy 152.56425 109.747) (xy 152.723 109.58825) (xy 152.723 108.477)
2191
-        (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 142.36744 108.63575) (xy 142.36744 107.2) (xy 142.318157 106.952235)
2192
-        (xy 142.177809 106.742191) (xy 142.084734 106.68) (xy 142.177809 106.617809) (xy 142.318157 106.407765) (xy 142.36744 106.16)
2193
-        (xy 142.36744 104.66) (xy 142.318157 104.412235) (xy 142.177809 104.202191) (xy 141.967765 104.061843) (xy 141.72 104.01256)
2194
-        (xy 140.22 104.01256) (xy 139.972235 104.061843) (xy 139.762191 104.202191) (xy 139.621843 104.412235) (xy 139.57256 104.66)
2195
-        (xy 139.339553 104.66) (xy 139.357 104.617881) (xy 139.357 104.062119) (xy 139.14432 103.548663) (xy 138.751337 103.15568)
2196
-        (xy 138.544487 103.07) (xy 138.751337 102.98432) (xy 139.14432 102.591337) (xy 139.357 102.077881) (xy 139.357 101.522119)
2197
-        (xy 139.14432 101.008663) (xy 138.751337 100.61568) (xy 138.544487 100.53) (xy 138.751337 100.44432) (xy 139.14432 100.051337)
2198
-        (xy 139.357 99.537881) (xy 139.357 98.982119) (xy 139.14432 98.468663) (xy 138.751337 98.07568) (xy 138.237881 97.863)
2199
-        (xy 137.682119 97.863) (xy 137.168663 98.07568) (xy 136.77568 98.468663) (xy 136.563 98.982119) (xy 136.563 99.328198)
2200
-        (xy 133.76 96.525199) (xy 133.76 93.994846) (xy 133.774888 93.919999) (xy 133.76 93.845152) (xy 133.76 93.845148)
2201
-        (xy 133.715904 93.623463) (xy 133.547929 93.372071) (xy 133.484473 93.329671) (xy 131.34402 91.189218) (xy 131.357 91.157881)
2202
-        (xy 131.357 90.602119) (xy 131.339996 90.561067) (xy 131.437902 90.414539) (xy 131.437903 90.414538) (xy 131.481999 90.192853)
2203
-        (xy 131.481999 90.192849) (xy 131.496887 90.118002) (xy 131.481999 90.043155) (xy 131.481999 89.501564) (xy 133.909472 87.074092)
2204
-        (xy 133.972928 87.031692) (xy 134.002813 86.986966) (xy 134.020582 86.998839) (xy 134.453744 87.085) (xy 134.746256 87.085)
2205
-        (xy 135.179418 86.998839) (xy 135.670625 86.670625) (xy 135.87 86.372239) (xy 136.069375 86.670625) (xy 136.560582 86.998839)
2206
-        (xy 136.993744 87.085) (xy 137.286256 87.085) (xy 137.719418 86.998839) (xy 138.210625 86.670625) (xy 138.41 86.372239)
2207
-        (xy 138.609375 86.670625) (xy 139.100582 86.998839) (xy 139.533744 87.085) (xy 139.826256 87.085) (xy 140.259418 86.998839)
2208
-        (xy 140.750625 86.670625) (xy 140.95 86.372239) (xy 141.149375 86.670625) (xy 141.285 86.761247) (xy 141.285001 88.20791)
2209
-        (xy 141.266683 88.3) (xy 141.33925 88.664818) (xy 141.47991 88.87533) (xy 141.545904 88.974097) (xy 141.62397 89.026259)
2210
-        (xy 142.332402 89.734692) (xy 142.575 89.97729) (xy 142.575 90.58271) (xy 142.205 90.212711) (xy 142.205 90.054343)
2211
-        (xy 142.016982 89.600429) (xy 141.669571 89.253018) (xy 141.215657 89.065) (xy 140.724343 89.065) (xy 140.270429 89.253018)
2212
-        (xy 139.923018 89.600429) (xy 139.735 90.054343) (xy 139.735 90.545657) (xy 139.923018 90.999571) (xy 140.270429 91.346982)
2213
-        (xy 140.724343 91.535) (xy 140.882711 91.535) (xy 141.305001 91.957291) (xy 141.305 98.551803) (xy 140.987138 98.683466)
2214
-        (xy 140.583466 99.087138) (xy 140.365 99.614561) (xy 140.365 100.185439) (xy 140.583466 100.712862) (xy 140.987138 101.116534)
2215
-        (xy 141.514561 101.335) (xy 142.085439 101.335) (xy 142.575001 101.132217) (xy 142.575001 102.962086) (xy 142.580553 102.989998)
2216
-        (xy 142.556683 103.11) (xy 142.62925 103.474818) (xy 142.783741 103.70603) (xy 145.065 105.98729) (xy 145.065 106.145657)
2217
-        (xy 145.253018 106.599571) (xy 145.600429 106.946982) (xy 146.054343 107.135) (xy 146.545657 107.135) (xy 146.999571 106.946982)
2218
-        (xy 147.346982 106.599571) (xy 147.535 106.145657) (xy 147.535 105.654343) (xy 147.346982 105.200429) (xy 147.334553 105.188)
2219
-        (xy 151.44056 105.188) (xy 151.44056 106.712) (xy 151.489843 106.959765) (xy 151.621369 107.156606) (xy 151.549673 107.228301)
2220
-        (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)
2221
-        (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)
2222
-        (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)
2223
-        (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)
2224
-        (xy 151.840235 104.589843) (xy 151.630191 104.730191) (xy 151.489843 104.940235) (xy 151.44056 105.188) (xy 147.334553 105.188)
2225
-        (xy 146.999571 104.853018) (xy 146.545657 104.665) (xy 146.38729 104.665) (xy 146.040696 104.318407) (xy 146.407122 104.447419)
2226
-        (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)
2227
-        (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)
2228
-        (xy 145.281336 103.43744) (xy 145.367325 103.645035) (xy 144.445 102.722711) (xy 144.445 99.519801) (xy 146.683699 101.758501)
2229
-        (xy 146.26256 101.781336) (xy 145.906169 101.928958) (xy 145.844331 102.164725) (xy 146.6 102.920395) (xy 146.614142 102.906252)
2230
-        (xy 146.793748 103.085858) (xy 146.779605 103.1) (xy 147.535275 103.855669) (xy 147.771042 103.793831) (xy 147.849775 103.570212)
2231
-        (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)
2232
-        (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)
2233
-        (xy 149.365548 101.765) (xy 148.839802 101.765) (xy 146.974802 99.9) (xy 147.956887 99.9) (xy 148.06826 100.459909)
2234
-        (xy 148.385423 100.934577) (xy 148.860091 101.25174) (xy 149.278667 101.335) (xy 149.561333 101.335) (xy 149.979909 101.25174)
2235
-        (xy 150.454577 100.934577) (xy 150.77174 100.459909) (xy 150.883113 99.9) (xy 150.77174 99.340091) (xy 150.454577 98.865423)
2236
-        (xy 149.979909 98.54826) (xy 149.561333 98.465) (xy 149.278667 98.465) (xy 148.860091 98.54826) (xy 148.385423 98.865423)
2237
-        (xy 148.06826 99.340091) (xy 147.956887 99.9) (xy 146.974802 99.9) (xy 145.52 98.445199) (xy 145.52 93.388)
2238
-        (xy 151.44056 93.388) (xy 151.44056 94.912) (xy 151.489843 95.159765) (xy 151.616955 95.35) (xy 151.489843 95.540235)
2239
-        (xy 151.44056 95.788) (xy 151.44056 97.312) (xy 151.489843 97.559765) (xy 151.630191 97.769809) (xy 151.840235 97.910157)
2240
-        (xy 152.088 97.95944) (xy 153.612 97.95944) (xy 153.859765 97.910157) (xy 154.069809 97.769809) (xy 154.210157 97.559765)
2241
-        (xy 154.25944 97.312) (xy 154.25944 95.788) (xy 154.210157 95.540235) (xy 154.083045 95.35) (xy 154.210157 95.159765)
2242
-        (xy 154.25944 94.912) (xy 154.25944 93.388) (xy 154.210157 93.140235) (xy 154.069809 92.930191) (xy 153.859765 92.789843)
2243
-        (xy 153.612 92.74056) (xy 152.088 92.74056) (xy 151.840235 92.789843) (xy 151.630191 92.930191) (xy 151.489843 93.140235)
2244
-        (xy 151.44056 93.388) (xy 145.52 93.388) (xy 145.52 86.878178) (xy 145.830625 86.670625) (xy 145.845096 86.648967)
2245
-        (xy 145.911673 86.809698) (xy 146.090301 86.988327) (xy 146.32369 87.085) (xy 147.01425 87.085) (xy 147.173 86.92625)
2246
-        (xy 147.173 85.727) (xy 147.427 85.727) (xy 147.427 86.92625) (xy 147.58575 87.085) (xy 148.27631 87.085)
2247
-        (xy 148.509699 86.988327) (xy 148.688327 86.809698) (xy 148.785 86.576309) (xy 148.785 85.88575) (xy 148.62625 85.727)
2248
-        (xy 147.427 85.727) (xy 147.173 85.727) (xy 147.153 85.727) (xy 147.153 85.473) (xy 147.173 85.473)
2249
-        (xy 147.173 84.27375) (xy 147.01425 84.115) (xy 146.32369 84.115) (xy 146.090301 84.211673) (xy 145.911673 84.390302)
2250
-        (xy 145.845096 84.551033) (xy 145.830625 84.529375) (xy 145.339418 84.201161) (xy 144.906256 84.115) (xy 144.613744 84.115)
2251
-        (xy 144.180582 84.201161) (xy 143.689375 84.529375) (xy 143.49 84.827761) (xy 143.290625 84.529375) (xy 142.799418 84.201161)
2252
-        (xy 142.366256 84.115) (xy 142.073744 84.115) (xy 141.640582 84.201161) (xy 141.149375 84.529375) (xy 140.95 84.827761)
2253
-        (xy 140.750625 84.529375) (xy 140.259418 84.201161) (xy 139.826256 84.115) (xy 139.533744 84.115) (xy 139.100582 84.201161)
2254
-        (xy 138.609375 84.529375) (xy 138.41 84.827761) (xy 138.210625 84.529375) (xy 137.719418 84.201161) (xy 137.286256 84.115)
2255
-        (xy 136.993744 84.115) (xy 136.560582 84.201161) (xy 136.069375 84.529375) (xy 135.87 84.827761) (xy 135.670625 84.529375)
2256
-        (xy 135.272466 84.263334) (xy 135.52579 84.01001) (xy 147.398799 84.01001) (xy 147.544769 84.155981) (xy 147.427 84.27375)
2257
-        (xy 147.427 85.473) (xy 148.62625 85.473) (xy 148.744019 85.355231) (xy 150.423787 87.035) (xy 150.20467 87.035)
2258
-        (xy 149.640493 87.26869) (xy 149.20869 87.700493) (xy 148.975 88.26467) (xy 148.975 88.87533) (xy 149.20869 89.439507)
2259
-        (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)
2260
-        (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)
2261
-        (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)
2262
-        (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)
2263
-        (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)
2264
-        (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)
2265
-        (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)
2266
-        (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)
2267
-        (xy 164.519438 89.419885) (xy 164.669841 89.470554) (xy 165.570395 88.57) (xy 165.929605 88.57) (xy 166.830159 89.470554)
2268
-        (xy 166.980562 89.419885) (xy 166.98869 89.439507) (xy 167.420493 89.87131) (xy 167.98467 90.105) (xy 168.59533 90.105)
2269
-        (xy 169.159507 89.87131) (xy 169.59131 89.439507) (xy 169.825 88.87533) (xy 169.825 88.26467) (xy 169.59131 87.700493)
2270
-        (xy 169.159507 87.26869) (xy 168.59533 87.035) (xy 167.98467 87.035) (xy 167.420493 87.26869) (xy 166.98869 87.700493)
2271
-        (xy 166.980562 87.720115) (xy 166.830159 87.669446) (xy 165.929605 88.57) (xy 165.570395 88.57) (xy 164.669841 87.669446)
2272
-        (xy 164.519438 87.720115) (xy 164.51131 87.700493) (xy 164.300658 87.489841) (xy 164.849446 87.489841) (xy 165.75 88.390395)
2273
-        (xy 166.650554 87.489841) (xy 166.564148 87.233357) (xy 165.990664 87.023542) (xy 165.38054 87.049161) (xy 164.935852 87.233357)
2274
-        (xy 164.849446 87.489841) (xy 164.300658 87.489841) (xy 164.079507 87.26869) (xy 163.51533 87.035) (xy 162.90467 87.035)
2275
-        (xy 162.340493 87.26869) (xy 161.94 87.669183) (xy 161.539507 87.26869) (xy 160.97533 87.035) (xy 160.36467 87.035)
2276
-        (xy 159.800493 87.26869) (xy 159.4 87.669183) (xy 158.999507 87.26869) (xy 158.43533 87.035) (xy 157.82467 87.035)
2277
-        (xy 157.715162 87.08036) (xy 156.95332 86.318519) (xy 156.910918 86.25506) (xy 156.659526 86.087085) (xy 156.437841 86.042989)
2278
-        (xy 156.437836 86.042989) (xy 156.362989 86.028101) (xy 156.288142 86.042989) (xy 155.417795 86.042989) (xy 155.767767 85.898026)
2279
-        (xy 156.298026 85.367767) (xy 156.585 84.67495) (xy 156.585 83.92505) (xy 162.815 83.92505) (xy 162.815 84.67495)
2280
-        (xy 163.101974 85.367767) (xy 163.632233 85.898026) (xy 164.32505 86.185) (xy 165.07495 86.185) (xy 165.767767 85.898026)
2281
-        (xy 166.298026 85.367767) (xy 166.585 84.67495) (xy 166.585 83.92505) (xy 166.298026 83.232233) (xy 165.767767 82.701974)
2282
-        (xy 165.07495 82.415) (xy 164.32505 82.415) (xy 163.632233 82.701974) (xy 163.101974 83.232233) (xy 162.815 83.92505)
2283
-        (xy 156.585 83.92505) (xy 156.298026 83.232233) (xy 155.767767 82.701974) (xy 155.07495 82.415) (xy 154.32505 82.415)
2284
-        (xy 153.632233 82.701974) (xy 153.101974 83.232233) (xy 152.815 83.92505) (xy 152.815 84.67495) (xy 153.101974 85.367767)
2285
-        (xy 153.632233 85.898026) (xy 153.982205 86.042989) (xy 152.217792 86.042989) (xy 148.490331 82.31553) (xy 148.447929 82.252071)
2286
-        (xy 148.273468 82.1355) (xy 177.3645 82.1355)
2287
-      )
2288
-    )
2289
-    (filled_polygon
2290
-      (pts
2291
-        (xy 128.77568 96.751337) (xy 129.168663 97.14432) (xy 129.682119 97.357) (xy 130.237881 97.357) (xy 130.269219 97.34402)
2292
-        (xy 136.113 103.187802) (xy 136.112999 105.718152) (xy 136.098111 105.792999) (xy 136.112999 105.867846) (xy 136.112999 105.86785)
2293
-        (xy 136.157095 106.089535) (xy 136.32507 106.340928) (xy 136.388529 106.38333) (xy 136.57598 106.570782) (xy 136.563 106.602119)
2294
-        (xy 136.563 107.157881) (xy 136.57598 107.189218) (xy 136.388529 107.37667) (xy 136.32507 107.419072) (xy 136.157095 107.670465)
2295
-        (xy 136.112999 107.89215) (xy 136.112999 107.892154) (xy 136.098111 107.967001) (xy 136.112999 108.041848) (xy 136.113 110.128147)
2296
-        (xy 136.098111 110.202999) (xy 136.157096 110.499536) (xy 136.261049 110.655112) (xy 136.325071 110.750928) (xy 136.388527 110.793328)
2297
-        (xy 136.772218 111.17702) (xy 136.563 111.682119) (xy 136.563 112.237881) (xy 136.77568 112.751337) (xy 136.888843 112.8645)
2298
-        (xy 128.6355 112.8645) (xy 128.6355 96.412912)
2238
+        (xy 164.702009 109.74) (xy 171.32256 109.74) (xy 171.32256 111.24) (xy 171.371843 111.487765) (xy 171.512191 111.697809)
2239
+        (xy 171.722235 111.838157) (xy 171.97 111.88744) (xy 173.47 111.88744) (xy 173.717765 111.838157) (xy 173.927809 111.697809)
2240
+        (xy 174.068157 111.487765) (xy 174.11744 111.24) (xy 174.11744 109.74) (xy 174.068157 109.492235) (xy 173.927809 109.282191)
2241
+        (xy 173.717765 109.141843) (xy 173.47 109.09256) (xy 171.97 109.09256) (xy 171.722235 109.141843) (xy 171.512191 109.282191)
2242
+        (xy 171.371843 109.492235) (xy 171.32256 109.74) (xy 164.702009 109.74) (xy 165.684473 108.757537) (xy 165.747929 108.715137)
2243
+        (xy 165.915904 108.463745) (xy 165.96 108.24206) (xy 165.96 108.242055) (xy 165.974888 108.167208) (xy 165.96 108.092361)
2244
+        (xy 165.96 103.794126) (xy 166.605 103.794126) (xy 166.605 104.205874) (xy 166.762569 104.58628) (xy 167.05372 104.877431)
2245
+        (xy 167.434126 105.035) (xy 167.845874 105.035) (xy 167.875 105.022936) (xy 167.875 105.405874) (xy 168.032569 105.78628)
2246
+        (xy 168.32372 106.077431) (xy 168.704126 106.235) (xy 169.115874 106.235) (xy 169.49628 106.077431) (xy 169.613711 105.96)
2247
+        (xy 169.925153 105.96) (xy 170 105.974888) (xy 170.074847 105.96) (xy 170.074852 105.96) (xy 170.296537 105.915904)
2248
+        (xy 170.547929 105.747929) (xy 170.590331 105.68447) (xy 171.934473 104.340329) (xy 171.997929 104.297929) (xy 172.059438 104.205874)
2249
+        (xy 172.165904 104.046538) (xy 172.198006 103.885148) (xy 172.21 103.824852) (xy 172.21 103.824848) (xy 172.224888 103.75)
2250
+        (xy 172.21 103.675152) (xy 172.21 88.164801) (xy 172.582098 87.792704) (xy 172.592191 87.807809) (xy 172.802235 87.948157)
2251
+        (xy 173.05 87.99744) (xy 174.75 87.99744) (xy 174.997765 87.948157) (xy 175.207809 87.807809) (xy 175.348157 87.597765)
2252
+        (xy 175.39744 87.35) (xy 175.39744 85.65) (xy 175.348157 85.402235) (xy 175.207809 85.192191) (xy 174.997765 85.051843)
2253
+        (xy 174.952381 85.042816) (xy 174.970625 85.030625) (xy 175.298839 84.539418) (xy 175.414092 83.96) (xy 175.298839 83.380582)
2254
+        (xy 174.970625 82.889375) (xy 174.479418 82.561161) (xy 174.046256 82.475) (xy 173.753744 82.475) (xy 173.320582 82.561161)
2255
+        (xy 172.829375 82.889375) (xy 172.81561 82.909976) (xy 172.798157 82.822235) (xy 172.657809 82.612191) (xy 172.447765 82.471843)
2256
+        (xy 172.2 82.42256) (xy 170.7 82.42256) (xy 170.452235 82.471843) (xy 170.242191 82.612191) (xy 170.18 82.705266)
2257
+        (xy 170.117809 82.612191) (xy 169.907765 82.471843) (xy 169.66 82.42256) (xy 168.16 82.42256) (xy 167.912235 82.471843)
2258
+        (xy 167.702191 82.612191) (xy 167.561843 82.822235) (xy 167.51256 83.07) (xy 167.51256 84.57) (xy 167.561843 84.817765)
2259
+        (xy 167.702191 85.027809) (xy 167.912235 85.168157) (xy 168.16 85.21744) (xy 169.66 85.21744) (xy 169.907765 85.168157)
2260
+        (xy 170.117809 85.027809) (xy 170.18 84.934734) (xy 170.242191 85.027809) (xy 170.452235 85.168157) (xy 170.7 85.21744)
2261
+        (xy 171.567759 85.21744) (xy 170.475528 86.309671) (xy 170.412072 86.352071) (xy 170.369672 86.415527) (xy 170.369671 86.415528)
2262
+        (xy 170.244097 86.603463) (xy 170.185112 86.9) (xy 170.200001 86.974852) (xy 170.2 101.525197) (xy 168.485199 103.24)
2263
+        (xy 168.343711 103.24) (xy 168.22628 103.122569) (xy 167.845874 102.965) (xy 167.434126 102.965) (xy 167.05372 103.122569)
2264
+        (xy 166.762569 103.41372) (xy 166.605 103.794126) (xy 165.96 103.794126) (xy 165.96 94.774847) (xy 165.974888 94.7)
2265
+        (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)
2266
+        (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)
2267
+        (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)
2268
+        (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)
2269
+        (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)
2270
+        (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)
2271
+        (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)
2272
+        (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)
2273
+        (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)
2274
+        (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)
2275
+        (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)
2276
+        (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)
2277
+        (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)
2278
+        (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)
2279
+        (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)
2280
+        (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)
2281
+        (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)
2282
+        (xy 149.20869 110.560493) (xy 148.975 111.12467) (xy 148.975 111.73533) (xy 149.041138 111.895001) (xy 140.909804 111.895001)
2283
+        (xy 139.40333 110.388529) (xy 139.360928 110.32507) (xy 139.125187 110.167552) (xy 139.182397 110.151143) (xy 139.369144 109.627698)
2284
+        (xy 139.341362 109.072632) (xy 139.182397 108.688857) (xy 138.940213 108.619392) (xy 138.139605 109.42) (xy 138.153748 109.434143)
2285
+        (xy 137.974143 109.613748) (xy 137.96 109.599605) (xy 137.945858 109.613748) (xy 137.766253 109.434143) (xy 137.780395 109.42)
2286
+        (xy 137.766253 109.405858) (xy 137.945858 109.226253) (xy 137.96 109.240395) (xy 138.760608 108.439787) (xy 138.691143 108.197603)
2287
+        (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)
2288
+        (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)
2289
+        (xy 139.357 104.617881) (xy 139.357 104.062119) (xy 139.341625 104.025) (xy 139.57256 104.025) (xy 139.57256 105.525)
2290
+        (xy 139.621843 105.772765) (xy 139.762191 105.982809) (xy 139.855266 106.045) (xy 139.762191 106.107191) (xy 139.621843 106.317235)
2291
+        (xy 139.57256 106.565) (xy 139.57256 108.065) (xy 139.621843 108.312765) (xy 139.762191 108.522809) (xy 139.972235 108.663157)
2292
+        (xy 140.22 108.71244) (xy 141.72 108.71244) (xy 141.967765 108.663157) (xy 142.008782 108.63575) (xy 151.453 108.63575)
2293
+        (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)
2294
+        (xy 152.723 109.58825) (xy 152.723 108.477) (xy 151.61175 108.477) (xy 151.453 108.63575) (xy 142.008782 108.63575)
2295
+        (xy 142.177809 108.522809) (xy 142.318157 108.312765) (xy 142.36744 108.065) (xy 142.36744 106.565) (xy 142.318157 106.317235)
2296
+        (xy 142.177809 106.107191) (xy 142.084734 106.045) (xy 142.177809 105.982809) (xy 142.318157 105.772765) (xy 142.36744 105.525)
2297
+        (xy 142.36744 104.025) (xy 142.318157 103.777235) (xy 142.177809 103.567191) (xy 141.967765 103.426843) (xy 141.72 103.37756)
2298
+        (xy 140.22 103.37756) (xy 139.972235 103.426843) (xy 139.762191 103.567191) (xy 139.621843 103.777235) (xy 139.57256 104.025)
2299
+        (xy 139.341625 104.025) (xy 139.14432 103.548663) (xy 138.751337 103.15568) (xy 138.544487 103.07) (xy 138.751337 102.98432)
2300
+        (xy 139.14432 102.591337) (xy 139.357 102.077881) (xy 139.357 101.522119) (xy 139.14432 101.008663) (xy 138.751337 100.61568)
2301
+        (xy 138.544487 100.53) (xy 138.751337 100.44432) (xy 139.14432 100.051337) (xy 139.357 99.537881) (xy 139.357 98.982119)
2302
+        (xy 139.14432 98.468663) (xy 138.751337 98.07568) (xy 138.237881 97.863) (xy 137.682119 97.863) (xy 137.168663 98.07568)
2303
+        (xy 136.77568 98.468663) (xy 136.563 98.982119) (xy 136.563 99.328198) (xy 133.76 96.525199) (xy 133.76 93.994846)
2304
+        (xy 133.774888 93.919999) (xy 133.76 93.845152) (xy 133.76 93.845148) (xy 133.715904 93.623463) (xy 133.547929 93.372071)
2305
+        (xy 133.484473 93.329671) (xy 131.34402 91.189218) (xy 131.357 91.157881) (xy 131.357 90.602119) (xy 131.339996 90.561067)
2306
+        (xy 131.437902 90.414539) (xy 131.437903 90.414538) (xy 131.481999 90.192853) (xy 131.481999 90.192849) (xy 131.496887 90.118002)
2307
+        (xy 131.481999 90.043155) (xy 131.481999 89.501564) (xy 133.909472 87.074092) (xy 133.972928 87.031692) (xy 134.002813 86.986966)
2308
+        (xy 134.020582 86.998839) (xy 134.453744 87.085) (xy 134.746256 87.085) (xy 135.179418 86.998839) (xy 135.670625 86.670625)
2309
+        (xy 135.87 86.372239) (xy 136.069375 86.670625) (xy 136.560582 86.998839) (xy 136.993744 87.085) (xy 137.286256 87.085)
2310
+        (xy 137.719418 86.998839) (xy 138.210625 86.670625) (xy 138.41 86.372239) (xy 138.609375 86.670625) (xy 139.100582 86.998839)
2311
+        (xy 139.533744 87.085) (xy 139.826256 87.085) (xy 140.259418 86.998839) (xy 140.750625 86.670625) (xy 140.95 86.372239)
2312
+        (xy 141.149375 86.670625) (xy 141.285 86.761247) (xy 141.285001 88.20791) (xy 141.266683 88.3) (xy 141.33925 88.664818)
2313
+        (xy 141.47991 88.87533) (xy 141.545904 88.974097) (xy 141.62397 89.026259) (xy 142.332402 89.734692) (xy 142.575 89.97729)
2314
+        (xy 142.575 90.58271) (xy 142.205 90.212711) (xy 142.205 90.054343) (xy 142.016982 89.600429) (xy 141.669571 89.253018)
2315
+        (xy 141.215657 89.065) (xy 140.724343 89.065) (xy 140.270429 89.253018) (xy 139.923018 89.600429) (xy 139.735 90.054343)
2316
+        (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)
2317
+        (xy 141.305001 91.957291) (xy 141.305 98.551803) (xy 140.987138 98.683466) (xy 140.583466 99.087138) (xy 140.365 99.614561)
2318
+        (xy 140.365 100.185439) (xy 140.583466 100.712862) (xy 140.987138 101.116534) (xy 141.514561 101.335) (xy 142.085439 101.335)
2319
+        (xy 142.575001 101.132217) (xy 142.575001 102.962086) (xy 142.580553 102.989998) (xy 142.556683 103.11) (xy 142.62925 103.474818)
2320
+        (xy 142.783741 103.70603) (xy 145.065 105.98729) (xy 145.065 106.145657) (xy 145.253018 106.599571) (xy 145.600429 106.946982)
2321
+        (xy 146.054343 107.135) (xy 146.545657 107.135) (xy 146.999571 106.946982) (xy 147.346982 106.599571) (xy 147.535 106.145657)
2322
+        (xy 147.535 105.654343) (xy 147.346982 105.200429) (xy 147.334553 105.188) (xy 151.44056 105.188) (xy 151.44056 106.712)
2323
+        (xy 151.489843 106.959765) (xy 151.621369 107.156606) (xy 151.549673 107.228301) (xy 151.453 107.46169) (xy 151.453 108.06425)
2324
+        (xy 151.61175 108.223) (xy 152.723 108.223) (xy 152.723 108.203) (xy 152.977 108.203) (xy 152.977 108.223)
2325
+        (xy 154.08825 108.223) (xy 154.247 108.06425) (xy 154.247 107.46169) (xy 154.150327 107.228301) (xy 154.078631 107.156606)
2326
+        (xy 154.210157 106.959765) (xy 154.25944 106.712) (xy 154.25944 105.188) (xy 154.210157 104.940235) (xy 154.069809 104.730191)
2327
+        (xy 153.859765 104.589843) (xy 153.612 104.54056) (xy 152.088 104.54056) (xy 151.840235 104.589843) (xy 151.630191 104.730191)
2328
+        (xy 151.489843 104.940235) (xy 151.44056 105.188) (xy 147.334553 105.188) (xy 146.999571 104.853018) (xy 146.545657 104.665)
2329
+        (xy 146.38729 104.665) (xy 146.040696 104.318407) (xy 146.407122 104.447419) (xy 146.93744 104.418664) (xy 147.293831 104.271042)
2330
+        (xy 147.355669 104.035275) (xy 146.6 103.279605) (xy 146.585858 103.293748) (xy 146.406252 103.114142) (xy 146.420395 103.1)
2331
+        (xy 145.664725 102.344331) (xy 145.428958 102.406169) (xy 145.252581 102.907122) (xy 145.281336 103.43744) (xy 145.367325 103.645035)
2332
+        (xy 144.445 102.722711) (xy 144.445 99.519801) (xy 146.683699 101.758501) (xy 146.26256 101.781336) (xy 145.906169 101.928958)
2333
+        (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)
2334
+        (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)
2335
+        (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)
2336
+        (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)
2337
+        (xy 146.974802 99.9) (xy 147.956887 99.9) (xy 148.06826 100.459909) (xy 148.385423 100.934577) (xy 148.860091 101.25174)
2338
+        (xy 149.278667 101.335) (xy 149.561333 101.335) (xy 149.979909 101.25174) (xy 150.454577 100.934577) (xy 150.77174 100.459909)
2339
+        (xy 150.883113 99.9) (xy 150.77174 99.340091) (xy 150.454577 98.865423) (xy 149.979909 98.54826) (xy 149.561333 98.465)
2340
+        (xy 149.278667 98.465) (xy 148.860091 98.54826) (xy 148.385423 98.865423) (xy 148.06826 99.340091) (xy 147.956887 99.9)
2341
+        (xy 146.974802 99.9) (xy 145.52 98.445199) (xy 145.52 93.388) (xy 151.44056 93.388) (xy 151.44056 94.912)
2342
+        (xy 151.489843 95.159765) (xy 151.616955 95.35) (xy 151.489843 95.540235) (xy 151.44056 95.788) (xy 151.44056 97.312)
2343
+        (xy 151.489843 97.559765) (xy 151.630191 97.769809) (xy 151.840235 97.910157) (xy 152.088 97.95944) (xy 153.612 97.95944)
2344
+        (xy 153.859765 97.910157) (xy 154.069809 97.769809) (xy 154.210157 97.559765) (xy 154.25944 97.312) (xy 154.25944 95.788)
2345
+        (xy 154.210157 95.540235) (xy 154.083045 95.35) (xy 154.210157 95.159765) (xy 154.25944 94.912) (xy 154.25944 93.388)
2346
+        (xy 154.210157 93.140235) (xy 154.069809 92.930191) (xy 153.859765 92.789843) (xy 153.612 92.74056) (xy 152.088 92.74056)
2347
+        (xy 151.840235 92.789843) (xy 151.630191 92.930191) (xy 151.489843 93.140235) (xy 151.44056 93.388) (xy 145.52 93.388)
2348
+        (xy 145.52 86.878178) (xy 145.830625 86.670625) (xy 145.845096 86.648967) (xy 145.911673 86.809698) (xy 146.090301 86.988327)
2349
+        (xy 146.32369 87.085) (xy 147.01425 87.085) (xy 147.173 86.92625) (xy 147.173 85.727) (xy 147.427 85.727)
2350
+        (xy 147.427 86.92625) (xy 147.58575 87.085) (xy 148.27631 87.085) (xy 148.509699 86.988327) (xy 148.688327 86.809698)
2351
+        (xy 148.785 86.576309) (xy 148.785 85.88575) (xy 148.62625 85.727) (xy 147.427 85.727) (xy 147.173 85.727)
2352
+        (xy 147.153 85.727) (xy 147.153 85.473) (xy 147.173 85.473) (xy 147.173 84.27375) (xy 147.01425 84.115)
2353
+        (xy 146.32369 84.115) (xy 146.090301 84.211673) (xy 145.911673 84.390302) (xy 145.845096 84.551033) (xy 145.830625 84.529375)
2354
+        (xy 145.339418 84.201161) (xy 144.906256 84.115) (xy 144.613744 84.115) (xy 144.180582 84.201161) (xy 143.689375 84.529375)
2355
+        (xy 143.49 84.827761) (xy 143.290625 84.529375) (xy 142.799418 84.201161) (xy 142.366256 84.115) (xy 142.073744 84.115)
2356
+        (xy 141.640582 84.201161) (xy 141.149375 84.529375) (xy 140.95 84.827761) (xy 140.750625 84.529375) (xy 140.259418 84.201161)
2357
+        (xy 139.826256 84.115) (xy 139.533744 84.115) (xy 139.100582 84.201161) (xy 138.609375 84.529375) (xy 138.41 84.827761)
2358
+        (xy 138.210625 84.529375) (xy 137.719418 84.201161) (xy 137.286256 84.115) (xy 136.993744 84.115) (xy 136.560582 84.201161)
2359
+        (xy 136.069375 84.529375) (xy 135.87 84.827761) (xy 135.670625 84.529375) (xy 135.272466 84.263334) (xy 135.52579 84.01001)
2360
+        (xy 147.398799 84.01001) (xy 147.544769 84.155981) (xy 147.427 84.27375) (xy 147.427 85.473) (xy 148.62625 85.473)
2361
+        (xy 148.744019 85.355231) (xy 150.423787 87.035) (xy 150.20467 87.035) (xy 149.640493 87.26869) (xy 149.20869 87.700493)
2362
+        (xy 148.975 88.26467) (xy 148.975 88.87533) (xy 149.20869 89.439507) (xy 149.640493 89.87131) (xy 150.20467 90.105)
2363
+        (xy 150.81533 90.105) (xy 151.379507 89.87131) (xy 151.78 89.470817) (xy 152.180493 89.87131) (xy 152.74467 90.105)
2364
+        (xy 153.35533 90.105) (xy 153.919507 89.87131) (xy 154.32 89.470817) (xy 154.720493 89.87131) (xy 155.28467 90.105)
2365
+        (xy 155.89533 90.105) (xy 156.459507 89.87131) (xy 156.86 89.470817) (xy 157.260493 89.87131) (xy 157.82467 90.105)
2366
+        (xy 158.43533 90.105) (xy 158.999507 89.87131) (xy 159.4 89.470817) (xy 159.800493 89.87131) (xy 160.36467 90.105)
2367
+        (xy 160.97533 90.105) (xy 161.539507 89.87131) (xy 161.94 89.470817) (xy 162.340493 89.87131) (xy 162.90467 90.105)
2368
+        (xy 163.51533 90.105) (xy 164.079507 89.87131) (xy 164.300658 89.650159) (xy 164.849446 89.650159) (xy 164.935852 89.906643)
2369
+        (xy 165.509336 90.116458) (xy 166.11946 90.090839) (xy 166.564148 89.906643) (xy 166.650554 89.650159) (xy 165.75 88.749605)
2370
+        (xy 164.849446 89.650159) (xy 164.300658 89.650159) (xy 164.51131 89.439507) (xy 164.519438 89.419885) (xy 164.669841 89.470554)
2371
+        (xy 165.570395 88.57) (xy 165.929605 88.57) (xy 166.830159 89.470554) (xy 166.980562 89.419885) (xy 166.98869 89.439507)
2372
+        (xy 167.420493 89.87131) (xy 167.98467 90.105) (xy 168.59533 90.105) (xy 169.159507 89.87131) (xy 169.59131 89.439507)
2373
+        (xy 169.825 88.87533) (xy 169.825 88.26467) (xy 169.59131 87.700493) (xy 169.159507 87.26869) (xy 168.59533 87.035)
2374
+        (xy 167.98467 87.035) (xy 167.420493 87.26869) (xy 166.98869 87.700493) (xy 166.980562 87.720115) (xy 166.830159 87.669446)
2375
+        (xy 165.929605 88.57) (xy 165.570395 88.57) (xy 164.669841 87.669446) (xy 164.519438 87.720115) (xy 164.51131 87.700493)
2376
+        (xy 164.300658 87.489841) (xy 164.849446 87.489841) (xy 165.75 88.390395) (xy 166.650554 87.489841) (xy 166.564148 87.233357)
2377
+        (xy 165.990664 87.023542) (xy 165.38054 87.049161) (xy 164.935852 87.233357) (xy 164.849446 87.489841) (xy 164.300658 87.489841)
2378
+        (xy 164.079507 87.26869) (xy 163.51533 87.035) (xy 162.90467 87.035) (xy 162.340493 87.26869) (xy 161.94 87.669183)
2379
+        (xy 161.539507 87.26869) (xy 160.97533 87.035) (xy 160.36467 87.035) (xy 159.800493 87.26869) (xy 159.4 87.669183)
2380
+        (xy 158.999507 87.26869) (xy 158.43533 87.035) (xy 157.82467 87.035) (xy 157.715162 87.08036) (xy 156.95332 86.318519)
2381
+        (xy 156.910918 86.25506) (xy 156.659526 86.087085) (xy 156.437841 86.042989) (xy 156.437836 86.042989) (xy 156.362989 86.028101)
2382
+        (xy 156.288142 86.042989) (xy 155.417795 86.042989) (xy 155.767767 85.898026) (xy 156.298026 85.367767) (xy 156.585 84.67495)
2383
+        (xy 156.585 83.92505) (xy 162.815 83.92505) (xy 162.815 84.67495) (xy 163.101974 85.367767) (xy 163.632233 85.898026)
2384
+        (xy 164.32505 86.185) (xy 165.07495 86.185) (xy 165.767767 85.898026) (xy 166.298026 85.367767) (xy 166.585 84.67495)
2385
+        (xy 166.585 83.92505) (xy 166.298026 83.232233) (xy 165.767767 82.701974) (xy 165.07495 82.415) (xy 164.32505 82.415)
2386
+        (xy 163.632233 82.701974) (xy 163.101974 83.232233) (xy 162.815 83.92505) (xy 156.585 83.92505) (xy 156.298026 83.232233)
2387
+        (xy 155.767767 82.701974) (xy 155.07495 82.415) (xy 154.32505 82.415) (xy 153.632233 82.701974) (xy 153.101974 83.232233)
2388
+        (xy 152.815 83.92505) (xy 152.815 84.67495) (xy 153.101974 85.367767) (xy 153.632233 85.898026) (xy 153.982205 86.042989)
2389
+        (xy 152.217792 86.042989) (xy 148.490331 82.31553) (xy 148.447929 82.252071) (xy 148.273468 82.1355) (xy 177.3645 82.1355)
2299 2390
       )
2300 2391
     )
2301 2392
     (filled_polygon

+ 659
- 568
schematics/oko-weatherstation.kicad_pcb-bak View File

@@ -2,11 +2,11 @@
2 2
 
3 3
   (general
4 4
     (thickness 1.6)
5
-    (drawings 48)
6
-    (tracks 173)
5
+    (drawings 45)
6
+    (tracks 175)
7 7
     (zones 0)
8
-    (modules 30)
9
-    (nets 25)
8
+    (modules 32)
9
+    (nets 27)
10 10
   )
11 11
 
12 12
   (page A4)
@@ -59,7 +59,7 @@
59 59
     (mod_text_size 1 1)
60 60
     (mod_text_width 0.15)
61 61
     (pad_size 1.5 1.5)
62
-    (pad_drill 0.7)
62
+    (pad_drill 0)
63 63
     (pad_to_mask_clearance 0)
64 64
     (solder_mask_min_width 0.25)
65 65
     (aux_axis_origin 128 81.5)
@@ -118,6 +118,8 @@
118 118
   (net 22 GPIO3)
119 119
   (net 23 GPIO4)
120 120
   (net 24 GPIO8)
121
+  (net 25 NCHRG)
122
+  (net 26 NSTBY)
121 123
 
122 124
   (net_class Default "This is the default net class."
123 125
     (clearance 0.2)
@@ -137,6 +139,8 @@
137 139
     (add_net GPIO3)
138 140
     (add_net GPIO4)
139 141
     (add_net GPIO8)
142
+    (add_net NCHRG)
143
+    (add_net NSTBY)
140 144
     (add_net "Net-(JP1-Pad1)")
141 145
     (add_net "Net-(JP1-Pad2)")
142 146
     (add_net "Net-(R1-Pad2)")
@@ -152,6 +156,102 @@
152 156
     (add_net VCC_SOLAR)
153 157
   )
154 158
 
159
+  (module ant:ant (layer F.Cu) (tedit 5C3908AA) (tstamp 5C3960ED)
160
+    (at 159.2 99.8)
161
+    (descr "Imported from ant.svg")
162
+    (tags svg2mod)
163
+    (attr smd)
164
+    (fp_text reference svg2mod (at 0 -16.47926) (layer F.SilkS) hide
165
+      (effects (font (size 1.524 1.524) (thickness 0.3048)))
166
+    )
167
+    (fp_text value G*** (at 0 16.47926) (layer F.SilkS) hide
168
+      (effects (font (size 1.524 1.524) (thickness 0.3048)))
169
+    )
170
+    (fp_poly (pts (xy 9.722176 -13.430868) (xy 9.013269 -13.233159) (xy 8.078872 -12.581828) (xy 7.656871 -12.249442)
171
+      (xy 7.000661 -11.837849) (xy 6.175762 -11.35736) (xy 5.247695 -10.818284) (xy 4.281981 -10.230933)
172
+      (xy 3.34414 -9.605615) (xy 2.499693 -8.952641) (xy 1.814161 -8.282321) (xy 1.353064 -7.604965)
173
+      (xy 0.978555 -6.785137) (xy 0.686542 -6.048574) (xy 0.443437 -5.326439) (xy 0.215651 -4.549897)
174
+      (xy -0.030405 -3.650112) (xy -0.32832 -2.558249) (xy -5.515097 -1.465832) (xy -5.634889 -1.180442)
175
+      (xy -6.155269 -1.391724) (xy -6.858126 -2.086419) (xy -7.637667 -2.341034) (xy -8.397204 -2.362056)
176
+      (xy -8.089313 -2.725043) (xy -7.523293 -3.329741) (xy -6.843526 -3.902506) (xy -6.194395 -4.16969)
177
+      (xy -6.045715 -4.15404) (xy -5.671569 -3.579635) (xy -5.298614 -2.866928) (xy -4.934528 -1.982531)
178
+      (xy -5.515097 -1.465832) (xy -0.32832 -2.558249) (xy -4.973655 0.658493) (xy -4.578479 0.752396)
179
+      (xy -4.159921 1.314501) (xy -3.913333 1.253212) (xy -3.896067 1.607991) (xy -3.962271 2.408809)
180
+      (xy -4.288946 3.260391) (xy -4.636152 3.645148) (xy -5.209552 4.158219) (xy -5.933996 4.743734)
181
+      (xy -6.734337 5.345822) (xy -7.182773 4.634602) (xy -7.676265 3.923319) (xy -8.158534 3.287779)
182
+      (xy -6.765864 2.890156) (xy -5.913305 2.381195) (xy -5.472916 1.842785) (xy -5.316755 1.356817)
183
+      (xy -5.316882 1.005184) (xy -5.345355 0.869775) (xy -4.973655 0.658493) (xy -0.32832 -2.558249)
184
+      (xy -1.121335 -2.414711) (xy -1.65586 -2.429032) (xy -2.052438 -2.391358) (xy -2.074026 -3.230892)
185
+      (xy -2.104448 -4.191108) (xy -2.155227 -5.161753) (xy -2.237881 -6.032575) (xy -2.363932 -6.693323)
186
+      (xy -3.075061 -7.421074) (xy -3.610929 -7.956757) (xy -4.218518 -8.481394) (xy -4.925312 -9.341115)
187
+      (xy -5.215108 -10.121126) (xy -5.271015 -10.461184) (xy -5.247521 -10.936886) (xy -5.497947 -11.897119)
188
+      (xy -6.030656 -11.291682) (xy -5.955725 -10.355543) (xy -5.692638 -9.489112) (xy -5.202427 -8.728631)
189
+      (xy -4.580008 -8.053065) (xy -3.920296 -7.441383) (xy -3.318209 -6.872551) (xy -2.868661 -6.325536)
190
+      (xy -2.805278 -5.574902) (xy -2.777344 -4.784992) (xy -2.804967 -3.977571) (xy -2.90826 -3.174405)
191
+      (xy -3.107331 -2.397257) (xy -3.721614 -2.346393) (xy -4.376761 -3.073463) (xy -5.087282 -3.883393)
192
+      (xy -5.697951 -4.56356) (xy -6.05354 -4.901339) (xy -6.56685 -4.74275) (xy -7.430915 -4.200304)
193
+      (xy -8.331107 -3.553532) (xy -8.952797 -3.081967) (xy -8.865389 -4.117298) (xy -8.878887 -5.030323)
194
+      (xy -9.054526 -5.609525) (xy -9.330712 -5.642097) (xy -9.881984 -5.472971) (xy -10.64317 -5.134487)
195
+      (xy -11.549096 -4.658984) (xy -12.534592 -4.078802) (xy -13.534485 -3.426278) (xy -14.551277 -2.63512)
196
+      (xy -15.433259 -1.809846) (xy -16.128072 -1.071053) (xy -16.583356 -0.539339) (xy -16.746752 -0.335302)
197
+      (xy -16.560128 -0.507497) (xy -16.051188 -0.954868) (xy -15.296336 -1.573593) (xy -14.371973 -2.259848)
198
+      (xy -13.354504 -2.909811) (xy -12.309629 -3.492526) (xy -11.34152 -4.008164) (xy -10.52728 -4.432381)
199
+      (xy -9.944009 -4.74083) (xy -9.668808 -4.909164) (xy -9.527359 -4.382748) (xy -9.594282 -3.522784)
200
+      (xy -9.782274 -2.538111) (xy -10.143084 -2.288954) (xy -9.930954 -2.08816) (xy -9.891828 -2.072509)
201
+      (xy -9.915304 -1.978605) (xy -10.560887 -1.497353) (xy -11.028345 -1.438072) (xy -11.664249 -1.333023)
202
+      (xy -12.823832 -0.929808) (xy -13.529655 -0.338759) (xy -13.894357 0.280745) (xy -14.030576 0.769325)
203
+      (xy -14.050952 0.967603) (xy -13.653409 0.670118) (xy -12.568066 0.650681) (xy -12.174604 0.425158)
204
+      (xy -12.016385 -0.163146) (xy -11.222121 -0.202273) (xy -11.218215 0.642855) (xy -11.002031 1.598729)
205
+      (xy -10.68051 2.317774) (xy -10.267447 2.826101) (xy -10.638795 3.033756) (xy -11.077361 2.935655)
206
+      (xy -11.760669 2.565859) (xy -12.067256 2.497441) (xy -12.591646 2.766637) (xy -13.530579 3.049122)
207
+      (xy -13.137571 3.497223) (xy -12.53247 3.898689) (xy -11.981178 4.066404) (xy -10.831498 3.984863)
208
+      (xy -9.978089 3.832478) (xy -9.378912 3.643486) (xy -8.99193 3.452122) (xy -8.135065 4.567221)
209
+      (xy -7.403397 5.823175) (xy -7.891333 6.145761) (xy -8.334602 6.417895) (xy -9.002784 6.670507)
210
+      (xy -9.768128 6.944804) (xy -10.592189 7.219983) (xy -11.617928 7.523549) (xy -12.601306 7.771443)
211
+      (xy -13.469269 7.949998) (xy -14.148768 8.045548) (xy -14.419248 8.085965) (xy -14.060445 8.093774)
212
+      (xy -13.399333 8.082547) (xy -12.762885 8.065858) (xy -12.478075 8.057279) (xy -12.183916 8.004387)
213
+      (xy -11.415024 7.863678) (xy -10.34178 7.662104) (xy -10.663774 8.277565) (xy -10.193101 8.620698)
214
+      (xy -9.58665 8.579926) (xy -9.361667 8.294612) (xy -9.136685 7.842702) (xy -8.530234 7.302142)
215
+      (xy -7.440049 7.062245) (xy -6.616923 6.848544) (xy -6.221783 6.683947) (xy -6.436978 5.88577)
216
+      (xy -5.545901 5.246402) (xy -4.891556 4.769867) (xy -4.637169 4.582866) (xy -4.07787 4.082568)
217
+      (xy -3.555131 3.411752) (xy -3.12854 2.607646) (xy -2.857682 1.707482) (xy -2.802147 0.74849)
218
+      (xy -2.101786 0.83848) (xy -1.688925 1.216003) (xy -1.413163 1.793161) (xy -0.783592 2.649953)
219
+      (xy -0.189714 3.076126) (xy 0.310832 3.283228) (xy 0.66041 3.482809) (xy 0.801384 3.886418)
220
+      (xy 0.801156 4.3937) (xy 0.769916 5.180743) (xy 0.692787 6.166729) (xy 0.554888 7.270841)
221
+      (xy 0.331159 8.464012) (xy 0.08465 9.463531) (xy -0.127261 10.201072) (xy -0.247201 10.608313)
222
+      (xy -0.363592 11.745402) (xy -0.305396 12.759733) (xy -0.247201 13.198473) (xy 0.017253 13.285768)
223
+      (xy 0.652704 13.198473) (xy 0.811928 12.887546) (xy 0.774217 12.289) (xy 0.656894 11.485173)
224
+      (xy 0.577282 10.558403) (xy 0.652704 9.59103) (xy 0.795096 9.015451) (xy 0.990652 8.275784)
225
+      (xy 1.180909 7.407783) (xy 1.364849 6.307643) (xy 1.505847 5.213554) (xy 1.572091 4.236017)
226
+      (xy 1.531767 3.48553) (xy 1.353064 3.072591) (xy 0.647697 2.594157) (xy 0.28716 2.480838)
227
+      (xy 0.074182 2.445266) (xy -0.188511 2.200075) (xy -0.626484 1.616275) (xy -0.902015 1.027289)
228
+      (xy -0.870748 0.393579) (xy -0.334169 0.177743) (xy 0.376585 0.484813) (xy 1.209481 0.814594)
229
+      (xy 2.088524 1.06787) (xy 2.937722 1.145422) (xy 3.681078 0.948034) (xy 4.960424 0.483979)
230
+      (xy 5.903627 0.414734) (xy 6.271239 0.455043) (xy 7.452724 1.176592) (xy 8.478769 1.779898)
231
+      (xy 9.383587 2.279874) (xy 10.201389 2.691438) (xy 10.966387 3.029504) (xy 11.712793 3.308988)
232
+      (xy 12.474818 3.544807) (xy 13.286674 3.751874) (xy 14.182573 3.945107) (xy 15.223839 4.043316)
233
+      (xy 15.872828 4.062486) (xy 16.215222 3.906674) (xy 15.990207 3.510805) (xy 15.047193 3.485576)
234
+      (xy 14.078574 3.351251) (xy 13.099045 3.12463) (xy 12.123299 2.82251) (xy 11.16603 2.461691)
235
+      (xy 10.241933 2.058971) (xy 9.365702 1.631149) (xy 8.55203 1.195022) (xy 7.815613 0.767391)
236
+      (xy 7.171143 0.365052) (xy 5.889508 -0.276471) (xy 4.970733 -0.424246) (xy 4.352031 -0.293773)
237
+      (xy 3.970613 -0.10055) (xy 3.342884 0.152915) (xy 2.462539 0.365912) (xy 1.699019 0.328399)
238
+      (xy 1.046067 -0.164068) (xy 0.785937 -0.874769) (xy 1.461573 -1.235088) (xy 2.243224 -1.530896)
239
+      (xy 3.041536 -1.726671) (xy 3.767156 -1.786893) (xy 4.064384 -1.774745) (xy 4.537229 -1.755665)
240
+      (xy 5.151035 -1.73824) (xy 5.871141 -1.731057) (xy 6.662891 -1.742704) (xy 7.491626 -1.781767)
241
+      (xy 8.322688 -1.856835) (xy 9.121418 -1.976492) (xy 9.853159 -2.149329) (xy 10.483253 -2.38393)
242
+      (xy 10.97704 -2.688884) (xy 11.299863 -3.072777) (xy 11.417063 -3.544197) (xy 11.293984 -4.111731)
243
+      (xy 10.895965 -4.783966) (xy 9.875565 -5.296398) (xy 9.038685 -5.633785) (xy 8.360635 -5.820147)
244
+      (xy 7.816727 -5.879502) (xy 7.691522 -5.875596) (xy 6.93934 -5.665623) (xy 6.402988 -5.265838)
245
+      (xy 5.872166 -4.883354) (xy 5.136576 -4.725284) (xy 4.352183 -4.558981) (xy 3.911148 -4.124152)
246
+      (xy 3.556578 -3.596671) (xy 3.031582 -3.152407) (xy 2.413883 -2.956301) (xy 1.624691 -2.812993)
247
+      (xy 0.907069 -2.721157) (xy 0.885692 -3.527729) (xy 0.942691 -4.296523) (xy 1.090363 -5.064656)
248
+      (xy 1.341004 -5.869249) (xy 1.706913 -6.74742) (xy 2.200386 -7.736288) (xy 2.652686 -8.25581)
249
+      (xy 3.306038 -8.835488) (xy 4.102272 -9.445507) (xy 4.983218 -10.056054) (xy 5.890709 -10.637314)
250
+      (xy 6.766574 -11.159472) (xy 7.552645 -11.592716) (xy 8.190753 -11.907229) (xy 8.622728 -12.073199)
251
+      (xy 9.274892 -12.393223) (xy 9.576685 -12.834045) (xy 9.83173 -13.352628) (xy 9.722176 -13.430881)
252
+      (xy 9.722176 -13.430868)) (layer F.SilkS) (width 0.338389))
253
+  )
254
+
155 255
   (module "" (layer F.Cu) (tedit 0) (tstamp 0)
156 256
     (at 168.91 82.55)
157 257
     (fp_text reference "" (at 170.18 78.74) (layer F.SilkS)
@@ -165,60 +265,6 @@
165 265
     )
166 266
   )
167 267
 
168
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570E85) (tstamp 5C5A5B51)
169
-    (at 171.45 83.82)
170
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
171
-    (tags "test point SMD pad rectangle square")
172
-    (path /5C5715CF)
173
-    (attr virtual)
174
-    (fp_text reference "" (at 0 5.08) (layer F.SilkS)
175
-      (effects (font (size 1 1) (thickness 0.15)))
176
-    )
177
-    (fp_text value BAT_CHARGING (at 0 1.75) (layer F.Fab)
178
-      (effects (font (size 1 1) (thickness 0.15)))
179
-    )
180
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
181
-      (effects (font (size 1 1) (thickness 0.15)))
182
-    )
183
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
184
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
185
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
186
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
187
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
188
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
189
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
190
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
191
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
192
-      (net 23 GPIO4))
193
-  )
194
-
195
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570E76) (tstamp 5C5A5A34)
196
-    (at 168.91 83.82)
197
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
198
-    (tags "test point SMD pad rectangle square")
199
-    (path /5C5715CF)
200
-    (attr virtual)
201
-    (fp_text reference "" (at 0 5.08) (layer F.SilkS)
202
-      (effects (font (size 1 1) (thickness 0.15)))
203
-    )
204
-    (fp_text value BAT_CHARGING (at 0 1.75) (layer F.Fab)
205
-      (effects (font (size 1 1) (thickness 0.15)))
206
-    )
207
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
208
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
209
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
210
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
211
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
212
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
213
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
214
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
215
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
216
-      (effects (font (size 1 1) (thickness 0.15)))
217
-    )
218
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
219
-      (net 22 GPIO3))
220
-  )
221
-
222 268
   (module "" (layer F.Cu) (tedit 0) (tstamp 0)
223 269
     (at 172.72 82.55)
224 270
     (fp_text reference "" (at 171.4 83.87) (layer F.SilkS)
@@ -232,26 +278,6 @@
232 278
     )
233 279
   )
234 280
 
235
-  (module Measurement_Points:Measurement_Point_Square-SMD-Pad_Small (layer B.Cu) (tedit 5C570A0D) (tstamp 5C5A46CA)
236
-    (at 172.67 110.54)
237
-    (descr "Mesurement Point, Square, SMD Pad,  1.5mm x 1.5mm,")
238
-    (tags "Mesurement Point Square SMD Pad 1.5x1.5mm")
239
-    (path /5C38D96A)
240
-    (attr virtual)
241
-    (fp_text reference J4 (at -2.4 0) (layer B.SilkS) hide
242
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
243
-    )
244
-    (fp_text value GND_BAT (at 0 -2) (layer B.Fab)
245
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
246
-    )
247
-    (fp_line (start -1 -1) (end -1 1) (layer B.CrtYd) (width 0.05))
248
-    (fp_line (start 1 -1) (end -1 -1) (layer B.CrtYd) (width 0.05))
249
-    (fp_line (start 1 1) (end 1 -1) (layer B.CrtYd) (width 0.05))
250
-    (fp_line (start -1 1) (end 1 1) (layer B.CrtYd) (width 0.05))
251
-    (pad 1 smd rect (at 0 0) (size 1.5 1.5) (layers B.Cu B.Mask)
252
-      (net 24 GPIO8))
253
-  )
254
-
255 281
   (module oko:GY-BME280 (layer F.Cu) (tedit 5C50A64F) (tstamp 5C37DABA)
256 282
     (at 132.5 98.5 180)
257 283
     (path /5C36680F)
@@ -361,22 +387,22 @@
361 387
     (fp_line (start 1.3 1.44) (end 21.3 1.44) (layer F.SilkS) (width 0.15))
362 388
     (fp_line (start 21.3 1.44) (end 21.3 16.44) (layer F.SilkS) (width 0.15))
363 389
     (fp_line (start 21.3 16.44) (end 1.3 16.44) (layer F.SilkS) (width 0.15))
364
-    (fp_text user "VL " (at -0.2 11.63 180) (layer F.SilkS)
390
+    (fp_text user "VL " (at -0.2 15.44 180) (layer F.SilkS)
365 391
       (effects (font (size 1 1) (thickness 0.15)))
366 392
     )
367
-    (fp_text user GND (at -0.3 12.9 180) (layer F.SilkS)
393
+    (fp_text user GND (at -0.3 16.71 180) (layer F.SilkS)
368 394
       (effects (font (size 1 1) (thickness 0.15)))
369 395
     )
370
-    (fp_text user VCC (at -0.4 14.17 180) (layer F.SilkS)
396
+    (fp_text user VCC (at -0.4 17.98 180) (layer F.SilkS)
371 397
       (effects (font (size 1 1) (thickness 0.15)))
372 398
     )
373
-    (fp_text user SDA (at -0.3 15.44 180) (layer F.SilkS)
399
+    (fp_text user SDA (at -0.3 19.25 180) (layer F.SilkS)
374 400
       (effects (font (size 1 1) (thickness 0.15)))
375 401
     )
376
-    (fp_text user SCL (at -0.3 16.71 180) (layer F.SilkS)
402
+    (fp_text user SCL (at -0.3 20.52 180) (layer F.SilkS)
377 403
       (effects (font (size 1 1) (thickness 0.15)))
378 404
     )
379
-    (fp_text user INT (at -0.1 17.98 180) (layer F.SilkS)
405
+    (fp_text user INT (at -0.1 21.79 180) (layer F.SilkS)
380 406
       (effects (font (size 1 1) (thickness 0.15)))
381 407
     )
382 408
     (fp_text user ADPS-9960 (at 4.5 6.4 270) (layer F.SilkS)
@@ -873,102 +899,6 @@
873 899
       (net 2 GND))
874 900
   )
875 901
 
876
-  (module ant:ant (layer F.Cu) (tedit 5C3908AA) (tstamp 5C3960ED)
877
-    (at 159.2 99.8)
878
-    (descr "Imported from ant.svg")
879
-    (tags svg2mod)
880
-    (attr smd)
881
-    (fp_text reference svg2mod (at 0 -16.47926) (layer F.SilkS) hide
882
-      (effects (font (size 1.524 1.524) (thickness 0.3048)))
883
-    )
884
-    (fp_text value G*** (at 0 16.47926) (layer F.SilkS) hide
885
-      (effects (font (size 1.524 1.524) (thickness 0.3048)))
886
-    )
887
-    (fp_poly (pts (xy 9.722176 -13.430868) (xy 9.013269 -13.233159) (xy 8.078872 -12.581828) (xy 7.656871 -12.249442)
888
-      (xy 7.000661 -11.837849) (xy 6.175762 -11.35736) (xy 5.247695 -10.818284) (xy 4.281981 -10.230933)
889
-      (xy 3.34414 -9.605615) (xy 2.499693 -8.952641) (xy 1.814161 -8.282321) (xy 1.353064 -7.604965)
890
-      (xy 0.978555 -6.785137) (xy 0.686542 -6.048574) (xy 0.443437 -5.326439) (xy 0.215651 -4.549897)
891
-      (xy -0.030405 -3.650112) (xy -0.32832 -2.558249) (xy -5.515097 -1.465832) (xy -5.634889 -1.180442)
892
-      (xy -6.155269 -1.391724) (xy -6.858126 -2.086419) (xy -7.637667 -2.341034) (xy -8.397204 -2.362056)
893
-      (xy -8.089313 -2.725043) (xy -7.523293 -3.329741) (xy -6.843526 -3.902506) (xy -6.194395 -4.16969)
894
-      (xy -6.045715 -4.15404) (xy -5.671569 -3.579635) (xy -5.298614 -2.866928) (xy -4.934528 -1.982531)
895
-      (xy -5.515097 -1.465832) (xy -0.32832 -2.558249) (xy -4.973655 0.658493) (xy -4.578479 0.752396)
896
-      (xy -4.159921 1.314501) (xy -3.913333 1.253212) (xy -3.896067 1.607991) (xy -3.962271 2.408809)
897
-      (xy -4.288946 3.260391) (xy -4.636152 3.645148) (xy -5.209552 4.158219) (xy -5.933996 4.743734)
898
-      (xy -6.734337 5.345822) (xy -7.182773 4.634602) (xy -7.676265 3.923319) (xy -8.158534 3.287779)
899
-      (xy -6.765864 2.890156) (xy -5.913305 2.381195) (xy -5.472916 1.842785) (xy -5.316755 1.356817)
900
-      (xy -5.316882 1.005184) (xy -5.345355 0.869775) (xy -4.973655 0.658493) (xy -0.32832 -2.558249)
901
-      (xy -1.121335 -2.414711) (xy -1.65586 -2.429032) (xy -2.052438 -2.391358) (xy -2.074026 -3.230892)
902
-      (xy -2.104448 -4.191108) (xy -2.155227 -5.161753) (xy -2.237881 -6.032575) (xy -2.363932 -6.693323)
903
-      (xy -3.075061 -7.421074) (xy -3.610929 -7.956757) (xy -4.218518 -8.481394) (xy -4.925312 -9.341115)
904
-      (xy -5.215108 -10.121126) (xy -5.271015 -10.461184) (xy -5.247521 -10.936886) (xy -5.497947 -11.897119)
905
-      (xy -6.030656 -11.291682) (xy -5.955725 -10.355543) (xy -5.692638 -9.489112) (xy -5.202427 -8.728631)
906
-      (xy -4.580008 -8.053065) (xy -3.920296 -7.441383) (xy -3.318209 -6.872551) (xy -2.868661 -6.325536)
907
-      (xy -2.805278 -5.574902) (xy -2.777344 -4.784992) (xy -2.804967 -3.977571) (xy -2.90826 -3.174405)
908
-      (xy -3.107331 -2.397257) (xy -3.721614 -2.346393) (xy -4.376761 -3.073463) (xy -5.087282 -3.883393)
909
-      (xy -5.697951 -4.56356) (xy -6.05354 -4.901339) (xy -6.56685 -4.74275) (xy -7.430915 -4.200304)
910
-      (xy -8.331107 -3.553532) (xy -8.952797 -3.081967) (xy -8.865389 -4.117298) (xy -8.878887 -5.030323)
911
-      (xy -9.054526 -5.609525) (xy -9.330712 -5.642097) (xy -9.881984 -5.472971) (xy -10.64317 -5.134487)
912
-      (xy -11.549096 -4.658984) (xy -12.534592 -4.078802) (xy -13.534485 -3.426278) (xy -14.551277 -2.63512)
913
-      (xy -15.433259 -1.809846) (xy -16.128072 -1.071053) (xy -16.583356 -0.539339) (xy -16.746752 -0.335302)
914
-      (xy -16.560128 -0.507497) (xy -16.051188 -0.954868) (xy -15.296336 -1.573593) (xy -14.371973 -2.259848)
915
-      (xy -13.354504 -2.909811) (xy -12.309629 -3.492526) (xy -11.34152 -4.008164) (xy -10.52728 -4.432381)
916
-      (xy -9.944009 -4.74083) (xy -9.668808 -4.909164) (xy -9.527359 -4.382748) (xy -9.594282 -3.522784)
917
-      (xy -9.782274 -2.538111) (xy -10.143084 -2.288954) (xy -9.930954 -2.08816) (xy -9.891828 -2.072509)
918
-      (xy -9.915304 -1.978605) (xy -10.560887 -1.497353) (xy -11.028345 -1.438072) (xy -11.664249 -1.333023)
919
-      (xy -12.823832 -0.929808) (xy -13.529655 -0.338759) (xy -13.894357 0.280745) (xy -14.030576 0.769325)
920
-      (xy -14.050952 0.967603) (xy -13.653409 0.670118) (xy -12.568066 0.650681) (xy -12.174604 0.425158)
921
-      (xy -12.016385 -0.163146) (xy -11.222121 -0.202273) (xy -11.218215 0.642855) (xy -11.002031 1.598729)
922
-      (xy -10.68051 2.317774) (xy -10.267447 2.826101) (xy -10.638795 3.033756) (xy -11.077361 2.935655)
923
-      (xy -11.760669 2.565859) (xy -12.067256 2.497441) (xy -12.591646 2.766637) (xy -13.530579 3.049122)
924
-      (xy -13.137571 3.497223) (xy -12.53247 3.898689) (xy -11.981178 4.066404) (xy -10.831498 3.984863)
925
-      (xy -9.978089 3.832478) (xy -9.378912 3.643486) (xy -8.99193 3.452122) (xy -8.135065 4.567221)
926
-      (xy -7.403397 5.823175) (xy -7.891333 6.145761) (xy -8.334602 6.417895) (xy -9.002784 6.670507)
927
-      (xy -9.768128 6.944804) (xy -10.592189 7.219983) (xy -11.617928 7.523549) (xy -12.601306 7.771443)
928
-      (xy -13.469269 7.949998) (xy -14.148768 8.045548) (xy -14.419248 8.085965) (xy -14.060445 8.093774)
929
-      (xy -13.399333 8.082547) (xy -12.762885 8.065858) (xy -12.478075 8.057279) (xy -12.183916 8.004387)
930
-      (xy -11.415024 7.863678) (xy -10.34178 7.662104) (xy -10.663774 8.277565) (xy -10.193101 8.620698)
931
-      (xy -9.58665 8.579926) (xy -9.361667 8.294612) (xy -9.136685 7.842702) (xy -8.530234 7.302142)
932
-      (xy -7.440049 7.062245) (xy -6.616923 6.848544) (xy -6.221783 6.683947) (xy -6.436978 5.88577)
933
-      (xy -5.545901 5.246402) (xy -4.891556 4.769867) (xy -4.637169 4.582866) (xy -4.07787 4.082568)
934
-      (xy -3.555131 3.411752) (xy -3.12854 2.607646) (xy -2.857682 1.707482) (xy -2.802147 0.74849)
935
-      (xy -2.101786 0.83848) (xy -1.688925 1.216003) (xy -1.413163 1.793161) (xy -0.783592 2.649953)
936
-      (xy -0.189714 3.076126) (xy 0.310832 3.283228) (xy 0.66041 3.482809) (xy 0.801384 3.886418)
937
-      (xy 0.801156 4.3937) (xy 0.769916 5.180743) (xy 0.692787 6.166729) (xy 0.554888 7.270841)
938
-      (xy 0.331159 8.464012) (xy 0.08465 9.463531) (xy -0.127261 10.201072) (xy -0.247201 10.608313)
939
-      (xy -0.363592 11.745402) (xy -0.305396 12.759733) (xy -0.247201 13.198473) (xy 0.017253 13.285768)
940
-      (xy 0.652704 13.198473) (xy 0.811928 12.887546) (xy 0.774217 12.289) (xy 0.656894 11.485173)
941
-      (xy 0.577282 10.558403) (xy 0.652704 9.59103) (xy 0.795096 9.015451) (xy 0.990652 8.275784)
942
-      (xy 1.180909 7.407783) (xy 1.364849 6.307643) (xy 1.505847 5.213554) (xy 1.572091 4.236017)
943
-      (xy 1.531767 3.48553) (xy 1.353064 3.072591) (xy 0.647697 2.594157) (xy 0.28716 2.480838)
944
-      (xy 0.074182 2.445266) (xy -0.188511 2.200075) (xy -0.626484 1.616275) (xy -0.902015 1.027289)
945
-      (xy -0.870748 0.393579) (xy -0.334169 0.177743) (xy 0.376585 0.484813) (xy 1.209481 0.814594)
946
-      (xy 2.088524 1.06787) (xy 2.937722 1.145422) (xy 3.681078 0.948034) (xy 4.960424 0.483979)
947
-      (xy 5.903627 0.414734) (xy 6.271239 0.455043) (xy 7.452724 1.176592) (xy 8.478769 1.779898)
948
-      (xy 9.383587 2.279874) (xy 10.201389 2.691438) (xy 10.966387 3.029504) (xy 11.712793 3.308988)
949
-      (xy 12.474818 3.544807) (xy 13.286674 3.751874) (xy 14.182573 3.945107) (xy 15.223839 4.043316)
950
-      (xy 15.872828 4.062486) (xy 16.215222 3.906674) (xy 15.990207 3.510805) (xy 15.047193 3.485576)
951
-      (xy 14.078574 3.351251) (xy 13.099045 3.12463) (xy 12.123299 2.82251) (xy 11.16603 2.461691)
952
-      (xy 10.241933 2.058971) (xy 9.365702 1.631149) (xy 8.55203 1.195022) (xy 7.815613 0.767391)
953
-      (xy 7.171143 0.365052) (xy 5.889508 -0.276471) (xy 4.970733 -0.424246) (xy 4.352031 -0.293773)
954
-      (xy 3.970613 -0.10055) (xy 3.342884 0.152915) (xy 2.462539 0.365912) (xy 1.699019 0.328399)
955
-      (xy 1.046067 -0.164068) (xy 0.785937 -0.874769) (xy 1.461573 -1.235088) (xy 2.243224 -1.530896)
956
-      (xy 3.041536 -1.726671) (xy 3.767156 -1.786893) (xy 4.064384 -1.774745) (xy 4.537229 -1.755665)
957
-      (xy 5.151035 -1.73824) (xy 5.871141 -1.731057) (xy 6.662891 -1.742704) (xy 7.491626 -1.781767)
958
-      (xy 8.322688 -1.856835) (xy 9.121418 -1.976492) (xy 9.853159 -2.149329) (xy 10.483253 -2.38393)
959
-      (xy 10.97704 -2.688884) (xy 11.299863 -3.072777) (xy 11.417063 -3.544197) (xy 11.293984 -4.111731)
960
-      (xy 10.895965 -4.783966) (xy 9.875565 -5.296398) (xy 9.038685 -5.633785) (xy 8.360635 -5.820147)
961
-      (xy 7.816727 -5.879502) (xy 7.691522 -5.875596) (xy 6.93934 -5.665623) (xy 6.402988 -5.265838)
962
-      (xy 5.872166 -4.883354) (xy 5.136576 -4.725284) (xy 4.352183 -4.558981) (xy 3.911148 -4.124152)
963
-      (xy 3.556578 -3.596671) (xy 3.031582 -3.152407) (xy 2.413883 -2.956301) (xy 1.624691 -2.812993)
964
-      (xy 0.907069 -2.721157) (xy 0.885692 -3.527729) (xy 0.942691 -4.296523) (xy 1.090363 -5.064656)
965
-      (xy 1.341004 -5.869249) (xy 1.706913 -6.74742) (xy 2.200386 -7.736288) (xy 2.652686 -8.25581)
966
-      (xy 3.306038 -8.835488) (xy 4.102272 -9.445507) (xy 4.983218 -10.056054) (xy 5.890709 -10.637314)
967
-      (xy 6.766574 -11.159472) (xy 7.552645 -11.592716) (xy 8.190753 -11.907229) (xy 8.622728 -12.073199)
968
-      (xy 9.274892 -12.393223) (xy 9.576685 -12.834045) (xy 9.83173 -13.352628) (xy 9.722176 -13.430881)
969
-      (xy 9.722176 -13.430868)) (layer F.SilkS) (width 0.338389))
970
-  )
971
-
972 902
   (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5C4D95C9) (tstamp 5C4D9413)
973 903
     (at 137.782986 93.98 180)
974 904
     (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")
@@ -1079,44 +1009,6 @@
1079 1009
     (pad 1 np_thru_hole circle (at 0 0) (size 2.5 2.5) (drill 2.5) (layers *.Cu *.Mask))
1080 1010
   )
1081 1011
 
1082
-  (module Resistors_ThroughHole:R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal (layer B.Cu) (tedit 5C57088B) (tstamp 5C50E1EE)
1083
-    (at 141.8 99.9)
1084
-    (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")
1085
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 7.62mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
1086
-    (path /5C36B93E)
1087
-    (fp_text reference R1 (at 3.81 2.31) (layer B.SilkS) hide
1088
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1089
-    )
1090
-    (fp_text value 100k (at 3.81 -2.31) (layer B.Fab) hide
1091
-      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1092
-    )
1093
-    (fp_line (start 8.7 1.6) (end -1.05 1.6) (layer B.CrtYd) (width 0.05))
1094
-    (fp_line (start 8.7 -1.6) (end 8.7 1.6) (layer B.CrtYd) (width 0.05))
1095
-    (fp_line (start -1.05 -1.6) (end 8.7 -1.6) (layer B.CrtYd) (width 0.05))
1096
-    (fp_line (start -1.05 1.6) (end -1.05 -1.6) (layer B.CrtYd) (width 0.05))
1097
-    (fp_line (start 7.02 -1.31) (end 7.02 -0.98) (layer B.SilkS) (width 0.12))
1098
-    (fp_line (start 0.6 -1.31) (end 7.02 -1.31) (layer B.SilkS) (width 0.12))
1099
-    (fp_line (start 0.6 -0.98) (end 0.6 -1.31) (layer B.SilkS) (width 0.12))
1100
-    (fp_line (start 7.02 1.31) (end 7.02 0.98) (layer B.SilkS) (width 0.12))
1101
-    (fp_line (start 0.6 1.31) (end 7.02 1.31) (layer B.SilkS) (width 0.12))
1102
-    (fp_line (start 0.6 0.98) (end 0.6 1.31) (layer B.SilkS) (width 0.12))
1103
-    (fp_line (start 7.62 0) (end 6.96 0) (layer B.Fab) (width 0.1))
1104
-    (fp_line (start 0 0) (end 0.66 0) (layer B.Fab) (width 0.1))
1105
-    (fp_line (start 6.96 1.25) (end 0.66 1.25) (layer B.Fab) (width 0.1))
1106
-    (fp_line (start 6.96 -1.25) (end 6.96 1.25) (layer B.Fab) (width 0.1))
1107
-    (fp_line (start 0.66 -1.25) (end 6.96 -1.25) (layer B.Fab) (width 0.1))
1108
-    (fp_line (start 0.66 1.25) (end 0.66 -1.25) (layer B.Fab) (width 0.1))
1109
-    (pad 2 thru_hole oval (at 7.62 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
1110
-      (net 14 "Net-(R1-Pad2)"))
1111
-    (pad 1 thru_hole circle (at 0 0) (size 1.6 1.6) (drill 0.8) (layers *.Cu *.Mask)
1112
-      (net 1 5V))
1113
-    (model ${KISYS3DMOD}/Resistors_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P7.62mm_Horizontal.wrl
1114
-      (at (xyz 0 0 0))
1115
-      (scale (xyz 0.393701 0.393701 0.393701))
1116
-      (rotate (xyz 0 0 0))
1117
-    )
1118
-  )
1119
-
1120 1012
   (module Symbols:OSHW-Logo_5.7x6mm_SilkScreen (layer B.Cu) (tedit 0) (tstamp 5C515B0D)
1121 1013
     (at 131.6 109.3 180)
1122 1014
     (descr "Open Source Hardware Logo")
@@ -1469,60 +1361,6 @@
1469 1361
       (xy 0.376964 2.709982)) (layer B.SilkS) (width 0.01))
1470 1362
   )
1471 1363
 
1472
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570DF4) (tstamp 5C59E441)
1473
-    (at 140.97 105.41)
1474
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
1475
-    (tags "test point SMD pad rectangle square")
1476
-    (path /5C5715CF)
1477
-    (attr virtual)
1478
-    (fp_text reference CHR. (at 0 4.445) (layer F.SilkS)
1479
-      (effects (font (size 1 1) (thickness 0.15)))
1480
-    )
1481
-    (fp_text value BAT_CHARGING (at 0 1.75) (layer F.Fab)
1482
-      (effects (font (size 1 1) (thickness 0.15)))
1483
-    )
1484
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1485
-      (effects (font (size 1 1) (thickness 0.15)))
1486
-    )
1487
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1488
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1489
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1490
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1491
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1492
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1493
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1494
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1495
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1496
-      (net 20 BAT_CHARGING))
1497
-  )
1498
-
1499
-  (module TestPoint:TestPoint_Pad_1.5x1.5mm (layer F.Cu) (tedit 5C570DE9) (tstamp 5C59E44F)
1500
-    (at 140.97 107.95)
1501
-    (descr "SMD rectangular pad as test Point, square 1.5mm side length")
1502
-    (tags "test point SMD pad rectangle square")
1503
-    (path /5C57277C)
1504
-    (attr virtual)
1505
-    (fp_text reference FULL (at 0 3.81) (layer F.SilkS)
1506
-      (effects (font (size 1 1) (thickness 0.15)))
1507
-    )
1508
-    (fp_text value BAT_CHARGED (at 0 1.75) (layer F.Fab)
1509
-      (effects (font (size 1 1) (thickness 0.15)))
1510
-    )
1511
-    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1512
-    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1513
-    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1514
-    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1515
-    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1516
-    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1517
-    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1518
-    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1519
-    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1520
-      (effects (font (size 1 1) (thickness 0.15)))
1521
-    )
1522
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1523
-      (net 21 BAT_CHARGED))
1524
-  )
1525
-
1526 1364
   (module Capacitors_SMD:C_0603_1608Metric (layer B.Cu) (tedit 5C570518) (tstamp 5C5A1D6B)
1527 1365
     (at 143.51 102.87 90)
1528 1366
     (descr "Capacitor 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")
@@ -1595,14 +1433,265 @@
1595 1433
     )
1596 1434
   )
1597 1435
 
1598
-  (gr_text D8 (at 170.815 110.49) (layer B.SilkS)
1599
-    (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1436
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5B301BBD) (tstamp 5C5E8343)
1437
+    (at 142.24 110.49 270)
1438
+    (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")
1439
+    (tags resistor)
1440
+    (path /5C58EB09)
1441
+    (attr smd)
1442
+    (fp_text reference R5 (at 0 -3.175 270) (layer B.SilkS)
1443
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1444
+    )
1445
+    (fp_text value 1k (at 0 -1.43 270) (layer B.Fab)
1446
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1447
+    )
1448
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
1449
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
1450
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
1451
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
1452
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
1453
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
1454
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
1455
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
1456
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
1457
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
1458
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
1459
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
1460
+    )
1461
+    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1462
+      (net 25 NCHRG))
1463
+    (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1464
+      (net 20 BAT_CHARGING))
1465
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
1466
+      (at (xyz 0 0 0))
1467
+      (scale (xyz 1 1 1))
1468
+      (rotate (xyz 0 0 0))
1469
+    )
1600 1470
   )
1601
-  (gr_text D4 (at 171.45 85.725) (layer F.SilkS) (tstamp 5C5A5C91)
1602
-    (effects (font (size 1 1) (thickness 0.15)))
1471
+
1472
+  (module Resistors_SMD:R_0603_1608Metric (layer B.Cu) (tedit 5B301BBD) (tstamp 5C5E8354)
1473
+    (at 140.97 110.49 270)
1474
+    (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")
1475
+    (tags resistor)
1476
+    (path /5C58EB15)
1477
+    (attr smd)
1478
+    (fp_text reference R6 (at 0 -3.175 270) (layer B.SilkS)
1479
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1480
+    )
1481
+    (fp_text value 1k (at 0 -1.43 270) (layer B.Fab)
1482
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1483
+    )
1484
+    (fp_text user %R (at 0 0 270) (layer B.Fab)
1485
+      (effects (font (size 0.4 0.4) (thickness 0.06)) (justify mirror))
1486
+    )
1487
+    (fp_line (start 1.48 -0.73) (end -1.48 -0.73) (layer B.CrtYd) (width 0.05))
1488
+    (fp_line (start 1.48 0.73) (end 1.48 -0.73) (layer B.CrtYd) (width 0.05))
1489
+    (fp_line (start -1.48 0.73) (end 1.48 0.73) (layer B.CrtYd) (width 0.05))
1490
+    (fp_line (start -1.48 -0.73) (end -1.48 0.73) (layer B.CrtYd) (width 0.05))
1491
+    (fp_line (start -0.162779 -0.51) (end 0.162779 -0.51) (layer B.SilkS) (width 0.12))
1492
+    (fp_line (start -0.162779 0.51) (end 0.162779 0.51) (layer B.SilkS) (width 0.12))
1493
+    (fp_line (start 0.8 -0.4) (end -0.8 -0.4) (layer B.Fab) (width 0.1))
1494
+    (fp_line (start 0.8 0.4) (end 0.8 -0.4) (layer B.Fab) (width 0.1))
1495
+    (fp_line (start -0.8 0.4) (end 0.8 0.4) (layer B.Fab) (width 0.1))
1496
+    (fp_line (start -0.8 -0.4) (end -0.8 0.4) (layer B.Fab) (width 0.1))
1497
+    (pad 2 smd roundrect (at 0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1498
+      (net 21 BAT_CHARGED))
1499
+    (pad 1 smd roundrect (at -0.7875 0 270) (size 0.875 0.95) (layers B.Cu B.Paste B.Mask) (roundrect_rratio 0.25)
1500
+      (net 26 NSTBY))
1501
+    (model ${KISYS3DMOD}/Resistor_SMD.3dshapes/R_0603_1608Metric.wrl
1502
+      (at (xyz 0 0 0))
1503
+      (scale (xyz 1 1 1))
1504
+      (rotate (xyz 0 0 0))
1505
+    )
1603 1506
   )
1604
-  (gr_text D3 (at 168.91 85.725) (layer F.SilkS)
1605
-    (effects (font (size 1 1) (thickness 0.15)))
1507
+
1508
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer B.Cu) (tedit 5C58C0C0) (tstamp 5C58CF0C)
1509
+    (at 140.97 104.775)
1510
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1511
+    (tags "test point THT pad rectangle square")
1512
+    (path /5C5715CF)
1513
+    (attr virtual)
1514
+    (fp_text reference CHRG (at 3.175 0.635) (layer B.SilkS)
1515
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1516
+    )
1517
+    (fp_text value BAT_CHARGING (at 0 -1.75) (layer B.Fab)
1518
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1519
+    )
1520
+    (fp_text user %R (at 0 1.65) (layer B.Fab)
1521
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1522
+    )
1523
+    (fp_line (start -0.95 0.95) (end 0.95 0.95) (layer B.SilkS) (width 0.12))
1524
+    (fp_line (start 0.95 0.95) (end 0.95 -0.95) (layer B.SilkS) (width 0.12))
1525
+    (fp_line (start 0.95 -0.95) (end -0.95 -0.95) (layer B.SilkS) (width 0.12))
1526
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer B.SilkS) (width 0.12))
1527
+    (fp_line (start -1.25 1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1528
+    (fp_line (start -1.25 1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1529
+    (fp_line (start 1.25 -1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1530
+    (fp_line (start 1.25 -1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1531
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1532
+      (net 25 NCHRG))
1533
+  )
1534
+
1535
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer B.Cu) (tedit 5C58C0E6) (tstamp 5C5E8894)
1536
+    (at 140.97 107.315)
1537
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1538
+    (tags "test point THT pad rectangle square")
1539
+    (path /5C57277C)
1540
+    (attr virtual)
1541
+    (fp_text reference FULL (at 3.175 0) (layer B.SilkS)
1542
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1543
+    )
1544
+    (fp_text value BAT_CHARGED (at 0 -1.75) (layer B.Fab)
1545
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1546
+    )
1547
+    (fp_line (start 1.25 -1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1548
+    (fp_line (start 1.25 -1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1549
+    (fp_line (start -1.25 1.25) (end -1.25 -1.25) (layer B.CrtYd) (width 0.05))
1550
+    (fp_line (start -1.25 1.25) (end 1.25 1.25) (layer B.CrtYd) (width 0.05))
1551
+    (fp_line (start -0.95 -0.95) (end -0.95 0.95) (layer B.SilkS) (width 0.12))
1552
+    (fp_line (start 0.95 -0.95) (end -0.95 -0.95) (layer B.SilkS) (width 0.12))
1553
+    (fp_line (start 0.95 0.95) (end 0.95 -0.95) (layer B.SilkS) (width 0.12))
1554
+    (fp_line (start -0.95 0.95) (end 0.95 0.95) (layer B.SilkS) (width 0.12))
1555
+    (fp_text user %R (at 0 1.65) (layer B.Fab)
1556
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1557
+    )
1558
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1559
+      (net 26 NSTBY))
1560
+  )
1561
+
1562
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer F.Cu) (tedit 5C58C54A) (tstamp 5C58C310)
1563
+    (at 168.91 83.82)
1564
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1565
+    (tags "test point THT pad rectangle square")
1566
+    (path /5C573A1A)
1567
+    (attr virtual)
1568
+    (fp_text reference D3 (at 0 1.905) (layer B.SilkS)
1569
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1570
+    )
1571
+    (fp_text value GPIO3 (at 0 1.75) (layer F.Fab)
1572
+      (effects (font (size 1 1) (thickness 0.15)))
1573
+    )
1574
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1575
+      (effects (font (size 1 1) (thickness 0.15)))
1576
+    )
1577
+    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1578
+    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1579
+    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1580
+    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1581
+    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1582
+    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1583
+    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1584
+    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1585
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1586
+      (net 22 GPIO3))
1587
+  )
1588
+
1589
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer F.Cu) (tedit 5C58C55A) (tstamp 5C58EB25)
1590
+    (at 171.45 83.82)
1591
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1592
+    (tags "test point THT pad rectangle square")
1593
+    (path /5C574DB6)
1594
+    (attr virtual)
1595
+    (fp_text reference D4 (at 0 1.905) (layer B.SilkS)
1596
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1597
+    )
1598
+    (fp_text value GPIO4 (at 0 1.75) (layer F.Fab)
1599
+      (effects (font (size 1 1) (thickness 0.15)))
1600
+    )
1601
+    (fp_line (start 1.25 1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1602
+    (fp_line (start 1.25 1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1603
+    (fp_line (start -1.25 -1.25) (end -1.25 1.25) (layer F.CrtYd) (width 0.05))
1604
+    (fp_line (start -1.25 -1.25) (end 1.25 -1.25) (layer F.CrtYd) (width 0.05))
1605
+    (fp_line (start -0.95 0.95) (end -0.95 -0.95) (layer F.SilkS) (width 0.12))
1606
+    (fp_line (start 0.95 0.95) (end -0.95 0.95) (layer F.SilkS) (width 0.12))
1607
+    (fp_line (start 0.95 -0.95) (end 0.95 0.95) (layer F.SilkS) (width 0.12))
1608
+    (fp_line (start -0.95 -0.95) (end 0.95 -0.95) (layer F.SilkS) (width 0.12))
1609
+    (fp_text user %R (at 0 -1.65) (layer F.Fab)
1610
+      (effects (font (size 1 1) (thickness 0.15)))
1611
+    )
1612
+    (pad 1 thru_hole rect (at 0 0) (size 1.5 1.5) (drill 0.7) (layers *.Cu *.Mask)
1613
+      (net 23 GPIO4))
1614
+  )
1615
+
1616
+  (module TestPoint:TestPoint_THTPad_1.5x1.5mm_Drill0.7mm (layer F.Cu) (tedit 5C58C53B) (tstamp 5C58F007)
1617
+    (at 172.72 110.49)
1618
+    (descr "THT rectangular pad as test Point, square 1.5mm side length, hole diameter 0.7mm")
1619
+    (tags "test point THT pad rectangle square")
1620
+    (path /5C576251)
1621
+    (attr virtual)
1622
+    (fp_text reference D8 (at 0 1.905) (layer B.SilkS)
1623
+      (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
1624
+    )
1625
+    (fp_text value GPIO8 (at 0 1.75) (layer F.Fab)
1626