Update ecc83 demo. default KISYS3DMOD definition on Linux: add...

Update ecc83 demo. default KISYS3DMOD definition on Linux: add /usr/local/kicad/share/kicad/module/package3d test to find a suitable value.

common/pcbcommon.cpp

@@ -77,6 +77,7 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
     // Attempt to determine where the 3D shape libraries were installed using the
     // legacy path:
     // on Unix: /usr/local/kicad/share/modules/packages3d
+    // oor /usr/local/kicad/share/kicad/modules/packages3d
     // or  /usr/share/kicad/modules/packages3d
     // On Windows: bin../share/modules/packages3d
     wxString relpath( wxT( "modules/" ) );
@@ -112,6 +113,16 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
         return true;
     }
 
+    path.Empty();
+    wxGetEnv( wxT("HOME"), &path );
+    path += wxT("/kicad/share/kicad/") + relpath;
+
+    if( wxFileName::DirExists( path ) )
+    {
+        wxSetEnv( aKiSys3Dmod, path );
+        return true;
+    }
+
     // Try the standard install path:
     path = wxT("/usr/local/kicad/share/") + relpath;
 
@@ -121,6 +132,14 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
         return true;
     }
 
+    // Try the new standard install path:
+    path = wxT("/usr/local/kicad/share/kicad/") + relpath;
+
+    if( wxFileName::DirExists( path ) )
+    {
+        wxSetEnv( aKiSys3Dmod, path );
+        return true;
+    }
     // Try the official distrib standard install path:
     path = wxT("/usr/share/kicad/") + relpath;
 

demos/ecc83/ecc83-pp-cache.lib

@@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_2
 #
 DEF CONN_2 P 0 40 Y N 1 F N

demos/ecc83/ecc83-pp.cmp

-Cmp-Mod V01 Genere par PcbNew le 11/12/2006-20:19:14
+Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product   date = 01/01/2015 18:02:29
 
 BeginCmp
-TimeStamp = 4549F4BE;
+TimeStamp = /4549F4BE;
 Reference = C1;
 ValeurCmp = 10uF;
-IdModule  = C2V10;
+IdModule  = discret:C2V10;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F3BE;
+TimeStamp = /4549F3BE;
 Reference = C2;
 ValeurCmp = 680nF;
-IdModule  = CP8;
+IdModule  = discret:C2;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F464;
+TimeStamp = /4549F464;
 Reference = P1;
 ValeurCmp = IN;
-IdModule  = BORNIER2;
+IdModule  = connect:bornier2;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F46C;
+TimeStamp = /4549F46C;
 Reference = P2;
 ValeurCmp = OUT;
-IdModule  = BORNIER2;
+IdModule  = connect:bornier2;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F4A5;
+TimeStamp = /4549F4A5;
 Reference = P3;
 ValeurCmp = POWER;
-IdModule  = BORNIER2;
+IdModule  = connect:bornier2;
 EndCmp
 
 BeginCmp
-TimeStamp = 456A8ACC;
+TimeStamp = /456A8ACC;
 Reference = P4;
 ValeurCmp = CONN_2;
-IdModule  = BORNIER2;
+IdModule  = connect:bornier2;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F38A;
+TimeStamp = /54A5890A;
+Reference = P5;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A58C65;
+Reference = P6;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A58C8A;
+Reference = P7;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A58CA3;
+Reference = P8;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F38A;
 Reference = R1;
 ValeurCmp = 1.5K;
-IdModule  = R3;
+IdModule  = discret:R3;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F39D;
+TimeStamp = /4549F39D;
 Reference = R2;
 ValeurCmp = 1.5K;
-IdModule  = R3;
+IdModule  = discret:R3;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F3AD;
+TimeStamp = /4549F3AD;
 Reference = R3;
 ValeurCmp = 100K;
-IdModule  = R3;
+IdModule  = discret:R3;
 EndCmp
 
 BeginCmp
-TimeStamp = 4549F3A2;
+TimeStamp = /4549F3A2;
 Reference = R4;
 ValeurCmp = 47K;
-IdModule  = R3;
+IdModule  = discret:R3;
 EndCmp
 
 BeginCmp
-TimeStamp = 454A08DD;
+TimeStamp = /48B4F266;
 Reference = U1;
 ValeurCmp = ECC83;
-IdModule  = ECC-83-1;
+IdModule  = Valves:VALVE-ECC-83-1;
 EndCmp
 
 EndListe

demos/ecc83/ecc83-pp.kicad_pcb

