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

Merge with tip of product branch r6303, 4.0.0-rc1.

This commit is contained in:
Wayne Stambaugh 2015-11-08 16:22:19 -05:00
parent ca1ae0d4a0 5897580c13
commit ce81524b83
380 changed files with 17307 additions and 20586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3d-viewer/3d_canvas.cpp
View File

@ -651,9 +651,9 @@ void EDA_3D_CANVAS::TakeScreenshot( wxCommandEvent& event )
mask = wxT( "*." ) + file_ext;
fn.SetExt( file_ext );
FullFileName = EDA_FileSelector( _( "3D Image File Name:" ), fn.GetPath(),
fn.GetFullName(), file_ext, mask, this,
wxFD_SAVE | wxFD_OVERWRITE_PROMPT, true );
FullFileName = EDA_FILE_SELECTOR( _( "3D Image File Name:" ), fn.GetPath(),
fn.GetFullName(), file_ext, mask, this,
wxFD_SAVE | wxFD_OVERWRITE_PROMPT, true );
if( FullFileName.IsEmpty() )
return;

6
3d-viewer/3d_mesh_model.cpp
View File

@ -333,6 +333,12 @@ void S3D_MESH::openGL_Render( bool aIsRenderingJustNonTransparentObjects,
#endif
*/
if( m_Materials && m_Materials->m_ColorPerVertex == false )
{
if( m_Materials->m_DiffuseColor.size() == m_Point.size() )
m_Materials->m_ColorPerVertex = true;
}
for( unsigned int idx = 0; idx < m_CoordIndex.size(); idx++ )
{
if( m_Materials )

10
3d-viewer/3d_toolbar.cpp
View File

@ -55,7 +55,7 @@ void EDA_3D_FRAME::ReCreateMainToolbar()
m_mainToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString,
KiBitmap( copy_button_xpm ),
_( "Copy 3D Image to Clipboard" ) );
_( "Copy 3D image to clipboard" ) );
m_mainToolBar->AddSeparator();
@ -173,7 +173,7 @@ void EDA_3D_FRAME::CreateMenuBar()
AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_TEXTURES,
_( "Render Textures" ),
_( "Apply a grid/cloud textures to Board, Solder Mask and Silkscreen" ),
_( "Apply a grid/cloud textures to board, solder mask and silk screen" ),
KiBitmap( green_xpm ), wxITEM_CHECK );
AddMenuItem( renderOptionsMenu, ID_MENU3D_FL_RENDER_SMOOTH_NORMALS,
@ -257,7 +257,7 @@ void EDA_3D_FRAME::CreateMenuBar()
_( "Show Copper &Thickness" ), KiBitmap( use_3D_copper_thickness_xpm ), wxITEM_CHECK );
AddMenuItem( prefsMenu, ID_MENU3D_MODULE_ONOFF,
_( "Show 3D F&ootprints" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK );
_( "Show 3D M&odels" ), KiBitmap( shape_3d_xpm ), wxITEM_CHECK );
AddMenuItem( prefsMenu, ID_MENU3D_ZONE_ONOFF,
_( "Show Zone &Filling" ), KiBitmap( add_zone_xpm ), wxITEM_CHECK );
@ -272,7 +272,7 @@ void EDA_3D_FRAME::CreateMenuBar()
_( "Show &Adhesive Layers" ), KiBitmap( tools_xpm ), wxITEM_CHECK );
AddMenuItem( layersMenu, ID_MENU3D_SILKSCREEN_ONOFF,
_( "Show &Silkscreen Layer" ), KiBitmap( add_text_xpm ), wxITEM_CHECK );
_( "Show &Silkscreen Layers" ), KiBitmap( add_text_xpm ), wxITEM_CHECK );
AddMenuItem( layersMenu, ID_MENU3D_SOLDER_MASK_ONOFF,
_( "Show Solder &Mask Layers" ), KiBitmap( pads_mask_layers_xpm ), wxITEM_CHECK );
@ -283,7 +283,7 @@ void EDA_3D_FRAME::CreateMenuBar()
// Other layers are not "board" layers, and are not shown in realistic mode
// These menus will be disabled in in realistic mode
AddMenuItem( layersMenu, ID_MENU3D_COMMENTS_ONOFF,
_( "Show &Comments and Drawings Layer" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK );
_( "Show &Comments and Drawing Layers" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK );
AddMenuItem( layersMenu, ID_MENU3D_ECO_ONOFF,
_( "Show &Eco Layers" ), KiBitmap( edit_sheet_xpm ), wxITEM_CHECK );

42
3d-viewer/dialogs/dialog_3D_view_option_base.cpp
View File

@ -25,64 +25,64 @@ DIALOG_3D_VIEW_OPTIONS_BASE::DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWi
fgSizeShowOpts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_bitmapRealisticMode = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapRealisticMode, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxRealisticMode = new wxCheckBox( this, wxID_ANY, _("Realistic mode"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxRealisticMode, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxRealisticMode, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapCuThickness = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapCuThickness, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapCuThickness, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxCuThickness = new wxCheckBox( this, wxID_ANY, _("Show copper thickness"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxCuThickness, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxCuThickness, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmap3Dshapes = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmap3Dshapes, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmap3Dshapes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBox3Dshapes = new wxCheckBox( this, wxID_ANY, _("Show component 3D shapes"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBox3Dshapes, 0, wxALL, 5 );
m_checkBox3Dshapes = new wxCheckBox( this, wxID_ANY, _("Show 3D Models"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBox3Dshapes, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapAreas = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapAreas, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxAreas = new wxCheckBox( this, wxID_ANY, _("Show filled areas in zones"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxAreas, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxAreas, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapSilkscreen = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapSilkscreen, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapSilkscreen, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxSilkscreen = new wxCheckBox( this, wxID_ANY, _("Show silkscreen layers"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxSilkscreen, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxSilkscreen, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapSolderMask = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapSolderMask, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxSolderMask = new wxCheckBox( this, wxID_ANY, _("Show solder mask layers"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxSolderMask, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxSolderMask, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapSolderPaste = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapSolderPaste, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapSolderPaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxSolderpaste = new wxCheckBox( this, wxID_ANY, _("Show solder paste layers"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxSolderpaste, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxSolderpaste, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapAdhesive = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapAdhesive, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxAdhesive = new wxCheckBox( this, wxID_ANY, _("Show adhesive layers"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxAdhesive, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxAdhesive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapComments = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapComments, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxComments = new wxCheckBox( this, wxID_ANY, _("Show comments and drawings layers"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxComments, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxComments, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_bitmapECO = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_bitmapECO, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_bitmapECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_checkBoxECO = new wxCheckBox( this, wxID_ANY, _("Show ECO layers"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizeShowOpts->Add( m_checkBoxECO, 0, wxALL, 5 );
fgSizeShowOpts->Add( m_checkBoxECO, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
bSizerLeft->Add( fgSizeShowOpts, 1, wxEXPAND, 5 );

42
3d-viewer/dialogs/dialog_3D_view_option_base.fbp
View File

@ -120,7 +120,7 @@
<property name="vgap">0</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -201,7 +201,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -289,7 +289,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -370,7 +370,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -458,7 +458,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -539,7 +539,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -570,7 +570,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Show component 3D shapes</property>
<property name="label">Show 3D Models</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -627,7 +627,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -708,7 +708,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -796,7 +796,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -877,7 +877,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -965,7 +965,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -1046,7 +1046,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -1134,7 +1134,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -1215,7 +1215,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -1303,7 +1303,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -1384,7 +1384,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -1472,7 +1472,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -1553,7 +1553,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -1641,7 +1641,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -1722,7 +1722,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>

14
3d-viewer/dialogs/dialog_3D_view_option_base.h
View File

@ -38,7 +38,7 @@ class DIALOG_SHIM;
class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
{
private:
protected:
wxStaticBitmap* m_bitmapRealisticMode;
wxCheckBox* m_checkBoxRealisticMode;
@ -66,19 +66,19 @@ class DIALOG_3D_VIEW_OPTIONS_BASE : public DIALOG_SHIM
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
wxButton* m_sdbSizerCancel;
// Virtual event handlers, overide them in your derived class
virtual void OnCheckRealisticMode( wxCommandEvent& event ) { event.Skip(); }
virtual void OnShowAllClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnShowNoneClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }
public:
DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
DIALOG_3D_VIEW_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("3D Display Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_3D_VIEW_OPTIONS_BASE();
};
#endif //__DIALOG_3D_VIEW_OPTION_BASE_H__

9
3d-viewer/vrml_v2_modelparser.cpp
View File

@ -1314,7 +1314,8 @@ int VRML2_MODEL_PARSER::read_Material()
if( strcmp( text, "diffuseColor" ) == 0 )
{
ParseVertex( m_file, vertex );
m_model->m_Materials->m_DiffuseColor.push_back( vertex );
if( m_model->m_Materials->m_DiffuseColor.empty() )
m_model->m_Materials->m_DiffuseColor.push_back( vertex );
}
else if( strcmp( text, "emissiveColor" ) == 0 )
{
@ -1640,6 +1641,12 @@ int VRML2_MODEL_PARSER::read_Color()
if( strcmp( text, "color" ) == 0 )
{
if( m_model->m_Materials == NULL )
{
m_model->m_Materials = new S3D_MATERIAL( m_Master, "" );
m_Master->Insert( m_model->m_Materials );
}
m_model->m_Materials->m_DiffuseColor.clear();
ParseVertexList( m_file, m_model->m_Materials->m_DiffuseColor );
}

219
Documentation/compiling/COMPILING.txt
View File

@ -1,219 +0,0 @@
Compiling KiCad from Source
===========================
KiCad Documentation Team
Last revised on 2014-december-24 by JP Charras
Introduction
------------
This is a generic guide how to compile kicad from scratch. On windows and linux.
If you need something more distribution specific or the experimental mac-osx port
read the other documents in the Documentation/compiling folder.
Installation of Tools
---------------------
On windows:
Get msys and mingw here:
http://mingw.org/
msys sets up a development environment that allows the bash shell to run.
mingw are a set of tools that run on windows or under msys. You will need
at least the following mingw packages: make, gcc, g++, binutils, autoconf, and
automake.
On linux:
Install "mesa". Use your package manager to install the
development libaries.
After a fresh install you need the following packages to compile and run
KiCad from source.
* bzr - Bazaar version control system
* CMake - Cross-platform make
* GLUT - The OpenGL Utility Library
* GLEW
* wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings version 3.0 or more
* libbz2 (dev)
* libcairo (dev)
* Boost - Collection of portable C++ source libraries
boost will be automagically downloaded, copied in kicad sources tree and patched,
the first time you compile kicad.
Useful, but not required:
* Doxygen - Documentation system for several programming languages
Required to build Kicad with scripting (using python) support:
Python
Swig
KiCad uses the Bazaar version control system to track source code changes,
and download the boost libraries needed by Kicad.
Be sure you bzr install also includes bzrtools.
boost libraries will be downloaded the first time you build Kicad.
Compiler and basic development tools
-------------
Make sure g++, make and other tools are in your path.
If windows, then try running g++ and make from within your msys bash shell.
PLEASE NOTE: g++ 4.7.1 and 4.7.2 are known to
miscompile pcbnew (it get zones wrong) with -O2; using -O1 is a suitable
workaround until they fix the compiler.
Install or Build wxWidgets
--------------------------
WARNING:
see wxWidgets_patch_notes.txt for patches and issues in wxWidgets.
On Windows, download
http://sourceforge.net/projects/wxwindows/files/3.0.2/wxWidgets-3.0.2.zip/download
or a newer version.
Do NOT use previous versions which all have annoying issues for KiCad.
Start msys so you have a bash shell.
Note also since 2.9 versions no need to build a "debug" version of the wxWidgets library,
the release and the debug version are same.
Unzip the wxWidgets zip file into the build directory. Change directories into
there, and then:
mkdir Release
cd Release
../configure --with-opengl
make
and under Linux, but not under Windows:
sudo make install that install wxWidgets libs and headers in /usr/local/
On linux, yo can also download wxWidgets 3.0 (recommandedd)
or you can use your package manager to install the
development versions of the wxWidgets packages which include the C++ headers.
The recommended way is to build wxWidgets from source, and use wxWidgets 3.0
or more recent (Older versions have a print function which does not work).
Verify that wx-config is in your path by running it from a command prompt.
Linux users then go to next step.
Install CMake
-------------
On windows, download the installation binary for windows from cmake.org.
Install that and choose to add cmake to your path during installation. You
will have to restart your command shell for the new path to take effect.
Verify that cmake is in your path by trying to run it from a command prompt.
On linux, use your package manager to install cmake. You should get cmake 2.8.4
or later. If only an older one is available in your package repository, build
cmake from source. Verify that cmake is in your path by trying to run it from a
command prompt.
Obtain Sources
--------------
You can use the Launchpad repository or a tar file for this. See the wiki.
To download files from Launchpad repository, you should install bazaar (bzr) that is a
version control system like subversion, mercurial, git...
Launchpad repository handle 2 branches for KiCda sources:
- a product branch (used by developers, which is most of time usable in production)
- a stable branch (a copy of the testing branch,
when the product branch is a stable state))
Remarks:
- The product branch is actively maintained
- From the product branch, you can go back to any previous version, using bzr features
- The stable branch is poorly or not maintained (and could be removed)
In order to have a working Kicad installtion, you need
- sources to build binaries
- libraries (they are not included in sources)
- documentation and translations (they are not included in sources)
product branch:
bzr branch https://code.launchpad.net/~kicad-product-committers/kicad kicad_src
Stable branch:
bzr branch https://code.launchpad.net/~kicad-product-committers/kicad/stable kicad_src
Components and Footprints libraries
all (schematic libs, 3D shapes ...) but new footprints libraries (use Download zip tool)
https://github.com/KiCad/kicad-library/
New footprints libraries (use Download zip tool for each lib you want)
https://github.com/KiCad/ for footprint libs (*.pretty folders)
A mirror of github is available, using bzr:
(schematic libs, 3D shapes ... all but new footprints libraries)
bzr checkout lp:~kicad-product-committers/kicad/library
Old legacy libraries:
bzr checkout lp:~dickelbeck/kicad/library-read-only
Note also Kicad is able to read on github.com/KiCad/ the *.pretty folders
without download, using github plugin.
(however the time to read them can be long)
Documentation and translations:
bzr branch lp:~kicad-developers/kicad/doc kicad_doc
Create Makefiles with CMake
---------------------------
On windows, go into your msys shell.
Linux and windows users both then make two "out of source" build directories:
cd <kicadSource>
mkdir -p build/release
mkdir build/debug (if you want a debug version of KiCad)
cd build/release
On either cmake command line shown below, you can optionally include
-DCMAKE_INSTALL_PREFIX=<finallInstallDir>
For instance on Linux: <finallInstallDir>=/usr/local/kicad or ~/kicad
On windows, run the following command:
cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
Avoid installing Kicad on C: disk, which is protected by Windows.
Use D: or E: ...
On linux, run instead the following command:
cmake -DCMAKE_BUILD_TYPE=Release ../../
Take a look at CMakeCache.txt, and in particular CMAKE_INSTALL_PREFIX, which
gives the final install directory. If not what you want, edit it with a text
editor and re-run the same cmake command again, but with no
-DCMAKE_INSTALL_PREFIX given on the command line.
Compiling with Make
------------------~
You compile Kicad here. You will only need to do step 8) again when one of the
CMakeLists.txt files change. If windows, you must be in your msys shell.
On either platform then:
cd <kicadSource>/build/release
make
[sudo] make install
You are now done unless you want to make a Debug build.
Compiling a Debug version
-------------------------
cd <kicadSource>/build/debug
On either cmake command line shown below, you can optionally include
-DCMAKE_INSTALL_PREFIX=<finallInstallDir> before the final ../../ argument.
Although normally you do not install the Debug binaries, you can debug them
where they were built.
On windows, run the following command:
cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
where <wxInstallDir> is <wxWidgets path>/Release
On linux, run instead the following command:
cmake -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_USE_DEBUG=ON ../../
Make the Debug binaries:
make
See Documentation/compiling/build-config.txt for a list of all CMake options
available when compiling KiCad.

192
Documentation/compiling/build-config.txt
View File

@ -1,192 +0,0 @@
Bazaar
======
KiCad uses the Bazaar version control system to track source code changes,
and download the boost libraries needed by Kicad.
The easiest way to get a copy of the KiCad source is to use Bazaar.
Bazaar can be download from http://wiki.bazaar.canonical.com.
Your best bet is to use the stand alone version of Bazaar
(which includes bzrtools, needed by Kicad) rather than one of
the Python specific versions.
Be sure bzrtools is also installed.
boost libraries will be downloaded the first time you build Kicad.
CMake
=====
KiCad uses CMake (version 2.12 or later) to generate the build files specific for the target platform
specified by the developer. This document attempts to define some of the more
common CMake and KiCad build configuration settings. You can use CMake either
by the command CMake on or the graphical version ccmake. This document only
documents a very small subset of the total CMake documentation For all of the
gory details, please see the complete CMake documentation at:
http://www.cmake.org/cmake/help/documentation.html.
Useful CMake Build Settings.
============================
This section defines some of the more common CMake build configuration setting
used when configuring KiCad. These settings are valid for all projects that
use CMake.
Changing the Build Generator.
-----------------------------
CMake attempts to create the project build system based on the platform. On
Posix systems CMake will create Unix Makefiles to build KiCad. On Windows
systems CMake will attempt to find the latest version of Visual C++ installed
on the system and create the appropriate project files. This behavior can be
changed by specifying the project generator using the -G "Project Generator"
switch on the command line. Please note, only a small subset of these project
generators are supported. If you want to use Eclipse on Linux to build KiCad,
you may be in for a lot of work.
CMAKE_BUILD_TYPE (Release/Debug/RelWithDebInfo/MinSizeRel)
----------------------------------------------------------
Default: Release
When configuring the KiCad build for the command line you must specify build
type. To create a debug build, set CMAKE_BUILD_TYPE to Debug. To create a
release build, set CMAKE_BUILD_TYPE to Release. See the CMake documentation
for other build types. For IDE project files, the build type can be selected
by the IDE configuration manager.
CMAKE_INSTALL_PATH (InstallPath)
--------------------------------
By default CMake will select the correct install path for your platform. If
you wish to install KiCad in a custom location, set CMAKE_INSTALL_PATH to the
path where you want to install KiCad. Please note that the default install
path that CMake chooses will likely overwrite the current version of KiCad
installed on your system.
wxWidgets Library Configuration.
================================
KiCad is built using the wxWidgets library. The following options allow you
to specifically tailor the wxWidgets library configuration. For the complete
list of wxWidgets setting see CMakeModules/FindwxWidgets.cmake in the KiCad
source.
wxWidgets_ROOT_DIR (NonDefaultwxWidgetsPath)
--------------------------------------------
CMake looks in the standard platform locations to find the default version of
the wxWidgets library. If you wish to use a custom built wxWidgets library,
set wxWidgets_ROOT_DIR to the correct path.
KiCad Specific Options
======================
All of the configuration settings below are specific to the KiCad project.
If for any reason you add or remove a build option to the KiCad CMake files,
please update the list below.
KICAD_SKIP_BOOST (ON/OFF)
--------------------------
Default: OFF
Use the version of the Boost library installed on the system rather than
building a local copy.
WARNING: The KiCad developers strongly advise you to build the bundled copy of
the Boost library, as it is known to work with KiCad. Other versions may
contain bugs that may result in KiCad errors.
USE_IMAGES_IN_MENUS (ON/OFF)
----------------------------
Default: OFF for OSX, ON for other platforms.
This option is used to enable or disable building KiCad with images (icons) in menu
items. If this is not defined when CMake is used to create the build files,
images will be included in menu items on all platforms except OSX.
Note also, on Linux, some window managers do not show icons in menu, or
show them only if the current option is activated.
Therefore, even if you have icons in menus, they will be not always displayed
DOWNLOAD_DIR (PATH)
-------------------
Default: <source directory>/.downloads-by-cmake
Some external dependencies are automatically download and built when you
compile KiCad. This option specifies which directory they are stored in. If you
are building multiple copies of KiCad (e.g., to test different features or your
own modifications), it is recommended you set this option to a global directory
to avoid download and building the dependencies multiple times.
KICAD_USER_CONFIG_DIR (PATH)
----------------------------
Default: ~/.config (Unix-based systems), Application data directory (Windows)
This option specifies where to store user-specific configuration information.
USE_WX_OVERLAY (ON/OFF)
-----------------------
Default: ON for OSX, OFF for other platforms.
This option enables or disables the use of wxOverlay for drawing operations.
Warning, this is experimental!
KICAD_SCRIPTING (ON/OFF)
------------------------
Default: OFF
This option enables or disables building Python scripting support within KiCad.
Currently only Pcbnew is supported. This option requires SWIG and Python to be
installed on the system.
It allows using footprint wizards in footprint editor to create new footprints
KICAD_SCRIPTING_MODULES (ON/OFF)
--------------------------------
Default: OFF
This option enables or disables building KiCad Python modules that can be used
externally by Python. Currently only Pcbnew is supported. This option
requires SWIG and Python to be installed on the system.
This python module is used to edit board files (.kicad_pcb files) from a
python script, outside kicad.
KICAD_SCRIPTING_WXPYTHON (ON/OFF)
---------------------------------
Default: OFF
This option enables or disables building wxPython support into the KiCad
scripting support. Currently only Pcbnew has scripting support. This option requires
SWIG, Python, and wxPython to be installed on the system.
It allows execution of python scripts insided Pcbnew, during a session.
PYTHON_SITE_PACKAGE_PATH (PATH)
-------------------------------
Default: System site library path
When building KiCad with Python scripting enable, the Python site library path
is used by default. If you want to install the KiCad Python extension in a
different path, set this variable to the desired path.
BUILD_GITHUB_PLUGIN (ON/OFF)
----------------------------
Default: ON
This option enables or disables building KiCad with a pcbnew plugin for loading
footprints from a GitHub repository.
KICAD_REPO_NAME (STRING)
------------------------
Default: "product"
The name of the repository this copy of KiCad was compiled from. This is
reported in the "About" dialog and is useful for people who are working with
multiple copies of the code from different sources. The default value is
"product", the name of the main development branch on Launchpad.

229
Documentation/compiling/build-msw.txt
View File

@ -1,229 +0,0 @@
Introduction
------------
This document details how to build KiCad from source on Windows. The current
supported method of building KiCad for Windows systems is to use the MinGW
compiler, either from Windows or cross compiling from Linux. MSYS can be
used on Windows to extend the range of subprojects that you can build, but
is not needed to build KiCad itself.
Visual Studio is not supported, and don't ask about it, it is not supported
and will not be, ever.
Install Build Tools
-------------------
This section describes the tools required to build KiCad from source and how
to install them. Failure to install these tools properly will likely result
in build errors.
MinGW/MSYS
----------
MinGW/MSYS provides the compiler tools and a partial Posix environment useful
for building software. Download the MinGW installer from http://mingw.org.
Run the installer and and verify MinGW and MSYS are checked. You will also
need to expand the MinGW entry and select C++ from the list of supported
languages. Only C is installed by default and C++ is required to build KiCad.
Bazaar
------
KiCad uses the Bazaar version control system to track source code changes,
and download the boost libraries needed by Kicad.
The easiest way to get a copy of the KiCad source is to use Bazaar. Bazaar
can be download from http://wiki.bazaar.canonical.com/WindowsDownloads.
Your best bet is to use the stand alone version of Bazaar
(which includes bzrtools, needed Kicad) rather than one of
the Python specific versions.
CMake
-----
The KiCad source uses CMake to make sure the system has the required software
and libraries installed to properly compile the source. Download the latest
CMake installer from http://cmake.org. Run the installer and make sure the
add CMake to PATH variable check box is checked. If you fail to do this step,
the CMake executable will not be found.
Doxygen (Optional)
------------------
Doxygen is used to generate HTML documentation of the KiCad source code. While
it is not necessary to install Doxygen, it is a very good way to learn your way
around the KiCad code base. It is highly recommended for new developers. The
latest Doxygen installer can be downloaded from http://www.stack.nl/~dimitri/
doxygen/
Python (Optional)
-----------------
KiCad supports the Python scripting language (currently only Pcbnew scripting
exists). Currently the Python scripting support will only build against the
version 2 branch of Python. The Python installer can be downloaded from http://
www.python.org.
SWIG (Optional)
---------------
SWIG is used to generate the Python scripting code. It must be installed to
build the Python scripting support. Unfortunately there in no installer for
windows. You can download precompiled binaries from http://http://www.swig.
org/download.html and install swig.exe. Make sure the folder you install the
SWIG binary into is in the system PATH. Otherwise CMake will not be able to
find it.
NullSoft Installer System (Optional)
------------------------------------
The NullSoft Installer System (NSIS) is used to create a Windows installer for
end users from the binaries created from the KiCad source along with the
library and documentation files. NSIS is typically only used be developers who
create installers for end users and is not required if you install from source.
NSIS can be downloaded from http://nsis.sourceforge.net/Download.
Install and Build Libraries
---------------------------
This section documents installing and build all of the software libraries
required to build KiCad. As of now, these libraries have to be built because
MinGW builds of these libraries are not readily available Attempting to link
programs built on MinGW with libraries from other compilers (namely Microsoft
Visual C) is problematic. It can be done but it is not painless. As far as
the author of this document knows, MinGW can only link to Visual Studio C
libraries. The name mangling of Visual Studio C++ is not compatible with the
MinGW linker.
Build and Install the wxWidgets Library
---------------------------------------
The wxWidgets library is the base that KiCad is built upon. Version 2.9.4
or later of wxWidgets *should be* used on Windows. You may be able to build
KiCad with older versions of wxWidgets but it is not recommended. wxWidgets
can be downloaded from http://http://www.wxwidgets.org/downloads/
Unzip the wxWidgets zip file into your preferred build directory. Avoid using
spaces in the path names. Some MinGW tools do not play well with them. It is
always best to error on the side of caution.
Open MinGW and change to the wxWidgets source directory. If you don't want to
install the wxWidgets library into MinGW then enter the following commands:
#mkdir Release
#cd Release
#../configure --enable-monolithic=no --enable-shared=yes --with-opengl
#make
If you want to install wxWidgets in MinGW then enter the following commands:
#mkdir Release
#cd Release
#../configure --prefix=/mingw --enable-monolithic=no --enable-shared=yes --with-opengl
#make && make install
wxWidgets cannot be statically linked to Kicad.
Download the KiCad Source Code
------------------------------
You can use the Launchpad repository or a tar file for this. See the wiki.
To download files from Launchpad repository, you need to install the Bazaar
(bzr) version control system.
Launchpad repository has two branches for KiCad sources:
- a testing branch (used by developers)
- a stable branch (a copy of the testing branch, when this testing branch is
near a stable state)
To download the testing branch:
#bzr branch https://code.launchpad.net/~kicad-product-committers/kicad kicad_testing
To download the stable branch:
#bzr branch https://code.launchpad.net/~kicad-product-committers/kicad/stable kicad_stable
To download the component and footprint libraries:
(This branch is a bzr/launchpad import of the Git repository
at https://github.com/KiCad/kicad-library.git.
It has schematic parts and 3D models in it.)
#bzr branch https://code.launchpad.net/~kicad-product-committers/kicad/library kicad_libraries
To download the documentation and translation files:
#bzr branch https://code.launchpad.net/~kicad-developers/kicad/doc kicad_doc
Create Makefiles with CMake
---------------------------
Open your Msys shell. Create two "out of source" build directories at the
command line enter the following commands:
#cd <kicadSource>
#mkdir -p build/release # Build path can be anywhere you prefer.
#mkdir build/debug # Only if you want a debug version of KiCad.
To create a release build of KiCad, run the following command:
#cd build
#cmake -G "MSYS Makefiles" \ # Back slashes are not required
-DCMAKE_BUILD_TYPE=Release ../../ \ # and are for formatting only.
If the configuration fails, you have failed to install the required software
on you system. The error message should give you a good indication of what is
missing. You must resolve this before you can build KiCad.
Compiling the Code
------------------
To build KiCad, at the command line enter following comnands:
#cd <kicadSource>/build/release
#make
Installing KiCad
----------------
To install Kicad, at the command line enter the following commands:
#cd <kicadSource>/build/release
#make install
If you get any errors during the installation, you probably do not have the
appropriate privileges to the install path. Take a look at CMakeCache.txt
that was created when you ran CMake, and in particular look at the value of
the CMAKE_INSTALL_PREFIX variable. This is where KiCad will be installed. If
this not where you want KiCad installed, edit it with a text editor rerun the
make install command. You do not have the appropriate privileges to install
KiCad in the CMAKE_INSTALL_PATH, run the make install command as administrator.
You are now done unless you want to make a Debug build.
Compiling a Debug version
-------------------------
To create a debug version of KiCad, enter the following commands:
#cd <kicadSource>/build/debug
#cmake -G "MSYS Makefiles" \
-DCMAKE_BUILD_TYPE=Debug ../../
#make
Generally speaking you do not install debug binaries. They can be debugged in
place. To monitor the debugging output, you can download the Windows debug
viewer DbgView from http://technet.microsoft.com/en-us/sysinternals/
bb896647.aspx
Compiling the Python Scripting Support.
---------------------------------------
Before building KiCad Python scripting extension, you must create a MinGW
compatible Python link library. The directions to do this can be found in
the "How do I create Python extensions?" FAQ at http://www.mingw.org/wiki/FAQ.
To build KiCad with Python scripting support, run CMake as follows and then
compile the source as described above.
#cmake -G "MSYS Makefiles" \
-DCMAKE_BUILD_TYPE=Release \
-DKICAD_PYTHON_SCRIPTING=ON \
-DKICAD_PYTHON_MODULES=ON ../../
You only need to include the KICAD_PYTHON_MODULES option if you want to
install the python modules that ship with KiCad. Also note that the wxPython
support cannot be compiled on Windows at this time due to library conflicts
between MinGW and Python. Work is currently underway by the KiCad developers
to provide a MinGW build of Python which should resolve this issue.
Building the Developer Documentation
------------------------------------
To build the HTML developer documentation, run the following commands:
#cd <kicadSource>/build/release
#make doxygen-docs
The documentation will be created in the <kicadSouce>/Documentation/html
directory.

221
Documentation/compiling/mac-osx.txt
View File

@ -1,221 +0,0 @@
Compiling KiCad on Apple Mac OS X
=================================
Building on OS X is very similar to building on Linux. This document will provide
a complete walk-through on what to do but it will focus on OS X specific things.
See general documentation on non OS X specific KiCad build switches, etc.
Prerequisites
-------------
Tools needed for building KiCad:
* XCode Tools
* bzr - Bazaar version control system
* CMake - Cross-platform make
Optional tools:
* Doxygen - Documentation system for several programming languages
Mandatory library dependencies needed to compile KiCad:
* GLEW - The OpenGL Extension Wrangler Library
* cairo - 2D graphics library
* wxWidgets - Cross-Platform GUI Library
OR
wxPython - A blending of the wxWidgets C++ class library with the Python
programming language
* SWIG - Interface compiler (only needed for scripting/wxPython builds)
Optional library dependencies, depends on used KiCad features
* OpenSSL - The Open Source toolkit for SSL/TLS
=> Needed for github plugin
All tools (except XCode, of course) and all dependencies except wxWidgets/wxPython
can be compiled manually, but it is advised to install them using your favorite
package manager for OS X like MacPorts or Homebrew.
Depending on the package manager the development packages of the library
dependencies may have to be installed (usually something like <pkg>-dev or
<pkg>-devel).
Further, depending on the configuration of your package manager packages might
have to be compiled with special flags/variants to support the correct
architecture. E.g., some packages of MacPorts need to have the "+universal"
variant set to also include the x86_64 variant that might be chosen
automatically by KiCad build process.
IMPORTANT:
At the moment you *must not* use a wxWidgets/wxPython version installed by any
package manager.
KiCad on OS X needs overlay support and some other fixes, which are not yet
contained in mainline wxWidgets/wxPython sources and builds.
If you don't use a patched wxWidgets you will get graphical artifacts (something
like a magnifying glass effect in the upper left corner of KiCad windows) or
KiCad will just crash on start (due to duplicate libraries).
Install now the tools and library dependencies as mentioned above.
Folder Structure
----------------
This documentation will use the following folder structure as an example, but it
is not mandatory to do it like that:
KiCad/
+-- kicad/ KiCad source folder
+-- build/ KiCad build folder
+-- bin/ KiCad binaries folder
+-- wx-src/ wxWidgets/wxPython source folder
+-- wx-build/ wxWidgets/wxPython build folder
+-- wx-bin/ wxWidgets/wxPython binaries folder
Get KiCad sources
-----------------
Create your work root "KiCad" wherever you like and sync KiCad sources to it:
# mkdir KiCad
# cd KiCad
# bzr branch lp:kicad
Compiling wxWidgets / wxPython
------------------------------
If you don't intend to build KiCad with scripting support then you only need
wxWidgets, otherwise you need wxPython (which also contains wxWidgets).
Get wxWidgets sources from
http://www.wxwidgets.org/downloads/
or wxPython sources from
http://www.wxpython.org/download.php#source
and unpack it to the wx-src folder.
It is recommended to use the latest stable version. As of this writing this is
3.0.2 for wxWidgets or 3.0.1.1 for wxPython.
There is a little helper script osx_build_wx.sh in kicad/scripts that does all
the patching/configuring/compiling of wxWidgets or wxPython for you.
Go to your working root "KiCad" and for example run:
# kicad/scripts/osx_build_wx.sh wx-src wx-bin kicad 10.7 "-j4"
First parameter is the source folder of wxWidgets/wxPython, second parameter the
target folder for compiled binaries, and third parameter is the kicad folder.
The fourth parameter is the minimum OS X version you are building for (see the
section about compiling KiCad for further notes on minimum OS X version).
The last parameter is optional and contains make options used during the build
(in this example for building with 4 jobs in parallel).
The script will automatically detect if you are compiling wxWidgets or wxPython.
NOTE: All paths are assumed to be relative to the current directory, i.e., the
working root you are in.
CAUTION: The script will erase existing wx-build and target folders (wx-bin)
without any confirmation!
If everything went fine during compilation you will now have a working
wxWidgets/wxPython installation in the wx-bin folder.
For building KiCad it is sufficient to keep the wx-bin folder.
The script doesn't have to be used, the usual "configure/make/make install" will
also work. If you do so, be sure to apply the patches needed for KiCad:
# patch -p0 < ../kicad/patches/wxwidgets-3.0.0_macosx.patch
# patch -p0 < ../kicad/patches/wxwidgets-3.0.0_macosx_bug_15908.patch
# patch -p0 < ../kicad/patches/wxwidgets-3.0.0_macosx_soname.patch
The same patches apply both for wxWidgets and for wxPython.
There is also an optional patch that enables full screen resolution on Retina displays:
# patch -p0 < ../kicad/patches/wxwidgets-3.0.2_macosx_retina_opengl.patch
Optional patch to support pinch gesture on trackpads to control zoom:
# patch -p0 < ../kicad/patches/wxwidgets-3.0.2_macosx_magnify_event.patch
The script uses the following configure command/options for wxWidgets known to
work:
# ../wx-src/configure \
--prefix=`pwd`/../wx-bin \
--with-opengl \
--enable-aui \
--enable-utf8 \
--enable-html \
--enable-stl \
--with-libjpeg=builtin \
--with-libpng=builtin \
--with-regex=builtin \
--with-libtiff=builtin \
--with-zlib=builtin \
--with-expat=builtin \
--without-liblzma \
--with-macosx-version-min=<osxtarget> \
--enable-universal-binary=i386,x86_64 \
CC=clang \
CXX=clang++
If you know what you are doing, you can of course use different settings.
Compiling KiCad
---------------
Change to your working root "KiCad" and create the build folder there:
# mkdir build
# cd build
Now, configure KiCad without scripting support:
# cmake ../kicad \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
-DwxWidgets_CONFIG_EXECUTABLE=../wx-bin/bin/wx-config \
-DKICAD_SCRIPTING=OFF \
-DKICAD_SCRIPTING_MODULES=OFF \
-DKICAD_SCRIPTING_WXPYTHON=OFF \
-DCMAKE_INSTALL_PREFIX=../bin \
-DCMAKE_BUILD_TYPE=Release
or, configure KiCad with scripting support:
# cmake ../kicad \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
-DwxWidgets_CONFIG_EXECUTABLE=../wx-bin/bin/wx-config \
-DPYTHON_EXECUTABLE=`which python` \
-DPYTHON_SITE_PACKAGE_PATH=`pwd`/../wx-bin/lib/python2.7/site-packages \
-DKICAD_SCRIPTING=ON \
-DKICAD_SCRIPTING_MODULES=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
-DCMAKE_INSTALL_PREFIX=../bin \
-DCMAKE_BUILD_TYPE=Release
Note, that depending on your python version the "python2.7" part of the
"-DPYTHON_SITE_PACKAGE_PATH" variable might have to be adjusted to what has
been generated when compiling/installing wxPython. If you want to use a specific
python, you can also specify it via "-DPYTHON_EXECUTABLE" instead of using
`which python` (this one will just detect/use you default python).
The parameter "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.x" is mandatory, you have to
specify the (minimum) OS X version you intend to build for. It is important that
at least wxWidgets/wxPython and KiCad (and boost, if you use an external build)
are built using the same or compatible settings. If not, you might get linker
errors, because this parameter influences which standard C++ library is being
used (libstdc++ vs. libc++).
If you don't know what to use and you are only building for your machine, just
set it to your current OS X version (e.g., MacPorts always builds this way).
Binaries built with a target OS X version <10.7 are known to show strange
behavior in some situations on recent systems (maybe because libc++ is standard
on everything >= 10.7 and problems arise due to mixing libstdc++/libc++).
Now KiCad is configured using default features/build-switches.
See Documentation/compiling/build-config.txt for a list of all CMake options
available when compiling KiCad.
Build & Install:
# make
... will take some time ...
# make install
Again, if everything went fine you will now have KiCad binaries in the "bin"
folder. KiCad application can be directly run from there to test.
If everything is OK, you can create a .dmg image of your "bin" folder or just
copy/install the KiCad binaries and/or support files (like demos or
documentation) wherever you want.
If you resync to newer versions of KiCad you don't have to rebuild wxWidgets or
other dependencies.
CMake should pick up the changes automatically and build correctly. However, it
is advised that you make a clean build to be sure (just delete the build folder
and go again through the configure/build steps).

3
Documentation/development/Doxyfile
View File

@ -648,7 +648,8 @@ WARN_LOGFILE =
INPUT = coding-style-policy.md \
stable-release-policy.md \
road-map.md
road-map.md \
compiling.md
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

398
Documentation/development/compiling.md Normal file
View File

@ -0,0 +1,398 @@
# Building KiCad from Source #
If you are a user and not a developer, please consider using one of the prebuilt packages
of KiCad which can be found at the [download][] page on the [KiCad website][]. Building KiCad
from source is not for the faint of heart and is not recommended unless you have reasonable
software development experience. This document contains the instructions on how to build KiCad
from source on the supported platforms. It is not intended as a guide for installing or building
[library dependencies](#library_dependencies). Please consult you platforms documentation for
installing packages or the source code when building the library dependencies. Currently the
supported platforms are Windows Versions 7-10, just about any version of Linux, and OSX
10.7-10.10. You may be able to build KiCad on other platforms but it is not supported. On
Windows and Linux the [GNU GCC][] is the only supported compiler and on OSX [Clang][] is the
only supported compiler.
[TOC]
# Development Tools # {#development_tools}
Before you begin building KiCad, there are a few tools required in addition to your compiler.
Some of these tools are required to build from source and some are optional.
## CMake Build Configuration Tool ## {#cmake}
[CMake][] is the build configuration and makefile generation tool used by KiCad. It is required.
## Bazaar Version Control System ## {#bazaar}
The official source code repository is hosted on [Launchpad][] and requires the [Bazaar][] version
control system in order to create a branch of the latest source. Bazaar is not required if you are
going to build a stable version of KiCad from a source archive.
## GIT Version Control System ## {#git}
If you prefer to use [GIT][] for version control, there is a mirror of the official KiCad
repository on [Github][]. GIT is not required if you are going to build a stable version of
KiCad from a source archive. Please note that the Github mirror is read only. Do not submit
pull requests to Github. Changes should be sent to the KiCad developer's [mailing list][] as
an attached patch with [PATCH] at the beginning of the subject.
## Doxygen Code Documentation Generator ## {#doxygen_section}
The KiCad source code is documented using [Doxygen][] which parses the KiCad source code files
and builds a dependency tree along with the source documentation into HTML. Doxygen is only
required if you are going to build the KiCad documentation.
## SWIG Simplified Wrapper and Interface Generator ## {#swig}
[SWIG][] is used to generate the Python scripting language extensions for KiCad. SWIG is not
required if you are not going to build the KiCad scripting extension.
# Library Dependencies # {#library_dependencies}
This section includes a list of library dependencies required to build KiCad. It does not
include any dependencies of the libraries. Please consult the library's documentation for any
additional dependencies. Some of these libraries are optional depending on you build
configuration. This is not a guide on how to install the library dependencies using you systems
package management tools or how to build the library from source. Consult the appropriate
documentation to perform these tasks.
## wxWidgets Cross Platform GUI Library## {#wxwidgets}
[wxWidgets][] is the graphical user interface (GUI) library used by KiCad. The current minimum
version is 3.0.0. However, 3.0.2 should be used whenever possible as there are some known bugs
in prior versions that can cause problems on some platforms. Please note that there are also
some platform specific patches that must be applied before building wxWidgets from source. These
patches can be found in the [patches folder][] in the KiCad source. These patches are named by
the wxWidgets version and platform name they should be applied against. wxWidgets must be built
with the --with-opengl option. If you installed the packaged version of wxWidgets on your system,
verify that it was built with this option.
## Boost C++ Libraries ## {#boost}
The [Boost][] C++ library is required only if you intend to build KiCad with the system installed
version of Boost instead of the default internally built version. If you use the system installed
version of Boost, version 1.56 or greater is required. Please note there are some platform
specific patches required to build a working Boost library. These patches can be found in the
[patches folder][] in the KiCad source. These patches are named by the platform name they should
be applied against.
## OpenSSL Secure Socket Layer Library ## {#openssl}
The [OpenSSL][] library is only required when the KiCad build is configured with the Github plugin
enabled. See the [KiCad Build Configuration Options](#build_opts)` section for more information.
Please note that KiCad will download and build version 1.0.1e of OpenSSL by default. You should
probably use the version of OpenSSL installed on your system as it will most likely be more up to
date and contain the latest security fixes.
## GLEW OpenGL Extension Wrangler Library ## {#glew}
The [OpenGL Extension Wrangler][GLEW] is an OpenGL helper library used by the KiCad graphics
abstraction library [GAL] and is always required to build KiCad.
## GLUT OpenGL Utility Toolkit Library ## {#glut}
The [OpenGL Utility Toolkit][GLUT] is an OpenGL helper library used by the KiCad graphics
abstraction library [GAL] and is always required to build KiCad.
## Cairo 2D Graphics Library ## {#cairo}
The [Cairo][] 2D graphics library is used as a fallback rendering canvas when OpenGL is no
available and is always required to build KiCad.
## Python Programming Language ## {#python}
The [Python][] programming language is used to provide scripting support to KiCad. It only needs
to be install if the [KiCad scripting](#kicad_scripting) build configuration option is enabled.
## wxPython Library ## {#wxpython}
The [wxPython][] library is used to provide a scripting console for Pcbnew. It only needs to be
installed if the [wxPython scripting](#wxpython_scripting) build configuration option is enabled.
When building KiCad with wxPython support, make sure the version of the wxWidgets library and
the version of wxPython installed on your system are the same. Mismatched versions have been
known to cause runtime issues.
# KiCad Build Configuration Options # {#build_opts}
KiCad has many build options that can be configured to build different options depending on
the availability of support for each option on a given platform. This section documents
these options and their default values.
## Case Sensitivity ## {#case_sensitive_opt}
The KICAD_KEEPCASE option allows you to build KiCad so that the string matching for component
names is case sensitive of case insensitive. This option is enabled by default.
## Advanced Graphics Context ## {#graphics_context_opt}
The USE_WX_GRAPHICS_CONTEXT option replaces wxDC with wxGraphicsContext for graphics rendering.
This option is disabled by default. Warning: the is experimental and has not been maintained
so use at your own risk.
## Graphics Context Overlay ## {#overlay_opt}
The USE_WX_OVERLAY option is used to enable the optional wxOverlay class for graphics rendering
on OSX. This is enabled on OSX by default and disabled on all other platforms.
## Scripting Support ## {#scripting_opt}
The KICAD_SCRIPTING option is used to enable building the Python scripting support into Pcbnew.
This options is disabled by default.
## Scripting Module Support ## {#scripting_mod_opt}
The KICAD_SCRIPTING_MODULES option is used to enable building and installing the Python modules
supplied by KiCad. This option is disabled by default.
## wxPython Scripting Support ## {#wxpython_opt}
The KICAD_SCRIPTING_WXPYTHON option is used to enable building the wxPython interface into
Pcbnew including the wxPython console. This option is disabled by default.
## Build with Static Libraries ## {#static_lib_opt}
The KICAD_BUILD_STATIC option is used to build KiCad with static libraries. This option is
used for OSX builds only and is disabled by default.
## Build with Dynamic Libraries ## {#dynamic_lib_opt}
The KICAD_BUILD_DYNAMIC option is used to build KiCad with dynamic libraries. This option is
used for OSX only and is disabled by default.
## Build with System Boost ## {#boost_opt}
The KICAD_SKIP_BOOST option allow you to use the Boost libraries installed on your system to
be used instead of downloading Boost 1.54 and building a custom version specifically for
building KiCad. It is high recommended that you enable this option on Linux and use Boost
version 1.56 or greater. On other platforms you mileage may vary. This option is disabled
by default.
## OSX Dependency Builder ## {#osx_deps_opt}
The USE_OSX_DEPS_BUILDER option forces the build configuration to download and build the
required dependencies to build KiCad on OSX. This option is not longer maintained and most
likely is broken. Use it at your own peril.
## Github Plugin ## {#github_opt}
The BUILD_GITHUB_PLUGIN option is used to control if the Github plugin is built. This option is
enabled by default.
# Getting the KiCad Source Code ## {#getting_src}
There are several ways to get the KiCad source. If you want to build the stable version you
can down load the source archive from the [KiCad Launchpad][] developers page. Use tar or some
other archive program to extract the source on your system. If you are using tar, use the
following command:
tar -xzf kicad_src_archive.tar.gz
If you are contributing directly to the KiCad project on Launchpad, you can create a local
branch on your machine by using the following command:
bzr branch lp:repo_to_branch
If you prefer to use [GIT][] as you version control system, you can clone the KiCad mirror on
Github using the following command:
git clone https://github.com/KiCad/kicad-source-mirror
Here is a list of source links:
Stable release archive: https://launchpad.net/kicad/4.0/4.0.0-rc1/+download/kicad-4.0.0-rc1.tar.xz
Development branch: https://code.launchpad.net/~kicad-product-committers/kicad/product
Github mirror: https://github.com/KiCad/kicad-source-mirror
# Building KiCad on Linux # {#build_linux}
To perform a full build on Linux, run the following commands:
cd kicad_source_tree
mkdir -p build/release
mkdir build/debug # Optional for debug build.
cd build/release
cmake -DCMAKE_BUILD_TYPE=Release \
-DKICAD_SCRIPTING=ON \
-DKICAD_SCRIPTING_MODULES=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
../../
make
sudo make install
If the CMake configuration fails, determine the missing dependencies and install them on your
system. By default, CMake sets the install path on Linux to /usr/local. Use the
CMAKE_INSTALL_PREFIX option to specify a different install path.
# Building KiCad on Windows # {#build_windows}
The preferred Windows build environment is [MSYS2][]. The [MinGW][] build environment is still
supported but it is not recommended because the developer is responsible for building *all* of
the dependencies from source which is a huge and frustrating undertaking. The [MSYS2][] project
provides packages for all of the require dependencies to build KiCad. To setup the [MSYS2][]
build environment, depending on your system download and run either the [MSYS2 32-bit Installer][]
or the [MSYS2 64-bit Installer][]. After the installer is finished, update to the latest
package versions by running the `msys2_shell.bat` file located in the MSYS2 install path and
running the command `pacman -Syu`. If the msys2-runtime package is updated, close the shell
and run `msys2_shell.bat`.
## MSYS2 the Easy Way ## {#msys2_easy}
The easiest way to build KiCad using the [MSYS2][] build environment is to use the KiCad
[PKGBUILD][] provided by the MSYS2 project to build package using the head of the KiCad
development branch. To build the KiCad package, run the `msys2_shell.bat` file located in the
MSYS2 install path and run the following commands:
pacman -S git
mkdir src
cd src
git clone https://github.com/Alexpux/MINGW-packages
cd MinGW-packages/mingw-w64-kicad-git
makepkg-mingw -is
This will download and install all of the build dependencies, clone the KiCad source mirror
from Github, create both 32-bit and 64-bit KiCad packages depending on your MSYS setup, and
install the newly built KiCad packages. Please note that this build process takes a very
long time to build even on a fast system.
## MSYS2 the Hard Way ## {#msys2_hard}
If you do not want to create KiCad packages and prefer the traditional `make && make install`
method of building KiCad, your task is significantly more involved. For 64 bit builds run
the `mingw64_shell.bat` file located in the MSYS2 install path. At the command prompt run the
the following commands:
pacman -S mingw-w64-x86_64-cmake \
mingw-w64-x86_64-doxygen \
mingw-w64-x86_64-gcc \
mingw-w64-x86_64-python2 \
mingw-w64-x86_64-pkg-config \
mingw-w64-x86_64-swig \
mingw-w64-x86_64-boost \
mingw-w64-x86_64-cairo \
mingw-w64-x86_64-glew \
mingw-w64-x86_64-openssl \
mingw-w64-x86_64-wxPython \
mingw-w64-x86_64-wxWidgets
cd kicad-source
mkdir -p build/release
mkdir build/debug # Optional for debug build.
cd build/release
cmake -DCMAKE_BUILD_TYPE=Release \
-G "MSYS Makefiles" \
-DCMAKE_PREFIX_PATH=/mingw64 \
-DCMAKE_INSTALL_PREFIX=/mingw64 \
-DDEFAULT_INSTALL_PATH=/mingw64 \
-DOPENSSL_ROOT_DIR=/mingw64 \
-DKICAD_SKIP_BOOST=ON \
-DKICAD_SCRIPTING=ON \
-DKICAD_SCRIPTING_MODULES=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
../../
make install
# Building KiCad on OSX # {#build_osx}
Building on OSX is challenging at best. It typically requires building dependency libraries
that require patching in order to work correctly. For more information on the complexities of
building KiCad on OSX, see the [OSX bundle build scripts][].
Download the wxPython source and build using the following commands:
cd path-to-wxwidgets-src
patch -p0 < path-to-kicad-src/patches/wxwidgets-3.0.0_macosx.patch
patch -p0 < path-to-kicad-src/wxwidgets-3.0.0_macosx_bug_15908.patch
patch -p0 < path-to-kicad-src/patches/wxwidgets-3.0.0_macosx_soname.patch
patch -p0 < path-to-kicad-src/patches/wxwidgets-3.0.2_macosx_yosemite.patch
patch -p0 < path-to-kicad-src/patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch
mkdir build
cd build
export MAC_OS_X_VERSION_MIN_REQUIRED=10.7
../configure \
--prefix=`pwd`/../wx-bin \
--with-opengl \
--enable-aui \
--enable-utf8 \
--enable-html \
--enable-stl \
--with-libjpeg=builtin \
--with-libpng=builtin \
--with-regex=builtin \
--with-libtiff=builtin \
--with-zlib=builtin \
--with-expat=builtin \
--without-liblzma \
--with-macosx-version-min=10.7 \
--enable-universal-binary=i386,x86_64 \
CC=clang \
CXX=clang++
Build KiCad using the following commands:
cd kicad-source
mkdir -p build/release
mkdir build/debug # Optional for debug build.
cd build/release
cmake -DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 \
-DwxWidgets_CONFIG_EXECUTABLE=path-to-wx-install/bin/wx-config \
-DKICAD_SCRIPTING=ON \
-DKICAD_SCRIPTING_MODULES=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
-DPYTHON_EXECUTABLE=path-to-python-exe/python \
-DPYTHON_SITE_PACKAGE_PATH=wx/wx-bin/lib/python2.7/site-packages \
-DCMAKE_INSTALL_PREFIX=../bin \
-DCMAKE_BUILD_TYPE=Release \
../../
make
make install
# Known Issues # {#known_issues}
There are some known issues that are platform and/or dependencie specific. This section provides
a list of the currently known issues when building KiCad.
## Boost C++ Library Issues ## {#boost_issue}
As of version 5 of [GNU GCC][], using the default configuration of downloading, patching, and
building of Boost 1.54 will cause the KiCad build to fail. Therefore a newer version of Boost
must be used to build KiCad. If your system has Boost 1.56 or greater installed, you job is
straight forward. Configure your KiCad build using `-DKICAD_SKIP_BOOST=ON`. If your system
does not have Boost 1.56 or greater installed, you will have to download and [build Boost][]
from source. If you are building Boost on windows using [MinGW][] you will have to apply the
Boost patches in the KiCad source [patch folder][].
[download]: http://kicad-pcb.org/download/
[KiCad website]: http://kicad-pcb.org/
[KiCad Launchpad]: https://launchpad.net/kicad
[GNU GCC]: https://gcc.gnu.org/
[Clang]: http://clang.llvm.org/
[CMake]: https://cmake.org/
[Launchpad]: https://code.launchpad.net/~kicad-product-committers/kicad/product
[Bazaar]: http://bazaar.canonical.com/en/
[GIT]: https://git-scm.com/
[Github]: https://github.com/KiCad/kicad-source-mirror
[Doxygen]: http://www.stack.nl/~dimitri/doxygen/
[mailing list]: https://launchpad.net/~kicad-developers
[SWIG]: http://www.swig.org/
[wxWidgets]: http://wxwidgets.org/
[patches folder]: http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/files/head:/patches/
[Boost]: http://www.boost.org/
[OpenSSL]: https://www.openssl.org/
[GLEW]: http://glew.sourceforge.net/
[GLUT]: https://www.opengl.org/resources/libraries/glut/
[Cairo]: http://cairographics.org/
[Python]: https://www.python.org/
[wxPython]: http://wxpython.org/
[MSYS2]: http://msys2.github.io/
[MSYS2 32-bit Installer]: http://repo.msys2.org/distrib/i686/msys2-i686-20150916.exe
[MSYS2 64-bit Installer]: http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20150916.exe
[PKGBUILD]: https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-kicad-git/PKGBUILD
[OSX bundle build scripts]:http://bazaar.launchpad.net/~adamwolf/+junk/kicad-mac-packaging/files
[MinGW]: http://mingw.org/
[build Boost]: http://www.boost.org/doc/libs/1_59_0/more/getting_started/index.html

1
Doxyfile
View File

@ -648,6 +648,7 @@ WARN_LOGFILE =
INPUT = Documentation/development/coding-style-policy.md \
Documentation/development/stable-release-policy.md \
Documentation/development/road-map.md \
Documentation/development/compiling.md \
kicad \
pcbnew \
cvpcb \

2
bitmap2component/CMakeLists.txt
View File

@ -28,7 +28,7 @@ if( APPLE )
MACOSX_PACKAGE_LOCATION Resources
)
set( MACOSX_BUNDLE_ICON_FILE bitmap2component.icns )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
set( MACOSX_BUNDLE_NAME bitmap2component )
endif()

2
bitmap2component/Info.plist
View File

@ -13,7 +13,7 @@
<key>CFBundleIconFile</key>
<string>bitmap2component.icns</string>
<key>CFBundleIdentifier</key>
<string>org.kicad-eda.bitmap2component</string>
<string>org.kicad-pcb.bitmap2component</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>

45
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KICAD, a free EDA CAD application.
*
* Copyright (C) 1992-2010 jean-pierre.charras
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors.
* Copyright (C) 1992-2015 Kicad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -43,6 +43,7 @@
#include <kiway.h>
#include <kiface_i.h>
#define KEYWORD_FRAME_POSX wxT( "Bmconverter_Pos_x" )
#define KEYWORD_FRAME_POSY wxT( "Bmconverter_Pos_y" )
#define KEYWORD_FRAME_SIZEX wxT( "Bmconverter_Size_x" )
@ -96,7 +97,7 @@ private:
void OnExport( wxCommandEvent& event );
/**
* Generate a schematic library which comtains one component:
* Generate a schematic library which contains one component:
* the logo
*/
void OnExportEeschema();
@ -123,9 +124,9 @@ private:
void OnResolutionChange( wxCommandEvent& event );
// called when texts controls which handle the image resolution
// lose the focus, to ensure the rigyht vaules are displayed
// lose the focus, to ensure the right values are displayed
// because the m_imageDPI are clipped to acceptable values, and
// the text displayed could be differ duringa text edition
// the text displayed could be differ during text edition
// We are using ChangeValue here to avoid generating a wxEVT_TEXT event.
void UpdateDPITextValueX( wxMouseEvent& event )
{
@ -249,7 +250,7 @@ void BM2CMP_FRAME::OnPaint( wxPaintEvent& event )
m_BNPicturePanel->PrepareDC( nb_dc );
// OSX crashes with empty bitmaps (on initial refreshes)
if(m_Pict_Bitmap.IsOk() && m_Greyscale_Bitmap.IsOk() && m_BN_Bitmap.IsOk())
if( m_Pict_Bitmap.IsOk() && m_Greyscale_Bitmap.IsOk() && m_BN_Bitmap.IsOk() )
{
pict_dc.DrawBitmap( m_Pict_Bitmap, 0, 0, false );
greyscale_dc.DrawBitmap( m_Greyscale_Bitmap, 0, 0, false );
@ -258,19 +259,17 @@ void BM2CMP_FRAME::OnPaint( wxPaintEvent& event )
}
/* Called to load a bitmap file
*/
void BM2CMP_FRAME::OnLoadFile( wxCommandEvent& event )
{
wxFileName fn( m_BitmapFileName );
wxString path = fn.GetPath();
if( path.IsEmpty() || !wxDirExists(path) )
path = wxGetCwd();
if( path.IsEmpty() || !wxDirExists( path ) )
path = m_mruPath;
wxFileDialog fileDlg( this, _( "Choose Image" ), path, wxEmptyString,
_( "Image Files " ) + wxImage::GetImageExtWildcard(),
wxFD_OPEN );
wxFD_OPEN | wxFD_FILE_MUST_EXIST );
int diag = fileDlg.ShowModal();
@ -282,6 +281,8 @@ void BM2CMP_FRAME::OnLoadFile( wxCommandEvent& event )
if( !OpenProjectFiles( std::vector<wxString>( 1, fullFilename ) ) )
return;
fn = fullFilename;
m_mruPath = fn.GetPath();
m_buttonExport->Enable( true );
SetStatusText( fullFilename );
Refresh();
@ -349,11 +350,12 @@ bool BM2CMP_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, int
return true;
}
void BM2CMP_FRAME::updateImageInfo()
{
// Note: the image resolution text controls are not modified
// here, to avoid a race between text change when entered by user and
// a text change if it is modifed here.
// a text change if it is modified here.
int h = m_Pict_Bitmap.GetHeight();
int w = m_Pict_Bitmap.GetWidth();
int nb = m_Pict_Bitmap.GetDepth();
@ -368,6 +370,7 @@ void BM2CMP_FRAME::updateImageInfo()
(double) h / m_imageDPI.y * 25.4 ) );
}
void BM2CMP_FRAME::OnResolutionChange( wxCommandEvent& event )
{
long tmp;
@ -387,6 +390,7 @@ void BM2CMP_FRAME::OnResolutionChange( wxCommandEvent& event )
updateImageInfo();
}
void BM2CMP_FRAME::Binarize( double aThreshold )
{
unsigned int pixin;
@ -427,10 +431,10 @@ void BM2CMP_FRAME::NegateGreyscaleImage( )
}
}
/* Called on Normal/Negative change option */
void BM2CMP_FRAME::OnOptionsSelection( wxCommandEvent& event )
{
NegateGreyscaleImage( );
NegateGreyscaleImage();
m_Greyscale_Bitmap = wxBitmap( m_Greyscale_Image );
Binarize( (double)m_sliderThreshold->GetValue()/m_sliderThreshold->GetMax() );
Refresh();
@ -498,7 +502,7 @@ void BM2CMP_FRAME::OnExportLogo()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created" ), GetChars(m_ConvertedFileName) );
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
@ -536,7 +540,7 @@ void BM2CMP_FRAME::OnExportPostScript()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created" ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
@ -554,7 +558,7 @@ void BM2CMP_FRAME::OnExportEeschema()
if( path.IsEmpty() || !wxDirExists(path) )
path = ::wxGetCwd();
wxFileDialog fileDlg( this, _( "Create a lib file for Eeschema" ),
wxFileDialog fileDlg( this, _( "Create a component library file for Eeschema" ),
path, wxEmptyString,
wxGetTranslation( SchematicLibraryFileWildcard ),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
@ -573,7 +577,7 @@ void BM2CMP_FRAME::OnExportEeschema()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created" ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
@ -589,9 +593,9 @@ void BM2CMP_FRAME::OnExportPcbnew()
wxString path = fn.GetPath();
if( path.IsEmpty() || !wxDirExists( path ) )
path = ::wxGetCwd();
path = m_mruPath;
wxFileDialog fileDlg( this, _( "Create a footprint file for PcbNew" ),
wxFileDialog fileDlg( this, _( "Create a footprint file for Pcbnew" ),
path, wxEmptyString,
wxGetTranslation( KiCadFootprintLibFileWildcard ),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
@ -610,13 +614,14 @@ void BM2CMP_FRAME::OnExportPcbnew()
if( outfile == NULL )
{
wxString msg;
msg.Printf( _( "File '%s' could not be created" ), GetChars( m_ConvertedFileName ) );
msg.Printf( _( "File '%s' could not be created." ), GetChars( m_ConvertedFileName ) );
wxMessageBox( msg );
return;
}
ExportFile( outfile, PCBNEW_KICAD_MOD );
fclose( outfile );
m_mruPath = fn.GetPath();
}

1
common/CMakeLists.txt
View File

@ -388,6 +388,7 @@ add_custom_target(
)
add_dependencies( common netlist_lexer_source_files )
add_dependencies( pcbcommon netlist_lexer_source_files )
# auto-generate pcb_plot_params_lexer.h and pcb_plot_params_keywords.cpp
make_lexer(

7
common/basicframe.cpp
View File

@ -33,6 +33,7 @@
#include <wx/clipbrd.h>
#include <wx/statline.h>
#include <wx/platinfo.h>
#include <wx/stdpaths.h>
#include <build_version.h>
#include <fctsys.h>
@ -61,6 +62,8 @@ static const wxChar entryAutoSaveInterval[] = wxT( "AutoSaveInterval" );
/// Configuration file entry for wxAuiManger perspective.
static const wxChar entryPerspective[] = wxT( "Perspective" );
/// Configuration file entry for most recently used path.
static const wxChar entryMruPath[] = wxT( "MostRecentlyUsedPath" );
EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
@ -76,7 +79,7 @@ EDA_BASE_FRAME::EDA_BASE_FRAME( wxWindow* aParent, FRAME_T aFrameType,
m_autoSaveState = false;
m_autoSaveInterval = -1;
m_autoSaveTimer = new wxTimer( this, ID_AUTO_SAVE_TIMER );
m_mruPath = wxStandardPaths::Get().GetDocumentsDir();
minsize.x = 470;
minsize.y = 350;
@ -265,6 +268,7 @@ void EDA_BASE_FRAME::LoadSettings( wxConfigBase* aCfg )
Maximize();
aCfg->Read( baseCfgName + entryPerspective, &m_perspective );
aCfg->Read( baseCfgName + entryMruPath, &m_mruPath );
}
@ -309,6 +313,7 @@ void EDA_BASE_FRAME::SaveSettings( wxConfigBase* aCfg )
// printf( "perspective(%s): %s\n",
// TO_UTF8( m_FrameName + entryPerspective ), TO_UTF8( perspective ) );
aCfg->Write( baseCfgName + entryPerspective, perspective );
aCfg->Write( baseCfgName + entryMruPath, m_mruPath );
}

33
common/dialog_about/AboutDialog_main.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2010 Rafael Sokolowski <Rafael.Sokolowski@web.de>
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
* Copyright (C) 2010-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -58,7 +58,7 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
static void InitKiCadAboutNew( AboutAppInfo& info )
{
// Set application specific icon
const wxTopLevelWindow* const tlw = wxDynamicCast( Pgm().App().GetTopWindow(), wxTopLevelWindow);
const wxTopLevelWindow* const tlw = wxDynamicCast( Pgm().App().GetTopWindow(), wxTopLevelWindow );
if( tlw )
info.SetIcon( tlw->GetIcon() );
@ -130,8 +130,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
description << wxT( "<b><u>" ) << _( "Description" ) << wxT( "</u></b>" ); // bold & underlined font for caption
description << wxT( "<p>" ) <<
_(
"The KiCad EDA Suite is a set of open source applications for the creation of electronic schematics and to design printed circuit boards." )
_( "The KiCad EDA Suite is a set of open source applications for the creation of electronic schematics and to design printed circuit boards." )
<< wxT( "</p>" );
description << wxT( "</p>" );
@ -142,9 +141,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
// bullet-ed list with some http links
description << wxT( "<ul>" );
description << wxT( "<li>" ) << HtmlHyperlink( wxT(
"http://iut-tice.ujf-grenoble.fr/kicad" ),
_( "The original site of the initiator of Kicad" ) )
description << wxT( "<li>" ) << HtmlHyperlink( wxT( "http://iut-tice.ujf-grenoble.fr/kicad" ),
_( "The original site of the initiator of KiCad" ) )
<< wxT( "</li>" );
description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT(
@ -167,13 +165,11 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
_( "Report bugs if you found any" ) ) << wxT( "</li>" );
description << wxT( "<li>" ) << HtmlHyperlink( wxT(
"https://blueprints.launchpad.net/kicad" ),
_( "File an idea for improvement" ) ) << wxT(
"</li>" );
description << wxT( "<li>" ) << HtmlHyperlink( wxT( "https://blueprints.launchpad.net/kicad" ),
_( "File an idea for improvement" ) ) << wxT( "</li>" );
description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "http://www.kicadlib.org/Kicad_related_links.html" ),
_( "KiCad links to user groups, tutorials and much more" ) ) << wxT( "</li>" );
_( "KiCad links to user groups, tutorials and much more" ) ) << wxT( "</li>" );
description << wxT( "</ul>" );
description << wxT( "</p>" );
@ -188,7 +184,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
<< HtmlNewline( 4 )
<< _( "The complete KiCad EDA Suite is released under the" ) << HtmlNewline( 2 )
<< HtmlHyperlink( wxT( "http://www.gnu.org/licenses" ),
_( "GNU General Public License (GPL) version 2 or any later version" ) )
_( "GNU General Public License (GPL) version 2 or any later version" ) )
<< wxT( "</div>" );
info.SetLicense( license );
@ -303,14 +299,19 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
info.AddTranslator(
new Contributor( wxT( "Kenta Yonekura" ), wxT( "midpika@hotmail.com" ), wxT( "Japanese (JA)" ), KiBitmapNew( lang_jp_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Manolis Stefanis, Athanasios Vlastos and Milonas Kostas" ),
wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) );
new Contributor( wxT( "Manolis Stefanis" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Athanasios Vlastos" ), wxT( "" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Milonas Kostas" ), wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Michail Misirlis" ), wxT( "mmisirlis@gmail.com" ), wxT( "Greek (el_GR)" ), KiBitmapNew( lang_gr_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Massimo Cioce" ), wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Marco Ciampa" ), wxT( "ciampix@libero.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) );
info.AddTranslator(
new Contributor( wxT( "Evgeniy Ivanov" ), wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ),KiBitmapNew( lang_bg_xpm ) ) );
new Contributor( wxT( "Evgeniy Ivanov" ), wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), KiBitmapNew( lang_bg_xpm ) ) );
// TODO: are these all russian translators,
// placed them here now,

9
common/dialogs/dialog_hotkeys_editor.cpp
View File

@ -104,7 +104,7 @@ void HOTKEY_LIST_CTRL::recalculateColumns()
// to set the column widths
totalLength = maxInfoMsgLength + maxKeyCodeLength;
scale = (float) GetClientSize().x / totalLength;
scale = (double) GetClientSize().x / totalLength;
SetColumnWidth( 0, int( maxInfoMsgLength*scale ) - 2 );
SetColumnWidth( 1, int( maxKeyCodeLength*scale ) );
@ -279,7 +279,7 @@ HOTKEYS_EDITOR_DIALOG::HOTKEYS_EDITOR_DIALOG( EDA_BASE_FRAME* aParent,
section ) );
}
m_OKButton->SetDefault();
m_sdbSizerOK->SetDefault();
Center();
}
@ -320,11 +320,6 @@ void HOTKEYS_EDITOR_DIALOG::OnOKClicked( wxCommandEvent& event )
}
void HOTKEYS_EDITOR_DIALOG::CancelClicked( wxCommandEvent& event )
{
EndModal( wxID_CANCEL );
}
void HOTKEYS_EDITOR_DIALOG::UndoClicked( wxCommandEvent& aEvent )
{

21
common/dialogs/dialog_hotkeys_editor_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 9 2015)
// C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -27,13 +27,16 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
wxBoxSizer* b_buttonsSizer;
b_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
m_OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
b_buttonsSizer->Add( m_OKButton, 0, wxALL|wxEXPAND, 5 );
m_sdbSizer = new wxStdDialogButtonSizer();
m_sdbSizerOK = new wxButton( this, wxID_OK );
m_sdbSizer->AddButton( m_sdbSizerOK );
m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer->AddButton( m_sdbSizerCancel );
m_sdbSizer->Realize();
m_cancelButton = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
b_buttonsSizer->Add( m_cancelButton, 0, wxALL|wxEXPAND, 5 );
b_buttonsSizer->Add( m_sdbSizer, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_undoButton = new wxButton( this, wxID_CANCEL, _("Undo"), wxDefaultPosition, wxDefaultSize, 0 );
m_undoButton = new wxButton( this, wxID_UNDO, _("Undo"), wxDefaultPosition, wxDefaultSize, 0 );
b_buttonsSizer->Add( m_undoButton, 0, wxALL|wxEXPAND, 5 );
@ -44,16 +47,14 @@ HOTKEYS_EDITOR_DIALOG_BASE::HOTKEYS_EDITOR_DIALOG_BASE( wxWindow* parent, wxWind
this->Layout();
// Connect Events
m_OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
m_cancelButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::CancelClicked ), NULL, this );
m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
m_undoButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::UndoClicked ), NULL, this );
}
HOTKEYS_EDITOR_DIALOG_BASE::~HOTKEYS_EDITOR_DIALOG_BASE()
{
// Disconnect Events
m_OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
m_cancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::CancelClicked ), NULL, this );
m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::OnOKClicked ), NULL, this );
m_undoButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HOTKEYS_EDITOR_DIALOG_BASE::UndoClicked ), NULL, this );
}

192
common/dialogs/dialog_hotkeys_editor_base.fbp
View File

@ -269,92 +269,30 @@
<property name="name">b_buttonsSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_OK</property>
<property name="label">OK</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
<property name="Cancel">1</property>
<property name="ContextHelp">0</property>
<property name="Help">0</property>
<property name="No">0</property>
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_OKButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="name">m_sdbSizer</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnOKClicked</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick"></event>
<event name="OnNoButtonClick"></event>
<event name="OnOKButtonClick">OnOKClicked</event>
<event name="OnSaveButtonClick"></event>
<event name="OnYesButtonClick"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
@ -389,95 +327,7 @@
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_CANCEL</property>
<property name="label">Close</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name"> m_cancelButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">CancelClicked</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_CANCEL</property>
<property name="id">wxID_UNDO</property>
<property name="label">Undo</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>

10
common/dialogs/dialog_hotkeys_editor_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 9 2015)
// C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -21,8 +21,8 @@ class DIALOG_SHIM;
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/notebook.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
@ -38,13 +38,13 @@ class HOTKEYS_EDITOR_DIALOG_BASE : public DIALOG_SHIM
protected:
wxStaticText* m_staticText1;
wxNotebook* m_hotkeySections;
wxButton* m_OKButton;
wxButton* m_cancelButton;
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
wxButton* m_sdbSizerCancel;
wxButton* m_undoButton;
// Virtual event handlers, overide them in your derived class
virtual void OnOKClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void CancelClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void UndoClicked( wxCommandEvent& event ) { event.Skip(); }

20
common/dialogs/wx_html_report_panel_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 9 2015)
// C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -11,7 +11,7 @@
WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
m_box = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Messages:") ), wxVERTICAL );
m_box = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );
wxFlexGridSizer* fgSizer4;
fgSizer4 = new wxFlexGridSizer( 2, 1, 0, 0 );
@ -20,7 +20,7 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
fgSizer4->SetFlexibleDirection( wxBOTH );
fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_htmlView = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
m_htmlView = new wxHtmlWindow( m_box->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
m_htmlView->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
fgSizer4->Add( m_htmlView, 1, wxEXPAND, 5 );
@ -31,35 +31,35 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticText3 = new wxStaticText( this, wxID_ANY, wxT("Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText3 = new wxStaticText( m_box->GetStaticBox(), wxID_ANY, _("Filter:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText3->Wrap( -1 );
fgSizer3->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
m_checkBoxShowAll = new wxCheckBox( this, wxID_ANY, wxT("All"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowAll = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("All"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowAll->SetValue(true);
fgSizer3->Add( m_checkBoxShowAll, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
m_checkBoxShowWarnings = new wxCheckBox( this, wxID_ANY, wxT("Warnings"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowWarnings = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Warnings"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowWarnings->Enable( false );
fgSizer3->Add( m_checkBoxShowWarnings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
m_checkBoxShowErrors = new wxCheckBox( this, wxID_ANY, wxT("Errors"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowErrors = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Errors"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowErrors->Enable( false );
fgSizer3->Add( m_checkBoxShowErrors, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
m_checkBoxShowInfos = new wxCheckBox( this, wxID_ANY, wxT("Infos"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowInfos = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Infos"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowInfos->Enable( false );
fgSizer3->Add( m_checkBoxShowInfos, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 );
m_checkBoxShowActions = new wxCheckBox( this, wxID_ANY, wxT("Actions"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowActions = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Actions"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowActions->Enable( false );
fgSizer3->Add( m_checkBoxShowActions, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
m_btnSaveReportToFile = new wxButton( this, wxID_ANY, wxT("Save report to file..."), wxDefaultPosition, wxDefaultSize, 0 );
m_btnSaveReportToFile = new wxButton( m_box->GetStaticBox(), wxID_ANY, _("Save report to file..."), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_btnSaveReportToFile, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 );

2
common/dialogs/wx_html_report_panel_base.fbp
View File

@ -14,7 +14,7 @@
<property name="file">wx_html_report_panel_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="internationalize">0</property>
<property name="internationalize">1</property>
<property name="name">WX_HTML_REPORT_PANEL_BASE</property>
<property name="namespace"></property>
<property name="path">.</property>

3
common/dialogs/wx_html_report_panel_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 9 2015)
// C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@ -10,6 +10,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/html/htmlwin.h>
#include <wx/gdicmn.h>
#include <wx/font.h>

38
common/draw_panel.cpp
View File

@ -667,12 +667,10 @@ void EDA_DRAW_PANEL::DrawBackGround( wxDC* DC )
wxSize pageSize = GetParent()->GetPageSizeIU();
// Draw the Y axis
GRDashedLine( &m_ClipBox, DC, 0, -pageSize.y,
0, pageSize.y, 0, axis_color );
GRLine( &m_ClipBox, DC, 0, -pageSize.y, 0, pageSize.y, 0, axis_color );
// Draw the X axis
GRDashedLine( &m_ClipBox, DC, -pageSize.x, 0,
pageSize.x, 0, 0, axis_color );
GRLine( &m_ClipBox, DC, -pageSize.x, 0, pageSize.x, 0, 0, axis_color );
}
if( GetParent()->m_showOriginAxis )
@ -821,20 +819,12 @@ void EDA_DRAW_PANEL::DrawAuxiliaryAxis( wxDC* aDC, GR_DRAWMODE aDrawMode )
GRSetDrawMode( aDC, aDrawMode );
// Draw the Y axis
GRDashedLine( &m_ClipBox, aDC,
origin.x,
-pageSize.y,
origin.x,
pageSize.y,
0, color );
GRLine( &m_ClipBox, aDC, origin.x, -pageSize.y,
origin.x, pageSize.y, 0, color );
// Draw the X axis
GRDashedLine( &m_ClipBox, aDC,
-pageSize.x,
origin.y,
pageSize.x,
origin.y,
0, color );
GRLine( &m_ClipBox, aDC, -pageSize.x, origin.y,
pageSize.x, origin.y, 0, color );
}
@ -849,20 +839,12 @@ void EDA_DRAW_PANEL::DrawGridAxis( wxDC* aDC, GR_DRAWMODE aDrawMode, const wxPoi
GRSetDrawMode( aDC, aDrawMode );
// Draw the Y axis
GRDashedLine( &m_ClipBox, aDC,
aGridOrigin.x,
-pageSize.y,
aGridOrigin.x,
pageSize.y,
0, color );
GRLine( &m_ClipBox, aDC, aGridOrigin.x, -pageSize.y,
aGridOrigin.x, pageSize.y, 0, color );
// Draw the X axis
GRDashedLine( &m_ClipBox, aDC,
-pageSize.x,
aGridOrigin.y,
pageSize.x,
aGridOrigin.y,
0, color );
GRLine( &m_ClipBox, aDC, -pageSize.x, aGridOrigin.y,
pageSize.x, aGridOrigin.y, 0, color );
}

7
common/draw_panel_gal.cpp
View File

@ -206,12 +206,7 @@ void EDA_DRAW_PANEL_GAL::ForceRefresh()
void EDA_DRAW_PANEL_GAL::SetEventDispatcher( TOOL_DISPATCHER* aEventDispatcher )
{
m_eventDispatcher = aEventDispatcher;
#if wxCHECK_VERSION( 3, 0, 0 )
const wxEventType eventTypes[] = { wxEVT_TOOL };
#else
const wxEventType eventTypes[] = { wxEVT_COMMAND_MENU_SELECTED, wxEVT_COMMAND_TOOL_CLICKED };
#endif
if( m_eventDispatcher )
{
@ -310,7 +305,7 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
// warn about unhandled GAL canvas type, but continue with the fallback option
case GAL_TYPE_NONE:
// KIGFX::GAL is a stub - it actually does cannot display anything,
// KIGFX::GAL is a stub - it actually does cannot display anything,
// but prevents code relying on GAL canvas existence from crashing
new_gal = new KIGFX::GAL();
break;

18
common/eda_doc.cpp
View File

@ -141,15 +141,15 @@ bool GetAssociatedDocument( wxWindow* aParent,
if( wxIsWild( fullfilename ) )
{
fullfilename = EDA_FileSelector( _( "Doc Files" ),
wxPathOnly( fullfilename ),
fullfilename,
extension,
mask,
aParent,
wxFD_OPEN,
true,
wxPoint( -1, -1 ) );
fullfilename = EDA_FILE_SELECTOR( _( "Doc Files" ),
wxPathOnly( fullfilename ),
fullfilename,
extension,
mask,
aParent,
wxFD_OPEN,
true,
wxPoint( -1, -1 ) );
if( fullfilename.IsEmpty() )
return false;
}

23
common/gal/opengl/cached_container.cpp
View File

@ -308,11 +308,14 @@ bool CACHED_CONTAINER::defragment( VERTEX* aTarget )
if( aTarget == NULL )
{
// No target was specified, so we have to reallocate our own space
aTarget = static_cast<VERTEX*>( malloc( m_currentSize * sizeof( VERTEX ) ) );
int size = m_currentSize * sizeof( VERTEX );
aTarget = static_cast<VERTEX*>( malloc( size ) );
if( aTarget == NULL )
{
DisplayError( NULL, wxT( "Run out of memory" ) );
DisplayError( NULL, wxString::Format(
wxT( "CACHED_CONTAINER::defragment: Run out of memory (malloc %d bytes)" ),
size ) );
return false;
}
}
@ -432,11 +435,15 @@ bool CACHED_CONTAINER::resizeContainer( unsigned int aNewSize )
if( reservedSpace() > aNewSize )
return false;
newContainer = static_cast<VERTEX*>( malloc( aNewSize * sizeof( VERTEX ) ) );
int size = aNewSize * sizeof( VERTEX );
newContainer = static_cast<VERTEX*>( malloc( size ) );
if( newContainer == NULL )
{
DisplayError( NULL, wxT( "Run out of memory" ) );
DisplayError( NULL, wxString::Format(
wxT( "CACHED_CONTAINER::resizeContainer:\n"
"Run out of memory (malloc %d bytes)" ),
size ) );
return false;
}
@ -451,11 +458,15 @@ bool CACHED_CONTAINER::resizeContainer( unsigned int aNewSize )
else
{
// Enlarging container
newContainer = static_cast<VERTEX*>( realloc( m_vertices, aNewSize * sizeof( VERTEX ) ) );
int size = aNewSize * sizeof( VERTEX );
newContainer = static_cast<VERTEX*>( realloc( m_vertices, size ) );
if( newContainer == NULL )
{
DisplayError( NULL, wxT( "Run out of memory" ) );
DisplayError( NULL, wxString::Format(
wxT( "CACHED_CONTAINER::resizeContainer:\n"
"Run out of memory (realloc from %d to %d bytes)" ),
m_currentSize * sizeof( VERTEX ), size ) );
return false;
}

20
common/gal/opengl/vertex_manager.cpp
View File

@ -51,12 +51,20 @@ VERTEX_MANAGER::VERTEX_MANAGER( bool aCached ) :
void VERTEX_MANAGER::Vertex( GLfloat aX, GLfloat aY, GLfloat aZ ) const
{
// flag to avoid hanging by calling DisplayError too many times:
static bool show_err = true;
// Obtain the pointer to the vertex in the currently used container
VERTEX* newVertex = m_container->Allocate( 1 );
if( newVertex == NULL )
{
DisplayError( NULL, wxT( "Vertex allocation error" ) );
if( show_err )
{
DisplayError( NULL, wxT( "VERTEX_MANAGER::Vertex: Vertex allocation error" ) );
show_err = false;
}
return;
}
@ -66,12 +74,20 @@ void VERTEX_MANAGER::Vertex( GLfloat aX, GLfloat aY, GLfloat aZ ) const
void VERTEX_MANAGER::Vertices( const VERTEX aVertices[], unsigned int aSize ) const
{
// flag to avoid hanging by calling DisplayError too many times:
static bool show_err = true;
// Obtain pointer to the vertex in currently used container
VERTEX* newVertex = m_container->Allocate( aSize );
if( newVertex == NULL )
{
DisplayError( NULL, wxT( "Vertex allocation error" ) );
if( show_err )
{
DisplayError( NULL, wxT( "VERTEX_MANAGER::Vertices: Vertex allocation error" ) );
show_err = false;
}
return;
}

80
common/gestfich.cpp
View File

@ -58,26 +58,26 @@ void AddDelimiterString( wxString& string )
}
bool EDA_DirectorySelector( const wxString& Title,
wxString& Path,
int flag,
wxWindow* Frame,
const wxPoint& Pos )
bool EDA_PATH_SELECTOR( const wxString& aTitle,
wxString& aPath,
int aFlags,
wxWindow* aParent,
const wxPoint& aPosition )
{
int ii;
bool selected = false;
wxDirDialog* DirFrame = new wxDirDialog( Frame,
wxString( Title ),
Path,
flag,
Pos );
wxDirDialog* DirFrame = new wxDirDialog( aParent,
aTitle,
aPath,
aFlags,
aPosition );
ii = DirFrame->ShowModal();
if( ii == wxID_OK )
{
Path = DirFrame->GetPath();
aPath = DirFrame->GetPath();
selected = true;
}
@ -86,21 +86,22 @@ bool EDA_DirectorySelector( const wxString& Title,
}
wxString EDA_FileSelector( const wxString& Title,
const wxString& Path,
const wxString& FileName,
const wxString& Ext,
const wxString& Mask,
wxWindow* Frame,
int flag,
const bool keep_working_directory,
const wxPoint& Pos )
wxString EDA_FILE_SELECTOR( const wxString& aTitle,
const wxString& aPath,
const wxString& aFileName,
const wxString& aExtension,
const wxString& aWildcard,
wxWindow* aParent,
int aStyle,
const bool aKeepWorkingDirectory,
const wxPoint& aPosition,
wxString* aMruPath )
{
wxString fullfilename;
wxString curr_cwd = wxGetCwd();
wxString defaultname = FileName;
wxString defaultpath = Path;
wxString dotted_Ext = wxT(".") + Ext;
wxString defaultname = aFileName;
wxString defaultpath = aPath;
wxString dotted_Ext = wxT(".") + aExtension;
#ifdef __WINDOWS__
defaultname.Replace( wxT( "/" ), wxT( "\\" ) );
@ -108,7 +109,12 @@ wxString EDA_FileSelector( const wxString& Title,
#endif
if( defaultpath.IsEmpty() )
defaultpath = wxGetCwd();
{
if( aMruPath == NULL )
defaultpath = wxGetCwd();
else
defaultpath = *aMruPath;
}
wxSetWorkingDirectory( defaultpath );
@ -116,24 +122,30 @@ wxString EDA_FileSelector( const wxString& Title,
printf( "defaultpath=\"%s\" defaultname=\"%s\" Ext=\"%s\" Mask=\"%s\" flag=%d keep_working_directory=%d\n",
TO_UTF8( defaultpath ),
TO_UTF8( defaultname ),
TO_UTF8( Ext ),
TO_UTF8( Mask ),
flag,
keep_working_directory );
TO_UTF8( aExtension ),
TO_UTF8( aWildcard ),
aStyle,
aKeepWorkingDirectory );
#endif
fullfilename = wxFileSelector( wxString( Title ),
fullfilename = wxFileSelector( aTitle,
defaultpath,
defaultname,
dotted_Ext,
Mask,
flag, // open mode wxFD_OPEN, wxFD_SAVE ..
Frame,
Pos.x, Pos.y );
aWildcard,
aStyle, // open mode wxFD_OPEN, wxFD_SAVE ..
aParent,
aPosition.x, aPosition.y );
if( keep_working_directory )
if( aKeepWorkingDirectory )
wxSetWorkingDirectory( curr_cwd );
if( !fullfilename.IsEmpty() && aMruPath )
{
wxFileName fn = fullfilename;
*aMruPath = fn.GetPath();
}
return fullfilename;
}

30
common/gr_basic.cpp
View File

@ -375,26 +375,9 @@ void GRLine( EDA_RECT* aClipBox, wxDC* aDC, wxPoint aStart, wxPoint aEnd, int aW
}
void GRDashedLineTo( EDA_RECT* ClipBox, wxDC* DC, int x2, int y2, int width, EDA_COLOR_T Color )
{
s_DC_lastcolor = UNSPECIFIED_COLOR;
GRSetColorPen( DC, Color, width, wxPENSTYLE_SHORT_DASH );
WinClipAndDrawLine( ClipBox, DC, GRLastMoveToX, GRLastMoveToY, x2, y2, width );
s_DC_lastcolor = UNSPECIFIED_COLOR;
GRSetColorPen( DC, Color, width );
GRLastMoveToX = x2;
GRLastMoveToY = y2;
}
void GRDashedLine( EDA_RECT* ClipBox,
wxDC* DC,
int x1,
int y1,
int x2,
int y2,
int width,
EDA_COLOR_T Color )
void GRDashedLine( EDA_RECT* ClipBox, wxDC* DC,
int x1, int y1, int x2, int y2,
int width, EDA_COLOR_T Color )
{
GRLastMoveToX = x2;
GRLastMoveToY = y2;
@ -421,12 +404,7 @@ void GRMoveTo( int x, int y )
*/
void GRLineTo( EDA_RECT* ClipBox, wxDC* DC, int x, int y, int width, EDA_COLOR_T Color )
{
int GRLineToX, GRLineToY;
GRLineToX = x;
GRLineToY = y;
GRLine( ClipBox, DC, GRLastMoveToX, GRLastMoveToY, GRLineToX, GRLineToY, width, Color );
GRLine( ClipBox, DC, GRLastMoveToX, GRLastMoveToY, x, y, width, Color );
}

24
common/hotkeys_basic.cpp
View File

@ -749,12 +749,12 @@ void EDA_BASE_FRAME::ImportHotkeyConfigFromFile( EDA_HOTKEY_CONFIG* aDescList,
#if 0 // pass in the project dir as an argument
wxString path = wxPathOnly( Prj().GetProjectFullName() );
#else
wxString path = wxGetCwd();
wxString path = GetMruPath();
#endif
wxFileName fn( aDefaultShortname );
fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
wxString filename = EDA_FileSelector( _( "Read Hotkey Configuration File:" ),
wxString filename = EDA_FILE_SELECTOR( _( "Read Hotkey Configuration File:" ),
path,
fn.GetFullPath(),
ext,
@ -767,6 +767,7 @@ void EDA_BASE_FRAME::ImportHotkeyConfigFromFile( EDA_HOTKEY_CONFIG* aDescList,
return;
ReadHotkeyConfigFile( filename, aDescList );
SetMruPath( wxFileName( filename ).GetPath() );
}
@ -779,24 +780,25 @@ void EDA_BASE_FRAME::ExportHotkeyConfigToFile( EDA_HOTKEY_CONFIG* aDescList,
#if 0
wxString path = wxPathOnly( Prj().GetProjectFullName() );
#else
wxString path = wxGetCwd();
wxString path = GetMruPath();
#endif
wxFileName fn( aDefaultShortname );
fn.SetExt( DEFAULT_HOTKEY_FILENAME_EXT );
wxString filename = EDA_FileSelector( _( "Write Hotkey Configuration File:" ),
path,
fn.GetFullPath(),
ext,
mask,
this,
wxFD_SAVE,
true );
wxString filename = EDA_FILE_SELECTOR( _( "Write Hotkey Configuration File:" ),
path,
fn.GetFullPath(),
ext,
mask,
this,
wxFD_SAVE,
true );
if( filename.IsEmpty() )
return;
WriteHotkeyConfig( aDescList, &filename );
SetMruPath( wxFileName( filename ).GetPath() );
}

4
common/kiway_player.cpp
View File

@ -100,8 +100,8 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
m_modal_resultant_parent = aResultantFocusWindow;
Raise(); // Needed on Ubuntu-14/Unity to display the frame
Show( true );
Raise(); // Needed on sole Window managers to always display the frame
SetFocus();
@ -146,7 +146,7 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
// have the final say, after wxWindowDisabler reenables my parent and
// the events settle down, set the focus
wxYield();
wxSafeYield();
aResultantFocusWindow->SetFocus();
}

4
common/page_layout/page_layout_reader.cpp
View File

@ -372,6 +372,10 @@ void PAGE_LAYOUT_READER_PARSER::parseBitmap( WORKSHEET_DATAITEM_BITMAP * aItem )
readPngdata( aItem );
break;
case T_option:
readOption( aItem );
break;
default:
Unexpected( CurText() );
break;

6
common/pgm_base.cpp
View File

@ -336,9 +336,9 @@ const wxString& PGM_BASE::GetEditorName()
#ifdef __WINDOWS__
mask += wxT( ".exe" );
#endif
editorname = EDA_FileSelector( _( "Preferred Editor:" ), wxEmptyString,
wxEmptyString, wxEmptyString, mask,
NULL, wxFD_OPEN, true );
editorname = EDA_FILE_SELECTOR( _( "Preferred Editor:" ), wxEmptyString,
wxEmptyString, wxEmptyString, mask,
NULL, wxFD_OPEN, true );
}
if( !editorname.IsEmpty() )

6
common/project.cpp
View File

@ -63,9 +63,13 @@ PROJECT::~PROJECT()
void PROJECT::SetProjectFullName( const wxString& aFullPathAndName )
{
// Compare paths, rather than inodes, to be less surprising to the user.
// Create a temporary wxFileName to normalize the path
wxFileName candidate_path( aFullPathAndName );
// Edge transitions only. This is what clears the project
// data using the Clear() function.
if( m_project_name != aFullPathAndName )
if( m_project_name.GetFullPath() != candidate_path.GetFullPath() )
{
Clear(); // clear the data when the project changes.

9
common/search_stack.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 CERN
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.
* Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -198,12 +198,13 @@ const wxString SEARCH_STACK::LastVisitedPath( const wxString& aSubPathToSearch )
#if defined(DEBUG)
void SEARCH_STACK::Show( const char* aPrefix ) const
void SEARCH_STACK::Show( const wxString& aPrefix ) const
{
printf( "%s SEARCH_STACK:\n", aPrefix );
wxLogDebug( wxT( "%s SEARCH_STACK:" ), GetChars( aPrefix ) );
for( unsigned i=0; i<GetCount(); ++i )
{
printf( " [%2u]:%s\n", i, TO_UTF8( (*this)[i] ) );
wxLogDebug( wxT( " [%2u]:%s" ), i, TO_UTF8( (*this)[i] ) );
}
}
#endif

72
common/searchhelpfilefullpath.cpp
View File

@ -26,6 +26,7 @@
#include <pgm_base.h>
#include <common.h>
#include <config.h> // to define DEFAULT_INSTALL_PATH
#include <macros.h>
/**
@ -49,6 +50,8 @@ wxString FindFileInSearchPaths( const SEARCH_STACK& aStack,
fn.AppendDir( (*aSubdirs)[j] );
}
wxLogDebug( wxT( " %s" ), GetChars( fn.GetFullPath() ) );
if( fn.DirExists() )
{
paths.Add( fn.GetPath() );
@ -68,38 +71,15 @@ wxString SearchHelpFileFullPath( const SEARCH_STACK& aSStack, const wxString& aB
// It might already be in aSStack, but why depend on other code
// far away when it's so easy to add it again (to our copy) as the first place to look.
// This is CMAKE_INSTALL_PREFIX:
ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
// If there's a KICAD environment variable set, use that guy's path also
ss.AddPaths( Pgm().GetKicadEnvVariable(), 0 );
// This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
// build configuration:
ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
#if defined(__WXMAC__)
ss.AddPaths( GetOSXKicadMachineDataDir() );
ss.AddPaths( Pgm().GetExecutablePath(), 0 );
#endif
#if ! defined(__WXMAC__) // && defined(__linux__)
// Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
// installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
// This is ${KICAD_HELP} var in that CMakeLists.txt file.
// Below we account for an international subdirectory.
subdirs.Add( wxT( "share" ) );
subdirs.Add( wxT( "doc" ) );
subdirs.Add( wxT( "kicad" ) );
subdirs.Add( wxT( "help" ) );
#endif
#if ! defined(__WXMAC__) // && defined(__WINDOWS__)
// Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
// installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
// This is ${KICAD_HELP} var in that CMakeLists.txt file.
// Below we account for an international subdirectory.
altsubdirs.Add( wxT( "doc" ) );
altsubdirs.Add( wxT( "help" ) );
#endif
#if defined (__WXMAC__)
// OS X packages can have the help files in
// /Library/Application\ Support/kicad/help,
// and in Contents/SharedSupport/help inside the
@ -111,6 +91,37 @@ wxString SearchHelpFileFullPath( const SEARCH_STACK& aSStack, const wxString& aB
altsubdirs.Add( wxT( "help" ) );
#endif
#if ! defined(__WXMAC__) // && defined(__linux__)
// This is the executable path minus the trailing bin directory used on Windows and Linux.
wxFileName tmp( Pgm().GetExecutablePath(), wxEmptyString );
wxArrayString binDirs = tmp.GetDirs();
if( !binDirs.IsEmpty() && binDirs[ binDirs.GetCount() - 1 ].CmpNoCase( wxT( "bin" ) ) == 0 )
tmp.RemoveLastDir();
ss.AddPaths( tmp.GetPath(), 0 );
// Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
// installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
// This is ${KICAD_HELP} var in that CMakeLists.txt file.
// Below we account for an international subdirectory.
subdirs.Add( wxT( "share" ) );
subdirs.Add( wxT( "doc" ) );
subdirs.Add( wxT( "kicad" ) );
subdirs.Add( wxT( "help" ) );
// Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
// installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
// This is ${KICAD_HELP} var in that CMakeLists.txt file.
// Below we account for an international subdirectory.
altsubdirs.Add( wxT( "doc" ) );
altsubdirs.Add( wxT( "help" ) );
#endif
// If there's a KICAD environment variable set, always use that guy's path first.
if( !Pgm().GetKicadEnvVariable().IsEmpty() )
ss.AddPaths( Pgm().GetKicadEnvVariable(), 0 );
/* Search for a help file.
* we *must* find a help file.
* so help is searched in directories in this order:
@ -126,15 +137,18 @@ wxString SearchHelpFileFullPath( const SEARCH_STACK& aSStack, const wxString& aB
// If fails, try to find help file in help/en
wxArrayString locale_name_dirs;
locale_name_dirs.Add( i18n->GetCanonicalName() ); // canonical name like fr_FR
// wxLocale::GetName() does not return always the short name
locale_name_dirs.Add( i18n->GetName().BeforeLast( '_' ) ); // short canonical name like fr
locale_name_dirs.Add( wxT( "en" ) ); // default (en)
#if defined(DEBUG) && 0
ss.Show( __func__ );
printf( "%s: m_help_file:'%s'\n", __func__, TO_UTF8( aBaseName ) );
#if defined(DEBUG) && 1
ss.Show( wxString( __func__ ) );
wxLogDebug( wxT( "%s: m_help_file:'%s'" ), __func__, GetChars( aBaseName ) );
#endif
wxLogDebug( wxT( "Checking SEARCH_STACK for file %s" ), GetChars( aBaseName ) );
// Help files can be html (.html ext) or pdf (.pdf ext) files.
// Therefore, <BaseName>.html file is searched and if not found,
// <BaseName>.pdf file is searched in the same paths

14
common/single_top.cpp
View File

@ -115,6 +115,20 @@ PGM_BASE& Pgm()
*/
struct APP_SINGLE_TOP : public wxApp
{
#if defined (__LINUX__)
APP_SINGLE_TOP(): wxApp()
{
// Disable proxy menu in Unity window manager. Only usual menubar works with wxWidgets (at least <= 3.1)
// When the proxy menu menubar is enable, some important things for us do not work: menuitems UI events and shortcuts.
wxString wm;
if( wxGetEnv( wxT( "XDG_CURRENT_DESKTOP" ), &wm ) && wm.CmpNoCase( wxT( "Unity" ) ) == 0 )
{
wxSetEnv ( wxT("UBUNTU_MENUPROXY" ), wxT( "0" ) );
}
}
#endif
bool OnInit() // overload wxApp virtual
{
try

2
cvpcb/CMakeLists.txt
View File

@ -69,7 +69,7 @@ if( false )
MACOSX_PACKAGE_LOCATION Resources
)
set( MACOSX_BUNDLE_ICON_FILE cvpcb.icns )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
set( MACOSX_BUNDLE_NAME cvpcb )
endif()

2
cvpcb/Info.plist
View File

@ -27,7 +27,7 @@
<key>CFBundleIconFile</key>
<string>cvpcb.icns</string>
<key>CFBundleIdentifier</key>
<string>org.kicad-eda.cvpcb</string>
<string>org.kicad-pcb.cvpcb</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>

21
cvpcb/autosel.cpp
View File

@ -27,7 +27,7 @@
// This file handle automatic selection of footprints, from .equ files which give
// a footprint FPID associated to a component value.
// Thse assiciations have this form:
// These associations have this form:
// 'FT232BL' 'QFP:LQFP-32_7x7mm_Pitch0.8mm'
@ -51,7 +51,7 @@
/*
* read the string between quotes and put it in aTarget
* put text in aTarget
* return a pointer to the last read char (the second quote if Ok)
* return a pointer to the last read char (the second quote if OK)
*/
wxString GetQuotedText( wxString & text )
{
@ -78,7 +78,8 @@ bool sortListbyCmpValue( const FOOTPRINT_EQUIVALENCE& ref, const FOOTPRINT_EQUIV
return ref.m_ComponentValue.Cmp( test.m_ComponentValue ) >= 0;
}
// read the .equ files and populate the list of equvalents
// read the .equ files and populate the list of equivalents
int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList, wxString * aErrorMessages )
{
char Line[1024];
@ -103,7 +104,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList, wx
if( aErrorMessages )
{
error_msg.Printf( _( "Equ file '%s' could not be found in the "
error_msg.Printf( _( "Equivalence file '%s' could not be found in the "
"default search paths." ),
GetChars( fn.GetFullName() ) );
@ -124,7 +125,7 @@ int CVPCB_MAINFRAME::buildEquivalenceList( FOOTPRINT_EQUIVALENCE_LIST& aList, wx
if( aErrorMessages )
{
error_msg.Printf( _( "Error opening equ file '%s'." ), GetChars( tmp ) );
error_msg.Printf( _( "Error opening equivalence file '%s'." ), GetChars( tmp ) );
if( ! aErrorMessages->IsEmpty() )
*aErrorMessages << wxT("\n\n");
@ -176,7 +177,7 @@ void CVPCB_MAINFRAME::AutomaticFootprintMatching( wxCommandEvent& event )
return;
if( buildEquivalenceList( equiv_List, &error_msg ) )
wxMessageBox( error_msg, _( "Equ files Load Error" ), wxOK | wxICON_WARNING, this );
wxMessageBox( error_msg, _( "Equivalence File Load Error" ), wxOK | wxICON_WARNING, this );
// Sort the association list by component value.
// When sorted, find duplicate definitions (i.e. 2 or more items
@ -184,10 +185,10 @@ void CVPCB_MAINFRAME::AutomaticFootprintMatching( wxCommandEvent& event )
std::sort( equiv_List.begin(), equiv_List.end(), sortListbyCmpValue );
// Display the number of footprint/component equivalences.
msg.Printf( _( "%d footprint/cmp equivalences found." ), equiv_List.size() );
msg.Printf( _( "%lu footprint/cmp equivalences found." ), (unsigned long)equiv_List.size() );
SetStatusText( msg, 0 );
// Now, associe each free component with a footprint, when the association
// Now, associate each free component with a footprint, when the association
// is found in list
m_skipComponentSelect = true;
ii = 0;
@ -206,7 +207,7 @@ void CVPCB_MAINFRAME::AutomaticFootprintMatching( wxCommandEvent& event )
// Here a first attempt is made. We can have multiple equivItem of the same value.
// When happens, using the footprint filter of components can remove the ambiguity by
// filtering equivItem so one can use multiple equiv_List (for polar and
// nonpolar caps for example)
// non-polar caps for example)
for( unsigned idx = 0; idx < equiv_List.size(); idx++ )
{
FOOTPRINT_EQUIVALENCE& equivItem = equiv_List[idx];
@ -274,7 +275,7 @@ void CVPCB_MAINFRAME::AutomaticFootprintMatching( wxCommandEvent& event )
// obviously the last chance: there's only one filter matching one footprint
if( 1 == component->GetFootprintFilters().GetCount() )
{
// we do not need to analyse wildcards: single footprint do not
// we do not need to analyze wildcards: single footprint do not
// contain them and if there are wildcards it just will not match any
const FOOTPRINT_INFO* module = m_footprints.GetModuleInfo( component->GetFootprintFilters()[0] );

3
cvpcb/class_DisplayFootprintsFrame.cpp
View File

@ -398,7 +398,8 @@ void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event )
return;
}
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, _( "3D Viewer" ), KICAD_DEFAULT_3D_DRAWFRAME_STYLE );
m_Draw3DFrame = new EDA_3D_FRAME( &Kiway(), this, _( "3D Viewer" ) );
m_Draw3DFrame->Raise(); // Needed with some Window Managers
m_Draw3DFrame->Show( true );
}

14
cvpcb/menubar.cpp
View File

@ -121,14 +121,20 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
AddHelpVersionInfoMenuEntry( helpMenu );
// Manual Contents
AddMenuItem( helpMenu, wxID_HELP, _( "&CvPcb Manual" ),
_( "Open CvPcb manual" ),
AddMenuItem( helpMenu, wxID_HELP, _( "CvPcb &Manual" ),
_( "Open CvPcb Manual" ),
KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu,
wxID_INDEX,
_( "&Getting Started in KiCad" ),
_( "Open \"Getting Started in KiCad\" guide for beginners" ),
KiBitmap( help_xpm ) );
// About CvPcb
AddMenuItem( helpMenu, wxID_ABOUT,
_( "&About CvPcb" ),
_( "About CvPcb footprint selector" ),
_( "&About Kicad" ),
_( "About KiCad" ),
KiBitmap( info_xpm ) );
// Create the menubar and append all submenus

90
demos/complex_hierarchy/ampli_ht.sch
View File

@ -1,6 +1,6 @@
EESchema Schematic File Version 2
LIBS:device
LIBS:power
LIBS:complex_hierarchy_schlib
LIBS:complex_hierarchy-cache
EELAYER 25 0
EELAYER END
@ -129,7 +129,7 @@ AR Path="/4B3A1333/4B617B88" Ref="R26" Part="1"
AR Path="/4B3A13A4/4B617B88" Ref="R28" Part="1"
F 0 "R28" H 9200 4850 50 0000 C CNN
F 1 "220K" V 9100 5100 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 9100 5100
-1 0 0 1
@ -142,7 +142,7 @@ AR Path="/4B3A1333/4B616B96" Ref="R25" Part="1"
AR Path="/4B3A13A4/4B616B96" Ref="R27" Part="1"
F 0 "R27" V 9530 4450 50 0000 C CNN
F 1 "47" V 9450 4450 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 9450 4450
0 1 1 0
@ -155,7 +155,7 @@ AR Path="/4B3A1333/4B616AFA" Ref="D8" Part="1"
AR Path="/4B3A13A4/4B616AFA" Ref="D9" Part="1"
F 0 "D9" V 7850 4200 50 0000 C CNN
F 1 "1N4148" V 7950 4200 50 0000 C CNN
F 2 "discret:D3" 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
1 7900 4000
0 -1 -1 0
@ -166,7 +166,7 @@ U 1 1 4B6168A3
P 8100 5950
AR Path="/4B3A13A4/4B6168A3" Ref="#PWR019" Part="1"
AR Path="/4B3A1333/4B6168A3" Ref="#PWR035" Part="1"
F 0 "#PWR035" H 8100 5950 30 0001 C CNN
F 0 "#PWR019" H 8100 5950 30 0001 C CNN
F 1 "GND" H 8100 5880 30 0001 C CNN
F 2 "" H 8100 5950 60 0001 C CNN
F 3 "" H 8100 5950 60 0001 C CNN
@ -181,7 +181,7 @@ AR Path="/4B3A1333/4B61688C" Ref="R10" Part="1"
AR Path="/4B3A13A4/4B61688C" Ref="R20" Part="1"
F 0 "R20" V 8180 5250 50 0000 C CNN
F 1 "5,6K" V 8100 5250 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 8100 5250
1 0 0 -1
@ -192,7 +192,7 @@ U 1 1 4B4F364A
P 2850 2450
AR Path="/4B3A1333/4B4F364A" Ref="#PWR036" Part="1"
AR Path="/4B3A13A4/4B4F364A" Ref="#PWR020" Part="1"
F 0 "#PWR036" H 2850 2450 30 0001 C CNN
F 0 "#PWR020" H 2850 2450 30 0001 C CNN
F 1 "GND" H 2850 2380 30 0001 C CNN
F 2 "" H 2850 2450 60 0001 C CNN
F 3 "" H 2850 2450 60 0001 C CNN
@ -207,7 +207,7 @@ AR Path="/4B3A1333/4B4F3641" Ref="C12" Part="1"
AR Path="/4B3A13A4/4B4F3641" Ref="C14" Part="1"
F 0 "C14" H 3000 2300 50 0000 L CNN
F 1 "150nF" H 3000 2200 50 0000 L CNN
F 2 "discret:C2" H 2850 2250 60 0001 C CNN
F 2 "Discret:C2" H 2850 2250 60 0001 C CNN
F 3 "" H 2850 2250 60 0001 C CNN
1 2850 2250
1 0 0 -1
@ -220,7 +220,7 @@ AR Path="/4B3A1333/4B4F363E" Ref="R23" Part="1"
AR Path="/4B3A13A4/4B4F363E" Ref="R24" Part="1"
F 0 "R24" V 2350 2000 50 0000 C CNN
F 1 "1K" V 2450 2000 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 2450 2000
0 1 1 0
@ -231,7 +231,7 @@ U 1 1 4B4B1086
P 6300 5850
AR Path="/4B3A13A4/4B4B1086" Ref="#PWR021" Part="1"
AR Path="/4B3A1333/4B4B1086" Ref="#PWR037" Part="1"
F 0 "#PWR037" H 6300 5950 20 0001 C CNN
F 0 "#PWR021" H 6300 5950 20 0001 C CNN
F 1 "-VAA" H 6300 5950 40 0000 C CNN
F 2 "" H 6300 5850 60 0001 C CNN
F 3 "" H 6300 5850 60 0001 C CNN
@ -244,7 +244,7 @@ U 1 1 4B4B1080
P 4750 2850
AR Path="/4B3A13A4/4B4B1080" Ref="#PWR022" Part="1"
AR Path="/4B3A1333/4B4B1080" Ref="#PWR038" Part="1"
F 0 "#PWR038" H 4750 2950 20 0001 C CNN
F 0 "#PWR022" H 4750 2950 20 0001 C CNN
F 1 "-VAA" H 4750 2950 40 0000 C CNN
F 2 "" H 4750 2850 60 0001 C CNN
F 3 "" H 4750 2850 60 0001 C CNN
@ -265,7 +265,7 @@ AR Path="/4B3A13A4/4B3A137D" Ref="Q6" Part="1"
AR Path="/4B3A1333/4B3A137D" Ref="Q2" Part="1"
F 0 "Q6" H 8500 3950 50 0000 R CNN
F 1 "MPAS42" H 8500 3850 50 0000 R CNN
F 2 "discret:TO92-CBE" 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
1 8500 3700
1 0 0 -1
@ -278,7 +278,7 @@ AR Path="/4B3A13A4/4B3A137C" Ref="Q7" Part="1"
AR Path="/4B3A1333/4B3A137C" Ref="Q3" Part="1"
F 0 "Q7" H 8500 4650 60 0000 R CNN
F 1 "MPAS92" H 8500 4950 60 0000 R CNN
F 2 "discret:TO92-CBE" 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
1 8500 4800
1 0 0 1
@ -291,7 +291,7 @@ AR Path="/4B3A13A4/4B3A137B" Ref="D7" Part="1"
AR Path="/4B3A1333/4B3A137B" Ref="D4" Part="1"
F 0 "D7" V 7850 4700 50 0000 C CNN
F 1 "1N4148" V 7950 4700 50 0000 C CNN
F 2 "discret:D3" 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
1 7900 4500
0 -1 -1 0
@ -302,7 +302,7 @@ U 1 1 4B3A137A
P 8600 5300
AR Path="/4B3A13A4/4B3A137A" Ref="#PWR023" Part="1"
AR Path="/4B3A1333/4B3A137A" Ref="#PWR039" Part="1"
F 0 "#PWR039" H 8600 5300 30 0001 C CNN
F 0 "#PWR023" H 8600 5300 30 0001 C CNN
F 1 "GND" H 8600 5230 30 0001 C CNN
F 2 "" H 8600 5300 60 0001 C CNN
F 3 "" H 8600 5300 60 0001 C CNN
@ -317,7 +317,7 @@ AR Path="/4B3A13A4/4B3A1379" Ref="Q8" Part="1"
AR Path="/4B3A1333/4B3A1379" Ref="Q4" Part="1"
F 0 "Q8" H 7800 4950 50 0000 R CNN
F 1 "MPAS42" H 7800 5250 50 0000 R CNN
F 2 "discret:TO92-CBE" 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
1 7800 5100
1 0 0 -1
@ -328,7 +328,7 @@ U 1 1 4B3A1378
P 7000 5200
AR Path="/4B3A13A4/4B3A1378" Ref="#PWR024" Part="1"
AR Path="/4B3A1333/4B3A1378" Ref="#PWR040" Part="1"
F 0 "#PWR040" H 7000 5200 30 0001 C CNN
F 0 "#PWR024" H 7000 5200 30 0001 C CNN
F 1 "GND" H 7000 5130 30 0001 C CNN
F 2 "" H 7000 5200 60 0001 C CNN
F 3 "" H 7000 5200 60 0001 C CNN
@ -343,7 +343,7 @@ AR Path="/4B3A13A4/4B3A1377" Ref="D6" Part="1"
AR Path="/4B3A1333/4B3A1377" Ref="D3" Part="1"
F 0 "D6" V 7250 3300 50 0000 C CNN
F 1 "1N4148" V 7350 3300 50 0000 C CNN
F 2 "discret:D3" H 7300 3100 60 0001 C CNN
F 2 "Discret:D3" H 7300 3100 60 0001 C CNN
F 3 "" H 7300 3100 60 0001 C CNN
1 7300 3100
0 -1 -1 0
@ -356,7 +356,7 @@ AR Path="/4B3A13A4/4B3A1376" Ref="R13" Part="1"
AR Path="/4B3A1333/4B3A1376" Ref="R3" Part="1"
F 0 "R13" V 7980 2750 50 0000 C CNN
F 1 "470" V 7900 2750 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 7900 2750
1 0 0 -1
@ -369,7 +369,7 @@ AR Path="/4B3A13A4/4B3A1375" Ref="D5" Part="1"
AR Path="/4B3A1333/4B3A1375" Ref="D2" Part="1"
F 0 "D5" V 7250 3000 50 0000 C CNN
F 1 "1N4148" V 7350 3000 50 0000 C CNN
F 2 "discret:D3" H 7300 2800 60 0001 C CNN
F 2 "Discret:D3" H 7300 2800 60 0001 C CNN
F 3 "" H 7300 2800 60 0001 C CNN
1 7300 2800
0 -1 -1 0
@ -382,7 +382,7 @@ AR Path="/4B3A13A4/4B3A1374" Ref="R14" Part="1"
AR Path="/4B3A1333/4B3A1374" Ref="R4" Part="1"
F 0 "R14" V 7380 3600 50 0000 C CNN
F 1 "220K" V 7300 3600 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 7300 3600
1 0 0 -1
@ -393,7 +393,7 @@ U 1 1 4B3A1373
P 7300 3850
AR Path="/4B3A13A4/4B3A1373" Ref="#PWR025" Part="1"
AR Path="/4B3A1333/4B3A1373" Ref="#PWR041" Part="1"
F 0 "#PWR041" H 7300 3850 30 0001 C CNN
F 0 "#PWR025" H 7300 3850 30 0001 C CNN
F 1 "GND" H 7300 3780 30 0001 C CNN
F 2 "" H 7300 3850 60 0001 C CNN
F 3 "" H 7300 3850 60 0001 C CNN
@ -408,7 +408,7 @@ AR Path="/4B3A13A4/4B3A1371" Ref="R18" Part="1"
AR Path="/4B3A1333/4B3A1371" Ref="R8" Part="1"
F 0 "R18" V 7150 5100 50 0000 C CNN
F 1 "1K" V 7250 5100 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 7250 5100
0 1 1 0
@ -421,7 +421,7 @@ AR Path="/4B3A13A4/4B3A1370" Ref="R22" Part="1"
AR Path="/4B3A1333/4B3A1370" Ref="R12" Part="1"
F 0 "R22" H 9000 4850 50 0000 C CNN
F 1 "220K" V 8900 5100 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 8900 5100
-1 0 0 1
@ -432,7 +432,7 @@ U 1 1 4B3A136F
P 6300 4950
AR Path="/4B3A13A4/4B3A136F" Ref="#U026" Part="1"
AR Path="/4B3A1333/4B3A136F" Ref="#U042" Part="1"
F 0 "#U042" H 6300 4900 20 0001 C CNN
F 0 "#U026" H 6300 4900 20 0001 C CNN
F 1 "+12V" H 6300 5050 40 0000 C CNN
F 2 "" H 6300 4950 60 0001 C CNN
F 3 "" H 6300 4950 60 0001 C CNN
@ -447,7 +447,7 @@ AR Path="/4B3A13A4/4B3A136D" Ref="R19" Part="1"
AR Path="/4B3A1333/4B3A136D" Ref="R9" Part="1"
F 0 "R19" V 7300 5400 50 0000 C CNN
F 1 "1K" V 7400 5400 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 7400 5400
0 1 1 0
@ -460,7 +460,7 @@ AR Path="/4B3A13A4/4B3A136C" Ref="P5" Part="1"
AR Path="/4B3A1333/4B3A136C" Ref="P3" Part="1"
F 0 "P5" V 10700 4400 40 0000 C CNN
F 1 "CONN_2" V 10800 4400 40 0000 C CNN
F 2 "connect:bornier2" 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
1 10750 4400
1 0 0 -1
@ -475,7 +475,7 @@ AR Path="/4B3A13A4/4B3A136B" Ref="R16" Part="1"
AR Path="/4B3A1333/4B3A136B" Ref="R6" Part="1"
F 0 "R16" V 3150 2000 50 0000 C CNN
F 1 "22K" V 3250 2000 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 3250 2000
0 1 1 0
@ -486,7 +486,7 @@ U 1 1 4B3A136A
P 1800 2250
AR Path="/4B3A13A4/4B3A136A" Ref="#PWR027" Part="1"
AR Path="/4B3A1333/4B3A136A" Ref="#PWR043" Part="1"
F 0 "#PWR043" H 1800 2250 30 0001 C CNN
F 0 "#PWR027" H 1800 2250 30 0001 C CNN
F 1 "GND" H 1800 2180 30 0001 C CNN
F 2 "" H 1800 2250 60 0001 C CNN
F 3 "" H 1800 2250 60 0001 C CNN
@ -499,7 +499,7 @@ U 1 1 4B3A1369
P 4000 2750
AR Path="/4B3A13A4/4B3A1369" Ref="#PWR028" Part="1"
AR Path="/4B3A1333/4B3A1369" Ref="#PWR044" Part="1"
F 0 "#PWR044" H 4000 2750 30 0001 C CNN
F 0 "#PWR028" H 4000 2750 30 0001 C CNN
F 1 "GND" H 4000 2680 30 0001 C CNN
F 2 "" H 4000 2750 60 0001 C CNN
F 3 "" H 4000 2750 60 0001 C CNN
@ -527,7 +527,7 @@ AR Path="/4B3A13A4/4B3A1367" Ref="P6" Part="1"
AR Path="/4B3A1333/4B3A1367" Ref="P4" Part="1"
F 0 "P6" V 1300 2100 40 0000 C CNN
F 1 "CONN_2" V 1400 2100 40 0000 C CNN
F 2 "connect:bornier2" 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
1 1350 2100
-1 0 0 -1
@ -540,7 +540,7 @@ AR Path="/4B3A13A4/4B3A1366" Ref="C7" Part="1"
AR Path="/4B3A1333/4B3A1366" Ref="C4" Part="1"
F 0 "C7" H 4100 2650 50 0000 L CNN
F 1 "4.7nF" H 4100 2450 50 0000 L CNN
F 2 "discret:C2" H 4000 2550 60 0001 C CNN
F 2 "Discret:C2" H 4000 2550 60 0001 C CNN
F 3 "" H 4000 2550 60 0001 C CNN
1 4000 2550
1 0 0 -1
@ -553,7 +553,7 @@ AR Path="/4B3A13A4/4B3A1365" Ref="C8" Part="1"
AR Path="/4B3A1333/4B3A1365" Ref="C5" Part="1"
F 0 "C8" H 8150 5850 50 0000 L CNN
F 1 "820pF" H 8150 5650 50 0000 L CNN
F 2 "discret:C2" 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
1 8100 5750
1 0 0 -1
@ -566,7 +566,7 @@ AR Path="/4B3A13A4/4B3A1364" Ref="R15" Part="1"
AR Path="/4B3A1333/4B3A1364" Ref="R5" Part="1"
F 0 "R15" V 9530 4150 50 0000 C CNN
F 1 "47" V 9450 4150 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 9450 4150
0 1 1 0
@ -577,7 +577,7 @@ U 1 1 4B3A1363
P 10250 4550
AR Path="/4B3A13A4/4B3A1363" Ref="#PWR029" Part="1"
AR Path="/4B3A1333/4B3A1363" Ref="#PWR045" Part="1"
F 0 "#PWR045" H 10250 4550 30 0001 C CNN
F 0 "#PWR029" H 10250 4550 30 0001 C CNN
F 1 "GND" H 10250 4480 30 0001 C CNN
F 2 "" H 10250 4550 60 0001 C CNN
F 3 "" H 10250 4550 60 0001 C CNN
@ -592,7 +592,7 @@ AR Path="/4B3A13A4/4B3A1362" Ref="R21" Part="1"
AR Path="/4B3A1333/4B3A1362" Ref="R11" Part="1"
F 0 "R21" V 5150 6400 50 0000 C CNN
F 1 "4,7K" V 5250 6400 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" H 5250 6400 60 0001 C CNN
F 2 "Discret:R3-LARGE_PADS" H 5250 6400 60 0001 C CNN
F 3 "" H 5250 6400 60 0001 C CNN
1 5250 6400
0 1 1 0
@ -603,7 +603,7 @@ U 1 1 4B3A1361
P 5050 6400
AR Path="/4B3A13A4/4B3A1361" Ref="#PWR030" Part="1"
AR Path="/4B3A1333/4B3A1361" Ref="#PWR046" Part="1"
F 0 "#PWR046" H 5050 6400 30 0001 C CNN
F 0 "#PWR030" H 5050 6400 30 0001 C CNN
F 1 "GND" H 5050 6330 30 0001 C CNN
F 2 "" H 5050 6400 60 0001 C CNN
F 3 "" H 5050 6400 60 0001 C CNN
@ -618,7 +618,7 @@ AR Path="/4B3A13A4/4B3A1360" Ref="Q5" Part="1"
AR Path="/4B3A1333/4B3A1360" Ref="Q1" Part="1"
F 0 "Q5" H 7800 3150 60 0000 R CNN
F 1 "MPAS92" H 7800 3450 60 0000 R CNN
F 2 "discret:TO92-CBE" 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
1 7800 3300
1 0 0 1
@ -629,7 +629,7 @@ U 1 1 4B3A135F
P 7300 2650
AR Path="/4B3A13A4/4B3A135F" Ref="#PWR031" Part="1"
AR Path="/4B3A1333/4B3A135F" Ref="#PWR047" Part="1"
F 0 "#PWR047" H 7300 2770 20 0001 C CNN
F 0 "#PWR031" H 7300 2770 20 0001 C CNN
F 1 "HT" H 7300 2740 40 0000 C CNN
F 2 "" H 7300 2650 60 0001 C CNN
F 3 "" H 7300 2650 60 0001 C CNN
@ -642,7 +642,7 @@ U 1 1 4B3A135E
P 7900 2550
AR Path="/4B3A13A4/4B3A135E" Ref="#PWR032" Part="1"
AR Path="/4B3A1333/4B3A135E" Ref="#PWR048" Part="1"
F 0 "#PWR048" H 7900 2670 20 0001 C CNN
F 0 "#PWR032" H 7900 2670 20 0001 C CNN
F 1 "HT" H 7900 2640 40 0000 C CNN
F 2 "" H 7900 2550 60 0001 C CNN
F 3 "" H 7900 2550 60 0001 C CNN
@ -655,7 +655,7 @@ U 1 1 4B3A135D
P 8600 3300
AR Path="/4B3A13A4/4B3A135D" Ref="#PWR033" Part="1"
AR Path="/4B3A1333/4B3A135D" Ref="#PWR049" Part="1"
F 0 "#PWR049" H 8600 3420 20 0001 C CNN
F 0 "#PWR033" H 8600 3420 20 0001 C CNN
F 1 "HT" H 8600 3390 40 0000 C CNN
F 2 "" H 8600 3300 60 0001 C CNN
F 3 "" H 8600 3300 60 0001 C CNN
@ -681,7 +681,7 @@ U 1 1 4B3A135B
P 4750 1950
AR Path="/4B3A13A4/4B3A135B" Ref="#U034" Part="1"
AR Path="/4B3A1333/4B3A135B" Ref="#U050" Part="1"
F 0 "#U050" H 4750 1900 20 0001 C CNN
F 0 "#U034" H 4750 1900 20 0001 C CNN
F 1 "+12V" H 4750 2050 40 0000 C CNN
F 2 "" H 4750 1950 60 0001 C CNN
F 3 "" H 4750 1950 60 0001 C CNN
@ -696,7 +696,7 @@ AR Path="/4B3A13A4/4B3A1359" Ref="R17" Part="1"
AR Path="/4B3A1333/4B3A1359" Ref="R7" Part="1"
F 0 "R17" V 3850 2000 50 0000 C CNN
F 1 "22K" V 3950 2000 50 0000 C CNN
F 2 "discret:R3-LARGE_PADS" 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
1 3950 2000
0 1 1 0
@ -709,7 +709,7 @@ AR Path="/4B3A13A4/4B3A1358" Ref="C6" Part="1"
AR Path="/4B3A1333/4B3A1358" Ref="C3" Part="1"
F 0 "C6" V 4200 1600 50 0000 C CNN
F 1 "15nF" V 4500 1600 50 0000 C CNN
F 2 "discret:C2" 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
1 4350 1600
0 1 1 0
@ -724,7 +724,7 @@ AR Path="/4B3A13A4/4B3A1357" Ref="RV2" Part="1"
AR Path="/4B3A1333/4B3A1357" Ref="RV1" Part="1"
F 0 "RV2" H 5850 6300 50 0000 C CNN
F 1 "4,7K" H 5850 6400 50 0000 C CNN
F 2 "discret:RV2" 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
1 5850 6400
1 0 0 -1

52
demos/complex_hierarchy/complex_hierarchy.kicad_pcb
View File

@ -298,7 +298,7 @@
(net 10 /ampli_ht_vertical/Vpil_0_3,3V))
(pad 2 thru_hole circle (at 2.54 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 17 "Net-(C3-Pad2)"))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -325,7 +325,7 @@
(net 18 "Net-(C4-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -352,7 +352,7 @@
(net 19 "Net-(C5-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -379,7 +379,7 @@
(net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
(pad 2 thru_hole circle (at 2.54 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 20 "Net-(C6-Pad2)"))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -406,7 +406,7 @@
(net 21 "Net-(C7-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -433,7 +433,7 @@
(net 22 "Net-(C8-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -557,7 +557,7 @@
(net 15 "Net-(C12-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -584,7 +584,7 @@
(net 16 "Net-(C14-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -899,7 +899,7 @@
(net 12 HT))
(pad 2 thru_hole circle (at 2.54 0 270) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -926,7 +926,7 @@
(net 2 /12Vext))
(pad 2 thru_hole circle (at 2.54 0 270) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -953,7 +953,7 @@
(net 8 /ampli_ht_vertical/PIEZO_OUT))
(pad 2 thru_hole circle (at 2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -980,7 +980,7 @@
(net 7 /ampli_ht_vertical/PIEZO_IN))
(pad 2 thru_hole circle (at 2.54 0 270) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1007,7 +1007,7 @@
(net 4 /ampli_ht_horizontal/PIEZO_OUT))
(pad 2 thru_hole circle (at 2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1034,7 +1034,7 @@
(net 3 /ampli_ht_horizontal/PIEZO_IN))
(pad 2 thru_hole circle (at 2.54 0 270) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1066,7 +1066,7 @@
(net 48 "Net-(D3-Pad1)"))
(pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 51 "Net-(D8-Pad2)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1098,7 +1098,7 @@
(net 51 "Net-(D8-Pad2)"))
(pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 12 HT))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1130,7 +1130,7 @@
(net 23 "Net-(D4-Pad1)"))
(pad C thru_hole circle (at 1.27 -1.27 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1162,7 +1162,7 @@
(net 30 "Net-(Q4-PadB)"))
(pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 23 "Net-(D4-Pad1)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1194,7 +1194,7 @@
(net 50 "Net-(D6-Pad1)"))
(pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 52 "Net-(D9-Pad2)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1226,7 +1226,7 @@
(net 52 "Net-(D9-Pad2)"))
(pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 12 HT))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1258,7 +1258,7 @@
(net 25 "Net-(D7-Pad1)"))
(pad C thru_hole circle (at 1.27 -1.27 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 GND))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1290,7 +1290,7 @@
(net 35 "Net-(Q8-PadB)"))
(pad C thru_hole circle (at 1.27 -1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 25 "Net-(D7-Pad1)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2160,7 +2160,7 @@
(net 45 "Net-(U1-Pad7)"))
(pad 8 thru_hole oval (at -3.81 -3.81) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 43 VCC))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2192,7 +2192,7 @@
(net 11 GND))
(pad VO thru_hole circle (at -1.27 1.27 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 43 VCC))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2233,7 +2233,7 @@
(net 10 /ampli_ht_vertical/Vpil_0_3,3V))
(pad 8 thru_hole oval (at -3.81 -3.81) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 46 +12V))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2274,7 +2274,7 @@
(net 6 /ampli_ht_horizontal/Vpil_0_3,3V))
(pad 8 thru_hole oval (at -3.81 -3.81) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 46 +12V))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))

20
demos/complex_hierarchy/complex_hierarchy.sch
View File

@ -1,6 +1,6 @@
EESchema Schematic File Version 2
LIBS:device
LIBS:power
LIBS:complex_hierarchy_schlib
LIBS:complex_hierarchy-cache
EELAYER 25 0
EELAYER END
@ -85,7 +85,7 @@ U 1 1 4B4B15E7
P 6650 2750
F 0 "C10" H 6800 2800 50 0000 L CNN
F 1 "10uF" H 6800 2750 50 0000 L TNN
F 2 "discret:CP6" 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
1 6650 2750
1 0 0 -1
@ -107,7 +107,7 @@ U 1 1 4B4B15D9
P 9200 2500
F 0 "C11" H 9350 2550 50 0000 L CNN
F 1 "10uF" H 9350 2500 50 0000 L TNN
F 2 "discret:CP6" 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
1 9200 2500
1 0 0 -1
@ -130,7 +130,7 @@ U 1 1 4B4B1532
P 7900 1350
F 0 "U2" H 7900 1650 60 0000 C CNN
F 1 "78L05" H 7900 1550 60 0000 C CNN
F 2 "discret:LM78LXX" 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
1 7900 1350
1 0 0 -1
@ -187,7 +187,7 @@ U 1 1 4B3A1558
P 2500 1500
F 0 "C9" H 2650 1550 50 0000 L CNN
F 1 "47uF/63V" H 2650 1500 50 0000 L TNN
F 2 "discret:CP8" H 2500 1500 60 0001 C CNN
F 2 "Discret:CP8" H 2500 1500 60 0001 C CNN
F 3 "" H 2500 1500 60 0001 C CNN
1 2500 1500
1 0 0 -1
@ -232,7 +232,7 @@ U 1 1 4B3A12F4
P 1650 1400
F 0 "P1" V 1600 1400 40 0000 C CNN
F 1 "CONN_2" V 1700 1400 40 0000 C CNN
F 2 "connect:bornier2" 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
1 1650 1400
-1 0 0 -1
@ -254,7 +254,7 @@ U 1 1 4B03CEC2
P 9200 1600
F 0 "C1" H 9350 1650 50 0000 L CNN
F 1 "47uF" H 9350 1600 50 0000 L TNN
F 2 "discret:CP6" 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
1 9200 1600
1 0 0 -1
@ -364,7 +364,7 @@ U 1 1 4AE173CF
P 3200 2750
F 0 "C2" H 3350 2800 50 0000 L CNN
F 1 "47uF/20V" H 3350 2700 50 0000 L TNN
F 2 "discret:CP6" H 3200 2750 60 0001 C CNN
F 2 "Discret:CP6" H 3200 2750 60 0001 C CNN
F 3 "" H 3200 2750 60 0001 C CNN
1 3200 2750
1 0 0 -1
@ -375,7 +375,7 @@ U 1 1 4AE172F4
P 2700 2500
F 0 "D1" H 2700 2400 40 0000 C CNN
F 1 "1N4007" H 2700 2600 40 0000 C CNN
F 2 "discret:D5" 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
1 2700 2500
-1 0 0 -1
@ -397,7 +397,7 @@ U 1 1 4AD71B06
P 1650 2600
F 0 "P2" V 1600 2600 40 0000 C CNN
F 1 "CONN_2" V 1700 2600 40 0000 C CNN
F 2 "connect:bornier2" 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
1 1650 2600
-1 0 0 -1

108
demos/ecc83/ecc83-pp.cmp
View File

@ -1,108 +0,0 @@
Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:02:29
BeginCmp
TimeStamp = /4549F4BE;
Reference = C1;
ValeurCmp = 10uF;
IdModule = discret:C2V10;
EndCmp
BeginCmp
TimeStamp = /4549F3BE;
Reference = C2;
ValeurCmp = 680nF;
IdModule = discret:C2;
EndCmp
BeginCmp
TimeStamp = /4549F464;
Reference = P1;
ValeurCmp = IN;
IdModule = connect:bornier2;
EndCmp
BeginCmp
TimeStamp = /4549F46C;
Reference = P2;
ValeurCmp = OUT;
IdModule = connect:bornier2;
EndCmp
BeginCmp
TimeStamp = /4549F4A5;
Reference = P3;
ValeurCmp = POWER;
IdModule = connect:bornier2;
EndCmp
BeginCmp
TimeStamp = /456A8ACC;
Reference = P4;
ValeurCmp = CONN_2;
IdModule = connect:bornier2;
EndCmp
BeginCmp
TimeStamp = /54A5890A;
Reference = P5;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58C65;
Reference = P6;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58C8A;
Reference = P7;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58CA3;
Reference = P8;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /4549F38A;
Reference = R1;
ValeurCmp = 1.5K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F39D;
Reference = R2;
ValeurCmp = 1.5K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F3AD;
Reference = R3;
ValeurCmp = 100K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F3A2;
Reference = R4;
ValeurCmp = 47K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /48B4F266;
Reference = U1;
ValeurCmp = ECC83;
IdModule = Valves:VALVE-ECC-83-1;
EndCmp
EndListe

22
demos/ecc83/ecc83-pp.kicad_pcb
View File

@ -137,7 +137,7 @@
(net 2 "Net-(C1-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0 90) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/c_vert_c2v10.wrl
(model Discret.3dshapes/C2V10.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -164,7 +164,7 @@
(net 3 "Net-(C2-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 "Net-(C2-Pad2)"))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -191,7 +191,7 @@
(net 1 GND))
(pad 2 thru_hole circle (at 2 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
(net 5 "Net-(P1-Pad2)"))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -218,7 +218,7 @@
(net 3 "Net-(C2-Pad1)"))
(pad 2 thru_hole circle (at 2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -245,7 +245,7 @@
(net 2 "Net-(C1-Pad1)"))
(pad 2 thru_hole circle (at 2 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -272,7 +272,7 @@
(net 6 "Net-(P4-Pad1)"))
(pad 2 thru_hole circle (at 2 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask F.SilkS)
(net 7 "Net-(P4-Pad2)"))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -367,7 +367,7 @@
(net 8 "Net-(R1-Pad1)"))
(pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 "Net-(C2-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -398,7 +398,7 @@
(net 9 "Net-(R2-Pad1)"))
(pad 2 thru_hole circle (at 3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -429,7 +429,7 @@
(net 3 "Net-(C2-Pad1)"))
(pad 2 thru_hole circle (at 3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -460,7 +460,7 @@
(net 5 "Net-(P1-Pad2)"))
(pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -495,7 +495,7 @@
(net 4 "Net-(C2-Pad2)"))
(pad 9 thru_hole circle (at -3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 7 "Net-(P4-Pad2)"))
(model Valves/VALVE-ECC-83-1.wrl
(model Valves.3dshapes/VALVE-ECC-83-1.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))

108
demos/ecc83/ecc83-pp_v2.cmp
View File

@ -1,108 +0,0 @@
Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 20:57:19
BeginCmp
TimeStamp = /4549F4BE;
Reference = C1;
ValeurCmp = 10uF;
IdModule = discret:C2V10;
EndCmp
BeginCmp
TimeStamp = /4549F3BE;
Reference = C2;
ValeurCmp = 680nF;
IdModule = discret:CP8;
EndCmp
BeginCmp
TimeStamp = /4549F464;
Reference = P1;
ValeurCmp = IN;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /4549F46C;
Reference = P2;
ValeurCmp = OUT;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /4549F4A5;
Reference = P3;
ValeurCmp = POWER;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /456A8ACC;
Reference = P4;
ValeurCmp = CONN_2;
IdModule = pin_array:pin_array_1x02;
EndCmp
BeginCmp
TimeStamp = /54A5830A;
Reference = P5;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58363;
Reference = P6;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A5837A;
Reference = P7;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /54A58391;
Reference = P8;
ValeurCmp = CONN_1;
IdModule = connect:1pin;
EndCmp
BeginCmp
TimeStamp = /4549F38A;
Reference = R1;
ValeurCmp = 1.5K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F39D;
Reference = R2;
ValeurCmp = 1.5K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F3AD;
Reference = R3;
ValeurCmp = 100K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /4549F3A2;
Reference = R4;
ValeurCmp = 47K;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /48B4F266;
Reference = U1;
ValeurCmp = ECC83;
IdModule = Valves:VALVE-ECC-83-2;
EndCmp
EndListe

22
demos/ecc83/ecc83-pp_v2.kicad_pcb
View File

@ -143,7 +143,7 @@
(net 2 "Net-(C1-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0 90) (size 1.778 1.778) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/c_vert_c2v10.wrl
(model Discret.3dshapes/C2V10.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -176,7 +176,7 @@
(net 3 "Net-(C2-Pad1)"))
(pad 2 thru_hole circle (at 10.16 0 270) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 "Net-(C2-Pad2)"))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 0.8 0.8 0.8))
(rotate (xyz 0 0 0))
@ -202,7 +202,7 @@
(net 1 GND))
(pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 5 "Net-(P1-Pad2)"))
(model pin_array/pins_array_2x1.wrl
(model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -228,7 +228,7 @@
(net 3 "Net-(C2-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model pin_array/pins_array_2x1.wrl
(model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -254,7 +254,7 @@
(net 2 "Net-(C1-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model pin_array/pins_array_2x1.wrl
(model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -280,7 +280,7 @@
(net 6 "Net-(P4-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 7 "Net-(P4-Pad2)"))
(model pin_array/pins_array_2x1.wrl
(model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -311,7 +311,7 @@
(net 8 "Net-(R1-Pad1)"))
(pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 "Net-(C2-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -342,7 +342,7 @@
(net 9 "Net-(R2-Pad1)"))
(pad 2 thru_hole circle (at 3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -373,7 +373,7 @@
(net 3 "Net-(C2-Pad1)"))
(pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -404,7 +404,7 @@
(net 5 "Net-(P1-Pad2)"))
(pad 2 thru_hole circle (at 3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -504,7 +504,7 @@
(pad 9 thru_hole oval (at -3.4544 4.75488 54) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
(net 7 "Net-(P4-Pad2)"))
(pad 0 thru_hole circle (at 0 0) (size 4.50088 4.50088) (drill 3.0988) (layers *.Cu *.Mask F.SilkS))
(model Valves/VALVE-ECC-83-2.wrl
(model Valves.3dshapes/VALVE-ECC-83-2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))

409
demos/flat_hierarchy/flat_hierarchy.cmp
View File

@ -1,409 +0,0 @@
Cmp-Mod V01 Created by Cvpcb (2014-07-04 BZR 4974)-product date = 05/07/2014 20:15:53
BeginCmp
TimeStamp = /48553E53/442A5056;
Reference = C1;
ValeurCmp = 100uF;
IdModule = discret:CP10;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A501D;
Reference = C2;
ValeurCmp = 220uF;
IdModule = discret:CP10;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A584C;
Reference = C3;
ValeurCmp = 22uF/25V;
IdModule = discret:CP8;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A5F61;
Reference = C4;
ValeurCmp = 0;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A58B1;
Reference = C5;
ValeurCmp = 10nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /48553E7C/442AA12B;
Reference = C6;
ValeurCmp = 100nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /48553E7C/442AA145;
Reference = C7;
ValeurCmp = 100nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /48553E7C/4639BE2C;
Reference = C8;
ValeurCmp = 100nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /48553E53/464AD280;
Reference = C9;
ValeurCmp = 22OnF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A500B;
Reference = D1;
ValeurCmp = 1N4004;
IdModule = discret:D5;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D1B;
Reference = D2;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D25;
Reference = D3;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D5C;
Reference = D4;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D5D;
Reference = D5;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D64;
Reference = D6;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D65;
Reference = D7;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4F5D;
Reference = D8;
ValeurCmp = RED-LED;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A5084;
Reference = D9;
ValeurCmp = GREEN-LED;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A6026;
Reference = D10;
ValeurCmp = SCHOTTKY;
IdModule = discret:D5;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639BA28;
Reference = D11;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639B9EA;
Reference = D12;
ValeurCmp = YELLOW-LED;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4C93;
Reference = J1;
ValeurCmp = DB9-FEMAL;
IdModule = connect:DB9FC;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639BAF8;
Reference = JP1;
ValeurCmp = JUMPER;
IdModule = pin_array:PIN_ARRAY_2X1;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A57BE;
Reference = L1;
ValeurCmp = 22uH;
IdModule = inductors:INDUCTOR_V;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4FE7;
Reference = P1;
ValeurCmp = CONN_2;
IdModule = connect:bornier2;
EndCmp
BeginCmp
TimeStamp = /48553E7C/4436967E;
Reference = P2;
ValeurCmp = SUPP28;
IdModule = 28DIP-ELL300;
EndCmp
BeginCmp
TimeStamp = /48553E7C/442A88ED;
Reference = P3;
ValeurCmp = SUPP40;
IdModule = 40DIP-ELL600;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4EB9;
Reference = Q1;
ValeurCmp = BC237;
IdModule = discret:TO92;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4F30;
Reference = Q2;
ValeurCmp = BC307;
IdModule = discret:TO92;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639B996;
Reference = Q3;
ValeurCmp = BC307;
IdModule = discret:TO92;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4CF4;
Reference = R1;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4CFB;
Reference = R2;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D5A;
Reference = R3;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D5B;
Reference = R4;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D62;
Reference = R5;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D63;
Reference = R6;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4F2A;
Reference = R7;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D92;
Reference = R8;
ValeurCmp = 1K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4F52;
Reference = R9;
ValeurCmp = 2.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A5F83;
Reference = R10;
ValeurCmp = 5,1K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4F23;
Reference = R11;
ValeurCmp = 22K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D85;
Reference = R12;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D8D;
Reference = R13;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A5083;
Reference = R14;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A58D7;
Reference = R15;
ValeurCmp = 6.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A58DC;
Reference = R16;
ValeurCmp = 62K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A50BF;
Reference = R17;
ValeurCmp = 22K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/44369638;
Reference = R18;
ValeurCmp = 220;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639B9B0;
Reference = R19;
ValeurCmp = 2.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639B9B3;
Reference = R20;
ValeurCmp = 2.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/4639B9E9;
Reference = R21;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /48553E53/443D0101;
Reference = RV1;
ValeurCmp = 1K;
IdModule = discret:RV2X4;
EndCmp
BeginCmp
TimeStamp = /48553E7C/442A87F7;
Reference = U1;
ValeurCmp = 24Cxx;
IdModule = dip_sockets:DIP-8__300_ELL;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A4D6B;
Reference = U2;
ValeurCmp = 74HC125;
IdModule = dip_sockets:DIP-14__300_ELL;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A504A;
Reference = U3;
ValeurCmp = 7805;
IdModule = discret:LM78XX;
EndCmp
BeginCmp
TimeStamp = /48553E53/442A5E20;
Reference = U4;
ValeurCmp = LT1373;
IdModule = dip_sockets:DIP-8__300_ELL;
EndCmp
BeginCmp
TimeStamp = /48553E7C/442A81A7;
Reference = U5;
ValeurCmp = PIC_18_PINS;
IdModule = dip_sockets:DIP-18__300_ELL;
EndCmp
BeginCmp
TimeStamp = /48553E7C/442A81A5;
Reference = U6;
ValeurCmp = PIC_8_PINS;
IdModule = dip_sockets:DIP-8__300_ELL;
EndCmp
EndListe

116
demos/flat_hierarchy/flat_hierarchy.kicad_pcb
View File

@ -223,7 +223,7 @@
(net 10 CLOCK-RB6))
(pad 28 thru_hole oval (at -16.51 -3.81 270) (size 1.5748 2.794) (drill 0.812799) (layers *.Cu *.Mask F.SilkS)
(net 11 DATA-RB7))
(model dil/dil_28-w300.wrl
(model Sockets_DIP.3dshapes/DIP-28__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -296,7 +296,7 @@
(net 10 CLOCK-RB6))
(pad 40 thru_hole oval (at -24.13 -7.62 270) (size 1.5748 2.794) (drill 0.812799) (layers *.Cu *.Mask F.SilkS)
(net 11 DATA-RB7))
(model dil\dil_40-w600.wrl
(model Sockets_DIP.3dshapes/DIP-40__600.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -412,7 +412,7 @@
(net 3 GND))
(pad 1 thru_hole rect (at -12.7 0 180) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 VCC))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -444,7 +444,7 @@
(net 3 GND))
(pad 1 thru_hole rect (at -12.7 0) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 12 "Net-(C2-Pad1)"))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -477,7 +477,7 @@
(net 5 VPP))
(pad 2 thru_hole circle (at 10.16 0 270) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 0.8 0.8 0.8))
(rotate (xyz 0 0 0))
@ -506,7 +506,7 @@
(net 3 GND))
(pad 2 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -535,7 +535,7 @@
(net 3 GND))
(pad 2 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -564,7 +564,7 @@
(net 3 GND))
(pad 2 thru_hole circle (at 0 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -593,7 +593,7 @@
(net 3 GND))
(pad 2 thru_hole circle (at 0 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -622,7 +622,7 @@
(net 3 GND))
(pad 2 thru_hole circle (at 0 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -651,7 +651,7 @@
(net 15 "Net-(C9-Pad2)"))
(pad 2 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 15 "Net-(C9-Pad2)"))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -683,7 +683,7 @@
(net 16 "Net-(D1-Pad1)"))
(pad 2 thru_hole rect (at 6.35 0 270) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
(net 12 "Net-(C2-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.5 0.5 0.5))
(rotate (xyz 0 0 0))
@ -715,7 +715,7 @@
(net 4 VCC))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 17 "Net-(D2-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -747,7 +747,7 @@
(net 17 "Net-(D2-Pad1)"))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -779,7 +779,7 @@
(net 4 VCC))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 18 "Net-(D4-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -811,7 +811,7 @@
(net 18 "Net-(D4-Pad1)"))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -843,7 +843,7 @@
(net 4 VCC))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 19 "Net-(D6-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -875,7 +875,7 @@
(net 19 "Net-(D6-Pad1)"))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -901,7 +901,7 @@
(net 20 "Net-(D8-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/led5_vertical.wrl
(model LEDs.3dshapes/LED-5MM.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -927,7 +927,7 @@
(net 21 "Net-(D9-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/led5_vertical.wrl
(model LEDs.3dshapes/LED-5MM.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -959,7 +959,7 @@
(net 22 "Net-(D10-Pad1)"))
(pad 2 thru_hole rect (at 6.35 0) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
(net 5 VPP))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.5 0.5 0.5))
(rotate (xyz 0 0 0))
@ -991,7 +991,7 @@
(net 23 "Net-(D11-Pad2)"))
(pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 24 "Net-(D11-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -1017,7 +1017,7 @@
(net 25 "Net-(D12-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/led5_vertical.wrl
(model LEDs.3dshapes/LED-5MM.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1061,7 +1061,7 @@
(pad 8 thru_hole circle (at 1.397 -1.27 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 1 /pic_programmer/CTS))
(pad 9 thru_hole circle (at 4.191 -1.27 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(model conn_DBxx/db9_female_pin90deg.wrl
(model Connect.3dshapes/DB9FC.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1087,7 +1087,7 @@
(net 4 VCC))
(pad 2 thru_hole circle (at 1.27 0 270) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 6 VCC_PIC))
(model pin_array/pins_array_2x1.wrl
(model Pin_Headers.3dshapes/Pin_Header_Straight_1x02.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1110,7 +1110,7 @@
(net 22 "Net-(D10-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0 270) (size 1.905 1.905) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 VCC))
(model discret/inductorV.wrl
(model Inductors.3dshapes/INDUCTOR_V.wrl
(at (xyz 0 0 0))
(scale (xyz 2 2 2))
(rotate (xyz 0 0 0))
@ -1137,7 +1137,7 @@
(net 3 GND))
(pad 2 thru_hole circle (at 2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 16 "Net-(D1-Pad1)"))
(model device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1169,7 +1169,7 @@
(net 26 "Net-(Q1-Pad2)"))
(pad 3 thru_hole circle (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 23 "Net-(D11-Pad2)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1201,7 +1201,7 @@
(net 15 "Net-(C9-Pad2)"))
(pad 3 thru_hole circle (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 27 "Net-(Q2-Pad3)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1233,7 +1233,7 @@
(net 28 "Net-(Q3-Pad2)"))
(pad 3 thru_hole circle (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 6 VCC_PIC))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1264,7 +1264,7 @@
(net 2 /pic_programmer/TXD))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 17 "Net-(D2-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1295,7 +1295,7 @@
(net 2 /pic_programmer/TXD))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1326,7 +1326,7 @@
(net 7 /pic_programmer/DTR))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 18 "Net-(D4-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1357,7 +1357,7 @@
(net 7 /pic_programmer/DTR))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1388,7 +1388,7 @@
(net 8 /pic_programmer/PC-CLOCK-OUT))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 19 "Net-(D6-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1419,7 +1419,7 @@
(net 8 /pic_programmer/PC-CLOCK-OUT))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1450,7 +1450,7 @@
(net 5 VPP))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 15 "Net-(C9-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1481,7 +1481,7 @@
(net 29 "Net-(R8-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 26 "Net-(Q1-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1512,7 +1512,7 @@
(net 27 "Net-(Q2-Pad3)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 20 "Net-(D8-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1543,7 +1543,7 @@
(net 13 "Net-(C4-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 14 "Net-(C5-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1574,7 +1574,7 @@
(net 23 "Net-(D11-Pad2)"))
(pad 2 thru_hole circle (at 5.08 0 90) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 15 "Net-(C9-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1605,7 +1605,7 @@
(net 30 "Net-(R12-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 90) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 DATA-RB7))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1636,7 +1636,7 @@
(net 31 "Net-(R13-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 270) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 10 CLOCK-RB6))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1667,7 +1667,7 @@
(net 4 VCC))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 21 "Net-(D9-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1698,7 +1698,7 @@
(net 32 "Net-(R15-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1729,7 +1729,7 @@
(net 33 "Net-(R16-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 VPP))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1760,7 +1760,7 @@
(net 27 "Net-(Q2-Pad3)"))
(pad 2 thru_hole circle (at 5.08 0 270) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1791,7 +1791,7 @@
(net 27 "Net-(Q2-Pad3)"))
(pad 2 thru_hole circle (at 5.08 0 90) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 9 VPP-MCLR))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1822,7 +1822,7 @@
(net 24 "Net-(D11-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 28 "Net-(Q3-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1853,7 +1853,7 @@
(net 4 VCC))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 28 "Net-(Q3-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1884,7 +1884,7 @@
(net 25 "Net-(D12-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 6 VCC_PIC))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1919,7 +1919,7 @@
(net 34 "Net-(RV1-Pad2)"))
(pad 3 thru_hole circle (at -5.08 2.54 180) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
(net 33 "Net-(R16-Pad1)"))
(model discret/adjustable_rx2v4.wrl
(model Discret.3dshapes/RV2X4.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1959,7 +1959,7 @@
(pad 7 thru_hole oval (at -1.27 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 8 thru_hole oval (at -3.81 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 VCC))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2012,7 +2012,7 @@
(net 3 GND))
(pad 14 thru_hole oval (at -7.62 -3.81) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 VCC))
(model dil/dil_14.wrl
(model Sockets_DIP.3dshapes/DIP-14__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2047,7 +2047,7 @@
(net 3 GND))
(pad VO thru_hole circle (at 0 2.54 90) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
(net 4 VCC))
(model discret/to220_horiz.wrl
(model Discret.3dshapes/TO220.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2086,7 +2086,7 @@
(net 3 GND))
(pad 8 thru_hole oval (at -3.81 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 22 "Net-(D10-Pad1)"))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2133,7 +2133,7 @@
(pad 16 thru_hole oval (at -5.08 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 17 thru_hole oval (at -7.62 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 18 thru_hole oval (at -10.16 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(model dil/dil_18.wrl
(model Sockets_DIP.3dshapes/DIP-18__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2171,7 +2171,7 @@
(net 11 DATA-RB7))
(pad 8 thru_hole oval (at -3.81 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 GND))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))

106
demos/flat_hierarchy/pic_programmer.sch
View File

@ -179,7 +179,7 @@ U 1 1 464AD280
P 6200 1150
F 0 "C9" H 6250 1250 50 0000 L CNN
F 1 "22OnF" H 6250 1050 50 0000 L CNN
F 2 "" H 6200 1150 60 0001 C CNN
F 2 "Discret:C1-1" H 6200 1150 60 0001 C CNN
F 3 "" H 6200 1150 60 0001 C CNN
1 6200 1150
1 0 0 -1
@ -201,7 +201,7 @@ U 1 1 4639BAF8
P 8300 3400
F 0 "JP1" V 8100 3500 60 0000 C CNN
F 1 "JUMPER" H 8300 3320 40 0000 C CNN
F 2 "" H 8300 3400 60 0001 C CNN
F 2 "pin_array:PIN_ARRAY_2X1" H 8300 3400 60 0001 C CNN
F 3 "" H 8300 3400 60 0001 C CNN
1 8300 3400
0 1 1 0
@ -212,7 +212,7 @@ U 1 1 4639BA28
P 7400 4300
F 0 "D11" V 7350 4500 50 0000 C CNN
F 1 "BAT43" V 7450 4500 50 0000 C CNN
F 2 "" H 7400 4300 60 0001 C CNN
F 2 "Discret:D3" H 7400 4300 60 0001 C CNN
F 3 "" H 7400 4300 60 0001 C CNN
1 7400 4300
0 1 1 0
@ -245,7 +245,7 @@ U 1 1 4639B9EA
P 7900 4700
F 0 "D12" V 7800 4550 50 0000 C CNN
F 1 "YELLOW-LED" H 7900 4800 50 0000 C CNN
F 2 "" H 7900 4700 60 0001 C CNN
F 2 "Discret:LEDV" H 7900 4700 60 0001 C CNN
F 3 "" H 7900 4700 60 0001 C CNN
F 4 "YELLOW-LED" H 7900 4900 40 0000 C CNN "Champ4"
1 7900 4700
@ -257,7 +257,7 @@ U 1 1 4639B9E9
P 7900 4150
F 0 "R21" H 7800 4350 50 0000 C CNN
F 1 "470" V 7900 4150 50 0000 C CNN
F 2 "" H 7900 4150 60 0001 C CNN
F 2 "Discret:R4" H 7900 4150 60 0001 C CNN
F 3 "" H 7900 4150 60 0001 C CNN
1 7900 4150
1 0 0 -1
@ -268,7 +268,7 @@ U 1 1 4639B9B3
P 7400 3050
F 0 "R20" H 7300 3250 50 0000 C CNN
F 1 "2.2K" V 7400 3050 50 0000 C CNN
F 2 "" H 7400 3050 60 0001 C CNN
F 2 "Discret:R4" H 7400 3050 60 0001 C CNN
F 3 "" H 7400 3050 60 0001 C CNN
1 7400 3050
1 0 0 -1
@ -279,7 +279,7 @@ U 1 1 4639B9B0
P 7400 3800
F 0 "R19" H 7500 3600 50 0000 C CNN
F 1 "2.2K" V 7400 3800 50 0000 C CNN
F 2 "" H 7400 3800 60 0001 C CNN
F 2 "Discret:R4" H 7400 3800 60 0001 C CNN
F 3 "" H 7400 3800 60 0001 C CNN
1 7400 3800
-1 0 0 1
@ -290,7 +290,7 @@ U 1 1 4639B996
P 7800 3400
F 0 "Q3" H 7700 3150 50 0000 C CNN
F 1 "BC307" H 7700 3250 50 0000 C CNN
F 2 "" H 7800 3400 60 0001 C CNN
F 2 "Discret:TO92" H 7800 3400 60 0001 C CNN
F 3 "" H 7800 3400 60 0001 C CNN
1 7800 3400
1 0 0 1
@ -314,7 +314,7 @@ U 1 1 443D0101
P 3600 6750
F 0 "RV1" V 3750 6900 50 0000 C CNN
F 1 "1K" H 3600 6750 50 0000 C CNN
F 2 "" H 3600 6750 60 0001 C CNN
F 2 "Discret:RV2X4" H 3600 6750 60 0001 C CNN
F 3 "" H 3600 6750 60 0001 C CNN
1 3600 6750
0 -1 -1 0
@ -325,7 +325,7 @@ U 1 1 44369638
P 8650 1500
F 0 "R18" V 8730 1500 50 0000 C CNN
F 1 "220" V 8650 1500 50 0000 C CNN
F 2 "" H 8650 1500 60 0001 C CNN
F 2 "Discret:R4" H 8650 1500 60 0001 C CNN
F 3 "" H 8650 1500 60 0001 C CNN
1 8650 1500
0 -1 -1 0
@ -369,7 +369,7 @@ U 1 1 442A6026
P 3300 5850
F 0 "D10" H 3300 5950 40 0000 C CNN
F 1 "SCHOTTKY" H 3300 5750 40 0000 C CNN
F 2 "" H 3300 5850 60 0001 C CNN
F 2 "Discret:D5" H 3300 5850 60 0001 C CNN
F 3 "" H 3300 5850 60 0001 C CNN
1 3300 5850
1 0 0 -1
@ -380,7 +380,7 @@ U 1 1 442A5F83
P 2150 7200
F 0 "R10" V 2230 7200 50 0000 C CNN
F 1 "5.1K" V 2150 7200 50 0000 C CNN
F 2 "" H 2150 7200 60 0001 C CNN
F 2 "Discret:R4" H 2150 7200 60 0001 C CNN
F 3 "" H 2150 7200 60 0001 C CNN
1 2150 7200
0 1 -1 0
@ -391,7 +391,7 @@ U 1 1 442A5F61
P 1900 7450
F 0 "C4" V 2050 7450 50 0000 C CNN
F 1 "0" V 1750 7450 50 0000 C CNN
F 2 "" H 1900 7450 60 0001 C CNN
F 2 "Discret:C1-1" H 1900 7450 60 0001 C CNN
F 3 "" H 1900 7450 60 0001 C CNN
1 1900 7450
0 1 -1 0
@ -402,7 +402,7 @@ U 1 1 442A5E20
P 1900 6100
F 0 "U4" H 2500 6600 60 0000 C CNN
F 1 "LT1373" H 1400 6600 60 0000 C CNN
F 2 "" H 1900 6100 60 0001 C CNN
F 2 "Sockets_DIP:DIP-8__300_ELL" H 1900 6100 60 0001 C CNN
F 3 "" H 1900 6100 60 0001 C CNN
1 1900 6100
1 0 0 -1
@ -415,7 +415,7 @@ U 1 1 442A58DC
P 3600 6200
F 0 "R16" H 3750 6050 50 0000 C CNN
F 1 "62K" V 3600 6200 50 0000 C CNN
F 2 "" H 3600 6200 60 0001 C CNN
F 2 "Discret:R4" H 3600 6200 60 0001 C CNN
F 3 "" H 3600 6200 60 0001 C CNN
1 3600 6200
-1 0 0 1
@ -426,7 +426,7 @@ U 1 1 442A58D7
P 3600 7300
F 0 "R15" H 3450 7450 50 0000 C CNN
F 1 "6.2K" V 3600 7300 50 0000 C CNN
F 2 "" H 3600 7300 60 0001 C CNN
F 2 "Discret:R4" H 3600 7300 60 0001 C CNN
F 3 "" H 3600 7300 60 0001 C CNN
1 3600 7300
1 0 0 -1
@ -438,7 +438,7 @@ U 1 1 442A58B1
P 1650 7200
F 0 "C5" V 1800 7200 50 0000 C CNN
F 1 "10nF" V 1500 7200 50 0000 C CNN
F 2 "" H 1650 7200 60 0001 C CNN
F 2 "Discret:C1-1" H 1650 7200 60 0001 C CNN
F 3 "" H 1650 7200 60 0001 C CNN
1 1650 7200
0 1 -1 0
@ -460,7 +460,7 @@ U 1 1 442A584C
P 3950 6200
F 0 "C3" H 4100 6250 50 0000 L CNN
F 1 "22uF/25V" H 4100 6150 50 0000 L CNN
F 2 "" H 3950 6200 60 0001 C CNN
F 2 "Discret:CP8" H 3950 6200 60 0001 C CNN
F 3 "" H 3950 6200 60 0001 C CNN
1 3950 6200
1 0 0 -1
@ -493,7 +493,7 @@ U 1 1 442A57BE
P 2550 5350
F 0 "L1" V 2500 5350 40 0000 C CNN
F 1 "22uH" V 2650 5350 40 0000 C CNN
F 2 "" H 2550 5350 60 0001 C CNN
F 2 "inductors:INDUCTOR_V" H 2550 5350 60 0001 C CNN
F 3 "" H 2550 5350 60 0001 C CNN
1 2550 5350
0 1 -1 0
@ -519,7 +519,7 @@ U 1 1 442A50BF
P 8300 1950
F 0 "R17" H 8200 2150 50 0000 C CNN
F 1 "22K" V 8300 1950 50 0000 C CNN
F 2 "" H 8300 1950 60 0001 C CNN
F 2 "Discret:R4" H 8300 1950 60 0001 C CNN
F 3 "" H 8300 1950 60 0001 C CNN
1 8300 1950
1 0 0 -1
@ -552,7 +552,7 @@ U 1 1 442A5084
P 10200 6150
F 0 "D9" V 10100 6000 50 0000 C CNN
F 1 "GREEN-LED" H 10200 6250 50 0000 C CNN
F 2 "" H 10200 6150 60 0001 C CNN
F 2 "Discret:LEDV" H 10200 6150 60 0001 C CNN
F 3 "" H 10200 6150 60 0001 C CNN
F 4 "GREEN LED" H 10200 6350 40 0000 C CNN "Champ4"
1 10200 6150
@ -564,7 +564,7 @@ U 1 1 442A5083
P 10200 5600
F 0 "R14" H 10100 5800 50 0000 C CNN
F 1 "470" V 10200 5600 50 0000 C CNN
F 2 "" H 10200 5600 60 0001 C CNN
F 2 "Discret:R4" H 10200 5600 60 0001 C CNN
F 3 "" H 10200 5600 60 0001 C CNN
1 10200 5600
1 0 0 -1
@ -586,7 +586,7 @@ U 1 1 442A5056
P 9650 5550
F 0 "C1" H 9800 5600 50 0000 L CNN
F 1 "100uF" H 9800 5500 50 0000 L CNN
F 2 "" H 9650 5550 60 0001 C CNN
F 2 "Discret:CP10" H 9650 5550 60 0001 C CNN
F 3 "" H 9650 5550 60 0001 C CNN
1 9650 5550
1 0 0 -1
@ -608,7 +608,7 @@ U 1 1 442A504A
P 9150 5350
F 0 "U3" H 9150 5650 60 0000 C CNN
F 1 "7805" H 9150 5550 60 0000 C CNN
F 2 "" H 9150 5350 60 0001 C CNN
F 2 "Discret:LM78XX" H 9150 5350 60 0001 C CNN
F 3 "" H 9150 5350 60 0001 C CNN
1 9150 5350
1 0 0 -1
@ -630,7 +630,7 @@ U 1 1 442A501D
P 8400 5550
F 0 "C2" H 8550 5600 50 0000 L CNN
F 1 "220uF" H 8550 5500 50 0000 L CNN
F 2 "" H 8400 5550 60 0001 C CNN
F 2 "Discret:CP10" H 8400 5550 60 0001 C CNN
F 3 "" H 8400 5550 60 0001 C CNN
1 8400 5550
1 0 0 -1
@ -652,7 +652,7 @@ U 1 1 442A500B
P 8100 5300
F 0 "D1" H 8100 5400 50 0000 C CNN
F 1 "1N4004" H 8100 5200 50 0000 C CNN
F 2 "" H 8100 5300 60 0001 C CNN
F 2 "Discret:D5" H 8100 5300 60 0001 C CNN
F 3 "" H 8100 5300 60 0001 C CNN
1 8100 5300
1 0 0 -1
@ -663,7 +663,7 @@ U 1 1 442A4FE7
P 7450 5400
F 0 "P1" V 7400 5400 40 0000 C CNN
F 1 "CONN_2" V 7500 5400 40 0000 C CNN
F 2 "" H 7450 5400 60 0001 C CNN
F 2 "Connect:bornier2" H 7450 5400 60 0001 C CNN
F 3 "" H 7450 5400 60 0001 C CNN
1 7450 5400
-1 0 0 1
@ -674,7 +674,7 @@ U 1 1 442A4F5D
P 7900 2350
F 0 "D8" V 7800 2200 50 0000 C CNN
F 1 "RED-LED" H 7900 2450 50 0000 C CNN
F 2 "" H 7900 2350 60 0001 C CNN
F 2 "Discret:LEDV" H 7900 2350 60 0001 C CNN
F 3 "" H 7900 2350 60 0001 C CNN
F 4 "Low Current Led" V 8250 2350 40 0000 C CNN "Champ4"
F 5 "RED LED" H 7900 2550 40 0000 C CNN "Champ5"
@ -687,7 +687,7 @@ U 1 1 442A4F52
P 7900 1850
F 0 "R9" H 7800 2050 50 0000 C CNN
F 1 "2.2K" V 7900 1850 50 0000 C CNN
F 2 "" H 7900 1850 60 0001 C CNN
F 2 "Discret:R4" H 7900 1850 60 0001 C CNN
F 3 "" H 7900 1850 60 0001 C CNN
1 7900 1850
1 0 0 -1
@ -720,7 +720,7 @@ U 1 1 442A4F30
P 7800 1200
F 0 "Q2" H 7700 900 50 0000 C CNN
F 1 "BC307" H 7700 1000 50 0000 C CNN
F 2 "" H 7800 1200 60 0001 C CNN
F 2 "Discret:TO92" H 7800 1200 60 0001 C CNN
F 3 "" H 7800 1200 60 0001 C CNN
1 7800 1200
1 0 0 1
@ -731,7 +731,7 @@ U 1 1 442A4F2A
P 6700 1050
F 0 "R7" H 6600 1200 50 0000 C CNN
F 1 "10K" V 6700 1050 50 0000 C CNN
F 2 "" H 6700 1050 60 0001 C CNN
F 2 "Discret:R4" H 6700 1050 60 0001 C CNN
F 3 "" H 6700 1050 60 0001 C CNN
1 6700 1050
1 0 0 -1
@ -742,7 +742,7 @@ U 1 1 442A4F23
P 6700 1950
F 0 "R11" H 6800 1750 50 0000 C CNN
F 1 "22K" V 6700 1950 50 0000 C CNN
F 2 "" H 6700 1950 60 0001 C CNN
F 2 "Discret:R4" H 6700 1950 60 0001 C CNN
F 3 "" H 6700 1950 60 0001 C CNN
1 6700 1950
-1 0 0 1
@ -766,7 +766,7 @@ U 1 1 442A4EB9
P 6600 2600
F 0 "Q1" H 6500 2850 50 0000 C CNN
F 1 "BC237" H 6502 2750 50 0000 C CNN
F 2 "" H 6600 2600 60 0001 C CNN
F 2 "Discret:TO92" H 6600 2600 60 0001 C CNN
F 3 "" H 6600 2600 60 0001 C CNN
1 6600 2600
1 0 0 -1
@ -827,7 +827,7 @@ U 1 1 442A4D92
P 5100 1200
F 0 "R8" V 5180 1200 50 0000 C CNN
F 1 "1K" V 5100 1200 50 0000 C CNN
F 2 "" H 5100 1200 60 0001 C CNN
F 2 "Discret:R4" H 5100 1200 60 0001 C CNN
F 3 "" H 5100 1200 60 0001 C CNN
1 5100 1200
0 -1 -1 0
@ -838,7 +838,7 @@ U 1 1 442A4D8D
P 5350 4500
F 0 "R13" V 5450 4500 50 0000 C CNN
F 1 "470" V 5350 4500 50 0000 C CNN
F 2 "" H 5350 4500 60 0001 C CNN
F 2 "Discret:R4" H 5350 4500 60 0001 C CNN
F 3 "" H 5350 4500 60 0001 C CNN
1 5350 4500
0 -1 -1 0
@ -849,7 +849,7 @@ U 1 1 442A4D85
P 5150 3150
F 0 "R12" V 5230 3150 50 0000 C CNN
F 1 "470" V 5150 3150 50 0000 C CNN
F 2 "" H 5150 3150 60 0001 C CNN
F 2 "Discret:R4" H 5150 3150 60 0001 C CNN
F 3 "" H 5150 3150 60 0001 C CNN
1 5150 3150
0 -1 -1 0
@ -871,7 +871,7 @@ U 4 1 442A4D6B
P 4150 2200
F 0 "U2" H 4150 2500 50 0000 C BNN
F 1 "74HC125" H 4150 2450 50 0000 C TNN
F 2 "" H 4150 2200 60 0001 C CNN
F 2 "Sockets_DIP:DIP-10__300_ELL" H 4150 2200 60 0001 C CNN
F 3 "" H 4150 2200 60 0001 C CNN
4 4150 2200
-1 0 0 -1
@ -915,7 +915,7 @@ U 1 1 442A4D65
P 3900 4800
F 0 "D7" V 3950 4600 50 0000 C CNN
F 1 "BAT43" V 3850 4600 50 0000 C CNN
F 2 "" H 3900 4800 60 0001 C CNN
F 2 "Discret:D3" H 3900 4800 60 0001 C CNN
F 3 "" H 3900 4800 60 0001 C CNN
1 3900 4800
0 -1 -1 0
@ -926,7 +926,7 @@ U 1 1 442A4D64
P 3900 4100
F 0 "D6" V 3950 3900 50 0000 C CNN
F 1 "BAT43" V 3850 3900 50 0000 C CNN
F 2 "" H 3900 4100 60 0001 C CNN
F 2 "Discret:D3" H 3900 4100 60 0001 C CNN
F 3 "" H 3900 4100 60 0001 C CNN
1 3900 4100
0 -1 -1 0
@ -937,7 +937,7 @@ U 1 1 442A4D63
P 3200 4750
F 0 "R6" H 3100 4950 50 0000 C CNN
F 1 "10K" V 3200 4750 50 0000 C CNN
F 2 "" H 3200 4750 60 0001 C CNN
F 2 "Discret:R4" H 3200 4750 60 0001 C CNN
F 3 "" H 3200 4750 60 0001 C CNN
1 3200 4750
1 0 0 -1
@ -948,7 +948,7 @@ U 1 1 442A4D62
P 3550 4400
F 0 "R5" V 3630 4400 50 0000 C CNN
F 1 "10K" V 3550 4400 50 0000 C CNN
F 2 "" H 3550 4400 60 0001 C CNN
F 2 "Discret:R4" H 3550 4400 60 0001 C CNN
F 3 "" H 3550 4400 60 0001 C CNN
1 3550 4400
0 -1 -1 0
@ -959,7 +959,7 @@ U 3 1 442A4D61
P 4550 4500
F 0 "U2" H 4550 4750 50 0000 C BNN
F 1 "74HC125" H 4550 4700 50 0000 C TNN
F 2 "" H 4550 4500 60 0001 C CNN
F 2 "Sockets_DIP:DIP-10__300_ELL" H 4550 4500 60 0001 C CNN
F 3 "" H 4550 4500 60 0001 C CNN
3 4550 4500
1 0 0 -1
@ -1003,7 +1003,7 @@ U 1 1 442A4D5D
P 3700 3550
F 0 "D5" V 3750 3350 50 0000 C CNN
F 1 "BAT43" V 3650 3350 50 0000 C CNN
F 2 "" H 3700 3550 60 0001 C CNN
F 2 "Discret:D3" H 3700 3550 60 0001 C CNN
F 3 "" H 3700 3550 60 0001 C CNN
1 3700 3550
0 -1 -1 0
@ -1014,7 +1014,7 @@ U 1 1 442A4D5C
P 3700 2850
F 0 "D4" V 3750 2650 50 0000 C CNN
F 1 "BAT43" V 3650 2650 50 0000 C CNN
F 2 "" H 3700 2850 60 0001 C CNN
F 2 "Discret:D3" H 3700 2850 60 0001 C CNN
F 3 "" H 3700 2850 60 0001 C CNN
1 3700 2850
0 -1 -1 0
@ -1025,7 +1025,7 @@ U 1 1 442A4D5B
P 3000 3600
F 0 "R4" V 3080 3600 50 0000 C CNN
F 1 "10K" V 3000 3600 50 0000 C CNN
F 2 "" H 3000 3600 60 0001 C CNN
F 2 "Discret:R4" H 3000 3600 60 0001 C CNN
F 3 "" H 3000 3600 60 0001 C CNN
1 3000 3600
1 0 0 -1
@ -1036,7 +1036,7 @@ U 1 1 442A4D5A
P 3350 3250
F 0 "R3" V 3430 3250 50 0000 C CNN
F 1 "10K" V 3350 3250 50 0000 C CNN
F 2 "" H 3350 3250 60 0001 C CNN
F 2 "Discret:R4" H 3350 3250 60 0001 C CNN
F 3 "" H 3350 3250 60 0001 C CNN
1 3350 3250
0 -1 -1 0
@ -1047,7 +1047,7 @@ U 2 1 442A4D59
P 4350 3150
F 0 "U2" H 4350 3400 50 0000 C BNN
F 1 "74HC125" H 4350 3350 50 0000 C TNN
F 2 "" H 4350 3150 60 0001 C CNN
F 2 "Sockets_DIP:DIP-10__300_ELL" H 4350 3150 60 0001 C CNN
F 3 "" H 4350 3150 60 0001 C CNN
2 4350 3150
1 0 0 -1
@ -1091,7 +1091,7 @@ U 1 1 442A4D25
P 3750 1600
F 0 "D3" V 3800 1400 50 0000 C CNN
F 1 "BAT43" V 3700 1400 50 0000 C CNN
F 2 "" H 3750 1600 60 0001 C CNN
F 2 "Discret:D3" H 3750 1600 60 0001 C CNN
F 3 "" H 3750 1600 60 0001 C CNN
1 3750 1600
0 -1 -1 0
@ -1102,7 +1102,7 @@ U 1 1 442A4D1B
P 3750 900
F 0 "D2" V 3800 700 50 0000 C CNN
F 1 "BAT43" V 3700 700 50 0000 C CNN
F 2 "" H 3750 900 60 0001 C CNN
F 2 "Discret:D3" H 3750 900 60 0001 C CNN
F 3 "" H 3750 900 60 0001 C CNN
1 3750 900
0 -1 -1 0
@ -1113,7 +1113,7 @@ U 1 1 442A4CFB
P 2900 1650
F 0 "R2" H 2800 1850 50 0000 C CNN
F 1 "10K" V 2900 1650 50 0000 C CNN
F 2 "" H 2900 1650 60 0001 C CNN
F 2 "Discret:R4" H 2900 1650 60 0001 C CNN
F 3 "" H 2900 1650 60 0001 C CNN
1 2900 1650
1 0 0 -1
@ -1124,7 +1124,7 @@ U 1 1 442A4CF4
P 3400 1300
F 0 "R1" V 3480 1300 50 0000 C CNN
F 1 "10K" V 3400 1300 50 0000 C CNN
F 2 "" H 3400 1300 60 0001 C CNN
F 2 "Discret:R4" H 3400 1300 60 0001 C CNN
F 3 "" H 3400 1300 60 0001 C CNN
1 3400 1300
0 -1 -1 0
@ -1135,7 +1135,7 @@ U 1 1 442A4CC8
P 4300 1200
F 0 "U2" H 4300 1500 50 0000 C BNN
F 1 "74HC125" H 4300 1450 50 0000 C TNN
F 2 "" H 4300 1200 60 0001 C CNN
F 2 "Sockets_DIP:DIP-10__300_ELL" H 4300 1200 60 0001 C CNN
F 3 "" H 4300 1200 60 0001 C CNN
1 4300 1200
1 0 0 -1
@ -1146,7 +1146,7 @@ U 1 1 442A4C93
P 1250 3600
F 0 "J1" H 1250 3000 70 0000 C CNN
F 1 "DB9-FEMAL" H 1250 4200 70 0000 C CNN
F 2 "" H 1250 3600 60 0001 C CNN
F 2 "Connect:DB9FC" H 1250 3600 60 0001 C CNN
F 3 "" H 1250 3600 60 0001 C CNN
1 1250 3600
-1 0 0 1

16
demos/flat_hierarchy/pic_sockets.sch
View File

@ -100,7 +100,7 @@ U 1 1 4639BE2C
P 2200 6800
F 0 "C8" H 2250 6900 50 0000 L CNN
F 1 "100nF" H 2250 6700 50 0000 L CNN
F 2 "" H 2200 6800 60 0001 C CNN
F 2 "Discret:C1-1" H 2200 6800 60 0001 C CNN
F 3 "" H 2200 6800 60 0001 C CNN
1 2200 6800
1 0 0 -1
@ -191,7 +191,7 @@ U 1 1 4436967E
P 8300 2800
F 0 "P2" H 8300 3600 70 0000 C CNN
F 1 "SUPP28" H 8300 1950 70 0000 C CNN
F 2 "" H 8300 2800 60 0001 C CNN
F 2 "Sockets_DIP:DIP-28__300_ELL" H 8300 2800 60 0001 C CNN
F 3 "" H 8300 2800 60 0001 C CNN
1 8300 2800
1 0 0 -1
@ -213,7 +213,7 @@ U 1 1 442AA145
P 1650 6800
F 0 "C7" H 1700 6900 50 0000 L CNN
F 1 "100nF" H 1700 6700 50 0000 L CNN
F 2 "" H 1650 6800 60 0001 C CNN
F 2 "Discret:C1-1" H 1650 6800 60 0001 C CNN
F 3 "" H 1650 6800 60 0001 C CNN
1 1650 6800
1 0 0 -1
@ -246,7 +246,7 @@ U 1 1 442AA12B
P 2750 6800
F 0 "C6" H 2800 6900 50 0000 L CNN
F 1 "100nF" H 2800 6700 50 0000 L CNN
F 2 "" H 2750 6800 60 0001 C CNN
F 2 "Discret:C1-1" H 2750 6800 60 0001 C CNN
F 3 "" H 2750 6800 60 0001 C CNN
1 2750 6800
1 0 0 -1
@ -300,7 +300,7 @@ U 1 1 442A88ED
P 8300 4950
F 0 "P3" H 8300 6050 70 0000 C CNN
F 1 "SUPP40" H 8300 3800 70 0000 C CNN
F 2 "" H 8300 4950 60 0001 C CNN
F 2 "Sockets_DIP:DIP-40__600_ELL" H 8300 4950 60 0001 C CNN
F 3 "" H 8300 4950 60 0001 C CNN
1 8300 4950
1 0 0 -1
@ -327,7 +327,7 @@ U 1 1 442A87F7
P 3250 1400
F 0 "U1" H 3400 1750 60 0000 C CNN
F 1 "24Cxx" H 3450 1050 60 0000 C CNN
F 2 "" H 3250 1400 60 0001 C CNN
F 2 "Sockets_DIP:DIP-8__300_ELL" H 3250 1400 60 0001 C CNN
F 3 "" H 3250 1400 60 0001 C CNN
1 3250 1400
1 0 0 -1
@ -357,7 +357,7 @@ U 1 1 442A81A7
P 3300 4850
F 0 "U5" H 3300 5600 60 0000 C CNN
F 1 "PIC_18_PINS" H 3300 4050 60 0000 C CNN
F 2 "" H 3300 4850 60 0001 C CNN
F 2 "Sockets_DIP:DIP-18__300_ELL" H 3300 4850 60 0001 C CNN
F 3 "" H 3300 4850 60 0001 C CNN
1 3300 4850
1 0 0 -1
@ -403,7 +403,7 @@ U 1 1 442A81A5
P 3300 3000
F 0 "U6" H 3250 3700 60 0000 C CNN
F 1 "PIC_8_PINS" H 3300 2300 60 0000 C CNN
F 2 "" H 3300 3000 60 0001 C CNN
F 2 "Sockets_DIP:DIP-8__300_ELL" H 3300 3000 60 0001 C CNN
F 3 "" H 3300 3000 60 0001 C CNN
1 3300 3000
1 0 0 -1

3697
demos/interf_u/interf_u.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

1137
demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.cmp
View File

File diff suppressed because it is too large Load Diff

342
demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

BIN
demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wings Normal file
View File

Binary file not shown.

883
demos/kit-dev-coldfire-xilinx_5213/prj.3dshapes/push_butt_4pads.wrl Normal file
View File

@ -0,0 +1,883 @@
#VRML V2.0 utf8
#Exported from Wings 3D 2.0.1
DEF cylinder7_copy10 Transform {
children [
Shape {
appearance Appearance {
material DEF mold Material {
diffuseColor 0.3194453658536587 0.3194453658536587 0.35398
emissiveColor 7.622400000000001e-4 7.622400000000001e-4 0.001
specularColor 0.0 0.0 0.0
ambientIntensity 0.1806907491527868
transparency 0.0
shininess 0.43
}
}
geometry IndexedFaceSet {
coord Coordinate { point [
-0.5900000000000001 -0.8000000000000002 1.54952,
-0.60598529817263 -0.8803635207966689 1.54952,
-0.6515075759508252 -0.948492424049175 1.54952,
-0.7196364792033313 -0.9940147018273703 1.54952,
-0.8000000000000002 -1.01 1.54952,
-0.8803635207966689 -0.9940147018273703 1.54952,
-0.948492424049175 -0.948492424049175 1.54952,
-0.9940147018273703 -0.8803635207966689 1.54952,
-1.01 -0.8000000000000002 1.54952,
-0.9940147018273703 -0.7196364792033313 1.54952,
-0.948492424049175 -0.6515075759508252 1.54952,
-0.880363520796669 -0.60598529817263 1.54952,
-0.8000000000000002 -0.5900000000000001 1.54952,
-0.7196364792033311 -0.60598529817263 1.54952,
-0.6515075759508252 -0.651507575950825 1.54952,
-0.60598529817263 -0.7196364792033311 1.54952,
-0.5900000000000001 -0.8000000000000002 1.44952,
-0.60598529817263 -0.8803635207966689 1.44952,
-0.6515075759508252 -0.948492424049175 1.44952,
-0.7196364792033313 -0.9940147018273703 1.44952,
-0.8000000000000002 -1.01 1.44952,
-0.8803635207966689 -0.9940147018273703 1.44952,
-0.948492424049175 -0.948492424049175 1.44952,
-0.9940147018273703 -0.8803635207966689 1.44952,
-1.01 -0.8000000000000002 1.44952,
-0.9940147018273703 -0.7196364792033313 1.44952,
-0.948492424049175 -0.6515075759508252 1.44952,
-0.880363520796669 -0.60598529817263 1.44952,
-0.8000000000000002 -0.5900000000000001 1.44952,
-0.7196364792033311 -0.60598529817263 1.44952,
-0.6515075759508252 -0.651507575950825 1.44952,
-0.60598529817263 -0.7196364792033311 1.44952 ] }
coordIndex [
0, 1, 16, -1,
0, 8, 1, -1,
0, 9, 8, -1,
0, 15, 9, -1,
0, 16, 15, -1,
1, 2, 18, -1,
1, 7, 2, -1,
1, 8, 7, -1,
1, 17, 16, -1,
1, 18, 17, -1,
2, 3, 18, -1,
2, 6, 3, -1,
2, 7, 6, -1,
3, 4, 20, -1,
3, 5, 4, -1,
3, 6, 5, -1,
3, 19, 18, -1,
3, 20, 19, -1,
4, 5, 20, -1,
5, 6, 22, -1,
5, 21, 20, -1,
5, 22, 21, -1,
6, 7, 22, -1,
7, 8, 24, -1,
7, 23, 22, -1,
7, 24, 23, -1,
8, 9, 24, -1,
9, 10, 26, -1,
9, 15, 10, -1,
9, 25, 24, -1,
9, 26, 25, -1,
10, 11, 26, -1,
10, 14, 11, -1,
10, 15, 14, -1,
11, 12, 28, -1,
11, 13, 12, -1,
11, 14, 13, -1,
11, 27, 26, -1,
11, 28, 27, -1,
12, 13, 28, -1,
13, 14, 30, -1,
13, 29, 28, -1,
13, 30, 29, -1,
14, 15, 30, -1,
15, 16, 31, -1,
15, 31, 30, -1,
16, 17, 23, -1,
16, 23, 24, -1,
16, 24, 31, -1,
17, 18, 22, -1,
17, 22, 23, -1,
18, 19, 21, -1,
18, 21, 22, -1,
19, 20, 21, -1,
24, 25, 31, -1,
25, 26, 30, -1,
25, 30, 31, -1,
26, 27, 29, -1,
26, 29, 30, -1,
27, 28, 29, -1 ]
}
}
]
}
DEF cylinder7_copy9 Transform {
children [
Shape {
appearance Appearance {
material USE mold
}
geometry IndexedFaceSet {
coord Coordinate { point [
1.01 -0.8000000000000002 1.54952,
0.9940147018273701 -0.8803635207966689 1.54952,
0.9484924240491749 -0.948492424049175 1.54952,
0.8803635207966688 -0.9940147018273703 1.54952,
0.7999999999999999 -1.01 1.54952,
0.7196364792033312 -0.9940147018273703 1.54952,
0.6515075759508251 -0.948492424049175 1.54952,
0.6059852981726298 -0.8803635207966689 1.54952,
0.5900000000000001 -0.8000000000000002 1.54952,
0.6059852981726298 -0.7196364792033313 1.54952,
0.6515075759508251 -0.6515075759508252 1.54952,
0.7196364792033311 -0.60598529817263 1.54952,
0.7999999999999999 -0.5900000000000001 1.54952,
0.880363520796669 -0.60598529817263 1.54952,
0.9484924240491749 -0.651507575950825 1.54952,
0.9940147018273701 -0.7196364792033311 1.54952,
1.01 -0.8000000000000002 1.44952,
0.9940147018273701 -0.8803635207966689 1.44952,
0.9484924240491749 -0.948492424049175 1.44952,
0.8803635207966688 -0.9940147018273703 1.44952,
0.7999999999999999 -1.01 1.44952,
0.7196364792033312 -0.9940147018273703 1.44952,
0.6515075759508251 -0.948492424049175 1.44952,
0.6059852981726298 -0.8803635207966689 1.44952,
0.5900000000000001 -0.8000000000000002 1.44952,
0.6059852981726298 -0.7196364792033313 1.44952,
0.6515075759508251 -0.6515075759508252 1.44952,
0.7196364792033311 -0.60598529817263 1.44952,
0.7999999999999999 -0.5900000000000001 1.44952,
0.880363520796669 -0.60598529817263 1.44952,
0.9484924240491749 -0.651507575950825 1.44952,
0.9940147018273701 -0.7196364792033311 1.44952 ] }
coordIndex [
0, 1, 16, -1,
0, 8, 1, -1,
0, 9, 8, -1,
0, 15, 9, -1,
0, 16, 15, -1,
1, 2, 18, -1,
1, 7, 2, -1,
1, 8, 7, -1,
1, 17, 16, -1,
1, 18, 17, -1,
2, 3, 18, -1,
2, 6, 3, -1,
2, 7, 6, -1,
3, 4, 20, -1,
3, 5, 4, -1,
3, 6, 5, -1,
3, 19, 18, -1,
3, 20, 19, -1,
4, 5, 20, -1,
5, 6, 22, -1,
5, 21, 20, -1,
5, 22, 21, -1,
6, 7, 22, -1,
7, 8, 24, -1,
7, 23, 22, -1,
7, 24, 23, -1,
8, 9, 24, -1,
9, 10, 26, -1,
9, 15, 10, -1,
9, 25, 24, -1,
9, 26, 25, -1,
10, 11, 26, -1,
10, 14, 11, -1,
10, 15, 14, -1,
11, 12, 28, -1,
11, 13, 12, -1,
11, 14, 13, -1,
11, 27, 26, -1,
11, 28, 27, -1,
12, 13, 28, -1,
13, 14, 30, -1,
13, 29, 28, -1,
13, 30, 29, -1,
14, 15, 30, -1,
15, 16, 31, -1,
15, 31, 30, -1,
16, 17, 23, -1,
16, 23, 24, -1,
16, 24, 31, -1,
17, 18, 22, -1,
17, 22, 23, -1,
18, 19, 21, -1,
18, 21, 22, -1,
19, 20, 21, -1,
24, 25, 31, -1,
25, 26, 30, -1,
25, 30, 31, -1,
26, 27, 29, -1,
26, 29, 30, -1,
27, 28, 29, -1 ]
}
}
]
}
DEF cylinder7_copy8 Transform {
children [
Shape {
appearance Appearance {
material USE mold
}
geometry IndexedFaceSet {
coord Coordinate { point [
-0.5900000000000001 0.7999999999999999 1.54952,
-0.60598529817263 0.7196364792033312 1.54952,
-0.6515075759508252 0.6515075759508251 1.54952,
-0.7196364792033313 0.6059852981726298 1.54952,
-0.8000000000000002 0.5900000000000001 1.54952,
-0.8803635207966689 0.6059852981726298 1.54952,
-0.948492424049175 0.6515075759508251 1.54952,
-0.9940147018273703 0.7196364792033312 1.54952,
-1.01 0.7999999999999999 1.54952,
-0.9940147018273703 0.8803635207966688 1.54952,
-0.948492424049175 0.9484924240491749 1.54952,
-0.880363520796669 0.9940147018273701 1.54952,
-0.8000000000000002 1.01 1.54952,
-0.7196364792033311 0.9940147018273701 1.54952,
-0.6515075759508252 0.9484924240491751 1.54952,
-0.60598529817263 0.880363520796669 1.54952,
-0.5900000000000001 0.7999999999999999 1.44952,
-0.60598529817263 0.7196364792033312 1.44952,
-0.6515075759508252 0.6515075759508251 1.44952,
-0.7196364792033313 0.6059852981726298 1.44952,
-0.8000000000000002 0.5900000000000001 1.44952,
-0.8803635207966689 0.6059852981726298 1.44952,
-0.948492424049175 0.6515075759508251 1.44952,
-0.9940147018273703 0.7196364792033312 1.44952,
-1.01 0.7999999999999999 1.44952,
-0.9940147018273703 0.8803635207966688 1.44952,
-0.948492424049175 0.9484924240491749 1.44952,
-0.880363520796669 0.9940147018273701 1.44952,
-0.8000000000000002 1.01 1.44952,
-0.7196364792033311 0.9940147018273701 1.44952,
-0.6515075759508252 0.9484924240491751 1.44952,
-0.60598529817263 0.880363520796669 1.44952 ] }
coordIndex [
0, 1, 16, -1,
0, 8, 1, -1,
0, 9, 8, -1,
0, 15, 9, -1,
0, 16, 15, -1,
1, 2, 18, -1,
1, 7, 2, -1,
1, 8, 7, -1,
1, 17, 16, -1,
1, 18, 17, -1,
2, 3, 18, -1,
2, 6, 3, -1,
2, 7, 6, -1,
3, 4, 20, -1,
3, 5, 4, -1,
3, 6, 5, -1,
3, 19, 18, -1,
3, 20, 19, -1,
4, 5, 20, -1,
5, 6, 22, -1,
5, 21, 20, -1,
5, 22, 21, -1,
6, 7, 22, -1,
7, 8, 24, -1,
7, 23, 22, -1,
7, 24, 23, -1,
8, 9, 24, -1,
9, 10, 26, -1,
9, 15, 10, -1,
9, 25, 24, -1,
9, 26, 25, -1,
10, 11, 26, -1,
10, 14, 11, -1,
10, 15, 14, -1,
11, 12, 28, -1,
11, 13, 12, -1,
11, 14, 13, -1,
11, 27, 26, -1,
11, 28, 27, -1,
12, 13, 28, -1,
13, 14, 30, -1,
13, 29, 28, -1,
13, 30, 29, -1,
14, 15, 30, -1,
15, 16, 31, -1,
15, 31, 30, -1,
16, 17, 23, -1,
16, 23, 24, -1,
16, 24, 31, -1,
17, 18, 22, -1,
17, 22, 23, -1,
18, 19, 21, -1,
18, 21, 22, -1,
19, 20, 21, -1,
24, 25, 31, -1,
25, 26, 30, -1,
25, 30, 31, -1,
26, 27, 29, -1,
26, 29, 30, -1,
27, 28, 29, -1 ]
}
}
]
}
DEF cylinder7 Transform {
children [
Shape {
appearance Appearance {
material USE mold
}
geometry IndexedFaceSet {
coord Coordinate { point [
1.01 0.7999999999999999 1.54952,
0.9940147018273701 0.7196364792033312 1.54952,
0.9484924240491749 0.6515075759508251 1.54952,
0.8803635207966688 0.6059852981726298 1.54952,
0.7999999999999999 0.5900000000000001 1.54952,
0.7196364792033312 0.6059852981726298 1.54952,
0.6515075759508251 0.6515075759508251 1.54952,
0.6059852981726298 0.7196364792033312 1.54952,
0.5900000000000001 0.7999999999999999 1.54952,
0.6059852981726298 0.8803635207966688 1.54952,
0.6515075759508251 0.9484924240491749 1.54952,
0.7196364792033311 0.9940147018273701 1.54952,
0.7999999999999999 1.01 1.54952,
0.880363520796669 0.9940147018273701 1.54952,
0.9484924240491749 0.9484924240491751 1.54952,
0.9940147018273701 0.880363520796669 1.54952,
1.01 0.7999999999999999 1.44952,
0.9940147018273701 0.7196364792033312 1.44952,
0.9484924240491749 0.6515075759508251 1.44952,
0.8803635207966688 0.6059852981726298 1.44952,
0.7999999999999999 0.5900000000000001 1.44952,
0.7196364792033312 0.6059852981726298 1.44952,
0.6515075759508251 0.6515075759508251 1.44952,
0.6059852981726298 0.7196364792033312 1.44952,
0.5900000000000001 0.7999999999999999 1.44952,
0.6059852981726298 0.8803635207966688 1.44952,
0.6515075759508251 0.9484924240491749 1.44952,
0.7196364792033311 0.9940147018273701 1.44952,
0.7999999999999999 1.01 1.44952,
0.880363520796669 0.9940147018273701 1.44952,
0.9484924240491749 0.9484924240491751 1.44952,
0.9940147018273701 0.880363520796669 1.44952 ] }
coordIndex [
0, 1, 16, -1,
0, 8, 1, -1,
0, 9, 8, -1,
0, 15, 9, -1,
0, 16, 15, -1,
1, 2, 18, -1,
1, 7, 2, -1,
1, 8, 7, -1,
1, 17, 16, -1,
1, 18, 17, -1,
2, 3, 18, -1,
2, 6, 3, -1,
2, 7, 6, -1,
3, 4, 20, -1,
3, 5, 4, -1,
3, 6, 5, -1,
3, 19, 18, -1,
3, 20, 19, -1,
4, 5, 20, -1,
5, 6, 22, -1,
5, 21, 20, -1,
5, 22, 21, -1,
6, 7, 22, -1,
7, 8, 24, -1,
7, 23, 22, -1,
7, 24, 23, -1,
8, 9, 24, -1,
9, 10, 26, -1,
9, 15, 10, -1,
9, 25, 24, -1,
9, 26, 25, -1,
10, 11, 26, -1,
10, 14, 11, -1,
10, 15, 14, -1,
11, 12, 28, -1,
11, 13, 12, -1,
11, 14, 13, -1,
11, 27, 26, -1,
11, 28, 27, -1,
12, 13, 28, -1,
13, 14, 30, -1,
13, 29, 28, -1,
13, 30, 29, -1,
14, 15, 30, -1,
15, 16, 31, -1,
15, 31, 30, -1,
16, 17, 23, -1,
16, 23, 24, -1,
16, 24, 31, -1,
17, 18, 22, -1,
17, 22, 23, -1,
18, 19, 21, -1,
18, 21, 22, -1,
19, 20, 21, -1,
24, 25, 31, -1,
25, 26, 30, -1,
25, 30, 31, -1,
26, 27, 29, -1,
26, 29, 30, -1,
27, 28, 29, -1 ]
}
}
]
}
DEF cube7_copy6 Transform {
children [
Shape {
appearance Appearance {
material DEF pins Material {
diffuseColor 0.6044776119402985 0.6044776119402985 0.6044776119402985
emissiveColor 0.0 0.0 0.0
specularColor 0.22388059701492538 0.22388059701492538 0.22388059701492538
ambientIntensity 0.5447761194029851
transparency 0.0
shininess 1.0
}
}
geometry IndexedFaceSet {
coord Coordinate { point [
1.0199999999999996 -1.2199995714285716 0.22951899999999997,
1.0199999999999996 -1.3399995714285717 0.22951899999999997,
0.7499999999999996 -1.3399995714285717 0.22951899999999997,
0.7499999999999996 -1.2199995714285716 0.22951899999999997,
1.0199999999999996 -1.3399995714285717 0.34951899999999997,
1.0199999999999996 -1.2199995714285716 0.34951899999999997,
0.7499999999999996 -1.2199995714285716 0.34951899999999997,
0.7499999999999996 -1.3399995714285717 0.34951899999999997,
0.7499999999999998 -1.0199995714285717 0.34951899999999997,
1.0199999999999996 -1.0199995714285717 0.34951899999999997,
1.0199999999999996 -1.0199995714285717 0.22951899999999997,
0.7499999999999998 -1.0199995714285717 0.22951899999999997,
1.0199999999999996 -1.2199995714285716 -0.8258406666666664,
1.0199999999999996 -1.3399995714285717 -0.8258406666666664,
0.7499999999999996 -1.3399995714285717 -0.8258406666666664,
0.7499999999999996 -1.2199995714285716 -0.8258406666666664 ] }
coordIndex [
0, 1, 13, -1,
0, 3, 11, -1,
0, 4, 1, -1,
0, 5, 4, -1,
0, 9, 5, -1,
0, 10, 9, -1,
0, 11, 10, -1,
0, 12, 15, -1,
0, 13, 12, -1,
0, 15, 3, -1,
1, 2, 13, -1,
1, 4, 2, -1,
2, 3, 15, -1,
2, 4, 7, -1,
2, 6, 3, -1,
2, 7, 6, -1,
2, 14, 13, -1,
2, 15, 14, -1,
3, 6, 11, -1,
4, 5, 6, -1,
4, 6, 7, -1,
5, 9, 6, -1,
6, 8, 11, -1,
6, 9, 8, -1,
8, 9, 11, -1,
9, 10, 11, -1,
12, 13, 15, -1,
13, 14, 15, -1 ]
}
}
]
}
DEF cube7_copy5 Transform {
children [
Shape {
appearance Appearance {
material USE pins
}
geometry IndexedFaceSet {
coord Coordinate { point [
-0.75 -1.2199995714285714 0.22951899999999997,
-0.75 -1.3399995714285715 0.22951899999999997,
-1.02 -1.3399995714285715 0.22951899999999997,
-1.02 -1.2199995714285714 0.22951899999999997,
-0.75 -1.3399995714285715 0.34951899999999997,
-0.75 -1.2199995714285714 0.34951899999999997,
-1.02 -1.2199995714285714 0.34951899999999997,
-1.02 -1.3399995714285715 0.34951899999999997,
-1.02 -1.0199995714285714 0.34951899999999997,
-0.7499999999999998 -1.0199995714285714 0.34951899999999997,
-0.7499999999999998 -1.0199995714285714 0.22951899999999997,
-1.02 -1.0199995714285714 0.22951899999999997,
-0.75 -1.2199995714285714 -0.8258406666666664,
-0.75 -1.3399995714285715 -0.8258406666666664,
-1.02 -1.3399995714285715 -0.8258406666666664,
-1.02 -1.2199995714285714 -0.8258406666666664 ] }
coordIndex [
0, 1, 13, -1,
0, 3, 11, -1,
0, 4, 1, -1,
0, 5, 4, -1,
0, 9, 5, -1,
0, 10, 9, -1,
0, 11, 10, -1,
0, 12, 15, -1,
0, 13, 12, -1,
0, 15, 3, -1,
1, 2, 13, -1,
1, 4, 2, -1,
2, 3, 15, -1,
2, 4, 7, -1,
2, 6, 3, -1,
2, 7, 6, -1,
2, 14, 13, -1,
2, 15, 14, -1,
3, 6, 11, -1,
4, 5, 6, -1,
4, 6, 7, -1,
5, 9, 6, -1,
6, 8, 11, -1,
6, 9, 8, -1,
8, 9, 11, -1,
9, 10, 11, -1,
12, 13, 15, -1,
13, 14, 15, -1 ]
}
}
]
}
DEF cube7_copy8 Transform {
children [
Shape {
appearance Appearance {
material USE pins
}
geometry IndexedFaceSet {
coord Coordinate { point [
0.75 1.22 0.22951899999999997,
0.75 1.34 0.22951899999999997,
1.02 1.34 0.22951899999999997,
1.02 1.22 0.22951899999999997,
0.75 1.34 0.34951899999999997,
0.75 1.22 0.34951899999999997,
1.02 1.22 0.34951899999999997,
1.02 1.34 0.34951899999999997,
1.02 1.02 0.34951899999999997,
0.75 1.02 0.34951899999999997,
0.75 1.02 0.22951899999999997,
1.02 1.02 0.22951899999999997,
0.75 1.22 -0.8258406666666664,
0.75 1.34 -0.8258406666666664,
1.02 1.34 -0.8258406666666664,
1.02 1.22 -0.8258406666666664 ] }
coordIndex [
0, 1, 13, -1,
0, 3, 11, -1,
0, 4, 1, -1,
0, 5, 4, -1,
0, 9, 5, -1,
0, 10, 9, -1,
0, 11, 10, -1,
0, 12, 15, -1,
0, 13, 12, -1,
0, 15, 3, -1,
1, 2, 13, -1,
1, 4, 2, -1,
2, 3, 15, -1,
2, 4, 7, -1,
2, 6, 3, -1,
2, 7, 6, -1,
2, 14, 13, -1,
2, 15, 14, -1,
3, 6, 11, -1,
4, 5, 6, -1,
4, 6, 7, -1,
5, 9, 6, -1,
6, 8, 11, -1,
6, 9, 8, -1,
8, 9, 11, -1,
9, 10, 11, -1,
12, 13, 15, -1,
13, 14, 15, -1 ]
}
}
]
}
DEF cube7 Transform {
children [
Shape {
appearance Appearance {
material USE pins
}
geometry IndexedFaceSet {
coord Coordinate { point [
-1.02 1.22 0.22951899999999997,
-1.02 1.34 0.22951899999999997,
-0.75 1.34 0.22951899999999997,
-0.75 1.22 0.22951899999999997,
-1.02 1.34 0.34951899999999997,
-1.02 1.22 0.34951899999999997,
-0.75 1.22 0.34951899999999997,
-0.75 1.34 0.34951899999999997,
-0.75 1.02 0.34951899999999997,
-1.02 1.02 0.34951899999999997,
-1.02 1.02 0.22951899999999997,
-0.75 1.02 0.22951899999999997,
-1.02 1.22 -0.8258406666666664,
-1.02 1.34 -0.8258406666666664,
-0.75 1.34 -0.8258406666666664,
-0.75 1.22 -0.8258406666666664 ] }
coordIndex [
0, 1, 13, -1,
0, 3, 11, -1,
0, 4, 1, -1,
0, 5, 4, -1,
0, 9, 5, -1,
0, 10, 9, -1,
0, 11, 10, -1,
0, 12, 15, -1,
0, 13, 12, -1,
0, 15, 3, -1,
1, 2, 13, -1,
1, 4, 2, -1,
2, 3, 15, -1,
2, 4, 7, -1,
2, 6, 3, -1,
2, 7, 6, -1,
2, 14, 13, -1,
2, 15, 14, -1,
3, 6, 11, -1,
4, 5, 6, -1,
4, 6, 7, -1,
5, 9, 6, -1,
6, 8, 11, -1,
6, 9, 8, -1,
8, 9, 11, -1,
9, 10, 11, -1,
12, 13, 15, -1,
13, 14, 15, -1 ]
}
}
]
}
DEF cylinder7 Transform {
children [
Shape {
appearance Appearance {
material DEF push2 Material {
diffuseColor 0.7669 0.24881644444444442 0.23518266666666665
emissiveColor 0.001 7.142857142857143e-5 0.0
specularColor 0.23134328358208955 0.21527101335428123 0.21437810945273633
ambientIntensity 0.545343458147857
transparency 0.0
shininess 1.0
}
}
geometry IndexedFaceSet {
coord Coordinate { point [
0.6649999999999998 4.9447115306922195e-17 2.0495203039999996,
0.6143798891200056 -0.2544844825227846 2.0495203039999996,
0.4702260094890541 -0.47022600948905396 2.0495203039999996,
0.25448448252278466 -0.6143798891200056 2.0495203039999996,
2.5088302746043006e-17 -0.6649999999999998 2.0495203039999996,
-0.25448448252278466 -0.6143798891200056 2.0495203039999996,
-0.470226009489054 -0.470226009489054 2.0495203039999996,
-0.6143798891200056 -0.25448448252278466 2.0495203039999996,
-0.665 -3.1989207222265875e-17 2.0495203039999996,
-0.6143798891200056 0.25448448252278466 2.0495203039999996,
-0.4702260094890542 0.47022600948905413 2.0495203039999996,
-0.25448448252278505 0.6143798891200056 2.0495203039999996,
-1.3778434231233315e-16 0.6649999999999999 2.0495203039999996,
0.2544844825227848 0.6143798891200056 2.0495203039999996,
0.47022600948905396 0.4702260094890542 2.0495203039999996,
0.6143798891200056 0.2544844825227851 2.0495203039999996,
0.7 -3.74835796082551e-17 1.4495203040000002,
0.6467156727579007 -0.26787840265556284 1.4495203040000002,
0.4949747468305833 -0.4949747468305833 1.4495203040000002,
0.26787840265556284 -0.6467156727579008 1.4495203040000002,
2.9330379271164106e-17 -0.7 1.4495203040000002,
-0.2678784026555628 -0.6467156727579008 1.4495203040000002,
-0.4949747468305832 -0.49497474683058335 1.4495203040000002,
-0.6467156727579007 -0.26787840265556295 1.4495203040000002,
-0.7 -1.232060243758215e-16 1.4495203040000002,
-0.6467156727579008 0.26787840265556273 1.4495203040000002,
-0.49497474683058335 0.4949747468305831 1.4495203040000002,
-0.26787840265556323 0.6467156727579004 1.4495203040000002,
-1.421145102639687e-16 0.6999999999999998 1.4495203040000002,
0.267878402655563 0.6467156727579005 1.4495203040000002,
0.4949747468305831 0.4949747468305833 1.4495203040000002,
0.6467156727579005 0.26787840265556323 1.4495203040000002 ] }
coordIndex [
0, 1, 16, -1,
0, 8, 1, -1,
0, 9, 8, -1,
0, 15, 9, -1,
0, 16, 15, -1,
1, 2, 18, -1,
1, 7, 2, -1,
1, 8, 7, -1,
1, 17, 16, -1,
1, 18, 17, -1,
2, 3, 18, -1,
2, 6, 3, -1,
2, 7, 6, -1,
3, 4, 20, -1,
3, 5, 4, -1,
3, 6, 5, -1,
3, 19, 18, -1,
3, 20, 19, -1,
4, 5, 20, -1,
5, 6, 22, -1,
5, 21, 20, -1,
5, 22, 21, -1,
6, 7, 22, -1,
7, 8, 24, -1,
7, 23, 22, -1,
7, 24, 23, -1,
8, 9, 24, -1,
9, 10, 26, -1,
9, 15, 10, -1,
9, 25, 24, -1,
9, 26, 25, -1,
10, 11, 26, -1,
10, 14, 11, -1,
10, 15, 14, -1,
11, 12, 28, -1,
11, 13, 12, -1,
11, 14, 13, -1,
11, 27, 26, -1,
11, 28, 27, -1,
12, 13, 28, -1,
13, 14, 30, -1,
13, 29, 28, -1,
13, 30, 29, -1,
14, 15, 30, -1,
15, 16, 31, -1,
15, 31, 30, -1 ]
}
},
Shape {
appearance Appearance {
material DEF default Material {
diffuseColor 0.7898538076923077 0.8133333333333334 0.6940444444444445
emissiveColor 0.0 0.0 0.0
specularColor 0.0 0.0 0.0
ambientIntensity 0.765743861823362
transparency 0.0
shininess 0.0
}
}
geometry IndexedFaceSet {
coord Coordinate { point [
0.7 -3.74835796082551e-17 1.4495203040000002,
0.6467156727579007 -0.26787840265556284 1.4495203040000002,
0.4949747468305833 -0.4949747468305833 1.4495203040000002,
0.26787840265556284 -0.6467156727579008 1.4495203040000002,
2.9330379271164106e-17 -0.7 1.4495203040000002,
-0.2678784026555628 -0.6467156727579008 1.4495203040000002,
-0.4949747468305832 -0.49497474683058335 1.4495203040000002,
-0.6467156727579007 -0.26787840265556295 1.4495203040000002,
-0.7 -1.232060243758215e-16 1.4495203040000002,
-0.6467156727579008 0.26787840265556273 1.4495203040000002,
-0.49497474683058335 0.4949747468305831 1.4495203040000002,
-0.26787840265556323 0.6467156727579004 1.4495203040000002,
-1.421145102639687e-16 0.6999999999999998 1.4495203040000002,
0.267878402655563 0.6467156727579005 1.4495203040000002,
0.4949747468305831 0.4949747468305833 1.4495203040000002,
0.6467156727579005 0.26787840265556323 1.4495203040000002 ] }
coordIndex [
0, 1, 7, -1,
0, 7, 8, -1,
0, 8, 15, -1,
1, 2, 6, -1,
1, 6, 7, -1,
2, 3, 5, -1,
2, 5, 6, -1,
3, 4, 5, -1,
8, 9, 15, -1,
9, 10, 14, -1,
9, 14, 15, -1,
10, 11, 13, -1,
10, 13, 14, -1,
11, 12, 13, -1 ]
}
}
]
}
DEF cube6 Transform {
children [
Shape {
appearance Appearance {
material USE mold
}
geometry IndexedFaceSet {
coord Coordinate { point [
-1.18 -1.18 1.34952,
-1.18 1.18 1.34952,
1.18 1.18 1.34952,
1.18 -1.18 1.34952,
-1.18 -1.18 0.029519999999999987,
-1.18 1.18 0.029519999999999987,
1.18 1.18 0.029519999999999987,
1.18 -1.18 0.029519999999999987 ] }
coordIndex [
0, 1, 5, -1,
0, 4, 7, -1,
0, 5, 4, -1,
0, 7, 3, -1,
1, 2, 5, -1,
2, 3, 7, -1,
2, 6, 5, -1,
2, 7, 6, -1,
4, 5, 7, -1,
5, 6, 7, -1 ]
}
},
Shape {
appearance Appearance {
material DEF metal Material {
diffuseColor 0.64702 0.64702 0.64702
emissiveColor 0.001 0.001 0.001
specularColor 0.12686567164179105 0.12686567164179105 0.12686567164179105
ambientIntensity 0.4626865671641791
transparency 0.0
shininess 1.0
}
}
geometry IndexedFaceSet {
coord Coordinate { point [
-1.18 -1.18 1.34952,
-1.18 1.18 1.34952,
1.18 1.18 1.34952,
1.18 -1.18 1.34952,
-1.18 1.18 1.4495200000000001,
-1.18 -1.18 1.4495200000000001,
1.18 -1.18 1.4495200000000001,
1.18 1.18 1.4495200000000001 ] }
coordIndex [
0, 3, 6, -1,
0, 4, 1, -1,
0, 5, 4, -1,
0, 6, 5, -1,
1, 4, 2, -1,
2, 4, 7, -1,
2, 6, 3, -1,
2, 7, 6, -1,
4, 5, 6, -1,
4, 6, 7, -1 ]
}
}
]
}

444
demos/pic_programmer/pic_programmer.cmp
View File

@ -1,444 +0,0 @@
Cmp-Mod V01 Created by Cvpcb (2014-09-16 BZR 5138)-product date = 20/09/2014 09:54:11
BeginCmp
TimeStamp = /442A5056;
Reference = C1;
ValeurCmp = 100µF;
IdModule = discret:CP10;
EndCmp
BeginCmp
TimeStamp = /442A501D;
Reference = C2;
ValeurCmp = 220uF;
IdModule = discret:CP10;
EndCmp
BeginCmp
TimeStamp = /442A584C;
Reference = C3;
ValeurCmp = 22uF/25V;
IdModule = discret:CP8;
EndCmp
BeginCmp
TimeStamp = /442A5F61;
Reference = C4;
ValeurCmp = 0;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /442A58B1;
Reference = C5;
ValeurCmp = 10nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/442AA12B;
Reference = C6;
ValeurCmp = 100nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/442AA145;
Reference = C7;
ValeurCmp = 100nF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /464AD280;
Reference = C9;
ValeurCmp = 22OnF;
IdModule = discret:C1-1;
EndCmp
BeginCmp
TimeStamp = /442A500B;
Reference = D1;
ValeurCmp = 1N4004;
IdModule = discret:D5;
EndCmp
BeginCmp
TimeStamp = /442A4D1B;
Reference = D2;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /442A4D25;
Reference = D3;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /442A4D5C;
Reference = D4;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /442A4D5D;
Reference = D5;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /442A4D64;
Reference = D6;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /442A4D65;
Reference = D7;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /442A4F5D;
Reference = D8;
ValeurCmp = RED-LED;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /442A5084;
Reference = D9;
ValeurCmp = GREEN-LED;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /442A6026;
Reference = D10;
ValeurCmp = SCHOTTKY;
IdModule = discret:D5;
EndCmp
BeginCmp
TimeStamp = /4639BA28;
Reference = D11;
ValeurCmp = BAT43;
IdModule = discret:D3;
EndCmp
BeginCmp
TimeStamp = /4639B9EA;
Reference = D12;
ValeurCmp = YELLOW-LED;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /442A4C93;
Reference = J1;
ValeurCmp = DB9-FEMAL;
IdModule = connect:DB9FC;
EndCmp
BeginCmp
TimeStamp = /4639BAF8;
Reference = JP1;
ValeurCmp = JUMPER;
IdModule = connect:GS2;
EndCmp
BeginCmp
TimeStamp = /442A57BE;
Reference = L1;
ValeurCmp = 22uH;
IdModule = inductors:INDUCTOR_V;
EndCmp
BeginCmp
TimeStamp = /442A4FE7;
Reference = P1;
ValeurCmp = CONN_2;
IdModule = connect:bornier2;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/4436967E;
Reference = P2;
ValeurCmp = SUPP28;
IdModule = dip_sockets:DIP-28__300_ELL;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/442A88ED;
Reference = P3;
ValeurCmp = SUPP40;
IdModule = sockets:40tex-Ell600;
EndCmp
BeginCmp
TimeStamp = /54020BEA;
Reference = P101;
ValeurCmp = CONN_1;
IdModule = footprints:1pin-4;
EndCmp
BeginCmp
TimeStamp = /54020DA9;
Reference = P102;
ValeurCmp = CONN_1;
IdModule = footprints:1pin-4;
EndCmp
BeginCmp
TimeStamp = /54020DC2;
Reference = P103;
ValeurCmp = CONN_1;
IdModule = footprints:1pin-4;
EndCmp
BeginCmp
TimeStamp = /54020DE3;
Reference = P104;
ValeurCmp = CONN_1;
IdModule = footprints:1pin-4;
EndCmp
BeginCmp
TimeStamp = /54020E5D;
Reference = P105;
ValeurCmp = CONN_1;
IdModule = footprints:1pin-4;
EndCmp
BeginCmp
TimeStamp = /54020E76;
Reference = P106;
ValeurCmp = CONN_1;
IdModule = footprints:1pin-4;
EndCmp
BeginCmp
TimeStamp = /442A4EB9;
Reference = Q1;
ValeurCmp = BC237;
IdModule = discret:TO92;
EndCmp
BeginCmp
TimeStamp = /442A4F30;
Reference = Q2;
ValeurCmp = BC307;
IdModule = discret:TO92;
EndCmp
BeginCmp
TimeStamp = /4639B996;
Reference = Q3;
ValeurCmp = BC307;
IdModule = discret:TO92;
EndCmp
BeginCmp
TimeStamp = /442A4CF4;
Reference = R1;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4CFB;
Reference = R2;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D5A;
Reference = R3;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D5B;
Reference = R4;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D62;
Reference = R5;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D63;
Reference = R6;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4F2A;
Reference = R7;
ValeurCmp = 10K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D92;
Reference = R8;
ValeurCmp = 1K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4F52;
Reference = R9;
ValeurCmp = 2.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A5F83;
Reference = R10;
ValeurCmp = 5,1K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4F23;
Reference = R11;
ValeurCmp = 22K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D85;
Reference = R12;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A4D8D;
Reference = R13;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A5083;
Reference = R14;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A58D7;
Reference = R15;
ValeurCmp = 6.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A58DC;
Reference = R16;
ValeurCmp = 62K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /442A50BF;
Reference = R17;
ValeurCmp = 22K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /44369638;
Reference = R18;
ValeurCmp = 220;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /4639B9B0;
Reference = R19;
ValeurCmp = 2.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /4639B9B3;
Reference = R20;
ValeurCmp = 2.2K;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /4639B9E9;
Reference = R21;
ValeurCmp = 470;
IdModule = discret:R4;
EndCmp
BeginCmp
TimeStamp = /443D0101;
Reference = RV1;
ValeurCmp = 1K;
IdModule = discret:RV2X4;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/442A87F7;
Reference = U1;
ValeurCmp = 24Cxx;
IdModule = dip_sockets:DIP-8__300_ELL;
EndCmp
BeginCmp
TimeStamp = /442A4D6B;
Reference = U2;
ValeurCmp = 74HC125;
IdModule = dip_sockets:DIP-14__300_ELL;
EndCmp
BeginCmp
TimeStamp = /442A504A;
Reference = U3;
ValeurCmp = 7805;
IdModule = discret:LM78XX;
EndCmp
BeginCmp
TimeStamp = /442A5E20;
Reference = U4;
ValeurCmp = LT1373;
IdModule = dip_sockets:DIP-8__300_ELL;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/442A81A7;
Reference = U5;
ValeurCmp = PIC_18_PINS;
IdModule = dip_sockets:DIP-18__300_ELL;
EndCmp
BeginCmp
TimeStamp = /4804A5E2/442A81A5;
Reference = U6;
ValeurCmp = PIC_8_PINS;
IdModule = dip_sockets:DIP-8__300_ELL;
EndCmp
EndListe

112
demos/pic_programmer/pic_programmer.kicad_pcb
View File

@ -209,7 +209,7 @@
(net 5 GND))
(pad 1 thru_hole rect (at -12.7 0 180) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 29 VCC))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -241,7 +241,7 @@
(net 5 GND))
(pad 1 thru_hole rect (at -12.7 0) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 6 "Net-(C2-Pad1)"))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -274,7 +274,7 @@
(net 30 VPP))
(pad 2 thru_hole circle (at 10.16 0 270) (size 1.778 1.778) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 0.8 0.8 0.8))
(rotate (xyz 0 0 0))
@ -303,7 +303,7 @@
(net 5 GND))
(pad 2 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -332,7 +332,7 @@
(net 5 GND))
(pad 2 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -361,7 +361,7 @@
(net 5 GND))
(pad 2 thru_hole circle (at 0 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -390,7 +390,7 @@
(net 5 GND))
(pad 2 thru_hole circle (at 0 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -419,7 +419,7 @@
(net 9 "Net-(C9-Pad2)"))
(pad 2 thru_hole circle (at 0 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 9 "Net-(C9-Pad2)"))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -451,7 +451,7 @@
(net 10 "Net-(D1-Pad1)"))
(pad 2 thru_hole rect (at 6.35 0 270) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
(net 6 "Net-(C2-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.5 0.5 0.5))
(rotate (xyz 0 0 0))
@ -483,7 +483,7 @@
(net 29 VCC))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 15 "Net-(D2-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -515,7 +515,7 @@
(net 15 "Net-(D2-Pad1)"))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -547,7 +547,7 @@
(net 29 VCC))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 16 "Net-(D4-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -579,7 +579,7 @@
(net 16 "Net-(D4-Pad1)"))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -611,7 +611,7 @@
(net 29 VCC))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 17 "Net-(D6-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -643,7 +643,7 @@
(net 17 "Net-(D6-Pad1)"))
(pad 1 thru_hole circle (at -3.81 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -669,7 +669,7 @@
(net 18 "Net-(D8-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/led5_vertical.wrl
(model LEDs.3dshapes/LED-5MM.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -695,7 +695,7 @@
(net 19 "Net-(D9-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/led5_vertical.wrl
(model LEDs.3dshapes/LED-5MM.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -727,7 +727,7 @@
(net 11 "Net-(D10-Pad1)"))
(pad 2 thru_hole rect (at 6.35 0) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
(net 30 VPP))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.5 0.5 0.5))
(rotate (xyz 0 0 0))
@ -759,7 +759,7 @@
(net 13 "Net-(D11-Pad2)"))
(pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 12 "Net-(D11-Pad1)"))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -785,7 +785,7 @@
(net 14 "Net-(D12-Pad1)"))
(pad 2 thru_hole circle (at 1.27 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/led5_vertical.wrl
(model LEDs.3dshapes/LED-5MM.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -829,7 +829,7 @@
(pad 8 thru_hole circle (at 1.397 -1.27 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
(net 1 /CTS))
(pad 9 thru_hole circle (at 4.191 -1.27 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS))
(model Conn_DBxx/db9_female_pin90deg.wrl
(model Connect.3dshapes/DB9FC.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -873,7 +873,7 @@
(net 11 "Net-(D10-Pad1)"))
(pad 2 thru_hole circle (at 2.54 0 270) (size 1.905 1.905) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 29 VCC))
(model discret/inductorV.wrl
(model Inductors.3dshapes/INDUCTOR_V.wrl
(at (xyz 0 0 0))
(scale (xyz 2 2 2))
(rotate (xyz 0 0 0))
@ -900,7 +900,7 @@
(net 5 GND))
(pad 2 thru_hole circle (at 2.54 0 90) (size 2.54 2.54) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 10 "Net-(D1-Pad1)"))
(model Device/bornier_2.wrl
(model Connect.3dshapes/bornier2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -932,7 +932,7 @@
(net 20 "Net-(Q1-Pad2)"))
(pad 3 thru_hole circle (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 "Net-(D11-Pad2)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -964,7 +964,7 @@
(net 9 "Net-(C9-Pad2)"))
(pad 3 thru_hole circle (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 21 "Net-(Q2-Pad3)"))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -996,7 +996,7 @@
(net 22 "Net-(Q3-Pad2)"))
(pad 3 thru_hole circle (at -1.27 1.27) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 31 /pic_sockets/VCC_PIC))
(model discret/to98.wrl
(model Discret.3dshapes/TO92.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1027,7 +1027,7 @@
(net 4 /TXD))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 15 "Net-(D2-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1058,7 +1058,7 @@
(net 4 /TXD))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1089,7 +1089,7 @@
(net 2 /DTR))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 16 "Net-(D4-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1120,7 +1120,7 @@
(net 2 /DTR))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1151,7 +1151,7 @@
(net 3 /PC-CLOCK-OUT))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 17 "Net-(D6-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1182,7 +1182,7 @@
(net 3 /PC-CLOCK-OUT))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1213,7 +1213,7 @@
(net 30 VPP))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 9 "Net-(C9-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1244,7 +1244,7 @@
(net 27 "Net-(R8-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 20 "Net-(Q1-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1275,7 +1275,7 @@
(net 21 "Net-(Q2-Pad3)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 18 "Net-(D8-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1306,7 +1306,7 @@
(net 7 "Net-(C4-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 8 "Net-(C5-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1337,7 +1337,7 @@
(net 13 "Net-(D11-Pad2)"))
(pad 2 thru_hole circle (at 5.08 0 90) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 9 "Net-(C9-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1368,7 +1368,7 @@
(net 23 "Net-(R12-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 90) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 34 /pic_sockets/DATA-RB7))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1399,7 +1399,7 @@
(net 24 "Net-(R13-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 270) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 33 /pic_sockets/CLOCK-RB6))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1430,7 +1430,7 @@
(net 29 VCC))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 19 "Net-(D9-Pad1)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1461,7 +1461,7 @@
(net 25 "Net-(R15-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1492,7 +1492,7 @@
(net 26 "Net-(R16-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 30 VPP))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1523,7 +1523,7 @@
(net 21 "Net-(Q2-Pad3)"))
(pad 2 thru_hole circle (at 5.08 0 270) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1554,7 +1554,7 @@
(net 21 "Net-(Q2-Pad3)"))
(pad 2 thru_hole circle (at 5.08 0 90) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 32 /pic_sockets/VPP-MCLR))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1585,7 +1585,7 @@
(net 12 "Net-(D11-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 22 "Net-(Q3-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1616,7 +1616,7 @@
(net 29 VCC))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 22 "Net-(Q3-Pad2)"))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1647,7 +1647,7 @@
(net 14 "Net-(D12-Pad1)"))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 31 /pic_sockets/VCC_PIC))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -1682,7 +1682,7 @@
(net 28 "Net-(RV1-Pad2)"))
(pad 3 thru_hole circle (at -5.08 2.54 180) (size 2.032 2.032) (drill 1.27) (layers *.Cu *.Mask F.SilkS)
(net 26 "Net-(R16-Pad1)"))
(model discret/adjustable_rx2v4.wrl
(model Discret.3dshapes/RV2X4.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1722,7 +1722,7 @@
(pad 7 thru_hole oval (at -1.27 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 8 thru_hole oval (at -3.81 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 31 /pic_sockets/VCC_PIC))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1775,7 +1775,7 @@
(net 5 GND))
(pad 14 thru_hole oval (at -7.62 -3.81) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 29 VCC))
(model dil/dil_14.wrl
(model Sockets_DIP.3dshapes/DIP-14__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1810,7 +1810,7 @@
(net 5 GND))
(pad VO thru_hole circle (at 0 2.54 90) (size 1.778 1.778) (drill 1.143) (layers *.Cu *.Mask F.SilkS)
(net 29 VCC))
(model discret/to220_horiz.wrl
(model Discret.3dshapes/TO220.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1849,7 +1849,7 @@
(net 5 GND))
(pad 8 thru_hole oval (at -3.81 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 "Net-(D10-Pad1)"))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1896,7 +1896,7 @@
(pad 16 thru_hole oval (at -5.08 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 17 thru_hole oval (at -7.62 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 18 thru_hole oval (at -10.16 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(model dil/dil_18.wrl
(model Sockets_DIP.3dshapes/DIP-18__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1934,7 +1934,7 @@
(net 34 /pic_sockets/DATA-RB7))
(pad 8 thru_hole oval (at -3.81 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 5 GND))
(model dil/dil_8.wrl
(model Sockets_DIP.3dshapes/DIP-8__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2125,7 +2125,7 @@
(net 34 /pic_sockets/DATA-RB7))
(pad HOLE thru_hole circle (at -26.67 -13.97 270) (size 2.54 2.54) (drill 2.032) (layers *.Cu *.Mask F.SilkS))
(pad HOLE thru_hole circle (at 21.59 13.97 270) (size 2.54 2.54) (drill 2.032) (layers *.Cu *.Mask F.SilkS))
(model dil/textool_40.wrl
(model Sockets.3dshapes/40tex600.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -2184,7 +2184,7 @@
(net 33 /pic_sockets/CLOCK-RB6))
(pad 28 thru_hole oval (at -16.51 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 34 /pic_sockets/DATA-RB7))
(model dil/dil_28-w300.wrl
(model Sockets_DIP.3dshapes/DIP-28__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))

999
demos/pic_programmer/pic_programmer.net
View File

File diff suppressed because it is too large Load Diff

2
demos/pic_programmer/pic_programmer.sch
View File

@ -235,7 +235,7 @@ L C C9
U 1 1 464AD280
P 5700 1000
F 0 "C9" H 5750 1100 50 0000 L CNN
F 1 "22OnF" H 5750 900 50 0000 L CNN
F 1 "220nF" H 5750 900 50 0000 L CNN
F 2 "discret:C1-1" H 5500 900 30 0000 C CNN
F 3 "" H 5700 1000 60 0001 C CNN
1 5700 1000

18
demos/python_scripts_examples/gen_gerber_and_drill_files_board.py
View File

@ -43,6 +43,7 @@ popt.SetAutoScale(False)
popt.SetScale(1)
popt.SetMirror(False)
popt.SetUseGerberAttributes(True)
popt.SetUseGerberProtelExtensions(False)
popt.SetExcludeEdgeLayer(False);
popt.SetScale(1)
popt.SetUseAuxOrigin(True)
@ -71,7 +72,9 @@ plot_plan = [
for layer_info in plot_plan:
pctl.SetLayer(layer_info[1])
pctl.OpenPlotfile(layer_info[0], PLOT_FORMAT_GERBER, layer_info[2])
pctl.PlotLayer()
print 'plot %s' % pctl.GetPlotFileName()
if pctl.PlotLayer() == False:
print "plot error"
#generate internal copper layers, if any
lyrcnt = board.GetCopperLayerCount();
@ -80,7 +83,9 @@ for innerlyr in range ( 1, lyrcnt-1 ):
pctl.SetLayer(innerlyr)
lyrname = 'inner%s' % innerlyr
pctl.OpenPlotfile(lyrname, PLOT_FORMAT_GERBER, "inner")
pctl.PlotLayer()
print 'plot %s' % pctl.GetPlotFileName()
if pctl.PlotLayer() == False:
print "plot error"
# At the end you have to close the last plot, otherwise you don't know when
@ -95,16 +100,17 @@ drlwriter.SetMapFileFormat( PLOT_FORMAT_PDF )
mirror = False
minimalHeader = False
offset = wxPoint(0,0)
mergeNPTH = False
drlwriter.SetOptions( mirror, minimalHeader, offset, mergeNPTH )
drlwriter.SetOptions( mirror, minimalHeader, offset )
metricFmt = True
drlwriter.SetFormat( metricFmt )
genDrl = True
genMap = True
drlwriter.CreateDrillandMapFilesSet( plotDir, genDrl, genMap );
print 'create drill and map files in %s' % pctl.GetPlotDirName()
drlwriter.CreateDrillandMapFilesSet( pctl.GetPlotDirName(), genDrl, genMap );
# One can create a text file to report drill statistics
rptfn = plotDir + '/drill_report.txt'
rptfn = pctl.GetPlotDirName() + 'drill_report.rpt'
print 'report: %s' % rptfn
drlwriter.GenDrillReportFile( rptfn );

178
demos/sonde xilinx/sonde xilinx.cmp
View File

@ -1,178 +0,0 @@
Cmp-Mod V01 Genere par Cvpcb 06-dec le 31/12/2005-17:06:34
BeginCmp
TimeStamp = 3EBF82C6;
Reference = C1;
ValeurCmp = 1uF;
IdModule = CP5;
EndCmp
BeginCmp
TimeStamp = 3EBF81A7;
Reference = C2;
ValeurCmp = 100pF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = 3EBF81A7;
Reference = C3;
ValeurCmp = 100pF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = 3EBF81A7;
Reference = C4;
ValeurCmp = 100pF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = 3EBF81A7;
Reference = C5;
ValeurCmp = 100pF;
IdModule = C2;
EndCmp
BeginCmp
TimeStamp = 3EBF815E;
Reference = D1;
ValeurCmp = BAT46;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = 3EBF8176;
Reference = D2;
ValeurCmp = BAT46;
IdModule = D3;
EndCmp
BeginCmp
TimeStamp = 3EBF7D04;
Reference = J1;
ValeurCmp = DB25;
IdModule = DB25M_CI;
EndCmp
BeginCmp
TimeStamp = 3ECDE5C8;
Reference = J2;
ValeurCmp = DB9MALE;
IdModule = DB9M_CI_INVERT;
EndCmp
BeginCmp
TimeStamp = 3EBF830C;
Reference = P1;
ValeurCmp = CONN_6;
IdModule = bornier6;
EndCmp
BeginCmp
TimeStamp = 3EBF7D16;
Reference = R1;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF8187;
Reference = R2;
ValeurCmp = 5,1K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7D22;
Reference = R4;
ValeurCmp = 47;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF818E;
Reference = R5;
ValeurCmp = 1K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7D26;
Reference = R6;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7D31;
Reference = R7;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7D33;
Reference = R8;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7D33;
Reference = R9;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7D31;
Reference = R10;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF819B;
Reference = R11;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF819B;
Reference = R12;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF819B;
Reference = R13;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF819B;
Reference = R14;
ValeurCmp = 100;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EBF7DBD;
Reference = U1;
ValeurCmp = 74LS125;
IdModule = 14DIP-ELL300;
EndCmp
BeginCmp
TimeStamp = 3EBF7EEC;
Reference = U2;
ValeurCmp = 74LS125;
IdModule = 14DIP-ELL300;
EndCmp
EndListe

50
demos/sonde xilinx/sonde xilinx.kicad_pcb
View File

@ -219,7 +219,7 @@
(pad 15 connect rect (at 12.319 2.667 180) (size 5.08 1.524) (layers Dessous B.Mask)
(net 12 /VCC_SENSE-ERROR*))
(pad 14 connect rect (at 14.986 2.667 180) (size 5.08 1.524) (layers Dessous B.Mask))
(model conn_DBxx/db25_male.wrl
(model Connect.3dshapes/DB25M_CI.wrl
(at (xyz 0 0 -0.033))
(scale (xyz 0.98 1 1))
(rotate (xyz 90 180 0))
@ -254,7 +254,7 @@
(net 5 /TCK-CCLK))
(pad 6 thru_hole circle (at 12.7 0 270) (size 3.81 3.81) (drill 1.524) (layers *.Cu *.Mask F.SilkS)
(net 10 /TMS-PROG))
(model device/bornier_6.wrl
(model Connect.3dshapes/bornier6.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -285,7 +285,7 @@
(net 26 VCC))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 25 N-000038))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -316,7 +316,7 @@
(net 15 N-000014))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 12 /VCC_SENSE-ERROR*))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -347,7 +347,7 @@
(net 6 /TD0-DONE))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 25 N-000038))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -378,7 +378,7 @@
(net 26 VCC))
(pad 2 thru_hole circle (at 5.08 0) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 GND))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -409,7 +409,7 @@
(net 19 N-000031))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 7 /TD0-PROG-D4))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -440,7 +440,7 @@
(net 17 N-000016))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 9 /TDI-DIN-D0))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -471,7 +471,7 @@
(net 21 N-000033))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 2 /CTRL-D3))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -502,7 +502,7 @@
(net 20 N-000032))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 11 /TMS-PROG-D2))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -533,7 +533,7 @@
(net 18 N-000030))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 1 /CLK-D1))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -564,7 +564,7 @@
(net 8 /TDI-DIN))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 23 N-000035))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -595,7 +595,7 @@
(net 5 /TCK-CCLK))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 24 N-000036))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -626,7 +626,7 @@
(net 10 /TMS-PROG))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 22 N-000034))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -657,7 +657,7 @@
(net 16 N-000015))
(pad 2 thru_hole circle (at 5.08 0 180) (size 1.524 1.524) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 3 /DONE-SELECT*))
(model discret/resistor.wrl
(model Discret.3dshapes/R3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.4 0.4 0.4))
(rotate (xyz 0 0 0))
@ -700,7 +700,7 @@
(net 26 VCC))
(pad 2 thru_hole circle (at 6.35 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 GND))
(model discret/c_pol.wrl
(model Discret.3dshapes/CP6.wrl
(at (xyz 0 0 0))
(scale (xyz 0.5 0.5 0.5))
(rotate (xyz 0 0 0))
@ -732,7 +732,7 @@
(net 26 VCC))
(pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 4 /PWR_3,3-5V))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -764,7 +764,7 @@
(net 15 N-000014))
(pad 1 thru_hole circle (at -3.81 0 180) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 26 VCC))
(model discret/diode.wrl
(model Discret.3dshapes/D3.wrl
(at (xyz 0 0 0))
(scale (xyz 0.3 0.3 0.3))
(rotate (xyz 0 0 0))
@ -814,7 +814,7 @@
(net 13 GND))
(pad 14 thru_hole oval (at -7.62 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 26 VCC))
(model dil/dil_14.wrl
(model Sockets_DIP.3dshapes/DIP-14__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -867,7 +867,7 @@
(net 21 N-000033))
(pad 14 thru_hole oval (at -7.62 -3.81 270) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 26 VCC))
(model dil/dil_14.wrl
(model Sockets_DIP.3dshapes/DIP-14__300.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -894,7 +894,7 @@
(net 23 N-000035))
(pad 2 thru_hole circle (at 2.54 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -921,7 +921,7 @@
(net 25 N-000038))
(pad 2 thru_hole circle (at 2.54 0) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -948,7 +948,7 @@
(net 24 N-000036))
(pad 2 thru_hole circle (at 2.54 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -975,7 +975,7 @@
(net 22 N-000034))
(pad 2 thru_hole circle (at 2.54 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
(net 13 GND))
(model discret/capa_2pas_5x5mm.wrl
(model Discret.3dshapes/C2.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
@ -1029,7 +1029,7 @@
(net 13 GND))
(pad 9 connect rect (at 4.191 2.54 270) (size 1.778 5.08) (layers Dessus F.Mask)
(net 13 GND))
(model conn_DBxx/db9_male.wrl
(model Connect.3dshapes/DB9M_CI_INVERT.wrl
(at (xyz 0 0 -0.033))
(scale (xyz 1 1 1))
(rotate (xyz 90 0 0))

158
demos/sonde xilinx/sonde xilinx.sch
View File

@ -1,8 +1,6 @@
EESchema Schematic File Version 2
LIBS:sonde xilinx_schlib
LIBS:power
LIBS:device
LIBS:conn
LIBS:74xx
LIBS:sonde xilinx-cache
EELAYER 25 0
EELAYER END
@ -24,7 +22,7 @@ U 1 1 4D527316
P 6650 2600
F 0 "R11" V 6730 2600 50 0000 C CNN
F 1 "100" V 6650 2600 50 0000 C CNN
F 2 "" H 6650 2600 60 0001 C CNN
F 2 "Discret:R4" H 6650 2600 60 0001 C CNN
F 3 "" H 6650 2600 60 0001 C CNN
1 6650 2600
0 1 1 0
@ -37,9 +35,7 @@ Connection ~ 6300 4200
Wire Wire Line
6300 4250 6300 4200
Wire Wire Line
5900 4200 6300 4200
Wire Wire Line
6300 4200 6400 4200
5900 4200 6400 4200
$Comp
L GND #PWR01
U 1 1 3EBF81B1
@ -57,7 +53,7 @@ U 1 1 3EBF81A7
P 6300 4450
F 0 "C4" H 6350 4550 50 0000 L CNN
F 1 "100pF" H 6350 4350 50 0000 L CNN
F 2 "" H 6300 4450 60 0001 C CNN
F 2 "Discret:C2" H 6300 4450 60 0001 C CNN
F 3 "" H 6300 4450 60 0001 C CNN
1 6300 4450
1 0 0 -1
@ -68,7 +64,7 @@ U 1 1 4D528082
P 6650 4200
F 0 "R13" V 6730 4200 50 0000 C CNN
F 1 "100" V 6650 4200 50 0000 C CNN
F 2 "" H 6650 4200 60 0001 C CNN
F 2 "Discret:R4" H 6650 4200 60 0001 C CNN
F 3 "" H 6650 4200 60 0001 C CNN
1 6650 4200
0 1 1 0
@ -83,15 +79,13 @@ U 4 1 3EBF7DBD
P 5450 4200
F 0 "U1" H 5450 4300 50 0000 L BNN
F 1 "74LS125" H 5500 4051 50 0000 L TNN
F 2 "" H 5450 4200 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 5450 4200 60 0001 C CNN
F 3 "" H 5450 4200 60 0001 C CNN
4 5450 4200
1 0 0 -1
$EndComp
Wire Wire Line
4800 2900 4800 3600
Wire Wire Line
4800 3600 4800 4500
4800 2900 4800 4500
Text Label 8100 3800 1 60 ~ 0
TMS-PROG
Wire Wire Line
@ -103,9 +97,7 @@ Wire Wire Line
Wire Wire Line
10250 3700 8400 3700
Wire Wire Line
10050 3600 10200 3600
Wire Wire Line
10200 3600 10250 3600
10050 3600 10250 3600
Connection ~ 10200 3600
Connection ~ 10200 4000
Connection ~ 10200 3800
@ -114,11 +106,7 @@ Wire Wire Line
Wire Wire Line
10250 3800 10200 3800
Wire Wire Line
10200 3600 10200 3800
Wire Wire Line
10200 3800 10200 4000
Wire Wire Line
10200 4000 10200 4200
10200 3600 10200 4200
Wire Wire Line
10200 4200 10250 4200
$Comp
@ -127,7 +115,7 @@ U 1 1 3ECDE5C8
P 10700 3900
F 0 "J2" H 10700 4450 70 0000 C CNN
F 1 "DB9MALE" H 10700 3353 70 0000 C CNN
F 2 "" H 10700 3900 60 0001 C CNN
F 2 "Connect:DB9M_CI_INVERT" H 10700 3900 60 0001 C CNN
F 3 "" H 10700 3900 60 0001 C CNN
1 10700 3900
1 0 0 1
@ -253,29 +241,21 @@ F 3 "" H 8450 2650 60 0001 C CNN
0 1 1 0
$EndComp
Wire Wire Line
7350 3050 8100 3050
7350 3050 8500 3050
Wire Wire Line
8100 3050 8500 3050
Wire Wire Line
7250 2950 8200 2950
Wire Wire Line
8200 2950 8500 2950
7250 2950 8500 2950
Wire Wire Line
7250 2950 7250 3300
Wire Wire Line
7250 3300 6900 3300
Wire Wire Line
7250 2850 8300 2850
Wire Wire Line
8300 2850 8500 2850
7250 2850 8500 2850
Wire Wire Line
7250 2850 7250 2600
Wire Wire Line
7250 2600 6900 2600
Wire Wire Line
7450 2750 8400 2750
Wire Wire Line
8400 2750 8500 2750
7450 2750 8500 2750
Wire Wire Line
7450 2750 7450 1900
Wire Wire Line
@ -285,16 +265,14 @@ Wire Wire Line
Wire Wire Line
7650 2550 7650 1000
Wire Wire Line
7300 1000 7650 1000
Wire Wire Line
7650 1000 9400 1000
7300 1000 9400 1000
$Comp
L CONN_6 P1
U 1 1 3EBF830C
P 8850 2800
F 0 "P1" V 8800 2800 60 0000 C CNN
F 1 "CONN_6" V 8900 2800 60 0000 C CNN
F 2 "" H 8850 2800 60 0001 C CNN
F 2 "Connect:bornier6" H 8850 2800 60 0001 C CNN
F 3 "" H 8850 2800 60 0001 C CNN
1 8850 2800
1 0 0 -1
@ -319,7 +297,7 @@ U 1 1 3EBF82C6
P 6500 1250
F 0 "C1" H 6550 1350 50 0000 L CNN
F 1 "1uF" H 6550 1151 50 0000 L CNN
F 2 "" H 6500 1250 60 0001 C CNN
F 2 "Discret:CP5" H 6500 1250 60 0001 C CNN
F 3 "" H 6500 1250 60 0001 C CNN
1 6500 1250
1 0 0 -1
@ -334,19 +312,11 @@ Wire Wire Line
Wire Wire Line
6300 3350 6300 3300
Wire Wire Line
5900 3300 6300 3300
5900 3300 6400 3300
Wire Wire Line
6300 3300 6400 3300
5900 2600 6400 2600
Wire Wire Line
5900 2600 6300 2600
Wire Wire Line
6300 2600 6400 2600
Wire Wire Line
5850 1900 5900 1900
Wire Wire Line
5900 1900 6300 1900
Wire Wire Line
6300 1900 6400 1900
5850 1900 6400 1900
$Comp
L GND #PWR010
U 1 1 4D528089
@ -364,7 +334,7 @@ U 1 1 4D528086
P 6300 3550
F 0 "C5" H 6350 3650 50 0000 L CNN
F 1 "100pF" H 6350 3450 50 0000 L CNN
F 2 "" H 6300 3550 60 0001 C CNN
F 2 "Discret:C2" H 6300 3550 60 0001 C CNN
F 3 "" H 6300 3550 60 0001 C CNN
1 6300 3550
1 0 0 -1
@ -375,7 +345,7 @@ U 1 1 4D528083
P 6650 3300
F 0 "R12" V 6730 3300 50 0000 C CNN
F 1 "100" V 6650 3300 50 0000 C CNN
F 2 "" H 6650 3300 60 0001 C CNN
F 2 "Discret:R4" H 6650 3300 60 0001 C CNN
F 3 "" H 6650 3300 60 0001 C CNN
1 6650 3300
0 1 1 0
@ -397,7 +367,7 @@ U 1 1 4D528085
P 6300 2850
F 0 "C2" H 6350 2950 50 0000 L CNN
F 1 "100pF" H 6350 2750 50 0000 L CNN
F 2 "" H 6300 2850 60 0001 C CNN
F 2 "Discret:C2" H 6300 2850 60 0001 C CNN
F 3 "" H 6300 2850 60 0001 C CNN
1 6300 2850
1 0 0 -1
@ -409,17 +379,7 @@ Wire Wire Line
Wire Wire Line
2300 1000 2300 3700
Wire Wire Line
4700 1000 5800 1000
Wire Wire Line
5800 1000 5900 1000
Wire Wire Line
5900 1000 6100 1000
Wire Wire Line
6100 1000 6200 1000
Wire Wire Line
6200 1000 6500 1000
Wire Wire Line
6500 1000 6900 1000
4700 1000 6900 1000
Wire Wire Line
5900 1000 5900 1050
Wire Wire Line
@ -452,7 +412,7 @@ U 1 1 4D528084
P 6300 2150
F 0 "C3" H 6350 2250 50 0000 L CNN
F 1 "100pF" H 6350 2050 50 0000 L CNN
F 2 "" H 6300 2150 60 0001 C CNN
F 2 "Discret:C2" H 6300 2150 60 0001 C CNN
F 3 "" H 6300 2150 60 0001 C CNN
1 6300 2150
1 0 0 -1
@ -463,7 +423,7 @@ U 1 1 3EBF819B
P 6650 1900
F 0 "R14" V 6730 1900 50 0000 C CNN
F 1 "100" V 6650 1900 50 0000 C CNN
F 2 "" H 6650 1900 60 0001 C CNN
F 2 "Discret:R4" H 6650 1900 60 0001 C CNN
F 3 "" H 6650 1900 60 0001 C CNN
1 6650 1900
0 1 1 0
@ -474,7 +434,7 @@ U 1 1 3EBF818E
P 6200 1300
F 0 "R5" H 6050 1500 50 0000 C CNN
F 1 "1K" V 6200 1300 50 0000 C CNN
F 2 "" H 6200 1300 60 0001 C CNN
F 2 "Discret:R4" H 6200 1300 60 0001 C CNN
F 3 "" H 6200 1300 60 0001 C CNN
1 6200 1300
1 0 0 -1
@ -485,7 +445,7 @@ U 1 1 3EBF8187
P 5900 1300
F 0 "R2" H 5750 1500 50 0000 C CNN
F 1 "5,1K" V 5900 1300 50 0000 C CNN
F 2 "" H 5900 1300 60 0001 C CNN
F 2 "Discret:R4" H 5900 1300 60 0001 C CNN
F 3 "" H 5900 1300 60 0001 C CNN
1 5900 1300
1 0 0 -1
@ -496,7 +456,7 @@ U 1 1 3EBF8176
P 7100 1000
F 0 "D2" H 7100 1100 50 0000 C CNN
F 1 "BAT46" H 7100 900 50 0000 C CNN
F 2 "" H 7100 1000 60 0001 C CNN
F 2 "Discret:D3" H 7100 1000 60 0001 C CNN
F 3 "" H 7100 1000 60 0001 C CNN
1 7100 1000
-1 0 0 -1
@ -507,16 +467,14 @@ U 1 1 3EBF815E
P 4500 1000
F 0 "D1" H 4500 1100 50 0000 C CNN
F 1 "BAT46" H 4500 900 50 0000 C CNN
F 2 "" H 4500 1000 60 0001 C CNN
F 2 "Discret:D3" H 4500 1000 60 0001 C CNN
F 3 "" H 4500 1000 60 0001 C CNN
1 4500 1000
-1 0 0 -1
$EndComp
Connection ~ 2350 2000
Wire Wire Line
2350 1800 2350 2000
Wire Wire Line
2350 2000 2350 2600
2350 1800 2350 2600
Wire Wire Line
2350 2600 2200 2600
Wire Wire Line
@ -629,17 +587,7 @@ Wire Wire Line
Wire Wire Line
1150 6900 1250 6900
Wire Wire Line
1150 5600 1150 5900
Wire Wire Line
1150 5900 1150 6250
Wire Wire Line
1150 6250 1150 6550
Wire Wire Line
1150 6550 1150 6900
Wire Wire Line
1150 6900 1150 7200
Wire Wire Line
1150 7200 1150 7300
1150 5600 1150 7300
Wire Wire Line
1150 5600 1250 5600
$Comp
@ -648,7 +596,7 @@ U 4 1 3EBF7EEC
P 1700 5600
F 0 "U2" H 1700 5700 50 0000 L BNN
F 1 "74LS125" H 1750 5450 40 0000 L TNN
F 2 "" H 1700 5600 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 1700 5600 60 0001 C CNN
F 3 "" H 1700 5600 60 0001 C CNN
4 1700 5600
1 0 0 -1
@ -659,7 +607,7 @@ U 3 1 3EBF7EDF
P 1700 6250
F 0 "U2" H 1700 6350 50 0000 L BNN
F 1 "74LS125" H 1750 6100 40 0000 L TNN
F 2 "" H 1700 6250 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 1700 6250 60 0001 C CNN
F 3 "" H 1700 6250 60 0001 C CNN
3 1700 6250
1 0 0 -1
@ -670,7 +618,7 @@ U 2 1 3EBF7EDD
P 1700 6900
F 0 "U2" H 1700 7000 50 0000 L BNN
F 1 "74LS125" H 1750 6750 40 0000 L TNN
F 2 "" H 1700 6900 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 1700 6900 60 0001 C CNN
F 3 "" H 1700 6900 60 0001 C CNN
2 1700 6900
1 0 0 -1
@ -678,9 +626,7 @@ $EndComp
Wire Wire Line
5450 3600 4800 3600
Wire Wire Line
4200 2900 4800 2900
Wire Wire Line
4800 2900 5450 2900
4200 2900 5450 2900
Wire Wire Line
5000 3300 4200 3300
Wire Wire Line
@ -697,7 +643,7 @@ U 3 1 3EBF7DB3
P 5450 3300
F 0 "U1" H 5450 3400 50 0000 L BNN
F 1 "74LS125" H 5500 3151 50 0000 L TNN
F 2 "" H 5450 3300 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 5450 3300 60 0001 C CNN
F 3 "" H 5450 3300 60 0001 C CNN
3 5450 3300
1 0 0 -1
@ -708,7 +654,7 @@ U 2 1 3EBF7DAD
P 5450 2600
F 0 "U1" H 5450 2700 50 0000 L BNN
F 1 "74LS125" H 5500 2451 50 0000 L TNN
F 2 "" H 5450 2600 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 5450 2600 60 0001 C CNN
F 3 "" H 5450 2600 60 0001 C CNN
2 5450 2600
1 0 0 -1
@ -719,7 +665,7 @@ U 1 1 3EBF7D9F
P 5400 1900
F 0 "U1" H 5400 2000 50 0000 L BNN
F 1 "74LS125" H 5450 1750 50 0000 L TNN
F 2 "" H 5400 1900 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 5400 1900 60 0001 C CNN
F 3 "" H 5400 1900 60 0001 C CNN
1 5400 1900
1 0 0 -1
@ -730,7 +676,7 @@ U 1 1 3EBF7D92
P 4650 1600
F 0 "U2" H 4650 1700 50 0000 L BNN
F 1 "74LS125" H 4700 1450 50 0000 L TNN
F 2 "" H 4650 1600 60 0001 C CNN
F 2 "Sockets_DIP:DIP-14__300_ELL" H 4650 1600 60 0001 C CNN
F 3 "" H 4650 1600 60 0001 C CNN
1 4650 1600
-1 0 0 -1
@ -743,7 +689,7 @@ U 1 1 3EBF7D33
P 3950 4200
F 0 "R9" V 4030 4200 50 0000 C CNN
F 1 "100" V 3950 4200 50 0000 C CNN
F 2 "" H 3950 4200 60 0001 C CNN
F 2 "Discret:R4" H 3950 4200 60 0001 C CNN
F 3 "" H 3950 4200 60 0001 C CNN
1 3950 4200
0 1 1 0
@ -754,7 +700,7 @@ U 1 1 3EBF7D31
P 3950 3300
F 0 "R10" V 4030 3300 50 0000 C CNN
F 1 "100" V 3950 3300 50 0000 C CNN
F 2 "" H 3950 3300 60 0001 C CNN
F 2 "Discret:R4" H 3950 3300 60 0001 C CNN
F 3 "" H 3950 3300 60 0001 C CNN
1 3950 3300
0 1 1 0
@ -765,7 +711,7 @@ U 1 1 4D528080
P 3950 2900
F 0 "R8" V 4030 2900 50 0000 C CNN
F 1 "100" V 3950 2900 50 0000 C CNN
F 2 "" H 3950 2900 60 0001 C CNN
F 2 "Discret:R4" H 3950 2900 60 0001 C CNN
F 3 "" H 3950 2900 60 0001 C CNN
1 3950 2900
0 1 1 0
@ -776,7 +722,7 @@ U 1 1 4D52807F
P 3950 2600
F 0 "R7" V 4030 2600 50 0000 C CNN
F 1 "100" V 3950 2600 50 0000 C CNN
F 2 "" H 3950 2600 60 0001 C CNN
F 2 "Discret:R4" H 3950 2600 60 0001 C CNN
F 3 "" H 3950 2600 60 0001 C CNN
1 3950 2600
0 1 1 0
@ -787,7 +733,7 @@ U 1 1 3EBF7D26
P 3950 2250
F 0 "R6" V 4030 2250 50 0000 C CNN
F 1 "100" V 3950 2250 50 0000 C CNN
F 2 "" H 3950 2250 60 0001 C CNN
F 2 "Discret:R4" H 3950 2250 60 0001 C CNN
F 3 "" H 3950 2250 60 0001 C CNN
1 3950 2250
0 1 1 0
@ -798,7 +744,7 @@ U 1 1 3EBF7D22
P 3950 1600
F 0 "R4" V 4030 1600 50 0000 C CNN
F 1 "47" V 3950 1600 50 0000 C CNN
F 2 "" H 3950 1600 60 0001 C CNN
F 2 "Discret:R4" H 3950 1600 60 0001 C CNN
F 3 "" H 3950 1600 60 0001 C CNN
1 3950 1600
0 1 1 0
@ -809,7 +755,7 @@ U 1 1 3EBF7D16
P 3950 1000
F 0 "R1" V 4030 1000 50 0000 C CNN
F 1 "100" V 3950 1000 50 0000 C CNN
F 2 "" H 3950 1000 60 0001 C CNN
F 2 "Discret:R4" H 3950 1000 60 0001 C CNN
F 3 "" H 3950 1000 60 0001 C CNN
1 3950 1000
0 1 1 0
@ -820,7 +766,7 @@ U 1 1 3EBF7D04
P 1750 2800
F 0 "J1" H 1800 4150 70 0000 C CNN
F 1 "DB25MALE" H 1700 1450 70 0000 C CNN
F 2 "" H 1750 2800 60 0001 C CNN
F 2 "Connect:DB25M_CI" H 1750 2800 60 0001 C CNN
F 3 "" H 1750 2800 60 0001 C CNN
1 1750 2800
-1 0 0 -1
@ -829,10 +775,10 @@ Wire Wire Line
9400 1000 9400 3500
Connection ~ 7650 1000
$Comp
L GND #PWR?
L GND #PWR017
U 1 1 5510FC05
P 4950 2000
F 0 "#PWR?" H 4950 2000 30 0001 C CNN
F 0 "#PWR017" H 4950 2000 30 0001 C CNN
F 1 "GND" H 4950 1930 30 0001 C CNN
F 2 "" H 4950 2000 60 0000 C CNN
F 3 "" H 4950 2000 60 0000 C CNN
@ -844,9 +790,7 @@ Wire Wire Line
Wire Wire Line
5100 1600 5900 1600
Wire Wire Line
5900 1550 5900 1600
Wire Wire Line
5900 1600 5900 1900
5900 1550 5900 1900
Connection ~ 5900 1900
Connection ~ 5900 1600
Wire Wire Line

4
demos/test_pads_inside_pads/test_pads_inside_pads-cache.lib
View File

@ -1,4 +1,4 @@
EESchema-LIBRARY Version 2.3 Date: 19/12/2011 12:55:30
EESchema-LIBRARY Version 2.3
#encoding utf-8
#
# CONN_1
@ -6,6 +6,8 @@ EESchema-LIBRARY Version 2.3 Date: 19/12/2011 12:55:30
DEF ~CONN_1 P 0 30 N N 1 F N
F0 "P" 80 0 40 H V L CNN
F1 "CONN_1" 0 55 30 H I C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW
C 0 0 31 0 1 0 N
P 2 0 1 0 -30 0 -50 0 N

31
demos/test_pads_inside_pads/test_pads_inside_pads.cmp
View File

@ -1,31 +0,0 @@
Cmp-Mod V01 Created by CvPcb (2011-12-09 BZR 3290)-testing date = 11/12/2011 20:34:04
BeginCmp
TimeStamp = /4EDF7CC5;
Reference = P1;
ValeurCmp = CONN_1;
IdModule = 1pin;
EndCmp
BeginCmp
TimeStamp = /4EDF7CC0;
Reference = P2;
ValeurCmp = CONN_1;
IdModule = 1pin;
EndCmp
BeginCmp
TimeStamp = /4EE5056C;
Reference = P3;
ValeurCmp = CONN_1;
IdModule = 1pin;
EndCmp
BeginCmp
TimeStamp = /4EE5056D;
Reference = P4;
ValeurCmp = CONN_1;
IdModule = 1pin;
EndCmp
EndListe

15
demos/test_pads_inside_pads/test_pads_inside_pads.sch
View File

@ -1,4 +1,4 @@
EESchema Schematic File Version 2 date 19/12/2011 12:55:30
EESchema Schematic File Version 2
LIBS:power
LIBS:device
LIBS:transistors
@ -29,9 +29,10 @@ LIBS:opto
LIBS:atmel
LIBS:contrib
LIBS:valves
EELAYER 25 0
LIBS:test_pads_inside_pads-cache
EELAYER 25 0
EELAYER END
$Descr A4 11700 8267
$Descr A4 11693 8268
encoding utf-8
Sheet 1 1
Title ""
@ -55,6 +56,8 @@ U 1 1 4EE5056D
P 4300 1450
F 0 "P4" H 4380 1450 40 0000 L CNN
F 1 "CONN_1" H 4300 1505 30 0001 C CNN
F 2 "Connect:1pin" H 4300 1400 60 0000 C CNN
F 3 "" H 4300 1450 60 0001 C CNN
1 4300 1450
1 0 0 -1
$EndComp
@ -64,6 +67,8 @@ U 1 1 4EE5056C
P 3600 1450
F 0 "P3" H 3680 1450 40 0000 L CNN
F 1 "CONN_1" H 3600 1505 30 0001 C CNN
F 2 "Connect:1pin" H 3600 1500 60 0000 C CNN
F 3 "" H 3600 1450 60 0001 C CNN
1 3600 1450
-1 0 0 1
$EndComp
@ -73,6 +78,8 @@ U 1 1 4EDF7CC5
P 3600 1750
F 0 "P1" H 3680 1750 40 0000 L CNN
F 1 "CONN_1" H 3600 1805 30 0001 C CNN
F 2 "Connect:1pin" H 3600 1800 60 0000 C CNN
F 3 "" H 3600 1750 60 0001 C CNN
1 3600 1750
-1 0 0 1
$EndComp
@ -82,6 +89,8 @@ U 1 1 4EDF7CC0
P 4300 1750
F 0 "P2" H 4380 1750 40 0000 L CNN
F 1 "CONN_1" H 4300 1805 30 0001 C CNN
F 2 "Connect:1pin" H 4300 1700 60 0000 C CNN
F 3 "" H 4300 1750 60 0001 C CNN
1 4300 1750
1 0 0 -1
$EndComp

123
demos/test_xil_95108/carte_test-cache.lib
View File

@ -3,29 +3,29 @@ EESchema-LIBRARY Version 2.3
#
# +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
DEF +12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -150 50 H I C CNN
F1 "+12V" 0 140 50 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
P 2 0 1 0 -30 50 0 100 N
P 2 0 1 0 0 0 0 100 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
ENDDEF
#
# -12V
#
DEF -12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 130 20 H I C CNN
F1 "-12V" 0 100 30 H V C CNN
DEF -12V #PWR 0 0 Y Y 1 F N
F0 "#PWR" 0 100 50 H I C CNN
F1 "-12V" 0 150 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW
X -12V 1 0 0 0 U 20 20 0 0 W N
P 3 0 1 0 0 0 0 50 0 50 N
P 7 0 1 0 0 80 30 50 -20 50 -30 50 0 80 0 80 0 80 F
P 6 0 1 0 0 0 0 50 30 50 0 100 -30 50 0 50 F
ENDDRAW
ENDDEF
#
@ -87,20 +87,22 @@ 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
F0 "C" 25 100 50 H V L CNN
F1 "C" 25 -100 50 H V L 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
SM*
C?
C1-1
C_????_*
C_????
SMD*_c
Capacitor*
$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
X ~ 1 0 150 110 D 40 40 1 1 P
X ~ 2 0 -150 110 U 40 40 1 1 P
ENDDRAW
ENDDEF
#
@ -151,21 +153,29 @@ 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
DEF CP C 0 10 N Y 1 F N
F0 "C" 25 100 50 H V L CNN
F1 "CP" 25 -100 50 H V L CNN
F2 "" 38 -150 30 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST
CP*
SM*
Elko*
TantalC*
C*elec
c_elec*
SMD*_Pol
$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
S -90 20 -90 40 0 1 0 N
S -90 20 90 20 0 1 0 N
S -70 90 -30 90 0 1 0 N
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
ENDDEF
#
@ -331,7 +341,7 @@ ENDDEF
#
# DIODE
#
DEF DIODE D 0 40 N N 1 F N
DEF DIODE D 0 0 Y Y 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
@ -343,21 +353,21 @@ $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
X K 1 200 0 150 L 20 20 1 1 P
X A 2 -200 0 150 R 20 20 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
DEF GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 -150 50 H I C CNN
F1 "GND" 0 -123 30 H V 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
P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
X GND 1 0 0 0 D 20 30 1 1 W N
ENDDRAW
ENDDEF
#
@ -378,12 +388,12 @@ $FPLIST
LEDV
$ENDFPLIST
DRAW
P 2 0 1 0 50 50 50 -50 N
P 3 0 1 0 -50 50 50 0 -50 -50 F
P 3 0 1 0 65 -40 110 -80 105 -55 N
P 3 0 1 0 80 -25 125 -65 120 -40 N
X A 1 -200 0 150 R 40 40 1 1 P
X K 2 200 0 150 L 40 40 1 1 P
P 2 0 1 0 -50 50 -50 -50 N
P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
P 3 0 1 0 50 50 -50 0 50 -50 F
X K 1 -200 0 150 R 40 40 1 1 P
X A 2 200 0 150 L 40 40 1 1 P
ENDDRAW
ENDDEF
#
@ -428,21 +438,18 @@ 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
F0 "R" 80 0 50 V V C CNN
F1 "R" 0 0 50 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
R_*
Resistor_*
$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
S -40 -100 40 100 0 1 10 N
X ~ 1 0 150 50 D 60 60 1 1 P
X ~ 2 0 -150 50 U 60 60 1 1 P
ENDDRAW
ENDDEF
#
@ -550,14 +557,14 @@ 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
F0 "#PWR" 0 -150 50 H I C CNN
F1 "VCC" 0 150 50 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
C 0 75 25 0 1 0 N
P 2 0 1 0 0 0 0 50 N
X VCC 1 0 0 0 U 50 50 1 1 W N
ENDDRAW
ENDDEF
#

297
demos/test_xil_95108/carte_test.cmp
View File

@ -1,297 +0,0 @@
Cmp-Mod V01 Genere par PcbNew le 26/5/2003-7:55:8
BeginCmp
TimeStamp = 3EC23ABA;
Reference = C1;
ValeurCmp = 100nF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC23B98;
Reference = C2;
ValeurCmp = 10uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 3EC23DCD;
Reference = C3;
ValeurCmp = 10uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 3EC242AD;
Reference = C4;
ValeurCmp = 22pF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC242AD;
Reference = C5;
ValeurCmp = 22pF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC243D6;
Reference = C6;
ValeurCmp = 47uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 3EC4C7DB;
Reference = C7;
ValeurCmp = 100nF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC4C7DB;
Reference = C8;
ValeurCmp = 100nF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC4C7DB;
Reference = C10;
ValeurCmp = 100nF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC4C7DB;
Reference = C11;
ValeurCmp = 100nF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3EC4C7DB;
Reference = C12;
ValeurCmp = 100nF;
IdModule = SM1206;
EndCmp
BeginCmp
TimeStamp = 3ECDDCAD;
Reference = C13;
ValeurCmp = 10uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 3ECDDACB;
Reference = C14;
ValeurCmp = 10uF;
IdModule = CP6;
EndCmp
BeginCmp
TimeStamp = 3EC243C8;
Reference = D1;
ValeurCmp = 1N4004;
IdModule = D5;
EndCmp
BeginCmp
TimeStamp = 3EC4D08F;
Reference = D2;
ValeurCmp = LED;
IdModule = LEDV;
EndCmp
BeginCmp
TimeStamp = 3EC4D08F;
Reference = D3;
ValeurCmp = LED;
IdModule = LEDV;
EndCmp
BeginCmp
TimeStamp = 3ECDDCDD;
Reference = D4;
ValeurCmp = 1N4004;
IdModule = D5;
EndCmp
BeginCmp
TimeStamp = 3EC4C60F;
Reference = J1;
ValeurCmp = DB25;
IdModule = DB25FC;
EndCmp
BeginCmp
TimeStamp = 3ECDEBEA;
Reference = J2;
ValeurCmp = DB9FEM;
IdModule = DB9F_CI_INVERT;
EndCmp
BeginCmp
TimeStamp = 3EC4C49F;
Reference = K1;
ValeurCmp = CONN_3;
IdModule = SIL-3;
EndCmp
BeginCmp
TimeStamp = 3EC243AC;
Reference = P2;
ValeurCmp = CONN_3;
IdModule = bornier3;
EndCmp
BeginCmp
TimeStamp = 3EC2446D;
Reference = P3;
ValeurCmp = CONN_2;
IdModule = bornier2;
EndCmp
BeginCmp
TimeStamp = 3ECB3F5E;
Reference = P4;
ValeurCmp = CONN_2X2;
IdModule = head_2x2;
EndCmp
BeginCmp
TimeStamp = 3EC242C1;
Reference = R1;
ValeurCmp = 100K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EC4D082;
Reference = R2;
ValeurCmp = 330;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EC4D082;
Reference = R3;
ValeurCmp = 330;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EC8B970;
Reference = R4;
ValeurCmp = 4,7K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EC8B978;
Reference = R5;
ValeurCmp = 4,7K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3ECDDB57;
Reference = R6;
ValeurCmp = 1,1k;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3ECDDB60;
Reference = R7;
ValeurCmp = 1,1K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3ECDDB43;
Reference = R8;
ValeurCmp = 2,2K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3ECDDB4B;
Reference = R9;
ValeurCmp = 2,2K;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3ECDDB6D;
Reference = R10;
ValeurCmp = 75;
IdModule = R4;
EndCmp
BeginCmp
TimeStamp = 3EC8B876;
Reference = SW1;
ValeurCmp = SW_PUSH;
IdModule = SW_PUSH;
EndCmp
BeginCmp
TimeStamp = 3EC8B882;
Reference = SW2;
ValeurCmp = SW_PUSH;
IdModule = SW_PUSH;
EndCmp
BeginCmp
TimeStamp = 3EC238E5;
Reference = U1;
ValeurCmp = TDA8702;
IdModule = 16DIP-ELL300;
EndCmp
BeginCmp
TimeStamp = 3EC230AD;
Reference = U2;
ValeurCmp = XC95108PC84;
IdModule = PLCC84;
EndCmp
BeginCmp
TimeStamp = 3EC2436D;
Reference = U3;
ValeurCmp = LM7805;
IdModule = LM78XX;
EndCmp
BeginCmp
TimeStamp = 3EC4C318;
Reference = U4;
ValeurCmp = 74HC04;
IdModule = 14DIP-ELL300;
EndCmp
BeginCmp
TimeStamp = 3EC4C463;
Reference = U5;
ValeurCmp = RAM_32KO;
IdModule = 28DIP-ELL300-600;
EndCmp
BeginCmp
TimeStamp = 3ECDDB8B;
Reference = U6;
ValeurCmp = LM318N;
IdModule = 8DIP-ELL300;
EndCmp
BeginCmp
TimeStamp = 3EC2428D;
Reference = X1;
ValeurCmp = 10MHz;
IdModule = HC-18UH;
EndCmp
EndListe

6002
demos/test_xil_95108/carte_test.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

1048
demos/test_xil_95108/carte_test.net
View File

File diff suppressed because it is too large Load Diff

7
demos/test_xil_95108/carte_test.pro
View File

@ -1,4 +1,4 @@
update=18/05/2015 09:09:57
update=30/10/2015 11:04:44
version=1
last_client=kicad
[pcbnew]
@ -84,5 +84,6 @@ version=1
version=1
LibDir=
[eeschema/libraries]
LibName1=carte_test_schlib
LibName2=power
LibName1=device
LibName2=carte_test_schlib
LibName3=power

841
demos/test_xil_95108/carte_test.sch
View File

File diff suppressed because it is too large Load Diff

61
demos/test_xil_95108/carte_test_schlib.lib
View File

@ -1,34 +1,6 @@
EESchema-LIBRARY Version 2.3
#encoding utf-8
#
# +12V
#
DEF +12V #PWR 0 0 N Y 1 F P
F0 "#PWR" 0 -50 20 H I C CNN
F1 "+12V" 0 100 30 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW
X +12V 1 0 0 0 U 20 30 0 0 W N
C 0 60 20 0 1 0 N
P 3 0 1 0 0 0 0 40 0 40 N
ENDDRAW
ENDDEF
#
# -12V
#
DEF -12V #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 130 20 H I C CNN
F1 "-12V" 0 100 30 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW
X -12V 1 0 0 0 U 20 20 0 0 W N
P 3 0 1 0 0 0 0 50 0 50 N
P 7 0 1 0 0 80 30 50 -20 50 -30 50 0 80 0 80 0 80 F
ENDDRAW
ENDDEF
#
# 74HCT04
#
DEF 74HCT04 U 0 30 Y Y 6 F N
@ -331,7 +303,7 @@ ENDDEF
#
# DIODE
#
DEF DIODE D 0 40 N N 1 F N
DEF DIODE D 0 0 Y Y 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
@ -343,21 +315,8 @@ $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
X K 1 200 0 150 L 20 20 1 1 P
X A 2 -200 0 150 R 20 20 1 1 P
ENDDRAW
ENDDEF
#
@ -547,20 +506,6 @@ X VCCA 16 100 900 300 D 50 50 1 2 W
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
#
# XC95108PC84
#
DEF XC95108PC84 U 0 30 Y Y 1 F N

7
demos/test_xil_95108/fp-lib-table Normal file
View File

@ -0,0 +1,7 @@
(fp_lib_table
(lib (name Capacitors_SMD)(type KiCad)(uri "$(KISYSMOD)\\Capacitors_SMD.pretty")(options "")(descr ""))
(lib (name Sockets_DIP)(type KiCad)(uri "$(KISYSMOD)\\Sockets_DIP.pretty")(options "")(descr ""))
(lib (name Pin_Headers)(type KiCad)(uri "$(KISYSMOD)/Pin_Headers.pretty")(options "")(descr ""))
(lib (name SMD_Packages)(type KiCad)(uri "$(KISYSMOD)/SMD_Packages.pretty")(options "")(descr ""))
(lib (name Sockets)(type KiCad)(uri "$(KISYSMOD)/Sockets.pretty")(options "")(descr ""))
)

44
demos/video/bus_pci.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@ -1037,7 +1019,7 @@ U 1 1 269C6109
P 3300 4200
F 0 "BUS1" H 3300 7400 60 0000 C CNN
F 1 "BUSPCI_5V" H 3300 1000 60 0000 C CNN
F 2 "connect:BUSPCI" H 3300 4200 60 0001 C CNN
F 2 "Connect:BUSPCI" H 3300 4200 60 0001 C CNN
F 3 "" H 3300 4200 60 0001 C CNN
1 3300 4200
1 0 0 -1
@ -1059,7 +1041,7 @@ U 1 1 C8AF8090
P 14350 1300
F 0 "RR1" H 14400 1850 70 0000 C CNN
F 1 "8x10K" V 14380 1300 70 0000 C CNN
F 2 "connect:SIL-9" H 14350 1300 60 0001 C CNN
F 2 "Connect:SIL-9" H 14350 1300 60 0001 C CNN
F 3 "" H 14350 1300 60 0001 C CNN
1 14350 1300
1 0 0 -1
@ -1070,7 +1052,7 @@ U 1 1 C8B01EF2
P 14350 2300
F 0 "RR2" H 14400 2850 70 0000 C CNN
F 1 "8x10K" V 14380 2300 70 0000 C CNN
F 2 "connect:SIL-9" H 14350 2300 60 0001 C CNN
F 2 "Connect:SIL-9" H 14350 2300 60 0001 C CNN
F 3 "" H 14350 2300 60 0001 C CNN
1 14350 2300
1 0 0 -1
@ -1081,7 +1063,7 @@ U 1 1 C8B23B9F
P 14350 3300
F 0 "RR3" H 14400 3850 70 0000 C CNN
F 1 "8x10K" V 14380 3300 70 0000 C CNN
F 2 "connect:SIL-9" H 14350 3300 60 0001 C CNN
F 2 "Connect:SIL-9" H 14350 3300 60 0001 C CNN
F 3 "" H 14350 3300 60 0001 C CNN
1 14350 3300
1 0 0 -1
@ -1092,7 +1074,7 @@ U 1 1 C8B2B4CE
P 14350 4300
F 0 "RR4" H 14400 4850 70 0000 C CNN
F 1 "8x10K" V 14380 4300 70 0000 C CNN
F 2 "discret:r_pack8" H 14350 4300 60 0001 C CNN
F 2 "Discret:r_pack8" H 14350 4300 60 0001 C CNN
F 3 "" H 14350 4300 60 0001 C CNN
1 14350 4300
1 0 0 -1
@ -1103,7 +1085,7 @@ U 1 1 C8B2B4E3
P 14350 5300
F 0 "RR5" H 14400 5850 70 0000 C CNN
F 1 "8x10K" V 14380 5300 70 0000 C CNN
F 2 "discret:r_pack8" H 14350 5300 60 0001 C CNN
F 2 "Discret:r_pack8" H 14350 5300 60 0001 C CNN
F 3 "" H 14350 5300 60 0001 C CNN
1 14350 5300
1 0 0 -1
@ -1114,7 +1096,7 @@ U 1 1 C93123CE
P 14350 6300
F 0 "RR6" H 14400 6850 70 0000 C CNN
F 1 "8x10K" V 14380 6300 70 0000 C CNN
F 2 "connect:SIL-9" H 14350 6300 60 0001 C CNN
F 2 "Connect:SIL-9" H 14350 6300 60 0001 C CNN
F 3 "" H 14350 6300 60 0001 C CNN
1 14350 6300
1 0 0 -1
@ -1125,7 +1107,7 @@ U 1 1 C931248E
P 14350 7300
F 0 "RR7" H 14400 7850 70 0000 C CNN
F 1 "8x10K" V 14380 7300 70 0000 C CNN
F 2 "discret:r_pack8" H 14350 7300 60 0001 C CNN
F 2 "Discret:r_pack8" H 14350 7300 60 0001 C CNN
F 3 "" H 14350 7300 60 0001 C CNN
1 14350 7300
1 0 0 -1
@ -1136,7 +1118,7 @@ U 1 1 C9363A3F
P 14350 8300
F 0 "RR8" H 14400 8850 70 0000 C CNN
F 1 "8x10K" V 14380 8300 70 0000 C CNN
F 2 "connect:SIL-9" H 14350 8300 60 0001 C CNN
F 2 "Connect:SIL-9" H 14350 8300 60 0001 C CNN
F 3 "" H 14350 8300 60 0001 C CNN
1 14350 8300
1 0 0 -1
@ -1147,7 +1129,7 @@ U 1 1 26A799F7
P 11900 7650
F 0 "W2" H 11900 7750 60 0000 C CNN
F 1 "FLOAT#" H 11900 7550 60 0000 C CNN
F 2 "connect:GS2" H 11900 7650 60 0001 C CNN
F 2 "Connect:GS2" H 11900 7650 60 0001 C CNN
F 3 "" H 11900 7650 60 0001 C CNN
1 11900 7650
0 -1 -1 0
@ -1158,7 +1140,7 @@ U 1 1 26A79A10
P 11900 8550
F 0 "W3" H 11900 8610 40 0000 C CNN
F 1 "SERNV" H 11900 8480 40 0000 C CNN
F 2 "connect:GS2" H 11900 8550 60 0001 C CNN
F 2 "Connect:GS2" H 11900 8550 60 0001 C CNN
F 3 "" H 11900 8550 60 0001 C CNN
1 11900 8550
0 -1 -1 0
@ -1169,7 +1151,7 @@ U 1 1 26A799ED
P 12050 6450
F 0 "W1" H 12050 6550 60 0000 C CNN
F 1 "16/32" H 12050 6350 60 0000 C CNN
F 2 "connect:GS2" H 12050 6450 60 0001 C CNN
F 2 "Connect:GS2" H 12050 6450 60 0001 C CNN
F 3 "" H 12050 6450 60 0001 C CNN
1 12050 6450
0 -1 -1 0

20
demos/video/esvideo.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END

38
demos/video/graphic.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@ -65,7 +47,7 @@ U 1 1 34E1751D
P 4850 800
F 0 "P12" V 5050 800 50 0000 C CNN
F 1 "CONN_1" V 4950 800 50 0000 C CNN
F 2 "connect:TESTPOINT" H 4850 800 60 0001 C CNN
F 2 "Connect:TESTPOINT" H 4850 800 60 0001 C CNN
F 3 "" H 4850 800 60 0001 C CNN
1 4850 800
0 -1 -1 0
@ -83,7 +65,7 @@ U 1 1 34E1718B
P 5850 5500
F 0 "P9" H 5850 5400 50 0000 C CNN
F 1 "CONN_1" H 5850 5300 50 0000 C CNN
F 2 "connect:PINTST" H 5850 5500 60 0001 C CNN
F 2 "Connect:PINTST" H 5850 5500 60 0001 C CNN
F 3 "" H 5850 5500 60 0001 C CNN
1 5850 5500
1 0 0 -1
@ -94,7 +76,7 @@ U 1 1 4BF036DA
P 6400 3400
F 0 "P11" H 6400 3550 50 0000 C CNN
F 1 "CONN_1" H 6400 3450 50 0000 C CNN
F 2 "connect:PINTST" H 6400 3400 60 0001 C CNN
F 2 "Connect:PINTST" H 6400 3400 60 0001 C CNN
F 3 "" H 6400 3400 60 0001 C CNN
1 6400 3400
1 0 0 -1
@ -105,7 +87,7 @@ U 1 1 4BF036D9
P 6400 2800
F 0 "P10" H 6400 2950 50 0000 C CNN
F 1 "CONN_1" H 6400 2850 50 0000 C CNN
F 2 "connect:PINTST" H 6400 2800 60 0001 C CNN
F 2 "Connect:PINTST" H 6400 2800 60 0001 C CNN
F 3 "" H 6400 2800 60 0001 C CNN
1 6400 2800
1 0 0 -1
@ -579,7 +561,7 @@ U 1 1 33A7E0C8
P 3550 750
F 0 "P4" V 3500 750 40 0000 C CNN
F 1 "CONN_2" V 3600 750 40 0000 C CNN
F 2 "connect:SIL-2" H 3550 750 60 0001 C CNN
F 2 "Connect:SIL-2" H 3550 750 60 0001 C CNN
F 3 "" H 3550 750 60 0001 C CNN
1 3550 750
0 -1 -1 0
@ -888,7 +870,7 @@ U 1 1 2D5AA041
P 7700 2850
F 0 "D6" H 7700 2600 60 0000 C CNN
F 1 "LED" H 7720 2700 60 0000 C CNN
F 2 "discret:LEDV" H 7700 2850 60 0001 C CNN
F 2 "Discret:LEDV" H 7700 2850 60 0001 C CNN
F 3 "" H 7700 2850 60 0001 C CNN
1 7700 2850
-1 0 0 1
@ -1246,7 +1228,7 @@ U 1 1 B3BF4EDE
P 7400 5800
F 0 "C49" H 7550 5900 50 0000 C CNN
F 1 "22pF" H 7550 5700 50 0000 C CNN
F 2 "discret:C1" H 7400 5800 60 0001 C CNN
F 2 "Discret:C1" H 7400 5800 60 0001 C CNN
F 3 "" H 7400 5800 60 0001 C CNN
1 7400 5800
1 0 0 -1
@ -1257,7 +1239,7 @@ U 1 1 B3BF4EE8
P 8200 5800
F 0 "C50" H 8350 5900 50 0000 C CNN
F 1 "22pF" H 8350 5700 50 0000 C CNN
F 2 "discret:C1" H 8200 5800 60 0001 C CNN
F 2 "Discret:C1" H 8200 5800 60 0001 C CNN
F 3 "" H 8200 5800 60 0001 C CNN
1 8200 5800
1 0 0 -1
@ -1279,7 +1261,7 @@ U 1 1 B3BF4ED4
P 7800 5300
F 0 "X1" H 7800 5450 60 0000 C CNN
F 1 "10MHz" H 7800 5150 60 0000 C CNN
F 2 "discret:HC-18UV" H 7800 5300 60 0001 C CNN
F 2 "Discret:HC-18UV" H 7800 5300 60 0001 C CNN
F 3 "" H 7800 5300 60 0001 C CNN
1 7800 5300
1 0 0 -1

24
demos/video/modul.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@ -748,7 +730,7 @@ U 1 1 22760FA8
P 2100 5350
F 0 "CV1" H 2230 5270 50 0000 C CNN
F 1 "5/30pF" H 2250 5190 50 0000 C CNN
F 2 "discret:CV3-30PF" H 2100 5350 60 0001 C CNN
F 2 "Discret:CV3-30PF" H 2100 5350 60 0001 C CNN
F 3 "" H 2100 5350 60 0001 C CNN
1 2100 5350
1 0 0 -1
@ -937,7 +919,7 @@ U 1 1 22760FA3
P 2100 4800
F 0 "X3" V 2300 4900 60 0000 C CNN
F 1 "4.433618MHz" V 1900 4450 60 0000 C CNN
F 2 "discret:HC-18UH" H 2100 4800 60 0001 C CNN
F 2 "Discret:HC-18UH" H 2100 4800 60 0001 C CNN
F 3 "" H 2100 4800 60 0001 C CNN
1 2100 4800
0 -1 -1 0

20
demos/video/muxdata.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END

30
demos/video/pal-ntsc.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@ -423,7 +405,7 @@ U 1 1 A9CA7F7F
P 3850 3700
F 0 "D1" H 3850 3800 50 0000 C CNN
F 1 "BAT46" H 3850 3600 50 0000 C CNN
F 2 "discret:D3" H 3850 3700 60 0001 C CNN
F 2 "Discret:D3" H 3850 3700 60 0001 C CNN
F 3 "" H 3850 3700 60 0001 C CNN
1 3850 3700
1 0 0 -1
@ -434,7 +416,7 @@ U 1 1 A9CA7F84
P 3850 3300
F 0 "D2" H 3850 3200 50 0000 C CNN
F 1 "BAT46" H 3850 3400 50 0000 C CNN
F 2 "discret:D3" H 3850 3300 60 0001 C CNN
F 2 "Discret:D3" H 3850 3300 60 0001 C CNN
F 3 "" H 3850 3300 60 0001 C CNN
1 3850 3300
-1 0 0 1
@ -445,7 +427,7 @@ U 1 1 A9CA7F8E
P 4050 6000
F 0 "D3" H 4050 6100 60 0000 C CNN
F 1 "BAT46" H 4050 5900 60 0000 C CNN
F 2 "discret:D3" H 4050 6000 60 0001 C CNN
F 2 "Discret:D3" H 4050 6000 60 0001 C CNN
F 3 "" H 4050 6000 60 0001 C CNN
1 4050 6000
1 0 0 -1
@ -456,7 +438,7 @@ U 1 1 A9CA7F93
P 4050 5600
F 0 "D4" H 4050 5700 60 0000 C CNN
F 1 "BAT46" H 4050 5500 60 0000 C CNN
F 2 "discret:D3" H 4050 5600 60 0001 C CNN
F 2 "Discret:D3" H 4050 5600 60 0001 C CNN
F 3 "" H 4050 5600 60 0001 C CNN
1 4050 5600
-1 0 0 -1
@ -588,7 +570,7 @@ U 1 1 B15DA8C0
P 5250 2100
F 0 "X2" H 5250 2250 60 0000 C CNN
F 1 "30MHz" H 5250 1950 60 0000 C CNN
F 2 "discret:HC-18UV" H 5250 2100 60 0001 C CNN
F 2 "Discret:HC-18UV" H 5250 2100 60 0001 C CNN
F 3 "" H 5250 2100 60 0001 C CNN
1 5250 2100
1 0 0 -1

20
demos/video/rams.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END

1326
demos/video/video.cmp
View File

File diff suppressed because it is too large Load Diff

374
demos/video/video.kicad_pcb
View File

File diff suppressed because it is too large Load Diff

30
demos/video/video.sch
View File

@ -1,24 +1,6 @@
EESchema Schematic File Version 2
LIBS:video_schlib
LIBS:power
LIBS:device
LIBS:transistors
LIBS:conn
LIBS:linear
LIBS:regul
LIBS:74xx
LIBS:cmos4000
LIBS:adc-dac
LIBS:memory
LIBS:xilinx
LIBS:special
LIBS:analog_switches
LIBS:motorola
LIBS:intel
LIBS:audio
LIBS:interface
LIBS:philips
LIBS:cypress
LIBS:siliconi
LIBS:video-cache
EELAYER 25 0
EELAYER END
@ -266,7 +248,7 @@ U 1 1 84DFBB8F
P 15350 4050
F 0 "J4" H 15350 4600 70 0000 C CNN
F 1 "DB9FEM" H 15350 3500 70 0000 C CNN
F 2 "connect:DB9FC" H 15350 4050 60 0001 C CNN
F 2 "Connect:DB9FC" H 15350 4050 60 0001 C CNN
F 3 "" H 15350 4050 60 0001 C CNN
1 15350 4050
1 0 0 1
@ -299,7 +281,7 @@ U 1 1 30705D02
P 15350 2700
F 0 "P8" H 15360 2820 60 0000 C CNN
F 1 "BNC" V 15460 2640 40 0000 C CNN
F 2 "discret:SUBCLICK" H 15350 2700 60 0001 C CNN
F 2 "Discret:SUBCLICK" H 15350 2700 60 0001 C CNN
F 3 "" H 15350 2700 60 0001 C CNN
1 15350 2700
1 0 0 -1
@ -436,7 +418,7 @@ U 1 1 32F9F1AD
P 12100 3400
F 0 "P3" H 12110 3520 60 0000 C CNN
F 1 "BNC" V 12210 3340 40 0000 C CNN
F 2 "discret:SUBCLICK" H 12100 3400 60 0001 C CNN
F 2 "Discret:SUBCLICK" H 12100 3400 60 0001 C CNN
F 3 "" H 12100 3400 60 0001 C CNN
1 12100 3400
1 0 0 -1
@ -447,7 +429,7 @@ U 1 1 32F9F1A3
P 12100 2600
F 0 "P2" H 12110 2720 60 0000 C CNN
F 1 "BNC" V 12210 2540 40 0000 C CNN
F 2 "discret:SUBCLICK" H 12100 2600 60 0001 C CNN
F 2 "Discret:SUBCLICK" H 12100 2600 60 0001 C CNN
F 3 "" H 12100 2600 60 0001 C CNN
1 12100 2600
1 0 0 -1
@ -458,7 +440,7 @@ U 1 1 32F9F198
P 12100 1800
F 0 "P1" H 12110 1920 60 0000 C CNN
F 1 "BNC" V 12210 1740 40 0000 C CNN
F 2 "discret:SUBCLICK" H 12100 1800 60 0001 C CNN
F 2 "Discret:SUBCLICK" H 12100 1800 60 0001 C CNN
F 3 "" H 12100 1800 60 0001 C CNN
1 12100 1800
1 0 0 -1

2
eeschema/CMakeLists.txt
View File

@ -220,7 +220,7 @@ if( APPLE )
MACOSX_PACKAGE_LOCATION Resources
)
set( MACOSX_BUNDLE_ICON_FILE eeschema.icns )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad )
set( MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-pcb.kicad )
set( MACOSX_BUNDLE_NAME eeschema )
endif()

2
eeschema/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleExecutable</key> <string>eeschema</string>
<key>CFBundleGetInfoString</key> <string></string>
<key>CFBundleIconFile</key> <string>eeschema.icns</string>
<key>CFBundleIdentifier</key> <string>org.kicad-eda.eeschema</string>
<key>CFBundleIdentifier</key> <string>org.kicad-pcb.eeschema</string>
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
<key>CFBundleLongVersionString</key> <string></string>
<key>CFBundleName</key> <string>EESchema</string>

6
eeschema/annotate.cpp
View File

@ -35,10 +35,6 @@
#include <sch_reference_list.h>
#include <class_library.h>
#include <sch_component.h>
#include <lib_pin.h>
#include <boost/foreach.hpp>
void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
{
@ -56,6 +52,8 @@ void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
// Update the references for the sheet that is currently being displayed.
m_CurrentSheet->UpdateAllScreenReferences();
GetCanvas()->Refresh();
OnModify();
}

3
eeschema/block.cpp
View File

@ -48,9 +48,6 @@
#include <sch_sheet.h>
#include <sch_sheet_path.h>
#include <boost/foreach.hpp>
// Imported functions:
extern void SetSchItemParent( SCH_ITEM* Struct, SCH_SCREEN* Screen );
extern void MoveItemsInList( PICKED_ITEMS_LIST& aItemsList, const wxPoint aMoveVector );

3
eeschema/block_libedit.cpp
View File

@ -87,7 +87,7 @@ int LIB_EDIT_FRAME::BlockCommand( int key )
bool LIB_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
{
int ItemCount = 0;
int nextCmd = false;
bool nextCmd = false;
wxPoint pt;
if( GetScreen()->m_BlockLocate.GetCount() )
@ -323,7 +323,6 @@ void DrawMovingBlockOutlines( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint&
{
BLOCK_SELECTOR* block;
BASE_SCREEN* screen = aPanel->GetScreen();
wxPoint move_offset;
block = &screen->m_BlockLocate;
LIB_EDIT_FRAME* parent = (LIB_EDIT_FRAME*) aPanel->GetParent();

4
eeschema/bus-wire-junction.cpp
View File

@ -30,7 +30,6 @@
#include <fctsys.h>
#include <gr_basic.h>
#include <class_drawpanel.h>
#include <confirm.h>
#include <schframe.h>
#include <lib_draw_item.h>
@ -43,7 +42,6 @@
#include <sch_text.h>
#include <sch_component.h>
#include <sch_sheet.h>
#include <trigo.h>
static void AbortCreateNewLine( EDA_DRAW_PANEL* aPanel, wxDC* aDC );
@ -208,7 +206,7 @@ void SCH_EDIT_FRAME::BeginSegment( wxDC* DC, int type )
}
else // A segment is in progress: terminates the current segment and add a new segment.
{
SCH_LINE* prevSegment = (SCH_LINE*) segment->Back();
SCH_LINE* prevSegment = segment->Back();
// Be aware prevSegment can be null when the horizontal and vertical lines only switch is off
// when we create the first segment.

3
eeschema/busentry.cpp
View File

@ -31,11 +31,8 @@
#include <fctsys.h>
#include <gr_basic.h>
#include <class_drawpanel.h>
#include <eeschema_id.h>
#include <confirm.h>
#include <schframe.h>
#include <general.h>
#include <sch_bus_entry.h>

6
eeschema/class_library.cpp
View File

@ -39,7 +39,6 @@
#include <config_params.h>
#include <wildcards_and_files_ext.h>
#include <project_rescue.h>
//#include <richio.h>
#include <general.h>
#include <class_library.h>
@ -487,8 +486,6 @@ bool PART_LIB::Load( wxString& aErrorMsg )
// There is no header if this is a symbol library.
if( type == LIBRARY_TYPE_EESCHEMA )
{
wxString tmp;
line = reader.Line();
header = FROM_UTF8( line );
@ -648,7 +645,6 @@ bool PART_LIB::LoadDocs( wxString& aErrorMsg )
char line[8000], * name, * text;
LIB_ALIAS* entry;
FILE* file;
wxString msg;
wxFileName fn = fileName;
fn.SetExt( DOC_EXT );
@ -1066,8 +1062,6 @@ void PART_LIBS::LibNamesAndPaths( PROJECT* aProject, bool doSave,
}
else
{
wxString pro = aProject->GetProjectFullName();
if( !aProject->ConfigLoad( Kiface().KifaceSearch(), GROUP_SCH, ca ) )
{
wxString msg = wxString::Format( _(

Some files were not shown because too many files have changed in this diff Show More