minor update

e4fdce4a · charras · d0fe1003 · e4fdce4a · e4fdce4a · e4fdce4a
Commit e4fdce4a authored Jun 22, 2008 by charras
34 changed files
--- a/demos/ecc83/ecc83-pp.net
+++ b/demos/ecc83/ecc83-pp.net
-# EESchema Netlist Version 1.1 created  11/12/2006-20:12:40
-(
- ( 456A8ACC $noname  P4 CONN_2 {Lib=CONN_2}
-  (    1 N-000002 )
-  (    2 N-000003 )
- )
- ( 454A08DD $noname  U1 ECC83 {Lib=ECC83_2}
-  (    1 N-000005 )
-  (    2 N-000007 )
-  (    3 N-000006 )
-  (    4 N-000002 )
-  (    5 N-000002 )
-  (    6 N-000008 )
-  (    7 N-000005 )
-  (    8 N-000009 )
-  (    9 N-000003 )
- )
- ( 4549F4BE $noname  C1 10uF {Lib=C}
-  (    1 N-000008 )
-  (    2 GND )
- )
- ( 4549F4A5 $noname  P3 POWER {Lib=CONN_2}
-  (    1 N-000008 )
-  (    2 GND )
- )
- ( 4549F46C $noname  P2 OUT {Lib=CONN_2}
-  (    1 N-000004 )
-  (    2 GND )
- )
- ( 4549F464 $noname  P1 IN {Lib=CONN_2}
-  (    1 GND )
-  (    2 N-000007 )
- )
- ( 4549F3BE $noname  C2 680nF {Lib=C}
-  (    1 N-000004 )
-  (    2 N-000009 )
- )
- ( 4549F3AD $noname  R3 100K {Lib=R}
-  (    1 N-000004 )
-  (    2 GND )
- )
- ( 4549F3A2 $noname  R4 47K {Lib=R}
-  (    1 N-000007 )
-  (    2 GND )
- )
- ( 4549F39D $noname  R2 1.5K {Lib=R}
-  (    1 N-000006 )
-  (    2 GND )
- )
- ( 4549F38A $noname  R1 1.5K {Lib=R}
-  (    1 N-000005 )
-  (    2 N-000009 )
- )
-)
-*
-{ Allowed footprints by component:
-$component C1
- C?
- SM*
-$endlist
-$component C2
- C?
- SM*
-$endlist
-$component R3
- R?
- SM0603
- SM0805
-$endlist
-$component R4
- R?
- SM0603
- SM0805
-$endlist
-$component R2
- R?
- SM0603
- SM0805
-$endlist
-$component R1
- R?
- SM0603
- SM0805
-$endlist
-$endfootprintlist
-}
-{ Pin List by Nets
-Net 1 "GND"
- R2 2
- R4 2
- R3 2
- P1 1
- P2 2
- P3 2
- C1 2
-Net 2 ""
- U1 5
- U1 4
- P4 1
-Net 3 ""
- U1 9
- P4 2
-Net 4 ""
- P2 1
- C2 1
- R3 1
-Net 5 ""
- U1 1
- U1 1
- R1 1
- U1 7
-Net 6 ""
- U1 3
- R2 1
- U1 3
-Net 7 ""
- U1 2
- U1 2
- R4 1
- P1 2
-Net 8 ""
- P3 1
- U1 6
- C1 1
-Net 9 ""
- C2 2
- U1 8
- R1 2
-}
-#End
+*PADS-PCB*
+*PART*
+P4 unknown
+U1 unknown
+C1 unknown
+P3 unknown
+P2 unknown
+P1 unknown
+C2 unknown
+R3 unknown
+R4 unknown
+R2 unknown
+R1 unknown
+
+*NET*
+*SIGNAL* GND
+ R2.2
+ R4.2
+ R3.2
+ P1.1
+ P2.2
+ P3.2
+ C1.2
+*SIGNAL* N-000002
+ U1.5
+ U1.4
+ P4.1
+*SIGNAL* N-000003
+ U1.9
+ P4.2
+*SIGNAL* N-000004
+ P2.1
+ C2.1
+ R3.1
+*SIGNAL* N-000005
+ U1.1
+ U1.1
+ R1.1
+ U1.7
+*SIGNAL* N-000006
+ U1.3
+ R2.1
+ U1.3
+*SIGNAL* N-000007
+ U1.2
+ U1.2
+ R4.1
+ P1.2
+*SIGNAL* N-000008
+ P3.1
+ U1.6
+ C1.1
+*SIGNAL* N-000009
+ C2.2
+ U1.8
+ R1.2
+*END*
--- a/demos/ecc83/ecc83-pp_v2.brd
+++ b/demos/ecc83/ecc83-pp_v2.brd
-PCBNEW-BOARD Version 1 date 14/12/2006-16:10:50
+PCBNEW-BOARD Version 1 date 25/9/2007-05:51:28

 $GENERAL
 LayerCount 2
 Ly 1FFF8001
-Links 21
-NoConn 1
+Links 20
+NoConn 0
 Di 46725 35674 66775 52326
 Ndraw 4
 Ntrack 57
@@ -16,7 +16,7 @@ $EndGENERAL
 $SHEETDESCR
 Sheet A4 11700 8267
 Title ""
-Date "14 dec 2006"
+Date "25 sep 2007"
 Rev ""
 Comp ""
 Comment1 ""
@@ -45,8 +45,8 @@ TextPcbSize 600 800
 EdgeModWidth 150
 TextModSize 600 600
 TextModWidth 120
-PadSize 1100 550
-PadDrill 760
+PadSize 1772 1772
+PadDrill 1220
 AuxiliaryAxisOrg 0 0
 $EndSETUP

@@ -387,7 +387,7 @@ Ro 0.000000 0.000000 0.000000
 $EndSHAPE3D
 $EndMODULE  CP8
 $MODULE ECC-83-2
-Po 58750 43000 0 15 456BE21B 454A08DD ~~
+Po 58750 43000 0 15 46F8A1CF 454A08DD ~~
 Li ECC-83-2
 Sc 454A08DD
 Op 0 0 0
@@ -458,10 +458,10 @@ Ne 9 "N-000002"
 Po -1360 1872
 $EndPAD
 $PAD