-(kicad_pcb (version 4) (host pcbnew "(2014-07-02 BZR 4969)-product")
+(kicad_pcb (version 4) (host pcbnew "(2014-12-31 BZR 5344)-product")
 
   (general
     (links 20)
     (no_connects 0)
-    (area 123.761499 90.741499 168.338501 132.778501)
+    (area 121.326286 89.674 171.408715 136.0628)
     (thickness 1.6002)
     (drawings 4)
     (tracks 57)
     (zones 0)
     (modules 15)
-    (nets 10)
+    (nets 14)
   )
 
   (page A4)
@@ -53,7 +53,7 @@
     (mod_text_width 0.3048)
     (pad_size 2.794 1.397)
     (pad_drill 1.9304)
-    (pad_to_mask_clearance 0.254)
+    (pad_to_mask_clearance 0.1)
     (aux_axis_origin 0 0)
     (visible_elements 7FFFFFFF)
     (pcbplotparams
@@ -94,6 +94,10 @@
   (net 7 "Net-(P4-Pad2)")
   (net 8 "Net-(R1-Pad1)")
   (net 9 "Net-(R2-Pad1)")
+  (net 10 "Net-(P5-Pad1)")
+  (net 11 "Net-(P6-Pad1)")
+  (net 12 "Net-(P7-Pad1)")
+  (net 13 "Net-(P8-Pad1)")
 
   (net_class Default "Ceci est la Netclass par défaut"
     (clearance 0.381)
@@ -103,136 +107,266 @@
     (uvia_dia 0.508)
     (uvia_drill 0.127)
     (add_net GND)
-    (add_net N-000007)
     (add_net "Net-(C1-Pad1)")
     (add_net "Net-(C2-Pad1)")
     (add_net "Net-(C2-Pad2)")
     (add_net "Net-(P1-Pad2)")
     (add_net "Net-(P4-Pad1)")
     (add_net "Net-(P4-Pad2)")
+    (add_net "Net-(P5-Pad1)")
+    (add_net "Net-(P6-Pad1)")
+    (add_net "Net-(P7-Pad1)")
+    (add_net "Net-(P8-Pad1)")
     (add_net "Net-(R1-Pad1)")
     (add_net "Net-(R2-Pad1)")
   )
 
-  (module 1pin (layer Composant) (tedit 200000) (tstamp 454CC09B)
-    (at 127 129.54)
-    (descr "module 1 pin (ou trou mecanique de percage)")
+  (module discret:C2V10 (layer Composant) (tedit 54A57B4C) (tstamp 54A581E5)
+    (at 138.43 98.425 90)
+    (descr "Condensateur polarise")
+    (tags CP)
+    (path /4549F4BE)
+    (fp_text reference C1 (at 0 2.54 90) (layer F.SilkS)
+      (effects (font (size 1.27 1.27) (thickness 0.254)))
+    )
+    (fp_text value 10uF (at 0 -2.54 90) (layer F.SilkS)
+      (effects (font (size 1.27 1.27) (thickness 0.254)))
+    )
+    (fp_circle (center 0 0) (end 4.826 -2.794) (layer F.SilkS) (width 0.3048))
+    (pad 1 thru_hole rect (at -2.54 0 90) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 2 "Net-(C1-Pad1)"))
+    (pad 2 thru_hole circle (at 2.54 0 90) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (model discret/c_vert_c2v10.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module discret:C2 (layer Composant) (tedit 54A57B4C) (tstamp 54A581EA)
+    (at 137.16 122.555 90)
+    (descr "Condensateur = 2 pas")
+    (tags C)
+    (path /4549F3BE)
+    (fp_text reference C2 (at 0 0 90) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+    )
+    (fp_text value 680nF (at 0 0 90) (layer F.SilkS) hide
+      (effects (font (size 1.016 1.016) (thickness 0.2032)))
+    )
+    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
+    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
+    (pad 1 thru_hole circle (at -2.54 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 3 "Net-(C2-Pad1)"))
+    (pad 2 thru_hole circle (at 2.54 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 4 "Net-(C2-Pad2)"))
+    (model discret/capa_2pas_5x5mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module connect:bornier2 (layer Composant) (tedit 54A588D7) (tstamp 54A581EF)
+    (at 164.465 110.49 270)
+    (descr "Bornier d'alimentation 2 pins")
+    (tags DEV)
+    (path /4549F464)
+    (fp_text reference P1 (at -6.05 -0.775 360) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_text value IN (at 0 5 270) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole rect (at -2 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (pad 2 thru_hole circle (at 2 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 5 "Net-(P1-Pad2)"))
+    (model Device/bornier_2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module connect:bornier2 (layer Composant) (tedit 54A588C9) (tstamp 54A581F4)
+    (at 128.27 116.84 90)
+    (descr "Bornier d'alimentation 2 pins")
     (tags DEV)
-    (path 1pin)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (path /4549F46C)
+    (fp_text reference P2 (at 5.81 0.14 180) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_text value OUT (at 0 5 90) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole rect (at -2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 3 "Net-(C2-Pad1)"))
+    (pad 2 thru_hole circle (at 2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (model Device/bornier_2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
     )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+  )
+
+  (module connect:bornier2 (layer Composant) (tedit 54A588D1) (tstamp 54A581F9)
+    (at 128.27 102.87 90)
+    (descr "Bornier d'alimentation 2 pins")
+    (tags DEV)
+    (path /4549F4A5)
+    (fp_text reference P3 (at -6.1 0.09 180) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_text value POWER (at 0 5 90) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole rect (at -2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 2 "Net-(C1-Pad1)"))
+    (pad 2 thru_hole circle (at 2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (model Device/bornier_2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
     )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
   )
 
-  (module 1pin (layer Composant) (tedit 200000) (tstamp 454CC096)
-    (at 165.1 129.54)
+  (module connect:bornier2 (layer Composant) (tedit 54A58902) (tstamp 54A581FE)
+    (at 147.955 129.54 180)
+    (descr "Bornier d'alimentation 2 pins")
+    (tags DEV)
+    (path /456A8ACC)
+    (fp_text reference P4 (at 6.605 0.46 180) (layer F.SilkS)
+      (effects (font (thickness 0.15)))
+    )
+    (fp_text value CONN_2 (at -9.735 3.03 180) (layer F.SilkS) hide
+      (effects (font (thickness 0.15)))
+    )
+    (fp_line (start 5 2) (end -5 2) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 3) (end 5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start 5 -3) (end -5 -3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 -3) (end -5 3) (layer F.SilkS) (width 0.15))
+    (fp_line (start -5 3) (end 5 3) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole rect (at -2 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 6 "Net-(P4-Pad1)"))
+    (pad 2 thru_hole circle (at 2 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
+      (net 7 "Net-(P4-Pad2)"))
+    (model Device/bornier_2.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module connect:1pin (layer Composant) (tedit 54A588DF) (tstamp 54A58203)
+    (at 127 93.98)
     (descr "module 1 pin (ou trou mecanique de percage)")
     (tags DEV)
-    (path 1pin)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (path /54A5890A)
+    (fp_text reference P5 (at 0 -3) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (fp_text value CONN_1 (at 0 2) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
+    (fp_circle (center 0 0) (end 0 -2) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at 0 0) (size 4 4) (drill 3) (layers *.Cu *.Mask F.SilkS)
+      (net 10 "Net-(P5-Pad1)"))
   )
 
-  (module 1pin (layer Composant) (tedit 200000) (tstamp 454CC090)
+  (module connect:1pin (layer Composant) (tedit 54A588E7) (tstamp 54A58207)
     (at 165.1 93.98)
     (descr "module 1 pin (ou trou mecanique de percage)")
     (tags DEV)
-    (path 1pin)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (path /54A58C65)
+    (fp_text reference P6 (at 0 -3) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (fp_text value CONN_1 (at 0 2) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
+    (fp_circle (center 0 0) (end 0 -2) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at 0 0) (size 4 4) (drill 3) (layers *.Cu *.Mask F.SilkS)
+      (net 11 "Net-(P6-Pad1)"))
   )
 
-  (module 1pin (layer Composant) (tedit 200000) (tstamp 454CC08A)
-    (at 127 93.98)
+  (module connect:1pin (layer Composant) (tedit 54A588EE) (tstamp 54A5820B)
+    (at 165.1 129.54)
     (descr "module 1 pin (ou trou mecanique de percage)")
     (tags DEV)
-    (path 1pin)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (path /54A58C8A)
+    (fp_text reference P7 (at 0 -3) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    (fp_text value CONN_1 (at 0 2) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
+    (fp_circle (center 0 0) (end 0 -2) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at 0 0) (size 4 4) (drill 3) (layers *.Cu *.Mask F.SilkS)
+      (net 12 "Net-(P7-Pad1)"))
   )
 
-  (module ECC-83-1 (layer Composant) (tedit 454CBC05) (tstamp 48B4F266)
-    (at 149.225 113.665)
-    (path /48B4F266)
-    (fp_text reference U1 (at 1.27 -11.43) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
+  (module connect:1pin (layer Composant) (tedit 54A588F3) (tstamp 54A5820F)
+    (at 127 129.54)
+    (descr "module 1 pin (ou trou mecanique de percage)")
+    (tags DEV)
+    (path /54A58CA3)
+    (fp_text reference P8 (at 0 -3) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value ECC83 (at 0 11.43) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 8 "Net-(R1-Pad1)"))
-    (pad 2 thru_hole circle (at 5.60832 1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 5 "Net-(P1-Pad2)"))
-    (pad 3 thru_hole circle (at 5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 9 "Net-(R2-Pad1)"))
-    (pad 4 thru_hole circle (at 3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 6 "Net-(P4-Pad1)"))
-    (pad 5 thru_hole circle (at 0 -5.8928) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 6 "Net-(P4-Pad1)"))
-    (pad 6 thru_hole circle (at -3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 2 "Net-(C1-Pad1)"))
-    (pad 7 thru_hole circle (at -5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 8 "Net-(R1-Pad1)"))
-    (pad 8 thru_hole circle (at -5.60832 1.78816) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 4 "Net-(C2-Pad2)"))
-    (pad 9 thru_hole circle (at -3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 7 "Net-(P4-Pad2)"))
-    (model valves/ecc83.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_text value CONN_1 (at 0 2) (layer F.SilkS) hide
+      (effects (font (size 1 1) (thickness 0.15)))
     )
+    (fp_circle (center 0 0) (end 0 -2) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at 0 0) (size 4 4) (drill 3) (layers *.Cu *.Mask F.SilkS)
+      (net 13 "Net-(P8-Pad1)"))
   )
 
-  (module R3 (layer Composant) (tedit 200000) (tstamp 4549F39D)
-    (at 149.86 97.79 180)
+  (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A58213)
+    (at 135.89 111.76 270)
     (descr "Resitance 3 pas")
     (tags R)
-    (path /4549F39D)
+    (path /4549F38A)
     (autoplace_cost180 10)
-    (fp_text reference R2 (at 0 0 180) (layer F.SilkS)
+    (fp_text reference R1 (at 0 0.127 270) (layer F.SilkS) hide
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_text value 1.5K (at 0 0 180) (layer F.SilkS) hide
+    (fp_text value 1.5K (at 0 0.127 270) (layer F.SilkS)
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 9 "Net-(R2-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
+    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 8 "Net-(R1-Pad1)"))
+    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 4 "Net-(C2-Pad2)"))
     (model discret/resistor.wrl
       (at (xyz 0 0 0))
       (scale (xyz 0.3 0.3 0.3))
@@ -240,29 +374,29 @@
     )
   )
 
-  (module R3 (layer Composant) (tedit 200000) (tstamp 4549F3A2)
-    (at 164.465 121.285 270)
+  (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A58218)
+    (at 149.86 97.79 180)
     (descr "Resitance 3 pas")
     (tags R)
-    (path /4549F3A2)
+    (path /4549F39D)
     (autoplace_cost180 10)
-    (fp_text reference R4 (at 0 0 270) (layer F.SilkS)
+    (fp_text reference R2 (at 0 0.127 180) (layer F.SilkS) hide
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_text value 47K (at 0 0 270) (layer F.SilkS) hide
+    (fp_text value 1.5K (at 0 0.127 180) (layer F.SilkS)
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 5 "Net-(P1-Pad2)"))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
+    (pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 9 "Net-(R2-Pad1)"))
+    (pad 2 thru_hole circle (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 1 GND))
     (model discret/resistor.wrl
       (at (xyz 0 0 0))
@@ -271,26 +405,26 @@
     )
   )
 
-  (module R3 (layer Composant) (tedit 200000) (tstamp 4549F3AD)
+  (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A5821D)
     (at 133.985 122.555 90)
     (descr "Resitance 3 pas")
     (tags R)
     (path /4549F3AD)
     (autoplace_cost180 10)
-    (fp_text reference R3 (at 0 0 90) (layer F.SilkS)
+    (fp_text reference R3 (at 0 0.127 90) (layer F.SilkS) hide
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_text value 100K (at 0 0 90) (layer F.SilkS) hide
+    (fp_text value 100K (at 0 0.127 90) (layer F.SilkS)
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
     (pad 1 thru_hole circle (at -3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
       (net 3 "Net-(C2-Pad1)"))
     (pad 2 thru_hole circle (at 3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
@@ -302,30 +436,30 @@
     )
   )
 
-  (module R3 (layer Composant) (tedit 200000) (tstamp 4549F38A)
-    (at 135.89 111.76 270)
+  (module discret:R3 (layer Composant) (tedit 54A57B4C) (tstamp 54A58222)
+    (at 164.465 121.285 270)
     (descr "Resitance 3 pas")
     (tags R)
-    (path /4549F38A)
+    (path /4549F3A2)
     (autoplace_cost180 10)
-    (fp_text reference R1 (at 0 0 270) (layer F.SilkS)
+    (fp_text reference R4 (at 0 0.127 270) (layer F.SilkS) hide
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_text value 1.5K (at 0 0 270) (layer F.SilkS) hide
+    (fp_text value 47K (at 0 0.127 270) (layer F.SilkS)
       (effects (font (size 1.397 1.27) (thickness 0.2032)))
     )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
     (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 8 "Net-(R1-Pad1)"))
+      (net 5 "Net-(P1-Pad2)"))
     (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 4 "Net-(C2-Pad2)"))
+      (net 1 GND))
     (model discret/resistor.wrl
       (at (xyz 0 0 0))
       (scale (xyz 0.3 0.3 0.3))
@@ -333,158 +467,35 @@
     )
   )
 
-  (module C2V10 (layer Composant) (tedit 41854742) (tstamp 4549F4BE)
-    (at 138.43 98.425 90)
-    (descr "Condensateur polarise")
-    (tags CP)
-    (path /4549F4BE)
-    (fp_text reference C1 (at 0 2.54 90) (layer F.SilkS)
-      (effects (font (size 1.27 1.27) (thickness 0.254)))
-    )
-    (fp_text value 10uF (at 0 -2.54 90) (layer F.SilkS)
-      (effects (font (size 1.27 1.27) (thickness 0.254)))
-    )
-    (fp_circle (center 0 0) (end 4.826 -2.794) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -2.54 0 90) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 2 "Net-(C1-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0 90) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (model discret/c_vert_c2v10.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module C2 (layer Composant) (tedit 200000) (tstamp 4549F3BE)
-    (at 137.16 122.555 90)
-    (descr "Condensateur = 2 pas")
-    (tags C)
-    (path /4549F3BE)
-    (fp_text reference C2 (at 0 0 90) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_text value 680nF (at 0 0 90) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.2032)))
-    )
-    (fp_line (start -3.556 -1.016) (end 3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 -1.016) (end 3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.556 1.016) (end -3.556 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 1.016) (end -3.556 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.556 -0.508) (end -3.048 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -2.54 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 3 "Net-(C2-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 4 "Net-(C2-Pad2)"))
-    (model discret/capa_2pas_5x5mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+  (module Valves:VALVE-ECC-83-1 (layer Composant) (tedit 54A57B25) (tstamp 54A58227)
+    (at 149.225 113.665)
+    (path /48B4F266)
+    (fp_text reference U1 (at 1.27 -11.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-  )
-
-  (module bornier2 (layer Composant) (tedit 3EC0ED69) (tstamp 4549F4A5)
-    (at 128.27 102.87 90)
-    (descr "Bornier d'alimentation 2 pins")
-    (tags DEV)
-    (path /4549F4A5)
-    (fp_text reference P3 (at 0 -5.08 90) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_text value POWER (at 0 5.08 90) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_line (start 5.08 2.54) (end -5.08 2.54) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 3.81) (end 5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 -3.81) (end -5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 -3.81) (end -5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 3.81) (end 5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
-      (net 2 "Net-(C1-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (model device/bornier_2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
+    (fp_text value ECC83 (at 0 11.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
     )
-  )
-
-  (module bornier2 (layer Composant) (tedit 3EC0ED69) (tstamp 4549F464)
-    (at 164.465 110.49 270)
-    (descr "Bornier d'alimentation 2 pins")
-    (tags DEV)
-    (path /4549F464)
-    (fp_text reference P1 (at 0 -5.08 270) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_text value IN (at 0 5.08 270) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_line (start 5.08 2.54) (end -5.08 2.54) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 3.81) (end 5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 -3.81) (end -5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 -3.81) (end -5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 3.81) (end 5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -2.54 0 270) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (pad 2 thru_hole circle (at 2.54 0 270) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
+    (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at 3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 8 "Net-(R1-Pad1)"))
+    (pad 2 thru_hole circle (at 5.60832 1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 5 "Net-(P1-Pad2)"))
-    (model device/bornier_2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module bornier2 (layer Composant) (tedit 3EC0ED69) (tstamp 4549F46C)
-    (at 128.27 116.84 90)
-    (descr "Bornier d'alimentation 2 pins")
-    (tags DEV)
-    (path /4549F46C)
-    (fp_text reference P2 (at 0 -5.08 90) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_text value OUT (at 0 5.08 90) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_line (start 5.08 2.54) (end -5.08 2.54) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 3.81) (end 5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 -3.81) (end -5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 -3.81) (end -5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 3.81) (end 5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
-      (net 3 "Net-(C2-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (model device/bornier_2.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module bornier2 (layer Composant) (tedit 3EC0ED69) (tstamp 456A8ACC)
-    (at 147.955 129.54 180)
-    (descr "Bornier d'alimentation 2 pins")
-    (tags DEV)
-    (path /456A8ACC)
-    (fp_text reference P4 (at 0 -5.08 180) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_text value CONN_2 (at 0 5.08 180) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_line (start 5.08 2.54) (end -5.08 2.54) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 3.81) (end 5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 5.08 -3.81) (end -5.08 -3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 -3.81) (end -5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -5.08 3.81) (end 5.08 3.81) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole rect (at -2.54 0 180) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
+    (pad 3 thru_hole circle (at 5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 9 "Net-(R2-Pad1)"))
+    (pad 4 thru_hole circle (at 3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 6 "Net-(P4-Pad1)"))
-    (pad 2 thru_hole circle (at 2.54 0 180) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
+    (pad 5 thru_hole circle (at 0 -5.8928) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 6 "Net-(P4-Pad1)"))
+    (pad 6 thru_hole circle (at -3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 2 "Net-(C1-Pad1)"))
+    (pad 7 thru_hole circle (at -5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 8 "Net-(R1-Pad1)"))
+    (pad 8 thru_hole circle (at -5.60832 1.78816) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 4 "Net-(C2-Pad2)"))
+    (pad 9 thru_hole circle (at -3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 7 "Net-(P4-Pad2)"))
-    (model device/bornier_2.wrl
+    (model Valves/VALVE-ECC-83-1.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
@@ -496,68 +507,68 @@
   (gr_line (start 168.275 90.805) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.127))
   (gr_line (start 123.825 90.805) (end 123.825 132.715) (angle 90) (layer Edge.Cuts) (width 0.127))
 
-  (segment (start 142.24 95.25) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
-  (segment (start 164.465 125.095) (end 164.465 124.46) (width 0.8636) (layer Cuivre) (net 1) (status 800))
-  (segment (start 146.05 97.79) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
-  (segment (start 139.065 95.25) (end 142.24 95.25) (width 0.8636) (layer Cuivre) (net 1))
-  (segment (start 138.43 95.885) (end 139.065 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 800))
   (segment (start 164.465 107.95) (end 165.735 107.95) (width 0.8636) (layer Cuivre) (net 1) (status 800))
-  (segment (start 136.525 100.965) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
-  (segment (start 138.43 100.965) (end 136.525 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 800))
-  (segment (start 145.7706 103.8606) (end 142.875 100.965) (width 0.8636) (layer Cuivre) (net 2))
-  (segment (start 142.875 100.965) (end 138.43 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 400))
-  (segment (start 145.7706 108.91012) (end 145.7706 103.8606) (width 0.8636) (layer Cuivre) (net 2) (status 800))
-  (segment (start 132.08 105.41) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
+  (segment (start 138.43 95.885) (end 139.065 95.25) (width 0.8636) (layer Cuivre) (net 1) (status 800))
+  (segment (start 139.065 95.25) (end 142.24 95.25) (width 0.8636) (layer Cuivre) (net 1))
+  (segment (start 146.05 97.79) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
+  (segment (start 164.465 125.095) (end 164.465 124.46) (width 0.8636) (layer Cuivre) (net 1) (status 800))
+  (segment (start 142.24 95.25) (end 146.05 95.25) (width 0.8636) (layer Cuivre) (net 1))
   (segment (start 128.27 105.41) (end 132.08 105.41) (width 0.8636) (layer Cuivre) (net 2) (status 800))
-  (segment (start 137.16 125.095) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
-  (segment (start 133.985 126.365) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
+  (segment (start 132.08 105.41) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
+  (segment (start 145.7706 108.91012) (end 145.7706 103.8606) (width 0.8636) (layer Cuivre) (net 2) (status 800))
+  (segment (start 142.875 100.965) (end 138.43 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 400))
+  (segment (start 145.7706 103.8606) (end 142.875 100.965) (width 0.8636) (layer Cuivre) (net 2))
+  (segment (start 138.43 100.965) (end 136.525 100.965) (width 0.8636) (layer Cuivre) (net 2) (status 800))
+  (segment (start 136.525 100.965) (end 135.255 102.235) (width 0.8636) (layer Cuivre) (net 2))
   (segment (start 133.985 125.095) (end 128.27 119.38) (width 0.8636) (layer Cuivre) (net 3))
-  (segment (start 137.16 120.015) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
-  (segment (start 135.89 115.57) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
-  (segment (start 137.16 115.57) (end 143.49984 115.57) (width 0.8636) (layer Cuivre) (net 4))
+  (segment (start 133.985 126.365) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
+  (segment (start 137.16 125.095) (end 133.985 125.095) (width 0.8636) (layer Cuivre) (net 3))
   (segment (start 143.49984 115.57) (end 143.61668 115.45316) (width 0.8636) (layer Cuivre) (net 4))
-  (segment (start 159.385 117.475) (end 164.465 117.475) (width 0.8636) (layer Cuivre) (net 5) (status 400))
-  (segment (start 154.83332 115.4938) (end 157.4038 115.4938) (width 0.8636) (layer Cuivre) (net 5) (status 800))
-  (segment (start 164.465 117.475) (end 164.465 113.03) (width 0.8636) (layer Cuivre) (net 5) (status C00))
+  (segment (start 137.16 115.57) (end 143.49984 115.57) (width 0.8636) (layer Cuivre) (net 4))
+  (segment (start 135.89 115.57) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
+  (segment (start 137.16 120.015) (end 137.16 115.57) (width 0.8636) (layer Cuivre) (net 4))
   (segment (start 157.4038 115.4938) (end 159.385 117.475) (width 0.8636) (layer Cuivre) (net 5))
-  (segment (start 149.86 128.905) (end 150.495 129.54) (width 0.8636) (layer Cuivre) (net 6) (status 400))
-  (segment (start 149.86 111.125) (end 149.86 128.905) (width 0.8636) (layer Cuivre) (net 6))
-  (segment (start 149.225 110.49) (end 149.86 111.125) (width 0.8636) (layer Cuivre) (net 6))
-  (segment (start 149.225 107.7722) (end 151.54148 107.7722) (width 0.8636) (layer Cuivre) (net 6) (status 800))
-  (segment (start 151.54148 107.7722) (end 152.6794 108.91012) (width 0.8636) (layer Cuivre) (net 6) (status 400))
+  (segment (start 164.465 117.475) (end 164.465 113.03) (width 0.8636) (layer Cuivre) (net 5) (status C00))
+  (segment (start 154.83332 115.4938) (end 157.4038 115.4938) (width 0.8636) (layer Cuivre) (net 5) (status 800))
+  (segment (start 159.385 117.475) (end 164.465 117.475) (width 0.8636) (layer Cuivre) (net 5) (status 400))
   (segment (start 149.225 107.7722) (end 149.225 110.49) (width 0.8636) (layer Cuivre) (net 6) (status 800))
-  (segment (start 145.7706 129.1844) (end 145.415 129.54) (width 0.8636) (layer Cuivre) (net 7) (status 400))
+  (segment (start 151.54148 107.7722) (end 152.6794 108.91012) (width 0.8636) (layer Cuivre) (net 6) (status 400))
+  (segment (start 149.225 107.7722) (end 151.54148 107.7722) (width 0.8636) (layer Cuivre) (net 6) (status 800))
+  (segment (start 149.225 110.49) (end 149.86 111.125) (width 0.8636) (layer Cuivre) (net 6))
+  (segment (start 149.86 111.125) (end 149.86 128.905) (width 0.8636) (layer Cuivre) (net 6))
+  (segment (start 149.86 128.905) (end 150.495 129.54) (width 0.8636) (layer Cuivre) (net 6) (status 400))
   (segment (start 145.7706 118.41988) (end 145.7706 129.1844) (width 0.8636) (layer Cuivre) (net 7) (status 800))
-  (segment (start 153.289 131.826) (end 154.94 130.175) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 140.716 131.826) (end 153.289 131.826) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 143.61668 111.8362) (end 141.6812 111.8362) (width 0.8636) (layer Cuivre) (net 8) (status 800))
-  (segment (start 141.6812 111.8362) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 154.94 121.31548) (end 154.94 120.68048) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 154.94 120.68048) (end 152.6794 118.41988) (width 0.8636) (layer Cuivre) (net 8) (status 400))
-  (segment (start 136.398 121.92) (end 135.509 121.031) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.509 121.031) (end 135.509 117.729) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.509 117.729) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 136.525 121.92) (end 136.398 121.92) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 136.525 121.92) (end 139.065 124.46) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 139.065 124.46) (end 139.065 130.175) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 139.065 130.175) (end 140.335 131.445) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.89 107.95) (end 135.255 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
-  (segment (start 133.985 109.22) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.255 107.95) (end 133.985 109.22) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 135.89 107.95) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
-  (segment (start 140.335 131.445) (end 140.716 131.826) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 154.94 121.31548) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 145.7706 129.1844) (end 145.415 129.54) (width 0.8636) (layer Cuivre) (net 7) (status 400))
   (segment (start 154.94 130.175) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
-  (segment (start 154.83332 111.8362) (end 154.83332 111.23168) (width 0.8636) (layer Cuivre) (net 9) (status 800))
-  (segment (start 159.385 106.68) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
-  (segment (start 154.83332 111.23168) (end 159.385 106.68) (width 0.8636) (layer Cuivre) (net 9))
-  (segment (start 157.48 97.79) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 154.94 121.31548) (end 154.94 121.31548) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 140.335 131.445) (end 140.716 131.826) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.89 107.95) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
+  (segment (start 135.255 107.95) (end 133.985 109.22) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 133.985 109.22) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.89 107.95) (end 135.255 107.95) (width 0.8636) (layer Cuivre) (net 8) (status 800))
+  (segment (start 139.065 130.175) (end 140.335 131.445) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 139.065 124.46) (end 139.065 130.175) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 136.525 121.92) (end 139.065 124.46) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 136.525 121.92) (end 136.398 121.92) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.509 117.729) (end 133.985 116.205) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 135.509 121.031) (end 135.509 117.729) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 136.398 121.92) (end 135.509 121.031) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 154.94 120.68048) (end 152.6794 118.41988) (width 0.8636) (layer Cuivre) (net 8) (status 400))
+  (segment (start 154.94 121.31548) (end 154.94 120.68048) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 141.6812 111.8362) (end 137.795 107.95) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 143.61668 111.8362) (end 141.6812 111.8362) (width 0.8636) (layer Cuivre) (net 8) (status 800))
+  (segment (start 140.716 131.826) (end 153.289 131.826) (width 0.8636) (layer Cuivre) (net 8))
+  (segment (start 153.289 131.826) (end 154.94 130.175) (width 0.8636) (layer Cuivre) (net 8))
   (segment (start 153.67 97.79) (end 157.48 97.79) (width 0.8636) (layer Cuivre) (net 9) (status 800))
+  (segment (start 157.48 97.79) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 154.83332 111.23168) (end 159.385 106.68) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 159.385 106.68) (end 159.385 99.695) (width 0.8636) (layer Cuivre) (net 9))
+  (segment (start 154.83332 111.8362) (end 154.83332 111.23168) (width 0.8636) (layer Cuivre) (net 9) (status 800))
 
   (zone (net 1) (net_name GND) (layer Cuivre) (tstamp 4EED97A2) (hatch edge 0.508)
     (connect_pads (clearance 0.635))
     (min_thickness 0.381)
-    (fill (arc_segments 32) (thermal_gap 0.254) (thermal_bridge_width 0.50038))
+    (fill yes (arc_segments 32) (thermal_gap 0.254) (thermal_bridge_width 0.50038))
     (polygon
       (pts
         (xy 167.64 132.08) (xy 167.64 91.44) (xy 124.46 91.44) (xy 124.46 132.08)
@@ -565,212 +576,216 @@
     )
     (filled_polygon
       (pts
-        (xy 167.386 127.81788) (xy 167.32504 127.72644) (xy 166.93134 127.32766) (xy 166.46652 127.01524) (xy 165.9509 126.7968)
-        (xy 165.61562 126.72822) (xy 165.61562 125.08738) (xy 165.59022 124.86386) (xy 165.52418 124.6505) (xy 165.42512 124.46762)
-        (xy 165.2397 124.40412) (xy 165.15588 124.48794) (xy 165.15588 124.3203) (xy 165.09238 124.13488) (xy 164.89426 124.03074)
-        (xy 164.6809 123.96724) (xy 164.45738 123.94438) (xy 164.23386 123.96978) (xy 164.0205 124.03582) (xy 163.83762 124.13488)
-        (xy 163.77412 124.3203) (xy 164.465 125.01118) (xy 165.15588 124.3203) (xy 165.15588 124.48794) (xy 164.54882 125.095)
-        (xy 165.2397 125.78588) (xy 165.42512 125.72238) (xy 165.52926 125.52426) (xy 165.59276 125.3109) (xy 165.61562 125.08738)
-        (xy 165.61562 126.72822) (xy 165.39972 126.68504) (xy 165.15588 126.6825) (xy 165.15588 125.8697) (xy 164.465 125.17882)
-        (xy 164.38118 125.26264) (xy 164.38118 125.095) (xy 163.6903 124.40412) (xy 163.50488 124.46762) (xy 163.40074 124.66574)
-        (xy 163.33724 124.8791) (xy 163.31438 125.10262) (xy 163.33978 125.32614) (xy 163.40582 125.5395) (xy 163.50488 125.72238)
-        (xy 163.6903 125.78588) (xy 164.38118 125.095) (xy 164.38118 125.26264) (xy 163.77412 125.8697) (xy 163.83762 126.05512)
-        (xy 164.03574 126.15926) (xy 164.2491 126.22276) (xy 164.47262 126.24562) (xy 164.69614 126.22022) (xy 164.9095 126.15418)
-        (xy 165.09238 126.05512) (xy 165.15588 125.8697) (xy 165.15588 126.6825) (xy 164.84092 126.67996) (xy 164.28974 126.78664)
-        (xy 163.77158 126.99492) (xy 163.30168 127.30226) (xy 162.90036 127.69342) (xy 162.5854 128.1557) (xy 162.36442 128.67132)
-        (xy 162.24758 129.21996) (xy 162.23996 129.77876) (xy 162.33902 130.32994) (xy 162.54476 130.85064) (xy 162.84956 131.32308)
-        (xy 163.23818 131.72694) (xy 163.38042 131.826) (xy 155.067 131.826) (xy 155.81884 131.07416) (xy 155.829 131.064)
-        (xy 155.92806 130.94208) (xy 155.97632 130.8862) (xy 155.97632 130.88112) (xy 155.98394 130.87604) (xy 156.04236 130.76428)
-        (xy 156.0957 130.6703) (xy 156.0957 130.66014) (xy 156.10078 130.6576) (xy 156.12872 130.55854) (xy 156.16936 130.43662)
-        (xy 156.16936 130.429) (xy 156.1719 130.42392) (xy 156.18206 130.31978) (xy 156.1973 130.19278) (xy 156.1973 130.18008)
-        (xy 156.1973 130.175) (xy 156.1973 121.33326) (xy 156.1973 121.3231) (xy 156.1973 121.31548) (xy 156.1973 120.69318)
-        (xy 156.1973 120.68048) (xy 156.17444 120.44934) (xy 156.17444 120.43664) (xy 156.10586 120.21312) (xy 156.10332 120.20042)
-        (xy 156.02966 120.0658) (xy 155.9941 119.99468) (xy 155.98648 119.98452) (xy 155.97124 119.96674) (xy 155.8417 119.80164)
-        (xy 155.83154 119.79402) (xy 155.829 119.79148) (xy 154.51582 118.4783) (xy 154.5209 118.23954) (xy 154.44978 117.88648)
-        (xy 154.31262 117.5512) (xy 154.1145 117.25148) (xy 154.00274 117.13972) (xy 154.26182 117.25402) (xy 154.61488 117.33022)
-        (xy 154.97556 117.33784) (xy 155.33116 117.27688) (xy 155.66644 117.1448) (xy 155.97124 116.95176) (xy 156.18206 116.7511)
-        (xy 156.8831 116.7511) (xy 158.48584 118.35384) (xy 158.496 118.364) (xy 158.61792 118.46306) (xy 158.6738 118.51132)
-        (xy 158.67634 118.51132) (xy 158.68396 118.51894) (xy 158.79318 118.57736) (xy 158.8897 118.6307) (xy 158.89732 118.6307)
-        (xy 158.9024 118.63578) (xy 159.00146 118.66372) (xy 159.12338 118.70436) (xy 159.12846 118.70436) (xy 159.13608 118.7069)
-        (xy 159.23006 118.71452) (xy 159.36722 118.7323) (xy 159.38246 118.7323) (xy 159.385 118.7323) (xy 163.60648 118.7323)
-        (xy 163.72078 118.81104) (xy 163.99256 118.93042) (xy 164.28466 118.99392) (xy 164.58184 118.999) (xy 164.87648 118.9482)
-        (xy 165.15588 118.83898) (xy 165.40734 118.67896) (xy 165.62324 118.47322) (xy 165.79342 118.22938) (xy 165.91534 117.9576)
-        (xy 165.98138 117.6655) (xy 165.98646 117.32514) (xy 165.92804 117.03304) (xy 165.81374 116.75618) (xy 165.7223 116.61648)
-        (xy 165.7223 114.70894) (xy 165.7604 114.68608) (xy 166.05758 114.40414) (xy 166.2938 114.06886) (xy 166.46144 113.69294)
-        (xy 166.55034 113.29416) (xy 166.55796 112.82426) (xy 166.47922 112.4204) (xy 166.32174 112.04194) (xy 166.1795 111.82604)
-        (xy 166.1795 108.11764) (xy 166.1795 107.78236) (xy 166.17696 106.63682) (xy 166.15918 106.553) (xy 166.12616 106.47172)
-        (xy 166.08044 106.4006) (xy 166.01694 106.3371) (xy 165.94582 106.28884) (xy 165.86708 106.25582) (xy 165.78072 106.23804)
-        (xy 165.69436 106.23804) (xy 164.63264 106.2355) (xy 164.52342 106.34472) (xy 164.52342 107.89158) (xy 166.07028 107.89158)
-        (xy 166.1795 107.78236) (xy 166.1795 108.11764) (xy 166.07028 108.00842) (xy 164.52342 108.00842) (xy 164.52342 109.55528)
-        (xy 164.63264 109.6645) (xy 165.69436 109.66196) (xy 165.78072 109.66196) (xy 165.86708 109.64418) (xy 165.94582 109.61116)
-        (xy 166.01694 109.5629) (xy 166.08044 109.4994) (xy 166.12616 109.42828) (xy 166.15918 109.347) (xy 166.17696 109.26318)
-        (xy 166.1795 108.11764) (xy 166.1795 111.82604) (xy 166.09568 111.70158) (xy 165.80612 111.40948) (xy 165.46576 111.18088)
-        (xy 165.0873 111.02086) (xy 164.68344 110.93958) (xy 164.40658 110.9345) (xy 164.40658 109.55528) (xy 164.40658 108.00842)
-        (xy 164.40658 107.89158) (xy 164.40658 106.34472) (xy 164.29736 106.2355) (xy 163.23564 106.23804) (xy 163.14928 106.23804)
-        (xy 163.06292 106.25582) (xy 162.98418 106.28884) (xy 162.91306 106.3371) (xy 162.84956 106.4006) (xy 162.80384 106.47172)
-        (xy 162.77082 106.553) (xy 162.75304 106.63682) (xy 162.7505 107.78236) (xy 162.85972 107.89158) (xy 164.40658 107.89158)
-        (xy 164.40658 108.00842) (xy 162.85972 108.00842) (xy 162.7505 108.11764) (xy 162.75304 109.26318) (xy 162.77082 109.347)
-        (xy 162.80384 109.42828) (xy 162.84956 109.4994) (xy 162.91306 109.5629) (xy 162.98418 109.61116) (xy 163.06292 109.64418)
-        (xy 163.14928 109.66196) (xy 163.23564 109.66196) (xy 164.29736 109.6645) (xy 164.40658 109.55528) (xy 164.40658 110.9345)
-        (xy 164.2745 110.9345) (xy 163.87064 111.01324) (xy 163.48964 111.16564) (xy 163.14674 111.3917) (xy 162.85464 111.67872)
-        (xy 162.62096 112.01654) (xy 162.46094 112.395) (xy 162.37458 112.79632) (xy 162.3695 113.20526) (xy 162.44316 113.60912)
-        (xy 162.59556 113.99266) (xy 162.81654 114.33556) (xy 163.10356 114.63274) (xy 163.2077 114.70386) (xy 163.2077 116.2177)
-        (xy 159.9057 116.2177) (xy 158.30296 114.61496) (xy 158.2928 114.6048) (xy 158.115 114.45748) (xy 158.10484 114.44732)
-        (xy 157.9499 114.36604) (xy 157.8991 114.3381) (xy 157.89148 114.33556) (xy 157.8864 114.33302) (xy 157.78734 114.30254)
-        (xy 157.66542 114.26444) (xy 157.6578 114.2619) (xy 157.65272 114.2619) (xy 157.5562 114.25174) (xy 157.42158 114.2365)
-        (xy 157.40634 114.2365) (xy 157.4038 114.2365) (xy 156.17952 114.2365) (xy 156.01188 114.06886) (xy 155.7147 113.86566)
-        (xy 155.37942 113.72596) (xy 155.06954 113.66246) (xy 155.33116 113.61928) (xy 155.66644 113.4872) (xy 155.97124 113.29416)
-        (xy 156.23286 113.04524) (xy 156.44114 112.7506) (xy 156.58846 112.4204) (xy 156.66974 112.06734) (xy 156.67482 111.65586)
-        (xy 156.6037 111.3028) (xy 156.58338 111.25708) (xy 160.26384 107.57916) (xy 160.274 107.569) (xy 160.37306 107.44708)
-        (xy 160.42132 107.3912) (xy 160.42132 107.38612) (xy 160.42894 107.38104) (xy 160.48736 107.26928) (xy 160.5407 107.1753)
-        (xy 160.5407 107.16514) (xy 160.54578 107.1626) (xy 160.57372 107.06354) (xy 160.61436 106.94162) (xy 160.61436 106.934)
-        (xy 160.6169 106.92892) (xy 160.62706 106.82478) (xy 160.6423 106.69778) (xy 160.6423 106.68508) (xy 160.6423 106.68)
-        (xy 160.6423 99.7077) (xy 160.6423 99.695) (xy 160.61944 99.46386) (xy 160.61944 99.45116) (xy 160.55086 99.22764)
-        (xy 160.54832 99.21494) (xy 160.47466 99.08032) (xy 160.4391 99.0092) (xy 160.43148 98.99904) (xy 160.41624 98.98126)
-        (xy 160.2867 98.81616) (xy 160.27654 98.80854) (xy 160.274 98.806) (xy 158.37916 96.91116) (xy 158.369 96.901)
-        (xy 158.1912 96.75368) (xy 158.18104 96.74352) (xy 158.0261 96.66224) (xy 157.9753 96.6343) (xy 157.96768 96.63176)
-        (xy 157.9626 96.62922) (xy 157.86354 96.59874) (xy 157.74162 96.56064) (xy 157.734 96.5581) (xy 157.72892 96.5581)
-        (xy 157.6324 96.54794) (xy 157.49778 96.5327) (xy 157.48254 96.5327) (xy 157.48 96.5327) (xy 154.52598 96.5327)
-        (xy 154.39644 96.4438) (xy 154.12212 96.3295) (xy 153.83002 96.26854) (xy 153.5303 96.26854) (xy 153.2382 96.32442)
-        (xy 152.96134 96.43618) (xy 152.71242 96.59874) (xy 152.49906 96.80702) (xy 152.32888 97.0534) (xy 152.21204 97.32772)
-        (xy 152.15108 97.61982) (xy 152.146 97.91954) (xy 152.19934 98.21164) (xy 152.3111 98.4885) (xy 152.47112 98.73996)
-        (xy 152.6794 98.95586) (xy 152.92578 99.12604) (xy 153.19756 99.24542) (xy 153.48966 99.30892) (xy 153.78684 99.314)
-        (xy 154.08148 99.2632) (xy 154.36088 99.15398) (xy 154.52852 99.0473) (xy 156.9593 99.0473) (xy 158.1277 100.2157)
-        (xy 158.1277 106.1593) (xy 154.16784 110.11662) (xy 154.0129 110.18012) (xy 154.07894 110.11916) (xy 154.28722 109.82452)
-        (xy 154.43454 109.49432) (xy 154.51582 109.14126) (xy 154.5209 108.72978) (xy 154.44978 108.37672) (xy 154.31262 108.04144)
-        (xy 154.1145 107.74172) (xy 153.85796 107.48518) (xy 153.56078 107.28198) (xy 153.2255 107.14228) (xy 152.87244 107.07116)
-        (xy 152.6159 107.06862) (xy 152.44064 106.89336) (xy 152.43048 106.8832) (xy 152.25268 106.73588) (xy 152.24252 106.72572)
-        (xy 152.08758 106.64444) (xy 152.03678 106.6165) (xy 152.02916 106.61396) (xy 152.02408 106.61142) (xy 151.92502 106.58094)
-        (xy 151.8031 106.54284) (xy 151.79548 106.5403) (xy 151.7904 106.5403) (xy 151.69388 106.53014) (xy 151.55926 106.5149)
-        (xy 151.54402 106.5149) (xy 151.54148 106.5149) (xy 150.5712 106.5149) (xy 150.40356 106.34726) (xy 150.10638 106.14406)
-        (xy 149.7711 106.00436) (xy 149.41804 105.93324) (xy 149.05736 105.9307) (xy 148.70176 105.99674) (xy 148.36902 106.13136)
-        (xy 148.06676 106.32948) (xy 147.80768 106.58348) (xy 147.60448 106.88066) (xy 147.46224 107.2134) (xy 147.38604 107.56646)
-        (xy 147.38096 107.92714) (xy 147.40128 108.03636) (xy 147.2057 107.74172) (xy 147.20062 107.73664) (xy 147.20062 97.78238)
-        (xy 147.17522 97.55886) (xy 147.10918 97.3455) (xy 147.01012 97.16262) (xy 146.8247 97.09912) (xy 146.74088 97.18294)
-        (xy 146.74088 97.0153) (xy 146.67738 96.82988) (xy 146.47926 96.72574) (xy 146.2659 96.66224) (xy 146.04238 96.63938)
-        (xy 145.81886 96.66478) (xy 145.6055 96.73082) (xy 145.42262 96.82988) (xy 145.35912 97.0153) (xy 146.05 97.70618)
-        (xy 146.74088 97.0153) (xy 146.74088 97.18294) (xy 146.13382 97.79) (xy 146.8247 98.48088) (xy 147.01012 98.41738)
-        (xy 147.11426 98.21926) (xy 147.17776 98.0059) (xy 147.20062 97.78238) (xy 147.20062 107.73664) (xy 147.0279 107.56392)
-        (xy 147.0279 103.87584) (xy 147.0279 103.8606) (xy 147.00504 103.62946) (xy 147.00504 103.61676) (xy 146.93646 103.39324)
-        (xy 146.93392 103.38054) (xy 146.86026 103.24592) (xy 146.8247 103.1748) (xy 146.81708 103.16464) (xy 146.78406 103.12654)
-        (xy 146.74088 103.07066) (xy 146.74088 98.5647) (xy 146.05 97.87382) (xy 145.96618 97.95764) (xy 145.96618 97.79)
-        (xy 145.2753 97.09912) (xy 145.08988 97.16262) (xy 144.98574 97.36074) (xy 144.92224 97.5741) (xy 144.89938 97.79762)
-        (xy 144.92478 98.02114) (xy 144.99082 98.2345) (xy 145.08988 98.41738) (xy 145.2753 98.48088) (xy 145.96618 97.79)
-        (xy 145.96618 97.95764) (xy 145.35912 98.5647) (xy 145.42262 98.75012) (xy 145.62074 98.85426) (xy 145.8341 98.91776)
-        (xy 146.05762 98.94062) (xy 146.28114 98.91522) (xy 146.4945 98.84918) (xy 146.67738 98.75012) (xy 146.74088 98.5647)
-        (xy 146.74088 103.07066) (xy 146.6723 102.9843) (xy 146.66214 102.97414) (xy 146.6596 102.9716) (xy 143.77416 100.08616)
-        (xy 143.764 100.076) (xy 143.5862 99.92868) (xy 143.57604 99.91852) (xy 143.4211 99.83724) (xy 143.3703 99.8093)
-        (xy 143.36268 99.80676) (xy 143.3576 99.80422) (xy 143.25854 99.77374) (xy 143.13662 99.73564) (xy 143.129 99.7331)
-        (xy 143.12392 99.7331) (xy 143.0274 99.72294) (xy 142.89278 99.7077) (xy 142.87754 99.7077) (xy 142.875 99.7077)
-        (xy 140.0556 99.7077) (xy 140.04798 99.68738) (xy 139.95908 99.55276) (xy 139.84478 99.43846) (xy 139.76858 99.38512)
-        (xy 139.76858 95.88246) (xy 139.74064 95.62338) (xy 139.66444 95.37192) (xy 139.54506 95.14586) (xy 139.33932 95.0595)
-        (xy 139.2555 95.14332) (xy 139.2555 94.97568) (xy 139.16914 94.76994) (xy 138.938 94.64802) (xy 138.68654 94.57182)
-        (xy 138.42746 94.54642) (xy 138.16838 94.57436) (xy 137.91692 94.65056) (xy 137.69086 94.76994) (xy 137.6045 94.97568)
-        (xy 138.43 95.80118) (xy 139.2555 94.97568) (xy 139.2555 95.14332) (xy 138.51382 95.885) (xy 139.33932 96.7105)
-        (xy 139.54506 96.62414) (xy 139.66698 96.393) (xy 139.74318 96.14154) (xy 139.76858 95.88246) (xy 139.76858 99.38512)
-        (xy 139.7127 99.34702) (xy 139.56284 99.28606) (xy 139.40536 99.25304) (xy 139.2555 99.25304) (xy 139.2555 96.79432)
-        (xy 138.43 95.96882) (xy 138.34618 96.05264) (xy 138.34618 95.885) (xy 137.52068 95.0595) (xy 137.31494 95.14586)
-        (xy 137.19302 95.377) (xy 137.11682 95.62846) (xy 137.09142 95.88754) (xy 137.11936 96.14662) (xy 137.19556 96.39808)
-        (xy 137.31494 96.62414) (xy 137.52068 96.7105) (xy 138.34618 95.885) (xy 138.34618 96.05264) (xy 137.6045 96.79432)
-        (xy 137.69086 97.00006) (xy 137.922 97.12198) (xy 138.17346 97.19818) (xy 138.43254 97.22358) (xy 138.69162 97.19564)
-        (xy 138.94308 97.11944) (xy 139.16914 97.00006) (xy 139.2555 96.79432) (xy 139.2555 99.25304) (xy 139.2428 99.25304)
-        (xy 137.45972 99.25304) (xy 137.30224 99.28352) (xy 137.15238 99.34702) (xy 137.01776 99.43592) (xy 136.90346 99.55022)
-        (xy 136.81202 99.6823) (xy 136.79932 99.7077) (xy 136.54024 99.7077) (xy 136.525 99.7077) (xy 136.28116 99.73056)
-        (xy 136.11606 99.77882) (xy 136.05764 99.7966) (xy 136.05002 99.79914) (xy 136.04494 99.80168) (xy 135.90524 99.87534)
-        (xy 135.84174 99.9109) (xy 135.83666 99.9109) (xy 135.82904 99.91852) (xy 135.72744 99.9998) (xy 135.6487 100.0633)
-        (xy 135.63854 100.07346) (xy 135.636 100.076) (xy 134.37616 101.33584) (xy 134.366 101.346) (xy 134.36346 101.34854)
-        (xy 131.5593 104.1527) (xy 130.36296 104.1527) (xy 130.36296 104.05872) (xy 130.33248 103.90124) (xy 130.26898 103.75138)
-        (xy 130.18008 103.61676) (xy 130.06578 103.50246) (xy 129.98958 103.44912) (xy 129.98958 100.34016) (xy 129.9591 100.00488)
-        (xy 129.86512 99.6823) (xy 129.70764 99.38766) (xy 129.69494 99.36734) (xy 129.4511 99.23272) (xy 129.36728 99.31654)
-        (xy 129.36728 99.1489) (xy 129.23266 98.90506) (xy 128.93548 98.74504) (xy 128.61544 98.64598) (xy 128.28016 98.61042)
-        (xy 127.94488 98.6409) (xy 127.6223 98.73488) (xy 127.32766 98.89236) (xy 127.30734 98.90506) (xy 127.17272 99.1489)
-        (xy 128.27 100.24618) (xy 129.36728 99.1489) (xy 129.36728 99.31654) (xy 128.35382 100.33) (xy 129.4511 101.42728)
-        (xy 129.69494 101.29266) (xy 129.85496 100.99548) (xy 129.95402 100.67544) (xy 129.98958 100.34016) (xy 129.98958 103.44912)
-        (xy 129.9337 103.41102) (xy 129.78384 103.35006) (xy 129.62636 103.31704) (xy 129.4638 103.31704) (xy 129.36728 103.31704)
-        (xy 129.36728 101.5111) (xy 128.27 100.41382) (xy 128.18618 100.49764) (xy 128.18618 100.33) (xy 127.0889 99.23272)
-        (xy 126.84506 99.36734) (xy 126.68504 99.66452) (xy 126.58598 99.98456) (xy 126.55042 100.31984) (xy 126.5809 100.65512)
-        (xy 126.67488 100.9777) (xy 126.83236 101.27234) (xy 126.84506 101.29266) (xy 127.0889 101.42728) (xy 128.18618 100.33)
-        (xy 128.18618 100.49764) (xy 127.17272 101.5111) (xy 127.30734 101.75494) (xy 127.60452 101.91496) (xy 127.92456 102.01402)
-        (xy 128.25984 102.04958) (xy 128.59512 102.0191) (xy 128.9177 101.92512) (xy 129.21234 101.76764) (xy 129.23266 101.75494)
-        (xy 129.36728 101.5111) (xy 129.36728 103.31704) (xy 126.91872 103.31704) (xy 126.76124 103.34752) (xy 126.61138 103.41102)
-        (xy 126.47676 103.49992) (xy 126.36246 103.61422) (xy 126.27102 103.7463) (xy 126.21006 103.89616) (xy 126.17704 104.05364)
-        (xy 126.17704 104.2162) (xy 126.17704 106.76128) (xy 126.20752 106.91876) (xy 126.27102 107.06862) (xy 126.35992 107.20324)
-        (xy 126.47422 107.31754) (xy 126.6063 107.40898) (xy 126.75616 107.46994) (xy 126.91364 107.50296) (xy 127.0762 107.50296)
-        (xy 129.62128 107.50296) (xy 129.77876 107.47248) (xy 129.92862 107.40898) (xy 130.06324 107.32008) (xy 130.17754 107.20578)
-        (xy 130.26898 107.0737) (xy 130.32994 106.92384) (xy 130.36296 106.76636) (xy 130.36296 106.6673) (xy 132.06476 106.6673)
-        (xy 132.08 106.6673) (xy 132.31114 106.64444) (xy 132.32384 106.64444) (xy 132.48894 106.59364) (xy 132.54736 106.5784)
-        (xy 132.55244 106.57332) (xy 132.56006 106.57332) (xy 132.69976 106.49712) (xy 132.76326 106.4641) (xy 132.7658 106.46156)
-        (xy 132.77596 106.45648) (xy 132.87502 106.37266) (xy 132.9563 106.3117) (xy 132.96646 106.30154) (xy 132.969 106.299)
-        (xy 136.1313 103.1367) (xy 136.14146 103.12654) (xy 136.144 103.124) (xy 136.89584 102.36962) (xy 136.90092 102.37724)
-        (xy 137.01522 102.49154) (xy 137.1473 102.58298) (xy 137.29716 102.64394) (xy 137.45464 102.67696) (xy 137.6172 102.67696)
-        (xy 139.40028 102.67696) (xy 139.55776 102.64648) (xy 139.70762 102.58298) (xy 139.84224 102.49408) (xy 139.95654 102.37978)
-        (xy 140.04798 102.2477) (xy 140.05814 102.2223) (xy 142.3543 102.2223) (xy 144.5133 104.3813) (xy 144.5133 107.56392)
-        (xy 144.35328 107.7214) (xy 144.15008 108.01858) (xy 144.00784 108.35132) (xy 143.93164 108.70438) (xy 143.92656 109.06506)
-        (xy 143.9926 109.42066) (xy 144.12468 109.75594) (xy 144.32026 110.0582) (xy 144.43964 110.18266) (xy 144.16278 110.06836)
-        (xy 143.80972 109.99724) (xy 143.44904 109.9947) (xy 143.09344 110.06074) (xy 142.7607 110.19536) (xy 142.45844 110.39348)
-        (xy 142.26794 110.5789) (xy 142.2019 110.5789) (xy 138.69416 107.07116) (xy 138.684 107.061) (xy 138.5062 106.91368)
-        (xy 138.49604 106.90352) (xy 138.3411 106.82224) (xy 138.2903 106.7943) (xy 138.28268 106.79176) (xy 138.2776 106.78922)
-        (xy 138.17854 106.75874) (xy 138.05662 106.72064) (xy 138.049 106.7181) (xy 138.04392 106.7181) (xy 137.9474 106.70794)
-        (xy 137.81278 106.6927) (xy 137.79754 106.6927) (xy 137.795 106.6927) (xy 136.74598 106.6927) (xy 136.61644 106.6038)
-        (xy 136.34212 106.4895) (xy 136.05002 106.42854) (xy 135.7503 106.42854) (xy 135.4582 106.48442) (xy 135.18134 106.59618)
-        (xy 134.98576 106.72064) (xy 134.84606 106.76382) (xy 134.78764 106.7816) (xy 134.78002 106.78414) (xy 134.77494 106.78668)
-        (xy 134.63524 106.86034) (xy 134.57174 106.8959) (xy 134.56666 106.8959) (xy 134.55904 106.90352) (xy 134.45744 106.9848)
-        (xy 134.3787 107.0483) (xy 134.36854 107.05846) (xy 134.366 107.061) (xy 133.10616 108.32084) (xy 133.096 108.331)
-        (xy 132.93852 108.51896) (xy 132.85724 108.67136) (xy 132.8293 108.7247) (xy 132.82676 108.72978) (xy 132.82422 108.7374)
-        (xy 132.79374 108.83646) (xy 132.75564 108.95838) (xy 132.7531 108.96346) (xy 132.7531 108.97108) (xy 132.74294 109.06506)
-        (xy 132.7277 109.20222) (xy 132.7277 109.21746) (xy 132.7277 109.22) (xy 132.7277 116.18976) (xy 132.7277 116.205)
-        (xy 132.75056 116.44884) (xy 132.79882 116.61394) (xy 132.8166 116.67236) (xy 132.81914 116.67744) (xy 132.82168 116.68506)
-        (xy 132.89534 116.82476) (xy 132.9309 116.88826) (xy 132.9309 116.8908) (xy 132.93852 116.90096) (xy 133.0198 117.00002)
-        (xy 133.0833 117.0813) (xy 133.09346 117.09146) (xy 133.096 117.094) (xy 133.65226 117.65026) (xy 133.5405 117.68582)
-        (xy 133.35762 117.78488) (xy 133.29412 117.9703) (xy 133.85038 118.52656) (xy 133.985 118.66118) (xy 134.06882 118.745)
-        (xy 133.985 118.82882) (xy 133.90118 118.91264) (xy 133.90118 118.745) (xy 133.2103 118.05412) (xy 133.02488 118.11762)
-        (xy 132.92074 118.31574) (xy 132.85724 118.5291) (xy 132.83438 118.75262) (xy 132.85978 118.97614) (xy 132.92582 119.1895)
-        (xy 133.02488 119.37238) (xy 133.2103 119.43588) (xy 133.90118 118.745) (xy 133.90118 118.91264) (xy 133.85038 118.96344)
-        (xy 133.29412 119.5197) (xy 133.35762 119.70512) (xy 133.55574 119.80926) (xy 133.7691 119.87276) (xy 133.99262 119.89562)
-        (xy 134.21614 119.87022) (xy 134.2517 119.85752) (xy 134.2517 121.01576) (xy 134.2517 121.031) (xy 134.27456 121.27484)
-        (xy 134.32282 121.43994) (xy 134.3406 121.49836) (xy 134.34314 121.50344) (xy 134.34568 121.51106) (xy 134.41934 121.65076)
-        (xy 134.4549 121.71426) (xy 134.4549 121.7168) (xy 134.46252 121.72696) (xy 134.5438 121.82602) (xy 134.6073 121.9073)
-        (xy 134.61746 121.91746) (xy 134.62 121.92) (xy 135.49884 122.79884) (xy 135.50646 122.80646) (xy 135.61568 122.8979)
-        (xy 135.6868 122.95632) (xy 135.68934 122.95632) (xy 135.69696 122.96394) (xy 135.86714 123.05538) (xy 135.90016 123.07316)
-        (xy 135.9027 123.0757) (xy 136.53262 123.70562) (xy 136.45134 123.74118) (xy 136.30148 123.8377) (xy 134.5057 123.8377)
-        (xy 130.36296 119.69496) (xy 130.36296 118.02872) (xy 130.33248 117.87124) (xy 130.26898 117.72138) (xy 130.18008 117.58676)
-        (xy 130.06578 117.47246) (xy 129.98958 117.41912) (xy 129.98958 114.31016) (xy 129.9591 113.97488) (xy 129.86512 113.6523)
-        (xy 129.70764 113.35766) (xy 129.69494 113.33734) (xy 129.4511 113.20272) (xy 129.36728 113.28654) (xy 129.36728 113.1189)
-        (xy 129.23266 112.87506) (xy 128.93548 112.71504) (xy 128.61544 112.61598) (xy 128.28016 112.58042) (xy 127.94488 112.6109)
-        (xy 127.6223 112.70488) (xy 127.32766 112.86236) (xy 127.30734 112.87506) (xy 127.17272 113.1189) (xy 128.27 114.21618)
-        (xy 129.36728 113.1189) (xy 129.36728 113.28654) (xy 128.35382 114.3) (xy 129.4511 115.39728) (xy 129.69494 115.26266)
-        (xy 129.85496 114.96548) (xy 129.95402 114.64544) (xy 129.98958 114.31016) (xy 129.98958 117.41912) (xy 129.9337 117.38102)
-        (xy 129.78384 117.32006) (xy 129.62636 117.28704) (xy 129.4638 117.28704) (xy 129.36728 117.28704) (xy 129.36728 115.4811)
-        (xy 128.27 114.38382) (xy 128.18618 114.46764) (xy 128.18618 114.3) (xy 127.0889 113.20272) (xy 126.84506 113.33734)
-        (xy 126.68504 113.63452) (xy 126.58598 113.95456) (xy 126.55042 114.28984) (xy 126.5809 114.62512) (xy 126.67488 114.9477)
-        (xy 126.83236 115.24234) (xy 126.84506 115.26266) (xy 127.0889 115.39728) (xy 128.18618 114.3) (xy 128.18618 114.46764)
-        (xy 127.17272 115.4811) (xy 127.30734 115.72494) (xy 127.60452 115.88496) (xy 127.92456 115.98402) (xy 128.25984 116.01958)
-        (xy 128.59512 115.9891) (xy 128.9177 115.89512) (xy 129.21234 115.73764) (xy 129.23266 115.72494) (xy 129.36728 115.4811)
-        (xy 129.36728 117.28704) (xy 126.91872 117.28704) (xy 126.76124 117.31752) (xy 126.61138 117.38102) (xy 126.47676 117.46992)
-        (xy 126.36246 117.58422) (xy 126.27102 117.7163) (xy 126.21006 117.86616) (xy 126.17704 118.02364) (xy 126.17704 118.1862)
-        (xy 126.17704 120.73128) (xy 126.20752 120.88876) (xy 126.27102 121.03862) (xy 126.35992 121.17324) (xy 126.47422 121.28754)
-        (xy 126.6063 121.37898) (xy 126.75616 121.43994) (xy 126.91364 121.47296) (xy 127.0762 121.47296) (xy 128.58496 121.47296)
-        (xy 132.68198 125.56998) (xy 132.64388 125.6284) (xy 132.52704 125.90272) (xy 132.46608 126.19482) (xy 132.461 126.49454)
-        (xy 132.51434 126.78664) (xy 132.6261 127.0635) (xy 132.78612 127.31496) (xy 132.9944 127.53086) (xy 133.24078 127.70104)
-        (xy 133.51256 127.82042) (xy 133.80466 127.88392) (xy 134.10184 127.889) (xy 134.39648 127.8382) (xy 134.67588 127.72898)
-        (xy 134.92734 127.56896) (xy 135.14324 127.36322) (xy 135.31342 127.11938) (xy 135.43534 126.8476) (xy 135.50138 126.5555)
-        (xy 135.50392 126.3523) (xy 136.30148 126.3523) (xy 136.41578 126.43104) (xy 136.68756 126.55042) (xy 136.97966 126.61392)
-        (xy 137.27684 126.619) (xy 137.57148 126.5682) (xy 137.8077 126.47422) (xy 137.8077 130.15976) (xy 137.8077 130.175)
-        (xy 137.83056 130.41884) (xy 137.87882 130.58394) (xy 137.8966 130.64236) (xy 137.89914 130.64744) (xy 137.90168 130.65506)
-        (xy 137.97534 130.79476) (xy 138.0109 130.85826) (xy 138.0109 130.8608) (xy 138.01852 130.87096) (xy 138.0998 130.97002)
-        (xy 138.1633 131.0513) (xy 138.17346 131.06146) (xy 138.176 131.064) (xy 138.938 131.826) (xy 128.72974 131.826)
-        (xy 128.76784 131.80314) (xy 129.1717 131.41706) (xy 129.49682 130.95986) (xy 129.72288 130.44678) (xy 129.84734 129.90068)
-        (xy 129.8575 129.2606) (xy 129.74828 128.71196) (xy 129.53492 128.1938) (xy 129.22504 127.72644) (xy 128.83134 127.32766)
-        (xy 128.36652 127.01524) (xy 127.8509 126.7968) (xy 127.29972 126.68504) (xy 126.74092 126.67996) (xy 126.18974 126.78664)
-        (xy 125.67158 126.99492) (xy 125.20168 127.30226) (xy 124.80036 127.69342) (xy 124.714 127.81788) (xy 124.714 95.7072)
-        (xy 124.74956 95.76308) (xy 125.13818 96.16694) (xy 125.59792 96.48698) (xy 126.111 96.7105) (xy 126.65964 96.82988)
-        (xy 127.21844 96.84258) (xy 127.77216 96.74606) (xy 128.29286 96.54286) (xy 128.76784 96.24314) (xy 129.1717 95.85706)
-        (xy 129.49682 95.39986) (xy 129.72288 94.88678) (xy 129.84734 94.34068) (xy 129.8575 93.7006) (xy 129.74828 93.15196)
-        (xy 129.53492 92.6338) (xy 129.22504 92.16644) (xy 128.83134 91.76766) (xy 128.71958 91.694) (xy 163.37534 91.694)
-        (xy 163.30168 91.74226) (xy 162.90036 92.13342) (xy 162.5854 92.5957) (xy 162.36442 93.11132) (xy 162.24758 93.65996)
-        (xy 162.23996 94.21876) (xy 162.33902 94.76994) (xy 162.54476 95.29064) (xy 162.84956 95.76308) (xy 163.23818 96.16694)
-        (xy 163.69792 96.48698) (xy 164.211 96.7105) (xy 164.75964 96.82988) (xy 165.31844 96.84258) (xy 165.87216 96.74606)
-        (xy 166.39286 96.54286) (xy 166.86784 96.24314) (xy 167.2717 95.85706) (xy 167.386 95.6945) (xy 167.386 127.81788)
+        (xy 167.386 127.8747) (xy 167.3002 127.745561) (xy 166.909756 127.352381) (xy 166.450378 127.042527) (xy 165.939566 126.827801)
+        (xy 165.613438 126.760856) (xy 165.613438 125.080387) (xy 165.58852 124.856618) (xy 165.520426 124.64201) (xy 165.428009 124.469114)
+        (xy 165.239548 124.404867) (xy 165.155133 124.489281) (xy 165.155133 124.320452) (xy 165.090886 124.131991) (xy 164.890987 124.02839)
+        (xy 164.674717 123.965779) (xy 164.450387 123.946562) (xy 164.226618 123.97148) (xy 164.01201 124.039574) (xy 163.839114 124.131991)
+        (xy 163.774867 124.320452) (xy 164.465 125.010586) (xy 165.155133 124.320452) (xy 165.155133 124.489281) (xy 164.549414 125.095)
+        (xy 165.239548 125.785133) (xy 165.428009 125.720886) (xy 165.53161 125.520987) (xy 165.594221 125.304717) (xy 165.613438 125.080387)
+        (xy 165.613438 126.760856) (xy 165.396774 126.716382) (xy 165.155133 126.714695) (xy 165.155133 125.869548) (xy 164.465 125.179414)
+        (xy 164.380586 125.263828) (xy 164.380586 125.095) (xy 163.690452 124.404867) (xy 163.501991 124.469114) (xy 163.39839 124.669013)
+        (xy 163.335779 124.885283) (xy 163.316562 125.109613) (xy 163.34148 125.333382) (xy 163.409574 125.54799) (xy 163.501991 125.720886)
+        (xy 163.690452 125.785133) (xy 164.380586 125.095) (xy 164.380586 125.263828) (xy 163.774867 125.869548) (xy 163.839114 126.058009)
+        (xy 164.039013 126.16161) (xy 164.255283 126.224221) (xy 164.479613 126.243438) (xy 164.703382 126.21852) (xy 164.91799 126.150426)
+        (xy 165.090886 126.058009) (xy 165.155133 125.869548) (xy 165.155133 126.714695) (xy 164.842679 126.712514) (xy 164.298384 126.816344)
+        (xy 163.784623 127.023916) (xy 163.320965 127.327326) (xy 162.925069 127.715016) (xy 162.612015 128.172219) (xy 162.393729 128.68152)
+        (xy 162.278523 129.223521) (xy 162.270786 129.777576) (xy 162.370814 130.322582) (xy 162.574795 130.837779) (xy 162.87496 131.303545)
+        (xy 163.259877 131.702137) (xy 163.438092 131.826) (xy 155.06709 131.826) (xy 155.829046 131.064045) (xy 155.902757 130.974307)
+        (xy 155.977415 130.885333) (xy 155.980599 130.879539) (xy 155.984797 130.87443) (xy 156.03969 130.772054) (xy 156.095629 130.670303)
+        (xy 156.097627 130.664003) (xy 156.100753 130.658174) (xy 156.134719 130.547072) (xy 156.169825 130.436407) (xy 156.170561 130.429838)
+        (xy 156.172495 130.423515) (xy 156.184237 130.307918) (xy 156.197177 130.192555) (xy 156.197267 130.179639) (xy 156.197293 130.179388)
+        (xy 156.19727 130.179154) (xy 156.1973 130.175) (xy 156.1973 121.31548) (xy 156.1973 120.68048) (xy 156.185963 120.564857)
+        (xy 156.175844 120.449198) (xy 156.174 120.442852) (xy 156.173355 120.436269) (xy 156.139771 120.325033) (xy 156.107385 120.213559)
+        (xy 156.104343 120.207691) (xy 156.102432 120.20136) (xy 156.04789 120.098782) (xy 155.99446 119.995705) (xy 155.990336 119.990539)
+        (xy 155.987232 119.984701) (xy 155.913816 119.894685) (xy 155.841372 119.803935) (xy 155.8323 119.794736) (xy 155.832143 119.794543)
+        (xy 155.831963 119.794394) (xy 155.829045 119.791435) (xy 154.517617 118.480007) (xy 154.520979 118.239312) (xy 154.450834 117.885053)
+        (xy 154.313215 117.551165) (xy 154.113365 117.250367) (xy 154.005586 117.141833) (xy 154.261512 117.253644) (xy 154.614224 117.331193)
+        (xy 154.975282 117.338756) (xy 155.330932 117.276046) (xy 155.667628 117.14545) (xy 155.972546 116.951943) (xy 156.183451 116.7511)
+        (xy 156.88301 116.7511) (xy 158.495955 118.364045) (xy 158.585663 118.437732) (xy 158.674667 118.512415) (xy 158.68046 118.5156)
+        (xy 158.68557 118.519797) (xy 158.787945 118.57469) (xy 158.889697 118.630629) (xy 158.895996 118.632627) (xy 158.901826 118.635753)
+        (xy 159.012927 118.669719) (xy 159.123593 118.704825) (xy 159.130161 118.705561) (xy 159.136485 118.707495) (xy 159.252036 118.719232)
+        (xy 159.367445 118.732177) (xy 159.380371 118.732267) (xy 159.380612 118.732292) (xy 159.380836 118.73227) (xy 159.385 118.7323)
+        (xy 163.603561 118.7323) (xy 163.717904 118.81177) (xy 163.991779 118.931423) (xy 164.283679 118.995602) (xy 164.582486 119.001861)
+        (xy 164.876817 118.949962) (xy 165.155462 118.841883) (xy 165.407808 118.681739) (xy 165.624243 118.475631) (xy 165.796522 118.23141)
+        (xy 165.918084 117.958377) (xy 165.984299 117.666932) (xy 165.989065 117.325564) (xy 165.931014 117.032384) (xy 165.817123 116.756063)
+        (xy 165.7223 116.613343) (xy 165.7223 113.813608) (xy 165.853581 113.688591) (xy 166.059943 113.396054) (xy 166.205555 113.069005)
+        (xy 166.284869 112.719903) (xy 166.290578 112.311) (xy 166.221043 111.959819) (xy 166.08462 111.628833) (xy 165.9095 111.365256)
+        (xy 165.9095 109.533779) (xy 165.9095 108.660815) (xy 165.9095 108.319185) (xy 165.9095 107.446221) (xy 165.892418 107.360345)
+        (xy 165.858911 107.279451) (xy 165.810266 107.206648) (xy 165.748353 107.144735) (xy 165.67555 107.096089) (xy 165.594656 107.062582)
+        (xy 165.50878 107.0455) (xy 165.421221 107.0455) (xy 164.635815 107.0455) (xy 164.52469 107.156625) (xy 164.52469 108.43031)
+        (xy 165.798375 108.43031) (xy 165.9095 108.319185) (xy 165.9095 108.660815) (xy 165.798375 108.54969) (xy 164.52469 108.54969)
+        (xy 164.52469 109.823375) (xy 164.635815 109.9345) (xy 165.421221 109.9345) (xy 165.50878 109.9345) (xy 165.594656 109.917418)
+        (xy 165.67555 109.883911) (xy 165.748353 109.835265) (xy 165.810266 109.773352) (xy 165.858911 109.700549) (xy 165.892418 109.619655)
+        (xy 165.9095 109.533779) (xy 165.9095 111.365256) (xy 165.886506 111.330648) (xy 165.634248 111.076622) (xy 165.337453 110.876432)
+        (xy 165.007427 110.737701) (xy 164.65674 110.665716) (xy 164.40531 110.66396) (xy 164.40531 109.823375) (xy 164.40531 108.54969)
+        (xy 164.40531 108.43031) (xy 164.40531 107.156625) (xy 164.294185 107.0455) (xy 163.508779 107.0455) (xy 163.42122 107.0455)
+        (xy 163.335344 107.062582) (xy 163.25445 107.096089) (xy 163.181647 107.144735) (xy 163.119734 107.206648) (xy 163.071089 107.279451)
+        (xy 163.037582 107.360345) (xy 163.0205 107.446221) (xy 163.0205 108.319185) (xy 163.131625 108.43031) (xy 164.40531 108.43031)
+        (xy 164.40531 108.54969) (xy 163.131625 108.54969) (xy 163.0205 108.660815) (xy 163.0205 109.533779) (xy 163.037582 109.619655)
+        (xy 163.071089 109.700549) (xy 163.119734 109.773352) (xy 163.181647 109.835265) (xy 163.25445 109.883911) (xy 163.335344 109.917418)
+        (xy 163.42122 109.9345) (xy 163.508779 109.9345) (xy 164.294185 109.9345) (xy 164.40531 109.823375) (xy 164.40531 110.66396)
+        (xy 164.29875 110.663216) (xy 163.947092 110.730299) (xy 163.615161 110.864408) (xy 163.3156 111.060435) (xy 163.059819 111.310913)
+        (xy 162.857562 111.606303) (xy 162.716531 111.935353) (xy 162.642099 112.285529) (xy 162.6371 112.643493) (xy 162.701726 112.995611)
+        (xy 162.833514 113.32847) (xy 163.027445 113.629392) (xy 163.2077 113.816051) (xy 163.2077 116.2177) (xy 159.90579 116.2177)
+        (xy 158.292845 114.604755) (xy 158.203136 114.531067) (xy 158.114133 114.456385) (xy 158.108339 114.453199) (xy 158.10323 114.449003)
+        (xy 158.000835 114.394099) (xy 157.899103 114.338171) (xy 157.892805 114.336173) (xy 157.886975 114.333047) (xy 157.775858 114.299075)
+        (xy 157.665207 114.263975) (xy 157.658638 114.263238) (xy 157.652315 114.261305) (xy 157.536763 114.249567) (xy 157.421355 114.236623)
+        (xy 157.408428 114.236532) (xy 157.408188 114.236508) (xy 157.407963 114.236529) (xy 157.4038 114.2365) (xy 156.180108 114.2365)
+        (xy 156.012816 114.068035) (xy 155.71342 113.866089) (xy 155.380501 113.726143) (xy 155.075367 113.663508) (xy 155.330932 113.618446)
+        (xy 155.667628 113.48785) (xy 155.972546 113.294343) (xy 156.234071 113.045296) (xy 156.442242 112.750195) (xy 156.58913 112.42028)
+        (xy 156.669139 112.068118) (xy 156.674899 111.655632) (xy 156.604754 111.301373) (xy 156.586355 111.256734) (xy 160.274046 107.569045)
+        (xy 160.347757 107.479307) (xy 160.422415 107.390333) (xy 160.425599 107.384539) (xy 160.429797 107.37943) (xy 160.48469 107.277054)
+        (xy 160.540629 107.175303) (xy 160.542627 107.169003) (xy 160.545753 107.163174) (xy 160.579719 107.052072) (xy 160.614825 106.941407)
+        (xy 160.615561 106.934838) (xy 160.617495 106.928515) (xy 160.629237 106.812918) (xy 160.642177 106.697555) (xy 160.642267 106.684639)
+        (xy 160.642293 106.684388) (xy 160.64227 106.684154) (xy 160.6423 106.68) (xy 160.6423 99.695) (xy 160.630972 99.579472)
+        (xy 160.620845 99.463718) (xy 160.619 99.457367) (xy 160.618355 99.450789) (xy 160.584783 99.339594) (xy 160.552385 99.228079)
+        (xy 160.549343 99.222211) (xy 160.547432 99.21588) (xy 160.49289 99.113302) (xy 160.43946 99.010225) (xy 160.435336 99.005059)
+        (xy 160.432232 98.999221) (xy 160.358816 98.909205) (xy 160.286372 98.818455) (xy 160.2773 98.809256) (xy 160.277143 98.809063)
+        (xy 160.276963 98.808914) (xy 160.274045 98.805955) (xy 158.369045 96.900955) (xy 158.279336 96.827267) (xy 158.190333 96.752585)
+        (xy 158.184539 96.749399) (xy 158.17943 96.745203) (xy 158.077035 96.690299) (xy 157.975303 96.634371) (xy 157.969005 96.632373)
+        (xy 157.963175 96.629247) (xy 157.852058 96.595275) (xy 157.741407 96.560175) (xy 157.734838 96.559438) (xy 157.728515 96.557505)
+        (xy 157.612963 96.545767) (xy 157.497555 96.532823) (xy 157.484628 96.532732) (xy 157.484388 96.532708) (xy 157.484163 96.532729)
+        (xy 157.48 96.5327) (xy 154.531449 96.5327) (xy 154.398359 96.442929) (xy 154.12284 96.327112) (xy 153.830072 96.267015)
+        (xy 153.531208 96.264929) (xy 153.23763 96.320932) (xy 152.96052 96.432891) (xy 152.710435 96.596542) (xy 152.496899 96.805652)
+        (xy 152.328047 97.052255) (xy 152.210309 97.326959) (xy 152.14817 97.619299) (xy 152.143997 97.918142) (xy 152.197949 98.212104)
+        (xy 152.307971 98.489988) (xy 152.469872 98.74121) (xy 152.677486 98.9562) (xy 152.922904 99.12677) (xy 153.196779 99.246423)
+        (xy 153.488679 99.310602) (xy 153.787486 99.316861) (xy 154.081817 99.264962) (xy 154.360462 99.156883) (xy 154.533136 99.0473)
+        (xy 156.95921 99.0473) (xy 158.1277 100.21579) (xy 158.1277 106.159209) (xy 154.168184 110.118725) (xy 154.016171 110.180142)
+        (xy 154.080151 110.119216) (xy 154.288322 109.824115) (xy 154.43521 109.4942) (xy 154.515219 109.142038) (xy 154.520979 108.729552)
+        (xy 154.450834 108.375293) (xy 154.313215 108.041405) (xy 154.113365 107.740607) (xy 153.858896 107.484355) (xy 153.5595 107.282409)
+        (xy 153.226581 107.142463) (xy 152.872821 107.069847) (xy 152.61542 107.06805) (xy 152.430525 106.883155) (xy 152.340816 106.809467)
+        (xy 152.251813 106.734785) (xy 152.246019 106.731599) (xy 152.24091 106.727403) (xy 152.138515 106.672499) (xy 152.036783 106.616571)
+        (xy 152.030485 106.614573) (xy 152.024655 106.611447) (xy 151.913538 106.577475) (xy 151.802887 106.542375) (xy 151.796318 106.541638)
+        (xy 151.789995 106.539705) (xy 151.674443 106.527967) (xy 151.559035 106.515023) (xy 151.546108 106.514932) (xy 151.545868 106.514908)
+        (xy 151.545643 106.514929) (xy 151.54148 106.5149) (xy 150.571788 106.5149) (xy 150.404496 106.346435) (xy 150.1051 106.144489)
+        (xy 149.772181 106.004543) (xy 149.418421 105.931927) (xy 149.057293 105.929406) (xy 148.702553 105.997076) (xy 148.367712 106.13236)
+        (xy 148.065526 106.330105) (xy 147.807504 106.582779) (xy 147.603473 106.880758) (xy 147.461206 107.212692) (xy 147.386122 107.565937)
+        (xy 147.38108 107.927038) (xy 147.401175 108.036528) (xy 147.204565 107.740607) (xy 147.198438 107.734437) (xy 147.198438 97.775387)
+        (xy 147.17352 97.551618) (xy 147.105426 97.33701) (xy 147.013009 97.164114) (xy 146.824548 97.099867) (xy 146.740133 97.184281)
+        (xy 146.740133 97.015452) (xy 146.675886 96.826991) (xy 146.475987 96.72339) (xy 146.259717 96.660779) (xy 146.035387 96.641562)
+        (xy 145.811618 96.66648) (xy 145.59701 96.734574) (xy 145.424114 96.826991) (xy 145.359867 97.015452) (xy 146.05 97.705586)
+        (xy 146.740133 97.015452) (xy 146.740133 97.184281) (xy 146.134414 97.79) (xy 146.824548 98.480133) (xy 147.013009 98.415886)
+        (xy 147.11661 98.215987) (xy 147.179221 97.999717) (xy 147.198438 97.775387) (xy 147.198438 107.734437) (xy 147.0279 107.562704)
+        (xy 147.0279 103.8606) (xy 147.016572 103.745072) (xy 147.006445 103.629318) (xy 147.0046 103.622967) (xy 147.003955 103.616389)
+        (xy 146.970383 103.505194) (xy 146.937985 103.393679) (xy 146.934943 103.387811) (xy 146.933032 103.38148) (xy 146.87849 103.278902)
+        (xy 146.82506 103.175825) (xy 146.820936 103.170659) (xy 146.817832 103.164821) (xy 146.744416 103.074805) (xy 146.740133 103.069439)
+        (xy 146.740133 98.564548) (xy 146.05 97.874414) (xy 145.965586 97.958828) (xy 145.965586 97.79) (xy 145.275452 97.099867)
+        (xy 145.086991 97.164114) (xy 144.98339 97.364013) (xy 144.920779 97.580283) (xy 144.901562 97.804613) (xy 144.92648 98.028382)
+        (xy 144.994574 98.24299) (xy 145.086991 98.415886) (xy 145.275452 98.480133) (xy 145.965586 97.79) (xy 145.965586 97.958828)
+        (xy 145.359867 98.564548) (xy 145.424114 98.753009) (xy 145.624013 98.85661) (xy 145.840283 98.919221) (xy 146.064613 98.938438)
+        (xy 146.288382 98.91352) (xy 146.50299 98.845426) (xy 146.675886 98.753009) (xy 146.740133 98.564548) (xy 146.740133 103.069439)
+        (xy 146.671972 102.984055) (xy 146.662897 102.974852) (xy 146.662743 102.974663) (xy 146.662567 102.974518) (xy 146.659646 102.971555)
+        (xy 143.764045 100.075955) (xy 143.674336 100.002267) (xy 143.585333 99.927585) (xy 143.579539 99.924399) (xy 143.57443 99.920203)
+        (xy 143.472035 99.865299) (xy 143.370303 99.809371) (xy 143.364005 99.807373) (xy 143.358175 99.804247) (xy 143.247058 99.770275)
+        (xy 143.136407 99.735175) (xy 143.129838 99.734438) (xy 143.123515 99.732505) (xy 143.007963 99.720767) (xy 142.892555 99.707823)
+        (xy 142.879628 99.707732) (xy 142.879388 99.707708) (xy 142.879163 99.707729) (xy 142.875 99.7077) (xy 140.06012 99.7077)
+        (xy 139.939524 99.525536) (xy 139.769934 99.381442) (xy 139.769934 95.87791) (xy 139.742805 95.616637) (xy 139.665224 95.365679)
+        (xy 139.548053 95.146468) (xy 139.340093 95.059321) (xy 139.255679 95.143735) (xy 139.255679 94.974907) (xy 139.168532 94.766947)
+        (xy 138.93622 94.644349) (xy 138.684454 94.569429) (xy 138.42291 94.545066) (xy 138.161637 94.572195) (xy 137.910679 94.649776)
+        (xy 137.691468 94.766947) (xy 137.604321 94.974907) (xy 138.43 95.800586) (xy 139.255679 94.974907) (xy 139.255679 95.143735)
+        (xy 138.514414 95.885) (xy 139.340093 96.710679) (xy 139.548053 96.623532) (xy 139.670651 96.39122) (xy 139.745571 96.139454)
+        (xy 139.769934 95.87791) (xy 139.769934 99.381442) (xy 139.762029 99.374726) (xy 139.549605 99.279205) (xy 139.319 99.246506)
+        (xy 139.255679 99.246506) (xy 139.255679 96.795093) (xy 138.43 95.969414) (xy 138.345586 96.053828) (xy 138.345586 95.885)
+        (xy 137.519907 95.059321) (xy 137.311947 95.146468) (xy 137.189349 95.37878) (xy 137.114429 95.630546) (xy 137.090066 95.89209)
+        (xy 137.117195 96.153363) (xy 137.194776 96.404321) (xy 137.311947 96.623532) (xy 137.519907 96.710679) (xy 138.345586 95.885)
+        (xy 138.345586 96.053828) (xy 137.604321 96.795093) (xy 137.691468 97.003053) (xy 137.92378 97.125651) (xy 138.175546 97.200571)
+        (xy 138.43709 97.224934) (xy 138.698363 97.197805) (xy 138.949321 97.120224) (xy 139.168532 97.003053) (xy 139.255679 96.795093)
+        (xy 139.255679 99.246506) (xy 137.541 99.246506) (xy 137.407044 99.257394) (xy 137.184746 99.326905) (xy 136.990536 99.455476)
+        (xy 136.839726 99.632971) (xy 136.806122 99.7077) (xy 136.525 99.7077) (xy 136.409377 99.719036) (xy 136.293718 99.729156)
+        (xy 136.287372 99.730999) (xy 136.280789 99.731645) (xy 136.169553 99.765228) (xy 136.058079 99.797615) (xy 136.052211 99.800656)
+        (xy 136.04588 99.802568) (xy 135.943302 99.857109) (xy 135.840225 99.91054) (xy 135.835059 99.914663) (xy 135.829221 99.917768)
+        (xy 135.739174 99.991207) (xy 135.648455 100.063629) (xy 135.639253 100.072701) (xy 135.639063 100.072857) (xy 135.638917 100.073033)
+        (xy 135.635954 100.075955) (xy 134.365955 101.345955) (xy 131.55921 104.1527) (xy 130.099494 104.1527) (xy 130.099494 103.87)
+        (xy 130.088606 103.736044) (xy 130.019095 103.513746) (xy 129.890524 103.319536) (xy 129.721486 103.175911) (xy 129.721486 100.867292)
+        (xy 129.693068 100.584173) (xy 129.609962 100.312038) (xy 129.478371 100.065848) (xy 129.259047 99.965367) (xy 129.174633 100.049781)
+        (xy 129.174633 99.880953) (xy 129.074152 99.661629) (xy 128.822958 99.527966) (xy 128.550515 99.445876) (xy 128.267292 99.418514)
+        (xy 127.984173 99.446932) (xy 127.712038 99.530038) (xy 127.465848 99.661629) (xy 127.365367 99.880953) (xy 128.27 100.785586)
+        (xy 129.174633 99.880953) (xy 129.174633 100.049781) (xy 128.354414 100.87) (xy 129.259047 101.774633) (xy 129.478371 101.674152)
+        (xy 129.612034 101.422958) (xy 129.694124 101.150515) (xy 129.721486 100.867292) (xy 129.721486 103.175911) (xy 129.713029 103.168726)
+        (xy 129.500605 103.073205) (xy 129.27 103.040506) (xy 129.174633 103.040506) (xy 129.174633 101.859047) (xy 128.27 100.954414)
+        (xy 128.185586 101.038828) (xy 128.185586 100.87) (xy 127.280953 99.965367) (xy 127.061629 100.065848) (xy 126.927966 100.317042)
+        (xy 126.845876 100.589485) (xy 126.818514 100.872708) (xy 126.846932 101.155827) (xy 126.930038 101.427962) (xy 127.061629 101.674152)
+        (xy 127.280953 101.774633) (xy 128.185586 100.87) (xy 128.185586 101.038828) (xy 127.365367 101.859047) (xy 127.465848 102.078371)
+        (xy 127.717042 102.212034) (xy 127.989485 102.294124) (xy 128.272708 102.321486) (xy 128.555827 102.293068) (xy 128.827962 102.209962)
+        (xy 129.074152 102.078371) (xy 129.174633 101.859047) (xy 129.174633 103.040506) (xy 127.27 103.040506) (xy 127.136044 103.051394)
+        (xy 126.913746 103.120905) (xy 126.719536 103.249476) (xy 126.568726 103.426971) (xy 126.473205 103.639395) (xy 126.440506 103.87)
+        (xy 126.440506 105.87) (xy 126.451394 106.003956) (xy 126.520905 106.226254) (xy 126.649476 106.420464) (xy 126.826971 106.571274)
+        (xy 127.039395 106.666795) (xy 127.27 106.699494) (xy 129.27 106.699494) (xy 129.403956 106.688606) (xy 129.472093 106.6673)
+        (xy 132.08 106.6673) (xy 132.195577 106.655967) (xy 132.311282 106.645844) (xy 132.317627 106.644) (xy 132.324211 106.643355)
+        (xy 132.435446 106.609771) (xy 132.546921 106.577385) (xy 132.552788 106.574343) (xy 132.55912 106.572432) (xy 132.661697 106.51789)
+        (xy 132.764775 106.46446) (xy 132.76994 106.460336) (xy 132.775779 106.457232) (xy 132.865794 106.383816) (xy 132.956545 106.311372)
+        (xy 132.965743 106.3023) (xy 132.965937 106.302143) (xy 132.966085 106.301963) (xy 132.969045 106.299045) (xy 136.144045 103.124045)
+        (xy 136.897831 102.370259) (xy 136.920476 102.404464) (xy 137.097971 102.555274) (xy 137.310395 102.650795) (xy 137.541 102.683494)
+        (xy 139.319 102.683494) (xy 139.452956 102.672606) (xy 139.675254 102.603095) (xy 139.869464 102.474524) (xy 140.020274 102.297029)
+        (xy 140.053877 102.2223) (xy 142.354209 102.2223) (xy 144.5133 104.38139) (xy 144.5133 107.563823) (xy 144.353104 107.720699)
+        (xy 144.149073 108.018678) (xy 144.006806 108.350612) (xy 143.931722 108.703857) (xy 143.92668 109.064958) (xy 143.991872 109.420162)
+        (xy 144.124815 109.755939) (xy 144.320446 110.059498) (xy 144.442147 110.185523) (xy 144.163861 110.068543) (xy 143.810101 109.995927)
+        (xy 143.448973 109.993406) (xy 143.094233 110.061076) (xy 142.759392 110.19636) (xy 142.457206 110.394105) (xy 142.268499 110.5789)
+        (xy 142.20199 110.5789) (xy 138.684045 107.060955) (xy 138.594336 106.987267) (xy 138.505333 106.912585) (xy 138.499539 106.909399)
+        (xy 138.49443 106.905203) (xy 138.392035 106.850299) (xy 138.290303 106.794371) (xy 138.284005 106.792373) (xy 138.278175 106.789247)
+        (xy 138.167058 106.755275) (xy 138.056407 106.720175) (xy 138.049838 106.719438) (xy 138.043515 106.717505) (xy 137.927963 106.705767)
+        (xy 137.812555 106.692823) (xy 137.799628 106.692732) (xy 137.799388 106.692708) (xy 137.799163 106.692729) (xy 137.795 106.6927)
+        (xy 136.751449 106.6927) (xy 136.618359 106.602929) (xy 136.34284 106.487112) (xy 136.050072 106.427015) (xy 135.751208 106.424929)
+        (xy 135.45763 106.480932) (xy 135.18052 106.592891) (xy 134.974799 106.72751) (xy 134.899553 106.750228) (xy 134.788079 106.782615)
+        (xy 134.782211 106.785656) (xy 134.77588 106.787568) (xy 134.673302 106.842109) (xy 134.570225 106.89554) (xy 134.565059 106.899663)
+        (xy 134.559221 106.902768) (xy 134.469174 106.976207) (xy 134.378455 107.048629) (xy 134.369253 107.057701) (xy 134.369063 107.057857)
+        (xy 134.368917 107.058033) (xy 134.365954 107.060955) (xy 133.095955 108.330955) (xy 133.022267 108.420663) (xy 132.947585 108.509667)
+        (xy 132.944399 108.51546) (xy 132.940203 108.52057) (xy 132.885299 108.622964) (xy 132.829371 108.724697) (xy 132.827373 108.730994)
+        (xy 132.824247 108.736825) (xy 132.790275 108.847941) (xy 132.755175 108.958593) (xy 132.754438 108.965161) (xy 132.752505 108.971485)
+        (xy 132.740767 109.087036) (xy 132.727823 109.202445) (xy 132.727732 109.215371) (xy 132.727708 109.215612) (xy 132.727729 109.215836)
+        (xy 132.7277 109.22) (xy 132.7277 116.205) (xy 132.739032 116.320577) (xy 132.749156 116.436282) (xy 132.750999 116.442627)
+        (xy 132.751645 116.449211) (xy 132.785228 116.560446) (xy 132.817615 116.671921) (xy 132.820656 116.677788) (xy 132.822568 116.68412)
+        (xy 132.877109 116.786697) (xy 132.93054 116.889775) (xy 132.934663 116.89494) (xy 132.937768 116.900779) (xy 133.011183 116.990794)
+        (xy 133.083628 117.081545) (xy 133.092699 117.090743) (xy 133.092857 117.090937) (xy 133.093036 117.091085) (xy 133.095955 117.094045)
+        (xy 133.653071 117.651161) (xy 133.53201 117.689574) (xy 133.359114 117.781991) (xy 133.294867 117.970452) (xy 133.985 118.660586)
+        (xy 133.999142 118.646443) (xy 134.083556 118.730857) (xy 134.069414 118.745) (xy 134.083556 118.759142) (xy 133.999142 118.843556)
+        (xy 133.985 118.829414) (xy 133.900586 118.913828) (xy 133.900586 118.745) (xy 133.210452 118.054867) (xy 133.021991 118.119114)
+        (xy 132.91839 118.319013) (xy 132.855779 118.535283) (xy 132.836562 118.759613) (xy 132.86148 118.983382) (xy 132.929574 119.19799)
+        (xy 133.021991 119.370886) (xy 133.210452 119.435133) (xy 133.900586 118.745) (xy 133.900586 118.913828) (xy 133.294867 119.519548)
+        (xy 133.359114 119.708009) (xy 133.559013 119.81161) (xy 133.775283 119.874221) (xy 133.999613 119.893438) (xy 134.223382 119.86852)
+        (xy 134.2517 119.859534) (xy 134.2517 121.031) (xy 134.263032 121.146577) (xy 134.273156 121.262282) (xy 134.274999 121.268627)
+        (xy 134.275645 121.275211) (xy 134.309228 121.386446) (xy 134.341615 121.497921) (xy 134.344656 121.503788) (xy 134.346568 121.51012)
+        (xy 134.401109 121.612697) (xy 134.45454 121.715775) (xy 134.458663 121.72094) (xy 134.461768 121.726779) (xy 134.535183 121.816794)
+        (xy 134.607628 121.907545) (xy 134.616699 121.916743) (xy 134.616857 121.916937) (xy 134.617036 121.917085) (xy 134.619955 121.920045)
+        (xy 135.508955 122.809045) (xy 135.598663 122.882732) (xy 135.687667 122.957415) (xy 135.69346 122.9606) (xy 135.69857 122.964797)
+        (xy 135.800945 123.01969) (xy 135.902345 123.075435) (xy 136.531915 123.705005) (xy 136.45052 123.737891) (xy 136.297995 123.8377)
+        (xy 134.50579 123.8377) (xy 130.099494 119.431403) (xy 130.099494 117.84) (xy 130.088606 117.706044) (xy 130.019095 117.483746)
+        (xy 129.890524 117.289536) (xy 129.721486 117.145911) (xy 129.721486 114.837292) (xy 129.693068 114.554173) (xy 129.609962 114.282038)
+        (xy 129.478371 114.035848) (xy 129.259047 113.935367) (xy 129.174633 114.019781) (xy 129.174633 113.850953) (xy 129.074152 113.631629)
+        (xy 128.822958 113.497966) (xy 128.550515 113.415876) (xy 128.267292 113.388514) (xy 127.984173 113.416932) (xy 127.712038 113.500038)
+        (xy 127.465848 113.631629) (xy 127.365367 113.850953) (xy 128.27 114.755586) (xy 129.174633 113.850953) (xy 129.174633 114.019781)
+        (xy 128.354414 114.84) (xy 129.259047 115.744633) (xy 129.478371 115.644152) (xy 129.612034 115.392958) (xy 129.694124 115.120515)
+        (xy 129.721486 114.837292) (xy 129.721486 117.145911) (xy 129.713029 117.138726) (xy 129.500605 117.043205) (xy 129.27 117.010506)
+        (xy 129.174633 117.010506) (xy 129.174633 115.829047) (xy 128.27 114.924414) (xy 128.185586 115.008828) (xy 128.185586 114.84)
+        (xy 127.280953 113.935367) (xy 127.061629 114.035848) (xy 126.927966 114.287042) (xy 126.845876 114.559485) (xy 126.818514 114.842708)
+        (xy 126.846932 115.125827) (xy 126.930038 115.397962) (xy 127.061629 115.644152) (xy 127.280953 115.744633) (xy 128.185586 114.84)
+        (xy 128.185586 115.008828) (xy 127.365367 115.829047) (xy 127.465848 116.048371) (xy 127.717042 116.182034) (xy 127.989485 116.264124)
+        (xy 128.272708 116.291486) (xy 128.555827 116.263068) (xy 128.827962 116.179962) (xy 129.074152 116.048371) (xy 129.174633 115.829047)
+        (xy 129.174633 117.010506) (xy 127.27 117.010506) (xy 127.136044 117.021394) (xy 126.913746 117.090905) (xy 126.719536 117.219476)
+        (xy 126.568726 117.396971) (xy 126.473205 117.609395) (xy 126.440506 117.84) (xy 126.440506 119.84) (xy 126.451394 119.973956)
+        (xy 126.520905 120.196254) (xy 126.649476 120.390464) (xy 126.826971 120.541274) (xy 127.039395 120.636795) (xy 127.27 120.669494)
+        (xy 127.781403 120.669494) (xy 132.682111 125.570202) (xy 132.643047 125.627255) (xy 132.525309 125.901959) (xy 132.46317 126.194299)
+        (xy 132.458997 126.493142) (xy 132.512949 126.787104) (xy 132.622971 127.064988) (xy 132.784872 127.31621) (xy 132.992486 127.5312)
+        (xy 133.237904 127.70177) (xy 133.511779 127.821423) (xy 133.803679 127.885602) (xy 134.102486 127.891861) (xy 134.396817 127.839962)
+        (xy 134.675462 127.731883) (xy 134.927808 127.571739) (xy 135.144243 127.365631) (xy 135.316522 127.12141) (xy 135.438084 126.848377)
+        (xy 135.504299 126.556932) (xy 135.507155 126.3523) (xy 136.298561 126.3523) (xy 136.412904 126.43177) (xy 136.686779 126.551423)
+        (xy 136.978679 126.615602) (xy 137.277486 126.621861) (xy 137.571817 126.569962) (xy 137.8077 126.478469) (xy 137.8077 130.175)
+        (xy 137.819032 130.290577) (xy 137.829156 130.406282) (xy 137.830999 130.412627) (xy 137.831645 130.419211) (xy 137.865228 130.530446)
+        (xy 137.897615 130.641921) (xy 137.900656 130.647788) (xy 137.902568 130.65412) (xy 137.957109 130.756697) (xy 138.01054 130.859775)
+        (xy 138.014663 130.86494) (xy 138.017768 130.870779) (xy 138.091183 130.960794) (xy 138.163628 131.051545) (xy 138.172699 131.060743)
+        (xy 138.172857 131.060937) (xy 138.173036 131.061085) (xy 138.175955 131.064045) (xy 138.937909 131.826) (xy 128.671224 131.826)
+        (xy 128.747968 131.777297) (xy 129.149238 131.395173) (xy 129.468645 130.942385) (xy 129.694021 130.436182) (xy 129.816783 129.895842)
+        (xy 129.825621 129.262945) (xy 129.717994 128.719389) (xy 129.506839 128.20709) (xy 129.2002 127.745561) (xy 128.809756 127.352381)
+        (xy 128.350378 127.042527) (xy 127.839566 126.827801) (xy 127.296774 126.716382) (xy 126.742679 126.712514) (xy 126.198384 126.816344)
+        (xy 125.684623 127.023916) (xy 125.220965 127.327326) (xy 124.825069 127.715016) (xy 124.714 127.877227) (xy 124.714 95.648953)
+        (xy 124.77496 95.743545) (xy 125.159877 96.142137) (xy 125.614883 96.458375) (xy 126.122648 96.680212) (xy 126.663831 96.799199)
+        (xy 127.217818 96.810803) (xy 127.763509 96.714583) (xy 128.280118 96.514204) (xy 128.747968 96.217297) (xy 129.149238 95.835173)
+        (xy 129.468645 95.382385) (xy 129.694021 94.876182) (xy 129.816783 94.335842) (xy 129.825621 93.702945) (xy 129.717994 93.159389)
+        (xy 129.506839 92.64709) (xy 129.2002 92.185561) (xy 128.809756 91.792381) (xy 128.663899 91.694) (xy 163.433018 91.694)
+        (xy 163.320965 91.767326) (xy 162.925069 92.155016) (xy 162.612015 92.612219) (xy 162.393729 93.12152) (xy 162.278523 93.663521)
+        (xy 162.270786 94.217576) (xy 162.370814 94.762582) (xy 162.574795 95.277779) (xy 162.87496 95.743545) (xy 163.259877 96.142137)
+        (xy 163.714883 96.458375) (xy 164.222648 96.680212) (xy 164.763831 96.799199) (xy 165.317818 96.810803) (xy 165.863509 96.714583)
+        (xy 166.380118 96.514204) (xy 166.847968 96.217297) (xy 167.249238 95.835173) (xy 167.386 95.6413) (xy 167.386 127.8747)
       )
     )
   )

demos/ecc83/ecc83-pp.net

 (export (version D)
   (design
     (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch)
-    (date "04/07/2014 20:15:10")
-    (tool "Eeschema (2014-07-02 BZR 4969)-product"))
+    (date "01/01/2015 18:01:45")
+    (tool "Eeschema (2014-12-31 BZR 5344)-product"))
   (components
     (comp (ref U1)
       (value ECC83)
-      (footprint VALVE-NOVAL_P)
+      (footprint Valves:VALVE-ECC-83-1)
       (libsource (lib valves) (part ECC83))
       (sheetpath (names /) (tstamps /))
       (tstamp 48B4F266))
     (comp (ref P4)
       (value CONN_2)
+      (footprint connect:bornier2)
       (libsource (lib conn) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 456A8ACC))
     (comp (ref C1)
       (value 10uF)
+      (footprint discret:C2V10)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F4BE))
     (comp (ref P3)
       (value POWER)
+      (footprint connect:bornier2)
       (libsource (lib conn) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F4A5))
     (comp (ref P2)
       (value OUT)
+      (footprint connect:bornier2)
       (libsource (lib conn) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F46C))
     (comp (ref P1)
       (value IN)
+      (footprint connect:bornier2)
       (libsource (lib conn) (part CONN_2))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F464))
     (comp (ref C2)
       (value 680nF)
+      (footprint discret:C2)
       (libsource (lib device) (part C))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3BE))
     (comp (ref R3)
       (value 100K)
+      (footprint discret:R3)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3AD))
     (comp (ref R4)
       (value 47K)
+      (footprint discret:R3)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F3A2))
     (comp (ref R2)
       (value 1.5K)
+      (footprint discret:R3)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
       (tstamp 4549F39D))
     (comp (ref R1)
       (value 1.5K)
+      (footprint discret:R3)
       (libsource (lib device) (part R))
       (sheetpath (names /) (tstamps /))
-      (tstamp 4549F38A)))
+      (tstamp 4549F38A))
+    (comp (ref P5)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A5890A))
+    (comp (ref P6)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A58C65))
+    (comp (ref P7)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A58C8A))
+    (comp (ref P8)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A58CA3)))
   (libparts
     (libpart (lib device) (part C)
       (description "Condensateur non polarise")
@@ -87,6 +117,13 @@
       (pins
         (pin (num 1) (name ~) (type passive))
         (pin (num 2) (name ~) (type passive))))
+    (libpart (lib conn) (part CONN_1)
+      (description "1 pin")
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_1))
+      (pins
+        (pin (num 1) (name 1) (type passive))))
     (libpart (lib conn) (part CONN_2)
       (description "Symbole general de connecteur")
       (fields
@@ -114,47 +151,55 @@
         (pin (num 9) (name F2) (type power_in)))))
   (libraries
     (library (logical device)
-      (uri f:\kicad\share\library\device.lib))
+      (uri f:\kicad\share\kicad\library\device.lib))
     (library (logical conn)
-      (uri f:\kicad\share\library\conn.lib))
+      (uri f:\kicad\share\kicad\library\conn.lib))
     (library (logical valves)
-      (uri f:\kicad\share\library\valves.lib)))
+      (uri f:\kicad\share\kicad\library\valves.lib)))
   (nets
-    (net (code 1) (name "Net-(C1-Pad1)")
+    (net (code 1) (name GND)
+      (node (ref R4) (pin 2))
+      (node (ref R2) (pin 2))
+      (node (ref R3) (pin 2))
+      (node (ref P1) (pin 1))
+      (node (ref P2) (pin 2))
+      (node (ref P3) (pin 2))
+      (node (ref C1) (pin 2)))
+    (net (code 2) (name "Net-(C1-Pad1)")
       (node (ref U1) (pin 6))
-      (node (ref C1) (pin 1))
-      (node (ref P3) (pin 1)))
-    (net (code 2) (name "Net-(R2-Pad1)")
-      (node (ref R2) (pin 1))
-      (node (ref U1) (pin 3)))
-    (net (code 3) (name "Net-(C2-Pad2)")
+      (node (ref P3) (pin 1))
+      (node (ref C1) (pin 1)))
+    (net (code 3) (name "Net-(R2-Pad1)")
+      (node (ref U1) (pin 3))
+      (node (ref R2) (pin 1)))
+    (net (code 4) (name "Net-(P8-Pad1)")
+      (node (ref P8) (pin 1)))
+    (net (code 5) (name "Net-(P7-Pad1)")
+      (node (ref P7) (pin 1)))
+    (net (code 6) (name "Net-(P6-Pad1)")
+      (node (ref P6) (pin 1)))
+    (net (code 7) (name "Net-(P5-Pad1)")
+      (node (ref P5) (pin 1)))
+    (net (code 8) (name "Net-(C2-Pad2)")
       (node (ref U1) (pin 8))
-      (node (ref R1) (pin 2))
-      (node (ref C2) (pin 2)))
-    (net (code 4) (name "Net-(C2-Pad1)")
+      (node (ref C2) (pin 2))
+      (node (ref R1) (pin 2)))
+    (net (code 9) (name "Net-(C2-Pad1)")
       (node (ref C2) (pin 1))
-      (node (ref R3) (pin 1))
-      (node (ref P2) (pin 1)))
-    (net (code 5) (name "Net-(P4-Pad2)")
+      (node (ref P2) (pin 1))
+      (node (ref R3) (pin 1)))
+    (net (code 10) (name "Net-(P4-Pad2)")
       (node (ref U1) (pin 9))
       (node (ref P4) (pin 2)))
-    (net (code 6) (name "Net-(P1-Pad2)")
+    (net (code 11) (name "Net-(P1-Pad2)")
       (node (ref U1) (pin 2))
-      (node (ref P1) (pin 2))
-      (node (ref R4) (pin 1)))
-    (net (code 7) (name "Net-(R1-Pad1)")
+      (node (ref R4) (pin 1))
+      (node (ref P1) (pin 2)))
+    (net (code 12) (name "Net-(R1-Pad1)")
       (node (ref R1) (pin 1))
       (node (ref U1) (pin 1))
       (node (ref U1) (pin 7)))
-    (net (code 8) (name GND)
-      (node (ref R3) (pin 2))
-      (node (ref C1) (pin 2))
-      (node (ref P1) (pin 1))
-      (node (ref P2) (pin 2))
-      (node (ref P3) (pin 2))
-      (node (ref R4) (pin 2))
-      (node (ref R2) (pin 2)))
-    (net (code 9) (name "Net-(P4-Pad1)")
+    (net (code 13) (name "Net-(P4-Pad1)")
       (node (ref U1) (pin 4))
-      (node (ref U1) (pin 5))
-      (node (ref P4) (pin 1)))))
+      (node (ref P4) (pin 1))
+      (node (ref U1) (pin 5)))))
\ No newline at end of file

demos/ecc83/ecc83-pp.pro

-update=07/03/2011 07:10:15
-last_client=cvpcb
+update=01/01/2015 18:35:22
+last_client=kicad
 [general]
 version=1
 RootSch=ecc83-pp.sch
 BoardNm=ecc83-pp.brd
 [common]
 NetDir=
+[cvpcb]
+version=1
+NetIExt=.net
+[cvpcb/libraries]
+EquName1=devcms
 [eeschema]
 version=1
 LibDir=
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
-RptD_X=0
-RptD_Y=100
-RptLab=1
-PenMin=20
-SimCmd=
-UseNetN=0
 [eeschema/libraries]
 LibName1=power
 LibName2=device
@@ -46,55 +21,24 @@ LibName3=conn
 LibName4=valves
 LibName5=linear
 LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=intel
-LibName18=audio
-LibName19=interface
-LibName20=digital-audio
-LibName21=philips
-LibName22=display
-LibName23=cypress
-LibName24=siliconi
-LibName25=contrib
+LibName7=special
 [pcbnew]
 version=1
-PadDrlX=760
-PadDimH=1100
-PadDimV=550
-BoardThickness=630
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=150
+PageLayoutDescrFile=
 LastNetListRead=
-[pcbnew/libraries]
-LibName1=dip_sockets
-LibName2=valves
-LibName3=connect
-LibName4=discret
-LibName5=pin_array
-LibName6=divers
-LibName7=libcms
-LibName8=display
-LibDir=
-[cvpcb]
-version=1
-NetIExt=.net
-[cvpcb/libraries]
-EquName1=devcms
+UseCmpFile=1
+PadDrill=1.9304
+PadDrillOvalY=1.9304
+PadSizeH=2.794
+PadSizeV=1.397
+PcbTextSizeV=2.032
+PcbTextSizeH=1.524
+PcbTextThickness=0.3048
+ModuleTextSizeV=1.524
+ModuleTextSizeH=1.524
+ModuleTextSizeThickness=0.3048
+SolderMaskClearance=0.09999999999999999
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.381
+BoardOutlineThickness=0.381
+ModuleOutlineThickness=0.381

demos/ecc83/ecc83-pp.sch

@@ -24,7 +24,8 @@ LIBS:display
 LIBS:cypress
 LIBS:siliconi
 LIBS:contrib
-EELAYER 24 0
+LIBS:ecc83-pp-cache
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -39,291 +40,335 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 Wire Wire Line
-	6050 4450 6150 4450
+	6250 3900 6350 3900
 Wire Wire Line
-	5750 3850 5750 4050
-Connection ~ 4450 4500
+	5950 3300 5950 3500
+Connection ~ 4650 3950
 Wire Wire Line
-	4450 4450 4450 5400
+	4650 3900 4650 4850
 Wire Wire Line
-	4450 4450 4650 4450
+	4650 3900 4850 3900
 Wire Wire Line
-	1800 6650 1900 6650
+	1950 4950 2050 4950
 Wire Wire Line
-	1900 6650 1900 6450
+	2050 4950 2050 4750
 Wire Wire Line
-	4150 5000 4150 5300
+	4350 4450 4350 4750
 Wire Wire Line
-	6950 5150 6950 5000
+	7150 4600 7150 4450
 Wire Wire Line
-	4150 4800 4450 4800
-Connection ~ 4450 4800
+	4350 4250 4650 4250
+Connection ~ 4650 4250
 Wire Wire Line
-	6950 4150 6950 4050
+	7150 3600 7150 3500
 Wire Wire Line
-	4850 4850 4850 5400
+	5050 4300 5050 4850
 Wire Wire Line
-	6300 3900 6300 4000
+	6500 3350 6500 3450
 Wire Wire Line
-	5750 3850 6950 3850
-Connection ~ 6700 3850
+	5950 3300 7150 3300
+Connection ~ 6900 3300
 Wire Wire Line
-	6150 4450 6150 3900
-Connection ~ 6150 3900
+	6350 3900 6350 3350
+Connection ~ 6350 3350
 Wire Wire Line
-	6300 4500 6300 4900
-Connection ~ 6300 4800
+	6500 3950 6500 4350
+Connection ~ 6500 4250
 Wire Wire Line
-	6950 4800 6700 4800
+	7150 4250 6900 4250
 Wire Wire Line
-	6700 4800 6700 5400
+	6900 4250 6900 4850
 Wire Wire Line
-	2000 6450 2000 6650
+	2150 4750 2150 4950
 Wire Wire Line
-	2000 6550 1800 6550
-Connection ~ 2000 6550
+	2150 4850 1950 4850
+Connection ~ 2150 4850
 Wire Wire Line
-	4100 5250 4150 5250
-Connection ~ 4150 5250
+	4300 4700 4350 4700
+Connection ~ 4350 4700
 Wire Wire Line
-	1800 6550 1800 6450
+	1950 4850 1950 4750
 Wire Wire Line
-	4950 3900 6300 3900
+	5150 3350 6500 3350
 Wire Wire Line
-	4950 3900 4950 4050
+	5150 3350 5150 3500
 Wire Wire Line
-	5850 4850 5850 4900
+	6050 4300 6050 4350
 Wire Wire Line
-	5850 4900 6300 4900
+	6050 4350 6500 4350
 $Comp
 L ECC83 U1
 U 3 1 48B4F266
-P 1900 6000
-F 0 "U1" H 2030 6310 50  0000 C CNN
-F 1 "ECC83" H 2250 5700 50  0000 C CNN
-F 2 "VALVE-NOVAL_P" H 2170 5600 50  0001 C CNN
-F 3 "" H 1900 6000 60  0001 C CNN
-	3    1900 6000
+P 2050 4300
+F 0 "U1" H 2180 4610 50  0000 C CNN
+F 1 "ECC83" H 2400 4000 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" V 1800 4300 30  0000 C CNN
+F 3 "" H 2050 4300 60  0001 C CNN
+	3    2050 4300
 	1    0    0    -1  
 $EndComp
 $Comp
 L ECC83 U1
 U 2 1 48B4F263
-P 4950 4450
-F 0 "U1" H 5080 4760 50  0000 C CNN
-F 1 "ECC83" H 5150 4100 50  0000 C CNN
-F 2 "VALVE-NOVAL_P" H 5220 4050 50  0001 C CNN
-F 3 "" H 4950 4450 60  0001 C CNN
-	2    4950 4450
+P 5150 3900
+F 0 "U1" H 5280 4210 50  0000 C CNN
+F 1 "ECC83" H 5350 3550 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 5350 3500 30  0000 C CNN
+F 3 "" H 5150 3900 60  0001 C CNN
+	2    5150 3900
 	1    0    0    -1  
 $EndComp
 $Comp
 L ECC83 U1
 U 1 1 48B4F256
-P 5750 4450
-F 0 "U1" H 5880 4760 50  0000 C CNN
-F 1 "ECC83" H 5500 4150 50  0000 C CNN
-F 2 "VALVE-NOVAL_P" H 6020 4050 50  0001 C CNN
-F 3 "" H 5750 4450 60  0001 C CNN
-	1    5750 4450
+P 5950 3900
+F 0 "U1" H 6080 4210 50  0000 C CNN
+F 1 "ECC83" H 5700 3600 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 6220 3500 50  0001 C CNN
+F 3 "" H 5950 3900 60  0001 C CNN
+	1    5950 3900
 	-1   0    0    -1  
 $EndComp
 $Comp
 L GND #PWR01
 U 1 1 457DBAF8
-P 6950 5150
-F 0 "#PWR01" H 6950 5150 30  0001 C CNN
-F 1 "GND" H 6950 5080 30  0001 C CNN
-F 2 "" H 6950 5150 60  0001 C CNN
-F 3 "" H 6950 5150 60  0001 C CNN
-	1    6950 5150
+P 7150 4600
+F 0 "#PWR01" H 7150 4600 30  0001 C CNN
+F 1 "GND" H 7150 4530 30  0001 C CNN
+F 2 "" H 7150 4600 60  0001 C CNN
+F 3 "" H 7150 4600 60  0001 C CNN
+	1    7150 4600
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR02
 U 1 1 457DBAF5
-P 6700 5900
-F 0 "#PWR02" H 6700 5900 30  0001 C CNN
-F 1 "GND" H 6700 5830 30  0001 C CNN
-F 2 "" H 6700 5900 60  0001 C CNN
-F 3 "" H 6700 5900 60  0001 C CNN
-	1    6700 5900
+P 6900 5350
+F 0 "#PWR02" H 6900 5350 30  0001 C CNN
+F 1 "GND" H 6900 5280 30  0001 C CNN
+F 2 "" H 6900 5350 60  0001 C CNN
+F 3 "" H 6900 5350 60  0001 C CNN
+	1    6900 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR03
 U 1 1 457DBAF1
-P 4850 5900
-F 0 "#PWR03" H 4850 5900 30  0001 C CNN
-F 1 "GND" H 4850 5830 30  0001 C CNN
-F 2 "" H 4850 5900 60  0001 C CNN
-F 3 "" H 4850 5900 60  0001 C CNN
-	1    4850 5900
+P 5050 5350
+F 0 "#PWR03" H 5050 5350 30  0001 C CNN
+F 1 "GND" H 5050 5280 30  0001 C CNN
+F 2 "" H 5050 5350 60  0001 C CNN
+F 3 "" H 5050 5350 60  0001 C CNN
+	1    5050 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR04
 U 1 1 457DBAEF
-P 4450 5900
-F 0 "#PWR04" H 4450 5900 30  0001 C CNN
-F 1 "GND" H 4450 5830 30  0001 C CNN
-F 2 "" H 4450 5900 60  0001 C CNN
-F 3 "" H 4450 5900 60  0001 C CNN
-	1    4450 5900
+P 4650 5350
+F 0 "#PWR04" H 4650 5350 30  0001 C CNN
+F 1 "GND" H 4650 5280 30  0001 C CNN
+F 2 "" H 4650 5350 60  0001 C CNN
+F 3 "" H 4650 5350 60  0001 C CNN
+	1    4650 5350
 	1    0    0    -1  
 $EndComp
 $Comp
 L PWR_FLAG #FLG05
 U 1 1 457DBAC0
-P 4100 5250
-F 0 "#FLG05" H 4100 5520 30  0001 C CNN
-F 1 "PWR_FLAG" H 4100 5480 30  0000 C CNN
-F 2 "" H 4100 5250 60  0001 C CNN
-F 3 "" H 4100 5250 60  0001 C CNN
-	1    4100 5250
+P 4300 4700
+F 0 "#FLG05" H 4300 4970 30  0001 C CNN
+F 1 "PWR_FLAG" H 4300 4930 30  0000 C CNN
+F 2 "" H 4300 4700 60  0001 C CNN
+F 3 "" H 4300 4700 60  0001 C CNN
+	1    4300 4700
 	0    -1   -1   0   
 $EndComp
 $Comp
 L CONN_2 P4
 U 1 1 456A8ACC
-P 1900 7000
-F 0 "P4" V 1850 7000 40  0000 C CNN
-F 1 "CONN_2" V 1950 7000 40  0000 C CNN
-F 2 "" H 1900 7000 60  0001 C CNN
-F 3 "" H 1900 7000 60  0001 C CNN
-	1    1900 7000
+P 2050 5300
+F 0 "P4" V 2000 5300 40  0000 C CNN
+F 1 "CONN_2" V 2100 5300 40  0000 C CNN
+F 2 "connect:bornier2" H 2050 5300 60  0001 C CNN
+F 3 "" H 2050 5300 60  0001 C CNN
+	1    2050 5300
 	0    1    1    0   
 $EndComp
 $Comp
 L C C1
 U 1 1 4549F4BE
-P 6700 4050
-F 0 "C1" H 6750 4150 50  0000 L CNN
-F 1 "10uF" H 6450 4150 50  0000 L CNN
-F 2 "" H 6700 4050 60  0001 C CNN
-F 3 "" H 6700 4050 60  0001 C CNN
-	1    6700 4050
+P 6900 3500
+F 0 "C1" H 6950 3600 50  0000 L CNN
+F 1 "10uF" H 6650 3600 50  0000 L CNN
+F 2 "discret:C2V10" H 6900 3500 60  0001 C CNN
+F 3 "" H 6900 3500 60  0001 C CNN
+	1    6900 3500
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR06
 U 1 1 4549F4B9
-P 4150 5300
-F 0 "#PWR06" H 4150 5300 30  0001 C CNN
-F 1 "GND" H 4150 5230 30  0001 C CNN
-F 2 "" H 4150 5300 60  0001 C CNN
-F 3 "" H 4150 5300 60  0001 C CNN
-	1    4150 5300
+P 4350 4750
+F 0 "#PWR06" H 4350 4750 30  0001 C CNN
+F 1 "GND" H 4350 4680 30  0001 C CNN
+F 2 "" H 4350 4750 60  0001 C CNN
+F 3 "" H 4350 4750 60  0001 C CNN
+	1    4350 4750
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR07
 U 1 1 4549F4B3
-P 6950 4150
-F 0 "#PWR07" H 6950 4150 30  0001 C CNN
-F 1 "GND" H 6950 4080 30  0001 C CNN
-F 2 "" H 6950 4150 60  0001 C CNN
-F 3 "" H 6950 4150 60  0001 C CNN
-	1    6950 4150
+P 7150 3600
+F 0 "#PWR07" H 7150 3600 30  0001 C CNN
+F 1 "GND" H 7150 3530 30  0001 C CNN
+F 2 "" H 7150 3600 60  0001 C CNN
+F 3 "" H 7150 3600 60  0001 C CNN
+	1    7150 3600
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P3
 U 1 1 4549F4A5
-P 7300 3950
-F 0 "P3" V 7250 3950 40  0000 C CNN
-F 1 "POWER" V 7350 3950 40  0000 C CNN
-F 2 "" H 7300 3950 60  0001 C CNN
-F 3 "" H 7300 3950 60  0001 C CNN
-	1    7300 3950
+P 7500 3400
+F 0 "P3" V 7450 3400 40  0000 C CNN
+F 1 "POWER" V 7550 3400 40  0000 C CNN
+F 2 "connect:bornier2" H 7500 3400 60  0001 C CNN
+F 3 "" H 7500 3400 60  0001 C CNN
+	1    7500 3400
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P2
 U 1 1 4549F46C
-P 7300 4900
-F 0 "P2" V 7250 4900 40  0000 C CNN
-F 1 "OUT" V 7350 4900 40  0000 C CNN
-F 2 "" H 7300 4900 60  0001 C CNN
-F 3 "" H 7300 4900 60  0001 C CNN
-	1    7300 4900
+P 7500 4350
+F 0 "P2" V 7450 4350 40  0000 C CNN
+F 1 "OUT" V 7550 4350 40  0000 C CNN
+F 2 "connect:bornier2" H 7500 4350 60  0001 C CNN
+F 3 "" H 7500 4350 60  0001 C CNN
+	1    7500 4350
 	1    0    0    -1  
 $EndComp
 $Comp
 L CONN_2 P1
 U 1 1 4549F464
-P 3800 4900
-F 0 "P1" V 3750 4900 40  0000 C CNN
-F 1 "IN" V 3850 4900 40  0000 C CNN
-F 2 "" H 3800 4900 60  0001 C CNN
-F 3 "" H 3800 4900 60  0001 C CNN
-	1    3800 4900
+P 4000 4350
+F 0 "P1" V 3950 4350 40  0000 C CNN
+F 1 "IN" V 4050 4350 40  0000 C CNN
+F 2 "connect:bornier2" V 4150 4350 60  0000 C CNN
+F 3 "" H 4000 4350 60  0001 C CNN
+	1    4000 4350
 	-1   0    0    1   
 $EndComp
 $Comp
 L C C2
 U 1 1 4549F3BE
-P 6500 4800
-F 0 "C2" H 6550 4900 50  0000 L CNN
-F 1 "680nF" H 6550 4700 50  0000 L CNN
-F 2 "" H 6500 4800 60  0001 C CNN
-F 3 "" H 6500 4800 60  0001 C CNN
-	1    6500 4800
+P 6700 4250
+F 0 "C2" H 6750 4350 50  0000 L CNN
+F 1 "680nF" H 6750 4150 50  0000 L CNN
+F 2 "discret:C2" H 6700 4250 60  0001 C CNN
+F 3 "" H 6700 4250 60  0001 C CNN
+	1    6700 4250
 	0    1    1    0   
 $EndComp
 $Comp
 L R R3
 U 1 1 4549F3AD
-P 6700 5650
-F 0 "R3" V 6780 5650 50  0000 C CNN
-F 1 "100K" V 6700 5650 50  0000 C CNN
-F 2 "" H 6700 5650 60  0001 C CNN
-F 3 "" H 6700 5650 60  0001 C CNN
-	1    6700 5650
+P 6900 5100
+F 0 "R3" V 6980 5100 50  0000 C CNN
+F 1 "100K" V 6900 5100 50  0000 C CNN
+F 2 "discret:R3" H 6900 5100 60  0001 C CNN
+F 3 "" H 6900 5100 60  0001 C CNN
+	1    6900 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R4
 U 1 1 4549F3A2
-P 4450 5650
-F 0 "R4" V 4530 5650 50  0000 C CNN
-F 1 "47K" V 4450 5650 50  0000 C CNN
-F 2 "" H 4450 5650 60  0001 C CNN
-F 3 "" H 4450 5650 60  0001 C CNN
-	1    4450 5650
+P 4650 5100
+F 0 "R4" V 4730 5100 50  0000 C CNN
+F 1 "47K" V 4650 5100 50  0000 C CNN
+F 2 "discret:R3" H 4650 5100 60  0001 C CNN
+F 3 "" H 4650 5100 60  0001 C CNN
+	1    4650 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R2
 U 1 1 4549F39D
-P 4850 5650
-F 0 "R2" V 4930 5650 50  0000 C CNN
-F 1 "1.5K" V 4850 5650 50  0000 C CNN
-F 2 "" H 4850 5650 60  0001 C CNN
-F 3 "" H 4850 5650 60  0001 C CNN
-	1    4850 5650
+P 5050 5100
+F 0 "R2" V 5130 5100 50  0000 C CNN
+F 1 "1.5K" V 5050 5100 50  0000 C CNN
+F 2 "discret:R3" H 5050 5100 60  0001 C CNN
+F 3 "" H 5050 5100 60  0001 C CNN
+	1    5050 5100
 	1    0    0    -1  
 $EndComp
 $Comp
 L R R1
 U 1 1 4549F38A
-P 6300 4250
-F 0 "R1" V 6380 4250 50  0000 C CNN
-F 1 "1.5K" V 6300 4250 50  0000 C CNN
-F 2 "" H 6300 4250 60  0001 C CNN
-F 3 "" H 6300 4250 60  0001 C CNN
-	1    6300 4250
+P 6500 3700
+F 0 "R1" V 6580 3700 50  0000 C CNN
+F 1 "1.5K" V 6500 3700 50  0000 C CNN
+F 2 "discret:R3" H 6500 3700 60  0001 C CNN
+F 3 "" H 6500 3700 60  0001 C CNN
+	1    6500 3700
 	1    0    0    -1  
 $EndComp
 $Comp
 L GND #PWR08
 U 1 1 53B6F370
-P 6700 4250
-F 0 "#PWR08" H 6700 4250 30  0001 C CNN
-F 1 "GND" H 6700 4180 30  0001 C CNN
-F 2 "" H 6700 4250 60  0001 C CNN
-F 3 "" H 6700 4250 60  0001 C CNN
-	1    6700 4250
+P 6900 3700
+F 0 "#PWR08" H 6900 3700 30  0001 C CNN
+F 1 "GND" H 6900 3630 30  0001 C CNN
+F 2 "" H 6900 3700 60  0001 C CNN
+F 3 "" H 6900 3700 60  0001 C CNN
+	1    6900 3700
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P5
+U 1 1 54A5890A
+P 6050 7050
+F 0 "P5" H 6130 7050 40  0000 L CNN
+F 1 "CONN_1" H 6050 7105 30  0001 C CNN
+F 2 "connect:1pin" H 6050 7050 60  0001 C CNN
+F 3 "" H 6050 7050 60  0000 C CNN
+	1    6050 7050
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P6
+U 1 1 54A58C65
+P 6050 7150
+F 0 "P6" H 6130 7150 40  0000 L CNN
+F 1 "CONN_1" H 6050 7205 30  0001 C CNN
+F 2 "connect:1pin" H 6050 7150 60  0001 C CNN
+F 3 "" H 6050 7150 60  0000 C CNN
+	1    6050 7150
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P7
+U 1 1 54A58C8A
+P 6050 7250
+F 0 "P7" H 6130 7250 40  0000 L CNN
+F 1 "CONN_1" H 6050 7305 30  0001 C CNN
+F 2 "connect:1pin" H 6050 7250 60  0001 C CNN
+F 3 "" H 6050 7250 60  0000 C CNN
+	1    6050 7250
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P8
+U 1 1 54A58CA3
+P 6050 7350
+F 0 "P8" H 6130 7350 40  0000 L CNN
+F 1 "CONN_1" H 6050 7405 30  0001 C CNN
+F 2 "connect:1pin" H 6050 7350 60  0001 C CNN
+F 3 "" H 6050 7350 60  0000 C CNN
+	1    6050 7350
 	1    0    0    -1  
 $EndComp
 $EndSCHEMATC

demos/ecc83/ecc83-pp_v2-cache.lib

@@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CONN_1
+#
+DEF ~CONN_1 P 0 30 N N 1 F N
+F0 "P" 80 0 40 H V L CNN
+F1 "CONN_1" 0 55 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+C 0 0 31 0 1 0 N
+P 2 0 1 0  -30 0  -50 0 N
+X 1 1 -150 0 100 R 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
 # CONN_2
 #
 DEF CONN_2 P 0 40 Y N 1 F N

demos/ecc83/ecc83-pp_v2.cmp

+Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product   date = 01/01/2015 18:25:40
+
+BeginCmp
+TimeStamp = /4549F4BE;
+Reference = C1;
+ValeurCmp = 10uF;
+IdModule  = discret:C2V10;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F3BE;
+Reference = C2;
+ValeurCmp = 680nF;
+IdModule  = discret:CP8;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F464;
+Reference = P1;
+ValeurCmp = IN;
+IdModule  = pin_array:pin_array_1x02;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F46C;
+Reference = P2;
+ValeurCmp = OUT;
+IdModule  = pin_array:pin_array_1x02;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F4A5;
+Reference = P3;
+ValeurCmp = POWER;
+IdModule  = pin_array:pin_array_1x02;
+EndCmp
+
+BeginCmp
+TimeStamp = /456A8ACC;
+Reference = P4;
+ValeurCmp = CONN_2;
+IdModule  = pin_array:pin_array_1x02;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A5830A;
+Reference = P5;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A58363;
+Reference = P6;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A5837A;
+Reference = P7;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /54A58391;
+Reference = P8;
+ValeurCmp = CONN_1;
+IdModule  = connect:1pin;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F38A;
+Reference = R1;
+ValeurCmp = 1.5K;
+IdModule  = discret:R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F39D;
+Reference = R2;
+ValeurCmp = 1.5K;
+IdModule  = discret:R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F3AD;
+Reference = R3;
+ValeurCmp = 100K;
+IdModule  = discret:R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /4549F3A2;
+Reference = R4;
+ValeurCmp = 47K;
+IdModule  = discret:R3;
+EndCmp
+
+BeginCmp
+TimeStamp = /48B4F266;
+Reference = U1;
+ValeurCmp = ECC83;
+IdModule  = Valves:VALVE-ECC-83-1;
+EndCmp
+
+EndListe

demos/ecc83/ecc83-pp_v2.kicad_pcb

-(kicad_pcb (version 4) (host pcbnew "(2014-07-02 BZR 4969)-product")
+(kicad_pcb (version 4) (host pcbnew "(2014-12-31 BZR 5344)-product")
 
   (general
     (links 20)
     (no_connects 0)
-    (area 119.824499 90.614499 168.465501 132.905501)
+    (area 118.759514 89.3318 168.710429 133.6802)
     (thickness 1.6002)
     (drawings 4)
-    (tracks 47)
+    (tracks 46)
     (zones 0)
     (modules 15)
-    (nets 10)
+    (nets 14)
   )
 
   (page A4)
@@ -60,7 +60,7 @@
     (mod_text_width 0.3048)
     (pad_size 2.794 1.397)
     (pad_drill 1.9304)
-    (pad_to_mask_clearance 0.254)
+    (pad_to_mask_clearance 0.1)
     (aux_axis_origin 0 0)
     (visible_elements 7FFFF7FF)
     (pcbplotparams
@@ -100,6 +100,10 @@
   (net 7 "Net-(P4-Pad2)")
   (net 8 "Net-(R1-Pad1)")
   (net 9 "Net-(R2-Pad1)")
+  (net 10 "Net-(P5-Pad1)")
+  (net 11 "Net-(P6-Pad1)")
+  (net 12 "Net-(P7-Pad1)")
+  (net 13 "Net-(P8-Pad1)")
 
   (net_class Default "Ceci est la Netclass par défaut"
     (clearance 0.508)
@@ -109,18 +113,21 @@
     (uvia_dia 0.508)
     (uvia_drill 0.127)
     (add_net GND)
-    (add_net N-000007)
     (add_net "Net-(C1-Pad1)")
     (add_net "Net-(C2-Pad1)")
     (add_net "Net-(C2-Pad2)")
     (add_net "Net-(P1-Pad2)")
     (add_net "Net-(P4-Pad1)")
     (add_net "Net-(P4-Pad2)")
+    (add_net "Net-(P5-Pad1)")
+    (add_net "Net-(P6-Pad1)")
+    (add_net "Net-(P7-Pad1)")
+    (add_net "Net-(P8-Pad1)")
     (add_net "Net-(R1-Pad1)")
     (add_net "Net-(R2-Pad1)")
   )
 
-  (module C2V10 (layer Dessus) (tedit 41854742) (tstamp 4549F4BE)
+  (module discret:C2V10 (layer Dessus) (tedit 54A58223) (tstamp 54A58357)
     (at 131.445 99.06 90)
     (descr "Condensateur polarise")
     (tags CP)
@@ -143,187 +150,7 @@
     )
   )
 
-  (module R3 (layer Dessus) (tedit 200000) (tstamp 4549F38A)
-    (at 140.97 125.095 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4549F38A)
-    (autoplace_cost180 10)
-    (fp_text reference R1 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_text value 1.5K (at 0 0 270) (layer F.SilkS) hide
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 8 "Net-(R1-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 4 "Net-(C2-Pad2)"))
-    (model discret/resistor.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module R3 (layer Dessus) (tedit 200000) (tstamp 4549F3AD)
-    (at 124.46 118.745 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4549F3AD)
-    (autoplace_cost180 10)
-    (fp_text reference R3 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_text value 100K (at 0 0 270) (layer F.SilkS) hide
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 3 "Net-(C2-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (model discret/resistor.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module R3 (layer Dessus) (tedit 200000) (tstamp 4549F3A2)
-    (at 165.1 120.015 270)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4549F3A2)
-    (autoplace_cost180 10)
-    (fp_text reference R4 (at 0 0 270) (layer F.SilkS)
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_text value 47K (at 0 0 270) (layer F.SilkS) hide
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 5 "Net-(P1-Pad2)"))
-    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (model discret/resistor.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module R3 (layer Dessus) (tedit 200000) (tstamp 4549F39D)
-    (at 165.1 103.505 90)
-    (descr "Resitance 3 pas")
-    (tags R)
-    (path /4549F39D)
-    (autoplace_cost180 10)
-    (fp_text reference R2 (at 0 0 90) (layer F.SilkS)
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_text value 1.5K (at 0 0 90) (layer F.SilkS) hide
-      (effects (font (size 1.397 1.27) (thickness 0.2032)))
-    )
-    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
-    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
-    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
-    (pad 1 thru_hole circle (at -3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 9 "Net-(R2-Pad1)"))
-    (pad 2 thru_hole circle (at 3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
-    (model discret/resistor.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 0.3 0.3 0.3))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC08A)
-    (at 123.19 93.98)
-    (descr "module 1 pin (ou trou mecanique de percage)")
-    (tags DEV)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
-  )
-
-  (module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC090)
-    (at 165.1 93.98)
-    (descr "module 1 pin (ou trou mecanique de percage)")
-    (tags DEV)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_text value GND (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
-  )
-
-  (module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC096)
-    (at 165.1 129.54)
-    (descr "module 1 pin (ou trou mecanique de percage)")
-    (tags DEV)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
-  )
-
-  (module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC09B)
-    (at 123.19 129.54)
-    (descr "module 1 pin (ou trou mecanique de percage)")
-    (tags DEV)
-    (fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
-      (effects (font (size 1.016 1.016) (thickness 0.254)))
-    )
-    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
-  )
-
-  (module CP8 (layer Dessus) (tedit 200000) (tstamp 4549F3BE)
+  (module discret:CP8 (layer Dessus) (tedit 54A58223) (tstamp 54A5835C)
     (at 131.445 118.745 270)
     (descr "Condensateur polarise")
     (tags CP)
@@ -356,61 +183,25 @@
     )
   )
 
-  (module ECC-83-2 (layer Dessus) (tedit 46F8A1CF) (tstamp 454A08DD)
-    (at 149.3 109.2)
-    (path /48B4F266)
-    (fp_text reference U1 (at 0 -11.43) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_text value ECC83 (at 0 11.43) (layer F.SilkS)
-      (effects (font (thickness 0.3048)))
-    )
-    (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.381))
-    (pad 1 thru_hole oval (at 3.4544 4.75488 306) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 8 "Net-(R1-Pad1)"))
-    (pad 2 thru_hole oval (at 5.60832 1.8288 342) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 5 "Net-(P1-Pad2)"))
-    (pad 3 thru_hole oval (at 5.60832 -1.8288 18) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 9 "Net-(R2-Pad1)"))
-    (pad 4 thru_hole oval (at 3.4544 -4.75488 54) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 6 "Net-(P4-Pad1)"))
-    (pad 5 thru_hole oval (at 0 -5.8928 90) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 6 "Net-(P4-Pad1)"))
-    (pad 6 thru_hole oval (at -3.4544 -4.75488 306) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 2 "Net-(C1-Pad1)"))
-    (pad 7 thru_hole oval (at -5.60832 -1.8288 342) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 8 "Net-(R1-Pad1)"))
-    (pad 8 thru_hole oval (at -5.60832 1.78816 18) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 4 "Net-(C2-Pad2)"))
-    (pad 9 thru_hole oval (at -3.4544 4.75488 54) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
-      (net 7 "Net-(P4-Pad2)"))
-    (pad 10 thru_hole circle (at 0 0) (size 4.50088 4.50088) (drill 3.0988) (layers *.Cu *.Mask F.SilkS))
-    (model valves/ecc83.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 456A8ACC)
-    (at 149.225 128.905 180)
+  (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58361)
+    (at 165.1 111.76 270)
     (descr "Connecteurs 2 pins")
     (tags "CONN DEV")
