Browse Source

Modification de ESP12f

CLUZE Remy -EXT 6 years ago
parent
commit
2ea8f55a54

+ 8 - 8
Eda/Ordinateur/Ordinateur-cache.lib

@@ -17,15 +17,15 @@ X GPIO9 11 -50 -700 200 U 50 50 1 1 I
 X GPIO10 12 50 -700 200 U 50 50 1 1 I
 X MOSI 13 150 -700 200 U 50 50 1 1 I
 X SCLK 14 250 -700 200 U 50 50 1 1 I
-X GND 15 700 450 200 L 50 50 1 1 I
-X GPIO15 16 700 350 200 L 50 50 1 1 I
-X GPIO2 17 700 250 200 L 50 50 1 1 I
-X GPIO0 18 700 150 200 L 50 50 1 1 I
-X GPIO4 19 700 50 200 L 50 50 1 1 I
+X GND 15 700 -250 200 L 50 50 1 1 I
+X GPIO15 16 700 -150 200 L 50 50 1 1 I
+X GPIO2 17 700 -50 200 L 50 50 1 1 I
+X GPIO0 18 700 50 200 L 50 50 1 1 I
+X GPIO4 19 700 150 200 L 50 50 1 1 I
 X ADC 2 -700 350 200 R 50 50 1 1 I
-X GPIO5 20 700 -50 200 L 50 50 1 1 I
-X RXD 21 700 -150 200 L 50 50 1 1 I
-X TXD 22 700 -250 200 L 50 50 1 1 I
+X GPIO5 20 700 250 200 L 50 50 1 1 I
+X RXD 21 700 350 200 L 50 50 1 1 I
+X TXD 22 700 450 200 L 50 50 1 1 I
 X EN 3 -700 250 200 R 50 50 1 1 I
 X GPIO16 4 -700 150 200 R 50 50 1 1 I
 X GPIO14 5 -700 50 200 R 50 50 1 1 I

+ 0 - 3
Eda/Ordinateur/Ordinateur-rescue.dcm

@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0
-#
-#End Doc Library

+ 3 - 530
Eda/Ordinateur/Ordinateur-rescue.lib

@@ -1,173 +1,11 @@
 EESchema-LIBRARY Version 2.4
 #encoding utf-8
 #
-# Battery-global-Ordinateur-rescue
+# ESP-12F-Module
 #
-DEF Battery-global-Ordinateur-rescue BT 0 0 N Y 1 F N
-F0 "BT" 100 50 50 H V L CNN
-F1 "Battery-global-Ordinateur-rescue" 100 -50 50 H V L CNN
-F2 "" 0 40 50 V V C CNN
-F3 "" 0 40 50 V V C CNN
-DRAW
-S -90 -7 90 -17 0 1 0 F
-S -90 50 90 40 0 1 0 F
-S -62 -30 58 -50 0 1 0 F
-S -62 27 58 7 0 1 0 F
-P 2 0 1 10 20 95 60 95 N
-P 2 0 1 10 40 115 40 75 N
-X ~ 1 0 150 100 D 50 50 1 1 P
-X ~ 2 0 -150 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# C-global-Ordinateur-rescue
-#
-DEF C-global-Ordinateur-rescue C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "C-global-Ordinateur-rescue" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
-$ENDFPLIST
-DRAW
-P 2 0 1 20 -80 -30 80 -30 N
-P 2 0 1 20 -80 30 80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_01X02-conn-Ordinateur-rescue
-#
-DEF CONN_01X02-conn-Ordinateur-rescue P 0 40 Y N 1 F N
-F0 "P" 0 150 50 H V C CNN
-F1 "CONN_01X02-conn-Ordinateur-rescue" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Pin_Header_Straight_1X02
- Pin_Header_Angled_1X02
- Socket_Strip_Straight_1X02
- Socket_Strip_Angled_1X02
-$ENDFPLIST
-DRAW
-S -50 -45 10 -55 0 1 0 N
-S -50 55 10 45 0 1 0 N
-S -50 100 50 -100 0 1 0 N
-X P1 1 -200 50 150 R 50 50 1 1 P
-X P2 2 -200 -50 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_01X03-conn-Ordinateur-rescue
-#
-DEF CONN_01X03-conn-Ordinateur-rescue P 0 40 Y N 1 F N
-F0 "P" 0 200 50 H V C CNN
-F1 "CONN_01X03-conn-Ordinateur-rescue" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Pin_Header_Straight_1X03
- Pin_Header_Angled_1X03
- Socket_Strip_Straight_1X03
- Socket_Strip_Angled_1X03
-$ENDFPLIST
-DRAW
-S -50 -95 10 -105 0 1 0 N
-S -50 5 10 -5 0 1 0 N
-S -50 105 10 95 0 1 0 N
-S -50 150 50 -150 0 1 0 N
-X P1 1 -200 100 150 R 50 50 1 1 P
-X P2 2 -200 0 150 R 50 50 1 1 P
-X P3 3 -200 -100 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_01X05-conn-Ordinateur-rescue
-#
-DEF CONN_01X05-conn-Ordinateur-rescue P 0 40 Y N 1 F N
-F0 "P" 0 300 50 H V C CNN
-F1 "CONN_01X05-conn-Ordinateur-rescue" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Pin_Header_Straight_1X05
- Pin_Header_Angled_1X05
- Socket_Strip_Straight_1X05
- Socket_Strip_Angled_1X05
-$ENDFPLIST
-DRAW
-S -50 -195 10 -205 0 1 0 N
-S -50 -95 10 -105 0 1 0 N
-S -50 5 10 -5 0 1 0 N
-S -50 105 10 95 0 1 0 N
-S -50 205 10 195 0 1 0 N
-S -50 250 50 -250 0 1 0 N
-X P1 1 -200 200 150 R 50 50 1 1 P
-X P2 2 -200 100 150 R 50 50 1 1 P
-X P3 3 -200 0 150 R 50 50 1 1 P
-X P4 4 -200 -100 150 R 50 50 1 1 P
-X P5 5 -200 -200 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CP-global-Ordinateur-rescue
-#
-DEF CP-global-Ordinateur-rescue C 0 10 N Y 1 F N
-F0 "C" 25 100 50 H V L CNN
-F1 "CP-global-Ordinateur-rescue" 25 -100 50 H V L CNN
-F2 "" 38 -150 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- CP*
- Elko*
- TantalC*
- C*elec
- c_elec*
- SMD*_Pol
-$ENDFPLIST
-DRAW
-S -90 20 -90 40 0 1 0 N
-S -90 20 90 20 0 1 0 N
-S 90 -20 -90 -40 0 1 0 F
-S 90 40 -90 40 0 1 0 N
-S 90 40 90 20 0 1 0 N
-P 2 0 1 0 -70 90 -30 90 N
-P 2 0 1 0 -50 110 -50 70 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# Crystal-global-Ordinateur-rescue
-#
-DEF Crystal-global-Ordinateur-rescue Y 0 40 N N 1 F N
-F0 "Y" 0 150 50 H V C CNN
-F1 "Crystal-global-Ordinateur-rescue" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- Crystal_*
-$ENDFPLIST
-DRAW
-S -50 100 50 -100 0 1 12 N
-P 2 0 1 12 -100 -50 -100 50 N
-P 2 0 1 12 100 -50 100 50 N
-X 1 1 -150 0 50 R 40 40 1 1 P
-X 2 2 150 0 50 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# ESP-12F-Module-Ordinateur-rescue
-#
-DEF ESP-12F-Module-Ordinateur-rescue U 0 40 Y Y 1 F N
+DEF ESP-12F-Module U 0 40 Y Y 1 F N
 F0 "U" 450 -600 60 H V C CNN
-F1 "ESP-12F-Module-Ordinateur-rescue" 0 600 60 H V C CNN
+F1 "ESP-12F-Module" 0 600 60 H V C CNN
 F2 "" 0 -50 60 H I C CNN
 F3 "" 0 -50 60 H I C CNN
 DRAW
@@ -198,369 +36,4 @@ X CS0 9 -250 -700 200 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# HD44780-afficheur-Ordinateur-rescue
-#
-DEF HD44780-afficheur-Ordinateur-rescue U 0 40 Y Y 1 F N
-F0 "U" 150 -450 60 H V C CNN
-F1 "HD44780-afficheur-Ordinateur-rescue" 0 450 60 H V C CNN
-F2 "" -200 50 60 H I C CNN
-F3 "" -200 50 60 H I C CNN
-DRAW
-S -200 -400 200 400 0 1 0 N
-X VSS 1 -400 350 200 R 50 50 1 1 I
-X D3 10 400 -250 200 L 50 50 1 1 I
-X D4 11 400 -150 200 L 50 50 1 1 I
-X D5 12 400 -50 200 L 50 50 1 1 I
-X D6 13 400 50 200 L 50 50 1 1 I
-X D7 14 400 150 200 L 50 50 1 1 I
-X A 15 400 250 200 L 50 50 1 1 I
-X K 16 400 350 200 L 50 50 1 1 I
-X VDD 2 -400 250 200 R 50 50 1 1 I
-X Vee 3 -400 150 200 R 50 50 1 1 I
-X RS 4 -400 50 200 R 50 50 1 1 I
-X R/W 5 -400 -50 200 R 50 50 1 1 I
-X E 6 -400 -150 200 R 50 50 1 1 I
-X D0 7 -400 -250 200 R 50 50 1 1 I
-X D1 8 -400 -350 200 R 50 50 1 1 I
-X D2 9 400 -350 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# LED-global-Ordinateur-rescue
-#
-DEF LED-global-Ordinateur-rescue D 0 40 Y N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "LED-global-Ordinateur-rescue" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- LED-3MM
- LED-5MM
- LED-10MM
- LED-0603
- LED-0805
- LED-1206
- LEDV
-$ENDFPLIST
-DRAW
-P 2 0 1 0 -50 50 -50 -50 N
-P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
-P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
-P 3 0 1 0 50 50 -50 0 50 -50 F
-X K 1 -200 0 150 R 40 40 1 1 P
-X A 2 200 0 150 L 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# LM317-global-Ordinateur-rescue
-#
-DEF LM317-global-Ordinateur-rescue U 0 40 Y Y 1 F N
-F0 "U" 150 -250 60 H V C CNN
-F1 "LM317-global-Ordinateur-rescue" 0 200 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -200 150 200 -200 0 1 0 N
-X Adj 1 0 -400 200 U 50 50 1 1 I
-X Vout 2 400 0 200 L 50 50 1 1 I
-X Vin 3 -400 0 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# M24C32-ST-Ordinateur-rescue
-#
-DEF M24C32-ST-Ordinateur-rescue U 0 40 Y Y 1 F N
-F0 "U" 200 -50 60 H V C CNN
-F1 "M24C32-ST-Ordinateur-rescue" 0 450 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -250 400 250 0 0 1 0 N
-X E0 1 450 350 200 L 50 50 1 1 I
-X E1 2 450 250 200 L 50 50 1 1 I
-X E2 3 450 150 200 L 50 50 1 1 I
-X VSS 4 450 50 200 L 50 50 1 1 I
-X VCC 5 -450 350 200 R 50 50 1 1 I
-X ~WC 6 -450 250 200 R 50 50 1 1 I
-X SCL 7 -450 150 200 R 50 50 1 1 I
-X SDA 8 -450 50 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# M41T83-ST-Ordinateur-rescue
-#
-DEF M41T83-ST-Ordinateur-rescue U 0 40 Y Y 1 F N
-F0 "U" 0 1400 60 H V C CNN
-F1 "M41T83-ST-Ordinateur-rescue" 0 200 60 H V C CNN
-F2 "" 0 0 60 H V C CNN
-F3 "" 0 0 60 H V C CNN
-DRAW
-S -450 300 450 1300 0 1 0 N
-X NC 1 -650 1200 200 R 50 50 1 1 I
-X SDA 10 650 400 200 L 50 50 1 1 I
-X SCL 11 650 500 200 L 50 50 1 1 I
-X ~IRQ1~/FT/OUT 12 650 600 200 L 50 50 1 1 I
-X NC 13 650 700 200 L 50 50 1 1 I
-X ~IRQ2 14 650 800 200 L 50 50 1 1 I
-X VCC 15 650 900 200 L 50 50 1 1 I
-X NF 16 650 1000 200 L 50 50 1 1 I
-X NF 17 650 1100 200 L 50 50 1 1 I
-X NC 18 650 1200 200 L 50 50 1 1 I
-X NF 2 -650 1100 200 R 50 50 1 1 I
-X NF 3 -650 1000 200 R 50 50 1 1 I
-X NC 4 -650 900 200 R 50 50 1 1 I
-X ~RST 5 -650 800 200 R 50 50 1 1 I
-X DU 6 -650 700 200 R 50 50 1 1 I
-X SQW 7 -650 600 200 R 50 50 1 1 I
-X VBAT 8 -650 500 200 R 50 50 1 1 I
-X VSS 9 -650 400 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Micro_USB-conn-Ordinateur-rescue
-#
-DEF Micro_USB-conn-Ordinateur-rescue J 0 40 Y Y 1 F N
-F0 "J" 250 -350 60 H V C CNN
-F1 "Micro_USB-conn-Ordinateur-rescue" 50 350 60 H V C CNN
-F2 "" 200 -200 60 H I C CNN
-F3 "" 200 -200 60 H I C CNN
-DRAW
-S 300 -300 -200 300 0 1 0 N
-P 4 0 1 0 -200 -300 -300 -200 -300 200 -200 300 N
-X USB_SH 0 -150 -400 100 U 50 50 1 1 I
-X USB_VBUS 1 500 200 200 L 50 50 1 1 I
-X USB_N 2 500 100 200 L 50 50 1 1 I
-X USB_P 3 500 0 200 L 50 50 1 1 I
-X USB_ID 4 500 -100 200 L 50 50 1 1 I
-X USB_GND 5 500 -200 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# N_MOSFET-global-Ordinateur-rescue
-#
-DEF N_MOSFET-global-Ordinateur-rescue Q 0 0 Y Y 1 F N
-F0 "Q" 160 140 60 H V C CNN
-F1 "N_MOSFET-global-Ordinateur-rescue" 0 -140 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-C 0 0 80 0 1 0 N
-P 2 0 1 0 -50 40 50 40 N
-P 2 0 1 0 -40 20 -40 -50 N
-P 2 0 1 0 -30 20 -50 20 N
-P 2 0 1 0 -10 -20 0 -10 N
-P 2 0 1 0 -10 20 10 20 N
-P 2 0 1 0 0 -10 0 -10 N
-P 2 0 1 0 0 -10 10 -20 N
-P 2 0 1 0 0 20 0 -20 N
-P 2 0 1 0 0 50 0 40 N
-P 2 0 1 0 10 -20 0 -10 N
-P 2 0 1 0 30 20 50 20 N
-P 3 0 1 0 -50 -50 0 -50 0 0 N
-P 3 0 1 0 40 20 40 -50 50 -50 N
-P 4 0 1 0 0 10 -10 -20 10 -20 0 10 N
-X G 1 0 250 200 D 50 50 1 1 I
-X D 2 250 -50 200 L 50 50 1 1 I
-X S 3 -250 -50 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# Poten-global-Ordinateur-rescue
-#
-DEF Poten-global-Ordinateur-rescue VR 0 0 N Y 1 F N
-F0 "VR" 80 0 50 V V C CNN
-F1 "Poten-global-Ordinateur-rescue" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R_*
- Resistor_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-P 3 0 1 0 -75 -25 -50 0 -75 25 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 -150 0 100 R 50 50 1 1 I
-X ~ 3 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# R-global-Ordinateur-rescue
-#
-DEF R-global-Ordinateur-rescue R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R-global-Ordinateur-rescue" 0 0 50 V V C CNN
-F2 "" -70 0 50 V V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R_*
- Resistor_*
-$ENDFPLIST
-DRAW
-S -40 -100 40 100 0 1 10 N
-X ~ 1 0 150 50 D 50 50 1 1 P
-X ~ 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# SRD-03VDC-SL-C-relay-Ordinateur-rescue
-#
-DEF SRD-03VDC-SL-C-relay-Ordinateur-rescue K 0 40 Y Y 1 F N
-F0 "K" 275 -250 60 H V C CNN
-F1 "SRD-03VDC-SL-C-relay-Ordinateur-rescue" -375 0 60 V V C CNN
-F2 "" -50 0 60 H I C CNN
-F3 "" -50 0 60 H I C CNN
-DRAW
-A -200 -37 12 901 -901 0 1 0 N -200 -25 -200 -50
-A -200 -13 12 -899 899 0 1 0 N -200 -25 -200 0
-A -200 13 12 901 -901 0 1 0 N -200 25 -200 0
-A -200 37 12 -899 899 0 1 0 N -200 25 -200 50
-S -300 200 300 -200 0 1 0 N
-X A1 1 -200 400 200 D 50 50 1 1 I
-X A2 2 -200 -400 200 U 50 50 1 1 I
-X COM 3 200 -400 200 U 50 50 1 1 I
-X NO 4 100 400 200 D 50 50 1 1 I
-X NC 5 250 400 200 D 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# STM32F401RC-ST-Ordinateur-rescue
-#
-DEF STM32F401RC-ST-Ordinateur-rescue U 0 40 Y Y 1 F N
-F0 "U" 1000 -1100 60 H V C CNN
-F1 "STM32F401RC-ST-Ordinateur-rescue" -50 -700 60 H V C CNN
-F2 "" -1200 -650 60 H I C CNN
-F3 "" -1200 -650 60 H I C CNN
-DRAW
-S -1050 -1050 1050 1050 0 1 0 N
-X VBAT 1 -1250 750 200 R 50 50 1 1 I
-X PC2 10 -1250 -150 200 R 50 50 1 1 I
-X PC3 11 -1250 -250 200 R 50 50 1 1 I
-X VSSA 12 -1250 -350 200 R 50 50 1 1 I
-X VDDA 13 -1250 -450 200 R 50 50 1 1 I
-X PA0 14 -1250 -550 200 R 50 50 1 1 I
-X PA1 15 -1250 -650 200 R 50 50 1 1 I
-X PA2 16 -1250 -750 200 R 50 50 1 1 I
-X PA3 17 -750 -1250 200 U 50 50 1 1 I
-X VSS 18 -650 -1250 200 U 50 50 1 1 I
-X VDD 19 -550 -1250 200 U 50 50 1 1 I
-X PC13 2 -1250 650 200 R 50 50 1 1 I
-X PA4 20 -450 -1250 200 U 50 50 1 1 I
-X PA5 21 -350 -1250 200 U 50 50 1 1 I
-X PA6 22 -250 -1250 200 U 50 50 1 1 I
-X PA7 23 -150 -1250 200 U 50 50 1 1 I
-X PC4 24 -50 -1250 200 U 50 50 1 1 I
-X PC5 25 50 -1250 200 U 50 50 1 1 I
-X PB0 26 150 -1250 200 U 50 50 1 1 I
-X PB1 27 250 -1250 200 U 50 50 1 1 I
-X PB2 28 350 -1250 200 U 50 50 1 1 I
-X PB10 29 450 -1250 200 U 50 50 1 1 I
-X PC14 3 -1250 550 200 R 50 50 1 1 I
-X VCAP1 30 550 -1250 200 U 50 50 1 1 I
-X VSS 31 650 -1250 200 U 50 50 1 1 I
-X VDD 32 750 -1250 200 U 50 50 1 1 I
-X PB12 33 1250 -750 200 L 50 50 1 1 I
-X PB13 34 1250 -650 200 L 50 50 1 1 I
-X PB14 35 1250 -550 200 L 50 50 1 1 I
-X PB15 36 1250 -450 200 L 50 50 1 1 I
-X PC6 37 1250 -350 200 L 50 50 1 1 I
-X PC7 38 1250 -250 200 L 50 50 1 1 I
-X PC8 39 1250 -150 200 L 50 50 1 1 I
-X PC15 4 -1250 450 200 R 50 50 1 1 I
-X PC9 40 1250 -50 200 L 50 50 1 1 I
-X PA8 41 1250 50 200 L 50 50 1 1 I
-X PA9 42 1250 150 200 L 50 50 1 1 I
-X PA10 43 1250 250 200 L 50 50 1 1 I
-X PA11 44 1250 350 200 L 50 50 1 1 I
-X PA12 45 1250 450 200 L 50 50 1 1 I
-X PA13 46 1250 550 200 L 50 50 1 1 I
-X VDD 47 1250 650 200 L 50 50 1 1 I
-X VSS 48 1250 750 200 L 50 50 1 1 I
-X PA14 49 750 1250 200 D 50 50 1 1 I
-X PH0 5 -1250 350 200 R 50 50 1 1 I
-X PA15 50 650 1250 200 D 50 50 1 1 I
-X PC10 51 550 1250 200 D 50 50 1 1 I
-X PC11 52 450 1250 200 D 50 50 1 1 I
-X PC12 53 350 1250 200 D 50 50 1 1 I
-X PD2 54 250 1250 200 D 50 50 1 1 I
-X PB3 55 150 1250 200 D 50 50 1 1 I
-X PB4 56 50 1250 200 D 50 50 1 1 I
-X PB5 57 -50 1250 200 D 50 50 1 1 I
-X PB6 58 -150 1250 200 D 50 50 1 1 I
-X PB7 59 -250 1250 200 D 50 50 1 1 I
-X PH1 6 -1250 250 200 R 50 50 1 1 I
-X BOOT0 60 -350 1250 200 D 50 50 1 1 I
-X PB8 61 -450 1250 200 D 50 50 1 1 I
-X PB9 62 -550 1250 200 D 50 50 1 1 I
-X VSS 63 -650 1250 200 D 50 50 1 1 I
-X VDD 64 -750 1250 200 D 50 50 1 1 I
-X NRST 7 -1250 150 200 R 50 50 1 1 I
-X PC0 8 -1250 50 200 R 50 50 1 1 I
-X PC1 9 -1250 -50 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# SW_PUSH-global-Ordinateur-rescue
-#
-DEF SW_PUSH-global-Ordinateur-rescue SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH-global-Ordinateur-rescue" 0 -80 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S -170 50 170 60 0 1 0 N
-P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
-X 1 1 -300 0 200 R 50 50 0 1 P I
-X 2 2 300 0 200 L 50 50 0 1 P I
-ENDDRAW
-ENDDEF
-#
-# ULN2803A-TI-Ordinateur-rescue
-#
-DEF ULN2803A-TI-Ordinateur-rescue U 0 40 Y Y 1 F N
-F0 "U" 150 -500 60 H V C CNN
-F1 "ULN2803A-TI-Ordinateur-rescue" 0 500 60 H V C CNN
-F2 "" 250 50 60 H I C CNN
-F3 "" 250 50 60 H I C CNN
-DRAW
-S -250 450 250 -450 0 1 0 N
-X 1B 1 -450 400 200 R 50 50 1 1 I
-X VCC 10 450 -400 200 L 50 50 1 1 I
-X 8C 11 450 -300 200 L 50 50 1 1 I
-X 7C 12 450 -200 200 L 50 50 1 1 I
-X 6C 13 450 -100 200 L 50 50 1 1 I
-X 5C 14 450 0 200 L 50 50 1 1 I
-X 4C 15 450 100 200 L 50 50 1 1 I
-X 3C 16 450 200 200 L 50 50 1 1 I
-X 2C 17 450 300 200 L 50 50 1 1 I
-X 1C 18 450 400 200 L 50 50 1 1 I
-X 2B 2 -450 300 200 R 50 50 1 1 I
-X 3B 3 -450 200 200 R 50 50 1 1 I
-X 4B 4 -450 100 200 R 50 50 1 1 I
-X 5B 5 -450 0 200 R 50 50 1 1 I
-X 6B 6 -450 -100 200 R 50 50 1 1 I
-X 7B 7 -450 -200 200 R 50 50 1 1 I
-X 8B 8 -450 -300 200 R 50 50 1 1 I
-X GND 9 -450 -400 200 R 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
-# mt-OO8a-global-Ordinateur-rescue
-#
-DEF mt-OO8a-global-Ordinateur-rescue SW 0 40 Y Y 1 F N
-F0 "SW" 200 250 60 H V C CNN
-F1 "mt-OO8a-global-Ordinateur-rescue" 0 -250 60 H V C CNN
-F2 "" 0 0 60 H I C CNN
-F3 "" 0 0 60 H I C CNN
-DRAW
-S -300 200 300 -200 0 1 0 N
-X Left 1 -500 100 200 R 50 50 1 1 I
-X Select 2 -500 0 200 R 50 50 1 1 I
-X Down 3 -500 -100 200 R 50 50 1 1 I
-X Right 4 500 -100 200 L 50 50 1 1 I
-X Com 5 500 0 200 L 50 50 1 1 I
-X Up 6 500 100 200 L 50 50 1 1 I
-ENDDRAW
-ENDDEF
-#
 #End Library

File diff suppressed because it is too large
+ 34 - 838
Eda/Ordinateur/Ordinateur.bak


+ 540 - 508
Eda/Ordinateur/Ordinateur.kicad_pcb