-Sh "2" C 1772 1772 0 0 0
+Sh "10" C 1772 1772 0 0 0
 Dr 1220 0 0
 At STD N 00E0FFFF
-Ne 6 "N-000007"
+Ne 0 ""
 Po 0 0
 $EndPAD
 $SHAPE3D
@@ -624,16 +624,16 @@ Po 0 47250 35750 47250 52250 150
 De 28 0 900 0 0
 $EndDRAWSEGMENT
 $TRACK
-Po 0 48500 40500 49000 40500 340 -1
-De 0 0 1 0 800
-Po 0 49500 40000 51750 40000 340 -1
-De 0 0 1 0 400
 Po 0 49000 40500 49500 40000 340 -1
 De 0 0 1 0 0
 Po 0 51750 40000 56262 40000 340 -1
 De 0 0 1 0 800
 Po 0 56262 40000 57390 41128 340 -1
 De 0 0 1 0 400
+Po 0 48500 40500 49000 40500 340 -1
+De 0 0 1 0 800
+Po 0 49500 40000 51750 40000 340 -1
+De 0 0 1 0 400
 Po 0 48500 39500 50000 38000 340 -1
 De 0 0 2 0 800
 Po 0 50000 38000 51750 38000 340 -1
@@ -704,12 +704,12 @@ Po 0 56000 50750 56500 50250 340 -1
 De 0 0 4 0 0
 Po 0 56500 50250 56500 46000 340 -1
 De 0 0 4 0 0
+Po 0 50750 43750 48500 43750 340 -1
+De 0 0 5 0 400
 Po 0 48500 45250 48500 43750 340 -1
 De 0 0 5 0 C00
 Po 0 51750 42750 50750 43750 340 -1
 De 0 0 5 0 800
-Po 0 50750 43750 48500 43750 340 -1
-De 0 0 5 0 400
 Po 0 63750 44500 65000 44500 340 -1
 De 0 0 6 0 400
 Po 0 62970 43720 63750 44500 340 -1

