Răsfoiți Sursa

Modification des PCB (voir ticket)

Remy 8 ani în urmă
părinte
comite
9e1359809f

+ 10 - 10
Eda/Controle/fp-lib-table

@@ -1,12 +1,12 @@
 (fp_lib_table
 (fp_lib_table
-  (lib (name C)(type KiCad)(uri "$(KISYSMOD)/footprint/C.pretty")(options "")(descr ""))
-  (lib (name Connector)(type KiCad)(uri "$(KISYSMOD)/footprint/Connector.pretty")(options "")(descr ""))
-  (lib (name D)(type KiCad)(uri "$(KISYSMOD)/footprint/D.pretty")(options "")(descr ""))
-  (lib (name L)(type KiCad)(uri "$(KISYSMOD)/footprint/L.pretty")(options "")(descr ""))
-  (lib (name LED)(type KiCad)(uri "$(KISYSMOD)/footprint/LED.pretty")(options "")(descr ""))
-  (lib (name MH)(type KiCad)(uri "$(KISYSMOD)/footprint/MH.pretty")(options "")(descr ""))
-  (lib (name R)(type KiCad)(uri "$(KISYSMOD)/footprint/R.pretty")(options "")(descr ""))
-  (lib (name SW)(type KiCad)(uri "$(KISYSMOD)/footprint/SW.pretty")(options "")(descr ""))
-  (lib (name U)(type KiCad)(uri "$(KISYSMOD)/footprint/U.pretty")(options "")(descr ""))
-  (lib (name Y)(type KiCad)(uri "$(KISYSMOD)/footprint/Y.pretty")(options "")(descr ""))
+  (lib (name C)(type KiCad)(uri "$(APPDATA)/footprint/C.pretty")(options "")(descr ""))
+  (lib (name Connector)(type KiCad)(uri "$(APPDATA)/footprint/Connector.pretty")(options "")(descr ""))
+  (lib (name D)(type KiCad)(uri "$(APPDATA)/footprint/D.pretty")(options "")(descr ""))
+  (lib (name L)(type KiCad)(uri "$(APPDATA)/footprint/L.pretty")(options "")(descr ""))
+  (lib (name LED)(type KiCad)(uri "$(APPDATA)/footprint/LED.pretty")(options "")(descr ""))
+  (lib (name MH)(type KiCad)(uri "$(APPDATA)/footprint/MH.pretty")(options "")(descr ""))
+  (lib (name R)(type KiCad)(uri "$(APPDATA)/footprint/R.pretty")(options "")(descr ""))
+  (lib (name SW)(type KiCad)(uri "$(APPDATA)/footprint/SW.pretty")(options "")(descr ""))
+  (lib (name U)(type KiCad)(uri "$(APPDATA)/footprint/U.pretty")(options "")(descr ""))
+  (lib (name Y)(type KiCad)(uri "$(APPDATA)/footprint/Y.pretty")(options "")(descr ""))
 )
 )

+ 72 - 10
Eda/Controle/proc-cache.lib

@@ -108,6 +108,32 @@ X P3 3 -200 -100 150 R 50 50 1 1 P
 ENDDRAW
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #
+# CONN_01X04
+#
+DEF CONN_01X04 P 0 40 Y N 1 F N
+F0 "P" 0 250 50 H V C CNN
+F1 "CONN_01X04" 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_1X04
+ Pin_Header_Angled_1X04
+ Socket_Strip_Straight_1X04
+ Socket_Strip_Angled_1X04
+$ENDFPLIST
+DRAW
+S -50 -145 10 -155 0 1 0 N
+S -50 -45 10 -55 0 1 0 N
+S -50 55 10 45 0 1 0 N
+S -50 155 10 145 0 1 0 N
+S -50 200 50 -200 0 1 0 N
+X P1 1 -200 150 150 R 50 50 1 1 P
+X P2 2 -200 50 150 R 50 50 1 1 P
+X P3 3 -200 -50 150 R 50 50 1 1 P
+X P4 4 -200 -150 150 R 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_01X05
 # CONN_01X05
 #
 #
 DEF CONN_01X05 P 0 40 Y N 1 F N
 DEF CONN_01X05 P 0 40 Y N 1 F N
@@ -210,6 +236,41 @@ X 2 2 150 0 50 L 40 40 1 1 P
 ENDDRAW
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #
+# ESP-12F
+#
+DEF ESP-12F U 0 40 Y Y 1 F N
+F0 "U" 450 -600 60 H V C CNN
+F1 "ESP-12F" 0 600 60 H V C CNN
+F2 "" 0 -50 60 H I C CNN
+F3 "" 0 -50 60 H I C CNN
+DRAW
+S -500 -500 500 550 0 1 0 N
+S 250 -500 250 -500 0 1 0 N
+X RST 1 -700 450 200 R 50 50 1 1 I
+X ADC 2 -700 350 200 R 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
+X GPIO12 6 -700 -50 200 R 50 50 1 1 I
+X GPIO13 7 -700 -150 200 R 50 50 1 1 I
+X VCC 8 -700 -250 200 R 50 50 1 1 I
+X CS0 9 -250 -700 200 U 50 50 1 1 I
+X MISO 10 -150 -700 200 U 50 50 1 1 I
+X GPIO5 20 700 -50 200 L 50 50 1 1 I
+X GPIO9 11 -50 -700 200 U 50 50 1 1 I
+X RXD 21 700 -150 200 L 50 50 1 1 I
+X GPIO10 12 50 -700 200 U 50 50 1 1 I
+X TXD 22 700 -250 200 L 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
+ENDDRAW
+ENDDEF
+#
 # LED
 # LED
 #
 #
 DEF LED D 0 40 Y N 1 F N
 DEF LED D 0 40 Y N 1 F N
@@ -321,11 +382,11 @@ X USB_GND 5 500 -200 200 L 50 50 1 1 I
 ENDDRAW
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #
-# P_MOSFET
+# N_MOSFET
 #
 #
-DEF P_MOSFET Q 0 0 Y Y 1 F N
+DEF N_MOSFET Q 0 0 Y Y 1 F N
 F0 "Q" 160 140 60 H V C CNN
 F0 "Q" 160 140 60 H V C CNN
-F1 "P_MOSFET" 0 -140 60 H V C CNN
+F1 "N_MOSFET" 0 -140 60 H V C CNN
 F2 "" 0 0 60 H I C CNN
 F2 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 F3 "" 0 0 60 H I C CNN
 DRAW
 DRAW
@@ -333,19 +394,20 @@ C 0 0 80 0 1 0 N
 P 2 0 1 0 -50 40 50 40 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 -40 20 -40 -50 N
 P 2 0 1 0 -30 20 -50 20 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 -10 20 10 20 N
 P 2 0 1 0 0 -10 0 -10 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 20 0 -20 N
-P 2 0 1 0 0 40 0 50 N
-P 2 0 1 0 10 0 0 -20 N
-P 2 0 1 0 10 0 0 -10 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 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 -50 -50 0 -50 0 0 N
 P 3 0 1 0 40 20 40 -50 50 -50 N
 P 3 0 1 0 40 20 40 -50 50 -50 N
-P 5 0 1 0 -10 0 10 0 0 -30 -10 0 0 -10 N
-X S 1 -250 -50 200 R 50 50 1 1 I
-X G 2 0 250 200 D 50 50 1 1 I
-X D 3 250 -50 200 L 50 50 1 1 I
+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
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #

+ 23 - 71
Eda/Controle/proc-rescue.lib

@@ -1,79 +1,31 @@
 EESchema-LIBRARY Version 2.3
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #encoding utf-8
 #
 #
-# STM32F401RC-RESCUE-proc
+# P_MOSFET-RESCUE-proc
 #
 #
-DEF STM32F401RC-RESCUE-proc U 0 40 Y Y 1 F N
-F0 "U" 1000 -1100 60 H V C CNN
-F1 "STM32F401RC-RESCUE-proc" -50 -700 60 H V C CNN
-F2 "" -1200 -650 60 H I C CNN
-F3 "" -1200 -650 60 H I C CNN
+DEF P_MOSFET-RESCUE-proc Q 0 0 Y Y 1 F N
+F0 "Q" 160 140 60 H V C CNN
+F1 "P_MOSFET-RESCUE-proc" 0 -140 60 H V C CNN
+F2 "" 0 0 60 H I C CNN
+F3 "" 0 0 60 H I C CNN
 DRAW
 DRAW
-S -1050 -1050 1050 1050 0 1 0 N
-X VBAT 1 -1250 750 200 R 50 50 1 1 I
-X PC13 2 -1250 650 200 R 50 50 1 1 I
-X PC14 3 -1250 550 200 R 50 50 1 1 I
-X PC15 4 -1250 450 200 R 50 50 1 1 I
-X PH0 5 -1250 350 200 R 50 50 1 1 I
-X PH1 6 -1250 250 200 R 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
-X PC2 10 -1250 -150 200 R 50 50 1 1 I
-X PA4 20 -450 -1250 200 U 50 50 1 1 I
-X VCAP1 30 550 -1250 200 U 50 50 1 1 I
-X PC9 40 1250 -50 200 L 50 50 1 1 I
-X JTDI 50 650 1250 200 D 50 50 1 1 I
-X BOOT0 60 -350 1250 200 D 50 50 1 1 I
-X PC3 11 -1250 -250 200 R 50 50 1 1 I
-X PA5 21 -350 -1250 200 U 50 50 1 1 I
-X VSS 31 650 -1250 200 U 50 50 1 1 I
-X PA8 41 1250 50 200 L 50 50 1 1 I
-X PC10 51 550 1250 200 D 50 50 1 1 I
-X PB8 61 -450 1250 200 D 50 50 1 1 I
-X VSSA 12 -1250 -350 200 R 50 50 1 1 I
-X PA6 22 -250 -1250 200 U 50 50 1 1 I
-X VDD 32 750 -1250 200 U 50 50 1 1 I
-X PA9 42 1250 150 200 L 50 50 1 1 I
-X PC11 52 450 1250 200 D 50 50 1 1 I
-X PB9 62 -550 1250 200 D 50 50 1 1 I
-X VDDA 13 -1250 -450 200 R 50 50 1 1 I
-X PA7 23 -150 -1250 200 U 50 50 1 1 I
-X PB12 33 1250 -750 200 L 50 50 1 1 I
-X PA10 43 1250 250 200 L 50 50 1 1 I
-X PC12 53 350 1250 200 D 50 50 1 1 I
-X VSS 63 -650 1250 200 D 50 50 1 1 I
-X PA0 14 -1250 -550 200 R 50 50 1 1 I
-X PC4 24 -50 -1250 200 U 50 50 1 1 I
-X PB13 34 1250 -650 200 L 50 50 1 1 I
-X PA11 44 1250 350 200 L 50 50 1 1 I
-X PD2 54 250 1250 200 D 50 50 1 1 I
-X VDD 64 -750 1250 200 D 50 50 1 1 I
-X PA1 15 -1250 -650 200 R 50 50 1 1 I
-X PC5 25 50 -1250 200 U 50 50 1 1 I
-X PB14 35 1250 -550 200 L 50 50 1 1 I
-X PA12 45 1250 450 200 L 50 50 1 1 I
-X JTDO 55 150 1250 200 D 50 50 1 1 I
-X PA2 16 -1250 -750 200 R 50 50 1 1 I
-X PB0 26 150 -1250 200 U 50 50 1 1 I
-X PB15 36 1250 -450 200 L 50 50 1 1 I
-X JTMS 46 1250 550 200 L 50 50 1 1 I
-X JTRST 56 50 1250 200 D 50 50 1 1 I
-X PA3 17 -750 -1250 200 U 50 50 1 1 I
-X PB1 27 250 -1250 200 U 50 50 1 1 I
-X PC6 37 1250 -350 200 L 50 50 1 1 I
-X VDD 47 1250 650 200 L 50 50 1 1 I
-X PB5 57 -50 1250 200 D 50 50 1 1 I
-X VSS 18 -650 -1250 200 U 50 50 1 1 I
-X PB2 28 350 -1250 200 U 50 50 1 1 I
-X PC7 38 1250 -250 200 L 50 50 1 1 I
-X VSS 48 1250 750 200 L 50 50 1 1 I
-X PB6 58 -150 1250 200 D 50 50 1 1 I
-X VDD 19 -550 -1250 200 U 50 50 1 1 I
-X PB10 29 450 -1250 200 U 50 50 1 1 I
-X PC8 39 1250 -150 200 L 50 50 1 1 I
-X JTCK 49 750 1250 200 D 50 50 1 1 I
-X PB7 59 -250 1250 200 D 50 50 1 1 I
+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 10 20 N
+P 2 0 1 0 0 -10 0 -10 N
+P 2 0 1 0 0 20 0 -20 N
+P 2 0 1 0 0 40 0 50 N
+P 2 0 1 0 10 0 0 -20 N
+P 2 0 1 0 10 0 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 5 0 1 0 -10 0 10 0 0 -30 -10 0 0 -10 N
+X S 1 -250 -50 200 R 50 50 1 1 I
+X G 2 0 250 200 D 50 50 1 1 I
+X D 3 250 -50 200 L 50 50 1 1 I
 ENDDRAW
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #

Fișier diff suprimat deoarece este prea mare
+ 313 - 494
Eda/Controle/proc.kicad_pcb


+ 439 - 276
Eda/Controle/proc.net

@@ -1,8 +1,8 @@
 (export (version D)
 (export (version D)
   (design
   (design
-    (source /home/rcluze/Projet/Autres/rampesLeds/Eda/Controle/proc.sch)
-    (date "jeu. 07 sept. 2017 15:17:15 CEST")
-    (tool "Eeschema 4.0.7-e2-6376~58~ubuntu16.04.1")
+    (source D:/Projet/rampesLeds/Eda/Controle/proc.sch)
+    (date "06/07/2018 15:26:24")
+    (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
     (sheet (number 1) (name /) (tstamps /)
       (title_block
       (title_block
         (title)
         (title)
@@ -53,7 +53,7 @@
       (tstamp 56C84AD6))
       (tstamp 56C84AD6))
     (comp (ref P7)
     (comp (ref P7)
       (value Alim)
       (value Alim)
-      (footprint Connector:bornier_2x1)
+      (footprint Connector:Bornier2.54_1x2)
       (libsource (lib conn) (part CONN_01X02))
       (libsource (lib conn) (part CONN_01X02))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
       (tstamp 56C85860))
       (tstamp 56C85860))
@@ -76,31 +76,19 @@
       (tstamp 57061F55))
       (tstamp 57061F55))
     (comp (ref P8)
     (comp (ref P8)
       (value Debug)
       (value Debug)
-      (footprint Connector:1X6_2.54)
+      (footprint Connector:PinHeader2.54_1X5)
       (libsource (lib conn) (part CONN_01X05))
       (libsource (lib conn) (part CONN_01X05))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
       (tstamp 57062F1C))
       (tstamp 57062F1C))
     (comp (ref P5)
     (comp (ref P5)
       (value CONN_01X06)
       (value CONN_01X06)
-      (footprint Connector:bornier_6x1)
+      (footprint Connector:Bornier2.54_1x6)
       (libsource (lib conn) (part CONN_01X06))
       (libsource (lib conn) (part CONN_01X06))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
       (tstamp 570CFB57))
       (tstamp 570CFB57))
-    (comp (ref P6)
-      (value CONN_01X06)
-      (footprint Connector:bornier_6x1)
-      (libsource (lib conn) (part CONN_01X06))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 570CFBC4))
-    (comp (ref R1)
-      (value 100)
-      (footprint R:0603)
-      (libsource (lib global) (part R))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 570E42C5))
     (comp (ref D1)
     (comp (ref D1)
       (value rouge)
       (value rouge)
-      (footprint Dialight:598-xxxx-107F)
+      (footprint LED:0805)
       (fields
       (fields
         (field (name part) 598-8010-107F))
         (field (name part) 598-8010-107F))
       (libsource (lib global) (part LED))
       (libsource (lib global) (part LED))
@@ -114,7 +102,7 @@
       (tstamp 570E4510))
       (tstamp 570E4510))
     (comp (ref D2)
     (comp (ref D2)
       (value vert)
       (value vert)
-      (footprint Dialight:598-xxxx-107F)
+      (footprint LED:0805)
       (fields
       (fields
         (field (name part) 598-8070-107F))
         (field (name part) 598-8070-107F))
       (libsource (lib global) (part LED))
       (libsource (lib global) (part LED))
@@ -204,17 +192,6 @@
       (libsource (lib proc-cache) (part LM317-RESCUE-proc))
       (libsource (lib proc-cache) (part LM317-RESCUE-proc))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
       (tstamp 57E4F7D8))
       (tstamp 57E4F7D8))
-    (comp (ref Q1)
-      (value P_MOSFET)
-      (footprint U:SOT-223)
-      (fields
-        (field (name vendor) Value)
-        (field (name part) Value)
-        (field (name p/mouser) Value)
-        (field (name p/farnell) Value))
-      (libsource (lib global) (part P_MOSFET))
-      (sheetpath (names /) (tstamps /))
-      (tstamp 58122852))
     (comp (ref SW2)
     (comp (ref SW2)
       (value reset)
       (value reset)
       (footprint SW:SW)
       (footprint SW:SW)
@@ -295,10 +272,95 @@
       (tstamp 592E9BBE))
       (tstamp 592E9BBE))
     (comp (ref P9)
     (comp (ref P9)
       (value I2C)
       (value I2C)
-      (footprint Connector:bornier_1x3)
+      (footprint Connector:Bornier2.54_1x3)
       (libsource (lib conn) (part CONN_01X03))
       (libsource (lib conn) (part CONN_01X03))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
-      (tstamp 59B166C5)))
+      (tstamp 59B166C5))
+    (comp (ref U5)
+      (value ESP-12F)
+      (footprint U:ESP-12F)
+      (libsource (lib esp-12f) (part ESP-12F))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B362B9A))
+    (comp (ref P11)
+      (value Ventilateur)
+      (footprint Connector:Bornier2.54_1x3)
+      (libsource (lib conn) (part CONN_01X03))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B364CD7))
+    (comp (ref R11)
+      (value 10K)
+      (footprint R:0603)
+      (libsource (lib global) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3A483C))
+    (comp (ref R12)
+      (value 10K)
+      (footprint R:0603)
+      (libsource (lib global) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3A48BD))
+    (comp (ref D3)
+      (value Orange)
+      (footprint LED:0805)
+      (fields
+        (field (name part) 598-8010-107F))
+      (libsource (lib global) (part LED))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3A77C2))
+    (comp (ref R13)
+      (value 100)
+      (footprint R:0603)
+      (libsource (lib global) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3A7872))
+    (comp (ref R1)
+      (value 100)
+      (footprint R:0603)
+      (libsource (lib global) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 570E42C5))
+    (comp (ref P10)
+      (value Thermometre)
+      (footprint Connector:Bornier2.54_1x3)
+      (libsource (lib conn) (part CONN_01X03))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3AE3C4))
+    (comp (ref Q1)
+      (value N_MOSFET)
+      (footprint U:SOT-223)
+      (libsource (lib global) (part N_MOSFET))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3CCE17))
+    (comp (ref P6)
+      (value CONN_01X04)
+      (footprint Connector:Bornier2.54_1x4)
+      (libsource (lib conn) (part CONN_01X04))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3CE1CC))
+    (comp (ref R14)
+      (value 10K)
+      (footprint R:0603)
+      (fields
+        (field (name vendor) Value)
+        (field (name part) Value)
+        (field (name p/mouser) Value)
+        (field (name p/farnell) Value))
+      (libsource (lib global) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3D4E22))
+    (comp (ref C15)
+      (value 100nF)
+      (footprint C:0603)
+      (libsource (lib global) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3D4E2B))
+    (comp (ref SW3)
+      (value reset)
+      (footprint SW:SW)
+      (libsource (lib global) (part SW_PUSH))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 5B3D4E31)))
   (libparts
   (libparts
     (libpart (lib global) (part Battery)
     (libpart (lib global) (part Battery)
       (fields
       (fields
@@ -359,6 +421,21 @@
         (pin (num 1) (name P1) (type passive))
         (pin (num 1) (name P1) (type passive))
         (pin (num 2) (name P2) (type passive))
         (pin (num 2) (name P2) (type passive))
         (pin (num 3) (name P3) (type passive))))
         (pin (num 3) (name P3) (type passive))))
+    (libpart (lib conn) (part CONN_01X04)
+      (description "Connector 01x04")
+      (footprints
+        (fp Pin_Header_Straight_1X04)
+        (fp Pin_Header_Angled_1X04)
+        (fp Socket_Strip_Straight_1X04)
+        (fp Socket_Strip_Angled_1X04))
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_01X04))
+      (pins
+        (pin (num 1) (name P1) (type passive))
+        (pin (num 2) (name P2) (type passive))
+        (pin (num 3) (name P3) (type passive))
+        (pin (num 4) (name P4) (type passive))))
     (libpart (lib conn) (part CONN_01X05)
     (libpart (lib conn) (part CONN_01X05)
       (description "Connector 01x05")
       (description "Connector 01x05")
       (footprints
       (footprints
@@ -415,6 +492,33 @@
       (pins
       (pins
         (pin (num 1) (name 1) (type passive))
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive))))
         (pin (num 2) (name 2) (type passive))))