@@ -2,8 +2,8 @@
 
   (general
     (thickness 1.6)
-    (drawings 12)
-    (tracks 901)
+    (drawings 15)
+    (tracks 907)
     (zones 0)
     (modules 133)
     (nets 129)
@@ -12,7 +12,7 @@
   (page A4)
   (layers
     (0 F.Cu signal)
-    (31 B.Cu signal hide)
+    (31 B.Cu signal)
     (32 B.Adhes user)
     (33 F.Adhes user)
     (34 B.Paste user)
@@ -207,18 +207,18 @@
   (net 114 "Net-(U1-Pad3)")
   (net 115 "Net-(U1-Pad2)")
   (net 116 "Net-(P11-Pad1)")
-  (net 117 "Net-(U8-Pad18)")
-  (net 118 "Net-(U8-Pad17)")
-  (net 119 "Net-(U9-Pad7)")
-  (net 120 "Net-(U1-Pad53)")
-  (net 121 "Net-(U1-Pad52)")
-  (net 122 "Net-(U1-Pad51)")
-  (net 123 /TechniqueBas5V)
-  (net 124 /TechniqueHaut5V)
-  (net 125 /CuveHaut5V)
-  (net 126 /ReserveBas5V)
-  (net 127 /CapteurAutres25V)
-  (net 128 /CapteurAutres15V)
+  (net 117 "Net-(U9-Pad7)")
+  (net 118 "Net-(U1-Pad53)")
+  (net 119 "Net-(U1-Pad52)")
+  (net 120 "Net-(U1-Pad51)")
+  (net 121 /TechniqueBas5V)
+  (net 122 /TechniqueHaut5V)
+  (net 123 /CuveHaut5V)
+  (net 124 /ReserveBas5V)
+  (net 125 /CapteurAutres25V)
+  (net 126 /CapteurAutres15V)
+  (net 127 "Net-(U8-Pad20)")
+  (net 128 "Net-(U8-Pad19)")
 
   (net_class Default "This is the default net class."
     (clearance 0.2)
@@ -345,9 +345,9 @@
     (add_net "Net-(U4-Pad9)")
     (add_net "Net-(U8-Pad11)")
     (add_net "Net-(U8-Pad12)")
-    (add_net "Net-(U8-Pad17)")
-    (add_net "Net-(U8-Pad18)")
+    (add_net "Net-(U8-Pad19)")
     (add_net "Net-(U8-Pad2)")
+    (add_net "Net-(U8-Pad20)")
     (add_net "Net-(U8-Pad4)")
     (add_net "Net-(U8-Pad5)")
     (add_net "Net-(U8-Pad6)")
@@ -886,7 +886,7 @@
     (fp_line (start -6.35 -2.54) (end 6.35 -2.54) (layer F.SilkS) (width 0.17))
     (fp_line (start -6.35 1.27) (end -6.35 -2.54) (layer F.SilkS) (width 0.17))
     (pad 2 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
-      (net 123 /TechniqueBas5V))
+      (net 121 /TechniqueBas5V))
     (pad 1 thru_hole rect (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 /5V))
     (pad 4 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
@@ -915,7 +915,7 @@
     (fp_line (start -6.35 -2.54) (end 6.35 -2.54) (layer F.SilkS) (width 0.17))
     (fp_line (start -6.35 1.27) (end -6.35 -2.54) (layer F.SilkS) (width 0.17))
     (pad 2 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
-      (net 124 /TechniqueHaut5V))
+      (net 122 /TechniqueHaut5V))
     (pad 1 thru_hole rect (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 /5V))
     (pad 4 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
@@ -944,7 +944,7 @@
     (fp_line (start -6.35 -2.54) (end 6.35 -2.54) (layer F.SilkS) (width 0.17))
     (fp_line (start -6.35 1.27) (end -6.35 -2.54) (layer F.SilkS) (width 0.17))
     (pad 2 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
-      (net 125 /CuveHaut5V))
+      (net 123 /CuveHaut5V))
     (pad 1 thru_hole rect (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 /5V))
     (pad 4 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
@@ -973,7 +973,7 @@
     (fp_line (start -6.35 -2.54) (end 6.35 -2.54) (layer F.SilkS) (width 0.17))
     (fp_line (start -6.35 1.27) (end -6.35 -2.54) (layer F.SilkS) (width 0.17))
     (pad 2 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
-      (net 126 /ReserveBas5V))
+      (net 124 /ReserveBas5V))
     (pad 1 thru_hole rect (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 /5V))
     (pad 4 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
@@ -1002,7 +1002,7 @@
     (fp_line (start -6.35 -2.54) (end 6.35 -2.54) (layer F.SilkS) (width 0.17))
     (fp_line (start -6.35 1.27) (end -6.35 -2.54) (layer F.SilkS) (width 0.17))
     (pad 2 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
-      (net 127 /CapteurAutres25V))
+      (net 125 /CapteurAutres25V))
     (pad 1 thru_hole rect (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 /5V))
     (pad 4 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
@@ -1031,7 +1031,7 @@
     (fp_line (start -6.35 -2.54) (end 6.35 -2.54) (layer F.SilkS) (width 0.17))
     (fp_line (start -6.35 1.27) (end -6.35 -2.54) (layer F.SilkS) (width 0.17))
     (pad 2 thru_hole circle (at -1.27 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
-      (net 128 /CapteurAutres15V))
+      (net 126 /CapteurAutres15V))
     (pad 1 thru_hole rect (at -3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
       (net 9 /5V))
     (pad 4 thru_hole circle (at 3.81 0) (size 1.524 1.524) (drill 0.762) (layers *.Cu *.Mask)
@@ -1564,7 +1564,7 @@
     (fp_text reference P6 (at -4.826 0 -270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TempEau (at 0 -4) (layer F.SilkS)
+    (fp_text value TemperatureEau (at 0 -4) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 4.04 -2.95) (end 4.04 3.35) (layer F.SilkS) (width 0.15))
@@ -1723,31 +1723,6 @@
       (net 5 /3.3V))
   )
 
-  (module Connector:PinHeader2.54_1X2 locked (layer F.Cu) (tedit 5D9C94E3) (tstamp 5D8B565E)
-    (at 77.5 47.5 270)
-    (path /5CF5CE43)
-    (fp_text reference P18 (at 3.7 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value ProgESP (at 0.2 2.3 270) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -2.423 -1.143) (end -2.423 1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.6 -1.2) (end -2.4 -1.2) (layer F.SilkS) (width 0.15))
-    (fp_line (start 2.6 1.143) (end 2.6 -1.143) (layer F.SilkS) (width 0.15))
-    (fp_line (start -2.4 1.2) (end 2.6 1.2) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.153 -1.905) (end -1.407 -1.524) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.661 -1.905) (end -1.153 -1.905) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.407 -1.524) (end -1.661 -1.905) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.28 -1.778) (end -1.534 -1.778) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.407 -1.651) (end -1.28 -1.778) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.407 -1.778) (end -1.407 -1.651) (layer F.SilkS) (width 0.15))
-    (pad 2 thru_hole circle (at 1.26 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
-      (net 56 /TX))
-    (pad 1 thru_hole circle (at -1.28 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
-      (net 55 /RX))
-  )
-
   (module MH:MH3mm (layer F.Cu) (tedit 5CE7D073) (tstamp 5D8B5F9A)
     (at 120 30)
     (descr "module Non Plated Through Hole")
@@ -2363,21 +2338,21 @@
   )
 
   (module Jumper:Jumper_2.54mm locked (layer F.Cu) (tedit 5D9C94DD) (tstamp 5D8B5757)
-    (at 77.5 38.77 90)
+    (at 77.5 44.5 270)
     (path /5CF5CE26)
-    (fp_text reference SJ1 (at 0 2.54 90) (layer F.SilkS)
+    (fp_text reference SJ1 (at 0 2.54 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value Mode (at -0.1 -2.54 90) (layer F.SilkS)
+    (fp_text value Mode (at -0.1 -2.54 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start -3.048 -1.524) (end 3.048 -1.524) (layer F.SilkS) (width 0.15))
     (fp_line (start 3.048 -1.524) (end 3.048 1.524) (layer F.SilkS) (width 0.15))
     (fp_line (start 3.048 1.524) (end -3.048 1.524) (layer F.SilkS) (width 0.15))
     (fp_line (start -3.048 1.524) (end -3.048 -1.524) (layer F.SilkS) (width 0.15))
-    (pad 2 thru_hole circle (at 1.27 0 90) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask)
       (net 2 /GND))
-    (pad 1 thru_hole rect (at -1.27 0 90) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.8 1.8) (drill 1) (layers *.Cu *.Mask)
       (net 58 /mode))
   )
 
@@ -2456,11 +2431,11 @@
     (pad 54 smd rect (at -5.75 -1.25 180) (size 0.3 1.2) (layers F.Cu F.Paste F.Mask)
       (net 112 "Net-(U1-Pad54)"))
     (pad 53 smd rect (at -5.75 -1.75 180) (size 0.3 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 120 "Net-(U1-Pad53)"))
+      (net 118 "Net-(U1-Pad53)"))
     (pad 52 smd rect (at -5.75 -2.25 180) (size 0.3 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 121 "Net-(U1-Pad52)"))
+      (net 119 "Net-(U1-Pad52)"))
     (pad 51 smd rect (at -5.75 -2.75 180) (size 0.3 1.2) (layers F.Cu F.Paste F.Mask)
-      (net 122 "Net-(U1-Pad51)"))
+      (net 120 "Net-(U1-Pad51)"))
     (pad 50 smd rect (at -5.75 -3.25 180) (size 0.3 1.2) (layers F.Cu F.Paste F.Mask)
       (net 106 /VentiloPWM_3))
     (pad 49 smd rect (at -5.75 -3.75 180) (size 0.3 1.2) (layers F.Cu F.Paste F.Mask)
@@ -2663,23 +2638,23 @@
     (fp_line (start -6.5 10.5) (end -6.5 -12) (layer F.SilkS) (width 0.15))
     (fp_line (start 6.5 10.5) (end -6.5 10.5) (layer F.SilkS) (width 0.15))
     (pad 15 smd rect (at 7.6 10.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 56 /TX))
+      (net 2 /GND))
     (pad 9 smd rect (at -5 11.5) (size 1 1.8) (layers F.Cu F.Paste F.Mask)
       (net 29 /CS_ESP))
     (pad 22 smd rect (at 7.6 -3.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 2 /GND))
+      (net 56 /TX))
     (pad 21 smd rect (at 7.6 -1.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 2 /GND))
+      (net 55 /RX))
     (pad 20 smd rect (at 7.6 0.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 57 "Net-(R32-Pad2)"))
+      (net 127 "Net-(U8-Pad20)"))
     (pad 19 smd rect (at 7.6 2.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 58 /mode))
+      (net 128 "Net-(U8-Pad19)"))
     (pad 18 smd rect (at 7.6 4.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 117 "Net-(U8-Pad18)"))
+      (net 58 /mode))
     (pad 17 smd rect (at 7.6 6.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 118 "Net-(U8-Pad17)"))
