Skip to content

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

Update demo files. A minor code cleaning.

parent 51e3d894
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20664 additions and 20157 deletions
common/base_units.cpp
View file @ f0412874
...@@ -377,3 +377,18 @@ wxString& operator <<( wxString& aString, const wxPoint& aPos ) ...@@ -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
View file @ f0412874
...@@ -477,18 +477,3 @@ bool ReplaceIllegalFileNameChars( std::string* aName ) ...@@ -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
View file @ f0412874
This diff is collapsed.
demos/complex_hierarchy/complex_hierarchy-cache.lib
View file @ f0412874
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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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.pro
View file @ f0412874
update=12/03/2011 18:54:54 update=09/01/2014 08:59:03
version=1 version=1
last_client=pcbnew last_client=kicad
[cvpcb] [cvpcb]
version=1 version=1
NetITyp=0 NetITyp=0
...@@ -11,8 +11,6 @@ LibDir= ...@@ -11,8 +11,6 @@ LibDir=
NetType=0 NetType=0
[cvpcb/libraries] [cvpcb/libraries]
EquName1=devcms EquName1=devcms
[general]
version=1
[eeschema] [eeschema]
version=1 version=1
LibDir=F:\\kicad\\share\\library LibDir=F:\\kicad\\share\\library
...@@ -86,3 +84,5 @@ LibName7=display ...@@ -86,3 +84,5 @@ LibName7=display
LibName8=valves LibName8=valves
LibName9=led LibName9=led
LibName10=dip_sockets LibName10=dip_sockets
[general]
version=1
demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro
View file @ f0412874
update=20/06/2009 21:38:13 update=10/01/2014 20:45:48
last_client=pcbnew last_client=eeschema
[pcbnew]
version=1
LastNetListRead=
UseCmpFile=1
PadDrill=0.000000000000
PadDrillOvalY=0.000000000000
PadSizeH=0.406400000000
PadSizeV=1.270000000000
PcbTextSizeV=2.032000000000
PcbTextSizeH=1.524000000000
PcbTextThickness=0.304800000000
ModuleTextSizeV=1.524000000000
ModuleTextSizeH=1.524000000000
ModuleTextSizeThickness=0.304800000000
SolderMaskClearance=0.200000000000
SolderMaskMinWidth=0.000000000000
DrawSegmentWidth=0.381000000000
BoardOutlineThickness=0.381000000000
ModuleOutlineThickness=0.152400000000
[pcbnew/libraries]
LibDir=
LibName1=sockets
LibName2=dip_sockets
LibName3=connect
LibName4=discret
LibName5=pin_array
LibName6=divers
LibName7=libcms
LibName8=display
LibName9=valves
[general] [general]
version=1 version=1
RootSch=kit-dev-coldfire_5213.sch
BoardNm=kit-dev-coldfire_5213.brd
[eeschema] [eeschema]
version=1 version=1
PageLayoutDescrFile=
SubpartIdSeparator=0
SubpartFirstId=65
LibDir= LibDir=
NetFmt=1 NetFmtName=
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_X=0
RptD_Y=100 RptD_Y=100
RptLab=1 RptLab=1
SimCmd=
UseNetN=0
LabSize=60 LabSize=60
[eeschema/libraries] [eeschema/libraries]
LibName1=power LibName1=power
...@@ -66,50 +72,3 @@ LibName25=cypress ...@@ -66,50 +72,3 @@ LibName25=cypress
LibName26=siliconi LibName26=siliconi
LibName27=contrib LibName27=contrib
LibName28=valves 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
demos/test_pads_inside_pads/test_pads_inside_pads.net
View file @ f0412874
# EESchema Netlist Version 1.1 created 19/12/2011 12:55:28 (export (version D)
( (design
( /4EE5056D $noname P4 CONN_1 {Lib=CONN_1} (source F:/kicad-launchpad/testing/demos/test_pads_inside_pads/test_pads_inside_pads.sch)
( 1 /NET1 ) (date "09/01/2014 15:29:02")
) (tool "eeschema (2014-01-08 BZR 4616)-product"))
( /4EE5056C $noname P3 CONN_1 {Lib=CONN_1} (components
( 1 /NET1 ) (comp (ref P4)
) (value CONN_1)
( /4EDF7CC5 $noname P1 CONN_1 {Lib=CONN_1} (libsource (lib conn) (part CONN_1))
( 1 /NET2 ) (sheetpath (names /) (tstamps /))
) (tstamp 4EE5056D))
( /4EDF7CC0 $noname P2 CONN_1 {Lib=CONN_1} (comp (ref P3)
( 1 /NET2 ) (value CONN_1)
) (libsource (lib conn) (part CONN_1))
) (sheetpath (names /) (tstamps /))
* (tstamp 4EE5056C))
{ Pin List by Nets (comp (ref P1)
Net 1 "/NET1" "NET1" (value CONN_1)
P4 1 (libsource (lib conn) (part CONN_1))
P3 1 (sheetpath (names /) (tstamps /))
Net 2 "/NET2" "NET2" (tstamp 4EDF7CC5))
P1 1 (comp (ref P2)
P2 1 (value CONN_1)
} (libsource (lib conn) (part CONN_1))
#End (sheetpath (names /) (tstamps /))
(tstamp 4EDF7CC0)))
(libparts
(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)))))
(libraries
(library (logical conn)
(uri F:\kicad\share\library\conn.lib)))
(nets
(net (code 1) (name /NET1)
(node (ref P4) (pin 1))
(node (ref P3) (pin 1)))
(net (code 2) (name /NET2)
(node (ref P1) (pin 1))
(node (ref P2) (pin 1)))))
\ No newline at end of file
demos/test_xil_95108/carte_test-cache.lib
View file @ f0412874
EESchema-LIBRARY Version 2.3 Date: 02/12/2009 10:35:45 EESchema-LIBRARY Version 2.3
#encoding utf-8
# #
# +12V # +12V
# #
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
...@@ -17,6 +20,8 @@ ENDDEF ...@@ -17,6 +20,8 @@ ENDDEF
DEF -12V #PWR 0 0 Y Y 1 F P DEF -12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 130 20 H I C CNN F0 "#PWR" 0 130 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 20 0 0 W N X -12V 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
...@@ -29,6 +34,8 @@ ENDDEF ...@@ -29,6 +34,8 @@ ENDDEF
DEF 74HCT04 U 0 30 Y Y 6 F N DEF 74HCT04 U 0 30 Y Y 6 F N
F0 "U" 150 100 40 H V C CNN F0 "U" 150 100 40 H V C CNN
F1 "74HCT04" 200 -100 40 H V C CNN F1 "74HCT04" 200 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
ALIAS 74HC14 74HC04 74LS14 ALIAS 74HC14 74HC04 74LS14
DRAW DRAW
P 4 0 0 0 -150 150 -150 -150 150 0 -150 150 N P 4 0 0 0 -150 150 -150 -150 150 0 -150 150 N
...@@ -66,6 +73,8 @@ ENDDEF ...@@ -66,6 +73,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
...@@ -78,16 +87,18 @@ ENDDEF ...@@ -78,16 +87,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
...@@ -98,6 +109,8 @@ ENDDEF ...@@ -98,6 +109,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
...@@ -110,6 +123,8 @@ ENDDEF ...@@ -110,6 +123,8 @@ ENDDEF
DEF CONN_2X2 P 0 40 Y N 1 F N DEF CONN_2X2 P 0 40 Y N 1 F N
F0 "P" 0 150 50 H V C CNN F0 "P" 0 150 50 H V C CNN
F1 "CONN_2X2" 10 -130 40 H V C CNN F1 "CONN_2X2" 10 -130 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -100 100 100 -100 0 1 0 N S -100 100 100 -100 0 1 0 N
X 1 1 -400 50 300 R 60 60 1 1 P I X 1 1 -400 50 300 R 60 60 1 1 P I
...@@ -124,6 +139,8 @@ ENDDEF ...@@ -124,6 +139,8 @@ ENDDEF
DEF CONN_3 K 0 40 Y N 1 F N DEF CONN_3 K 0 40 Y N 1 F N
F0 "K" -50 0 50 V V C CNN F0 "K" -50 0 50 V V C CNN
F1 "CONN_3" 50 0 40 V V C CNN F1 "CONN_3" 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
...@@ -135,15 +152,17 @@ ENDDEF ...@@ -135,15 +152,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
...@@ -152,9 +171,11 @@ ENDDEF ...@@ -152,9 +171,11 @@ ENDDEF
# #
# CRYSTAL # CRYSTAL
# #
DEF CRYSTAL X 0 40 N N 0 F N DEF CRYSTAL X 0 40 N N 1 F N
F0 "X" 0 150 60 H V C CNN F0 "X" 0 150 60 H V C CNN
F1 "CRYSTAL" 0 -150 60 H V C CNN F1 "CRYSTAL" 0 -150 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
P 2 0 1 16 -100 100 -100 -100 N P 2 0 1 16 -100 100 -100 -100 N
P 2 0 1 16 100 100 100 -100 N P 2 0 1 16 100 100 100 -100 N
...@@ -169,6 +190,8 @@ ENDDEF ...@@ -169,6 +190,8 @@ ENDDEF
DEF DB25 J 0 40 Y N 1 F N DEF DB25 J 0 40 Y N 1 F N
F0 "J" 50 1350 70 H V C CNN F0 "J" 50 1350 70 H V C CNN
F1 "DB25" -50 -1350 70 H V C CNN F1 "DB25" -50 -1350 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
A -109 1270 41 1799 774 0 1 0 N -150 1270 -100 1310 A -109 1270 41 1799 774 0 1 0 N -150 1270 -100 1310
A -108 -1259 42 -1787 -788 0 1 0 N -150 -1260 -100 -1300 A -108 -1259 42 -1787 -788 0 1 0 N -150 -1260 -100 -1300
...@@ -261,6 +284,8 @@ ENDDEF ...@@ -261,6 +284,8 @@ ENDDEF
DEF DB9 J 0 40 Y N 1 F N DEF DB9 J 0 40 Y N 1 F N
F0 "J" 0 550 70 H V C CNN F0 "J" 0 550 70 H V C CNN
F1 "DB9" 0 -550 70 H V C CNN F1 "DB9" 0 -550 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
C -70 -400 30 0 1 0 N C -70 -400 30 0 1 0 N
C -70 -200 30 0 1 0 N C -70 -200 30 0 1 0 N
...@@ -309,6 +334,8 @@ ENDDEF ...@@ -309,6 +334,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*
...@@ -326,6 +353,8 @@ ENDDEF ...@@ -326,6 +353,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
...@@ -337,6 +366,8 @@ ENDDEF ...@@ -337,6 +366,8 @@ ENDDEF
DEF LED D 0 40 Y N 1 F N DEF LED D 0 40 Y N 1 F N
F0 "D" 0 100 50 H V C CNN F0 "D" 0 100 50 H V C CNN
F1 "LED" 0 -100 50 H V C CNN F1 "LED" 0 -100 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
LED-3MM LED-3MM
LED-5MM LED-5MM
...@@ -361,6 +392,8 @@ ENDDEF ...@@ -361,6 +392,8 @@ ENDDEF
DEF LM318N U 0 30 Y Y 1 F N DEF LM318N U 0 30 Y Y 1 F N
F0 "U" 100 300 60 H V C CNN F0 "U" 100 300 60 H V C CNN
F1 "LM318N" 210 -250 60 H V C CNN F1 "LM318N" 210 -250 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
P 2 0 1 0 -200 -200 -200 200 N P 2 0 1 0 -200 -200 -200 200 N
P 2 0 1 0 -200 200 200 0 N P 2 0 1 0 -200 200 200 0 N
...@@ -382,25 +415,29 @@ ENDDEF ...@@ -382,25 +415,29 @@ 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
SM0805 SM0805
R?-* R?-*
SM1206
$ENDFPLIST $ENDFPLIST
DRAW DRAW
S -40 150 40 -150 0 1 12 N S -40 150 40 -150 0 1 12 N
...@@ -414,6 +451,8 @@ ENDDEF ...@@ -414,6 +451,8 @@ ENDDEF
DEF RAM_32KO U 0 40 Y Y 1 F N DEF RAM_32KO U 0 40 Y Y 1 F N
F0 "U" 150 900 70 H V C CNN F0 "U" 150 900 70 H V C CNN
F1 "RAM_32KO" 300 -1100 60 H V C CNN F1 "RAM_32KO" 300 -1100 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X GND 14 0 -1050 0 U 60 60 0 0 W N X GND 14 0 -1050 0 U 60 60 0 0 W N
X VCC 28 0 850 0 D 60 60 0 0 W N X VCC 28 0 850 0 D 60 60 0 0 W N
...@@ -452,6 +491,8 @@ ENDDEF ...@@ -452,6 +491,8 @@ ENDDEF
DEF SW_PUSH SW 0 40 N N 1 F N DEF SW_PUSH SW 0 40 N N 1 F N
F0 "SW" 150 110 50 H V C CNN F0 "SW" 150 110 50 H V C CNN
F1 "SW_PUSH" 0 -80 50 H V C CNN F1 "SW_PUSH" 0 -80 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -170 50 170 60 0 1 0 N S -170 50 170 60 0 1 0 N
P 4 0 1 0 -40 60 -30 90 30 90 40 60 N P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
...@@ -465,6 +506,8 @@ ENDDEF ...@@ -465,6 +506,8 @@ ENDDEF
DEF TDA8702 U 0 40 Y Y 1 F N DEF TDA8702 U 0 40 Y Y 1 F N
F0 "U" 200 800 60 H V L CNN F0 "U" 200 800 60 H V L CNN
F1 "TDA8702" 200 -800 60 H V L CNN F1 "TDA8702" 200 -800 60 H V L CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -500 700 500 -700 0 1 0 N S -500 700 500 -700 0 1 0 N
X VREF 1 -800 -400 300 R 50 50 1 1 B X VREF 1 -800 -400 300 R 50 50 1 1 B
...@@ -509,6 +552,8 @@ ENDDEF ...@@ -509,6 +552,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
...@@ -521,6 +566,8 @@ ENDDEF ...@@ -521,6 +566,8 @@ ENDDEF
DEF XC95108PC84 U 0 30 Y Y 1 F N DEF XC95108PC84 U 0 30 Y Y 1 F N
F0 "U" 550 2550 60 H V L CNN F0 "U" 550 2550 60 H V L CNN
F1 "XC95108PC84" 400 -1950 60 H V L CNN F1 "XC95108PC84" 400 -1950 60 H V L CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -850 2450 850 -1850 0 1 0 N S -850 2450 850 -1850 0 1 0 N
X P1 1 -1150 1850 300 R 60 60 1 1 B X P1 1 -1150 1850 300 R 60 60 1 1 B
......
demos/test_xil_95108/carte_test.kicad_pcb
View file @ f0412874
This diff is collapsed.
demos/test_xil_95108/carte_test.net
View file @ f0412874
This diff is collapsed.
demos/test_xil_95108/carte_test.pro
View file @ f0412874
update=07/03/2011 07:11:33 update=09/01/2014 18:43:43
version=1 version=1
last_client=cvpcb last_client=kicad
[pcbnew] [pcbnew]
version=1 version=1
LibDir= LibDir=
...@@ -118,12 +118,10 @@ LibName8=memory ...@@ -118,12 +118,10 @@ LibName8=memory
LibName9=xilinx LibName9=xilinx
LibName10=special LibName10=special
LibName11=analog_switches LibName11=analog_switches
[general]
version=1
RootSch=carte_test.sch
BoardNm=carte_test.brd
[cvpcb] [cvpcb]
version=1 version=1
NetIExt=.net NetIExt=.net
[cvpcb/libraries] [cvpcb/libraries]
EquName1=devcms EquName1=devcms
[general]
version=1
demos/test_xil_95108/carte_test.sch
View file @ f0412874
This diff is collapsed.
include/base_units.h
View file @ f0412874
...@@ -83,6 +83,13 @@ double To_User_Unit( EDA_UNITS_T aUnit, double aValue ); ...@@ -83,6 +83,13 @@ double To_User_Unit( EDA_UNITS_T aUnit, double aValue );
*/ */
wxString CoordinateToString( int aValue, bool aConvertToMils = false ); wxString CoordinateToString( int aValue, bool aConvertToMils = false );
/**
* Function AngleToStringDegrees
* is a helper to convert the \a double \a aAngle (in internal unit)
* to a string in degrees
*/
wxString AngleToStringDegrees( double aAngle );
/** /**
* Function LenghtDoubleToString * Function LenghtDoubleToString
* is a helper to convert the \a double length \a aValue to a string in inches, * is a helper to convert the \a double length \a aValue to a string in inches,
......
include/kicad_string.h
View file @ f0412874
...@@ -164,18 +164,6 @@ wxString GetIllegalFileNameWxChars(); ...@@ -164,18 +164,6 @@ wxString GetIllegalFileNameWxChars();
*/ */
bool ReplaceIllegalFileNameChars( std::string* aName ); bool ReplaceIllegalFileNameChars( std::string* aName );
/**
* Function RemoveTrailingZeros
* removes the trailing zeros from \a aString.
*
* All trailing zeros and the '.' character from floating point numbers are removed from
* \a aString.
*
* @param aString is a wxString object to remove the trailing zeros from.
* @return a wxString with the trailing zeros removed.
*/
wxString RemoveTrailingZeros( const wxString& aString );
#ifndef HAVE_STRTOKR #ifndef HAVE_STRTOKR
// common/strtok_r.c optionally: // common/strtok_r.c optionally:
extern "C" char* strtok_r( char* str, const char* delim, char** nextp ); extern "C" char* strtok_r( char* str, const char* delim, char** nextp );
......
pcbnew/dialogs/dialog_general_options.cpp
View file @ f0412874
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <class_drawpanel_gal.h> #include <class_drawpanel_gal.h>
#include <view/view.h> #include <view/view.h>
#include <pcb_painter.h> #include <pcb_painter.h>
#include <base_units.h>
DIALOG_GENERALOPTIONS::DIALOG_GENERALOPTIONS( PCB_EDIT_FRAME* parent ) : DIALOG_GENERALOPTIONS::DIALOG_GENERALOPTIONS( PCB_EDIT_FRAME* parent ) :
DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( parent ) DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( parent )
...@@ -70,8 +71,8 @@ void DIALOG_GENERALOPTIONS::init() ...@@ -70,8 +71,8 @@ void DIALOG_GENERALOPTIONS::init()
wxString rotationAngle; wxString rotationAngle;
rotationAngle.Printf( wxT( "%.1f" ), ((double)GetParent()->GetRotationAngle()) / 10.0 ); rotationAngle = AngleToStringDegrees( (double)GetParent()->GetRotationAngle() );
m_RotationAngle->SetValue( RemoveTrailingZeros( rotationAngle ) ); m_RotationAngle->SetValue( rotationAngle );
wxString timevalue; wxString timevalue;
timevalue << GetParent()->GetAutoSaveInterval() / 60; timevalue << GetParent()->GetAutoSaveInterval() / 60;
......
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