Merged trunk @ 5348
This commit is contained in:
Garth Corral
commit
ac26035fe1
|
|
@ -116,7 +116,7 @@ LINK_DIRECTORIES( ${LINK_DIRECTORIES_PATH} )
|
|||
if( UNIX )
|
||||
set( KICAD_USER_CONFIG_DIR $ENV{HOME} CACHE PATH "Location of user specific KiCad config files" )
|
||||
elseif( MINGW )
|
||||
set( KICAD_USER_CONFIG_DIR $ENV{%APPDATA%} CACHE PATH "Location of user specific KiCad config files" )
|
||||
set( KICAD_USER_CONFIG_DIR $ENV{APPDATA} CACHE PATH "Location of user specific KiCad config files" )
|
||||
endif()
|
||||
mark_as_advanced( KICAD_USER_CONFIG_DIR )
|
||||
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ if(WIN32 AND NOT CYGWIN)
|
|||
find_library(LIB_EAY
|
||||
NAMES
|
||||
${LIB_EAY_NAMES}
|
||||
${_OPENSLL_ROOT_HINTS_AND_PATHS}
|
||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||
PATH_SUFFIXES
|
||||
"lib"
|
||||
"lib/MinGW"
|
||||
|
|
@ -177,7 +177,7 @@ if(WIN32 AND NOT CYGWIN)
|
|||
find_library(SSL_EAY
|
||||
NAMES
|
||||
${SSL_EAY_NAMES}
|
||||
${_OPENSLL_ROOT_HINTS_AND_PATHS}
|
||||
${_OPENSSL_ROOT_HINTS_AND_PATHS}
|
||||
PATH_SUFFIXES
|
||||
"lib"
|
||||
"lib/MinGW"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Compiling KiCad from Source
|
||||
===========================
|
||||
KiCad Documentation Team
|
||||
Last revised on 12-mars-2012 by jp Charras
|
||||
Last revised on 2014-december-24 by JP Charras
|
||||
|
||||
Introduction
|
||||
------------
|
||||
|
|
@ -32,7 +32,7 @@ KiCad from source.
|
|||
* CMake - Cross-platform make
|
||||
* GLUT - The OpenGL Utility Library
|
||||
* GLEW
|
||||
* wxGTK or wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings
|
||||
* wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings version 3.0 or more
|
||||
* libbz2 (dev)
|
||||
* libcairo (dev)
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ 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 at least (possibly the 4.7.x series) is known to
|
||||
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.
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ WARNING:
|
|||
see wxWidgets_patch_notes.txt for patches and issues in wxWidgets.
|
||||
|
||||
On Windows, download
|
||||
http://sourceforge.net/projects/wxwindows/files/3.0.0/wxWidgets-3.0.0.zip/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.
|
||||
|
|
@ -95,6 +95,10 @@ 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.
|
||||
|
||||
Note also wxWidgets must be compiled with the wxWebView support.
|
||||
This is the default when building wxWidgets, but only if the libwebkitgtk-dev is installed
|
||||
before building wxWidgets (sudo apt-get install libwebkitgtk-dev)
|
||||
|
||||
Install CMake
|
||||
-------------
|
||||
On windows, download the installation binary for windows from cmake.org.
|
||||
|
|
@ -167,9 +171,12 @@ Linux and windows users both then make two "out of source" build directories:
|
|||
|
||||
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 ../../
|
||||
|
|
|
|||
|
|
@ -100,9 +100,12 @@ 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 in menu
|
||||
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)
|
||||
|
|
@ -138,6 +141,7 @@ 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)
|
||||
|
|
@ -147,6 +151,8 @@ 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)
|
||||
|
|
@ -156,6 +162,7 @@ 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)
|
||||
|
|
@ -169,11 +176,21 @@ different path, set this variable to the desired path.
|
|||
|
||||
BUILD_GITHUB_PLUGIN (ON/OFF)
|
||||
----------------------------
|
||||
Default: OFF
|
||||
Default: ON
|
||||
|
||||
This option enables or disables building KiCad with a pcbnew plugin for loading
|
||||
footprints from a GitHub repository.
|
||||
|
||||
KICAD_USE_WEBKIT (ON/OFF)
|
||||
----------------------------
|
||||
Default: ON (and OFF when BUILD_GITHUB_PLUGIN is OFF)
|
||||
|
||||
This option enables or disables building a web viewer used if the
|
||||
footprint library table wizard to easily add footprints library entries
|
||||
to this tables when libraries are on a GitHub repository.
|
||||
This option need the full support of wxWebview/WebKit in wxWidgets, which is not
|
||||
always the case on Linux.
|
||||
|
||||
|
||||
KICAD_REPO_NAME (STRING)
|
||||
------------------------
|
||||
|
|
|
|||
|
|
@ -85,16 +85,18 @@ void EDA_DRAW_FRAME::Process_PageSettings( wxCommandEvent& event )
|
|||
}
|
||||
|
||||
|
||||
DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ) :
|
||||
DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ) :
|
||||
DIALOG_PAGES_SETTINGS_BASE( parent ),
|
||||
m_initialized( false )
|
||||
{
|
||||
m_parent = parent;
|
||||
m_screen = m_parent->GetScreen();
|
||||
m_projectPath = Prj().GetProjectPath();
|
||||
m_page_bitmap = NULL;
|
||||
m_tb = m_parent->GetTitleBlock();
|
||||
m_customFmt = false;
|
||||
m_localPrjConfigChanged = false;
|
||||
m_pagelayout = NULL;
|
||||
|
||||
initDialog();
|
||||
|
||||
|
|
@ -105,8 +107,8 @@ DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent ) :
|
|||
|
||||
DIALOG_PAGES_SETTINGS::~DIALOG_PAGES_SETTINGS()
|
||||
{
|
||||
if( m_page_bitmap )
|
||||
delete m_page_bitmap;
|
||||
delete m_page_bitmap;
|
||||
delete m_pagelayout;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -225,7 +227,7 @@ void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event )
|
|||
m_screen->SetModify();
|
||||
m_parent->GetCanvas()->Refresh();
|
||||
|
||||
if( m_localPrjConfigChanged )
|
||||
if( LocalPrjConfigChanged() )
|
||||
m_parent->SaveProjectSettings( true );
|
||||
|
||||
EndModal( true );
|
||||
|
|
@ -409,9 +411,12 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
|
|||
|
||||
if( fileName != BASE_SCREEN::m_PageLayoutDescrFileName )
|
||||
{
|
||||
if( !fileName.IsEmpty() )
|
||||
wxString fullFileName =
|
||||
WORKSHEET_LAYOUT::MakeFullFileName( fileName, m_projectPath );
|
||||
|
||||
if( !fullFileName.IsEmpty() )
|
||||
{
|
||||
wxString fullFileName = WORKSHEET_LAYOUT::MakeFullFileName( fileName );
|
||||
|
||||
if( !wxFileExists( fullFileName ) )
|
||||
{
|
||||
wxString msg;
|
||||
|
|
@ -424,7 +429,7 @@ bool DIALOG_PAGES_SETTINGS::SavePageSettings()
|
|||
|
||||
BASE_SCREEN::m_PageLayoutDescrFileName = fileName;
|
||||
WORKSHEET_LAYOUT& pglayout = WORKSHEET_LAYOUT::GetTheInstance();
|
||||
pglayout.SetPageLayout( fileName );
|
||||
pglayout.SetPageLayout( fullFileName );
|
||||
m_localPrjConfigChanged = true;
|
||||
}
|
||||
|
||||
|
|
@ -663,6 +668,7 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample()
|
|||
wxString emptyString;
|
||||
GRResetPenAndBrush( &memDC );
|
||||
|
||||
WORKSHEET_LAYOUT::SetAltInstance( m_pagelayout );
|
||||
DrawPageLayout( &memDC, NULL, pageDUMMY,
|
||||
emptyString, emptyString,
|
||||
m_tb, m_screen->m_NumberOfScreens,
|
||||
|
|
@ -670,6 +676,7 @@ void DIALOG_PAGES_SETTINGS::UpdatePageLayoutExample()
|
|||
|
||||
memDC.SelectObject( wxNullBitmap );
|
||||
m_PageLayoutExampleBitmap->SetBitmap( *m_page_bitmap );
|
||||
WORKSHEET_LAYOUT::SetAltInstance( NULL );
|
||||
|
||||
// Refresh the dialog.
|
||||
Layout();
|
||||
|
|
@ -782,11 +789,9 @@ void DIALOG_PAGES_SETTINGS::GetCustomSizeMilsFromDialog()
|
|||
// Called on .kicad_wks file description selection change
|
||||
void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
|
||||
{
|
||||
wxString pro_dir = wxPathOnly( Prj().GetProjectFullName() );
|
||||
|
||||
// Display a file picker dialog
|
||||
wxFileDialog fileDialog( this, _( "Select Page Layout Descr File" ),
|
||||
pro_dir, GetWksFileName(),
|
||||
m_projectPath, GetWksFileName(),
|
||||
PageLayoutDescrFileWildcard,
|
||||
wxFD_DEFAULT_STYLE | wxFD_FILE_MUST_EXIST );
|
||||
|
||||
|
|
@ -796,24 +801,30 @@ void DIALOG_PAGES_SETTINGS::OnWksFileSelection( wxCommandEvent& event )
|
|||
wxString fileName = fileDialog.GetPath();
|
||||
|
||||
// Try to remove the path, if the path is the current working dir,
|
||||
// or the dir of kicad.pro (template)
|
||||
wxString shortFileName = WORKSHEET_LAYOUT::MakeShortFileName( fileName );
|
||||
wxFileName fn = shortFileName;
|
||||
// or the dir of kicad.pro (template), and use a relative path
|
||||
wxString shortFileName = WORKSHEET_LAYOUT::MakeShortFileName( fileName, m_projectPath );
|
||||
|
||||
// For Win/Linux/macOS compatibility, a relative path is a good idea
|
||||
if( fn.IsAbsolute() && fileName != GetWksFileName() )
|
||||
if( shortFileName != GetWksFileName() && shortFileName != fileName )
|
||||
{
|
||||
fn.MakeRelativeTo( pro_dir );
|
||||
|
||||
wxString msg = wxString::Format( _(
|
||||
"The page layout descr filename has changed.\n"
|
||||
"Do you want to use the relative path:\n"
|
||||
"'%s'" ),
|
||||
GetChars( fn.GetFullPath() )
|
||||
);
|
||||
if( IsOK( this, msg ) )
|
||||
shortFileName = fn.GetFullPath();
|
||||
"'%s'\n"
|
||||
"instead of\n"
|
||||
"'%s'" ), GetChars( shortFileName ), GetChars( fileName ) );
|
||||
|
||||
if( !IsOK( this, msg ) )
|
||||
shortFileName = fileName;
|
||||
}
|
||||
|
||||
SetWksFileName( shortFileName );
|
||||
|
||||
if( m_pagelayout == NULL )
|
||||
m_pagelayout = new WORKSHEET_LAYOUT;
|
||||
|
||||
m_pagelayout->SetPageLayout( fileName );
|
||||
|
||||
GetPageLayoutInfoFromDialog();
|
||||
UpdatePageLayoutExample();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ class DIALOG_PAGES_SETTINGS: public DIALOG_PAGES_SETTINGS_BASE
|
|||
private:
|
||||
EDA_DRAW_FRAME* m_parent;
|
||||
BASE_SCREEN* m_screen;
|
||||
wxString m_projectPath; // the curr project path
|
||||
wxArrayString m_pageFmt; /// list of page sizes (not translated)
|
||||
bool m_initialized;
|
||||
bool m_localPrjConfigChanged; /// the page layuout filename was changed
|
||||
|
|
@ -45,6 +46,8 @@ private:
|
|||
PAGE_INFO m_pageInfo; /// Temporary page info.
|
||||
bool m_customFmt; /// true if the page selection is custom
|
||||
TITLE_BLOCK m_tb; /// Temporary title block (basic inscriptions).
|
||||
WORKSHEET_LAYOUT *m_pagelayout; // the alternate and temporary page layout shown by the dialog
|
||||
// when the initial one is replaced by a new one
|
||||
|
||||
public:
|
||||
DIALOG_PAGES_SETTINGS( EDA_DRAW_FRAME* parent );
|
||||
|
|
|
|||
|
|
@ -36,3 +36,5 @@ tstamps
|
|||
uri
|
||||
value
|
||||
version
|
||||
aliases
|
||||
alias
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@
|
|||
|
||||
// The layout shape used in the application
|
||||
// It is accessible by WORKSHEET_LAYOUT::GetTheInstance()
|
||||
WORKSHEET_LAYOUT wksTheInstance;
|
||||
static WORKSHEET_LAYOUT wksTheInstance;
|
||||
static WORKSHEET_LAYOUT* wksAltInstance;
|
||||
|
||||
WORKSHEET_LAYOUT::WORKSHEET_LAYOUT()
|
||||
{
|
||||
|
|
@ -71,6 +72,28 @@ WORKSHEET_LAYOUT::WORKSHEET_LAYOUT()
|
|||
m_bottomMargin = 10.0; // the bottom page margin in mm
|
||||
}
|
||||
|
||||
/* static function: returns the instance of WORKSHEET_LAYOUT
|
||||
* used in the application
|
||||
*/
|
||||
WORKSHEET_LAYOUT& WORKSHEET_LAYOUT::GetTheInstance()
|
||||
{
|
||||
if( wksAltInstance )
|
||||
return *wksAltInstance;
|
||||
else
|
||||
return wksTheInstance;
|
||||
}
|
||||
|
||||
/**
|
||||
* static function: Set an alternate instance of WORKSHEET_LAYOUT
|
||||
* mainly used in page setting dialog
|
||||
* @param aLayout = the alternate page layout.
|
||||
* if null, restore the basic page layout
|
||||
*/
|
||||
void WORKSHEET_LAYOUT::SetAltInstance( WORKSHEET_LAYOUT* aLayout )
|
||||
{
|
||||
wksAltInstance = aLayout;
|
||||
}
|
||||
|
||||
|
||||
void WORKSHEET_LAYOUT::SetLeftMargin( double aMargin )
|
||||
{
|
||||
|
|
@ -163,10 +186,22 @@ WORKSHEET_DATAITEM* WORKSHEET_LAYOUT::GetItem( unsigned aIdx ) const
|
|||
}
|
||||
|
||||
|
||||
const wxString WORKSHEET_LAYOUT::MakeShortFileName( const wxString& aFullFileName )
|
||||
const wxString WORKSHEET_LAYOUT::MakeShortFileName( const wxString& aFullFileName,
|
||||
const wxString& aProjectPath )
|
||||
{
|
||||
wxFileName fn = aFullFileName;
|
||||
wxString shortFileName = aFullFileName;
|
||||
wxFileName fn = aFullFileName;
|
||||
|
||||
if( fn.IsRelative() )
|
||||
return shortFileName;
|
||||
|
||||
if( ! aProjectPath.IsEmpty() && aFullFileName.StartsWith( aProjectPath ) )
|
||||
{
|
||||
fn.MakeRelativeTo( aProjectPath );
|
||||
shortFileName = fn.GetFullPath();
|
||||
return shortFileName;
|
||||
}
|
||||
|
||||
wxString fileName = Kiface().KifaceSearch().FindValidPath( fn.GetFullName() );
|
||||
|
||||
if( !fileName.IsEmpty() )
|
||||
|
|
@ -180,17 +215,34 @@ const wxString WORKSHEET_LAYOUT::MakeShortFileName( const wxString& aFullFileNam
|
|||
}
|
||||
|
||||
|
||||
const wxString WORKSHEET_LAYOUT::MakeFullFileName( const wxString& aShortFileName )
|
||||
const wxString WORKSHEET_LAYOUT::MakeFullFileName( const wxString& aShortFileName,
|
||||
const wxString& aProjectPath )
|
||||
{
|
||||
wxFileName fn = aShortFileName;
|
||||
wxString fullFileName = aShortFileName;
|
||||
wxString fullFileName = ExpandEnvVarSubstitutions( aShortFileName );
|
||||
|
||||
if( fn.GetPath().IsEmpty() && !fn.GetFullName().IsEmpty() )
|
||||
if( fullFileName.IsEmpty() )
|
||||
return fullFileName;
|
||||
|
||||
wxFileName fn = fullFileName;
|
||||
|
||||
if( fn.IsAbsolute() )
|
||||
return fullFileName;
|
||||
|
||||
// the path is not absolute: search it in project path, and then in
|
||||
// kicad valid paths
|
||||
if( !aProjectPath.IsEmpty() )
|
||||
{
|
||||
wxString name = Kiface().KifaceSearch().FindValidPath( fn.GetFullName() );
|
||||
if( !name.IsEmpty() )
|
||||
fullFileName = name;
|
||||
fn.MakeAbsolute( aProjectPath );
|
||||
|
||||
if( wxFileExists( fn.GetFullPath() ) )
|
||||
return fn.GetFullPath();
|
||||
}
|
||||
|
||||
fn = fullFileName;
|
||||
wxString name = Kiface().KifaceSearch().FindValidPath( fn.GetFullName() );
|
||||
|
||||
if( !name.IsEmpty() )
|
||||
fullFileName = name;
|
||||
|
||||
return fullFileName;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -773,9 +773,9 @@ void WORKSHEET_LAYOUT::SetPageLayout( const char* aPageLayout, bool Append )
|
|||
|
||||
#include <wx/file.h>
|
||||
|
||||
// SetLayout() try to load a custom layout file,
|
||||
// currently defined by the environment variable KICAD_WKSFILE
|
||||
// (a *.kicad_wks file).
|
||||
// SetLayout() try to load the aFullFileName custom layout file,
|
||||
// if aFullFileName is empty, try the filename defined by the
|
||||
// environment variable KICAD_WKSFILE (a *.kicad_wks filename).
|
||||
// if does not exists, loads the default page layout.
|
||||
void WORKSHEET_LAYOUT::SetPageLayout( const wxString& aFullFileName, bool Append )
|
||||
{
|
||||
|
|
@ -783,8 +783,6 @@ void WORKSHEET_LAYOUT::SetPageLayout( const wxString& aFullFileName, bool Append
|
|||
|
||||
if( !Append )
|
||||
{
|
||||
fullFileName = MakeFullFileName( aFullFileName );
|
||||
|
||||
if( fullFileName.IsEmpty() )
|
||||
wxGetEnv( wxT( "KICAD_WKSFILE" ), &fullFileName );
|
||||
|
||||
|
|
@ -816,17 +814,19 @@ void WORKSHEET_LAYOUT::SetPageLayout( const wxString& aFullFileName, bool Append
|
|||
|
||||
if( wksFile.Read( buffer, filelen ) != filelen )
|
||||
wxLogMessage( _("The file <%s> was not fully read"),
|
||||
fullFileName.GetData() );
|
||||
fullFileName.GetData() );
|
||||
else
|
||||
{
|
||||
buffer[filelen]=0;
|
||||
|
||||
if( ! Append )
|
||||
ClearList();
|
||||
PAGE_LAYOUT_READER_PARSER lp_parser( buffer, fullFileName );
|
||||
|
||||
PAGE_LAYOUT_READER_PARSER pl_parser( buffer, fullFileName );
|
||||
|
||||
try
|
||||
{
|
||||
lp_parser.Parse( this );
|
||||
pl_parser.Parse( this );
|
||||
}
|
||||
catch( const IO_ERROR& ioe )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
|
|||
// Attempt to determine where the 3D shape libraries were installed using the
|
||||
// legacy path:
|
||||
// on Unix: /usr/local/kicad/share/modules/packages3d
|
||||
// oor /usr/local/kicad/share/kicad/modules/packages3d
|
||||
// or /usr/share/kicad/modules/packages3d
|
||||
// On Windows: bin../share/modules/packages3d
|
||||
wxString relpath( wxT( "modules/" ) );
|
||||
|
|
@ -112,6 +113,16 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
|
|||
return true;
|
||||
}
|
||||
|
||||
path.Empty();
|
||||
wxGetEnv( wxT("HOME"), &path );
|
||||
path += wxT("/kicad/share/kicad/") + relpath;
|
||||
|
||||
if( wxFileName::DirExists( path ) )
|
||||
{
|
||||
wxSetEnv( aKiSys3Dmod, path );
|
||||
return true;
|
||||
}
|
||||
|
||||
// Try the standard install path:
|
||||
path = wxT("/usr/local/kicad/share/") + relpath;
|
||||
|
||||
|
|
@ -121,6 +132,14 @@ bool Set3DShapesDefaultPath( const wxString& aKiSys3Dmod, const PGM_BASE* aProce
|
|||
return true;
|
||||
}
|
||||
|
||||
// Try the new standard install path:
|
||||
path = wxT("/usr/local/kicad/share/kicad/") + relpath;
|
||||
|
||||
if( wxFileName::DirExists( path ) )
|
||||
{
|
||||
wxSetEnv( aKiSys3Dmod, path );
|
||||
return true;
|
||||
}
|
||||
// Try the official distrib standard install path:
|
||||
path = wxT("/usr/share/kicad/") + relpath;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ set( CVPCB_DIALOGS
|
|||
../pcbnew/dialogs/dialog_fp_plugin_options_base.cpp
|
||||
../pcbnew/dialogs/wizard_add_fplib_base.cpp
|
||||
../pcbnew/dialogs/wizard_add_fplib.cpp
|
||||
../pcbnew/dialogs/dialog_select_dirlist_base.cpp
|
||||
)
|
||||
|
||||
set( CVPCB_SRCS
|
||||
|
|
|
|||
|
|
@ -438,25 +438,39 @@ void CVPCB_MAINFRAME::LoadNetList( wxCommandEvent& event )
|
|||
|
||||
bool CVPCB_MAINFRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, int aCtl )
|
||||
{
|
||||
if( aFileSet.size() == 1 )
|
||||
if( aFileSet.size() != 1 ) // Unexpected comand
|
||||
return false;
|
||||
|
||||
m_NetlistFileName = aFileSet[0];
|
||||
ReadNetListAndLinkFiles();
|
||||
|
||||
UpdateTitle();
|
||||
|
||||
// Resize the components list box. This is needed in case the
|
||||
// contents have shrunk compared to the previous netlist.
|
||||
m_compListBox->UpdateWidth();
|
||||
|
||||
// OSX need it since some objects are "rebuild" just make aware AUI
|
||||
// Fixes #1258081
|
||||
m_auimgr.Update();
|
||||
|
||||
if( Kiface().IsSingle() )
|
||||
{
|
||||
m_NetlistFileName = aFileSet[0];
|
||||
ReadNetListAndLinkFiles();
|
||||
// PROJECT::SetProjectFullName() is an impactful function. It should only be
|
||||
// called under carefully considered circumstances.
|
||||
|
||||
UpdateTitle();
|
||||
|
||||
// Resize the components list box. This is needed in case the
|
||||
// contents have shrunk compared to the previous netlist.
|
||||
m_compListBox->UpdateWidth();
|
||||
|
||||
// OSX need it since some objects are "rebuild" just make aware AUI
|
||||
// Fixes #1258081
|
||||
m_auimgr.Update();
|
||||
|
||||
return true;
|
||||
// The calling code should know not to ask me here to change projects unless
|
||||
// it knows what consequences that will have on other KIFACEs running and using
|
||||
// this same PROJECT. It can be very harmful if that calling code is stupid.
|
||||
//
|
||||
// In Cvpcb, we call SetProjectFullName only in Single mode, i.e. it is not
|
||||
// called from a project
|
||||
wxFileName pro = m_NetlistFileName;
|
||||
pro.SetExt( ProjectFileExtension );
|
||||
Prj().SetProjectFullName( pro.GetFullPath() );
|
||||
}
|
||||
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -64,50 +64,49 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
|
|||
// Menu File:
|
||||
wxMenu* filesMenu = new wxMenu;
|
||||
|
||||
// Open
|
||||
AddMenuItem( filesMenu,
|
||||
ID_LOAD_PROJECT,
|
||||
_( "&Open Netlist" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
|
||||
// Open files can be used only outside a project, because opening a netlist
|
||||
// which is not the project netlist is a non sense.
|
||||
if( Kiface().IsSingle() )
|
||||
{
|
||||
AddMenuItem( filesMenu, ID_LOAD_PROJECT,
|
||||
_( "&Open Netlist" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
|
||||
|
||||
// Open Recent submenu
|
||||
static wxMenu* openRecentMenu;
|
||||
// Open Recent submenu
|
||||
static wxMenu* openRecentMenu;
|
||||
|
||||
// Add this menu to list menu managed by m_fileHistory
|
||||
// (the file history will be updated when adding/removing files in history
|
||||
if( openRecentMenu )
|
||||
Kiface().GetFileHistory().RemoveMenu( openRecentMenu );
|
||||
// Add this menu to list menu managed by m_fileHistory
|
||||
// (the file history will be updated when adding/removing files in history
|
||||
if( openRecentMenu )
|
||||
Kiface().GetFileHistory().RemoveMenu( openRecentMenu );
|
||||
|
||||
openRecentMenu = new wxMenu();
|
||||
openRecentMenu = new wxMenu();
|
||||
|
||||
Kiface().GetFileHistory().UseMenu( openRecentMenu );
|
||||
Kiface().GetFileHistory().AddFilesToMenu();
|
||||
Kiface().GetFileHistory().UseMenu( openRecentMenu );
|
||||
Kiface().GetFileHistory().AddFilesToMenu();
|
||||
|
||||
AddMenuItem( filesMenu, openRecentMenu, -1,
|
||||
_( "Open &Recent" ),
|
||||
_( "Open recent netlist" ),
|
||||
KiBitmap( open_project_xpm ) );
|
||||
AddMenuItem( filesMenu, openRecentMenu, -1,
|
||||
_( "Open &Recent" ),
|
||||
_( "Open recent netlist" ),
|
||||
KiBitmap( open_project_xpm ) );
|
||||
|
||||
// Separator
|
||||
filesMenu->AppendSeparator();
|
||||
// Separator
|
||||
filesMenu->AppendSeparator();
|
||||
}
|
||||
|
||||
// Save the .cmp file
|
||||
AddMenuItem( filesMenu,
|
||||
wxID_SAVE,
|
||||
AddMenuItem( filesMenu, wxID_SAVE,
|
||||
_( "&Save\tCtrl+S" ), SAVE_HLP_MSG, KiBitmap( save_xpm ) );
|
||||
|
||||
// Save as the .cmp file
|
||||
AddMenuItem( filesMenu,
|
||||
wxID_SAVEAS,
|
||||
AddMenuItem( filesMenu, wxID_SAVEAS,
|
||||
_( "Save &As...\tCtrl+Shift+S" ), SAVE_AS_HLP_MSG, KiBitmap( save_xpm ) );
|
||||
|
||||
// Separator
|
||||
filesMenu->AppendSeparator();
|
||||
|
||||
// Quit
|
||||
AddMenuItem( filesMenu,
|
||||
wxID_EXIT,
|
||||
_( "&Quit" ),
|
||||
_( "Quit CvPcb" ),
|
||||
AddMenuItem( filesMenu, wxID_EXIT,
|
||||
_( "&Quit" ), _( "Quit CvPcb" ),
|
||||
KiBitmap( exit_xpm ) );
|
||||
|
||||
// Menu Preferences:
|
||||
|
|
|
|||
|
|
@ -49,8 +49,13 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
|
|||
m_mainToolBar = new wxAuiToolBar( this, ID_H_TOOLBAR, wxDefaultPosition, wxDefaultSize,
|
||||
wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_HORZ_LAYOUT );
|
||||
|
||||
m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
|
||||
KiBitmap( open_document_xpm ), LOAD_FILE_HELP );
|
||||
// Open files can be used only outside a project, because opening a netlist
|
||||
// which is not the project netlist is a non sense.
|
||||
if( Kiface().IsSingle() )
|
||||
{
|
||||
m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
|
||||
KiBitmap( open_document_xpm ), LOAD_FILE_HELP );
|
||||
}
|
||||
|
||||
m_mainToolBar->AddTool( wxID_SAVE, wxEmptyString, KiBitmap( save_xpm ), SAVE_HLP_MSG );
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
|
|||
ENDDRAW
|
||||
ENDDEF
|
||||
#
|
||||
# CONN_1
|
||||
#
|
||||
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
|
||||
X 1 1 -150 0 100 R 60 60 1 1 P
|
||||
ENDDRAW
|
||||
ENDDEF
|
||||
#
|
||||
# CONN_2
|
||||
#
|
||||
DEF CONN_2 P 0 40 Y N 1 F N
|
||||
|
|
|
|||
|
|
@ -1,80 +1,108 @@
|
|||
Cmp-Mod V01 Genere par PcbNew le 11/12/2006-20:19:14
|
||||
Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:02:29
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F4BE;
|
||||
TimeStamp = /4549F4BE;
|
||||
Reference = C1;
|
||||
ValeurCmp = 10uF;
|
||||
IdModule = C2V10;
|
||||
IdModule = discret:C2V10;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F3BE;
|
||||
TimeStamp = /4549F3BE;
|
||||
Reference = C2;
|
||||
ValeurCmp = 680nF;
|
||||
IdModule = CP8;
|
||||
IdModule = discret:C2;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F464;
|
||||
TimeStamp = /4549F464;
|
||||
Reference = P1;
|
||||
ValeurCmp = IN;
|
||||
IdModule = BORNIER2;
|
||||
IdModule = connect:bornier2;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F46C;
|
||||
TimeStamp = /4549F46C;
|
||||
Reference = P2;
|
||||
ValeurCmp = OUT;
|
||||
IdModule = BORNIER2;
|
||||
IdModule = connect:bornier2;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F4A5;
|
||||
TimeStamp = /4549F4A5;
|
||||
Reference = P3;
|
||||
ValeurCmp = POWER;
|
||||
IdModule = BORNIER2;
|
||||
IdModule = connect:bornier2;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 456A8ACC;
|
||||
TimeStamp = /456A8ACC;
|
||||
Reference = P4;
|
||||
ValeurCmp = CONN_2;
|
||||
IdModule = BORNIER2;
|
||||
IdModule = connect:bornier2;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F38A;
|
||||
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 = R3;
|
||||
IdModule = discret:R3;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F39D;
|
||||
TimeStamp = /4549F39D;
|
||||
Reference = R2;
|
||||
ValeurCmp = 1.5K;
|
||||
IdModule = R3;
|
||||
IdModule = discret:R3;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F3AD;
|
||||
TimeStamp = /4549F3AD;
|
||||
Reference = R3;
|
||||
ValeurCmp = 100K;
|
||||
IdModule = R3;
|
||||
IdModule = discret:R3;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 4549F3A2;
|
||||
TimeStamp = /4549F3A2;
|
||||
Reference = R4;
|
||||
ValeurCmp = 47K;
|
||||
IdModule = R3;
|
||||
IdModule = discret:R3;
|
||||
EndCmp
|
||||
|
||||
BeginCmp
|
||||
TimeStamp = 454A08DD;
|
||||
TimeStamp = /48B4F266;
|
||||
Reference = U1;
|
||||
ValeurCmp = ECC83;
|
||||
IdModule = ECC-83-1;
|
||||
IdModule = Valves:VALVE-ECC-83-1;
|
||||
EndCmp
|
||||
|
||||
EndListe
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,65 +1,95 @@
|
|||
(export (version D)
|
||||
(design
|
||||
(source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp.sch)
|
||||
(date "04/07/2014 20:15:10")
|
||||
(tool "Eeschema (2014-07-02 BZR 4969)-product"))
|
||||
(date "01/01/2015 18:01:45")
|
||||
(tool "Eeschema (2014-12-31 BZR 5344)-product"))
|
||||
(components
|
||||
(comp (ref U1)
|
||||
(value ECC83)
|
||||
(footprint VALVE-NOVAL_P)
|
||||
(footprint Valves:VALVE-ECC-83-1)
|
||||
(libsource (lib valves) (part ECC83))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 48B4F266))
|
||||
(comp (ref P4)
|
||||
(value CONN_2)
|
||||
(footprint connect:bornier2)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 456A8ACC))
|
||||
(comp (ref C1)
|
||||
(value 10uF)
|
||||
(footprint discret:C2V10)
|
||||
(libsource (lib device) (part C))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F4BE))
|
||||
(comp (ref P3)
|
||||
(value POWER)
|
||||
(footprint connect:bornier2)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F4A5))
|
||||
(comp (ref P2)
|
||||
(value OUT)
|
||||
(footprint connect:bornier2)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F46C))
|
||||
(comp (ref P1)
|
||||
(value IN)
|
||||
(footprint connect:bornier2)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F464))
|
||||
(comp (ref C2)
|
||||
(value 680nF)
|
||||
(footprint discret:C2)
|
||||
(libsource (lib device) (part C))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F3BE))
|
||||
(comp (ref R3)
|
||||
(value 100K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F3AD))
|
||||
(comp (ref R4)
|
||||
(value 47K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F3A2))
|
||||
(comp (ref R2)
|
||||
(value 1.5K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F39D))
|
||||
(comp (ref R1)
|
||||
(value 1.5K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F38A)))
|
||||
(tstamp 4549F38A))
|
||||
(comp (ref P5)
|
||||
(value CONN_1)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A5890A))
|
||||
(comp (ref P6)
|
||||
(value CONN_1)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A58C65))
|
||||
(comp (ref P7)
|
||||
(value CONN_1)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A58C8A))
|
||||
(comp (ref P8)
|
||||
(value CONN_1)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A58CA3)))
|
||||
(libparts
|
||||
(libpart (lib device) (part C)
|
||||
(description "Condensateur non polarise")
|
||||
|
|
@ -87,6 +117,13 @@
|
|||
(pins
|
||||
(pin (num 1) (name ~) (type passive))
|
||||
(pin (num 2) (name ~) (type passive))))
|
||||
(libpart (lib conn) (part CONN_1)
|
||||
(description "1 pin")
|
||||
(fields
|
||||
(field (name Reference) P)
|
||||
(field (name Value) CONN_1))
|
||||
(pins
|
||||
(pin (num 1) (name 1) (type passive))))
|
||||
(libpart (lib conn) (part CONN_2)
|
||||
(description "Symbole general de connecteur")
|
||||
(fields
|
||||
|
|
@ -114,47 +151,55 @@
|
|||
(pin (num 9) (name F2) (type power_in)))))
|
||||
(libraries
|
||||
(library (logical device)
|
||||
(uri f:\kicad\share\library\device.lib))
|
||||
(uri f:\kicad\share\kicad\library\device.lib))
|
||||
(library (logical conn)
|
||||
(uri f:\kicad\share\library\conn.lib))
|
||||
(uri f:\kicad\share\kicad\library\conn.lib))
|
||||
(library (logical valves)
|
||||
(uri f:\kicad\share\library\valves.lib)))
|
||||
(uri f:\kicad\share\kicad\library\valves.lib)))
|
||||
(nets
|
||||
(net (code 1) (name "Net-(C1-Pad1)")
|
||||
(node (ref U1) (pin 6))
|
||||
(node (ref C1) (pin 1))
|
||||
(node (ref P3) (pin 1)))
|
||||
(net (code 2) (name "Net-(R2-Pad1)")
|
||||
(node (ref R2) (pin 1))
|
||||
(node (ref U1) (pin 3)))
|
||||
(net (code 3) (name "Net-(C2-Pad2)")
|
||||
(node (ref U1) (pin 8))
|
||||
(node (ref R1) (pin 2))
|
||||
(node (ref C2) (pin 2)))
|
||||
(net (code 4) (name "Net-(C2-Pad1)")
|
||||
(node (ref C2) (pin 1))
|
||||
(node (ref R3) (pin 1))
|
||||
(node (ref P2) (pin 1)))
|
||||
(net (code 5) (name "Net-(P4-Pad2)")
|
||||
(node (ref U1) (pin 9))
|
||||
(node (ref P4) (pin 2)))
|
||||
(net (code 6) (name "Net-(P1-Pad2)")
|
||||
(node (ref U1) (pin 2))
|
||||
(node (ref P1) (pin 2))
|
||||
(node (ref R4) (pin 1)))
|
||||
(net (code 7) (name "Net-(R1-Pad1)")
|
||||
(node (ref R1) (pin 1))
|
||||
(node (ref U1) (pin 1))
|
||||
(node (ref U1) (pin 7)))
|
||||
(net (code 8) (name GND)
|
||||
(net (code 1) (name GND)
|
||||
(node (ref R4) (pin 2))
|
||||
(node (ref R2) (pin 2))
|
||||
(node (ref R3) (pin 2))
|
||||
(node (ref C1) (pin 2))
|
||||
(node (ref P1) (pin 1))
|
||||
(node (ref P2) (pin 2))
|
||||
(node (ref P3) (pin 2))
|
||||
(node (ref R4) (pin 2))
|
||||
(node (ref R2) (pin 2)))
|
||||
(net (code 9) (name "Net-(P4-Pad1)")
|
||||
(node (ref C1) (pin 2)))
|
||||
(net (code 2) (name "Net-(C1-Pad1)")
|
||||
(node (ref U1) (pin 6))
|
||||
(node (ref P3) (pin 1))
|
||||
(node (ref C1) (pin 1)))
|
||||
(net (code 3) (name "Net-(R2-Pad1)")
|
||||
(node (ref U1) (pin 3))
|
||||
(node (ref R2) (pin 1)))
|
||||
(net (code 4) (name "Net-(P8-Pad1)")
|
||||
(node (ref P8) (pin 1)))
|
||||
(net (code 5) (name "Net-(P7-Pad1)")
|
||||
(node (ref P7) (pin 1)))
|
||||
(net (code 6) (name "Net-(P6-Pad1)")
|
||||
(node (ref P6) (pin 1)))
|
||||
(net (code 7) (name "Net-(P5-Pad1)")
|
||||
(node (ref P5) (pin 1)))
|
||||
(net (code 8) (name "Net-(C2-Pad2)")
|
||||
(node (ref U1) (pin 8))
|
||||
(node (ref C2) (pin 2))
|
||||
(node (ref R1) (pin 2)))
|
||||
(net (code 9) (name "Net-(C2-Pad1)")
|
||||
(node (ref C2) (pin 1))
|
||||
(node (ref P2) (pin 1))
|
||||
(node (ref R3) (pin 1)))
|
||||
(net (code 10) (name "Net-(P4-Pad2)")
|
||||
(node (ref U1) (pin 9))
|
||||
(node (ref P4) (pin 2)))
|
||||
(net (code 11) (name "Net-(P1-Pad2)")
|
||||
(node (ref U1) (pin 2))
|
||||
(node (ref R4) (pin 1))
|
||||
(node (ref P1) (pin 2)))
|
||||
(net (code 12) (name "Net-(R1-Pad1)")
|
||||
(node (ref R1) (pin 1))
|
||||
(node (ref U1) (pin 1))
|
||||
(node (ref U1) (pin 7)))
|
||||
(net (code 13) (name "Net-(P4-Pad1)")
|
||||
(node (ref U1) (pin 4))
|
||||
(node (ref U1) (pin 5))
|
||||
(node (ref P4) (pin 1)))))
|
||||
(node (ref P4) (pin 1))
|
||||
(node (ref U1) (pin 5)))))
|
||||
|
|
@ -1,44 +1,19 @@
|
|||
update=07/03/2011 07:10:15
|
||||
last_client=cvpcb
|
||||
update=01/01/2015 18:35:22
|
||||
last_client=kicad
|
||||
[general]
|
||||
version=1
|
||||
RootSch=ecc83-pp.sch
|
||||
BoardNm=ecc83-pp.brd
|
||||
[common]
|
||||
NetDir=
|
||||
[cvpcb]
|
||||
version=1
|
||||
NetIExt=.net
|
||||
[cvpcb/libraries]
|
||||
EquName1=devcms
|
||||
[eeschema]
|
||||
version=1
|
||||
LibDir=
|
||||
NetFmt=1
|
||||
HPGLSpd=20
|
||||
HPGLDm=15
|
||||
HPGLNum=1
|
||||
offX_A4=0
|
||||
offY_A4=0
|
||||
offX_A3=0
|
||||
offY_A3=0
|
||||
offX_A2=0
|
||||
offY_A2=0
|
||||
offX_A1=0
|
||||
offY_A1=0
|
||||
offX_A0=0
|
||||
offY_A0=0
|
||||
offX_A=0
|
||||
offY_A=0
|
||||
offX_B=0
|
||||
offY_B=0
|
||||
offX_C=0
|
||||
offY_C=0
|
||||
offX_D=0
|
||||
offY_D=0
|
||||
offX_E=0
|
||||
offY_E=0
|
||||
RptD_X=0
|
||||
RptD_Y=100
|
||||
RptLab=1
|
||||
PenMin=20
|
||||
SimCmd=
|
||||
UseNetN=0
|
||||
[eeschema/libraries]
|
||||
LibName1=power
|
||||
LibName2=device
|
||||
|
|
@ -46,55 +21,24 @@ LibName3=conn
|
|||
LibName4=valves
|
||||
LibName5=linear
|
||||
LibName6=regul
|
||||
LibName7=74xx
|
||||
LibName8=cmos4000
|
||||
LibName9=adc-dac
|
||||
LibName10=memory
|
||||
LibName11=xilinx
|
||||
LibName12=special
|
||||
LibName13=microcontrollers
|
||||
LibName14=microchip
|
||||
LibName15=analog_switches
|
||||
LibName16=motorola
|
||||
LibName17=intel
|
||||
LibName18=audio
|
||||
LibName19=interface
|
||||
LibName20=digital-audio
|
||||
LibName21=philips
|
||||
LibName22=display
|
||||
LibName23=cypress
|
||||
LibName24=siliconi
|
||||
LibName25=contrib
|
||||
LibName7=special
|
||||
[pcbnew]
|
||||
version=1
|
||||
PadDrlX=760
|
||||
PadDimH=1100
|
||||
PadDimV=550
|
||||
BoardThickness=630
|
||||
SgPcb45=1
|
||||
TxtPcbV=800
|
||||
TxtPcbH=600
|
||||
TxtModV=600
|
||||
TxtModH=600
|
||||
TxtModW=120
|
||||
VEgarde=100
|
||||
DrawLar=150
|
||||
EdgeLar=150
|
||||
TxtLar=120
|
||||
MSegLar=150
|
||||
PageLayoutDescrFile=
|
||||
LastNetListRead=
|
||||
[pcbnew/libraries]
|
||||
LibName1=dip_sockets
|
||||
LibName2=valves
|
||||
LibName3=connect
|
||||
LibName4=discret
|
||||
LibName5=pin_array
|
||||
LibName6=divers
|
||||
LibName7=libcms
|
||||
LibName8=display
|
||||
LibDir=
|
||||
[cvpcb]
|
||||
version=1
|
||||
NetIExt=.net
|
||||
[cvpcb/libraries]
|
||||
EquName1=devcms
|
||||
UseCmpFile=1
|
||||
PadDrill=1.9304
|
||||
PadDrillOvalY=1.9304
|
||||
PadSizeH=2.794
|
||||
PadSizeV=1.397
|
||||
PcbTextSizeV=2.032
|
||||
PcbTextSizeH=1.524
|
||||
PcbTextThickness=0.3048
|
||||
ModuleTextSizeV=1.524
|
||||
ModuleTextSizeH=1.524
|
||||
ModuleTextSizeThickness=0.3048
|
||||
SolderMaskClearance=0.09999999999999999
|
||||
SolderMaskMinWidth=0
|
||||
DrawSegmentWidth=0.381
|
||||
BoardOutlineThickness=0.381
|
||||
ModuleOutlineThickness=0.381
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@ LIBS:display
|
|||
LIBS:cypress
|
||||
LIBS:siliconi
|
||||
LIBS:contrib
|
||||
EELAYER 24 0
|
||||
LIBS:ecc83-pp-cache
|
||||
EELAYER 25 0
|
||||
EELAYER END
|
||||
$Descr A4 11693 8268
|
||||
encoding utf-8
|
||||
|
|
@ -39,291 +40,335 @@ Comment3 ""
|
|||
Comment4 ""
|
||||
$EndDescr
|
||||
Wire Wire Line
|
||||
6050 4450 6150 4450
|
||||
6250 3900 6350 3900
|
||||
Wire Wire Line
|
||||
5750 3850 5750 4050
|
||||
Connection ~ 4450 4500
|
||||
5950 3300 5950 3500
|
||||
Connection ~ 4650 3950
|
||||
Wire Wire Line
|
||||
4450 4450 4450 5400
|
||||
4650 3900 4650 4850
|
||||
Wire Wire Line
|
||||
4450 4450 4650 4450
|
||||
4650 3900 4850 3900
|
||||
Wire Wire Line
|
||||
1800 6650 1900 6650
|
||||
1950 4950 2050 4950
|
||||
Wire Wire Line
|
||||
1900 6650 1900 6450
|
||||
2050 4950 2050 4750
|
||||
Wire Wire Line
|
||||
4150 5000 4150 5300
|
||||
4350 4450 4350 4750
|
||||
Wire Wire Line
|
||||
6950 5150 6950 5000
|
||||
7150 4600 7150 4450
|
||||
Wire Wire Line
|
||||
4150 4800 4450 4800
|
||||
Connection ~ 4450 4800
|
||||
4350 4250 4650 4250
|
||||
Connection ~ 4650 4250
|
||||
Wire Wire Line
|
||||
6950 4150 6950 4050
|
||||
7150 3600 7150 3500
|
||||
Wire Wire Line
|
||||
4850 4850 4850 5400
|
||||
5050 4300 5050 4850
|
||||
Wire Wire Line
|
||||
6300 3900 6300 4000
|
||||
6500 3350 6500 3450
|
||||
Wire Wire Line
|
||||
5750 3850 6950 3850
|
||||
Connection ~ 6700 3850
|
||||
5950 3300 7150 3300
|
||||
Connection ~ 6900 3300
|
||||
Wire Wire Line
|
||||
6150 4450 6150 3900
|
||||
Connection ~ 6150 3900
|
||||
6350 3900 6350 3350
|
||||
Connection ~ 6350 3350
|
||||
Wire Wire Line
|
||||
6300 4500 6300 4900
|
||||
Connection ~ 6300 4800
|
||||
6500 3950 6500 4350
|
||||
Connection ~ 6500 4250
|
||||
Wire Wire Line
|
||||
6950 4800 6700 4800
|
||||
7150 4250 6900 4250
|
||||
Wire Wire Line
|
||||
6700 4800 6700 5400
|
||||
6900 4250 6900 4850
|
||||
Wire Wire Line
|
||||
2000 6450 2000 6650
|
||||
2150 4750 2150 4950
|
||||
Wire Wire Line
|
||||
2000 6550 1800 6550
|
||||
Connection ~ 2000 6550
|
||||
2150 4850 1950 4850
|
||||
Connection ~ 2150 4850
|
||||
Wire Wire Line
|
||||
4100 5250 4150 5250
|
||||
Connection ~ 4150 5250
|
||||
4300 4700 4350 4700
|
||||
Connection ~ 4350 4700
|
||||
Wire Wire Line
|
||||
1800 6550 1800 6450
|
||||
1950 4850 1950 4750
|
||||
Wire Wire Line
|
||||
4950 3900 6300 3900
|
||||
5150 3350 6500 3350
|
||||
Wire Wire Line
|
||||
4950 3900 4950 4050
|
||||
5150 3350 5150 3500
|
||||
Wire Wire Line
|
||||
5850 4850 5850 4900
|
||||
6050 4300 6050 4350
|
||||
Wire Wire Line
|
||||
5850 4900 6300 4900
|
||||
6050 4350 6500 4350
|
||||
$Comp
|
||||
L ECC83 U1
|
||||
U 3 1 48B4F266
|
||||
P 1900 6000
|
||||
F 0 "U1" H 2030 6310 50 0000 C CNN
|
||||
F 1 "ECC83" H 2250 5700 50 0000 C CNN
|
||||
F 2 "VALVE-NOVAL_P" H 2170 5600 50 0001 C CNN
|
||||
F 3 "" H 1900 6000 60 0001 C CNN
|
||||
3 1900 6000
|
||||
P 2050 4300
|
||||
F 0 "U1" H 2180 4610 50 0000 C CNN
|
||||
F 1 "ECC83" H 2400 4000 50 0000 C CNN
|
||||
F 2 "Valves:VALVE-ECC-83-1" V 1800 4300 30 0000 C CNN
|
||||
F 3 "" H 2050 4300 60 0001 C CNN
|
||||
3 2050 4300
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L ECC83 U1
|
||||
U 2 1 48B4F263
|
||||
P 4950 4450
|
||||
F 0 "U1" H 5080 4760 50 0000 C CNN
|
||||
F 1 "ECC83" H 5150 4100 50 0000 C CNN
|
||||
F 2 "VALVE-NOVAL_P" H 5220 4050 50 0001 C CNN
|
||||
F 3 "" H 4950 4450 60 0001 C CNN
|
||||
2 4950 4450
|
||||
P 5150 3900
|
||||
F 0 "U1" H 5280 4210 50 0000 C CNN
|
||||
F 1 "ECC83" H 5350 3550 50 0000 C CNN
|
||||
F 2 "Valves:VALVE-ECC-83-1" H 5350 3500 30 0000 C CNN
|
||||
F 3 "" H 5150 3900 60 0001 C CNN
|
||||
2 5150 3900
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L ECC83 U1
|
||||
U 1 1 48B4F256
|
||||
P 5750 4450
|
||||
F 0 "U1" H 5880 4760 50 0000 C CNN
|
||||
F 1 "ECC83" H 5500 4150 50 0000 C CNN
|
||||
F 2 "VALVE-NOVAL_P" H 6020 4050 50 0001 C CNN
|
||||
F 3 "" H 5750 4450 60 0001 C CNN
|
||||
1 5750 4450
|
||||
P 5950 3900
|
||||
F 0 "U1" H 6080 4210 50 0000 C CNN
|
||||
F 1 "ECC83" H 5700 3600 50 0000 C CNN
|
||||
F 2 "Valves:VALVE-ECC-83-1" H 6220 3500 50 0001 C CNN
|
||||
F 3 "" H 5950 3900 60 0001 C CNN
|
||||
1 5950 3900
|
||||
-1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR01
|
||||
U 1 1 457DBAF8
|
||||
P 6950 5150
|
||||
F 0 "#PWR01" H 6950 5150 30 0001 C CNN
|
||||
F 1 "GND" H 6950 5080 30 0001 C CNN
|
||||
F 2 "" H 6950 5150 60 0001 C CNN
|
||||
F 3 "" H 6950 5150 60 0001 C CNN
|
||||
1 6950 5150
|
||||
P 7150 4600
|
||||
F 0 "#PWR01" H 7150 4600 30 0001 C CNN
|
||||
F 1 "GND" H 7150 4530 30 0001 C CNN
|
||||
F 2 "" H 7150 4600 60 0001 C CNN
|
||||
F 3 "" H 7150 4600 60 0001 C CNN
|
||||
1 7150 4600
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR02
|
||||
U 1 1 457DBAF5
|
||||
P 6700 5900
|
||||
F 0 "#PWR02" H 6700 5900 30 0001 C CNN
|
||||
F 1 "GND" H 6700 5830 30 0001 C CNN
|
||||
F 2 "" H 6700 5900 60 0001 C CNN
|
||||
F 3 "" H 6700 5900 60 0001 C CNN
|
||||
1 6700 5900
|
||||
P 6900 5350
|
||||
F 0 "#PWR02" H 6900 5350 30 0001 C CNN
|
||||
F 1 "GND" H 6900 5280 30 0001 C CNN
|
||||
F 2 "" H 6900 5350 60 0001 C CNN
|
||||
F 3 "" H 6900 5350 60 0001 C CNN
|
||||
1 6900 5350
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR03
|
||||
U 1 1 457DBAF1
|
||||
P 4850 5900
|
||||
F 0 "#PWR03" H 4850 5900 30 0001 C CNN
|
||||
F 1 "GND" H 4850 5830 30 0001 C CNN
|
||||
F 2 "" H 4850 5900 60 0001 C CNN
|
||||
F 3 "" H 4850 5900 60 0001 C CNN
|
||||
1 4850 5900
|
||||
P 5050 5350
|
||||
F 0 "#PWR03" H 5050 5350 30 0001 C CNN
|
||||
F 1 "GND" H 5050 5280 30 0001 C CNN
|
||||
F 2 "" H 5050 5350 60 0001 C CNN
|
||||
F 3 "" H 5050 5350 60 0001 C CNN
|
||||
1 5050 5350
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR04
|
||||
U 1 1 457DBAEF
|
||||
P 4450 5900
|
||||
F 0 "#PWR04" H 4450 5900 30 0001 C CNN
|
||||
F 1 "GND" H 4450 5830 30 0001 C CNN
|
||||
F 2 "" H 4450 5900 60 0001 C CNN
|
||||
F 3 "" H 4450 5900 60 0001 C CNN
|
||||
1 4450 5900
|
||||
P 4650 5350
|
||||
F 0 "#PWR04" H 4650 5350 30 0001 C CNN
|
||||
F 1 "GND" H 4650 5280 30 0001 C CNN
|
||||
F 2 "" H 4650 5350 60 0001 C CNN
|
||||
F 3 "" H 4650 5350 60 0001 C CNN
|
||||
1 4650 5350
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L PWR_FLAG #FLG05
|
||||
U 1 1 457DBAC0
|
||||
P 4100 5250
|
||||
F 0 "#FLG05" H 4100 5520 30 0001 C CNN
|
||||
F 1 "PWR_FLAG" H 4100 5480 30 0000 C CNN
|
||||
F 2 "" H 4100 5250 60 0001 C CNN
|
||||
F 3 "" H 4100 5250 60 0001 C CNN
|
||||
1 4100 5250
|
||||
P 4300 4700
|
||||
F 0 "#FLG05" H 4300 4970 30 0001 C CNN
|
||||
F 1 "PWR_FLAG" H 4300 4930 30 0000 C CNN
|
||||
F 2 "" H 4300 4700 60 0001 C CNN
|
||||
F 3 "" H 4300 4700 60 0001 C CNN
|
||||
1 4300 4700
|
||||
0 -1 -1 0
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_2 P4
|
||||
U 1 1 456A8ACC
|
||||
P 1900 7000
|
||||
F 0 "P4" V 1850 7000 40 0000 C CNN
|
||||
F 1 "CONN_2" V 1950 7000 40 0000 C CNN
|
||||
F 2 "" H 1900 7000 60 0001 C CNN
|
||||
F 3 "" H 1900 7000 60 0001 C CNN
|
||||
1 1900 7000
|
||||
P 2050 5300
|
||||
F 0 "P4" V 2000 5300 40 0000 C CNN
|
||||
F 1 "CONN_2" V 2100 5300 40 0000 C CNN
|
||||
F 2 "connect:bornier2" H 2050 5300 60 0001 C CNN
|
||||
F 3 "" H 2050 5300 60 0001 C CNN
|
||||
1 2050 5300
|
||||
0 1 1 0
|
||||
$EndComp
|
||||
$Comp
|
||||
L C C1
|
||||
U 1 1 4549F4BE
|
||||
P 6700 4050
|
||||
F 0 "C1" H 6750 4150 50 0000 L CNN
|
||||
F 1 "10uF" H 6450 4150 50 0000 L CNN
|
||||
F 2 "" H 6700 4050 60 0001 C CNN
|
||||
F 3 "" H 6700 4050 60 0001 C CNN
|
||||
1 6700 4050
|
||||
P 6900 3500
|
||||
F 0 "C1" H 6950 3600 50 0000 L CNN
|
||||
F 1 "10uF" H 6650 3600 50 0000 L CNN
|
||||
F 2 "discret:C2V10" H 6900 3500 60 0001 C CNN
|
||||
F 3 "" H 6900 3500 60 0001 C CNN
|
||||
1 6900 3500
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR06
|
||||
U 1 1 4549F4B9
|
||||
P 4150 5300
|
||||
F 0 "#PWR06" H 4150 5300 30 0001 C CNN
|
||||
F 1 "GND" H 4150 5230 30 0001 C CNN
|
||||
F 2 "" H 4150 5300 60 0001 C CNN
|
||||
F 3 "" H 4150 5300 60 0001 C CNN
|
||||
1 4150 5300
|
||||
P 4350 4750
|
||||
F 0 "#PWR06" H 4350 4750 30 0001 C CNN
|
||||
F 1 "GND" H 4350 4680 30 0001 C CNN
|
||||
F 2 "" H 4350 4750 60 0001 C CNN
|
||||
F 3 "" H 4350 4750 60 0001 C CNN
|
||||
1 4350 4750
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR07
|
||||
U 1 1 4549F4B3
|
||||
P 6950 4150
|
||||
F 0 "#PWR07" H 6950 4150 30 0001 C CNN
|
||||
F 1 "GND" H 6950 4080 30 0001 C CNN
|
||||
F 2 "" H 6950 4150 60 0001 C CNN
|
||||
F 3 "" H 6950 4150 60 0001 C CNN
|
||||
1 6950 4150
|
||||
P 7150 3600
|
||||
F 0 "#PWR07" H 7150 3600 30 0001 C CNN
|
||||
F 1 "GND" H 7150 3530 30 0001 C CNN
|
||||
F 2 "" H 7150 3600 60 0001 C CNN
|
||||
F 3 "" H 7150 3600 60 0001 C CNN
|
||||
1 7150 3600
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_2 P3
|
||||
U 1 1 4549F4A5
|
||||
P 7300 3950
|
||||
F 0 "P3" V 7250 3950 40 0000 C CNN
|
||||
F 1 "POWER" V 7350 3950 40 0000 C CNN
|
||||
F 2 "" H 7300 3950 60 0001 C CNN
|
||||
F 3 "" H 7300 3950 60 0001 C CNN
|
||||
1 7300 3950
|
||||
P 7500 3400
|
||||
F 0 "P3" V 7450 3400 40 0000 C CNN
|
||||
F 1 "POWER" V 7550 3400 40 0000 C CNN
|
||||
F 2 "connect:bornier2" H 7500 3400 60 0001 C CNN
|
||||
F 3 "" H 7500 3400 60 0001 C CNN
|
||||
1 7500 3400
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_2 P2
|
||||
U 1 1 4549F46C
|
||||
P 7300 4900
|
||||
F 0 "P2" V 7250 4900 40 0000 C CNN
|
||||
F 1 "OUT" V 7350 4900 40 0000 C CNN
|
||||
F 2 "" H 7300 4900 60 0001 C CNN
|
||||
F 3 "" H 7300 4900 60 0001 C CNN
|
||||
1 7300 4900
|
||||
P 7500 4350
|
||||
F 0 "P2" V 7450 4350 40 0000 C CNN
|
||||
F 1 "OUT" V 7550 4350 40 0000 C CNN
|
||||
F 2 "connect:bornier2" H 7500 4350 60 0001 C CNN
|
||||
F 3 "" H 7500 4350 60 0001 C CNN
|
||||
1 7500 4350
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_2 P1
|
||||
U 1 1 4549F464
|
||||
P 3800 4900
|
||||
F 0 "P1" V 3750 4900 40 0000 C CNN
|
||||
F 1 "IN" V 3850 4900 40 0000 C CNN
|
||||
F 2 "" H 3800 4900 60 0001 C CNN
|
||||
F 3 "" H 3800 4900 60 0001 C CNN
|
||||
1 3800 4900
|
||||
P 4000 4350
|
||||
F 0 "P1" V 3950 4350 40 0000 C CNN
|
||||
F 1 "IN" V 4050 4350 40 0000 C CNN
|
||||
F 2 "connect:bornier2" V 4150 4350 60 0000 C CNN
|
||||
F 3 "" H 4000 4350 60 0001 C CNN
|
||||
1 4000 4350
|
||||
-1 0 0 1
|
||||
$EndComp
|
||||
$Comp
|
||||
L C C2
|
||||
U 1 1 4549F3BE
|
||||
P 6500 4800
|
||||
F 0 "C2" H 6550 4900 50 0000 L CNN
|
||||
F 1 "680nF" H 6550 4700 50 0000 L CNN
|
||||
F 2 "" H 6500 4800 60 0001 C CNN
|
||||
F 3 "" H 6500 4800 60 0001 C CNN
|
||||
1 6500 4800
|
||||
P 6700 4250
|
||||
F 0 "C2" H 6750 4350 50 0000 L CNN
|
||||
F 1 "680nF" H 6750 4150 50 0000 L CNN
|
||||
F 2 "discret:C2" H 6700 4250 60 0001 C CNN
|
||||
F 3 "" H 6700 4250 60 0001 C CNN
|
||||
1 6700 4250
|
||||
0 1 1 0
|
||||
$EndComp
|
||||
$Comp
|
||||
L R R3
|
||||
U 1 1 4549F3AD
|
||||
P 6700 5650
|
||||
F 0 "R3" V 6780 5650 50 0000 C CNN
|
||||
F 1 "100K" V 6700 5650 50 0000 C CNN
|
||||
F 2 "" H 6700 5650 60 0001 C CNN
|
||||
F 3 "" H 6700 5650 60 0001 C CNN
|
||||
1 6700 5650
|
||||
P 6900 5100
|
||||
F 0 "R3" V 6980 5100 50 0000 C CNN
|
||||
F 1 "100K" V 6900 5100 50 0000 C CNN
|
||||
F 2 "discret:R3" H 6900 5100 60 0001 C CNN
|
||||
F 3 "" H 6900 5100 60 0001 C CNN
|
||||
1 6900 5100
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L R R4
|
||||
U 1 1 4549F3A2
|
||||
P 4450 5650
|
||||
F 0 "R4" V 4530 5650 50 0000 C CNN
|
||||
F 1 "47K" V 4450 5650 50 0000 C CNN
|
||||
F 2 "" H 4450 5650 60 0001 C CNN
|
||||
F 3 "" H 4450 5650 60 0001 C CNN
|
||||
1 4450 5650
|
||||
P 4650 5100
|
||||
F 0 "R4" V 4730 5100 50 0000 C CNN
|
||||
F 1 "47K" V 4650 5100 50 0000 C CNN
|
||||
F 2 "discret:R3" H 4650 5100 60 0001 C CNN
|
||||
F 3 "" H 4650 5100 60 0001 C CNN
|
||||
1 4650 5100
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L R R2
|
||||
U 1 1 4549F39D
|
||||
P 4850 5650
|
||||
F 0 "R2" V 4930 5650 50 0000 C CNN
|
||||
F 1 "1.5K" V 4850 5650 50 0000 C CNN
|
||||
F 2 "" H 4850 5650 60 0001 C CNN
|
||||
F 3 "" H 4850 5650 60 0001 C CNN
|
||||
1 4850 5650
|
||||
P 5050 5100
|
||||
F 0 "R2" V 5130 5100 50 0000 C CNN
|
||||
F 1 "1.5K" V 5050 5100 50 0000 C CNN
|
||||
F 2 "discret:R3" H 5050 5100 60 0001 C CNN
|
||||
F 3 "" H 5050 5100 60 0001 C CNN
|
||||
1 5050 5100
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L R R1
|
||||
U 1 1 4549F38A
|
||||
P 6300 4250
|
||||
F 0 "R1" V 6380 4250 50 0000 C CNN
|
||||
F 1 "1.5K" V 6300 4250 50 0000 C CNN
|
||||
F 2 "" H 6300 4250 60 0001 C CNN
|
||||
F 3 "" H 6300 4250 60 0001 C CNN
|
||||
1 6300 4250
|
||||
P 6500 3700
|
||||
F 0 "R1" V 6580 3700 50 0000 C CNN
|
||||
F 1 "1.5K" V 6500 3700 50 0000 C CNN
|
||||
F 2 "discret:R3" H 6500 3700 60 0001 C CNN
|
||||
F 3 "" H 6500 3700 60 0001 C CNN
|
||||
1 6500 3700
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L GND #PWR08
|
||||
U 1 1 53B6F370
|
||||
P 6700 4250
|
||||
F 0 "#PWR08" H 6700 4250 30 0001 C CNN
|
||||
F 1 "GND" H 6700 4180 30 0001 C CNN
|
||||
F 2 "" H 6700 4250 60 0001 C CNN
|
||||
F 3 "" H 6700 4250 60 0001 C CNN
|
||||
1 6700 4250
|
||||
P 6900 3700
|
||||
F 0 "#PWR08" H 6900 3700 30 0001 C CNN
|
||||
F 1 "GND" H 6900 3630 30 0001 C CNN
|
||||
F 2 "" H 6900 3700 60 0001 C CNN
|
||||
F 3 "" H 6900 3700 60 0001 C CNN
|
||||
1 6900 3700
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P5
|
||||
U 1 1 54A5890A
|
||||
P 6050 7050
|
||||
F 0 "P5" H 6130 7050 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6050 7105 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6050 7050 60 0001 C CNN
|
||||
F 3 "" H 6050 7050 60 0000 C CNN
|
||||
1 6050 7050
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P6
|
||||
U 1 1 54A58C65
|
||||
P 6050 7150
|
||||
F 0 "P6" H 6130 7150 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6050 7205 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6050 7150 60 0001 C CNN
|
||||
F 3 "" H 6050 7150 60 0000 C CNN
|
||||
1 6050 7150
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P7
|
||||
U 1 1 54A58C8A
|
||||
P 6050 7250
|
||||
F 0 "P7" H 6130 7250 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6050 7305 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6050 7250 60 0001 C CNN
|
||||
F 3 "" H 6050 7250 60 0000 C CNN
|
||||
1 6050 7250
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P8
|
||||
U 1 1 54A58CA3
|
||||
P 6050 7350
|
||||
F 0 "P8" H 6130 7350 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6050 7405 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6050 7350 60 0001 C CNN
|
||||
F 3 "" H 6050 7350 60 0000 C CNN
|
||||
1 6050 7350
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$EndSCHEMATC
|
||||
|
|
|
|||
|
|
@ -21,6 +21,20 @@ X ~ 2 0 -200 170 U 40 40 1 1 P
|
|||
ENDDRAW
|
||||
ENDDEF
|
||||
#
|
||||
# CONN_1
|
||||
#
|
||||
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
|
||||
X 1 1 -150 0 100 R 60 60 1 1 P
|
||||
ENDDRAW
|
||||
ENDDEF
|
||||
#
|
||||
# CONN_2
|
||||
#
|
||||
DEF CONN_2 P 0 40 Y N 1 F N
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
Cmp-Mod V01 Created by Cvpcb (2014-12-31 BZR 5344)-product date = 01/01/2015 18:25:40
|
||||
|
||||
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-1;
|
||||
EndCmp
|
||||
|
||||
EndListe
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
(kicad_pcb (version 4) (host pcbnew "(2014-07-02 BZR 4969)-product")
|
||||
(kicad_pcb (version 4) (host pcbnew "(2014-12-31 BZR 5344)-product")
|
||||
|
||||
(general
|
||||
(links 20)
|
||||
(no_connects 0)
|
||||
(area 119.824499 90.614499 168.465501 132.905501)
|
||||
(area 118.759514 89.3318 168.710429 133.6802)
|
||||
(thickness 1.6002)
|
||||
(drawings 4)
|
||||
(tracks 47)
|
||||
(tracks 46)
|
||||
(zones 0)
|
||||
(modules 15)
|
||||
(nets 10)
|
||||
(nets 14)
|
||||
)
|
||||
|
||||
(page A4)
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
(mod_text_width 0.3048)
|
||||
(pad_size 2.794 1.397)
|
||||
(pad_drill 1.9304)
|
||||
(pad_to_mask_clearance 0.254)
|
||||
(pad_to_mask_clearance 0.1)
|
||||
(aux_axis_origin 0 0)
|
||||
(visible_elements 7FFFF7FF)
|
||||
(pcbplotparams
|
||||
|
|
@ -100,6 +100,10 @@
|
|||
(net 7 "Net-(P4-Pad2)")
|
||||
(net 8 "Net-(R1-Pad1)")
|
||||
(net 9 "Net-(R2-Pad1)")
|
||||
(net 10 "Net-(P5-Pad1)")
|
||||
(net 11 "Net-(P6-Pad1)")
|
||||
(net 12 "Net-(P7-Pad1)")
|
||||
(net 13 "Net-(P8-Pad1)")
|
||||
|
||||
(net_class Default "Ceci est la Netclass par défaut"
|
||||
(clearance 0.508)
|
||||
|
|
@ -109,18 +113,21 @@
|
|||
(uvia_dia 0.508)
|
||||
(uvia_drill 0.127)
|
||||
(add_net GND)
|
||||
(add_net N-000007)
|
||||
(add_net "Net-(C1-Pad1)")
|
||||
(add_net "Net-(C2-Pad1)")
|
||||
(add_net "Net-(C2-Pad2)")
|
||||
(add_net "Net-(P1-Pad2)")
|
||||
(add_net "Net-(P4-Pad1)")
|
||||
(add_net "Net-(P4-Pad2)")
|
||||
(add_net "Net-(P5-Pad1)")
|
||||
(add_net "Net-(P6-Pad1)")
|
||||
(add_net "Net-(P7-Pad1)")
|
||||
(add_net "Net-(P8-Pad1)")
|
||||
(add_net "Net-(R1-Pad1)")
|
||||
(add_net "Net-(R2-Pad1)")
|
||||
)
|
||||
|
||||
(module C2V10 (layer Dessus) (tedit 41854742) (tstamp 4549F4BE)
|
||||
(module discret:C2V10 (layer Dessus) (tedit 54A58223) (tstamp 54A58357)
|
||||
(at 131.445 99.06 90)
|
||||
(descr "Condensateur polarise")
|
||||
(tags CP)
|
||||
|
|
@ -143,187 +150,7 @@
|
|||
)
|
||||
)
|
||||
|
||||
(module R3 (layer Dessus) (tedit 200000) (tstamp 4549F38A)
|
||||
(at 140.97 125.095 270)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F38A)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R1 (at 0 0 270) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 1.5K (at 0 0 270) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module R3 (layer Dessus) (tedit 200000) (tstamp 4549F3AD)
|
||||
(at 124.46 118.745 270)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F3AD)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R3 (at 0 0 270) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 100K (at 0 0 270) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module R3 (layer Dessus) (tedit 200000) (tstamp 4549F3A2)
|
||||
(at 165.1 120.015 270)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F3A2)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R4 (at 0 0 270) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 47K (at 0 0 270) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module R3 (layer Dessus) (tedit 200000) (tstamp 4549F39D)
|
||||
(at 165.1 103.505 90)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F39D)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R2 (at 0 0 90) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 1.5K (at 0 0 90) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.3048))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.3048))
|
||||
(pad 1 thru_hole circle (at -3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC08A)
|
||||
(at 123.19 93.98)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
|
||||
)
|
||||
|
||||
(module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC090)
|
||||
(at 165.1 93.98)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value GND (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
|
||||
)
|
||||
|
||||
(module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC096)
|
||||
(at 165.1 129.54)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
|
||||
)
|
||||
|
||||
(module 1pin (layer Dessus) (tedit 200000) (tstamp 454CC09B)
|
||||
(at 123.19 129.54)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(fp_text reference 1PIN (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value P*** (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS))
|
||||
)
|
||||
|
||||
(module CP8 (layer Dessus) (tedit 200000) (tstamp 4549F3BE)
|
||||
(module discret:CP8 (layer Dessus) (tedit 54A58223) (tstamp 54A5835C)
|
||||
(at 131.445 118.745 270)
|
||||
(descr "Condensateur polarise")
|
||||
(tags CP)
|
||||
|
|
@ -356,95 +183,7 @@
|
|||
)
|
||||
)
|
||||
|
||||
(module ECC-83-2 (layer Dessus) (tedit 46F8A1CF) (tstamp 454A08DD)
|
||||
(at 149.3 109.2)
|
||||
(path /48B4F266)
|
||||
(fp_text reference U1 (at 0 -11.43) (layer F.SilkS)
|
||||
(effects (font (thickness 0.3048)))
|
||||
)
|
||||
(fp_text value ECC83 (at 0 11.43) (layer F.SilkS)
|
||||
(effects (font (thickness 0.3048)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole oval (at 3.4544 4.75488 306) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 8 "Net-(R1-Pad1)"))
|
||||
(pad 2 thru_hole oval (at 5.60832 1.8288 342) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 5 "Net-(P1-Pad2)"))
|
||||
(pad 3 thru_hole oval (at 5.60832 -1.8288 18) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 9 "Net-(R2-Pad1)"))
|
||||
(pad 4 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 6 "Net-(P4-Pad1)"))
|
||||
(pad 5 thru_hole oval (at 0 -5.8928 90) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 6 "Net-(P4-Pad1)"))
|
||||
(pad 6 thru_hole oval (at -3.4544 -4.75488 306) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 2 "Net-(C1-Pad1)"))
|
||||
(pad 7 thru_hole oval (at -5.60832 -1.8288 342) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 8 "Net-(R1-Pad1)"))
|
||||
(pad 8 thru_hole oval (at -5.60832 1.78816 18) (size 2.032 3.048) (drill oval 1.016 2.032) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 4 "Net-(C2-Pad2)"))
|
||||
(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 10 thru_hole circle (at 0 0) (size 4.50088 4.50088) (drill 3.0988) (layers *.Cu *.Mask F.SilkS))
|
||||
(model valves/ecc83.wrl
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 1 1 1))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 456A8ACC)
|
||||
(at 149.225 128.905 180)
|
||||
(descr "Connecteurs 2 pins")
|
||||
(tags "CONN DEV")
|
||||
(path /456A8ACC)
|
||||
(fp_text reference P4 (at 0 -1.905 180) (layer F.SilkS)
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_text value CONN_2 (at 0 -1.905 180) (layer F.SilkS) hide
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(pad 1 thru_hole rect (at -1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 1 1 1))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 4549F46C)
|
||||
(at 123.19 109.855 90)
|
||||
(descr "Connecteurs 2 pins")
|
||||
(tags "CONN DEV")
|
||||
(path /4549F46C)
|
||||
(fp_text reference P2 (at 0 -1.905 90) (layer F.SilkS)
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_text value OUT (at 0 -1.905 90) (layer F.SilkS) hide
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(pad 1 thru_hole rect (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 1 1 1))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 4549F464)
|
||||
(module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58361)
|
||||
(at 165.1 111.76 270)
|
||||
(descr "Connecteurs 2 pins")
|
||||
(tags "CONN DEV")
|
||||
|
|
@ -470,7 +209,33 @@
|
|||
)
|
||||
)
|
||||
|
||||
(module PIN_ARRAY_2X1 (layer Dessus) (tedit 4565C520) (tstamp 4549F4A5)
|
||||
(module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58366)
|
||||
(at 123.19 109.855 90)
|
||||
(descr "Connecteurs 2 pins")
|
||||
(tags "CONN DEV")
|
||||
(path /4549F46C)
|
||||
(fp_text reference P2 (at 0 -1.905 90) (layer F.SilkS)
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_text value OUT (at 0 -1.905 90) (layer F.SilkS) hide
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(pad 1 thru_hole rect (at -1.27 0 90) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 1 1 1))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A5836B)
|
||||
(at 123.19 101.6 90)
|
||||
(descr "Connecteurs 2 pins")
|
||||
(tags "CONN DEV")
|
||||
|
|
@ -496,58 +261,306 @@
|
|||
)
|
||||
)
|
||||
|
||||
(module pin_array:pin_array_1x02 (layer Dessus) (tedit 541A9B89) (tstamp 54A58370)
|
||||
(at 149.225 128.905 180)
|
||||
(descr "Connecteurs 2 pins")
|
||||
(tags "CONN DEV")
|
||||
(path /456A8ACC)
|
||||
(fp_text reference P4 (at 0 -1.905 180) (layer F.SilkS)
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_text value CONN_2 (at 0 -1.905 180) (layer F.SilkS) hide
|
||||
(effects (font (size 0.762 0.762) (thickness 0.1524)))
|
||||
)
|
||||
(fp_line (start -2.54 1.27) (end -2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start -2.54 -1.27) (end 2.54 -1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 -1.27) (end 2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(fp_line (start 2.54 1.27) (end -2.54 1.27) (layer F.SilkS) (width 0.1524))
|
||||
(pad 1 thru_hole rect (at -1.27 0 180) (size 1.524 1.524) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 1 1 1))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58389)
|
||||
(at 140.97 125.095 270)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F38A)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R1 (at 0 0.127 270) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 1.5K (at 0 0.127 270) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A5838E)
|
||||
(at 165.1 103.505 90)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F39D)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R2 (at 0 0.127 90) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 1.5K (at 0 0.127 90) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(pad 1 thru_hole circle (at -3.81 0 90) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58393)
|
||||
(at 124.46 118.745 270)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F3AD)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R3 (at 0 0.127 270) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 100K (at 0 0.127 270) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module discret:R3 (layer Dessus) (tedit 54A58223) (tstamp 54A58398)
|
||||
(at 165.1 120.015 270)
|
||||
(descr "Resitance 3 pas")
|
||||
(tags R)
|
||||
(path /4549F3A2)
|
||||
(autoplace_cost180 10)
|
||||
(fp_text reference R4 (at 0 0.127 270) (layer F.SilkS) hide
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_text value 47K (at 0 0.127 270) (layer F.SilkS)
|
||||
(effects (font (size 1.397 1.27) (thickness 0.2032)))
|
||||
)
|
||||
(fp_line (start -3.81 0) (end -3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.81 0) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 0) (end 3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 -1.016) (end -3.302 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -1.016) (end -3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 1.016) (end 3.302 1.016) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start 3.302 1.016) (end 3.302 0) (layer F.SilkS) (width 0.2032))
|
||||
(fp_line (start -3.302 -0.508) (end -2.794 -1.016) (layer F.SilkS) (width 0.2032))
|
||||
(pad 1 thru_hole circle (at -3.81 0 270) (size 1.397 1.397) (drill 0.8128) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 0.3 0.3 0.3))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module Valves:VALVE-ECC-83-1 (layer Dessus) (tedit 54A58223) (tstamp 54A5839D)
|
||||
(at 149.3 109.2)
|
||||
(path /48B4F266)
|
||||
(fp_text reference U1 (at 1.27 -11.43) (layer F.SilkS)
|
||||
(effects (font (size 1 1) (thickness 0.15)))
|
||||
)
|
||||
(fp_text value ECC83 (at 0 11.43) (layer F.SilkS)
|
||||
(effects (font (size 1 1) (thickness 0.15)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 10.16 1.27) (layer F.SilkS) (width 0.15))
|
||||
(pad 1 thru_hole circle (at 3.4544 4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 8 "Net-(R1-Pad1)"))
|
||||
(pad 2 thru_hole circle (at 5.60832 1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 5 "Net-(P1-Pad2)"))
|
||||
(pad 3 thru_hole circle (at 5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 9 "Net-(R2-Pad1)"))
|
||||
(pad 4 thru_hole circle (at 3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 6 "Net-(P4-Pad1)"))
|
||||
(pad 5 thru_hole circle (at 0 -5.8928) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 6 "Net-(P4-Pad1)"))
|
||||
(pad 6 thru_hole circle (at -3.4544 -4.75488) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 2 "Net-(C1-Pad1)"))
|
||||
(pad 7 thru_hole circle (at -5.60832 -1.8288) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 8 "Net-(R1-Pad1)"))
|
||||
(pad 8 thru_hole circle (at -5.60832 1.78816) (size 2.032 2.032) (drill 1.016) (layers *.Cu *.Mask F.SilkS)
|
||||
(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
|
||||
(at (xyz 0 0 0))
|
||||
(scale (xyz 1 1 1))
|
||||
(rotate (xyz 0 0 0))
|
||||
)
|
||||
)
|
||||
|
||||
(module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583D2)
|
||||
(at 123.19 93.98)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(path /54A5830A)
|
||||
(fp_text reference P5 (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 10 "Net-(P5-Pad1)"))
|
||||
)
|
||||
|
||||
(module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583D6)
|
||||
(at 165.1 93.98)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(path /54A58363)
|
||||
(fp_text reference P6 (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 11 "Net-(P6-Pad1)"))
|
||||
)
|
||||
|
||||
(module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583DA)
|
||||
(at 165.1 129.54)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(path /54A5837A)
|
||||
(fp_text reference P7 (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 12 "Net-(P7-Pad1)"))
|
||||
)
|
||||
|
||||
(module connect:1pin (layer Dessus) (tedit 54A58223) (tstamp 54A583DE)
|
||||
(at 123.19 129.54)
|
||||
(descr "module 1 pin (ou trou mecanique de percage)")
|
||||
(tags DEV)
|
||||
(path /54A58391)
|
||||
(fp_text reference P8 (at 0 -3.048) (layer F.SilkS)
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_text value CONN_1 (at 0 2.794) (layer F.SilkS) hide
|
||||
(effects (font (size 1.016 1.016) (thickness 0.254)))
|
||||
)
|
||||
(fp_circle (center 0 0) (end 0 -2.286) (layer F.SilkS) (width 0.381))
|
||||
(pad 1 thru_hole circle (at 0 0) (size 4.064 4.064) (drill 3.048) (layers *.Cu *.Mask F.SilkS)
|
||||
(net 13 "Net-(P8-Pad1)"))
|
||||
)
|
||||
|
||||
(gr_line (start 168.275 132.715) (end 120.015 132.715) (angle 90) (layer Edge.Cuts) (width 0.381))
|
||||
(gr_line (start 168.275 90.805) (end 120.015 90.805) (angle 90) (layer Edge.Cuts) (width 0.381))
|
||||
(gr_line (start 168.275 90.805) (end 168.275 132.715) (angle 90) (layer Edge.Cuts) (width 0.381))
|
||||
(gr_line (start 120.015 90.805) (end 120.015 132.715) (angle 90) (layer Edge.Cuts) (width 0.381))
|
||||
|
||||
(segment (start 165.1 123.825) (end 165.354 123.825) (width 0.8636) (layer Dessous) (net 1))
|
||||
(segment (start 165.1 123.825) (end 165.354 123.825) (width 0.8636) (layer Dessous) (net 1) (status 30))
|
||||
(segment (start 125.73 101.6) (end 131.445 101.6) (width 0.8636) (layer Dessous) (net 2) (status 420))
|
||||
(segment (start 123.19 102.87) (end 124.46 102.87) (width 0.8636) (layer Dessous) (net 2) (status 810))
|
||||
(segment (start 142.90548 101.6) (end 145.7706 104.46512) (width 0.8636) (layer Dessous) (net 2) (status 420))
|
||||
(segment (start 131.445 101.6) (end 142.90548 101.6) (width 0.8636) (layer Dessous) (net 2) (status 810))
|
||||
(segment (start 124.46 102.87) (end 125.73 101.6) (width 0.8636) (layer Dessous) (net 2))
|
||||
(segment (start 131.445 101.6) (end 142.90548 101.6) (width 0.8636) (layer Dessous) (net 2) (status 800))
|
||||
(segment (start 142.90548 101.6) (end 145.7706 104.46512) (width 0.8636) (layer Dessous) (net 2) (status 400))
|
||||
(segment (start 123.19 102.87) (end 124.46 102.87) (width 0.8636) (layer Dessous) (net 2) (status 800))
|
||||
(segment (start 125.73 101.6) (end 131.445 101.6) (width 0.8636) (layer Dessous) (net 2) (status 400))
|
||||
(segment (start 128.905 111.125) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 400))
|
||||
(segment (start 131.445 108.585) (end 128.905 111.125) (width 0.8636) (layer Dessous) (net 3) (status 800))
|
||||
(segment (start 123.825 114.935) (end 123.19 114.3) (width 0.8636) (layer Dessous) (net 3))
|
||||
(segment (start 123.19 114.3) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3))
|
||||
(segment (start 124.46 114.935) (end 123.825 114.935) (width 0.8636) (layer Dessous) (net 3))
|
||||
(segment (start 131.445 128.905) (end 140.97 128.905) (width 0.8636) (layer Dessous) (net 4) (status C00))
|
||||
(segment (start 143.61668 111.00816) (end 143.61668 111.65332) (width 0.8636) (layer Dessous) (net 4) (status 800))
|
||||
(segment (start 143.51 127.635) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 142.24 128.905) (end 143.51 127.635) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 140.97 128.905) (end 142.24 128.905) (width 0.8636) (layer Dessous) (net 4) (status 800))
|
||||
(segment (start 143.61668 111.65332) (end 142.875 112.395) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 142.875 112.395) (end 142.875 116.205) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 124.46 114.935) (end 123.825 114.935) (width 0.8636) (layer Dessous) (net 3) (status 30))
|
||||
(segment (start 123.19 114.3) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 20))
|
||||
(segment (start 123.825 114.935) (end 123.19 114.3) (width 0.8636) (layer Dessous) (net 3) (status 10))
|
||||
(segment (start 131.445 108.585) (end 128.905 111.125) (width 0.8636) (layer Dessous) (net 3) (status 810))
|
||||
(segment (start 128.905 111.125) (end 123.19 111.125) (width 0.8636) (layer Dessous) (net 3) (status 420))
|
||||
(segment (start 142.875 116.205) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 154.83332 111.0488) (end 159.9438 111.0488) (width 0.8636) (layer Dessous) (net 5) (status 800))
|
||||
(segment (start 165.1 113.03) (end 165.1 116.205) (width 0.8636) (layer Dessous) (net 5) (status C00))
|
||||
(segment (start 142.875 112.395) (end 142.875 116.205) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 143.61668 111.65332) (end 142.875 112.395) (width 0.8636) (layer Dessous) (net 4) (status 10))
|
||||
(segment (start 140.97 128.905) (end 142.24 128.905) (width 0.8636) (layer Dessous) (net 4) (status 810))
|
||||
(segment (start 142.24 128.905) (end 143.51 127.635) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 143.51 127.635) (end 143.51 116.84) (width 0.8636) (layer Dessous) (net 4))
|
||||
(segment (start 143.61668 111.00816) (end 143.61668 111.65332) (width 0.8636) (layer Dessous) (net 4) (status 830))
|
||||
(segment (start 131.445 128.905) (end 140.97 128.905) (width 0.8636) (layer Dessous) (net 4) (status C30))
|
||||
(segment (start 161.925 113.03) (end 165.1 113.03) (width 0.8636) (layer Dessous) (net 5) (status 420))
|
||||
(segment (start 159.9438 111.0488) (end 161.925 113.03) (width 0.8636) (layer Dessous) (net 5))
|
||||
(segment (start 161.925 113.03) (end 165.1 113.03) (width 0.8636) (layer Dessous) (net 5) (status 400))
|
||||
(segment (start 150.495 128.905) (end 150.495 116.332) (width 0.8636) (layer Dessous) (net 6) (status 800))
|
||||
(segment (start 152.6794 104.46512) (end 152.6794 110.8456) (width 0.8636) (layer Dessous) (net 6) (status 800))
|
||||
(segment (start 151.54148 103.3272) (end 152.6794 104.46512) (width 0.8636) (layer Dessous) (net 6) (status 400))
|
||||
(segment (start 149.225 103.3272) (end 151.54148 103.3272) (width 0.8636) (layer Dessous) (net 6))
|
||||
(segment (start 149.86 113.665) (end 149.86 115.697) (width 0.8636) (layer Dessous) (net 6))
|
||||
(segment (start 165.1 113.03) (end 165.1 116.205) (width 0.8636) (layer Dessous) (net 5) (status C30))
|
||||
(segment (start 154.83332 111.0488) (end 159.9438 111.0488) (width 0.8636) (layer Dessous) (net 5) (status 810))
|
||||
(segment (start 149.86 115.697) (end 149.86 107.33952) (width 0.8636) (layer Dessous) (net 6))
|
||||
(segment (start 149.86 107.33952) (end 152.7544 104.44512) (width 0.8636) (layer Dessous) (net 6) (tstamp 54A589AE) (status 20))
|
||||
(segment (start 149.86 115.697) (end 150.495 116.332) (width 0.8636) (layer Dessous) (net 6))
|
||||
(segment (start 152.6794 110.8456) (end 149.86 113.665) (width 0.8636) (layer Dessous) (net 6))
|
||||
(segment (start 147.955 116.15928) (end 145.7706 113.97488) (width 0.8636) (layer Dessous) (net 7) (status 400))
|
||||
(segment (start 147.955 128.905) (end 147.955 116.15928) (width 0.8636) (layer Dessous) (net 7) (status 800))
|
||||
(segment (start 140.97 123.825) (end 139.065 125.73) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 139.065 125.73) (end 130.175 125.73) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 130.175 125.73) (end 128.905 127) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 143.61668 107.3912) (end 142.1638 107.3912) (width 0.8636) (layer Dessous) (net 8) (status 800))
|
||||
(segment (start 140.97 108.585) (end 140.97 121.285) (width 0.8636) (layer Dessous) (net 8) (status 400))
|
||||
(segment (start 142.1638 107.3912) (end 140.97 108.585) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 140.97 121.285) (end 140.97 123.825) (width 0.8636) (layer Dessous) (net 8) (status 800))
|
||||
(segment (start 154.94 116.23548) (end 152.6794 113.97488) (width 0.8636) (layer Dessous) (net 8) (status 400))
|
||||
(segment (start 154.94 130.175) (end 154.94 116.23548) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 128.905 127) (end 128.905 130.175) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 128.905 130.175) (end 130.175 131.445) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 130.175 131.445) (end 153.67 131.445) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 149.225 103.3272) (end 151.54148 103.3272) (width 0.8636) (layer Dessous) (net 6) (status 10))
|
||||
(segment (start 151.54148 103.3272) (end 152.6794 104.46512) (width 0.8636) (layer Dessous) (net 6) (status 420))
|
||||
(segment (start 150.495 128.905) (end 150.495 116.332) (width 0.8636) (layer Dessous) (net 6) (status 810))
|
||||
(segment (start 147.955 128.905) (end 147.955 116.15928) (width 0.8636) (layer Dessous) (net 7) (status 810))
|
||||
(segment (start 147.955 116.15928) (end 145.7706 113.97488) (width 0.8636) (layer Dessous) (net 7) (status 420))
|
||||
(segment (start 153.67 131.445) (end 154.94 130.175) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 165.0238 107.3912) (end 165.1 107.315) (width 0.8636) (layer Dessous) (net 9) (status 400))
|
||||
(segment (start 154.83332 107.3912) (end 165.0238 107.3912) (width 0.8636) (layer Dessous) (net 9) (status 800))
|
||||
(segment (start 130.175 131.445) (end 153.67 131.445) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 128.905 130.175) (end 130.175 131.445) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 128.905 127) (end 128.905 130.175) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 154.94 130.175) (end 154.94 116.23548) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 154.94 116.23548) (end 152.6794 113.97488) (width 0.8636) (layer Dessous) (net 8) (status 420))
|
||||
(segment (start 140.97 121.285) (end 140.97 123.825) (width 0.8636) (layer Dessous) (net 8) (status 810))
|
||||
(segment (start 142.1638 107.3912) (end 140.97 108.585) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 140.97 108.585) (end 140.97 121.285) (width 0.8636) (layer Dessous) (net 8) (status 420))
|
||||
(segment (start 143.61668 107.3912) (end 142.1638 107.3912) (width 0.8636) (layer Dessous) (net 8) (status 810))
|
||||
(segment (start 130.175 125.73) (end 128.905 127) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 139.065 125.73) (end 130.175 125.73) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 140.97 123.825) (end 139.065 125.73) (width 0.8636) (layer Dessous) (net 8))
|
||||
(segment (start 154.83332 107.3912) (end 165.0238 107.3912) (width 0.8636) (layer Dessous) (net 9) (status 830))
|
||||
(segment (start 165.0238 107.3912) (end 165.1 107.315) (width 0.8636) (layer Dessous) (net 9) (status 430))
|
||||
|
||||
(zone (net 1) (net_name GND) (layer Dessous) (tstamp 4EED96A1) (hatch edge 0.508)
|
||||
(connect_pads (clearance 0.635))
|
||||
|
|
|
|||
|
|
@ -0,0 +1,209 @@
|
|||
(export (version D)
|
||||
(design
|
||||
(source F:/kicad-launchpad/testing/demos/ecc83/ecc83-pp_v2.sch)
|
||||
(date "01/01/2015 18:25:50")
|
||||
(tool "Eeschema (2014-12-31 BZR 5344)-product"))
|
||||
(components
|
||||
(comp (ref U1)
|
||||
(value ECC83)
|
||||
(footprint Valves:VALVE-ECC-83-1)
|
||||
(libsource (lib valves) (part ECC83))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 48B4F266))
|
||||
(comp (ref P4)
|
||||
(value CONN_2)
|
||||
(footprint pin_array:pin_array_1x02)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 456A8ACC))
|
||||
(comp (ref C1)
|
||||
(value 10uF)
|
||||
(footprint discret:C2V10)
|
||||
(libsource (lib device) (part C))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F4BE))
|
||||
(comp (ref P3)
|
||||
(value POWER)
|
||||
(footprint pin_array:pin_array_1x02)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F4A5))
|
||||
(comp (ref P2)
|
||||
(value OUT)
|
||||
(footprint pin_array:pin_array_1x02)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F46C))
|
||||
(comp (ref P1)
|
||||
(value IN)
|
||||
(footprint pin_array:pin_array_1x02)
|
||||
(libsource (lib conn) (part CONN_2))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F464))
|
||||
(comp (ref C2)
|
||||
(value 680nF)
|
||||
(footprint discret:CP8)
|
||||
(libsource (lib device) (part C))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F3BE))
|
||||
(comp (ref R3)
|
||||
(value 100K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F3AD))
|
||||
(comp (ref R4)
|
||||
(value 47K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F3A2))
|
||||
(comp (ref R2)
|
||||
(value 1.5K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F39D))
|
||||
(comp (ref R1)
|
||||
(value 1.5K)
|
||||
(footprint discret:R3)
|
||||
(libsource (lib device) (part R))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 4549F38A))
|
||||
(comp (ref P5)
|
||||
(value CONN_1)
|
||||
(footprint connect:1pin)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A5830A))
|
||||
(comp (ref P6)
|
||||
(value CONN_1)
|
||||
(footprint connect:1pin)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A58363))
|
||||
(comp (ref P7)
|
||||
(value CONN_1)
|
||||
(footprint connect:1pin)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A5837A))
|
||||
(comp (ref P8)
|
||||
(value CONN_1)
|
||||
(footprint connect:1pin)
|
||||
(libsource (lib conn) (part CONN_1))
|
||||
(sheetpath (names /) (tstamps /))
|
||||
(tstamp 54A58391)))
|
||||
(libparts
|
||||
(libpart (lib device) (part C)
|
||||
(description "Condensateur non polarise")
|
||||
(footprints
|
||||
(fp SM*)
|
||||
(fp C?)
|
||||
(fp C1-1))
|
||||
(fields
|
||||
(field (name Reference) C)
|
||||
(field (name Value) C))
|
||||
(pins
|
||||
(pin (num 1) (name ~) (type passive))
|
||||
(pin (num 2) (name ~) (type passive))))
|
||||
(libpart (lib device) (part R)
|
||||
(description Resistance)
|
||||
(footprints
|
||||
(fp R?)
|
||||
(fp SM0603)
|
||||
(fp SM0805)
|
||||
(fp R?-*)
|
||||
(fp SM1206))
|
||||
(fields
|
||||
(field (name Reference) R)
|
||||
(field (name Value) R))
|
||||
(pins
|
||||
(pin (num 1) (name ~) (type passive))
|
||||
(pin (num 2) (name ~) (type passive))))
|
||||
(libpart (lib valves) (part ECC81)
|
||||
(aliases
|
||||
(alias ECC83))
|
||||
(fields
|
||||
(field (name Reference) U)
|
||||
(field (name Value) ECC81)
|
||||
(field (name Footprint) VALVE-NOVAL_P))
|
||||
(pins
|
||||
(pin (num 1) (name A) (type output))
|
||||
(pin (num 2) (name G) (type input))
|
||||
(pin (num 3) (name K) (type BiDi))
|
||||
(pin (num 4) (name F1) (type power_in))
|
||||
(pin (num 5) (name F1) (type power_in))
|
||||
(pin (num 6) (name A) (type output))
|
||||
(pin (num 7) (name G) (type input))
|
||||
(pin (num 8) (name K) (type BiDi))
|
||||
(pin (num 9) (name F2) (type power_in))))
|
||||
(libpart (lib conn) (part CONN_1)
|
||||
(description "1 pin")
|
||||
(fields
|
||||
(field (name Reference) P)
|
||||
(field (name Value) CONN_1))
|
||||
(pins
|
||||
(pin (num 1) (name 1) (type passive))))
|
||||
(libpart (lib conn) (part CONN_2)
|
||||
(description "Symbole general de connecteur")
|
||||
(fields
|
||||
(field (name Reference) P)
|
||||
(field (name Value) CONN_2))
|
||||
(pins
|
||||
(pin (num 1) (name P1) (type passive))
|
||||
(pin (num 2) (name PM) (type passive)))))
|
||||
(libraries
|
||||
(library (logical device)
|
||||
(uri f:\kicad\share\kicad\library\device.lib))
|
||||
(library (logical valves)
|
||||
(uri f:\kicad\share\kicad\library\valves.lib))
|
||||
(library (logical conn)
|
||||
(uri f:\kicad\share\kicad\library\conn.lib)))
|
||||
(nets
|
||||
(net (code 1) (name GND)
|
||||
(node (ref R4) (pin 2))
|
||||
(node (ref R3) (pin 2))
|
||||
(node (ref P1) (pin 1))
|
||||
(node (ref R2) (pin 2))
|
||||
(node (ref P2) (pin 2))
|
||||
(node (ref P3) (pin 2))
|
||||
(node (ref C1) (pin 2)))
|
||||
(net (code 2) (name "Net-(C1-Pad1)")
|
||||
(node (ref P3) (pin 1))
|
||||
(node (ref C1) (pin 1))
|
||||
(node (ref U1) (pin 6)))
|
||||
(net (code 3) (name "Net-(P8-Pad1)")
|
||||
(node (ref P8) (pin 1)))
|
||||
(net (code 4) (name "Net-(P7-Pad1)")
|
||||
(node (ref P7) (pin 1)))
|
||||
(net (code 5) (name "Net-(P6-Pad1)")
|
||||
(node (ref P6) (pin 1)))
|
||||
(net (code 6) (name "Net-(P5-Pad1)")
|
||||
(node (ref P5) (pin 1)))
|
||||
(net (code 7) (name "Net-(R2-Pad1)")
|
||||
(node (ref R2) (pin 1))
|
||||
(node (ref U1) (pin 3)))
|
||||
(net (code 8) (name "Net-(C2-Pad2)")
|
||||
(node (ref C2) (pin 2))
|
||||
(node (ref R1) (pin 2))
|
||||
(node (ref U1) (pin 8)))
|
||||
(net (code 9) (name "Net-(C2-Pad1)")
|
||||
(node (ref C2) (pin 1))
|
||||
(node (ref R3) (pin 1))
|
||||
(node (ref P2) (pin 1)))
|
||||
(net (code 10) (name "Net-(P4-Pad2)")
|
||||
(node (ref U1) (pin 9))
|
||||
(node (ref P4) (pin 2)))
|
||||
(net (code 11) (name "Net-(P1-Pad2)")
|
||||
(node (ref U1) (pin 2))
|
||||
(node (ref R4) (pin 1))
|
||||
(node (ref P1) (pin 2)))
|
||||
(net (code 12) (name "Net-(R1-Pad1)")
|
||||
(node (ref R1) (pin 1))
|
||||
(node (ref U1) (pin 1))
|
||||
(node (ref U1) (pin 7)))
|
||||
(net (code 13) (name "Net-(P4-Pad1)")
|
||||
(node (ref U1) (pin 4))
|
||||
(node (ref U1) (pin 5))
|
||||
(node (ref P4) (pin 1)))))
|
||||
|
|
@ -1,68 +1,9 @@
|
|||
update=04/07/2014 20:10:13
|
||||
update=01/01/2015 18:33:52
|
||||
last_client=kicad
|
||||
[general]
|
||||
version=1
|
||||
RootSch=ecc83-pp.sch
|
||||
BoardNm=ecc83-pp.brd
|
||||
[eeschema]
|
||||
version=1
|
||||
LibDir=
|
||||
NetFmt=1
|
||||
HPGLSpd=20
|
||||
HPGLDm=15
|
||||
HPGLNum=1
|
||||
offX_A4=0
|
||||
offY_A4=0
|
||||
offX_A3=0
|
||||
offY_A3=0
|
||||
offX_A2=0
|
||||
offY_A2=0
|
||||
offX_A1=0
|
||||
offY_A1=0
|
||||
offX_A0=0
|
||||
offY_A0=0
|
||||
offX_A=0
|
||||
offY_A=0
|
||||
offX_B=0
|
||||
offY_B=0
|
||||
offX_C=0
|
||||
offY_C=0
|
||||
offX_D=0
|
||||
offY_D=0
|
||||
offX_E=0
|
||||
offY_E=0
|
||||
RptD_X=0
|
||||
RptD_Y=100
|
||||
RptLab=1
|
||||
PenMin=20
|
||||
SimCmd=
|
||||
UseNetN=0
|
||||
[eeschema/libraries]
|
||||
LibName1=power
|
||||
LibName2=device
|
||||
LibName3=valves
|
||||
LibName4=conn
|
||||
LibName5=linear
|
||||
LibName6=regul
|
||||
LibName7=74xx
|
||||
LibName8=cmos4000
|
||||
LibName9=adc-dac
|
||||
LibName10=memory
|
||||
LibName11=xilinx
|
||||
LibName12=special
|
||||
LibName13=microcontrollers
|
||||
LibName14=microchip
|
||||
LibName15=analog_switches
|
||||
LibName16=motorola
|
||||
LibName17=intel
|
||||
LibName18=audio
|
||||
LibName19=interface
|
||||
LibName20=digital-audio
|
||||
LibName21=philips
|
||||
LibName22=display
|
||||
LibName23=cypress
|
||||
LibName24=siliconi
|
||||
LibName25=contrib
|
||||
[pcbnew]
|
||||
version=1
|
||||
PageLayoutDescrFile=
|
||||
|
|
@ -83,3 +24,13 @@ SolderMaskMinWidth=0
|
|||
DrawSegmentWidth=0.381
|
||||
BoardOutlineThickness=0.381
|
||||
ModuleOutlineThickness=0.381
|
||||
[eeschema]
|
||||
version=1
|
||||
LibDir=
|
||||
[eeschema/libraries]
|
||||
LibName1=power
|
||||
LibName2=device
|
||||
LibName3=valves
|
||||
LibName4=conn
|
||||
LibName5=linear
|
||||
LibName6=regul
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ LIBS:cypress
|
|||
LIBS:siliconi
|
||||
LIBS:contrib
|
||||
LIBS:ecc83-pp_v2-cache
|
||||
EELAYER 24 0
|
||||
EELAYER 25 0
|
||||
EELAYER END
|
||||
$Descr A4 11693 8268
|
||||
encoding utf-8
|
||||
|
|
@ -105,7 +105,7 @@ U 3 1 48B4F266
|
|||
P 2000 6100
|
||||
F 0 "U1" H 2130 6410 50 0000 C CNN
|
||||
F 1 "ECC83" H 2350 5800 50 0000 C CNN
|
||||
F 2 "ECC-83-1" H 2450 5650 50 0000 C CNN
|
||||
F 2 "Valves:VALVE-ECC-83-1" H 2450 5650 50 0000 C CNN
|
||||
F 3 "" H 2000 6100 60 0001 C CNN
|
||||
3 2000 6100
|
||||
1 0 0 -1
|
||||
|
|
@ -116,7 +116,7 @@ U 2 1 48B4F263
|
|||
P 4950 4450
|
||||
F 0 "U1" H 5080 4760 50 0000 C CNN
|
||||
F 1 "ECC83" H 5150 4100 50 0000 C CNN
|
||||
F 2 "ECC-83-1" H 5150 4000 50 0000 C CNN
|
||||
F 2 "Valves:VALVE-ECC-83-1" H 5150 4000 50 0000 C CNN
|
||||
F 3 "" H 4950 4450 60 0001 C CNN
|
||||
2 4950 4450
|
||||
1 0 0 -1
|
||||
|
|
@ -127,7 +127,7 @@ U 1 1 48B4F256
|
|||
P 5750 4450
|
||||
F 0 "U1" H 5880 4760 50 0000 C CNN
|
||||
F 1 "ECC83" H 5500 4150 50 0000 C CNN
|
||||
F 2 "ECC-83-1" H 5750 3950 50 0000 C CNN
|
||||
F 2 "Valves:VALVE-ECC-83-1" H 5750 3950 50 0000 C CNN
|
||||
F 3 "" H 5750 4450 60 0001 C CNN
|
||||
1 5750 4450
|
||||
-1 0 0 -1
|
||||
|
|
@ -193,7 +193,7 @@ U 1 1 456A8ACC
|
|||
P 2000 7100
|
||||
F 0 "P4" V 1950 7100 40 0000 C CNN
|
||||
F 1 "CONN_2" V 2050 7100 40 0000 C CNN
|
||||
F 2 "BORNIER2" V 2150 7100 60 0000 C CNN
|
||||
F 2 "pin_array:pin_array_1x02" V 2150 7100 60 0000 C CNN
|
||||
F 3 "" H 2000 7100 60 0001 C CNN
|
||||
1 2000 7100
|
||||
0 1 1 0
|
||||
|
|
@ -204,7 +204,7 @@ U 1 1 4549F4BE
|
|||
P 6700 4050
|
||||
F 0 "C1" H 6750 4150 50 0000 L CNN
|
||||
F 1 "10uF" H 6450 4150 50 0000 L CNN
|
||||
F 2 "C2V10" H 6700 4050 60 0000 C CNN
|
||||
F 2 "discret:C2V10" H 6700 4050 60 0000 C CNN
|
||||
F 3 "" H 6700 4050 60 0001 C CNN
|
||||
1 6700 4050
|
||||
1 0 0 -1
|
||||
|
|
@ -237,7 +237,7 @@ U 1 1 4549F4A5
|
|||
P 7300 3950
|
||||
F 0 "P3" V 7250 3950 40 0000 C CNN
|
||||
F 1 "POWER" V 7350 3950 40 0000 C CNN
|
||||
F 2 "BORNIER2" H 7300 4150 60 0000 C CNN
|
||||
F 2 "pin_array:pin_array_1x02" H 7300 4150 60 0000 C CNN
|
||||
F 3 "" H 7300 3950 60 0001 C CNN
|
||||
1 7300 3950
|
||||
1 0 0 -1
|
||||
|
|
@ -248,7 +248,7 @@ U 1 1 4549F46C
|
|||
P 7300 4900
|
||||
F 0 "P2" V 7250 4900 40 0000 C CNN
|
||||
F 1 "OUT" V 7350 4900 40 0000 C CNN
|
||||
F 2 "BORNIER2" H 7300 5100 60 0000 C CNN
|
||||
F 2 "pin_array:pin_array_1x02" H 7300 5100 60 0000 C CNN
|
||||
F 3 "" H 7300 4900 60 0001 C CNN
|
||||
1 7300 4900
|
||||
1 0 0 -1
|
||||
|
|
@ -259,7 +259,7 @@ U 1 1 4549F464
|
|||
P 3800 4900
|
||||
F 0 "P1" V 3750 4900 40 0000 C CNN
|
||||
F 1 "IN" V 3850 4900 40 0000 C CNN
|
||||
F 2 "BORNIER2" H 3750 4700 60 0000 C CNN
|
||||
F 2 "pin_array:pin_array_1x02" H 3750 4700 60 0000 C CNN
|
||||
F 3 "" H 3800 4900 60 0001 C CNN
|
||||
1 3800 4900
|
||||
-1 0 0 1
|
||||
|
|
@ -270,7 +270,7 @@ U 1 1 4549F3BE
|
|||
P 6500 4800
|
||||
F 0 "C2" H 6550 4900 50 0000 L CNN
|
||||
F 1 "680nF" H 6550 4700 50 0000 L CNN
|
||||
F 2 "CP8" H 6400 4900 60 0000 C CNN
|
||||
F 2 "discret:CP8" H 6400 4900 60 0000 C CNN
|
||||
F 3 "" H 6500 4800 60 0001 C CNN
|
||||
1 6500 4800
|
||||
0 1 1 0
|
||||
|
|
@ -281,7 +281,7 @@ U 1 1 4549F3AD
|
|||
P 6700 5650
|
||||
F 0 "R3" V 6780 5650 50 0000 C CNN
|
||||
F 1 "100K" V 6700 5650 50 0000 C CNN
|
||||
F 2 "R3" H 6700 5650 60 0000 C CNN
|
||||
F 2 "discret:R3" H 6700 5650 60 0000 C CNN
|
||||
F 3 "" H 6700 5650 60 0001 C CNN
|
||||
1 6700 5650
|
||||
1 0 0 -1
|
||||
|
|
@ -292,7 +292,7 @@ U 1 1 4549F3A2
|
|||
P 4450 5650
|
||||
F 0 "R4" V 4530 5650 50 0000 C CNN
|
||||
F 1 "47K" V 4450 5650 50 0000 C CNN
|
||||
F 2 "R3" V 4350 5650 60 0000 C CNN
|
||||
F 2 "discret:R3" V 4350 5650 60 0000 C CNN
|
||||
F 3 "" H 4450 5650 60 0001 C CNN
|
||||
1 4450 5650
|
||||
1 0 0 -1
|
||||
|
|
@ -303,7 +303,7 @@ U 1 1 4549F39D
|
|||
P 4850 5650
|
||||
F 0 "R2" V 4930 5650 50 0000 C CNN
|
||||
F 1 "1.5K" V 4850 5650 50 0000 C CNN
|
||||
F 2 "R3" V 4756 5656 60 0000 C CNN
|
||||
F 2 "discret:R3" V 4756 5656 60 0000 C CNN
|
||||
F 3 "" H 4850 5650 60 0001 C CNN
|
||||
1 4850 5650
|
||||
1 0 0 -1
|
||||
|
|
@ -314,9 +314,57 @@ U 1 1 4549F38A
|
|||
P 6300 4250
|
||||
F 0 "R1" V 6380 4250 50 0000 C CNN
|
||||
F 1 "1.5K" V 6300 4250 50 0000 C CNN
|
||||
F 2 "R3" H 6400 4150 60 0000 C CNN
|
||||
F 2 "discret:R3" H 6400 4150 60 0000 C CNN
|
||||
F 3 "" H 6300 4250 60 0001 C CNN
|
||||
1 6300 4250
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P5
|
||||
U 1 1 54A5830A
|
||||
P 6300 6600
|
||||
F 0 "P5" H 6380 6600 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6300 6655 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6300 6600 60 0001 C CNN
|
||||
F 3 "" H 6300 6600 60 0000 C CNN
|
||||
1 6300 6600
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P6
|
||||
U 1 1 54A58363
|
||||
P 6300 6700
|
||||
F 0 "P6" H 6380 6700 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6300 6755 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6300 6700 60 0001 C CNN
|
||||
F 3 "" H 6300 6700 60 0000 C CNN
|
||||
1 6300 6700
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P7
|
||||
U 1 1 54A5837A
|
||||
P 6300 6800
|
||||
F 0 "P7" H 6380 6800 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6300 6855 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6300 6800 60 0001 C CNN
|
||||
F 3 "" H 6300 6800 60 0000 C CNN
|
||||
1 6300 6800
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
$Comp
|
||||
L CONN_1 P8
|
||||
U 1 1 54A58391
|
||||
P 6300 6900
|
||||
F 0 "P8" H 6380 6900 40 0000 L CNN
|
||||
F 1 "CONN_1" H 6300 6955 30 0001 C CNN
|
||||
F 2 "connect:1pin" H 6300 6900 60 0001 C CNN
|
||||
F 3 "" H 6300 6900 60 0000 C CNN
|
||||
1 6300 6900
|
||||
1 0 0 -1
|
||||
$EndComp
|
||||
NoConn ~ 6150 6600
|
||||
NoConn ~ 6150 6700
|
||||
NoConn ~ 6150 6800
|
||||
NoConn ~ 6150 6900
|
||||
$EndSCHEMATC
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
(fp_lib_table
|
||||
(lib (name Valves)(type KiCad)(uri ${KISYSMOD}/Valves.pretty)(options "")(descr ""))
|
||||
)
|
||||
|
|
@ -479,16 +479,11 @@ bool SCH_EDIT_FRAME::LoadProjectFile()
|
|||
|
||||
// Load the page layout decr file, from the filename stored in
|
||||
// BASE_SCREEN::m_PageLayoutDescrFileName, read in config project file
|
||||
// If empty, the default descr is loaded
|
||||
// If empty, or not existing, the default descr is loaded
|
||||
WORKSHEET_LAYOUT& pglayout = WORKSHEET_LAYOUT::GetTheInstance();
|
||||
wxString pg_fullfilename = ExpandEnvVarSubstitutions( BASE_SCREEN::m_PageLayoutDescrFileName );
|
||||
|
||||
if( !pg_fullfilename.IsEmpty() )
|
||||
{
|
||||
// When the page layout filename is not absolute, therefore
|
||||
// relative to the current project, make it absolute
|
||||
pg_fullfilename = Prj().AbsolutePath( pg_fullfilename );
|
||||
}
|
||||
wxString pg_fullfilename = WORKSHEET_LAYOUT::MakeFullFileName(
|
||||
BASE_SCREEN::m_PageLayoutDescrFileName,
|
||||
Prj().GetProjectPath() );
|
||||
|
||||
pglayout.SetPageLayout( pg_fullfilename );
|
||||
|
||||
|
|
|
|||
|
|
@ -550,11 +550,15 @@ public:
|
|||
* static function: returns the instance of WORKSHEET_LAYOUT
|
||||
* used in the application
|
||||
*/
|
||||
static WORKSHEET_LAYOUT& GetTheInstance()
|
||||
{
|
||||
extern WORKSHEET_LAYOUT wksTheInstance;
|
||||
return wksTheInstance;
|
||||
}
|
||||
static WORKSHEET_LAYOUT& GetTheInstance();
|
||||
|
||||
/**
|
||||
* static function: Set an alternate instance of WORKSHEET_LAYOUT
|
||||
* mainly used in page setting dialog
|
||||
* @param aLayout = the alternate page layout.
|
||||
* if null, restore the basic page layout
|
||||
*/
|
||||
static void SetAltInstance( WORKSHEET_LAYOUT* aLayout = NULL );
|
||||
|
||||
// Accessors:
|
||||
double GetLeftMargin() { return m_leftMargin; }
|
||||
|
|
@ -664,19 +668,28 @@ public:
|
|||
|
||||
/**
|
||||
* @return a short filename from a full filename:
|
||||
* if the path is the current path, or if the path
|
||||
* if the path is the current project path, or if the path
|
||||
* is the same as kicad.pro (in template), returns the shortname
|
||||
* else do nothing and returns a full filename
|
||||
* @param aFullFileName = the full filename, which can be a relative
|
||||
* @param aProjectPath = the curr project absolute path (can be empty)
|
||||
*/
|
||||
static const wxString MakeShortFileName( const wxString& aFullFileName );
|
||||
static const wxString MakeShortFileName( const wxString& aFullFileName,
|
||||
const wxString& aProjectPath );
|
||||
|
||||
/**
|
||||
* @return a full filename from a short filename,
|
||||
* if the short filename path is void
|
||||
* In this case the path is the same as kicad.pro (in template)
|
||||
* else return the short filename (which have an absolute os relative path
|
||||
*/
|
||||
static const wxString MakeFullFileName( const wxString& aShortFileName );
|
||||
* Static function
|
||||
* @return a full filename from a short filename.
|
||||
* @param aShortFileName = the short filename, which can be a relative
|
||||
* @param aProjectPath = the curr project absolute path (can be empty)
|
||||
* or absolute path, and can include env variable reference ( ${envvar} expression )
|
||||
* if the short filename path is relative, it is expected relative to the project path
|
||||
* or (if aProjectPath is empty or if the file does not exist)
|
||||
* relative to kicad.pro (in template)
|
||||
* If aShortFileName is absolute return aShortFileName
|
||||
*/
|
||||
static const wxString MakeFullFileName( const wxString& aShortFileName,
|
||||
const wxString& aProjectPath );
|
||||
};
|
||||
|
||||
#endif // WORKSHEET_SHAPE_BUILDER_H
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Nov 5 2013)
|
||||
// C++ code generated with wxFormBuilder (version Jun 5 2014)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||
|
|
@ -166,7 +166,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
|
|||
|
||||
m_staticTextRegType = new wxStaticText( m_panelRegulators, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticTextRegType->Wrap( -1 );
|
||||
m_staticTextRegType->SetToolTip( _("Type of the regulator.\nThere are 2 types:\n- regulators which have a dedicted sense pin for the voltage regulation.\n- 3 terminal pins.") );
|
||||
m_staticTextRegType->SetToolTip( _("Type of the regulator.\nThere are 2 types:\n- regulators which have a dedicated sense pin for the voltage regulation.\n- 3 terminal pins.") );
|
||||
|
||||
fgSizerRegParams->Add( m_staticTextRegType, 0, wxALL, 5 );
|
||||
|
||||
|
|
@ -1232,7 +1232,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
|
|||
|
||||
wxArrayString m_BoardClassesUnitsSelectorChoices;
|
||||
m_BoardClassesUnitsSelector = new UNIT_SELECTOR_LEN( m_panelBoardClass, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_BoardClassesUnitsSelectorChoices, 0 );
|
||||
m_BoardClassesUnitsSelector->SetSelection( -1 );
|
||||
m_BoardClassesUnitsSelector->SetSelection( 0 );
|
||||
bSizerBoardClass->Add( m_BoardClassesUnitsSelector, 0, wxALL, 5 );
|
||||
|
||||
wxBoxSizer* brdclsSizerRight;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<wxFormBuilder_Project>
|
||||
<FileVersion major="1" minor="11" />
|
||||
<FileVersion major="1" minor="13" />
|
||||
<object class="Project" expanded="1">
|
||||
<property name="class_decoration"></property>
|
||||
<property name="code_generation">C++</property>
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
<property name="minimum_size"></property>
|
||||
<property name="name">PCB_CALCULATOR_FRAME_BASE</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size">670,489</property>
|
||||
<property name="size">702,489</property>
|
||||
<property name="style">wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER</property>
|
||||
<property name="subclass">KIWAY_PLAYER; kiway_player.h</property>
|
||||
<property name="title">PCB Calculator</property>
|
||||
|
|
@ -2308,7 +2308,7 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip">Type of the regulator.
There are 2 types:
- regulators which have a dedicted sense pin for the voltage regulation.
- 3 terminal pins.</property>
|
||||
<property name="tooltip">Type of the regulator.
There are 2 types:
- regulators which have a dedicated sense pin for the voltage regulation.
- 3 terminal pins.</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -18263,7 +18263,7 @@
|
|||
<property name="pin_button">1</property>
|
||||
<property name="pos"></property>
|
||||
<property name="resize">Resizable</property>
|
||||
<property name="selection">-1</property>
|
||||
<property name="selection">0</property>
|
||||
<property name="show">1</property>
|
||||
<property name="size"></property>
|
||||
<property name="style"></property>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Nov 5 2013)
|
||||
// C++ code generated with wxFormBuilder (version Jun 5 2014)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||
|
|
@ -293,7 +293,7 @@ class PCB_CALCULATOR_FRAME_BASE : public KIWAY_PLAYER
|
|||
|
||||
public:
|
||||
|
||||
PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 670,489 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
|
||||
PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PCB Calculator"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 702,489 ), long style = wxDEFAULT_FRAME_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxTAB_TRAVERSAL );
|
||||
|
||||
~PCB_CALCULATOR_FRAME_BASE();
|
||||
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ void PCB_CALCULATOR_FRAME::OnClosePcbCalc( wxCloseEvent& event )
|
|||
msg.Printf( _("Unable to write file<%s>\n"\
|
||||
"Do you want to exit and abandon your change?"), GetDataFilename().c_str() );
|
||||
|
||||
int opt = wxMessageBox( msg, _("Write Data File Errror"),
|
||||
int opt = wxMessageBox( msg, _("Write Data File Error"),
|
||||
wxYES_NO | wxICON_QUESTION );
|
||||
if( opt == wxNO )
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ set( PCBNEW_DIALOGS
|
|||
dialogs/dialog_SVG_print_base.cpp
|
||||
dialogs/dialog_select_pretty_lib.cpp
|
||||
dialogs/dialog_select_pretty_lib_base.cpp
|
||||
dialogs/dialog_select_dirlist_base.cpp
|
||||
dialogs/dialog_set_grid.cpp
|
||||
dialogs/dialog_set_grid_base.cpp
|
||||
dialogs/dialog_target_properties_base.cpp
|
||||
|
|
|
|||
|
|
@ -33,5 +33,9 @@
|
|||
<key>LSRequiresCarbon</key> <true/>
|
||||
<key>NSHumanReadableCopyright</key> <string></string>
|
||||
<key>NSHighResolutionCapable</key> <string>True</string>
|
||||
<key>LSEnvironment</key>
|
||||
<dict>
|
||||
<key>KIGITHUB</key> <string>https://github.com/kicad</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
|
|
|||
|
|
@ -295,6 +295,10 @@ public:
|
|||
m_global( aGlobal ),
|
||||
m_project( aProject )
|
||||
{
|
||||
// For user info, shows the table filenames:
|
||||
m_PrjTableFilename->SetLabel( Prj().FootprintLibTblName() );
|
||||
m_GblTableFilename->SetLabel( FP_LIB_TABLE::GetGlobalTableFileName() );
|
||||
|
||||
// wxGrid only supports user owned tables if they exist past end of ~wxGrid(),
|
||||
// so make it a grid owned table.
|
||||
m_global_grid->SetTable( new FP_TBL_MODEL( *aGlobal ), true );
|
||||
|
|
|
|||
|
|
@ -24,6 +24,22 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
|
|||
wxBoxSizer* m_global_sizer;
|
||||
m_global_sizer = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer1;
|
||||
fgSizer1 = new wxFlexGridSizer( 1, 2, 0, 0 );
|
||||
fgSizer1->SetFlexibleDirection( wxBOTH );
|
||||
fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("Table:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText3->Wrap( -1 );
|
||||
fgSizer1->Add( m_staticText3, 0, wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
m_GblTableFilename = new wxStaticText( m_global_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_GblTableFilename->Wrap( -1 );
|
||||
fgSizer1->Add( m_GblTableFilename, 0, wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 5 );
|
||||
|
||||
m_global_grid = new wxGrid( m_global_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
|
||||
// Grid
|
||||
|
|
@ -60,6 +76,22 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
|
|||
wxBoxSizer* m_project_sizer;
|
||||
m_project_sizer = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
wxFlexGridSizer* fgSizer2;
|
||||
fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 );
|
||||
fgSizer2->SetFlexibleDirection( wxBOTH );
|
||||
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||
|
||||
m_staticText4 = new wxStaticText( m_project_panel, wxID_ANY, _("Table:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText4->Wrap( -1 );
|
||||
fgSizer2->Add( m_staticText4, 0, wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
m_PrjTableFilename = new wxStaticText( m_project_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_PrjTableFilename->Wrap( -1 );
|
||||
fgSizer2->Add( m_PrjTableFilename, 0, wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
|
||||
m_project_sizer->Add( fgSizer2, 0, wxEXPAND, 5 );
|
||||
|
||||
m_project_grid = new wxGrid( m_project_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
|
||||
// Grid
|
||||
|
|
|
|||
|
|
@ -277,6 +277,190 @@
|
|||
<property name="name">m_global_sizer</property>
|
||||
<property name="orient">wxVERTICAL</property>
|
||||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxFlexGridSizer" expanded="1">
|
||||
<property name="cols">2</property>
|
||||
<property name="flexible_direction">wxBOTH</property>
|
||||
<property name="growablecols"></property>
|
||||
<property name="growablerows"></property>
|
||||
<property name="hgap">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">fgSizer1</property>
|
||||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="rows">1</property>
|
||||
<property name="vgap">0</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxRIGHT|wxLEFT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticText" expanded="1">
|
||||
<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_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_ANY</property>
|
||||
<property name="label">Table:</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_staticText3</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="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<property name="wrap">-1</property>
|
||||
<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="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxRIGHT|wxLEFT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticText" expanded="1">
|
||||
<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_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_ANY</property>
|
||||
<property name="label">Table Name</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_GblTableFilename</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="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<property name="wrap">-1</property>
|
||||
<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>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="0">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALL|wxEXPAND</property>
|
||||
|
|
@ -506,6 +690,190 @@
|
|||
<property name="name">m_project_sizer</property>
|
||||
<property name="orient">wxVERTICAL</property>
|
||||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxFlexGridSizer" expanded="1">
|
||||
<property name="cols">2</property>
|
||||
<property name="flexible_direction">wxBOTH</property>
|
||||
<property name="growablecols"></property>
|
||||
<property name="growablerows"></property>
|
||||
<property name="hgap">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">fgSizer2</property>
|
||||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="rows">1</property>
|
||||
<property name="vgap">0</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxRIGHT|wxLEFT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticText" expanded="1">
|
||||
<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_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_ANY</property>
|
||||
<property name="label">Table:</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_staticText4</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="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<property name="wrap">-1</property>
|
||||
<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="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxRIGHT|wxLEFT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticText" expanded="1">
|
||||
<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_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_ANY</property>
|
||||
<property name="label">Table Name</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_PrjTableFilename</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="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<property name="wrap">-1</property>
|
||||
<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>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="0">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALL|wxEXPAND</property>
|
||||
|
|
|
|||
|
|
@ -14,13 +14,14 @@
|
|||
class DIALOG_SHIM;
|
||||
|
||||
#include "dialog_shim.h"
|
||||
#include <wx/string.h>
|
||||
#include <wx/stattext.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/font.h>
|
||||
#include <wx/colour.h>
|
||||
#include <wx/settings.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/font.h>
|
||||
#include <wx/grid.h>
|
||||
#include <wx/gdicmn.h>
|
||||
#include <wx/sizer.h>
|
||||
#include <wx/grid.h>
|
||||
#include <wx/panel.h>
|
||||
#include <wx/bitmap.h>
|
||||
#include <wx/image.h>
|
||||
|
|
@ -43,8 +44,12 @@ class DIALOG_FP_LIB_TABLE_BASE : public DIALOG_SHIM
|
|||
protected:
|
||||
wxAuiNotebook* m_auinotebook;
|
||||
wxPanel* m_global_panel;
|
||||
wxStaticText* m_staticText3;
|
||||
wxStaticText* m_GblTableFilename;
|
||||
wxGrid* m_global_grid;
|
||||
wxPanel* m_project_panel;
|
||||
wxStaticText* m_staticText4;
|
||||
wxStaticText* m_PrjTableFilename;
|
||||
wxGrid* m_project_grid;
|
||||
wxButton* m_append_button;
|
||||
wxButton* m_buttonWizard;
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c
|
|||
|
||||
bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Launch FreeRouter and Launch FreeRouter"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_buttonLaunchFreeroute->SetToolTip( _("Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)") );
|
||||
m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Export a Specctra Design and Launch FreeRoute"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_buttonLaunchFreeroute->SetToolTip( _("FreeRouter can be run only if freeroute.jar is found in Kicad binaries folder") );
|
||||
|
||||
bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL|wxEXPAND, 5 );
|
||||
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@
|
|||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_BUTTON_LAUNCH</property>
|
||||
<property name="label">Launch FreeRouter and Launch FreeRouter</property>
|
||||
<property name="label">Export a Specctra Design and Launch FreeRoute</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
<property name="maximum_size"></property>
|
||||
|
|
@ -364,7 +364,7 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip">Use Java Web Start function to run FreeRouter via Internet (or your Browser if not found)</property>
|
||||
<property name="tooltip">FreeRouter can be run only if freeroute.jar is found in Kicad binaries folder</property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ DIALOG_SELECT_DIRLIST_BASE::DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWind
|
|||
wxBoxSizer* bSizerMain;
|
||||
bSizerMain = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticText = new wxStaticText( this, wxID_ANY, _("The footprint library is a folde.\nFootprints are files inside this folder."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText = new wxStaticText( this, wxID_ANY, _("The footprint library is a folder.\nFootprints are files inside this folder."), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_staticText->Wrap( -1 );
|
||||
m_staticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
|
||||
|
||||
|
|
@ -25,10 +25,12 @@ DIALOG_SELECT_DIRLIST_BASE::DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWind
|
|||
m_dirCtrl = new wxGenericDirCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDIRCTRL_3D_INTERNAL|wxDIRCTRL_DIR_ONLY|wxDIRCTRL_MULTIPLE|wxDIRCTRL_SHOW_FILTERS|wxSUNKEN_BORDER, _("*.pretty|*"), 0 );
|
||||
|
||||
m_dirCtrl->ShowHidden( false );
|
||||
m_dirCtrl->SetMinSize( wxSize( 400,350 ) );
|
||||
|
||||
bSizerMain->Add( m_dirCtrl, 1, wxEXPAND | wxALL, 5 );
|
||||
|
||||
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
|
||||
m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
bSizerMain->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||
|
||||
m_sdbSizer = new wxStdDialogButtonSizer();
|
||||
m_sdbSizerOK = new wxButton( this, wxID_OK );
|
||||
|
|
@ -37,7 +39,7 @@ DIALOG_SELECT_DIRLIST_BASE::DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWind
|
|||
m_sdbSizer->AddButton( m_sdbSizerCancel );
|
||||
m_sdbSizer->Realize();
|
||||
|
||||
bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT, 5 );
|
||||
bSizerMain->Add( m_sdbSizer, 0, wxALIGN_RIGHT|wxALL, 5 );
|
||||
|
||||
|
||||
this->SetSizer( bSizerMain );
|
||||
|
|
@ -48,6 +50,8 @@ DIALOG_SELECT_DIRLIST_BASE::DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWind
|
|||
// Connect Events
|
||||
m_dirCtrl->Connect( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnSelectFolder ), NULL, this );
|
||||
m_dirCtrl->Connect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnSelectFolder ), NULL, this );
|
||||
m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnCancelClick ), NULL, this );
|
||||
m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnOKClick ), NULL, this );
|
||||
}
|
||||
|
||||
DIALOG_SELECT_DIRLIST_BASE::~DIALOG_SELECT_DIRLIST_BASE()
|
||||
|
|
@ -55,5 +59,7 @@ DIALOG_SELECT_DIRLIST_BASE::~DIALOG_SELECT_DIRLIST_BASE()
|
|||
// Disconnect Events
|
||||
m_dirCtrl->Disconnect( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnSelectFolder ), NULL, this );
|
||||
m_dirCtrl->Disconnect( wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnSelectFolder ), NULL, this );
|
||||
m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnCancelClick ), NULL, this );
|
||||
m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnOKClick ), NULL, this );
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<property name="minimum_size">400,300</property>
|
||||
<property name="name">DIALOG_SELECT_DIRLIST_BASE</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size">400,300</property>
|
||||
<property name="size">400,321</property>
|
||||
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
|
||||
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
|
||||
<property name="title">Select Footprint Library Folder</property>
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">The footprint library is a folde.
Footprints are files inside this folder.</property>
|
||||
<property name="label">The footprint library is a folder.
Footprints are files inside this folder.</property>
|
||||
<property name="max_size"></property>
|
||||
<property name="maximize_button">0</property>
|
||||
<property name="maximum_size"></property>
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
<property name="maximum_size"></property>
|
||||
<property name="min_size"></property>
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="minimum_size">400,350</property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_dirCtrl</property>
|
||||
<property name="pane_border">1</property>
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND | wxALL</property>
|
||||
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticLine" expanded="1">
|
||||
<property name="BottomDockable">1</property>
|
||||
|
|
@ -317,7 +317,7 @@
|
|||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">m_staticline1</property>
|
||||
<property name="name">m_staticline</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
|
|
@ -361,7 +361,7 @@
|
|||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALIGN_RIGHT</property>
|
||||
<property name="flag">wxALIGN_RIGHT|wxALL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStdDialogButtonSizer" expanded="1">
|
||||
<property name="Apply">0</property>
|
||||
|
|
@ -376,11 +376,11 @@
|
|||
<property name="name">m_sdbSizer</property>
|
||||
<property name="permission">protected</property>
|
||||
<event name="OnApplyButtonClick"></event>
|
||||
<event name="OnCancelButtonClick"></event>
|
||||
<event name="OnCancelButtonClick">OnCancelClick</event>
|
||||
<event name="OnContextHelpButtonClick"></event>
|
||||
<event name="OnHelpButtonClick"></event>
|
||||
<event name="OnNoButtonClick"></event>
|
||||
<event name="OnOKButtonClick"></event>
|
||||
<event name="OnOKButtonClick">OnOKClick</event>
|
||||
<event name="OnSaveButtonClick"></event>
|
||||
<event name="OnYesButtonClick"></event>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -39,18 +39,20 @@ class DIALOG_SELECT_DIRLIST_BASE : public DIALOG_SHIM
|
|||
protected:
|
||||
wxStaticText* m_staticText;
|
||||
wxGenericDirCtrl* m_dirCtrl;
|
||||
wxStaticLine* m_staticline1;
|
||||
wxStaticLine* m_staticline;
|
||||
wxStdDialogButtonSizer* m_sdbSizer;
|
||||
wxButton* m_sdbSizerOK;
|
||||
wxButton* m_sdbSizerCancel;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnSelectFolder( wxTreeEvent& event ) { event.Skip(); }
|
||||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
||||
DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Footprint Library Folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,300 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Footprint Library Folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,321 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
~DIALOG_SELECT_DIRLIST_BASE();
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
#include <project.h> // For PROJECT_VAR_NAME definition
|
||||
#include <io_mgr.h>
|
||||
#include <wizard_add_fplib.h>
|
||||
#include <dialog_select_dirlist_base.h>
|
||||
|
||||
// a key to store the default Kicad Github libs URL
|
||||
#define KICAD_FPLIBS_URL_KEY wxT( "kicad_fplib_url" )
|
||||
|
|
@ -640,6 +641,11 @@ public:
|
|||
{
|
||||
if( !aDefaultPath.IsEmpty() )
|
||||
m_dirCtrl->SetPath( aDefaultPath );
|
||||
|
||||
Layout();
|
||||
GetSizer()->Fit( this );
|
||||
GetSizer()->SetSizeHints(this);
|
||||
Centre();
|
||||
}
|
||||
|
||||
~DIALOG_SELECT_DIRLIST() {};
|
||||
|
|
|
|||
|
|
@ -251,52 +251,3 @@ WIZARD_FPLIB_TABLE_BASE::~WIZARD_FPLIB_TABLE_BASE()
|
|||
|
||||
m_pages.Clear();
|
||||
}
|
||||
|
||||
DIALOG_SELECT_DIRLIST_BASE::DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
|
||||
{
|
||||
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
|
||||
|
||||
wxBoxSizer* bSizerMain;
|
||||
bSizerMain = new wxBoxSizer( wxVERTICAL );
|
||||
|
||||
m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("The footprint library is a folder.\nFootprints are files inside this folder."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
|
||||
m_staticTextInfo->Wrap( -1 );
|
||||
m_staticTextInfo->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
|
||||
|
||||
bSizerMain->Add( m_staticTextInfo, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
|
||||
|
||||
m_dirCtrl = new wxGenericDirCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDIRCTRL_3D_INTERNAL|wxDIRCTRL_DIR_ONLY|wxDIRCTRL_MULTIPLE|wxSUNKEN_BORDER, wxEmptyString, 0 );
|
||||
|
||||
m_dirCtrl->ShowHidden( false );
|
||||
bSizerMain->Add( m_dirCtrl, 1, wxEXPAND | wxALL, 5 );
|
||||
|
||||
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||
bSizerMain->Add( m_staticline1, 0, wxEXPAND | wxALL, 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();
|
||||
|
||||
bSizerMain->Add( m_sdbSizer, 0, wxEXPAND, 5 );
|
||||
|
||||
|
||||
this->SetSizer( bSizerMain );
|
||||
this->Layout();
|
||||
|
||||
this->Centre( wxBOTH );
|
||||
|
||||
// Connect Events
|
||||
m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnCancelClick ), NULL, this );
|
||||
m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnOKClick ), NULL, this );
|
||||
}
|
||||
|
||||
DIALOG_SELECT_DIRLIST_BASE::~DIALOG_SELECT_DIRLIST_BASE()
|
||||
{
|
||||
// Disconnect Events
|
||||
m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnCancelClick ), NULL, this );
|
||||
m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SELECT_DIRLIST_BASE::OnOKClick ), NULL, this );
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2123,366 +2123,5 @@
|
|||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="Dialog" expanded="1">
|
||||
<property name="aui_managed">0</property>
|
||||
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
|
||||
<property name="bg"></property>
|
||||
<property name="center">wxBOTH</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="event_handler">impl_virtual</property>
|
||||
<property name="extra_style"></property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">DIALOG_SELECT_DIRLIST_BASE</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size">346,325</property>
|
||||
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="title">Select Footprint Library Folder</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnActivate"></event>
|
||||
<event name="OnActivateApp"></event>
|
||||
<event name="OnAuiFindManager"></event>
|
||||
<event name="OnAuiPaneButton"></event>
|
||||
<event name="OnAuiPaneClose"></event>
|
||||
<event name="OnAuiPaneMaximize"></event>
|
||||
<event name="OnAuiPaneRestore"></event>
|
||||
<event name="OnAuiRender"></event>
|
||||
<event name="OnChar"></event>
|
||||
<event name="OnClose"></event>
|
||||
<event name="OnEnterWindow"></event>
|
||||
<event name="OnEraseBackground"></event>
|
||||
<event name="OnHibernate"></event>
|
||||
<event name="OnIconize"></event>
|
||||
<event name="OnIdle"></event>
|
||||
<event name="OnInitDialog"></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 class="wxBoxSizer" expanded="1">
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">bSizerMain</property>
|
||||
<property name="orient">wxVERTICAL</property>
|
||||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticText" expanded="1">
|
||||
<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_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">,90,92,-1,70,0</property>
|
||||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">The footprint library is a folder.
Footprints are files inside this folder.</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_staticTextInfo</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">wxALIGN_CENTRE</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<property name="wrap">-1</property>
|
||||
<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="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND | wxALL</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="wxGenericDirCtrl" expanded="1">
|
||||
<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_pane">0</property>
|
||||
<property name="defaultfilter">0</property>
|
||||
<property name="defaultfolder"></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="filter"></property>
|
||||
<property name="floatable">1</property>
|
||||
<property name="font"></property>
|
||||
<property name="gripper">0</property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</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_dirCtrl</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="show_hidden">0</property>
|
||||
<property name="size"></property>
|
||||
<property name="style">wxDIRCTRL_3D_INTERNAL|wxDIRCTRL_DIR_ONLY|wxDIRCTRL_MULTIPLE</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style">wxSUNKEN_BORDER</property>
|
||||
<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="OnTreeBeginDrag"></event>
|
||||
<event name="OnTreeBeginLabelEdit"></event>
|
||||
<event name="OnTreeBeginRDrag"></event>
|
||||
<event name="OnTreeDeleteItem"></event>
|
||||
<event name="OnTreeEndDrag"></event>
|
||||
<event name="OnTreeEndLabelEdit"></event>
|
||||
<event name="OnTreeItemActivated"></event>
|
||||
<event name="OnTreeItemCollapsed"></event>
|
||||
<event name="OnTreeItemCollapsing"></event>
|
||||
<event name="OnTreeItemExpanded"></event>
|
||||
<event name="OnTreeItemExpanding"></event>
|
||||
<event name="OnTreeItemMenu"></event>
|
||||
<event name="OnTreeItemMiddleClick"></event>
|
||||
<event name="OnTreeItemRightClick"></event>
|
||||
<event name="OnTreeKeyDown"></event>
|
||||
<event name="OnTreeSelChanged"></event>
|
||||
<event name="OnTreeSelChanging"></event>
|
||||
<event name="OnUpdateUI"></event>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND | wxALL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticLine" expanded="1">
|
||||
<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_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_ANY</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_staticline1</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">wxLI_HORIZONTAL</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="toolbar_pane">0</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<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="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">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="name">m_sdbSizer</property>
|
||||
<property name="permission">protected</property>
|
||||
<event name="OnApplyButtonClick"></event>
|
||||
<event name="OnCancelButtonClick">OnCancelClick</event>
|
||||
<event name="OnContextHelpButtonClick"></event>
|
||||
<event name="OnHelpButtonClick"></event>
|
||||
<event name="OnNoButtonClick"></event>
|
||||
<event name="OnOKButtonClick">OnOKClick</event>
|
||||
<event name="OnSaveButtonClick"></event>
|
||||
<event name="OnYesButtonClick"></event>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
</wxFormBuilder_Project>
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
#include <wx/wizard.h>
|
||||
#include <wx/dynarray.h>
|
||||
WX_DEFINE_ARRAY_PTR( wxWizardPageSimple*, WizardPages );
|
||||
#include <wx/dirctrl.h>
|
||||
#include <wx/dialog.h>
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
@ -87,31 +85,4 @@ class WIZARD_FPLIB_TABLE_BASE : public wxWizard
|
|||
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
/// Class DIALOG_SELECT_DIRLIST_BASE
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
class DIALOG_SELECT_DIRLIST_BASE : public wxDialog
|
||||
{
|
||||
private:
|
||||
|
||||
protected:
|
||||
wxStaticText* m_staticTextInfo;
|
||||
wxGenericDirCtrl* m_dirCtrl;
|
||||
wxStaticLine* m_staticline1;
|
||||
wxStdDialogButtonSizer* m_sdbSizer;
|
||||
wxButton* m_sdbSizerOK;
|
||||
wxButton* m_sdbSizerCancel;
|
||||
|
||||
// Virtual event handlers, overide them in your derived class
|
||||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); }
|
||||
|
||||
|
||||
public:
|
||||
|
||||
DIALOG_SELECT_DIRLIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Footprint Library Folder"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 346,325 ), long style = wxDEFAULT_DIALOG_STYLE );
|
||||
~DIALOG_SELECT_DIRLIST_BASE();
|
||||
|
||||
};
|
||||
|
||||
#endif //__WIZARD_ADD_FPLIB_BASE_H__
|
||||
|
|
|
|||
|
|
@ -386,6 +386,9 @@ void KICAD_NETLIST_PARSER::parseLibPartList() throw( IO_ERROR, PARSE_ERROR )
|
|||
{
|
||||
/* Parses a section like
|
||||
* (libpart (lib device) (part C)
|
||||
* (aliases
|
||||
* (alias Cxx)
|
||||
* (alias Cyy))
|
||||
* (description "Condensateur non polarise")
|
||||
* (footprints
|
||||
* (fp SM*)
|
||||
|
|
@ -405,6 +408,7 @@ void KICAD_NETLIST_PARSER::parseLibPartList() throw( IO_ERROR, PARSE_ERROR )
|
|||
wxString libName;
|
||||
wxString libPartName;
|
||||
wxArrayString footprintFilters;
|
||||
wxArrayString aliases;
|
||||
|
||||
// The last token read was libpart, so read the next token
|
||||
while( (token = NextTok()) != T_RIGHT )
|
||||
|
|
@ -443,6 +447,20 @@ void KICAD_NETLIST_PARSER::parseLibPartList() throw( IO_ERROR, PARSE_ERROR )
|
|||
|
||||
break;
|
||||
|
||||
case T_aliases:
|
||||
while( (token = NextTok()) != T_RIGHT )
|
||||
{
|
||||
if( token == T_LEFT )
|
||||
token = NextTok();
|
||||
|
||||
if( token != T_alias )
|
||||
Expecting( T_alias );
|
||||
|
||||
NeedSYMBOLorNUMBER();
|
||||
aliases.Add( FROM_UTF8( CurText() ) );
|
||||
NeedRIGHT();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
// Skip not used data (i.e all other tokens)
|
||||
skipCurrent();
|
||||
|
|
@ -457,5 +475,12 @@ void KICAD_NETLIST_PARSER::parseLibPartList() throw( IO_ERROR, PARSE_ERROR )
|
|||
|
||||
if( component->IsLibSource( libName, libPartName ) )
|
||||
component->SetFootprintFilters( footprintFilters );
|
||||
|
||||
for( unsigned jj = 0; jj < aliases.GetCount(); jj++ )
|
||||
{
|
||||
if( component->IsLibSource( libName, aliases[jj] ) )
|
||||
component->SetFootprintFilters( footprintFilters );
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -267,17 +267,11 @@ bool PCB_EDIT_FRAME::LoadProjectSettings()
|
|||
|
||||
// Load the page layout decr file, from the filename stored in
|
||||
// BASE_SCREEN::m_PageLayoutDescrFileName, read in config project file
|
||||
// If empty, the default descr is loaded
|
||||
// If empty, or not existing, the default descr is loaded
|
||||
WORKSHEET_LAYOUT& pglayout = WORKSHEET_LAYOUT::GetTheInstance();
|
||||
wxString pg_fullfilename = ExpandEnvVarSubstitutions(
|
||||
BASE_SCREEN::m_PageLayoutDescrFileName );
|
||||
|
||||
if( !pg_fullfilename.IsEmpty() )
|
||||
{
|
||||
// When the page layout filename is not absolute, therefore
|
||||
// relative to the current project, make it absolute
|
||||
pg_fullfilename = Prj().AbsolutePath( pg_fullfilename );
|
||||
}
|
||||
wxString pg_fullfilename = WORKSHEET_LAYOUT::MakeFullFileName(
|
||||
BASE_SCREEN::m_PageLayoutDescrFileName,
|
||||
Prj().GetProjectPath() );
|
||||
|
||||
pglayout.SetPageLayout( pg_fullfilename );
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,25 @@ REVISION=$TESTING
|
|||
# CMake Options
|
||||
OPTS="$OPTS -DBUILD_GITHUB_PLUGIN=ON" # needed by $STABLE revision
|
||||
|
||||
# Python scripting, uncomment to enable
|
||||
# Uncomment this line if you have issues to build kicad with a wxWidgets with is not built
|
||||
# with webkit/webview support, i.e. if you have this error:
|
||||
# error "wxWidgets must be built with wxWebView support enabled. Please rebuild wxWidgets"
|
||||
# but you will lose the wizard which allows you to easily add .pretty libs on github server
|
||||
# (you will need to enter by hand their url in footprint lib table dialog)
|
||||
#OPTS="$OPTS -DKICAD_USE_WEBKIT=OFF"
|
||||
|
||||
# Python scripting, uncomment only one to enable:
|
||||
|
||||
# Basic python scripting: gives access to wizards like footprint wizards (recommended)
|
||||
# be sure you have python 2.7 installed
|
||||
#OPTS="$OPTS -DKICAD_SCRIPTING=ON"
|
||||
|
||||
# More advanced python scripting: gives access to wizards like footprint wizards and creates a python module
|
||||
# to edit board files (.kicad_pcb files) outside kicad, by python scripts
|
||||
#OPTS="$OPTS -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON"
|
||||
|
||||
# Most advanced python scripting: you can execute python scripts inside Pcbnew to edit the current loaded board
|
||||
# mainly for advanced users
|
||||
#OPTS="$OPTS -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON"
|
||||
|
||||
# Use https under bazaar to retrieve repos because this does not require a
|
||||
|
|
|
|||
Loading…
Reference in New Issue