Demo files cleanup and update

15 years ago · 61edf74377
45 changed files with 103364 additions and 158740 deletions
--- a/demos/ecc83/ecc83-pp-cache.lib
+++ b/demos/ecc83/ecc83-pp-cache.lib
@ -1,116 +1,116 @@
-EESchema-LIBRARY Version  27/8/2008-06:35:46
-#
-#
-# C
-#
-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
- SM*
- C?
- C1-1
-$ENDFPLIST
-DRAW
-P 2 0 1 8  -100 -30  100 -30 N
-P 2 0 1 8  -100 30  100 30 N
-X ~ 1 0 200 170 D 40 40 1 1 P
-X ~ 2 0 -200 170 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
-# CONN_2
-#
-DEF CONN_2 P 0 40 Y N 1 F N
-F0 "P" -50 0 40 V V C C
-F1 "CONN_2" 50 0 40 V V C C
-DRAW
-S -100 150 100 -150 0 1 0 N
-X PM 2 -350 -100 250 R 60 60 1 1 P I
-X P1 1 -350 100 250 R 60 60 1 1 P I
-ENDDRAW
-ENDDEF
-#
-# ECC81
-#
-DEF ECC81 U 0 0 Y Y 3 L N
-F0 "U" 130 310 50 H V C C
-F1 "ECC81" 350 -300 50 H V C C
-F2 "VALVE-NOVAL_P" 270 -400 50 H I C C
-ALIAS ECC83
-DRAW
-A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
-P 3 0 1 0  -200 100  -200 -100  -200 -100 N
-A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
-P 2 2 1 6  -75 0  -125 0 N
-P 2 1 0 0  0 200  0 300 N
-A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
-P 2 2 1 0  -200 0  -125 0 N
-P 2 2 1 6  75 0  125 0 N
-A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
-P 2 0 1 0  200 100  200 -100 N
-P 2 1 1 6  -75 0  -125 0 N
-P 2 1 0 0  -100 -200  -100 -300 N
-P 3 1 1 10  -100 200  110 200  110 200 N
-P 2 2 0 0  -100 -200  -100 -300 N
-P 3 2 1 10  -100 200  110 200  110 200 N
-P 2 1 1 0  -200 0  -125 0 N
-P 2 1 1 6  75 0  125 0 N
-P 2 1 1 6  -25 0  25 0 N
-P 2 2 1 6  -25 0  25 0 N
-P 2 2 0 0  0 200  0 300 N
-A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
-A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
-X A 1 0 400 100 D 40 40 2 1 O
-X A 6 0 400 100 D 40 40 1 1 O
-X G 7 -300 0 100 R 40 40 1 1 I
-X G 2 -300 0 100 R 40 40 2 1 I
-X F1 4 -100 -450 200 U 40 40 3 1 W
-X K 3 -100 -400 100 U 40 40 2 1 B
-X K 8 -100 -400 100 U 40 40 1 1 B
-X F2 9 0 -450 200 U 40 40 3 1 W
-X F1 5 100 -450 200 U 40 40 3 1 W
-ENDDRAW
-ENDDEF
-#
-# GND
-#
-DEF ~GND #PWR 0 0 Y Y 1 F P
-F0 "#PWR" 0 0 30 H I C C
-F1 "GND" 0 -70 30 H I C C
-DRAW
-P 4 0 1 4  -50 0  0 -50  50 0  -50 0 N
-X GND 1 0 0 0 U 30 30 1 1 W N
-ENDDRAW
-ENDDEF
-#
-# PWR_FLAG
-#
-DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C C
-F1 "PWR_FLAG" 0 230 30 H V C C
-DRAW
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
-X pwr 1 0 0 0 U 20 20 0 0 w
-ENDDRAW
-ENDDEF
-#
-# R
-#
-DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C C
-F1 "R" 0 0 50 V V C C
-$FPLIST
- R?
- SM0603
- SM0805
-$ENDFPLIST
-DRAW
-S -40 150 40 -150 0 1 8 N
-X ~ 1 0 250 100 D 60 60 1 1 P
-X ~ 2 0 -250 100 U 60 60 1 1 P
-ENDDRAW
-ENDDEF
-#
-#EndLibrary
+EESchema-LIBRARY Version 2.3  Date: 02/12/2009 10:37:56
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 50 100 50 H V L CNN
+F1 "C" 50 -100 50 H V L CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$ENDFPLIST
+DRAW
+P 2 0 1 10  -100 -30  100 -30 N
+P 2 0 1 10  -100 30  100 30 N
+X ~ 1 0 200 170 D 40 40 1 1 P
+X ~ 2 0 -200 170 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# ECC81
+#
+DEF ECC81 U 0 0 Y Y 3 L N
+F0 "U" 130 310 50 H V C CNN
+F1 "ECC81" 350 -300 50 H V C CNN
+F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
+ALIAS ECC83
+DRAW
+P 2 1 0 0  -100 -200  -100 -300 N
+P 2 1 0 0  0 200  0 300 N
+P 2 2 0 0  -100 -200  -100 -300 N
+P 2 2 0 0  0 200  0 300 N
+A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
+A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
+P 2 0 1 0  200 100  200 -100 N
+P 3 0 1 0  -200 100  -200 -100  -200 -100 N
+A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
+P 2 1 1 0  -200 0  -125 0 N
+P 2 1 1 6  -75 0  -125 0 N
+P 2 1 1 6  -25 0  25 0 N
+P 2 1 1 6  75 0  125 0 N
+P 3 1 1 10  -100 200  110 200  110 200 N
+X A 6 0 400 100 D 40 40 1 1 O
+X G 7 -300 0 100 R 40 40 1 1 I
+X K 8 -100 -400 100 U 40 40 1 1 B
+A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
+P 2 2 1 0  -200 0  -125 0 N
+P 2 2 1 6  -75 0  -125 0 N
+P 2 2 1 6  -25 0  25 0 N
+P 2 2 1 6  75 0  125 0 N
+P 3 2 1 10  -100 200  110 200  110 200 N
+X A 1 0 400 100 D 40 40 2 1 O
+X G 2 -300 0 100 R 40 40 2 1 I
+X K 3 -100 -400 100 U 40 40 2 1 B
+A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
+A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
+X F1 4 -100 -450 200 U 40 40 3 1 W
+X F1 5 100 -450 200 U 40 40 3 1 W
+X F2 9 0 -450 200 U 40 40 3 1 W
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND" 0 -70 30 H I C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 270 30 H I C CNN
+F1 "PWR_FLAG" 0 230 30 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 3 0 1 0  0 0  0 100  0 100 N
+P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+$ENDFPLIST
+DRAW
+S -40 150 40 -150 0 1 12 N
+X ~ 1 0 250 100 D 60 60 1 1 P
+X ~ 2 0 -250 100 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
--- a/demos/ecc83/ecc83-pp.pro
+++ b/demos/ecc83/ecc83-pp.pro
@ -1,139 +1,103 @@
-update=11/12/2006-20:12:28
-last_client=cvpcb
-[general]
-version=1
-RootSch=ecc83-pp.sch
-BoardNm=ecc83-pp.brd
-[common]
-NetDir=
-[pcbnew]
-version=1
-PadDrlX=760
-PadDimH=1100
-PadDimV=550
-PadForm=1
-PadMask=14745599
-ViaDiam=450
-ViaDril=250
-Isol=60
-Countlayer=2
-Lpiste=340
-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=0
-ModAffT=0
-PcbAffT=0
-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=valves
-LibName3=connect
-LibName4=discret
-LibName5=pin_array
-LibName6=divers
-LibName7=libcms
-LibName8=display
-[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=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
-[cvpcb]
-version=1
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetType=0
-[cvpcb/libraries]
-EquName1=devcms
+update=03/12/2010 17:27:41
+last_client=pcbnew
+[general]
+version=1
+RootSch=ecc83-pp.sch
+BoardNm=ecc83-pp.brd
+[common]
+NetDir=
+[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=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
+[cvpcb]
+version=1
+NetITyp=0
+NetIExt=.net
+PkgIExt=.pkg
+NetType=0
+[cvpcb/libraries]
+EquName1=devcms
+[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
+LastNetListRead=
+[pcbnew/libraries]
+LibDir=
+LibName1=supports
+LibName2=valves
+LibName3=connect
+LibName4=discret
+LibName5=pin_array
+LibName6=divers
+LibName7=libcms
+LibName8=display
--- a/demos/ecc83/ecc83-pp_v2-cache.lib
+++ b/demos/ecc83/ecc83-pp_v2-cache.lib
@ -0,0 +1,117 @@
+EESchema-LIBRARY Version 2.3  Date: 04/12/2010 17:36:18
+#
+# C
+#
+DEF C C 0 10 N Y 1 F N
+F0 "C" 50 100 50 H V L CNN
+F1 "C" 50 -100 50 H V L CNN
+$FPLIST
+ SM*
+ C?
+ C1-1
+$ENDFPLIST
+DRAW
+P 2 0 1 10  -100 -30  100 -30 N
+P 2 0 1 10  -100 30  100 30 N
+X ~ 1 0 200 170 D 40 40 1 1 P
+X ~ 2 0 -200 170 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# CONN_2
+#
+DEF CONN_2 P 0 40 Y N 1 F N
+F0 "P" -50 0 40 V V C CNN
+F1 "CONN_2" 50 0 40 V V C CNN
+DRAW
+S -100 150 100 -150 0 1 0 N
+X P1 1 -350 100 250 R 60 60 1 1 P I
+X PM 2 -350 -100 250 R 60 60 1 1 P I
+ENDDRAW
+ENDDEF
+#
+# ECC81
+#
+DEF ECC81 U 0 0 Y Y 3 L N
+F0 "U" 130 310 50 H V C CNN
+F1 "ECC81" 350 -300 50 H V C CNN
+F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
+ALIAS ECC83
+DRAW
+P 2 1 0 0  -100 -200  -100 -300 N
+P 2 1 0 0  0 200  0 300 N
+P 2 2 0 0  -100 -200  -100 -300 N
+P 2 2 0 0  0 200  0 300 N
+A 0 -100 200 -1799 -1 0 1 0 N -200 -100 200 -100
+A 0 100 200 1 1799 0 1 0 N 200 100 -200 100
+P 2 0 1 0  200 100  200 -100 N
+P 3 0 1 0  -200 100  -200 -100  -200 -100 N
+A 0 -225 103 142 1659 1 1 10 N 100 -200 -100 -200
+P 2 1 1 0  -200 0  -125 0 N
+P 2 1 1 6  -75 0  -125 0 N
+P 2 1 1 6  -25 0  25 0 N
+P 2 1 1 6  75 0  125 0 N
+P 3 1 1 10  -100 200  110 200  110 200 N
+X A 6 0 400 100 D 40 40 1 1 O
+X G 7 -300 0 100 R 40 40 1 1 I
+X K 8 -100 -400 100 U 40 40 1 1 B
+A 0 -225 103 142 1659 2 1 10 N 100 -200 -100 -200
+P 2 2 1 0  -200 0  -125 0 N
+P 2 2 1 6  -75 0  -125 0 N
+P 2 2 1 6  -25 0  25 0 N
+P 2 2 1 6  75 0  125 0 N
+P 3 2 1 10  -100 200  110 200  110 200 N
+X A 1 0 400 100 D 40 40 2 1 O
+X G 2 -300 0 100 R 40 40 2 1 I
+X K 3 -100 -400 100 U 40 40 2 1 B
+A -50 -275 55 265 1534 3 1 0 N 0 -250 -100 -250
+A 50 -275 55 265 1534 3 1 0 N 100 -250 0 -250
+X F1 4 -100 -450 200 U 40 40 3 1 W
+X F1 5 100 -450 200 U 40 40 3 1 W
+X F2 9 0 -450 200 U 40 40 3 1 W
+ENDDRAW
+ENDDEF
+#
+# GND
+#
+DEF ~GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 0 30 H I C CNN
+F1 "GND" 0 -70 30 H I C CNN
+DRAW
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+X GND 1 0 0 0 U 30 30 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 270 30 H I C CNN
+F1 "PWR_FLAG" 0 230 30 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 3 0 1 0  0 0  0 100  0 100 N
+P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+ENDDRAW
+ENDDEF
+#
+# R
+#
+DEF R R 0 0 N Y 1 F N
+F0 "R" 80 0 50 V V C CNN
+F1 "R" 0 0 50 V V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+ R?-*
+ SM1206
+$ENDFPLIST
+DRAW
+S -40 150 40 -150 0 1 12 N
+X ~ 1 0 250 100 D 60 60 1 1 P
+X ~ 2 0 -250 100 U 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
--- a/demos/ecc83/ecc83-pp_v2.sch
+++ b/demos/ecc83/ecc83-pp_v2.sch
@ -1,259 +1,283 @@
-EESchema Schematic File Version 2
-LIBS:power,device,valves,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib
-EELAYER 23  0
-EELAYER END
-$Descr A4 11700 8267
-Sheet 1 1
-Title "ECC Push-Pull"
-Date "11 dec 2006"
-Rev "0.1"
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-Wire Wire Line
-	6050 4450 6150 4450
-Wire Wire Line
-	5750 3850 5750 4050
-Connection ~ 4450 4500
-Wire Wire Line
-	4450 5400 4450 4450
-Wire Wire Line
-	4450 4450 4650 4450
-Wire Wire Line
-	9850 6350 9950 6350
-Wire Wire Line
-	9950 6350 9950 6150
-Wire Wire Line
-	4150 5300 4150 5000
-Wire Wire Line
-	6950 5150 6950 5000
-Wire Wire Line
-	4150 4800 4450 4800
-Connection ~ 4450 4800
-Wire Wire Line
-	6950 4350 6950 4050
-Connection ~ 6950 4250
-Wire Wire Line
-	4850 4850 4850 5400
-Wire Wire Line
-	6300 3900 6300 4000
-Wire Wire Line
-	6950 3850 5750 3850
-Connection ~ 6700 3850
-Wire Wire Line
-	6700 4250 6950 4250
-Wire Wire Line
-	6150 4450 6150 3900
-Connection ~ 6150 3900
-Wire Wire Line
-	6300 4500 6300 4900
-Connection ~ 6300 4800
-Wire Wire Line
-	6950 4800 6700 4800
-Wire Wire Line
-	6700 4800 6700 5400
-Wire Wire Line
-	10050 6150 10050 6350
-Wire Wire Line
-	10050 6250 9850 6250
-Connection ~ 10050 6250
-Wire Wire Line
-	4100 5250 4150 5250
-Connection ~ 4150 5250
-Wire Wire Line
-	9850 6250 9850 6150
-Wire Wire Line
-	6300 3900 4950 3900
-Wire Wire Line
-	4950 3900 4950 4050
-Wire Wire Line
-	5850 4850 5850 4900
-Wire Wire Line
-	5850 4900 6300 4900
-$Comp
-L ECC83 U1
-U 3 1 48B4F266
-P 9950 5700
-F 0 "U1" H 10080 6010 50  0000 C C
-F 1 "ECC81_83" H 10300 5400 50  0000 C C
-F 2 "VALVE-NOVAL_P" H 10220 5300 50  0001 C C
-	3    9950 5700
-	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 C
-F 1 "ECC83" H 5150 4100 50  0000 C C
-F 2 "VALVE-NOVAL_P" H 5220 4050 50  0001 C C
-	2    4950 4450
-	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 C
-F 1 "ECC83" H 5500 4150 50  0000 C C
-F 2 "VALVE-NOVAL_P" H 6020 4050 50  0001 C C
-	1    5750 4450
-	-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 C
-F 1 "GND" H 6950 5080 30  0001 C C
-	1    6950 5150
-	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 C
-F 1 "GND" H 6700 5830 30  0001 C C
-	1    6700 5900
-	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 C
-F 1 "GND" H 4850 5830 30  0001 C C
-	1    4850 5900
-	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 C
-F 1 "GND" H 4450 5830 30  0001 C C
-	1    4450 5900
-	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 C
-F 1 "PWR_FLAG" H 4100 5480 30  0000 C C
-	1    4100 5250
-	0    -1   -1   0   
-$EndComp
-$Comp
-L CONN_2 P4
-U 1 1 456A8ACC
-P 9950 6700
-F 0 "P4" V 9900 6700 40  0000 C C
-F 1 "CONN_2" V 10000 6700 40  0000 C C
-	1    9950 6700
-	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 C
-F 1 "10uF" H 6450 4150 50  0000 L C
-	1    6700 4050
-	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 C
-F 1 "GND" H 4150 5230 30  0001 C C
-	1    4150 5300
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR07
-U 1 1 4549F4B3
-P 6950 4350
-F 0 "#PWR07" H 6950 4350 30  0001 C C
-F 1 "GND" H 6950 4280 30  0001 C C
-	1    6950 4350
-	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 C
-F 1 "POWER" V 7350 3950 40  0000 C C
-	1    7300 3950
-	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 C
-F 1 "OUT" V 7350 4900 40  0000 C C
-	1    7300 4900
-	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 C
-F 1 "IN" V 3850 4900 40  0000 C C
-	1    3800 4900
-	-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 C
-F 1 "680nF" H 6550 4700 50  0000 L C
-	1    6500 4800
-	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 C
-F 1 "100K" V 6700 5650 50  0000 C C
-	1    6700 5650
-	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 C
-F 1 "47K" V 4450 5650 50  0000 C C
-	1    4450 5650
-	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 C
-F 1 "1.5K" V 4850 5650 50  0000 C C
-	1    4850 5650
-	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 C
-F 1 "1.5K" V 6300 4250 50  0000 C C
-	1    6300 4250
-	1    0    0    -1  
-$EndComp
-$EndSCHEMATC
+EESchema Schematic File Version 2  date 04/12/2010 17:36:18
+LIBS:power
+LIBS:device
+LIBS:valves
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:special
+LIBS:microcontrollers
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:contrib
+EELAYER 23  0
+EELAYER END
+$Descr A4 11700 8267
+Sheet 1 1
+Title "ECC Push-Pull"
+Date "11 dec 2006"
+Rev "0.1"
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+Wire Wire Line
+	6050 4450 6150 4450
+Wire Wire Line
+	5750 3850 5750 4050
+Connection ~ 4450 4500
+Wire Wire Line
+	4450 5400 4450 4450
+Wire Wire Line
+	4450 4450 4650 4450
+Wire Wire Line
+	9850 6350 9950 6350
+Wire Wire Line
+	9950 6350 9950 6150
+Wire Wire Line
+	4150 5300 4150 5000
+Wire Wire Line
+	6950 5150 6950 5000
+Wire Wire Line
+	4150 4800 4450 4800
+Connection ~ 4450 4800
+Wire Wire Line
+	6950 4350 6950 4050
+Connection ~ 6950 4250
+Wire Wire Line
+	4850 4850 4850 5400
+Wire Wire Line
+	6300 3900 6300 4000
+Wire Wire Line
+	6950 3850 5750 3850
+Connection ~ 6700 3850
+Wire Wire Line
+	6700 4250 6950 4250
+Wire Wire Line
+	6150 4450 6150 3900
+Connection ~ 6150 3900
+Wire Wire Line
+	6300 4500 6300 4900
+Connection ~ 6300 4800
+Wire Wire Line
+	6950 4800 6700 4800
+Wire Wire Line
+	6700 4800 6700 5400
+Wire Wire Line
+	10050 6150 10050 6350
+Wire Wire Line
+	10050 6250 9850 6250
+Connection ~ 10050 6250
+Wire Wire Line
+	4100 5250 4150 5250
+Connection ~ 4150 5250
+Wire Wire Line
+	9850 6250 9850 6150
+Wire Wire Line
+	6300 3900 4950 3900
+Wire Wire Line
+	4950 3900 4950 4050
+Wire Wire Line
+	5850 4850 5850 4900
+Wire Wire Line
+	5850 4900 6300 4900
+$Comp
+L ECC83 U1
+U 3 1 48B4F266
+P 9950 5700
+F 0 "U1" H 10080 6010 50  0000 C CNN
+F 1 "ECC81_83" H 10300 5400 50  0000 C CNN
+F 2 "VALVE-NOVAL_P" H 10220 5300 50  0001 C CNN
+	3    9950 5700
+	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
+	2    4950 4450
+	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
+	1    5750 4450
+	-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
+	1    6950 5150
+	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
+	1    6700 5900
+	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
+	1    4850 5900
+	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
+	1    4450 5900
+	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
+	1    4100 5250
+	0    -1   -1   0   
+$EndComp
+$Comp
+L CONN_2 P4
+U 1 1 456A8ACC
+P 9950 6700
+F 0 "P4" V 9900 6700 40  0000 C CNN
+F 1 "CONN_2" V 10000 6700 40  0000 C CNN
+	1    9950 6700
+	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
+	1    6700 4050
+	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
+	1    4150 5300
+	1    0    0    -1  
+$EndComp
+$Comp
+L GND #PWR07
+U 1 1 4549F4B3
+P 6950 4350
+F 0 "#PWR07" H 6950 4350 30  0001 C CNN
+F 1 "GND" H 6950 4280 30  0001 C CNN
+	1    6950 4350
+	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
+	1    7300 3950
+	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
+	1    7300 4900
+	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
+	1    3800 4900
+	-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
+	1    6500 4800
+	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
+	1    6700 5650
+	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
+	1    4450 5650
+	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
+	1    4850 5650
+	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
+	1    6300 4250
+	1    0    0    -1  
+$EndComp
+$EndSCHEMATC
--- a/demos/interf_u/interf_u-cache.lib
+++ b/demos/interf_u/interf_u-cache.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 28/04/2010 09:06:34
+EESchema-LIBRARY Version 2.3  Date: 19/08/2010 20:44:23
 #
 # 4003APG120
 #
--- a/demos/interf_u/interf_u.brd
+++ b/demos/interf_u/interf_u.brd
--- a/demos/interf_u/interf_u.net
+++ b/demos/interf_u/interf_u.net
--- a/demos/interf_u/interf_u.pro
+++ b/demos/interf_u/interf_u.pro
@ -1,96 +1,85 @@
-<<<<<<< TREE
-update=31/08/2010 17:56:15
-=======
-update=22/07/2010 13:46:39
->>>>>>> MERGE-SOURCE
-version=1
-last_client=pcbnew
-[common]
-NetDir=
-[general]
-version=1
-RootSch=interf_u.sch
-BoardNm=interf_u.brd
-[cvpcb]
-version=1
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetType=0
-[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
-SimCmd=
-UseNetN=0
-LabSize=60
-PrintMonochrome=1
-ShowSheetReferenceAndTitleBlock=1
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=conn
-LibName4=linear
-LibName5=regul
-LibName6=74xx
-LibName7=cmos4000
-LibName8=adc-dac
-LibName9=memory
-LibName10=xilinx
-LibName11=special
-LibName12=image
-[pcbnew]
-version=1
-PadDrlX=430
-PadDimH=550
-PadDimV=550
-BoardThickness=630
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=50
-TxtLar=170
-MSegLar=150
-LastNetListRead=interf_u.net
-[pcbnew/libraries]
-LibDir=
-LibName1=connect
-LibName2=discret
-LibName3=pin_array
-LibName4=sockets
-LibName5=divers
-LibName6=libcms
-LibName7=display
+update=ven. 03 déc. 2010 20:28:58 CET
+version=1
+last_client=pcbnew
+[common]
+NetDir=
+[general]
+version=1
+RootSch=interf_u.sch
+BoardNm=interf_u.brd
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
+[eeschema]
+version=1
+LibDir=F:\\kicad\\share\\library
+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
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=conn
+LibName4=linear
+LibName5=regul
+LibName6=74xx
+LibName7=cmos4000
+LibName8=adc-dac
+LibName9=memory
+LibName10=xilinx
+LibName11=special
+[pcbnew]
+version=1
+PadDrlX=0
+PadDimH=1500
+PadDimV=2500
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+VEgarde=100
+DrawLar=150
+EdgeLar=50
+TxtLar=170
+MSegLar=400
+LastNetListRead=interf_u.net
+[pcbnew/libraries]
+LibDir=F:\\kicad\\share\\modules\\packages3d
+LibName1=connect
+LibName2=image
+LibName3=discret
+LibName4=pin_array
+LibName5=sockets
+LibName6=divers
+LibName7=libcms
+LibName8=display
--- a/demos/interf_u/interf_u.sch
+++ b/demos/interf_u/interf_u.sch
@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date 30/06/2010 12:55:05
+EESchema Schematic File Version 2  date 19/08/2010 20:44:23
 LIBS:power
 LIBS:device
 LIBS:conn
@ -17,7 +17,7 @@ EELAYER END
 $Descr A3 16535 11700
 Sheet 1 1
 Title "INTERFACE UNIVERSEL"
-Date "30 jun 2010"
+Date "19 aug 2010"
 Rev "2B"
 Comp "KICAD"
 Comment1 "Comment 1"
@ -25,15 +25,6 @@ Comment2 "Comment 2"
 Comment3 "Comment 3"
 Comment4 "Comment 4"
 $EndDescr
-$Comp
-L LOGO #G?
-U 1 1 4C2B218C
-P 11350 10550
-F 0 "#G?" H 11350 10130 60  0001 C CNN
-F 1 "LOGO" H 11350 10970 60  0001 C CNN
-	1    11350 10550
-	1    0    0    -1  
-$EndComp
 Wire Bus Line
 	3900 2450 3850 2450
 Wire Wire Line
@ -1104,9 +1095,9 @@ Text Label 9700 4700 0    60   ~ 0
 MA4
 Text Label 9700 4600 0    60   ~ 0
 MA15
-Text Label 13050 1050 0    60   ~ 0
+Text Label 13000 1050 0    60   ~ 0
 LED1
-Text Label 13050 1500 0    60   ~ 0
+Text Label 13000 1500 0    60   ~ 0
 LED2
 Text Label 9700 4200 0    60   ~ 0
 MA5
--- a/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
+++ b/demos/kit-dev-coldfire-xilinx_5213/in_out_conn.sch
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.dcm
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.dcm
@ -0,0 +1,105 @@
+EESchema-DOCLIB  Version 2.0  05/07/2009 12:03:24
+#
+$CMP 74LS125
+D Quad buffer 3 State out
+K TTL buffer 3State
+$ENDCMP
+#
+$CMP C
+D Condensateur non polarise
+$ENDCMP
+#
+$CMP CONN_1
+D 1 pin
+K CONN
+$ENDCMP
+#
+$CMP CONN_2
+D Symbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP CONN_2X2
+D Symbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP CONN_3
+D Symbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP CONN_4X2
+D Symbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP CONN_6
+D ymbole general de connecteur
+K CONN
+$ENDCMP
+#
+$CMP CP
+D Condensateur polarise
+$ENDCMP
+#
+$CMP DB9
+K CONN
+$ENDCMP
+#
+$CMP DIODE
+D Diode simple
+K DEV DIODE
+$ENDCMP
+#
+$CMP LED
+K LED
+$ENDCMP
+#
+$CMP LT1129_QPACK
+D LowDrop Linear Regulator (QPACK 5 pins)
+K REGUL POWER
+F linear-tec/lt1129.pdf
+$ENDCMP
+#
+$CMP MAX232
+D Driver de Ligne RS232
+K RS232
+F maxim/MAX220-MAX249.pdf
+$ENDCMP
+#
+$CMP MC34064P
+D Undervoltage sensing circuit (TP-226AA package)
+F onsemi/mc34064.pdf
+$ENDCMP
+#
+$CMP MCF5213-LQFP100
+D Coldfire with SRAM and Flash Eprom - LQFP100 package
+K COLDFIRE
+$ENDCMP
+#
+$CMP PCA82C251
+D CAN Transceiver
+K BUS CAN
+$ENDCMP
+#
+$CMP PNP
+F transistors/bipolar/*.*
+$ENDCMP
+#
+$CMP R
+D Resistance
+K R DEV
+$ENDCMP
+#
+$CMP SW_PUSH
+D Push Button
+K Switch
+$ENDCMP
+#
+$CMP SWITCH_INV
+D Switch inverseur
+K switch
+$ENDCMP
+#
+#End Doc Library
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.brd
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.brd
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.csv
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.csv
@ -1,50 +0,0 @@
-              0;  1;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R9
-          100nF; 43;         SM0805; AVX;08055C104JAT2A;http://octopart.com/08055c104jat2a-avx-4795;    ;    ;    ;    ;    ;C61, C4, C5, C6, C7, C8, C9, C10, C11, C12, C14, C15, C18, C21, C22, C23, C24, C25, C26, C27, C28, C30, C31, C32, C33, C34, C35, C36, C41, C43, C44, C45, C46, C51, C52, C53, C54, C55, C56, C57, C58, C59, C60
-          100uF;  1;      SM1206POL;    ;    ;    ;    ;    ;    ;    ;    ;C17
-            10K; 12;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R35, R4, R5, R6, R8, R10, R11, R13, R23, R26, R30, R34
-            10M;  1;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R1
-           10pF;  2;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;C2, C1
-           10uF;  2;           C2V8;    ;    ;    ;    ;    ;    ;    ;    ;C38, C16
-           10uH;  2;         SM1206;    ;    ;    ;    ;    ;    ;    ;    ;L2, L1
-             1K;  4;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R63, R7, R36, R62
-         1N4004;  1;             D5;    ;    ;    ;    ;    ;    ;    ;    ;D7
-            1nF;  2;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;C20, C3
-            20K;  1;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R12
-             22;  1;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R46
-          220uF;  1;           C2V8;    ;    ;    ;    ;    ;    ;    ;    ;C40
-            270;  7;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R53, R14, R22, R28, R31, R32, R33
-            3,3;  1;             R4;    ;    ;    ;    ;    ;    ;    ;    ;R64
-           3906;  1;       SOT23EBC;    ;    ;    ;    ;    ;    ;    ;    ;Q1
-           4,7K; 14;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R50, R2, R15, R16, R17, R18, R19, R20, R21, R25, R45, R47, R48, R49
-            4K7;  1;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R57
-             62;  1;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;R38
-      74AHC1G14;  1;         SOT353;    ;    ;    ;    ;    ;    ;    ;    ;U2
-        74HC125;  1;          SO14E;    ;    ;    ;    ;    ;    ;    ;    ;U4
-           8MHz;  1;        HC-18UH;    ;    ;    ;    ;    ;    ;    ;    ;Y1
-          BAT54;  2;       ST23AK#1;    ;    ;    ;    ;    ;    ;    ;    ;D3, D1
-           BEAD;  1;         SM1206;    ;    ;    ;    ;    ;    ;    ;    ;FB1
-         CONN_1;  6;         PINTST;    ;    ;    ;    ;    ;    ;    ;    ;VREF1, ALLPST1, CLKOUT1, GND1, RS1, TA-1
-      CONN_13X2;  1; pin_array_13x2;    ;    ;    ;    ;    ;    ;    ;    ;BDM_PORT1
-         CONN_2;  1;       BORNIER2;    ;    ;    ;    ;    ;    ;    ;    ;TB1
-      CONN_20X2;  1; PIN_ARRAY_20X2;    ;    ;    ;    ;    ;    ;    ;    ;P4
-       CONN_2X2;  2;  PIN_ARRAY_2X2;    ;    ;    ;    ;    ;    ;    ;    ;P3, CAN_EN1
-         CONN_3;  3;  PIN_ARRAY_3X1;    ;    ;    ;    ;    ;    ;    ;    ;COM_SEL3, COM_SEL1, COM_SEL2
-      CONN_30X2;  1; PIN_ARRAY_30X2;    ;    ;    ;    ;    ;    ;    ;    ;MCU_PORT1
-       CONN_4X2;  4;  pin_array_4x2;    ;    ;    ;    ;    ;    ;    ;    ;UART_EN2, PULUPEN1, UART_EN0, UART_EN1
-         CONN_6;  1;  PIN_ARRAY-6X1;    ;    ;    ;    ;    ;    ;    ;    ;P1
-            DB9;  3;          DB9FC;    ;    ;    ;    ;    ;    ;    ;    ;UARTCAN2, UARTCAN0, UARTCAN1
-         DS1818;  1;    TO92-INVERT;    ;    ;    ;    ;    ;    ;    ;    ;LV1
-           FUSE;  1;        FSUPCMS;    ;    ;    ;    ;    ;    ;    ;    ;F1
-        JACK_2P;  1;      JACK_ALIM;    ;    ;    ;    ;    ;    ;    ;    ;J1
-         JUMPER;  8;  PIN_ARRAY_2X1;    ;    ;    ;    ;    ;    ;    ;    ;VX_EN1, BDM_EN1, CAN_TERM1, CLK0, CLK1, CT1, LED_EN1, VDDA1
-            LED;  7;      SM1206POL;    ;    ;    ;    ;    ;    ;    ;    ;LED5, D8, D9, LED1, LED2, LED3, LED4
-     LED_RESET1;  1;      SM1206POL;    ;    ;    ;    ;    ;    ;    ;    ;RED1
-   LT1129_QPACK;  1;          DPAK5;    ;    ;    ;    ;    ;    ;    ;    ;VR1
-         MAX202;  3;          SO16E;    ;    ;    ;    ;    ;    ;    ;    ;U8, U3, U5
-MCF5213-LQFP100;  1;        VQFP100;Freescale;MC9S12UF32PUE;http://octopart.com/mc9s12uf32pue-freescale+semiconductor-481400;    ;    ;    ;    ;    ;U1
-      PCA82C251;  1;           SO8E;    ;    ;    ;    ;    ;    ;    ;    ;U7
-              R;  2;         SM0805;    ;    ;    ;    ;    ;    ;    ;    ;RCAN2, RCAN1
-            RED;  1;      SM1206POL;    ;    ;    ;    ;    ;    ;    ;    ;LEDABRT1
-        SW_PUSH;  4;  SW_PUSH_SMALL;    ;    ;    ;    ;    ;    ;    ;    ;SW2, ABRT_SW1, RST_SW1, SW1
-     SWITCH_INV;  1;        SW_SPDT;    ;    ;    ;    ;    ;    ;    ;    ;SW_ONOFF1
-  XCR3256-TQ144;  1;        TQFP144;    ;    ;    ;    ;    ;    ;    ;    ;U9
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.lst
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.lst
@ -1,333 +0,0 @@
-eeschema (20100316 SVN-R2464)-final  >> Creation date: Wed 17 Mar 2010 09:34:42 PM MDT
-
-#Cmp ( order = Reference )
-| ABRT_SW1   SW_PUSH     ; SW_PUSH_SMALL
-| ALLPST1    CONN_1      ; PINTST      
-| BDM_EN1    JUMPER      ; PIN_ARRAY_2X1
-| BDM_PORT1  CONN_13X2   ; pin_array_13x2
-| C1         10pF        ; SM0805      
-| C2         10pF        ; SM0805      
-| C3         1nF         ; SM0805      
-| C4         100nF       ; SM0805      
-| C5         100nF       ; SM0805      
-| C6         100nF       ; SM0805      
-| C7         100nF       ; SM0805      
-| C8         100nF       ; SM0805      
-| C9         100nF       ; SM0805      
-| C10        100nF       ; SM0805      
-| C11        100nF       ; SM0805      
-| C12        100nF       ; SM0805      
-| C14        100nF       ; SM0805      
-| C15        100nF       ; SM0805      
-| C16        10uF        ; SM1206POL   
-| C17        100uF       ; SM1206POL   
-| C18        100nF       ; SM0805      
-| C20        1nF         ; SM0805      
-| C21        100nF       ; SM0805      
-| C22        100nF       ; SM0805      
-| C23        100nF       ; SM0805      
-| C24        100nF       ; SM0805      
-| C25        100nF       ; SM0805      
-| C26        100nF       ; SM0805      
-| C27        100nF       ; SM0805      
-| C28        100nF       ; SM0805      
-| C30        100nF       ; SM0805      
-| C31        100nF       ; SM0805      
-| C32        100nF       ; SM0805      
-| C33        100nF       ; SM0805      
-| C34        100nF       ; SM0805      
-| C35        100nF       ; SM0805      
-| C36        100nF       ; SM0805      
-| C38        10uF        ; C2V8        
-| C40        220uF       ; C2V8        
-| C41        100nF       ; SM0805      
-| C43        100nF       ; SM0805      
-| C44        100nF       ; SM0805      
-| C45        100nF       ; SM0805      
-| C46        100nF       ; SM0805      
-| C51        100nF       ; SM0805      
-| C52        100nF       ; SM0805      
-| C53        100nF       ; SM0805      
-| C54        100nF       ; SM0805      
-| C55        100nF       ; SM0805      
-| C56        100nF       ; SM0805      
-| C57        100nF       ; SM0805      
-| C58        100nF       ; SM0805      
-| C59        100nF       ; SM0805      
-| C60        100nF       ; SM0805      
-| C61        100nF       ; SM0805      
-| CAN_EN1    CONN_2X2    ; PIN_ARRAY_2X2
-| CAN_TERM1  JUMPER      ; PIN_ARRAY_2X1
-| CLK0       JUMPER      ; PIN_ARRAY_2X1
-| CLK1       JUMPER      ; PIN_ARRAY_2X1
-| CLKOUT1    CONN_1      ; PINTST      
-| COM_SEL1   CONN_3      ; PIN_ARRAY_3X1
-| COM_SEL2   CONN_3      ; PIN_ARRAY_3X1
-| COM_SEL3   CONN_3      ; PIN_ARRAY_3X1
-| CT1        JUMPER      ; PIN_ARRAY_2X1
-| D1         BAT54       ; ST23AK#1    
-| D3         BAT54       ; ST23AK#1    
-| D7         1N4004      ; D5          
-| D8         LED         ; SM1206POL   
-| D9         LED         ; SM1206POL   
-| F1         FUSE        ; FSUPCMS     
-| FB1        BEAD        ; SM1206      
-| GND1       CONN_1      ; PINTST      
-| J1         JACK_2P     ; JACK_ALIM   
-| L1         10uH        ; SM1206      
-| L2         10uH        ; SM1206      
-| LED1       LED         ; SM1206POL   
-| LED2       LED         ; SM1206POL   
-| LED3       LED         ; SM1206POL   
-| LED4       LED         ; SM1206POL   
-| LED5       LED         ; SM1206POL   
-| LED_EN1    JUMPER      ; PIN_ARRAY_2X1
-| LEDABRT1   RED         ; SM1206POL   
-| LV1        DS1818      ; TO92-INVERT 
-| MCU_PORT1  CONN_30X2   ; PIN_ARRAY_30X2
-| P1         CONN_6      ; PIN_ARRAY-6X1
-| P3         CONN_2X2    ; PIN_ARRAY_2X2
-| P4         CONN_20X2   ; PIN_ARRAY_20X2
-| PULUPEN1   CONN_4X2    ; pin_array_4x2
-| Q1         3906        ; SOT23EBC    
-| R1         10M         ; SM0805      
-| R2         4,7K        ; SM0805      
-| R4         10K         ; SM0805      
-| R5         10K         ; SM0805      
-| R6         10K         ; SM0805      
-| R7         1K          ; SM0805      
-| R8         10K         ; SM0805      
-| R9         0           ; SM0805      
-| R10        10K         ; SM0805      
-| R11        10K         ; SM0805      
-| R12        20K         ; SM0805      
-| R13        10K         ; SM0805      
-| R14        270         ; SM0805      
-| R15        4,7K        ; SM0805      
-| R16        4,7K        ; SM0805      
-| R17        4,7K        ; SM0805      
-| R18        4,7K        ; SM0805      
-| R19        4,7K        ; SM0805      
-| R20        4,7K        ; SM0805      
-| R21        4,7K        ; SM0805      
-| R22        270         ; SM0805      
-| R23        10K         ; SM0805      
-| R25        4,7K        ; SM0805      
-| R26        10K         ; SM0805      
-| R28        270         ; SM0805      
-| R30        10K         ; SM0805      
-| R31        270         ; SM0805      
-| R32        270         ; SM0805      
-| R33        270         ; SM0805      
-| R34        10K         ; SM0805      
-| R35        10K         ; SM0805      
-| R36        1K          ; SM0805      
-| R38        62          ; SM0805      
-| R45        4,7K        ; SM0805      
-| R46        22          ; SM0805      
-| R47        4,7K        ; SM0805      
-| R48        4,7K        ; SM0805      
-| R49        4,7K        ; SM0805      
-| R50        4,7K        ; SM0805      
-| R53        270         ; SM0805      
-| R57        4K7         ; SM0805      
-| R62        1K          ; SM0805      
-| R63        1K          ; SM0805      
-| R64        3,3         ; R4          
-| RCAN1      R           ; SM0805      
-| RCAN2      R           ; SM0805      
-| RED1       LED_RESET1  ; SM1206POL   
-| RS1        CONN_1      ; PINTST      
-| RST_SW1    SW_PUSH     ; SW_PUSH_SMALL
-| SW1        SW_PUSH     ; SW_PUSH_SMALL
-| SW2        SW_PUSH     ; SW_PUSH_SMALL
-| SW_ONOFF1  SWITCH_INV  ; SW_SPDT     
-| TA-1       CONN_1      ; PINTST      
-| TB1        CONN_2      ; BORNIER2    
-| U1         MCF5213-LQFP100; VQFP100     
-| U2         74AHC1G14   ; SOT353      
-| U3         MAX202      ; SO16E       
-| U4         74HC125     ; SO14E       
-| U5         MAX202      ; SO16E       
-| U7         PCA82C251   ; SO8E        
-| U8         MAX202      ; SO16E       
-| U9         XCR3256-TQ144; TQFP144     
-| UART_EN0   CONN_4X2    ; pin_array_4x2
-| UART_EN1   CONN_4X2    ; pin_array_4x2
-| UART_EN2   CONN_4X2    ; pin_array_4x2
-| UARTCAN0   DB9         ; DB9FC       
-| UARTCAN1   DB9         ; DB9FC       
-| UARTCAN2   DB9         ; DB9FC       
-| VDDA1      JUMPER      ; PIN_ARRAY_2X1
-| VR1        LT1129_QPACK; DPAK5       
-| VREF1      CONN_1      ; PINTST      
-| VX_EN1     JUMPER      ; PIN_ARRAY_2X1
-| Y1         8MHz        ; HC-18UH     
-#End Cmp
-
-#Cmp ( order = Value )
-| 0            R9        ; SM0805      
-| 100nF        C4        ; SM0805      
-| 100nF        C5        ; SM0805      
-| 100nF        C6        ; SM0805      
-| 100nF        C7        ; SM0805      
-| 100nF        C8        ; SM0805      
-| 100nF        C9        ; SM0805      
-| 100nF        C10       ; SM0805      
-| 100nF        C11       ; SM0805      
-| 100nF        C12       ; SM0805      
-| 100nF        C14       ; SM0805      
-| 100nF        C15       ; SM0805      
-| 100nF        C18       ; SM0805      
-| 100nF        C21       ; SM0805      
-| 100nF        C22       ; SM0805      
-| 100nF        C23       ; SM0805      
-| 100nF        C24       ; SM0805      
-| 100nF        C25       ; SM0805      
-| 100nF        C26       ; SM0805      
-| 100nF        C27       ; SM0805      
-| 100nF        C28       ; SM0805      
-| 100nF        C30       ; SM0805      
-| 100nF        C31       ; SM0805      
-| 100nF        C32       ; SM0805      
-| 100nF        C33       ; SM0805      
-| 100nF        C34       ; SM0805      
-| 100nF        C35       ; SM0805      
-| 100nF        C36       ; SM0805      
-| 100nF        C41       ; SM0805      
-| 100nF        C43       ; SM0805      
-| 100nF        C44       ; SM0805      
-| 100nF        C45       ; SM0805      
-| 100nF        C46       ; SM0805      
-| 100nF        C51       ; SM0805      
-| 100nF        C52       ; SM0805      
-| 100nF        C53       ; SM0805      
-| 100nF        C54       ; SM0805      
-| 100nF        C55       ; SM0805      
-| 100nF        C56       ; SM0805      
-| 100nF        C57       ; SM0805      
-| 100nF        C58       ; SM0805      
-| 100nF        C59       ; SM0805      
-| 100nF        C60       ; SM0805      
-| 100nF        C61       ; SM0805      
-| 100uF        C17       ; SM1206POL   
-| 10K          R4        ; SM0805      
-| 10K          R5        ; SM0805      
-| 10K          R6        ; SM0805      
-| 10K          R8        ; SM0805      
-| 10K          R10       ; SM0805      
-| 10K          R11       ; SM0805      
-| 10K          R13       ; SM0805      
-| 10K          R23       ; SM0805      
-| 10K          R26       ; SM0805      
-| 10K          R30       ; SM0805      
-| 10K          R34       ; SM0805      
-| 10K          R35       ; SM0805      
-| 10M          R1        ; SM0805      
-| 10pF         C1        ; SM0805      
-| 10pF         C2        ; SM0805      
-| 10uF         C16       ; SM1206POL   
-| 10uF         C38       ; C2V8        
-| 10uH         L1        ; SM1206      
-| 10uH         L2        ; SM1206      
-| 1K           R7        ; SM0805      
-| 1K           R36       ; SM0805      
-| 1K           R62       ; SM0805      
-| 1K           R63       ; SM0805      
-| 1N4004       D7        ; D5          
-| 1nF          C3        ; SM0805      
-| 1nF          C20       ; SM0805      
-| 20K          R12       ; SM0805      
-| 22           R46       ; SM0805      
-| 220uF        C40       ; C2V8        
-| 270          R14       ; SM0805      
-| 270          R22       ; SM0805      
-| 270          R28       ; SM0805      
-| 270          R31       ; SM0805      
-| 270          R32       ; SM0805      
-| 270          R33       ; SM0805      
-| 270          R53       ; SM0805      
-| 3,3          R64       ; R4          
-| 3906         Q1        ; SOT23EBC    
-| 4,7K         R2        ; SM0805      
-| 4,7K         R15       ; SM0805      
-| 4,7K         R16       ; SM0805      
-| 4,7K         R17       ; SM0805      
-| 4,7K         R18       ; SM0805      
-| 4,7K         R19       ; SM0805      
-| 4,7K         R20       ; SM0805      
-| 4,7K         R21       ; SM0805      
-| 4,7K         R25       ; SM0805      
-| 4,7K         R45       ; SM0805      
-| 4,7K         R47       ; SM0805      
-| 4,7K         R48       ; SM0805      
-| 4,7K         R49       ; SM0805      
-| 4,7K         R50       ; SM0805      
-| 4K7          R57       ; SM0805      
-| 62           R38       ; SM0805      
-| 74AHC1G14    U2        ; SOT353      
-| 74HC125      U4        ; SO14E       
-| 8MHz         Y1        ; HC-18UH     
-| BAT54        D1        ; ST23AK#1    
-| BAT54        D3        ; ST23AK#1    
-| BEAD         FB1       ; SM1206      
-| CONN_1       ALLPST1   ; PINTST      
-| CONN_1       CLKOUT1   ; PINTST      
-| CONN_1       GND1      ; PINTST      
-| CONN_1       RS1       ; PINTST      
-| CONN_1       TA-1      ; PINTST      
-| CONN_1       VREF1     ; PINTST      
-| CONN_13X2    BDM_PORT1 ; pin_array_13x2
-| CONN_2       TB1       ; BORNIER2    
-| CONN_20X2    P4        ; PIN_ARRAY_20X2
-| CONN_2X2     CAN_EN1   ; PIN_ARRAY_2X2
-| CONN_2X2     P3        ; PIN_ARRAY_2X2
-| CONN_3       COM_SEL1  ; PIN_ARRAY_3X1
-| CONN_3       COM_SEL2  ; PIN_ARRAY_3X1
-| CONN_3       COM_SEL3  ; PIN_ARRAY_3X1
-| CONN_30X2    MCU_PORT1 ; PIN_ARRAY_30X2
-| CONN_4X2     PULUPEN1  ; pin_array_4x2
-| CONN_4X2     UART_EN0  ; pin_array_4x2
-| CONN_4X2     UART_EN1  ; pin_array_4x2
-| CONN_4X2     UART_EN2  ; pin_array_4x2
-| CONN_6       P1        ; PIN_ARRAY-6X1
-| DB9          UARTCAN0  ; DB9FC       
-| DB9          UARTCAN1  ; DB9FC       
-| DB9          UARTCAN2  ; DB9FC       
-| DS1818       LV1       ; TO92-INVERT 
-| FUSE         F1        ; FSUPCMS     
-| JACK_2P      J1        ; JACK_ALIM   
-| JUMPER       BDM_EN1   ; PIN_ARRAY_2X1
-| JUMPER       CAN_TERM1 ; PIN_ARRAY_2X1
-| JUMPER       CLK0      ; PIN_ARRAY_2X1
-| JUMPER       CLK1      ; PIN_ARRAY_2X1
-| JUMPER       CT1       ; PIN_ARRAY_2X1
-| JUMPER       LED_EN1   ; PIN_ARRAY_2X1
-| JUMPER       VDDA1     ; PIN_ARRAY_2X1
-| JUMPER       VX_EN1    ; PIN_ARRAY_2X1
-| LED          D8        ; SM1206POL   
-| LED          D9        ; SM1206POL   
-| LED          LED1      ; SM1206POL   
-| LED          LED2      ; SM1206POL   
-| LED          LED3      ; SM1206POL   
-| LED          LED4      ; SM1206POL   
-| LED          LED5      ; SM1206POL   
-| LED_RESET1   RED1      ; SM1206POL   
-| LT1129_QPACK VR1       ; DPAK5       
-| MAX202       U3        ; SO16E       
-| MAX202       U5        ; SO16E       
-| MAX202       U8        ; SO16E       
-| MCF5213-LQFP100 U1        ; VQFP100     
-| PCA82C251    U7        ; SO8E        
-| R            RCAN1     ; SM0805      
-| R            RCAN2     ; SM0805      
-| RED          LEDABRT1  ; SM1206POL   
-| SW_PUSH      ABRT_SW1  ; SW_PUSH_SMALL
-| SW_PUSH      RST_SW1   ; SW_PUSH_SMALL
-| SW_PUSH      SW1       ; SW_PUSH_SMALL
-| SW_PUSH      SW2       ; SW_PUSH_SMALL
-| SWITCH_INV   SW_ONOFF1 ; SW_SPDT     
-| XCR3256-TQ144 U9        ; TQFP144     
-#End Cmp
-
-#End List
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.net
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.net
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
@ -1,121 +1,115 @@
-update=29/8/2008-13:10:03
-last_client=pcbnew
-[general]
-version=1
-RootSch=kit-dev-coldfire_5213.sch
-BoardNm=kit-dev-coldfire_5213.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
-SimCmd=
-UseNetN=0
-LabSize=60
-[eeschema/libraries]
-LibName1=power
-LibName2=device
-LibName3=transistors
-LibName4=conn
-LibName5=linear
-LibName6=regul
-LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=contrib
-LibName28=valves
-[pcbnew]
-version=1
-PadDrlX=0
-PadDimH=160
-PadDimV=500
-PadForm=1
-PadMask=14745599
-ViaDiam=350
-ViaDril=150
-MViaDia=200
-MViaDrl=80
-Isol=60
-Countlayer=4
-Lpiste=300
-RouteTo=15
-RouteBo=0
-TypeVia=3
-Segm45=1
-Racc45=1
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-HPGLnum=1
-HPGdiam=15
-HPGLSpd=20
-HPGLrec=2
-HPGLorg=0
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=60
-WpenSer=10
-UserGrX=0
-UserGrY=0
-UserGrU=1
-DivGrPc=1
-TimeOut=600
-ShowRat=0
-ShowMRa=1
-[pcbnew/libraries]
-LibDir=
-LibName1=supports
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
-LibName8=valves
+update=20/06/2009 21:38:13
+last_client=pcbnew
+[general]
+version=1
+RootSch=kit-dev-coldfire_5213.sch
+BoardNm=kit-dev-coldfire_5213.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
+SimCmd=
+UseNetN=0
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=transistors
+LibName4=conn
+LibName5=linear
+LibName6=regul
+LibName7=74xx
+LibName8=cmos4000
+LibName9=adc-dac
+LibName10=memory
+LibName11=xilinx
+LibName12=special
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=contrib
+LibName28=valves
+[pcbnew]
+version=1
+PadDrlX=0
+PadDimH=160
+PadDimV=500
+ViaDiam=450
+ViaDril=150
+ViaAltD=250
+MViaDia=200
+MViaDrl=80
+Isol=60
+LayerThickness=630
+Countlayer=4
+Lpiste=220
+RouteTo=15
+RouteBo=0
+TypeVia=3
+Segm45=1
+Racc45=1
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+HPGLnum=1
+HPGdiam=15
+HPGLSpd=20
+HPGLrec=2
+HPGLorg=0
+VEgarde=100
+DrawLar=150
+EdgeLar=150
+TxtLar=120
+MSegLar=60
+WpenSer=10
+[pcbnew/libraries]
+LibDir=
+LibName1=sockets
+LibName2=dip_sockets
+LibName3=connect
+LibName4=discret
+LibName5=pin_array
+LibName6=divers
+LibName7=libcms
+LibName8=display
+LibName9=valves
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch
--- a/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.stf
+++ b/demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.stf
@ -1,162 +0,0 @@
-comp = "ABRT_SW1" module = "SW_PUSH_SMALL"
-comp = "ALLPST1" module = "PINTST"
-comp = "BDM_EN1" module = "PIN_ARRAY_2X1"
-comp = "BDM_PORT1" module = "pin_array_13x2"
-comp = "C1" module = "SM0805"
-comp = "C2" module = "SM0805"
-comp = "C3" module = "SM0805"
-comp = "C4" module = "SM0805"
-comp = "C5" module = "SM0805"
-comp = "C6" module = "SM0805"
-comp = "C7" module = "SM0805"
-comp = "C8" module = "SM0805"
-comp = "C9" module = "SM0805"
-comp = "C10" module = "SM0805"
-comp = "C11" module = "SM0805"
-comp = "C12" module = "SM0805"
-comp = "C14" module = "SM0805"
-comp = "C15" module = "SM0805"
-comp = "C16" module = "SM1206POL"
-comp = "C17" module = "SM1206POL"
-comp = "C18" module = "SM0805"
-comp = "C20" module = "SM0805"
-comp = "C21" module = "SM0805"
-comp = "C22" module = "SM0805"
-comp = "C23" module = "SM0805"
-comp = "C24" module = "SM0805"
-comp = "C25" module = "SM0805"
-comp = "C26" module = "SM0805"
-comp = "C27" module = "SM0805"
-comp = "C28" module = "SM0805"
-comp = "C30" module = "SM0805"
-comp = "C31" module = "SM0805"
-comp = "C32" module = "SM0805"
-comp = "C33" module = "SM0805"
-comp = "C34" module = "SM0805"
-comp = "C35" module = "SM0805"
-comp = "C36" module = "SM0805"
-comp = "C38" module = "C2V8"
-comp = "C40" module = "C2V8"
-comp = "C41" module = "SM0805"
-comp = "C43" module = "SM0805"
-comp = "C44" module = "SM0805"
-comp = "C45" module = "SM0805"
-comp = "C46" module = "SM0805"
-comp = "C51" module = "SM0805"
-comp = "C52" module = "SM0805"
-comp = "C53" module = "SM0805"
-comp = "C54" module = "SM0805"
-comp = "C55" module = "SM0805"
-comp = "C56" module = "SM0805"
-comp = "C57" module = "SM0805"
-comp = "C58" module = "SM0805"
-comp = "C59" module = "SM0805"
-comp = "C60" module = "SM0805"
-comp = "C61" module = "SM0805"
-comp = "CAN_EN1" module = "PIN_ARRAY_2X2"
-comp = "CAN_TERM1" module = "PIN_ARRAY_2X1"
-comp = "CLK0" module = "PIN_ARRAY_2X1"
-comp = "CLK1" module = "PIN_ARRAY_2X1"
-comp = "CLKOUT1" module = "PINTST"
-comp = "COM_SEL1" module = "PIN_ARRAY_3X1"
-comp = "COM_SEL2" module = "PIN_ARRAY_3X1"
-comp = "COM_SEL3" module = "PIN_ARRAY_3X1"
-comp = "CT1" module = "PIN_ARRAY_2X1"
-comp = "D1" module = "ST23AK#1"
-comp = "D3" module = "ST23AK#1"
-comp = "D7" module = "D5"
-comp = "D8" module = "SM1206POL"
-comp = "D9" module = "SM1206POL"
-comp = "F1" module = "FSUPCMS"
-comp = "FB1" module = "SM1206"
-comp = "GND1" module = "PINTST"
-comp = "J1" module = "JACK_ALIM"
-comp = "L1" module = "SM1206"
-comp = "L2" module = "SM1206"
-comp = "LED1" module = "SM1206POL"
-comp = "LED2" module = "SM1206POL"
-comp = "LED3" module = "SM1206POL"
-comp = "LED4" module = "SM1206POL"
-comp = "LED5" module = "SM1206POL"
-comp = "LEDABRT1" module = "SM1206POL"
-comp = "LED_EN1" module = "PIN_ARRAY_2X1"
-comp = "LV1" module = "TO92-INVERT"
-comp = "MCU_PORT1" module = "PIN_ARRAY_30X2"
-comp = "P1" module = "PIN_ARRAY-6X1"
-comp = "P3" module = "PIN_ARRAY_2X2"
-comp = "P4" module = "PIN_ARRAY_20X2"
-comp = "PULUPEN1" module = "pin_array_4x2"
-comp = "Q1" module = "SOT23EBC"
-comp = "R1" module = "SM0805"
-comp = "R2" module = "SM0805"
-comp = "R4" module = "SM0805"
-comp = "R5" module = "SM0805"
-comp = "R6" module = "SM0805"
-comp = "R7" module = "SM0805"
-comp = "R8" module = "SM0805"
-comp = "R9" module = "SM0805"
-comp = "R10" module = "SM0805"
-comp = "R11" module = "SM0805"
-comp = "R12" module = "SM0805"
-comp = "R13" module = "SM0805"
-comp = "R14" module = "SM0805"
-comp = "R15" module = "SM0805"
-comp = "R16" module = "SM0805"
-comp = "R17" module = "SM0805"
-comp = "R18" module = "SM0805"
-comp = "R19" module = "SM0805"
-comp = "R20" module = "SM0805"
-comp = "R21" module = "SM0805"
-comp = "R22" module = "SM0805"
-comp = "R23" module = "SM0805"
-comp = "R25" module = "SM0805"
-comp = "R26" module = "SM0805"
-comp = "R28" module = "SM0805"
-comp = "R30" module = "SM0805"
-comp = "R31" module = "SM0805"
-comp = "R32" module = "SM0805"
-comp = "R33" module = "SM0805"
-comp = "R34" module = "SM0805"
-comp = "R35" module = "SM0805"
-comp = "R36" module = "SM0805"
-comp = "R38" module = "SM0805"
-comp = "R45" module = "SM0805"
-comp = "R46" module = "SM0805"
-comp = "R47" module = "SM0805"
-comp = "R48" module = "SM0805"
-comp = "R49" module = "SM0805"
-comp = "R50" module = "SM0805"
-comp = "R53" module = "SM0805"
-comp = "R57" module = "SM0805"
-comp = "R62" module = "SM0805"
-comp = "R63" module = "SM0805"
-comp = "R64" module = "R4"
-comp = "RCAN1" module = "SM0805"
-comp = "RCAN2" module = "SM0805"
-comp = "RED1" module = "SM1206POL"
-comp = "RS1" module = "PINTST"
-comp = "RST_SW1" module = "SW_PUSH_SMALL"
-comp = "SW1" module = "SW_PUSH_SMALL"
-comp = "SW2" module = "SW_PUSH_SMALL"
-comp = "SW_ONOFF1" module = "SW_SPDT"
-comp = "TA-1" module = "PINTST"
-comp = "TB1" module = "BORNIER2"
-comp = "U1" module = "VQFP100"
-comp = "U2" module = "SOT353"
-comp = "U3" module = "SO16E"
-comp = "U4" module = "SO14E"
-comp = "U5" module = "SO16E"
-comp = "U7" module = "SO8E"
-comp = "U8" module = "SO16E"
-comp = "U9" module = "TQFP144"
-comp = "UARTCAN0" module = "DB9FC"
-comp = "UARTCAN1" module = "DB9FC"
-comp = "UARTCAN2" module = "DB9FC"
-comp = "UART_EN0" module = "pin_array_4x2"
-comp = "UART_EN1" module = "pin_array_4x2"
-comp = "UART_EN2" module = "pin_array_4x2"
-comp = "VDDA1" module = "PIN_ARRAY_2X1"
-comp = "VR1" module = "DPAK5"
-comp = "VREF1" module = "PINTST"
-comp = "VX_EN1" module = "PIN_ARRAY_2X1"
-comp = "Y1" module = "HC-18UH"
--- a/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
+++ b/demos/kit-dev-coldfire-xilinx_5213/xilinx.sch
--- a/demos/pic_programmer/pic_programmer-cache.lib
+++ b/demos/pic_programmer/pic_programmer-cache.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 12/06/2010 08:54:10
+EESchema-LIBRARY Version 2.3  Date: 15/10/2009 11:34:58
 #
 # 24C16
 #
@ -105,6 +105,24 @@ X ~ 2 0 -200 150 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
+# CP1
+#
+DEF CP1 C 0 10 N N 1 F N
+F0 "C" 50 100 50 H V L CNN
+F1 "CP1" 50 -100 50 H V L CNN
+$FPLIST
+ CP*
+ SM*
+$ENDFPLIST
+DRAW
+T 0 -50 100 80 0 0 0 +  Normal 0 C C
+A 0 -200 180 563 1236 0 1 15 N 100 -50 -100 -50
+P 4 0 1 15  -100 50  100 50  50 50  50 50 N
+X ~ 1 0 200 150 D 40 40 1 1 P
+X ~ 2 0 -200 180 U 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
 # DB9
 #
 DEF DB9 J 0 40 Y N 1 F N
@ -196,14 +214,14 @@ DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
 DRAW
-P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
+P 4 0 1 4  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # INDUCTOR
 #
-DEF INDUCTOR L 0 40 N N 1 F N
+DEF INDUCTOR L 0 40 N N 0 F N
 F0 "L" -50 0 40 V V C CNN
 F1 "INDUCTOR" 100 0 40 V V C CNN
 DRAW
@ -275,10 +293,11 @@ ENDDEF
 #
 # NPN
 #
-DEF NPN Q 0 0 Y Y 1 F N
-F0 "Q" 0 -150 50 H V R CNN
-F1 "NPN" 0 150 50 H V R CNN
+DEF NPN Q 0 0 Y Y 0 F N
+F0 "Q" 150 0 50 H V C CNN
+F1 "NPN" -98 150 50 H V C CNN
 DRAW
+C 50 0 0 0 1 0 N
 C 50 0 111 0 1 10 N
 P 2 0 1 0  0 0  100 100 N
 P 3 0 1 10  0 75  0 -75  0 -75 N
@ -366,10 +385,11 @@ ENDDEF
 #
 # PNP
 #
-DEF PNP Q 0 0 Y Y 1 F N
-F0 "Q" 0 -150 60 H V R CNN
-F1 "PNP" 0 150 60 H V R CNN
+DEF PNP Q 0 0 Y Y 0 F N
+F0 "Q" 150 0 60 H V C CNN
+F1 "PNP" -96 150 60 H V C CNN
 DRAW
+C 50 0 0 0 1 0 N
 C 50 0 111 0 1 10 N
 P 2 0 1 0  0 0  100 100 N
 P 3 0 1 10  0 75  0 -75  0 -75 F
@ -384,7 +404,7 @@ ENDDEF
 #
 # POT
 #
-DEF POT RV 0 40 Y N 1 F N
+DEF POT RV 0 40 Y N 0 F N
 F0 "RV" 0 -100 50 H V C CNN
 F1 "POT" 0 0 50 H V C CNN
 DRAW
@ -417,11 +437,9 @@ $FPLIST
 R?
 SM0603
 SM0805
- R?-*
- SM1206
 $ENDFPLIST
 DRAW
-S -40 150 40 -150 0 1 12 N
+S -40 150 40 -150 0 1 8 N
 X ~ 1 0 250 100 D 60 60 1 1 P
 X ~ 2 0 -250 100 U 60 60 1 1 P
 ENDDRAW
@ -522,8 +540,8 @@ F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
-C 0 50 20 0 1 0 N
-P 3 0 1 0  0 0  0 30  0 30 N
+C 0 50 20 0 1 4 N
+P 3 0 1 4  0 0  0 30  0 30 N
 ENDDRAW
 ENDDEF
 #
--- a/demos/pic_programmer/pic_programmer.pro
+++ b/demos/pic_programmer/pic_programmer.pro
@ -1,43 +1,79 @@
-update=24/06/2010 21:06:23
-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
-PadDrlX=320
-PadDimH=620
-PadDimV=1100
-BoardThickness=630
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=150
-LastNetListRead=
-[pcbnew/libraries]
-LibDir=
-LibName1=supports
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
+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/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
@ -1,402 +1,374 @@
-EESchema Schematic File Version 2  date 12/06/2010 08:54:10
-LIBS:power
-LIBS:device
-LIBS:transistors
-LIBS:conn
-LIBS:linear
-LIBS:regul
-LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
-LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:opto
-LIBS:atmel
-LIBS:contrib
-LIBS:valves
-EELAYER 23  0
-EELAYER END
-$Descr A4 11700 8267
-Sheet 2 2
-Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
-Date "12 jun 2010"
-Rev "3"
-Comp "KiCad"
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndDescr
-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   ~ 0
-VCC_PIC
-$Comp
-L GND #PWR036
-U 1 1 4639BE2E
-P 4550 7400
-F 0 "#PWR036" H 4550 7400 30  0001 C CNN
-F 1 "GND" H 4550 7330 30  0001 C CNN
-	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 CNN
-F 1 "100nF" H 4600 7100 50  0000 L CNN
-	1    4550 7200
-	1    0    0    -1  
-$EndComp
-Text HLabel 2350 2150 0    60   Input ~ 0
-VCC_PIC
-Text Label 2550 2150 0    60   ~ 0
-VCC_PIC
-Text Label 7650 5150 0    60   ~ 0
-VCC_PIC
-Text Label 9900 4950 0    60   ~ 0
-VCC_PIC
-Text Label 9650 2500 0    60   ~ 0
-VCC_PIC
-$Comp
-L GND #PWR037
-U 1 1 442A8794
-P 8450 5250
-F 0 "#PWR037" H 8450 5250 30  0001 C CNN
-F 1 "GND" H 8450 5180 30  0001 C CNN
-	1    8450 5250
-	0    1    1    0   
-$EndComp
-Text Label 4300 4850 0    60   ~ 0
-VCC_PIC
-$Comp
-L GND #PWR038
-U 1 1 443CCA5D
-P 8450 4850
-F 0 "#PWR038" H 8450 4850 30  0001 C CNN
-F 1 "GND" H 8450 4780 30  0001 C CNN
-	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 #PWR039
-U 1 1 443697C7
-P 9400 2600
-F 0 "#PWR039" H 9400 2600 30  0001 C CNN
-F 1 "GND" H 9400 2530 30  0001 C CNN
-	1    9400 2600
-	0    -1   -1   0   
-$EndComp
-$Comp
-L GND #PWR040
-U 1 1 443697C3
-P 8200 2400
-F 0 "#PWR040" H 8200 2400 30  0001 C CNN
-F 1 "GND" H 8200 2330 30  0001 C CNN
-	1    8200 2400
-	0    1    1    0   
-$EndComp
-Text Label 9550 1800 0    60   ~ 0
-CLOCK-RB6
-Text Label 9550 1700 0    60   ~ 0
-DATA-RB7
-Text Label 7550 1700 0    60   ~ 0
-VPP-MCLR
-$Comp
-L SUPP28 P2
-U 1 1 4436967E
-P 8800 2350
-F 0 "P2" H 8850 3150 70  0000 C CNN
-F 1 "SUPP28" H 8800 1550 70  0000 C CNN
-	1    8800 2350
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR041
-U 1 1 442AA147
-P 3700 7400
-F 0 "#PWR041" H 3700 7400 30  0001 C CNN
-F 1 "GND" H 3700 7330 30  0001 C CNN
-	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 CNN
-F 1 "100nF" H 3750 7100 50  0000 L CNN
-	1    3700 7200
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR042
-U 1 1 442AA138
-P 2700 7400
-F 0 "#PWR042" H 2700 7400 30  0001 C CNN
-F 1 "GND" H 2700 7330 30  0001 C CNN
-	1    2700 7400
-	1    0    0    -1  
-$EndComp
-$Comp
-L VCC #PWR043
-U 1 1 442AA134
-P 2700 7000
-F 0 "#PWR043" H 2700 7100 30  0001 C CNN
-F 1 "VCC" H 2700 7100 30  0000 C CNN
-	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 CNN
-F 1 "100nF" H 2750 7100 50  0000 L CNN
-	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 #PWR044
-U 1 1 442A896A
-P 9650 5050
-F 0 "#PWR044" H 9650 5050 30  0001 C CNN
-F 1 "GND" H 9650 4980 30  0001 C CNN
-	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 CNN
-F 1 "SUPP40" H 8900 4000 70  0000 C CNN
-	1    9050 5100
-	1    0    0    -1  
-$EndComp
-NoConn ~ 4550 1100
-$Comp
-L GND #PWR045
-U 1 1 442A8838
-P 2950 1250
-F 0 "#PWR045" H 2950 1250 30  0001 C CNN
-F 1 "GND" H 2950 1180 30  0001 C CNN
-	1    2950 1250
-	1    0    0    -1  
-$EndComp
-Text Label 4700 1400 0    60   ~ 0
-DATA-RB7
-Text Label 4700 1300 0    60   ~ 0
-CLOCK-RB6
-$Comp
-L 24C16 U1
-U 1 1 442A87F7
-P 3850 1200
-F 0 "U1" H 4000 1550 60  0000 C CNN
-F 1 "24Cxx" H 4050 850 60  0000 C CNN
-	1    3850 1200
-	1    0    0    -1  
-$EndComp
-Text Label 9800 4250 0    60   ~ 0
-CLOCK-RB6
-Text Label 9800 4150 0    60   ~ 0
-DATA-RB7
-Text Label 7800 4150 0    60   ~ 0
-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 CNN
-F 1 "PIC_18_PINS" H 3750 4050 60  0000 C CNN
-	1    3300 4850
-	1    0    0    -1  
-$EndComp
-NoConn ~ 4550 3150
-NoConn ~ 3100 2850
-NoConn ~ 3100 2450
-Text Label 4200 5150 0    60   ~ 0
-CLOCK-RB6
-Text Label 4200 5000 0    60   ~ 0
-DATA-RB7
-Text Label 1850 4700 0    60   ~ 0
-VPP-MCLR
-Text Label 2450 3150 0    60   ~ 0
-VPP-MCLR
-Text Label 4700 2850 0    60   ~ 0
-CLOCK-RB6
-Text Label 4700 2450 0    60   ~ 0
-DATA-RB7
-Text HLabel 1350 4450 0    60   Input ~ 0
-VPP-MCLR
-Text HLabel 1350 4250 0    60   Input ~ 0
-CLOCK-RB6
-Text HLabel 1350 4050 0    60   Input ~ 0
-DATA-RB7
-$Comp
-L GND #PWR046
-U 1 1 442A820F
-P 2300 4900
-F 0 "#PWR046" H 2300 4900 30  0001 C CNN
-F 1 "GND" H 2300 4830 30  0001 C CNN
-	1    2300 4900
-	1    0    0    -1  
-$EndComp
-$Comp
-L GND #PWR047
-U 1 1 442A8205
-P 4550 2150
-F 0 "#PWR047" H 4550 2150 30  0001 C CNN
-F 1 "GND" H 4550 2080 30  0001 C CNN
-	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 CNN
-F 1 "PIC_8_PINS" H 3850 1950 60  0000 C CNN
-	1    3850 2650
-	1    0    0    -1  
-$EndComp
-$EndSCHEMATC
+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,.\pic_programmer.cache
+EELAYER 23  0
+EELAYER END
+$Descr A4 11700 8267
+Sheet 2 2
+Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
+Date "15 apr 2008"
+Rev "3"
+Comp "KiCad"
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+Kmarq B 3100 2150 "Warning Pin power_in non pilotée (Net 2)" F=1
+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 #PWR036
+U 1 1 4639BE2E
+P 4550 7400
+F 0 "#PWR036" 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 HLabel 2350 2150 0    60   Input
+VCC_PIC
+Text Label 2550 2150 0    60   ~
+VCC_PIC
+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 #PWR037
+U 1 1 442A8794
+P 8450 5250
+F 0 "#PWR037" 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 #PWR038
+U 1 1 443CCA5D
+P 8450 4850
+F 0 "#PWR038" 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 #PWR039
+U 1 1 443697C7
+P 9400 2600
+F 0 "#PWR039" 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 #PWR040
+U 1 1 443697C3
+P 8200 2400
+F 0 "#PWR040" 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 #PWR041
+U 1 1 442AA147
+P 3700 7400
+F 0 "#PWR041" 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 #PWR042
+U 1 1 442AA138
+P 2700 7400
+F 0 "#PWR042" 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 #PWR043
+U 1 1 442AA134
+P 2700 7000
+F 0 "#PWR043" 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 #PWR044
+U 1 1 442A896A
+P 9650 5050
+F 0 "#PWR044" 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 #PWR045
+U 1 1 442A8838
+P 2950 1250
+F 0 "#PWR045" 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 2450 3150 0    60   ~
+VPP-MCLR
+Text Label 4700 2850 0    60   ~
+CLOCK-RB6
+Text Label 4700 2450 0    60   ~
+DATA-RB7
+Text HLabel 1350 4450 0    60   Input
+VPP-MCLR
+Text HLabel 1350 4250 0    60   Input
+CLOCK-RB6
+Text HLabel 1350 4050 0    60   Input
+DATA-RB7
+$Comp
+L GND #PWR046
+U 1 1 442A820F
+P 2300 4900
+F 0 "#PWR046" 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 #PWR047
+U 1 1 442A8205
+P 4550 2150
+F 0 "#PWR047" 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/pspice/pspice-cache.lib
+++ b/demos/pspice/pspice-cache.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 14/07/2010 15:02:10
+EESchema-LIBRARY Version 2.3  Date: 14/07/2010 20:10:02
 #
 # +12V
 #
--- a/demos/pspice/pspice.cir
+++ b/demos/pspice/pspice.cir
@ -1,30 +1,4 @@
-* EESchema Netlist Version 1.1 (Spice format) creation date: 14/07/2010 20:09:58


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

-.model Q2N2222 npn (bf=200)
-.print tran v(nodes)
-.print dc v(nodes)
-.tran 10 10000 10 > pspice.dat
-
-.end
+No circuit simulation currently defined
--- a/demos/pspice/pspice.pro
+++ b/demos/pspice/pspice.pro
@ -1,41 +1,73 @@
-update=23/10/2004-11:48:10
-last_client=eeschema
-[general]
-version=1
-RootSch=pspice.sch
-BoardNm=pspice.brd
-[eeschema]
-version=1
-LibDir=
-NetFmt=4
-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=pspice
+update=14/07/2010 14:39:58
+last_client=pcbnew
+[general]
+version=1
+RootSch=pspice.sch
+BoardNm=pspice.brd
+[eeschema]
+version=1
+LibDir=
+NetFmt=4
+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
+SimCmd=f:/kicad/bin/gnucap.exe -b
+UseNetN=1
+LabSize=60
+PrintMonochrome=1
+ShowSheetReferenceAndTitleBlock=1
+[eeschema/libraries]
+LibName1=pspice
+[pcbnew]
+version=1
+PadDrlX=320
+PadDimH=600
+PadDimV=600
+BoardThickness=630
+SgPcb45=1
+TxtPcbV=800
+TxtPcbH=600
+TxtModV=600
+TxtModH=600
+TxtModW=120
+VEgarde=100
+DrawLar=150
+EdgeLar=150
+TxtLar=120
+MSegLar=150
+LastNetListRead=
+[pcbnew/libraries]
+LibDir=
+LibName1=sockets
+LibName2=connect
+LibName3=discret
+LibName4=pin_array
+LibName5=divers
+LibName6=libcms
+LibName7=display
+LibName8=valves
+LibName9=led
+LibName10=dip_sockets
--- a/demos/video/bus_pci.sch
+++ b/demos/video/bus_pci.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 7 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Interface Bus PCI"
--- a/demos/video/esvideo.sch
+++ b/demos/video/esvideo.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 8 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
--- a/demos/video/graphic.sch
+++ b/demos/video/graphic.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 5 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Xilinxs"
@ -557,7 +573,7 @@ U 1 1 33A7E0B2
 P 3750 1250
 F 0 "R48" V 3830 1250 50  0000 C CNN
 F 1 "10K" V 3750 1250 50  0000 C CNN
-F 10 "~" V 3750 1170 50  0001 C CNN "Champ7"
+F 4 "~" V 3750 1170 50  0001 C CNN "Champ7"
 	1    3750 1250
 	0    1    1    0   
 $EndComp
@ -630,7 +646,7 @@ U 1 1 33A7DCE3
 P 2400 7300
 F 0 "R1" V 2480 7300 50  0000 C CNN
 F 1 "10" V 2400 7300 50  0000 C CNN
-F 10 "~" V 2400 7220 50  0001 C CNN "Champ7"
+F 4 "~" V 2400 7220 50  0001 C CNN "Champ7"
 	1    2400 7300
 	0    1    1    0   
 $EndComp
--- a/demos/video/modul.sch
+++ b/demos/video/modul.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
 Sheet 3 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
@ -118,7 +134,7 @@ U 1 1 33A51A4E
 P 2300 3250
 F 0 "R4" V 2380 3250 50  0000 C CNN
 F 1 "10K" V 2300 3250 50  0000 C CNN
-F 10 "~" V 2300 3170 50  0001 C CNN "Champ7"
+F 4 "~" V 2300 3170 50  0001 C CNN "Champ7"
 	1    2300 3250
 	0    1    1    0   
 $EndComp
--- a/demos/video/muxdata.sch
+++ b/demos/video/muxdata.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
 Sheet 2 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
--- a/demos/video/pal-ntsc.sch
+++ b/demos/video/pal-ntsc.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 4 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 ""
--- a/demos/video/rams.sch
+++ b/demos/video/rams.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 6 8
 Title "Kicad EDA"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Rams Video"
--- a/demos/video/video-cache.lib
+++ b/demos/video/video-cache.lib
@ -1,4 +1,4 @@
-EESchema-LIBRARY Version 2.3  Date: 16/05/2010 20:17:13
+EESchema-LIBRARY Version 2.3  Date: 18/11/2010 18:50:34
 #
 # +12V
 #
--- a/demos/video/video.brd
+++ b/demos/video/video.brd
--- a/demos/video/video.net
+++ b/demos/video/video.net
--- a/demos/video/video.pro
+++ b/demos/video/video.pro
@ -1,20 +1,15 @@
-update=01/05/2010 14:42:54
+update=04/12/2010 17:34:26
 version=1
 last_client=pcbnew
-[cvpcb]
-version=1
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetDir=
-LibDir=
-NetType=0
-[cvpcb/libraries]
-EquName1=devcms
 [general]
 version=1
 RootSch=video.sch
 BoardNm=video.brd
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
 [eeschema]
 version=1
 LibDir=
@ -45,14 +40,14 @@ offY_E=0
 RptD_X=0
 RptD_Y=100
 RptLab=1
-PenMin=20
-SimCmd=
-UseNetN=0
+LabSize=60
+PrintMonochrome=1
+ShowSheetReferenceAndTitleBlock=1
 [eeschema/libraries]
 LibName1=power
 LibName2=device
-LibName3=conn
-LibName4=brooktre
+LibName3=transistors
+LibName4=conn
 LibName5=linear
 LibName6=regul
 LibName7=74xx
@ -61,8 +56,24 @@ LibName9=adc-dac
 LibName10=memory
 LibName11=xilinx
 LibName12=special
-LibName13=analog_switches
-LibName14=philips
+LibName13=microcontrollers
+LibName14=dsp
+LibName15=microchip
+LibName16=analog_switches
+LibName17=motorola
+LibName18=texas
+LibName19=intel
+LibName20=audio
+LibName21=interface
+LibName22=digital-audio
+LibName23=philips
+LibName24=display
+LibName25=cypress
+LibName26=siliconi
+LibName27=opto
+LibName28=atmel
+LibName29=contrib
+LibName30=valves
 [pcbnew]
 version=1
 PadDrlX=1200
@ -77,13 +88,13 @@ TxtModH=500
 TxtModW=80
 VEgarde=100
 DrawLar=120
-EdgeLar=120
+EdgeLar=80
 TxtLar=80
 MSegLar=120
-LastNetListRead=
+LastNetListRead=video.net
 [pcbnew/libraries]
 LibDir=
-LibName1=supports
+LibName1=dip_sockets
 LibName2=connect
 LibName3=discret
 LibName4=pin_array
--- a/demos/video/video.sch
+++ b/demos/video/video.sch
@ -1,8 +1,8 @@
-EESchema Schematic File Version 2  date 16/05/2010 20:17:13
+EESchema Schematic File Version 2  date 18/11/2010 18:50:34
 LIBS:power
 LIBS:device
+LIBS:transistors
 LIBS:conn
-LIBS:brooktre
 LIBS:linear
 LIBS:regul
 LIBS:74xx
@ -11,15 +11,31 @@ LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
 LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
 LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:contrib
+LIBS:valves
 LIBS:video-cache
-EELAYER 20  0
+EELAYER 24  0
 EELAYER END
 $Descr A3 16535 11700
 Sheet 1 8
 Title "Video"
-Date "16 may 2010"
+Date "18 nov 2010"
 Rev "2.0B"
 Comp "Kicad EDA"
 Comment1 "Feuille Principale"
@ -62,7 +78,13 @@ Wire Wire Line
 Wire Wire Line
 	14900 3150 14800 3150
 Wire Wire Line
-	14800 3150 14800 4050
+	14800 3150 14800 3350
+Wire Wire Line
+	14800 3350 14800 3650
+Wire Wire Line
+	14800 3650 14800 3850
+Wire Wire Line
+	14800 3850 14800 4050
 Text Label 14800 1700 0    60   ~ 0
 Y_OUT
 Text Label 14800 1300 0    60   ~ 0
@ -482,9 +504,9 @@ Text Label 6150 1200 0    60   ~ 0
 PCA[0..2]
 Wire Bus Line
 	6050 1200 6850 1200
-Text Label 1450 5350 0    60   ~ 0
+Text Label 1400 5350 0    60   ~ 0
 RDFIFO-
-Text Label 1450 5250 0    60   ~ 0
+Text Label 1400 5250 0    60   ~ 0
 WRFIFDO-
 Wire Wire Line
 	2000 5350 1400 5350
@ -514,7 +536,7 @@ Text Label 1500 7100 0    60   ~ 0
 RDEMPTY
 Text Label 1500 7000 0    60   ~ 0
 WRFULL
-Text Label 1550 5750 0    60   ~ 0
+Text Label 1400 5750 0    60   ~ 0
 PTRDY-
 Wire Wire Line
 	1400 5750 2000 5750
@ -549,8 +571,8 @@ SELECT-
 Wire Wire Line
 	1500 6100 2000 6100
 Wire Wire Line
-	1500 5650 2000 5650
-Text Label 1550 5650 0    60   ~ 0
+	1400 5650 2000 5650
+Text Label 1400 5650 0    60   ~ 0
 PTATN-
 Text Label 1550 6100 0    60   ~ 0
 PTADR-
@ -616,10 +638,10 @@ Wire Wire Line
 	3800 5050 4350 5050
 Text Label 3850 4750 0    60   ~ 0
 CSYNC-OUT
-Text Label 1250 5500 0    60   ~ 0
+Text Label 1400 5500 0    60   ~ 0
 CSYNCIN-
 Wire Wire Line
-	1150 5500 2000 5500
+	1400 5500 2000 5500
 Text Label 8950 1800 0    60   ~ 0
 CSYNCIN-
 Wire Wire Line
@ -630,7 +652,7 @@ Wire Wire Line
 	3800 4750 4500 4750
 Text Label 6200 2850 0    60   ~ 0
 CSYNC-OUT
-Text Label 6550 5950 0    60   ~ 0
+Text Label 6450 5950 0    60   ~ 0
 WRAM-
 Wire Wire Line
 	6450 5950 6950 5950
@ -670,21 +692,21 @@ Text Label 3850 7000 0    60   ~ 0
 WRCDA-
 Text Label 3850 6900 0    60   ~ 0
 RDCDA-
-Text Label 6550 7300 0    60   ~ 0
+Text Label 6450 7300 0    60   ~ 0
 RAS7-
-Text Label 6550 7200 0    60   ~ 0
+Text Label 6450 7200 0    60   ~ 0
 RAS6-
-Text Label 6550 7100 0    60   ~ 0
+Text Label 6450 7100 0    60   ~ 0
 RAS5-
-Text Label 6550 7000 0    60   ~ 0
+Text Label 6450 7000 0    60   ~ 0
 RAS4-
-Text Label 6550 6900 0    60   ~ 0
+Text Label 6450 6900 0    60   ~ 0
 RAS3-
-Text Label 6550 6800 0    60   ~ 0
+Text Label 6450 6800 0    60   ~ 0
 RAS2-
-Text Label 6550 6700 0    60   ~ 0
+Text Label 6450 6700 0    60   ~ 0
 RAS1-
-Text Label 6550 6600 0    60   ~ 0
+Text Label 6450 6600 0    60   ~ 0
 RAS0-
 Wire Wire Line
 	6450 7300 6950 7300
@ -702,13 +724,13 @@ Wire Wire Line
 	6450 6700 6950 6700
 Wire Wire Line
 	6450 6600 6950 6600
-Text Label 6550 6400 0    60   ~ 0
+Text Label 6450 6400 0    60   ~ 0
 CAS3-
-Text Label 6550 6300 0    60   ~ 0
+Text Label 6450 6300 0    60   ~ 0
 CAS2-
-Text Label 6550 6200 0    60   ~ 0
+Text Label 6450 6200 0    60   ~ 0
 CAS1-
-Text Label 6550 6100 0    60   ~ 0
+Text Label 6450 6100 0    60   ~ 0
 CAS0-
 Wire Wire Line
 	6450 6400 6950 6400
@ -766,14 +788,14 @@ Wire Wire Line
 	3800 5550 4300 5550
 Wire Wire Line
 	3800 5450 4300 5450
-Text Label 1500 4950 0    60   ~ 0
+Text Label 1400 4950 0    60   ~ 0
 /PCWR
-Text Label 1500 5050 0    60   ~ 0
+Text Label 1400 5050 0    60   ~ 0
 /PCRD
 Wire Wire Line
-	1300 4950 2000 4950
+	1400 4950 2000 4950
 Wire Wire Line
-	1300 5050 2000 5050
+	1400 5050 2000 5050
 Wire Bus Line
 	1200 4750 2000 4750
 Text Label 1300 4650 0    60   ~ 0
--- a/gerbview/dialogs/dialog_print_using_printer_base.cpp
+++ b/gerbview/dialogs/dialog_print_using_printer_base.cpp
@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Sep  8 2010)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@ -70,7 +70,6 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
 	sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );
 	
 	m_Print_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	sbOptionsSizer->Add( m_Print_Mirror, 0, wxALL, 5 );
 	
 	bmiddleRightSizer->Add( sbOptionsSizer, 0, wxEXPAND|wxALL, 5 );
@ -78,8 +77,8 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare
 	wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
 	int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
 	m_ModeColorOption = new wxRadioBox( this, wxID_PRINT_MODE, _("Print Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
-	m_ModeColorOption->SetSelection( 1 );
-	m_ModeColorOption->SetToolTip( _("Choose if you wand to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using  black and white printers") );
+	m_ModeColorOption->SetSelection( 0 );
+	m_ModeColorOption->SetToolTip( _("Choose if you want to print sheets in color, or force the black and white mode.") );
 	
 	bmiddleRightSizer->Add( m_ModeColorOption, 0, wxALL|wxEXPAND, 5 );
 	
@ -129,4 +128,5 @@ DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base()
 	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );
 	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
 	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
+	
 }
--- a/gerbview/dialogs/dialog_print_using_printer_base.fbp
+++ b/gerbview/dialogs/dialog_print_using_printer_base.fbp
@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="9" />
+    <FileVersion major="1" minor="10" />
    <object class="Project" expanded="1">
        <property name="class_decoration"></property>
        <property name="code_generation">C++</property>
        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_python_events">0</property>
        <property name="encoding">UTF-8</property>
        <property name="event_generation">connect</property>
        <property name="file">dialog_print_using_printer_base</property>
@ -16,13 +18,16 @@
        <property name="path">.</property>
        <property name="precompiled_header"></property>
        <property name="relative_path">1</property>
+        <property name="skip_python_events">1</property>
        <property name="use_enum">1</property>
        <property name="use_microsoft_bom">0</property>
        <object class="Dialog" expanded="1">
            <property name="bg"></property>
            <property name="center"></property>
            <property name="context_help"></property>
+            <property name="context_menu">1</property>
            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
            <property name="extra_style"></property>
            <property name="fg"></property>
            <property name="font"></property>
@ -37,6 +42,10 @@
            <property name="subclass"></property>
            <property name="title">Print</property>
            <property name="tooltip"></property>
+            <property name="validator_data_type"></property>
+            <property name="validator_style">wxFILTER_NONE</property>
+            <property name="validator_type">wxDefaultValidator</property>
+            <property name="validator_variable"></property>
            <property name="window_extra_style"></property>
            <property name="window_name"></property>
            <property name="window_style"></property>
@ -145,6 +154,7 @@
                                <property name="bg"></property>
                                <property name="choices">&quot;fit in page&quot; &quot;Scale 0.5&quot; &quot;Scale 0.7&quot; &quot;Approx. Scale 1&quot; &quot;Accurate Scale 1&quot; &quot;Scale 1.4&quot; &quot;Scale 2&quot; &quot;Scale 3&quot; &quot;Scale 4&quot;</property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -162,6 +172,10 @@
                                <property name="style">wxRA_SPECIFY_COLS</property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -198,6 +212,7 @@
                            <object class="wxStaticText" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -213,6 +228,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -249,6 +268,7 @@
                            <object class="wxTextCtrl" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -264,6 +284,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip">Set X scale adjust for exact scale plotting</property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="value"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
@ -304,6 +328,7 @@
                            <object class="wxStaticText" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -319,6 +344,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -355,6 +384,7 @@
                            <object class="wxTextCtrl" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -370,6 +400,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip">Set Y scale adjust for exact scale plotting</property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="value"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
@ -434,6 +468,7 @@
                                        <property name="bg"></property>
                                        <property name="checked">0</property>
                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
                                        <property name="enabled">1</property>
                                        <property name="fg"></property>
                                        <property name="font"></property>
@ -449,6 +484,10 @@
                                        <property name="style"></property>
                                        <property name="subclass"></property>
                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
+                                        <property name="validator_style">wxFILTER_NONE</property>
+                                        <property name="validator_type">wxDefaultValidator</property>
+                                        <property name="validator_variable"></property>
                                        <property name="window_extra_style"></property>
                                        <property name="window_name"></property>
                                        <property name="window_style"></property>
@ -488,6 +527,7 @@
                                <property name="bg"></property>
                                <property name="choices">&quot;Color&quot; &quot;Black and white&quot;</property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -500,11 +540,15 @@
                                <property name="name">m_ModeColorOption</property>
                                <property name="permission">protected</property>
                                <property name="pos"></property>
-                                <property name="selection">1</property>
+                                <property name="selection">0</property>
                                <property name="size"></property>
                                <property name="style">wxRA_SPECIFY_COLS</property>
                                <property name="subclass"></property>
-                                <property name="tooltip">Choose if you wand to draw the sheet like it appears on screen,&#x0A;or in black and white mode, better to print it when using  black and white printers</property>
+                                <property name="tooltip">Choose if you want to print sheets in color, or force the black and white mode.</property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -542,6 +586,7 @@
                                <property name="bg"></property>
                                <property name="choices">&quot;1 Page per Layer&quot; &quot;Single page&quot;</property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
                                <property name="font"></property>
@ -559,6 +604,10 @@
                                <property name="style">wxRA_SPECIFY_COLS</property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -606,6 +655,7 @@
                            <object class="wxButton" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="default">0</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
@ -622,6 +672,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -658,6 +712,7 @@
                            <object class="wxButton" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="default">0</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
@ -674,6 +729,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -710,6 +769,7 @@
                            <object class="wxButton" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="default">0</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
@ -726,6 +786,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
@ -762,6 +826,7 @@
                            <object class="wxButton" expanded="1">
                                <property name="bg"></property>
                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
                                <property name="default">0</property>
                                <property name="enabled">1</property>
                                <property name="fg"></property>
@ -778,6 +843,10 @@
                                <property name="style"></property>
                                <property name="subclass"></property>
                                <property name="tooltip"></property>
+                                <property name="validator_data_type"></property>
+                                <property name="validator_style">wxFILTER_NONE</property>
+                                <property name="validator_type">wxDefaultValidator</property>
+                                <property name="validator_variable"></property>
                                <property name="window_extra_style"></property>
                                <property name="window_name"></property>
                                <property name="window_style"></property>
--- a/gerbview/dialogs/dialog_print_using_printer_base.h
+++ b/gerbview/dialogs/dialog_print_using_printer_base.h
@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Sep  8 2010)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@ -58,15 +58,16 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog
 		wxButton* m_buttonQuit;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }
-		virtual void OnScaleSelectionClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnPageSetup( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnPrintPreview( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnPrintButtonClick( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnButtonCancelClick( wxCommandEvent& event ){ event.Skip(); }
+		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnScaleSelectionClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPageSetup( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrintPreview( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPrintButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
+		
 		DIALOG_PRINT_USING_PRINTER_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Print"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 551,314 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
 		~DIALOG_PRINT_USING_PRINTER_base();
 	
--- a/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp
+++ b/gerbview/dialogs/gerbview_dialog_display_options_frame_base.cpp
@ -34,10 +34,10 @@ DIALOG_DISPLAY_OPTIONS_BASE::DIALOG_DISPLAY_OPTIONS_BASE( wxWindow* parent, wxWi
 	m_BoxUnits->SetSelection( 0 );
 	bLeftSizer->Add( m_BoxUnits, 0, wxALL|wxEXPAND, 5 );
 	
-	wxString m_CursorShapeChoices[] = { _("Small"), _("Big") };
+	wxString m_CursorShapeChoices[] = { _("Small"), _("Large") };
 	int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString );
 	m_CursorShape = new wxRadioBox( this, wxID_ANY, _("Cursor"), wxDefaultPosition, wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices, 1, wxRA_SPECIFY_COLS );
-	m_CursorShape->SetSelection( 0 );
+	m_CursorShape->SetSelection( 1 );
 	bLeftSizer->Add( m_CursorShape, 0, wxALL|wxEXPAND, 5 );
 	
 	bUpperSizer->Add( bLeftSizer, 0, wxEXPAND, 5 );
--- a/gerbview/dialogs/gerbview_dialog_display_options_frame_base.fbp
+++ b/gerbview/dialogs/gerbview_dialog_display_options_frame_base.fbp
@ -226,7 +226,7 @@
                                    <property name="proportion">0</property>
                                    <object class="wxRadioBox" expanded="1">
                                        <property name="bg"></property>
-                                        <property name="choices">&quot;Small&quot; &quot;Big&quot;</property>
+                                        <property name="choices">&quot;Small&quot; &quot;Large&quot;</property>
                                        <property name="context_help"></property>
                                        <property name="context_menu">1</property>
                                        <property name="enabled">1</property>
@ -241,7 +241,7 @@
                                        <property name="name">m_CursorShape</property>
                                        <property name="permission">protected</property>
                                        <property name="pos"></property>
-                                        <property name="selection">0</property>
+                                        <property name="selection">1</property>
                                        <property name="size"></property>
                                        <property name="style">wxRA_SPECIFY_COLS</property>
                                        <property name="subclass"></property>