-    (path /456A8ACC)
-    (fp_text reference P4 (at 0 -1.905 180) (layer F.SilkS)
+    (path /4549F464)
+    (fp_text reference P1 (at 0 -1.905 270) (layer F.SilkS)
       (effects (font (size 0.762 0.762) (thickness 0.1524)))
     )
-    (fp_text value CONN_2 (at 0 -1.905 180) (layer F.SilkS) hide
+    (fp_text value IN (at 0 -1.905 270) (layer F.SilkS) hide
       (effects (font (size 0.762 0.762) (thickness 0.1524)))
     )
     (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
-    (pad 1 thru_hole rect (at -1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 6 "Net-(P4-Pad1)"))
-    (pad 2 thru_hole circle (at 1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 7 "Net-(P4-Pad2)"))
+    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 5 "Net-(P1-Pad2)"))
     (model pin_array/pins_array_2x1.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -418,7 +209,7 @@
     )
   )
 
-  (module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 4549F46C)
+  (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58366)
     (at 123.19 109.855 90)
     (descr "Connecteurs 2 pins")
     (tags "CONN DEV")
@@ -444,25 +235,25 @@
     )
   )
 
-  (module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 4549F464)
-    (at 165.1 111.76 270)
+  (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A5836B)
+    (at 123.19 101.6 90)
     (descr "Connecteurs 2 pins")
     (tags "CONN DEV")
