Update demo files. A minor code cleaning. (f0412874) · Commits · Elphel / kicad-source-mirror

common/base_units.cpp

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -377,3 +377,18 @@ wxString& operator <<( wxString& aString, const wxPoint& aPos )
	return aString;		return aString;
	}		}

			/**
			* Function AngleToStringDegrees
			* is a helper to convert the \a double \a aAngle (in internal unit)
			* to a string in degrees
			*/
			wxString AngleToStringDegrees( double aAngle )
			{
			wxString text;

			text.Printf( wxT( "%.3f" ), aAngle/10.0 );
			StripTrailingZeros( text, 1 );

			return text;
			}

common/string.cpp

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -477,18 +477,3 @@ bool ReplaceIllegalFileNameChars( std::string* aName )

	return changed;		return changed;
	}		}


	wxString RemoveTrailingZeros( const wxString& aString )
	{
	wxString retv = aString;
	int i = retv.Length();

	while( --i > 0 && retv[i] == wxChar( '0' ) )
	retv.RemoveLast();

	if( retv[i] == wxChar( '.' ) \|\| retv[i] == wxChar( ',' ) )
	retv.RemoveLast();

	return retv;
	}

demos/complex_hierarchy/ampli_ht.sch

+596 −525

File changed.

Preview size limit exceeded, changes collapsed.

demos/complex_hierarchy/complex_hierarchy-cache.lib

+53 −19