--- a/demos/flat_hierarchy/flat_hierarchy.brd
+++ b/demos/flat_hierarchy/flat_hierarchy.brd
--- a/demos/flat_hierarchy/flat_hierarchy.cache.lib
+++ b/demos/flat_hierarchy/flat_hierarchy.cache.lib
--- a/demos/flat_hierarchy/flat_hierarchy.cmp
+++ b/demos/flat_hierarchy/flat_hierarchy.cmp
+Cmp-Mod V01 Created by Cvpcb (2007-05-11) date = 16/5/2007-09:46:07
+
+BeginCmp
+TimeStamp = 442A5056;
+Reference = C1;
+ValeurCmp = 100uF;
+IdModule  = CP10;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A501D;
+Reference = C2;
+ValeurCmp = 220uF;
+IdModule  = CP10;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A584C;
+Reference = C3;
+ValeurCmp = 22uF/25V;
+IdModule  = CP8;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A5F61;
+Reference = C4;
+ValeurCmp = 0;
+IdModule  = C1-1;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A58B1;
+Reference = C5;
+ValeurCmp = 10nF;
+IdModule  = C1-1;
+EndCmp
+
+BeginCmp
+TimeStamp = 442AA12B;
+Reference = C6;
+ValeurCmp = 100nF;
+IdModule  = C1-1;
+EndCmp
+
+BeginCmp
+TimeStamp = 442AA145;
+Reference = C7;
+ValeurCmp = 100nF;
+IdModule  = C1-1;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639BE2C;
+Reference = C8;
+ValeurCmp = 100nF;
+IdModule  = C1-1;
+EndCmp
+
+BeginCmp
+TimeStamp = 464AD280;
+Reference = C9;
+ValeurCmp = 22OnF;
+IdModule  = C1-1;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A500B;
+Reference = D1;
+ValeurCmp = 1N4004;
+IdModule  = D5;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D1B;
+Reference = D2;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D25;
+Reference = D3;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D5C;
+Reference = D4;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D5D;
+Reference = D5;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D64;
+Reference = D6;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D65;
+Reference = D7;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4F5D;
+Reference = D8;
+ValeurCmp = RED-LED;
+IdModule  = LEDV;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A5084;
+Reference = D9;
+ValeurCmp = GREEN-LED;
+IdModule  = LEDV;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A6026;
+Reference = D10;
+ValeurCmp = SCHOTTKY;
+IdModule  = D5;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639BA28;
+Reference = D11;
+ValeurCmp = BAT43;
+IdModule  = D3;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639B9EA;
+Reference = D12;
+ValeurCmp = YELLOW-LED;
+IdModule  = LEDV;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4C93;
+Reference = J1;
+ValeurCmp = DB9-FEMAL;
+IdModule  = DB9FC;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639BAF8;
+Reference = JP1;
+ValeurCmp = JUMPER;
+IdModule  = PIN_ARRAY_2X1;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A57BE;
+Reference = L1;
+ValeurCmp = 22uH;
+IdModule  = INDUCTOR_V;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4FE7;
+Reference = P1;
+ValeurCmp = CONN_2;
+IdModule  = bornier2;
+EndCmp
+
+BeginCmp
+TimeStamp = 4436967E;
+Reference = P2;
+ValeurCmp = SUPP28;
+IdModule  = 28DIP-ELL300;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A88ED;
+Reference = P3;
+ValeurCmp = SUPP40;
+IdModule  = 40DIP-ELL600;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4EB9;
+Reference = Q1;
+ValeurCmp = BC237;
+IdModule  = TO92;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4F30;
+Reference = Q2;
+ValeurCmp = BC307;
+IdModule  = TO92;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639B996;
+Reference = Q3;
+ValeurCmp = BC307;
+IdModule  = TO92;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4CF4;
+Reference = R1;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4CFB;
+Reference = R2;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D5A;
+Reference = R3;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D5B;
+Reference = R4;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D62;
+Reference = R5;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D63;
+Reference = R6;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4F2A;
+Reference = R7;
+ValeurCmp = 10K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D92;
+Reference = R8;
+ValeurCmp = 1K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4F52;
+Reference = R9;
+ValeurCmp = 2.2K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A5F83;
+Reference = R10;
+ValeurCmp = 5,1K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4F23;
+Reference = R11;
+ValeurCmp = 22K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D85;
+Reference = R12;
+ValeurCmp = 470;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D8D;
+Reference = R13;
+ValeurCmp = 470;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A5083;
+Reference = R14;
+ValeurCmp = 470;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A58D7;
+Reference = R15;
+ValeurCmp = 6.2K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A58DC;
+Reference = R16;
+ValeurCmp = 62K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A50BF;
+Reference = R17;
+ValeurCmp = 22K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 44369638;
+Reference = R18;
+ValeurCmp = 220;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639B9B0;
+Reference = R19;
+ValeurCmp = 2.2K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639B9B3;
+Reference = R20;
+ValeurCmp = 2.2K;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 4639B9E9;
+Reference = R21;
+ValeurCmp = 470;
+IdModule  = R4;
+EndCmp
+
+BeginCmp
+TimeStamp = 443D0101;
+Reference = RV1;
+ValeurCmp = 1K;
+IdModule  = RV2X4;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A87F7;
+Reference = U1;
+ValeurCmp = 24Cxx;
+IdModule  = 8DIP-ELL300;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A4D6B;
+Reference = U2;
+ValeurCmp = 74HC125;
+IdModule  = 14DIP-ELL300;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A504A;
+Reference = U3;
+ValeurCmp = 7805;
+IdModule  = LM78XX;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A5E20;
+Reference = U4;
+ValeurCmp = LT1373;
+IdModule  = 8DIP-ELL300;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A81A7;
+Reference = U5;
+ValeurCmp = PIC_18_PINS;
+IdModule  = 18DIP-ELL300;
+EndCmp
+
+BeginCmp
+TimeStamp = 442A81A5;
+Reference = U6;
+ValeurCmp = PIC_8_PINS;
+IdModule  = 8DIP-ELL300;
+EndCmp
+
+EndListe
--- a/demos/flat_hierarchy/flat_hierarchy.net
+++ b/demos/flat_hierarchy/flat_hierarchy.net
--- a/demos/flat_hierarchy/flat_hierarchy.pro
+++ b/demos/flat_hierarchy/flat_hierarchy.pro
+update=18/4/2006-09:31:05
+last_client=pcbnew
+[general]
+version=1
+RootSch=pic_programmer.sch
+BoardNm=pic_programmer.brd
+[cvpcb]
+version=1
+NetITyp=0
+NetIExt=.net
+PkgIExt=.pkg
+NetType=0
+[cvpcb/libraries]
+EquName1=devcms
+[common]
+NetDir=
+[pcbnew]
+version=1
+PadDril=400
+PadDimH=700
+PadDimV=700
+PadForm=1
+PadMask=14745599
+ViaDiam=650
+ViaDril=250
+Isol=100
+Countlayer=2
+Lpiste=250
+RouteTo=15
+RouteBo=0
+TypeVia=3
+Segm45=1
+Racc45=1
+Unite=0
+SegFill=1
+SegAffG=0
+NewAffG=1
+PadFill=1
+PadAffG=1
+PadSNum=1
+ModAffC=1
+ModAffT=1
+PcbAffT=1
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+HPGLnum=1
+HPGdiam=15
+HPGLSpd=20
+HPGLrec=2
+HPGLorg=0
+GERBmin=15
+VEgarde=100
+DrawLar=150
+EdgeLar=150
+TxtLar=120
+MSegLar=150
+ForPlot=1
+WpenSer=10
+UserGrX=0,01
+UserGrY=0,01
+UserGrU=1
+DivGrPc=1
+TimeOut=600
+MaxLnkS=3
+ShowRat=0
+ShowMRa=1
+[pcbnew/libraries]
+LibDir=
+LibName1=supports
+LibName2=connect
+LibName3=discret
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
--- a/demos/flat_hierarchy/flat_hierarchy.sch
+++ b/demos/flat_hierarchy/flat_hierarchy.sch
+EESchema Schematic File Version 2
+LIBS:power,device,transistors,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves
+EELAYER 23  0
+EELAYER END
+$Descr A4 11700 8267
+Sheet 1 3
+Title ""
+Date "15 jun 2008"
+Rev "1"
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$Sheet
+S 5550 2650 2100 1700
+U 48553E7C
+F0 "sockets" 60
+F1 "pic_sockets.sch" 60
+$EndSheet
+$Sheet
+S 3150 2650 1650 1700
+U 48553E53
+F0 "pic_programmer" 60
+F1 "pic_programmer.sch" 60
+$EndSheet
+$EndSCHEMATC
--- a/demos/flat_hierarchy/pic_programmer.cache.lib
+++ b/demos/flat_hierarchy/pic_programmer.cache.lib
--- a/demos/flat_hierarchy/pic_programmer.sch
+++ b/demos/flat_hierarchy/pic_programmer.sch
--- a/demos/flat_hierarchy/pic_sockets.cache.lib
+++ b/demos/flat_hierarchy/pic_sockets.cache.lib
--- a/demos/flat_hierarchy/pic_sockets.sch
+++ b/demos/flat_hierarchy/pic_sockets.sch
+EESchema Schematic File Version 2
+LIBS:power,device,transistors,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves
+EELAYER 23  0
+EELAYER END
+$Descr A4 11700 8267
+Sheet 2 3
+Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
+Date "15 apr 2008"
+Rev "3"
+Comp "KiCad"
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+Text GLabel 2350 1900 0    60   Input
+VPP-MCLR
+Text GLabel 2350 1700 0    60   Input
+CLOCK-RB6
+Text GLabel 2350 1500 0    60   Input
+DATA-RB7
+Text GLabel 2350 2150 0    60   Input
+VCC_PIC
+Text Label 2550 2150 0    60   ~
+VCC_PIC
+Text Label 2450 3150 0    60   ~
+VPP-MCLR
+Wire Wire Line
+	3700 7000 3700 6900
+Wire Wire Line
+	2350 2150 3100 2150
+Wire Wire Line
+	10250 1800 9400 1800
+Wire Wire Line
+	9400 1700 10200 1700
+Wire Wire Line
+	8200 1700 7450 1700
+Connection ~ 2950 1100
+Wire Wire Line
+	2950 1100 3150 1100
+Connection ~ 2950 1200
+Wire Wire Line
+	2950 1250 2950 1000
+Wire Wire Line
+	2950 1000 3150 1000
+Wire Wire Line
+	3150 1200 2950 1200
+Wire Wire Line
+	4550 1400 5350 1400
+Wire Wire Line
+	5400 1300 4550 1300
+Wire Wire Line
+	10500 4250 9650 4250
+Wire Wire Line
+	9650 4150 10450 4150
+Wire Wire Line
+	8450 4150 7700 4150
+Wire Wire Line
+	2500 4850 2300 4850
+Wire Wire Line
+	4900 5150 4050 5150
+Wire Wire Line
+	4050 5000 4850 5000
+Wire Wire Line
+	2500 4700 1750 4700
+Wire Wire Line
+	5400 2850 4550 2850
+Wire Wire Line
+	4550 2450 5350 2450
+Wire Wire Line
+	3100 3150 2350 3150
+Wire Wire Line
+	2300 4850 2300 4900
+Wire Wire Line
+	4850 4850 4050 4850
+Wire Wire Line
+	10200 2500 9400 2500
+Wire Wire Line
+	10450 4950 9650 4950
+Wire Wire Line
+	8450 5150 7650 5150
+Wire Wire Line
+	3700 6900 4550 6900
+Wire Wire Line
+	4550 6900 4550 7000
+Text Label 3950 6900 0    60   ~
+VCC_PIC
+$Comp
+L GND #PWR01
+U 1 1 4639BE2E
+P 4550 7400
+F 0 "#PWR01" H 4550 7400 30  0001 C C
+F 1 "GND" H 4550 7330 30  0001 C C
+	1    4550 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C8
+U 1 1 4639BE2C
+P 4550 7200
+F 0 "C8" H 4600 7300 50  0000 L C
+F 1 "100nF" H 4600 7100 50  0000 L C
+	1    4550 7200
+	1    0    0    -1  
+$EndComp
+Text Label 7650 5150 0    60   ~
+VCC_PIC
+Text Label 9900 4950 0    60   ~
+VCC_PIC
+Text Label 9650 2500 0    60   ~
+VCC_PIC
+$Comp
+L GND #PWR02
+U 1 1 442A8794
+P 8450 5250
+F 0 "#PWR02" H 8450 5250 30  0001 C C
+F 1 "GND" H 8450 5180 30  0001 C C
+	1    8450 5250
+	0    1    1    0   
+$EndComp
+Text Label 4300 4850 0    60   ~
+VCC_PIC
+$Comp
+L GND #PWR03
+U 1 1 443CCA5D
+P 8450 4850
+F 0 "#PWR03" H 8450 4850 30  0001 C C
+F 1 "GND" H 8450 4780 30  0001 C C
+	1    8450 4850
+	0    1    1    0   
+$EndComp
+NoConn ~ 8200 2700
+NoConn ~ 9400 3000
+NoConn ~ 9400 2900
+NoConn ~ 9400 2800
+NoConn ~ 9400 2700
+NoConn ~ 9400 2400
+NoConn ~ 9400 2300
+NoConn ~ 9400 2200
+NoConn ~ 9400 2100
+NoConn ~ 9400 2000
+NoConn ~ 9400 1900
+NoConn ~ 8200 3000
+NoConn ~ 8200 2900
+NoConn ~ 8200 2800
+NoConn ~ 8200 2600
+NoConn ~ 8200 2500
+NoConn ~ 8200 2300
+NoConn ~ 8200 2200
+NoConn ~ 8200 2100
+NoConn ~ 8200 2000
+NoConn ~ 8200 1900
+NoConn ~ 8200 1800
+$Comp
+L GND #PWR04
+U 1 1 443697C7
+P 9400 2600
+F 0 "#PWR04" H 9400 2600 30  0001 C C
+F 1 "GND" H 9400 2530 30  0001 C C
+	1    9400 2600
+	0    -1   -1   0   
+$EndComp
+$Comp
+L GND #PWR05
+U 1 1 443697C3
+P 8200 2400
+F 0 "#PWR05" H 8200 2400 30  0001 C C
+F 1 "GND" H 8200 2330 30  0001 C C
+	1    8200 2400
+	0    1    1    0   
+$EndComp
+Text Label 9550 1800 0    60   ~
+CLOCK-RB6
+Text Label 9550 1700 0    60   ~
+DATA-RB7
+Text Label 7550 1700 0    60   ~
+VPP-MCLR
+$Comp
+L SUPP28 P2
+U 1 1 4436967E
+P 8800 2350
+F 0 "P2" H 8850 3150 70  0000 C C
+F 1 "SUPP28" H 8800 1550 70  0000 C C
+	1    8800 2350
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR06
+U 1 1 442AA147
+P 3700 7400
+F 0 "#PWR06" H 3700 7400 30  0001 C C
+F 1 "GND" H 3700 7330 30  0001 C C
+	1    3700 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C7
+U 1 1 442AA145
+P 3700 7200
+F 0 "C7" H 3750 7300 50  0000 L C
+F 1 "100nF" H 3750 7100 50  0000 L C
+	1    3700 7200
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR07
+U 1 1 442AA138
+P 2700 7400
+F 0 "#PWR07" H 2700 7400 30  0001 C C
+F 1 "GND" H 2700 7330 30  0001 C C
+	1    2700 7400
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCC #PWR08
+U 1 1 442AA134
+P 2700 7000
+F 0 "#PWR08" H 2700 7100 30  0001 C C
+F 1 "VCC" H 2700 7100 30  0000 C C
+	1    2700 7000
+	1    0    0    -1  
+$EndComp
+$Comp
+L C C6
+U 1 1 442AA12B
+P 2700 7200
+F 0 "C6" H 2750 7300 50  0000 L C
+F 1 "100nF" H 2750 7100 50  0000 L C
+	1    2700 7200
+	1    0    0    -1  
+$EndComp
+NoConn ~ 9650 6050
+NoConn ~ 9650 5950
+NoConn ~ 9650 5850
+NoConn ~ 9650 5750
+NoConn ~ 9650 5650
+NoConn ~ 9650 5550
+NoConn ~ 9650 5450
+NoConn ~ 9650 5350
+NoConn ~ 9650 5250
+NoConn ~ 9650 5150
+NoConn ~ 9650 4850
+NoConn ~ 9650 4750
+NoConn ~ 9650 4650
+NoConn ~ 9650 4550
+NoConn ~ 9650 4450
+NoConn ~ 9650 4350
+NoConn ~ 8450 6050
+NoConn ~ 8450 5950
+NoConn ~ 8450 5850
+NoConn ~ 8450 5750
+NoConn ~ 8450 5650
+NoConn ~ 8450 5550
+NoConn ~ 8450 5450
+NoConn ~ 8450 5350
+NoConn ~ 8450 5050
+NoConn ~ 8450 4950
+NoConn ~ 8450 4750
+NoConn ~ 8450 4650
+NoConn ~ 8450 4550
+NoConn ~ 8450 4450
+NoConn ~ 8450 4350
+NoConn ~ 8450 4250
+$Comp
+L GND #PWR09
+U 1 1 442A896A
+P 9650 5050
+F 0 "#PWR09" H 9650 5050 30  0001 C C
+F 1 "GND" H 9650 4980 30  0001 C C
+	1    9650 5050
+	0    -1   -1   0   
+$EndComp
+$Comp
+L SUPP40 P3
+U 1 1 442A88ED
+P 9050 5100
+F 0 "P3" H 9100 6200 70  0000 C C
+F 1 "SUPP40" H 8900 4000 70  0000 C C
+	1    9050 5100
+	1    0    0    -1  
+$EndComp
+NoConn ~ 4550 1100
+$Comp
+L GND #PWR010
+U 1 1 442A8838
+P 2950 1250
+F 0 "#PWR010" H 2950 1250 30  0001 C C
+F 1 "GND" H 2950 1180 30  0001 C C
+	1    2950 1250
+	1    0    0    -1  
+$EndComp
+Text Label 4700 1400 0    60   ~
+DATA-RB7
+Text Label 4700 1300 0    60   ~
+CLOCK-RB6
+$Comp
+L 24C16 U1
+U 1 1 442A87F7
+P 3850 1200
+F 0 "U1" H 4000 1550 60  0000 C C
+F 1 "24Cxx" H 4050 850 60  0000 C C
+	1    3850 1200
+	1    0    0    -1  
+$EndComp
+Text Label 9800 4250 0    60   ~
+CLOCK-RB6
+Text Label 9800 4150 0    60   ~
+DATA-RB7
+Text Label 7800 4150 0    60   ~
+VPP-MCLR
+NoConn ~ 2500 4400
+NoConn ~ 4050 5450
+NoConn ~ 4050 5300
+NoConn ~ 4050 4550
+NoConn ~ 4050 4700
+NoConn ~ 4050 4400
+NoConn ~ 4050 4250
+NoConn ~ 2500 5450
+NoConn ~ 2500 5300
+NoConn ~ 2500 5150
+NoConn ~ 2500 5000
+NoConn ~ 2500 4550
+NoConn ~ 2500 4250
+$Comp
+L PIC16F54 U5
+U 1 1 442A81A7
+P 3300 4850
+F 0 "U5" H 3600 5650 60  0000 C C
+F 1 "PIC_18_PINS" H 3750 4050 60  0000 C C
+	1    3300 4850
+	1    0    0    -1  
+$EndComp
+NoConn ~ 4550 3150
+NoConn ~ 3100 2850
+NoConn ~ 3100 2450
+Text Label 4200 5150 0    60   ~
+CLOCK-RB6
+Text Label 4200 5000 0    60   ~
+DATA-RB7
+Text Label 1850 4700 0    60   ~
+VPP-MCLR
+Text Label 4700 2850 0    60   ~
+CLOCK-RB6
+Text Label 4700 2450 0    60   ~
+DATA-RB7
+$Comp
+L GND #PWR011
+U 1 1 442A820F
+P 2300 4900
+F 0 "#PWR011" H 2300 4900 30  0001 C C
+F 1 "GND" H 2300 4830 30  0001 C C
+	1    2300 4900
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR012
+U 1 1 442A8205
+P 4550 2150
+F 0 "#PWR012" H 4550 2150 30  0001 C C
+F 1 "GND" H 4550 2080 30  0001 C C
+	1    4550 2150
+	0    -1   -1   0   
+$EndComp
+$Comp
+L PIC12C508A U6
+U 1 1 442A81A5
+P 3850 2650
+F 0 "U6" H 3800 3350 60  0000 C C
+F 1 "PIC_8_PINS" H 3850 1950 60  0000 C C
+	1    3850 2650
+	1    0    0    -1  
+$EndComp
+$EndSCHEMATC
--- a/demos/interf_u/interf_u.brd
+++ b/demos/interf_u/interf_u.brd
--- a/demos/interf_u/interf_u.cache.lib
+++ b/demos/interf_u/interf_u.cache.lib
-EESchema-LIBRARY Version  24/2/2007-10:08:03
+EESchema-LIBRARY Version  15/5/2008-16:10:49
 #
 #
 # 4003APG120
@@ -346,8 +346,9 @@ DEF C C 0 10 N Y 1 F N
 F0 "C" 50 100 50 H V L C
 F1 "C" 50 -100 50 H V L C
 $FPLIST
- C?
 SM*
+ C?
+ C1-1
 $ENDFPLIST
 DRAW
 P 2 0 1 8  -100 -30  100 -30 N
@@ -407,7 +408,7 @@ DEF CRYSTAL X 0 40 N N 0 F N
 F0 "X" 0 150 60 H V C C
 F1 "CRYSTAL" 0 -150 60 H V C C
 DRAW
-P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 N
+P 5 0 1 12  -50 50  50 50  50 -50  -50 -50  -50 50 f
 P 2 0 1 16  100 100  100 -100 N
 P 2 0 1 16  -100 100  -100 -100 N
 X 2 2 300 0 200 L 40 40 1 1 P
@@ -426,28 +427,28 @@ $ENDFPLIST
 DRAW
 A -109 1270 41 1799 774 0 1 8 N -150 1270 -100 1310
 P 2 0 1 0  -150 300  20 300 N
-C 50 -300 30 0 1 0 N
-P 2 0 1 0  -150 1100  20 1100 N
-C 50 -500 30 0 1 0 N
-P 2 0 1 0  -150 1000  -100 1000 N
-C -70 -1000 30 0 1 0 N
-C 50 1100 30 0 1 0 N
-C -70 0 30 0 1 0 N
-P 2 0 1 0  -150 1200  -100 1200 N
-P 2 0 1 0  -150 200  -100 200 N
-P 2 0 1 0  -150 -200  -100 -200 N
-C -70 200 30 0 1 0 N
-C -70 400 30 0 1 0 N
-P 2 0 1 0  -150 -400  -100 -400 N
-P 2 0 1 0  -150 -900  20 -900 N
-C 50 500 30 0 1 0 N
-P 2 0 1 0  -150 -600  -100 -600 N
+P 2 0 1 0  -150 700  20 700 N
+P 2 0 1 0  -150 -1100  20 -1100 N
 C 50 -100 30 0 1 0 N
 P 2 0 1 0  -150 400  -100 400 N
