Update demo files. A minor code cleaning.

This commit is contained in:
jean-pierre charras 2014-01-10 21:12:36 +01:00
parent 51e3d8943f
commit f0412874c0
20 changed files with 20617 additions and 20110 deletions

View File

@ -377,3 +377,18 @@ wxString& operator <<( wxString& aString, const wxPoint& aPos )
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;
}

View File

@ -477,18 +477,3 @@ bool ReplaceIllegalFileNameChars( std::string* aName )
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;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,13 @@
EESchema-LIBRARY Version 2.3 Date: 21/05/2010 09:45:35
EESchema-LIBRARY Version 2.3
#encoding utf-8
#
# +12C
#
DEF +12C #PWR 0 0 N Y 1 F P
F0 "#PWR" 0 -30 30 H I 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
X +12C 1 0 0 0 U 30 30 0 0 W N
C 0 60 20 0 1 0 N
@ -17,6 +20,8 @@ ENDDEF
DEF +12V #PWR 0 0 N Y 1 F P
F0 "#PWR" 0 -50 20 H I 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
X +12V 1 0 0 0 U 20 30 0 0 W N
C 0 60 20 0 1 0 N
@ -29,6 +34,8 @@ ENDDEF
DEF -VAA #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 100 20 H I 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
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
@ -41,6 +48,8 @@ ENDDEF
DEF 7805 U 0 30 N Y 1 F N
F0 "U" 150 -196 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
DRAW
S -200 -150 200 150 0 1 0 N
@ -53,16 +62,18 @@ ENDDEF
# 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
F0 "C" 0 100 40 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
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
P 2 0 1 20 -80 -30 80 -30 N
P 2 0 1 20 -80 30 80 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
@ -73,6 +84,8 @@ ENDDEF
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
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H 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
@ -83,15 +96,17 @@ ENDDEF
# CP
#
DEF CP C 0 10 N N 1 F N
F0 "C" 50 100 50 H V L CNN
F1 "CP" 50 -100 50 H V L CNN
F0 "C" 50 100 40 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
$FPLIST
CP*
SM*
$ENDFPLIST
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
X ~ 1 0 200 150 D 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
F0 "D" 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
D?
S*
@ -120,6 +137,8 @@ ENDDEF
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
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V 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
@ -131,6 +150,8 @@ ENDDEF
DEF HT #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 120 20 H I 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
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
@ -143,6 +164,8 @@ ENDDEF
DEF ICL7660 U 0 40 Y Y 1 F N
F0 "U" 200 400 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
S -550 -350 550 350 0 1 0 N
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
F0 "U" -50 200 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
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
@ -180,16 +205,17 @@ DEF MPSA42 Q 0 40 Y N 1 F N
F0 "Q" 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
F3 "" 0 0 60 H V C CNN
$FPLIST
TO92-CBE
$ENDFPLIST
DRAW
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
P 3 0 1 0 25 -25 0 0 0 0 N
P 3 0 1 0 100 -100 65 -65 65 -65 N
P 5 0 1 0 25 -25 50 -75 75 -50 25 -25 25 -25 F
P 3 0 1 10 0 75 0 -75 0 -75 N
P 3 0 1 0 50 -50 0 0 0 0 N
P 3 0 1 0 90 -90 100 -100 100 -100 N
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 C C 100 200 100 D 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
F1 "MPSA92" 150 150 60 H V L CNN
F2 "TO92-CBE" 150 0 30 H I C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST
TO92-CBE
$ENDFPLIST
@ -223,6 +250,8 @@ ENDDEF
DEF POT RV 0 40 Y N 1 F N
F0 "RV" 0 -100 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
S -150 50 150 -50 0 1 0 N
P 3 0 1 0 0 50 -20 70 20 70 F
@ -235,20 +264,23 @@ 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
F0 "#FLG" 0 95 30 H I 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
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
P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 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
F0 "R" 80 0 40 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
R?
SM0603
@ -268,6 +300,8 @@ ENDDEF
DEF VCC #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 100 30 H I 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
X VCC 1 0 0 0 U 20 20 0 0 W N
C 0 50 20 0 1 0 N

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
update=12/03/2011 18:54:54
update=09/01/2014 08:59:03
version=1
last_client=pcbnew
last_client=kicad
[cvpcb]
version=1
NetITyp=0
@ -11,8 +11,6 @@ LibDir=
NetType=0
[cvpcb/libraries]
EquName1=devcms
[general]
version=1
[eeschema]
version=1
LibDir=F:\\kicad\\share\\library
@ -86,3 +84,5 @@ LibName7=display
LibName8=valves
LibName9=led
LibName10=dip_sockets
[general]
version=1

View File

@ -1,38 +1,17 @@
EESchema Schematic File Version 2 date 01/04/2010 13:24:06
EESchema Schematic File Version 2
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
LIBS:actionneur_piezo-cache
LIBS:special
LIBS:complex_hierarchy-cache
EELAYER 24 0
EELAYER END
$Descr A4 11700 8267
$Descr A4 11693 8268
encoding utf-8
Sheet 1 3
Title ""
Date "1 apr 2010"
@ -61,7 +40,7 @@ Connection ~ 2100 1100
Wire Wire Line
2100 1150 2100 1050
Wire Wire Line
5650 1600 6150 1600
7950 1200 8450 1200
Connection ~ 1850 1100
Wire Wire Line
2100 1100 1700 1100
@ -93,14 +72,14 @@ Wire Wire Line
2400 2300 2400 2250
Connection ~ 2400 2300
Wire Wire Line
4750 1550 4750 1600
7050 1150 7050 1200
Wire Wire Line
4750 1600 4850 1600
7050 1200 7150 1200
Wire Wire Line
6150 2100 6150 2150
8450 1700 8450 1750
Wire Wire Line
6150 1550 6150 1700
Connection ~ 6150 1600
8450 1150 8450 1300
Connection ~ 8450 1200
Wire Wire Line
1700 1300 1750 1300
Wire Wire Line
@ -123,6 +102,8 @@ U 1 1 4B4B15E7
P 6650 2750
F 0 "C10" H 6700 2850 50 0000 L CNN
F 1 "10uF" H 6750 2650 50 0000 L TNN
F 2 "" H 6650 2750 60 0001 C CNN
F 3 "" H 6650 2750 60 0001 C CNN
F 4 "" H 6650 2750 60 0001 C CNN "Field1"
F 5 "" H 6650 2750 60 0001 C CNN "Field2"
F 6 "" H 6650 2750 60 0001 C CNN "Field3"
@ -140,6 +121,8 @@ U 1 1 4B4B15DA
P 9200 3250
F 0 "#PWR01" H 9200 3250 30 0001 C CNN
F 1 "GND" H 9200 3180 30 0001 C CNN
F 2 "" H 9200 3250 60 0001 C CNN
F 3 "" H 9200 3250 60 0001 C CNN
F 4 "" H 9200 3250 60 0001 C CNN "Field1"
F 5 "" H 9200 3250 60 0001 C CNN "Field2"
F 6 "" H 9200 3250 60 0001 C CNN "Field3"
@ -157,6 +140,8 @@ U 1 1 4B4B15D9
P 9200 3000
F 0 "C11" H 9250 3100 50 0000 L CNN
F 1 "10uF" H 9300 2900 50 0000 L TNN
F 2 "" H 9200 3000 60 0001 C CNN
F 3 "" H 9200 3000 60 0001 C CNN
F 4 "" H 9200 3000 60 0001 C CNN "Field1"
F 5 "" H 9200 3000 60 0001 C CNN "Field2"
F 6 "" H 9200 3000 60 0001 C CNN "Field3"
@ -175,16 +160,20 @@ U 1 1 4B4B1578
P 9350 2750
F 0 "#PWR02" H 9350 2850 20 0001 C CNN
F 1 "-VAA" H 9350 2850 30 0000 C CNN
F 2 "" H 9350 2750 60 0001 C CNN
F 3 "" H 9350 2750 60 0001 C CNN
1 9350 2750
0 1 1 0
$EndComp
$Comp
L 7805 U2
U 1 1 4B4B1532
P 5250 1650
F 0 "U2" H 5400 1454 60 0000 C CNN
F 1 "78L05" H 5250 1850 60 0000 C CNN
1 5250 1650
P 7550 1250
F 0 "U2" H 7700 1054 60 0000 C CNN
F 1 "78L05" H 7550 1450 60 0000 C CNN
F 2 "" H 7550 1250 60 0001 C CNN
F 3 "" H 7550 1250 60 0001 C CNN
1 7550 1250
1 0 0 -1
$EndComp
$Comp
@ -193,16 +182,20 @@ U 1 1 4B4B1253
P 7900 2250
F 0 "#PWR03" H 7900 2350 30 0001 C CNN
F 1 "VCC" H 7900 2350 30 0000 C CNN
F 2 "" H 7900 2250 60 0001 C CNN
F 3 "" H 7900 2250 60 0001 C CNN
1 7900 2250
1 0 0 -1
$EndComp
$Comp
L VCC #PWR04
U 1 1 4B4B124E
P 6150 1550
F 0 "#PWR04" H 6150 1650 30 0001 C CNN
F 1 "VCC" H 6150 1650 30 0000 C CNN
1 6150 1550
P 8450 1150
F 0 "#PWR04" H 8450 1250 30 0001 C CNN
F 1 "VCC" H 8450 1250 30 0000 C CNN
F 2 "" H 8450 1150 60 0001 C CNN
F 3 "" H 8450 1150 60 0001 C CNN
1 8450 1150
1 0 0 -1
$EndComp
$Comp
@ -211,6 +204,8 @@ U 1 1 4B4B1237
P 7900 3550
F 0 "#PWR05" H 7900 3550 30 0001 C CNN
F 1 "GND" H 7900 3480 30 0001 C CNN
F 2 "" H 7900 3550 60 0001 C CNN
F 3 "" H 7900 3550 60 0001 C CNN
F 4 "" H 7900 3550 60 0001 C CNN "Field1"
F 5 "" H 7900 3550 60 0001 C CNN "Field2"
F 6 "" H 7900 3550 60 0001 C CNN "Field3"
@ -228,6 +223,8 @@ U 1 1 4B4B1230
P 7950 2900
F 0 "U1" H 8150 3300 70 0000 L CNN
F 1 "ICL7660" H 8000 2450 70 0000 L CNN
F 2 "" H 7950 2900 60 0001 C CNN
F 3 "" H 7950 2900 60 0001 C CNN
1 7950 2900
1 0 0 -1
$EndComp
@ -239,6 +236,8 @@ U 1 1 4B3A1558
P 2100 1350
F 0 "C9" H 2150 1450 50 0000 L CNN
F 1 "47uF/63V" H 2200 1250 50 0000 L TNN
F 2 "" H 2100 1350 60 0001 C CNN
F 3 "" H 2100 1350 60 0001 C CNN
F 4 "" H 2100 1350 60 0001 C CNN "Field1"
F 5 "" H 2100 1350 60 0001 C CNN "Field2"
F 6 "" H 2100 1350 60 0001 C CNN "Field3"
@ -256,6 +255,8 @@ U 1 1 4B3A1557
P 2100 1600
F 0 "#PWR06" H 2100 1600 30 0001 C CNN
F 1 "GND" H 2100 1530 30 0001 C CNN
F 2 "" H 2100 1600 60 0001 C CNN
F 3 "" H 2100 1600 60 0001 C CNN
F 4 "" H 2100 1600 60 0001 C CNN "Field1"
F 5 "" H 2100 1600 60 0001 C CNN "Field2"
F 6 "" H 2100 1600 60 0001 C CNN "Field3"
@ -285,6 +286,8 @@ U 1 1 4B3A1302
P 1750 1400
F 0 "#PWR07" H 1750 1400 30 0001 C CNN
F 1 "GND" H 1750 1330 30 0001 C CNN
F 2 "" H 1750 1400 60 0001 C CNN
F 3 "" H 1750 1400 60 0001 C CNN
F 4 "" H 1750 1400 60 0001 C CNN "Field1"
F 5 "" H 1750 1400 60 0001 C CNN "Field2"
F 6 "" H 1750 1400 60 0001 C CNN "Field3"
@ -302,6 +305,8 @@ U 1 1 4B3A12F4
P 1350 1200
F 0 "P1" V 1300 1200 40 0000 C CNN
F 1 "CONN_2" V 1400 1200 40 0000 C CNN
F 2 "" H 1350 1200 60 0001 C CNN
F 3 "" H 1350 1200 60 0001 C CNN
F 4 "" H 1350 1200 60 0001 C CNN "Field1"
F 5 "" H 1350 1200 60 0001 C CNN "Field2"
F 6 "" H 1350 1200 60 0001 C CNN "Field3"
@ -319,67 +324,77 @@ U 1 1 4B0FA68B
P 1850 1050
F 0 "#PWR08" H 1850 1170 20 0001 C CNN
F 1 "HT" H 1850 1140 30 0000 C CNN
F 2 "" H 1850 1050 60 0001 C CNN
F 3 "" H 1850 1050 60 0001 C CNN
1 1850 1050
1 0 0 -1
$EndComp
$Comp
L CP C1
U 1 1 4B03CEC2
P 6150 1900
F 0 "C1" H 6200 2000 50 0000 L CNN
F 1 "47uF" H 6250 1800 50 0000 L TNN
F 4 "" H 6150 1900 60 0001 C CNN "Field1"
F 5 "" H 6150 1900 60 0001 C CNN "Field2"
F 6 "" H 6150 1900 60 0001 C CNN "Field3"
F 7 "" H 6150 1900 60 0001 C CNN "Field4"
F 8 "" H 6150 1900 60 0001 C CNN "Field5"
F 9 "" H 6150 1900 60 0001 C CNN "Field6"
F 10 "" H 6150 1900 60 0001 C CNN "Field7"
F 11 "" H 6150 1900 60 0001 C CNN "Field8"
1 6150 1900
P 8450 1500
F 0 "C1" H 8500 1600 50 0000 L CNN
F 1 "47uF" H 8550 1400 50 0000 L TNN
F 2 "" H 8450 1500 60 0001 C CNN
F 3 "" H 8450 1500 60 0001 C CNN
F 4 "" H 8450 1500 60 0001 C CNN "Field1"
F 5 "" H 8450 1500 60 0001 C CNN "Field2"
F 6 "" H 8450 1500 60 0001 C CNN "Field3"
F 7 "" H 8450 1500 60 0001 C CNN "Field4"
F 8 "" H 8450 1500 60 0001 C CNN "Field5"
F 9 "" H 8450 1500 60 0001 C CNN "Field6"
F 10 "" H 8450 1500 60 0001 C CNN "Field7"
F 11 "" H 8450 1500 60 0001 C CNN "Field8"
1 8450 1500
1 0 0 -1
$EndComp
$Comp
L GND #PWR09
U 1 1 4B03CEC1
P 6150 2150
F 0 "#PWR09" H 6150 2150 30 0001 C CNN
F 1 "GND" H 6150 2080 30 0001 C CNN
F 4 "" H 6150 2150 60 0001 C CNN "Field1"
F 5 "" H 6150 2150 60 0001 C CNN "Field2"
F 6 "" H 6150 2150 60 0001 C CNN "Field3"
F 7 "" H 6150 2150 60 0001 C CNN "Field4"
F 8 "" H 6150 2150 60 0001 C CNN "Field5"
F 9 "" H 6150 2150 60 0001 C CNN "Field6"
F 10 "" H 6150 2150 60 0001 C CNN "Field7"
F 11 "" H 6150 2150 60 0001 C CNN "Field8"
1 6150 2150
P 8450 1750
F 0 "#PWR09" H 8450 1750 30 0001 C CNN
F 1 "GND" H 8450 1680 30 0001 C CNN
F 2 "" H 8450 1750 60 0001 C CNN
F 3 "" H 8450 1750 60 0001 C CNN
F 4 "" H 8450 1750 60 0001 C CNN "Field1"
F 5 "" H 8450 1750 60 0001 C CNN "Field2"
F 6 "" H 8450 1750 60 0001 C CNN "Field3"
F 7 "" H 8450 1750 60 0001 C CNN "Field4"
F 8 "" H 8450 1750 60 0001 C CNN "Field5"
F 9 "" H 8450 1750 60 0001 C CNN "Field6"
F 10 "" H 8450 1750 60 0001 C CNN "Field7"
F 11 "" H 8450 1750 60 0001 C CNN "Field8"
1 8450 1750
1 0 0 -1
$EndComp
$Comp
L GND #PWR010
U 1 1 4B03CE88
P 5250 1900
F 0 "#PWR010" H 5250 1900 30 0001 C CNN
F 1 "GND" H 5250 1830 30 0001 C CNN
F 4 "" H 5250 1900 60 0001 C CNN "Field1"
F 5 "" H 5250 1900 60 0001 C CNN "Field2"
F 6 "" H 5250 1900 60 0001 C CNN "Field3"
F 7 "" H 5250 1900 60 0001 C CNN "Field4"
F 8 "" H 5250 1900 60 0001 C CNN "Field5"
F 9 "" H 5250 1900 60 0001 C CNN "Field6"
F 10 "" H 5250 1900 60 0001 C CNN "Field7"
F 11 "" H 5250 1900 60 0001 C CNN "Field8"
1 5250 1900
P 7550 1500
F 0 "#PWR010" H 7550 1500 30 0001 C CNN
F 1 "GND" H 7550 1430 30 0001 C CNN
F 2 "" H 7550 1500 60 0001 C CNN
F 3 "" H 7550 1500 60 0001 C CNN
F 4 "" H 7550 1500 60 0001 C CNN "Field1"
F 5 "" H 7550 1500 60 0001 C CNN "Field2"
F 6 "" H 7550 1500 60 0001 C CNN "Field3"
F 7 "" H 7550 1500 60 0001 C CNN "Field4"
F 8 "" H 7550 1500 60 0001 C CNN "Field5"
F 9 "" H 7550 1500 60 0001 C CNN "Field6"
F 10 "" H 7550 1500 60 0001 C CNN "Field7"
F 11 "" H 7550 1500 60 0001 C CNN "Field8"
1 7550 1500
1 0 0 -1
$EndComp
$Comp
L +12C #PWR011
U 1 1 4B03CE6C
P 4750 1550
F 0 "#PWR011" H 4750 1520 30 0001 C CNN
F 1 "+12C" H 4750 1660 40 0000 C CNN
1 4750 1550
P 7050 1150
F 0 "#PWR011" H 7050 1120 30 0001 C CNN
F 1 "+12C" H 7050 1260 40 0000 C CNN
F 2 "" H 7050 1150 60 0001 C CNN
F 3 "" H 7050 1150 60 0001 C CNN
1 7050 1150
1 0 0 -1
$EndComp
$Comp
@ -388,6 +403,8 @@ U 1 1 4B03CAA3
P 2100 1050
F 0 "#U012" H 2100 1320 30 0001 C CNN
F 1 "PWR_FLAG" H 2100 1280 30 0000 C CNN
F 2 "" H 2100 1050 60 0001 C CNN
F 3 "" H 2100 1050 60 0001 C CNN
F 4 "" H 2100 1050 60 0001 C CNN "Field1"
F 5 "" H 2100 1050 60 0001 C CNN "Field2"
F 6 "" H 2100 1050 60 0001 C CNN "Field3"
@ -405,6 +422,8 @@ U 1 1 4B03C9F9
P 2400 2250
F 0 "#U013" H 2400 2520 30 0001 C CNN
F 1 "PWR_FLAG" H 2400 2480 30 0000 C CNN
F 2 "" H 2400 2250 60 0001 C CNN
F 3 "" H 2400 2250 60 0001 C CNN
F 4 "" H 2400 2250 60 0001 C CNN "Field1"
F 5 "" H 2400 2250 60 0001 C CNN "Field2"
F 6 "" H 2400 2250 60 0001 C CNN "Field3"
@ -422,6 +441,8 @@ U 1 1 4B03C68D
P 3300 2250
F 0 "#PWR014" H 3300 2220 30 0001 C CNN
F 1 "+12C" H 3300 2360 40 0000 C CNN
F 2 "" H 3300 2250 60 0001 C CNN
F 3 "" H 3300 2250 60 0001 C CNN
1 3300 2250
1 0 0 -1
$EndComp
@ -431,6 +452,8 @@ U 1 1 4AE17C45
P 2200 2750
F 0 "#PWR015" H 2200 2750 30 0001 C CNN
F 1 "GND" H 2200 2680 30 0001 C CNN
F 2 "" H 2200 2750 60 0001 C CNN
F 3 "" H 2200 2750 60 0001 C CNN
F 4 "" H 2200 2750 60 0001 C CNN "Field1"
F 5 "" H 2200 2750 60 0001 C CNN "Field2"
F 6 "" H 2200 2750 60 0001 C CNN "Field3"
@ -448,6 +471,8 @@ U 1 1 4AE17C31
P 2150 2700
F 0 "#U016" H 2150 2970 30 0001 C CNN
F 1 "PWR_FLAG" H 2150 2930 30 0000 C CNN
F 2 "" H 2150 2700 60 0001 C CNN
F 3 "" H 2150 2700 60 0001 C CNN
F 4 "" H 2150 2700 60 0001 C CNN "Field1"
F 5 "" H 2150 2700 60 0001 C CNN "Field2"
F 6 "" H 2150 2700 60 0001 C CNN "Field3"
@ -465,6 +490,8 @@ U 1 1 4AE173EF
P 3050 2250
F 0 "#U017" H 3050 2200 20 0001 C CNN
F 1 "+12V" H 3050 2350 30 0000 C CNN
F 2 "" H 3050 2250 60 0001 C CNN
F 3 "" H 3050 2250 60 0001 C CNN
F 4 "" H 3050 2250 60 0001 C CNN "Field1"
F 5 "" H 3050 2250 60 0001 C CNN "Field2"
F 6 "" H 3050 2250 60 0001 C CNN "Field3"
@ -482,6 +509,8 @@ U 1 1 4AE173D0
P 2750 2800
F 0 "#PWR018" H 2750 2800 30 0001 C CNN
F 1 "GND" H 2750 2730 30 0001 C CNN
F 2 "" H 2750 2800 60 0001 C CNN
F 3 "" H 2750 2800 60 0001 C CNN
F 4 "" H 2750 2800 60 0001 C CNN "Field1"
F 5 "" H 2750 2800 60 0001 C CNN "Field2"
F 6 "" H 2750 2800 60 0001 C CNN "Field3"
@ -499,6 +528,8 @@ U 1 1 4AE173CF
P 2750 2550
F 0 "C2" H 2800 2650 50 0000 L CNN
F 1 "47uF/20V" H 2850 2450 50 0000 L TNN
F 2 "" H 2750 2550 60 0001 C CNN
F 3 "" H 2750 2550 60 0001 C CNN
F 4 "" H 2750 2550 60 0001 C CNN "Field1"
F 5 "" H 2750 2550 60 0001 C CNN "Field2"
F 6 "" H 2750 2550 60 0001 C CNN "Field3"
@ -516,6 +547,8 @@ U 1 1 4AE172F4
P 2150 2300
F 0 "D1" H 2150 2400 40 0000 C CNN
F 1 "1N4007" H 2150 2200 40 0000 C CNN
F 2 "" H 2150 2300 60 0001 C CNN
F 3 "" H 2150 2300 60 0001 C CNN
F 4 "" H 2150 2300 60 0001 C CNN "Field1"
F 5 "" H 2150 2300 60 0001 C CNN "Field2"
F 6 "" H 2150 2300 60 0001 C CNN "Field3"
@ -533,6 +566,8 @@ U 1 1 4AD71B8E
P 1650 2600
F 0 "#PWR019" H 1650 2600 30 0001 C CNN
F 1 "GND" H 1650 2530 30 0001 C CNN
F 2 "" H 1650 2600 60 0001 C CNN
F 3 "" H 1650 2600 60 0001 C CNN
F 4 "" H 1650 2600 60 0001 C CNN "Field1"
F 5 "" H 1650 2600 60 0001 C CNN "Field2"
F 6 "" H 1650 2600 60 0001 C CNN "Field3"
@ -550,6 +585,8 @@ U 1 1 4AD71B06
P 1250 2400
F 0 "P2" V 1200 2400 40 0000 C CNN
F 1 "CONN_2" V 1300 2400 40 0000 C CNN
F 2 "" H 1250 2400 60 0001 C CNN
F 3 "" H 1250 2400 60 0001 C CNN
F 4 "" H 1250 2400 60 0001 C CNN "Field1"
F 5 "" H 1250 2400 60 0001 C CNN "Field2"
F 6 "" H 1250 2400 60 0001 C CNN "Field3"

View File

@ -1,41 +1,47 @@
update=20/06/2009 21:38:13
last_client=pcbnew
update=10/01/2014 20:45:48
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]
version=1
RootSch=kit-dev-coldfire_5213.sch
BoardNm=kit-dev-coldfire_5213.brd
[eeschema]
version=1
PageLayoutDescrFile=
SubpartIdSeparator=0
SubpartFirstId=65
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
NetFmtName=
RptD_X=0
RptD_Y=100
RptLab=1
SimCmd=
UseNetN=0
LabSize=60
[eeschema/libraries]
LibName1=power
@ -66,50 +72,3 @@ 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

View File

@ -1,25 +1,44 @@
# EESchema Netlist Version 1.1 created 19/12/2011 12:55:28
(
( /4EE5056D $noname P4 CONN_1 {Lib=CONN_1}
( 1 /NET1 )
)
( /4EE5056C $noname P3 CONN_1 {Lib=CONN_1}
( 1 /NET1 )
)
( /4EDF7CC5 $noname P1 CONN_1 {Lib=CONN_1}
( 1 /NET2 )
)
( /4EDF7CC0 $noname P2 CONN_1 {Lib=CONN_1}
( 1 /NET2 )
)
)
*
{ Pin List by Nets
Net 1 "/NET1" "NET1"
P4 1
P3 1
Net 2 "/NET2" "NET2"
P1 1
P2 1
}
#End
(export (version D)
(design
(source F:/kicad-launchpad/testing/demos/test_pads_inside_pads/test_pads_inside_pads.sch)
(date "09/01/2014 15:29:02")
(tool "eeschema (2014-01-08 BZR 4616)-product"))
(components
(comp (ref P4)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 4EE5056D))
(comp (ref P3)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 4EE5056C))
(comp (ref P1)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(sheetpath (names /) (tstamps /))
(tstamp 4EDF7CC5))
(comp (ref P2)
(value CONN_1)
(libsource (lib conn) (part CONN_1))
(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)))))

View File

@ -1,10 +1,13 @@
EESchema-LIBRARY Version 2.3 Date: 02/12/2009 10:35:45
EESchema-LIBRARY Version 2.3
#encoding utf-8
#
# +12V
#
DEF +12V #PWR 0 0 N Y 1 F P
F0 "#PWR" 0 -50 20 H I 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
X +12V 1 0 0 0 U 20 30 0 0 W N
C 0 60 20 0 1 0 N
@ -17,6 +20,8 @@ ENDDEF
DEF -12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 130 20 H I 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
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
@ -29,6 +34,8 @@ ENDDEF
DEF 74HCT04 U 0 30 Y Y 6 F N
F0 "U" 150 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
DRAW
P 4 0 0 0 -150 150 -150 -150 150 0 -150 150 N
@ -66,6 +73,8 @@ ENDDEF
DEF 7805 U 0 30 N Y 1 F N
F0 "U" 150 -196 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
DRAW
S -200 -150 200 150 0 1 0 N
@ -78,16 +87,18 @@ ENDDEF
# 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
F0 "C" 0 100 40 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
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
P 2 0 1 20 -80 -30 80 -30 N
P 2 0 1 20 -80 30 80 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
@ -98,6 +109,8 @@ ENDDEF
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
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H 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
@ -110,6 +123,8 @@ ENDDEF
DEF CONN_2X2 P 0 40 Y N 1 F N
F0 "P" 0 150 50 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
S -100 100 100 -100 0 1 0 N
X 1 1 -400 50 300 R 60 60 1 1 P I
@ -124,6 +139,8 @@ ENDDEF
DEF CONN_3 K 0 40 Y N 1 F N
F0 "K" -50 0 50 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
S -100 150 100 -150 0 1 0 N
X P1 1 -350 100 250 R 60 60 1 1 P I
@ -135,15 +152,17 @@ ENDDEF
# CP
#
DEF CP C 0 10 N N 1 F N
F0 "C" 50 100 50 H V L CNN
F1 "CP" 50 -100 50 H V L CNN
F0 "C" 50 100 40 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
$FPLIST
CP*
SM*
$ENDFPLIST
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
X ~ 1 0 200 150 D 40 40 1 1 P
X ~ 2 0 -200 150 U 40 40 1 1 P
@ -152,9 +171,11 @@ ENDDEF
#
# 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
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
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
DEF DB25 J 0 40 Y N 1 F N
F0 "J" 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
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
@ -261,6 +284,8 @@ ENDDEF
DEF DB9 J 0 40 Y N 1 F N
F0 "J" 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
C -70 -400 30 0 1 0 N
C -70 -200 30 0 1 0 N
@ -309,6 +334,8 @@ ENDDEF
DEF DIODE D 0 40 N N 1 F N
F0 "D" 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
D?
S*
@ -326,6 +353,8 @@ ENDDEF
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
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V 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
@ -337,6 +366,8 @@ ENDDEF
DEF LED D 0 40 Y N 1 F N
F0 "D" 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
LED-3MM
LED-5MM
@ -361,6 +392,8 @@ ENDDEF
DEF LM318N U 0 30 Y Y 1 F N
F0 "U" 100 300 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
P 2 0 1 0 -200 -200 -200 200 N
P 2 0 1 0 -200 200 200 0 N
@ -382,25 +415,29 @@ 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
F0 "#FLG" 0 95 30 H I 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
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
P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 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
F0 "R" 80 0 40 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
R?
SM0603
SM0805
R?-*
SM1206
$ENDFPLIST
DRAW
S -40 150 40 -150 0 1 12 N
@ -414,6 +451,8 @@ ENDDEF
DEF RAM_32KO U 0 40 Y Y 1 F N
F0 "U" 150 900 70 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
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
@ -452,6 +491,8 @@ ENDDEF
DEF SW_PUSH SW 0 40 N N 1 F N
F0 "SW" 150 110 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
S -170 50 170 60 0 1 0 N
P 4 0 1 0 -40 60 -30 90 30 90 40 60 N
@ -465,6 +506,8 @@ ENDDEF
DEF TDA8702 U 0 40 Y Y 1 F N
F0 "U" 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
S -500 700 500 -700 0 1 0 N
X VREF 1 -800 -400 300 R 50 50 1 1 B
@ -509,6 +552,8 @@ ENDDEF
DEF VCC #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 100 30 H I 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
X VCC 1 0 0 0 U 20 20 0 0 W N
C 0 50 20 0 1 0 N
@ -521,6 +566,8 @@ ENDDEF
DEF XC95108PC84 U 0 30 Y Y 1 F N
F0 "U" 550 2550 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
S -850 2450 850 -1850 0 1 0 N
X P1 1 -1150 1850 300 R 60 60 1 1 B

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
update=07/03/2011 07:11:33
update=09/01/2014 18:43:43
version=1
last_client=cvpcb
last_client=kicad
[pcbnew]
version=1
LibDir=
@ -118,12 +118,10 @@ LibName8=memory
LibName9=xilinx
LibName10=special
LibName11=analog_switches
[general]
version=1
RootSch=carte_test.sch
BoardNm=carte_test.brd
[cvpcb]
version=1
NetIExt=.net
[cvpcb/libraries]
EquName1=devcms
[general]
version=1

File diff suppressed because it is too large Load Diff

View File

@ -83,6 +83,13 @@ double To_User_Unit( EDA_UNITS_T aUnit, double aValue );
*/
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
* is a helper to convert the \a double length \a aValue to a string in inches,

View File

@ -164,18 +164,6 @@ wxString GetIllegalFileNameWxChars();
*/
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
// common/strtok_r.c optionally:
extern "C" char* strtok_r( char* str, const char* delim, char** nextp );

View File

@ -45,6 +45,7 @@
#include <class_drawpanel_gal.h>
#include <view/view.h>
#include <pcb_painter.h>
#include <base_units.h>
DIALOG_GENERALOPTIONS::DIALOG_GENERALOPTIONS( PCB_EDIT_FRAME* parent ) :
DIALOG_GENERALOPTIONS_BOARDEDITOR_BASE( parent )
@ -70,8 +71,8 @@ void DIALOG_GENERALOPTIONS::init()
wxString rotationAngle;
rotationAngle.Printf( wxT( "%.1f" ), ((double)GetParent()->GetRotationAngle()) / 10.0 );
m_RotationAngle->SetValue( RemoveTrailingZeros( rotationAngle ) );
rotationAngle = AngleToStringDegrees( (double)GetParent()->GetRotationAngle() );
m_RotationAngle->SetValue( rotationAngle );
wxString timevalue;
timevalue << GetParent()->GetAutoSaveInterval() / 60;