+    (libpart (lib esp-12f) (part ESP-12F)
+      (fields
+        (field (name Reference) U)
+        (field (name Value) ESP-12F))
+      (pins
+        (pin (num 1) (name RST) (type input))
+        (pin (num 2) (name ADC) (type input))
+        (pin (num 3) (name EN) (type input))
+        (pin (num 4) (name GPIO16) (type input))
+        (pin (num 5) (name GPIO14) (type input))
+        (pin (num 6) (name GPIO12) (type input))
+        (pin (num 7) (name GPIO13) (type input))
+        (pin (num 8) (name VCC) (type input))
+        (pin (num 9) (name CS0) (type input))
+        (pin (num 10) (name MISO) (type input))
+        (pin (num 11) (name GPIO9) (type input))
+        (pin (num 12) (name GPIO10) (type input))
+        (pin (num 13) (name MOSI) (type input))
+        (pin (num 14) (name SCLK) (type input))
+        (pin (num 15) (name GND) (type input))
+        (pin (num 16) (name GPIO15) (type input))
+        (pin (num 17) (name GPIO2) (type input))
+        (pin (num 18) (name GPIO0) (type input))
+        (pin (num 19) (name GPIO4) (type input))
+        (pin (num 20) (name GPIO5) (type input))
+        (pin (num 21) (name RXD) (type input))
+        (pin (num 22) (name TXD) (type input))))
     (libpart (lib global) (part LED)
     (libpart (lib global) (part LED)
       (footprints
       (footprints
         (fp LED-3MM)
         (fp LED-3MM)
@@ -486,14 +590,14 @@
         (pin (num 3) (name USB_P) (type input))
         (pin (num 3) (name USB_P) (type input))
         (pin (num 4) (name USB_ID) (type input))
         (pin (num 4) (name USB_ID) (type input))
         (pin (num 5) (name USB_GND) (type input))))
         (pin (num 5) (name USB_GND) (type input))))