-    (path /4549F464)
-    (fp_text reference P1 (at 0 -1.905 270) (layer F.SilkS)
+    (path /4549F4A5)
+    (fp_text reference P3 (at 0 -1.905 90) (layer F.SilkS)
       (effects (font (size 0.762 0.762) (thickness 0.1524)))
     )
-    (fp_text value IN (at 0 -1.905 270) (layer F.SilkS) hide
+    (fp_text value POWER (at 0 -1.905 90) (layer F.SilkS) hide
       (effects (font (size 0.762 0.762) (thickness 0.1524)))
     )
     (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
-    (pad 1 thru_hole rect (at -1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+    (pad 1 thru_hole rect (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 2 "Net-(C1-Pad1)"))
+    (pad 2 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
       (net 1 GND))
-    (pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 5 "Net-(P1-Pad2)"))
     (model pin_array/pins_array_2x1.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -470,25 +261,25 @@
     )
   )
 
-  (module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 4549F4A5)
-    (at 123.19 101.6 90)
+  (module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58370)
+    (at 149.225 128.905 180)
     (descr "Connecteurs 2 pins")
     (tags "CONN DEV")
-    (path /4549F4A5)
-    (fp_text reference P3 (at 0 -1.905 90) (layer F.SilkS)
+    (path /456A8ACC)
+    (fp_text reference P4 (at 0 -1.905 180) (layer F.SilkS)
       (effects (font (size 0.762 0.762) (thickness 0.1524)))
     )
-    (fp_text value POWER (at 0 -1.905 90) (layer F.SilkS) hide
+    (fp_text value CONN_2 (at 0 -1.905 180) (layer F.SilkS) hide
       (effects (font (size 0.762 0.762) (thickness 0.1524)))
     )
     (fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
     (fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
-    (pad 1 thru_hole rect (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 2 "Net-(C1-Pad1)"))
-    (pad 2 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
-      (net 1 GND))
+    (pad 1 thru_hole rect (at -1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 6 "Net-(P4-Pad1)"))
+    (pad 2 thru_hole circle (at 1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 7 "Net-(P4-Pad2)"))
     (model pin_array/pins_array_2x1.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -496,58 +287,280 @@
     )
   )
 
+  (module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58389)
+    (at 140.97 125.095 270)
+    (descr "Resitance 3 pas")
+    (tags R)
+    (path /4549F38A)
+    (autoplace_cost180 10)
+    (fp_text reference R1 (at 0 0.127 270) (layer F.SilkS) hide
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_text value 1.5K (at 0 0.127 270) (layer F.SilkS)
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
+    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 8 "Net-(R1-Pad1)"))
+    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 4 "Net-(C2-Pad2)"))
+    (model discret/resistor.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 0.3 0.3 0.3))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A5838E)
+    (at 165.1 103.505 90)
+    (descr "Resitance 3 pas")
+    (tags R)
+    (path /4549F39D)
+    (autoplace_cost180 10)
+    (fp_text reference R2 (at 0 0.127 90) (layer F.SilkS) hide
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_text value 1.5K (at 0 0.127 90) (layer F.SilkS)
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
+    (pad 1 thru_hole circle (at -3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 9 "Net-(R2-Pad1)"))
+    (pad 2 thru_hole circle (at 3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (model discret/resistor.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 0.3 0.3 0.3))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58393)
+    (at 124.46 118.745 270)
+    (descr "Resitance 3 pas")
+    (tags R)
+    (path /4549F3AD)
+    (autoplace_cost180 10)
+    (fp_text reference R3 (at 0 0.127 270) (layer F.SilkS) hide
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_text value 100K (at 0 0.127 270) (layer F.SilkS)
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
+    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 3 "Net-(C2-Pad1)"))
+    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (model discret/resistor.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 0.3 0.3 0.3))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58398)
+    (at 165.1 120.015 270)
+    (descr "Resitance 3 pas")
+    (tags R)
+    (path /4549F3A2)
+    (autoplace_cost180 10)
+    (fp_text reference R4 (at 0 0.127 270) (layer F.SilkS) hide
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_text value 47K (at 0 0.127 270) (layer F.SilkS)
+      (effects (font (size 1.397 1.27) (thickness 0.2032)))
+    )
+    (fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
+    (fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
+    (fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
+    (pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 5 "Net-(P1-Pad2)"))
+    (pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
+      (net 1 GND))
+    (model discret/resistor.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 0.3 0.3 0.3))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Valves:VALVE-ECC-83-1 (layer Dessus) (tedit 54A58223) (tstamp 54A5839D)
+    (at 149.3 109.2)
+    (path /48B4F266)
+    (fp_text reference U1 (at 1.27 -11.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value ECC83 (at 0 11.43) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.15))
+    (pad 1 thru_hole circle (at 3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 8 "Net-(R1-Pad1)"))
+    (pad 2 thru_hole circle (at 5.60832 1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 5 "Net-(P1-Pad2)"))
+    (pad 3 thru_hole circle (at 5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 9 "Net-(R2-Pad1)"))
+    (pad 4 thru_hole circle (at 3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 6 "Net-(P4-Pad1)"))
+    (pad 5 thru_hole circle (at 0 -5.8928) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 6 "Net-(P4-Pad1)"))
+    (pad 6 thru_hole circle (at -3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 2 "Net-(C1-Pad1)"))
+    (pad 7 thru_hole circle (at -5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 8 "Net-(R1-Pad1)"))
+    (pad 8 thru_hole circle (at -5.60832 1.78816) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 4 "Net-(C2-Pad2)"))
+    (pad 9 thru_hole circle (at -3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
+      (net 7 "Net-(P4-Pad2)"))
+    (model Valves/VALVE-ECC-83-1.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583D2)
+    (at 123.19 93.98)
+    (descr "module 1 pin (ou trou mecanique de percage)")
+    (tags DEV)
+    (path /54A5830A)
+    (fp_text reference P5 (at 0 -3.048) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
+    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
+      (net 10 "Net-(P5-Pad1)"))
+  )
+
+  (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583D6)
+    (at 165.1 93.98)
+    (descr "module 1 pin (ou trou mecanique de percage)")
+    (tags DEV)
+    (path /54A58363)
+    (fp_text reference P6 (at 0 -3.048) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
+    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
+      (net 11 "Net-(P6-Pad1)"))
+  )
+
+  (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583DA)
+    (at 165.1 129.54)
+    (descr "module 1 pin (ou trou mecanique de percage)")
+    (tags DEV)
+    (path /54A5837A)
+    (fp_text reference P7 (at 0 -3.048) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
+    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
+      (net 12 "Net-(P7-Pad1)"))
+  )
+
+  (module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583DE)
+    (at 123.19 129.54)
+    (descr "module 1 pin (ou trou mecanique de percage)")
+    (tags DEV)
+    (path /54A58391)
+    (fp_text reference P8 (at 0 -3.048) (layer F.SilkS)
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
+      (effects (font (size 1.016 1.016) (thickness 0.254)))
+    )
+    (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
+    (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
+      (net 13 "Net-(P8-Pad1)"))
+  )
+
   (gr_line (start 168.275 132.715) (end 120.015 132.715) (angle 90) (layer Edge.Cuts) (width 0.381))
   (gr_line (start 168.275 90.805) (end 120.015 90.805) (angle 90) (layer Edge.Cuts) (width 0.381))
   (gr_line (start 168.275 90.805) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.381))
   (gr_line (start 120.015 90.805) (end 120.015 132.715) (angle 90) (layer Edge.Cuts) (width 0.381))
 