+A 116 -1169 34 -657 -15 0 1 8 N 130 -1200 150 -1170
+P 2 0 1 0  -150 800  -100 800 N
 C 50 300 30 0 1 0 N
 P 2 0 1 8  -100 -1300  130 -1200 N
-C 50 -900 30 0 1 0 N
+C 50 900 30 0 1 0 N
+P 2 0 1 8  150 -1170  150 1170 N
 C -70 -400 30 0 1 0 N
+P 2 0 1 0  -150 600  -100 600 N
+P 2 0 1 0  -150 1100  20 1100 N
+P 2 0 1 0  -150 -800  -100 -800 N
+C 50 500 30 0 1 0 N
+P 2 0 1 0  -150 -600  -100 -600 N
+C 50 -500 30 0 1 0 N
+P 2 0 1 0  -150 1000  -100 1000 N
+C -70 0 30 0 1 0 N
+P 2 0 1 0  -150 1200  -100 1200 N
+P 2 0 1 0  -150 0  -100 0 N
+P 2 0 1 0  -150 -1000  -100 -1000 N
 C -70 600 30 0 1 0 N
 P 2 0 1 0  -150 -100  20 -100 N
 C -70 800 30 0 1 0 N
@@ -456,32 +457,32 @@ P 2 0 1 0  -150 500  20 500 N
 P 2 0 1 0  -150 -700  20 -700 N
 P 2 0 1 0  -150 -300  20 -300 N
 P 2 0 1 0  -150 900  20 900 N