-    (libpart (lib global) (part P_MOSFET)
+    (libpart (lib global) (part N_MOSFET)
       (fields
       (fields
         (field (name Reference) Q)
         (field (name Reference) Q)
-        (field (name Value) P_MOSFET))
+        (field (name Value) N_MOSFET))
       (pins
       (pins
-        (pin (num 1) (name S) (type input))
-        (pin (num 2) (name G) (type input))
-        (pin (num 3) (name D) (type input))))
+        (pin (num 1) (name G) (type input))
+        (pin (num 2) (name D) (type input))
+        (pin (num 3) (name S) (type input))))
     (libpart (lib global) (part R)
     (libpart (lib global) (part R)
       (footprints
       (footprints
         (fp R_*)
         (fp R_*)
@@ -581,276 +685,335 @@
         (pin (num 1) (name 1) (type passive))
         (pin (num 1) (name 1) (type passive))
         (pin (num 2) (name 2) (type passive)))))
         (pin (num 2) (name 2) (type passive)))))
   (libraries
   (libraries
+    (library (logical conn)
+      (uri D:\Projet\Librairie_Kicad\schematic\conn.lib))
     (library (logical global)
     (library (logical global)
-      (uri /home/rcluze/Projet/Autres/Librairie_Kicad/schematic/global.lib))
+      (uri D:\Projet\Librairie_Kicad\schematic\global.lib))
     (library (logical ST)
     (library (logical ST)
-      (uri /home/rcluze/Projet/Autres/Librairie_Kicad/schematic/ST.lib))
-    (library (logical conn)
-      (uri /home/rcluze/Projet/Autres/Librairie_Kicad/schematic/conn.lib))
+      (uri D:\Projet\Librairie_Kicad\schematic\ST.lib))
+    (library (logical esp-12f)
+      (uri D:\Projet\Librairie_Kicad\schematic\esp-12f.lib))
     (library (logical proc-cache)
     (library (logical proc-cache)
-      (uri /home/rcluze/Projet/Autres/rampesLeds/Eda/Controle/proc-cache.lib)))
+      (uri D:\Projet\rampesLeds\Eda\Controle\proc-cache.lib)))
   (nets
   (nets
-    (net (code 1) (name "Net-(U1-Pad54)")
-      (node (ref U1) (pin 54)))
-    (net (code 2) (name /s9)
-      (node (ref U1) (pin 37))
-      (node (ref P6) (pin 3)))
-    (net (code 3) (name "Net-(U1-Pad27)")
-      (node (ref U1) (pin 27)))
-    (net (code 4) (name /swdio)
-      (node (ref P8) (pin 4))
-      (node (ref U1) (pin 46)))
-    (net (code 5) (name "Net-(U1-Pad36)")
-      (node (ref U1) (pin 36)))
-    (net (code 6) (name "Net-(U1-Pad26)")
-      (node (ref U1) (pin 26)))
-    (net (code 7) (name /I2C2_SDA)
-      (node (ref P9) (pin 2))
-      (node (ref U1) (pin 55)))
-    (net (code 8) (name /USB_OTG_FS_P)
-      (node (ref U1) (pin 45))
-      (node (ref J1) (pin 3)))
-    (net (code 9) (name "Net-(U1-Pad35)")
-      (node (ref U1) (pin 35)))
-    (net (code 10) (name "Net-(U1-Pad25)")
-      (node (ref U1) (pin 25)))
-    (net (code 11) (name /USB_OTG_FS_N)
-      (node (ref J1) (pin 2))
-      (node (ref U1) (pin 44)))
-    (net (code 12) (name "Net-(U1-Pad34)")
-      (node (ref U1) (pin 34)))
-    (net (code 13) (name "Net-(U1-Pad53)")
-      (node (ref U1) (pin 53)))
-    (net (code 14) (name /USB_OTG_FS_ID)
-      (node (ref U1) (pin 43))
-      (node (ref J1) (pin 4)))
-    (net (code 15) (name "Net-(U1-Pad33)")
-      (node (ref U1) (pin 33)))
-    (net (code 16) (name "Net-(U1-Pad52)")
-      (node (ref U1) (pin 52)))
-    (net (code 17) (name "Net-(U1-Pad28)")
-      (node (ref U1) (pin 28)))
-    (net (code 18) (name "Net-(U1-Pad22)")
-      (node (ref U1) (pin 22)))
-    (net (code 19) (name "Net-(U1-Pad21)")
-      (node (ref U1) (pin 21)))
-    (net (code 20) (name "Net-(U1-Pad20)")
-      (node (ref U1) (pin 20)))
-    (net (code 21) (name "Net-(U1-Pad11)")
-      (node (ref U1) (pin 11)))
-    (net (code 22) (name "Net-(U1-Pad10)")
-      (node (ref U1) (pin 10)))
-    (net (code 23) (name "Net-(U1-Pad9)")
-      (node (ref U1) (pin 9)))
-    (net (code 24) (name "Net-(U1-Pad8)")
-      (node (ref U1) (pin 8)))
-    (net (code 25) (name "Net-(U1-Pad2)")
-      (node (ref U1) (pin 2)))
-    (net (code 26) (name /swclk)
-      (node (ref P8) (pin 2))
-      (node (ref U1) (pin 49)))
-    (net (code 27) (name /s11)
-      (node (ref P6) (pin 5))
-      (node (ref U1) (pin 39)))
-    (net (code 28) (name /I2C2_SDL)
-      (node (ref P9) (pin 3))
-      (node (ref U1) (pin 29)))
-    (net (code 29) (name /s10)
-      (node (ref P6) (pin 4))
-      (node (ref U1) (pin 38)))
-    (net (code 30) (name "Net-(U1-Pad57)")
-      (node (ref U1) (pin 57)))
-    (net (code 31) (name "Net-(J1-Pad0)")
-      (node (ref J1) (pin 0)))
-    (net (code 32) (name "Net-(U4-Pad0)")
-      (node (ref U4) (pin 0)))
-    (net (code 33) (name /boot0)
-      (node (ref C7) (pin 2))
-      (node (ref U1) (pin 60))
-      (node (ref R9) (pin 2))
-      (node (ref SW2) (pin 1)))
-    (net (code 34) (name /USB_OTG_FS_VBUS)
-      (node (ref U1) (pin 42))
-      (node (ref J1) (pin 1)))
-    (net (code 35) (name /12V)
-      (node (ref C4) (pin 1))
-      (node (ref Q1) (pin 1))
-      (node (ref U4) (pin 3)))
-    (net (code 36) (name "Net-(P7-Pad2)")
-      (node (ref Q1) (pin 3))
-      (node (ref P7) (pin 2)))
-    (net (code 37) (name "Net-(U1-Pad51)")
-      (node (ref U1) (pin 51)))
-    (net (code 38) (name "Net-(U1-Pad50)")
-      (node (ref U1) (pin 50)))
-    (net (code 39) (name /s12)
-      (node (ref U1) (pin 40))
-      (node (ref P6) (pin 6)))
-    (net (code 40) (name /nrst)
-      (node (ref C6) (pin 2))
-      (node (ref SW1) (pin 1))
-      (node (ref U1) (pin 7))
-      (node (ref R8) (pin 2))
-      (node (ref P8) (pin 5)))
-    (net (code 41) (name /mfp)
-      (node (ref U3) (pin 12))
-      (node (ref U1) (pin 4))
-      (node (ref R3) (pin 2)))
-    (net (code 42) (name /wc)
-      (node (ref R10) (pin 2))
+    (net (code 1) (name /GND)
+      (node (ref U1) (pin 12))
+      (node (ref U1) (pin 63))
+      (node (ref U1) (pin 31))
+      (node (ref P11) (pin 3))
+      (node (ref P9) (pin 1))
+      (node (ref U1) (pin 47))
+      (node (ref U2) (pin 4))
+      (node (ref C10) (pin 2))
       (node (ref U2) (pin 3))
       (node (ref U2) (pin 3))
-      (node (ref U1) (pin 3)))
-    (net (code 43) (name "Net-(U1-Pad1)")
-      (node (ref U1) (pin 1)))
-    (net (code 44) (name /GND)
+      (node (ref U1) (pin 18))
+      (node (ref U2) (pin 2))
+      (node (ref U2) (pin 1))
+      (node (ref U5) (pin 15))
       (node (ref P8) (pin 3))
       (node (ref P8) (pin 3))
-      (node (ref C9) (pin 2))
-      (node (ref C14) (pin 2))
-      (node (ref C4) (pin 2))
-      (node (ref C7) (pin 1))
-      (node (ref U3) (pin 16))
-      (node (ref U3) (pin 2))
+      (node (ref D3) (pin 1))
       (node (ref P7) (pin 1))
       (node (ref P7) (pin 1))
-      (node (ref C5) (pin 2))
-      (node (ref U3) (pin 9))
+      (node (ref SW2) (pin 2))
+      (node (ref SW3) (pin 2))
+      (node (ref C15) (pin 1))
+      (node (ref C2) (pin 2))
+      (node (ref C11) (pin 2))
+      (node (ref U3) (pin 2))
+      (node (ref Q1) (pin 1))
       (node (ref R6) (pin 2))
       (node (ref R6) (pin 2))
-      (node (ref U2) (pin 6))
-      (node (ref Q1) (pin 2))
-      (node (ref U2) (pin 5))
-      (node (ref BT1) (pin 2))
-      (node (ref U2) (pin 7))
-      (node (ref U2) (pin 8))
-      (node (ref U3) (pin 17))
-      (node (ref D2) (pin 1))
-      (node (ref U3) (pin 3))
+      (node (ref P10) (pin 3))
+      (node (ref C5) (pin 2))
       (node (ref D1) (pin 1))
       (node (ref D1) (pin 1))
-      (node (ref C1) (pin 2))
       (node (ref C12) (pin 2))
       (node (ref C12) (pin 2))
+      (node (ref D2) (pin 1))
+      (node (ref C9) (pin 2))
       (node (ref C3) (pin 2))
       (node (ref C3) (pin 2))
-      (node (ref P9) (pin 1))
-      (node (ref C11) (pin 2))
-      (node (ref SW2) (pin 2))
-      (node (ref C2) (pin 2))
-      (node (ref U1) (pin 47))
-      (node (ref U1) (pin 63))
-      (node (ref R8) (pin 1))
-      (node (ref U1) (pin 18))
-      (node (ref U1) (pin 12))
-      (node (ref U1) (pin 31))
-      (node (ref J1) (pin 5))
+      (node (ref C1) (pin 2))
+      (node (ref U3) (pin 9))
       (node (ref C13) (pin 2))
       (node (ref C13) (pin 2))
-      (node (ref C10) (pin 2))
-      (node (ref C8) (pin 2)))
-    (net (code 45) (name "Net-(C12-Pad1)")
-      (node (ref C12) (pin 1))
-      (node (ref U1) (pin 30)))
-    (net (code 46) (name /VDD)
-      (node (ref C8) (pin 1))
-      (node (ref C14) (pin 1))
-      (node (ref C9) (pin 1))
-      (node (ref SW1) (pin 2))
-      (node (ref R9) (pin 1))
-      (node (ref R4) (pin 1))
+      (node (ref U3) (pin 3))
+      (node (ref C4) (pin 2))
+      (node (ref C7) (pin 1))
+      (node (ref C8) (pin 2))
+      (node (ref BT1) (pin 2))
+      (node (ref J1) (pin 5))
+      (node (ref U3) (pin 16))
+      (node (ref U3) (pin 17))
+      (node (ref R8) (pin 1))
+      (node (ref C14) (pin 2)))
+    (net (code 2) (name /VDD)
+      (node (ref R14) (pin 1))
+      (node (ref R7) (pin 1))
       (node (ref C2) (pin 1))
       (node (ref C2) (pin 1))
+      (node (ref C5) (pin 1))
+      (node (ref SW1) (pin 2))
+      (node (ref U3) (pin 15))
+      (node (ref U5) (pin 8))
+      (node (ref U2) (pin 5))
+      (node (ref R10) (pin 1))
+      (node (ref R12) (pin 2))
+      (node (ref R11) (pin 2))
       (node (ref C6) (pin 1))
       (node (ref C6) (pin 1))
+      (node (ref R4) (pin 1))
+      (node (ref U3) (pin 6))
+      (node (ref U4) (pin 2))
+      (node (ref R3) (pin 1))
+      (node (ref P10) (pin 1))
+      (node (ref U1) (pin 48))
+      (node (ref U1) (pin 19))
+      (node (ref C9) (pin 1))
+      (node (ref C8) (pin 1))
+      (node (ref C13) (pin 1))
+      (node (ref C14) (pin 1))
       (node (ref U1) (pin 64))
       (node (ref U1) (pin 64))
+      (node (ref C3) (pin 1))
       (node (ref U1) (pin 13))
       (node (ref U1) (pin 13))
       (node (ref U1) (pin 32))
       (node (ref U1) (pin 32))
-      (node (ref U1) (pin 19))
-      (node (ref U1) (pin 48))
-      (node (ref R3) (pin 1))
-      (node (ref U3) (pin 15))
-      (node (ref U2) (pin 4))
-      (node (ref U3) (pin 6))
-      (node (ref R10) (pin 1))
-      (node (ref U4) (pin 2))
       (node (ref P8) (pin 1))
       (node (ref P8) (pin 1))
-      (node (ref C13) (pin 1))
       (node (ref C1) (pin 1))
       (node (ref C1) (pin 1))
-      (node (ref R7) (pin 1))
-      (node (ref C5) (pin 1))
-      (node (ref R5) (pin 1))
-      (node (ref C3) (pin 1)))
-    (net (code 47) (name "Net-(R2-Pad2)")
+      (node (ref R9) (pin 1))
+      (node (ref R5) (pin 1)))
+    (net (code 3) (name "Net-(C12-Pad1)")
+      (node (ref U1) (pin 30))
+      (node (ref C12) (pin 1)))
+    (net (code 4) (name "Net-(J1-Pad0)")
+      (node (ref J1) (pin 0)))
+    (net (code 5) (name /swdio)
+      (node (ref U1) (pin 46))
+      (node (ref P8) (pin 4)))
+    (net (code 6) (name /CMD)
+      (node (ref U1) (pin 15))
+      (node (ref P11) (pin 2)))
+    (net (code 7) (name /L_vert)
       (node (ref R2) (pin 2))
       (node (ref R2) (pin 2))
-      (node (ref U1) (pin 23)))
-    (net (code 48) (name "Net-(R1-Pad2)")
-      (node (ref R1) (pin 2))
-      (node (ref U1) (pin 24)))
-    (net (code 49) (name "Net-(C10-Pad1)")
-      (node (ref U1) (pin 6))
+      (node (ref U1) (pin 25)))
+    (net (code 8) (name "Net-(U1-Pad35)")
+      (node (ref U1) (pin 35)))
+    (net (code 9) (name /L_orange)
+      (node (ref R13) (pin 2))
+      (node (ref U1) (pin 26)))
+    (net (code 10) (name "Net-(U1-Pad36)")
+      (node (ref U1) (pin 36)))
+    (net (code 11) (name "Net-(U1-Pad57)")
+      (node (ref U1) (pin 57)))
+    (net (code 12) (name /USB_OTG_FS_ID)
+      (node (ref J1) (pin 4))
+      (node (ref U1) (pin 43)))
+    (net (code 13) (name /MOSI)
+      (node (ref U1) (pin 22))
+      (node (ref U5) (pin 13)))
+    (net (code 14) (name /USB_OTG_FS_VBUS)
+      (node (ref J1) (pin 1))
+      (node (ref U1) (pin 42)))
+    (net (code 15) (name "Net-(U1-Pad52)")
+      (node (ref U1) (pin 52)))
+    (net (code 16) (name /MISO)
+      (node (ref U1) (pin 23))
+      (node (ref U5) (pin 10)))
+    (net (code 17) (name "Net-(U1-Pad33)")
+      (node (ref U1) (pin 33)))
+    (net (code 18) (name /mfp)
+      (node (ref R3) (pin 2))
+      (node (ref U1) (pin 28))
+      (node (ref U3) (pin 12)))
+    (net (code 19) (name "Net-(U1-Pad53)")
+      (node (ref U1) (pin 53)))
+    (net (code 20) (name /aquit)
+      (node (ref SW3) (pin 1))
+      (node (ref R14) (pin 2))
+      (node (ref C15) (pin 2))
+      (node (ref U1) (pin 14)))
+    (net (code 21) (name "Net-(U1-Pad34)")
+      (node (ref U1) (pin 34)))
+    (net (code 22) (name "Net-(U1-Pad54)")
+      (node (ref U1) (pin 54)))
+    (net (code 23) (name "Net-(C10-Pad1)")
       (node (ref C10) (pin 1))
       (node (ref C10) (pin 1))
+      (node (ref U1) (pin 6))
       (node (ref Y1) (pin 2)))
       (node (ref Y1) (pin 2)))
-    (net (code 50) (name "Net-(C11-Pad1)")
+    (net (code 24) (name "Net-(C11-Pad1)")
       (node (ref U1) (pin 5))
       (node (ref U1) (pin 5))
       (node (ref Y1) (pin 1))
       (node (ref Y1) (pin 1))
       (node (ref C11) (pin 1)))
       (node (ref C11) (pin 1)))
-    (net (code 51) (name /s1)
-      (node (ref P5) (pin 1))
-      (node (ref U1) (pin 17)))
-    (net (code 52) (name "Net-(D1-Pad2)")
+    (net (code 25) (name "Net-(U1-Pad11)")
+      (node (ref U1) (pin 11)))
+    (net (code 26) (name "Net-(U1-Pad10)")
+      (node (ref U1) (pin 10)))
+    (net (code 27) (name "Net-(U1-Pad9)")
+      (node (ref U1) (pin 9)))
+    (net (code 28) (name "Net-(U1-Pad8)")
+      (node (ref U1) (pin 8)))
+    (net (code 29) (name "Net-(U1-Pad2)")
+      (node (ref U1) (pin 2)))
+    (net (code 30) (name /swclk)
+      (node (ref U1) (pin 49))
+      (node (ref P8) (pin 2)))
+    (net (code 31) (name /Themp)
+      (node (ref U1) (pin 27))
+      (node (ref P10) (pin 2)))
+    (net (code 32) (name /s7)
+      (node (ref P6) (pin 1))
+      (node (ref U1) (pin 58)))
+    (net (code 33) (name /s8)
+      (node (ref P6) (pin 2))
+      (node (ref U1) (pin 59)))
+    (net (code 34) (name /s9)
+      (node (ref P6) (pin 3))
+      (node (ref U1) (pin 61)))
+    (net (code 35) (name /s10)
+      (node (ref P6) (pin 4))
+      (node (ref U1) (pin 62)))
+    (net (code 36) (name "Net-(U5-Pad4)")
+      (node (ref U5) (pin 4)))
+    (net (code 37) (name "Net-(D3-Pad2)")
+      (node (ref D3) (pin 2))
+      (node (ref R13) (pin 1)))
+    (net (code 38) (name "Net-(U5-Pad5)")
+      (node (ref U5) (pin 5)))
+    (net (code 39) (name "Net-(D1-Pad2)")
       (node (ref D1) (pin 2))
       (node (ref D1) (pin 2))
       (node (ref R1) (pin 1)))
       (node (ref R1) (pin 1)))
-    (net (code 53) (name /s8)
-      (node (ref P6) (pin 2))
-      (node (ref U1) (pin 58)))
-    (net (code 54) (name /s7)
-      (node (ref U1) (pin 59))
-      (node (ref P6) (pin 1)))
-    (net (code 55) (name /s6)
-      (node (ref U1) (pin 61))
-      (node (ref P5) (pin 6)))
-    (net (code 56) (name /s5)
-      (node (ref U1) (pin 62))
-      (node (ref P5) (pin 5)))
-    (net (code 57) (name /s4)
-      (node (ref U1) (pin 14))
-      (node (ref P5) (pin 4)))
-    (net (code 58) (name /s3)
-      (node (ref U1) (pin 15))
-      (node (ref P5) (pin 3)))
-    (net (code 59) (name /s2)
-      (node (ref P5) (pin 2))
-      (node (ref U1) (pin 16)))
-    (net (code 60) (name "Net-(P4-Pad1)")
+    (net (code 40) (name /L_rouge)
+      (node (ref U1) (pin 24))
+      (node (ref R1) (pin 2)))
+    (net (code 41) (name "Net-(U1-Pad4)")
+      (node (ref U1) (pin 4)))
+    (net (code 42) (name "Net-(U5-Pad2)")
+      (node (ref U5) (pin 2)))
+    (net (code 43) (name "Net-(U5-Pad22)")
+      (node (ref U5) (pin 22)))
+    (net (code 44) (name "Net-(U5-Pad21)")
+      (node (ref U5) (pin 21)))
+    (net (code 45) (name "Net-(U5-Pad20)")
+      (node (ref U5) (pin 20)))
+    (net (code 46) (name "Net-(U5-Pad19)")
+      (node (ref U5) (pin 19)))
+    (net (code 47) (name "Net-(U5-Pad18)")
+      (node (ref U5) (pin 18)))
+    (net (code 48) (name "Net-(U5-Pad17)")
+      (node (ref U5) (pin 17)))
+    (net (code 49) (name "Net-(U5-Pad16)")
+      (node (ref U5) (pin 16)))
+    (net (code 50) (name "Net-(U5-Pad12)")
+      (node (ref U5) (pin 12)))
+    (net (code 51) (name "Net-(U5-Pad11)")
+      (node (ref U5) (pin 11)))
+    (net (code 52) (name "Net-(U5-Pad7)")
+      (node (ref U5) (pin 7)))
+    (net (code 53) (name "Net-(U5-Pad6)")
+      (node (ref U5) (pin 6)))
+    (net (code 54) (name "Net-(R11-Pad1)")
+      (node (ref R11) (pin 1))
+      (node (ref U5) (pin 1)))
+    (net (code 55) (name "Net-(R12-Pad1)")
+      (node (ref R12) (pin 1))
+      (node (ref U5) (pin 3)))
+    (net (code 56) (name "Net-(U1-Pad1)")
+      (node (ref U1) (pin 1)))
+    (net (code 57) (name "Net-(U1-Pad51)")
+      (node (ref U1) (pin 51)))
+    (net (code 58) (name "Net-(U1-Pad50)")
+      (node (ref U1) (pin 50)))
+    (net (code 59) (name /I2C2_SDA)
+      (node (ref P9) (pin 2))
+      (node (ref U1) (pin 55)))
+    (net (code 60) (name /I2C2_SDL)
+      (node (ref U1) (pin 29))
+      (node (ref P9) (pin 3)))
+    (net (code 61) (name /12V)
+      (node (ref U4) (pin 3))
+      (node (ref C4) (pin 1))
+      (node (ref Q1) (pin 3))
+      (node (ref P11) (pin 1)))
+    (net (code 62) (name "Net-(U3-Pad7)")
+      (node (ref U3) (pin 7)))
+    (net (code 63) (name "Net-(P1-Pad1)")
+      (node (ref P1) (pin 1)))
+    (net (code 64) (name "Net-(P2-Pad1)")
+      (node (ref P2) (pin 1)))
+    (net (code 65) (name "Net-(U3-Pad18)")
+      (node (ref U3) (pin 18)))
+    (net (code 66) (name "Net-(U3-Pad1)")
+      (node (ref U3) (pin 1)))
+    (net (code 67) (name "Net-(U3-Pad4)")
+      (node (ref U3) (pin 4)))
+    (net (code 68) (name "Net-(U3-Pad13)")
+      (node (ref U3) (pin 13)))
+    (net (code 69) (name "Net-(P4-Pad1)")
       (node (ref P4) (pin 1)))
       (node (ref P4) (pin 1)))
-    (net (code 61) (name "Net-(P3-Pad1)")
+    (net (code 70) (name "Net-(U3-Pad14)")
+      (node (ref U3) (pin 14)))
+    (net (code 71) (name "Net-(P3-Pad1)")
       (node (ref P3) (pin 1)))
       (node (ref P3) (pin 1)))
-    (net (code 62) (name "Net-(BT1-Pad1)")
+    (net (code 72) (name /s1)
+      (node (ref U1) (pin 16))
+      (node (ref P5) (pin 1)))
+    (net (code 73) (name /s2)
+      (node (ref U1) (pin 17))
+      (node (ref P5) (pin 2)))
+    (net (code 74) (name /s3)
+      (node (ref U1) (pin 37))
+      (node (ref P5) (pin 3)))
+    (net (code 75) (name /s4)
+      (node (ref U1) (pin 38))
+      (node (ref P5) (pin 4)))
+    (net (code 76) (name /s5)
+      (node (ref U1) (pin 39))
+      (node (ref P5) (pin 5)))
+    (net (code 77) (name /s6)
+      (node (ref U1) (pin 40))
+      (node (ref P5) (pin 6)))
+    (net (code 78) (name "Net-(D2-Pad2)")
+      (node (ref R2) (pin 1))
+      (node (ref D2) (pin 2)))
+    (net (code 79) (name "Net-(U3-Pad5)")
+      (node (ref U3) (pin 5)))
+    (net (code 80) (name "Net-(BT1-Pad1)")
       (node (ref BT1) (pin 1))
       (node (ref BT1) (pin 1))
       (node (ref U3) (pin 8)))
       (node (ref U3) (pin 8)))
-    (net (code 63) (name "Net-(U3-Pad14)")
-      (node (ref U3) (pin 14)))
-    (net (code 64) (name "Net-(U3-Pad7)")
-      (node (ref U3) (pin 7)))
-    (net (code 65) (name "Net-(U3-Pad13)")
-      (node (ref U3) (pin 13)))
-    (net (code 66) (name "Net-(U3-Pad4)")
-      (node (ref U3) (pin 4)))
-    (net (code 67) (name "Net-(U3-Pad1)")
-      (node (ref U3) (pin 1)))
-    (net (code 68) (name "Net-(U3-Pad18)")
-      (node (ref U3) (pin 18)))
-    (net (code 69) (name "Net-(P2-Pad1)")
-      (node (ref P2) (pin 1)))
-    (net (code 70) (name "Net-(P1-Pad1)")
-      (node (ref P1) (pin 1)))
-    (net (code 71) (name "Net-(D2-Pad2)")
-      (node (ref D2) (pin 2))
-      (node (ref R2) (pin 1)))
-    (net (code 72) (name "Net-(R6-Pad1)")
-      (node (ref R7) (pin 2))
+    (net (code 81) (name /sda)
+      (node (ref U2) (pin 8))
+      (node (ref R5) (pin 2))
+      (node (ref U3) (pin 10))
+      (node (ref U1) (pin 56)))
+    (net (code 82) (name "Net-(R6-Pad1)")
+      (node (ref U4) (pin 1))
       (node (ref R6) (pin 1))
       (node (ref R6) (pin 1))
-      (node (ref U4) (pin 1)))
-    (net (code 73) (name "Net-(U3-Pad5)")
-      (node (ref U3) (pin 5)))
-    (net (code 74) (name /sdl)
-      (node (ref U2) (pin 2))
+      (node (ref R7) (pin 2)))
+    (net (code 83) (name "Net-(P7-Pad2)")
+      (node (ref P7) (pin 2))
+      (node (ref Q1) (pin 2)))
+    (net (code 84) (name /boot0)
+      (node (ref C7) (pin 2))
+      (node (ref R9) (pin 2))
+      (node (ref SW2) (pin 1))
+      (node (ref U1) (pin 60)))
+    (net (code 85) (name /nrst)
+      (node (ref SW1) (pin 1))
+      (node (ref P8) (pin 5))
+      (node (ref U1) (pin 7))
+      (node (ref R8) (pin 2))
+      (node (ref C6) (pin 2)))
+    (net (code 86) (name /CS_Wifi)
+      (node (ref U5) (pin 9))
+      (node (ref U1) (pin 20)))
+    (net (code 87) (name /CLK)
+      (node (ref U5) (pin 14))
+      (node (ref U1) (pin 21)))
+    (net (code 88) (name /sdl)
       (node (ref U3) (pin 11))
       (node (ref U3) (pin 11))
       (node (ref R4) (pin 2))
       (node (ref R4) (pin 2))
+      (node (ref U2) (pin 7))
       (node (ref U1) (pin 41)))
       (node (ref U1) (pin 41)))
-    (net (code 75) (name /sda)
-      (node (ref U1) (pin 56))
-      (node (ref R5) (pin 2))
-      (node (ref U3) (pin 10))
-      (node (ref U2) (pin 1)))))
+    (net (code 89) (name /wc)
+      (node (ref R10) (pin 2))
+      (node (ref U1) (pin 3))
+      (node (ref U2) (pin 6)))
+    (net (code 90) (name /USB_OTG_FS_P)
+      (node (ref J1) (pin 3))
+      (node (ref U1) (pin 45)))
+    (net (code 91) (name /USB_OTG_FS_N)
+      (node (ref J1) (pin 2))
+      (node (ref U1) (pin 44)))
+    (net (code 92) (name "Net-(U4-Pad0)")
+      (node (ref U4) (pin 0)))))

+ 9 - 2
Eda/Controle/proc.pro

@@ -1,4 +1,4 @@
-update=mar. 30 mai 2017 16:29:08 CEST
+update=04/07/2018 14:10:03
 version=1
 version=1
 last_client=kicad
 last_client=kicad
 [pcbnew]
 [pcbnew]
@@ -37,7 +37,7 @@ SpiceUseNetNumbers=0
 LabSize=60
 LabSize=60
 [eeschema]
 [eeschema]
 version=1
 version=1
-LibDir=$(KISYSMOD)/schematic
+LibDir=D:/Projet/Librairie_Kicad/schematic
 [eeschema/libraries]
 [eeschema/libraries]
 LibName1=proc-rescue
 LibName1=proc-rescue
 LibName2=conn
 LibName2=conn
@@ -46,4 +46,11 @@ LibName4=ST
 LibName5=Motor
 LibName5=Motor
 LibName6=Analog
 LibName6=Analog
 LibName7=Toshiba
 LibName7=Toshiba
+LibName8=esp-12f
+LibName9=afficheur
+LibName10=NXP
+LibName11=ONSemi
+LibName12=relay
+LibName13=TI
+LibName14=Torex
 
 

+ 379 - 190
Eda/Controle/proc.sch

@@ -6,6 +6,13 @@ LIBS:ST
 LIBS:Motor
 LIBS:Motor
 LIBS:Analog
 LIBS:Analog
 LIBS:Toshiba
 LIBS:Toshiba
+LIBS:esp-12f
+LIBS:afficheur
+LIBS:NXP
+LIBS:ONSemi
+LIBS:relay
+LIBS:TI
+LIBS:Torex
 LIBS:proc-cache
 LIBS:proc-cache
 EELAYER 25 0
 EELAYER 25 0
 EELAYER END
 EELAYER END
@@ -59,37 +66,37 @@ RTC\n
 $Comp
 $Comp
 L R R6
 L R R6
 U 1 1 56C84A2E
 U 1 1 56C84A2E
-P 9400 3900
-F 0 "R6" V 9480 3900 50  0000 C CNN
-F 1 "510" V 9400 3900 50  0000 C CNN
-F 2 "R:0603" V 9330 3900 50  0001 C CNN
-F 3 "" H 9400 3900 50  0000 C CNN
-	1    9400 3900
+P 9225 4600
+F 0 "R6" V 9305 4600 50  0000 C CNN
+F 1 "510" V 9225 4600 50  0000 C CNN
+F 2 "R:0603" V 9155 4600 50  0001 C CNN
+F 3 "" H 9225 4600 50  0000 C CNN
+	1    9225 4600
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
 $Comp
 $Comp
 L R R7
 L R R7
 U 1 1 56C84A83
 U 1 1 56C84A83
-P 10100 3450
-F 0 "R7" V 10180 3450 50  0000 C CNN
-F 1 "330" V 10100 3450 50  0000 C CNN
-F 2 "R:0603" V 10030 3450 50  0001 C CNN
-F 3 "" H 10100 3450 50  0000 C CNN
-	1    10100 3450
+P 9925 4150
+F 0 "R7" V 10005 4150 50  0000 C CNN
+F 1 "330" V 9925 4150 50  0000 C CNN
+F 2 "R:0603" V 9855 4150 50  0001 C CNN
+F 3 "" H 9925 4150 50  0000 C CNN
+	1    9925 4150
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
 $Comp
 $Comp
 L CP1 C5
 L CP1 C5
 U 1 1 56C84AD6
 U 1 1 56C84AD6