-  (segment (start 165.1 123.825) (end 165.354 123.825) (width 0.8636) (layer Dessous) (net 1))
+  (segment (start 165.1 123.825) (end 165.354 123.825) (width 0.8636) (layer Dessous) (net 1) (status 30))
+  (segment (start 125.73 101.6) (end 131.445 101.6) (width 0.8636) (layer Dessous) (net 2) (status 420))
+  (segment (start 123.19 102.87) (end 124.46 102.87) (width 0.8636) (layer Dessous) (net 2) (status 810))
+  (segment (start 142.90548 101.6) (end 145.7706 104.46512) (width 0.8636) (layer Dessous) (net 2) (status 420))
+  (segment (start 131.445 101.6) (end 142.90548 101.6) (width 0.8636) (layer Dessous) (net 2) (status 810))
   (segment (start 124.46 102.87) (end 125.73 101.6) (width 0.8636) (layer Dessous) (net 2))
-  (segment (start 131.445 101.6) (end 142.90548 101.6) (width 0.8636) (layer Dessous) (net 2) (status 800))
-  (segment (start 142.90548 101.6) (end 145.7706 104.46512) (width 0.8636) (layer Dessous) (net 2) (status 400))
-  (segment (start 123.19 102.87) (end 124.46 102.87) (width 0.8636) (layer Dessous) (net 2) (status 800))
-  (segment (start 125.73 101.6) (end 131.445 101.6) (width 0.8636) (layer Dessous) (net 2) (status 400))
-  (segment (start 128.905 111.125) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 400))
-  (segment (start 131.445 108.585) (end 128.905 111.125) (width 0.8636) (layer Dessous) (net 3) (status 800))
-  (segment (start 123.825 114.935) (end 123.19 114.3) (width 0.8636) (layer Dessous) (net 3))
-  (segment (start 123.19 114.3) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3))
-  (segment (start 124.46 114.935) (end 123.825 114.935) (width 0.8636) (layer Dessous) (net 3))
-  (segment (start 131.445 128.905) (end 140.97 128.905) (width 0.8636) (layer Dessous) (net 4) (status C00))
-  (segment (start 143.61668 111.00816) (end 143.61668 111.65332) (width 0.8636) (layer Dessous) (net 4) (status 800))
-  (segment (start 143.51 127.635) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4))
-  (segment (start 142.24 128.905) (end 143.51 127.635) (width 0.8636) (layer Dessous) (net 4))
-  (segment (start 140.97 128.905) (end 142.24 128.905) (width 0.8636) (layer Dessous) (net 4) (status 800))
-  (segment (start 143.61668 111.65332) (end 142.875 112.395) (width 0.8636) (layer Dessous) (net 4))
-  (segment (start 142.875 112.395) (end 142.875 116.205) (width 0.8636) (layer Dessous) (net 4))
+  (segment (start 124.46 114.935) (end 123.825 114.935) (width 0.8636) (layer Dessous) (net 3) (status 30))
+  (segment (start 123.19 114.3) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 20))
+  (segment (start 123.825 114.935) (end 123.19 114.3) (width 0.8636) (layer Dessous) (net 3) (status 10))
+  (segment (start 131.445 108.585) (end 128.905 111.125) (width 0.8636) (layer Dessous) (net 3) (status 810))
+  (segment (start 128.905 111.125) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 420))
   (segment (start 142.875 116.205) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4))