+      (net 57 "Net-(R32-Pad2)"))
     (pad 16 smd rect (at 7.6 8.5) (size 1.8 1) (layers F.Cu F.Paste F.Mask)
-      (net 55 /RX))
+      (net 2 /GND))
     (pad 14 smd rect (at 5 11.5) (size 1 1.8) (layers F.Cu F.Paste F.Mask)
       (net 30 /CLK))
     (pad 13 smd rect (at 3 11.5) (size 1 1.8) (layers F.Cu F.Paste F.Mask)
@@ -2906,7 +2881,7 @@
     (fp_text reference P10 (at -4.826 0 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TempAir (at -0.1 -4.2) (layer F.SilkS)
+    (fp_text value TemperatureAir (at -0.1 -4.2) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 4.04 -2.95) (end 4.04 3.35) (layer F.SilkS) (width 0.15))
@@ -3325,7 +3300,7 @@
     (pad 8 smd rect (at -1.905 -3.7 90) (size 0.55 1.75) (layers F.Cu F.Paste F.Mask)
       (net 9 /5V))
     (pad 7 smd rect (at -0.635 -3.7 90) (size 0.55 1.75) (layers F.Cu F.Paste F.Mask)
-      (net 119 "Net-(U9-Pad7)"))
+      (net 117 "Net-(U9-Pad7)"))
     (pad 6 smd rect (at 0.635 -3.7 90) (size 0.55 1.75) (layers F.Cu F.Paste F.Mask)
       (net 2 /GND))
     (pad 5 smd rect (at 1.905 -3.7 90) (size 0.55 1.75) (layers F.Cu F.Paste F.Mask)
@@ -3436,7 +3411,7 @@
     (fp_line (start -0.4 -0.75) (end 0.4 -0.75) (layer B.SilkS) (width 0.17))
     (fp_line (start -0.4 0.75) (end 0.4 0.75) (layer B.SilkS) (width 0.17))
     (pad 1 smd rect (at -0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 123 /TechniqueBas5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
+      (net 121 /TechniqueBas5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (pad 2 smd rect (at 0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
       (net 77 /TechniqueBas) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (model ${KIPRJMOD}/../packages3d/None-R0805.wrl
@@ -3480,7 +3455,7 @@
     (fp_line (start -0.4 -0.75) (end 0.4 -0.75) (layer B.SilkS) (width 0.17))
     (fp_line (start -0.4 0.75) (end 0.4 0.75) (layer B.SilkS) (width 0.17))
     (pad 1 smd rect (at -0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 124 /TechniqueHaut5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
+      (net 122 /TechniqueHaut5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (pad 2 smd rect (at 0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
       (net 78 /TechniqueHaut) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (model ${KIPRJMOD}/../packages3d/None-R0805.wrl
@@ -3524,7 +3499,7 @@
     (fp_line (start -0.4 -0.75) (end 0.4 -0.75) (layer B.SilkS) (width 0.17))
     (fp_line (start -0.4 0.75) (end 0.4 0.75) (layer B.SilkS) (width 0.17))
     (pad 1 smd rect (at -0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 125 /CuveHaut5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
+      (net 123 /CuveHaut5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (pad 2 smd rect (at 0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
       (net 79 /CuveHaut) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (model ${KIPRJMOD}/../packages3d/None-R0805.wrl
@@ -3568,7 +3543,7 @@
     (fp_line (start -0.4 -0.75) (end 0.4 -0.75) (layer B.SilkS) (width 0.17))
     (fp_line (start -0.4 0.75) (end 0.4 0.75) (layer B.SilkS) (width 0.17))
     (pad 1 smd rect (at -0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 126 /ReserveBas5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
+      (net 124 /ReserveBas5V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (pad 2 smd rect (at 0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
       (net 80 /ReserveBas) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (model ${KIPRJMOD}/../packages3d/None-R0805.wrl
@@ -3612,7 +3587,7 @@
     (fp_line (start -0.4 -0.75) (end 0.4 -0.75) (layer B.SilkS) (width 0.17))
     (fp_line (start -0.4 0.75) (end 0.4 0.75) (layer B.SilkS) (width 0.17))
     (pad 1 smd rect (at -0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 127 /CapteurAutres25V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
+      (net 125 /CapteurAutres25V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (pad 2 smd rect (at 0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
       (net 81 /CapteurAutres2) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (model ${KIPRJMOD}/../packages3d/None-R0805.wrl
@@ -3656,7 +3631,7 @@
     (fp_line (start -0.4 -0.75) (end 0.4 -0.75) (layer B.SilkS) (width 0.17))
     (fp_line (start -0.4 0.75) (end 0.4 0.75) (layer B.SilkS) (width 0.17))
     (pad 1 smd rect (at -0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
-      (net 128 /CapteurAutres15V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
+      (net 126 /CapteurAutres15V) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (pad 2 smd rect (at 0.875 0 270) (size 0.85 1.5) (layers B.Cu B.Paste B.Mask)
       (net 84 /CapteurAutres1) (solder_mask_margin 0.07) (solder_paste_margin -0.05))
     (model ${KIPRJMOD}/../packages3d/None-R0805.wrl
@@ -3688,6 +3663,42 @@
     )
   )
 
+  (module Connector:PinHeader2.54_1X3 (layer F.Cu) (tedit 5E427FF0) (tstamp 5E428D2E)
+    (at 76.9 36.2 90)
+    (path /5CF5CE43)
+    (fp_text reference P18 (at 0.1 -2.2 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value ProgESP (at 0 -1.905 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -2.677 -1.778) (end -2.677 -1.651) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.677 -1.651) (end -2.55 -1.778) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.55 -1.778) (end -2.804 -1.778) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.677 -1.524) (end -2.931 -1.905) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.931 -1.905) (end -2.423 -1.905) (layer F.SilkS) (width 0.15))
+    (fp_line (start -2.423 -1.905) (end -2.677 -1.524) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.81 1.27) (end 4.445 1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start 4.445 1.27) (end 4.445 -1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start 4.445 -1.27) (end -3.81 -1.27) (layer F.SilkS) (width 0.15))
+    (fp_line (start -3.81 -1.27) (end -3.81 1.27) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at -2.54 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 2 /GND))
+    (pad 2 thru_hole circle (at 0 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 55 /RX))
+    (pad 3 thru_hole circle (at 2.54 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 56 /TX))
+  )
+
+  (gr_text GND (at 80.6 38.8) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
+  (gr_text RX (at 79.7 36.2) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
+  (gr_text TX (at 79.6 33.7) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
   (gr_text "Ordinateur Aquarium V2.0\n\nRC 10/2019\n" (at 107.1 97.7) (layer B.SilkS)
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror))
   )
@@ -4334,21 +4345,27 @@
   (segment (start 92.5 83.25) (end 92.5 87) (width 0.25) (layer F.Cu) (net 54) (status 40030))
   (segment (start 92.5 88) (end 93 87.5) (width 0.25) (layer F.Cu) (net 54) (status 40030))
   (segment (start 92.5 93.2) (end 92.5 88) (width 0.25) (layer F.Cu) (net 54) (status 40030))
-  (segment (start 77.28 46) (end 77.5 46.22) (width 0.25) (layer F.Cu) (net 55) (status 30))
-  (segment (start 72.6 46) (end 77.28 46) (width 0.25) (layer F.Cu) (net 55) (status 30))
-  (segment (start 76.74 48) (end 77.5 48.76) (width 0.25) (layer F.Cu) (net 56) (status 20))
-  (segment (start 72.6 48) (end 76.74 48) (width 0.25) (layer F.Cu) (net 56) (status 10))
+  (segment (start 72.88 36.28) (end 72.6 36) (width 0.25) (layer F.Cu) (net 55))
+  (segment (start 76.7 36) (end 76.9 36.2) (width 0.25) (layer F.Cu) (net 55))
+  (segment (start 72.6 36) (end 76.7 36) (width 0.25) (layer F.Cu) (net 55))
+  (segment (start 72.86 33.74) (end 72.6 34) (width 0.25) (layer F.Cu) (net 56))
+  (segment (start 76.56 34) (end 76.9 33.66) (width 0.25) (layer F.Cu) (net 56))
+  (segment (start 72.6 34) (end 76.56 34) (width 0.25) (layer F.Cu) (net 56))
   (via (at 70.3 38) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 57))
   (segment (start 68.375 37.5) (end 69.8 37.5) (width 0.25) (layer B.Cu) (net 57) (status 10))
   (segment (start 69.8 37.5) (end 70.3 38) (width 0.25) (layer B.Cu) (net 57))
-  (segment (start 70.3 38) (end 72.6 38) (width 0.25) (layer F.Cu) (net 57) (status 20))
   (via (at 69.9 39.9) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 58))
-  (segment (start 72.6 40) (end 70 40) (width 0.25) (layer F.Cu) (net 58) (status 10))
   (segment (start 70 40) (end 69.9 39.9) (width 0.25) (layer F.Cu) (net 58))
   (segment (start 68.475 39.9) (end 68.375 40) (width 0.25) (layer B.Cu) (net 58) (status 30))
   (segment (start 69.9 39.9) (end 68.475 39.9) (width 0.25) (layer B.Cu) (net 58) (status 20))
-  (segment (start 77.46 40) (end 77.5 40.04) (width 0.25) (layer F.Cu) (net 58) (status 30))
-  (segment (start 72.6 40) (end 77.46 40) (width 0.25) (layer F.Cu) (net 58) (status 30))
+  (segment (start 72.63 42.03) (end 72.6 42) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 70.199999 40.199999) (end 69.9 39.9) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 72 42) (end 70.199999 40.199999) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 72.6 42) (end 72 42) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 76.35 43.23) (end 77.5 43.23) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 72.6 42) (end 75 42) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 76.23 43.23) (end 77.5 43.23) (width 0.25) (layer F.Cu) (net 58))
+  (segment (start 75 42) (end 76.23 43.23) (width 0.25) (layer F.Cu) (net 58))
   (segment (start 46.855 91.295) (end 47.2 90.95) (width 0.25) (layer F.Cu) (net 71) (status 40030))
   (segment (start 40.9 91.295) (end 46.855 91.295) (width 0.25) (layer F.Cu) (net 71) (status 40030))
   (segment (start 43.935 93.835) (end 40.9 93.835) (width 0.25) (layer F.Cu) (net 72) (status 20))
@@ -4584,32 +4601,32 @@
   (segment (start 35.8 89.165) (end 40.6 84.365) (width 0.25) (layer F.Cu) (net 116) (status 20))
   (segment (start 33.5 105.1) (end 35.8 102.8) (width 0.25) (layer F.Cu) (net 116) (status 10))
   (segment (start 35.8 102.8) (end 35.8 89.165) (width 0.25) (layer F.Cu) (net 116))
-  (via (at 31.2 41.4) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 123))
-  (segment (start 30.165001 37.625001) (end 30.165001 40.365001) (width 0.25) (layer F.Cu) (net 123))
-  (segment (start 30.165001 40.365001) (end 30.900001 41.100001) (width 0.25) (layer F.Cu) (net 123))
-  (segment (start 30.900001 41.100001) (end 31.2 41.4) (width 0.25) (layer F.Cu) (net 123))
-  (segment (start 31.425 41.625) (end 31.2 41.4) (width 0.25) (layer B.Cu) (net 123))
-  (segment (start 50 41.625) (end 31.425 41.625) (width 0.25) (layer B.Cu) (net 123))
-  (segment (start 45.925 49.125) (end 45 48.2) (width 0.25) (layer B.Cu) (net 124))
-  (segment (start 50 49.125) (end 45.925 49.125) (width 0.25) (layer B.Cu) (net 124))
-  (segment (start 45.074999 48.274999) (end 45 48.2) (width 0.25) (layer B.Cu) (net 124))
-  (segment (start 32.765001 47.6) (end 44.4 47.6) (width 0.25) (layer B.Cu) (net 124))
-  (segment (start 30.165001 45) (end 32.765001 47.6) (width 0.25) (layer B.Cu) (net 124))
-  (segment (start 45 48.2) (end 44.4 47.6) (width 0.25) (layer B.Cu) (net 124))
-  (segment (start 49 56.625) (end 50 56.625) (width 0.25) (layer B.Cu) (net 125))
-  (segment (start 46.675 54.3) (end 49 56.625) (width 0.25) (layer B.Cu) (net 125))
-  (segment (start 31.8 54.3) (end 46.675 54.3) (width 0.25) (layer B.Cu) (net 125))
-  (segment (start 30 52.5) (end 31.8 54.3) (width 0.25) (layer B.Cu) (net 125))
-  (segment (start 49 64.125) (end 50 64.125) (width 0.25) (layer B.Cu) (net 126))
-  (segment (start 48.375 63.5) (end 49 64.125) (width 0.25) (layer B.Cu) (net 126))
-  (segment (start 33.46 63.5) (end 48.375 63.5) (width 0.25) (layer B.Cu) (net 126))
-  (segment (start 29.96 60) (end 33.46 63.5) (width 0.25) (layer B.Cu) (net 126))
-  (segment (start 49 71.625) (end 50 71.625) (width 0.25) (layer B.Cu) (net 127))
-  (segment (start 47.375 70) (end 49 71.625) (width 0.25) (layer B.Cu) (net 127))
-  (segment (start 32.5 70) (end 47.375 70) (width 0.25) (layer B.Cu) (net 127))
-  (segment (start 30 67.5) (end 32.5 70) (width 0.25) (layer B.Cu) (net 127))
-  (segment (start 31.585 76.625) (end 50 76.625) (width 0.25) (layer B.Cu) (net 128))
-  (segment (start 29.96 75) (end 31.585 76.625) (width 0.25) (layer B.Cu) (net 128))
+  (via (at 31.2 41.4) (size 0.6) (drill 0.4) (layers F.Cu B.Cu) (net 121))
+  (segment (start 30.165001 37.625001) (end 30.165001 40.365001) (width 0.25) (layer F.Cu) (net 121))
+  (segment (start 30.165001 40.365001) (end 30.900001 41.100001) (width 0.25) (layer F.Cu) (net 121))
+  (segment (start 30.900001 41.100001) (end 31.2 41.4) (width 0.25) (layer F.Cu) (net 121))
+  (segment (start 31.425 41.625) (end 31.2 41.4) (width 0.25) (layer B.Cu) (net 121))
+  (segment (start 50 41.625) (end 31.425 41.625) (width 0.25) (layer B.Cu) (net 121))
+  (segment (start 45.925 49.125) (end 45 48.2) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 50 49.125) (end 45.925 49.125) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 45.074999 48.274999) (end 45 48.2) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 32.765001 47.6) (end 44.4 47.6) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 30.165001 45) (end 32.765001 47.6) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 45 48.2) (end 44.4 47.6) (width 0.25) (layer B.Cu) (net 122))
+  (segment (start 49 56.625) (end 50 56.625) (width 0.25) (layer B.Cu) (net 123))
+  (segment (start 46.675 54.3) (end 49 56.625) (width 0.25) (layer B.Cu) (net 123))
+  (segment (start 31.8 54.3) (end 46.675 54.3) (width 0.25) (layer B.Cu) (net 123))
+  (segment (start 30 52.5) (end 31.8 54.3) (width 0.25) (layer B.Cu) (net 123))
+  (segment (start 49 64.125) (end 50 64.125) (width 0.25) (layer B.Cu) (net 124))
+  (segment (start 48.375 63.5) (end 49 64.125) (width 0.25) (layer B.Cu) (net 124))
+  (segment (start 33.46 63.5) (end 48.375 63.5) (width 0.25) (layer B.Cu) (net 124))
+  (segment (start 29.96 60) (end 33.46 63.5) (width 0.25) (layer B.Cu) (net 124))
+  (segment (start 49 71.625) (end 50 71.625) (width 0.25) (layer B.Cu) (net 125))
+  (segment (start 47.375 70) (end 49 71.625) (width 0.25) (layer B.Cu) (net 125))
+  (segment (start 32.5 70) (end 47.375 70) (width 0.25) (layer B.Cu) (net 125))
+  (segment (start 30 67.5) (end 32.5 70) (width 0.25) (layer B.Cu) (net 125))
+  (segment (start 31.585 76.625) (end 50 76.625) (width 0.25) (layer B.Cu) (net 126))
+  (segment (start 29.96 75) (end 31.585 76.625) (width 0.25) (layer B.Cu) (net 126))
 
   (zone (net 2) (net_name /GND) (layer F.Cu) (tstamp 0) (hatch edge 0.508)
     (connect_pads (clearance 0.155))
@@ -5555,90 +5572,94 @@
         (xy 73.394936 58.72) (xy 73.394936 57.72) (xy 73.373399 57.611725) (xy 73.312066 57.519934) (xy 73.220275 57.458601)
         (xy 73.112 57.437064) (xy 71.588 57.437064) (xy 71.479725 57.458601) (xy 71.387934 57.519934) (xy 71.326601 57.611725)
         (xy 71.305064 57.72) (xy 70.4025 57.72) (xy 70.4025 50.182936) (xy 70.5 50.182936) (xy 70.608275 50.161399)
-        (xy 70.700066 50.100066) (xy 70.761399 50.008275) (xy 70.782936 49.9) (xy 70.782936 48.1) (xy 70.761399 47.991725)
-        (xy 70.700066 47.899934) (xy 70.608275 47.838601) (xy 70.5 47.817064) (xy 69.5 47.817064) (xy 69.391725 47.838601)
-        (xy 69.299934 47.899934) (xy 69.238601 47.991725) (xy 69.217064 48.1) (xy 68.782936 48.1) (xy 68.761399 47.991725)
-        (xy 68.700066 47.899934) (xy 68.608275 47.838601) (xy 68.5 47.817064) (xy 67.5 47.817064) (xy 67.391725 47.838601)
-        (xy 67.299934 47.899934) (xy 67.238601 47.991725) (xy 67.217064 48.1) (xy 66.782936 48.1) (xy 66.761399 47.991725)
-        (xy 66.700066 47.899934) (xy 66.608275 47.838601) (xy 66.5 47.817064) (xy 65.5 47.817064) (xy 65.391725 47.838601)
-        (xy 65.299934 47.899934) (xy 65.238601 47.991725) (xy 65.217064 48.1) (xy 64.782936 48.1) (xy 64.761399 47.991725)
-        (xy 64.700066 47.899934) (xy 64.608275 47.838601) (xy 64.5 47.817064) (xy 63.5 47.817064) (xy 63.391725 47.838601)
-        (xy 63.299934 47.899934) (xy 63.238601 47.991725) (xy 63.217064 48.1) (xy 62.782936 48.1) (xy 62.761399 47.991725)
-        (xy 62.700066 47.899934) (xy 62.608275 47.838601) (xy 62.5 47.817064) (xy 61.5 47.817064) (xy 61.391725 47.838601)
-        (xy 61.299934 47.899934) (xy 61.238601 47.991725) (xy 61.217064 48.1) (xy 60.782936 48.1) (xy 60.761399 47.991725)
-        (xy 60.700066 47.899934) (xy 60.608275 47.838601) (xy 60.5 47.817064) (xy 59.5 47.817064) (xy 59.391725 47.838601)
-        (xy 59.299934 47.899934) (xy 59.238601 47.991725) (xy 59.217064 48.1) (xy 58.582936 48.1) (xy 58.582936 47.5)
-        (xy 58.561399 47.391725) (xy 58.500066 47.299934) (xy 58.408275 47.238601) (xy 58.3 47.217064) (xy 56.5 47.217064)
-        (xy 56.391725 47.238601) (xy 56.299934 47.299934) (xy 56.238601 47.391725) (xy 56.231139 47.429238) (xy 56.214872 47.4225)
-        (xy 55.985128 47.4225) (xy 55.772872 47.510419) (xy 55.610419 47.672872) (xy 55.5225 47.885128) (xy 44.282034 47.885128)
-        (xy 44.3775 47.654654) (xy 44.3775 47.345346) (xy 44.259133 47.059582) (xy 44.040418 46.840867) (xy 43.754654 46.7225)
-        (xy 42.45 46.7225) (xy 42.420276 46.728412) (xy 42.389976 46.729069) (xy 42.367687 46.738873) (xy 42.343805 46.743623)
-        (xy 42.318605 46.760461) (xy 42.301313 46.768067) (xy 42.299133 46.765979) (xy 42.276441 46.757151) (xy 42.256195 46.743623)
-        (xy 42.226467 46.73771) (xy 42.198225 46.726723) (xy 42.173883 46.727251) (xy 42.15 46.7225) (xy 41.8025 46.7225)
-        (xy 41.8025 45.7775) (xy 42.15 45.7775) (xy 42.173883 45.772749) (xy 42.198225 45.773277) (xy 42.226467 45.76229)
-        (xy 42.256195 45.756377) (xy 42.276441 45.742849) (xy 42.299133 45.734021) (xy 42.301313 45.731933) (xy 42.318605 45.739539)
-        (xy 42.343805 45.756377) (xy 42.367687 45.761127) (xy 42.389976 45.770931) (xy 42.420276 45.771588) (xy 42.45 45.7775)
-        (xy 43.042878 45.7775) (xy 43.055373 45.834681) (xy 43.416249 45.979564) (xy 43.805099 45.975318) (xy 44.144627 45.834681)
-        (xy 44.183963 45.654674) (xy 43.8775 45.348211) (xy 43.8775 45.206789) (xy 44.254674 45.583963) (xy 44.434681 45.544627)
-        (xy 44.452597 45.5) (xy 56.217064 45.5) (xy 56.217064 46.5) (xy 56.238601 46.608275) (xy 56.299934 46.700066)
-        (xy 56.391725 46.761399) (xy 56.5 46.782936) (xy 58.3 46.782936) (xy 58.408275 46.761399) (xy 58.500066 46.700066)
-        (xy 58.561399 46.608275) (xy 58.582936 46.5) (xy 58.582936 45.5) (xy 71.417064 45.5) (xy 71.417064 46.5)
-        (xy 71.438601 46.608275) (xy 71.499934 46.700066) (xy 71.591725 46.761399) (xy 71.7 46.782936) (xy 73.5 46.782936)
-        (xy 73.608275 46.761399) (xy 73.700066 46.700066) (xy 73.761399 46.608275) (xy 73.782936 46.5) (xy 73.782936 46.4025)
-        (xy 76.2225 46.4025) (xy 76.2225 46.474111) (xy 76.416988 46.943646) (xy 76.776354 47.303012) (xy 77.227782 47.49)
-        (xy 76.902721 47.624645) (xy 76.897048 47.620854) (xy 76.77964 47.5975) (xy 76.779636 47.5975) (xy 76.74 47.589616)
-        (xy 76.700364 47.5975) (xy 73.782936 47.5975) (xy 73.782936 47.5) (xy 73.761399 47.391725) (xy 73.700066 47.299934)
-        (xy 73.608275 47.238601) (xy 73.5 47.217064) (xy 71.7 47.217064) (xy 71.591725 47.238601) (xy 71.499934 47.299934)
-        (xy 71.438601 47.391725) (xy 71.417064 47.5) (xy 71.417064 48.5) (xy 71.438601 48.608275) (xy 71.499934 48.700066)
-        (xy 71.591725 48.761399) (xy 71.7 48.782936) (xy 73.5 48.782936) (xy 73.608275 48.761399) (xy 73.700066 48.700066)
-        (xy 73.761399 48.608275) (xy 73.782936 48.5) (xy 73.782936 48.4025) (xy 76.265325 48.4025) (xy 76.2225 48.505889)
-        (xy 76.2225 49.014111) (xy 76.416988 49.483646) (xy 76.776354 49.843012) (xy 77.245889 50.0375) (xy 77.754111 50.0375)
-        (xy 78.223646 49.843012) (xy 78.583012 49.483646) (xy 78.7775 49.014111) (xy 78.7775 48.505889) (xy 78.583012 48.036354)
-        (xy 78.223646 47.676988) (xy 77.772218 47.49) (xy 78.223646 47.303012) (xy 78.583012 46.943646) (xy 78.7775 46.474111)
-        (xy 78.7775 45.965889) (xy 78.583012 45.496354) (xy 78.223646 45.136988) (xy 77.754111 44.9425) (xy 77.245889 44.9425)
-        (xy 76.776354 45.136988) (xy 76.416988 45.496354) (xy 76.375092 45.5975) (xy 73.782936 45.5975) (xy 73.782936 45.5)
-        (xy 73.761399 45.391725) (xy 73.700066 45.299934) (xy 73.608275 45.238601) (xy 73.5 45.217064) (xy 71.7 45.217064)
-        (xy 71.591725 45.238601) (xy 71.499934 45.299934) (xy 71.438601 45.391725) (xy 71.417064 45.5) (xy 58.582936 45.5)
-        (xy 58.561399 45.391725) (xy 58.500066 45.299934) (xy 58.408275 45.238601) (xy 58.3 45.217064) (xy 56.5 45.217064)
-        (xy 56.391725 45.238601) (xy 56.299934 45.299934) (xy 56.238601 45.391725) (xy 56.217064 45.5) (xy 44.452597 45.5)
-        (xy 44.579564 45.183751) (xy 44.575318 44.794901) (xy 44.434681 44.455373) (xy 44.254674 44.416037) (xy 43.8775 44.793211)
-        (xy 43.8775 44.651789) (xy 44.183963 44.345326) (xy 44.144627 44.165319) (xy 43.783751 44.020436) (xy 43.394901 44.024682)
-        (xy 43.055373 44.165319) (xy 43.042878 44.2225) (xy 42.45 44.2225) (xy 42.420276 44.228412) (xy 42.389976 44.229069)
-        (xy 42.367687 44.238873) (xy 42.343805 44.243623) (xy 42.318605 44.260461) (xy 42.301313 44.268067) (xy 42.299133 44.265979)
-        (xy 42.276441 44.257151) (xy 42.256195 44.243623) (xy 42.226467 44.23771) (xy 42.198225 44.226723) (xy 42.173883 44.227251)
-        (xy 42.15 44.2225) (xy 41.245346 44.2225) (xy 40.959582 44.340867) (xy 40.740867 44.559582) (xy 40.725161 44.5975)
-        (xy 36.203427 44.5975) (xy 36.126247 44.411171) (xy 35.83383 44.118754) (xy 35.45177 43.9605) (xy 35.038232 43.9605)
-        (xy 34.656172 44.118754) (xy 34.363755 44.411171) (xy 34.205501 44.793231) (xy 33.944439 44.793231) (xy 33.944426 44.753071)
-        (xy 33.756012 44.298199) (xy 33.548802 44.22691) (xy 32.775712 45) (xy 32.63429 45) (xy 31.8612 44.22691)
-        (xy 31.65399 44.298199) (xy 31.465426 44.753825) (xy 31.188179 44.753825) (xy 31.046247 44.411171) (xy 30.791275 44.156199)
-        (xy 31.931911 44.156199) (xy 32.705001 44.929289) (xy 33.478091 44.156199) (xy 33.406802 43.948989) (xy 32.951176 43.760425)
-        (xy 32.458072 43.760575) (xy 32.0032 43.948989) (xy 31.931911 44.156199) (xy 30.791275 44.156199) (xy 30.75383 44.118754)
-        (xy 30.37177 43.9605) (xy 29.958232 43.9605) (xy 29.576172 44.118754) (xy 29.283755 44.411171) (xy 29.125501 44.793231)
-        (xy 28.669937 44.793231) (xy 28.669937 44.238) (xy 28.6484 44.129725) (xy 28.587067 44.037934) (xy 28.495276 43.976601)
-        (xy 28.387001 43.955064) (xy 26.863001 43.955064) (xy 26.754726 43.976601) (xy 26.662935 44.037934) (xy 26.601602 44.129725)
-        (xy 26.580065 44.238) (xy 25.2825 44.238) (xy 25.2825 43.5) (xy 56.217064 43.5) (xy 56.217064 44.5)
-        (xy 56.238601 44.608275) (xy 56.299934 44.700066) (xy 56.391725 44.761399) (xy 56.5 44.782936) (xy 58.3 44.782936)
-        (xy 58.408275 44.761399) (xy 58.500066 44.700066) (xy 58.561399 44.608275) (xy 58.582936 44.5) (xy 58.582936 43.5)
-        (xy 71.417064 43.5) (xy 71.417064 44.5) (xy 71.438601 44.608275) (xy 71.499934 44.700066) (xy 71.591725 44.761399)
-        (xy 71.7 44.782936) (xy 73.5 44.782936) (xy 73.608275 44.761399) (xy 73.700066 44.700066) (xy 73.761399 44.608275)
-        (xy 73.782936 44.5) (xy 73.782936 43.5) (xy 73.761399 43.391725) (xy 73.700066 43.299934) (xy 73.608275 43.238601)
-        (xy 73.5 43.217064) (xy 71.7 43.217064) (xy 71.591725 43.238601) (xy 71.499934 43.299934) (xy 71.438601 43.391725)
-        (xy 71.417064 43.5) (xy 58.582936 43.5) (xy 58.561399 43.391725) (xy 58.500066 43.299934) (xy 58.408275 43.238601)
-        (xy 58.3 43.217064) (xy 56.5 43.217064) (xy 56.391725 43.238601) (xy 56.299934 43.299934) (xy 56.238601 43.391725)
-        (xy 56.217064 43.5) (xy 25.2825 43.5) (xy 25.2825 36.863001) (xy 26.580065 36.863001) (xy 26.580065 38.387001)
-        (xy 26.601602 38.495276) (xy 26.662935 38.587067) (xy 26.754726 38.6484) (xy 26.863001 38.669937) (xy 28.387001 38.669937)
-        (xy 28.495276 38.6484) (xy 28.587067 38.587067) (xy 28.6484 38.495276) (xy 28.669937 38.387001) (xy 28.669937 37.418232)
-        (xy 29.125501 37.418232) (xy 29.125501 37.83177) (xy 29.283755 38.21383) (xy 29.576172 38.506247) (xy 29.762501 38.583427)
-        (xy 29.762502 40.32536) (xy 29.754617 40.365001) (xy 29.785855 40.522048) (xy 29.84347 40.608275) (xy 29.874816 40.655187)
-        (xy 29.908421 40.677641) (xy 30.6225 41.391721) (xy 30.6225 41.514872) (xy 30.710419 41.727128) (xy 30.872872 41.889581)
-        (xy 31.085128 41.9775) (xy 31.314872 41.9775) (xy 31.527128 41.889581) (xy 31.689581 41.727128) (xy 31.7775 41.514872)
-        (xy 31.7775 41.5) (xy 56.217064 41.5) (xy 56.217064 42.5) (xy 56.238601 42.608275) (xy 56.299934 42.700066)
-        (xy 56.391725 42.761399) (xy 56.5 42.782936) (xy 58.3 42.782936) (xy 58.408275 42.761399) (xy 58.500066 42.700066)
-        (xy 58.561399 42.608275) (xy 58.582936 42.5) (xy 58.582936 41.5) (xy 71.417064 41.5) (xy 71.417064 42.5)
-        (xy 71.438601 42.608275) (xy 71.499934 42.700066) (xy 71.591725 42.761399) (xy 71.7 42.782936) (xy 73.5 42.782936)
-        (xy 73.608275 42.761399) (xy 73.700066 42.700066) (xy 73.761399 42.608275) (xy 73.782936 42.5) (xy 73.782936 41.5)
-        (xy 73.761399 41.391725) (xy 73.700066 41.299934) (xy 73.608275 41.238601) (xy 73.5 41.217064) (xy 71.7 41.217064)
-        (xy 71.591725 41.238601) (xy 71.499934 41.299934) (xy 71.438601 41.391725) (xy 71.417064 41.5) (xy 58.582936 41.5)
+        (xy 70.700066 50.100066) (xy 70.761399 50.008275) (xy 70.782936 49.9) (xy 70.782936 48.169375) (xy 71.2225 48.169375)
+        (xy 71.2225 48.59498) (xy 71.295195 48.770482) (xy 71.429518 48.904805) (xy 71.605019 48.9775) (xy 72.430625 48.9775)
+        (xy 72.55 48.858125) (xy 72.55 48.05) (xy 72.65 48.05) (xy 72.65 48.858125) (xy 72.769375 48.9775)
+        (xy 73.594981 48.9775) (xy 73.770482 48.904805) (xy 73.904805 48.770482) (xy 73.9775 48.59498) (xy 73.9775 48.169375)
+        (xy 73.858125 48.05) (xy 72.65 48.05) (xy 72.55 48.05) (xy 71.341875 48.05) (xy 71.2225 48.169375)
+        (xy 70.782936 48.169375) (xy 70.782936 48.1) (xy 70.761399 47.991725) (xy 70.700066 47.899934) (xy 70.608275 47.838601)
+        (xy 70.5 47.817064) (xy 69.5 47.817064) (xy 69.391725 47.838601) (xy 69.299934 47.899934) (xy 69.238601 47.991725)
+        (xy 69.217064 48.1) (xy 68.782936 48.1) (xy 68.761399 47.991725) (xy 68.700066 47.899934) (xy 68.608275 47.838601)
+        (xy 68.5 47.817064) (xy 67.5 47.817064) (xy 67.391725 47.838601) (xy 67.299934 47.899934) (xy 67.238601 47.991725)
+        (xy 67.217064 48.1) (xy 66.782936 48.1) (xy 66.761399 47.991725) (xy 66.700066 47.899934) (xy 66.608275 47.838601)
+        (xy 66.5 47.817064) (xy 65.5 47.817064) (xy 65.391725 47.838601) (xy 65.299934 47.899934) (xy 65.238601 47.991725)
+        (xy 65.217064 48.1) (xy 64.782936 48.1) (xy 64.761399 47.991725) (xy 64.700066 47.899934) (xy 64.608275 47.838601)
+        (xy 64.5 47.817064) (xy 63.5 47.817064) (xy 63.391725 47.838601) (xy 63.299934 47.899934) (xy 63.238601 47.991725)
+        (xy 63.217064 48.1) (xy 62.782936 48.1) (xy 62.761399 47.991725) (xy 62.700066 47.899934) (xy 62.608275 47.838601)
+        (xy 62.5 47.817064) (xy 61.5 47.817064) (xy 61.391725 47.838601) (xy 61.299934 47.899934) (xy 61.238601 47.991725)
+        (xy 61.217064 48.1) (xy 60.782936 48.1) (xy 60.761399 47.991725) (xy 60.700066 47.899934) (xy 60.608275 47.838601)
+        (xy 60.5 47.817064) (xy 59.5 47.817064) (xy 59.391725 47.838601) (xy 59.299934 47.899934) (xy 59.238601 47.991725)
+        (xy 59.217064 48.1) (xy 58.582936 48.1) (xy 58.582936 47.5) (xy 58.564044 47.40502) (xy 71.2225 47.40502)
+        (xy 71.2225 47.830625) (xy 71.341875 47.95) (xy 72.55 47.95) (xy 72.55 47.141875) (xy 72.65 47.141875)
+        (xy 72.65 47.95) (xy 73.858125 47.95) (xy 73.9775 47.830625) (xy 73.9775 47.40502) (xy 73.904805 47.229518)
+        (xy 73.770482 47.095195) (xy 73.594981 47.0225) (xy 72.769375 47.0225) (xy 72.65 47.141875) (xy 72.55 47.141875)
+        (xy 72.430625 47.0225) (xy 71.605019 47.0225) (xy 71.429518 47.095195) (xy 71.295195 47.229518) (xy 71.2225 47.40502)
+        (xy 58.564044 47.40502) (xy 58.561399 47.391725) (xy 58.500066 47.299934) (xy 58.408275 47.238601) (xy 58.3 47.217064)
+        (xy 56.5 47.217064) (xy 56.391725 47.238601) (xy 56.299934 47.299934) (xy 56.238601 47.391725) (xy 56.231139 47.429238)
+        (xy 56.214872 47.4225) (xy 55.985128 47.4225) (xy 55.772872 47.510419) (xy 55.610419 47.672872) (xy 55.5225 47.885128)
+        (xy 44.282034 47.885128) (xy 44.3775 47.654654) (xy 44.3775 47.345346) (xy 44.259133 47.059582) (xy 44.040418 46.840867)
+        (xy 43.754654 46.7225) (xy 42.45 46.7225) (xy 42.420276 46.728412) (xy 42.389976 46.729069) (xy 42.367687 46.738873)
+        (xy 42.343805 46.743623) (xy 42.318605 46.760461) (xy 42.301313 46.768067) (xy 42.299133 46.765979) (xy 42.276441 46.757151)
+        (xy 42.256195 46.743623) (xy 42.226467 46.73771) (xy 42.198225 46.726723) (xy 42.173883 46.727251) (xy 42.15 46.7225)
+        (xy 41.8025 46.7225) (xy 41.8025 45.7775) (xy 42.15 45.7775) (xy 42.173883 45.772749) (xy 42.198225 45.773277)
+        (xy 42.226467 45.76229) (xy 42.256195 45.756377) (xy 42.276441 45.742849) (xy 42.299133 45.734021) (xy 42.301313 45.731933)
+        (xy 42.318605 45.739539) (xy 42.343805 45.756377) (xy 42.367687 45.761127) (xy 42.389976 45.770931) (xy 42.420276 45.771588)
+        (xy 42.45 45.7775) (xy 43.042878 45.7775) (xy 43.055373 45.834681) (xy 43.416249 45.979564) (xy 43.805099 45.975318)
+        (xy 44.144627 45.834681) (xy 44.183963 45.654674) (xy 43.8775 45.348211) (xy 43.8775 45.206789) (xy 44.254674 45.583963)
+        (xy 44.434681 45.544627) (xy 44.452597 45.5) (xy 56.217064 45.5) (xy 56.217064 46.5) (xy 56.238601 46.608275)
+        (xy 56.299934 46.700066) (xy 56.391725 46.761399) (xy 56.5 46.782936) (xy 58.3 46.782936) (xy 58.408275 46.761399)
+        (xy 58.500066 46.700066) (xy 58.561399 46.608275) (xy 58.582936 46.5) (xy 58.582936 46.169375) (xy 71.2225 46.169375)
+        (xy 71.2225 46.59498) (xy 71.295195 46.770482) (xy 71.429518 46.904805) (xy 71.605019 46.9775) (xy 72.430625 46.9775)
+        (xy 72.55 46.858125) (xy 72.55 46.05) (xy 72.65 46.05) (xy 72.65 46.858125) (xy 72.769375 46.9775)
+        (xy 73.594981 46.9775) (xy 73.770482 46.904805) (xy 73.904805 46.770482) (xy 73.928457 46.713379) (xy 76.627332 46.713379)
+        (xy 76.715437 46.934923) (xy 77.220954 47.146488) (xy 77.768954 47.148495) (xy 78.276009 46.940639) (xy 78.284563 46.934923)
+        (xy 78.372668 46.713379) (xy 77.5 45.840711) (xy 76.627332 46.713379) (xy 73.928457 46.713379) (xy 73.9775 46.59498)
+        (xy 73.9775 46.169375) (xy 73.858125 46.05) (xy 72.65 46.05) (xy 72.55 46.05) (xy 71.341875 46.05)
+        (xy 71.2225 46.169375) (xy 58.582936 46.169375) (xy 58.582936 46.038954) (xy 76.121505 46.038954) (xy 76.329361 46.546009)
+        (xy 76.335077 46.554563) (xy 76.556621 46.642668) (xy 77.429289 45.77) (xy 77.570711 45.77) (xy 78.443379 46.642668)
+        (xy 78.664923 46.554563) (xy 78.876488 46.049046) (xy 78.878495 45.501046) (xy 78.670639 44.993991) (xy 78.664923 44.985437)
+        (xy 78.443379 44.897332) (xy 77.570711 45.77) (xy 77.429289 45.77) (xy 76.556621 44.897332) (xy 76.335077 44.985437)
+        (xy 76.123512 45.490954) (xy 76.121505 46.038954) (xy 58.582936 46.038954) (xy 58.582936 45.5) (xy 58.564044 45.40502)
+        (xy 71.2225 45.40502) (xy 71.2225 45.830625) (xy 71.341875 45.95) (xy 72.55 45.95) (xy 72.55 45.141875)
+        (xy 72.65 45.141875) (xy 72.65 45.95) (xy 73.858125 45.95) (xy 73.9775 45.830625) (xy 73.9775 45.40502)
+        (xy 73.904805 45.229518) (xy 73.770482 45.095195) (xy 73.594981 45.0225) (xy 72.769375 45.0225) (xy 72.65 45.141875)
+        (xy 72.55 45.141875) (xy 72.430625 45.0225) (xy 71.605019 45.0225) (xy 71.429518 45.095195) (xy 71.295195 45.229518)
+        (xy 71.2225 45.40502) (xy 58.564044 45.40502) (xy 58.561399 45.391725) (xy 58.500066 45.299934) (xy 58.408275 45.238601)
+        (xy 58.3 45.217064) (xy 56.5 45.217064) (xy 56.391725 45.238601) (xy 56.299934 45.299934) (xy 56.238601 45.391725)
+        (xy 56.217064 45.5) (xy 44.452597 45.5) (xy 44.579564 45.183751) (xy 44.575318 44.794901) (xy 44.434681 44.455373)
+        (xy 44.254674 44.416037) (xy 43.8775 44.793211) (xy 43.8775 44.651789) (xy 44.183963 44.345326) (xy 44.144627 44.165319)
+        (xy 43.783751 44.020436) (xy 43.394901 44.024682) (xy 43.055373 44.165319) (xy 43.042878 44.2225) (xy 42.45 44.2225)
+        (xy 42.420276 44.228412) (xy 42.389976 44.229069) (xy 42.367687 44.238873) (xy 42.343805 44.243623) (xy 42.318605 44.260461)
+        (xy 42.301313 44.268067) (xy 42.299133 44.265979) (xy 42.276441 44.257151) (xy 42.256195 44.243623) (xy 42.226467 44.23771)
+        (xy 42.198225 44.226723) (xy 42.173883 44.227251) (xy 42.15 44.2225) (xy 41.245346 44.2225) (xy 40.959582 44.340867)
+        (xy 40.740867 44.559582) (xy 40.725161 44.5975) (xy 36.203427 44.5975) (xy 36.126247 44.411171) (xy 35.83383 44.118754)
+        (xy 35.45177 43.9605) (xy 35.038232 43.9605) (xy 34.656172 44.118754) (xy 34.363755 44.411171) (xy 34.205501 44.793231)
+        (xy 33.944439 44.793231) (xy 33.944426 44.753071) (xy 33.756012 44.298199) (xy 33.548802 44.22691) (xy 32.775712 45)
+        (xy 32.63429 45) (xy 31.8612 44.22691) (xy 31.65399 44.298199) (xy 31.465426 44.753825) (xy 31.188179 44.753825)
+        (xy 31.046247 44.411171) (xy 30.791275 44.156199) (xy 31.931911 44.156199) (xy 32.705001 44.929289) (xy 33.478091 44.156199)
+        (xy 33.406802 43.948989) (xy 32.951176 43.760425) (xy 32.458072 43.760575) (xy 32.0032 43.948989) (xy 31.931911 44.156199)
+        (xy 30.791275 44.156199) (xy 30.75383 44.118754) (xy 30.37177 43.9605) (xy 29.958232 43.9605) (xy 29.576172 44.118754)
+        (xy 29.283755 44.411171) (xy 29.125501 44.793231) (xy 28.669937 44.793231) (xy 28.669937 44.238) (xy 28.6484 44.129725)
+        (xy 28.587067 44.037934) (xy 28.495276 43.976601) (xy 28.387001 43.955064) (xy 26.863001 43.955064) (xy 26.754726 43.976601)
+        (xy 26.662935 44.037934) (xy 26.601602 44.129725) (xy 26.580065 44.238) (xy 25.2825 44.238) (xy 25.2825 43.5)
+        (xy 56.217064 43.5) (xy 56.217064 44.5) (xy 56.238601 44.608275) (xy 56.299934 44.700066) (xy 56.391725 44.761399)
+        (xy 56.5 44.782936) (xy 58.3 44.782936) (xy 58.408275 44.761399) (xy 58.500066 44.700066) (xy 58.561399 44.608275)
+        (xy 58.582936 44.5) (xy 58.582936 43.5) (xy 71.417064 43.5) (xy 71.417064 44.5) (xy 71.438601 44.608275)
+        (xy 71.499934 44.700066) (xy 71.591725 44.761399) (xy 71.7 44.782936) (xy 73.5 44.782936) (xy 73.608275 44.761399)
+        (xy 73.700066 44.700066) (xy 73.761399 44.608275) (xy 73.782936 44.5) (xy 73.782936 43.5) (xy 73.761399 43.391725)
+        (xy 73.700066 43.299934) (xy 73.608275 43.238601) (xy 73.5 43.217064) (xy 71.7 43.217064) (xy 71.591725 43.238601)
+        (xy 71.499934 43.299934) (xy 71.438601 43.391725) (xy 71.417064 43.5) (xy 58.582936 43.5) (xy 58.561399 43.391725)
+        (xy 58.500066 43.299934) (xy 58.408275 43.238601) (xy 58.3 43.217064) (xy 56.5 43.217064) (xy 56.391725 43.238601)
+        (xy 56.299934 43.299934) (xy 56.238601 43.391725) (xy 56.217064 43.5) (xy 25.2825 43.5) (xy 25.2825 36.863001)
+        (xy 26.580065 36.863001) (xy 26.580065 38.387001) (xy 26.601602 38.495276) (xy 26.662935 38.587067) (xy 26.754726 38.6484)
+        (xy 26.863001 38.669937) (xy 28.387001 38.669937) (xy 28.495276 38.6484) (xy 28.587067 38.587067) (xy 28.6484 38.495276)
+        (xy 28.669937 38.387001) (xy 28.669937 37.418232) (xy 29.125501 37.418232) (xy 29.125501 37.83177) (xy 29.283755 38.21383)
+        (xy 29.576172 38.506247) (xy 29.762501 38.583427) (xy 29.762502 40.32536) (xy 29.754617 40.365001) (xy 29.785855 40.522048)
+        (xy 29.84488 40.610385) (xy 29.874816 40.655187) (xy 29.908421 40.677641) (xy 30.6225 41.391721) (xy 30.6225 41.514872)
+        (xy 30.710419 41.727128) (xy 30.872872 41.889581) (xy 31.085128 41.9775) (xy 31.314872 41.9775) (xy 31.527128 41.889581)
+        (xy 31.689581 41.727128) (xy 31.7775 41.514872) (xy 31.7775 41.5) (xy 56.217064 41.5) (xy 56.217064 42.5)
+        (xy 56.238601 42.608275) (xy 56.299934 42.700066) (xy 56.391725 42.761399) (xy 56.5 42.782936) (xy 58.3 42.782936)
+        (xy 58.408275 42.761399) (xy 58.500066 42.700066) (xy 58.561399 42.608275) (xy 58.582936 42.5) (xy 58.582936 41.5)
         (xy 58.561399 41.391725) (xy 58.500066 41.299934) (xy 58.408275 41.238601) (xy 58.3 41.217064) (xy 56.5 41.217064)
         (xy 56.391725 41.238601) (xy 56.299934 41.299934) (xy 56.238601 41.391725) (xy 56.217064 41.5) (xy 31.7775 41.5)
         (xy 31.7775 41.285128) (xy 31.689581 41.072872) (xy 31.527128 40.910419) (xy 31.314872 40.8225) (xy 31.191721 40.8225)
@@ -5661,46 +5682,56 @@
         (xy 44.199551 39.5) (xy 56.217064 39.5) (xy 56.217064 40.5) (xy 56.238601 40.608275) (xy 56.299934 40.700066)
         (xy 56.391725 40.761399) (xy 56.5 40.782936) (xy 58.3 40.782936) (xy 58.408275 40.761399) (xy 58.500066 40.700066)
         (xy 58.561399 40.608275) (xy 58.582936 40.5) (xy 58.582936 39.785128) (xy 69.3225 39.785128) (xy 69.3225 40.014872)
-        (xy 69.410419 40.227128) (xy 69.572872 40.389581) (xy 69.785128 40.4775) (xy 70.014872 40.4775) (xy 70.195939 40.4025)
-        (xy 71.417064 40.4025) (xy 71.417064 40.5) (xy 71.438601 40.608275) (xy 71.499934 40.700066) (xy 71.591725 40.761399)
+        (xy 69.410419 40.227128) (xy 69.572872 40.389581) (xy 69.785128 40.4775) (xy 69.908279 40.4775) (xy 69.943418 40.512639)
+        (xy 69.943421 40.512641) (xy 71.417064 41.986285) (xy 71.417064 42.5) (xy 71.438601 42.608275) (xy 71.499934 42.700066)
+        (xy 71.591725 42.761399) (xy 71.7 42.782936) (xy 73.5 42.782936) (xy 73.608275 42.761399) (xy 73.700066 42.700066)
+        (xy 73.761399 42.608275) (xy 73.782936 42.5) (xy 73.782936 42.4025) (xy 74.83328 42.4025) (xy 75.917359 43.48658)
+        (xy 75.939814 43.520186) (xy 76.072952 43.609146) (xy 76.19036 43.6325) (xy 76.23 43.640385) (xy 76.26964 43.6325)
+        (xy 76.317064 43.6325) (xy 76.317064 44.13) (xy 76.338601 44.238275) (xy 76.399934 44.330066) (xy 76.491725 44.391399)
+        (xy 76.6 44.412936) (xy 77.178766 44.412936) (xy 76.723991 44.599361) (xy 76.715437 44.605077) (xy 76.627332 44.826621)
+        (xy 77.5 45.699289) (xy 78.372668 44.826621) (xy 78.284563 44.605077) (xy 77.825458 44.412936) (xy 78.4 44.412936)
+        (xy 78.508275 44.391399) (xy 78.600066 44.330066) (xy 78.661399 44.238275) (xy 78.682936 44.13) (xy 78.682936 42.33)
+        (xy 78.661399 42.221725) (xy 78.600066 42.129934) (xy 78.508275 42.068601) (xy 78.4 42.047064) (xy 76.6 42.047064)
+        (xy 76.491725 42.068601) (xy 76.399934 42.129934) (xy 76.338601 42.221725) (xy 76.317064 42.33) (xy 76.317064 42.747843)
+        (xy 75.312642 41.743422) (xy 75.290186 41.709814) (xy 75.157048 41.620854) (xy 75.03964 41.5975) (xy 75.039636 41.5975)
+        (xy 75 41.589616) (xy 74.960364 41.5975) (xy 73.782936 41.5975) (xy 73.782936 41.5) (xy 73.761399 41.391725)
+        (xy 73.700066 41.299934) (xy 73.608275 41.238601) (xy 73.5 41.217064) (xy 71.786285 41.217064) (xy 70.51264 39.94342)
+        (xy 70.512639 39.943418) (xy 70.4775 39.908279) (xy 70.4775 39.785128) (xy 70.389581 39.572872) (xy 70.316709 39.5)
+        (xy 71.417064 39.5) (xy 71.417064 40.5) (xy 71.438601 40.608275) (xy 71.499934 40.700066) (xy 71.591725 40.761399)
         (xy 71.7 40.782936) (xy 73.5 40.782936) (xy 73.608275 40.761399) (xy 73.700066 40.700066) (xy 73.761399 40.608275)
-        (xy 73.782936 40.5) (xy 73.782936 40.4025) (xy 76.317064 40.4025) (xy 76.317064 40.94) (xy 76.338601 41.048275)
-        (xy 76.399934 41.140066) (xy 76.491725 41.201399) (xy 76.6 41.222936) (xy 78.4 41.222936) (xy 78.508275 41.201399)
-        (xy 78.600066 41.140066) (xy 78.661399 41.048275) (xy 78.682936 40.94) (xy 78.682936 39.14) (xy 78.661399 39.031725)
-        (xy 78.600066 38.939934) (xy 78.508275 38.878601) (xy 78.4 38.857064) (xy 77.821234 38.857064) (xy 78.276009 38.670639)
-        (xy 78.284563 38.664923) (xy 78.372668 38.443379) (xy 77.5 37.570711) (xy 76.627332 38.443379) (xy 76.715437 38.664923)
-        (xy 77.174542 38.857064) (xy 76.6 38.857064) (xy 76.491725 38.878601) (xy 76.399934 38.939934) (xy 76.338601 39.031725)
-        (xy 76.317064 39.14) (xy 76.317064 39.5975) (xy 73.782936 39.5975) (xy 73.782936 39.5) (xy 73.761399 39.391725)
-        (xy 73.700066 39.299934) (xy 73.608275 39.238601) (xy 73.5 39.217064) (xy 71.7 39.217064) (xy 71.591725 39.238601)
-        (xy 71.499934 39.299934) (xy 71.438601 39.391725) (xy 71.417064 39.5) (xy 71.417064 39.5975) (xy 70.399782 39.5975)
-        (xy 70.389581 39.572872) (xy 70.227128 39.410419) (xy 70.014872 39.3225) (xy 69.785128 39.3225) (xy 69.572872 39.410419)
-        (xy 69.410419 39.572872) (xy 69.3225 39.785128) (xy 58.582936 39.785128) (xy 58.582936 39.5) (xy 58.561399 39.391725)
-        (xy 58.500066 39.299934) (xy 58.408275 39.238601) (xy 58.3 39.217064) (xy 56.5 39.217064) (xy 56.391725 39.238601)
-        (xy 56.299934 39.299934) (xy 56.238601 39.391725) (xy 56.217064 39.5) (xy 44.199551 39.5) (xy 44.040418 39.340867)
-        (xy 43.754654 39.2225) (xy 42.45 39.2225) (xy 42.420276 39.228412) (xy 42.389976 39.229069) (xy 42.367687 39.238873)
-        (xy 42.343805 39.243623) (xy 42.318605 39.260461) (xy 42.301313 39.268067) (xy 42.299133 39.265979) (xy 42.276441 39.257151)
-        (xy 42.256195 39.243623) (xy 42.226467 39.23771) (xy 42.198225 39.226723) (xy 42.173883 39.227251) (xy 42.15 39.2225)
-        (xy 41.8025 39.2225) (xy 41.8025 38.2775) (xy 42.15 38.2775) (xy 42.173883 38.272749) (xy 42.198225 38.273277)
-        (xy 42.226467 38.26229) (xy 42.256195 38.256377) (xy 42.276441 38.242849) (xy 42.299133 38.234021) (xy 42.301313 38.231933)
-        (xy 42.318605 38.239539) (xy 42.343805 38.256377) (xy 42.367687 38.261127) (xy 42.389976 38.270931) (xy 42.420276 38.271588)
-        (xy 42.45 38.2775) (xy 43.042878 38.2775) (xy 43.055373 38.334681) (xy 43.416249 38.479564) (xy 43.805099 38.475318)
-        (xy 44.144627 38.334681) (xy 44.183963 38.154674) (xy 43.8775 37.848211) (xy 43.8775 37.706789) (xy 44.254674 38.083963)
-        (xy 44.434681 38.044627) (xy 44.579564 37.683751) (xy 44.577558 37.5) (xy 56.217064 37.5) (xy 56.217064 38.5)
-        (xy 56.238601 38.608275) (xy 56.299934 38.700066) (xy 56.391725 38.761399) (xy 56.5 38.782936) (xy 58.3 38.782936)
-        (xy 58.408275 38.761399) (xy 58.500066 38.700066) (xy 58.561399 38.608275) (xy 58.582936 38.5) (xy 58.582936 38.4025)
-        (xy 58.600218 38.4025) (xy 58.610419 38.427128) (xy 58.772872 38.589581) (xy 58.985128 38.6775) (xy 59.214872 38.6775)
-        (xy 59.427128 38.589581) (xy 59.589581 38.427128) (xy 59.6775 38.214872) (xy 59.6775 37.985128) (xy 59.636079 37.885128)
-        (xy 69.7225 37.885128) (xy 69.7225 38.114872) (xy 69.810419 38.327128) (xy 69.972872 38.489581) (xy 70.185128 38.5775)
-        (xy 70.414872 38.5775) (xy 70.627128 38.489581) (xy 70.714209 38.4025) (xy 71.417064 38.4025) (xy 71.417064 38.5)
-        (xy 71.438601 38.608275) (xy 71.499934 38.700066) (xy 71.591725 38.761399) (xy 71.7 38.782936) (xy 73.5 38.782936)
-        (xy 73.608275 38.761399) (xy 73.700066 38.700066) (xy 73.761399 38.608275) (xy 73.782936 38.5) (xy 73.782936 37.768954)
-        (xy 76.121505 37.768954) (xy 76.329361 38.276009) (xy 76.335077 38.284563) (xy 76.556621 38.372668) (xy 77.429289 37.5)
-        (xy 77.570711 37.5) (xy 78.443379 38.372668) (xy 78.664923 38.284563) (xy 78.876488 37.779046) (xy 78.878495 37.231046)
-        (xy 78.670639 36.723991) (xy 78.664923 36.715437) (xy 78.443379 36.627332) (xy 77.570711 37.5) (xy 77.429289 37.5)
-        (xy 76.556621 36.627332) (xy 76.335077 36.715437) (xy 76.123512 37.220954) (xy 76.121505 37.768954) (xy 73.782936 37.768954)
-        (xy 73.782936 37.5) (xy 73.761399 37.391725) (xy 73.700066 37.299934) (xy 73.608275 37.238601) (xy 73.5 37.217064)
-        (xy 71.7 37.217064) (xy 71.591725 37.238601) (xy 71.499934 37.299934) (xy 71.438601 37.391725) (xy 71.417064 37.5)
-        (xy 71.417064 37.5975) (xy 70.714209 37.5975) (xy 70.627128 37.510419) (xy 70.414872 37.4225) (xy 70.185128 37.4225)
+        (xy 73.782936 40.5) (xy 73.782936 39.755526) (xy 75.955185 39.755526) (xy 76.055472 39.987459) (xy 76.59714 40.215689)
+        (xy 77.184915 40.219258) (xy 77.729315 39.997624) (xy 77.744528 39.987459) (xy 77.844815 39.755526) (xy 76.9 38.810711)
+        (xy 75.955185 39.755526) (xy 73.782936 39.755526) (xy 73.782936 39.5) (xy 73.761399 39.391725) (xy 73.700066 39.299934)
+        (xy 73.608275 39.238601) (xy 73.5 39.217064) (xy 71.7 39.217064) (xy 71.591725 39.238601) (xy 71.499934 39.299934)
+        (xy 71.438601 39.391725) (xy 71.417064 39.5) (xy 70.316709 39.5) (xy 70.227128 39.410419) (xy 70.014872 39.3225)
+        (xy 69.785128 39.3225) (xy 69.572872 39.410419) (xy 69.410419 39.572872) (xy 69.3225 39.785128) (xy 58.582936 39.785128)
+        (xy 58.582936 39.5) (xy 58.561399 39.391725) (xy 58.500066 39.299934) (xy 58.408275 39.238601) (xy 58.3 39.217064)
+        (xy 56.5 39.217064) (xy 56.391725 39.238601) (xy 56.299934 39.299934) (xy 56.238601 39.391725) (xy 56.217064 39.5)
+        (xy 44.199551 39.5) (xy 44.040418 39.340867) (xy 43.754654 39.2225) (xy 42.45 39.2225) (xy 42.420276 39.228412)
+        (xy 42.389976 39.229069) (xy 42.367687 39.238873) (xy 42.343805 39.243623) (xy 42.318605 39.260461) (xy 42.301313 39.268067)
+        (xy 42.299133 39.265979) (xy 42.276441 39.257151) (xy 42.256195 39.243623) (xy 42.226467 39.23771) (xy 42.198225 39.226723)
+        (xy 42.173883 39.227251) (xy 42.15 39.2225) (xy 41.8025 39.2225) (xy 41.8025 39.024915) (xy 75.420742 39.024915)
+        (xy 75.642376 39.569315) (xy 75.652541 39.584528) (xy 75.884474 39.684815) (xy 76.829289 38.74) (xy 76.970711 38.74)
+        (xy 77.915526 39.684815) (xy 78.147459 39.584528) (xy 78.375689 39.04286) (xy 78.379258 38.455085) (xy 78.157624 37.910685)
+        (xy 78.147459 37.895472) (xy 77.915526 37.795185) (xy 76.970711 38.74) (xy 76.829289 38.74) (xy 75.884474 37.795185)
+        (xy 75.652541 37.895472) (xy 75.424311 38.43714) (xy 75.420742 39.024915) (xy 41.8025 39.024915) (xy 41.8025 38.2775)
+        (xy 42.15 38.2775) (xy 42.173883 38.272749) (xy 42.198225 38.273277) (xy 42.226467 38.26229) (xy 42.256195 38.256377)
+        (xy 42.276441 38.242849) (xy 42.299133 38.234021) (xy 42.301313 38.231933) (xy 42.318605 38.239539) (xy 42.343805 38.256377)
+        (xy 42.367687 38.261127) (xy 42.389976 38.270931) (xy 42.420276 38.271588) (xy 42.45 38.2775) (xy 43.042878 38.2775)
+        (xy 43.055373 38.334681) (xy 43.416249 38.479564) (xy 43.805099 38.475318) (xy 44.144627 38.334681) (xy 44.183963 38.154674)
+        (xy 43.8775 37.848211) (xy 43.8775 37.706789) (xy 44.254674 38.083963) (xy 44.434681 38.044627) (xy 44.579564 37.683751)
+        (xy 44.577558 37.5) (xy 56.217064 37.5) (xy 56.217064 38.5) (xy 56.238601 38.608275) (xy 56.299934 38.700066)
+        (xy 56.391725 38.761399) (xy 56.5 38.782936) (xy 58.3 38.782936) (xy 58.408275 38.761399) (xy 58.500066 38.700066)
+        (xy 58.561399 38.608275) (xy 58.582936 38.5) (xy 58.582936 38.4025) (xy 58.600218 38.4025) (xy 58.610419 38.427128)
+        (xy 58.772872 38.589581) (xy 58.985128 38.6775) (xy 59.214872 38.6775) (xy 59.427128 38.589581) (xy 59.589581 38.427128)
+        (xy 59.6775 38.214872) (xy 59.6775 37.985128) (xy 59.636079 37.885128) (xy 69.7225 37.885128) (xy 69.7225 38.114872)
+        (xy 69.810419 38.327128) (xy 69.972872 38.489581) (xy 70.185128 38.5775) (xy 70.414872 38.5775) (xy 70.627128 38.489581)
+        (xy 70.789581 38.327128) (xy 70.8775 38.114872) (xy 70.8775 37.885128) (xy 70.789581 37.672872) (xy 70.627128 37.510419)
+        (xy 70.601975 37.5) (xy 71.417064 37.5) (xy 71.417064 38.5) (xy 71.438601 38.608275) (xy 71.499934 38.700066)
+        (xy 71.591725 38.761399) (xy 71.7 38.782936) (xy 73.5 38.782936) (xy 73.608275 38.761399) (xy 73.700066 38.700066)
+        (xy 73.761399 38.608275) (xy 73.782936 38.5) (xy 73.782936 37.5) (xy 73.761399 37.391725) (xy 73.700066 37.299934)
+        (xy 73.608275 37.238601) (xy 73.5 37.217064) (xy 71.7 37.217064) (xy 71.591725 37.238601) (xy 71.499934 37.299934)
+        (xy 71.438601 37.391725) (xy 71.417064 37.5) (xy 70.601975 37.5) (xy 70.414872 37.4225) (xy 70.185128 37.4225)
         (xy 69.972872 37.510419) (xy 69.810419 37.672872) (xy 69.7225 37.885128) (xy 59.636079 37.885128) (xy 59.589581 37.772872)
         (xy 59.427128 37.610419) (xy 59.214872 37.5225) (xy 58.985128 37.5225) (xy 58.804061 37.5975) (xy 58.582936 37.5975)
         (xy 58.582936 37.5) (xy 58.561399 37.391725) (xy 58.500066 37.299934) (xy 58.408275 37.238601) (xy 58.3 37.217064)
@@ -5722,36 +5753,32 @@
         (xy 28.387001 36.580065) (xy 26.863001 36.580065) (xy 26.754726 36.601602) (xy 26.662935 36.662935) (xy 26.601602 36.754726)
         (xy 26.580065 36.863001) (xy 25.2825 36.863001) (xy 25.2825 35.5) (xy 56.217064 35.5) (xy 56.217064 36.5)
         (xy 56.238601 36.608275) (xy 56.299934 36.700066) (xy 56.391725 36.761399) (xy 56.5 36.782936) (xy 58.3 36.782936)
-        (xy 58.408275 36.761399) (xy 58.500066 36.700066) (xy 58.561399 36.608275) (xy 58.582936 36.5) (xy 58.582936 36.169375)
-        (xy 71.2225 36.169375) (xy 71.2225 36.59498) (xy 71.295195 36.770482) (xy 71.429518 36.904805) (xy 71.605019 36.9775)
-        (xy 72.430625 36.9775) (xy 72.55 36.858125) (xy 72.55 36.05) (xy 72.65 36.05) (xy 72.65 36.858125)
-        (xy 72.769375 36.9775) (xy 73.594981 36.9775) (xy 73.770482 36.904805) (xy 73.904805 36.770482) (xy 73.9775 36.59498)
-        (xy 73.9775 36.556621) (xy 76.627332 36.556621) (xy 77.5 37.429289) (xy 78.372668 36.556621) (xy 78.284563 36.335077)
-        (xy 77.779046 36.123512) (xy 77.231046 36.121505) (xy 76.723991 36.329361) (xy 76.715437 36.335077) (xy 76.627332 36.556621)
-        (xy 73.9775 36.556621) (xy 73.9775 36.169375) (xy 73.858125 36.05) (xy 72.65 36.05) (xy 72.55 36.05)
-        (xy 71.341875 36.05) (xy 71.2225 36.169375) (xy 58.582936 36.169375) (xy 58.582936 35.5) (xy 58.564044 35.40502)
-        (xy 71.2225 35.40502) (xy 71.2225 35.830625) (xy 71.341875 35.95) (xy 72.55 35.95) (xy 72.55 35.141875)
-        (xy 72.65 35.141875) (xy 72.65 35.95) (xy 73.858125 35.95) (xy 73.9775 35.830625) (xy 73.9775 35.40502)
-        (xy 73.904805 35.229518) (xy 73.770482 35.095195) (xy 73.594981 35.0225) (xy 72.769375 35.0225) (xy 72.65 35.141875)
-        (xy 72.55 35.141875) (xy 72.430625 35.0225) (xy 71.605019 35.0225) (xy 71.429518 35.095195) (xy 71.295195 35.229518)
-        (xy 71.2225 35.40502) (xy 58.564044 35.40502) (xy 58.561399 35.391725) (xy 58.500066 35.299934) (xy 58.408275 35.238601)
-        (xy 58.3 35.217064) (xy 56.5 35.217064) (xy 56.391725 35.238601) (xy 56.299934 35.299934) (xy 56.238601 35.391725)
-        (xy 56.217064 35.5) (xy 25.2825 35.5) (xy 25.2825 33.5) (xy 56.217064 33.5) (xy 56.217064 34.5)
-        (xy 56.238601 34.608275) (xy 56.299934 34.700066) (xy 56.391725 34.761399) (xy 56.5 34.782936) (xy 58.3 34.782936)
-        (xy 58.408275 34.761399) (xy 58.500066 34.700066) (xy 58.561399 34.608275) (xy 58.582439 34.5025) (xy 58.885791 34.5025)
-        (xy 58.972872 34.589581) (xy 59.185128 34.6775) (xy 59.414872 34.6775) (xy 59.627128 34.589581) (xy 59.789581 34.427128)
-        (xy 59.8775 34.214872) (xy 59.8775 34.169375) (xy 71.2225 34.169375) (xy 71.2225 34.59498) (xy 71.295195 34.770482)
-        (xy 71.429518 34.904805) (xy 71.605019 34.9775) (xy 72.430625 34.9775) (xy 72.55 34.858125) (xy 72.55 34.05)
-        (xy 72.65 34.05) (xy 72.65 34.858125) (xy 72.769375 34.9775) (xy 73.594981 34.9775) (xy 73.770482 34.904805)
-        (xy 73.904805 34.770482) (xy 73.9775 34.59498) (xy 73.9775 34.169375) (xy 73.858125 34.05) (xy 72.65 34.05)
-        (xy 72.55 34.05) (xy 71.341875 34.05) (xy 71.2225 34.169375) (xy 59.8775 34.169375) (xy 59.8775 33.985128)
+        (xy 58.408275 36.761399) (xy 58.500066 36.700066) (xy 58.561399 36.608275) (xy 58.582936 36.5) (xy 58.582936 35.5)
+        (xy 58.561399 35.391725) (xy 58.500066 35.299934) (xy 58.408275 35.238601) (xy 58.3 35.217064) (xy 56.5 35.217064)
+        (xy 56.391725 35.238601) (xy 56.299934 35.299934) (xy 56.238601 35.391725) (xy 56.217064 35.5) (xy 25.2825 35.5)
+        (xy 25.2825 33.5) (xy 56.217064 33.5) (xy 56.217064 34.5) (xy 56.238601 34.608275) (xy 56.299934 34.700066)
+        (xy 56.391725 34.761399) (xy 56.5 34.782936) (xy 58.3 34.782936) (xy 58.408275 34.761399) (xy 58.500066 34.700066)
+        (xy 58.561399 34.608275) (xy 58.582439 34.5025) (xy 58.885791 34.5025) (xy 58.972872 34.589581) (xy 59.185128 34.6775)
+        (xy 59.414872 34.6775) (xy 59.627128 34.589581) (xy 59.789581 34.427128) (xy 59.8775 34.214872) (xy 59.8775 33.985128)
         (xy 59.789581 33.772872) (xy 59.627128 33.610419) (xy 59.414872 33.5225) (xy 59.185128 33.5225) (xy 58.972872 33.610419)
-        (xy 58.885791 33.6975) (xy 58.582936 33.6975) (xy 58.582936 33.5) (xy 58.564044 33.40502) (xy 71.2225 33.40502)
-        (xy 71.2225 33.830625) (xy 71.341875 33.95) (xy 72.55 33.95) (xy 72.55 33.141875) (xy 72.65 33.141875)
-        (xy 72.65 33.95) (xy 73.858125 33.95) (xy 73.9775 33.830625) (xy 73.9775 33.40502) (xy 73.904805 33.229518)
-        (xy 73.770482 33.095195) (xy 73.594981 33.0225) (xy 72.769375 33.0225) (xy 72.65 33.141875) (xy 72.55 33.141875)
-        (xy 72.430625 33.0225) (xy 71.605019 33.0225) (xy 71.429518 33.095195) (xy 71.295195 33.229518) (xy 71.2225 33.40502)
-        (xy 58.564044 33.40502) (xy 58.561399 33.391725) (xy 58.500066 33.299934) (xy 58.408275 33.238601) (xy 58.3 33.217064)
+        (xy 58.885791 33.6975) (xy 58.582936 33.6975) (xy 58.582936 33.5) (xy 71.417064 33.5) (xy 71.417064 34.5)
+        (xy 71.438601 34.608275) (xy 71.499934 34.700066) (xy 71.591725 34.761399) (xy 71.7 34.782936) (xy 73.5 34.782936)
+        (xy 73.608275 34.761399) (xy 73.700066 34.700066) (xy 73.761399 34.608275) (xy 73.782936 34.5) (xy 73.782936 34.4025)
+        (xy 75.835842 34.4025) (xy 76.176354 34.743012) (xy 76.627782 34.93) (xy 76.176354 35.116988) (xy 75.816988 35.476354)
+        (xy 75.766808 35.5975) (xy 73.782936 35.5975) (xy 73.782936 35.5) (xy 73.761399 35.391725) (xy 73.700066 35.299934)
+        (xy 73.608275 35.238601) (xy 73.5 35.217064) (xy 71.7 35.217064) (xy 71.591725 35.238601) (xy 71.499934 35.299934)
+        (xy 71.438601 35.391725) (xy 71.417064 35.5) (xy 71.417064 36.5) (xy 71.438601 36.608275) (xy 71.499934 36.700066)
+        (xy 71.591725 36.761399) (xy 71.7 36.782936) (xy 73.5 36.782936) (xy 73.608275 36.761399) (xy 73.700066 36.700066)
+        (xy 73.761399 36.608275) (xy 73.782936 36.5) (xy 73.782936 36.4025) (xy 75.6225 36.4025) (xy 75.6225 36.454111)
+        (xy 75.816988 36.923646) (xy 76.176354 37.283012) (xy 76.366709 37.36186) (xy 76.070685 37.482376) (xy 76.055472 37.492541)
+        (xy 75.955185 37.724474) (xy 76.9 38.669289) (xy 77.844815 37.724474) (xy 77.744528 37.492541) (xy 77.433838 37.361633)
+        (xy 77.623646 37.283012) (xy 77.983012 36.923646) (xy 78.1775 36.454111) (xy 78.1775 35.945889) (xy 77.983012 35.476354)
+        (xy 77.623646 35.116988) (xy 77.172218 34.93) (xy 77.623646 34.743012) (xy 77.983012 34.383646) (xy 78.1775 33.914111)
+        (xy 78.1775 33.405889) (xy 77.983012 32.936354) (xy 77.623646 32.576988) (xy 77.154111 32.3825) (xy 76.645889 32.3825)
+        (xy 76.176354 32.576988) (xy 75.816988 32.936354) (xy 75.6225 33.405889) (xy 75.6225 33.5975) (xy 73.782936 33.5975)
+        (xy 73.782936 33.5) (xy 73.761399 33.391725) (xy 73.700066 33.299934) (xy 73.608275 33.238601) (xy 73.5 33.217064)
+        (xy 71.7 33.217064) (xy 71.591725 33.238601) (xy 71.499934 33.299934) (xy 71.438601 33.391725) (xy 71.417064 33.5)
+        (xy 58.582936 33.5) (xy 58.561399 33.391725) (xy 58.500066 33.299934) (xy 58.408275 33.238601) (xy 58.3 33.217064)
         (xy 56.5 33.217064) (xy 56.391725 33.238601) (xy 56.299934 33.299934) (xy 56.238601 33.391725) (xy 56.217064 33.5)
         (xy 25.2825 33.5) (xy 25.2825 29.596705) (xy 27.9725 29.596705) (xy 27.9725 30.403295) (xy 28.281169 31.148486)
         (xy 28.851514 31.718831) (xy 29.596705 32.0275) (xy 30.403295 32.0275) (xy 31.148486 31.718831) (xy 31.718831 31.148486)
@@ -5781,7 +5808,7 @@
         (xy 96.2225 32.614872) (xy 96.310419 32.827128) (xy 96.472872 32.989581) (xy 96.685128 33.0775) (xy 96.914872 33.0775)
         (xy 97.127128 32.989581) (xy 97.2225 32.894209) (xy 97.222501 34.725434) (xy 96.450458 35.497478) (xy 90.496498 35.497478)
         (xy 90.459321 35.490083) (xy 90.422145 35.497478) (xy 90.422144 35.497478) (xy 90.312029 35.519381) (xy 90.18716 35.602816)
-        (xy 90.166101 35.634333) (xy 81.784328 44.016108) (xy 81.752805 44.037171) (xy 81.66937 44.162041) (xy 81.654261 44.238)
+        (xy 90.166101 35.634333) (xy 81.784328 44.016108) (xy 81.752805 44.037171) (xy 81.66937 44.162041) (xy 81.653143 44.243623)
         (xy 81.640072 44.309333) (xy 81.647467 44.346509) (xy 81.647468 72.412624) (xy 81.589581 72.272872) (xy 81.427128 72.110419)
         (xy 81.214872 72.0225) (xy 80.985128 72.0225) (xy 80.772872 72.110419) (xy 80.610419 72.272872) (xy 80.5225 72.485128)
         (xy 80.5225 72.5475) (xy 79.855625 72.5475) (xy 79.808125 72.5) (xy 78.9 72.5) (xy 78.9 72.517064)
@@ -7415,254 +7442,259 @@
         (xy 64.3725 59.755625) (xy 64.491875 59.875) (xy 65.55 59.875) (xy 65.55 59.141875) (xy 65.430625 59.0225)
         (xy 64.75502 59.0225) (xy 64.579518 59.095195) (xy 64.445195 59.229518) (xy 64.3725 59.405019) (xy 57.67424 59.405019)
         (xy 55.9525 57.68328) (xy 55.9525 49.489635) (xy 55.960384 49.449999) (xy 55.9525 49.410363) (xy 55.9525 49.41036)
-        (xy 55.929146 49.292952) (xy 55.840186 49.159814) (xy 55.80658 49.13736) (xy 52.9025 46.23328) (xy 52.9025 45.965889)
-        (xy 76.2225 45.965889) (xy 76.2225 46.474111) (xy 76.416988 46.943646) (xy 76.776354 47.303012) (xy 77.227782 47.49)
-        (xy 76.776354 47.676988) (xy 76.416988 48.036354) (xy 76.2225 48.505889) (xy 76.2225 49.014111) (xy 76.416988 49.483646)
-        (xy 76.776354 49.843012) (xy 77.245889 50.0375) (xy 77.754111 50.0375) (xy 78.223646 49.843012) (xy 78.583012 49.483646)
-        (xy 78.7775 49.014111) (xy 78.7775 48.505889) (xy 78.583012 48.036354) (xy 78.223646 47.676988) (xy 77.772218 47.49)
-        (xy 78.223646 47.303012) (xy 78.583012 46.943646) (xy 78.7775 46.474111) (xy 78.7775 45.965889) (xy 78.583012 45.496354)
-        (xy 78.223646 45.136988) (xy 77.754111 44.9425) (xy 77.245889 44.9425) (xy 76.776354 45.136988) (xy 76.416988 45.496354)
-        (xy 76.2225 45.965889) (xy 52.9025 45.965889) (xy 52.9025 44.082936) (xy 53.25 44.082936) (xy 53.358275 44.061399)
-        (xy 53.450066 44.000066) (xy 53.511399 43.908275) (xy 53.532936 43.8) (xy 53.532936 42.95) (xy 53.511399 42.841725)
-        (xy 53.450066 42.749934) (xy 53.358275 42.688601) (xy 53.25 42.667064) (xy 51.75 42.667064) (xy 51.641725 42.688601)
-        (xy 51.549934 42.749934) (xy 51.488601 42.841725) (xy 51.467064 42.95) (xy 51.467064 42.9725) (xy 51.032936 42.9725)
-        (xy 51.032936 42.95) (xy 51.011399 42.841725) (xy 50.950066 42.749934) (xy 50.858275 42.688601) (xy 50.75 42.667064)
-        (xy 49.25 42.667064) (xy 49.141725 42.688601) (xy 49.049934 42.749934) (xy 48.988601 42.841725) (xy 48.967064 42.95)
-        (xy 28.027501 42.95) (xy 28.027501 41.285128) (xy 30.6225 41.285128) (xy 30.6225 41.514872) (xy 30.710419 41.727128)
-        (xy 30.872872 41.889581) (xy 31.085128 41.9775) (xy 31.228073 41.9775) (xy 31.267952 42.004146) (xy 31.38536 42.0275)
-        (xy 31.385363 42.0275) (xy 31.424999 42.035384) (xy 31.464635 42.0275) (xy 48.967064 42.0275) (xy 48.967064 42.05)
-        (xy 48.988601 42.158275) (xy 49.049934 42.250066) (xy 49.141725 42.311399) (xy 49.25 42.332936) (xy 50.75 42.332936)
-        (xy 50.858275 42.311399) (xy 50.950066 42.250066) (xy 51.011399 42.158275) (xy 51.032936 42.05) (xy 51.032936 41.2)
-        (xy 51.467064 41.2) (xy 51.467064 42.05) (xy 51.488601 42.158275) (xy 51.549934 42.250066) (xy 51.641725 42.311399)
-        (xy 51.75 42.332936) (xy 53.25 42.332936) (xy 53.358275 42.311399) (xy 53.44005 42.256759) (xy 53.572872 42.389581)
-        (xy 53.785128 42.4775) (xy 54.014872 42.4775) (xy 54.227128 42.389581) (xy 54.272334 42.344375) (xy 61.0725 42.344375)
-        (xy 61.0725 42.694981) (xy 61.145195 42.870482) (xy 61.279518 43.004805) (xy 61.45502 43.0775) (xy 62.130625 43.0775)
-        (xy 62.25 42.958125) (xy 62.25 42.225) (xy 62.35 42.225) (xy 62.35 42.958125) (xy 62.469375 43.0775)
-        (xy 63.14498 43.0775) (xy 63.320482 43.004805) (xy 63.454805 42.870482) (xy 63.5275 42.694981) (xy 63.5275 42.344375)
-        (xy 63.5725 42.344375) (xy 63.5725 42.694981) (xy 63.645195 42.870482) (xy 63.779518 43.004805) (xy 63.95502 43.0775)
-        (xy 64.630625 43.0775) (xy 64.75 42.958125) (xy 64.75 42.225) (xy 64.85 42.225) (xy 64.85 42.958125)
-        (xy 64.969375 43.0775) (xy 65.64498 43.0775) (xy 65.820482 43.004805) (xy 65.954805 42.870482) (xy 66.0275 42.694981)
-        (xy 66.0275 42.344375) (xy 65.908125 42.225) (xy 64.85 42.225) (xy 64.75 42.225) (xy 63.691875 42.225)
-        (xy 63.5725 42.344375) (xy 63.5275 42.344375) (xy 63.408125 42.225) (xy 62.35 42.225) (xy 62.25 42.225)
-        (xy 61.191875 42.225) (xy 61.0725 42.344375) (xy 54.272334 42.344375) (xy 54.389581 42.227128) (xy 54.4775 42.014872)
-        (xy 54.4775 41.785128) (xy 54.389581 41.572872) (xy 54.227128 41.410419) (xy 54.014872 41.3225) (xy 53.896757 41.3225)
-        (xy 53.782048 41.245854) (xy 53.66464 41.2225) (xy 53.664636 41.2225) (xy 53.625 41.214616) (xy 53.585364 41.2225)
-        (xy 53.532936 41.2225) (xy 53.532936 41.2) (xy 53.511399 41.091725) (xy 53.450066 40.999934) (xy 53.358275 40.938601)
-        (xy 53.25 40.917064) (xy 51.75 40.917064) (xy 51.641725 40.938601) (xy 51.549934 40.999934) (xy 51.488601 41.091725)
-        (xy 51.467064 41.2) (xy 51.032936 41.2) (xy 51.011399 41.091725) (xy 50.950066 40.999934) (xy 50.858275 40.938601)
-        (xy 50.75 40.917064) (xy 49.25 40.917064) (xy 49.141725 40.938601) (xy 49.049934 40.999934) (xy 48.988601 41.091725)
-        (xy 48.967064 41.2) (xy 48.967064 41.2225) (xy 31.751559 41.2225) (xy 31.689581 41.072872) (xy 31.527128 40.910419)
-        (xy 31.314872 40.8225) (xy 31.085128 40.8225) (xy 30.872872 40.910419) (xy 30.710419 41.072872) (xy 30.6225 41.285128)
-        (xy 28.027501 41.285128) (xy 28.027501 39.608721) (xy 28.875359 40.45658) (xy 28.897814 40.490186) (xy 29.030952 40.579146)
-        (xy 29.14836 40.6025) (xy 29.148363 40.6025) (xy 29.187999 40.610384) (xy 29.227635 40.6025) (xy 44.685791 40.6025)
-        (xy 44.772872 40.689581) (xy 44.985128 40.7775) (xy 45.214872 40.7775) (xy 45.427128 40.689581) (xy 45.514209 40.6025)
-        (xy 53.768279 40.6025) (xy 54.687359 41.521581) (xy 54.709814 41.555187) (xy 54.842952 41.644147) (xy 54.96036 41.667501)
-        (xy 55 41.675386) (xy 55.03964 41.667501) (xy 61.0725 41.667501) (xy 61.0725 42.005625) (xy 61.191875 42.125)
-        (xy 62.25 42.125) (xy 62.25 42.105) (xy 62.35 42.105) (xy 62.35 42.125) (xy 63.408125 42.125)
-        (xy 63.5275 42.005625) (xy 63.5275 41.667501) (xy 63.5725 41.667501) (xy 63.5725 42.005625) (xy 63.691875 42.125)
-        (xy 64.75 42.125) (xy 64.75 42.105) (xy 64.85 42.105) (xy 64.85 42.125) (xy 65.908125 42.125)
-        (xy 66.0275 42.005625) (xy 66.0275 41.985128) (xy 101.2225 41.985128) (xy 101.2225 42.214872) (xy 101.310419 42.427128)
-        (xy 101.472872 42.589581) (xy 101.685128 42.6775) (xy 101.913188 42.6775) (xy 101.928934 42.701066) (xy 102.020725 42.762399)
-        (xy 102.129 42.783936) (xy 103.101 42.783936) (xy 103.209275 42.762399) (xy 103.301066 42.701066) (xy 103.362399 42.609275)
-        (xy 103.383936 42.501) (xy 103.383936 41.699) (xy 103.362399 41.590725) (xy 103.301066 41.498934) (xy 103.209275 41.437601)
-        (xy 103.101 41.416064) (xy 102.129 41.416064) (xy 102.020725 41.437601) (xy 101.928934 41.498934) (xy 101.913188 41.5225)
-        (xy 101.685128 41.5225) (xy 101.472872 41.610419) (xy 101.310419 41.772872) (xy 101.2225 41.985128) (xy 66.0275 41.985128)
-        (xy 66.0275 41.667501) (xy 88.895363 41.667501) (xy 88.934999 41.675385) (xy 88.974635 41.667501) (xy 88.974639 41.667501)
-        (xy 89.092047 41.644147) (xy 89.225185 41.555187) (xy 89.247641 41.521579) (xy 90.02022 40.749) (xy 103.616064 40.749)
-        (xy 103.616064 41.551) (xy 103.637601 41.659275) (xy 103.698934 41.751066) (xy 103.790725 41.812399) (xy 103.899 41.833936)
-        (xy 104.871 41.833936) (xy 104.979275 41.812399) (xy 105.071066 41.751066) (xy 105.132399 41.659275) (xy 105.143692 41.6025)
-        (xy 106.83981 41.6025) (xy 106.813601 41.641725) (xy 106.792064 41.75) (xy 106.792064 43.25) (xy 106.813601 43.358275)
-        (xy 106.874934 43.450066) (xy 106.966725 43.511399) (xy 107.054444 43.528847) (xy 107.010419 43.572872) (xy 106.9225 43.785128)
-        (xy 106.9225 44.014872) (xy 106.923564 44.01744) (xy 106.874934 44.049934) (xy 106.813601 44.141725) (xy 106.792064 44.25)
-        (xy 106.792064 45.75) (xy 106.813601 45.858275) (xy 106.874934 45.950066) (xy 106.966725 46.011399) (xy 107.075 46.032936)
-        (xy 107.925 46.032936) (xy 108.033275 46.011399) (xy 108.125066 45.950066) (xy 108.186399 45.858275) (xy 108.207936 45.75)
-        (xy 108.207936 44.25) (xy 108.186399 44.141725) (xy 108.125066 44.049934) (xy 108.076436 44.01744) (xy 108.0775 44.014872)
-        (xy 108.0775 43.785128) (xy 107.989581 43.572872) (xy 107.945556 43.528847) (xy 108.033275 43.511399) (xy 108.125066 43.450066)
-        (xy 108.186399 43.358275) (xy 108.207936 43.25) (xy 108.207936 41.75) (xy 108.542064 41.75) (xy 108.542064 43.25)
-        (xy 108.563601 43.358275) (xy 108.624934 43.450066) (xy 108.716725 43.511399) (xy 108.825 43.532936) (xy 108.8475 43.532936)
-        (xy 108.847501 43.967064) (xy 108.825 43.967064) (xy 108.716725 43.988601) (xy 108.624934 44.049934) (xy 108.563601 44.141725)
-        (xy 108.542064 44.25) (xy 108.542064 45.75) (xy 108.563601 45.858275) (xy 108.624934 45.950066) (xy 108.716725 46.011399)
-        (xy 108.825 46.032936) (xy 109.675 46.032936) (xy 109.783275 46.011399) (xy 109.875066 45.950066) (xy 109.936399 45.858275)
-        (xy 109.957936 45.75) (xy 109.957936 44.25) (xy 109.936399 44.141725) (xy 109.875066 44.049934) (xy 109.783275 43.988601)
-        (xy 109.675 43.967064) (xy 109.6525 43.967064) (xy 109.6525 43.532936) (xy 109.675 43.532936) (xy 109.783275 43.511399)
-        (xy 109.875066 43.450066) (xy 109.936399 43.358275) (xy 109.957936 43.25) (xy 109.957936 42.9025) (xy 112.53328 42.9025)
-        (xy 113.2875 43.656721) (xy 113.287501 46.541574) (xy 113.101171 46.618754) (xy 112.808754 46.911171) (xy 112.6505 47.293231)
-        (xy 112.6505 47.706769) (xy 112.808754 48.088829) (xy 113.101171 48.381246) (xy 113.483231 48.5395) (xy 113.896769 48.5395)
-        (xy 114.278829 48.381246) (xy 114.571246 48.088829) (xy 114.7295 47.706769) (xy 114.7295 47.293231) (xy 115.1905 47.293231)
-        (xy 115.1905 47.706769) (xy 115.348754 48.088829) (xy 115.641171 48.381246) (xy 116.023231 48.5395) (xy 116.436769 48.5395)
-        (xy 116.818829 48.381246) (xy 117.111246 48.088829) (xy 117.2695 47.706769) (xy 117.2695 47.293231) (xy 117.7305 47.293231)
-        (xy 117.7305 47.706769) (xy 117.888754 48.088829) (xy 118.181171 48.381246) (xy 118.563231 48.5395) (xy 118.976769 48.5395)
-        (xy 119.358829 48.381246) (xy 119.651246 48.088829) (xy 119.8095 47.706769) (xy 119.8095 47.293231) (xy 119.651246 46.911171)
-        (xy 119.478075 46.738) (xy 120.265064 46.738) (xy 120.265064 48.262) (xy 120.286601 48.370275) (xy 120.347934 48.462066)
-        (xy 120.439725 48.523399) (xy 120.548 48.544936) (xy 122.072 48.544936) (xy 122.180275 48.523399) (xy 122.272066 48.462066)
-        (xy 122.333399 48.370275) (xy 122.354936 48.262) (xy 122.354936 46.738) (xy 122.333399 46.629725) (xy 122.272066 46.537934)
-        (xy 122.180275 46.476601) (xy 122.072 46.455064) (xy 120.548 46.455064) (xy 120.439725 46.476601) (xy 120.347934 46.537934)
-        (xy 120.286601 46.629725) (xy 120.265064 46.738) (xy 119.478075 46.738) (xy 119.358829 46.618754) (xy 118.976769 46.4605)
-        (xy 118.563231 46.4605) (xy 118.181171 46.618754) (xy 117.888754 46.911171) (xy 117.7305 47.293231) (xy 117.2695 47.293231)
-        (xy 117.111246 46.911171) (xy 116.818829 46.618754) (xy 116.436769 46.4605) (xy 116.023231 46.4605) (xy 115.641171 46.618754)
-        (xy 115.348754 46.911171) (xy 115.1905 47.293231) (xy 114.7295 47.293231) (xy 114.571246 46.911171) (xy 114.278829 46.618754)
-        (xy 114.0925 46.541574) (xy 114.0925 43.529635) (xy 114.100384 43.489999) (xy 114.0925 43.450361) (xy 114.0925 43.45036)
-        (xy 114.069146 43.332952) (xy 113.980186 43.199814) (xy 113.946581 43.17736) (xy 113.31922 42.55) (xy 113.956581 41.91264)
-        (xy 113.990186 41.890186) (xy 114.079146 41.757048) (xy 114.1025 41.63964) (xy 114.1025 41.639637) (xy 114.110384 41.600001)
-        (xy 114.1025 41.560365) (xy 114.1025 38.454284) (xy 114.278829 38.381246) (xy 114.571246 38.088829) (xy 114.7295 37.706769)
-        (xy 114.7295 37.293231) (xy 115.1905 37.293231) (xy 115.1905 37.706769) (xy 115.348754 38.088829) (xy 115.641171 38.381246)
-        (xy 116.023231 38.5395) (xy 116.436769 38.5395) (xy 116.818829 38.381246) (xy 117.111246 38.088829) (xy 117.2695 37.706769)
-        (xy 117.2695 37.293231) (xy 117.7305 37.293231) (xy 117.7305 37.706769) (xy 117.888754 38.088829) (xy 118.181171 38.381246)
-        (xy 118.563231 38.5395) (xy 118.976769 38.5395) (xy 119.358829 38.381246) (xy 119.651246 38.088829) (xy 119.8095 37.706769)
-        (xy 119.8095 37.293231) (xy 119.651246 36.911171) (xy 119.478075 36.738) (xy 120.265064 36.738) (xy 120.265064 38.262)
-        (xy 120.286601 38.370275) (xy 120.347934 38.462066) (xy 120.439725 38.523399) (xy 120.548 38.544936) (xy 122.072 38.544936)
-        (xy 122.180275 38.523399) (xy 122.272066 38.462066) (xy 122.333399 38.370275) (xy 122.354936 38.262) (xy 122.354936 36.738)
-        (xy 122.333399 36.629725) (xy 122.272066 36.537934) (xy 122.180275 36.476601) (xy 122.072 36.455064) (xy 120.548 36.455064)
-        (xy 120.439725 36.476601) (xy 120.347934 36.537934) (xy 120.286601 36.629725) (xy 120.265064 36.738) (xy 119.478075 36.738)
-        (xy 119.358829 36.618754) (xy 118.976769 36.4605) (xy 118.563231 36.4605) (xy 118.181171 36.618754) (xy 117.888754 36.911171)
-        (xy 117.7305 37.293231) (xy 117.2695 37.293231) (xy 117.111246 36.911171) (xy 116.818829 36.618754) (xy 116.436769 36.4605)
-        (xy 116.023231 36.4605) (xy 115.641171 36.618754) (xy 115.348754 36.911171) (xy 115.1905 37.293231) (xy 114.7295 37.293231)
-        (xy 114.571246 36.911171) (xy 114.278829 36.618754) (xy 113.896769 36.4605) (xy 113.483231 36.4605) (xy 113.101171 36.618754)
-        (xy 112.808754 36.911171) (xy 112.6505 37.293231) (xy 112.6505 37.706769) (xy 112.808754 38.088829) (xy 113.101171 38.381246)
-        (xy 113.297501 38.462568) (xy 113.2975 41.433279) (xy 112.63328 42.0975) (xy 109.957936 42.0975) (xy 109.957936 41.75)
-        (xy 109.936399 41.641725) (xy 109.875066 41.549934) (xy 109.783275 41.488601) (xy 109.675 41.467064) (xy 108.825 41.467064)
-        (xy 108.716725 41.488601) (xy 108.624934 41.549934) (xy 108.563601 41.641725) (xy 108.542064 41.75) (xy 108.207936 41.75)
-        (xy 108.186399 41.641725) (xy 108.125066 41.549934) (xy 108.033275 41.488601) (xy 107.925 41.467064) (xy 107.9025 41.467064)
-        (xy 107.9025 41.23964) (xy 107.910385 41.2) (xy 107.9025 41.16036) (xy 107.9025 41.032936) (xy 107.925 41.032936)
-        (xy 108.033275 41.011399) (xy 108.125066 40.950066) (xy 108.186399 40.858275) (xy 108.207936 40.75) (xy 108.207936 40.304105)
-        (xy 108.385128 40.3775) (xy 108.542064 40.3775) (xy 108.542064 40.75) (xy 108.563601 40.858275) (xy 108.624934 40.950066)
-        (xy 108.716725 41.011399) (xy 108.825 41.032936) (xy 109.675 41.032936) (xy 109.783275 41.011399) (xy 109.875066 40.950066)
-        (xy 109.936399 40.858275) (xy 109.957936 40.75) (xy 109.957936 39.25) (xy 109.936399 39.141725) (xy 109.875066 39.049934)
-        (xy 109.783275 38.988601) (xy 109.675 38.967064) (xy 108.825 38.967064) (xy 108.716725 38.988601) (xy 108.624934 39.049934)
-        (xy 108.563601 39.141725) (xy 108.547534 39.2225) (xy 108.385128 39.2225) (xy 108.207936 39.295895) (xy 108.207936 39.25)
-        (xy 108.186399 39.141725) (xy 108.125066 39.049934) (xy 108.033275 38.988601) (xy 107.925 38.967064) (xy 107.075 38.967064)
-        (xy 106.966725 38.988601) (xy 106.874934 39.049934) (xy 106.813601 39.141725) (xy 106.792064 39.25) (xy 106.792064 40.75)
-        (xy 106.801512 40.7975) (xy 105.153936 40.7975) (xy 105.153936 40.749) (xy 105.132399 40.640725) (xy 105.071066 40.548934)
-        (xy 104.979275 40.487601) (xy 104.871 40.466064) (xy 103.899 40.466064) (xy 103.790725 40.487601) (xy 103.698934 40.548934)
-        (xy 103.637601 40.640725) (xy 103.616064 40.749) (xy 90.02022 40.749) (xy 91.191721 39.5775) (xy 91.314872 39.5775)
-        (xy 91.527128 39.489581) (xy 91.689581 39.327128) (xy 91.7775 39.114872) (xy 91.7775 38.885128) (xy 91.689581 38.672872)
-        (xy 91.527128 38.510419) (xy 91.314872 38.4225) (xy 91.085128 38.4225) (xy 90.872872 38.510419) (xy 90.710419 38.672872)
-        (xy 90.6225 38.885128) (xy 90.6225 39.008279) (xy 88.768279 40.862501) (xy 78.682936 40.862501) (xy 78.682936 39.14)
-        (xy 78.661399 39.031725) (xy 78.600066 38.939934) (xy 78.508275 38.878601) (xy 78.4 38.857064) (xy 76.6 38.857064)
-        (xy 76.491725 38.878601) (xy 76.399934 38.939934) (xy 76.338601 39.031725) (xy 76.317064 39.14) (xy 76.317064 40.862501)
-        (xy 69.058575 40.862501) (xy 69.061399 40.858275) (xy 69.082936 40.75) (xy 69.082936 40.3025) (xy 69.485791 40.3025)
-        (xy 69.572872 40.389581) (xy 69.785128 40.4775) (xy 70.014872 40.4775) (xy 70.227128 40.389581) (xy 70.389581 40.227128)
-        (xy 70.4775 40.014872) (xy 70.4775 39.785128) (xy 70.389581 39.572872) (xy 70.227128 39.410419) (xy 70.014872 39.3225)
-        (xy 69.785128 39.3225) (xy 69.572872 39.410419) (xy 69.485791 39.4975) (xy 69.082936 39.4975) (xy 69.082936 39.25)
-        (xy 69.061399 39.141725) (xy 69.000066 39.049934) (xy 68.908275 38.988601) (xy 68.8 38.967064) (xy 67.95 38.967064)
-        (xy 67.841725 38.988601) (xy 67.749934 39.049934) (xy 67.688601 39.141725) (xy 67.667064 39.25) (xy 67.667064 40.75)
-        (xy 67.688601 40.858275) (xy 67.691425 40.862501) (xy 67.520243 40.862501) (xy 67.5275 40.84498) (xy 67.5275 40.169375)
-        (xy 67.408125 40.05) (xy 66.675 40.05) (xy 66.675 40.07) (xy 66.575 40.07) (xy 66.575 40.05)
-        (xy 66.555 40.05) (xy 66.555 39.95) (xy 66.575 39.95) (xy 66.575 38.891875) (xy 66.675 38.891875)
-        (xy 66.675 39.95) (xy 67.408125 39.95) (xy 67.5275 39.830625) (xy 67.5275 39.15502) (xy 67.454805 38.979518)
-        (xy 67.320482 38.845195) (xy 67.144981 38.7725) (xy 66.794375 38.7725) (xy 66.675 38.891875) (xy 66.575 38.891875)
-        (xy 66.455625 38.7725) (xy 66.105019 38.7725) (xy 65.929518 38.845195) (xy 65.795195 38.979518) (xy 65.7225 39.15502)
-        (xy 65.7225 39.781515) (xy 65.658275 39.738601) (xy 65.55 39.717064) (xy 64.05 39.717064) (xy 63.941725 39.738601)
-        (xy 63.9025 39.76481) (xy 63.9025 39.714209) (xy 63.989581 39.627128) (xy 64.0775 39.414872) (xy 64.0775 39.185128)
-        (xy 63.989581 38.972872) (xy 63.827128 38.810419) (xy 63.626943 38.7275) (xy 63.894981 38.7275) (xy 64.070482 38.654805)
-        (xy 64.204805 38.520482) (xy 64.2775 38.34498) (xy 64.2775 37.669375) (xy 65.7225 37.669375) (xy 65.7225 38.34498)
-        (xy 65.795195 38.520482) (xy 65.929518 38.654805) (xy 66.105019 38.7275) (xy 66.455625 38.7275) (xy 66.575 38.608125)
-        (xy 66.575 37.55) (xy 66.675 37.55) (xy 66.675 38.608125) (xy 66.794375 38.7275) (xy 67.144981 38.7275)
-        (xy 67.320482 38.654805) (xy 67.454805 38.520482) (xy 67.5275 38.34498) (xy 67.5275 37.669375) (xy 67.408125 37.55)
-        (xy 66.675 37.55) (xy 66.575 37.55) (xy 65.841875 37.55) (xy 65.7225 37.669375) (xy 64.2775 37.669375)
-        (xy 64.158125 37.55) (xy 63.425 37.55) (xy 63.425 37.57) (xy 63.325 37.57) (xy 63.325 37.55)
-        (xy 62.591875 37.55) (xy 62.4725 37.669375) (xy 62.4725 38.34498) (xy 62.545195 38.520482) (xy 62.679518 38.654805)
-        (xy 62.855019 38.7275) (xy 63.205625 38.7275) (xy 63.324998 38.608127) (xy 63.324998 38.7275) (xy 63.373057 38.7275)
-        (xy 63.172872 38.810419) (xy 63.010419 38.972872) (xy 62.9225 39.185128) (xy 62.9225 39.414872) (xy 63.010419 39.627128)
-        (xy 63.097501 39.71421) (xy 63.097501 39.726512) (xy 63.05 39.717064) (xy 61.55 39.717064) (xy 61.441725 39.738601)
-        (xy 61.349934 39.799934) (xy 61.288601 39.891725) (xy 61.267064 40) (xy 61.267064 40.85) (xy 61.269551 40.862501)
-        (xy 55.166721 40.862501) (xy 54.247641 39.943422) (xy 54.225185 39.909814) (xy 54.092047 39.820854) (xy 53.974639 39.7975)
-        (xy 53.974635 39.7975) (xy 53.934999 39.789616) (xy 53.895363 39.7975) (xy 45.514209 39.7975) (xy 45.427128 39.710419)
-        (xy 45.214872 39.6225) (xy 44.985128 39.6225) (xy 44.772872 39.710419) (xy 44.685791 39.7975) (xy 29.354721 39.7975)
-        (xy 28.227157 38.669937) (xy 28.387001 38.669937) (xy 28.495276 38.6484) (xy 28.587067 38.587067) (xy 28.6484 38.495276)
-        (xy 28.669937 38.387001) (xy 28.669937 37.418232) (xy 29.125501 37.418232) (xy 29.125501 37.83177) (xy 29.283755 38.21383)
-        (xy 29.576172 38.506247) (xy 29.958232 38.664501) (xy 30.37177 38.664501) (xy 30.75383 38.506247) (xy 31.046247 38.21383)
-        (xy 31.204501 37.83177) (xy 31.204501 37.418232) (xy 31.665501 37.418232) (xy 31.665501 37.83177) (xy 31.823755 38.21383)
-        (xy 32.116172 38.506247) (xy 32.498232 38.664501) (xy 32.91177 38.664501) (xy 33.29383 38.506247) (xy 33.586247 38.21383)
-        (xy 33.744501 37.83177) (xy 33.744501 37.418232) (xy 34.205501 37.418232) (xy 34.205501 37.83177) (xy 34.363755 38.21383)
-        (xy 34.656172 38.506247) (xy 35.038232 38.664501) (xy 35.45177 38.664501) (xy 35.83383 38.506247) (xy 36.126247 38.21383)
-        (xy 36.284501 37.83177) (xy 36.284501 37.418232) (xy 36.270789 37.385128) (xy 43.9225 37.385128) (xy 43.9225 37.614872)
-        (xy 44.010419 37.827128) (xy 44.172872 37.989581) (xy 44.385128 38.0775) (xy 44.614872 38.0775) (xy 44.827128 37.989581)
-        (xy 44.831581 37.985128) (xy 58.5225 37.985128) (xy 58.5225 38.214872) (xy 58.610419 38.427128) (xy 58.772872 38.589581)
-        (xy 58.985128 38.6775) (xy 59.214872 38.6775) (xy 59.427128 38.589581) (xy 59.589581 38.427128) (xy 59.6775 38.214872)
-        (xy 59.6775 38.09172) (xy 59.866721 37.9025) (xy 60.917064 37.9025) (xy 60.917064 38.25) (xy 60.938601 38.358275)
-        (xy 60.999934 38.450066) (xy 61.091725 38.511399) (xy 61.2 38.532936) (xy 62.05 38.532936) (xy 62.158275 38.511399)
-        (xy 62.250066 38.450066) (xy 62.311399 38.358275) (xy 62.332936 38.25) (xy 62.332936 36.75) (xy 62.314044 36.65502)
-        (xy 62.4725 36.65502) (xy 62.4725 37.330625) (xy 62.591875 37.45) (xy 63.325 37.45) (xy 63.325 36.391875)
-        (xy 63.425 36.391875) (xy 63.425 37.45) (xy 64.158125 37.45) (xy 64.2775 37.330625) (xy 64.2775 36.65502)
-        (xy 65.7225 36.65502) (xy 65.7225 37.330625) (xy 65.841875 37.45) (xy 66.575 37.45) (xy 66.575 36.391875)
-        (xy 66.675 36.391875) (xy 66.675 37.45) (xy 67.408125 37.45) (xy 67.5275 37.330625) (xy 67.5275 36.75)
-        (xy 67.667064 36.75) (xy 67.667064 38.25) (xy 67.688601 38.358275) (xy 67.749934 38.450066) (xy 67.841725 38.511399)
-        (xy 67.95 38.532936) (xy 68.8 38.532936) (xy 68.908275 38.511399) (xy 69.000066 38.450066) (xy 69.061399 38.358275)
-        (xy 69.082936 38.25) (xy 69.082936 37.9025) (xy 69.63328 37.9025) (xy 69.7225 37.99172) (xy 69.7225 38.114872)
-        (xy 69.810419 38.327128) (xy 69.972872 38.489581) (xy 70.185128 38.5775) (xy 70.414872 38.5775) (xy 70.627128 38.489581)
-        (xy 70.789581 38.327128) (xy 70.8775 38.114872) (xy 70.8775 37.885128) (xy 70.789581 37.672872) (xy 70.627128 37.510419)
-        (xy 70.414872 37.4225) (xy 70.29172 37.4225) (xy 70.135001 37.265781) (xy 76.3225 37.265781) (xy 76.3225 37.734219)
-        (xy 76.501763 38.167) (xy 76.833 38.498237) (xy 77.265781 38.6775) (xy 77.734219 38.6775) (xy 78.167 38.498237)
-        (xy 78.498237 38.167) (xy 78.6775 37.734219) (xy 78.6775 37.265781) (xy 78.564586 36.993179) (xy 90.130551 36.993179)
-        (xy 90.130551 37.222923) (xy 90.21847 37.435179) (xy 90.380923 37.597632) (xy 90.593179 37.685551) (xy 90.822923 37.685551)
-        (xy 91.035179 37.597632) (xy 91.197632 37.435179) (xy 91.285551 37.222923) (xy 91.285551 37.099771) (xy 95.482823 32.9025)
-        (xy 96.385791 32.9025) (xy 96.472872 32.989581) (xy 96.685128 33.0775) (xy 96.914872 33.0775) (xy 97.127128 32.989581)
-        (xy 97.289581 32.827128) (xy 97.3775 32.614872) (xy 97.3775 32.385128) (xy 97.289581 32.172872) (xy 97.127128 32.010419)
-        (xy 96.914872 31.9225) (xy 96.685128 31.9225) (xy 96.472872 32.010419) (xy 96.385791 32.0975) (xy 95.355737 32.0975)
-        (xy 95.316101 32.089616) (xy 95.276465 32.0975) (xy 95.276462 32.0975) (xy 95.159054 32.120854) (xy 95.025916 32.209814)
-        (xy 95.003462 32.243419) (xy 90.716331 36.530551) (xy 90.593179 36.530551) (xy 90.380923 36.61847) (xy 90.21847 36.780923)
-        (xy 90.130551 36.993179) (xy 78.564586 36.993179) (xy 78.498237 36.833) (xy 78.167 36.501763) (xy 77.734219 36.3225)
-        (xy 77.265781 36.3225) (xy 76.833 36.501763) (xy 76.501763 36.833) (xy 76.3225 37.265781) (xy 70.135001 37.265781)
-        (xy 70.112642 37.243422) (xy 70.090186 37.209814) (xy 69.957048 37.120854) (xy 69.83964 37.0975) (xy 69.839636 37.0975)
-        (xy 69.8 37.089616) (xy 69.760364 37.0975) (xy 69.082936 37.0975) (xy 69.082936 36.75) (xy 69.061399 36.641725)
-        (xy 69.000066 36.549934) (xy 68.908275 36.488601) (xy 68.8 36.467064) (xy 67.95 36.467064) (xy 67.841725 36.488601)
-        (xy 67.749934 36.549934) (xy 67.688601 36.641725) (xy 67.667064 36.75) (xy 67.5275 36.75) (xy 67.5275 36.65502)
-        (xy 67.454805 36.479518) (xy 67.320482 36.345195) (xy 67.144981 36.2725) (xy 66.794375 36.2725) (xy 66.675 36.391875)
-        (xy 66.575 36.391875) (xy 66.455625 36.2725) (xy 66.105019 36.2725) (xy 65.929518 36.345195) (xy 65.795195 36.479518)
-        (xy 65.7225 36.65502) (xy 64.2775 36.65502) (xy 64.204805 36.479518) (xy 64.070482 36.345195) (xy 63.894981 36.2725)
-        (xy 63.544375 36.2725) (xy 63.425 36.391875) (xy 63.325 36.391875) (xy 63.205625 36.2725) (xy 62.855019 36.2725)
-        (xy 62.679518 36.345195) (xy 62.545195 36.479518) (xy 62.4725 36.65502) (xy 62.314044 36.65502) (xy 62.311399 36.641725)
-        (xy 62.250066 36.549934) (xy 62.158275 36.488601) (xy 62.05 36.467064) (xy 61.2 36.467064) (xy 61.091725 36.488601)
-        (xy 60.999934 36.549934) (xy 60.938601 36.641725) (xy 60.917064 36.75) (xy 60.917064 37.0975) (xy 59.739635 37.0975)
-        (xy 59.699999 37.089616) (xy 59.660363 37.0975) (xy 59.66036 37.0975) (xy 59.542952 37.120854) (xy 59.409814 37.209814)
-        (xy 59.387359 37.24342) (xy 59.10828 37.5225) (xy 58.985128 37.5225) (xy 58.772872 37.610419) (xy 58.610419 37.772872)
-        (xy 58.5225 37.985128) (xy 44.831581 37.985128) (xy 44.989581 37.827128) (xy 45.0775 37.614872) (xy 45.0775 37.385128)
-        (xy 44.989581 37.172872) (xy 44.827128 37.010419) (xy 44.614872 36.9225) (xy 44.385128 36.9225) (xy 44.172872 37.010419)
-        (xy 44.010419 37.172872) (xy 43.9225 37.385128) (xy 36.270789 37.385128) (xy 36.126247 37.036172) (xy 35.83383 36.743755)
-        (xy 35.45177 36.585501) (xy 35.038232 36.585501) (xy 34.656172 36.743755) (xy 34.363755 37.036172) (xy 34.205501 37.418232)
-        (xy 33.744501 37.418232) (xy 33.586247 37.036172) (xy 33.29383 36.743755) (xy 32.91177 36.585501) (xy 32.498232 36.585501)
-        (xy 32.116172 36.743755) (xy 31.823755 37.036172) (xy 31.665501 37.418232) (xy 31.204501 37.418232) (xy 31.046247 37.036172)
-        (xy 30.75383 36.743755) (xy 30.37177 36.585501) (xy 29.958232 36.585501) (xy 29.576172 36.743755) (xy 29.283755 37.036172)
-        (xy 29.125501 37.418232) (xy 28.669937 37.418232) (xy 28.669937 36.863001) (xy 28.6484 36.754726) (xy 28.587067 36.662935)
-        (xy 28.495276 36.601602) (xy 28.387001 36.580065) (xy 26.863001 36.580065) (xy 26.754726 36.601602) (xy 26.662935 36.662935)
-        (xy 26.601602 36.754726) (xy 26.580065 36.863001) (xy 26.580065 38.387001) (xy 26.601602 38.495276) (xy 26.662935 38.587067)
-        (xy 26.754726 38.6484) (xy 26.863001 38.669937) (xy 27.221168 38.669937) (xy 27.222501 38.676638) (xy 27.222502 43.955064)
-        (xy 26.863001 43.955064) (xy 26.754726 43.976601) (xy 26.662935 44.037934) (xy 26.601602 44.129725) (xy 26.580065 44.238)
-        (xy 26.580065 45.762) (xy 26.601602 45.870275) (xy 26.662935 45.962066) (xy 26.754726 46.023399) (xy 26.863001 46.044936)
-        (xy 27.057501 46.044936) (xy 27.0575 51.455064) (xy 26.698 51.455064) (xy 26.589725 51.476601) (xy 26.497934 51.537934)
-        (xy 26.436601 51.629725) (xy 26.415064 51.738) (xy 26.415064 53.262) (xy 26.436601 53.370275) (xy 26.497934 53.462066)
-        (xy 26.589725 53.523399) (xy 26.698 53.544936) (xy 27.017501 53.544936) (xy 27.0175 58.955064) (xy 26.658 58.955064)
-        (xy 26.549725 58.976601) (xy 26.457934 59.037934) (xy 26.396601 59.129725) (xy 26.375064 59.238) (xy 26.375064 60.762)
-        (xy 26.396601 60.870275) (xy 26.457934 60.962066) (xy 26.549725 61.023399) (xy 26.658 61.044936) (xy 27.016167 61.044936)
-        (xy 27.040854 61.169047) (xy 27.057501 61.193961) (xy 27.0575 66.455064) (xy 26.698 66.455064) (xy 26.589725 66.476601)
-        (xy 26.497934 66.537934) (xy 26.436601 66.629725) (xy 26.415064 66.738) (xy 26.415064 68.262) (xy 26.436601 68.370275)
-        (xy 26.497934 68.462066) (xy 26.589725 68.523399) (xy 26.698 68.544936) (xy 27.017501 68.544936) (xy 27.0175 73.955064)
-        (xy 26.658 73.955064) (xy 26.549725 73.976601) (xy 26.457934 74.037934) (xy 26.396601 74.129725) (xy 26.375064 74.238)
-        (xy 26.375064 75.762) (xy 26.396601 75.870275) (xy 26.457934 75.962066) (xy 26.549725 76.023399) (xy 26.658 76.044936)
-        (xy 27.016167 76.044936) (xy 27.040854 76.169047) (xy 27.061536 76.2) (xy 27.097501 76.253824) (xy 27.0975 79.292064)
-        (xy 26.75 79.292064) (xy 26.641725 79.313601) (xy 26.549934 79.374934) (xy 26.488601 79.466725) (xy 26.467064 79.575)
-        (xy 26.467064 80.138716) (xy 26.168419 80.437361) (xy 26.134814 80.459815) (xy 26.11236 80.49342) (xy 26.112359 80.493421)
-        (xy 26.045853 80.592954) (xy 26.014615 80.750001) (xy 25.2825 80.750001) (xy 25.2825 33.985128) (xy 58.7225 33.985128)
-        (xy 58.7225 34.214872) (xy 58.810419 34.427128) (xy 58.972872 34.589581) (xy 59.185128 34.6775) (xy 59.30828 34.6775)
-        (xy 59.887359 35.25658) (xy 59.909814 35.290186) (xy 60.042952 35.379146) (xy 60.16036 35.4025) (xy 60.160363 35.4025)
-        (xy 60.199999 35.410384) (xy 60.239635 35.4025) (xy 60.917064 35.4025) (xy 60.917064 35.75) (xy 60.938601 35.858275)
-        (xy 60.999934 35.950066) (xy 61.091725 36.011399) (xy 61.2 36.032936) (xy 62.05 36.032936) (xy 62.158275 36.011399)
-        (xy 62.250066 35.950066) (xy 62.311399 35.858275) (xy 62.332936 35.75) (xy 62.332936 35.169375) (xy 62.4725 35.169375)
-        (xy 62.4725 35.84498) (xy 62.545195 36.020482) (xy 62.679518 36.154805) (xy 62.855019 36.2275) (xy 63.205625 36.2275)
-        (xy 63.325 36.108125) (xy 63.325 35.05) (xy 63.425 35.05) (xy 63.425 36.108125) (xy 63.544375 36.2275)
-        (xy 63.894981 36.2275) (xy 64.070482 36.154805) (xy 64.204805 36.020482) (xy 64.2775 35.84498) (xy 64.2775 35.169375)
-        (xy 64.158125 35.05) (xy 63.425 35.05) (xy 63.325 35.05) (xy 62.591875 35.05) (xy 62.4725 35.169375)
-        (xy 62.332936 35.169375) (xy 62.332936 34.25) (xy 62.314044 34.15502) (xy 62.4725 34.15502) (xy 62.4725 34.830625)
-        (xy 62.591875 34.95) (xy 63.325 34.95) (xy 63.325 33.891875) (xy 63.425 33.891875) (xy 63.425 34.95)
-        (xy 64.158125 34.95) (xy 64.2775 34.830625) (xy 64.2775 34.15502) (xy 64.204805 33.979518) (xy 64.070482 33.845195)
-        (xy 63.894981 33.7725) (xy 63.544375 33.7725) (xy 63.425 33.891875) (xy 63.325 33.891875) (xy 63.205625 33.7725)
-        (xy 62.855019 33.7725) (xy 62.679518 33.845195) (xy 62.545195 33.979518) (xy 62.4725 34.15502) (xy 62.314044 34.15502)
-        (xy 62.311399 34.141725) (xy 62.250066 34.049934) (xy 62.158275 33.988601) (xy 62.05 33.967064) (xy 61.2 33.967064)
-        (xy 61.091725 33.988601) (xy 60.999934 34.049934) (xy 60.938601 34.141725) (xy 60.917064 34.25) (xy 60.917064 34.5975)
-        (xy 60.366721 34.5975) (xy 59.8775 34.10828) (xy 59.8775 33.985128) (xy 59.789581 33.772872) (xy 59.627128 33.610419)
-        (xy 59.414872 33.5225) (xy 59.185128 33.5225) (xy 58.972872 33.610419) (xy 58.810419 33.772872) (xy 58.7225 33.985128)
-        (xy 25.2825 33.985128) (xy 25.2825 29.596705) (xy 27.9725 29.596705) (xy 27.9725 30.403295) (xy 28.281169 31.148486)
+        (xy 55.929146 49.292952) (xy 55.840186 49.159814) (xy 55.80658 49.13736) (xy 52.9025 46.23328) (xy 52.9025 45.535781)
+        (xy 76.3225 45.535781) (xy 76.3225 46.004219) (xy 76.501763 46.437) (xy 76.833 46.768237) (xy 77.265781 46.9475)
+        (xy 77.734219 46.9475) (xy 78.167 46.768237) (xy 78.498237 46.437) (xy 78.6775 46.004219) (xy 78.6775 45.535781)
+        (xy 78.498237 45.103) (xy 78.167 44.771763) (xy 77.734219 44.5925) (xy 77.265781 44.5925) (xy 76.833 44.771763)
+        (xy 76.501763 45.103) (xy 76.3225 45.535781) (xy 52.9025 45.535781) (xy 52.9025 44.082936) (xy 53.25 44.082936)
+        (xy 53.358275 44.061399) (xy 53.450066 44.000066) (xy 53.511399 43.908275) (xy 53.532936 43.8) (xy 53.532936 42.95)
+        (xy 53.511399 42.841725) (xy 53.450066 42.749934) (xy 53.358275 42.688601) (xy 53.25 42.667064) (xy 51.75 42.667064)
+        (xy 51.641725 42.688601) (xy 51.549934 42.749934) (xy 51.488601 42.841725) (xy 51.467064 42.95) (xy 51.467064 42.9725)
+        (xy 51.032936 42.9725) (xy 51.032936 42.95) (xy 51.011399 42.841725) (xy 50.950066 42.749934) (xy 50.858275 42.688601)
+        (xy 50.75 42.667064) (xy 49.25 42.667064) (xy 49.141725 42.688601) (xy 49.049934 42.749934) (xy 48.988601 42.841725)
+        (xy 48.967064 42.95) (xy 28.027501 42.95) (xy 28.027501 41.285128) (xy 30.6225 41.285128) (xy 30.6225 41.514872)
+        (xy 30.710419 41.727128) (xy 30.872872 41.889581) (xy 31.085128 41.9775) (xy 31.228073 41.9775) (xy 31.267952 42.004146)
+        (xy 31.38536 42.0275) (xy 31.385363 42.0275) (xy 31.424999 42.035384) (xy 31.464635 42.0275) (xy 48.967064 42.0275)
+        (xy 48.967064 42.05) (xy 48.988601 42.158275) (xy 49.049934 42.250066) (xy 49.141725 42.311399) (xy 49.25 42.332936)
+        (xy 50.75 42.332936) (xy 50.858275 42.311399) (xy 50.950066 42.250066) (xy 51.011399 42.158275) (xy 51.032936 42.05)
+        (xy 51.032936 41.2) (xy 51.467064 41.2) (xy 51.467064 42.05) (xy 51.488601 42.158275) (xy 51.549934 42.250066)
+        (xy 51.641725 42.311399) (xy 51.75 42.332936) (xy 53.25 42.332936) (xy 53.358275 42.311399) (xy 53.44005 42.256759)
+        (xy 53.572872 42.389581) (xy 53.785128 42.4775) (xy 54.014872 42.4775) (xy 54.227128 42.389581) (xy 54.272334 42.344375)
+        (xy 61.0725 42.344375) (xy 61.0725 42.694981) (xy 61.145195 42.870482) (xy 61.279518 43.004805) (xy 61.45502 43.0775)
+        (xy 62.130625 43.0775) (xy 62.25 42.958125) (xy 62.25 42.225) (xy 62.35 42.225) (xy 62.35 42.958125)
+        (xy 62.469375 43.0775) (xy 63.14498 43.0775) (xy 63.320482 43.004805) (xy 63.454805 42.870482) (xy 63.5275 42.694981)
+        (xy 63.5275 42.344375) (xy 63.5725 42.344375) (xy 63.5725 42.694981) (xy 63.645195 42.870482) (xy 63.779518 43.004805)
+        (xy 63.95502 43.0775) (xy 64.630625 43.0775) (xy 64.75 42.958125) (xy 64.75 42.225) (xy 64.85 42.225)
+        (xy 64.85 42.958125) (xy 64.969375 43.0775) (xy 65.64498 43.0775) (xy 65.820482 43.004805) (xy 65.954805 42.870482)
+        (xy 66.0275 42.694981) (xy 66.0275 42.344375) (xy 66.013125 42.33) (xy 76.317064 42.33) (xy 76.317064 44.13)
+        (xy 76.338601 44.238275) (xy 76.399934 44.330066) (xy 76.491725 44.391399) (xy 76.6 44.412936) (xy 78.4 44.412936)
+        (xy 78.508275 44.391399) (xy 78.600066 44.330066) (xy 78.661399 44.238275) (xy 78.682936 44.13) (xy 78.682936 42.33)
+        (xy 78.661399 42.221725) (xy 78.600066 42.129934) (xy 78.508275 42.068601) (xy 78.4 42.047064) (xy 76.6 42.047064)
+        (xy 76.491725 42.068601) (xy 76.399934 42.129934) (xy 76.338601 42.221725) (xy 76.317064 42.33) (xy 66.013125 42.33)
+        (xy 65.908125 42.225) (xy 64.85 42.225) (xy 64.75 42.225) (xy 63.691875 42.225) (xy 63.5725 42.344375)
+        (xy 63.5275 42.344375) (xy 63.408125 42.225) (xy 62.35 42.225) (xy 62.25 42.225) (xy 61.191875 42.225)
+        (xy 61.0725 42.344375) (xy 54.272334 42.344375) (xy 54.389581 42.227128) (xy 54.4775 42.014872) (xy 54.4775 41.785128)
+        (xy 54.389581 41.572872) (xy 54.227128 41.410419) (xy 54.014872 41.3225) (xy 53.896757 41.3225) (xy 53.782048 41.245854)
+        (xy 53.66464 41.2225) (xy 53.664636 41.2225) (xy 53.625 41.214616) (xy 53.585364 41.2225) (xy 53.532936 41.2225)
+        (xy 53.532936 41.2) (xy 53.511399 41.091725) (xy 53.450066 40.999934) (xy 53.358275 40.938601) (xy 53.25 40.917064)
+        (xy 51.75 40.917064) (xy 51.641725 40.938601) (xy 51.549934 40.999934) (xy 51.488601 41.091725) (xy 51.467064 41.2)
+        (xy 51.032936 41.2) (xy 51.011399 41.091725) (xy 50.950066 40.999934) (xy 50.858275 40.938601) (xy 50.75 40.917064)
+        (xy 49.25 40.917064) (xy 49.141725 40.938601) (xy 49.049934 40.999934) (xy 48.988601 41.091725) (xy 48.967064 41.2)
+        (xy 48.967064 41.2225) (xy 31.751559 41.2225) (xy 31.689581 41.072872) (xy 31.527128 40.910419) (xy 31.314872 40.8225)
+        (xy 31.085128 40.8225) (xy 30.872872 40.910419) (xy 30.710419 41.072872) (xy 30.6225 41.285128) (xy 28.027501 41.285128)
+        (xy 28.027501 39.608721) (xy 28.875359 40.45658) (xy 28.897814 40.490186) (xy 29.030952 40.579146) (xy 29.14836 40.6025)
+        (xy 29.148363 40.6025) (xy 29.187999 40.610384) (xy 29.227635 40.6025) (xy 44.685791 40.6025) (xy 44.772872 40.689581)
+        (xy 44.985128 40.7775) (xy 45.214872 40.7775) (xy 45.427128 40.689581) (xy 45.514209 40.6025) (xy 53.768279 40.6025)
+        (xy 54.687359 41.521581) (xy 54.709814 41.555187) (xy 54.842952 41.644147) (xy 54.96036 41.667501) (xy 55 41.675386)
+        (xy 55.03964 41.667501) (xy 61.0725 41.667501) (xy 61.0725 42.005625) (xy 61.191875 42.125) (xy 62.25 42.125)
+        (xy 62.25 42.105) (xy 62.35 42.105) (xy 62.35 42.125) (xy 63.408125 42.125) (xy 63.5275 42.005625)
+        (xy 63.5275 41.667501) (xy 63.5725 41.667501) (xy 63.5725 42.005625) (xy 63.691875 42.125) (xy 64.75 42.125)
+        (xy 64.75 42.105) (xy 64.85 42.105) (xy 64.85 42.125) (xy 65.908125 42.125) (xy 66.0275 42.005625)
+        (xy 66.0275 41.985128) (xy 101.2225 41.985128) (xy 101.2225 42.214872) (xy 101.310419 42.427128) (xy 101.472872 42.589581)
+        (xy 101.685128 42.6775) (xy 101.913188 42.6775) (xy 101.928934 42.701066) (xy 102.020725 42.762399) (xy 102.129 42.783936)
+        (xy 103.101 42.783936) (xy 103.209275 42.762399) (xy 103.301066 42.701066) (xy 103.362399 42.609275) (xy 103.383936 42.501)
+        (xy 103.383936 41.699) (xy 103.362399 41.590725) (xy 103.301066 41.498934) (xy 103.209275 41.437601) (xy 103.101 41.416064)
+        (xy 102.129 41.416064) (xy 102.020725 41.437601) (xy 101.928934 41.498934) (xy 101.913188 41.5225) (xy 101.685128 41.5225)
+        (xy 101.472872 41.610419) (xy 101.310419 41.772872) (xy 101.2225 41.985128) (xy 66.0275 41.985128) (xy 66.0275 41.667501)
+        (xy 88.895363 41.667501) (xy 88.934999 41.675385) (xy 88.974635 41.667501) (xy 88.974639 41.667501) (xy 89.092047 41.644147)
+        (xy 89.225185 41.555187) (xy 89.247641 41.521579) (xy 90.02022 40.749) (xy 103.616064 40.749) (xy 103.616064 41.551)
+        (xy 103.637601 41.659275) (xy 103.698934 41.751066) (xy 103.790725 41.812399) (xy 103.899 41.833936) (xy 104.871 41.833936)
+        (xy 104.979275 41.812399) (xy 105.071066 41.751066) (xy 105.132399 41.659275) (xy 105.143692 41.6025) (xy 106.83981 41.6025)
+        (xy 106.813601 41.641725) (xy 106.792064 41.75) (xy 106.792064 43.25) (xy 106.813601 43.358275) (xy 106.874934 43.450066)
+        (xy 106.966725 43.511399) (xy 107.054444 43.528847) (xy 107.010419 43.572872) (xy 106.9225 43.785128) (xy 106.9225 44.014872)
+        (xy 106.923564 44.01744) (xy 106.874934 44.049934) (xy 106.813601 44.141725) (xy 106.792064 44.25) (xy 106.792064 45.75)
+        (xy 106.813601 45.858275) (xy 106.874934 45.950066) (xy 106.966725 46.011399) (xy 107.075 46.032936) (xy 107.925 46.032936)
+        (xy 108.033275 46.011399) (xy 108.125066 45.950066) (xy 108.186399 45.858275) (xy 108.207936 45.75) (xy 108.207936 44.25)
+        (xy 108.186399 44.141725) (xy 108.125066 44.049934) (xy 108.076436 44.01744) (xy 108.0775 44.014872) (xy 108.0775 43.785128)
+        (xy 107.989581 43.572872) (xy 107.945556 43.528847) (xy 108.033275 43.511399) (xy 108.125066 43.450066) (xy 108.186399 43.358275)
+        (xy 108.207936 43.25) (xy 108.207936 41.75) (xy 108.542064 41.75) (xy 108.542064 43.25) (xy 108.563601 43.358275)
+        (xy 108.624934 43.450066) (xy 108.716725 43.511399) (xy 108.825 43.532936) (xy 108.8475 43.532936) (xy 108.847501 43.967064)
+        (xy 108.825 43.967064) (xy 108.716725 43.988601) (xy 108.624934 44.049934) (xy 108.563601 44.141725) (xy 108.542064 44.25)
+        (xy 108.542064 45.75) (xy 108.563601 45.858275) (xy 108.624934 45.950066) (xy 108.716725 46.011399) (xy 108.825 46.032936)
+        (xy 109.675 46.032936) (xy 109.783275 46.011399) (xy 109.875066 45.950066) (xy 109.936399 45.858275) (xy 109.957936 45.75)
+        (xy 109.957936 44.25) (xy 109.936399 44.141725) (xy 109.875066 44.049934) (xy 109.783275 43.988601) (xy 109.675 43.967064)
+        (xy 109.6525 43.967064) (xy 109.6525 43.532936) (xy 109.675 43.532936) (xy 109.783275 43.511399) (xy 109.875066 43.450066)
+        (xy 109.936399 43.358275) (xy 109.957936 43.25) (xy 109.957936 42.9025) (xy 112.53328 42.9025) (xy 113.2875 43.656721)
+        (xy 113.287501 46.541574) (xy 113.101171 46.618754) (xy 112.808754 46.911171) (xy 112.6505 47.293231) (xy 112.6505 47.706769)
+        (xy 112.808754 48.088829) (xy 113.101171 48.381246) (xy 113.483231 48.5395) (xy 113.896769 48.5395) (xy 114.278829 48.381246)
+        (xy 114.571246 48.088829) (xy 114.7295 47.706769) (xy 114.7295 47.293231) (xy 115.1905 47.293231) (xy 115.1905 47.706769)
+        (xy 115.348754 48.088829) (xy 115.641171 48.381246) (xy 116.023231 48.5395) (xy 116.436769 48.5395) (xy 116.818829 48.381246)
+        (xy 117.111246 48.088829) (xy 117.2695 47.706769) (xy 117.2695 47.293231) (xy 117.7305 47.293231) (xy 117.7305 47.706769)
+        (xy 117.888754 48.088829) (xy 118.181171 48.381246) (xy 118.563231 48.5395) (xy 118.976769 48.5395) (xy 119.358829 48.381246)
+        (xy 119.651246 48.088829) (xy 119.8095 47.706769) (xy 119.8095 47.293231) (xy 119.651246 46.911171) (xy 119.478075 46.738)
+        (xy 120.265064 46.738) (xy 120.265064 48.262) (xy 120.286601 48.370275) (xy 120.347934 48.462066) (xy 120.439725 48.523399)
+        (xy 120.548 48.544936) (xy 122.072 48.544936) (xy 122.180275 48.523399) (xy 122.272066 48.462066) (xy 122.333399 48.370275)
+        (xy 122.354936 48.262) (xy 122.354936 46.738) (xy 122.333399 46.629725) (xy 122.272066 46.537934) (xy 122.180275 46.476601)
+        (xy 122.072 46.455064) (xy 120.548 46.455064) (xy 120.439725 46.476601) (xy 120.347934 46.537934) (xy 120.286601 46.629725)
+        (xy 120.265064 46.738) (xy 119.478075 46.738) (xy 119.358829 46.618754) (xy 118.976769 46.4605) (xy 118.563231 46.4605)
+        (xy 118.181171 46.618754) (xy 117.888754 46.911171) (xy 117.7305 47.293231) (xy 117.2695 47.293231) (xy 117.111246 46.911171)
+        (xy 116.818829 46.618754) (xy 116.436769 46.4605) (xy 116.023231 46.4605) (xy 115.641171 46.618754) (xy 115.348754 46.911171)
+        (xy 115.1905 47.293231) (xy 114.7295 47.293231) (xy 114.571246 46.911171) (xy 114.278829 46.618754) (xy 114.0925 46.541574)
+        (xy 114.0925 43.529635) (xy 114.100384 43.489999) (xy 114.0925 43.450361) (xy 114.0925 43.45036) (xy 114.069146 43.332952)
+        (xy 113.980186 43.199814) (xy 113.946581 43.17736) (xy 113.31922 42.55) (xy 113.956581 41.91264) (xy 113.990186 41.890186)
+        (xy 114.079146 41.757048) (xy 114.1025 41.63964) (xy 114.1025 41.639637) (xy 114.110384 41.600001) (xy 114.1025 41.560365)
+        (xy 114.1025 38.454284) (xy 114.278829 38.381246) (xy 114.571246 38.088829) (xy 114.7295 37.706769) (xy 114.7295 37.293231)
+        (xy 115.1905 37.293231) (xy 115.1905 37.706769) (xy 115.348754 38.088829) (xy 115.641171 38.381246) (xy 116.023231 38.5395)
+        (xy 116.436769 38.5395) (xy 116.818829 38.381246) (xy 117.111246 38.088829) (xy 117.2695 37.706769) (xy 117.2695 37.293231)
+        (xy 117.7305 37.293231) (xy 117.7305 37.706769) (xy 117.888754 38.088829) (xy 118.181171 38.381246) (xy 118.563231 38.5395)
+        (xy 118.976769 38.5395) (xy 119.358829 38.381246) (xy 119.651246 38.088829) (xy 119.8095 37.706769) (xy 119.8095 37.293231)
+        (xy 119.651246 36.911171) (xy 119.478075 36.738) (xy 120.265064 36.738) (xy 120.265064 38.262) (xy 120.286601 38.370275)
+        (xy 120.347934 38.462066) (xy 120.439725 38.523399) (xy 120.548 38.544936) (xy 122.072 38.544936) (xy 122.180275 38.523399)
+        (xy 122.272066 38.462066) (xy 122.333399 38.370275) (xy 122.354936 38.262) (xy 122.354936 36.738) (xy 122.333399 36.629725)
+        (xy 122.272066 36.537934) (xy 122.180275 36.476601) (xy 122.072 36.455064) (xy 120.548 36.455064) (xy 120.439725 36.476601)
+        (xy 120.347934 36.537934) (xy 120.286601 36.629725) (xy 120.265064 36.738) (xy 119.478075 36.738) (xy 119.358829 36.618754)
+        (xy 118.976769 36.4605) (xy 118.563231 36.4605) (xy 118.181171 36.618754) (xy 117.888754 36.911171) (xy 117.7305 37.293231)
+        (xy 117.2695 37.293231) (xy 117.111246 36.911171) (xy 116.818829 36.618754) (xy 116.436769 36.4605) (xy 116.023231 36.4605)
+        (xy 115.641171 36.618754) (xy 115.348754 36.911171) (xy 115.1905 37.293231) (xy 114.7295 37.293231) (xy 114.571246 36.911171)
+        (xy 114.278829 36.618754) (xy 113.896769 36.4605) (xy 113.483231 36.4605) (xy 113.101171 36.618754) (xy 112.808754 36.911171)
+        (xy 112.6505 37.293231) (xy 112.6505 37.706769) (xy 112.808754 38.088829) (xy 113.101171 38.381246) (xy 113.297501 38.462568)
+        (xy 113.2975 41.433279) (xy 112.63328 42.0975) (xy 109.957936 42.0975) (xy 109.957936 41.75) (xy 109.936399 41.641725)
+        (xy 109.875066 41.549934) (xy 109.783275 41.488601) (xy 109.675 41.467064) (xy 108.825 41.467064) (xy 108.716725 41.488601)
+        (xy 108.624934 41.549934) (xy 108.563601 41.641725) (xy 108.542064 41.75) (xy 108.207936 41.75) (xy 108.186399 41.641725)
+        (xy 108.125066 41.549934) (xy 108.033275 41.488601) (xy 107.925 41.467064) (xy 107.9025 41.467064) (xy 107.9025 41.23964)
+        (xy 107.910385 41.2) (xy 107.9025 41.16036) (xy 107.9025 41.032936) (xy 107.925 41.032936) (xy 108.033275 41.011399)
+        (xy 108.125066 40.950066) (xy 108.186399 40.858275) (xy 108.207936 40.75) (xy 108.207936 40.304105) (xy 108.385128 40.3775)
+        (xy 108.542064 40.3775) (xy 108.542064 40.75) (xy 108.563601 40.858275) (xy 108.624934 40.950066) (xy 108.716725 41.011399)
+        (xy 108.825 41.032936) (xy 109.675 41.032936) (xy 109.783275 41.011399) (xy 109.875066 40.950066) (xy 109.936399 40.858275)
+        (xy 109.957936 40.75) (xy 109.957936 39.25) (xy 109.936399 39.141725) (xy 109.875066 39.049934) (xy 109.783275 38.988601)
+        (xy 109.675 38.967064) (xy 108.825 38.967064) (xy 108.716725 38.988601) (xy 108.624934 39.049934) (xy 108.563601 39.141725)
+        (xy 108.547534 39.2225) (xy 108.385128 39.2225) (xy 108.207936 39.295895) (xy 108.207936 39.25) (xy 108.186399 39.141725)
+        (xy 108.125066 39.049934) (xy 108.033275 38.988601) (xy 107.925 38.967064) (xy 107.075 38.967064) (xy 106.966725 38.988601)
+        (xy 106.874934 39.049934) (xy 106.813601 39.141725) (xy 106.792064 39.25) (xy 106.792064 40.75) (xy 106.801512 40.7975)
+        (xy 105.153936 40.7975) (xy 105.153936 40.749) (xy 105.132399 40.640725) (xy 105.071066 40.548934) (xy 104.979275 40.487601)
+        (xy 104.871 40.466064) (xy 103.899 40.466064) (xy 103.790725 40.487601) (xy 103.698934 40.548934) (xy 103.637601 40.640725)
+        (xy 103.616064 40.749) (xy 90.02022 40.749) (xy 91.191721 39.5775) (xy 91.314872 39.5775) (xy 91.527128 39.489581)
+        (xy 91.689581 39.327128) (xy 91.7775 39.114872) (xy 91.7775 38.885128) (xy 91.689581 38.672872) (xy 91.527128 38.510419)
+        (xy 91.314872 38.4225) (xy 91.085128 38.4225) (xy 90.872872 38.510419) (xy 90.710419 38.672872) (xy 90.6225 38.885128)
+        (xy 90.6225 39.008279) (xy 88.768279 40.862501) (xy 69.058575 40.862501) (xy 69.061399 40.858275) (xy 69.082936 40.75)
+        (xy 69.082936 40.3025) (xy 69.485791 40.3025) (xy 69.572872 40.389581) (xy 69.785128 40.4775) (xy 70.014872 40.4775)
+        (xy 70.227128 40.389581) (xy 70.389581 40.227128) (xy 70.4775 40.014872) (xy 70.4775 39.785128) (xy 70.389581 39.572872)
+        (xy 70.227128 39.410419) (xy 70.014872 39.3225) (xy 69.785128 39.3225) (xy 69.572872 39.410419) (xy 69.485791 39.4975)
+        (xy 69.082936 39.4975) (xy 69.082936 39.25) (xy 69.061399 39.141725) (xy 69.000066 39.049934) (xy 68.908275 38.988601)
+        (xy 68.8 38.967064) (xy 67.95 38.967064) (xy 67.841725 38.988601) (xy 67.749934 39.049934) (xy 67.688601 39.141725)
+        (xy 67.667064 39.25) (xy 67.667064 40.75) (xy 67.688601 40.858275) (xy 67.691425 40.862501) (xy 67.520243 40.862501)
+        (xy 67.5275 40.84498) (xy 67.5275 40.169375) (xy 67.408125 40.05) (xy 66.675 40.05) (xy 66.675 40.07)
+        (xy 66.575 40.07) (xy 66.575 40.05) (xy 66.555 40.05) (xy 66.555 39.95) (xy 66.575 39.95)
+        (xy 66.575 38.891875) (xy 66.675 38.891875) (xy 66.675 39.95) (xy 67.408125 39.95) (xy 67.5275 39.830625)
+        (xy 67.5275 39.15502) (xy 67.454805 38.979518) (xy 67.320482 38.845195) (xy 67.144981 38.7725) (xy 66.794375 38.7725)
+        (xy 66.675 38.891875) (xy 66.575 38.891875) (xy 66.455625 38.7725) (xy 66.105019 38.7725) (xy 65.929518 38.845195)
+        (xy 65.795195 38.979518) (xy 65.7225 39.15502) (xy 65.7225 39.781515) (xy 65.658275 39.738601) (xy 65.55 39.717064)
+        (xy 64.05 39.717064) (xy 63.941725 39.738601) (xy 63.9025 39.76481) (xy 63.9025 39.714209) (xy 63.989581 39.627128)
+        (xy 64.0775 39.414872) (xy 64.0775 39.185128) (xy 63.989581 38.972872) (xy 63.827128 38.810419) (xy 63.626943 38.7275)
+        (xy 63.894981 38.7275) (xy 64.070482 38.654805) (xy 64.204805 38.520482) (xy 64.2775 38.34498) (xy 64.2775 37.669375)
+        (xy 65.7225 37.669375) (xy 65.7225 38.34498) (xy 65.795195 38.520482) (xy 65.929518 38.654805) (xy 66.105019 38.7275)
+        (xy 66.455625 38.7275) (xy 66.575 38.608125) (xy 66.575 37.55) (xy 66.675 37.55) (xy 66.675 38.608125)
+        (xy 66.794375 38.7275) (xy 67.144981 38.7275) (xy 67.320482 38.654805) (xy 67.454805 38.520482) (xy 67.5275 38.34498)
+        (xy 67.5275 37.669375) (xy 67.408125 37.55) (xy 66.675 37.55) (xy 66.575 37.55) (xy 65.841875 37.55)
+        (xy 65.7225 37.669375) (xy 64.2775 37.669375) (xy 64.158125 37.55) (xy 63.425 37.55) (xy 63.425 37.57)
+        (xy 63.325 37.57) (xy 63.325 37.55) (xy 62.591875 37.55) (xy 62.4725 37.669375) (xy 62.4725 38.34498)
+        (xy 62.545195 38.520482) (xy 62.679518 38.654805) (xy 62.855019 38.7275) (xy 63.205625 38.7275) (xy 63.324998 38.608127)
+        (xy 63.324998 38.7275) (xy 63.373057 38.7275) (xy 63.172872 38.810419) (xy 63.010419 38.972872) (xy 62.9225 39.185128)
+        (xy 62.9225 39.414872) (xy 63.010419 39.627128) (xy 63.097501 39.71421) (xy 63.097501 39.726512) (xy 63.05 39.717064)
+        (xy 61.55 39.717064) (xy 61.441725 39.738601) (xy 61.349934 39.799934) (xy 61.288601 39.891725) (xy 61.267064 40)
+        (xy 61.267064 40.85) (xy 61.269551 40.862501) (xy 55.166721 40.862501) (xy 54.247641 39.943422) (xy 54.225185 39.909814)
+        (xy 54.092047 39.820854) (xy 53.974639 39.7975) (xy 53.974635 39.7975) (xy 53.934999 39.789616) (xy 53.895363 39.7975)
+        (xy 45.514209 39.7975) (xy 45.427128 39.710419) (xy 45.214872 39.6225) (xy 44.985128 39.6225) (xy 44.772872 39.710419)
+        (xy 44.685791 39.7975) (xy 29.354721 39.7975) (xy 28.227157 38.669937) (xy 28.387001 38.669937) (xy 28.495276 38.6484)
+        (xy 28.587067 38.587067) (xy 28.6484 38.495276) (xy 28.669937 38.387001) (xy 28.669937 37.418232) (xy 29.125501 37.418232)
+        (xy 29.125501 37.83177) (xy 29.283755 38.21383) (xy 29.576172 38.506247) (xy 29.958232 38.664501) (xy 30.37177 38.664501)
+        (xy 30.75383 38.506247) (xy 31.046247 38.21383) (xy 31.204501 37.83177) (xy 31.204501 37.418232) (xy 31.665501 37.418232)
+        (xy 31.665501 37.83177) (xy 31.823755 38.21383) (xy 32.116172 38.506247) (xy 32.498232 38.664501) (xy 32.91177 38.664501)
+        (xy 33.29383 38.506247) (xy 33.586247 38.21383) (xy 33.744501 37.83177) (xy 33.744501 37.418232) (xy 34.205501 37.418232)
+        (xy 34.205501 37.83177) (xy 34.363755 38.21383) (xy 34.656172 38.506247) (xy 35.038232 38.664501) (xy 35.45177 38.664501)
+        (xy 35.83383 38.506247) (xy 36.126247 38.21383) (xy 36.284501 37.83177) (xy 36.284501 37.418232) (xy 36.270789 37.385128)
+        (xy 43.9225 37.385128) (xy 43.9225 37.614872) (xy 44.010419 37.827128) (xy 44.172872 37.989581) (xy 44.385128 38.0775)
+        (xy 44.614872 38.0775) (xy 44.827128 37.989581) (xy 44.831581 37.985128) (xy 58.5225 37.985128) (xy 58.5225 38.214872)
+        (xy 58.610419 38.427128) (xy 58.772872 38.589581) (xy 58.985128 38.6775) (xy 59.214872 38.6775) (xy 59.427128 38.589581)
+        (xy 59.589581 38.427128) (xy 59.6775 38.214872) (xy 59.6775 38.09172) (xy 59.866721 37.9025) (xy 60.917064 37.9025)
+        (xy 60.917064 38.25) (xy 60.938601 38.358275) (xy 60.999934 38.450066) (xy 61.091725 38.511399) (xy 61.2 38.532936)
+        (xy 62.05 38.532936) (xy 62.158275 38.511399) (xy 62.250066 38.450066) (xy 62.311399 38.358275) (xy 62.332936 38.25)
+        (xy 62.332936 36.75) (xy 62.314044 36.65502) (xy 62.4725 36.65502) (xy 62.4725 37.330625) (xy 62.591875 37.45)
+        (xy 63.325 37.45) (xy 63.325 36.391875) (xy 63.425 36.391875) (xy 63.425 37.45) (xy 64.158125 37.45)
+        (xy 64.2775 37.330625) (xy 64.2775 36.65502) (xy 65.7225 36.65502) (xy 65.7225 37.330625) (xy 65.841875 37.45)
+        (xy 66.575 37.45) (xy 66.575 36.391875) (xy 66.675 36.391875) (xy 66.675 37.45) (xy 67.408125 37.45)
+        (xy 67.5275 37.330625) (xy 67.5275 36.75) (xy 67.667064 36.75) (xy 67.667064 38.25) (xy 67.688601 38.358275)
+        (xy 67.749934 38.450066) (xy 67.841725 38.511399) (xy 67.95 38.532936) (xy 68.8 38.532936) (xy 68.908275 38.511399)
+        (xy 69.000066 38.450066) (xy 69.061399 38.358275) (xy 69.082936 38.25) (xy 69.082936 37.9025) (xy 69.63328 37.9025)
+        (xy 69.7225 37.99172) (xy 69.7225 38.114872) (xy 69.810419 38.327128) (xy 69.972872 38.489581) (xy 70.185128 38.5775)
+        (xy 70.414872 38.5775) (xy 70.627128 38.489581) (xy 70.789581 38.327128) (xy 70.8775 38.114872) (xy 70.8775 37.885128)
+        (xy 70.789581 37.672872) (xy 70.627128 37.510419) (xy 70.414872 37.4225) (xy 70.29172 37.4225) (xy 70.112642 37.243422)
+        (xy 70.090186 37.209814) (xy 69.957048 37.120854) (xy 69.83964 37.0975) (xy 69.839636 37.0975) (xy 69.8 37.089616)
+        (xy 69.760364 37.0975) (xy 69.082936 37.0975) (xy 69.082936 36.75) (xy 69.061399 36.641725) (xy 69.000066 36.549934)
+        (xy 68.908275 36.488601) (xy 68.8 36.467064) (xy 67.95 36.467064) (xy 67.841725 36.488601) (xy 67.749934 36.549934)
+        (xy 67.688601 36.641725) (xy 67.667064 36.75) (xy 67.5275 36.75) (xy 67.5275 36.65502) (xy 67.454805 36.479518)
+        (xy 67.320482 36.345195) (xy 67.144981 36.2725) (xy 66.794375 36.2725) (xy 66.675 36.391875) (xy 66.575 36.391875)
+        (xy 66.455625 36.2725) (xy 66.105019 36.2725) (xy 65.929518 36.345195) (xy 65.795195 36.479518) (xy 65.7225 36.65502)
+        (xy 64.2775 36.65502) (xy 64.204805 36.479518) (xy 64.070482 36.345195) (xy 63.894981 36.2725) (xy 63.544375 36.2725)
+        (xy 63.425 36.391875) (xy 63.325 36.391875) (xy 63.205625 36.2725) (xy 62.855019 36.2725) (xy 62.679518 36.345195)
+        (xy 62.545195 36.479518) (xy 62.4725 36.65502) (xy 62.314044 36.65502) (xy 62.311399 36.641725) (xy 62.250066 36.549934)
+        (xy 62.158275 36.488601) (xy 62.05 36.467064) (xy 61.2 36.467064) (xy 61.091725 36.488601) (xy 60.999934 36.549934)
+        (xy 60.938601 36.641725) (xy 60.917064 36.75) (xy 60.917064 37.0975) (xy 59.739635 37.0975) (xy 59.699999 37.089616)
+        (xy 59.660363 37.0975) (xy 59.66036 37.0975) (xy 59.542952 37.120854) (xy 59.409814 37.209814) (xy 59.387359 37.24342)
+        (xy 59.10828 37.5225) (xy 58.985128 37.5225) (xy 58.772872 37.610419) (xy 58.610419 37.772872) (xy 58.5225 37.985128)
+        (xy 44.831581 37.985128) (xy 44.989581 37.827128) (xy 45.0775 37.614872) (xy 45.0775 37.385128) (xy 44.989581 37.172872)
+        (xy 44.827128 37.010419) (xy 44.614872 36.9225) (xy 44.385128 36.9225) (xy 44.172872 37.010419) (xy 44.010419 37.172872)
+        (xy 43.9225 37.385128) (xy 36.270789 37.385128) (xy 36.126247 37.036172) (xy 35.83383 36.743755) (xy 35.45177 36.585501)
+        (xy 35.038232 36.585501) (xy 34.656172 36.743755) (xy 34.363755 37.036172) (xy 34.205501 37.418232) (xy 33.744501 37.418232)
+        (xy 33.586247 37.036172) (xy 33.29383 36.743755) (xy 32.91177 36.585501) (xy 32.498232 36.585501) (xy 32.116172 36.743755)
+        (xy 31.823755 37.036172) (xy 31.665501 37.418232) (xy 31.204501 37.418232) (xy 31.046247 37.036172) (xy 30.75383 36.743755)
+        (xy 30.37177 36.585501) (xy 29.958232 36.585501) (xy 29.576172 36.743755) (xy 29.283755 37.036172) (xy 29.125501 37.418232)
+        (xy 28.669937 37.418232) (xy 28.669937 36.863001) (xy 28.6484 36.754726) (xy 28.587067 36.662935) (xy 28.495276 36.601602)
+        (xy 28.387001 36.580065) (xy 26.863001 36.580065) (xy 26.754726 36.601602) (xy 26.662935 36.662935) (xy 26.601602 36.754726)
+        (xy 26.580065 36.863001) (xy 26.580065 38.387001) (xy 26.601602 38.495276) (xy 26.662935 38.587067) (xy 26.754726 38.6484)
+        (xy 26.863001 38.669937) (xy 27.221168 38.669937) (xy 27.222501 38.676638) (xy 27.222502 43.955064) (xy 26.863001 43.955064)
+        (xy 26.754726 43.976601) (xy 26.662935 44.037934) (xy 26.601602 44.129725) (xy 26.580065 44.238) (xy 26.580065 45.762)
+        (xy 26.601602 45.870275) (xy 26.662935 45.962066) (xy 26.754726 46.023399) (xy 26.863001 46.044936) (xy 27.057501 46.044936)
+        (xy 27.0575 51.455064) (xy 26.698 51.455064) (xy 26.589725 51.476601) (xy 26.497934 51.537934) (xy 26.436601 51.629725)
+        (xy 26.415064 51.738) (xy 26.415064 53.262) (xy 26.436601 53.370275) (xy 26.497934 53.462066) (xy 26.589725 53.523399)
+        (xy 26.698 53.544936) (xy 27.017501 53.544936) (xy 27.0175 58.955064) (xy 26.658 58.955064) (xy 26.549725 58.976601)
+        (xy 26.457934 59.037934) (xy 26.396601 59.129725) (xy 26.375064 59.238) (xy 26.375064 60.762) (xy 26.396601 60.870275)
+        (xy 26.457934 60.962066) (xy 26.549725 61.023399) (xy 26.658 61.044936) (xy 27.016167 61.044936) (xy 27.040854 61.169047)
+        (xy 27.057501 61.193961) (xy 27.0575 66.455064) (xy 26.698 66.455064) (xy 26.589725 66.476601) (xy 26.497934 66.537934)
+        (xy 26.436601 66.629725) (xy 26.415064 66.738) (xy 26.415064 68.262) (xy 26.436601 68.370275) (xy 26.497934 68.462066)
+        (xy 26.589725 68.523399) (xy 26.698 68.544936) (xy 27.017501 68.544936) (xy 27.0175 73.955064) (xy 26.658 73.955064)
+        (xy 26.549725 73.976601) (xy 26.457934 74.037934) (xy 26.396601 74.129725) (xy 26.375064 74.238) (xy 26.375064 75.762)
+        (xy 26.396601 75.870275) (xy 26.457934 75.962066) (xy 26.549725 76.023399) (xy 26.658 76.044936) (xy 27.016167 76.044936)
+        (xy 27.040854 76.169047) (xy 27.061536 76.2) (xy 27.097501 76.253824) (xy 27.0975 79.292064) (xy 26.75 79.292064)
+        (xy 26.641725 79.313601) (xy 26.549934 79.374934) (xy 26.488601 79.466725) (xy 26.467064 79.575) (xy 26.467064 80.138716)
+        (xy 26.168419 80.437361) (xy 26.134814 80.459815) (xy 26.11236 80.49342) (xy 26.112359 80.493421) (xy 26.045853 80.592954)
+        (xy 26.014615 80.750001) (xy 25.2825 80.750001) (xy 25.2825 33.985128) (xy 58.7225 33.985128) (xy 58.7225 34.214872)
+        (xy 58.810419 34.427128) (xy 58.972872 34.589581) (xy 59.185128 34.6775) (xy 59.30828 34.6775) (xy 59.887359 35.25658)
+        (xy 59.909814 35.290186) (xy 60.042952 35.379146) (xy 60.16036 35.4025) (xy 60.160363 35.4025) (xy 60.199999 35.410384)
+        (xy 60.239635 35.4025) (xy 60.917064 35.4025) (xy 60.917064 35.75) (xy 60.938601 35.858275) (xy 60.999934 35.950066)
+        (xy 61.091725 36.011399) (xy 61.2 36.032936) (xy 62.05 36.032936) (xy 62.158275 36.011399) (xy 62.250066 35.950066)
+        (xy 62.311399 35.858275) (xy 62.332936 35.75) (xy 62.332936 35.169375) (xy 62.4725 35.169375) (xy 62.4725 35.84498)
+        (xy 62.545195 36.020482) (xy 62.679518 36.154805) (xy 62.855019 36.2275) (xy 63.205625 36.2275) (xy 63.325 36.108125)
+        (xy 63.325 35.05) (xy 63.425 35.05) (xy 63.425 36.108125) (xy 63.544375 36.2275) (xy 63.894981 36.2275)
+        (xy 64.070482 36.154805) (xy 64.204805 36.020482) (xy 64.2775 35.84498) (xy 64.2775 35.169375) (xy 64.158125 35.05)
+        (xy 63.425 35.05) (xy 63.325 35.05) (xy 62.591875 35.05) (xy 62.4725 35.169375) (xy 62.332936 35.169375)
+        (xy 62.332936 34.25) (xy 62.314044 34.15502) (xy 62.4725 34.15502) (xy 62.4725 34.830625) (xy 62.591875 34.95)
+        (xy 63.325 34.95) (xy 63.325 33.891875) (xy 63.425 33.891875) (xy 63.425 34.95) (xy 64.158125 34.95)
+        (xy 64.2775 34.830625) (xy 64.2775 34.15502) (xy 64.204805 33.979518) (xy 64.070482 33.845195) (xy 63.894981 33.7725)
+        (xy 63.544375 33.7725) (xy 63.425 33.891875) (xy 63.325 33.891875) (xy 63.205625 33.7725) (xy 62.855019 33.7725)
+        (xy 62.679518 33.845195) (xy 62.545195 33.979518) (xy 62.4725 34.15502) (xy 62.314044 34.15502) (xy 62.311399 34.141725)
+        (xy 62.250066 34.049934) (xy 62.158275 33.988601) (xy 62.05 33.967064) (xy 61.2 33.967064) (xy 61.091725 33.988601)
+        (xy 60.999934 34.049934) (xy 60.938601 34.141725) (xy 60.917064 34.25) (xy 60.917064 34.5975) (xy 60.366721 34.5975)
+        (xy 59.8775 34.10828) (xy 59.8775 33.985128) (xy 59.789581 33.772872) (xy 59.627128 33.610419) (xy 59.414872 33.5225)
+        (xy 59.185128 33.5225) (xy 58.972872 33.610419) (xy 58.810419 33.772872) (xy 58.7225 33.985128) (xy 25.2825 33.985128)
+        (xy 25.2825 33.405889) (xy 75.6225 33.405889) (xy 75.6225 33.914111) (xy 75.816988 34.383646) (xy 76.176354 34.743012)
+        (xy 76.627782 34.93) (xy 76.176354 35.116988) (xy 75.816988 35.476354) (xy 75.6225 35.945889) (xy 75.6225 36.454111)
+        (xy 75.816988 36.923646) (xy 76.176354 37.283012) (xy 76.627782 37.47) (xy 76.176354 37.656988) (xy 75.816988 38.016354)
+        (xy 75.6225 38.485889) (xy 75.6225 38.994111) (xy 75.816988 39.463646) (xy 76.176354 39.823012) (xy 76.645889 40.0175)
+        (xy 77.154111 40.0175) (xy 77.623646 39.823012) (xy 77.983012 39.463646) (xy 78.1775 38.994111) (xy 78.1775 38.485889)
+        (xy 77.983012 38.016354) (xy 77.623646 37.656988) (xy 77.172218 37.47) (xy 77.623646 37.283012) (xy 77.913479 36.993179)
+        (xy 90.130551 36.993179) (xy 90.130551 37.222923) (xy 90.21847 37.435179) (xy 90.380923 37.597632) (xy 90.593179 37.685551)
+        (xy 90.822923 37.685551) (xy 91.035179 37.597632) (xy 91.197632 37.435179) (xy 91.285551 37.222923) (xy 91.285551 37.099771)
+        (xy 95.482823 32.9025) (xy 96.385791 32.9025) (xy 96.472872 32.989581) (xy 96.685128 33.0775) (xy 96.914872 33.0775)
+        (xy 97.127128 32.989581) (xy 97.289581 32.827128) (xy 97.3775 32.614872) (xy 97.3775 32.385128) (xy 97.289581 32.172872)
+        (xy 97.127128 32.010419) (xy 96.914872 31.9225) (xy 96.685128 31.9225) (xy 96.472872 32.010419) (xy 96.385791 32.0975)
+        (xy 95.355737 32.0975) (xy 95.316101 32.089616) (xy 95.276465 32.0975) (xy 95.276462 32.0975) (xy 95.159054 32.120854)
+        (xy 95.025916 32.209814) (xy 95.003462 32.243419) (xy 90.716331 36.530551) (xy 90.593179 36.530551) (xy 90.380923 36.61847)
+        (xy 90.21847 36.780923) (xy 90.130551 36.993179) (xy 77.913479 36.993179) (xy 77.983012 36.923646) (xy 78.1775 36.454111)
+        (xy 78.1775 35.945889) (xy 77.983012 35.476354) (xy 77.623646 35.116988) (xy 77.172218 34.93) (xy 77.623646 34.743012)
+        (xy 77.983012 34.383646) (xy 78.1775 33.914111) (xy 78.1775 33.405889) (xy 77.983012 32.936354) (xy 77.623646 32.576988)
+        (xy 77.154111 32.3825) (xy 76.645889 32.3825) (xy 76.176354 32.576988) (xy 75.816988 32.936354) (xy 75.6225 33.405889)
+        (xy 25.2825 33.405889) (xy 25.2825 29.596705) (xy 27.9725 29.596705) (xy 27.9725 30.403295) (xy 28.281169 31.148486)
         (xy 28.851514 31.718831) (xy 29.596705 32.0275) (xy 30.403295 32.0275) (xy 31.148486 31.718831) (xy 31.718831 31.148486)
         (xy 32.0275 30.403295) (xy 32.0275 29.793231) (xy 81.4205 29.793231) (xy 81.4205 30.206769) (xy 81.578754 30.588829)
         (xy 81.871171 30.881246) (xy 82.253231 31.0395) (xy 82.666769 31.0395) (xy 83.048829 30.881246) (xy 83.341246 30.588829)

File diff suppressed because it is too large
+ 791 - 782
Eda/Ordinateur/Ordinateur.kicad_pcb-bak


+ 250 - 249
Eda/Ordinateur/Ordinateur.net

@@ -1,7 +1,7 @@
 (export (version D)
   (design
-    (source C:\Users\e_rcluze\Documents\Autres\Projet\ordinateur_aquarium\Eda\Ordinateur\Ordinateur.sch)
-    (date "18/10/2019 15:32:24")
+    (source C:\Users\e_rcluze\Documents\Autres\projet\Ordinateur_Aquarium\Eda\Ordinateur\Ordinateur.sch)
+    (date "11/02/2020 11:21:15")
     (tool "Eeschema (5.0.2)-1")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
@@ -465,10 +465,10 @@
       (tstamp 5CF5CE3A))
     (comp (ref P18)
       (value ProgESP)
-      (footprint Connector:PinHeader2.54_1X2)
+      (footprint Connector:PinHeader2.54_1X3)
       (fields
         (field (name Partkeepr) 100))
-      (libsource (lib conn) (part CONN_01X02) (description ""))
+      (libsource (lib conn) (part CONN_01X03) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5CF5CE43))
     (comp (ref P19)
@@ -795,7 +795,7 @@
       (value ESP-12F)
       (footprint Module:ESP-12F)
       (fields
-        (field (name Partkeepr) 2500))
+        (field (name Partkeepr) 2800))
       (libsource (lib Module) (part ESP-12F) (description ""))
       (sheetpath (names /) (tstamps /))
       (tstamp 5CF5CDD9))
@@ -1513,101 +1513,101 @@
       (node (ref U9) (pin 8))
       (node (ref U6) (pin 8)))
     (net (code 3) (name /PH)
+      (node (ref U6) (pin 7))
       (node (ref R8) (pin 1))
-      (node (ref U1) (pin 16))
-      (node (ref U6) (pin 7)))
+      (node (ref U1) (pin 16)))
     (net (code 4) (name "Net-(R3-Pad1)")
       (node (ref R3) (pin 1))
       (node (ref R8) (pin 2))
       (node (ref U6) (pin 6)))
     (net (code 5) (name "Net-(R4-Pad2)")
-      (node (ref U6) (pin 5))
       (node (ref R4) (pin 2))
-      (node (ref R5) (pin 2)))
+      (node (ref R5) (pin 2))
+      (node (ref U6) (pin 5)))
     (net (code 6) (name "Net-(R10-Pad1)")
-      (node (ref R5) (pin 1))
       (node (ref R10) (pin 1))
+      (node (ref R5) (pin 1))
       (node (ref R9) (pin 2)))
     (net (code 7) (name "Net-(C12-Pad1)")
       (node (ref U9) (pin 2))
       (node (ref C12) (pin 1)))
     (net (code 8) (name "Net-(P11-Pad1)")
-      (node (ref U6) (pin 3))
-      (node (ref P11) (pin 1)))
+      (node (ref P11) (pin 1))
+      (node (ref U6) (pin 3)))
     (net (code 9) (name "Net-(C12-Pad2)")
-      (node (ref C12) (pin 2))
-      (node (ref U9) (pin 4)))
+      (node (ref U9) (pin 4))
+      (node (ref C12) (pin 2)))
     (net (code 10) (name "Net-(U9-Pad7)")
       (node (ref U9) (pin 7)))
-    (net (code 11) (name "Net-(U8-Pad7)")
-      (node (ref U8) (pin 7)))
-    (net (code 12) (name "Net-(U8-Pad11)")
-      (node (ref U8) (pin 11)))
-    (net (code 13) (name "Net-(U8-Pad12)")
-      (node (ref U8) (pin 12)))
-    (net (code 14) (name "Net-(U8-Pad17)")
-      (node (ref U8) (pin 17)))
-    (net (code 15) (name "Net-(U8-Pad18)")
-      (node (ref U8) (pin 18)))
-    (net (code 16) (name "Net-(U8-Pad6)")
+    (net (code 11) (name "Net-(U8-Pad19)")
+      (node (ref U8) (pin 19)))
+    (net (code 12) (name "Net-(U8-Pad2)")
+      (node (ref U8) (pin 2)))
+    (net (code 13) (name "Net-(U8-Pad20)")
+      (node (ref U8) (pin 20)))
+    (net (code 14) (name "Net-(R31-Pad1)")
+      (node (ref U8) (pin 3))
+      (node (ref R31) (pin 1)))
+    (net (code 15) (name "Net-(U8-Pad4)")
+      (node (ref U8) (pin 4)))
+    (net (code 16) (name "Net-(U8-Pad5)")
+      (node (ref U8) (pin 5)))
+    (net (code 17) (name "Net-(U8-Pad6)")
       (node (ref U8) (pin 6)))
-    (net (code 17) (name "Net-(U2-Pad1)")
+    (net (code 18) (name "Net-(U8-Pad7)")
+      (node (ref U8) (pin 7)))
+    (net (code 19) (name "Net-(U2-Pad1)")
       (node (ref U2) (pin 1)))
-    (net (code 18) (name "Net-(U2-Pad13)")
+    (net (code 20) (name "Net-(U2-Pad13)")
       (node (ref U2) (pin 13)))
-    (net (code 19) (name "Net-(U2-Pad14)")
+    (net (code 21) (name "Net-(U2-Pad14)")
       (node (ref U2) (pin 14)))
-    (net (code 20) (name "Net-(U2-Pad18)")
+    (net (code 22) (name "Net-(U2-Pad18)")
       (node (ref U2) (pin 18)))
-    (net (code 21) (name "Net-(U2-Pad4)")
+    (net (code 23) (name "Net-(U2-Pad4)")
       (node (ref U2) (pin 4)))
-    (net (code 22) (name "Net-(U2-Pad5)")
+    (net (code 24) (name "Net-(U2-Pad5)")
       (node (ref U2) (pin 5)))
-    (net (code 23) (name "Net-(R2-Pad1)")
-      (node (ref U6) (pin 1))
+    (net (code 25) (name "Net-(R2-Pad1)")
       (node (ref R3) (pin 2))
+      (node (ref U6) (pin 1))
       (node (ref R2) (pin 1)))
-    (net (code 24) (name "Net-(R1-Pad1)")
-      (node (ref R1) (pin 1))
+    (net (code 26) (name "Net-(R1-Pad1)")
       (node (ref U6) (pin 2))
+      (node (ref R1) (pin 1))
       (node (ref R2) (pin 2)))
-    (net (code 25) (name "Net-(P16-Pad1)")
+    (net (code 27) (name "Net-(P16-Pad1)")
       (node (ref P16) (pin 1))
       (node (ref Q1) (pin 2)))
-    (net (code 26) (name "Net-(R30-Pad1)")
+    (net (code 28) (name "Net-(R30-Pad1)")
       (node (ref R30) (pin 1))
       (node (ref U8) (pin 1)))
-    (net (code 27) (name "Net-(U8-Pad2)")
-      (node (ref U8) (pin 2)))
-    (net (code 28) (name "Net-(R31-Pad1)")
-      (node (ref U8) (pin 3))
-      (node (ref R31) (pin 1)))
-    (net (code 29) (name "Net-(U8-Pad4)")
-      (node (ref U8) (pin 4)))
-    (net (code 30) (name "Net-(U8-Pad5)")
-      (node (ref U8) (pin 5)))
+    (net (code 29) (name "Net-(U8-Pad11)")
+      (node (ref U8) (pin 11)))
+    (net (code 30) (name "Net-(U8-Pad12)")
+      (node (ref U8) (pin 12)))
     (net (code 31) (name "Net-(P1-Pad4)")
+      (node (ref P1) (pin 4))
       (node (ref SJ2) (pin 1))
-      (node (ref SJ3) (pin 1))
-      (node (ref P1) (pin 4)))
+      (node (ref SJ3) (pin 1)))
     (net (code 32) (name "Net-(P2-Pad4)")
+      (node (ref P2) (pin 4))
       (node (ref SJ5) (pin 1))
-      (node (ref SJ4) (pin 1))
-      (node (ref P2) (pin 4)))
+      (node (ref SJ4) (pin 1)))
     (net (code 33) (name /SCL)
-      (node (ref U3) (pin 7))
       (node (ref R14) (pin 1))
+      (node (ref U3) (pin 7))
       (node (ref U1) (pin 29))
-      (node (ref P7) (pin 5))
       (node (ref P8) (pin 5))
+      (node (ref P7) (pin 5))
       (node (ref U2) (pin 11)))
     (net (code 34) (name /SDA)
-      (node (ref U1) (pin 55))
       (node (ref P8) (pin 3))
       (node (ref U2) (pin 10))
       (node (ref U3) (pin 8))
-      (node (ref R12) (pin 1))
-      (node (ref P7) (pin 3)))
+      (node (ref U1) (pin 55))
+      (node (ref P7) (pin 3))
+      (node (ref R12) (pin 1)))
     (net (code 35) (name "Net-(U1-Pad53)")
       (node (ref U1) (pin 53)))
     (net (code 36) (name "Net-(U1-Pad52)")
@@ -1624,244 +1624,245 @@
       (node (ref P5) (pin 4))
       (node (ref SJ11) (pin 1)))
     (net (code 41) (name "Net-(P9-Pad4)")
-      (node (ref P9) (pin 4))
       (node (ref SJ13) (pin 1))
-      (node (ref SJ12) (pin 1)))
+      (node (ref SJ12) (pin 1))
+      (node (ref P9) (pin 4)))
     (net (code 42) (name "Net-(U1-Pad41)")
       (node (ref U1) (pin 41)))
     (net (code 43) (name /3.3V)
-      (node (ref U4) (pin 2))
-      (node (ref U1) (pin 32))
-      (node (ref C10) (pin 1))
-      (node (ref U8) (pin 8))
-      (node (ref U1) (pin 19))
+      (node (ref R6) (pin 1))
       (node (ref R18) (pin 1))
       (node (ref R16) (pin 1))
-      (node (ref R17) (pin 1))
+      (node (ref R13) (pin 1))
+      (node (ref C19) (pin 1))
+      (node (ref U1) (pin 32))
+      (node (ref U4) (pin 2))
+      (node (ref C20) (pin 1))
+      (node (ref R20) (pin 1))
       (node (ref R19) (pin 1))
-      (node (ref R33) (pin 1))
       (node (ref R32) (pin 1))
-      (node (ref R31) (pin 2))
-      (node (ref R20) (pin 1))
-      (node (ref C20) (pin 1))
-      (node (ref U1) (pin 13))
+      (node (ref R33) (pin 1))
+      (node (ref R17) (pin 1))
+      (node (ref U1) (pin 19))
+      (node (ref C6) (pin 2))
       (node (ref C5) (pin 2))
       (node (ref U3) (pin 5))
       (node (ref C9) (pin 2))
       (node (ref C3) (pin 2))
       (node (ref C8) (pin 2))
       (node (ref C4) (pin 2))
-      (node (ref C6) (pin 2))
-      (node (ref R12) (pin 2))
       (node (ref R15) (pin 2))
       (node (ref R14) (pin 2))
-      (node (ref C19) (pin 1))
-      (node (ref R6) (pin 1))
+      (node (ref R12) (pin 2))
       (node (ref SW1) (pin 2))
+      (node (ref C10) (pin 1))
       (node (ref R30) (pin 2))
-      (node (ref R13) (pin 1))
+      (node (ref U8) (pin 8))
+      (node (ref R31) (pin 2))
       (node (ref U2) (pin 15))
-      (node (ref P6) (pin 1))
-      (node (ref R24) (pin 1))
-      (node (ref P17) (pin 1))
-      (node (ref R29) (pin 1))
+      (node (ref C18) (pin 1))
       (node (ref P8) (pin 2))
+      (node (ref R29) (pin 1))
+      (node (ref P17) (pin 1))
       (node (ref U2) (pin 6))
       (node (ref VR1) (pin 3))
       (node (ref D10) (pin 1))
-      (node (ref P8) (pin 1))
-      (node (ref C18) (pin 1))
+      (node (ref R24) (pin 1))
+      (node (ref U1) (pin 13))
+      (node (ref P10) (pin 1))
       (node (ref U1) (pin 64))
+      (node (ref P8) (pin 1))
       (node (ref U7) (pin 2))
-      (node (ref P7) (pin 1))
       (node (ref P7) (pin 2))
-      (node (ref U1) (pin 47))
-      (node (ref P10) (pin 1)))
+      (node (ref P7) (pin 1))
+      (node (ref P6) (pin 1))
+      (node (ref U1) (pin 47)))
     (net (code 44) (name /GND)
-      (node (ref P6) (pin 3))
-      (node (ref C9) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref J1) (pin 5))
-      (node (ref R4) (pin 1))
-      (node (ref C3) (pin 1))
       (node (ref C6) (pin 1))
+      (node (ref C11) (pin 1))
       (node (ref P25) (pin 1))
-      (node (ref P24) (pin 1))
-      (node (ref C7) (pin 2))
+      (node (ref C5) (pin 1))
+      (node (ref C3) (pin 1))
+      (node (ref C9) (pin 1))
       (node (ref SW2) (pin 2))
-      (node (ref C11) (pin 1))
+      (node (ref C7) (pin 2))
+      (node (ref P6) (pin 3))
+      (node (ref P24) (pin 1))
+      (node (ref R4) (pin 1))
+      (node (ref J1) (pin 5))
       (node (ref BT1) (pin 2))
       (node (ref U4) (pin 1))
-      (node (ref SW3) (pin 5))
-      (node (ref C13) (pin 2))
-      (node (ref C1) (pin 2))
       (node (ref SJ3) (pin 2))
       (node (ref C2) (pin 2))
+      (node (ref C1) (pin 2))
       (node (ref R7) (pin 1))
+      (node (ref SW3) (pin 5))
       (node (ref U9) (pin 1))
+      (node (ref C20) (pin 2))
       (node (ref U9) (pin 3))
       (node (ref U9) (pin 6))
+      (node (ref C18) (pin 2))
       (node (ref P7) (pin 4))
       (node (ref C14) (pin 2))
-      (node (ref C16) (pin 2))
       (node (ref R27) (pin 2))
       (node (ref Q1) (pin 3))
       (node (ref P11) (pin 2))
-      (node (ref C18) (pin 2))
+      (node (ref C16) (pin 2))
       (node (ref VR1) (pin 1))
       (node (ref P17) (pin 3))
       (node (ref U4) (pin 16))
-      (node (ref U3) (pin 4))
-      (node (ref P15) (pin 3))
-      (node (ref R10) (pin 2))
       (node (ref C17) (pin 2))
+      (node (ref R10) (pin 2))
+      (node (ref P15) (pin 3))
+      (node (ref R1) (pin 2))
+      (node (ref U3) (pin 4))
       (node (ref U3) (pin 3))
       (node (ref U3) (pin 2))
       (node (ref U3) (pin 1))
       (node (ref C8) (pin 1))
       (node (ref C4) (pin 1))
-      (node (ref R1) (pin 2))
       (node (ref SJ1) (pin 2))
-      (node (ref U8) (pin 21))
       (node (ref C21) (pin 2))
-      (node (ref C20) (pin 2))
+      (node (ref U8) (pin 15))
+      (node (ref U8) (pin 16))
+      (node (ref P18) (pin 1))
       (node (ref C19) (pin 2))
-      (node (ref U8) (pin 22))
+      (node (ref C13) (pin 2))
       (node (ref C15) (pin 2))
       (node (ref R26) (pin 2))
       (node (ref U2) (pin 16))
       (node (ref U2) (pin 17))
       (node (ref U2) (pin 2))
       (node (ref U2) (pin 3))
-      (node (ref R45) (pin 2))
+      (node (ref Q3) (pin 3))
       (node (ref R41) (pin 2))
-      (node (ref R39) (pin 2))
-      (node (ref P3) (pin 3))
+      (node (ref U1) (pin 48))
+      (node (ref C24) (pin 2))
+      (node (ref P5) (pin 3))
+      (node (ref P8) (pin 4))
+      (node (ref C23) (pin 2))
+      (node (ref SJ5) (pin 2))
+      (node (ref U2) (pin 9))
       (node (ref R49) (pin 2))
       (node (ref R47) (pin 2))
+      (node (ref R45) (pin 2))
       (node (ref R43) (pin 2))
       (node (ref U1) (pin 31))
       (node (ref U1) (pin 18))
+      (node (ref P3) (pin 3))
       (node (ref U1) (pin 63))
-      (node (ref U1) (pin 48))
-      (node (ref P5) (pin 3))
-      (node (ref C22) (pin 2))
+      (node (ref R39) (pin 2))
+      (node (ref P9) (pin 3))
       (node (ref P2) (pin 3))
+      (node (ref C22) (pin 2))
+      (node (ref P10) (pin 3))
+      (node (ref SJ11) (pin 2))
+      (node (ref SJ13) (pin 2))
+      (node (ref SJ7) (pin 2))
+      (node (ref P23) (pin 1))
+      (node (ref P1) (pin 3))
+      (node (ref P7) (pin 6))
+      (node (ref P14) (pin 1))
       (node (ref Q2) (pin 3))
       (node (ref P13) (pin 1))
-      (node (ref P12) (pin 1))
-      (node (ref Q4) (pin 3))
-      (node (ref U2) (pin 9))
-      (node (ref SJ5) (pin 2))
-      (node (ref C23) (pin 2))
-      (node (ref Q3) (pin 3))
-      (node (ref C24) (pin 2))
-      (node (ref P10) (pin 3))
       (node (ref P4) (pin 3))
       (node (ref U1) (pin 12))
+      (node (ref P12) (pin 1))
       (node (ref P8) (pin 6))
       (node (ref SJ9) (pin 2))
-      (node (ref SJ7) (pin 2))
-      (node (ref P14) (pin 1))
-      (node (ref SJ11) (pin 2))
-      (node (ref SJ13) (pin 2))
-      (node (ref P9) (pin 3))
-      (node (ref P1) (pin 3))
-      (node (ref P23) (pin 1))
-      (node (ref P7) (pin 6))
-      (node (ref P8) (pin 4)))
+      (node (ref Q4) (pin 3)))
     (net (code 45) (name "Net-(P3-Pad4)")
       (node (ref SJ6) (pin 1))
-      (node (ref SJ7) (pin 1))
-      (node (ref P3) (pin 4)))
+      (node (ref P3) (pin 4))
+      (node (ref SJ7) (pin 1)))
     (net (code 46) (name "Net-(P4-Pad4)")
-      (node (ref SJ9) (pin 1))
+      (node (ref SJ8) (pin 1))
       (node (ref P4) (pin 4))
-      (node (ref SJ8) (pin 1)))
+      (node (ref SJ9) (pin 1)))
     (net (code 47) (name /CapteurAutres25V)
       (node (ref P5) (pin 2))
       (node (ref R46) (pin 1)))
-    (net (code 48) (name /VentiloPWM_2)
-      (node (ref R21) (pin 2))
-      (node (ref U1) (pin 56)))
-    (net (code 49) (name /USB_OTG_FS_ID)
-      (node (ref J1) (pin 4))
-      (node (ref U1) (pin 43)))
-    (net (code 50) (name /USB_OTG_FS_P)
+    (net (code 48) (name /USB_OTG_FS_ID)
+      (node (ref U1) (pin 43))
+      (node (ref J1) (pin 4)))
+    (net (code 49) (name /USB_OTG_FS_P)
       (node (ref U1) (pin 45))
       (node (ref J1) (pin 3)))
-    (net (code 51) (name /SWDIO)
+    (net (code 50) (name /SWDIO)
       (node (ref P17) (pin 4))
       (node (ref U1) (pin 46)))
-    (net (code 52) (name /SWCLK)
-      (node (ref P17) (pin 2))
-      (node (ref U1) (pin 49)))
+    (net (code 51) (name /SWCLK)
+      (node (ref U1) (pin 49))
+      (node (ref P17) (pin 2)))
+    (net (code 52) (name /VentiloPWM_2)
+      (node (ref U1) (pin 56))
+      (node (ref R21) (pin 2)))
     (net (code 53) (name /I2C2_SDL)
-      (node (ref P15) (pin 1))
-      (node (ref U1) (pin 58)))
+      (node (ref U1) (pin 58))
+      (node (ref P15) (pin 1)))
     (net (code 54) (name /I2C2_SDA)
       (node (ref P15) (pin 2))
       (node (ref U1) (pin 59)))
     (net (code 55) (name /TechniqueBas)
       (node (ref U1) (pin 61))
-      (node (ref R38) (pin 2))
-      (node (ref R39) (pin 1)))
+      (node (ref R39) (pin 1))
+      (node (ref R38) (pin 2)))
     (net (code 56) (name /TechniqueHaut)
       (node (ref R41) (pin 1))
       (node (ref U1) (pin 62))
       (node (ref R40) (pin 2)))
     (net (code 57) (name /CuveHaut)
-      (node (ref R42) (pin 2))
       (node (ref R43) (pin 1))
-      (node (ref U1) (pin 8)))
+      (node (ref U1) (pin 8))
+      (node (ref R42) (pin 2)))
     (net (code 58) (name /ReserveBas)
-      (node (ref U1) (pin 9))
       (node (ref R44) (pin 2))
-      (node (ref R45) (pin 1)))
+      (node (ref R45) (pin 1))
+      (node (ref U1) (pin 9)))
     (net (code 59) (name "Net-(P25-Pad3)")
       (node (ref P25) (pin 3)))
     (net (code 60) (name "Net-(P24-Pad3)")
       (node (ref P24) (pin 3)))
     (net (code 61) (name "Net-(P23-Pad3)")
       (node (ref P23) (pin 3)))
-    (net (code 62) (name /TempAir)
-      (node (ref P10) (pin 2))
-      (node (ref U1) (pin 15)))
-    (net (code 63) (name "Net-(U1-Pad17)")
+    (net (code 62) (name "Net-(P14-Pad3)")
+      (node (ref P14) (pin 3)))
+    (net (code 63) (name /TempAir)
+      (node (ref U1) (pin 15))
+      (node (ref P10) (pin 2)))
+    (net (code 64) (name "Net-(U1-Pad17)")
       (node (ref U1) (pin 17)))
-    (net (code 64) (name "Net-(U1-Pad2)")
+    (net (code 65) (name "Net-(U1-Pad2)")
       (node (ref U1) (pin 2)))
-    (net (code 65) (name /CS_ESP)
-      (node (ref U1) (pin 20))
-      (node (ref U8) (pin 9)))
-    (net (code 66) (name /CLK)
-      (node (ref U1) (pin 21))
-      (node (ref U8) (pin 14)))
-    (net (code 67) (name /MOSI)
+    (net (code 66) (name /CS_ESP)
+      (node (ref U8) (pin 9))
+      (node (ref U1) (pin 20)))
+    (net (code 67) (name /CLK)
+      (node (ref U8) (pin 14))
+      (node (ref U1) (pin 21)))
+    (net (code 68) (name /MOSI)
       (node (ref U1) (pin 22))
       (node (ref U8) (pin 13)))
-    (net (code 68) (name /MISO)
-      (node (ref U8) (pin 10))
-      (node (ref U1) (pin 23)))
-    (net (code 69) (name "Net-(P14-Pad3)")
-      (node (ref P14) (pin 3)))
-    (net (code 70) (name "Net-(U1-Pad3)")
+    (net (code 69) (name /MISO)
+      (node (ref U1) (pin 23))
+      (node (ref U8) (pin 10)))
+    (net (code 70) (name "Net-(P13-Pad3)")
+      (node (ref P13) (pin 3)))
+    (net (code 71) (name "Net-(U1-Pad3)")
       (node (ref U1) (pin 3)))
-    (net (code 71) (name "Net-(C7-Pad1)")
-      (node (ref C7) (pin 1))
-      (node (ref U1) (pin 30)))
-    (net (code 72) (name /MFP)
-      (node (ref U1) (pin 38))
+    (net (code 72) (name "Net-(C7-Pad1)")
+      (node (ref U1) (pin 30))
+      (node (ref C7) (pin 1)))
+    (net (code 73) (name /MFP)
       (node (ref U2) (pin 12))
+      (node (ref U1) (pin 38))
       (node (ref R15) (pin 1)))
-    (net (code 73) (name /ReserveBas5V)
+    (net (code 74) (name /ReserveBas5V)
       (node (ref R44) (pin 1))
       (node (ref P4) (pin 2)))
-    (net (code 74) (name /CapteurAutres15V)
+    (net (code 75) (name /CapteurAutres15V)
       (node (ref R48) (pin 1))
       (node (ref P9) (pin 2)))
-    (net (code 75) (name "Net-(P13-Pad3)")
-      (node (ref P13) (pin 3)))
     (net (code 76) (name "Net-(P12-Pad3)")
       (node (ref P12) (pin 3)))
     (net (code 77) (name "Net-(U4-Pad3)")
@@ -1874,44 +1875,44 @@
       (node (ref P3) (pin 2))
       (node (ref R42) (pin 1)))
     (net (code 80) (name /VentiloPWM5V_2)
-      (node (ref R34) (pin 1))
       (node (ref P23) (pin 4))
-      (node (ref C23) (pin 1))
-      (node (ref P14) (pin 4)))
+      (node (ref R34) (pin 1))
+      (node (ref P14) (pin 4))
+      (node (ref C23) (pin 1)))
     (net (code 81) (name "Net-(Q2-Pad1)")
-      (node (ref R25) (pin 2))
       (node (ref Q2) (pin 1))
-      (node (ref R22) (pin 2)))
+      (node (ref R22) (pin 2))
+      (node (ref R25) (pin 2)))
     (net (code 82) (name /VentiloPWM5V_1)
-      (node (ref P12) (pin 4))
-      (node (ref P13) (pin 4))
       (node (ref R25) (pin 1))
+      (node (ref P13) (pin 4))
+      (node (ref P12) (pin 4))
       (node (ref C22) (pin 1)))
     (net (code 83) (name "Net-(Q3-Pad2)")
-      (node (ref Q3) (pin 2))
-      (node (ref R21) (pin 1)))
+      (node (ref R21) (pin 1))
+      (node (ref Q3) (pin 2)))
     (net (code 84) (name "Net-(Q3-Pad1)")
       (node (ref R23) (pin 2))
-      (node (ref R34) (pin 2))
-      (node (ref Q3) (pin 1)))
+      (node (ref Q3) (pin 1))
+      (node (ref R34) (pin 2)))
     (net (code 85) (name "Net-(U2-Pad7)")
       (node (ref U2) (pin 7)))
     (net (code 86) (name "Net-(BT1-Pad1)")
-      (node (ref U2) (pin 8))
-      (node (ref BT1) (pin 1)))
+      (node (ref BT1) (pin 1))
+      (node (ref U2) (pin 8)))
     (net (code 87) (name /12V)
-      (node (ref P14) (pin 2))
       (node (ref C14) (pin 1))
-      (node (ref U7) (pin 3))
-      (node (ref P23) (pin 2))
-      (node (ref C13) (pin 1))
       (node (ref Q1) (pin 1))
       (node (ref P25) (pin 2))
-      (node (ref U5) (pin 3))
       (node (ref P24) (pin 2))
+      (node (ref P23) (pin 2))
+      (node (ref U7) (pin 3))
+      (node (ref P14) (pin 2))
+      (node (ref P12) (pin 2))
       (node (ref P13) (pin 2))
-      (node (ref P16) (pin 2))
-      (node (ref P12) (pin 2)))
+      (node (ref U5) (pin 3))
+      (node (ref C13) (pin 1))
+      (node (ref P16) (pin 2)))
     (net (code 88) (name "Net-(Q2-Pad2)")
       (node (ref R11) (pin 1))
       (node (ref Q2) (pin 2)))
@@ -1922,98 +1923,98 @@
       (node (ref R35) (pin 1))
       (node (ref Q4) (pin 2)))
     (net (code 91) (name "Net-(Q4-Pad1)")
-      (node (ref Q4) (pin 1))
+      (node (ref R36) (pin 2))
       (node (ref R37) (pin 2))
-      (node (ref R36) (pin 2)))
+      (node (ref Q4) (pin 1)))
     (net (code 92) (name /VentiloPWM_3)
       (node (ref R35) (pin 2))
       (node (ref U1) (pin 50)))
-    (net (code 93) (name "Net-(U1-Pad1)")
+    (net (code 93) (name /VentiloPWM5V_3)
+      (node (ref P25) (pin 4))
+      (node (ref R37) (pin 1))
+      (node (ref P24) (pin 4))
+      (node (ref C24) (pin 1)))
+    (net (code 94) (name "Net-(U1-Pad1)")
       (node (ref U1) (pin 1)))
-    (net (code 94) (name /CapteurAutres2)
-      (node (ref U1) (pin 10))
+    (net (code 95) (name /CapteurAutres2)
       (node (ref R47) (pin 1))
-      (node (ref R46) (pin 2)))
-    (net (code 95) (name /CapteurAutres1)
-      (node (ref U1) (pin 11))
+      (node (ref R46) (pin 2))
+      (node (ref U1) (pin 10)))
+    (net (code 96) (name /CapteurAutres1)
+      (node (ref R49) (pin 1))
       (node (ref R48) (pin 2))
-      (node (ref R49) (pin 1)))
-    (net (code 96) (name /VentiloPWM5V_3)
-      (node (ref P25) (pin 4))
-      (node (ref C24) (pin 1))
-      (node (ref R37) (pin 1))
-      (node (ref P24) (pin 4)))
+      (node (ref U1) (pin 11)))
     (net (code 97) (name "Net-(R24-Pad2)")
       (node (ref U4) (pin 15))
       (node (ref R24) (pin 2)))
     (net (code 98) (name /boot0)
-      (node (ref U1) (pin 60))
       (node (ref SW1) (pin 1))
       (node (ref C10) (pin 2))
+      (node (ref U1) (pin 60))
       (node (ref R7) (pin 2)))
     (net (code 99) (name /Right)
       (node (ref SW3) (pin 4))
-      (node (ref R16) (pin 2))
-      (node (ref U1) (pin 36)))
+      (node (ref U1) (pin 36))
+      (node (ref R16) (pin 2)))
     (net (code 100) (name /UP)
+      (node (ref SW3) (pin 6))
       (node (ref R17) (pin 2))
-      (node (ref U1) (pin 37))
-      (node (ref SW3) (pin 6)))
+      (node (ref U1) (pin 37)))
     (net (code 101) (name /Left)
-      (node (ref U1) (pin 33))
       (node (ref SW3) (pin 1))
-      (node (ref R18) (pin 2)))
+      (node (ref R18) (pin 2))
+      (node (ref U1) (pin 33)))
     (net (code 102) (name /Down)
-      (node (ref R19) (pin 2))
+      (node (ref U1) (pin 35))
       (node (ref SW3) (pin 3))
-      (node (ref U1) (pin 35)))
+      (node (ref R19) (pin 2)))
     (net (code 103) (name /Select)
       (node (ref SW3) (pin 2))
       (node (ref R20) (pin 2))
       (node (ref U1) (pin 34)))
     (net (code 104) (name "Net-(C1-Pad1)")
-      (node (ref C1) (pin 1))
       (node (ref U1) (pin 5))
-      (node (ref Y1) (pin 1)))
+      (node (ref Y1) (pin 1))
+      (node (ref C1) (pin 1)))
     (net (code 105) (name "Net-(C2-Pad1)")
+      (node (ref U1) (pin 6))
       (node (ref C2) (pin 1))
-      (node (ref Y1) (pin 2))
-      (node (ref U1) (pin 6)))
+      (node (ref Y1) (pin 2)))
     (net (code 106) (name /TempEau)
       (node (ref P6) (pin 2))
       (node (ref U1) (pin 14)))
     (net (code 107) (name "Net-(J1-Pad0)")
       (node (ref J1) (pin 0)))
     (net (code 108) (name /USB_OTG_FS_VBUS)
-      (node (ref J1) (pin 1))
-      (node (ref U1) (pin 42)))
+      (node (ref U1) (pin 42))
+      (node (ref J1) (pin 1)))
     (net (code 109) (name /USB_OTG_FS_N)
-      (node (ref U1) (pin 44))
-      (node (ref J1) (pin 2)))
+      (node (ref J1) (pin 2))
+      (node (ref U1) (pin 44)))
     (net (code 110) (name /nrst)
-      (node (ref P17) (pin 5))
       (node (ref R13) (pin 2))
-      (node (ref C11) (pin 2))
+      (node (ref U1) (pin 7))
       (node (ref SW2) (pin 1))
-      (node (ref U1) (pin 7)))
+      (node (ref C11) (pin 2))
+      (node (ref P17) (pin 5)))
     (net (code 111) (name /wc)
+      (node (ref R6) (pin 2))
       (node (ref U3) (pin 6))
-      (node (ref U1) (pin 4))
-      (node (ref R6) (pin 2)))
+      (node (ref U1) (pin 4)))
     (net (code 112) (name "Net-(C15-Pad1)")
       (node (ref U5) (pin 1))
-      (node (ref C15) (pin 1))
+      (node (ref D9) (pin 2))
       (node (ref R28) (pin 2))
       (node (ref R26) (pin 1))
-      (node (ref D9) (pin 2)))
+      (node (ref C15) (pin 1)))
     (net (code 113) (name "Net-(U4-Pad10)")
       (node (ref U4) (pin 10)))
     (net (code 114) (name /RX)
-      (node (ref U8) (pin 16))
-      (node (ref P18) (pin 1)))
+      (node (ref U8) (pin 21))
+      (node (ref P18) (pin 2)))
     (net (code 115) (name /TX)
-      (node (ref P18) (pin 2))
-      (node (ref U8) (pin 15)))
+      (node (ref P18) (pin 3))
+      (node (ref U8) (pin 22)))
     (net (code 116) (name "Net-(U4-Pad9)")
       (node (ref U4) (pin 9)))
     (net (code 117) (name "Net-(U4-Pad8)")
@@ -2029,24 +2030,24 @@
     (net (code 122) (name "Net-(P22-Pad1)")
       (node (ref P22) (pin 1)))
     (net (code 123) (name "Net-(R32-Pad2)")
-      (node (ref U8) (pin 20))
+      (node (ref U8) (pin 17))
       (node (ref R32) (pin 2)))
     (net (code 124) (name /mode)
-      (node (ref SJ1) (pin 1))
       (node (ref R33) (pin 2))
-      (node (ref U8) (pin 19)))
+      (node (ref SJ1) (pin 1))
+      (node (ref U8) (pin 18)))
     (net (code 125) (name /RS)
-      (node (ref U4) (pin 4))
-      (node (ref U1) (pin 39)))
+      (node (ref U1) (pin 39))
+      (node (ref U4) (pin 4)))
     (net (code 126) (name /R/W)
       (node (ref U4) (pin 5))
       (node (ref U1) (pin 40)))
     (net (code 127) (name /E)
-      (node (ref U1) (pin 28))
-      (node (ref U4) (pin 6)))
+      (node (ref U4) (pin 6))
+      (node (ref U1) (pin 28)))
     (net (code 128) (name /D4)
-      (node (ref U1) (pin 27))
-      (node (ref U4) (pin 11)))
+      (node (ref U4) (pin 11))
+      (node (ref U1) (pin 27)))
     (net (code 129) (name /D5)
       (node (ref U1) (pin 26))
       (node (ref U4) (pin 12)))