-P 10400 3700
-F 0 "C5" H 10425 3800 50  0000 L CNN
-F 1 "10µ" H 10425 3600 50  0000 L CNN
-F 2 "C:CP_Alu" H 10400 3700 50  0001 C CNN
-F 3 "" H 10400 3700 50  0000 C CNN
-	1    10400 3700
+P 10225 4400
+F 0 "C5" H 10250 4500 50  0000 L CNN
+F 1 "10µ" H 10250 4300 50  0000 L CNN
+F 2 "C:CP_Alu" H 10225 4400 50  0001 C CNN
+F 3 "" H 10225 4400 50  0000 C CNN
+	1    10225 4400
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
-Text Notes 9350 2850 0    60   ~ 0
+Text Notes 9175 3550 0    60   ~ 0
 Alim
 Alim
 $Comp
 $Comp
 L CONN_01X02 P7
 L CONN_01X02 P7
@@ -97,7 +104,7 @@ U 1 1 56C85860
 P 6400 5150
 P 6400 5150
 F 0 "P7" H 6400 5300 50  0000 C CNN
 F 0 "P7" H 6400 5300 50  0000 C CNN
 F 1 "Alim" V 6500 5150 50  0000 C CNN
 F 1 "Alim" V 6500 5150 50  0000 C CNN
-F 2 "Connector:bornier_2x1" H 6400 5150 50  0001 C CNN
+F 2 "Connector:Bornier2.54_1x2" H 6400 5150 50  0001 C CNN
 F 3 "" H 6400 5150 50  0000 C CNN
 F 3 "" H 6400 5150 50  0000 C CNN
 	1    6400 5150
 	1    6400 5150
 	-1   0    0    1   
 	-1   0    0    1   
@@ -110,67 +117,67 @@ Text Label 6650 1500 2    60   ~ 0
 mfp
 mfp
 Text Label 7000 800  1    60   ~ 0
 Text Label 7000 800  1    60   ~ 0
 vdd
 vdd
-Text Label 8700 3200 2    60   ~ 0
+Text Label 8525 3900 2    60   ~ 0
 12V
 12V
-Text Label 9400 4100 3    60   ~ 0
+Text Label 9225 4800 3    60   ~ 0
 GND
 GND
 Text Label 7450 4900 0    60   ~ 0
 Text Label 7450 4900 0    60   ~ 0
 12V
 12V
 Text Label 7450 5200 0    60   ~ 0
 Text Label 7450 5200 0    60   ~ 0
 GND
 GND
-Text Label 8450 4625 2    60   ~ 0
+Text Label 8450 5300 2    60   ~ 0
 s1
 s1
-Text Label 8450 4725 2    60   ~ 0
+Text Label 8450 5400 2    60   ~ 0
 s2
 s2
-Text Label 8450 4825 2    60   ~ 0
+Text Label 8450 5500 2    60   ~ 0
 s3
 s3
-Text Label 8450 4925 2    60   ~ 0
+Text Label 8450 5600 2    60   ~ 0
 s4
 s4
-Text Label 8450 5025 2    60   ~ 0
+Text Label 8450 5700 2    60   ~ 0
 s5
 s5
-Text Label 8450 5125 2    60   ~ 0
+Text Label 8450 5800 2    60   ~ 0
 s6
 s6
-Text Label 9075 4625 2    60   ~ 0
+Text Label 9075 5300 2    60   ~ 0
 s7
 s7
-Text Label 9075 4725 2    60   ~ 0
+Text Label 9075 5400 2    60   ~ 0
 s8
 s8
-Text Label 9075 4825 2    60   ~ 0
+Text Label 9075 5500 2    60   ~ 0
 s9
 s9
-Text Label 9075 4925 2    60   ~ 0
+Text Label 9075 5600 2    60   ~ 0
 s10
 s10
 Text Label 3325 4250 1    60   ~ 0
 Text Label 3325 4250 1    60   ~ 0
 sda
 sda
 Text Label 4525 5450 0    60   ~ 0
 Text Label 4525 5450 0    60   ~ 0
 sdl
 sdl
-Text Label 2525 6750 3    60   ~ 0
-s1
 Text Label 2025 6250 2    60   ~ 0
 Text Label 2025 6250 2    60   ~ 0
+s1
+Text Label 2525 6750 3    60   ~ 0
 s2
 s2
-Text Label 2025 6150 2    60   ~ 0
+Text Label 4525 5850 0    60   ~ 0
 s3
 s3
-Text Label 2025 6050 2    60   ~ 0
+Text Label 4525 5750 0    60   ~ 0
 s4
 s4
-Text Label 2725 4250 1    60   ~ 0
+Text Label 4525 5650 0    60   ~ 0
 s5
 s5
-Text Label 2825 4250 1    60   ~ 0
+Text Label 4525 5550 0    60   ~ 0
 s6
 s6
-Text Label 3025 4250 1    60   ~ 0
-s7
 Text Label 3125 4250 1    60   ~ 0
 Text Label 3125 4250 1    60   ~ 0
+s7
+Text Label 3025 4250 1    60   ~ 0
 s8
 s8
-Text Label 4525 5850 0    60   ~ 0
+Text Label 2825 4250 1    60   ~ 0
 s9
 s9
-Text Label 4525 5750 0    60   ~ 0
+Text Label 2725 4250 1    60   ~ 0
 s10
 s10
-Text Label 10600 5900 2    60   ~ 0
+Text Label 10825 5950 2    60   ~ 0
 vdd
 vdd
-Text Label 10600 6000 2    60   ~ 0
+Text Label 10825 6050 2    60   ~ 0
 swclk
 swclk
-Text Label 10600 6100 2    60   ~ 0
+Text Label 10825 6150 2    60   ~ 0
 GND
 GND
-Text Label 10600 6200 2    60   ~ 0
+Text Label 10825 6250 2    60   ~ 0
 swdio
 swdio
-Text Label 10600 6300 2    60   ~ 0
+Text Label 10825 6350 2    60   ~ 0
 nrst
 nrst
 Text Label 2025 5350 2    60   ~ 0
 Text Label 2025 5350 2    60   ~ 0
 nrst
 nrst
@@ -211,12 +218,12 @@ swclk
 $Comp
 $Comp
 L CONN_01X05 P8
 L CONN_01X05 P8
 U 1 1 57062F1C
 U 1 1 57062F1C
-P 10800 6100
-F 0 "P8" H 10800 6400 50  0000 C CNN
-F 1 "Debug" V 10900 6100 50  0000 C CNN
-F 2 "Connector:1X6_2.54" H 10800 6100 50  0001 C CNN
-F 3 "" H 10800 6100 50  0000 C CNN
-	1    10800 6100
+P 11025 6150
+F 0 "P8" H 11025 6450 50  0000 C CNN
+F 1 "Debug" V 11125 6150 50  0000 C CNN
+F 2 "Connector:PinHeader2.54_1X5" H 11025 6150 50  0001 C CNN
+F 3 "" H 11025 6150 50  0000 C CNN
+	1    11025 6150
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
 Text Label 6200 6200 3    60   ~ 0
 Text Label 6200 6200 3    60   ~ 0
@@ -229,87 +236,57 @@ Text Label 7100 5900 0    60   ~ 0
 sdl
 sdl
 Text Label 7100 5800 0    60   ~ 0
 Text Label 7100 5800 0    60   ~ 0
 sda
 sda
-Text Label 2025 5050 2    60   ~ 0
+Text Label 3625 6750 3    60   ~ 0
 mfp
 mfp
-Text Label 9075 5025 2    60   ~ 0
-s11
-Text Label 9075 5125 2    60   ~ 0
-s12
 $Comp
 $Comp
 L CONN_01X06 P5
 L CONN_01X06 P5
 U 1 1 570CFB57
 U 1 1 570CFB57
-P 8650 4875
-F 0 "P5" H 8650 5225 50  0000 C CNN
-F 1 "CONN_01X06" V 8750 4875 50  0000 C CNN
-F 2 "Connector:bornier_6x1" H 8650 4875 50  0001 C CNN
-F 3 "" H 8650 4875 50  0000 C CNN
-	1    8650 4875
-	1    0    0    -1  
-$EndComp
-$Comp
-L CONN_01X06 P6
-U 1 1 570CFBC4
-P 9275 4875
-F 0 "P6" H 9275 5225 50  0000 C CNN
-F 1 "CONN_01X06" V 9375 4875 50  0000 C CNN
-F 2 "Connector:bornier_6x1" H 9275 4875 50  0001 C CNN
-F 3 "" H 9275 4875 50  0000 C CNN
-	1    9275 4875
+P 8650 5550
+F 0 "P5" H 8650 5900 50  0000 C CNN
+F 1 "CONN_01X06" V 8750 5550 50  0000 C CNN
+F 2 "Connector:Bornier2.54_1x6" H 8650 5550 50  0001 C CNN
+F 3 "" H 8650 5550 50  0000 C CNN
+	1    8650 5550
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
-Text Label 4525 5650 0    60   ~ 0
-s11
-Text Label 4525 5550 0    60   ~ 0
-s12
-$Comp
-L R R1
-U 1 1 570E42C5
-P 3275 6975
-F 0 "R1" V 3355 6975 50  0000 C CNN
-F 1 "100" V 3275 6975 50  0000 C CNN
-F 2 "R:0603" V 3205 6975 50  0001 C CNN
-F 3 "" H 3275 6975 50  0000 C CNN
-	1    3275 6975
-	-1   0    0    1   
-$EndComp
 $Comp
 $Comp
 L LED D1
 L LED D1
 U 1 1 570E4326
 U 1 1 570E4326
-P 3275 7325
-F 0 "D1" H 3100 7250 50  0000 C CNN
-F 1 "rouge" H 3450 7275 50  0000 C CNN
-F 2 "Dialight:598-xxxx-107F" H 3275 7325 50  0001 C CNN
-F 3 "" H 3275 7325 50  0000 C CNN
-F 4 "598-8010-107F" H 3275 7325 60  0001 C CNN "part"
-	1    3275 7325
+P 5350 7100
+F 0 "D1" H 5175 7025 50  0000 C CNN
+F 1 "rouge" H 5425 7025 50  0000 C CNN
+F 2 "LED:0805" H 5350 7100 50  0001 C CNN
+F 3 "" H 5350 7100 50  0000 C CNN
+F 4 "598-8010-107F" H 5350 7100 60  0001 C CNN "part"
+	1    5350 7100
 	0    -1   -1   0   
 	0    -1   -1   0   
 $EndComp
 $EndComp
 $Comp
 $Comp
 L R R2
 L R R2
 U 1 1 570E4510
 U 1 1 570E4510
-P 3075 6975
-F 0 "R2" V 3155 6975 50  0000 C CNN
-F 1 "100" V 3075 6975 50  0000 C CNN
-F 2 "R:0603" V 3005 6975 50  0001 C CNN
-F 3 "" H 3075 6975 50  0000 C CNN
-	1    3075 6975
+P 5150 6750
+F 0 "R2" V 5230 6750 50  0000 C CNN
+F 1 "100" V 5150 6750 50  0000 C CNN
+F 2 "R:0603" V 5080 6750 50  0001 C CNN
+F 3 "" H 5150 6750 50  0000 C CNN
+	1    5150 6750
 	-1   0    0    1   
 	-1   0    0    1   
 $EndComp
 $EndComp
 $Comp
 $Comp
 L LED D2
 L LED D2
 U 1 1 570E4516
 U 1 1 570E4516
-P 3075 7325
-F 0 "D2" H 2875 7425 50  0000 C CNN
-F 1 "vert" H 3250 7425 50  0000 C CNN
-F 2 "Dialight:598-xxxx-107F" H 3075 7325 50  0001 C CNN
-F 3 "" H 3075 7325 50  0000 C CNN
-F 4 "598-8070-107F" H 3075 7325 60  0001 C CNN "part"
-	1    3075 7325
+P 5150 7100
+F 0 "D2" H 4975 7050 50  0000 C CNN
+F 1 "vert" H 5250 7025 50  0000 C CNN
+F 2 "LED:0805" H 5150 7100 50  0001 C CNN
+F 3 "" H 5150 7100 50  0000 C CNN
+F 4 "598-8070-107F" H 5150 7100 60  0001 C CNN "part"
+	1    5150 7100
 	0    -1   -1   0   
 	0    -1   -1   0   
 $EndComp
 $EndComp
-Text Label 3275 7525 3    60   ~ 0
+Text Label 5350 7300 3    60   ~ 0
 GND
 GND
-Text Label 3075 7525 3    60   ~ 0
+Text Label 5150 7300 3    60   ~ 0
 GND
 GND
 $Comp
 $Comp
 L CONN_01X01 P3
 L CONN_01X01 P3
@@ -404,13 +381,13 @@ vdd
 $Comp
 $Comp
 L M24C32 U2
 L M24C32 U2
 U 1 1 57E3BDFF
 U 1 1 57E3BDFF
-P 6650 6150
-F 0 "U2" H 6850 6100 60  0000 C CNN
-F 1 "M24C32" H 6650 6600 60  0000 C CNN
-F 2 "U:SO8N" H 6650 6150 60  0001 C CNN
-F 3 "" H 6650 6150 60  0000 C CNN
-	1    6650 6150
-	1    0    0    -1  
+P 6650 5750
+F 0 "U2" H 6850 5700 60  0000 C CNN
+F 1 "M24C32" H 6650 6200 60  0000 C CNN
+F 2 "U:SO8N" H 6650 5750 60  0001 C CNN
+F 3 "" H 6650 5750 60  0000 C CNN
+	1    6650 5750
+	-1   0    0    1   
 $EndComp
 $EndComp
 $Comp
 $Comp
 L M41T83 U3
 L M41T83 U3
@@ -480,17 +457,17 @@ $EndComp
 Text Label 8800 1600 0    60   ~ 0
 Text Label 8800 1600 0    60   ~ 0
 VDD
 VDD
 NoConn ~ 8800 1700
 NoConn ~ 8800 1700
-Text Label 10650 3200 0    60   ~ 0
+Text Label 10475 3900 0    60   ~ 0
 VDD
 VDD
 $Comp
 $Comp
 L CP1 C4
 L CP1 C4
 U 1 1 570673A6
 U 1 1 570673A6
-P 8850 3650
-F 0 "C4" H 8875 3750 50  0000 L CNN
-F 1 "100n" H 8875 3550 50  0000 L CNN
-F 2 "C:CP_Alu" H 8850 3650 50  0001 C CNN
-F 3 "" H 8850 3650 50  0000 C CNN
-	1    8850 3650
+P 8675 4350
+F 0 "C4" H 8700 4450 50  0000 L CNN
+F 1 "100n" H 8700 4250 50  0000 L CNN
+F 2 "C:CP_Alu" H 8675 4350 50  0001 C CNN
+F 3 "" H 8675 4350 50  0000 C CNN
+	1    8675 4350
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
 Text Label 2425 3875 1    60   ~ 0
 Text Label 2425 3875 1    60   ~ 0
@@ -500,29 +477,14 @@ GND
 $Comp
 $Comp
 L LM317-RESCUE-proc U4
 L LM317-RESCUE-proc U4
 U 1 1 57E4F7D8
 U 1 1 57E4F7D8
-P 9400 3200
-F 0 "U4" H 9550 2950 60  0000 C CNN
-F 1 "LM317" H 9400 3400 60  0000 C CNN
-F 2 "U:LM317" H 9400 3200 60  0001 C CNN
-F 3 "" H 9400 3200 60  0000 C CNN
-	1    9400 3200
+P 9225 3900
+F 0 "U4" H 9375 3650 60  0000 C CNN
+F 1 "LM317" H 9225 4100 60  0000 C CNN
+F 2 "U:LM317" H 9225 3900 60  0001 C CNN
+F 3 "" H 9225 3900 60  0000 C CNN
+	1    9225 3900
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
-$Comp
-L P_MOSFET Q1
-U 1 1 58122852
-P 7000 4950
-F 0 "Q1" H 7160 5090 60  0000 C CNN
-F 1 "P_MOSFET" H 7000 4810 60  0000 C CNN
-F 2 "U:SOT-223" H 7000 4950 60  0001 C CNN
-F 3 "" H 7000 4950 60  0001 C CNN
-F 4 "Value" H 7000 4950 60  0001 C CNN "vendor"
-F 5 "Value" H 7000 4950 60  0001 C CNN "part"
-F 6 "Value" H 7000 4950 60  0001 C CNN "p/mouser"
-F 7 "Value" H 7000 4950 60  0001 C CNN "p/farnell"
-	1    7000 4950
-	-1   0    0    1   
-$EndComp
 Wire Wire Line
 Wire Wire Line
 	6650 1500 7500 1500
 	6650 1500 7500 1500
 Wire Wire Line
 Wire Wire Line
@@ -546,27 +508,27 @@ Connection ~ 6800 1500
 Wire Notes Line
 Wire Notes Line
 	5900 2650 11200 2650
 	5900 2650 11200 2650
 Wire Wire Line
 Wire Wire Line
-	8850 3500 8850 3200
+	8675 4200 8675 3900
 Wire Wire Line
 Wire Wire Line
-	8700 3200 9000 3200
+	8525 3900 8825 3900
 Wire Wire Line
 Wire Wire Line
-	9800 3200 10650 3200
+	9625 3900 10475 3900
 Wire Wire Line
 Wire Wire Line
-	10400 3200 10400 3550
-Connection ~ 10100 3200
+	10225 3900 10225 4250
+Connection ~ 9925 3900
 Wire Wire Line
 Wire Wire Line
-	8850 3800 8850 4050
+	8675 4500 8675 4750
 Wire Wire Line
 Wire Wire Line
-	8850 4050 10400 4050
+	8675 4750 10225 4750
 Wire Wire Line
 Wire Wire Line
-	10400 4050 10400 3850
-Connection ~ 9400 4050
+	10225 4750 10225 4550
+Connection ~ 9225 4750
 Wire Wire Line
 Wire Wire Line
-	9400 3600 9400 3750
-Connection ~ 10400 3200
-Connection ~ 8850 3200
+	9225 4300 9225 4450
+Connection ~ 10225 3900
+Connection ~ 8675 3900
 Wire Notes Line
 Wire Notes Line
-	8050 4400 11200 4400
+	8050 5100 11200 5100
 Wire Wire Line
 Wire Wire Line
 	6200 5800 6200 6200
 	6200 5800 6200 6200
 Connection ~ 6200 5900
 Connection ~ 6200 5900