-  (segment (start 154.83332 111.0488) (end 159.9438 111.0488) (width 0.8636) (layer Dessous) (net 5) (status 800))
-  (segment (start 165.1 113.03) (end 165.1 116.205) (width 0.8636) (layer Dessous) (net 5) (status C00))
+  (segment (start 142.875 112.395) (end 142.875 116.205) (width 0.8636) (layer Dessous) (net 4))
+  (segment (start 143.61668 111.65332) (end 142.875 112.395) (width 0.8636) (layer Dessous) (net 4) (status 10))
+  (segment (start 140.97 128.905) (end 142.24 128.905) (width 0.8636) (layer Dessous) (net 4) (status 810))
+  (segment (start 142.24 128.905) (end 143.51 127.635) (width 0.8636) (layer Dessous) (net 4))
+  (segment (start 143.51 127.635) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4))
+  (segment (start 143.61668 111.00816) (end 143.61668 111.65332) (width 0.8636) (layer Dessous) (net 4) (status 830))
+  (segment (start 131.445 128.905) (end 140.97 128.905) (width 0.8636) (layer Dessous) (net 4) (status C30))
+  (segment (start 161.925 113.03) (end 165.1 113.03) (width 0.8636) (layer Dessous) (net 5) (status 420))
   (segment (start 159.9438 111.0488) (end 161.925 113.03) (width 0.8636) (layer Dessous) (net 5))