Original line number	Original line	Diff line number	Diff line
	EESchema-LIBRARY Version 2.3 Date: 21/05/2010 09:45:35		EESchema-LIBRARY Version 2.3
			#encoding utf-8
	#		#
	# +12C		# +12C
	#		#
	DEF +12C #PWR 0 0 N Y 1 F P		DEF +12C #PWR 0 0 N Y 1 F P
	F0 "#PWR" 0 -30 30 H I C CNN		F0 "#PWR" 0 -30 30 H I C CNN
	F1 "+12C" 0 110 40 H V C CNN		F1 "+12C" 0 110 40 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	X +12C 1 0 0 0 U 30 30 0 0 W N		X +12C 1 0 0 0 U 30 30 0 0 W N
	C 0 60 20 0 1 0 N		C 0 60 20 0 1 0 N
	@@ -17,6 +20,8 @@ ENDDEF
	DEF +12V #PWR 0 0 N Y 1 F P		DEF +12V #PWR 0 0 N Y 1 F P
	F0 "#PWR" 0 -50 20 H I C CNN		F0 "#PWR" 0 -50 20 H I C CNN
	F1 "+12V" 0 100 30 H V C CNN		F1 "+12V" 0 100 30 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	X +12V 1 0 0 0 U 20 30 0 0 W N		X +12V 1 0 0 0 U 20 30 0 0 W N
	C 0 60 20 0 1 0 N		C 0 60 20 0 1 0 N
	@@ -29,6 +34,8 @@ ENDDEF
	DEF -VAA #PWR 0 0 Y Y 1 F P		DEF -VAA #PWR 0 0 Y Y 1 F P
	F0 "#PWR" 0 100 20 H I C CNN		F0 "#PWR" 0 100 20 H I C CNN
	F1 "-VAA" 0 100 30 H V C CNN		F1 "-VAA" 0 100 30 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	X -VAA 1 0 0 0 U 20 20 0 0 W N		X -VAA 1 0 0 0 U 20 20 0 0 W N
	P 3 0 1 0 0 0 0 50 0 50 N		P 3 0 1 0 0 0 0 50 0 50 N
	@@ -41,6 +48,8 @@ ENDDEF
	DEF 7805 U 0 30 N Y 1 F N		DEF 7805 U 0 30 N Y 1 F N
	F0 "U" 150 -196 60 H V C CNN		F0 "U" 150 -196 60 H V C CNN
	F1 "7805" 0 200 60 H V C CNN		F1 "7805" 0 200 60 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	ALIAS LM7805 LM7812 78L05		ALIAS LM7805 LM7812 78L05
	DRAW		DRAW
	S -200 -150 200 150 0 1 0 N		S -200 -150 200 150 0 1 0 N
	@@ -53,16 +62,18 @@ ENDDEF
	# C		# C
	#		#
	DEF C C 0 10 N Y 1 F N		DEF C C 0 10 N Y 1 F N
	F0 "C" 50 100 50 H V L CNN		F0 "C" 0 100 40 H V L CNN
	F1 "C" 50 -100 50 H V L CNN		F1 "C" 6 -85 40 H V L CNN
			F2 "" 38 -150 30 H V C CNN
			F3 "" 0 100 30 H V C CNN
	$FPLIST		$FPLIST
	SM*		SM*
	C?		C?
	C1-1		C1-1
	$ENDFPLIST		$ENDFPLIST
	DRAW		DRAW
	P 2 0 1 10 -100 -30 100 -30 N		P 2 0 1 20 -80 -30 80 -30 N
	P 2 0 1 10 -100 30 100 30 N		P 2 0 1 20 -80 30 80 30 N
	X ~ 1 0 200 170 D 40 40 1 1 P		X ~ 1 0 200 170 D 40 40 1 1 P
	X ~ 2 0 -200 170 U 40 40 1 1 P		X ~ 2 0 -200 170 U 40 40 1 1 P
	ENDDRAW		ENDDRAW
	@@ -73,6 +84,8 @@ ENDDEF
	DEF CONN_2 P 0 40 Y N 1 F N		DEF CONN_2 P 0 40 Y N 1 F N
	F0 "P" -50 0 40 V V C CNN		F0 "P" -50 0 40 V V C CNN
	F1 "CONN_2" 50 0 40 V V C CNN		F1 "CONN_2" 50 0 40 V V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	S -100 150 100 -150 0 1 0 N		S -100 150 100 -150 0 1 0 N
	X P1 1 -350 100 250 R 60 60 1 1 P I		X P1 1 -350 100 250 R 60 60 1 1 P I
	@@ -83,15 +96,17 @@ ENDDEF
	# CP		# CP
	#		#
	DEF CP C 0 10 N N 1 F N		DEF CP C 0 10 N N 1 F N
	F0 "C" 50 100 50 H V L CNN		F0 "C" 50 100 40 H V L CNN
	F1 "CP" 50 -100 50 H V L CNN		F1 "CP" 50 -100 40 H V L CNN
			F2 "" 100 -150 30 H V C CNN
			F3 "" 50 100 30 H V C CNN
	ALIAS CAPAPOL		ALIAS CAPAPOL
	$FPLIST		$FPLIST
	CP*		CP*
	SM*		SM*
	$ENDFPLIST		$ENDFPLIST
	DRAW		DRAW
	P 4 0 1 8 -100 50 -100 -50 100 -50 100 50 N		P 4 0 1 8 -80 50 -80 -50 80 -50 80 50 N
	P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F		P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F
	X ~ 1 0 200 150 D 40 40 1 1 P		X ~ 1 0 200 150 D 40 40 1 1 P
	X ~ 2 0 -200 150 U 40 40 1 1 P		X ~ 2 0 -200 150 U 40 40 1 1 P
	@@ -103,6 +118,8 @@ ENDDEF
	DEF DIODE D 0 40 N N 1 F N		DEF DIODE D 0 40 N N 1 F N
	F0 "D" 0 100 40 H V C CNN		F0 "D" 0 100 40 H V C CNN
	F1 "DIODE" 0 -100 40 H V C CNN		F1 "DIODE" 0 -100 40 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	$FPLIST		$FPLIST
	D?		D?
	S*		S*
	@@ -120,6 +137,8 @@ ENDDEF
	DEF ~GND #PWR 0 0 Y Y 1 F P		DEF ~GND #PWR 0 0 Y Y 1 F P
	F0 "#PWR" 0 0 30 H I C CNN		F0 "#PWR" 0 0 30 H I C CNN
	F1 "GND" 0 -70 30 H I C CNN		F1 "GND" 0 -70 30 H I C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N		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		X GND 1 0 0 0 U 30 30 1 1 W N
	@@ -131,6 +150,8 @@ ENDDEF
	DEF HT #PWR 0 0 Y Y 1 F P		DEF HT #PWR 0 0 Y Y 1 F P
	F0 "#PWR" 0 120 20 H I C CNN		F0 "#PWR" 0 120 20 H I C CNN
	F1 "HT" 0 90 30 H V C CNN		F1 "HT" 0 90 30 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	X HT 1 0 0 0 U 20 20 0 0 W N		X HT 1 0 0 0 U 20 20 0 0 W N
	P 3 0 1 0 0 0 0 40 0 40 N		P 3 0 1 0 0 0 0 40 0 40 N
	@@ -143,6 +164,8 @@ ENDDEF
	DEF ICL7660 U 0 40 Y Y 1 F N		DEF ICL7660 U 0 40 Y Y 1 F N
	F0 "U" 200 400 70 H V L CNN		F0 "U" 200 400 70 H V L CNN
	F1 "ICL7660" 50 -450 70 H V L CNN		F1 "ICL7660" 50 -450 70 H V L CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	S -550 -350 550 350 0 1 0 N		S -550 -350 550 350 0 1 0 N
	X CAP+ 2 -850 250 300 R 60 60 1 1 I		X CAP+ 2 -850 250 300 R 60 60 1 1 I
	@@ -160,7 +183,9 @@ ENDDEF
	DEF LM358 U 0 20 Y Y 2 F N		DEF LM358 U 0 20 Y Y 2 F N
	F0 "U" -50 200 60 H V L CNN		F0 "U" -50 200 60 H V L CNN
	F1 "LM358" -50 -250 60 H V L CNN		F1 "LM358" -50 -250 60 H V L CNN
	ALIAS OP275 LMC6062 LMC6082 MC33178 LM358N TL072 TL082		F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
			ALIAS LMC6062 LMC6082 LM358N TL072 TL082
	DRAW		DRAW
	P 4 0 1 6 -200 200 200 0 -200 -200 -200 200 f		P 4 0 1 6 -200 200 200 0 -200 -200 -200 200 f
	X V- 4 -100 -400 250 U 40 40 0 1 W		X V- 4 -100 -400 250 U 40 40 0 1 W
	@@ -180,16 +205,17 @@ DEF MPSA42 Q 0 40 Y N 1 F N
	F0 "Q" 150 -150 60 H V L CNN		F0 "Q" 150 -150 60 H V L CNN
	F1 "MPSA42" 150 150 60 H V L CNN		F1 "MPSA42" 150 150 60 H V L CNN
	F2 "TO92-CBE" 150 0 30 H I C CNN		F2 "TO92-CBE" 150 0 30 H I C CNN
			F3 "" 0 0 60 H V C CNN
	$FPLIST		$FPLIST
	TO92-CBE		TO92-CBE
	$ENDFPLIST		$ENDFPLIST
	DRAW		DRAW
	C 50 0 111 0 1 10 N		C 50 0 111 0 1 10 N
	P 2 0 1 0 0 0 100 100 N		P 2 0 1 0 0 0 100 100 N
	P 3 0 1 10 0 75 0 -75 0 -75 F		P 3 0 1 10 0 75 0 -75 0 -75 N
	P 3 0 1 0 25 -25 0 0 0 0 N		P 3 0 1 0 50 -50 0 0 0 0 N
	P 3 0 1 0 100 -100 65 -65 65 -65 N		P 3 0 1 0 90 -90 100 -100 100 -100 N
	P 5 0 1 0 25 -25 50 -75 75 -50 25 -25 25 -25 F		P 5 0 1 0 90 -90 70 -30 30 -70 90 -90 90 -90 F
	X B B -200 0 200 R 40 40 1 1 I		X B B -200 0 200 R 40 40 1 1 I
	X C C 100 200 100 D 40 40 1 1 P		X C C 100 200 100 D 40 40 1 1 P
	X E E 100 -200 100 U 40 40 1 1 P		X E E 100 -200 100 U 40 40 1 1 P
	@@ -202,6 +228,7 @@ DEF MPSA92 Q 0 40 Y N 1 F N
	F0 "Q" 150 -150 60 H V L CNN		F0 "Q" 150 -150 60 H V L CNN
	F1 "MPSA92" 150 150 60 H V L CNN		F1 "MPSA92" 150 150 60 H V L CNN
	F2 "TO92-CBE" 150 0 30 H I C CNN		F2 "TO92-CBE" 150 0 30 H I C CNN
			F3 "" 0 0 60 H V C CNN
	$FPLIST		$FPLIST
	TO92-CBE		TO92-CBE
	$ENDFPLIST		$ENDFPLIST
	@@ -223,6 +250,8 @@ ENDDEF
	DEF POT RV 0 40 Y N 1 F N		DEF POT RV 0 40 Y N 1 F N
	F0 "RV" 0 -100 50 H V C CNN		F0 "RV" 0 -100 50 H V C CNN
	F1 "POT" 0 0 50 H V C CNN		F1 "POT" 0 0 50 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	S -150 50 150 -50 0 1 0 N		S -150 50 150 -50 0 1 0 N
	P 3 0 1 0 0 50 -20 70 20 70 F		P 3 0 1 0 0 50 -20 70 20 70 F
	@@ -235,20 +264,23 @@ ENDDEF
	# PWR_FLAG		# PWR_FLAG
	#		#
	DEF PWR_FLAG #FLG 0 0 N N 1 F P		DEF PWR_FLAG #FLG 0 0 N N 1 F P
	F0 "#FLG" 0 270 30 H I C CNN		F0 "#FLG" 0 95 30 H I C CNN
	F1 "PWR_FLAG" 0 230 30 H V C CNN		F1 "PWR_FLAG" 0 180 30 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	X pwr 1 0 0 0 U 20 20 0 0 w		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 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N
	P 5 0 1 0 0 100 -100 150 0 200 100 150 0 100 N
	ENDDRAW		ENDDRAW
	ENDDEF		ENDDEF
	#		#
	# R		# R
	#		#
	DEF R R 0 0 N Y 1 F N		DEF R R 0 0 N Y 1 F N
	F0 "R" 80 0 50 V V C CNN		F0 "R" 80 0 40 V V C CNN
	F1 "R" 0 0 50 V V C CNN		F1 "R" 7 1 40 V V C CNN
			F2 "" -70 0 30 V V C CNN
			F3 "" 0 0 30 H V C CNN
	$FPLIST		$FPLIST
	R?		R?
	SM0603		SM0603
	@@ -268,6 +300,8 @@ ENDDEF
	DEF VCC #PWR 0 0 Y Y 1 F P		DEF VCC #PWR 0 0 Y Y 1 F P
	F0 "#PWR" 0 100 30 H I C CNN		F0 "#PWR" 0 100 30 H I C CNN
	F1 "VCC" 0 100 30 H V C CNN		F1 "VCC" 0 100 30 H V C CNN
			F2 "" 0 0 60 H V C CNN
			F3 "" 0 0 60 H V C CNN
	DRAW		DRAW
	X VCC 1 0 0 0 U 20 20 0 0 W N		X VCC 1 0 0 0 U 20 20 0 0 W N
	C 0 50 20 0 1 0 N		C 0 50 20 0 1 0 N

demos/complex_hierarchy/complex_hierarchy.kicad_pcb

+2676 −2841

File changed.

Preview size limit exceeded, changes collapsed.

Admin message