@@ -649,11 +611,11 @@ Connection ~ 7000 5200
 Wire Notes Line
 Wire Notes Line
 	5900 4550 8050 4550
 	5900 4550 8050 4550
 Wire Wire Line
 Wire Wire Line
-	9400 3600 10100 3600
+	9225 4300 9925 4300
 Wire Wire Line
 Wire Wire Line
-	10100 3200 10100 3300
+	9925 3900 9925 4000
 Wire Wire Line
 Wire Wire Line
-	9400 4050 9400 4100
+	9225 4750 9225 4800
 $Comp
 $Comp
 L SW_PUSH SW2
 L SW_PUSH SW2
 U 1 1 57061F5B
 U 1 1 57061F5B
@@ -682,7 +644,7 @@ Wire Wire Line
 	10900 2050 10950 2050
 	10900 2050 10950 2050
 Wire Wire Line
 Wire Wire Line
 	10300 2050 10150 2050
 	10300 2050 10150 2050
-NoConn ~ 9100 3100
+NoConn ~ 8925 3800
 $Comp
 $Comp
 L Micro_USB J1
 L Micro_USB J1
 U 1 1 59256A87
 U 1 1 59256A87
@@ -718,13 +680,6 @@ NoConn ~ 2025 5450
 NoConn ~ 2025 5550
 NoConn ~ 2025 5550
 NoConn ~ 2025 5650
 NoConn ~ 2025 5650
 NoConn ~ 2025 5750
 NoConn ~ 2025 5750
-NoConn ~ 2825 6750
-NoConn ~ 2925 6750
-NoConn ~ 3025 6750
-NoConn ~ 3325 6750
-NoConn ~ 3425 6750
-NoConn ~ 3525 6750
-NoConn ~ 3625 6750
 NoConn ~ 4525 5950
 NoConn ~ 4525 5950
 NoConn ~ 4525 6050
 NoConn ~ 4525 6050
 NoConn ~ 4525 6150
 NoConn ~ 4525 6150
@@ -939,8 +894,6 @@ Text Label 800  6825 1    60   ~ 0
 VDD
 VDD
 Text Label 800  7125 3    60   ~ 0
 Text Label 800  7125 3    60   ~ 0
 GND
 GND
-Wire Notes Line
-	-550 3650 5900 3650
 NoConn ~ 6200 4050
 NoConn ~ 6200 4050
 Text Label 4525 5350 0    60   ~ 0
 Text Label 4525 5350 0    60   ~ 0
 USB_OTG_FS_VBUS
 USB_OTG_FS_VBUS
@@ -959,14 +912,6 @@ Wire Wire Line
 	2625 4100 2625 4250
 	2625 4100 2625 4250
 Wire Wire Line
 Wire Wire Line
 	2525 4250 2525 4100
 	2525 4250 2525 4100
-Wire Wire Line
-	3225 6750 3225 6825
-Wire Wire Line
-	3225 6825 3275 6825
-Wire Wire Line
-	3125 6750 3125 6825
-Wire Wire Line
-	3125 6825 3075 6825
 Text Label 2025 4950 2    60   ~ 0
 Text Label 2025 4950 2    60   ~ 0
 wc
 wc
 NoConn ~ 3225 4250
 NoConn ~ 3225 4250
@@ -978,19 +923,19 @@ NoConn ~ 3925 4250
 $Comp
 $Comp
 L CONN_01X03 P9
 L CONN_01X03 P9
 U 1 1 59B166C5
 U 1 1 59B166C5
-P 10800 5450
-F 0 "P9" H 10800 5650 50  0000 C CNN
-F 1 "I2C" V 10900 5450 50  0000 C CNN
-F 2 "Connector:bornier_1x3" H 10800 5450 50  0001 C CNN
-F 3 "" H 10800 5450 50  0000 C CNN
-	1    10800 5450
+P 10025 6200
+F 0 "P9" H 10025 6400 50  0000 C CNN
+F 1 "I2C" V 10125 6200 50  0000 C CNN
+F 2 "Connector:Bornier2.54_1x3" H 10025 6200 50  0001 C CNN
+F 3 "" H 10025 6200 50  0000 C CNN
+	1    10025 6200
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
-Text Label 10600 5350 2    60   ~ 0
+Text Label 9825 6100 2    60   ~ 0
 GND
 GND
-Text Label 10600 5450 2    60   ~ 0
+Text Label 9825 6200 2    60   ~ 0
 I2C2_SDA
 I2C2_SDA
-Text Label 10600 5550 2    60   ~ 0
+Text Label 9825 6300 2    60   ~ 0
 I2C2_SDL
 I2C2_SDL
 Text Label 3425 4250 1    60   ~ 0
 Text Label 3425 4250 1    60   ~ 0
 I2C2_SDA
 I2C2_SDA
@@ -1008,4 +953,248 @@ Wire Wire Line
 	4025 6750 4025 6800
 	4025 6750 4025 6800
 Wire Wire Line
 Wire Wire Line
 	4025 6800 4075 6800
 	4025 6800 4075 6800
+$Comp
+L ESP-12F U5
+U 1 1 5B362B9A
+P 1950 1150
+F 0 "U5" H 2400 550 60  0000 C CNN
+F 1 "ESP-12F" H 1950 1750 60  0000 C CNN
+F 2 "U:ESP-12F" H 1950 1100 60  0001 C CNN
+F 3 "" H 1950 1100 60  0001 C CNN
+	1    1950 1150
+	1    0    0    -1  
+$EndComp
+Text Label 2650 700  0    60   ~ 0
+GND
+$Comp
+L CONN_01X03 P11
+U 1 1 5B364CD7
+P 9175 6200
+F 0 "P11" H 9175 6400 50  0000 C CNN
+F 1 "Ventilateur" V 9275 6200 50  0000 C CNN
+F 2 "Connector:Bornier2.54_1x3" H 9175 6200 50  0001 C CNN
+F 3 "" H 9175 6200 50  0000 C CNN
+	1    9175 6200
+	1    0    0    -1  
+$EndComp
+Text Label 8975 6100 2    60   ~ 0
+12V
+Text Label 8975 6200 2    60   ~ 0
+CMD
+Text Label 8975 6300 2    60   ~ 0
+GND
+Wire Notes Line
+	5900 3650 500  3650
+Text Label 1700 1850 3    60   ~ 0
+CS_Wifi
+Text Label 1800 1850 3    60   ~ 0
+MISO
+Text Label 2100 1850 3    60   ~ 0
+MOSI
+Text Label 2200 1850 3    60   ~ 0
+CLK
+Text Label 1250 1400 2    60   ~ 0
+VDD
+$Comp
+L R R11
+U 1 1 5B3A483C
+P 1100 700
+F 0 "R11" V 1180 700 50  0000 C CNN
+F 1 "10K" V 1100 700 50  0000 C CNN
+F 2 "R:0603" V 1030 700 50  0001 C CNN
+F 3 "" H 1100 700 50  0000 C CNN
+	1    1100 700 
+	0    1    1    0   
+$EndComp
+$Comp
+L R R12
+U 1 1 5B3A48BD
+P 1100 900
+F 0 "R12" V 1180 900 50  0000 C CNN
+F 1 "10K" V 1100 900 50  0000 C CNN
+F 2 "R:0603" V 1030 900 50  0001 C CNN
+F 3 "" H 1100 900 50  0000 C CNN
+	1    1100 900 
+	0    1    1    0   
+$EndComp
+Text Label 950  700  2    60   ~ 0
+VDD
+Text Label 950  900  2    60   ~ 0
+VDD
+Text Label 2825 6750 3    60   ~ 0
+CS_Wifi
+Text Label 3125 6750 3    60   ~ 0
+MISO
+Text Label 3025 6750 3    60   ~ 0
+MOSI
+Text Label 2925 6750 3    60   ~ 0
+CLK
+$Comp
+L LED D3
+U 1 1 5B3A77C2
+P 5550 7100
+F 0 "D3" H 5375 7025 50  0000 C CNN
+F 1 "Orange" H 5625 7025 50  0000 C CNN
+F 2 "LED:0805" H 5550 7100 50  0001 C CNN
+F 3 "" H 5550 7100 50  0000 C CNN
+F 4 "598-8010-107F" H 5550 7100 60  0001 C CNN "part"
+	1    5550 7100
+	0    -1   -1   0   
+$EndComp
+$Comp
+L R R13
+U 1 1 5B3A7872
+P 5550 6750
+F 0 "R13" V 5630 6750 50  0000 C CNN
+F 1 "100" V 5550 6750 50  0000 C CNN
+F 2 "R:0603" V 5480 6750 50  0001 C CNN
+F 3 "" H 5550 6750 50  0000 C CNN
+	1    5550 6750
+	-1   0    0    1   
+$EndComp
+Text Label 5550 7300 3    60   ~ 0
+GND
+$Comp
+L R R1
+U 1 1 570E42C5
+P 5350 6750
+F 0 "R1" V 5430 6750 50  0000 C CNN
+F 1 "100" V 5350 6750 50  0000 C CNN
+F 2 "R:0603" V 5280 6750 50  0001 C CNN
+F 3 "" H 5350 6750 50  0000 C CNN
+	1    5350 6750
+	-1   0    0    1   
+$EndComp
+Text Label 3425 6750 3    60   ~ 0
+L_orange
+Text Label 3325 6750 3    60   ~ 0
+L_vert
+Text Label 3225 6750 3    60   ~ 0
+L_rouge
+Text Label 5550 6600 1    60   ~ 0
+L_orange
+Text Label 5150 6600 1    60   ~ 0
+L_vert
+Text Label 5350 6600 1    60   ~ 0
+L_rouge
+Text Label 2025 6150 2    60   ~ 0
+CMD
+$Comp
+L CONN_01X03 P10
+U 1 1 5B3AE3C4
+P 8600 6175
+F 0 "P10" H 8600 6375 50  0000 C CNN
+F 1 "Thermometre" V 8700 6175 50  0000 C CNN
+F 2 "Connector:Bornier2.54_1x3" H 8600 6175 50  0001 C CNN
+F 3 "" H 8600 6175 50  0000 C CNN
+	1    8600 6175
+	1    0    0    -1  
+$EndComp
+Text Label 8400 6275 2    60   ~ 0
+GND
+Text Label 8400 6075 2    60   ~ 0
+VDD
+Text Label 8400 6175 2    60   ~ 0
+Themp
+Text Label 3525 6750 3    60   ~ 0
+Themp
+$Comp
+L N_MOSFET Q1
+U 1 1 5B3CCE17
+P 7000 4950
+F 0 "Q1" H 7160 5090 60  0000 C CNN
+F 1 "N_MOSFET" H 7000 4810 60  0000 C CNN
+F 2 "U:SOT-223" H 7000 4950 60  0001 C CNN
+F 3 "" H 7000 4950 60  0001 C CNN
+	1    7000 4950
+	-1   0    0    1   
+$EndComp
+$Comp
+L CONN_01X04 P6
+U 1 1 5B3CE1CC
+P 9275 5450
+F 0 "P6" H 9275 5700 50  0000 C CNN
+F 1 "CONN_01X04" V 9375 5450 50  0000 C CNN
+F 2 "Connector:Bornier2.54_1x4" H 9275 5450 50  0001 C CNN
+F 3 "" H 9275 5450 50  0000 C CNN
+	1    9275 5450
+	1    0    0    -1  
+$EndComp
+NoConn ~ 1250 1000
+NoConn ~ 1250 1100
+NoConn ~ 1250 1200
+NoConn ~ 1250 1300
+NoConn ~ 1900 1850
+NoConn ~ 2000 1850
+NoConn ~ 2650 800 
+NoConn ~ 2650 900 
+NoConn ~ 2650 1000
+NoConn ~ 2650 1100
+NoConn ~ 2650 1200
+NoConn ~ 2650 1300
+NoConn ~ 2650 1400
+NoConn ~ 1250 800 
+$Comp
+L R R14
+U 1 1 5B3D4E22
+P 5725 650
+F 0 "R14" V 5805 650 50  0000 C CNN
+F 1 "10K" V 5725 650 50  0000 C CNN
+F 2 "R:0603" V 5655 650 50  0001 C CNN
+F 3 "" H 5725 650 50  0000 C CNN
+F 4 "Value" H 5725 650 60  0001 C CNN "vendor"
+F 5 "Value" H 5725 650 60  0001 C CNN "part"
+F 6 "Value" H 5725 650 60  0001 C CNN "p/mouser"
+F 7 "Value" H 5725 650 60  0001 C CNN "p/farnell"
+	1    5725 650 
+	0    1    1    0   
+$EndComp
+Text Label 5275 950  2    60   ~ 0
+aquit
+Text Label 6075 950  0    60   ~ 0
+GND
+Text Label 6075 650  0    60   ~ 0
+VDD
+$Comp
+L C C15
+U 1 1 5B3D4E2B
+P 5725 1250
+F 0 "C15" H 5750 1350 50  0000 L CNN
+F 1 "100nF" H 5750 1150 50  0000 L CNN
+F 2 "C:0603" H 5763 1100 50  0001 C CNN
+F 3 "" H 5725 1250 50  0000 C CNN
+	1    5725 1250
+	0    1    1    0   
+$EndComp
+$Comp
+L SW_PUSH SW3
+U 1 1 5B3D4E31
+P 5725 950
+F 0 "SW3" H 5875 1060 50  0000 C CNN
+F 1 "reset" H 5725 870 50  0000 C CNN
+F 2 "SW:SW" H 5725 950 50  0001 C CNN
+F 3 "" H 5725 950 50  0000 C CNN
+	1    5725 950 
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	6075 650  5875 650 
+Wire Wire Line
+	5575 650  5425 650 
+Wire Wire Line
+	5425 650  5425 1250
+Wire Wire Line
+	5425 1250 5575 1250
+Connection ~ 5425 950 
+Wire Wire Line
+	5875 1250 6025 1250
+Wire Wire Line
+	6025 1250 6025 950 
+Wire Wire Line
+	6025 950  6075 950 
+Wire Wire Line
+	5425 950  5275 950 
+Text Label 2025 6050 2    60   ~ 0
+aquit
+NoConn ~ 2025 5050
 $EndSCHEMATC
 $EndSCHEMATC

+ 3 - 3
Eda/Drivers/drivers-cache.lib

@@ -67,9 +67,9 @@ 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 -50 -50 0 -50 0 0 N
 P 3 0 1 0 40 20 40 -50 50 -50 N
 P 3 0 1 0 40 20 40 -50 50 -50 N
 P 5 0 1 0 -10 0 10 0 0 -30 -10 0 0 -10 N
 P 5 0 1 0 -10 0 10 0 0 -30 -10 0 0 -10 N
-X S 1 -250 -50 200 R 50 50 1 1 I
-X G 2 0 250 200 D 50 50 1 1 I
-X D 3 250 -50 200 L 50 50 1 1 I
+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
 ENDDRAW
 ENDDEF
 ENDDEF
 #
 #

+ 87 - 103
Eda/Drivers/drivers.kicad_pcb