-  (segment (start 161.925 113.03) (end 165.1 113.03) (width 0.8636) (layer Dessous) (net 5) (status 400))
-  (segment (start 150.495 128.905) (end 150.495 116.332) (width 0.8636) (layer Dessous) (net 6) (status 800))
-  (segment (start 152.6794 104.46512) (end 152.6794 110.8456) (width 0.8636) (layer Dessous) (net 6) (status 800))
-  (segment (start 151.54148 103.3272) (end 152.6794 104.46512) (width 0.8636) (layer Dessous) (net 6) (status 400))
-  (segment (start 149.225 103.3272) (end 151.54148 103.3272) (width 0.8636) (layer Dessous) (net 6))
-  (segment (start 149.86 113.665) (end 149.86 115.697) (width 0.8636) (layer Dessous) (net 6))
+  (segment (start 165.1 113.03) (end 165.1 116.205) (width 0.8636) (layer Dessous) (net 5) (status C30))
+  (segment (start 154.83332 111.0488) (end 159.9438 111.0488) (width 0.8636) (layer Dessous) (net 5) (status 810))
+  (segment (start 149.86 115.697) (end 149.86 107.33952) (width 0.8636) (layer Dessous) (net 6))
+  (segment (start 149.86 107.33952) (end 152.7544 104.44512) (width 0.8636) (layer Dessous) (net 6) (tstamp 54A589AE) (status 20))
   (segment (start 149.86 115.697) (end 150.495 116.332) (width 0.8636) (layer Dessous) (net 6))