@@ -2058,7 +2059,7 @@
       (node (ref U1) (pin 24)))
     (net (code 133) (name "Net-(C16-Pad1)")
       (node (ref U7) (pin 1))
+      (node (ref C16) (pin 1))
       (node (ref R29) (pin 2))
       (node (ref R27) (pin 1))
-      (node (ref D10) (pin 2))
-      (node (ref C16) (pin 1)))))
+      (node (ref D10) (pin 2)))))

+ 7 - 5
Eda/Ordinateur/Ordinateur.sch

@@ -1326,19 +1326,19 @@ F 4 "607" H 12100 775 50  0001 C CNN "Partkeepr"
 	1    12900 7750
 	1    0    0    -1  
 $EndComp
-Text Label 15350 6700 0    60   ~ 0
+Text Label 15350 6650 0    60   ~ 0
 TX
-Text Label 15350 6800 0    60   ~ 0
+Text Label 15350 6750 0    60   ~ 0
 RX
 $Comp
-L conn:CONN_01X02 P?
+L conn:CONN_01X03 P?
 U 1 1 5CF5CE43
 P 15150 6750
 AR Path="/5CF126C4/5CF5CE43" Ref="P?"  Part="1" 
 AR Path="/5CF5CE43" Ref="P18"  Part="1" 
 F 0 "P18" H 15069 6475 50  0000 C CNN
 F 1 "ProgESP" H 15069 6566 50  0000 C CNN