-A -108 -1259 42 -1787 -788 0 1 8 N -150 -1260 -100 -1300
-A 116 -1169 34 -657 -15 0 1 8 N 130 -1200 150 -1170
-P 2 0 1 0  -150 800  -100 800 N
-P 2 0 1 0  -150 -500  20 -500 N
-C 50 -700 30 0 1 0 N
-P 2 0 1 0  -150 0  -100 0 N
-C 50 900 30 0 1 0 N
-P 2 0 1 0  -150 700  20 700 N
-P 2 0 1 8  150 -1170  150 1170 N
-A 117 1170 32 664 1 0 1 8 N 130 1199 149 1170
-C 50 700 30 0 1 0 N
-C -70 -200 30 0 1 0 N
-P 2 0 1 0  -150 -800  -100 -800 N
-C -70 1000 30 0 1 0 N
 P 2 0 1 0  -150 100  20 100 N
-P 2 0 1 0  -150 600  -100 600 N
+P 2 0 1 0  -150 200  -100 200 N
+P 2 0 1 0  -150 -200  -100 -200 N
+C 50 700 30 0 1 0 N
+P 2 0 1 0  -150 -500  20 -500 N
+C -70 200 30 0 1 0 N
 P 2 0 1 8  130 1200  -100 1310 N
-C -70 -1200 30 0 1 0 N
+C -70 -1000 30 0 1 0 N
+P 2 0 1 0  -150 -400  -100 -400 N
+A 117 1170 32 664 1 0 1 8 N 130 1199 149 1170
+P 2 0 1 0  -150 -900  20 -900 N
 C -70 -600 30 0 1 0 N
+A -108 -1259 42 -1787 -788 0 1 8 N -150 -1260 -100 -1300
 C 50 100 30 0 1 0 N
-P 2 0 1 0  -150 -1000  -100 -1000 N
+C 50 -700 30 0 1 0 N
+C 50 -900 30 0 1 0 N
+C 50 -300 30 0 1 0 N
+C -70 -1200 30 0 1 0 N
+C -70 -200 30 0 1 0 N
+C -70 1000 30 0 1 0 N
+C -70 400 30 0 1 0 N
 C -70 -800 30 0 1 0 N
 C -70 1200 30 0 1 0 N
 C 50 -1100 30 0 1 0 N
 P 2 0 1 8  -150 -1260  -150 1270 N
-P 2 0 1 0  -150 -1100  20 -1100 N
+C 50 1100 30 0 1 0 N
 X 1 1 -450 -1200 300 R 60 60 1 1 P
 X P14 14 -450 -1100 300 R 60 60 1 1 P
 X 2 2 -450 -1000 300 R 60 60 1 1 P

--- a/demos/interf_u/interf_u.cmp
+++ b/demos/interf_u/interf_u.cmp
-Cmp-Mod V01 Genere par PcbNew le 14/4/2007-11:06:02
+Cmp-Mod V01 Created by Cvpcb (20080313-r890) date = 22/3/2008-09:05:19

 BeginCmp
 TimeStamp = 322D3011;
@@ -81,35 +81,35 @@ BeginCmp
 TimeStamp = 32307EA1;
 Reference = R1;
 ValeurCmp = 100K;
-IdModule  = 16DIP300;
+IdModule  = R3;
 EndCmp

 BeginCmp
 TimeStamp = 32307EAA;
 Reference = R2;
 ValeurCmp = 1K;
-IdModule  = 16DIP300;
+IdModule  = R3;
 EndCmp

 BeginCmp
 TimeStamp = 324002E6;
 Reference = R3;
 ValeurCmp = 10K;
-IdModule  = 16DIP300;
+IdModule  = R3;
 EndCmp

 BeginCmp
 TimeStamp = 322D3295;
 Reference = R4;
 ValeurCmp = 330;
