Skip to content

K
kicad-source-mirror
Commit 45fcc04d authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

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

Update ecc83 demo. default KISYS3DMOD definition on Linux: add /usr/local/kicad/share/kicad/module/package3d test to find a suitable value.
parent 9aa4fb69
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1654 additions and 1198 deletions
common/pcbcommon.cpp
View file @ 45fcc04d
...@@ -77,6 +77,7 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce ...@@ -77,6 +77,7 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
// Attempt to determine where the 3D shape libraries were installed using the // Attempt to determine where the 3D shape libraries were installed using the
// legacy path: // legacy path:
// on Unix: /usr/local/kicad/share/modules/packages3d // on Unix: /usr/local/kicad/share/modules/packages3d
// oor /usr/local/kicad/share/kicad/modules/packages3d
// or /usr/share/kicad/modules/packages3d // or /usr/share/kicad/modules/packages3d
// On Windows: bin../share/modules/packages3d // On Windows: bin../share/modules/packages3d
wxString relpath( wxT( "modules/" ) ); wxString relpath( wxT( "modules/" ) );
...@@ -112,6 +113,16 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce ...@@ -112,6 +113,16 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
return true; return true;
} }
path.Empty();
wxGetEnv( wxT("HOME"), &path );
path += wxT("/kicad/share/kicad/") + relpath;
if( wxFileName::DirExists( path ) )
{
wxSetEnv( aKiSys3Dmod, path );
return true;
}
// Try the standard install path: // Try the standard install path:
path = wxT("/usr/local/kicad/share/") + relpath; path = wxT("/usr/local/kicad/share/") + relpath;
...@@ -121,6 +132,14 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce ...@@ -121,6 +132,14 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
return true; return true;
} }
// Try the new standard install path:
path = wxT("/usr/local/kicad/share/kicad/") + relpath;
if( wxFileName::DirExists( path ) )
{
wxSetEnv( aKiSys3Dmod, path );
return true;
}
// Try the official distrib standard install path: // Try the official distrib standard install path:
path = wxT("/usr/share/kicad/") + relpath; path = wxT("/usr/share/kicad/") + relpath;
......
demos/ecc83/ecc83-pp-cache.lib
View file @ 45fcc04d
...@@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P ...@@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# CONN_1
#
DEF ~CONN_1 P 0 30 N N 1 F N
F0 "P" 80 0 40 H V L CNN
F1 "CONN_1" 0 55 30 H I C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW
C 0 0 31 0 1 0 N
P 2 0 1 0 -30 0 -50 0 N
X 1 1 -150 0 100 R 60 60 1 1 P
ENDDRAW
ENDDEF
#
# CONN_2 # CONN_2
# #
DEF CONN_2 P 0 40 Y N 1 F N DEF CONN_2 P 0 40 Y N 1 F N
......
demos/ecc83/ecc83-pp.cmp
View file @ 45fcc04d
Cmp-Mod V01 Genere par PcbNew le 11/12/2006-20:19:14 Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:02:29
BeginCmp BeginCmp
TimeStamp = 4549F4BE; TimeStamp = /4549F4BE;
Reference = C1; Reference = C1;
ValeurCmp = 10uF; ValeurCmp = 10uF;
IdModule = C2V10; IdModule = discret:C2V10;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F3BE; TimeStamp = /4549F3BE;
Reference = C2; Reference = C2;
ValeurCmp = 680nF; ValeurCmp = 680nF;
IdModule = CP8; IdModule = discret:C2;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F464; TimeStamp = /4549F464;
Reference = P1; Reference = P1;
ValeurCmp = IN; ValeurCmp = IN;
IdModule = BORNIER2; IdModule = connect:bornier2;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F46C; TimeStamp = /4549F46C;
Reference = P2; Reference = P2;
ValeurCmp = OUT; ValeurCmp = OUT;
IdModule = BORNIER2; IdModule = connect:bornier2;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F4A5; TimeStamp = /4549F4A5;
Reference = P3; Reference = P3;
ValeurCmp = POWER; ValeurCmp = POWER;
IdModule = BORNIER2; IdModule = connect:bornier2;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 456A8ACC; TimeStamp = /456A8ACC;
Reference = P4; Reference = P4;
ValeurCmp = CONN_2; ValeurCmp = CONN_2;
IdModule = BORNIER2; IdModule = connect:bornier2;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F38A; TimeStamp = /54A5890A;
Reference = P5;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58C65;
Reference = P6;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58C8A;
Reference = P7;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58CA3;
Reference = P8;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /4549F38A;
Reference = R1; Reference = R1;
ValeurCmp = 1.5K; ValeurCmp = 1.5K;
IdModule = R3; IdModule = discret:R3;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F39D; TimeStamp = /4549F39D;
Reference = R2; Reference = R2;
ValeurCmp = 1.5K; ValeurCmp = 1.5K;
IdModule = R3; IdModule = discret:R3;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F3AD; TimeStamp = /4549F3AD;
Reference = R3; Reference = R3;
ValeurCmp = 100K; ValeurCmp = 100K;
IdModule = R3; IdModule = discret:R3;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 4549F3A2; TimeStamp = /4549F3A2;
Reference = R4; Reference = R4;
ValeurCmp = 47K; ValeurCmp = 47K;
IdModule = R3; IdModule = discret:R3;
EndCmp EndCmp
BeginCmp BeginCmp
TimeStamp = 454A08DD; TimeStamp = /48B4F266;
Reference = U1; Reference = U1;
ValeurCmp = ECC83; ValeurCmp = ECC83;
IdModule = ECC-83-1; IdModule = Valves:VALVE-ECC-83-1;
EndCmp EndCmp
EndListe EndListe
demos/ecc83/ecc83-pp.kicad_pcb
View file @ 45fcc04d
This diff is collapsed.
demos/ecc83/ecc83-pp.net
View file @ 45fcc04d
(export (version D) (export (version D)
(design (design
(source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch) (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch)
(date "04/07/2014 20:15:10") (date "01/01/2015 18:01:45")
(tool "Eeschema (2014-07-02 BZR 4969)-product")) (tool "Eeschema (2014-12-31 BZR 5344)-product"))
(components (components
(comp (ref U1) (comp (ref U1)
(value ECC83) (value ECC83)
(footprint VALVE-NOVAL_P) (footprint Valves:VALVE-ECC-83-1)
(libsource (lib valves) (part ECC83)) (libsource (lib valves) (part ECC83))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 48B4F266)) (tstamp 48B4F266))
(comp (ref P4) (comp (ref P4)
(value CONN_2) (value CONN_2)
(footprint connect:bornier2)
(libsource (lib conn) (part CONN_2)) (libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 456A8ACC)) (tstamp 456A8ACC))
(comp (ref C1) (comp (ref C1)
(value 10uF) (value 10uF)
(footprint discret:C2V10)
(libsource (lib device) (part C)) (libsource (lib device) (part C))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F4BE)) (tstamp 4549F4BE))
(comp (ref P3) (comp (ref P3)
(value POWER) (value POWER)
(footprint connect:bornier2)
(libsource (lib conn) (part CONN_2)) (libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F4A5)) (tstamp 4549F4A5))
(comp (ref P2) (comp (ref P2)
(value OUT) (value OUT)
(footprint connect:bornier2)
(libsource (lib conn) (part CONN_2)) (libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F46C)) (tstamp 4549F46C))
(comp (ref P1) (comp (ref P1)
(value IN) (value IN)
(footprint connect:bornier2)
(libsource (lib conn) (part CONN_2)) (libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F464)) (tstamp 4549F464))
(comp (ref C2) (comp (ref C2)
(value 680nF) (value 680nF)
(footprint discret:C2)
(libsource (lib device) (part C)) (libsource (lib device) (part C))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F3BE)) (tstamp 4549F3BE))
(comp (ref R3) (comp (ref R3)
(value 100K) (value 100K)
(footprint discret:R3)
(libsource (lib device) (part R)) (libsource (lib device) (part R))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F3AD)) (tstamp 4549F3AD))
(comp (ref R4) (comp (ref R4)
(value 47K) (value 47K)
(footprint discret:R3)
(libsource (lib device) (part R)) (libsource (lib device) (part R))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F3A2)) (tstamp 4549F3A2))
(comp (ref R2) (comp (ref R2)
(value 1.5K) (value 1.5K)
(footprint discret:R3)
(libsource (lib device) (part R)) (libsource (lib device) (part R))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F39D)) (tstamp 4549F39D))
(comp (ref R1) (comp (ref R1)
(value 1.5K) (value 1.5K)
(footprint discret:R3)
(libsource (lib device) (part R)) (libsource (lib device) (part R))
(sheetpath (names /) (tstamps /)) (sheetpath (names /) (tstamps /))
(tstamp 4549F38A))) (tstamp 4549F38A))
(comp (ref P5)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A5890A))
(comp (ref P6)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A58C65))
(comp (ref P7)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A58C8A))
(comp (ref P8)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A58CA3)))
(libparts (libparts
(libpart (lib device) (part C) (libpart (lib device) (part C)
(description "Condensateur non polarise") (description "Condensateur non polarise")
...@@ -87,6 +117,13 @@ ...@@ -87,6 +117,13 @@
(pins (pins
(pin (num 1) (name ~) (type passive)) (pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive)))) (pin (num 2) (name ~) (type passive))))
(libpart (lib conn) (part CONN_1)
(description "1 pin")
(fields
(field (name Reference) P)
(field (name Value) CONN_1))
(pins
(pin (num 1) (name 1) (type passive))))
(libpart (lib conn) (part CONN_2) (libpart (lib conn) (part CONN_2)
(description "Symbole general de connecteur") (description "Symbole general de connecteur")
(fields (fields
...@@ -114,47 +151,55 @@ ...@@ -114,47 +151,55 @@
(pin (num 9) (name F2) (type power_in))))) (pin (num 9) (name F2) (type power_in)))))
(libraries (libraries
(library (logical device) (library (logical device)
(uri f:\kicad\share\library\device.lib)) (uri f:\kicad\share\kicad\library\device.lib))
(library (logical conn) (library (logical conn)
(uri f:\kicad\share\library\conn.lib)) (uri f:\kicad\share\kicad\library\conn.lib))
(library (logical valves) (library (logical valves)
(uri f:\kicad\share\library\valves.lib))) (uri f:\kicad\share\kicad\library\valves.lib)))
(nets (nets
(net (code 1) (name "Net-(C1-Pad1)") (net (code 1) (name GND)
(node (ref R4) (pin 2))
(node (ref R2) (pin 2))
(node (ref R3) (pin 2))
(node (ref P1) (pin 1))
(node (ref P2) (pin 2))
(node (ref P3) (pin 2))
(node (ref C1) (pin 2)))
(net (code 2) (name "Net-(C1-Pad1)")
(node (ref U1) (pin 6)) (node (ref U1) (pin 6))
(node (ref C1) (pin 1)) (node (ref P3) (pin 1))
(node (ref P3) (pin 1))) (node (ref C1) (pin 1)))
(net (code 2) (name "Net-(R2-Pad1)") (net (code 3) (name "Net-(R2-Pad1)")
(node (ref R2) (pin 1)) (node (ref U1) (pin 3))
(node (ref U1) (pin 3))) (node (ref R2) (pin 1)))
(net (code 3) (name "Net-(C2-Pad2)") (net (code 4) (name "Net-(P8-Pad1)")
(node (ref P8) (pin 1)))
(net (code 5) (name "Net-(P7-Pad1)")
(node (ref P7) (pin 1)))
(net (code 6) (name "Net-(P6-Pad1)")
(node (ref P6) (pin 1)))
(net (code 7) (name "Net-(P5-Pad1)")
(node (ref P5) (pin 1)))
(net (code 8) (name "Net-(C2-Pad2)")
(node (ref U1) (pin 8)) (node (ref U1) (pin 8))
(node (ref R1) (pin 2)) (node (ref C2) (pin 2))
(node (ref C2) (pin 2))) (node (ref R1) (pin 2)))
(net (code 4) (name "Net-(C2-Pad1)") (net (code 9) (name "Net-(C2-Pad1)")
(node (ref C2) (pin 1)) (node (ref C2) (pin 1))
(node (ref R3) (pin 1)) (node (ref P2) (pin 1))
(node (ref P2) (pin 1))) (node (ref R3) (pin 1)))
(net (code 5) (name "Net-(P4-Pad2)") (net (code 10) (name "Net-(P4-Pad2)")
(node (ref U1) (pin 9)) (node (ref U1) (pin 9))
(node (ref P4) (pin 2))) (node (ref P4) (pin 2)))
(net (code 6) (name "Net-(P1-Pad2)") (net (code 11) (name "Net-(P1-Pad2)")
(node (ref U1) (pin 2)) (node (ref U1) (pin 2))
(node (ref P1) (pin 2)) (node (ref R4) (pin 1))
(node (ref R4) (pin 1))) (node (ref P1) (pin 2)))
(net (code 7) (name "Net-(R1-Pad1)") (net (code 12) (name "Net-(R1-Pad1)")
(node (ref R1) (pin 1)) (node (ref R1) (pin 1))
(node (ref U1) (pin 1)) (node (ref U1) (pin 1))
(node (ref U1) (pin 7))) (node (ref U1) (pin 7)))
(net (code 8) (name GND) (net (code 13) (name "Net-(P4-Pad1)")
(node (ref R3) (pin 2))
(node (ref C1) (pin 2))
(node (ref P1) (pin 1))
(node (ref P2) (pin 2))
(node (ref P3) (pin 2))
(node (ref R4) (pin 2))
(node (ref R2) (pin 2)))
(net (code 9) (name "Net-(P4-Pad1)")
(node (ref U1) (pin 4)) (node (ref U1) (pin 4))
(node (ref U1) (pin 5)) (node (ref P4) (pin 1))
(node (ref P4) (pin 1))))) (node (ref U1) (pin 5)))))
\ No newline at end of file \ No newline at end of file
demos/ecc83/ecc83-pp.pro
View file @ 45fcc04d
update=07/03/2011 07:10:15 update=01/01/2015 18:35:22
last_client=cvpcb last_client=kicad
[general] [general]
version=1 version=1
RootSch=ecc83-pp.sch RootSch=ecc83-pp.sch
BoardNm=ecc83-pp.brd BoardNm=ecc83-pp.brd
[common] [common]
NetDir= NetDir=
[cvpcb]
version=1
NetIExt=.net
[cvpcb/libraries]
EquName1=devcms
[eeschema] [eeschema]
version=1 version=1
LibDir= 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] [eeschema/libraries]
LibName1=power LibName1=power
LibName2=device LibName2=device
...@@ -46,55 +21,24 @@ LibName3=conn ...@@ -46,55 +21,24 @@ LibName3=conn
LibName4=valves LibName4=valves
LibName5=linear LibName5=linear
LibName6=regul LibName6=regul
LibName7=74xx LibName7=special
LibName8=cmos4000
LibName9=adc-dac
LibName10=memory
LibName11=xilinx
LibName12=special
LibName13=microcontrollers
LibName14=microchip
LibName15=analog_switches
LibName16=motorola
LibName17=intel
LibName18=audio
LibName19=interface
LibName20=digital-audio
LibName21=philips
LibName22=display
LibName23=cypress
LibName24=siliconi
LibName25=contrib
[pcbnew] [pcbnew]
version=1 version=1
PadDrlX=760 PageLayoutDescrFile=
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= LastNetListRead=
[pcbnew/libraries] UseCmpFile=1
LibName1=dip_sockets PadDrill=1.9304
LibName2=valves PadDrillOvalY=1.9304
LibName3=connect PadSizeH=2.794
LibName4=discret PadSizeV=1.397
LibName5=pin_array PcbTextSizeV=2.032
LibName6=divers PcbTextSizeH=1.524
LibName7=libcms PcbTextThickness=0.3048
LibName8=display ModuleTextSizeV=1.524
LibDir= ModuleTextSizeH=1.524
[cvpcb] ModuleTextSizeThickness=0.3048
version=1 SolderMaskClearance=0.09999999999999999
NetIExt=.net SolderMaskMinWidth=0
[cvpcb/libraries] DrawSegmentWidth=0.381
EquName1=devcms BoardOutlineThickness=0.381
ModuleOutlineThickness=0.381
demos/ecc83/ecc83-pp.sch
View file @ 45fcc04d
This diff is collapsed.
demos/ecc83/ecc83-pp_v2-cache.lib
View file @ 45fcc04d
...@@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P ...@@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# CONN_1
#
DEF ~CONN_1 P 0 30 N N 1 F N
F0 "P" 80 0 40 H V L CNN
F1 "CONN_1" 0 55 30 H I C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW
C 0 0 31 0 1 0 N
P 2 0 1 0 -30 0 -50 0 N
X 1 1 -150 0 100 R 60 60 1 1 P
ENDDRAW
ENDDEF
#
# CONN_2 # CONN_2
# #
DEF CONN_2 P 0 40 Y N 1 F N DEF CONN_2 P 0 40 Y N 1 F N
......
demos/ecc83/ecc83-pp_v2.cmp 0 → 100644
View file @ 45fcc04d
Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:25:40
BeginCmp
TimeStamp = /4549F4BE;
Reference = C1;
ValeurCmp = 10uF;
IdModule = discret:C2V10;
EndCmp
BeginCmp
TimeStamp = /4549F3BE;
Reference = C2;
ValeurCmp = 680nF;
IdModule = discret:CP8;
EndCmp
BeginCmp
TimeStamp = /4549F464;
Reference = P1;
ValeurCmp = IN;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /4549F46C;
Reference = P2;
ValeurCmp = OUT;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /4549F4A5;
Reference = P3;
ValeurCmp = POWER;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /456A8ACC;
Reference = P4;
ValeurCmp = CONN_2;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /54A5830A;
Reference = P5;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58363;
Reference = P6;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A5837A;
Reference = P7;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58391;
Reference = P8;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /4549F38A;
Reference = R1;
ValeurCmp = 1.5K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F39D;
Reference = R2;
ValeurCmp = 1.5K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F3AD;
Reference = R3;
ValeurCmp = 100K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F3A2;
Reference = R4;
ValeurCmp = 47K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /48B4F266;
Reference = U1;
ValeurCmp = ECC83;
IdModule = Valves:VALVE-ECC-83-1;
EndCmp
EndListe
demos/ecc83/ecc83-pp_v2.kicad_pcb
View file @ 45fcc04d
This diff is collapsed.
demos/ecc83/ecc83-pp_v2.net 0 → 100644
View file @ 45fcc04d
(export (version D)
(design
(source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch)
(date "01/01/2015 18:25:50")
(tool "Eeschema (2014-12-31 BZR 5344)-product"))
(components
(comp (ref U1)
(value ECC83)
(footprint Valves:VALVE-ECC-83-1)
(libsource (lib valves) (part ECC83))
(sheetpath (names /) (tstamps /))
(tstamp 48B4F266))
(comp (ref P4)
(value CONN_2)
(footprint pin_array:pin_array_1x02)
(libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /))
(tstamp 456A8ACC))
(comp (ref C1)
(value 10uF)
(footprint discret:C2V10)
(libsource (lib device) (part C))
(sheetpath (names /) (tstamps /))
(tstamp 4549F4BE))
(comp (ref P3)
(value POWER)
(footprint pin_array:pin_array_1x02)
(libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /))
(tstamp 4549F4A5))
(comp (ref P2)
(value OUT)
(footprint pin_array:pin_array_1x02)
(libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /))
(tstamp 4549F46C))
(comp (ref P1)
(value IN)
(footprint pin_array:pin_array_1x02)
(libsource (lib conn) (part CONN_2))
(sheetpath (names /) (tstamps /))
(tstamp 4549F464))
(comp (ref C2)
(value 680nF)
(footprint discret:CP8)
(libsource (lib device) (part C))
(sheetpath (names /) (tstamps /))
(tstamp 4549F3BE))
(comp (ref R3)
(value 100K)
(footprint discret:R3)
(libsource (lib device) (part R))
(sheetpath (names /) (tstamps /))
(tstamp 4549F3AD))
(comp (ref R4)
(value 47K)
(footprint discret:R3)
(libsource (lib device) (part R))
(sheetpath (names /) (tstamps /))
(tstamp 4549F3A2))
(comp (ref R2)
(value 1.5K)
(footprint discret:R3)
(libsource (lib device) (part R))
(sheetpath (names /) (tstamps /))
(tstamp 4549F39D))
(comp (ref R1)
(value 1.5K)
(footprint discret:R3)
(libsource (lib device) (part R))
(sheetpath (names /) (tstamps /))
(tstamp 4549F38A))
(comp (ref P5)
(value CONN_1)
(footprint connect:1pin)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A5830A))
(comp (ref P6)
(value CONN_1)
(footprint connect:1pin)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A58363))
(comp (ref P7)
(value CONN_1)
(footprint connect:1pin)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A5837A))
(comp (ref P8)
(value CONN_1)
(footprint connect:1pin)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 54A58391)))
(libparts
(libpart (lib device) (part C)
(description "Condensateur non polarise")
(footprints
(fp SM*)
(fp C?)
(fp C1-1))
(fields
(field (name Reference) C)
(field (name Value) C))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))))
(libpart (lib device) (part R)
(description Resistance)
(footprints
(fp R?)
(fp SM0603)
(fp SM0805)
(fp R?-*)
(fp SM1206))
(fields
(field (name Reference) R)
(field (name Value) R))
(pins
(pin (num 1) (name ~) (type passive))
(pin (num 2) (name ~) (type passive))))
(libpart (lib valves) (part ECC81)
(aliases
(alias ECC83))
(fields
(field (name Reference) U)
(field (name Value) ECC81)
(field (name Footprint) VALVE-NOVAL_P))
(pins
(pin (num 1) (name A) (type output))
(pin (num 2) (name G) (type input))
(pin (num 3) (name K) (type BiDi))
(pin (num 4) (name F1) (type power_in))
(pin (num 5) (name F1) (type power_in))
(pin (num 6) (name A) (type output))
(pin (num 7) (name G) (type input))
(pin (num 8) (name K) (type BiDi))
(pin (num 9) (name F2) (type power_in))))
(libpart (lib conn) (part CONN_1)
(description "1 pin")
(fields
(field (name Reference) P)
(field (name Value) CONN_1))
(pins
(pin (num 1) (name 1) (type passive))))
(libpart (lib conn) (part CONN_2)
(description "Symbole general de connecteur")
(fields
(field (name Reference) P)
(field (name Value) CONN_2))
(pins
(pin (num 1) (name P1) (type passive))
(pin (num 2) (name PM) (type passive)))))
(libraries
(library (logical device)
(uri f:\kicad\share\kicad\library\device.lib))
(library (logical valves)
(uri f:\kicad\share\kicad\library\valves.lib))
(library (logical conn)
(uri f:\kicad\share\kicad\library\conn.lib)))
(nets
(net (code 1) (name GND)
(node (ref R4) (pin 2))
(node (ref R3) (pin 2))
(node (ref P1) (pin 1))
(node (ref R2) (pin 2))
(node (ref P2) (pin 2))
(node (ref P3) (pin 2))
(node (ref C1) (pin 2)))
(net (code 2) (name "Net-(C1-Pad1)")
(node (ref P3) (pin 1))
(node (ref C1) (pin 1))
(node (ref U1) (pin 6)))
(net (code 3) (name "Net-(P8-Pad1)")
(node (ref P8) (pin 1)))
(net (code 4) (name "Net-(P7-Pad1)")
(node (ref P7) (pin 1)))
(net (code 5) (name "Net-(P6-Pad1)")
(node (ref P6) (pin 1)))
(net (code 6) (name "Net-(P5-Pad1)")
(node (ref P5) (pin 1)))
(net (code 7) (name "Net-(R2-Pad1)")
(node (ref R2) (pin 1))
(node (ref U1) (pin 3)))
(net (code 8) (name "Net-(C2-Pad2)")
(node (ref C2) (pin 2))
(node (ref R1) (pin 2))
(node (ref U1) (pin 8)))
(net (code 9) (name "Net-(C2-Pad1)")
(node (ref C2) (pin 1))
(node (ref R3) (pin 1))
(node (ref P2) (pin 1)))
(net (code 10) (name "Net-(P4-Pad2)")
(node (ref U1) (pin 9))
(node (ref P4) (pin 2)))
(net (code 11) (name "Net-(P1-Pad2)")
(node (ref U1) (pin 2))
(node (ref R4) (pin 1))
(node (ref P1) (pin 2)))
(net (code 12) (name "Net-(R1-Pad1)")
(node (ref R1) (pin 1))
(node (ref U1) (pin 1))
(node (ref U1) (pin 7)))
(net (code 13) (name "Net-(P4-Pad1)")
(node (ref U1) (pin 4))
(node (ref U1) (pin 5))
(node (ref P4) (pin 1)))))
\ No newline at end of file
demos/ecc83/ecc83-pp_v2.pro
View file @ 45fcc04d
update=04/07/2014 20:10:13 update=01/01/2015 18:33:52
last_client=kicad last_client=kicad
[general] [general]
version=1 version=1
RootSch=ecc83-pp.sch RootSch=ecc83-pp.sch
BoardNm=ecc83-pp.brd BoardNm=ecc83-pp.brd
[eeschema]
version=1
LibDir=
NetFmt=1
HPGLSpd=20
HPGLDm=15
HPGLNum=1
offX_A4=0
offY_A4=0
offX_A3=0
offY_A3=0
offX_A2=0
offY_A2=0
offX_A1=0
offY_A1=0
offX_A0=0
offY_A0=0
offX_A=0
offY_A=0
offX_B=0
offY_B=0
offX_C=0
offY_C=0
offX_D=0
offY_D=0
offX_E=0
offY_E=0
RptD_X=0
RptD_Y=100
RptLab=1
PenMin=20
SimCmd=
UseNetN=0
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=valves
LibName4=conn
LibName5=linear
LibName6=regul
LibName7=74xx
LibName8=cmos4000
LibName9=adc-dac
LibName10=memory
LibName11=xilinx
LibName12=special
LibName13=microcontrollers
LibName14=microchip
LibName15=analog_switches
LibName16=motorola
LibName17=intel
LibName18=audio
LibName19=interface
LibName20=digital-audio
LibName21=philips
LibName22=display
LibName23=cypress
LibName24=siliconi
LibName25=contrib
[pcbnew] [pcbnew]
version=1 version=1
PageLayoutDescrFile= PageLayoutDescrFile=
...@@ -83,3 +24,13 @@ SolderMaskMinWidth=0 ...@@ -83,3 +24,13 @@ SolderMaskMinWidth=0
DrawSegmentWidth=0.381 DrawSegmentWidth=0.381
BoardOutlineThickness=0.381 BoardOutlineThickness=0.381
ModuleOutlineThickness=0.381 ModuleOutlineThickness=0.381
[eeschema]
version=1
LibDir=
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=valves
LibName4=conn
LibName5=linear
LibName6=regul
demos/ecc83/ecc83-pp_v2.sch
View file @ 45fcc04d
...@@ -25,7 +25,7 @@ LIBS:cypress ...@@ -25,7 +25,7 @@ LIBS:cypress
LIBS:siliconi LIBS:siliconi
LIBS:contrib LIBS:contrib
LIBS:ecc83-pp_v2-cache LIBS:ecc83-pp_v2-cache
EELAYER 24 0 EELAYER 25 0
EELAYER END EELAYER END
$Descr A4 11693 8268 $Descr A4 11693 8268
encoding utf-8 encoding utf-8
...@@ -105,7 +105,7 @@ U 3 1 48B4F266 ...@@ -105,7 +105,7 @@ U 3 1 48B4F266
P 2000 6100 P 2000 6100
F 0 "U1" H 2130 6410 50 0000 C CNN F 0 "U1" H 2130 6410 50 0000 C CNN
F 1 "ECC83" H 2350 5800 50 0000 C CNN F 1 "ECC83" H 2350 5800 50 0000 C CNN
F 2 "ECC-83-1" H 2450 5650 50 0000 C CNN F 2 "Valves:VALVE-ECC-83-1" H 2450 5650 50 0000 C CNN
F 3 "" H 2000 6100 60 0001 C CNN F 3 "" H 2000 6100 60 0001 C CNN
3 2000 6100 3 2000 6100
1 0 0 -1 1 0 0 -1
...@@ -116,7 +116,7 @@ U 2 1 48B4F263 ...@@ -116,7 +116,7 @@ U 2 1 48B4F263
P 4950 4450 P 4950 4450
F 0 "U1" H 5080 4760 50 0000 C CNN F 0 "U1" H 5080 4760 50 0000 C CNN
F 1 "ECC83" H 5150 4100 50 0000 C CNN F 1 "ECC83" H 5150 4100 50 0000 C CNN
F 2 "ECC-83-1" H 5150 4000 50 0000 C CNN F 2 "Valves:VALVE-ECC-83-1" H 5150 4000 50 0000 C CNN
F 3 "" H 4950 4450 60 0001 C CNN F 3 "" H 4950 4450 60 0001 C CNN
2 4950 4450 2 4950 4450
1 0 0 -1 1 0 0 -1
...@@ -127,7 +127,7 @@ U 1 1 48B4F256 ...@@ -127,7 +127,7 @@ U 1 1 48B4F256
P 5750 4450 P 5750 4450
F 0 "U1" H 5880 4760 50 0000 C CNN F 0 "U1" H 5880 4760 50 0000 C CNN
F 1 "ECC83" H 5500 4150 50 0000 C CNN F 1 "ECC83" H 5500 4150 50 0000 C CNN
F 2 "ECC-83-1" H 5750 3950 50 0000 C CNN F 2 "Valves:VALVE-ECC-83-1" H 5750 3950 50 0000 C CNN
F 3 "" H 5750 4450 60 0001 C CNN F 3 "" H 5750 4450 60 0001 C CNN
1 5750 4450 1 5750 4450
-1 0 0 -1 -1 0 0 -1
...@@ -193,7 +193,7 @@ U 1 1 456A8ACC ...@@ -193,7 +193,7 @@ U 1 1 456A8ACC
P 2000 7100 P 2000 7100
F 0 "P4" V 1950 7100 40 0000 C CNN F 0 "P4" V 1950 7100 40 0000 C CNN
F 1 "CONN_2" V 2050 7100 40 0000 C CNN F 1 "CONN_2" V 2050 7100 40 0000 C CNN
F 2 "BORNIER2" V 2150 7100 60 0000 C CNN F 2 "pin_array:pin_array_1x02" V 2150 7100 60 0000 C CNN
F 3 "" H 2000 7100 60 0001 C CNN F 3 "" H 2000 7100 60 0001 C CNN
1 2000 7100 1 2000 7100
0 1 1 0 0 1 1 0
...@@ -204,7 +204,7 @@ U 1 1 4549F4BE ...@@ -204,7 +204,7 @@ U 1 1 4549F4BE
P 6700 4050 P 6700 4050
F 0 "C1" H 6750 4150 50 0000 L CNN F 0 "C1" H 6750 4150 50 0000 L CNN
F 1 "10uF" H 6450 4150 50 0000 L CNN F 1 "10uF" H 6450 4150 50 0000 L CNN
F 2 "C2V10" H 6700 4050 60 0000 C CNN F 2 "discret:C2V10" H 6700 4050 60 0000 C CNN
F 3 "" H 6700 4050 60 0001 C CNN F 3 "" H 6700 4050 60 0001 C CNN
1 6700 4050 1 6700 4050
1 0 0 -1 1 0 0 -1
...@@ -237,7 +237,7 @@ U 1 1 4549F4A5 ...@@ -237,7 +237,7 @@ U 1 1 4549F4A5
P 7300 3950 P 7300 3950
F 0 "P3" V 7250 3950 40 0000 C CNN F 0 "P3" V 7250 3950 40 0000 C CNN
F 1 "POWER" V 7350 3950 40 0000 C CNN F 1 "POWER" V 7350 3950 40 0000 C CNN
F 2 "BORNIER2" H 7300 4150 60 0000 C CNN F 2 "pin_array:pin_array_1x02" H 7300 4150 60 0000 C CNN
F 3 "" H 7300 3950 60 0001 C CNN F 3 "" H 7300 3950 60 0001 C CNN
1 7300 3950 1 7300 3950
1 0 0 -1 1 0 0 -1
...@@ -248,7 +248,7 @@ U 1 1 4549F46C ...@@ -248,7 +248,7 @@ U 1 1 4549F46C
P 7300 4900 P 7300 4900
F 0 "P2" V 7250 4900 40 0000 C CNN F 0 "P2" V 7250 4900 40 0000 C CNN
F 1 "OUT" V 7350 4900 40 0000 C CNN F 1 "OUT" V 7350 4900 40 0000 C CNN
F 2 "BORNIER2" H 7300 5100 60 0000 C CNN F 2 "pin_array:pin_array_1x02" H 7300 5100 60 0000 C CNN
F 3 "" H 7300 4900 60 0001 C CNN F 3 "" H 7300 4900 60 0001 C CNN
1 7300 4900 1 7300 4900
1 0 0 -1 1 0 0 -1
...@@ -259,7 +259,7 @@ U 1 1 4549F464 ...@@ -259,7 +259,7 @@ U 1 1 4549F464
P 3800 4900 P 3800 4900
F 0 "P1" V 3750 4900 40 0000 C CNN F 0 "P1" V 3750 4900 40 0000 C CNN
F 1 "IN" V 3850 4900 40 0000 C CNN F 1 "IN" V 3850 4900 40 0000 C CNN
F 2 "BORNIER2" H 3750 4700 60 0000 C CNN F 2 "pin_array:pin_array_1x02" H 3750 4700 60 0000 C CNN
F 3 "" H 3800 4900 60 0001 C CNN F 3 "" H 3800 4900 60 0001 C CNN
1 3800 4900 1 3800 4900
-1 0 0 1 -1 0 0 1
...@@ -270,7 +270,7 @@ U 1 1 4549F3BE ...@@ -270,7 +270,7 @@ U 1 1 4549F3BE
P 6500 4800 P 6500 4800
F 0 "C2" H 6550 4900 50 0000 L CNN F 0 "C2" H 6550 4900 50 0000 L CNN
F 1 "680nF" H 6550 4700 50 0000 L CNN F 1 "680nF" H 6550 4700 50 0000 L CNN
F 2 "CP8" H 6400 4900 60 0000 C CNN F 2 "discret:CP8" H 6400 4900 60 0000 C CNN
F 3 "" H 6500 4800 60 0001 C CNN F 3 "" H 6500 4800 60 0001 C CNN
1 6500 4800 1 6500 4800
0 1 1 0 0 1 1 0
...@@ -281,7 +281,7 @@ U 1 1 4549F3AD ...@@ -281,7 +281,7 @@ U 1 1 4549F3AD
P 6700 5650 P 6700 5650
F 0 "R3" V 6780 5650 50 0000 C CNN F 0 "R3" V 6780 5650 50 0000 C CNN
F 1 "100K" V 6700 5650 50 0000 C CNN F 1 "100K" V 6700 5650 50 0000 C CNN
F 2 "R3" H 6700 5650 60 0000 C CNN F 2 "discret:R3" H 6700 5650 60 0000 C CNN
F 3 "" H 6700 5650 60 0001 C CNN F 3 "" H 6700 5650 60 0001 C CNN
1 6700 5650 1 6700 5650
1 0 0 -1 1 0 0 -1
...@@ -292,7 +292,7 @@ U 1 1 4549F3A2 ...@@ -292,7 +292,7 @@ U 1 1 4549F3A2
P 4450 5650 P 4450 5650
F 0 "R4" V 4530 5650 50 0000 C CNN F 0 "R4" V 4530 5650 50 0000 C CNN
F 1 "47K" V 4450 5650 50 0000 C CNN F 1 "47K" V 4450 5650 50 0000 C CNN
F 2 "R3" V 4350 5650 60 0000 C CNN F 2 "discret:R3" V 4350 5650 60 0000 C CNN
F 3 "" H 4450 5650 60 0001 C CNN F 3 "" H 4450 5650 60 0001 C CNN
1 4450 5650 1 4450 5650
1 0 0 -1 1 0 0 -1
...@@ -303,7 +303,7 @@ U 1 1 4549F39D ...@@ -303,7 +303,7 @@ U 1 1 4549F39D
P 4850 5650 P 4850 5650
F 0 "R2" V 4930 5650 50 0000 C CNN F 0 "R2" V 4930 5650 50 0000 C CNN
F 1 "1.5K" V 4850 5650 50 0000 C CNN F 1 "1.5K" V 4850 5650 50 0000 C CNN
F 2 "R3" V 4756 5656 60 0000 C CNN F 2 "discret:R3" V 4756 5656 60 0000 C CNN
F 3 "" H 4850 5650 60 0001 C CNN F 3 "" H 4850 5650 60 0001 C CNN
1 4850 5650 1 4850 5650
1 0 0 -1 1 0 0 -1
...@@ -314,9 +314,57 @@ U 1 1 4549F38A ...@@ -314,9 +314,57 @@ U 1 1 4549F38A
P 6300 4250 P 6300 4250
F 0 "R1" V 6380 4250 50 0000 C CNN F 0 "R1" V 6380 4250 50 0000 C CNN
F 1 "1.5K" V 6300 4250 50 0000 C CNN F 1 "1.5K" V 6300 4250 50 0000 C CNN
F 2 "R3" H 6400 4150 60 0000 C CNN F 2 "discret:R3" H 6400 4150 60 0000 C CNN
F 3 "" H 6300 4250 60 0001 C CNN F 3 "" H 6300 4250 60 0001 C CNN
1 6300 4250 1 6300 4250
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp
L CONN_1 P5
U 1 1 54A5830A
P 6300 6600
F 0 "P5" H 6380 6600 40 0000 L CNN
F 1 "CONN_1" H 6300 6655 30 0001 C CNN
F 2 "connect:1pin" H 6300 6600 60 0001 C CNN
F 3 "" H 6300 6600 60 0000 C CNN
1 6300 6600
1 0 0 -1
$EndComp
$Comp
L CONN_1 P6
U 1 1 54A58363
P 6300 6700
F 0 "P6" H 6380 6700 40 0000 L CNN
F 1 "CONN_1" H 6300 6755 30 0001 C CNN
F 2 "connect:1pin" H 6300 6700 60 0001 C CNN
F 3 "" H 6300 6700 60 0000 C CNN
1 6300 6700
1 0 0 -1
$EndComp
$Comp
L CONN_1 P7
U 1 1 54A5837A
P 6300 6800
F 0 "P7" H 6380 6800 40 0000 L CNN
F 1 "CONN_1" H 6300 6855 30 0001 C CNN
F 2 "connect:1pin" H 6300 6800 60 0001 C CNN
F 3 "" H 6300 6800 60 0000 C CNN
1 6300 6800
1 0 0 -1
$EndComp
$Comp
L CONN_1 P8
U 1 1 54A58391
P 6300 6900
F 0 "P8" H 6380 6900 40 0000 L CNN
F 1 "CONN_1" H 6300 6955 30 0001 C CNN
F 2 "connect:1pin" H 6300 6900 60 0001 C CNN
F 3 "" H 6300 6900 60 0000 C CNN
1 6300 6900
1 0 0 -1
$EndComp
NoConn ~ 6150 6600
NoConn ~ 6150 6700
NoConn ~ 6150 6800
NoConn ~ 6150 6900
$EndSCHEMATC $EndSCHEMATC
demos/ecc83/fp-lib-table 0 → 100644
View file @ 45fcc04d
(fp_lib_table
(lib (name Valves)(type KiCad)(uri ${KISYSMOD}/Valves.pretty)(options "")(descr ""))
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment