Update ecc83 demo. default KISYS3DMOD definition on Linux: add... (45fcc04d) · Commits · Elphel / kicad-source-mirror

common/pcbcommon.cpp

+19 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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
	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
	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

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

+51 −23

Original line number	Original line	Diff line number	Diff line
	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

+548 −533

File changed.

Preview size limit exceeded, changes collapsed.

demos/ecc83/ecc83-pp.net

+80 −35

Original line number	Original line	Diff line number	Diff line
	(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 @@
	(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 @@
	(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

Admin message