-IdModule  = 16DIP300;
+IdModule  = R3;
 EndCmp

 BeginCmp
 TimeStamp = 322D32A0;
 Reference = R5;
 ValeurCmp = 330;
-IdModule  = 16DIP300;
+IdModule  = R3;
 EndCmp

 BeginCmp

--- a/demos/interf_u/interf_u.net
+++ b/demos/interf_u/interf_u.net
--- a/demos/interf_u/interf_u.sch
+++ b/demos/interf_u/interf_u.sch
--- a/demos/pic_programmer/pic_programmer.brd
+++ b/demos/pic_programmer/pic_programmer.brd
--- a/demos/pic_programmer/pic_programmer.cache.lib
+++ b/demos/pic_programmer/pic_programmer.cache.lib
-EESchema-LIBRARY Version  16/5/2007-09:46:54
+EESchema-LIBRARY Version  30/4/2008-18:02:35
 #
 #
 # 24C16
@@ -28,19 +28,19 @@ F1 "74LS125" 50 -150 40 H V L T
 DRAW
 P 4 0 1 0  -150 150  -150 -150  150 0  -150 150 N
 X VCC 14 -150 150 0 D 50 30 0 0 W N
-X O 8 450 0 300 L 50 30 3 1 T
-X O 6 450 0 300 L 50 30 2 1 T
 X O 3 450 0 300 L 50 30 1 1 T
 X O 11 450 0 300 L 50 30 4 1 T
+X O 8 450 0 300 L 50 30 3 1 T
+X O 6 450 0 300 L 50 30 2 1 T
 X D 2 -450 0 300 R 50 30 1 1 I
 X D 5 -450 0 300 R 50 30 2 1 I
 X D 9 -450 0 300 R 50 30 3 1 I
 X D 12 -450 0 300 R 50 30 4 1 I
 X GND 7 -150 -150 0 U 50 30 0 0 W N
-X E 10 0 -300 220 U 50 30 3 0 I I
-X E 4 0 -300 220 U 50 30 2 0 I I
 X E 1 0 -300 220 U 50 30 1 0 I I
 X E 13 0 -300 220 U 50 30 4 0 I I
+X E 10 0 -300 220 U 50 30 3 0 I I
+X E 4 0 -300 220 U 50 30 2 0 I I
 ENDDRAW
 ENDDEF
 #
@@ -115,36 +115,36 @@ $FPLIST
 DB9*
 $ENDFPLIST
 DRAW
-P 2 0 1 8  -140 470  -150 460 N
-P 2 0 1 8  129 390  150 370 N
-P 2 0 1 0  -150 -200  -100 -200 N
-C -70 0 30 0 1 0 N
-P 2 0 1 8  140 -409  -50 -490 N
-P 2 0 1 0  -150 300  20 300 N
-C -70 400 30 0 1 0 N
-P 2 0 1 0  -150 -100  20 -100 N
-P 2 0 1 8  -140 -470  -110 -490 N
-P 2 0 1 8  -140 470  -100 490 N
-P 2 0 1 8  -100 490  -70 490 N
-P 2 0 1 0  -150 -300  20 -300 N
-P 2 0 1 8  150 370  150 -390 N
-P 2 0 1 0  -150 -400  -100 -400 N
-P 2 0 1 0  -150 100  20 100 N
-P 2 0 1 0  -150 0  -100 0 N
-P 2 0 1 8  -150 -460  -150 460 N
-P 2 0 1 0  -150 200  -100 200 N
+C -70 -200 30 0 1 0 N
 C 50 -100 30 0 1 0 N
-P 2 0 1 0  -150 400  -100 400 N
 C -70 200 30 0 1 0 N
+P 2 0 1 0  -150 -200  -100 -200 N
 C -70 -400 30 0 1 0 N
+P 2 0 1 8  140 -409  -50 -490 N
+P 2 0 1 0  -150 -100  20 -100 N
 C 50 100 30 0 1 0 N
+P 2 0 1 8  -140 470  -100 490 N
 C 50 300 30 0 1 0 N
+P 2 0 1 0  -150 -300  20 -300 N
 P 2 0 1 8  129 390  -70 490 N
+P 2 0 1 0  -150 -400  -100 -400 N
 P 2 0 1 8  -150 -459  -140 -470 N
+P 2 0 1 0  -150 0  -100 0 N
 P 2 0 1 8  150 -390  140 -409 N
+P 2 0 1 0  -150 200  -100 200 N
 P 2 0 1 8  -110 -490  -50 -490 N
-C -70 -200 30 0 1 0 N
+P 2 0 1 8  -140 470  -150 460 N
+P 2 0 1 8  129 390  150 370 N
 C 50 -300 30 0 1 0 N
+C -70 0 30 0 1 0 N
+C -70 400 30 0 1 0 N
+P 2 0 1 8  -140 -470  -110 -490 N
+P 2 0 1 8  -100 490  -70 490 N
+P 2 0 1 8  150 370  150 -390 N
+P 2 0 1 0  -150 100  20 100 N
+P 2 0 1 8  -150 -460  -150 460 N
+P 2 0 1 0  -150 400  -100 400 N
+P 2 0 1 0  -150 300  20 300 N
 X 1 1 -450 -400 300 R 60 60 1 1 P
 X P6 6 -450 -300 300 R 60 60 1 1 P
 X 2 2 -450 -200 300 R 60 60 1 1 P

--- a/demos/pic_programmer/pic_programmer.sch
+++ b/demos/pic_programmer/pic_programmer.sch
--- a/demos/pic_programmer/pic_sockets.sch
+++ b/demos/pic_programmer/pic_sockets.sch
--- a/demos/pspice/pspice.cache.lib
+++ b/demos/pspice/pspice.cache.lib
-EESchema-LIBRARY Version  28/3/2006-12:32:13
+EESchema-LIBRARY Version  18/6/2008-08:34:30
 #
 #
 # +12V
@@ -60,10 +60,10 @@ F0 "Q" -100 300 50 H V C C
 F1 "QNPN" -100 200 50 H V C C
 DRAW
 P 4 0 0 0  150 -150  150 -50  50 -150  150 -150 F
-P 2 0 1 0  0 -150  0 150 N
+P 4 0 1 0  -100 -150  0 -150  0 -150  0 -150 N
 P 2 0 0 0  0 0  150 -150 N
 P 2 0 1 0  0 0  150 150 N