-  (segment (start 152.6794 110.8456) (end 149.86 113.665) (width 0.8636) (layer Dessous) (net 6))
-  (segment (start 147.955 116.15928) (end 145.7706 113.97488) (width 0.8636) (layer Dessous) (net 7) (status 400))
-  (segment (start 147.955 128.905) (end 147.955 116.15928) (width 0.8636) (layer Dessous) (net 7) (status 800))
-  (segment (start 140.97 123.825) (end 139.065 125.73) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 139.065 125.73) (end 130.175 125.73) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 130.175 125.73) (end 128.905 127) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 143.61668 107.3912) (end 142.1638 107.3912) (width 0.8636) (layer Dessous) (net 8) (status 800))
-  (segment (start 140.97 108.585) (end 140.97 121.285) (width 0.8636) (layer Dessous) (net 8) (status 400))
-  (segment (start 142.1638 107.3912) (end 140.97 108.585) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 140.97 121.285) (end 140.97 123.825) (width 0.8636) (layer Dessous) (net 8) (status 800))
-  (segment (start 154.94 116.23548) (end 152.6794 113.97488) (width 0.8636) (layer Dessous) (net 8) (status 400))
-  (segment (start 154.94 130.175) (end 154.94 116.23548) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 128.905 127) (end 128.905 130.175) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 128.905 130.175) (end 130.175 131.445) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 130.175 131.445) (end 153.67 131.445) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 149.225 103.3272) (end 151.54148 103.3272) (width 0.8636) (layer Dessous) (net 6) (status 10))
+  (segment (start 151.54148 103.3272) (end 152.6794 104.46512) (width 0.8636) (layer Dessous) (net 6) (status 420))
+  (segment (start 150.495 128.905) (end 150.495 116.332) (width 0.8636) (layer Dessous) (net 6) (status 810))
+  (segment (start 147.955 128.905) (end 147.955 116.15928) (width 0.8636) (layer Dessous) (net 7) (status 810))
+  (segment (start 147.955 116.15928) (end 145.7706 113.97488) (width 0.8636) (layer Dessous) (net 7) (status 420))
   (segment (start 153.67 131.445) (end 154.94 130.175) (width 0.8636) (layer Dessous) (net 8))
-  (segment (start 165.0238 107.3912) (end 165.1 107.315) (width 0.8636) (layer Dessous) (net 9) (status 400))
-  (segment (start 154.83332 107.3912) (end 165.0238 107.3912) (width 0.8636) (layer Dessous) (net 9) (status 800))
+  (segment (start 130.175 131.445) (end 153.67 131.445) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 128.905 130.175) (end 130.175 131.445) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 128.905 127) (end 128.905 130.175) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 154.94 130.175) (end 154.94 116.23548) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 154.94 116.23548) (end 152.6794 113.97488) (width 0.8636) (layer Dessous) (net 8) (status 420))
+  (segment (start 140.97 121.285) (end 140.97 123.825) (width 0.8636) (layer Dessous) (net 8) (status 810))
+  (segment (start 142.1638 107.3912) (end 140.97 108.585) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 140.97 108.585) (end 140.97 121.285) (width 0.8636) (layer Dessous) (net 8) (status 420))
+  (segment (start 143.61668 107.3912) (end 142.1638 107.3912) (width 0.8636) (layer Dessous) (net 8) (status 810))
+  (segment (start 130.175 125.73) (end 128.905 127) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 139.065 125.73) (end 130.175 125.73) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 140.97 123.825) (end 139.065 125.73) (width 0.8636) (layer Dessous) (net 8))
+  (segment (start 154.83332 107.3912) (end 165.0238 107.3912) (width 0.8636) (layer Dessous) (net 9) (status 830))
+  (segment (start 165.0238 107.3912) (end 165.1 107.315) (width 0.8636) (layer Dessous) (net 9) (status 430))
 
   (zone (net 1) (net_name GND) (layer Dessous) (tstamp 4EED96A1) (hatch edge 0.508)
     (connect_pads (clearance 0.635))

demos/ecc83/ecc83-pp_v2.net

+(export (version D)
+  (design
+    (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch)
+    (date "01/01/2015 18:25:50")
+    (tool "Eeschema (2014-12-31 BZR 5344)-product"))
+  (components
+    (comp (ref U1)
+      (value ECC83)
+      (footprint Valves:VALVE-ECC-83-1)
+      (libsource (lib valves) (part ECC83))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 48B4F266))
+    (comp (ref P4)
+      (value CONN_2)
+      (footprint pin_array:pin_array_1x02)
+      (libsource (lib conn) (part CONN_2))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 456A8ACC))
+    (comp (ref C1)
+      (value 10uF)
+      (footprint discret:C2V10)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F4BE))
+    (comp (ref P3)
+      (value POWER)
+      (footprint pin_array:pin_array_1x02)
+      (libsource (lib conn) (part CONN_2))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F4A5))
+    (comp (ref P2)
+      (value OUT)
+      (footprint pin_array:pin_array_1x02)
+      (libsource (lib conn) (part CONN_2))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F46C))
+    (comp (ref P1)
+      (value IN)
+      (footprint pin_array:pin_array_1x02)
+      (libsource (lib conn) (part CONN_2))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F464))
+    (comp (ref C2)
+      (value 680nF)
+      (footprint discret:CP8)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F3BE))
+    (comp (ref R3)
+      (value 100K)
+      (footprint discret:R3)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F3AD))
+    (comp (ref R4)
+      (value 47K)
+      (footprint discret:R3)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F3A2))
+    (comp (ref R2)
+      (value 1.5K)
+      (footprint discret:R3)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F39D))
+    (comp (ref R1)
+      (value 1.5K)
+      (footprint discret:R3)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4549F38A))
+    (comp (ref P5)
+      (value CONN_1)
+      (footprint connect:1pin)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A5830A))
+    (comp (ref P6)
+      (value CONN_1)
+      (footprint connect:1pin)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A58363))
+    (comp (ref P7)
+      (value CONN_1)
+      (footprint connect:1pin)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A5837A))
+    (comp (ref P8)
+      (value CONN_1)
+      (footprint connect:1pin)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 54A58391)))
+  (libparts
+    (libpart (lib device) (part C)
+      (description "Condensateur non polarise")
+      (footprints
+        (fp SM*)
+        (fp C?)
+        (fp C1-1))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) C))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib device) (part R)
+      (description Resistance)
+      (footprints
+        (fp R?)
+        (fp SM0603)
+        (fp SM0805)
+        (fp R?-*)
+        (fp SM1206))
+      (fields
+        (field (name Reference) R)
+        (field (name Value) R))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib valves) (part ECC81)
+      (aliases
+        (alias ECC83))
+      (fields
+        (field (name Reference) U)
+        (field (name Value) ECC81)
+        (field (name Footprint) VALVE-NOVAL_P))
+      (pins
+        (pin (num 1) (name A) (type output))
+        (pin (num 2) (name G) (type input))
+        (pin (num 3) (name K) (type BiDi))
+        (pin (num 4) (name F1) (type power_in))
+        (pin (num 5) (name F1) (type power_in))
+        (pin (num 6) (name A) (type output))
+        (pin (num 7) (name G) (type input))
+        (pin (num 8) (name K) (type BiDi))
+        (pin (num 9) (name F2) (type power_in))))
+    (libpart (lib conn) (part CONN_1)
+      (description "1 pin")
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_1))
+      (pins
+        (pin (num 1) (name 1) (type passive))))
+    (libpart (lib conn) (part CONN_2)
+      (description "Symbole general de connecteur")
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_2))
+      (pins
+        (pin (num 1) (name P1) (type passive))
+        (pin (num 2) (name PM) (type passive)))))
+  (libraries
+    (library (logical device)
+      (uri f:\kicad\share\kicad\library\device.lib))
+    (library (logical valves)
+      (uri f:\kicad\share\kicad\library\valves.lib))
+    (library (logical conn)
+      (uri f:\kicad\share\kicad\library\conn.lib)))
+  (nets
+    (net (code 1) (name GND)
+      (node (ref R4) (pin 2))
+      (node (ref R3) (pin 2))
+      (node (ref P1) (pin 1))
+      (node (ref R2) (pin 2))
+      (node (ref P2) (pin 2))
+      (node (ref P3) (pin 2))
+      (node (ref C1) (pin 2)))
+    (net (code 2) (name "Net-(C1-Pad1)")
+      (node (ref P3) (pin 1))
+      (node (ref C1) (pin 1))
+      (node (ref U1) (pin 6)))
+    (net (code 3) (name "Net-(P8-Pad1)")
+      (node (ref P8) (pin 1)))
+    (net (code 4) (name "Net-(P7-Pad1)")
+      (node (ref P7) (pin 1)))
+    (net (code 5) (name "Net-(P6-Pad1)")
+      (node (ref P6) (pin 1)))
+    (net (code 6) (name "Net-(P5-Pad1)")
+      (node (ref P5) (pin 1)))
+    (net (code 7) (name "Net-(R2-Pad1)")
+      (node (ref R2) (pin 1))
+      (node (ref U1) (pin 3)))
+    (net (code 8) (name "Net-(C2-Pad2)")
+      (node (ref C2) (pin 2))
+      (node (ref R1) (pin 2))
+      (node (ref U1) (pin 8)))
+    (net (code 9) (name "Net-(C2-Pad1)")
+      (node (ref C2) (pin 1))
+      (node (ref R3) (pin 1))
+      (node (ref P2) (pin 1)))
+    (net (code 10) (name "Net-(P4-Pad2)")
+      (node (ref U1) (pin 9))
+      (node (ref P4) (pin 2)))
+    (net (code 11) (name "Net-(P1-Pad2)")
+      (node (ref U1) (pin 2))
+      (node (ref R4) (pin 1))
+      (node (ref P1) (pin 2)))
+    (net (code 12) (name "Net-(R1-Pad1)")
+      (node (ref R1) (pin 1))
+      (node (ref U1) (pin 1))
+      (node (ref U1) (pin 7)))
+    (net (code 13) (name "Net-(P4-Pad1)")
+      (node (ref U1) (pin 4))
+      (node (ref U1) (pin 5))
+      (node (ref P4) (pin 1)))))
\ No newline at end of file

demos/ecc83/ecc83-pp_v2.pro

-update=04/07/2014 20:10:13
+update=01/01/2015 18:33:52
 last_client=kicad
 [general]
 version=1
 RootSch=ecc83-pp.sch
 BoardNm=ecc83-pp.brd
-[eeschema]
-version=1
-LibDir=
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
-RptD_X=0
-RptD_Y=100
-RptLab=1
-PenMin=20
-SimCmd=
-UseNetN=0
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=valves
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=microchip
-LibName15=analog_switches
-LibName16=motorola
-LibName17=intel
-LibName18=audio
-LibName19=interface
-LibName20=digital-audio
-LibName21=philips
-LibName22=display
-LibName23=cypress
-LibName24=siliconi
-LibName25=contrib
 [pcbnew]
 version=1
 PageLayoutDescrFile=
@@ -83,3 +24,13 @@ SolderMaskMinWidth=0
 DrawSegmentWidth=0.381
 BoardOutlineThickness=0.381
 ModuleOutlineThickness=0.381
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=valves
+LibName4=conn
+LibName5=linear
+LibName6=regul

demos/ecc83/ecc83-pp_v2.sch

@@ -25,7 +25,7 @@ LIBS:cypress
 LIBS:siliconi
 LIBS:contrib
 LIBS:ecc83-pp_v2-cache
-EELAYER 24 0
+EELAYER 25 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
@@ -105,7 +105,7 @@ U 3 1 48B4F266
 P 2000 6100
 F 0 "U1" H 2130 6410 50  0000 C CNN
 F 1 "ECC83" H 2350 5800 50  0000 C CNN
-F 2 "ECC-83-1" H 2450 5650 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 2450 5650 50  0000 C CNN
 F 3 "" H 2000 6100 60  0001 C CNN
 	3    2000 6100
 	1    0    0    -1  
@@ -116,7 +116,7 @@ U 2 1 48B4F263
 P 4950 4450
 F 0 "U1" H 5080 4760 50  0000 C CNN
 F 1 "ECC83" H 5150 4100 50  0000 C CNN
-F 2 "ECC-83-1" H 5150 4000 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 5150 4000 50  0000 C CNN
 F 3 "" H 4950 4450 60  0001 C CNN
 	2    4950 4450
 	1    0    0    -1  
@@ -127,7 +127,7 @@ U 1 1 48B4F256
 P 5750 4450
 F 0 "U1" H 5880 4760 50  0000 C CNN
 F 1 "ECC83" H 5500 4150 50  0000 C CNN
-F 2 "ECC-83-1" H 5750 3950 50  0000 C CNN
+F 2 "Valves:VALVE-ECC-83-1" H 5750 3950 50  0000 C CNN
 F 3 "" H 5750 4450 60  0001 C CNN
 	1    5750 4450
 	-1   0    0    -1  
@@ -193,7 +193,7 @@ U 1 1 456A8ACC
 P 2000 7100
 F 0 "P4" V 1950 7100 40  0000 C CNN
 F 1 "CONN_2" V 2050 7100 40  0000 C CNN
-F 2 "BORNIER2" V 2150 7100 60  0000 C CNN
+F 2 "pin_array:pin_array_1x02" V 2150 7100 60  0000 C CNN
 F 3 "" H 2000 7100 60  0001 C CNN
 	1    2000 7100
 	0    1    1    0   
@@ -204,7 +204,7 @@ U 1 1 4549F4BE
 P 6700 4050
 F 0 "C1" H 6750 4150 50  0000 L CNN
 F 1 "10uF" H 6450 4150 50  0000 L CNN
-F 2 "C2V10" H 6700 4050 60  0000 C CNN
+F 2 "discret:C2V10" H 6700 4050 60  0000 C CNN
 F 3 "" H 6700 4050 60  0001 C CNN
 	1    6700 4050
 	1    0    0    -1  
@@ -237,7 +237,7 @@ U 1 1 4549F4A5
 P 7300 3950
 F 0 "P3" V 7250 3950 40  0000 C CNN
 F 1 "POWER" V 7350 3950 40  0000 C CNN
-F 2 "BORNIER2" H 7300 4150 60  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 7300 4150 60  0000 C CNN
 F 3 "" H 7300 3950 60  0001 C CNN
 	1    7300 3950
 	1    0    0    -1  
@@ -248,7 +248,7 @@ U 1 1 4549F46C
 P 7300 4900
 F 0 "P2" V 7250 4900 40  0000 C CNN
 F 1 "OUT" V 7350 4900 40  0000 C CNN
-F 2 "BORNIER2" H 7300 5100 60  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 7300 5100 60  0000 C CNN
 F 3 "" H 7300 4900 60  0001 C CNN
 	1    7300 4900
 	1    0    0    -1  
@@ -259,7 +259,7 @@ U 1 1 4549F464
 P 3800 4900
 F 0 "P1" V 3750 4900 40  0000 C CNN
 F 1 "IN" V 3850 4900 40  0000 C CNN
-F 2 "BORNIER2" H 3750 4700 60  0000 C CNN
+F 2 "pin_array:pin_array_1x02" H 3750 4700 60  0000 C CNN
 F 3 "" H 3800 4900 60  0001 C CNN
 	1    3800 4900
 	-1   0    0    1   
@@ -270,7 +270,7 @@ U 1 1 4549F3BE
 P 6500 4800
 F 0 "C2" H 6550 4900 50  0000 L CNN
 F 1 "680nF" H 6550 4700 50  0000 L CNN
-F 2 "CP8" H 6400 4900 60  0000 C CNN
+F 2 "discret:CP8" H 6400 4900 60  0000 C CNN
 F 3 "" H 6500 4800 60  0001 C CNN
 	1    6500 4800
 	0    1    1    0   
@@ -281,7 +281,7 @@ U 1 1 4549F3AD
 P 6700 5650
 F 0 "R3" V 6780 5650 50  0000 C CNN
 F 1 "100K" V 6700 5650 50  0000 C CNN
-F 2 "R3" H 6700 5650 60  0000 C CNN
+F 2 "discret:R3" H 6700 5650 60  0000 C CNN
 F 3 "" H 6700 5650 60  0001 C CNN
 	1    6700 5650
 	1    0    0    -1  
@@ -292,7 +292,7 @@ U 1 1 4549F3A2
 P 4450 5650
 F 0 "R4" V 4530 5650 50  0000 C CNN
 F 1 "47K" V 4450 5650 50  0000 C CNN
-F 2 "R3" V 4350 5650 60  0000 C CNN
+F 2 "discret:R3" V 4350 5650 60  0000 C CNN
 F 3 "" H 4450 5650 60  0001 C CNN
 	1    4450 5650
 	1    0    0    -1  
@@ -303,7 +303,7 @@ U 1 1 4549F39D
 P 4850 5650
 F 0 "R2" V 4930 5650 50  0000 C CNN
 F 1 "1.5K" V 4850 5650 50  0000 C CNN
-F 2 "R3" V 4756 5656 60  0000 C CNN
+F 2 "discret:R3" V 4756 5656 60  0000 C CNN
 F 3 "" H 4850 5650 60  0001 C CNN
 	1    4850 5650
 	1    0    0    -1  
@@ -314,9 +314,57 @@ U 1 1 4549F38A
 P 6300 4250
 F 0 "R1" V 6380 4250 50  0000 C CNN
 F 1 "1.5K" V 6300 4250 50  0000 C CNN
-F 2 "R3" H 6400 4150 60  0000 C CNN
+F 2 "discret:R3" H 6400 4150 60  0000 C CNN
 F 3 "" H 6300 4250 60  0001 C CNN
 	1    6300 4250
 	1    0    0    -1  
 $EndComp
+$Comp
+L CONN_1 P5
+U 1 1 54A5830A
+P 6300 6600
+F 0 "P5" H 6380 6600 40  0000 L CNN
+F 1 "CONN_1" H 6300 6655 30  0001 C CNN
+F 2 "connect:1pin" H 6300 6600 60  0001 C CNN
+F 3 "" H 6300 6600 60  0000 C CNN
+	1    6300 6600
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P6
+U 1 1 54A58363
+P 6300 6700
+F 0 "P6" H 6380 6700 40  0000 L CNN
+F 1 "CONN_1" H 6300 6755 30  0001 C CNN
+F 2 "connect:1pin" H 6300 6700 60  0001 C CNN
+F 3 "" H 6300 6700 60  0000 C CNN
+	1    6300 6700
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P7
+U 1 1 54A5837A
+P 6300 6800
+F 0 "P7" H 6380 6800 40  0000 L CNN
+F 1 "CONN_1" H 6300 6855 30  0001 C CNN
+F 2 "connect:1pin" H 6300 6800 60  0001 C CNN
+F 3 "" H 6300 6800 60  0000 C CNN
+	1    6300 6800
+	1    0    0    -1  
+$EndComp
+$Comp
+L CONN_1 P8
+U 1 1 54A58391
+P 6300 6900
+F 0 "P8" H 6380 6900 40  0000 L CNN
+F 1 "CONN_1" H 6300 6955 30  0001 C CNN
+F 2 "connect:1pin" H 6300 6900 60  0001 C CNN
+F 3 "" H 6300 6900 60  0000 C CNN
+	1    6300 6900
+	1    0    0    -1  
+$EndComp
+NoConn ~ 6150 6600
+NoConn ~ 6150 6700
+NoConn ~ 6150 6800
+NoConn ~ 6150 6900
 $EndSCHEMATC

demos/ecc83/fp-lib-table

+(fp_lib_table
+  (lib (name Valves)(type KiCad)(uri ${KISYSMOD}/Valves.pretty)(options "")(descr ""))
+)