-F 2 "Connector:PinHeader2.54_1X2" H 15150 6750 50  0001 C CNN
+F 2 "Connector:PinHeader2.54_1X3" H 15150 6750 50  0001 C CNN
 F 3 "" H 15150 6750 50  0000 C CNN
 F 4 "100" H 0   0   50  0001 C CNN "Partkeepr"
 	1    15150 6750
@@ -2090,7 +2090,7 @@ F 0 "U8" H 14400 6400 60  0000 C CNN
 F 1 "ESP-12F" H 13950 7600 60  0000 C CNN
 F 2 "Module:ESP-12F" H 13950 6950 60  0001 C CNN
 F 3 "" H 13950 6950 60  0001 C CNN
-F 4 "2500" H 12000 5850 50  0001 C CNN "Partkeepr"
+F 4 "2800" H 12000 5850 50  0001 C CNN "Partkeepr"
 	1    13950 7000
 	1    0    0    -1  
 $EndComp
@@ -2699,4 +2699,6 @@ Connection ~ 4000 2650
 Wire Wire Line
 	5100 2650 4900 2650
 Connection ~ 4900 2650
+Text Label 15350 6850 0    60   ~ 0
+GND
 $EndSCHEMATC

+ 1 - 0
Eda/Ordinateur/sym-lib-table

@@ -12,4 +12,5 @@
   (lib (name TI)(type Legacy)(uri ${MY_PATH}/schematic/TI.lib)(options "")(descr ""))
   (lib (name Torex)(type Legacy)(uri ${MY_PATH}/schematic/Torex.lib)(options "")(descr ""))
   (lib (name Toshiba)(type Legacy)(uri ${MY_PATH}/schematic/Toshiba.lib)(options "")(descr ""))
+  (lib (name Ordinateur-rescue)(type Legacy)(uri ${KIPRJMOD}/Ordinateur-rescue.lib)(options "")(descr ""))
 )

Some files were not shown because too many files changed in this diff