haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eeschema: BOM dialog: fix some minor issues when displaying messages. 

Cvpcb: fix Bug #1470201 (select next/previous unlinked comp and clear links not working well)
demo/complex_hierarchy: use our new schematic symbols.
This commit is contained in:
jean-pierre charras 2015-07-01 12:55:41 +02:00
parent 51c0ae3480
commit 0a10813352
12 changed files with 3041 additions and 3444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cvpcb/cvframe.cpp
View File

@ -302,21 +302,28 @@ void CVPCB_MAINFRAME::ToFirstNA( wxCommandEvent& event )
if( m_netlist.IsEmpty() ) if( m_netlist.IsEmpty() )
return; return;
long selection = m_compListBox->GetFirstSelected(); long first_selected = m_compListBox->GetFirstSelected();
if( selection < 0 ) if( first_selected < 0 )
selection = -1; // We will start to 0 for the first search , if no item selected first_selected = -1; // We will start to 0 for the first search , if no item selected
for( unsigned jj = selection+1; jj < m_netlist.GetCount(); jj++ ) int candidate = -1;
for( unsigned jj = first_selected+1; jj < m_netlist.GetCount(); jj++ )
{ {
if( m_netlist.GetComponent( jj )->GetFPID().empty() ) if( m_netlist.GetComponent( jj )->GetFPID().empty() )
{ {
m_compListBox->SetSelection( wxNOT_FOUND, false ); // Remove all selections candidate = jj;
m_compListBox->SetSelection( jj ); break;
SendMessageToEESCHEMA();
return;
} }
} }
if( candidate >= 0 )
{
m_compListBox->DeselectAll();
m_compListBox->SetSelection( candidate );
SendMessageToEESCHEMA();
}
} }
@ -325,24 +332,28 @@ void CVPCB_MAINFRAME::ToPreviousNA( wxCommandEvent& event )
if( m_netlist.IsEmpty() ) if( m_netlist.IsEmpty() )
return; return;
int selection = m_compListBox->GetFirstSelected(); int first_selected = m_compListBox->GetFirstSelected();
if( selection < 0 ) if( first_selected < 0 )
selection = m_compListBox->GetCount(); first_selected = m_compListBox->GetCount();
else
while( m_compListBox->GetNextSelected( selection ) >= 0 )
selection = m_compListBox->GetNextSelected( selection );
for( int kk = selection-1; kk >= 0; kk-- ) int candidate = -1;
for( int jj = first_selected-1; jj >= 0; jj-- )
{ {
if( m_netlist.GetComponent( kk )->GetFPID().empty() ) if( m_netlist.GetComponent( jj )->GetFPID().empty() )
{ {
m_compListBox->SetSelection( wxNOT_FOUND, false ); // Remove all selections candidate = jj;
m_compListBox->SetSelection( kk ); break;
SendMessageToEESCHEMA();
return;
} }
} }
if( candidate >= 0 )
{
m_compListBox->DeselectAll();
m_compListBox->SetSelection( candidate );
SendMessageToEESCHEMA();
}
} }
@ -359,12 +370,12 @@ void CVPCB_MAINFRAME::SaveQuitCvpcb( wxCommandEvent& aEvent )
void CVPCB_MAINFRAME::DelAssociations( wxCommandEvent& event ) void CVPCB_MAINFRAME::DelAssociations( wxCommandEvent& event )
{ {
wxString Line;
if( IsOK( this, _( "Delete selections" ) ) ) if( IsOK( this, _( "Delete selections" ) ) )
{ {
m_skipComponentSelect = true; m_skipComponentSelect = true;
m_compListBox->SetSelection( 0 );
// Remove all selections to avoid issues when setting the fpids
m_compListBox->DeselectAll();
for( unsigned i = 0; i < m_netlist.GetCount(); i++ ) for( unsigned i = 0; i < m_netlist.GetCount(); i++ )
{ {
@ -374,6 +385,9 @@ void CVPCB_MAINFRAME::DelAssociations( wxCommandEvent& event )
SetNewPkg( wxEmptyString ); SetNewPkg( wxEmptyString );
} }
// Remove all selections after setting the fpids
m_compListBox->DeselectAll();
m_skipComponentSelect = false; m_skipComponentSelect = false;
m_compListBox->SetSelection( 0 ); m_compListBox->SetSelection( 0 );
m_undefinedComponentCnt = m_netlist.GetCount(); m_undefinedComponentCnt = m_netlist.GetCount();

9
cvpcb/cvstruct.h
View File

@ -51,8 +51,17 @@ public:
~ITEMS_LISTBOX_BASE(); ~ITEMS_LISTBOX_BASE();
/**
* @return the index of the selected item in lists allowing only one item selected
* and the index of the first selected item in lists allowing many selection
*/
int GetSelection(); int GetSelection();
/**
* Removes all selection in lists which can have more than one item selected
*/
void DeselectAll();
virtual CVPCB_MAINFRAME* GetParent() const; virtual CVPCB_MAINFRAME* GetParent() const;
/* Function UpdateWidth /* Function UpdateWidth

8
cvpcb/listboxes.cpp
View File

@ -107,6 +107,14 @@ int ITEMS_LISTBOX_BASE::GetSelection()
return GetFirstSelected(); return GetFirstSelected();
} }
/* Removes all selection in list
*/
void ITEMS_LISTBOX_BASE::DeselectAll()
{
for( int i = 0; i < GetItemCount(); i++ )
Select( i, false );
}
CVPCB_MAINFRAME* ITEMS_LISTBOX_BASE::GetParent() const CVPCB_MAINFRAME* ITEMS_LISTBOX_BASE::GetParent() const
{ {

280
demos/complex_hierarchy/ampli_ht.sch
View File

@ -1,5 +1,5 @@
EESchema Schematic File Version 2 EESchema Schematic File Version 2
LIBS:complex_hierarchy_schlib LIBS:device
LIBS:power LIBS:power
LIBS:complex_hierarchy-cache LIBS:complex_hierarchy-cache
EELAYER 25 0 EELAYER 25 0
@ -21,27 +21,27 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
8900 5400 9100 5400 8900 5400 9100 5400
Wire Wire Line Wire Wire Line
9100 5400 9100 5350 9100 5400 9100 5250
Connection ~ 9100 4150 Connection ~ 9100 4150
Wire Wire Line Wire Wire Line
9100 4850 9100 4150 9100 4950 9100 4150
Wire Wire Line Wire Wire Line
9800 4450 9700 4450 9800 4450 9600 4450
Wire Wire Line Wire Wire Line
9800 4150 9800 4450 9800 4150 9800 4450
Wire Wire Line Wire Wire Line
9800 4150 9700 4150 9800 4150 9600 4150
Wire Wire Line Wire Wire Line
8100 5500 8100 5550 8100 5400 8100 5600
Wire Wire Line Wire Wire Line
5850 6250 5850 5500 5850 6250 5850 5500
Wire Wire Line Wire Wire Line
6900 5400 7150 5400 6900 5400 7250 5400
Wire Wire Line Wire Wire Line
2700 2000 3000 2000 2600 2000 3100 2000
Connection ~ 7300 3300 Connection ~ 7300 3300
Wire Wire Line Wire Wire Line
7300 3200 7300 3350 7300 3200 7300 3450
Wire Wire Line Wire Wire Line
5400 6400 5600 6400 5400 6400 5600 6400
Wire Wire Line Wire Wire Line
@ -50,15 +50,15 @@ Connection ~ 5450 2400
Wire Wire Line Wire Wire Line
5450 3000 5450 1600 5450 3000 5450 1600
Wire Wire Line Wire Wire Line
5450 1600 4550 1600 5450 1600 4500 1600
Wire Wire Line Wire Wire Line
3500 2000 3700 2000 3400 2000 3800 2000
Wire Wire Line Wire Wire Line
7000 5100 7000 5200 7000 5100 7000 5200
Wire Wire Line Wire Wire Line
7600 3300 7300 3300 7600 3300 7300 3300
Wire Wire Line Wire Wire Line
7900 3000 7900 3100 7900 2900 7900 3100
Connection ~ 7900 3700 Connection ~ 7900 3700
Wire Wire Line Wire Wire Line
8600 5000 8600 5300 8600 5000 8600 5300
@ -67,9 +67,9 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
8600 3300 8600 3500 8600 3300 8600 3500
Wire Wire Line Wire Wire Line
7300 3850 7300 3950 7300 3750 7300 3850
Wire Wire Line Wire Wire Line
7500 5100 7600 5100 7400 5100 7600 5100
Wire Wire Line Wire Wire Line
1700 2200 1800 2200 1700 2200 1800 2200
Wire Wire Line Wire Wire Line
@ -83,16 +83,14 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
4350 3000 5450 3000 4350 3000 5450 3000
Wire Wire Line Wire Wire Line
4350 2000 4200 2000 4350 2000 4100 2000
Wire Wire Line Wire Wire Line
4150 1600 3600 1600 4200 1600 3600 1600
Wire Wire Line Wire Wire Line
3600 1600 3600 2000 3600 1600 3600 2000
Connection ~ 3600 2000 Connection ~ 3600 2000
Wire Wire Line Wire Wire Line
7300 2700 7300 2800 2300 2000 1700 2000
Wire Wire Line
2200 2000 1700 2000
Wire Wire Line Wire Wire Line
5350 2400 5450 2400 5350 2400 5450 2400
Wire Wire Line Wire Wire Line
@ -106,22 +104,22 @@ Connection ~ 5150 3000
Wire Wire Line Wire Wire Line
7900 5300 7900 5400 7900 5300 7900 5400
Wire Wire Line Wire Wire Line
7900 5400 7650 5400 7900 5400 7550 5400
Wire Wire Line Wire Wire Line
8100 4800 8100 5000 8100 4800 8100 5100
Connection ~ 8100 4800 Connection ~ 8100 4800
Wire Wire Line Wire Wire Line
7900 3500 7900 3800 7900 3500 7900 3900
Wire Wire Line Wire Wire Line
7900 4700 7900 4900 7900 4600 7900 4900
Wire Wire Line Wire Wire Line
9800 4300 10400 4300 9800 4300 10400 4300
Connection ~ 9800 4300 Connection ~ 9800 4300
Wire Wire Line Wire Wire Line
8900 4450 8900 4850 8900 4450 8900 4950
Connection ~ 8900 4450 Connection ~ 8900 4450
Wire Wire Line Wire Wire Line
8900 5350 8900 6400 8900 5250 8900 6400
Connection ~ 8900 5400 Connection ~ 8900 5400
$Comp $Comp
L R R26 L R R26
@ -131,7 +129,7 @@ AR Path="/4B3A1333/4B617B88" Ref="R26" Part="1"
AR Path="/4B3A13A4/4B617B88" Ref="R28" Part="1" AR Path="/4B3A13A4/4B617B88" Ref="R28" Part="1"
F 0 "R28" H 9200 4850 50 0000 C CNN F 0 "R28" H 9200 4850 50 0000 C CNN
F 1 "220K" V 9100 5100 50 0000 C CNN F 1 "220K" V 9100 5100 50 0000 C CNN
F 2 "" H 9100 5100 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 9100 5100 60 0001 C CNN
F 3 "" H 9100 5100 60 0001 C CNN F 3 "" H 9100 5100 60 0001 C CNN
1 9100 5100 1 9100 5100
-1 0 0 1 -1 0 0 1
@ -144,35 +142,35 @@ AR Path="/4B3A1333/4B616B96" Ref="R25" Part="1"
AR Path="/4B3A13A4/4B616B96" Ref="R27" Part="1" AR Path="/4B3A13A4/4B616B96" Ref="R27" Part="1"
F 0 "R27" V 9530 4450 50 0000 C CNN F 0 "R27" V 9530 4450 50 0000 C CNN
F 1 "47" V 9450 4450 50 0000 C CNN F 1 "47" V 9450 4450 50 0000 C CNN
F 2 "" H 9450 4450 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 9450 4450 60 0001 C CNN
F 3 "" H 9450 4450 60 0001 C CNN F 3 "" H 9450 4450 60 0001 C CNN
1 9450 4450 1 9450 4450
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
L DIODE D8 L D_Small D8
U 1 1 4B616AFA U 1 1 4B616AFA
P 7900 4000 P 7900 4000
AR Path="/4B3A1333/4B616AFA" Ref="D8" Part="1" AR Path="/4B3A1333/4B616AFA" Ref="D8" Part="1"
AR Path="/4B3A13A4/4B616AFA" Ref="D9" Part="1" AR Path="/4B3A13A4/4B616AFA" Ref="D9" Part="1"
F 0 "D9" V 7850 4200 50 0000 C CNN F 0 "D9" V 7850 4200 50 0000 C CNN
F 1 "1N4148" V 7950 4200 50 0000 C CNN F 1 "1N4148" V 7950 4200 50 0000 C CNN
F 2 "" H 7900 4000 60 0001 C CNN F 2 "discret:D3" H 7900 4000 60 0001 C CNN
F 3 "" H 7900 4000 60 0001 C CNN F 3 "" H 7900 4000 60 0001 C CNN
1 7900 4000 1 7900 4000
0 1 1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L GND #PWR019 L GND #PWR019
U 1 1 4B6168A3 U 1 1 4B6168A3
P 8100 6000 P 8100 5950
AR Path="/4B3A13A4/4B6168A3" Ref="#PWR019" Part="1" AR Path="/4B3A13A4/4B6168A3" Ref="#PWR019" Part="1"
AR Path="/4B3A1333/4B6168A3" Ref="#PWR035" Part="1" AR Path="/4B3A1333/4B6168A3" Ref="#PWR035" Part="1"
F 0 "#PWR035" H 8100 6000 30 0001 C CNN F 0 "#PWR035" H 8100 5950 30 0001 C CNN
F 1 "GND" H 8100 5930 30 0001 C CNN F 1 "GND" H 8100 5880 30 0001 C CNN
F 2 "" H 8100 6000 60 0001 C CNN F 2 "" H 8100 5950 60 0001 C CNN
F 3 "" H 8100 6000 60 0001 C CNN F 3 "" H 8100 5950 60 0001 C CNN
1 8100 6000 1 8100 5950
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -183,7 +181,7 @@ AR Path="/4B3A1333/4B61688C" Ref="R10" Part="1"
AR Path="/4B3A13A4/4B61688C" Ref="R20" Part="1" AR Path="/4B3A13A4/4B61688C" Ref="R20" Part="1"
F 0 "R20" V 8180 5250 50 0000 C CNN F 0 "R20" V 8180 5250 50 0000 C CNN
F 1 "5,6K" V 8100 5250 50 0000 C CNN F 1 "5,6K" V 8100 5250 50 0000 C CNN
F 2 "" H 8100 5250 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 8100 5250 60 0001 C CNN
F 3 "" H 8100 5250 60 0001 C CNN F 3 "" H 8100 5250 60 0001 C CNN
1 8100 5250 1 8100 5250
1 0 0 -1 1 0 0 -1
@ -191,27 +189,27 @@ $EndComp
$Comp $Comp
L GND #PWR036 L GND #PWR036
U 1 1 4B4F364A U 1 1 4B4F364A
P 2850 2550 P 2850 2450
AR Path="/4B3A1333/4B4F364A" Ref="#PWR036" Part="1" AR Path="/4B3A1333/4B4F364A" Ref="#PWR036" Part="1"
AR Path="/4B3A13A4/4B4F364A" Ref="#PWR020" Part="1" AR Path="/4B3A13A4/4B4F364A" Ref="#PWR020" Part="1"
F 0 "#PWR036" H 2850 2550 30 0001 C CNN F 0 "#PWR036" H 2850 2450 30 0001 C CNN
F 1 "GND" H 2850 2480 30 0001 C CNN F 1 "GND" H 2850 2380 30 0001 C CNN
F 2 "" H 2850 2550 60 0001 C CNN F 2 "" H 2850 2450 60 0001 C CNN
F 3 "" H 2850 2550 60 0001 C CNN F 3 "" H 2850 2450 60 0001 C CNN
1 2850 2550 1 2850 2450
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L C C12 L C C12
U 1 1 4B4F3641 U 1 1 4B4F3641
P 2850 2300 P 2850 2250
AR Path="/4B3A1333/4B4F3641" Ref="C12" Part="1" AR Path="/4B3A1333/4B4F3641" Ref="C12" Part="1"
AR Path="/4B3A13A4/4B4F3641" Ref="C14" Part="1" AR Path="/4B3A13A4/4B4F3641" Ref="C14" Part="1"
F 0 "C14" H 3000 2350 50 0000 L CNN F 0 "C14" H 3000 2300 50 0000 L CNN
F 1 "150nF" H 3000 2250 50 0000 L CNN F 1 "150nF" H 3000 2200 50 0000 L CNN
F 2 "" H 2850 2300 60 0001 C CNN F 2 "discret:C2" H 2850 2250 60 0001 C CNN
F 3 "" H 2850 2300 60 0001 C CNN F 3 "" H 2850 2250 60 0001 C CNN
1 2850 2300 1 2850 2250
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -222,7 +220,7 @@ AR Path="/4B3A1333/4B4F363E" Ref="R23" Part="1"
AR Path="/4B3A13A4/4B4F363E" Ref="R24" Part="1" AR Path="/4B3A13A4/4B4F363E" Ref="R24" Part="1"
F 0 "R24" V 2350 2000 50 0000 C CNN F 0 "R24" V 2350 2000 50 0000 C CNN
F 1 "1K" V 2450 2000 50 0000 C CNN F 1 "1K" V 2450 2000 50 0000 C CNN
F 2 "" H 2450 2000 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 2450 2000 60 0001 C CNN
F 3 "" H 2450 2000 60 0001 C CNN F 3 "" H 2450 2000 60 0001 C CNN
1 2450 2000 1 2450 2000
0 1 1 0 0 1 1 0
@ -267,7 +265,7 @@ AR Path="/4B3A13A4/4B3A137D" Ref="Q6" Part="1"
AR Path="/4B3A1333/4B3A137D" Ref="Q2" Part="1" AR Path="/4B3A1333/4B3A137D" Ref="Q2" Part="1"
F 0 "Q6" H 8500 3950 50 0000 R CNN F 0 "Q6" H 8500 3950 50 0000 R CNN
F 1 "MPAS42" H 8500 3850 50 0000 R CNN F 1 "MPAS42" H 8500 3850 50 0000 R CNN
F 2 "" H 8500 3700 60 0001 C CNN F 2 "discret:TO92-CBE" H 8500 3700 60 0001 C CNN
F 3 "" H 8500 3700 60 0001 C CNN F 3 "" H 8500 3700 60 0001 C CNN
1 8500 3700 1 8500 3700
1 0 0 -1 1 0 0 -1
@ -280,23 +278,23 @@ AR Path="/4B3A13A4/4B3A137C" Ref="Q7" Part="1"
AR Path="/4B3A1333/4B3A137C" Ref="Q3" Part="1" AR Path="/4B3A1333/4B3A137C" Ref="Q3" Part="1"
F 0 "Q7" H 8500 4650 60 0000 R CNN F 0 "Q7" H 8500 4650 60 0000 R CNN
F 1 "MPAS92" H 8500 4950 60 0000 R CNN F 1 "MPAS92" H 8500 4950 60 0000 R CNN
F 2 "" H 8500 4800 60 0001 C CNN F 2 "discret:TO92-CBE" H 8500 4800 60 0001 C CNN
F 3 "" H 8500 4800 60 0001 C CNN F 3 "" H 8500 4800 60 0001 C CNN
1 8500 4800 1 8500 4800
1 0 0 1 1 0 0 1
$EndComp $EndComp
$Comp $Comp
L DIODE D7 L D_Small D7
U 1 1 4B3A137B U 1 1 4B3A137B
P 7900 4500 P 7900 4500
AR Path="/4B3A13A4/4B3A137B" Ref="D7" Part="1" AR Path="/4B3A13A4/4B3A137B" Ref="D7" Part="1"
AR Path="/4B3A1333/4B3A137B" Ref="D4" Part="1" AR Path="/4B3A1333/4B3A137B" Ref="D4" Part="1"
F 0 "D7" V 7850 4700 50 0000 C CNN F 0 "D7" V 7850 4700 50 0000 C CNN
F 1 "1N4148" V 7950 4700 50 0000 C CNN F 1 "1N4148" V 7950 4700 50 0000 C CNN
F 2 "" H 7900 4500 60 0001 C CNN F 2 "discret:D3" H 7900 4500 60 0001 C CNN
F 3 "" H 7900 4500 60 0001 C CNN F 3 "" H 7900 4500 60 0001 C CNN
1 7900 4500 1 7900 4500
0 1 1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L GND #PWR023 L GND #PWR023
@ -319,7 +317,7 @@ AR Path="/4B3A13A4/4B3A1379" Ref="Q8" Part="1"
AR Path="/4B3A1333/4B3A1379" Ref="Q4" Part="1" AR Path="/4B3A1333/4B3A1379" Ref="Q4" Part="1"
F 0 "Q8" H 7800 4950 50 0000 R CNN F 0 "Q8" H 7800 4950 50 0000 R CNN
F 1 "MPAS42" H 7800 5250 50 0000 R CNN F 1 "MPAS42" H 7800 5250 50 0000 R CNN
F 2 "" H 7800 5100 60 0001 C CNN F 2 "discret:TO92-CBE" H 7800 5100 60 0001 C CNN
F 3 "" H 7800 5100 60 0001 C CNN F 3 "" H 7800 5100 60 0001 C CNN
1 7800 5100 1 7800 5100
1 0 0 -1 1 0 0 -1
@ -338,17 +336,17 @@ F 3 "" H 7000 5200 60 0001 C CNN
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L DIODE D6 L D_Small D6
U 1 1 4B3A1377 U 1 1 4B3A1377
P 7300 3000 P 7300 3100
AR Path="/4B3A13A4/4B3A1377" Ref="D6" Part="1" AR Path="/4B3A13A4/4B3A1377" Ref="D6" Part="1"
AR Path="/4B3A1333/4B3A1377" Ref="D3" Part="1" AR Path="/4B3A1333/4B3A1377" Ref="D3" Part="1"
F 0 "D6" V 7250 3200 50 0000 C CNN F 0 "D6" V 7250 3300 50 0000 C CNN
F 1 "1N4148" V 7350 3200 50 0000 C CNN F 1 "1N4148" V 7350 3300 50 0000 C CNN
F 2 "" H 7300 3000 60 0001 C CNN F 2 "discret:D3" H 7300 3100 60 0001 C CNN
F 3 "" H 7300 3000 60 0001 C CNN F 3 "" H 7300 3100 60 0001 C CNN
1 7300 3000 1 7300 3100
0 1 1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L R R13 L R R13
@ -358,23 +356,23 @@ AR Path="/4B3A13A4/4B3A1376" Ref="R13" Part="1"
AR Path="/4B3A1333/4B3A1376" Ref="R3" Part="1" AR Path="/4B3A1333/4B3A1376" Ref="R3" Part="1"
F 0 "R13" V 7980 2750 50 0000 C CNN F 0 "R13" V 7980 2750 50 0000 C CNN
F 1 "470" V 7900 2750 50 0000 C CNN F 1 "470" V 7900 2750 50 0000 C CNN
F 2 "" H 7900 2750 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 7900 2750 60 0001 C CNN
F 3 "" H 7900 2750 60 0001 C CNN F 3 "" H 7900 2750 60 0001 C CNN
1 7900 2750 1 7900 2750
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L DIODE D5 L D_Small D5
U 1 1 4B3A1375 U 1 1 4B3A1375
P 7300 2500 P 7300 2800
AR Path="/4B3A13A4/4B3A1375" Ref="D5" Part="1" AR Path="/4B3A13A4/4B3A1375" Ref="D5" Part="1"
AR Path="/4B3A1333/4B3A1375" Ref="D2" Part="1" AR Path="/4B3A1333/4B3A1375" Ref="D2" Part="1"
F 0 "D5" V 7250 2700 50 0000 C CNN F 0 "D5" V 7250 3000 50 0000 C CNN
F 1 "1N4148" V 7350 2700 50 0000 C CNN F 1 "1N4148" V 7350 3000 50 0000 C CNN
F 2 "" H 7300 2500 60 0001 C CNN F 2 "discret:D3" H 7300 2800 60 0001 C CNN
F 3 "" H 7300 2500 60 0001 C CNN F 3 "" H 7300 2800 60 0001 C CNN
1 7300 2500 1 7300 2800
0 1 1 0 0 -1 -1 0
$EndComp $EndComp
$Comp $Comp
L R R14 L R R14
@ -384,7 +382,7 @@ AR Path="/4B3A13A4/4B3A1374" Ref="R14" Part="1"
AR Path="/4B3A1333/4B3A1374" Ref="R4" Part="1" AR Path="/4B3A1333/4B3A1374" Ref="R4" Part="1"
F 0 "R14" V 7380 3600 50 0000 C CNN F 0 "R14" V 7380 3600 50 0000 C CNN
F 1 "220K" V 7300 3600 50 0000 C CNN F 1 "220K" V 7300 3600 50 0000 C CNN
F 2 "" H 7300 3600 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 7300 3600 60 0001 C CNN
F 3 "" H 7300 3600 60 0001 C CNN F 3 "" H 7300 3600 60 0001 C CNN
1 7300 3600 1 7300 3600
1 0 0 -1 1 0 0 -1
@ -392,14 +390,14 @@ $EndComp
$Comp $Comp
L GND #PWR025 L GND #PWR025
U 1 1 4B3A1373 U 1 1 4B3A1373
P 7300 3950 P 7300 3850
AR Path="/4B3A13A4/4B3A1373" Ref="#PWR025" Part="1" AR Path="/4B3A13A4/4B3A1373" Ref="#PWR025" Part="1"
AR Path="/4B3A1333/4B3A1373" Ref="#PWR041" Part="1" AR Path="/4B3A1333/4B3A1373" Ref="#PWR041" Part="1"
F 0 "#PWR041" H 7300 3950 30 0001 C CNN F 0 "#PWR041" H 7300 3850 30 0001 C CNN
F 1 "GND" H 7300 3880 30 0001 C CNN F 1 "GND" H 7300 3780 30 0001 C CNN
F 2 "" H 7300 3950 60 0001 C CNN F 2 "" H 7300 3850 60 0001 C CNN
F 3 "" H 7300 3950 60 0001 C CNN F 3 "" H 7300 3850 60 0001 C CNN
1 7300 3950 1 7300 3850
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -410,7 +408,7 @@ AR Path="/4B3A13A4/4B3A1371" Ref="R18" Part="1"
AR Path="/4B3A1333/4B3A1371" Ref="R8" Part="1" AR Path="/4B3A1333/4B3A1371" Ref="R8" Part="1"
F 0 "R18" V 7150 5100 50 0000 C CNN F 0 "R18" V 7150 5100 50 0000 C CNN
F 1 "1K" V 7250 5100 50 0000 C CNN F 1 "1K" V 7250 5100 50 0000 C CNN
F 2 "" H 7250 5100 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 7250 5100 60 0001 C CNN
F 3 "" H 7250 5100 60 0001 C CNN F 3 "" H 7250 5100 60 0001 C CNN
1 7250 5100 1 7250 5100
0 1 1 0 0 1 1 0
@ -423,7 +421,7 @@ AR Path="/4B3A13A4/4B3A1370" Ref="R22" Part="1"
AR Path="/4B3A1333/4B3A1370" Ref="R12" Part="1" AR Path="/4B3A1333/4B3A1370" Ref="R12" Part="1"
F 0 "R22" H 9000 4850 50 0000 C CNN F 0 "R22" H 9000 4850 50 0000 C CNN
F 1 "220K" V 8900 5100 50 0000 C CNN F 1 "220K" V 8900 5100 50 0000 C CNN
F 2 "" H 8900 5100 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 8900 5100 60 0001 C CNN
F 3 "" H 8900 5100 60 0001 C CNN F 3 "" H 8900 5100 60 0001 C CNN
1 8900 5100 1 8900 5100
-1 0 0 1 -1 0 0 1
@ -449,7 +447,7 @@ AR Path="/4B3A13A4/4B3A136D" Ref="R19" Part="1"
AR Path="/4B3A1333/4B3A136D" Ref="R9" Part="1" AR Path="/4B3A1333/4B3A136D" Ref="R9" Part="1"
F 0 "R19" V 7300 5400 50 0000 C CNN F 0 "R19" V 7300 5400 50 0000 C CNN
F 1 "1K" V 7400 5400 50 0000 C CNN F 1 "1K" V 7400 5400 50 0000 C CNN
F 2 "" H 7400 5400 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 7400 5400 60 0001 C CNN
F 3 "" H 7400 5400 60 0001 C CNN F 3 "" H 7400 5400 60 0001 C CNN
1 7400 5400 1 7400 5400
0 1 1 0 0 1 1 0
@ -462,7 +460,7 @@ AR Path="/4B3A13A4/4B3A136C" Ref="P5" Part="1"
AR Path="/4B3A1333/4B3A136C" Ref="P3" Part="1" AR Path="/4B3A1333/4B3A136C" Ref="P3" Part="1"
F 0 "P5" V 10700 4400 40 0000 C CNN F 0 "P5" V 10700 4400 40 0000 C CNN
F 1 "CONN_2" V 10800 4400 40 0000 C CNN F 1 "CONN_2" V 10800 4400 40 0000 C CNN
F 2 "" H 10750 4400 60 0001 C CNN F 2 "connect:bornier2" H 10750 4400 60 0001 C CNN
F 3 "" H 10750 4400 60 0001 C CNN F 3 "" H 10750 4400 60 0001 C CNN
1 10750 4400 1 10750 4400
1 0 0 -1 1 0 0 -1
@ -477,7 +475,7 @@ AR Path="/4B3A13A4/4B3A136B" Ref="R16" Part="1"
AR Path="/4B3A1333/4B3A136B" Ref="R6" Part="1" AR Path="/4B3A1333/4B3A136B" Ref="R6" Part="1"
F 0 "R16" V 3150 2000 50 0000 C CNN F 0 "R16" V 3150 2000 50 0000 C CNN
F 1 "22K" V 3250 2000 50 0000 C CNN F 1 "22K" V 3250 2000 50 0000 C CNN
F 2 "" H 3250 2000 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 3250 2000 60 0001 C CNN
F 3 "" H 3250 2000 60 0001 C CNN F 3 "" H 3250 2000 60 0001 C CNN
1 3250 2000 1 3250 2000
0 1 1 0 0 1 1 0
@ -498,14 +496,14 @@ $EndComp
$Comp $Comp
L GND #PWR028 L GND #PWR028
U 1 1 4B3A1369 U 1 1 4B3A1369
P 4000 2850 P 4000 2750
AR Path="/4B3A13A4/4B3A1369" Ref="#PWR028" Part="1" AR Path="/4B3A13A4/4B3A1369" Ref="#PWR028" Part="1"
AR Path="/4B3A1333/4B3A1369" Ref="#PWR044" Part="1" AR Path="/4B3A1333/4B3A1369" Ref="#PWR044" Part="1"
F 0 "#PWR044" H 4000 2850 30 0001 C CNN F 0 "#PWR044" H 4000 2750 30 0001 C CNN
F 1 "GND" H 4000 2780 30 0001 C CNN F 1 "GND" H 4000 2680 30 0001 C CNN
F 2 "" H 4000 2850 60 0001 C CNN F 2 "" H 4000 2750 60 0001 C CNN
F 3 "" H 4000 2850 60 0001 C CNN F 3 "" H 4000 2750 60 0001 C CNN
1 4000 2850 1 4000 2750
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -516,7 +514,7 @@ AR Path="/4B3A13A4/4B3A1368" Ref="U4" Part="1"
AR Path="/4B3A1333/4B3A1368" Ref="U3" Part="1" AR Path="/4B3A1333/4B3A1368" Ref="U3" Part="1"
F 0 "U4" H 6450 5600 60 0000 C CNN F 0 "U4" H 6450 5600 60 0000 C CNN
F 1 "LM358N" H 6550 5200 50 0000 C CNN F 1 "LM358N" H 6550 5200 50 0000 C CNN
F 2 "" H 6400 5400 60 0001 C CNN F 2 "dip_sockets:DIP-8__300_ELL" H 6400 5400 60 0001 C CNN
F 3 "" H 6400 5400 60 0001 C CNN F 3 "" H 6400 5400 60 0001 C CNN
1 6400 5400 1 6400 5400
1 0 0 -1 1 0 0 -1
@ -529,7 +527,7 @@ AR Path="/4B3A13A4/4B3A1367" Ref="P6" Part="1"
AR Path="/4B3A1333/4B3A1367" Ref="P4" Part="1" AR Path="/4B3A1333/4B3A1367" Ref="P4" Part="1"
F 0 "P6" V 1300 2100 40 0000 C CNN F 0 "P6" V 1300 2100 40 0000 C CNN
F 1 "CONN_2" V 1400 2100 40 0000 C CNN F 1 "CONN_2" V 1400 2100 40 0000 C CNN
F 2 "" H 1350 2100 60 0001 C CNN F 2 "connect:bornier2" H 1350 2100 60 0001 C CNN
F 3 "" H 1350 2100 60 0001 C CNN F 3 "" H 1350 2100 60 0001 C CNN
1 1350 2100 1 1350 2100
-1 0 0 -1 -1 0 0 -1
@ -537,14 +535,14 @@ $EndComp
$Comp $Comp
L C C7 L C C7
U 1 1 4B3A1366 U 1 1 4B3A1366
P 4000 2600 P 4000 2550
AR Path="/4B3A13A4/4B3A1366" Ref="C7" Part="1" AR Path="/4B3A13A4/4B3A1366" Ref="C7" Part="1"
AR Path="/4B3A1333/4B3A1366" Ref="C4" Part="1" AR Path="/4B3A1333/4B3A1366" Ref="C4" Part="1"
F 0 "C7" H 4100 2700 50 0000 L CNN F 0 "C7" H 4100 2650 50 0000 L CNN
F 1 "4.7nF" H 4100 2500 50 0000 L CNN F 1 "4.7nF" H 4100 2450 50 0000 L CNN
F 2 "" H 4000 2600 60 0001 C CNN F 2 "discret:C2" H 4000 2550 60 0001 C CNN
F 3 "" H 4000 2600 60 0001 C CNN F 3 "" H 4000 2550 60 0001 C CNN
1 4000 2600 1 4000 2550
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -555,7 +553,7 @@ AR Path="/4B3A13A4/4B3A1365" Ref="C8" Part="1"
AR Path="/4B3A1333/4B3A1365" Ref="C5" Part="1" AR Path="/4B3A1333/4B3A1365" Ref="C5" Part="1"
F 0 "C8" H 8150 5850 50 0000 L CNN F 0 "C8" H 8150 5850 50 0000 L CNN
F 1 "820pF" H 8150 5650 50 0000 L CNN F 1 "820pF" H 8150 5650 50 0000 L CNN
F 2 "" H 8100 5750 60 0001 C CNN F 2 "discret:C2" H 8100 5750 60 0001 C CNN
F 3 "" H 8100 5750 60 0001 C CNN F 3 "" H 8100 5750 60 0001 C CNN
1 8100 5750 1 8100 5750
1 0 0 -1 1 0 0 -1
@ -568,7 +566,7 @@ AR Path="/4B3A13A4/4B3A1364" Ref="R15" Part="1"
AR Path="/4B3A1333/4B3A1364" Ref="R5" Part="1" AR Path="/4B3A1333/4B3A1364" Ref="R5" Part="1"
F 0 "R15" V 9530 4150 50 0000 C CNN F 0 "R15" V 9530 4150 50 0000 C CNN
F 1 "47" V 9450 4150 50 0000 C CNN F 1 "47" V 9450 4150 50 0000 C CNN
F 2 "" H 9450 4150 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 9450 4150 60 0001 C CNN
F 3 "" H 9450 4150 60 0001 C CNN F 3 "" H 9450 4150 60 0001 C CNN
1 9450 4150 1 9450 4150
0 1 1 0 0 1 1 0
@ -589,27 +587,27 @@ $EndComp
$Comp $Comp
L R R21 L R R21
U 1 1 4B3A1362 U 1 1 4B3A1362
P 5150 6400 P 5250 6400
AR Path="/4B3A13A4/4B3A1362" Ref="R21" Part="1" AR Path="/4B3A13A4/4B3A1362" Ref="R21" Part="1"
AR Path="/4B3A1333/4B3A1362" Ref="R11" Part="1" AR Path="/4B3A1333/4B3A1362" Ref="R11" Part="1"
F 0 "R21" V 5050 6400 50 0000 C CNN F 0 "R21" V 5150 6400 50 0000 C CNN
F 1 "4,7K" V 5150 6400 50 0000 C CNN F 1 "4,7K" V 5250 6400 50 0000 C CNN
F 2 "" H 5150 6400 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 5250 6400 60 0001 C CNN
F 3 "" H 5150 6400 60 0001 C CNN F 3 "" H 5250 6400 60 0001 C CNN
1 5150 6400 1 5250 6400
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
L GND #PWR030 L GND #PWR030
U 1 1 4B3A1361 U 1 1 4B3A1361
P 4850 6400 P 5050 6400
AR Path="/4B3A13A4/4B3A1361" Ref="#PWR030" Part="1" AR Path="/4B3A13A4/4B3A1361" Ref="#PWR030" Part="1"
AR Path="/4B3A1333/4B3A1361" Ref="#PWR046" Part="1" AR Path="/4B3A1333/4B3A1361" Ref="#PWR046" Part="1"
F 0 "#PWR046" H 4850 6400 30 0001 C CNN F 0 "#PWR046" H 5050 6400 30 0001 C CNN
F 1 "GND" H 4850 6330 30 0001 C CNN F 1 "GND" H 5050 6330 30 0001 C CNN
F 2 "" H 4850 6400 60 0001 C CNN F 2 "" H 5050 6400 60 0001 C CNN
F 3 "" H 4850 6400 60 0001 C CNN F 3 "" H 5050 6400 60 0001 C CNN
1 4850 6400 1 5050 6400
0 1 1 0 0 1 1 0
$EndComp $EndComp
$Comp $Comp
@ -620,7 +618,7 @@ AR Path="/4B3A13A4/4B3A1360" Ref="Q5" Part="1"
AR Path="/4B3A1333/4B3A1360" Ref="Q1" Part="1" AR Path="/4B3A1333/4B3A1360" Ref="Q1" Part="1"
F 0 "Q5" H 7800 3150 60 0000 R CNN F 0 "Q5" H 7800 3150 60 0000 R CNN
F 1 "MPAS92" H 7800 3450 60 0000 R CNN F 1 "MPAS92" H 7800 3450 60 0000 R CNN
F 2 "" H 7800 3300 60 0001 C CNN F 2 "discret:TO92-CBE" H 7800 3300 60 0001 C CNN
F 3 "" H 7800 3300 60 0001 C CNN F 3 "" H 7800 3300 60 0001 C CNN
1 7800 3300 1 7800 3300
1 0 0 1 1 0 0 1
@ -628,27 +626,27 @@ $EndComp
$Comp $Comp
L HT #PWR031 L HT #PWR031
U 1 1 4B3A135F U 1 1 4B3A135F
P 7300 2250 P 7300 2650
AR Path="/4B3A13A4/4B3A135F" Ref="#PWR031" Part="1" AR Path="/4B3A13A4/4B3A135F" Ref="#PWR031" Part="1"
AR Path="/4B3A1333/4B3A135F" Ref="#PWR047" Part="1" AR Path="/4B3A1333/4B3A135F" Ref="#PWR047" Part="1"
F 0 "#PWR047" H 7300 2370 20 0001 C CNN F 0 "#PWR047" H 7300 2770 20 0001 C CNN
F 1 "HT" H 7300 2340 40 0000 C CNN F 1 "HT" H 7300 2740 40 0000 C CNN
F 2 "" H 7300 2250 60 0001 C CNN F 2 "" H 7300 2650 60 0001 C CNN
F 3 "" H 7300 2250 60 0001 C CNN F 3 "" H 7300 2650 60 0001 C CNN
1 7300 2250 1 7300 2650
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L HT #PWR032 L HT #PWR032
U 1 1 4B3A135E U 1 1 4B3A135E
P 7900 2450 P 7900 2550
AR Path="/4B3A13A4/4B3A135E" Ref="#PWR032" Part="1" AR Path="/4B3A13A4/4B3A135E" Ref="#PWR032" Part="1"
AR Path="/4B3A1333/4B3A135E" Ref="#PWR048" Part="1" AR Path="/4B3A1333/4B3A135E" Ref="#PWR048" Part="1"
F 0 "#PWR048" H 7900 2570 20 0001 C CNN F 0 "#PWR048" H 7900 2670 20 0001 C CNN
F 1 "HT" H 7900 2540 40 0000 C CNN F 1 "HT" H 7900 2640 40 0000 C CNN
F 2 "" H 7900 2450 60 0001 C CNN F 2 "" H 7900 2550 60 0001 C CNN
F 3 "" H 7900 2450 60 0001 C CNN F 3 "" H 7900 2550 60 0001 C CNN
1 7900 2450 1 7900 2550
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -672,7 +670,7 @@ AR Path="/4B3A13A4/4B3A135C" Ref="U4" Part="2"
AR Path="/4B3A1333/4B3A135C" Ref="U3" Part="2" AR Path="/4B3A1333/4B3A135C" Ref="U3" Part="2"
F 0 "U4" H 4900 2600 60 0000 C CNN F 0 "U4" H 4900 2600 60 0000 C CNN
F 1 "LM358N" H 5000 2200 50 0000 C CNN F 1 "LM358N" H 5000 2200 50 0000 C CNN
F 2 "" H 4850 2400 60 0001 C CNN F 2 "dip_sockets:DIP-8__300_ELL" H 4850 2400 60 0001 C CNN
F 3 "" H 4850 2400 60 0001 C CNN F 3 "" H 4850 2400 60 0001 C CNN
2 4850 2400 2 4850 2400
1 0 0 -1 1 0 0 -1
@ -698,7 +696,7 @@ AR Path="/4B3A13A4/4B3A1359" Ref="R17" Part="1"
AR Path="/4B3A1333/4B3A1359" Ref="R7" Part="1" AR Path="/4B3A1333/4B3A1359" Ref="R7" Part="1"
F 0 "R17" V 3850 2000 50 0000 C CNN F 0 "R17" V 3850 2000 50 0000 C CNN
F 1 "22K" V 3950 2000 50 0000 C CNN F 1 "22K" V 3950 2000 50 0000 C CNN
F 2 "" H 3950 2000 60 0001 C CNN F 2 "discret:R3-LARGE_PADS" H 3950 2000 60 0001 C CNN
F 3 "" H 3950 2000 60 0001 C CNN F 3 "" H 3950 2000 60 0001 C CNN
1 3950 2000 1 3950 2000
0 1 1 0 0 1 1 0
@ -711,7 +709,7 @@ AR Path="/4B3A13A4/4B3A1358" Ref="C6" Part="1"
AR Path="/4B3A1333/4B3A1358" Ref="C3" Part="1" AR Path="/4B3A1333/4B3A1358" Ref="C3" Part="1"
F 0 "C6" V 4200 1600 50 0000 C CNN F 0 "C6" V 4200 1600 50 0000 C CNN
F 1 "15nF" V 4500 1600 50 0000 C CNN F 1 "15nF" V 4500 1600 50 0000 C CNN
F 2 "" H 4350 1600 60 0001 C CNN F 2 "discret:C2" H 4350 1600 60 0001 C CNN
F 3 "" H 4350 1600 60 0001 C CNN F 3 "" H 4350 1600 60 0001 C CNN
1 4350 1600 1 4350 1600
0 1 1 0 0 1 1 0
@ -726,23 +724,23 @@ AR Path="/4B3A13A4/4B3A1357" Ref="RV2" Part="1"
AR Path="/4B3A1333/4B3A1357" Ref="RV1" Part="1" AR Path="/4B3A1333/4B3A1357" Ref="RV1" Part="1"
F 0 "RV2" H 5850 6300 50 0000 C CNN F 0 "RV2" H 5850 6300 50 0000 C CNN
F 1 "4,7K" H 5850 6400 50 0000 C CNN F 1 "4,7K" H 5850 6400 50 0000 C CNN
F 2 "" H 5850 6400 60 0001 C CNN F 2 "discret:RV2" H 5850 6400 60 0001 C CNN
F 3 "" H 5850 6400 60 0001 C CNN F 3 "" H 5850 6400 60 0001 C CNN
1 5850 6400 1 5850 6400
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
Wire Wire Line Wire Wire Line
7900 4200 7900 4300 7900 4100 7900 4400
Wire Wire Line Wire Wire Line
8600 4450 9200 4450 8600 4450 9300 4450
Wire Wire Line Wire Wire Line
8600 4450 8600 4600 8600 4450 8600 4600
Wire Wire Line Wire Wire Line
8600 4150 9200 4150 8600 4150 9300 4150
Wire Wire Line Wire Wire Line
8600 4150 8600 3900 8600 4150 8600 3900
Wire Wire Line Wire Wire Line
2850 2550 2850 2500 2850 2450 2850 2400
Wire Wire Line Wire Wire Line
4350 2000 4350 2300 4350 2000 4350 2300
Wire Wire Line Wire Wire Line
@ -751,24 +749,28 @@ Wire Wire Line
4000 2200 4000 2400 4000 2200 4000 2400
Connection ~ 4350 2200 Connection ~ 4350 2200
Wire Wire Line Wire Wire Line
4000 2850 4000 2800 4000 2750 4000 2700
Wire Wire Line Wire Wire Line
4750 2850 4750 2800 4750 2850 4750 2800
Wire Wire Line Wire Wire Line
4750 1950 4750 2000 4750 1950 4750 2000
Wire Wire Line Wire Wire Line
7300 2300 7300 2250 7300 2700 7300 2650
Wire Wire Line Wire Wire Line
7900 2450 7900 2500 7900 2550 7900 2600
Wire Wire Line Wire Wire Line
7900 4800 8300 4800 7900 4800 8300 4800
Connection ~ 7900 4800 Connection ~ 7900 4800
Wire Wire Line Wire Wire Line
8100 5950 8100 6000 8100 5900 8100 5950
Wire Wire Line Wire Wire Line
6300 4950 6300 5000 6300 4950 6300 5000
Wire Wire Line Wire Wire Line
6300 5850 6300 5800 6300 5850 6300 5800
Wire Wire Line Wire Wire Line
4850 6400 4900 6400 5050 6400 5100 6400
Wire Wire Line
7100 5100 7000 5100
Wire Wire Line
7300 3000 7300 2900
$EndSCHEMATC $EndSCHEMATC

144
demos/complex_hierarchy/complex_hierarchy-cache.lib
View File

@ -3,29 +3,31 @@ EESchema-LIBRARY Version 2.3
# #
# +12C # +12C
# #
DEF +12C #PWR 0 0 N Y 1 F P DEF +12C #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -30 30 H I C CNN F0 "#PWR" 0 -150 50 H I C CNN
F1 "+12C" 0 110 40 H V C CNN F1 "+12C" 0 150 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 P 2 0 1 0 -30 50 0 100 N
C 0 60 20 0 1 0 N P 2 0 1 0 0 0 0 100 N
P 4 0 1 0 0 0 0 40 0 40 0 40 N P 2 0 1 0 0 100 30 50 N
X +12C 1 0 0 0 U 50 50 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# +12V # +12V
# #
DEF +12V #PWR 0 0 N Y 1 F P DEF +12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -50 20 H I C CNN F0 "#PWR" 0 -150 50 H I C CNN
F1 "+12V" 0 100 30 H V C CNN F1 "+12V" 0 140 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 P 2 0 1 0 -30 50 0 100 N
C 0 60 20 0 1 0 N P 2 0 1 0 0 0 0 100 N
P 3 0 1 0 0 0 0 40 0 40 N P 2 0 1 0 0 100 30 50 N
X +12V 1 0 0 0 U 50 50 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
@ -62,20 +64,22 @@ 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" 0 100 40 H V L CNN F0 "C" 25 100 50 H V L CNN
F1 "C" 6 -85 40 H V L CNN F1 "C" 25 -100 50 H V L CNN
F2 "" 38 -150 30 H V C CNN F2 "" 38 -150 30 H V C CNN
F3 "" 0 100 30 H V C CNN F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
SM*
C? C?
C1-1 C_????_*
C_????
SMD*_c
Capacitor*
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 2 0 1 20 -80 -30 80 -30 N P 2 0 1 20 -80 -30 80 -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 ~ 1 0 150 110 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P X ~ 2 0 -150 110 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
@ -95,61 +99,72 @@ ENDDEF
# #
# CP # CP
# #
DEF CP C 0 10 N N 1 F N DEF CP C 0 10 N Y 1 F N
F0 "C" 50 100 40 H V L CNN F0 "C" 25 100 50 H V L CNN
F1 "CP" 50 -100 40 H V L CNN F1 "CP" 25 -100 50 H V L CNN
F2 "" 100 -150 30 H V C CNN F2 "" 38 -150 30 H V C CNN
F3 "" 50 100 30 H V C CNN F3 "" 0 0 60 H V C CNN
ALIAS CAPAPOL
$FPLIST $FPLIST
CP* CP*
SM* Elko*
TantalC*
C*elec
c_elec*
SMD*_Pol
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 4 0 1 8 -80 50 -80 -50 80 -50 80 50 N S -90 20 -90 40 0 1 0 N
P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F S -90 20 90 20 0 1 0 N
X ~ 1 0 200 150 D 40 40 1 1 P S -70 90 -30 90 0 1 0 N
X ~ 2 0 -200 150 U 40 40 1 1 P S -50 70 -50 110 0 1 0 N
S 90 -20 -90 -40 0 1 0 F
S 90 40 -90 40 0 1 0 N
S 90 40 90 20 0 1 0 N
X ~ 1 0 150 110 D 40 40 1 1 P
X ~ 2 0 -150 110 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# DIODE # D_Small
# #
DEF DIODE D 0 40 N N 1 F N DEF D_Small D 0 10 N N 1 F N
F0 "D" 0 100 40 H V C CNN F0 "D" -50 80 50 H V L CNN
F1 "DIODE" 0 -100 40 H V C CNN F1 "D_Small" -150 -80 50 H V L CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 V V C CNN
F3 "" 0 0 60 H V C CNN F3 "" 0 0 60 V V C CNN
$FPLIST $FPLIST
D? Diode_*
S* D-Pak_TO252AA
*SingleDiode
*SingleDiode*
*_Diode_*
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 2 0 1 6 50 50 50 -50 N P 2 0 1 0 -30 -40 -30 40 N
P 3 0 1 0 -50 50 50 0 -50 -50 F P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
X A 1 -200 0 150 R 40 40 1 1 P X K 1 -100 0 70 R 50 50 1 1 P
X K 2 200 0 150 L 40 40 1 1 P X A 2 100 0 70 L 50 50 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# GND # GND
# #
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 -150 50 H I C CNN
F1 "GND" 0 -70 30 H I C CNN F1 "GND" 0 -123 30 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
X GND 1 0 0 0 U 30 30 1 1 W N X GND 1 0 0 0 D 20 30 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# HT # HT
# #
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 50 H I C CNN
F1 "HT" 0 90 30 H V C CNN F1 "HT" 0 90 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN
DRAW DRAW
@ -264,8 +279,8 @@ 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 95 30 H I C CNN F0 "#FLG" 0 95 50 H I C CNN
F1 "PWR_FLAG" 0 180 30 H V C CNN F1 "PWR_FLAG" 0 180 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN
DRAW DRAW
@ -277,35 +292,32 @@ 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 40 V V C CNN F0 "R" 80 0 50 V V C CNN
F1 "R" 7 1 40 V V C CNN F1 "R" 0 0 50 V V C CNN
F2 "" -70 0 30 V V C CNN F2 "" -70 0 30 V V C CNN
F3 "" 0 0 30 H V C CNN F3 "" 0 0 30 H V C CNN
$FPLIST $FPLIST
R? R_*
SM0603 Resistor_*
SM0805
R?-*
SM1206
$ENDFPLIST $ENDFPLIST
DRAW DRAW
S -40 150 40 -150 0 1 12 N S -40 -100 40 100 0 1 10 N
X ~ 1 0 250 100 D 60 60 1 1 P X ~ 1 0 150 50 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P X ~ 2 0 -150 50 U 60 60 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# VCC # VCC
# #
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 -150 50 H I C CNN
F1 "VCC" 0 100 30 H V C CNN F1 "VCC" 0 150 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 C 0 75 25 0 1 0 N
C 0 50 20 0 1 0 N P 2 0 1 0 0 0 0 50 N
P 3 0 1 0 0 0 0 30 0 30 N X VCC 1 0 0 0 U 50 50 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #

479
demos/complex_hierarchy/complex_hierarchy.cmp
View File

@ -1,479 +0,0 @@
Cmp-Mod V01 Created by CvPCB (20100127 SVN-R2271)-unstable date = 28/01/2010 13:02:06
BeginCmp
TimeStamp = /4B03CEC2;
Reference = C1;
ValeurCmp = 47uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = /4AE173CF;
Reference = C2;
ValeurCmp = 47uF/20V;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1358;
Reference = C3;
ValeurCmp = 15nF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1366;
Reference = C4;
ValeurCmp = 4,7nF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1365;
Reference = C5;
ValeurCmp = 820pF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1358;
Reference = C6;
ValeurCmp = 15nF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1366;
Reference = C7;
ValeurCmp = 4,7nF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1365;
Reference = C8;
ValeurCmp = 820pF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A1558;
Reference = C9;
ValeurCmp = 47uF/63V;
IdModule = CP8;
EndCmp
BeginCmp
TimeStamp = /4B4B15E7;
Reference = C10;
ValeurCmp = 10uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = /4B4B15D9;
Reference = C11;
ValeurCmp = 10uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B4F3641;
Reference = C12;
ValeurCmp = 150nF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B4F3641;
Reference = C14;
ValeurCmp = 150nF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = /4AE172F4;
Reference = D1;
ValeurCmp = 1N4007;
IdModule = D5;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1375;
Reference = D2;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1377;
Reference = D3;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A137B;
Reference = D4;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1375;
Reference = D5;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1377;
Reference = D6;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A137B;
Reference = D7;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B616AFA;
Reference = D8;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B616AFA;
Reference = D9;
ValeurCmp = 1N4148;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = /4B3A12F4;
Reference = P1;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = /4AD71B06;
Reference = P2;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A136C;
Reference = P3;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1367;
Reference = P4;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A136C;
Reference = P5;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1367;
Reference = P6;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1360;
Reference = Q1;
ValeurCmp = MPAS92;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A137D;
Reference = Q2;
ValeurCmp = MPAS42;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A137C;
Reference = Q3;
ValeurCmp = MPAS92;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1379;
Reference = Q4;
ValeurCmp = MPAS42;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1360;
Reference = Q5;
ValeurCmp = MPAS92;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A137D;
Reference = Q6;
ValeurCmp = MPAS42;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A137C;
Reference = Q7;
ValeurCmp = MPAS92;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1379;
Reference = Q8;
ValeurCmp = MPAS42;
IdModule = TO92-CBE;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1376;
Reference = R3;
ValeurCmp = 470;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1374;
Reference = R4;
ValeurCmp = 220K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1364;
Reference = R5;
ValeurCmp = 47;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A136B;
Reference = R6;
ValeurCmp = 22K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1359;
Reference = R7;
ValeurCmp = 22K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1371;
Reference = R8;
ValeurCmp = 1K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A136D;
Reference = R9;
ValeurCmp = 1K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B61688C;
Reference = R10;
ValeurCmp = 5,6K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1362;
Reference = R11;
ValeurCmp = 4,7K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1370;
Reference = R12;
ValeurCmp = 220K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1376;
Reference = R13;
ValeurCmp = 470;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1374;
Reference = R14;
ValeurCmp = 220K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1364;
Reference = R15;
ValeurCmp = 47;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A136B;
Reference = R16;
ValeurCmp = 22K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1359;
Reference = R17;
ValeurCmp = 22K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1371;
Reference = R18;
ValeurCmp = 1K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A136D;
Reference = R19;
ValeurCmp = 1K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B61688C;
Reference = R20;
ValeurCmp = 5,6K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1362;
Reference = R21;
ValeurCmp = 4,7K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1370;
Reference = R22;
ValeurCmp = 220K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B4F363E;
Reference = R23;
ValeurCmp = 1K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B4F363E;
Reference = R24;
ValeurCmp = 1K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B616B96;
Reference = R25;
ValeurCmp = 47;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B617B88;
Reference = R26;
ValeurCmp = 220K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B616B96;
Reference = R27;
ValeurCmp = 47;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B617B88;
Reference = R28;
ValeurCmp = 220K;
IdModule = R3-LARGE_PADS;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1357;
Reference = RV1;
ValeurCmp = 4,7K;
IdModule = RV2;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1357;
Reference = RV2;
ValeurCmp = 4,7K;
IdModule = RV2;
EndCmp
BeginCmp
TimeStamp = /4B4B1230;
Reference = U1;
ValeurCmp = ICL7660;
IdModule = DIP-8__300_ELL;
EndCmp
BeginCmp
TimeStamp = /4B4B1532;
Reference = U2;
ValeurCmp = 78L05;
IdModule = LM78LXX;
EndCmp
BeginCmp
TimeStamp = /4B3A1333/4B3A1368;
Reference = U3;
ValeurCmp = LM358N;
IdModule = DIP-8__300_ELL;
EndCmp
BeginCmp
TimeStamp = /4B3A13A4/4B3A1368;
Reference = U4;
ValeurCmp = LM358N;
IdModule = DIP-8__300_ELL;
EndCmp
EndListe

4476
demos/complex_hierarchy/complex_hierarchy.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

756
demos/complex_hierarchy/complex_hierarchy.net
View File

File diff suppressed because it is too large Load Diff

6
demos/complex_hierarchy/complex_hierarchy.pro
View File

@ -1,4 +1,4 @@
update=18/05/2015 09:00:28 update=01/07/2015 12:40:16
version=1 version=1
last_client=kicad last_client=kicad
[cvpcb] [cvpcb]
@ -34,5 +34,5 @@ version=1
version=1 version=1
LibDir=F:/kicad/share/library LibDir=F:/kicad/share/library
[eeschema/libraries] [eeschema/libraries]
LibName1=complex_hierarchy_schlib LibName1=power
LibName2=power LibName2=complex_hierarchy_schlib

102
demos/complex_hierarchy/complex_hierarchy.sch
View File

@ -1,5 +1,5 @@
EESchema Schematic File Version 2 EESchema Schematic File Version 2
LIBS:complex_hierarchy_schlib LIBS:device
LIBS:power LIBS:power
LIBS:complex_hierarchy-cache LIBS:complex_hierarchy-cache
EELAYER 25 0 EELAYER 25 0
@ -19,9 +19,9 @@ $EndDescr
NoConn ~ 8800 3050 NoConn ~ 8800 3050
Connection ~ 9200 2750 Connection ~ 9200 2750
Wire Wire Line Wire Wire Line
9200 2700 9200 2750 9200 2650 9200 2750
Wire Wire Line Wire Wire Line
6650 2950 6650 3000 6650 2900 6650 3000
Wire Wire Line Wire Wire Line
6650 3000 7050 3000 6650 3000 7050 3000
Wire Wire Line Wire Wire Line
@ -29,12 +29,12 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
7050 2850 7100 2850 7050 2850 7100 2850
Wire Wire Line Wire Wire Line
9200 2300 9200 2250 9200 2350 9200 2250
Connection ~ 2500 1300 Connection ~ 2500 1300
Wire Wire Line Wire Wire Line
8300 1300 9200 1300 8300 1300 9200 1300
Wire Wire Line Wire Wire Line
2900 2500 3800 2500 2800 2500 3800 2500
Wire Wire Line Wire Wire Line
2500 1250 2500 1350 2500 1250 2500 1350
Wire Wire Line Wire Wire Line
@ -44,9 +44,9 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
2100 2700 2000 2700 2100 2700 2000 2700
Wire Wire Line Wire Wire Line
2000 2500 2500 2500 2000 2500 2600 2500
Wire Wire Line Wire Wire Line
3200 3000 3200 3100 3200 2900 3200 3000
Wire Wire Line Wire Wire Line
3200 2500 3200 2600 3200 2500 3200 2600
Connection ~ 3200 2500 Connection ~ 3200 2500
@ -61,16 +61,16 @@ Wire Wire Line
Wire Wire Line Wire Wire Line
7400 1300 7500 1300 7400 1300 7500 1300
Wire Wire Line Wire Wire Line
9200 1800 9200 1850 9200 1750 9200 1800
Wire Wire Line Wire Wire Line
9200 1250 9200 1400 9200 1250 9200 1450
Connection ~ 9200 1300 Connection ~ 9200 1300
Wire Wire Line Wire Wire Line
2200 1650 2200 1750 2200 1650 2200 1750
Wire Wire Line Wire Wire Line
2500 1750 2500 1800 2500 1650 2500 1700
Wire Wire Line Wire Wire Line
6650 2550 6650 2500 6650 2600 6650 2500
Wire Wire Line Wire Wire Line
6650 2500 7050 2500 6650 2500 7050 2500
Wire Wire Line Wire Wire Line
@ -85,7 +85,7 @@ U 1 1 4B4B15E7
P 6650 2750 P 6650 2750
F 0 "C10" H 6800 2800 50 0000 L CNN F 0 "C10" H 6800 2800 50 0000 L CNN
F 1 "10uF" H 6800 2750 50 0000 L TNN F 1 "10uF" H 6800 2750 50 0000 L TNN
F 2 "" H 6650 2750 60 0001 C CNN F 2 "discret:CP6" H 6650 2750 60 0001 C CNN
F 3 "" H 6650 2750 60 0001 C CNN F 3 "" H 6650 2750 60 0001 C CNN
1 6650 2750 1 6650 2750
1 0 0 -1 1 0 0 -1
@ -107,7 +107,7 @@ U 1 1 4B4B15D9
P 9200 2500 P 9200 2500
F 0 "C11" H 9350 2550 50 0000 L CNN F 0 "C11" H 9350 2550 50 0000 L CNN
F 1 "10uF" H 9350 2500 50 0000 L TNN F 1 "10uF" H 9350 2500 50 0000 L TNN
F 2 "" H 9200 2500 60 0001 C CNN F 2 "discret:CP6" H 9200 2500 60 0001 C CNN
F 3 "" H 9200 2500 60 0001 C CNN F 3 "" H 9200 2500 60 0001 C CNN
1 9200 2500 1 9200 2500
1 0 0 -1 1 0 0 -1
@ -130,7 +130,7 @@ U 1 1 4B4B1532
P 7900 1350 P 7900 1350
F 0 "U2" H 7900 1650 60 0000 C CNN F 0 "U2" H 7900 1650 60 0000 C CNN
F 1 "78L05" H 7900 1550 60 0000 C CNN F 1 "78L05" H 7900 1550 60 0000 C CNN
F 2 "" H 7900 1350 60 0001 C CNN F 2 "discret:LM78LXX" H 7900 1350 60 0001 C CNN
F 3 "" H 7900 1350 60 0001 C CNN F 3 "" H 7900 1350 60 0001 C CNN
1 7900 1350 1 7900 1350
1 0 0 -1 1 0 0 -1
@ -174,7 +174,7 @@ U 1 1 4B4B1230
P 7950 2900 P 7950 2900
F 0 "U1" H 7400 3300 70 0000 L CNN F 0 "U1" H 7400 3300 70 0000 L CNN
F 1 "ICL7660" H 8500 2450 70 0000 R CNN F 1 "ICL7660" H 8500 2450 70 0000 R CNN
F 2 "" H 7950 2900 60 0001 C CNN F 2 "dip_sockets:DIP-8__300_ELL" H 7950 2900 60 0001 C CNN
F 3 "" H 7950 2900 60 0001 C CNN F 3 "" H 7950 2900 60 0001 C CNN
1 7950 2900 1 7950 2900
1 0 0 -1 1 0 0 -1
@ -184,23 +184,23 @@ Text Label 2150 2500 0 60 ~ 0
$Comp $Comp
L CP C9 L CP C9
U 1 1 4B3A1558 U 1 1 4B3A1558
P 2500 1550 P 2500 1500
F 0 "C9" H 2650 1600 50 0000 L CNN F 0 "C9" H 2650 1550 50 0000 L CNN
F 1 "47uF/63V" H 2650 1550 50 0000 L TNN F 1 "47uF/63V" H 2650 1500 50 0000 L TNN
F 2 "" H 2500 1550 60 0001 C CNN F 2 "discret:CP8" H 2500 1500 60 0001 C CNN
F 3 "" H 2500 1550 60 0001 C CNN F 3 "" H 2500 1500 60 0001 C CNN
1 2500 1550 1 2500 1500
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L GND #PWR06 L GND #PWR06
U 1 1 4B3A1557 U 1 1 4B3A1557
P 2500 1800 P 2500 1700
F 0 "#PWR06" H 2500 1800 30 0001 C CNN F 0 "#PWR06" H 2500 1700 30 0001 C CNN
F 1 "GND" H 2500 1730 30 0001 C CNN F 1 "GND" H 2500 1630 30 0001 C CNN
F 2 "" H 2500 1800 60 0001 C CNN F 2 "" H 2500 1700 60 0001 C CNN
F 3 "" H 2500 1800 60 0001 C CNN F 3 "" H 2500 1700 60 0001 C CNN
1 2500 1800 1 2500 1700
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Sheet $Sheet
@ -232,7 +232,7 @@ U 1 1 4B3A12F4
P 1650 1400 P 1650 1400
F 0 "P1" V 1600 1400 40 0000 C CNN F 0 "P1" V 1600 1400 40 0000 C CNN
F 1 "CONN_2" V 1700 1400 40 0000 C CNN F 1 "CONN_2" V 1700 1400 40 0000 C CNN
F 2 "" H 1650 1400 60 0001 C CNN F 2 "connect:bornier2" H 1650 1400 60 0001 C CNN
F 3 "" H 1650 1400 60 0001 C CNN F 3 "" H 1650 1400 60 0001 C CNN
1 1650 1400 1 1650 1400
-1 0 0 -1 -1 0 0 -1
@ -254,7 +254,7 @@ U 1 1 4B03CEC2
P 9200 1600 P 9200 1600
F 0 "C1" H 9350 1650 50 0000 L CNN F 0 "C1" H 9350 1650 50 0000 L CNN
F 1 "47uF" H 9350 1600 50 0000 L TNN F 1 "47uF" H 9350 1600 50 0000 L TNN
F 2 "" H 9200 1600 60 0001 C CNN F 2 "discret:CP6" H 9200 1600 60 0001 C CNN
F 3 "" H 9200 1600 60 0001 C CNN F 3 "" H 9200 1600 60 0001 C CNN
1 9200 1600 1 9200 1600
1 0 0 -1 1 0 0 -1
@ -262,12 +262,12 @@ $EndComp
$Comp $Comp
L GND #PWR09 L GND #PWR09
U 1 1 4B03CEC1 U 1 1 4B03CEC1
P 9200 1850 P 9200 1800
F 0 "#PWR09" H 9200 1850 30 0001 C CNN F 0 "#PWR09" H 9200 1800 30 0001 C CNN
F 1 "GND" H 9200 1780 30 0001 C CNN F 1 "GND" H 9200 1730 30 0001 C CNN
F 2 "" H 9200 1850 60 0001 C CNN F 2 "" H 9200 1800 60 0001 C CNN
F 3 "" H 9200 1850 60 0001 C CNN F 3 "" H 9200 1800 60 0001 C CNN
1 9200 1850 1 9200 1800
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
@ -350,35 +350,35 @@ $EndComp
$Comp $Comp
L GND #PWR017 L GND #PWR017
U 1 1 4AE173D0 U 1 1 4AE173D0
P 3200 3100 P 3200 3000
F 0 "#PWR017" H 3200 3100 30 0001 C CNN F 0 "#PWR017" H 3200 3000 30 0001 C CNN
F 1 "GND" H 3200 3030 30 0001 C CNN F 1 "GND" H 3200 2930 30 0001 C CNN
F 2 "" H 3200 3100 60 0001 C CNN F 2 "" H 3200 3000 60 0001 C CNN
F 3 "" H 3200 3100 60 0001 C CNN F 3 "" H 3200 3000 60 0001 C CNN
1 3200 3100 1 3200 3000
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L CP C2 L CP C2
U 1 1 4AE173CF U 1 1 4AE173CF
P 3200 2800 P 3200 2750
F 0 "C2" H 3350 2850 50 0000 L CNN F 0 "C2" H 3350 2800 50 0000 L CNN
F 1 "47uF/20V" H 3350 2750 50 0000 L TNN F 1 "47uF/20V" H 3350 2700 50 0000 L TNN
F 2 "" H 3200 2800 60 0001 C CNN F 2 "discret:CP6" H 3200 2750 60 0001 C CNN
F 3 "" H 3200 2800 60 0001 C CNN F 3 "" H 3200 2750 60 0001 C CNN
1 3200 2800 1 3200 2750
1 0 0 -1 1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L DIODE D1 L D_Small D1
U 1 1 4AE172F4 U 1 1 4AE172F4
P 2700 2500 P 2700 2500
F 0 "D1" H 2700 2400 40 0000 C CNN F 0 "D1" H 2700 2400 40 0000 C CNN
F 1 "1N4007" H 2700 2600 40 0000 C CNN F 1 "1N4007" H 2700 2600 40 0000 C CNN
F 2 "" H 2700 2500 60 0001 C CNN F 2 "discret:D5" H 2700 2500 60 0001 C CNN
F 3 "" H 2700 2500 60 0001 C CNN F 3 "" H 2700 2500 60 0001 C CNN
1 2700 2500 1 2700 2500
1 0 0 1 -1 0 0 -1
$EndComp $EndComp
$Comp $Comp
L GND #PWR018 L GND #PWR018
@ -397,7 +397,7 @@ U 1 1 4AD71B06
P 1650 2600 P 1650 2600
F 0 "P2" V 1600 2600 40 0000 C CNN F 0 "P2" V 1600 2600 40 0000 C CNN
F 1 "CONN_2" V 1700 2600 40 0000 C CNN F 1 "CONN_2" V 1700 2600 40 0000 C CNN
F 2 "" H 1650 2600 60 0001 C CNN F 2 "connect:bornier2" H 1650 2600 60 0001 C CNN
F 3 "" H 1650 2600 60 0001 C CNN F 3 "" H 1650 2600 60 0001 C CNN
1 1650 2600 1 1650 2600
-1 0 0 -1 -1 0 0 -1

144
demos/complex_hierarchy/complex_hierarchy_schlib.lib
View File

@ -3,29 +3,31 @@ EESchema-LIBRARY Version 2.3
# #
# +12C # +12C
# #
DEF +12C #PWR 0 0 N Y 1 F P DEF +12C #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -30 30 H I C CNN F0 "#PWR" 0 -150 50 H I C CNN
F1 "+12C" 0 110 40 H V C CNN F1 "+12C" 0 150 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 P 2 0 1 0 -30 50 0 100 N
C 0 60 20 0 1 0 N P 2 0 1 0 0 0 0 100 N
P 4 0 1 0 0 0 0 40 0 40 0 40 N P 2 0 1 0 0 100 30 50 N
X +12C 1 0 0 0 U 50 50 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# +12V # +12V
# #
DEF +12V #PWR 0 0 N Y 1 F P DEF +12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -50 20 H I C CNN F0 "#PWR" 0 -150 50 H I C CNN
F1 "+12V" 0 100 30 H V C CNN F1 "+12V" 0 140 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 P 2 0 1 0 -30 50 0 100 N
C 0 60 20 0 1 0 N P 2 0 1 0 0 0 0 100 N
P 3 0 1 0 0 0 0 40 0 40 N P 2 0 1 0 0 100 30 50 N
X +12V 1 0 0 0 U 50 50 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
@ -62,20 +64,22 @@ 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" 0 100 40 H V L CNN F0 "C" 25 100 50 H V L CNN
F1 "C" 6 -85 40 H V L CNN F1 "C" 25 -100 50 H V L CNN
F2 "" 38 -150 30 H V C CNN F2 "" 38 -150 30 H V C CNN
F3 "" 0 100 30 H V C CNN F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
SM*
C? C?
C1-1 C_????_*
C_????
SMD*_c
Capacitor*
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 2 0 1 20 -80 -30 80 -30 N P 2 0 1 20 -80 -30 80 -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 ~ 1 0 150 110 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P X ~ 2 0 -150 110 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
@ -95,61 +99,72 @@ ENDDEF
# #
# CP # CP
# #
DEF CP C 0 10 N N 1 F N DEF CP C 0 10 N Y 1 F N
F0 "C" 50 100 40 H V L CNN F0 "C" 25 100 50 H V L CNN
F1 "CP" 50 -100 40 H V L CNN F1 "CP" 25 -100 50 H V L CNN
F2 "" 100 -150 30 H V C CNN F2 "" 38 -150 30 H V C CNN
F3 "" 50 100 30 H V C CNN F3 "" 0 0 60 H V C CNN
ALIAS CAPAPOL
$FPLIST $FPLIST
CP* CP*
SM* Elko*
TantalC*
C*elec
c_elec*
SMD*_Pol
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 4 0 1 8 -80 50 -80 -50 80 -50 80 50 N S -90 20 -90 40 0 1 0 N
P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F S -90 20 90 20 0 1 0 N
X ~ 1 0 200 150 D 40 40 1 1 P S -70 90 -30 90 0 1 0 N
X ~ 2 0 -200 150 U 40 40 1 1 P S -50 70 -50 110 0 1 0 N
S 90 -20 -90 -40 0 1 0 F
S 90 40 -90 40 0 1 0 N
S 90 40 90 20 0 1 0 N
X ~ 1 0 150 110 D 40 40 1 1 P
X ~ 2 0 -150 110 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# DIODE # D_Small
# #
DEF DIODE D 0 40 N N 1 F N DEF D_Small D 0 10 N N 1 F N
F0 "D" 0 100 40 H V C CNN F0 "D" -50 80 50 H V L CNN
F1 "DIODE" 0 -100 40 H V C CNN F1 "D_Small" -150 -80 50 H V L CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 V V C CNN
F3 "" 0 0 60 H V C CNN F3 "" 0 0 60 V V C CNN
$FPLIST $FPLIST
D? Diode_*
S* D-Pak_TO252AA
*SingleDiode
*SingleDiode*
*_Diode_*
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 2 0 1 6 50 50 50 -50 N P 2 0 1 0 -30 -40 -30 40 N
P 3 0 1 0 -50 50 50 0 -50 -50 F P 4 0 1 0 30 -40 -30 0 30 40 30 -40 F
X A 1 -200 0 150 R 40 40 1 1 P X K 1 -100 0 70 R 50 50 1 1 P
X K 2 200 0 150 L 40 40 1 1 P X A 2 100 0 70 L 50 50 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# GND # GND
# #
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 -150 50 H I C CNN
F1 "GND" 0 -70 30 H I C CNN F1 "GND" 0 -123 30 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
X GND 1 0 0 0 U 30 30 1 1 W N X GND 1 0 0 0 D 20 30 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# HT # HT
# #
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 50 H I C CNN
F1 "HT" 0 90 30 H V C CNN F1 "HT" 0 90 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN
DRAW DRAW
@ -264,8 +279,8 @@ 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 95 30 H I C CNN F0 "#FLG" 0 95 50 H I C CNN
F1 "PWR_FLAG" 0 180 30 H V C CNN F1 "PWR_FLAG" 0 180 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN F3 "" 0 0 60 H V C CNN
DRAW DRAW
@ -277,35 +292,32 @@ 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 40 V V C CNN F0 "R" 80 0 50 V V C CNN
F1 "R" 7 1 40 V V C CNN F1 "R" 0 0 50 V V C CNN
F2 "" -70 0 30 V V C CNN F2 "" -70 0 30 V V C CNN
F3 "" 0 0 30 H V C CNN F3 "" 0 0 30 H V C CNN
$FPLIST $FPLIST
R? R_*
SM0603 Resistor_*
SM0805
R?-*
SM1206
$ENDFPLIST $ENDFPLIST
DRAW DRAW
S -40 150 40 -150 0 1 12 N S -40 -100 40 100 0 1 10 N
X ~ 1 0 250 100 D 60 60 1 1 P X ~ 1 0 150 50 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P X ~ 2 0 -150 50 U 60 60 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# VCC # VCC
# #
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 -150 50 H I C CNN
F1 "VCC" 0 100 30 H V C CNN F1 "VCC" 0 150 50 H V C CNN
F2 "" 0 0 60 H V C CNN F2 "" 0 0 60 H V C CNN
F3 "" 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 C 0 75 25 0 1 0 N
C 0 50 20 0 1 0 N P 2 0 1 0 0 0 0 50 N
P 3 0 1 0 0 0 0 30 0 30 N X VCC 1 0 0 0 U 50 50 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #

21
eeschema/netform.cpp
View File

@ -104,38 +104,41 @@ bool SCH_EDIT_FRAME::WriteNetListFile( NETLIST_OBJECT_LIST* aConnectedItemsList,
if( aReporter ) if( aReporter )
{ {
wxArrayString output, errors; wxArrayString output, errors;
int diag = wxExecute (commandLine, output, errors, wxEXEC_SYNC ); int diag = wxExecute( commandLine, output, errors, wxEXEC_SYNC );
wxString msg; wxString msg;
msg << _("Run command:") << wxT("\n") << commandLine << wxT("\n\n"); msg << _( "Run command:" ) << wxT( "\n" ) << commandLine << wxT( "\n\n" );
aReporter->Report( msg, REPORTER::RPT_ACTION ); aReporter->Report( msg, REPORTER::RPT_ACTION );
if( diag != 0 ) if( diag != 0 )
aReporter->Report( wxString::Format( _("Command error. Return code %d"), diag ), REPORTER::RPT_ERROR ); aReporter->Report( wxString::Format(
_("Command error. Return code %d" ), diag ),
REPORTER::RPT_ERROR );
else else
aReporter->Report( _("Success"), REPORTER::RPT_INFO ); aReporter->Report( _( "Success" ), REPORTER::RPT_INFO );
*aReporter << wxT("\n"); *aReporter << wxT("\n");
if( output.GetCount() ) if( output.GetCount() )
{ {
msg << wxT("\n") << _("Info messages:") << wxT("\n"); msg.Empty();
msg << wxT( "\n" ) << _( "Info messages:" ) << wxT( "\n" );
aReporter->Report( msg, REPORTER::RPT_INFO ); aReporter->Report( msg, REPORTER::RPT_INFO );
for( unsigned ii = 0; ii < output.GetCount(); ii++ ) for( unsigned ii = 0; ii < output.GetCount(); ii++ )
aReporter->Report( output[ii], REPORTER::RPT_INFO ); aReporter->Report( output[ii] + wxT( "\n" ), REPORTER::RPT_INFO );
} }
if( errors.GetCount() ) if( errors.GetCount() )
{ {
msg << wxT("\n") << _("Error messages:") << wxT("\n"); msg.Empty();
msg << wxT("\n") << _( "Error messages:" ) << wxT( "\n" );
aReporter->Report( msg, REPORTER::RPT_INFO ); aReporter->Report( msg, REPORTER::RPT_INFO );
for( unsigned ii = 0; ii < errors.GetCount(); ii++ ) for( unsigned ii = 0; ii < errors.GetCount(); ii++ )
aReporter->Report( errors[ii], REPORTER::RPT_ERROR ); aReporter->Report( errors[ii] + wxT( "\n" ), REPORTER::RPT_ERROR );
} }
} }
else else