-P 4 0 1 0  -100 -150  0 -150  0 -150  0 -150 N
+P 2 0 1 0  0 -150  0 150 N
 X C 1 150 350 200 D 40 40 1 1 P
 X B 2 -300 0 300 R 40 40 1 1 I
 X Substrat 4 -100 -350 200 U 50 20 1 1 I
@@ -89,8 +89,8 @@ DEF VSOURCE V 0 40 Y Y 1 F N
 F0 "V" 0 -100 60 H V C C
 F1 "VSOURCE" 0 100 60 H V C C
 DRAW
-P 2 0 1 0  -250 -250  -250 150 F
 P 3 0 1 0  -300 150  -250 250  -200 150 F
+P 2 0 1 0  -250 -250  -250 150 F
 C 0 0 400 0 1 0 N
 T 0 -320 -10 100 0 0 1 V
 X E1 1 0 700 300 D 60 60 1 1 I

--- a/demos/pspice/pspice.cir
+++ b/demos/pspice/pspice.cir
-* EESchema Netlist Version 1.0 (Spice format) creation date: 26/11/2005-21:12:08
+* EESchema Netlist Version 1.1 (Spice format) creation date: 18/6/2008-08:38:03

+.model Q2N2222 npn (bf=200)
 .AC 10 1Meg *1.2
+.DC V1 10 12 0.5

-R12  1 3 22K
-R11  2 3 100
-L1  3 1 100mH
-R10  5 4 220
-C3  5 0 10uF
-C2  9 0 1nF
-R8  4 0 2.2K
-Q3  1 9 4 4 Q2N2222
-V2  8 0 AC 0.1
-C1  11 8 1UF
-V1  2 0 DC 12V
-R2  11 0 10K
-R6  2 11 22K
-R5  2 12 22K
-R1  12 0 10K
-R7  7 0 470
-R4  2 9 1K
-R3  2 10 1K
-Q2  9 12 7 7 Q2N2222
-Q1  10 11 7 7 Q2N2222
+R12  /VOUT N-000003 22K
+R11  +12V N-000003 100
+L1  N-000003 /VOUT 100mH
+R10  N-000005 N-000004 220
+C3  N-000005 0 10uF
+C2  N-000009 0 1nF
+R8  N-000004 0 2.2K
+Q3  /VOUT N-000009 N-000004 N-000004 Q2N2222
+V2  N-000008 0 AC 0.1
+C1  /VIN N-000008 1UF
+V1  +12V 0 DC 12V
+R2  /VIN 0 10K
+R6  +12V /VIN 22K
+R5  +12V N-000012 22K
+R1  N-000012 0 10K
+R7  N-000007 0 470
+R4  +12V N-000009 1K
+R3  +12V N-000010 1K
+Q2  N-000009 N-000012 N-000007 N-000007 Q2N2222
+Q1  N-000010 /VIN N-000007 N-000007 Q2N2222

+.print ac v(vout)
 .plot ac v(nodes) (-1,5)

 .end
--- a/demos/pspice/pspice.sch
+++ b/demos/pspice/pspice.sch
--- a/demos/test_xil_95108/carte_test.brd
+++ b/demos/test_xil_95108/carte_test.brd
--- a/demos/test_xil_95108/carte_test.cache.lib
+++ b/demos/test_xil_95108/carte_test.cache.lib
--- a/demos/test_xil_95108/carte_test.sch
+++ b/demos/test_xil_95108/carte_test.sch
--- a/demos/video/pal-ntsc.sch
+++ b/demos/video/pal-ntsc.sch
--- a/demos/video/video.brd
+++ b/demos/video/video.brd
--- a/demos/video/video.cmp
+++ b/demos/video/video.cmp
-Cmp-Mod V01 Genere par PcbNew le 31/12/2006-08:17:33
+Cmp-Mod V01 Genere par PcbNew le 9/8/2007-16:28:54

 BeginCmp
 TimeStamp = 349FB562
@@ -11,7 +11,7 @@ BeginCmp
 TimeStamp = 269C6109
 Reference = BUS1;
 ValeurCmp = BUSPCI_5V;
-IdModule  = PCI5V32B;
+IdModule  = BUSPCI;
 EndCmp

 BeginCmp

--- a/demos/video/video.net
+++ b/demos/video/video.net
--- a/how-to-build-kicad.txt
+++ b/how-to-build-kicad.txt
@@ -47,7 +47,7 @@ If windows, then try running g++ and make from within your msys bash shell.

 4)  Install wxWidgets [and build it if on windows].
 If on windows, download
-http://prdownloads.sourceforge.net/wxwindows/wxMSW-2.8.7.zip or a newer version.
+http://prdownloads.sourceforge.net/wxwindows/wxMSW-2.8.8.zip or a newer version.
 Start msys so you have a bash shell.  Decide where your wxWidgets build directory
 will be.  It must be where you can access it from within the msys environment,
 such as home/<user>.   Edit your msys/1.0/etc/fstab file if needed to provide
@@ -72,11 +72,11 @@ and then:
    make
    make install

-I think the default is to install into /usr/local/wxMSW-2.8.7.  You can probably
+I think the default is to install into /usr/local/wxMSW-2.8.8.  You can probably
 pass --prefix=<wxInstallDir> to configure above to change where "make install"
 puts everything.  We will refer to <wxInstallDir> again below.  Without the
 --prefix=<wxInstallDir> passed to configure, <wxInstallDir> will likely be
-    /usr/local/wxMSW-2.8.7
+    /usr/local/wxMSW-2.8.8

 Verify that wx-config is in your path.  Modify your PATH environment variable
 if need be so you can run wx-config from a command prompt.  You may have to

--- a/internat/CMakeLists.txt
+++ b/internat/CMakeLists.txt
 install(DIRECTORY ca cs de es fr hu it ko nl pl pt ru sl sv zh_CN
    DESTINATION ${KICAD_INTERNAT}
    COMPONENT resources
-    PATTERN ".svn" EXCLUDE
-    PATTERN "*.po" EXCLUDE)
+    PATTERN ".svn" EXCLUDE )
--- a/nsis_win_installer/install.nsi
+++ b/nsis_win_installer/install.nsi