@@ -1,12 +1,12 @@
-(kicad_pcb (version 4) (host pcbnew 4.0.7-e2-6376~58~ubuntu16.04.1)
+(kicad_pcb (version 4) (host pcbnew 4.0.7)
 
 
   (general
   (general
     (links 5)
     (links 5)
-    (no_connects 5)
-    (area 74.774999 41.404999 104.925001 66.555001)
+    (no_connects 1)
+    (area 72.234999 70.614999 106.675001 94.895001)
     (thickness 1.6)
     (thickness 1.6)
     (drawings 7)
     (drawings 7)
-    (tracks 9)
+    (tracks 13)
     (zones 0)
     (zones 0)
     (modules 5)
     (modules 5)
     (nets 5)
     (nets 5)
@@ -95,7 +95,7 @@
   (net 1 "Net-(P1-Pad1)")
   (net 1 "Net-(P1-Pad1)")
   (net 2 "Net-(P1-Pad2)")
   (net 2 "Net-(P1-Pad2)")
   (net 3 "Net-(P1-Pad3)")
   (net 3 "Net-(P1-Pad3)")
-  (net 4 "Net-(Q1-Pad1)")
+  (net 4 "Net-(Q1-Pad3)")
 
 
   (net_class Default "This is the default net class."
   (net_class Default "This is the default net class."
     (clearance 0.3)
     (clearance 0.3)
@@ -107,45 +107,12 @@
     (add_net "Net-(P1-Pad1)")
     (add_net "Net-(P1-Pad1)")
     (add_net "Net-(P1-Pad2)")
     (add_net "Net-(P1-Pad2)")
     (add_net "Net-(P1-Pad3)")
     (add_net "Net-(P1-Pad3)")
-    (add_net "Net-(Q1-Pad1)")
-  )
-
-  (module Connector:bornier_1x3 (layer F.Cu) (tedit 5A775BB6) (tstamp 583D8BE6)
-    (at 81.2 89.74)
-    (descr "Terminal block 3 pins")
-    (tags DEV)
-    (path /56BF4595)
-    (fp_text reference P1 (at 0 -5.842) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_text value CONN_01X03 (at -0.4 9.9) (layer B.CrtYd)
-      (effects (font (thickness 0.3048)) (justify mirror))
-    )
-    (fp_line (start -7.62 4.572) (end -7.62 3.556) (layer F.SilkS) (width 0.254))
-    (fp_line (start -7.62 3.556) (end 7.62 3.556) (layer F.SilkS) (width 0.254))
-    (fp_line (start 7.62 3.556) (end 7.62 4.572) (layer F.SilkS) (width 0.254))
-    (fp_line (start 7.62 4.572) (end -7.62 4.572) (layer F.SilkS) (width 0.254))
-    (fp_line (start -7.62 -4.572) (end -7.62 -3.81) (layer F.SilkS) (width 0.254))
-    (fp_line (start -7.62 -4.572) (end 7.62 -4.572) (layer F.SilkS) (width 0.254))
-    (fp_line (start 7.62 -4.572) (end 7.62 -3.81) (layer F.SilkS) (width 0.254))
-    (fp_line (start -7.62 3.81) (end -7.62 -3.81) (layer F.SilkS) (width 0.254))
-    (fp_line (start 7.62 3.81) (end 7.62 -3.81) (layer F.SilkS) (width 0.254))
-    (pad 1 thru_hole rect (at -5.08 0) (size 2.99974 2.99974) (drill 1.24968) (layers *.Cu *.Mask F.SilkS)
-      (net 1 "Net-(P1-Pad1)"))
-    (pad 2 thru_hole circle (at 0 0) (size 2.99974 2.99974) (drill 1.24968) (layers *.Cu *.Mask F.SilkS)
-      (net 2 "Net-(P1-Pad2)"))
-    (pad 3 thru_hole circle (at 5.08 0) (size 2.99974 2.99974) (drill 1.24968) (layers *.Cu *.Mask F.SilkS)
-      (net 3 "Net-(P1-Pad3)"))
-    (model walter/conn_screw/mors_3p.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
+    (add_net "Net-(Q1-Pad3)")
   )
   )
 
 
   (module U:SOT-223 (layer F.Cu) (tedit 58121019) (tstamp 583D8BF9)
   (module U:SOT-223 (layer F.Cu) (tedit 58121019) (tstamp 583D8BF9)
     (at 100.25 89.74 270)
     (at 100.25 89.74 270)
-    (path /5812170B)
+    (path /5B3CD204)
     (fp_text reference Q1 (at 3.429 -4.064 360) (layer F.SilkS)
     (fp_text reference Q1 (at 3.429 -4.064 360) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
       (effects (font (size 1 1) (thickness 0.15)))
     )
     )
@@ -163,13 +130,13 @@
     (fp_line (start -0.6985 2.2225) (end 0.6985 2.2225) (layer F.Cu) (width 0.15))
     (fp_line (start -0.6985 2.2225) (end 0.6985 2.2225) (layer F.Cu) (width 0.15))
     (fp_line (start -0.6985 2.3495) (end 0.6985 2.3495) (layer F.Cu) (width 0.15))
     (fp_line (start -0.6985 2.3495) (end 0.6985 2.3495) (layer F.Cu) (width 0.15))
     (pad 2 smd rect (at 0 3.25 270) (size 1.4 1.7) (layers F.Cu F.Paste F.Mask)
     (pad 2 smd rect (at 0 3.25 270) (size 1.4 1.7) (layers F.Cu F.Paste F.Mask)
-      (net 2 "Net-(P1-Pad2)"))
-    (pad 3 smd rect (at 2.3 3.25 270) (size 1.4 1.7) (layers F.Cu F.Paste F.Mask)
       (net 3 "Net-(P1-Pad3)"))
       (net 3 "Net-(P1-Pad3)"))
+    (pad 3 smd rect (at 2.3 3.25 270) (size 1.4 1.7) (layers F.Cu F.Paste F.Mask)
+      (net 4 "Net-(Q1-Pad3)"))
     (pad 1 smd rect (at -2.3 3.25 270) (size 1.4 1.7) (layers F.Cu F.Paste F.Mask)
     (pad 1 smd rect (at -2.3 3.25 270) (size 1.4 1.7) (layers F.Cu F.Paste F.Mask)
-      (net 4 "Net-(Q1-Pad1)"))
-    (pad 2 smd rect (at 0 -3.25 270) (size 4 1.7) (layers F.Cu F.Paste F.Mask)
       (net 2 "Net-(P1-Pad2)"))
       (net 2 "Net-(P1-Pad2)"))
+    (pad 2 smd rect (at 0 -3.25 270) (size 4 1.7) (layers F.Cu F.Paste F.Mask)
+      (net 3 "Net-(P1-Pad3)"))
     (pad "" connect rect (at 0 0 270) (size 6 4) (layers F.Cu F.Adhes F.Mask))
     (pad "" connect rect (at 0 0 270) (size 6 4) (layers F.Cu F.Adhes F.Mask))
   )
   )
 
 
@@ -215,11 +182,33 @@
     (fp_line (start 11 4.75) (end 11 -4.75) (layer F.SilkS) (width 0.15))
     (fp_line (start 11 4.75) (end 11 -4.75) (layer F.SilkS) (width 0.15))
     (fp_line (start -11 -4.75) (end 11 -4.75) (layer F.SilkS) (width 0.15))
     (fp_line (start -11 -4.75) (end 11 -4.75) (layer F.SilkS) (width 0.15))
     (pad 1 thru_hole circle (at 14 0) (size 1.7 1.7) (drill 0.85) (layers *.Cu *.Mask)
     (pad 1 thru_hole circle (at 14 0) (size 1.7 1.7) (drill 0.85) (layers *.Cu *.Mask)
-      (net 4 "Net-(Q1-Pad1)"))
+      (net 4 "Net-(Q1-Pad3)"))
     (pad 2 thru_hole circle (at -14 0) (size 1.7 1.7) (drill 0.85) (layers *.Cu *.Mask)
     (pad 2 thru_hole circle (at -14 0) (size 1.7 1.7) (drill 0.85) (layers *.Cu *.Mask)
       (net 1 "Net-(P1-Pad1)"))
       (net 1 "Net-(P1-Pad1)"))
   )
   )
 
 
+  (module Connector:Bornier2.54_1x3 (layer F.Cu) (tedit 5B3CCA80) (tstamp 5B3CD1E0)
+    (at 81.6 91.23)
+    (path /56BF4595)
+    (fp_text reference P1 (at -4.826 0 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value CONN_01X03 (at -0.762 -3.81) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -4.04 3.35) (end 4.04 3.35) (layer F.SilkS) (width 0.15))
+    (fp_line (start 4.064 2.54) (end -4.016 2.54) (layer F.SilkS) (width 0.15))
+    (fp_line (start -4.04 -2.95) (end 4.04 -2.95) (layer F.SilkS) (width 0.15))
+    (fp_line (start -4.04 -2.95) (end -4.04 3.35) (layer F.SilkS) (width 0.15))
+    (fp_line (start 4.04 -2.95) (end 4.04 3.35) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole rect (at -2.54 0) (size 1.524 1.524) (drill 0.9) (layers *.Cu *.Mask F.SilkS)
+      (net 1 "Net-(P1-Pad1)"))
+    (pad 2 thru_hole circle (at 0 0) (size 1.524 1.524) (drill 0.9) (layers *.Cu *.Mask F.SilkS)
+      (net 2 "Net-(P1-Pad2)"))
+    (pad 3 thru_hole circle (at 2.54 0) (size 1.524 1.524) (drill 0.9) (layers *.Cu *.Mask F.SilkS)
+      (net 3 "Net-(P1-Pad3)"))
+  )
+
   (dimension 24.13 (width 0.3) (layer Eco2.User)
   (dimension 24.13 (width 0.3) (layer Eco2.User)
     (gr_text "24,130 mm" (at 109.347 82.755 270) (layer Eco2.User)
     (gr_text "24,130 mm" (at 109.347 82.755 270) (layer Eco2.User)
       (effects (font (size 1.5 1.5) (thickness 0.3)))
       (effects (font (size 1.5 1.5) (thickness 0.3)))
@@ -252,15 +241,19 @@
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror))
     (effects (font (size 1.5 1.5) (thickness 0.3)) (justify mirror))
   )
   )
 
 
-  (segment (start 76.12 89.74) (end 76.12 87.84013) (width 0.4) (layer F.Cu) (net 1))
-  (segment (start 76.12 87.84013) (end 76.750001 87.210129) (width 0.4) (layer F.Cu) (net 1))
-  (segment (start 76.750001 77.455002) (end 76.699999 77.405) (width 0.4) (layer F.Cu) (net 1))
-  (segment (start 76.750001 87.210129) (end 76.750001 77.455002) (width 0.4) (layer F.Cu) (net 1))
+  (segment (start 79.1 91.23) (end 79.1 88.36013) (width 0.4) (layer F.Cu) (net 1))
+  (segment (start 79.1 88.36013) (end 77.35 86.61013) (width 0.4) (layer F.Cu) (net 1))
   (segment (start 76.699999 77.405) (end 75.85 76.555001) (width 0.4) (layer F.Cu) (net 1))
   (segment (start 76.699999 77.405) (end 75.85 76.555001) (width 0.4) (layer F.Cu) (net 1))
-  (segment (start 97 92.04) (end 88.58 92.04) (width 0.4) (layer F.Cu) (net 3))
-  (segment (start 88.58 92.04) (end 86.28 89.74) (width 0.4) (layer F.Cu) (net 3))
-  (segment (start 103.85 76.555001) (end 97 83.405001) (width 0.4) (layer F.Cu) (net 4))
-  (segment (start 97 83.405001) (end 97 87.44) (width 0.4) (layer F.Cu) (net 4))
+  (segment (start 77.35 86.61013) (end 77.35 78.055001) (width 0.4) (layer F.Cu) (net 1))
+  (segment (start 77.35 78.055001) (end 76.699999 77.405) (width 0.4) (layer F.Cu) (net 1))
+  (segment (start 84.14 91.23) (end 85.63 89.74) (width 0.4) (layer F.Cu) (net 3))
+  (segment (start 85.63 89.74) (end 97 89.74) (width 0.4) (layer F.Cu) (net 3))
+  (segment (start 103.85 76.555001) (end 105.35 78.055001) (width 0.4) (layer F.Cu) (net 4))
+  (segment (start 105.35 78.055001) (end 105.35 92.48) (width 0.4) (layer F.Cu) (net 4))
+  (segment (start 105.35 92.48) (end 104.35 93.48) (width 0.4) (layer F.Cu) (net 4))
+  (segment (start 104.35 93.48) (end 97.34 93.48) (width 0.4) (layer F.Cu) (net 4))
+  (segment (start 97 93.14) (end 97 92.04) (width 0.4) (layer F.Cu) (net 4))
+  (segment (start 97.34 93.48) (end 97 93.14) (width 0.4) (layer F.Cu) (net 4))
 
 
   (zone (net 2) (net_name "Net-(P1-Pad2)") (layer F.Cu) (tstamp 0) (hatch edge 0.508)
   (zone (net 2) (net_name "Net-(P1-Pad2)") (layer F.Cu) (tstamp 0) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
     (connect_pads (clearance 0.508))
@@ -273,56 +266,47 @@
     )
     )
     (filled_polygon
     (filled_polygon
       (pts
       (pts
-        (xy 105.89 94.11) (xy 73.02 94.11) (xy 73.02 83.020001) (xy 73.123805 83.271229) (xy 73.69576 83.844183)
-        (xy 74.443438 84.154646) (xy 75.253011 84.155352) (xy 75.915001 83.881824) (xy 75.915001 86.864261) (xy 75.529566 87.249696)
-        (xy 75.348561 87.520589) (xy 75.334219 87.59269) (xy 74.62013 87.59269) (xy 74.384813 87.636968) (xy 74.168689 87.77604)
-        (xy 74.023699 87.98824) (xy 73.97269 88.24013) (xy 73.97269 91.23987) (xy 74.016968 91.475187) (xy 74.15604 91.691311)
-        (xy 74.36824 91.836301) (xy 74.62013 91.88731) (xy 77.61987 91.88731) (xy 77.855187 91.843032) (xy 78.071311 91.70396)
-        (xy 78.216301 91.49176) (xy 78.264473 91.253877) (xy 79.865728 91.253877) (xy 80.025495 91.572632) (xy 80.816217 91.882595)
-        (xy 81.665366 91.866367) (xy 82.374505 91.572632) (xy 82.534272 91.253877) (xy 81.2 89.919605) (xy 79.865728 91.253877)
-        (xy 78.264473 91.253877) (xy 78.26731 91.23987) (xy 78.26731 89.356217) (xy 79.057405 89.356217) (xy 79.073633 90.205366)
-        (xy 79.367368 90.914505) (xy 79.686123 91.074272) (xy 81.020395 89.74) (xy 81.379605 89.74) (xy 82.713877 91.074272)
-        (xy 83.032632 90.914505) (xy 83.327304 90.162789) (xy 84.14476 90.162789) (xy 84.46909 90.947727) (xy 85.069114 91.5488)
-        (xy 85.853485 91.874499) (xy 86.702789 91.87524) (xy 87.078947 91.719815) (xy 87.989566 92.630434) (xy 88.260459 92.811439)
-        (xy 88.58 92.875) (xy 95.527962 92.875) (xy 95.546838 92.975317) (xy 95.68591 93.191441) (xy 95.89811 93.336431)
-        (xy 96.15 93.38744) (xy 97.85 93.38744) (xy 98.057342 93.348426) (xy 98.25 93.38744) (xy 102.25 93.38744)
-        (xy 102.485317 93.343162) (xy 102.701441 93.20409) (xy 102.846431 92.99189) (xy 102.89744 92.74) (xy 102.89744 92.375)
-        (xy 103.21425 92.375) (xy 103.373 92.21625) (xy 103.373 89.867) (xy 103.627 89.867) (xy 103.627 92.21625)
-        (xy 103.78575 92.375) (xy 104.47631 92.375) (xy 104.709699 92.278327) (xy 104.888327 92.099698) (xy 104.985 91.866309)
-        (xy 104.985 90.02575) (xy 104.82625 89.867) (xy 103.627 89.867) (xy 103.373 89.867) (xy 103.353 89.867)
-        (xy 103.353 89.613) (xy 103.373 89.613) (xy 103.373 87.26375) (xy 103.627 87.26375) (xy 103.627 89.613)
-        (xy 104.82625 89.613) (xy 104.985 89.45425) (xy 104.985 87.613691) (xy 104.888327 87.380302) (xy 104.709699 87.201673)
-        (xy 104.47631 87.105) (xy 103.78575 87.105) (xy 103.627 87.26375) (xy 103.373 87.26375) (xy 103.21425 87.105)
-        (xy 102.89744 87.105) (xy 102.89744 86.74) (xy 102.853162 86.504683) (xy 102.71409 86.288559) (xy 102.50189 86.143569)
-        (xy 102.25 86.09256) (xy 98.25 86.09256) (xy 98.042658 86.131574) (xy 97.85 86.09256) (xy 97.835 86.09256)
-        (xy 97.835 83.793011) (xy 100.754648 83.793011) (xy 101.063805 84.541229) (xy 101.63576 85.114183) (xy 102.383438 85.424646)
-        (xy 103.193011 85.425352) (xy 103.941229 85.116195) (xy 104.514183 84.54424) (xy 104.824646 83.796562) (xy 104.825352 82.986989)
-        (xy 104.516195 82.238771) (xy 103.94424 81.665817) (xy 103.196562 81.355354) (xy 102.386989 81.354648) (xy 101.638771 81.663805)
-        (xy 101.065817 82.23576) (xy 100.755354 82.983438) (xy 100.754648 83.793011) (xy 97.835 83.793011) (xy 97.835 83.750869)
-        (xy 103.548236 78.037633) (xy 103.553319 78.039743) (xy 104.144089 78.040258) (xy 104.690086 77.814657) (xy 105.108188 77.397284)
-        (xy 105.334742 76.851682) (xy 105.335257 76.260912) (xy 105.109656 75.714915) (xy 104.692283 75.296813) (xy 104.146681 75.070259)
-        (xy 103.555911 75.069744) (xy 103.009914 75.295345) (xy 102.591812 75.712718) (xy 102.365258 76.25832) (xy 102.364743 76.84909)
-        (xy 102.367755 76.856378) (xy 96.409566 82.814567) (xy 96.228561 83.08546) (xy 96.165 83.405001) (xy 96.165 86.09256)
-        (xy 96.15 86.09256) (xy 95.914683 86.136838) (xy 95.698559 86.27591) (xy 95.553569 86.48811) (xy 95.50256 86.74)
-        (xy 95.50256 88.14) (xy 95.546838 88.375317) (xy 95.68591 88.591441) (xy 95.694598 88.597377) (xy 95.611673 88.680302)
-        (xy 95.515 88.913691) (xy 95.515 89.45425) (xy 95.67375 89.613) (xy 96.873 89.613) (xy 96.873 89.593)
-        (xy 97.127 89.593) (xy 97.127 89.613) (xy 97.147 89.613) (xy 97.147 89.867) (xy 97.127 89.867)
-        (xy 97.127 89.887) (xy 96.873 89.887) (xy 96.873 89.867) (xy 95.67375 89.867) (xy 95.515 90.02575)
-        (xy 95.515 90.566309) (xy 95.611673 90.799698) (xy 95.694226 90.882252) (xy 95.553569 91.08811) (xy 95.529898 91.205)
-        (xy 88.925868 91.205) (xy 88.259841 90.538973) (xy 88.414499 90.166515) (xy 88.41524 89.317211) (xy 88.09091 88.532273)
-        (xy 87.490886 87.9312) (xy 86.706515 87.605501) (xy 85.857211 87.60476) (xy 85.072273 87.92909) (xy 84.4712 88.529114)
-        (xy 84.145501 89.313485) (xy 84.14476 90.162789) (xy 83.327304 90.162789) (xy 83.342595 90.123783) (xy 83.326367 89.274634)
-        (xy 83.032632 88.565495) (xy 82.713877 88.405728) (xy 81.379605 89.74) (xy 81.020395 89.74) (xy 79.686123 88.405728)
-        (xy 79.367368 88.565495) (xy 79.057405 89.356217) (xy 78.26731 89.356217) (xy 78.26731 88.24013) (xy 78.264675 88.226123)
-        (xy 79.865728 88.226123) (xy 81.2 89.560395) (xy 82.534272 88.226123) (xy 82.374505 87.907368) (xy 81.583783 87.597405)
-        (xy 80.734634 87.613633) (xy 80.025495 87.907368) (xy 79.865728 88.226123) (xy 78.264675 88.226123) (xy 78.223032 88.004813)
-        (xy 78.08396 87.788689) (xy 77.87176 87.643699) (xy 77.61987 87.59269) (xy 77.479331 87.59269) (xy 77.52144 87.52967)
-        (xy 77.585001 87.210129) (xy 77.585001 77.455002) (xy 77.573083 77.395087) (xy 77.521441 77.135462) (xy 77.340436 76.864568)
-        (xy 77.332632 76.856764) (xy 77.334742 76.851682) (xy 77.335257 76.260912) (xy 77.109656 75.714915) (xy 76.692283 75.296813)
-        (xy 76.146681 75.070259) (xy 75.555911 75.069744) (xy 75.009914 75.295345) (xy 74.591812 75.712718) (xy 74.365258 76.25832)
-        (xy 74.364743 76.84909) (xy 74.590344 77.395087) (xy 75.007717 77.813189) (xy 75.553319 78.039743) (xy 75.915001 78.040058)
-        (xy 75.915001 80.358762) (xy 75.256562 80.085354) (xy 74.446989 80.084648) (xy 73.698771 80.393805) (xy 73.125817 80.96576)
-        (xy 73.02 81.220596) (xy 73.02 71.4) (xy 105.89 71.4)
+        (xy 105.89 77.414133) (xy 105.332632 76.856765) (xy 105.334742 76.851682) (xy 105.335257 76.260912) (xy 105.109656 75.714915)
+        (xy 104.692283 75.296813) (xy 104.146681 75.070259) (xy 103.555911 75.069744) (xy 103.009914 75.295345) (xy 102.591812 75.712718)
+        (xy 102.365258 76.25832) (xy 102.364743 76.84909) (xy 102.590344 77.395087) (xy 103.007717 77.813189) (xy 103.553319 78.039743)
+        (xy 104.144089 78.040258) (xy 104.151377 78.037246) (xy 104.515 78.400869) (xy 104.515 82.237574) (xy 103.94424 81.665817)
+        (xy 103.196562 81.355354) (xy 102.386989 81.354648) (xy 101.638771 81.663805) (xy 101.065817 82.23576) (xy 100.755354 82.983438)
+        (xy 100.754648 83.793011) (xy 101.063805 84.541229) (xy 101.63576 85.114183) (xy 102.383438 85.424646) (xy 103.193011 85.425352)
+        (xy 103.941229 85.116195) (xy 104.514183 84.54424) (xy 104.515 84.542272) (xy 104.515 87.125973) (xy 104.35 87.09256)
+        (xy 102.89744 87.09256) (xy 102.89744 86.74) (xy 102.853162 86.504683) (xy 102.71409 86.288559) (xy 102.50189 86.143569)
+        (xy 102.25 86.09256) (xy 98.25 86.09256) (xy 98.04115 86.131858) (xy 97.97631 86.105) (xy 97.28575 86.105)
+        (xy 97.127 86.26375) (xy 97.127 87.313) (xy 97.147 87.313) (xy 97.147 87.567) (xy 97.127 87.567)
+        (xy 97.127 87.587) (xy 96.873 87.587) (xy 96.873 87.567) (xy 95.67375 87.567) (xy 95.515 87.72575)
+        (xy 95.515 88.266309) (xy 95.611673 88.499698) (xy 95.694226 88.582252) (xy 95.553569 88.78811) (xy 95.529898 88.905)
+        (xy 85.63 88.905) (xy 85.310459 88.968561) (xy 85.066499 89.13157) (xy 85.039566 89.149566) (xy 84.355944 89.833188)
+        (xy 83.863339 89.832758) (xy 83.349697 90.04499) (xy 82.956371 90.43763) (xy 82.876605 90.629727) (xy 82.822397 90.498857)
+        (xy 82.580213 90.429392) (xy 81.779605 91.23) (xy 82.580213 92.030608) (xy 82.822397 91.961143) (xy 82.872509 91.820682)
+        (xy 82.95499 92.020303) (xy 83.34763 92.413629) (xy 83.8609 92.626757) (xy 84.416661 92.627242) (xy 84.930303 92.41501)
+        (xy 85.323629 92.02237) (xy 85.536757 91.5091) (xy 85.537189 91.013679) (xy 85.975868 90.575) (xy 95.527962 90.575)
+        (xy 95.546838 90.675317) (xy 95.68591 90.891441) (xy 95.687299 90.89239) (xy 95.553569 91.08811) (xy 95.50256 91.34)
+        (xy 95.50256 92.74) (xy 95.546838 92.975317) (xy 95.68591 93.191441) (xy 95.89811 93.336431) (xy 96.15 93.38744)
+        (xy 96.214219 93.38744) (xy 96.228561 93.459541) (xy 96.409566 93.730434) (xy 96.749566 94.070434) (xy 96.808781 94.11)
+        (xy 73.02 94.11) (xy 73.02 83.020001) (xy 73.123805 83.271229) (xy 73.69576 83.844183) (xy 74.443438 84.154646)
+        (xy 75.253011 84.155352) (xy 76.001229 83.846195) (xy 76.515 83.33332) (xy 76.515 86.61013) (xy 76.578561 86.929671)
+        (xy 76.6874 87.09256) (xy 76.759566 87.200564) (xy 78.265 88.705998) (xy 78.265 89.826769) (xy 78.062683 89.864838)
+        (xy 77.846559 90.00391) (xy 77.701569 90.21611) (xy 77.65056 90.468) (xy 77.65056 91.992) (xy 77.694838 92.227317)
+        (xy 77.83391 92.443441) (xy 78.04611 92.588431) (xy 78.298 92.63944) (xy 79.822 92.63944) (xy 80.057317 92.595162)
+        (xy 80.273441 92.45609) (xy 80.418431 92.24389) (xy 80.42525 92.210213) (xy 80.799392 92.210213) (xy 80.868857 92.452397)
+        (xy 81.392302 92.639144) (xy 81.947368 92.611362) (xy 82.331143 92.452397) (xy 82.400608 92.210213) (xy 81.6 91.409605)
+        (xy 80.799392 92.210213) (xy 80.42525 92.210213) (xy 80.46944 91.992) (xy 80.46944 91.987484) (xy 80.619787 92.030608)
+        (xy 81.420395 91.23) (xy 80.619787 90.429392) (xy 80.46944 90.472516) (xy 80.46944 90.468) (xy 80.428381 90.249787)
+        (xy 80.799392 90.249787) (xy 81.6 91.050395) (xy 82.400608 90.249787) (xy 82.331143 90.007603) (xy 81.807698 89.820856)
+        (xy 81.252632 89.848638) (xy 80.868857 90.007603) (xy 80.799392 90.249787) (xy 80.428381 90.249787) (xy 80.425162 90.232683)
+        (xy 80.28609 90.016559) (xy 80.07389 89.871569) (xy 79.935 89.843443) (xy 79.935 88.36013) (xy 79.916338 88.266309)
+        (xy 79.87144 88.04059) (xy 79.690434 87.769696) (xy 78.534429 86.613691) (xy 95.515 86.613691) (xy 95.515 87.15425)
+        (xy 95.67375 87.313) (xy 96.873 87.313) (xy 96.873 86.26375) (xy 96.71425 86.105) (xy 96.02369 86.105)
+        (xy 95.790301 86.201673) (xy 95.611673 86.380302) (xy 95.515 86.613691) (xy 78.534429 86.613691) (xy 78.185 86.264262)
+        (xy 78.185 78.055001) (xy 78.121439 77.73546) (xy 77.940434 77.464567) (xy 77.332632 76.856765) (xy 77.334742 76.851682)
+        (xy 77.335257 76.260912) (xy 77.109656 75.714915) (xy 76.692283 75.296813) (xy 76.146681 75.070259) (xy 75.555911 75.069744)
+        (xy 75.009914 75.295345) (xy 74.591812 75.712718) (xy 74.365258 76.25832) (xy 74.364743 76.84909) (xy 74.590344 77.395087)
+        (xy 75.007717 77.813189) (xy 75.553319 78.039743) (xy 76.144089 78.040258) (xy 76.151377 78.037246) (xy 76.515 78.400869)
+        (xy 76.515 80.907469) (xy 76.00424 80.395817) (xy 75.256562 80.085354) (xy 74.446989 80.084648) (xy 73.698771 80.393805)
+        (xy 73.125817 80.96576) (xy 73.02 81.220596) (xy 73.02 71.4) (xy 105.89 71.4)
       )
       )
     )
     )
   )
   )

+ 17 - 22
Eda/Drivers/drivers.net

@@ -1,8 +1,8 @@
 (export (version D)
 (export (version D)
   (design
   (design
-    (source /home/remy/Projet/rampesLeds/Eda/Drivers/drivers.sch)
-    (date "dim. 04 févr. 2018 19:45:49 CET")
-    (tool "Eeschema 4.0.7-e2-6376~58~ubuntu16.04.1")
+    (source D:/Projet/rampesLeds/Eda/Drivers/drivers.sch)
+    (date "04/07/2018 15:55:18")
+    (tool "Eeschema 4.0.7")
     (sheet (number 1) (name /) (tstamps /)
     (sheet (number 1) (name /) (tstamps /)
       (title_block
       (title_block
         (title)
         (title)
@@ -29,7 +29,7 @@
       (tstamp 5704C456))
       (tstamp 5704C456))
     (comp (ref P1)
     (comp (ref P1)
       (value CONN_01X03)
       (value CONN_01X03)
-      (footprint Connector:bornier_1x3)
+      (footprint Connector:Bornier2.54_1x3)
       (libsource (lib conn) (part CONN_01X03))
       (libsource (lib conn) (part CONN_01X03))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
       (tstamp 56BF4595))
       (tstamp 56BF4595))
@@ -47,14 +47,9 @@
     (comp (ref Q1)
     (comp (ref Q1)
       (value P_MOSFET)
       (value P_MOSFET)
       (footprint U:SOT-223)
       (footprint U:SOT-223)
-      (fields
-        (field (name vendor) Value)
-        (field (name part) Value)
-        (field (name p/mouser) Value)
-        (field (name p/farnell) Value))
       (libsource (lib global) (part P_MOSFET))
       (libsource (lib global) (part P_MOSFET))
       (sheetpath (names /) (tstamps /))
       (sheetpath (names /) (tstamps /))
-      (tstamp 5812170B)))
+      (tstamp 5B3CD204)))
   (libparts
   (libparts
     (libpart (lib conn) (part CONN_01X01)
     (libpart (lib conn) (part CONN_01X01)
       (description "Connector 01x01")
       (description "Connector 01x01")
@@ -87,9 +82,9 @@
         (field (name Reference) Q)
         (field (name Reference) Q)
         (field (name Value) P_MOSFET))
         (field (name Value) P_MOSFET))
       (pins
       (pins
-        (pin (num 1) (name S) (type input))
-        (pin (num 2) (name G) (type input))
-        (pin (num 3) (name D) (type input))))
+        (pin (num 1) (name G) (type input))
+        (pin (num 2) (name D) (type input))
+        (pin (num 3) (name S) (type input))))
     (libpart (lib global) (part R)
     (libpart (lib global) (part R)
       (footprints
       (footprints
         (fp R_*)
         (fp R_*)
@@ -101,23 +96,23 @@
         (pin (num 1) (name ~) (type passive))
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive)))))
         (pin (num 2) (name ~) (type passive)))))
   (libraries
   (libraries
-    (library (logical conn)
-      (uri /home/remy/Projet/Librairie_Kicad/schematic/conn.lib))
     (library (logical global)
     (library (logical global)
-      (uri /home/remy/Projet/Librairie_Kicad/schematic/global.lib)))
+      (uri D:\Projet\Librairie_Kicad\schematic\global.lib))
+    (library (logical conn)
+      (uri D:\Projet\Librairie_Kicad\schematic\conn.lib)))
   (nets
   (nets
-    (net (code 1) (name "Net-(Q1-Pad1)")
-      (node (ref Q1) (pin 1))
+    (net (code 1) (name "Net-(Q1-Pad3)")
+      (node (ref Q1) (pin 3))
       (node (ref R1) (pin 1)))
       (node (ref R1) (pin 1)))
     (net (code 2) (name "Net-(P1-Pad2)")
     (net (code 2) (name "Net-(P1-Pad2)")
-      (node (ref P1) (pin 2))
-      (node (ref Q1) (pin 2)))
+      (node (ref Q1) (pin 1))
+      (node (ref P1) (pin 2)))
     (net (code 3) (name "Net-(P1-Pad1)")
     (net (code 3) (name "Net-(P1-Pad1)")
       (node (ref R1) (pin 2))
       (node (ref R1) (pin 2))
       (node (ref P1) (pin 1)))
       (node (ref P1) (pin 1)))
     (net (code 4) (name "Net-(P1-Pad3)")
     (net (code 4) (name "Net-(P1-Pad3)")
-      (node (ref Q1) (pin 3))
-      (node (ref P1) (pin 3)))
+      (node (ref P1) (pin 3))
+      (node (ref Q1) (pin 2)))
     (net (code 5) (name "Net-(P3-Pad1)")
     (net (code 5) (name "Net-(P3-Pad1)")
       (node (ref P3) (pin 1)))
       (node (ref P3) (pin 1)))
     (net (code 6) (name "Net-(P2-Pad1)")
     (net (code 6) (name "Net-(P2-Pad1)")

+ 9 - 2
Eda/Drivers/drivers.pro

@@ -1,4 +1,4 @@
-update=mar. 27 sept. 2016 14:57:02 CEST
+update=04/07/2018 15:51:39
 version=1
 version=1
 last_client=kicad
 last_client=kicad
 [pcbnew]
 [pcbnew]
@@ -27,7 +27,7 @@ NetIExt=net
 version=1
 version=1
 [eeschema]
 [eeschema]
 version=1
 version=1
-LibDir=$(KISYSMOD)/schematic
+LibDir=D:/Projet/Librairie_Kicad/schematic
 [eeschema/libraries]
 [eeschema/libraries]
 LibName1=conn
 LibName1=conn
 LibName2=global
 LibName2=global
@@ -35,3 +35,10 @@ LibName3=ST
 LibName4=Motor
 LibName4=Motor
 LibName5=Analog
 LibName5=Analog
 LibName6=Toshiba
 LibName6=Toshiba
+LibName7=afficheur
+LibName8=esp-12f
+LibName9=NXP
+LibName10=ONSemi
+LibName11=relay
+LibName12=TI
+LibName13=Torex

+ 19 - 16
Eda/Drivers/drivers.sch

@@ -5,6 +5,13 @@ LIBS:ST
 LIBS:Motor
 LIBS:Motor
 LIBS:Analog
 LIBS:Analog
 LIBS:Toshiba
 LIBS:Toshiba
+LIBS:afficheur
+LIBS:esp-12f
+LIBS:NXP
+LIBS:ONSemi
+LIBS:relay
+LIBS:TI
+LIBS:Torex
 LIBS:drivers-cache
 LIBS:drivers-cache
 EELAYER 25 0
 EELAYER 25 0
 EELAYER END
 EELAYER END
@@ -54,7 +61,7 @@ U 1 1 56BF4595
 P 850 1300
 P 850 1300
 F 0 "P1" H 850 1500 50  0000 C CNN
 F 0 "P1" H 850 1500 50  0000 C CNN
 F 1 "CONN_01X03" V 950 1300 50  0000 C CNN
 F 1 "CONN_01X03" V 950 1300 50  0000 C CNN
-F 2 "Connector:bornier_1x3" H 850 1300 50  0001 C CNN
+F 2 "Connector:Bornier2.54_1x3" H 850 1300 50  0001 C CNN
 F 3 "" H 850 1300 50  0000 C CNN
 F 3 "" H 850 1300 50  0000 C CNN
 	1    850  1300
 	1    850  1300
 	-1   0    0    1   
 	-1   0    0    1   
@@ -74,21 +81,6 @@ F 7 "Value" H 2050 1950 60  0001 C CNN "p/farnell"
 	1    2050 1950
 	1    2050 1950
 	1    0    0    -1  
 	1    0    0    -1  
 $EndComp
 $EndComp
-$Comp
-L P_MOSFET Q1
-U 1 1 5812170B
-P 2000 1450
-F 0 "Q1" H 2160 1590 60  0000 C CNN
-F 1 "P_MOSFET" H 2000 1310 60  0000 C CNN
-F 2 "U:SOT-223" H 2000 1450 60  0001 C CNN
-F 3 "" H 2000 1450 60  0001 C CNN
-F 4 "Value" H 2000 1450 60  0001 C CNN "vendor"
-F 5 "Value" H 2000 1450 60  0001 C CNN "part"
-F 6 "Value" H 2000 1450 60  0001 C CNN "p/mouser"
-F 7 "Value" H 2000 1450 60  0001 C CNN "p/farnell"
-	1    2000 1450
-	0    -1   -1   0   
-$EndComp
 Wire Wire Line
 Wire Wire Line
 	2050 1800 2050 1700
 	2050 1800 2050 1700
 Wire Wire Line
 Wire Wire Line
@@ -99,4 +91,15 @@ Wire Wire Line
 	1750 1450 1450 1450
 	1750 1450 1450 1450
 Wire Wire Line
 Wire Wire Line
 	1450 1450 1450 1300
 	1450 1450 1450 1300
+$Comp
+L P_MOSFET Q1
+U 1 1 5B3CD204
+P 2000 1450
+F 0 "Q1" H 2160 1590 60  0000 C CNN
+F 1 "P_MOSFET" H 2000 1310 60  0000 C CNN
+F 2 "U:SOT-223" H 2000 1450 60  0001 C CNN
+F 3 "" H 2000 1450 60  0001 C CNN
+	1    2000 1450
+	0    -1   -1   0   
+$EndComp
 $EndSCHEMATC
 $EndSCHEMATC

+ 135 - 78
Soft/Controle/Controle.ioc

@@ -1,69 +1,90 @@
 #MicroXplorer Configuration settings - do not modify
 #MicroXplorer Configuration settings - do not modify
+ADC1.Channel-69\#ChannelRegularConversion=ADC_CHANNEL_9
+ADC1.IPParameters=Rank-69\#ChannelRegularConversion,Channel-69\#ChannelRegularConversion,SamplingTime-69\#ChannelRegularConversion,NbrOfConversionFlag,master
+ADC1.NbrOfConversionFlag=1
+ADC1.Rank-69\#ChannelRegularConversion=1
+ADC1.SamplingTime-69\#ChannelRegularConversion=ADC_SAMPLETIME_3CYCLES
+ADC1.master=1
 File.Version=6
 File.Version=6
 KeepUserPlacement=false
 KeepUserPlacement=false
 Mcu.Family=STM32F4
 Mcu.Family=STM32F4
-Mcu.IP0=I2C2
-Mcu.IP1=I2C3
-Mcu.IP2=NVIC
-Mcu.IP3=RCC
-Mcu.IP4=SYS
-Mcu.IP5=TIM2
-Mcu.IP6=TIM3
-Mcu.IP7=TIM4
-Mcu.IP8=USB_OTG_FS
-Mcu.IPNb=9
+Mcu.IP0=ADC1
+Mcu.IP1=I2C2
+Mcu.IP10=TIM4
+Mcu.IP11=TIM9
+Mcu.IP12=USB_OTG_FS
+Mcu.IP2=I2C3
+Mcu.IP3=NVIC
+Mcu.IP4=RCC
+Mcu.IP5=SPI1
+Mcu.IP6=SYS
+Mcu.IP7=TIM1
+Mcu.IP8=TIM2
+Mcu.IP9=TIM3
+Mcu.IPNb=13
 Mcu.Name=STM32F401R(B-C)Tx
 Mcu.Name=STM32F401R(B-C)Tx
 Mcu.Package=LQFP64
 Mcu.Package=LQFP64
 Mcu.Pin0=PC14-OSC32_IN
 Mcu.Pin0=PC14-OSC32_IN
-Mcu.Pin1=PC15-OSC32_OUT
-Mcu.Pin10=PB10
-Mcu.Pin11=PC6
-Mcu.Pin12=PC7
-Mcu.Pin13=PC8
-Mcu.Pin14=PC9
-Mcu.Pin15=PA8
-Mcu.Pin16=PA9
-Mcu.Pin17=PA10
-Mcu.Pin18=PA11
-Mcu.Pin19=PA12
-Mcu.Pin2=PH0 - OSC_IN
-Mcu.Pin20=PA13
-Mcu.Pin21=PA14
-Mcu.Pin22=PB3
-Mcu.Pin23=PB4
-Mcu.Pin24=PB6
-Mcu.Pin25=PB7
-Mcu.Pin26=PB8
-Mcu.Pin27=PB9
-Mcu.Pin28=VP_SYS_VS_Systick
-Mcu.Pin3=PH1 - OSC_OUT
-Mcu.Pin4=PA0-WKUP
-Mcu.Pin5=PA1
-Mcu.Pin6=PA2
-Mcu.Pin7=PA3
-Mcu.Pin8=PA7
-Mcu.Pin9=PC4
-Mcu.PinsNb=29
+Mcu.Pin1=PH0 - OSC_IN
+Mcu.Pin10=PA7
+Mcu.Pin11=PC4
+Mcu.Pin12=PC5
+Mcu.Pin13=PB0
+Mcu.Pin14=PB1
+Mcu.Pin15=PB2
+Mcu.Pin16=PB10
+Mcu.Pin17=PC6
+Mcu.Pin18=PC7
+Mcu.Pin19=PC8
+Mcu.Pin2=PH1 - OSC_OUT
+Mcu.Pin20=PC9
+Mcu.Pin21=PA8
+Mcu.Pin22=PA9
+Mcu.Pin23=PA10
+Mcu.Pin24=PA11
+Mcu.Pin25=PA12
+Mcu.Pin26=PA13
+Mcu.Pin27=PA14
+Mcu.Pin28=PB3
+Mcu.Pin29=PB4
+Mcu.Pin3=PA0-WKUP
+Mcu.Pin30=PB6
+Mcu.Pin31=PB7
+Mcu.Pin32=PB8
+Mcu.Pin33=PB9
+Mcu.Pin34=VP_SYS_VS_Systick
+Mcu.Pin35=VP_TIM1_VS_ControllerModeClock
+Mcu.Pin36=VP_TIM1_VS_ClockSourceITR
+Mcu.Pin37=VP_TIM9_VS_ClockSourceITR
+Mcu.Pin38=VP_TIM9_VS_no_output1
+Mcu.Pin4=PA1
+Mcu.Pin5=PA2
+Mcu.Pin6=PA3
+Mcu.Pin7=PA4
+Mcu.Pin8=PA5
+Mcu.Pin9=PA6
+Mcu.PinsNb=39
+Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserConstants=
 Mcu.UserName=STM32F401RCTx
 Mcu.UserName=STM32F401RCTx
-MxCube.Version=4.21.0
-MxDb.Version=DB.4.0.210
-NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true
-NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true
-NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true
-NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true
-NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true
-NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true
+MxCube.Version=4.25.1
+MxDb.Version=DB.4.0.251
+NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:true
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
-NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true
-NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true
-NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true
+NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true
+NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:true
 PA0-WKUP.GPIOParameters=GPIO_Label
 PA0-WKUP.GPIOParameters=GPIO_Label
-PA0-WKUP.GPIO_Label=S4
+PA0-WKUP.GPIO_Label=aquit
 PA0-WKUP.Locked=true
 PA0-WKUP.Locked=true
-PA0-WKUP.Signal=S_TIM2_CH1_ETR
+PA0-WKUP.Signal=GPIO_Output
 PA1.GPIOParameters=GPIO_Label
 PA1.GPIOParameters=GPIO_Label
-PA1.GPIO_Label=S3
+PA1.GPIO_Label=CMD
 PA1.Locked=true
 PA1.Locked=true
 PA1.Signal=S_TIM2_CH2
 PA1.Signal=S_TIM2_CH2
 PA10.Mode=OTG/Dual_Role_Device
 PA10.Mode=OTG/Dual_Role_Device
@@ -77,65 +98,82 @@ PA13.Signal=SYS_JTMS-SWDIO
 PA14.Mode=Serial_Wire
 PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
 PA14.Signal=SYS_JTCK-SWCLK
 PA2.GPIOParameters=GPIO_Label
 PA2.GPIOParameters=GPIO_Label
-PA2.GPIO_Label=S2
+PA2.GPIO_Label=S1
 PA2.Locked=true
 PA2.Locked=true
 PA2.Signal=S_TIM2_CH3
 PA2.Signal=S_TIM2_CH3
 PA3.GPIOParameters=GPIO_Label
 PA3.GPIOParameters=GPIO_Label
-PA3.GPIO_Label=S1
+PA3.GPIO_Label=S2
+PA3.Locked=true
 PA3.Signal=S_TIM2_CH4
 PA3.Signal=S_TIM2_CH4
-PA7.GPIOParameters=GPIO_Label
-PA7.GPIO_Label=LED_vert
-PA7.Locked=true
-PA7.Signal=GPIO_Output
+PA4.Locked=true
+PA4.Mode=NSS_Signal_Hard_Output
+PA4.Signal=SPI1_NSS
+PA5.Mode=Full_Duplex_Master
+PA5.Signal=SPI1_SCK
+PA6.Mode=Full_Duplex_Master
+PA6.Signal=SPI1_MISO
+PA7.Mode=Full_Duplex_Master
+PA7.Signal=SPI1_MOSI
 PA8.Mode=I2C
 PA8.Mode=I2C
 PA8.Signal=I2C3_SCL
 PA8.Signal=I2C3_SCL
 PA9.Mode=Activate_VBUS
 PA9.Mode=Activate_VBUS
 PA9.Signal=USB_OTG_FS_VBUS
 PA9.Signal=USB_OTG_FS_VBUS
+PB0.GPIOParameters=GPIO_Label
+PB0.GPIO_Label=LED_orange
+PB0.Locked=true
+PB0.Signal=GPIO_Output
+PB1.GPIOParameters=GPIO_Label
+PB1.GPIO_Label=THEMP
+PB1.Signal=ADCx_IN9
 PB10.Mode=I2C
 PB10.Mode=I2C
 PB10.Signal=I2C2_SCL
 PB10.Signal=I2C2_SCL
+PB2.GPIOParameters=GPIO_Label
+PB2.GPIO_Label=MFP
+PB2.Locked=true
+PB2.Signal=GPIO_Output
 PB3.Mode=I2C
 PB3.Mode=I2C
 PB3.Signal=I2C2_SDA
 PB3.Signal=I2C2_SDA
 PB4.Mode=I2C
 PB4.Mode=I2C
 PB4.Signal=I2C3_SDA
 PB4.Signal=I2C3_SDA
 PB6.GPIOParameters=GPIO_Label
 PB6.GPIOParameters=GPIO_Label
-PB6.GPIO_Label=S8
+PB6.GPIO_Label=S7
 PB6.Signal=S_TIM4_CH1
 PB6.Signal=S_TIM4_CH1
 PB7.GPIOParameters=GPIO_Label
 PB7.GPIOParameters=GPIO_Label
-PB7.GPIO_Label=S7
+PB7.GPIO_Label=S8
 PB7.Signal=S_TIM4_CH2
 PB7.Signal=S_TIM4_CH2
 PB8.GPIOParameters=GPIO_Label
 PB8.GPIOParameters=GPIO_Label
-PB8.GPIO_Label=S6
+PB8.GPIO_Label=S9
 PB8.Signal=S_TIM4_CH3
 PB8.Signal=S_TIM4_CH3
 PB9.GPIOParameters=GPIO_Label
 PB9.GPIOParameters=GPIO_Label
-PB9.GPIO_Label=S5
+PB9.GPIO_Label=S10
 PB9.Locked=true
 PB9.Locked=true
 PB9.Signal=S_TIM4_CH4
 PB9.Signal=S_TIM4_CH4
 PC14-OSC32_IN.GPIOParameters=GPIO_Label
 PC14-OSC32_IN.GPIOParameters=GPIO_Label
 PC14-OSC32_IN.GPIO_Label=WC
 PC14-OSC32_IN.GPIO_Label=WC
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Locked=true
 PC14-OSC32_IN.Signal=GPIO_Output
 PC14-OSC32_IN.Signal=GPIO_Output
-PC15-OSC32_OUT.GPIOParameters=GPIO_Label
-PC15-OSC32_OUT.GPIO_Label=MFP
-PC15-OSC32_OUT.Locked=true
-PC15-OSC32_OUT.Signal=GPIO_Output
 PC4.GPIOParameters=GPIO_Label
 PC4.GPIOParameters=GPIO_Label
 PC4.GPIO_Label=LED_rouge
 PC4.GPIO_Label=LED_rouge
 PC4.Locked=true
 PC4.Locked=true
 PC4.Signal=GPIO_Output
 PC4.Signal=GPIO_Output
+PC5.GPIOParameters=GPIO_Label
+PC5.GPIO_Label=LED_vert
+PC5.Locked=true
+PC5.Signal=GPIO_Output
 PC6.GPIOParameters=GPIO_Label
 PC6.GPIOParameters=GPIO_Label
-PC6.GPIO_Label=S9
+PC6.GPIO_Label=S3
 PC6.Locked=true
 PC6.Locked=true
 PC6.Signal=S_TIM3_CH1
 PC6.Signal=S_TIM3_CH1
 PC7.GPIOParameters=GPIO_Label
 PC7.GPIOParameters=GPIO_Label
-PC7.GPIO_Label=S10
+PC7.GPIO_Label=S4
 PC7.Locked=true
 PC7.Locked=true
 PC7.Signal=S_TIM3_CH2
 PC7.Signal=S_TIM3_CH2
 PC8.GPIOParameters=GPIO_Label
 PC8.GPIOParameters=GPIO_Label
-PC8.GPIO_Label=S11
+PC8.GPIO_Label=S5
 PC8.Locked=true
 PC8.Locked=true
 PC8.Signal=S_TIM3_CH3
 PC8.Signal=S_TIM3_CH3
 PC9.GPIOParameters=GPIO_Label
 PC9.GPIOParameters=GPIO_Label
-PC9.GPIO_Label=S12
+PC9.GPIO_Label=S6
 PC9.Locked=true
 PC9.Locked=true
 PC9.Signal=S_TIM3_CH4
 PC9.Signal=S_TIM3_CH4
 PCC.Checker=false
 PCC.Checker=false
@@ -152,22 +190,24 @@ PH0\ -\ OSC_IN.Signal=RCC_OSC_IN
 PH1\ -\ OSC_OUT.Locked=true
 PH1\ -\ OSC_OUT.Locked=true
 PH1\ -\ OSC_OUT.Mode=HSE-External-Oscillator
 PH1\ -\ OSC_OUT.Mode=HSE-External-Oscillator
 PH1\ -\ OSC_OUT.Signal=RCC_OSC_OUT
 PH1\ -\ OSC_OUT.Signal=RCC_OSC_OUT
+PinOutPanel.RotationAngle=0
 ProjectManager.AskForMigrate=true
 ProjectManager.AskForMigrate=true
 ProjectManager.BackupPrevious=false
 ProjectManager.BackupPrevious=false
 ProjectManager.CompilerOptimize=2
 ProjectManager.CompilerOptimize=2
 ProjectManager.ComputerToolchain=false
 ProjectManager.ComputerToolchain=false
 ProjectManager.CoupleFile=true
 ProjectManager.CoupleFile=true
-ProjectManager.CustomerFirmwarePackage=/home/rcluze/STM32Cube/Repository/STM32Cube_FW_F4_V1.16.0
+ProjectManager.CustomerFirmwarePackage=
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=true
 ProjectManager.DeletePrevious=true
 ProjectManager.DeviceId=STM32F401RCTx
 ProjectManager.DeviceId=STM32F401RCTx
-ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.16.0
+ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.21.0
 ProjectManager.FreePins=true
 ProjectManager.FreePins=true
 ProjectManager.HalAssertFull=false
 ProjectManager.HalAssertFull=false
 ProjectManager.HeapSize=0x200
 ProjectManager.HeapSize=0x200
 ProjectManager.KeepUserCode=true
 ProjectManager.KeepUserCode=true
 ProjectManager.LastFirmware=true
 ProjectManager.LastFirmware=true
 ProjectManager.LibraryCopy=1
 ProjectManager.LibraryCopy=1
+ProjectManager.MainLocation=Src
 ProjectManager.PreviousToolchain=SW4STM32
 ProjectManager.PreviousToolchain=SW4STM32
 ProjectManager.ProjectBuild=false
 ProjectManager.ProjectBuild=false
 ProjectManager.ProjectFileName=Controle.ioc
 ProjectManager.ProjectFileName=Controle.ioc
@@ -176,7 +216,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=SW4STM32
 ProjectManager.TargetToolchain=SW4STM32
 ProjectManager.ToolChainLocation=
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=true
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-SystemClock_Config-RCC-false-HAL,3-MX_USB_OTG_FS_USB_Init-USB_OTG_FS-false-HAL,4-MX_TIM4_Init-TIM4-false-HAL,5-MX_TIM3_Init-TIM3-false-HAL,6-MX_TIM2_Init-TIM2-false-HAL,7-MX_I2C3_Init-I2C3-false-HAL,8-MX_I2C2_Init-I2C2-false-HAL
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-true,3-MX_USB_OTG_FS_USB_Init-USB_OTG_FS-false-HAL-true,4-MX_TIM4_Init-TIM4-false-HAL-true,5-MX_TIM3_Init-TIM3-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_I2C3_Init-I2C3-false-HAL-true,8-MX_I2C2_Init-I2C2-false-HAL-true,9-MX_SPI1_Init-SPI1-false-HAL-true,10-MX_TIM9_Init-TIM9-false-HAL-true,11-MX_TIM1_Init-TIM1-false-HAL-true,12-MX_ADC1_Init-ADC1-false-HAL-true
 RCC.48MHZClocksFreq_Value=48000000
 RCC.48MHZClocksFreq_Value=48000000
 RCC.AHBFreq_Value=84000000
 RCC.AHBFreq_Value=84000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2
 RCC.APB1CLKDivider=RCC_HCLK_DIV2
@@ -208,8 +248,8 @@ RCC.VCOI2SOutputFreq_Value=192000000
 RCC.VCOInputFreq_Value=1000000
 RCC.VCOInputFreq_Value=1000000
 RCC.VCOOutputFreq_Value=336000000
 RCC.VCOOutputFreq_Value=336000000
 RCC.VcooutputI2S=96000000
 RCC.VcooutputI2S=96000000
-SH.S_TIM2_CH1_ETR.0=TIM2_CH1,PWM Generation1 CH1
-SH.S_TIM2_CH1_ETR.ConfNb=1
+SH.ADCx_IN9.0=ADC1_IN9,IN9
+SH.ADCx_IN9.ConfNb=1
 SH.S_TIM2_CH2.0=TIM2_CH2,PWM Generation2 CH2
 SH.S_TIM2_CH2.0=TIM2_CH2,PWM Generation2 CH2
 SH.S_TIM2_CH2.ConfNb=1
 SH.S_TIM2_CH2.ConfNb=1
 SH.S_TIM2_CH3.0=TIM2_CH3,PWM Generation3 CH3
 SH.S_TIM2_CH3.0=TIM2_CH3,PWM Generation3 CH3
@@ -232,11 +272,18 @@ SH.S_TIM4_CH3.0=TIM4_CH3,PWM Generation3 CH3
 SH.S_TIM4_CH3.ConfNb=1
 SH.S_TIM4_CH3.ConfNb=1
 SH.S_TIM4_CH4.0=TIM4_CH4,PWM Generation4 CH4
 SH.S_TIM4_CH4.0=TIM4_CH4,PWM Generation4 CH4
 SH.S_TIM4_CH4.ConfNb=1
 SH.S_TIM4_CH4.ConfNb=1
-TIM2.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
+SPI1.CalculateBaudRate=42.0 MBits/s
+SPI1.Direction=SPI_DIRECTION_2LINES
+SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,VirtualNSS
+SPI1.Mode=SPI_MODE_MASTER
+SPI1.VirtualNSS=VM_NSSHARD
+SPI1.VirtualType=VM_MASTER
+TIM1.Channel-Output\ Compare1\ CH1N=TIM_CHANNEL_1
+TIM1.IPParameters=Channel-Output Compare1 CH1N
 TIM2.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
 TIM2.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
 TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
 TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
 TIM2.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 TIM2.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
-TIM2.IPParameters=Channel-PWM Generation1 CH1,Channel-PWM Generation2 CH2,Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4
+TIM2.IPParameters=Channel-PWM Generation2 CH2,Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4
 TIM3.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
 TIM3.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1
 TIM3.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
 TIM3.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
 TIM3.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
 TIM3.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
@@ -247,6 +294,16 @@ TIM4.Channel-PWM\ Generation2\ CH2=TIM_CHANNEL_2
 TIM4.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
 TIM4.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
 TIM4.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 TIM4.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 TIM4.IPParameters=Channel-PWM Generation4 CH4,Channel-PWM Generation3 CH3,Channel-PWM Generation2 CH2,Channel-PWM Generation1 CH1
 TIM4.IPParameters=Channel-PWM Generation4 CH4,Channel-PWM Generation3 CH3,Channel-PWM Generation2 CH2,Channel-PWM Generation1 CH1
+TIM9.Channel-PWM\ Generation1\ No\ Output=TIM_CHANNEL_1
+TIM9.IPParameters=Channel-PWM Generation1 No Output
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Mode=SysTick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+VP_TIM1_VS_ClockSourceITR.Mode=TriggerSource_ITR0
+VP_TIM1_VS_ClockSourceITR.Signal=TIM1_VS_ClockSourceITR
+VP_TIM1_VS_ControllerModeClock.Mode=Clock Mode
+VP_TIM1_VS_ControllerModeClock.Signal=TIM1_VS_ControllerModeClock
+VP_TIM9_VS_ClockSourceITR.Mode=TriggerSource_ITR0
+VP_TIM9_VS_ClockSourceITR.Signal=TIM9_VS_ClockSourceITR
+VP_TIM9_VS_no_output1.Mode=PWM Generation1 No Output
+VP_TIM9_VS_no_output1.Signal=TIM9_VS_no_output1
 board=Controle
 board=Controle

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff