Skip to content

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

Update old demo board files. Minor code cleaning.

parent f71418ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3454 additions and 4875 deletions
common/gr_basic.cpp
View file @ 9a7116d4
...@@ -47,9 +47,6 @@ static const bool NOT_FILLED = false; ...@@ -47,9 +47,6 @@ static const bool NOT_FILLED = false;
// For draw mode = XOR GR_XOR or GR_NXOR by background color // For draw mode = XOR GR_XOR or GR_NXOR by background color
GR_DRAWMODE g_XorMode = GR_NXOR; GR_DRAWMODE g_XorMode = GR_NXOR;
// Background color of the design frame
EDA_COLOR_T g_DrawBgColor = WHITE;
static void ClipAndDrawPoly( EDA_RECT * ClipBox, wxDC * DC, wxPoint Points[], static void ClipAndDrawPoly( EDA_RECT * ClipBox, wxDC * DC, wxPoint Points[],
int n ); int n );
...@@ -81,7 +78,7 @@ static wxDC* s_DC_lastDC = NULL; ...@@ -81,7 +78,7 @@ static wxDC* s_DC_lastDC = NULL;
/*** /***
* Utility for the line clipping code, returns the boundary code of * Utility for the line clipping code, returns the boundary code of
* a point. Bit allocation is arbitrary * a point. Bit allocation is arbitrary
*/ */
static inline int clipOutCode( const EDA_RECT *aClipBox, int x, int y ) static inline int clipOutCode( const EDA_RECT *aClipBox, int x, int y )
{ {
...@@ -124,7 +121,7 @@ static bool clipLine( const EDA_RECT *aClipBox, int &x1, int &y1, int &x2, int & ...@@ -124,7 +121,7 @@ static bool clipLine( const EDA_RECT *aClipBox, int &x1, int &y1, int &x2, int &
// Fast reject // Fast reject
if( outcode1 & outcode2 ) if( outcode1 & outcode2 )
return true; return true;
// Choose a side to clip // Choose a side to clip
int thisoutcode, x, y; int thisoutcode, x, y;
if( outcode1 ) if( outcode1 )
...@@ -140,12 +137,12 @@ static bool clipLine( const EDA_RECT *aClipBox, int &x1, int &y1, int &x2, int & ...@@ -140,12 +137,12 @@ static bool clipLine( const EDA_RECT *aClipBox, int &x1, int &y1, int &x2, int &
{ {
y = aClipBox->GetBottom(); y = aClipBox->GetBottom();
x = x1 + (x2 - x1) * int64_t(y - y1) / (y2 - y1); x = x1 + (x2 - x1) * int64_t(y - y1) / (y2 - y1);
} }
else if( thisoutcode & 2 ) // Clip the top else if( thisoutcode & 2 ) // Clip the top
{ {
y = aClipBox->GetY(); y = aClipBox->GetY();
x = x1 + (x2 - x1) * int64_t(y - y1) / (y2 - y1); x = x1 + (x2 - x1) * int64_t(y - y1) / (y2 - y1);
} }
else if( thisoutcode & 8 ) // Clip the right else if( thisoutcode & 8 ) // Clip the right
{ {
x = aClipBox->GetRight(); x = aClipBox->GetRight();
......
demos/complex_hierarchy/complex_hierarchy-cache.lib deleted 100644 → 0
View file @ f71418ac
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
P 4 0 1 0 0 0 0 40 0 40 0 40 N
ENDDRAW
ENDDEF
#
# +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
P 3 0 1 0 0 0 0 40 0 40 N
ENDDRAW
ENDDEF
#
# -VAA
#
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
P 7 0 1 0 0 80 30 50 -20 50 -30 50 0 80 0 80 0 80 F
ENDDRAW
ENDDEF
#
# 7805
#
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
X VI VI -400 50 200 R 40 40 1 1 I
X VO VO 400 50 200 L 40 40 1 1 w
X GND GND 0 -250 100 U 40 40 1 1 I
ENDDRAW
ENDDEF
#
# C
#
DEF C C 0 10 N Y 1 F N
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 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
ENDDEF
#
# CONN_2
#
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
X PM 2 -350 -100 250 R 60 60 1 1 P I
ENDDRAW
ENDDEF
#
# CP
#
DEF CP C 0 10 N N 1 F N
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 -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
ENDDRAW
ENDDEF
#
# DIODE
#
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*
$ENDFPLIST
DRAW
P 2 0 1 6 50 50 50 -50 N
P 3 0 1 0 -50 50 50 0 -50 -50 F
X A 1 -200 0 150 R 40 40 1 1 P
X K 2 200 0 150 L 40 40 1 1 P
ENDDRAW
ENDDEF
#
# GND
#
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
ENDDRAW
ENDDEF
#
# HT
#
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
P 6 0 1 0 0 40 20 20 0 70 -20 20 0 40 0 40 N
ENDDRAW
ENDDEF
#
# ICL7660
#
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
X GND 3 -50 -650 300 U 60 60 1 1 W
X CAP- 4 -850 50 300 R 60 60 1 1 I
X VOUT 5 850 150 300 L 60 60 1 1 w
X LV 6 850 -150 300 L 60 60 1 1 I
X OSC 7 -850 -150 300 R 60 60 1 1 I
X V+ 8 -50 650 300 D 60 60 1 1 W
ENDDRAW
ENDDEF
#
# LM358
#
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
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
X V+ 8 -100 400 250 D 40 40 0 1 W
X ~ 1 500 0 300 L 40 40 1 1 O
X - 2 -500 -100 300 R 40 40 1 1 I
X + 3 -500 100 300 R 40 40 1 1 I
X + 5 -500 100 300 R 40 40 2 1 I
X - 6 -500 -100 300 R 40 40 2 1 I
X ~ 7 500 0 300 L 40 40 2 1 O
ENDDRAW
ENDDEF
#
# MPSA42
#
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 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
ENDDRAW
ENDDEF
#
# MPSA92
#
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
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
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
ENDDRAW
ENDDEF
#
# POT
#
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
X 1 1 -250 0 100 R 40 40 1 1 P
X 2 2 0 150 80 D 40 40 1 1 P
X 3 3 250 0 100 L 40 40 1 1 P
ENDDRAW
ENDDEF
#
# PWR_FLAG
#
DEF PWR_FLAG #FLG 0 0 N N 1 F P
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 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 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
X ~ 1 0 250 100 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P
ENDDRAW
ENDDEF
#
# VCC
#
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
P 3 0 1 0 0 0 0 30 0 30 N
ENDDRAW
ENDDEF
#
#End Library
demos/ecc83/ecc83-pp-cache.lib
View file @ 9a7116d4
EESchema-LIBRARY Version 2.3 Date: 02/12/2009 10:37:56 EESchema-LIBRARY Version 2.3
#encoding utf-8
# #
# 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
...@@ -23,6 +26,8 @@ ENDDEF ...@@ -23,6 +26,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
...@@ -36,6 +41,7 @@ DEF ECC81 U 0 0 Y Y 3 L N ...@@ -36,6 +41,7 @@ DEF ECC81 U 0 0 Y Y 3 L N
F0 "U" 130 310 50 H V C CNN F0 "U" 130 310 50 H V C CNN
F1 "ECC81" 350 -300 50 H V C CNN F1 "ECC81" 350 -300 50 H V C CNN
F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
F3 "" 0 0 60 H V C CNN
ALIAS ECC83 ALIAS ECC83
DRAW DRAW
P 2 1 0 0 -100 -200 -100 -300 N P 2 1 0 0 -100 -200 -100 -300 N
...@@ -77,6 +83,8 @@ ENDDEF ...@@ -77,6 +83,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
...@@ -86,25 +94,29 @@ ENDDEF ...@@ -86,25 +94,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
......
demos/ecc83/ecc83-pp.kicad_pcb
View file @ 9a7116d4
This diff is collapsed.
demos/ecc83/ecc83-pp.net
View file @ 9a7116d4
# EESchema Netlist Version 1.1 created 27/8/2008-06:26:11 (export (version D)
( (design
( /48B4F266 VALVE-NOVAL_P U1 ECC81_83 {Lib=ECC81_83} (source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch)
( 1 N-000001 ) (date "04/07/2014 20:15:10")
( 2 N-000004 ) (tool "Eeschema (2014-07-02 BZR 4969)-product"))
( 3 N-000005 ) (components
( 4 N-000007 ) (comp (ref U1)
( 5 N-000007 ) (value ECC83)
( 6 N-000008 ) (footprint VALVE-NOVAL_P)
( 7 N-000001 ) (libsource (lib valves) (part ECC83))
( 8 N-000009 ) (sheetpath (names /) (tstamps /))
( 9 N-000002 ) (tstamp 48B4F266))
) (comp (ref P4)
( /456A8ACC $noname P4 CONN_2 {Lib=CONN_2} (value CONN_2)
( 1 N-000007 ) (libsource (lib conn) (part CONN_2))
( 2 N-000002 ) (sheetpath (names /) (tstamps /))
) (tstamp 456A8ACC))
( /4549F4BE $noname C1 10uF {Lib=C} (comp (ref C1)
( 1 N-000008 ) (value 10uF)
( 2 GND ) (libsource (lib device) (part C))
) (sheetpath (names /) (tstamps /))
( /4549F4A5 $noname P3 POWER {Lib=CONN_2} (tstamp 4549F4BE))
( 1 N-000008 ) (comp (ref P3)
( 2 GND ) (value POWER)
) (libsource (lib conn) (part CONN_2))
( /4549F46C $noname P2 OUT {Lib=CONN_2} (sheetpath (names /) (tstamps /))
( 1 N-000006 ) (tstamp 4549F4A5))
( 2 GND ) (comp (ref P2)
) (value OUT)
( /4549F464 $noname P1 IN {Lib=CONN_2} (libsource (lib conn) (part CONN_2))
( 1 GND ) (sheetpath (names /) (tstamps /))
( 2 N-000004 ) (tstamp 4549F46C))
) (comp (ref P1)
( /4549F3BE $noname C2 680nF {Lib=C} (value IN)
( 1 N-000006 ) (libsource (lib conn) (part CONN_2))
( 2 N-000009 ) (sheetpath (names /) (tstamps /))
) (tstamp 4549F464))
( /4549F3AD $noname R3 100K {Lib=R} (comp (ref C2)
( 1 N-000006 ) (value 680nF)
( 2 GND ) (libsource (lib device) (part C))
) (sheetpath (names /) (tstamps /))
( /4549F3A2 $noname R4 47K {Lib=R} (tstamp 4549F3BE))
( 1 N-000004 ) (comp (ref R3)
( 2 GND ) (value 100K)
) (libsource (lib device) (part R))
( /4549F39D $noname R2 1.5K {Lib=R} (sheetpath (names /) (tstamps /))
( 1 N-000005 ) (tstamp 4549F3AD))
( 2 GND ) (comp (ref R4)
) (value 47K)
( /4549F38A $noname R1 1.5K {Lib=R} (libsource (lib device) (part R))
( 1 N-000001 ) (sheetpath (names /) (tstamps /))
( 2 N-000009 ) (tstamp 4549F3A2))
) (comp (ref R2)
) (value 1.5K)
* (libsource (lib device) (part R))
{ Allowed footprints by component: (sheetpath (names /) (tstamps /))
$component C1 (tstamp 4549F39D))
SM* (comp (ref R1)
C? (value 1.5K)
C1-1 (libsource (lib device) (part R))
$endlist (sheetpath (names /) (tstamps /))
$component C2 (tstamp 4549F38A)))
SM* (libparts
C? (libpart (lib device) (part C)
C1-1 (description "Condensateur non polarise")
$endlist (footprints
$component R3 (fp SM*)
R? (fp C?)
SM0603 (fp C1-1))
SM0805 (fields
$endlist (field (name Reference) C)
$component R4 (field (name Value) C))
R? (pins
SM0603 (pin (num 1) (name ~) (type passive))
SM0805 (pin (num 2) (name ~) (type passive))))
$endlist (libpart (lib device) (part R)
$component R2 (description Resistance)
R? (footprints
SM0603 (fp R?)
SM0805 (fp SM0603)
$endlist (fp SM0805)
$component R1 (fp R?-*)
R? (fp SM1206))
SM0603 (fields
SM0805 (field (name Reference) R)
$endlist (field (name Value) R))
$endfootprintlist (pins
} (pin (num 1) (name ~) (type passive))
{ Pin List by Nets (pin (num 2) (name ~) (type passive))))
Net 1 "" (libpart (lib conn) (part CONN_2)
R1 1 (description "Symbole general de connecteur")
U1 7 (fields
U1 1 (field (name Reference) P)
Net 2 "" (field (name Value) CONN_2))
P4 2 (pins
U1 9 (pin (num 1) (name P1) (type passive))
Net 3 "GND" (pin (num 2) (name PM) (type passive))))
R2 2 (libpart (lib valves) (part ECC81)
R4 2 (aliases
R3 2 (alias ECC83))
P1 1 (fields
P2 2 (field (name Reference) U)
P3 2 (field (name Value) ECC81)
C1 2 (field (name Footprint) VALVE-NOVAL_P))
Net 4 "" (pins
P1 2 (pin (num 1) (name A) (type output))
R4 1 (pin (num 2) (name G) (type input))
U1 2 (pin (num 3) (name K) (type BiDi))
Net 5 "" (pin (num 4) (name F1) (type power_in))
R2 1 (pin (num 5) (name F1) (type power_in))
U1 3 (pin (num 6) (name A) (type output))
Net 6 "" (pin (num 7) (name G) (type input))
P2 1 (pin (num 8) (name K) (type BiDi))
R3 1 (pin (num 9) (name F2) (type power_in)))))
C2 1 (libraries
Net 7 "" (library (logical device)
P4 1 (uri f:\kicad\share\library\device.lib))
U1 4 (library (logical conn)
U1 5 (uri f:\kicad\share\library\conn.lib))
Net 8 "" (library (logical valves)
P3 1 (uri f:\kicad\share\library\valves.lib)))
U1 6 (nets
C1 1 (net (code 1) (name "Net-(C1-Pad1)")
Net 9 "" (node (ref U1) (pin 6))
U1 8 (node (ref C1) (pin 1))
C2 2 (node (ref P3) (pin 1)))
R1 2 (net (code 2) (name "Net-(R2-Pad1)")
} (node (ref R2) (pin 1))
#End (node (ref U1) (pin 3)))
(net (code 3) (name "Net-(C2-Pad2)")
(node (ref U1) (pin 8))
(node (ref R1) (pin 2))
(node (ref C2) (pin 2)))
(net (code 4) (name "Net-(C2-Pad1)")
(node (ref C2) (pin 1))
(node (ref R3) (pin 1))
(node (ref P2) (pin 1)))
(net (code 5) (name "Net-(P4-Pad2)")
(node (ref U1) (pin 9))
(node (ref P4) (pin 2)))
(net (code 6) (name "Net-(P1-Pad2)")
(node (ref U1) (pin 2))
(node (ref P1) (pin 2))
(node (ref R4) (pin 1)))
(net (code 7) (name "Net-(R1-Pad1)")
(node (ref R1) (pin 1))
(node (ref U1) (pin 1))
(node (ref U1) (pin 7)))
(net (code 8) (name GND)
(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 5))
(node (ref P4) (pin 1)))))
\ No newline at end of file
demos/ecc83/ecc83-pp.sch
View file @ 9a7116d4
EESchema Schematic File Version 2 EESchema Schematic File Version 2
LIBS:power,device,conn,valves,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,.\ecc83-pp.cache LIBS:power
EELAYER 23 0 LIBS:device
LIBS:conn
LIBS:valves
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:microcontrollers
LIBS:microchip
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:digital-audio
LIBS:philips
LIBS:display
LIBS:cypress
LIBS:siliconi
LIBS:contrib
EELAYER 24 0
EELAYER END EELAYER END
$Descr A4 11700 8267 $Descr A4 11693 8268
encoding utf-8
Sheet 1 1 Sheet 1 1
Title "ECC Push-Pull" Title "ECC Push-Pull"
Date "11 dec 2006" Date "vendredi 04 juillet 2014"
Rev "0.1" Rev "0.1"
Comp "" Comp ""
Comment1 "" Comment1 ""
...@@ -19,32 +44,29 @@ Wire Wire Line ...@@ -19,32 +44,29 @@ Wire Wire Line
5750 3850 5750 4050 5750 3850 5750 4050
Connection ~ 4450 4500 Connection ~ 4450 4500
Wire Wire Line Wire Wire Line
4450 5400 4450 4450 4450 4450 4450 5400
Wire Wire Line Wire Wire Line
4450 4450 4650 4450 4450 4450 4650 4450
Wire Wire Line Wire Wire Line
9850 6350 9950 6350 1800 6650 1900 6650
Wire Wire Line Wire Wire Line
9950 6350 9950 6150 1900 6650 1900 6450
Wire Wire Line Wire Wire Line
4150 5300 4150 5000 4150 5000 4150 5300
Wire Wire Line Wire Wire Line
6950 5150 6950 5000 6950 5150 6950 5000
Wire Wire Line Wire Wire Line
4150 4800 4450 4800 4150 4800 4450 4800
Connection ~ 4450 4800 Connection ~ 4450 4800
Wire Wire Line Wire Wire Line
6950 4350 6950 4050 6950 4150 6950 4050
Connection ~ 6950 4250
Wire Wire Line Wire Wire Line
4850 4850 4850 5400 4850 4850 4850 5400
Wire Wire Line Wire Wire Line
6300 3900 6300 4000 6300 3900 6300 4000
Wire Wire Line Wire Wire Line
6950 3850 5750 3850 5750 3850 6950 3850
Connection ~ 6700 3850 Connection ~ 6700 3850
Wire Wire Line
6700 4250 6950 4250
Wire Wire Line Wire Wire Line
6150 4450 6150 3900 6150 4450 6150 3900
Connection ~ 6150 3900 Connection ~ 6150 3900
...@@ -56,17 +78,17 @@ Wire Wire Line ...@@ -56,17 +78,17 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
6700 4800 6700 5400 6700 4800 6700 5400
Wire Wire Line Wire Wire Line
10050 6150 10050 6350 2000 6450 2000 6650
Wire Wire Line Wire Wire Line
10050 6250 9850 6250 2000 6550 1800 6550
Connection ~ 10050 6250 Connection ~ 2000 6550
Wire Wire Line Wire Wire Line
4100 5250 4150 5250 4100 5250 4150 5250
Connection ~ 4150 5250 Connection ~ 4150 5250
Wire Wire Line Wire Wire Line
9850 6250 9850 6150 1800 6550 1800 6450
Wire Wire Line Wire Wire Line
6300 3900 4950 3900 4950 3900 6300 3900
Wire Wire Line Wire Wire Line
4950 3900 4950 4050 4950 3900 4950 4050
Wire Wire Line Wire Wire Line
...@@ -76,20 +98,22 @@ Wire Wire Line ...@@ -76,20 +98,22 @@ Wire Wire Line
$Comp $Comp
L ECC83 U1 L ECC83 U1
U 3 1 48B4F266 U 3 1 48B4F266
P 9950 5700 P 1900 6000
F 0 "U1" H 10080 6010 50 0000 C C F 0 "U1" H 2030 6310 50 0000 C CNN
F 1 "ECC81_83" H 10300 5400 50 0000 C C F 1 "ECC83" H 2250 5700 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 10220 5300 50 0001 C C F 2 "VALVE-NOVAL_P" H 2170 5600 50 0001 C CNN
3 9950 5700 F 3 "" H 1900 6000 60 0001 C CNN
3 1900 6000
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L ECC83 U1 L ECC83 U1
U 2 1 48B4F263 U 2 1 48B4F263
P 4950 4450 P 4950 4450
F 0 "U1" H 5080 4760 50 0000 C C F 0 "U1" H 5080 4760 50 0000 C CNN
F 1 "ECC83" H 5150 4100 50 0000 C C F 1 "ECC83" H 5150 4100 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 5220 4050 50 0001 C C F 2 "VALVE-NOVAL_P" H 5220 4050 50 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
$EndComp $EndComp
...@@ -97,9 +121,10 @@ $Comp ...@@ -97,9 +121,10 @@ $Comp
L ECC83 U1 L ECC83 U1
U 1 1 48B4F256 U 1 1 48B4F256
P 5750 4450 P 5750 4450
F 0 "U1" H 5880 4760 50 0000 C C F 0 "U1" H 5880 4760 50 0000 C CNN
F 1 "ECC83" H 5500 4150 50 0000 C C F 1 "ECC83" H 5500 4150 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 6020 4050 50 0001 C C F 2 "VALVE-NOVAL_P" H 6020 4050 50 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
$EndComp $EndComp
...@@ -107,8 +132,10 @@ $Comp ...@@ -107,8 +132,10 @@ $Comp
L GND #PWR01 L GND #PWR01
U 1 1 457DBAF8 U 1 1 457DBAF8
P 6950 5150 P 6950 5150
F 0 "#PWR01" H 6950 5150 30 0001 C C F 0 "#PWR01" H 6950 5150 30 0001 C CNN
F 1 "GND" H 6950 5080 30 0001 C C F 1 "GND" H 6950 5080 30 0001 C CNN
F 2 "" H 6950 5150 60 0001 C CNN
F 3 "" H 6950 5150 60 0001 C CNN
1 6950 5150 1 6950 5150
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -116,8 +143,10 @@ $Comp ...@@ -116,8 +143,10 @@ $Comp
L GND #PWR02 L GND #PWR02
U 1 1 457DBAF5 U 1 1 457DBAF5
P 6700 5900 P 6700 5900
F 0 "#PWR02" H 6700 5900 30 0001 C C F 0 "#PWR02" H 6700 5900 30 0001 C CNN
F 1 "GND" H 6700 5830 30 0001 C C F 1 "GND" H 6700 5830 30 0001 C CNN
F 2 "" H 6700 5900 60 0001 C CNN
F 3 "" H 6700 5900 60 0001 C CNN
1 6700 5900 1 6700 5900
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -125,8 +154,10 @@ $Comp ...@@ -125,8 +154,10 @@ $Comp
L GND #PWR03 L GND #PWR03
U 1 1 457DBAF1 U 1 1 457DBAF1
P 4850 5900 P 4850 5900
F 0 "#PWR03" H 4850 5900 30 0001 C C F 0 "#PWR03" H 4850 5900 30 0001 C CNN
F 1 "GND" H 4850 5830 30 0001 C C F 1 "GND" H 4850 5830 30 0001 C CNN
F 2 "" H 4850 5900 60 0001 C CNN
F 3 "" H 4850 5900 60 0001 C CNN
1 4850 5900 1 4850 5900
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -134,8 +165,10 @@ $Comp ...@@ -134,8 +165,10 @@ $Comp
L GND #PWR04 L GND #PWR04
U 1 1 457DBAEF U 1 1 457DBAEF
P 4450 5900 P 4450 5900
F 0 "#PWR04" H 4450 5900 30 0001 C C F 0 "#PWR04" H 4450 5900 30 0001 C CNN
F 1 "GND" H 4450 5830 30 0001 C C F 1 "GND" H 4450 5830 30 0001 C CNN
F 2 "" H 4450 5900 60 0001 C CNN
F 3 "" H 4450 5900 60 0001 C CNN
1 4450 5900 1 4450 5900
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -143,26 +176,32 @@ $Comp ...@@ -143,26 +176,32 @@ $Comp
L PWR_FLAG #FLG05 L PWR_FLAG #FLG05
U 1 1 457DBAC0 U 1 1 457DBAC0
P 4100 5250 P 4100 5250
F 0 "#FLG05" H 4100 5520 30 0001 C C F 0 "#FLG05" H 4100 5520 30 0001 C CNN
F 1 "PWR_FLAG" H 4100 5480 30 0000 C C F 1 "PWR_FLAG" H 4100 5480 30 0000 C CNN
F 2 "" H 4100 5250 60 0001 C CNN
F 3 "" H 4100 5250 60 0001 C CNN
1 4100 5250 1 4100 5250
0 -1 -1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L CONN_2 P4 L CONN_2 P4
U 1 1 456A8ACC U 1 1 456A8ACC
P 9950 6700 P 1900 7000
F 0 "P4" V 9900 6700 40 0000 C C F 0 "P4" V 1850 7000 40 0000 C CNN
F 1 "CONN_2" V 10000 6700 40 0000 C C F 1 "CONN_2" V 1950 7000 40 0000 C CNN
1 9950 6700 F 2 "" H 1900 7000 60 0001 C CNN
F 3 "" H 1900 7000 60 0001 C CNN
1 1900 7000
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
L C C1 L C C1
U 1 1 4549F4BE U 1 1 4549F4BE
P 6700 4050 P 6700 4050
F 0 "C1" H 6750 4150 50 0000 L C F 0 "C1" H 6750 4150 50 0000 L CNN
F 1 "10uF" H 6450 4150 50 0000 L C F 1 "10uF" H 6450 4150 50 0000 L CNN
F 2 "" 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
$EndComp $EndComp
...@@ -170,26 +209,32 @@ $Comp ...@@ -170,26 +209,32 @@ $Comp
L GND #PWR06 L GND #PWR06
U 1 1 4549F4B9 U 1 1 4549F4B9
P 4150 5300 P 4150 5300
F 0 "#PWR06" H 4150 5300 30 0001 C C F 0 "#PWR06" H 4150 5300 30 0001 C CNN
F 1 "GND" H 4150 5230 30 0001 C C F 1 "GND" H 4150 5230 30 0001 C CNN
F 2 "" H 4150 5300 60 0001 C CNN
F 3 "" H 4150 5300 60 0001 C CNN
1 4150 5300 1 4150 5300
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L GND #PWR07 L GND #PWR07
U 1 1 4549F4B3 U 1 1 4549F4B3
P 6950 4350 P 6950 4150
F 0 "#PWR07" H 6950 4350 30 0001 C C F 0 "#PWR07" H 6950 4150 30 0001 C CNN
F 1 "GND" H 6950 4280 30 0001 C C F 1 "GND" H 6950 4080 30 0001 C CNN
1 6950 4350 F 2 "" H 6950 4150 60 0001 C CNN
F 3 "" H 6950 4150 60 0001 C CNN
1 6950 4150
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L CONN_2 P3 L CONN_2 P3
U 1 1 4549F4A5 U 1 1 4549F4A5
P 7300 3950 P 7300 3950
F 0 "P3" V 7250 3950 40 0000 C C F 0 "P3" V 7250 3950 40 0000 C CNN
F 1 "POWER" V 7350 3950 40 0000 C C F 1 "POWER" V 7350 3950 40 0000 C CNN
F 2 "" 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
$EndComp $EndComp
...@@ -197,8 +242,10 @@ $Comp ...@@ -197,8 +242,10 @@ $Comp
L CONN_2 P2 L CONN_2 P2
U 1 1 4549F46C U 1 1 4549F46C
P 7300 4900 P 7300 4900
F 0 "P2" V 7250 4900 40 0000 C C F 0 "P2" V 7250 4900 40 0000 C CNN
F 1 "OUT" V 7350 4900 40 0000 C C F 1 "OUT" V 7350 4900 40 0000 C CNN
F 2 "" 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
$EndComp $EndComp
...@@ -206,8 +253,10 @@ $Comp ...@@ -206,8 +253,10 @@ $Comp
L CONN_2 P1 L CONN_2 P1
U 1 1 4549F464 U 1 1 4549F464
P 3800 4900 P 3800 4900
F 0 "P1" V 3750 4900 40 0000 C C F 0 "P1" V 3750 4900 40 0000 C CNN
F 1 "IN" V 3850 4900 40 0000 C C F 1 "IN" V 3850 4900 40 0000 C CNN
F 2 "" 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
$EndComp $EndComp
...@@ -215,8 +264,10 @@ $Comp ...@@ -215,8 +264,10 @@ $Comp
L C C2 L C C2
U 1 1 4549F3BE U 1 1 4549F3BE
P 6500 4800 P 6500 4800
F 0 "C2" H 6550 4900 50 0000 L C F 0 "C2" H 6550 4900 50 0000 L CNN
F 1 "680nF" H 6550 4700 50 0000 L C F 1 "680nF" H 6550 4700 50 0000 L CNN
F 2 "" 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
$EndComp $EndComp
...@@ -224,8 +275,10 @@ $Comp ...@@ -224,8 +275,10 @@ $Comp
L R R3 L R R3
U 1 1 4549F3AD U 1 1 4549F3AD
P 6700 5650 P 6700 5650
F 0 "R3" V 6780 5650 50 0000 C C F 0 "R3" V 6780 5650 50 0000 C CNN
F 1 "100K" V 6700 5650 50 0000 C C F 1 "100K" V 6700 5650 50 0000 C CNN
F 2 "" 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
$EndComp $EndComp
...@@ -233,8 +286,10 @@ $Comp ...@@ -233,8 +286,10 @@ $Comp
L R R4 L R R4
U 1 1 4549F3A2 U 1 1 4549F3A2
P 4450 5650 P 4450 5650
F 0 "R4" V 4530 5650 50 0000 C C F 0 "R4" V 4530 5650 50 0000 C CNN
F 1 "47K" V 4450 5650 50 0000 C C F 1 "47K" V 4450 5650 50 0000 C CNN
F 2 "" 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
$EndComp $EndComp
...@@ -242,8 +297,10 @@ $Comp ...@@ -242,8 +297,10 @@ $Comp
L R R2 L R R2
U 1 1 4549F39D U 1 1 4549F39D
P 4850 5650 P 4850 5650
F 0 "R2" V 4930 5650 50 0000 C C F 0 "R2" V 4930 5650 50 0000 C CNN
F 1 "1.5K" V 4850 5650 50 0000 C C F 1 "1.5K" V 4850 5650 50 0000 C CNN
F 2 "" 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
$EndComp $EndComp
...@@ -251,9 +308,22 @@ $Comp ...@@ -251,9 +308,22 @@ $Comp
L R R1 L R R1
U 1 1 4549F38A U 1 1 4549F38A
P 6300 4250 P 6300 4250
F 0 "R1" V 6380 4250 50 0000 C C F 0 "R1" V 6380 4250 50 0000 C CNN
F 1 "1.5K" V 6300 4250 50 0000 C C F 1 "1.5K" V 6300 4250 50 0000 C CNN
F 2 "" 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 GND #PWR08
U 1 1 53B6F370
P 6700 4250
F 0 "#PWR08" H 6700 4250 30 0001 C CNN
F 1 "GND" H 6700 4180 30 0001 C CNN
F 2 "" H 6700 4250 60 0001 C CNN
F 3 "" H 6700 4250 60 0001 C CNN
1 6700 4250
1 0 0 -1
$EndComp
$EndSCHEMATC $EndSCHEMATC
demos/ecc83/ecc83-pp_v2-cache.lib
View file @ 9a7116d4
EESchema-LIBRARY Version 2.3 Date: 30/12/2010 18:27:52 EESchema-LIBRARY Version 2.3
#encoding utf-8
# #
# 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
...@@ -23,6 +26,8 @@ ENDDEF ...@@ -23,6 +26,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
...@@ -36,6 +41,7 @@ DEF ECC81 U 0 0 Y Y 3 L N ...@@ -36,6 +41,7 @@ DEF ECC81 U 0 0 Y Y 3 L N
F0 "U" 130 310 50 H V C CNN F0 "U" 130 310 50 H V C CNN
F1 "ECC81" 350 -300 50 H V C CNN F1 "ECC81" 350 -300 50 H V C CNN
F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN F2 "VALVE-NOVAL_P" 270 -400 50 H I C CNN
F3 "" 0 0 60 H V C CNN
ALIAS ECC83 ALIAS ECC83
DRAW DRAW
P 2 1 0 0 -100 -200 -100 -300 N P 2 1 0 0 -100 -200 -100 -300 N
...@@ -77,6 +83,8 @@ ENDDEF ...@@ -77,6 +83,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
...@@ -86,20 +94,23 @@ ENDDEF ...@@ -86,20 +94,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
......
demos/ecc83/ecc83-pp_v2.kicad_pcb
View file @ 9a7116d4
This diff is collapsed.
demos/ecc83/ecc83-pp_v2.pro
View file @ 9a7116d4
update=11/12/2006-20:37:39 update=04/07/2014 20:10:13
last_client=pcbnew last_client=kicad
[general] [general]
version=1 version=1
RootSch=ecc83-pp.sch RootSch=ecc83-pp.sch
...@@ -65,65 +65,21 @@ LibName24=siliconi ...@@ -65,65 +65,21 @@ LibName24=siliconi
LibName25=contrib LibName25=contrib
[pcbnew] [pcbnew]
version=1 version=1
PadDrlX=760 PageLayoutDescrFile=
PadDimH=1100 LastNetListRead=ecc83-pp_v2.net
PadDimV=550 UseCmpFile=0
PadForm=1 PadDrill=1.9304
PadMask=14745599 PadDrillOvalY=1.9304
ViaDiam=450 PadSizeH=2.794
ViaDril=250 PadSizeV=1.397
Isol=60 PcbTextSizeV=2.032
Countlayer=2 PcbTextSizeH=1.524
Lpiste=340 PcbTextThickness=0.3048
RouteTo=15 ModuleTextSizeV=1.524
RouteBo=0 ModuleTextSizeH=1.524
TypeVia=3 ModuleTextSizeThickness=0.3048
Segm45=1 SolderMaskClearance=0.254
Racc45=1 SolderMaskMinWidth=0
Unite=0 DrawSegmentWidth=0.381
SegFill=1 BoardOutlineThickness=0.381
SegAffG=0 ModuleOutlineThickness=0.381
NewAffG=1
PadFill=1
PadAffG=1
PadSNum=1
ModAffC=0
ModAffT=0
PcbAffT=0
SgPcb45=1
TxtPcbV=800
TxtPcbH=600
TxtModV=600
TxtModH=600
TxtModW=120
HPGLnum=1
HPGdiam=15
HPGLSpd=20
HPGLrec=2
HPGLorg=0
GERBmin=15
VEgarde=100
DrawLar=150
EdgeLar=150
TxtLar=120
MSegLar=150
ForPlot=1
WpenSer=10
UserGrX=0,01
UserGrY=0,01
UserGrU=1
DivGrPc=1
TimeOut=600
MaxLnkS=3
ShowRat=0
ShowMRa=1
[pcbnew/libraries]
LibDir=
LibName1=supports
LibName2=valves
LibName3=connect
LibName4=discret
LibName5=pin_array
LibName6=divers
LibName7=libcms
LibName8=display
demos/ecc83/ecc83-pp_v2.sch
View file @ 9a7116d4
EESchema Schematic File Version 2 EESchema Schematic File Version 2
LIBS:power,device,valves,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,microchip,analog_switches,motorola,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib LIBS:power
EELAYER 23 0 LIBS:device
LIBS:valves
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:microcontrollers
LIBS:microchip
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:digital-audio
LIBS:philips
LIBS:display
LIBS:cypress
LIBS:siliconi
LIBS:contrib
LIBS:ecc83-pp_v2-cache
EELAYER 24 0
EELAYER END EELAYER END
$Descr A4 11700 8267 $Descr A4 11693 8268
encoding utf-8
Sheet 1 1 Sheet 1 1
Title "ECC Push-Pull" Title "ECC Push-Pull"
Date "11 dec 2006" Date "11 dec 2006"
...@@ -23,9 +49,9 @@ Wire Wire Line ...@@ -23,9 +49,9 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
4450 4450 4650 4450 4450 4450 4650 4450
Wire Wire Line Wire Wire Line
9850 6350 9950 6350 1900 6750 2000 6750
Wire Wire Line Wire Wire Line
9950 6350 9950 6150 2000 6750 2000 6550
Wire Wire Line Wire Wire Line
4150 5300 4150 5000 4150 5300 4150 5000
Wire Wire Line Wire Wire Line
...@@ -56,15 +82,15 @@ Wire Wire Line ...@@ -56,15 +82,15 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
6700 4800 6700 5400 6700 4800 6700 5400
Wire Wire Line Wire Wire Line
10050 6150 10050 6350 2100 6550 2100 6750
Wire Wire Line Wire Wire Line
10050 6250 9850 6250 2100 6650 1900 6650
Connection ~ 10050 6250 Connection ~ 2100 6650
Wire Wire Line Wire Wire Line
4100 5250 4150 5250 4100 5250 4150 5250
Connection ~ 4150 5250 Connection ~ 4150 5250
Wire Wire Line Wire Wire Line
9850 6250 9850 6150 1900 6650 1900 6550
Wire Wire Line Wire Wire Line
6300 3900 4950 3900 6300 3900 4950 3900
Wire Wire Line Wire Wire Line
...@@ -76,20 +102,22 @@ Wire Wire Line ...@@ -76,20 +102,22 @@ Wire Wire Line
$Comp $Comp
L ECC83 U1 L ECC83 U1
U 3 1 48B4F266 U 3 1 48B4F266
P 9950 5700 P 2000 6100
F 0 "U1" H 10080 6010 50 0000 C C F 0 "U1" H 2130 6410 50 0000 C CNN
F 1 "ECC81_83" H 10300 5400 50 0000 C C F 1 "ECC83" H 2350 5800 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 10220 5300 50 0001 C C F 2 "ECC-83-1" H 2450 5650 50 0000 C CNN
3 9950 5700 F 3 "" H 2000 6100 60 0001 C CNN
3 2000 6100
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L ECC83 U1 L ECC83 U1
U 2 1 48B4F263 U 2 1 48B4F263
P 4950 4450 P 4950 4450
F 0 "U1" H 5080 4760 50 0000 C C F 0 "U1" H 5080 4760 50 0000 C CNN
F 1 "ECC83" H 5150 4100 50 0000 C C F 1 "ECC83" H 5150 4100 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 5220 4050 50 0001 C C F 2 "ECC-83-1" H 5150 4000 50 0000 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
$EndComp $EndComp
...@@ -97,9 +125,10 @@ $Comp ...@@ -97,9 +125,10 @@ $Comp
L ECC83 U1 L ECC83 U1
U 1 1 48B4F256 U 1 1 48B4F256
P 5750 4450 P 5750 4450
F 0 "U1" H 5880 4760 50 0000 C C F 0 "U1" H 5880 4760 50 0000 C CNN
F 1 "ECC83" H 5500 4150 50 0000 C C F 1 "ECC83" H 5500 4150 50 0000 C CNN
F 2 "VALVE-NOVAL_P" H 6020 4050 50 0001 C C F 2 "ECC-83-1" H 5750 3950 50 0000 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
$EndComp $EndComp
...@@ -107,8 +136,10 @@ $Comp ...@@ -107,8 +136,10 @@ $Comp
L GND #PWR01 L GND #PWR01
U 1 1 457DBAF8 U 1 1 457DBAF8
P 6950 5150 P 6950 5150
F 0 "#PWR01" H 6950 5150 30 0001 C C F 0 "#PWR01" H 6950 5150 30 0001 C CNN
F 1 "GND" H 6950 5080 30 0001 C C F 1 "GND" H 6950 5080 30 0001 C CNN
F 2 "" H 6950 5150 60 0001 C CNN
F 3 "" H 6950 5150 60 0001 C CNN
1 6950 5150 1 6950 5150
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -116,8 +147,10 @@ $Comp ...@@ -116,8 +147,10 @@ $Comp
L GND #PWR02 L GND #PWR02
U 1 1 457DBAF5 U 1 1 457DBAF5
P 6700 5900 P 6700 5900
F 0 "#PWR02" H 6700 5900 30 0001 C C F 0 "#PWR02" H 6700 5900 30 0001 C CNN
F 1 "GND" H 6700 5830 30 0001 C C F 1 "GND" H 6700 5830 30 0001 C CNN
F 2 "" H 6700 5900 60 0001 C CNN
F 3 "" H 6700 5900 60 0001 C CNN
1 6700 5900 1 6700 5900
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -125,8 +158,10 @@ $Comp ...@@ -125,8 +158,10 @@ $Comp
L GND #PWR03 L GND #PWR03
U 1 1 457DBAF1 U 1 1 457DBAF1
P 4850 5900 P 4850 5900
F 0 "#PWR03" H 4850 5900 30 0001 C C F 0 "#PWR03" H 4850 5900 30 0001 C CNN
F 1 "GND" H 4850 5830 30 0001 C C F 1 "GND" H 4850 5830 30 0001 C CNN
F 2 "" H 4850 5900 60 0001 C CNN
F 3 "" H 4850 5900 60 0001 C CNN
1 4850 5900 1 4850 5900
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -134,8 +169,10 @@ $Comp ...@@ -134,8 +169,10 @@ $Comp
L GND #PWR04 L GND #PWR04
U 1 1 457DBAEF U 1 1 457DBAEF
P 4450 5900 P 4450 5900
F 0 "#PWR04" H 4450 5900 30 0001 C C F 0 "#PWR04" H 4450 5900 30 0001 C CNN
F 1 "GND" H 4450 5830 30 0001 C C F 1 "GND" H 4450 5830 30 0001 C CNN
F 2 "" H 4450 5900 60 0001 C CNN
F 3 "" H 4450 5900 60 0001 C CNN
1 4450 5900 1 4450 5900
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -143,26 +180,32 @@ $Comp ...@@ -143,26 +180,32 @@ $Comp
L PWR_FLAG #FLG05 L PWR_FLAG #FLG05
U 1 1 457DBAC0 U 1 1 457DBAC0
P 4100 5250 P 4100 5250
F 0 "#FLG05" H 4100 5520 30 0001 C C F 0 "#FLG05" H 4100 5520 30 0001 C CNN
F 1 "PWR_FLAG" H 4100 5480 30 0000 C C F 1 "PWR_FLAG" H 4100 5480 30 0000 C CNN
F 2 "" H 4100 5250 60 0001 C CNN
F 3 "" H 4100 5250 60 0001 C CNN
1 4100 5250 1 4100 5250
0 -1 -1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L CONN_2 P4 L CONN_2 P4
U 1 1 456A8ACC U 1 1 456A8ACC
P 9950 6700 P 2000 7100
F 0 "P4" V 9900 6700 40 0000 C C F 0 "P4" V 1950 7100 40 0000 C CNN
F 1 "CONN_2" V 10000 6700 40 0000 C C F 1 "CONN_2" V 2050 7100 40 0000 C CNN
1 9950 6700 F 2 "BORNIER2" V 2150 7100 60 0000 C CNN
F 3 "" H 2000 7100 60 0001 C CNN
1 2000 7100
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
L C C1 L C C1
U 1 1 4549F4BE U 1 1 4549F4BE
P 6700 4050 P 6700 4050
F 0 "C1" H 6750 4150 50 0000 L C F 0 "C1" H 6750 4150 50 0000 L CNN
F 1 "10uF" H 6450 4150 50 0000 L C F 1 "10uF" H 6450 4150 50 0000 L CNN
F 2 "C2V10" H 6700 4050 60 0000 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
$EndComp $EndComp
...@@ -170,8 +213,10 @@ $Comp ...@@ -170,8 +213,10 @@ $Comp
L GND #PWR06 L GND #PWR06
U 1 1 4549F4B9 U 1 1 4549F4B9
P 4150 5300 P 4150 5300
F 0 "#PWR06" H 4150 5300 30 0001 C C F 0 "#PWR06" H 4150 5300 30 0001 C CNN
F 1 "GND" H 4150 5230 30 0001 C C F 1 "GND" H 4150 5230 30 0001 C CNN
F 2 "" H 4150 5300 60 0001 C CNN
F 3 "" H 4150 5300 60 0001 C CNN
1 4150 5300 1 4150 5300
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -179,8 +224,10 @@ $Comp ...@@ -179,8 +224,10 @@ $Comp
L GND #PWR07 L GND #PWR07
U 1 1 4549F4B3 U 1 1 4549F4B3
P 6950 4350 P 6950 4350
F 0 "#PWR07" H 6950 4350 30 0001 C C F 0 "#PWR07" H 6950 4350 30 0001 C CNN
F 1 "GND" H 6950 4280 30 0001 C C F 1 "GND" H 6950 4280 30 0001 C CNN
F 2 "" H 6950 4350 60 0001 C CNN
F 3 "" H 6950 4350 60 0001 C CNN
1 6950 4350 1 6950 4350
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
...@@ -188,8 +235,10 @@ $Comp ...@@ -188,8 +235,10 @@ $Comp
L CONN_2 P3 L CONN_2 P3
U 1 1 4549F4A5 U 1 1 4549F4A5
P 7300 3950 P 7300 3950
F 0 "P3" V 7250 3950 40 0000 C C F 0 "P3" V 7250 3950 40 0000 C CNN
F 1 "POWER" V 7350 3950 40 0000 C C F 1 "POWER" V 7350 3950 40 0000 C CNN
F 2 "BORNIER2" H 7300 4150 60 0000 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
$EndComp $EndComp
...@@ -197,8 +246,10 @@ $Comp ...@@ -197,8 +246,10 @@ $Comp
L CONN_2 P2 L CONN_2 P2
U 1 1 4549F46C U 1 1 4549F46C
P 7300 4900 P 7300 4900
F 0 "P2" V 7250 4900 40 0000 C C F 0 "P2" V 7250 4900 40 0000 C CNN
F 1 "OUT" V 7350 4900 40 0000 C C F 1 "OUT" V 7350 4900 40 0000 C CNN
F 2 "BORNIER2" H 7300 5100 60 0000 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
$EndComp $EndComp
...@@ -206,8 +257,10 @@ $Comp ...@@ -206,8 +257,10 @@ $Comp
L CONN_2 P1 L CONN_2 P1
U 1 1 4549F464 U 1 1 4549F464
P 3800 4900 P 3800 4900
F 0 "P1" V 3750 4900 40 0000 C C F 0 "P1" V 3750 4900 40 0000 C CNN
F 1 "IN" V 3850 4900 40 0000 C C F 1 "IN" V 3850 4900 40 0000 C CNN
F 2 "BORNIER2" H 3750 4700 60 0000 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
$EndComp $EndComp
...@@ -215,8 +268,10 @@ $Comp ...@@ -215,8 +268,10 @@ $Comp
L C C2 L C C2
U 1 1 4549F3BE U 1 1 4549F3BE
P 6500 4800 P 6500 4800
F 0 "C2" H 6550 4900 50 0000 L C F 0 "C2" H 6550 4900 50 0000 L CNN
F 1 "680nF" H 6550 4700 50 0000 L C F 1 "680nF" H 6550 4700 50 0000 L CNN
F 2 "CP8" H 6400 4900 60 0000 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
$EndComp $EndComp
...@@ -224,8 +279,10 @@ $Comp ...@@ -224,8 +279,10 @@ $Comp
L R R3 L R R3
U 1 1 4549F3AD U 1 1 4549F3AD
P 6700 5650 P 6700 5650
F 0 "R3" V 6780 5650 50 0000 C C F 0 "R3" V 6780 5650 50 0000 C CNN
F 1 "100K" V 6700 5650 50 0000 C C F 1 "100K" V 6700 5650 50 0000 C CNN
F 2 "R3" H 6700 5650 60 0000 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
$EndComp $EndComp
...@@ -233,8 +290,10 @@ $Comp ...@@ -233,8 +290,10 @@ $Comp
L R R4 L R R4
U 1 1 4549F3A2 U 1 1 4549F3A2
P 4450 5650 P 4450 5650
F 0 "R4" V 4530 5650 50 0000 C C F 0 "R4" V 4530 5650 50 0000 C CNN
F 1 "47K" V 4450 5650 50 0000 C C F 1 "47K" V 4450 5650 50 0000 C CNN
F 2 "R3" V 4350 5650 60 0000 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
$EndComp $EndComp
...@@ -242,8 +301,10 @@ $Comp ...@@ -242,8 +301,10 @@ $Comp
L R R2 L R R2
U 1 1 4549F39D U 1 1 4549F39D
P 4850 5650 P 4850 5650
F 0 "R2" V 4930 5650 50 0000 C C F 0 "R2" V 4930 5650 50 0000 C CNN
F 1 "1.5K" V 4850 5650 50 0000 C C F 1 "1.5K" V 4850 5650 50 0000 C CNN
F 2 "R3" V 4756 5656 60 0000 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
$EndComp $EndComp
...@@ -251,8 +312,10 @@ $Comp ...@@ -251,8 +312,10 @@ $Comp
L R R1 L R R1
U 1 1 4549F38A U 1 1 4549F38A
P 6300 4250 P 6300 4250
F 0 "R1" V 6380 4250 50 0000 C C F 0 "R1" V 6380 4250 50 0000 C CNN
F 1 "1.5K" V 6300 4250 50 0000 C C F 1 "1.5K" V 6300 4250 50 0000 C CNN
F 2 "R3" H 6400 4150 60 0000 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
......
demos/flat_hierarchy/flat_hierarchy-cache.lib deleted 100644 → 0
View file @ f71418ac
This diff is collapsed.
demos/microwave/microwave.kicad_pcb
View file @ 9a7116d4
...@@ -16,20 +16,20 @@ ...@@ -16,20 +16,20 @@
(layers (layers
(15 Dessus.Cu signal) (15 Dessus.Cu signal)
(0 Dessous.Cu signal) (0 Dessous.Cu signal)
(16 Dessous.Adhes user) (16 B.Adhes user)
(17 Dessus.Adhes user) (17 F.Adhes user)
(18 Dessous.Pate user) (18 B.Paste user)
(19 Dessus.Pate user) (19 F.Paste user)
(20 Dessous.SilkS user) (20 B.SilkS user)
(21 Dessus.SilkS user) (21 F.SilkS user)
(22 Dessous.Masque user) (22 B.Mask user)
(23 Dessus.Masque user) (23 F.Mask user)
(24 Dessin.User user) (24 Dwgs.User user)
(25 Cmts.User user) (25 Cmts.User user)
(26 Eco1.User user) (26 Eco1.User user)
(27 Eco2.User user) (27 Eco2.User user)
(28 Contours.Ci user) (28 Edge.Cuts user)
) )
(setup (setup
(last_trace_width 0.254) (last_trace_width 0.254)
...@@ -100,10 +100,10 @@ ...@@ -100,10 +100,10 @@
(module POLY (layer Dessus.Cu) (tedit 42809A8C) (tstamp 0) (module POLY (layer Dessus.Cu) (tedit 42809A8C) (tstamp 0)
(at 203.2 144.78) (at 203.2 144.78)
(fp_text reference POLY (at 0 0.0762) (layer Dessus.SilkS) (fp_text reference POLY (at 0 0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_text value VAL** (at 0 -0.0762) (layer Dessus.SilkS) (fp_text value VAL** (at 0 -0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_poly (pts (xy -135.7503 0) (xy -135.7503 -0.61214) (xy -135.24738 -0.61214) (xy -134.74446 -0.6096) (fp_poly (pts (xy -135.7503 0) (xy -135.7503 -0.61214) (xy -135.24738 -0.61214) (xy -134.74446 -0.6096)
...@@ -387,10 +387,10 @@ ...@@ -387,10 +387,10 @@
(module POLY (layer Dessus.Cu) (tedit 4278D8F6) (tstamp 0) (module POLY (layer Dessus.Cu) (tedit 4278D8F6) (tstamp 0)
(at 203.17968 117.21084) (at 203.17968 117.21084)
(fp_text reference POLY (at 0 0.0762) (layer Dessus.SilkS) (fp_text reference POLY (at 0 0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_text value VAL** (at 0 -0.0762) (layer Dessus.SilkS) (fp_text value VAL** (at 0 -0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_poly (pts (xy -135.7503 0) (xy -135.7503 0.61214) (xy -135.24738 0.61214) (xy -134.74446 0.6096) (fp_poly (pts (xy -135.7503 0) (xy -135.7503 0.61214) (xy -135.24738 0.61214) (xy -134.74446 0.6096)
...@@ -539,10 +539,10 @@ ...@@ -539,10 +539,10 @@
(module POLY (layer Dessus.Cu) (tedit 4278D8F1) (tstamp 0) (module POLY (layer Dessus.Cu) (tedit 4278D8F1) (tstamp 0)
(at 203.2 119.38) (at 203.2 119.38)
(fp_text reference POLY (at 0 0.0762) (layer Dessus.SilkS) (fp_text reference POLY (at 0 0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_text value VAL** (at 0 -0.0762) (layer Dessus.SilkS) (fp_text value VAL** (at 0 -0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_poly (pts (xy -135.7503 0) (xy -135.7503 -0.61214) (xy -135.24738 -0.61214) (xy -134.74446 -0.6096) (fp_poly (pts (xy -135.7503 0) (xy -135.7503 -0.61214) (xy -135.24738 -0.61214) (xy -134.74446 -0.6096)
...@@ -826,10 +826,10 @@ ...@@ -826,10 +826,10 @@
(module POLY (layer Dessus.Cu) (tedit 4278D8EB) (tstamp 0) (module POLY (layer Dessus.Cu) (tedit 4278D8EB) (tstamp 0)
(at 203.18984 121.54408) (at 203.18984 121.54408)
(fp_text reference POLY (at 0 0.0762) (layer Dessus.SilkS) (fp_text reference POLY (at 0 0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_text value VAL** (at 0 -0.0762) (layer Dessus.SilkS) (fp_text value VAL** (at 0 -0.0762) (layer F.SilkS)
(effects (font (size 0.0762 0.0762) (thickness 0.2032))) (effects (font (size 0.0762 0.0762) (thickness 0.2032)))
) )
(fp_poly (pts (xy -135.7503 0) (xy -135.7503 -0.61214) (xy -135.24738 -0.61214) (xy -134.74446 -0.6096) (fp_poly (pts (xy -135.7503 0) (xy -135.7503 -0.61214) (xy -135.24738 -0.61214) (xy -134.74446 -0.6096)
...@@ -976,12 +976,12 @@ ...@@ -976,12 +976,12 @@
) )
) )
(gr_line (start 203.50988 120.54332) (end 203.50988 120.55348) (angle 90) (layer Dessin.User) (width 0.3048)) (gr_line (start 203.50988 120.54332) (end 203.50988 120.55348) (angle 90) (layer Dwgs.User) (width 0.3048))
(gr_line (start 202.84694 120.54332) (end 203.50988 120.54332) (angle 90) (layer Dessin.User) (width 0.3048)) (gr_line (start 202.84694 120.54332) (end 203.50988 120.54332) (angle 90) (layer Dwgs.User) (width 0.3048))
(gr_line (start 162.4076 120.38076) (end 164.10178 120.38076) (angle 90) (layer Dessin.User) (width 0.3048)) (gr_line (start 162.4076 120.38076) (end 164.10178 120.38076) (angle 90) (layer Dwgs.User) (width 0.3048))
(gr_line (start 59.69 201.93) (end 59.69 81.28) (angle 90) (layer Contours.Ci) (width 0.3048)) (gr_line (start 59.69 201.93) (end 59.69 81.28) (angle 90) (layer Edge.Cuts) (width 0.3048))
(gr_line (start 351.79 201.93) (end 59.69 201.93) (angle 90) (layer Contours.Ci) (width 0.3048)) (gr_line (start 351.79 201.93) (end 59.69 201.93) (angle 90) (layer Edge.Cuts) (width 0.3048))
(gr_line (start 351.79 81.28) (end 351.79 201.93) (angle 90) (layer Contours.Ci) (width 0.3048)) (gr_line (start 351.79 81.28) (end 351.79 201.93) (angle 90) (layer Edge.Cuts) (width 0.3048))
(gr_line (start 59.69 81.28) (end 351.79 81.28) (angle 90) (layer Contours.Ci) (width 0.3048)) (gr_line (start 59.69 81.28) (end 351.79 81.28) (angle 90) (layer Edge.Cuts) (width 0.3048))
) )
demos/test_pads_inside_pads/test_pads_inside_pads.kicad_pcb
View file @ 9a7116d4
...@@ -16,19 +16,19 @@ ...@@ -16,19 +16,19 @@
(layers (layers
(15 Dessus signal) (15 Dessus signal)
(0 Dessous signal) (0 Dessous signal)
(16 Dessous.Adhes user) (16 B.Adhes user)
(17 Dessus.Adhes user) (17 F.Adhes user)
(18 Dessous.Pate user) (18 B.Paste user)
(19 Dessus.Pate user) (19 F.Paste user)
(20 Dessous.SilkS user) (20 B.SilkS user)
(21 Dessus.SilkS user) (21 F.SilkS user)
(22 Dessous.Masque user) (22 B.Mask user)
(23 Dessus.Masque user) (23 F.Mask user)
(24 Dessin.User user) (24 Dwgs.User user)
(25 Cmts.User user) (25 Cmts.User user)
(26 Eco1.User user) (26 Eco1.User user)
(27 Eco2.User user) (27 Eco2.User user)
(28 Contours.Ci user) (28 Edge.Cuts user)
) )
(setup (setup
...@@ -107,55 +107,55 @@ ...@@ -107,55 +107,55 @@
(descr "module 1 pin (ou trou mecanique de percage)") (descr "module 1 pin (ou trou mecanique de percage)")
(tags DEV) (tags DEV)
(path /4EDF7CC5) (path /4EDF7CC5)
(fp_text reference P1 (at 0 -3.048) (layer Dessus.SilkS) (fp_text reference P1 (at 0 -3.048) (layer F.SilkS)
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_text value CONN_1 (at 0 2.794) (layer Dessus.SilkS) hide (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_circle (center 0 0) (end 0 -2.286) (layer Dessus.SilkS) (width 0.381)) (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
(pad 1 smd rect (at 0 0) (size 20.32 20.32) (pad 1 smd rect (at 0 0) (size 20.32 20.32)
(layers Dessus Dessus.Pate Dessus.Masque) (layers Dessus F.Paste F.Mask)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at -8.255 -7.62) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at -8.255 -7.62) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at -3.81 -7.62) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at -3.81 -7.62) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at 0 -7.62) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at 0 -7.62) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at 3.81 -7.62) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at 3.81 -7.62) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at 8.255 -7.62) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at 8.255 -7.62) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at 8.255 -4.445) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at 8.255 -4.445) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at 3.81 -4.445) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at 3.81 -4.445) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at 0 -4.445) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at 0 -4.445) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at -3.81 -4.445) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at -3.81 -4.445) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
(pad 1 thru_hole circle (at -8.255 -4.445) (size 1.524 1.524) (drill 0.762) (pad 1 thru_hole circle (at -8.255 -4.445) (size 1.524 1.524) (drill 0.762)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
) )
...@@ -165,15 +165,15 @@ ...@@ -165,15 +165,15 @@
(descr "module 1 pin (ou trou mecanique de percage)") (descr "module 1 pin (ou trou mecanique de percage)")
(tags DEV) (tags DEV)
(path /4EDF7CC0) (path /4EDF7CC0)
(fp_text reference P2 (at 0 -3.048) (layer Dessus.SilkS) (fp_text reference P2 (at 0 -3.048) (layer F.SilkS)
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_text value CONN_1 (at 0 2.794) (layer Dessus.SilkS) hide (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_circle (center 0 0) (end 0 -2.286) (layer Dessus.SilkS) (width 0.381)) (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 2 /NET2) (net 2 /NET2)
) )
) )
...@@ -183,15 +183,15 @@ ...@@ -183,15 +183,15 @@
(descr "module 1 pin (ou trou mecanique de percage)") (descr "module 1 pin (ou trou mecanique de percage)")
(tags DEV) (tags DEV)
(path /4EE5056C) (path /4EE5056C)
(fp_text reference P3 (at 0 -3.048) (layer Dessus.SilkS) (fp_text reference P3 (at 0 -3.048) (layer F.SilkS)
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_text value CONN_1 (at 0 2.794) (layer Dessus.SilkS) hide (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_circle (center 0 0) (end 0 -2.286) (layer Dessus.SilkS) (width 0.381)) (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 1 /NET1) (net 1 /NET1)
) )
) )
...@@ -201,15 +201,15 @@ ...@@ -201,15 +201,15 @@
(descr "module 1 pin (ou trou mecanique de percage)") (descr "module 1 pin (ou trou mecanique de percage)")
(tags DEV) (tags DEV)
(path /4EE5056D) (path /4EE5056D)
(fp_text reference P4 (at 0 -3.048) (layer Dessus.SilkS) (fp_text reference P4 (at 0 -3.048) (layer F.SilkS)
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_text value CONN_1 (at 0 2.794) (layer Dessus.SilkS) hide (fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
(effects (font (size 1.016 1.016) (thickness 0.254))) (effects (font (size 1.016 1.016) (thickness 0.254)))
) )
(fp_circle (center 0 0) (end 0 -2.286) (layer Dessus.SilkS) (width 0.381)) (fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048)
(layers *.Cu *.Mask Dessus.SilkS) (layers *.Cu *.Mask F.SilkS)
(net 1 /NET1) (net 1 /NET1)
(die_length 7.62) (die_length 7.62)
) )
......
demos/test_xil_95108/carte_test.kicad_pcb
View file @ 9a7116d4
This diff is collapsed.
include/gr_basic.h
View file @ 9a7116d4
...@@ -88,9 +88,6 @@ typedef int wxPenStyle; ...@@ -88,9 +88,6 @@ typedef int wxPenStyle;
extern GR_DRAWMODE g_XorMode; extern GR_DRAWMODE g_XorMode;
extern EDA_COLOR_T g_DrawBgColor;
typedef enum { typedef enum {
/* Line styles for Get/SetLineStyle. */ /* Line styles for Get/SetLineStyle. */
......
pcbnew/pcb_plot_params.cpp
View file @ 9a7116d4
...@@ -81,7 +81,7 @@ static bool setInt( int* aInt, int aValue, int aMin, int aMax ) ...@@ -81,7 +81,7 @@ static bool setInt( int* aInt, int aValue, int aMin, int aMax )
PCB_PLOT_PARAMS::PCB_PLOT_PARAMS() : PCB_PLOT_PARAMS::PCB_PLOT_PARAMS() :
m_layerSelection( 4, B_Cu, F_Cu, F_SilkS, B_SilkS ) m_layerSelection( 4, B_Cu, F_Cu, F_SilkS, B_SilkS )
{ {
m_useGerberExtensions = true; m_useGerberExtensions = false;
m_useGerberAttributes = false; m_useGerberAttributes = false;
m_gerberPrecision = gbrDefaultPrecision; m_gerberPrecision = gbrDefaultPrecision;
m_excludeEdgeLayer = true; m_excludeEdgeLayer = true;
......
pcbnew/print_board_functions.cpp
View file @ 9a7116d4
...@@ -93,7 +93,7 @@ void FOOTPRINT_EDIT_FRAME::PrintPage( wxDC* aDC, ...@@ -93,7 +93,7 @@ void FOOTPRINT_EDIT_FRAME::PrintPage( wxDC* aDC,
drawmode = GR_OR; drawmode = GR_OR;
// Draw footprints, this is done at last in order to print the pad holes in // Draw footprints, this is done at last in order to print the pad holes in
// white (or g_DrawBgColor) after the tracks and zones // white after the tracks and zones
int tmp = D_PAD::m_PadSketchModePenSize; int tmp = D_PAD::m_PadSketchModePenSize;
D_PAD::m_PadSketchModePenSize = defaultPenSize; D_PAD::m_PadSketchModePenSize = defaultPenSize;
...@@ -283,7 +283,7 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC, ...@@ -283,7 +283,7 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
} }
// Draw footprints, this is done at last in order to print the pad holes in // Draw footprints, this is done at last in order to print the pad holes in
// white (or g_DrawBgColor) after the tracks and zones // white after the tracks and zones
int tmp = D_PAD::m_PadSketchModePenSize; int tmp = D_PAD::m_PadSketchModePenSize;
D_PAD::m_PadSketchModePenSize = defaultPenSize; D_PAD::m_PadSketchModePenSize = defaultPenSize;
...@@ -299,7 +299,7 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC, ...@@ -299,7 +299,7 @@ void PCB_EDIT_FRAME::PrintPage( wxDC* aDC,
if( drillShapeOpt != PRINT_PARAMETERS::NO_DRILL_SHAPE ) if( drillShapeOpt != PRINT_PARAMETERS::NO_DRILL_SHAPE )
{ {
TRACK* track = Pcb->m_Track; TRACK* track = Pcb->m_Track;
EDA_COLOR_T color = g_DrawBgColor; EDA_COLOR_T color = WHITE;
bool blackpenstate = GetGRForceBlackPenState(); bool blackpenstate = GetGRForceBlackPenState();
......
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