Merged the netnames branch.

3d-viewer/3d_class.cpp

@@ -59,7 +59,7 @@ void S3D_MATERIAL::SetMaterial()
 
 void S3D_MASTER::Copy( S3D_MASTER* pattern )
 {
-    m_Shape3DName = pattern->m_Shape3DName;
+    SetShape3DName( pattern->GetShape3DName() );
     m_MatScale    = pattern->m_MatScale;
     m_MatRotation = pattern->m_MatRotation;
     m_MatPosition = pattern->m_MatPosition;
@@ -74,6 +74,7 @@ S3D_MASTER::S3D_MASTER( EDA_ITEM* aParent ) :
     m_MatScale.x  = m_MatScale.y = m_MatScale.z = 1.0;
     m_3D_Drawings = NULL;
     m_Materials   = NULL;
+    m_ShapeType   = FILE3D_NONE;
 }
 
 
@@ -96,6 +97,45 @@ S3D_MASTER:: ~S3D_MASTER()
 }
 
 
+bool S3D_MASTER::Is3DType( enum FILE3D_TYPE aShapeType )
+{
+    // type 'none' is not valid and will always return false
+    if( aShapeType == FILE3D_NONE )
+        return false;
+
+    // no one is interested if we have no file
+    if( m_Shape3DName.empty() )
+        return false;
+
+    if( aShapeType == m_ShapeType )
+        return true;
+
+    return false;
+}
+
+
+void S3D_MASTER::SetShape3DName( const wxString& aShapeName )
+{
+    m_ShapeType = FILE3D_NONE;
+    m_Shape3DName = aShapeName;
+
+    if( m_Shape3DName.empty() )
+        return;
+
+    wxFileName fn = m_Shape3DName;
+    wxString ext  = fn.GetExt();
+
+    if( ext == wxT( "wrl" ) || ext == wxT( "x3d" ) )
+        m_ShapeType = FILE3D_VRML;
+    else if( ext == wxT( "idf" ) )
+        m_ShapeType = FILE3D_IDF;
+    else
+        m_ShapeType = FILE3D_UNKNOWN;
+
+    return;
+}
+
+
 STRUCT_3D_SHAPE::STRUCT_3D_SHAPE( EDA_ITEM* aParent ) :
     EDA_ITEM( aParent, NOT_USED )
 {

3d-viewer/3d_draw.cpp

@@ -857,7 +857,7 @@ void MODULE::ReadAndInsert3DComponentShape( EDA_3D_CANVAS* glcanvas )
 
         for( ; struct3D != NULL; struct3D = struct3D->Next() )
         {
-            if( !struct3D->m_Shape3DName.IsEmpty() )
+            if( struct3D->Is3DType( S3D_MASTER::FILE3D_VRML ) )
                 struct3D->ReadData();
         }
 

3d-viewer/3d_frame.cpp

@@ -141,8 +141,6 @@ void EDA_3D_FRAME::Exit3DFrame( wxCommandEvent& event )
 
 void EDA_3D_FRAME::OnCloseWindow( wxCloseEvent& Event )
 {
-    SaveSettings();
-
     if( Parent() )
         Parent()->m_Draw3DFrame = NULL;
 

3d-viewer/3d_struct.h

@@ -92,13 +92,24 @@ public:
 class S3D_MASTER : public EDA_ITEM
 {
 public:
-    wxString        m_Shape3DName; /* 3D shape name in 3D library */
     S3D_VERTEX      m_MatScale;
     S3D_VERTEX      m_MatRotation;
     S3D_VERTEX      m_MatPosition;
     STRUCT_3D_SHAPE* m_3D_Drawings;
     S3D_MATERIAL*   m_Materials;
 
+    enum FILE3D_TYPE
+    {
+        FILE3D_NONE = 0,
+        FILE3D_VRML,
+        FILE3D_IDF,
+        FILE3D_UNKNOWN
+    };
+
+private:
+    wxString    m_Shape3DName;  /* 3D shape name in 3D library */
+    FILE3D_TYPE m_ShapeType;
+
 public:
     S3D_MASTER( EDA_ITEM* aParent );
     ~S3D_MASTER();
@@ -120,6 +131,20 @@ public:
 #if defined(DEBUG)
     void Show( int nestLevel, std::ostream& os ) const { ShowDummy( os ); } // override
 #endif
+
+    /**
+     * Function Is3DType
+     * returns true if the argument matches the type of model referred to
+     * by m_Shape3DName
+     */
+    bool Is3DType( enum FILE3D_TYPE aShapeType );
+
+    const wxString& GetShape3DName( void )
+    {
+        return m_Shape3DName;
+    }
+
+    void SetShape3DName( const wxString& aShapeName );
 };
 
 

3d-viewer/x3dmodelparser.cpp

@@ -36,8 +36,10 @@
 #include <queue>
 #include <vector>
 
-#include "3d_struct.h"
-#include "modelparsers.h"
+#include <3d_struct.h>
+#include <modelparsers.h>
+#include <xnode.h>
+
 
 X3D_MODEL_PARSER::X3D_MODEL_PARSER( S3D_MASTER* aMaster ) :
     S3D_MODEL_PARSER( aMaster )
@@ -54,13 +56,13 @@ void X3D_MODEL_PARSER::Load( const wxString aFilename )
 
     if( !doc.Load( aFilename ) )
     {
-        wxLogError( wxT( "Error while parsing file <%s>" ), GetChars( aFilename ) );
+        wxLogError( wxT( "Error while parsing file '%s'" ), GetChars( aFilename ) );
         return;
     }
 
     if( doc.GetRoot()->GetName() != wxT( "X3D" ) )
     {
-        wxLogError( wxT( "Filetype is not X3D <%s>" ), GetChars( aFilename ) );
+        wxLogError( wxT( "Filetype is not X3D '%s'" ), GetChars( aFilename ) );
         return;
     }
 
@@ -85,24 +87,25 @@ wxString X3D_MODEL_PARSER::VRML_representation()
 
     for( unsigned i = 0; i < vrml_points.size(); i++ )
     {
-    output += wxT( "Shape {\n"
-                   "  appearance Appearance {\n"
-                   "    material Material {\n" ) +
-              vrml_materials[i] +
-              wxT( "    }\n"
-                   "  }\n"
-                   "  geometry IndexedFaceSet {\n"
-                   "    solid TRUE\n"
-                   "    coord Coordinate {\n"
-                   "      point [\n") +
-              vrml_points[i] +
-              wxT( "      ]\n"
-                   "    }\n"
-                   "    coordIndex [\n" ) +
-              vrml_coord_indexes[i] +
-              wxT( "    ]\n"
-                   "  }\n"
-                   "},\n" );
+        output +=
+            wxT( "Shape {\n"
+                 "  appearance Appearance {\n"
+                 "    material Material {\n" ) +
+            vrml_materials[i] +
+            wxT( "    }\n"
+                 "  }\n"
+                 "  geometry IndexedFaceSet {\n"
+                 "    solid TRUE\n"
+                 "    coord Coordinate {\n"
+                 "      point [\n") +
+            vrml_points[i] +
+            wxT( "      ]\n"
+                 "    }\n"
+                 "    coordIndex [\n" ) +
+            vrml_coord_indexes[i] +
+            wxT( "    ]\n"
+                 "  }\n"
+                 "},\n" );
     }
 
     return output;
@@ -115,6 +118,7 @@ void X3D_MODEL_PARSER::GetChildsByName( wxXmlNode* aParent,
 {
     // Breadth-first search (BFS)
     std::queue< wxXmlNode* > found;
+
     found.push( aParent );
 
     while( !found.empty() )
@@ -140,7 +144,7 @@ void X3D_MODEL_PARSER::GetChildsByName( wxXmlNode* aParent,
 
 void X3D_MODEL_PARSER::GetNodeProperties( wxXmlNode* aNode, PROPERTY_MAP& aProps )
 {
-    wxXmlProperty *prop;
+    wxXmlAttribute* prop;
 
     for( prop = aNode->GetAttributes();
          prop != NULL;
@@ -167,6 +171,7 @@ void X3D_MODEL_PARSER::readTransform( wxXmlNode* aTransformNode )
     childnodes.clear();
 
     PROPERTY_MAP properties;
+
     GetNodeProperties( aTransformNode, properties );
     GetChildsByName( aTransformNode, wxT("IndexedFaceSet"), childnodes );
 
@@ -252,7 +257,7 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
         wxString vrml_material;
         PROPERTY_MAP::const_iterator p = ++properties.begin(); // skip DEF
 
-        for(;p != properties.end();p++)
+        for( ; p != properties.end(); p++ )
         {
             vrml_material.Append( p->first + wxT( " " ) + p->second + wxT( "\n" ) );
         }
@@ -270,8 +275,8 @@ void X3D_MODEL_PARSER::readMaterial( wxXmlNode* aMatNode )
         {
             if( material->m_Name == mat_name )
             {
-
                 wxString vrml_material;
+
                 vrml_material.Append( wxString::Format( wxT( "specularColor %f %f %f\n" ),
                                                              material->m_SpecularColor.x,
                                                              material->m_SpecularColor.y,
@@ -457,6 +462,7 @@ void X3D_MODEL_PARSER::readIndexedFaceSet( wxXmlNode* aFaceNode,
     while( index_tokens.HasMoreTokens() )
     {
         long index = 0;
+
         index_tokens.GetNextToken().ToLong( &index );
 
         // -1 marks the end of polygon

CMakeLists.txt

@@ -14,6 +14,9 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules )
 # reports.
 #
 
+option( USE_KIWAY_DLLS
+    "Build the major modules as DLLs or DSOs, will soon be the norm." OFF )
+
 #for those who bored with uppercase
 option( KICAD_KEEPCASE "turn-off automatic component name conversion to uppercase if selected" )
 
@@ -23,11 +26,6 @@ option( USE_WX_GRAPHICS_CONTEXT
 option( USE_WX_OVERLAY
     "Use wxOverlay: Always ON for MAC ( default OFF). Warning, this is experimental" )
 
-#One of these 2 option *must* be set to ON:
-option( KICAD_STABLE_VERSION
-    "set this option to ON to build the stable version of KICAD. mainly used to set version ID (default OFF)"
-    )
-
 option( KICAD_SCRIPTING
     "set this option ON to build the scripting support inside kicad binaries"
     )
@@ -44,21 +42,26 @@ option( KICAD_BUILD_STATIC
     "Builds Kicad and all libraries static (except wx-widgets)"
     )
 
+# WARNING: KiCad developers strongly advise you to build Boost with supplied patches,
+# as it is known to work with KiCad.  Other versions may contain bugs that may result
+# in KiCad errors.
+option( KICAD_SKIP_BOOST
+    "Skip building downloaded Boost library components, use Boost from your system."
+    )
+mark_as_advanced( KICAD_SKIP_BOOST )    # Normal builders should build Boost.
+
+
 # when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled:
 # PYTHON_EXECUTABLE can be defined when invoking cmake
 # ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 )
 # when not defined by user, the default is python.exe under Windows and python2 for others
 # python binary file should be is exec path.
 
-
 option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF )
 
+# This can be set to a custom name to brag about a particular branch in the "About" dialog:
+set( KICAD_REPO_NAME "product" CACHE STRING "Name of the tree from which this build came." )
 
-# Set version option (stable or testing)
-if( KICAD_STABLE_VERSION)
-    add_definitions( -DKICAD_STABLE_VERSION )
-    message( STATUS "Building stable version of KiCad" )
-endif()
 
 # All CMake downloads go here.  Suggested is up in the source tree, not in the build dir where they
 # would have to be downloaded over and over again.  The default is to choose a directory that is
@@ -109,7 +112,7 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     endif()
 
     set( CMAKE_C_FLAGS_DEBUG   "-g3 -ggdb3 -DDEBUG" )
-    set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG" )
+    set( CMAKE_CXX_FLAGS_DEBUG "-g3 -ggdb3 -DDEBUG -Wno-deprecated-declarations" )
 
     set( CMAKE_C_FLAGS_RELEASE   "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG" )
     set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" )
@@ -146,32 +149,50 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
         endif()
 
     else()
-        # We build DLL/DSOs from static libraries, so create position independent code
-        # for all cases, since we do not have DLL/DSO specific static libraries.
-        # Subdirectories via add_subdirectores() reference this variable, and it is either set or empty,
-        # empty for Windows.
+        # We build DLL/DSOs from static libraries, so create position independent
+        # code for all cases, since we do not have DLL/DSO specific static
+        # libraries. Subdirectories via add_subdirectores() reference this
+        # variable, and it is either set or empty, empty for Windows.
         set( PIC_FLAG -fPIC )
 
-        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${PIC_FLAG}" )
+        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   ${PIC_FLAG}" )
         set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PIC_FLAG}" )
 
+        if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+            set( TO_LINKER -XLinker )
+        else()
+            set( TO_LINKER -Wl )
+        endif()
+
         # Thou shalt not link vaporware and tell us it's a valid DSO:
-        set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-        set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) # needed by SWIG macros on linux
+        set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+        set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
 
-        # Set default flags for Release build.
         set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
-
     endif()
 
-    # quiet GCC 4.8.1 while in boost
+    # quiet GCC while in boost
     if( GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8 )
         set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs" )
     endif()
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing" )
 
     if( APPLE )
-        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -D__ASSERTMACROS__" )
-        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__ASSERTMACROS__" )
+
+        set( CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=10.5" )
+        set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__ASSERTMACROS__ -mmacosx-version-min=10.5" )
+
+        # Allows .dylib relocation in the future
+        set( CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -headerpad_max_install_names")
+
+        if( NOT CMAKE_CXX_COMPILER )
+            EXEC_PROGRAM( wx-config ARGS --cc  OUTPUT_VARIABLE CMAKE_C_COMPILER )
+        endif( NOT CMAKE_CXX_COMPILER )
+
+        if( NOT CMAKE_CXX_COMPILER )
+            EXEC_PROGRAM( wx-config ARGS --cxx OUTPUT_VARIABLE CMAKE_CXX_COMPILER )
+        endif( NOT CMAKE_CXX_COMPILER )
+
     endif()
 
 endif( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
@@ -259,19 +280,6 @@ include( Functions )
 
 include( ExternalProject )
 
-if ( APPLE )
-    set( KICAD_BUILD_STATIC ON)
-
-    if( NOT CMAKE_CXX_COMPILER )
-        EXEC_PROGRAM( wx-config ARGS --cc  OUTPUT_VARIABLE CMAKE_C_COMPILER )
-    endif( NOT CMAKE_CXX_COMPILER )
-
-    if( NOT CMAKE_CXX_COMPILER )
-        EXEC_PROGRAM( wx-config ARGS --cxx OUTPUT_VARIABLE CMAKE_CXX_COMPILER )
-    endif( NOT CMAKE_CXX_COMPILER )
-
-endif( APPLE )
-
 #================================================
 # Find libraries that are needed to build KiCad.
 #================================================
@@ -286,10 +294,36 @@ add_definitions(-DWX_COMPATIBILITY)
 find_package( OpenGL QUIET )
 check_find_package_result( OPENGL_FOUND "OpenGL" )
 
-if ( KICAD_BUILD_STATIC )
+if ( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC )
 
     #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib;.dll")
 
+    if( KICAD_BUILD_STATIC AND KICAD_BUILD_DYNAMIC )
+        message(FATAL_ERROR "You can't build STATIC and DYNAMIC together")
+    endif()
+
+    if( KICAD_BUILD_STATIC )
+        message(STATUS "KICAD_BUILD_STATIC set")
+    endif()
+
+    if( KICAD_BUILD_DYNAMIC )
+        message(STATUS "KICAD_BUILD_DYNAMIC set")
+        # TODO - Library packaging/relocation 
+    endif()
+
+    add_custom_target( lib-dependencies
+                       DEPENDS boost cairo glew libpng pixman pkgconfig
+                     )
+
+    include( download_libpng )
+
+    if( KICAD_SCRIPTING_WXPYTHON )
+        message(FATAL_ERROR "KICAD_BUILD_* and SCRIPTING Not Implemented Yet!")
+    else()
+        include( download_wxwidgets )
+        add_dependencies( lib-dependencies libwx )
+    endif( KICAD_SCRIPTING_WXPYTHON )
+
     include( download_pkgconfig )
         set( PKG_CONFIG_EXECUTABLE "${PKGCONFIG_ROOT}/bin/pkg-config")
     include( download_glew )
@@ -297,11 +331,17 @@ if ( KICAD_BUILD_STATIC )
         set( GLEW_INCLUDE_DIR  "${GLEW_ROOT}/include")
     include( download_pixman )
         set( PIXMAN_LIBRARY     "${PIXMAN_ROOT}/lib/libpixman-1.a")
-    include( download_libpng )
     include( download_cairo )
         set( CAIRO_INCLUDE_DIR  "${CAIRO_ROOT}/include/cairo")
         set( CAIRO_LIBRARY      "${CAIRO_ROOT}/lib/libcairo.a")
-endif( KICAD_BUILD_STATIC )
+
+    if( KICAD_BUILD_DYNAMIC AND APPLE ) 
+        add_custom_target( osx_fix_bundles ALL DEPENDS cvpcb eeschema gerbview kicad pcbnew bitmap2component pcb_calculator pl_editor)
+        add_custom_command(TARGET osx_fix_bundles POST_BUILD COMMAND scripts/osx_fixbundle.sh COMMENT "Migrating dylibs to bundles")
+    endif()
+
+
+endif( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC)
 
 #####################
 # Find GLEW library #
@@ -317,7 +357,21 @@ check_find_package_result(CAIRO_FOUND "Cairo")
 
 # Download boost and possibly build parts of it
 #################################################
-include( download_boost )
+if( KICAD_SKIP_BOOST )
+    find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale
+                                                   program_options regex system thread )
+
+    if( NOT Boost_FOUND )
+        message( FATAL_ERROR "Boost 1.54+ libraries are required." )
+    endif()
+
+    message( WARNING "
+WARNING: You decided to skip building boost library.
+KiCad developers strongly advise you to build the bundled boost library, as it is known to work with KiCad.
+Other versions may contain bugs that may result in KiCad errors." )
+else()
+    include( download_boost )
+endif()
 
 ##########################
 # Find wxWidgets library #
@@ -327,13 +381,16 @@ include( download_boost )
 # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
 
 # On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base
-if( APPLE )
+# Seems no more needed on wx-3
+if( APPLE AND NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) )
     find_package( wxWidgets COMPONENTS gl adv html core net base xml QUIET )
 else()
     find_package( wxWidgets COMPONENTS gl aui adv html core net base xml QUIET )
 endif()
-check_find_package_result( wxWidgets_FOUND "wxWidgets" )
 
+if( NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) )
+check_find_package_result( wxWidgets_FOUND "wxWidgets" )
+endif( NOT (KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC) )
 
 # Include wxWidgets macros.
 include( ${wxWidgets_USE_FILE} )
@@ -464,6 +521,26 @@ add_dependencies( pl_editor boost )
 add_dependencies( pnsrouter boost )
 
 
+if ( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC )
+add_dependencies( pcbnew lib-dependencies )
+add_dependencies( eeschema lib-dependencies )
+add_dependencies( cvpcb lib-dependencies )
+add_dependencies( gal lib-dependencies )
+add_dependencies( common lib-dependencies )
+add_dependencies( pcbcommon lib-dependencies )
+add_dependencies( 3d-viewer lib-dependencies )
+add_dependencies( pcad2kicadpcb lib-dependencies )
+add_dependencies( polygon lib-dependencies )
+add_dependencies( pl_editor lib-dependencies )
+add_dependencies( pnsrouter lib-dependencies )
+    if ( BUILD_GITHUB_PLUGIN ) 
+    add_dependencies( github_plugin lib-dependencies )
+    endif()
+endif()
+
+if ( KICAD_BUILD_DYNAMIC )
+endif()
+
 #############
 # Resources #
 #############

CMakeModules/FindwxWidgets.cmake

@@ -144,12 +144,10 @@
 # Helper macro to control the debugging output globally. There are
 # two versions for controlling how verbose your output should be.
 MACRO(DBG_MSG _MSG)
-#  MESSAGE(STATUS
-#    "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+#  MESSAGE(WARNING "${_MSG}")
 ENDMACRO(DBG_MSG)
 MACRO(DBG_MSG_V _MSG)
-#  MESSAGE(STATUS
-#    "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}")
+#  MESSAGE(WARNING "${_MSG}")
 ENDMACRO(DBG_MSG_V)
 
 # Clear return values in case the module is loaded more than once.
@@ -201,18 +199,24 @@ ENDIF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake")
 
 #=====================================================================
 #=====================================================================
-IF(WIN32 AND NOT CYGWIN AND NOT MSYS)
+
+
+IF(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_HOST_UNIX )
+  DBG_MSG( "setting win32 style" )
   SET(wxWidgets_FIND_STYLE "win32")
-ELSE(WIN32 AND NOT CYGWIN AND NOT MSYS)
-  IF(UNIX OR MSYS)
+ELSE()
+  IF(CMAKE_HOST_UNIX OR MSYS)
+    DBG_MSG( "unix style" )
     SET(wxWidgets_FIND_STYLE "unix")
-  ENDIF(UNIX OR MSYS)
-ENDIF(WIN32 AND NOT CYGWIN AND NOT MSYS)
+  ENDIF()
+ENDIF()
 
 #=====================================================================
 # WIN32_FIND_STYLE
 #=====================================================================
 IF(wxWidgets_FIND_STYLE STREQUAL "win32")
+  DBG_MSG("Using win32 path")
+
   # Useful common wx libs needed by almost all components.
   SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
 
@@ -271,9 +275,13 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
       MARK_AS_ADVANCED(WX_${LIB}${_DBG})
     ENDFOREACH(LIB)
 
+    DBG_MSG( "WX_LIB_DIR:${WX_LIB_DIR}" )
+
     # Find wxWidgets multilib base libraries.
     FIND_LIBRARY(WX_base${_DBG}
       NAMES
+      wxbase31${_UCD}${_DBG}
+      wxbase30${_UCD}${_DBG}
       wxbase29${_UCD}${_DBG}
       wxbase28${_UCD}${_DBG}
       wxbase27${_UCD}${_DBG}
@@ -286,6 +294,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     FOREACH(LIB net odbc xml)
       FIND_LIBRARY(WX_${LIB}${_DBG}
         NAMES
+        wxbase31${_UCD}${_DBG}_${LIB}
+        wxbase30${_UCD}${_DBG}_${LIB}
         wxbase29${_UCD}${_DBG}_${LIB}
         wxbase28${_UCD}${_DBG}_${LIB}
         wxbase27${_UCD}${_DBG}_${LIB}
@@ -300,6 +310,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     # Find wxWidgets monolithic library.
     FIND_LIBRARY(WX_mono${_DBG}
       NAMES
+      wxmsw${_UNV}31${_UCD}${_DBG}
+      wxmsw${_UNV}30${_UCD}${_DBG}
       wxmsw${_UNV}29${_UCD}${_DBG}
       wxmsw${_UNV}28${_UCD}${_DBG}
       wxmsw${_UNV}27${_UCD}${_DBG}
@@ -315,6 +327,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
                 stc ribbon propgrid)
       FIND_LIBRARY(WX_${LIB}${_DBG}
         NAMES
+        wxmsw${_UNV}31${_UCD}${_DBG}_${LIB}
+        wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
@@ -428,6 +442,9 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
       D:/
       $ENV{ProgramFiles}
     PATH_SUFFIXES
+      wxWidgets-3.1.0
+      wxWidgets-3.0.0
+      wxWidgets-2.9.5
       wxWidgets-2.9.4
       wxWidgets-2.9.3
       wxWidgets-2.9.2
@@ -463,6 +480,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
 
   # If wxWidgets_ROOT_DIR changed, clear lib dir.
   IF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
+    DBG_MSG( "WX_ROOT_DIR != wxWidgets_ROOT_DIR" )
+
     SET(WX_ROOT_DIR ${wxWidgets_ROOT_DIR}
         CACHE INTERNAL "wxWidgets_ROOT_DIR")
     SET(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND"
@@ -470,15 +489,19 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
   ENDIF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR)
 
   IF(WX_ROOT_DIR)
+    DBG_MSG( "WX_ROOT_DIR == wxWidgets_ROOT_DIR" )
+
     # Select one default tree inside the already determined wx tree.
     # Prefer static/shared order usually consistent with build
     # settings.
     IF(MINGW)
+      DBG_MSG( "MINGW" )
       SET(WX_LIB_DIR_PREFIX gcc)
     ELSE(MINGW)
       SET(WX_LIB_DIR_PREFIX vc)
     ENDIF(MINGW)
     IF(BUILD_SHARED_LIBS)
+      DBG_MSG( "BUILD_SHARED_LIBS" )
       FIND_PATH(wxWidgets_LIB_DIR
         NAMES
           msw/wx/setup.h
@@ -496,6 +519,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         NO_DEFAULT_PATH
         )
     ELSE(BUILD_SHARED_LIBS)
+      DBG_MSG( "!BUILD_SHARED_LIBS  WX_LIB_DIR:${WX_LIB_DIR}" )
       FIND_PATH(wxWidgets_LIB_DIR
         NAMES
           msw/wx/setup.h
@@ -613,7 +637,11 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
 # UNIX_FIND_STYLE
 #=====================================================================
 ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
+  DBG_MSG("NOT win32 path")
+
   IF(wxWidgets_FIND_STYLE STREQUAL "unix")
+    DBG_MSG("unix find style")
+
     #-----------------------------------------------------------------
     # UNIX: Helper MACROS
     #-----------------------------------------------------------------

CMakeModules/config.h.cmake

@@ -51,21 +51,23 @@
 #cmakedefine HAVE_FGETC_NOLOCK
 
 // Warning!!!  Using wxGraphicContext for rendering is experimental.
-#cmakedefine USE_WX_GRAPHICS_CONTEXT 1
+#cmakedefine USE_WX_GRAPHICS_CONTEXT    1
 
-#cmakedefine USE_IMAGES_IN_MENUS 1
+#cmakedefine USE_IMAGES_IN_MENUS        1
 
 /// The legacy file format revision of the *.brd file created by this build
-#define LEGACY_BOARD_FILE_VERSION 2
+#define LEGACY_BOARD_FILE_VERSION       2
 
 /// The install prefix defined in CMAKE_INSTALL_PREFIX.
-#define DEFAULT_INSTALL_PATH               "@CMAKE_INSTALL_PREFIX"
+#define DEFAULT_INSTALL_PATH            "@CMAKE_INSTALL_PREFIX@"
 
 /// Default footprint library install path when installed with `make install`.
-#define DEFAULT_FP_LIB_PATH                "@KICAD_FP_LIB_INSTALL_PATH@"
+#define DEFAULT_FP_LIB_PATH             "@KICAD_FP_LIB_INSTALL_PATH@"
 
 /// When defined, build the GITHUB_PLUGIN for pcbnew.
 #cmakedefine BUILD_GITHUB_PLUGIN
 
+/// Name of repo from which this build came.
+#define KICAD_REPO_NAME                 "@KICAD_REPO_NAME@"
 
 #endif  // CONFIG_H_

CMakeModules/download_boost.cmake

@@ -92,7 +92,7 @@ string( REPLACE "unit_test_framework" "test" boost_libs_list "${BOOST_LIBS_BUILT
 # Default Toolset
 set( BOOST_TOOLSET "toolset=gcc" )
 
-if( KICAD_BUILD_STATIC )
+if( KICAD_BUILD_STATIC OR APPLE )
     set( BOOST_LINKTYPE  "link=static" )
 else()
     unset( BOOST_LINKTYPE )
@@ -170,10 +170,20 @@ endif()
 
 ExternalProject_Add( boost
     PREFIX          "${PREFIX}"
-    DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
-    INSTALL_DIR     "${BOOST_ROOT}"
+
     URL             http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2
+    DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
+    TIMEOUT         600             # 10 minutes
     URL_MD5         ${BOOST_MD5}
+    # If download fails, then enable "LOG_DOWNLOAD ON" and try again.
+    # Upon a second failure with logging enabled, then look at these logs:
+    # <src>/.downloads-by-cmake$ less /tmp/product/.downloads-by-cmake/boost_1_54_0/src/boost-stamp/boost-download-out.log
+    # <src>/.downloads-by-cmake$ less /tmp/product/.downloads-by-cmake/boost_1_54_0/src/boost-stamp/boost-download-err.log
+    # If out.log does not show 100%, then try increasing TIMEOUT even more, or download the URL manually and put it
+    # into <src>/.downloads-by-cmake/ dir.
+ #  LOG_DOWNLOAD    ON
+
+    INSTALL_DIR     "${BOOST_ROOT}"
 
     # The patch command executes with the working directory set to <SOURCE_DIR>
     # Revert the branch to pristine before applying patch sets as bzr patch

CMakeModules/download_cairo.cmake

@@ -37,11 +37,20 @@ find_package( BZip2 REQUIRED )
 
 set( PREFIX ${DOWNLOAD_DIR}/cairo )
 
+if ( KICAD_BUILD_STATIC )
+    set( CAIRO_BUILDTYPE --disable-shared )
+endif( KICAD_BUILD_STATIC )
+
+
 if (APPLE) 
+
+    set( CAIRO_CFLAGS  "CFLAGS=" )
+    set( CAIRO_LDFLAGS "LDFLAGS=-framework CoreServices -framework Cocoa" )
+    set( CAIRO_OPTS    --enable-ft=no )
+
     if( CMAKE_OSX_ARCHITECTURES )
-        set( CAIRO_CFLAGS  "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES}" )
-        set( CAIRO_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -framework CoreServices -framework Cocoa" )
-        set( CAIRO_OPTS    --enable-ft=no )
+        set( CAIRO_CFLAGS  "${CAIRO_CFLAGS} -arch ${CMAKE_OSX_ARCHITECTURES}" )
+        set( CAIRO_LDFLAGS "${CAIRO_LDFLAGS} -arch ${CMAKE_OSX_ARCHITECTURES}" )
     endif( CMAKE_OSX_ARCHITECTURES )
 
     if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
@@ -72,8 +81,9 @@ ExternalProject_Add(  cairo
     BUILD_IN_SOURCE   1
     #SOURCE_DIR       "${PREFIX}"
     #PATCH_COMMAND    ""
+    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${CAIRO_ROOT}"
 
-    CONFIGURE_COMMAND ./configure --prefix=${CAIRO_ROOT} --enable-static --disable-shared
+    CONFIGURE_COMMAND ./configure --prefix=${CAIRO_ROOT} --enable-static ${CAIRO_BUILDTYPE}
                       PKG_CONFIG=${PROJECT_SOURCE_DIR}/pkgconfig_root/bin/pkg-config
                       PKG_CONFIG_PATH=${PROJECT_SOURCE_DIR}/pixman_root/lib/pkgconfig:${PROJECT_SOURCE_DIR}/libpng_root/lib/pkgconfig
                       --enable-png=yes --enable-svg=yes
@@ -84,8 +94,8 @@ ExternalProject_Add(  cairo
 
     #BINARY_DIR      "${PREFIX}"
 
-    BUILD_COMMAND   make
+    BUILD_COMMAND   $(MAKE) 
 
     INSTALL_DIR     "${CAIRO_ROOT}"
-    INSTALL_COMMAND make install
+    INSTALL_COMMAND $(MAKE) install
     )

CMakeModules/download_glew.cmake

@@ -60,13 +60,28 @@ ExternalProject_Add( glew
     #SOURCE_DIR      "${PREFIX}"
     BUILD_IN_SOURCE 1
 
+    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${GLEW_ROOT}"
+
     #PATCH_COMMAND     "true"
     CONFIGURE_COMMAND ""
 
     #BINARY_DIR      "${PREFIX}"
 
-    BUILD_COMMAND   make ${GLEW_CFLAGS} ${GLEW_LDFLAGS} ${GLEW_STRIP}
+    BUILD_COMMAND   $(MAKE) ${GLEW_CFLAGS} ${GLEW_LDFLAGS} ${GLEW_STRIP}
 
-    INSTALL_DIR     "${GLEW_ROOT}"
-    INSTALL_COMMAND make GLEW_DEST="${GLEW_ROOT}" install && ranlib "${GLEW_ROOT}/lib/libGLEW.a"
+    INSTALL_DIR      "${GLEW_ROOT}"
+    INSTALL_COMMAND  $(MAKE) GLEW_DEST="${GLEW_ROOT}" install
     )
+
+#
+# Optional Steps
+#
+
+if( APPLE )
+# On OSX is needed to run ranlib to make .a indexes for all platforms
+ExternalProject_Add_Step( glew glew_osx_ranlib
+    COMMAND ranlib "${GLEW_ROOT}/lib/libGLEW.a"
+    COMMENT "ranlib ${GLEW_ROOT}/lib/libGLEW.a - Needed on OSX only"
+    DEPENDEES install
+    )
+endif()

CMakeModules/download_libpng.cmake

@@ -43,6 +43,12 @@ if (APPLE)
     endif( CMAKE_OSX_ARCHITECTURES )
 endif(APPLE)
 
+if (KICAD_BUILD_STATIC)
+    set(LIBPNG_OPTS --enable-static --disable-shared)
+else()
+    set(LIBPNG_OPTS --enable-static --enable-shared)
+endif(KICAD_BUILD_STATIC)
+
 # <SOURCE_DIR> = ${PREFIX}/src/glew
 # There is a Bazaar 'boost scratch repo' in <SOURCE_DIR>/boost and after committing pristine
 # download, the patch is applied.  This lets you regenerate a new patch at any time
@@ -59,11 +65,12 @@ ExternalProject_Add( libpng
     BUILD_IN_SOURCE 1
 
     #PATCH_COMMAND     "true"
-    CONFIGURE_COMMAND  ./configure --prefix=${LIBPNG_ROOT} --enable-static --disable-shared ${LIBPNG_CFLAGS} --disable-dependency-tracking
+    CONFIGURE_COMMAND  ./configure --prefix=${LIBPNG_ROOT} ${LIBPNG_OPTS} ${LIBPNG_CFLAGS} --disable-dependency-tracking
     #BINARY_DIR      "${PREFIX}"
+    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${LIBPNG_ROOT}"
 
-    BUILD_COMMAND   make
+    BUILD_COMMAND   $(MAKE) 
 
     INSTALL_DIR     "${LIBPNG_ROOT}"
-    INSTALL_COMMAND make install
+    INSTALL_COMMAND  $(MAKE) install
     )

CMakeModules/download_pixman.cmake

@@ -37,12 +37,22 @@ find_package( BZip2 REQUIRED )
 
 set( PREFIX ${DOWNLOAD_DIR}/pixman )
 
+set(PIXMAN_CPPFLAGS "CFLAGS=")
+
 if (APPLE) 
     if( CMAKE_OSX_ARCHITECTURES )
-        set(PIXMAN_CPPFLAGS "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -fno-common -mmacosx-version-min=10.5")
+        set(PIXMAN_CPPFLAGS "${PIXMAN_CPPFLAGS} -arch ${CMAKE_OSX_ARCHITECTURES} -fno-common -mmacosx-version-min=10.5")
+    else()
+        set(PIXMAN_CPPFLAGS "${PIXMAN_CPPFLAGS} -fno-common -mmacosx-version-min=10.5")
     endif( CMAKE_OSX_ARCHITECTURES )
 endif(APPLE)
 
+if (KICAD_BUILD_STATIC)
+    set(PIXMAN_OPTS --enable-static=yes --enable-shared=no)
+else()
+    set(PIXMAN_OPTS --enable-static=yes --enable-shared=yes)
+endif(KICAD_BUILD_STATIC)
+
 # <SOURCE_DIR> = ${PREFIX}/src/glew
 # There is a Bazaar 'boost scratch repo' in <SOURCE_DIR>/boost and after committing pristine
 # download, the patch is applied.  This lets you regenerate a new patch at any time
@@ -58,12 +68,14 @@ ExternalProject_Add( pixman
     #SOURCE_DIR      "${PREFIX}"
     BUILD_IN_SOURCE 1
 
+    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${PIXMAN_ROOT}"
+
     #PATCH_COMMAND     "true"
-    CONFIGURE_COMMAND ./configure --prefix=${PIXMAN_ROOT} --enable-static=yes --enable-shared=no ${PIXMAN_CPPFLAGS}  --disable-dependency-tracking
+    CONFIGURE_COMMAND ./configure --prefix=${PIXMAN_ROOT} ${PIXMAN_OPTS} ${PIXMAN_CPPFLAGS}  --disable-dependency-tracking
     #BINARY_DIR      "${PREFIX}"
 
-    BUILD_COMMAND   make
+    BUILD_COMMAND   $(MAKE)
 
     INSTALL_DIR     "${PIXMAN_ROOT}"
-    INSTALL_COMMAND make install
+    INSTALL_COMMAND $(MAKE) install
     )

CMakeModules/download_pkgconfig.cmake

@@ -37,6 +37,12 @@ find_package( BZip2 REQUIRED )
 
 set( PREFIX ${DOWNLOAD_DIR}/pkgconfig )
 
+if ( KICAD_BUILD_STATIC )
+    set( PKGCONFIG_BUILDTYPE --enable-shared=no --enable-static=yes )
+else()
+    set( PKGCONFIG_BUILDTYPE --enable-shared=yes --enable-static=yes )
+endif( KICAD_BUILD_STATIC )
+
 # <SOURCE_DIR> = ${PREFIX}/src/glew
 # There is a Bazaar 'boost scratch repo' in <SOURCE_DIR>/boost and after committing pristine
 # download, the patch is applied.  This lets you regenerate a new patch at any time
@@ -53,11 +59,20 @@ ExternalProject_Add( pkgconfig
     BUILD_IN_SOURCE 1
 
     #PATCH_COMMAND     "true"
-    CONFIGURE_COMMAND  ./configure --prefix=${PKGCONFIG_ROOT} --with-internal-glib --enable-shared=no --enable-static=yes --disable-silent-rules
+    CONFIGURE_COMMAND  ./configure --prefix=${PKGCONFIG_ROOT} --with-internal-glib ${PKGCONFIG_BUILDTYPE} --disable-silent-rules
     #BINARY_DIR      "${PREFIX}"
 
-    BUILD_COMMAND   make
+    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${PKGCONFIG_ROOT}"
+
+    BUILD_COMMAND   $(MAKE)
 
     INSTALL_DIR     "${PKGCONFIG_ROOT}"
-    INSTALL_COMMAND make install
+    INSTALL_COMMAND $(MAKE) install
     )
+
+ExternalProject_Add_Step( pkgconfig pkgconfig_cleanup
+    COMMAND  ${CMAKE_COMMAND} -E remove_directory "${PKGCONFIG_ROOT}"
+    COMMENT "pkgconfig - cleanup destination before proceeding in install"
+    DEPENDEES build
+    )
+

CMakeModules/download_wxwidgets.cmake

@@ -0,0 +1,117 @@
+#  This program source code file is part of KICAD, a free EDA CAD application.
+#
+#  Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
+#  Copyright (C) 2013 Kicad Developers, see AUTHORS.txt for contributors.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, you may find one here:
+#  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#  or you may search the http://www.gnu.org website for the version 2 license,
+#  or you may write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+# Downloads and builds LIBWX
+
+#-----<configure>----------------------------------------------------------------
+
+set( LIBWX_RELEASE 3.0.0 )
+set( LIBWX_MD5 241998efc12205172ed24c18788ea2cd )   # re-calc this on every RELEASE change
+
+# The boost headers [and static libs if built] go here, at the top of KiCad
+# source tree in boost_root.
+set( LIBWX_ROOT "${PROJECT_SOURCE_DIR}/libwx_root" )
+
+#-----</configure>---------------------------------------------------------------
+
+find_package( BZip2 REQUIRED )
+
+set( PREFIX ${DOWNLOAD_DIR}/libwx )
+
+if (APPLE) 
+    if( CMAKE_OSX_ARCHITECTURES )
+        STRING(REGEX REPLACE " -arch " "," LIBWX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
+        SET( LIBWX_ARCHITECTURES --enable-universal_binary=${LIBWX_ARCHITECTURES})
+    endif( CMAKE_OSX_ARCHITECTURES )
+endif(APPLE)
+
+if ( KICAD_BUILD_STATIC )
+    set( LIBWX_BUILDTYPE "--disable-shared" )
+endif( KICAD_BUILD_STATIC )
+
+# <SOURCE_DIR> = ${PREFIX}/src/libwx
+# There is a Bazaar 'boost scratch repo' in <SOURCE_DIR>/boost and after committing pristine
+# download, the patch is applied.  This lets you regenerate a new patch at any time
+# easily, simply by editing the working tree in <SOURCE_DIR> and doing "bzr diff" in there.
+
+ExternalProject_Add( libwx
+    PREFIX          "${PREFIX}"
+    DOWNLOAD_DIR    "${DOWNLOAD_DIR}"
+    URL             http://downloads.sourceforge.net/project/wxwindows/${LIBWX_RELEASE}/wxWidgets-${LIBWX_RELEASE}.tar.bz2
+    URL_MD5         ${LIBWX_MD5}
+    STAMP_DIR       "${PREFIX}"
+
+    BUILD_IN_SOURCE 1
+
+    PATCH_COMMAND   bzr revert
+        COMMAND     bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/wxwidgets-3.0.0_macosx.patch"
+        COMMAND     bzr patch -p0 "${PROJECT_SOURCE_DIR}/patches/wxwidgets-3.0.0_macosx_bug_15908.patch"
+
+    UPDATE_COMMAND  ${CMAKE_COMMAND} -E remove_directory "${LIBWX_ROOT}"
+
+    CONFIGURE_COMMAND  ./configure --prefix=${LIBWX_ROOT} -with-opengl --enable-aui --enable-debug_info -with-expat=builtin --with-regex=builtin --enable-utf8 ${LIBWX_ARCHITECTURES} ${LIBWX_BUILDTYPE}
+    #BINARY_DIR     "${PREFIX}"
+
+    BUILD_COMMAND    $(MAKE) VERBOSE=1
+
+    INSTALL_DIR     "${LIBWX_ROOT}"
+    INSTALL_COMMAND  make install
+    )
+
+#SET directories
+set(wxWidgets_BIN_DIR           ${LIBWX_ROOT}/bin)
+set(wxWidgets_CONFIG_EXECUTABLE ${LIBWX_ROOT}/bin/wx-config)
+set(wxWidgets_INCLUDE_DIRS      ${LIBWX_ROOT}/include) 
+set(wxWidgets_LIBRARY_DIRS      ${LIBWX_ROOT}/lib)
+
+
+ExternalProject_Add_Step( libwx bzr_commit_libwx
+    COMMAND bzr ci -q -m pristine <SOURCE_DIR>
+    COMMENT "committing pristine libwx files to 'libwx scratch repo'"
+    DEPENDERS patch
+    )
+
+
+ExternalProject_Add_Step( libwx bzr_add_libwx
+    COMMAND bzr add -q ${PREFIX}/src/libwx
+    COMMENT "adding pristine libwx files to 'libwx scratch repo'"
+    DEPENDERS bzr_commit_libwx
+    )
+
+
+ExternalProject_Add_Step( libwx bzr_init_libwx
+    COMMAND bzr init -q <SOURCE_DIR>
+    COMMENT "creating 'libwx scratch repo' specifically for libwx to track libwx patches"
+    DEPENDERS bzr_add_libwx
+    DEPENDEES download
+    )
+
+######
+# Now is time to search what we have built
+######
+
+ExternalProject_Add_Step( libwx libwx_recursive_message
+    COMMAND cmake . 
+    COMMENT "*** RERUN CMAKE - wxWidgets built, now reissue a cmake to build Kicad"
+    DEPENDEES install
+    )
+

Documentation/compiling/COMPILING.txt

@@ -134,7 +134,7 @@ On either cmake command line shown below, you can optionally include
     -DCMAKE_INSTALL_PREFIX=<finallInstallDir>
 
 If windows, run the following command:
-    cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release  -DKICAD_TESTING_VERSION=ON -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
+    cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
 
 If linux, run instead the following command:
     cmake -DCMAKE_BUILD_TYPE=Release ../../
@@ -167,7 +167,7 @@ Although normally you do not install the Debug binaries, you can debug them
 where they were built.
 
 If windows, run the following command:
-    cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DKICAD_TESTING_VERSION=ON -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
+    cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
 where <wxInstallDir> is <wxWidgets path>/Release
 
 If linux, run instead the following command:

Documentation/compiling/build-config.txt

@@ -88,15 +88,11 @@ All of the configuration settings below are specific to the KiCad project.
 If for any reason you add or remove a build option to the KiCad CMake files,
 please update the list below.
 
-KICAD_STABLE_VERSION (ON/OFF)
------------------------------
-This option enables or disables the stable version string to be created and
-used when building KiCad.  It is mutually exclusive with KICAD_TESTING_VERSION.
-
-KICAD_TESTING_VERSION (ON/OFF)
-------------------------------
-This option enables or disables the testing version string to be created and
-used when building KiCad.  It is mutually exclusive with KICAD_STABLE_VERSION.
+KICAD_SKIP_BOOST (ON/OFF)
+--------------------------
+Skips building the required boost library components.
+WARNING: KiCad developers strongly advise you to build the bundled boost library, as it is
+known to work with KiCad. Other versions may contain bugs that may result in KiCad errors.
 
 USE_WX_GRAPHICS_CONTEXT (ON/OFF)
 --------------------------------

Documentation/compiling/build-msw.txt

@@ -149,8 +149,7 @@ command line enter the following commands:
 To create a release build of KiCad, run the following command:
 #cd build
 #cmake -G "MSYS Makefiles"                  \  # Back slashes are not required
-       -DCMAKE_BUILD_TYPE=Release           \  # and are for formatting only.
-       -DKICAD_TESTING_VERSION=ON ../../
+       -DCMAKE_BUILD_TYPE=Release ../../    \  # and are for formatting only.
 
 If the configuration fails, you have failed to install the required software
 on you system.  The error message should give you a good indication of what is
@@ -187,8 +186,7 @@ To create a debug version of KiCad, enter the following commands:
 
 #cd <kicadSource>/build/debug
 #cmake -G "MSYS Makefiles"                       \
-       -DCMAKE_BUILD_TYPE=Debug                  \
-       -DKICAD_TESTING_VERSION=ON ../../
+       -DCMAKE_BUILD_TYPE=Debug ../../
 #make
 
 Generally speaking you do not install debug binaries.  They can be debugged in
@@ -209,8 +207,7 @@ compile the source as described above.
 #cmake -G "MSYS Makefiles"                       \
        -DCMAKE_BUILD_TYPE=Release                \
        -DKICAD_PYTHON_SCRIPTING=ON               \
-       -DKICAD_PYTHON_MODULES=ON                 \
-       -DKICAD_TESTING_VERSION=ON ../../
+       -DKICAD_PYTHON_MODULES=ON ../../
 
 You only need to include the KICAD_PYTHON_MODULES option if you want to
 install the python modules that ship with KiCad.  Also note that the wxPython

Documentation/compiling/mac-osx.txt

@@ -115,7 +115,7 @@ user@mac-osx$ make
 
 It is also possible to give all the options on the commandline and not to edit the CMakeCache.txt. This is a oneliner for Leopard and up:
 
-cmake ~/Repositories/testing -DKICAD_TESTING_VERSION=ON -DCMAKE_OSX_ARCHITECTURES="i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6" -DCMAKE_CXX_FLAGS="-D__ASSERTMACROS__" -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
+cmake ~/Repositories/testing -DCMAKE_OSX_ARCHITECTURES="i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6" -DCMAKE_CXX_FLAGS="-D__ASSERTMACROS__" -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"
 
 Optional compiler cache
 ~~~~~~~~~~~~~~~~~~~~~~~

bitmap2component/bitmap2cmp_gui.cpp

@@ -281,8 +281,8 @@ void BM2CMP_FRAME::Binarize( double aThreshold )
     int           w = m_Greyscale_Image.GetWidth();
     unsigned int  threshold = (int)(aThreshold * 256);
 
-    for( int y = 1; y < h; y++ )
-        for( int x = 1; x < w; x++ )
+    for( int y = 0; y < h; y++ )
+        for( int x = 0; x < w; x++ )
         {
             pixin   = m_Greyscale_Image.GetGreen( x, y );
 
@@ -303,8 +303,8 @@ void BM2CMP_FRAME::NegateGreyscaleImage( )
     int           h = m_Greyscale_Image.GetHeight();
     int           w = m_Greyscale_Image.GetWidth();
 
-    for( int y = 1; y < h; y++ )
-        for( int x = 1; x < w; x++ )
+    for( int y = 0; y < h; y++ )
+        for( int x = 0; x < w; x++ )
         {
             pix   = m_Greyscale_Image.GetGreen( x, y );
             pix = ~pix;
@@ -512,7 +512,7 @@ void BM2CMP_FRAME::ExportFile( FILE* aOutfile, int aFormat )
     }
 
     /* fill the bitmap with data */
-    for( int y = 0; y<h; y++ )
+    for( int y = 0; y < h; y++ )
     {
         for( int x = 0; x<w; x++ )
         {

bitmaps_png/mk_icn_res.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# make icons using Inkscape
+
+# create output directories
+cd ../resources/linux/mime/icons/hicolor
+rm -r *
+mkdir scalable
+echo -e '\E[0;34m'"Directory \"scalable\" for .svg icons was created."
+
+# copy sources to the scalable dir
+cd ../../../../../bitmaps_png/sources
+cp icon_kicad.svg ../../resources/linux/mime/icons/hicolor/scalable/kicad.svg
+cp icon_pcbnew.svg ../../resources/linux/mime/icons/hicolor/scalable/pcbnew.svg
+cp icon_eeschema.svg ../../resources/linux/mime/icons/hicolor/scalable/eeschema.svg
+echo -e '\E[0;34m'"Sources of icons was copied."
+
+# convert .svg files into .png files
+cd ../../resources/linux/mime/icons/hicolor/scalable
+
+SIZES="16x16
+       22x22
+       24x24
+       32x32
+       48x48"
+
+for size in $SIZES
+do
+    sz=${size%x*}
+    echo -e '\E[0;32m'"\nMaking the mimetypes icons with size $size."
+    mkdir ../$size
+    echo -e '\E[0;34m'"Directory $size was created."
+    mkdir ../$size/mimetypes
+    echo -e '\E[0;34m'"Subdirectory \"mimetypes\" was created."
+    tput sgr0
+    
+    inkscape -f kicad.svg -e ../$size/mimetypes/application-x-kicad-project.png -w $sz -h $sz --export-area-snap
+    inkscape -f eeschema.svg -e ../$size/mimetypes/application-x-kicad-eeschema.png -w $sz -h $sz --export-area-snap
+    inkscape -f pcbnew.svg -e ../$size/mimetypes/application-x-kicad-pcbnew.png -w $sz -h $sz --export-area-snap
+    echo -e '\E[0;34m'"Icons with size $size was created."
+    
+    if [ $sz -eq 48 ]
+    then
+        echo -e '\E[0;32m'"\nMaking the applications icons with size $size."
+        mkdir ../$size/apps
+        echo -e '\E[0;34m'"Subdirectory \"apps\" was created."
+        tput sgr0
+        
+        inkscape -f kicad.svg -e ../$size/apps/kicad.png -w $sz -h $sz --export-area-snap
+        inkscape -f eeschema.svg -e ../$size/apps/eeschema.png -w $sz -h $sz --export-area-snap
+        inkscape -f pcbnew.svg -e ../$size/apps/pcbnew.png -w $sz -h $sz --export-area-snap
+        echo -e '\E[0;34m'"Icons with size $size was created."
+        tput sgr0
+    fi
+done
+

common/base_units.cpp

@@ -377,3 +377,18 @@ wxString& operator <<( wxString& aString, const wxPoint& aPos )
     return aString;
 }
 
+/**
+ * Function AngleToStringDegrees
+ * is a helper to convert the \a double \a aAngle (in internal unit)
+ * to a string in degrees
+ */
+wxString AngleToStringDegrees( double aAngle )
+{
+    wxString text;
+
+    text.Printf( wxT( "%.3f" ), aAngle/10.0 );
+    StripTrailingZeros( text, 1 );
+
+    return text;
+}
+

common/basicframe.cpp

@@ -51,13 +51,13 @@
 #define DEFAULT_AUTO_SAVE_INTERVAL 600
 
 
-const wxChar* traceAutoSave = wxT( "KicadAutoSave" );
+const wxChar traceAutoSave[] = wxT( "KicadAutoSave" );
 
 /// Configuration file entry name for auto save interval.
-static const wxChar* entryAutoSaveInterval = wxT( "AutoSaveInterval" );
+static const wxChar entryAutoSaveInterval[] = wxT( "AutoSaveInterval" );
 
 /// Configuration file entry for wxAuiManger perspective.
-static const wxChar* entryPerspective = wxT( "Perspective" );
+static const wxChar entryPerspective[] = wxT( "Perspective" );
 
 
 
@@ -141,6 +141,19 @@ bool EDA_BASE_FRAME::ProcessEvent( wxEvent& aEvent )
 }
 
 
+bool EDA_BASE_FRAME::Show( bool show )
+{
+    if( !show )     // closing
+    {
+        SaveSettings();     // virtual, wxFrame specific
+    }
+
+    int ret = wxFrame::Show( show );
+
+    return ret;
+}
+
+
 void EDA_BASE_FRAME::onAutoSaveTimer( wxTimerEvent& aEvent )
 {
     if( !doAutoSave() )
@@ -231,7 +244,7 @@ void EDA_BASE_FRAME::SaveSettings()
     wxString    text;
     wxConfig*   config = wxGetApp().GetSettings();
 
-    if( ( config == NULL ) || IsIconized() )
+    if( !config || IsIconized() )
         return;
 
     m_FrameSize = GetSize();
@@ -258,10 +271,15 @@ void EDA_BASE_FRAME::SaveSettings()
         config->Write( text, m_autoSaveInterval );
     }
 
-    // Once this is fully implemented, wxAuiManager will be used to maintain the persistance of
-    // the main frame and all it's managed windows and all of the legacy frame persistence
-    // position code can be removed.
-    config->Write( m_FrameName + entryPerspective, m_auimgr.SavePerspective() );
+    // Once this is fully implemented, wxAuiManager will be used to maintain
+    // the persistance of the main frame and all it's managed windows and
+    // all of the legacy frame persistence position code can be removed.
+    wxString perspective = m_auimgr.SavePerspective();
+
+    // printf( "perspective(%s): %s\n",
+    //    TO_UTF8( m_FrameName + entryPerspective ), TO_UTF8( perspective ) );
+
+    config->Write( m_FrameName + entryPerspective, perspective );
 }
 
 
@@ -270,6 +288,7 @@ void EDA_BASE_FRAME::PrintMsg( const wxString& text )
     SetStatusText( text );
 }
 
+
 void EDA_BASE_FRAME::UpdateFileHistory( const wxString& FullFileName,
                                         wxFileHistory * aFileHistory )
 {
@@ -283,7 +302,7 @@ void EDA_BASE_FRAME::UpdateFileHistory( const wxString& FullFileName,
 
 
 wxString EDA_BASE_FRAME::GetFileFromHistory( int cmdId, const wxString& type,
-                                             wxFileHistory * aFileHistory )
+                                             wxFileHistory* aFileHistory )
 {
     wxString fn, msg;
     size_t   i;
@@ -480,7 +499,12 @@ static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
     " (release,"
 #endif
     __WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL
-    __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 ")"
+
+#if !wxCHECK_VERSION( 3, 0, 0 )
+    __WX_BO_WXWIN_COMPAT_2_6
+#endif
+
+    __WX_BO_WXWIN_COMPAT_2_8 ")"
     ;
 }
 

common/build_version.cpp

@@ -6,14 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#   define KICAD_BUILD_VERSION "(2013-jul-14)"
-#endif
-
-
-#if defined KICAD_STABLE_VERSION
-#   define VERSION_STABILITY  "stable"
-#else
-#   define VERSION_STABILITY  "product"
+#   define KICAD_BUILD_VERSION "(2014-jan-25)"
 #endif
 
 /**
@@ -25,7 +18,7 @@ wxString GetBuildVersion()
     wxString msg = wxString::Format(
         wxT( "%s-%s" ),
         wxT( KICAD_BUILD_VERSION ),
-        wxT( VERSION_STABILITY )
+        wxT( KICAD_REPO_NAME )
         );
 
     return msg;

common/class_layer_box_selector.cpp

@@ -41,7 +41,12 @@ void LAYER_SELECTOR::SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer )
     // Prepare Bitmap
     bmpDC.SelectObject( aLayerbmp );
     brush.SetColour( MakeColour( GetLayerColor( aLayer ) ) );
+
+#if wxCHECK_VERSION( 3, 0, 0 )
+    brush.SetStyle( wxBRUSHSTYLE_SOLID );
+#else
     brush.SetStyle( wxSOLID );
+#endif
 
     bmpDC.SetBrush( brush );
     bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );

common/dialog_about/AboutDialog_main.cpp

@@ -203,7 +203,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
      * which should be represented by the same icon.
      */
 
-    // The developers
+    // The core developers
     info.AddDeveloper(
         new Contributor( wxT( "Jean-Pierre Charras" ),  wxT( "jp.charras@wanadoo.fr" ) ) );
     info.AddDeveloper(
@@ -214,6 +214,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
     // alphabetically by last name after main 3 above:
     info.AddDeveloper(
         new Contributor( wxT( "Frank Bennett" ),        wxT( "bennett78@lpbroadband.net" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Cirilo Bernardo" ),      wxT( "cirilo_bernardo@yahoo.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Jonas Diemer" ),         wxT( "diemer@gmx.de" ) ) );
     info.AddDeveloper(
@@ -222,12 +224,6 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         new Contributor( wxT( "Hauptmech" ),            wxT( "hauptmech@gmail.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Jerry Jacobs" ),         wxT( "xor.gate.engineering@gmail.com" ) ) );
-
-    /*
-    info.AddDeveloper(
-        new Contributor( wxT( "KBool Library" ),         wxT( "http://boolean.klaasholwerda.nl/bool.html" ) ) );
-    */
-
     info.AddDeveloper(
         new Contributor( wxT( "Lorenzo Marcantonio" ),  wxT( "lomarcan@tin.it" ) ) );
     info.AddDeveloper(
@@ -240,10 +236,14 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         new Contributor( wxT( "Marco Serantoni" ),      wxT( "marco.serantoni@gmail.com" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Brian Sidebotham" ),     wxT( "brian.sidebotham@gmail.com" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Orson (Maciej Suminski)" ),    wxT( "maciej.suminski@cern.ch" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Rafael Sokolowski" ),    wxT( "rafael.sokolowski@web.de" ) ) );
     info.AddDeveloper(
         new Contributor( wxT( "Vesa Solonen" ),         wxT( "vesa.solonen@hut.fi" ) ) );
+    info.AddDeveloper(
+        new Contributor( wxT( "Tomasz Wlostowski" ),    wxT( "tomasz.wlostowski@cern.ch" ) ) );
 
     // The document writers
     info.AddDocWriter(

common/dialogs/dialog_page_settings_base.cpp

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// C++ code generated with wxFormBuilder (version Nov  6 2013)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -343,7 +343,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
 	wxBoxSizer* bSizerFilename;
 	bSizerFilename = new wxBoxSizer( wxVERTICAL );
 	
-	m_staticTextfilename = new wxStaticText( this, wxID_ANY, _("Page layout file description"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextfilename = new wxStaticText( this, wxID_ANY, _("Page layout description file"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextfilename->Wrap( -1 );
 	bSizerFilename->Add( m_staticTextfilename, 0, wxRIGHT|wxLEFT, 5 );
 	

common/dialogs/dialog_page_settings_base.fbp

@@ -20,8 +20,10 @@
         <property name="path">.</property>
         <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Dialog" expanded="1">
@@ -4173,7 +4175,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Page layout file description</property>
+                                                <property name="label">Page layout description file</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>

common/dialogs/dialog_page_settings_base.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct  8 2012)
+// C++ code generated with wxFormBuilder (version Nov  6 2013)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!

common/drawframe.cpp

@@ -118,6 +118,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent,
     m_snapToGrid          = true;
     m_MsgFrameHeight      = EDA_MSG_PANEL::GetRequiredHeight();
 
+    m_auimgr.SetFlags(wxAUI_MGR_DEFAULT|wxAUI_MGR_LIVE_RESIZE);
+
     CreateStatusBar( 6 );
 
     // set the size of the status bar subwindows:

common/eda_dde.cpp

@@ -13,19 +13,10 @@ static const wxString HOSTNAME( wxT( "localhost" ) );
 
 // buffer for read and write data in socket connections
 #define IPC_BUF_SIZE 4096
-
 static char client_ipc_buffer[IPC_BUF_SIZE];
 
 static wxSocketServer* server;
 
-void      (*RemoteFct)(const char* cmd);
-
-
-void SetupServerFunction( void (*remotefct)(const char* remotecmd) )
-{
-    RemoteFct = remotefct;
-}
-
 
 /**********************************/
 /* Routines related to the server */
@@ -75,10 +66,7 @@ void EDA_DRAW_FRAME::OnSockRequest( wxSocketEvent& evt )
         sock->Read( client_ipc_buffer + 1, IPC_BUF_SIZE - 2 );
         len = 1 + sock->LastCount();
         client_ipc_buffer[len] = 0;
-
-        if( RemoteFct )
-            RemoteFct( client_ipc_buffer );
-
+        ExecuteRemoteCommand( client_ipc_buffer );
         break;
 
     case wxSOCKET_LOST:

common/edaappl.cpp

@@ -57,11 +57,6 @@
 static const wxChar* CommonConfigPath = wxT( "kicad_common" );
 
 
-#ifdef __UNIX__
-#   define TMP_FILE "/tmp/kicad.tmp"
-#endif
-
-
 // some key strings used to store parameters in config
 static const wxChar backgroundColorKey[] = wxT( "BackgroundColor" );
 static const wxChar showPageLimitsKey[]  = wxT( "ShowPageLimits" );
@@ -90,7 +85,7 @@ struct LANGUAGE_DESCR
     BITMAP_DEF  m_Lang_Icon;
 
     /// Labels used in menus
-    const wxChar* m_Lang_Label;
+    wxString    m_Lang_Label;
 
     /// Set to true if the m_Lang_Label must not be translated
     bool        m_DoNotTranslate;
@@ -274,7 +269,7 @@ EDA_APP::EDA_APP()
     m_oneInstancePerFileChecker = NULL;
     m_HtmlCtrl = NULL;
     m_settings = NULL;
-    m_LanguageId = wxLANGUAGE_DEFAULT;
+    setLanguageId( wxLANGUAGE_DEFAULT );
     m_Locale = NULL;
     m_projectSettings = NULL;
     m_commonSettings = NULL;
@@ -350,14 +345,15 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId )
     // Internationalization: loading the kicad suitable Dictionary
     wxString languageSel;
     m_commonSettings->Read( languageCfgKey, &languageSel);
-    m_LanguageId = wxLANGUAGE_DEFAULT;
+
+    setLanguageId( wxLANGUAGE_DEFAULT );
 
     // Search for the current selection
     for( unsigned ii = 0; ii < DIM( s_Languages ); ii++ )
     {
         if( s_Languages[ii].m_Lang_Label == languageSel )
         {
-            m_LanguageId = s_Languages[ii].m_WX_Lang_Identifier;
+            setLanguageId( s_Languages[ii].m_WX_Lang_Identifier );
             break;
         }
     }
@@ -625,14 +621,14 @@ void EDA_APP::GetSettings( bool aReopenLastUsedDirectory )
     wxString languageSel;
 
     m_commonSettings->Read( languageCfgKey, &languageSel );
-    m_LanguageId = wxLANGUAGE_DEFAULT;
+    setLanguageId( wxLANGUAGE_DEFAULT );
 
     // Search for the current selection
     for( unsigned ii = 0; ii < DIM( s_Languages ); ii++ )
     {
         if( s_Languages[ii].m_Lang_Label == languageSel )
         {
-            m_LanguageId = s_Languages[ii].m_WX_Lang_Identifier;
+            setLanguageId( s_Languages[ii].m_WX_Lang_Identifier );
             break;
         }
     }
@@ -704,9 +700,7 @@ bool EDA_APP::SetLanguage( bool first_time )
     // dictionary file name without extend (full name is kicad.mo)
     wxString DictionaryName( wxT( "kicad" ) );
 
-    if( m_Locale )
-        delete m_Locale;
-
+    delete m_Locale;
     m_Locale = new wxLocale;
 
 #if wxCHECK_VERSION( 2, 9, 0 )
@@ -717,7 +711,7 @@ bool EDA_APP::SetLanguage( bool first_time )
     {
         wxLogDebug( wxT( "This language is not supported by the system." ) );
 
-        m_LanguageId = wxLANGUAGE_DEFAULT;
+        setLanguageId( wxLANGUAGE_DEFAULT );
         delete m_Locale;
 
         m_Locale = new wxLocale;
@@ -786,7 +780,7 @@ void EDA_APP::SetLanguageIdentifier( int menu_id )
     {
         if( menu_id == s_Languages[ii].m_KI_Lang_Identifier )
         {
-            m_LanguageId = s_Languages[ii].m_WX_Lang_Identifier;
+            setLanguageId( s_Languages[ii].m_WX_Lang_Identifier );
             break;
         }
     }

common/footprint_info.cpp

@@ -205,6 +205,16 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
 
 #if USE_WORKER_THREADS
 
+        // Even though the PLUGIN API implementation is the place for the
+        // locale toggling, in order to keep LOCAL_IO::C_count at 1 or greater
+        // for the duration of all helper threads, we increment by one here via instantiation.
+        // Only done here because of the multi-threaded nature of this code.
+        // Without this C_count skips in and out of "equal to zero" and causes
+        // needless locale toggling among the threads, based on which of them
+        // are in a PLUGIN::FootprintLoad() function.  And that is occasionally
+        // none of them.
+        LOCALE_IO   top_most_nesting;
+
         // Something which will not invoke a thread copy constructor, one of many ways obviously:
         typedef boost::ptr_vector< boost::thread >  MYTHREADS;
 

common/fp_lib_table.cpp

@@ -626,11 +626,15 @@ const FP_LIB_TABLE::ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname )
 
     if( !row )
     {
-        wxString msg = wxString::Format( _( "lib table contains no logical lib '%s'" ),
-                                         GetChars( aNickname ) );
+        wxString msg = wxString::Format(
+            _( "fp-lib-table files contain no lib with nickname '%s'" ),
+            GetChars( aNickname ) );
+
         THROW_IO_ERROR( msg );
     }
 
+    // We've been 'lazy' up until now, but it cannot be deferred any longer,
+    // instantiate a PLUGIN of the proper kind if it is not already in this ROW.
     if( !row->plugin )
         row->setPlugin( IO_MGR::PluginFind( row->type ) );
 

common/gr_basic.cpp

@@ -396,15 +396,22 @@ void GRSetBrush( wxDC* DC, EDA_COLOR_T Color, bool fill )
        || s_DC_lastbrushfill  != fill
        || s_DC_lastDC != DC  )
     {
-        wxBrush DrawBrush;
-        DrawBrush.SetColour( MakeColour( Color ) );
+        wxBrush brush;
+
+        brush.SetColour( MakeColour( Color ) );
 
         if( fill )
-            DrawBrush.SetStyle( wxSOLID );
+#if wxCHECK_VERSION( 3, 0, 0 )
+            brush.SetStyle( wxBRUSHSTYLE_SOLID );
         else
-            DrawBrush.SetStyle( wxTRANSPARENT );
+            brush.SetStyle( wxBRUSHSTYLE_TRANSPARENT );
+#else
+            brush.SetStyle( wxSOLID );
+        else
+            brush.SetStyle( wxTRANSPARENT );
+#endif
 
-        DC->SetBrush( DrawBrush );
+        DC->SetBrush( brush );
 
         s_DC_lastbrushcolor = Color;
         s_DC_lastbrushfill  = fill;
@@ -1444,12 +1451,12 @@ EDA_COLOR_T ColorMix( EDA_COLOR_T aColor1, EDA_COLOR_T aColor2 )
 }
 
 
-EDA_COLOR_T ColorByName( const wxChar *aName )
+EDA_COLOR_T ColorByName( const wxString& aName )
 {
     // look for a match in the palette itself
     for( EDA_COLOR_T trying = BLACK; trying < NBCOLORS; trying = NextColor(trying) )
     {
-        if( 0 == wxStricmp( aName, g_ColorRefs[trying].m_Name ) )
+        if( 0 == aName.CmpNoCase( g_ColorRefs[trying].m_Name ) )
             return trying;
     }
 

common/msgpanel.cpp

@@ -239,7 +239,12 @@ void EDA_MSG_PANEL::erase( wxDC* aDC )
     pen.SetColour( color );
 
     brush.SetColour( color );
+
+#if wxCHECK_VERSION( 3, 0, 0 )
+    brush.SetStyle( wxBRUSHSTYLE_SOLID );
+#else
     brush.SetStyle( wxSOLID );
+#endif
 
     aDC->SetPen( pen );
     aDC->SetBrush( brush );

common/page_layout/class_worksheet_dataitem.cpp

@@ -430,7 +430,7 @@ const wxPoint WORKSHEET_DATAITEM_POLYPOLYGON::GetCornerPositionUi( unsigned aIdx
     return wxPoint( int(pos.x), int(pos.y) );
 }
 
-WORKSHEET_DATAITEM_TEXT::WORKSHEET_DATAITEM_TEXT( const wxChar* aTextBase ) :
+WORKSHEET_DATAITEM_TEXT::WORKSHEET_DATAITEM_TEXT( const wxString& aTextBase ) :
     WORKSHEET_DATAITEM( WS_TEXT )
 {
     m_TextBase = aTextBase;

common/sch_item_struct.cpp

@@ -36,7 +36,6 @@
 #include <wxEeschemaStruct.h>
 
 #include <general.h>
-#include <protos.h>
 
 
 const wxString traceFindItem( wxT( "KicadFindItem" ) );

common/selcolor.cpp

@@ -160,14 +160,23 @@ void WinEDA_SelColorFrame::Init_Dialog( int aOldColor )
         butt_ID = ID_COLOR_BLACK + ii;
         wxMemoryDC iconDC;
         wxBitmap   ButtBitmap( w, h );
-        wxBrush    Brush;
-        iconDC.SelectObject( ButtBitmap );
-        EDA_COLOR_T buttcolor = g_ColorRefs[ii].m_Numcolor;
-        iconDC.SetPen( *wxBLACK_PEN );
-        ColorSetBrush( &Brush, buttcolor );
-        Brush.SetStyle( wxSOLID );
+        wxBrush    brush;
+
+        iconDC.SelectObject( ButtBitmap );
+
+        EDA_COLOR_T buttcolor = g_ColorRefs[ii].m_Numcolor;
+
+        iconDC.SetPen( *wxBLACK_PEN );
+        ColorSetBrush( &brush, buttcolor );
+
+#if wxCHECK_VERSION( 3, 0, 0 )
+        brush.SetStyle( wxBRUSHSTYLE_SOLID );
+#else
+        brush.SetStyle( wxSOLID );
+#endif
+
+        iconDC.SetBrush( brush );
 
-        iconDC.SetBrush( Brush );
         iconDC.SetBackground( *wxGREY_BRUSH );
         iconDC.Clear();
         iconDC.DrawRoundedRectangle( 0, 0, w, h, (double) h / 3 );

common/string.cpp

@@ -211,31 +211,33 @@ wxString DateAndTime()
 }
 
 
-int StrNumCmp( const wxChar* aString1, const wxChar* aString2, int aLength, bool aIgnoreCase )
+int StrNumCmp( const wxString& aString1, const wxString& aString2, int aLength, bool aIgnoreCase )
 {
     int i;
     int nb1 = 0, nb2 = 0;
 
-    if( ( aString1 == NULL ) || ( aString2 == NULL ) )
+    wxString::const_iterator str1 = aString1.begin(), str2 = aString2.begin();
+
+    if( ( str1 == aString1.end() ) || ( str2 == aString2.end() ) )
         return 0;
 
     for( i = 0; i < aLength; i++ )
     {
-        if( isdigit( *aString1 ) && isdigit( *aString2 ) ) /* digit found */
+        if( isdigit( *str1 ) && isdigit( *str2 ) ) /* digit found */
         {
             nb1 = 0;
             nb2 = 0;
 
-            while( isdigit( *aString1 ) )
+            while( isdigit( *str1 ) )
             {
-                nb1 = nb1 * 10 + *aString1 - '0';
-                aString1++;
+                nb1 = nb1 * 10 + (int) *str1 - '0';
+                str1++;
             }
 
-            while( isdigit( *aString2 ) )
+            while( isdigit( *str2 ) )
             {
-                nb2 = nb2 * 10 + *aString2 - '0';
-                aString2++;
+                nb2 = nb2 * 10 + (int) *str2 - '0';
+                str2++;
             }
 
             if( nb1 < nb2 )
@@ -247,29 +249,29 @@ int StrNumCmp( const wxChar* aString1, const wxChar* aString2, int aLength, bool
 
         if( aIgnoreCase )
         {
-            if( toupper( *aString1 ) < toupper( *aString2 ) )
+            if( toupper( *str1 ) < toupper( *str2 ) )
                 return -1;
 
-            if( toupper( *aString1 ) > toupper( *aString2 ) )
+            if( toupper( *str1 ) > toupper( *str2 ) )
                 return 1;
 
-            if( ( *aString1 == 0 ) && ( *aString2 == 0 ) )
+            if( ( *str1 == 0 ) && ( *str2 == 0 ) )
                 return 0;
         }
         else
         {
-            if( *aString1 < *aString2 )
+            if( *str1 < *str2 )
                 return -1;
 
-            if( *aString1 > *aString2 )
+            if( *str1 > *str2 )
                 return 1;
 
-            if( ( *aString1 == 0 ) && ( *aString2 == 0 ) )
+            if( ( str1 == aString1.end() ) && ( str2 == aString2.end() ) )
                 return 0;
         }
 
-        aString1++;
-        aString2++;
+        str1++;
+        str2++;
     }
 
     return 0;
@@ -477,18 +479,3 @@ bool ReplaceIllegalFileNameChars( std::string* aName )
 
     return changed;
 }
-
-
-wxString RemoveTrailingZeros( const wxString& aString )
-{
-    wxString retv = aString;
-    int      i = retv.Length();
-
-    while( --i > 0 && retv[i] == wxChar( '0' ) )
-        retv.RemoveLast();
-
-    if( retv[i] == wxChar( '.' ) || retv[i] == wxChar( ',' ) )
-        retv.RemoveLast();
-
-    return retv;
-}

common/system/fcontext.s

@@ -1,44 +0,0 @@
-/*
-    Boost::Context assembly wrapper - done to avoid compiling the whole boost binary library
-    which may be unpleasant, in particular under Windows (we don't support VC++, while boost::context
-    does not support mingw */
-
-#ifdef __APPLE__
-
-    #if __i386__
-        #include "jump_i386_sysv_macho_gas.S"
-        #include "make_i386_sysv_macho_gas.S"
-
-    #elif __x86_64__
-        #include "jump_x86_64_sysv_macho_gas.S"
-        #include "make_x86_64_sysv_macho_gas.S"
-
-    #else
-        #error "Missing make_fcontext & jump_fcontext routines for this architecture"
-    #endif
-
-#else
-
-    #if __i386__
-
-        #ifdef __WIN32__
-            #include "jump_i386_pe_gas.S"
-            #include "make_i386_pe_gas.S"
-        #else
-            #include "jump_i386_sysv_elf_gas.S"
-            #include "make_i386_sysv_elf_gas.S"
-        #endif
-
-    #elif __x86_64__
-        #include "jump_x86_64_sysv_elf_gas.S"
-        #include "make_x86_64_sysv_elf_gas.S"
-
-    #elif __arm__
-        #include "jump_arm_aapcs_elf_gas.S"
-        #include "make_arm_aapcs_elf_gas.S"
-
-    #else
-         #error "Missing make_fcontext & jump_fcontext routines for this architecture"
-    #endif
-
-#endif

common/system/jump_arm_aapcs_elf_gas.S

@@ -1,76 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/*******************************************************************
- *                                                                 *
- *  -------------------------------------------------------------  *
- *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  *
- *  -------------------------------------------------------------  *
- *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| 0x20| 0x24|  *
- *  -------------------------------------------------------------  *
- *  |  v1 |  v2 |  v3 |  v4 |  v5 |  v6 |  v7 |  v8 |  sp |  lr |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  10 |                                                     |  *
- *  -------------------------------------------------------------  *
- *  | 0x28|                                                     |  *
- *  -------------------------------------------------------------  *
- *  |  pc |                                                     |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  11 |  12 |                                               |  *
- *  -------------------------------------------------------------  *
- *  | 0x2c| 0x30|                                               |  *
- *  -------------------------------------------------------------  *
- *  |  sp | size|                                               |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  13 |  14 | 15 |  16 |  17 |  18 |  19 |  20 |  21 |  22  |  *
- *  -------------------------------------------------------------  *
- *  | 0x34| 0x38|0x3c| 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58 |  *
- *  -------------------------------------------------------------  *
- *  | s16 | s17 | s18 | s19 | s20 | s21 | s22 | s23 | s24 | s25 |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  23 |  24 |  25 |  26 |  27 |  28 |                       |  *
- *  -------------------------------------------------------------  *
- *  | 0x5c| 0x60| 0x64| 0x68| 0x6c| 0x70|                       |  *
- *  -------------------------------------------------------------  *
- *  | s26 | s27 | s28 | s29 | s30 | s31 |                       |  *
- *  -------------------------------------------------------------  *
- *                                                                 *
- * *****************************************************************/
-
-.text
-.globl jump_fcontext
-.align 2
-.type jump_fcontext,%function
-jump_fcontext:
-    stmia   a1, {v1-v8,sp-lr}       @ save V1-V8,SP-LR
-    str     lr, [a1,#40]            @ save LR as PC
-
-#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
-    cmp     a4, #0                  @ test if fpu env should be preserved
-    beq     1f
-
-    mov     a4, a1
-    add     a4, #52
-    vstmia  a4, {d8-d15}            @ save S16-S31
-
-    mov     a4, a2
-    add     a4, #52
-    vldmia  a4, {d8-d15}            @ restore S16-S31
-1:
-#endif
-
-    mov     a1, a3                  @ use third arg as return value after jump
-                                    @ and as first arg in context function
-    ldmia   a2, {v1-v8,sp-pc}       @ restore v1-V8,SP-PC
-.size jump_fcontext,.-jump_fcontext
-
-/* Mark that we don't need executable stack.  */
-.section .note.GNU-stack,"",%progbits

common/system/jump_i386_pe_gas.S

@@ -1,56 +0,0 @@
-/*           Copyright Oliver Kowalke 2009.
-  Distributed under the Boost Software License, Version 1.0.
-     (See accompanying file LICENSE_1_0.txt or copy at
-           http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-.global _jump_fcontext
-.text
-.align 2
-
-_jump_fcontext:
-    mov    0x4(%esp),%ecx
-    mov    %edi,(%ecx)
-    mov    %esi,0x4(%ecx)
-    mov    %ebx,0x8(%ecx)
-    mov    %ebp,0xc(%ecx)
-    mov    %fs:0x18,%edx
-    mov    (%edx),%eax
-    mov    %eax,0x24(%ecx)
-    mov    0x4(%edx),%eax
-    mov    %eax,0x18(%ecx)
-    mov    0x8(%edx),%eax
-    mov    %eax,0x20(%ecx)
-    mov    0x10(%edx),%eax
-    mov    %eax,0x28(%ecx)
-    lea    0x4(%esp),%eax
-    mov    %eax,0x10(%ecx)
-    mov    (%esp),%eax
-    mov    %eax,0x14(%ecx)
-    mov    0x8(%esp),%edx
-    mov    (%edx),%edi
-    mov    0x4(%edx),%esi
-    mov    0x8(%edx),%ebx
-    mov    0xc(%edx),%ebp
-    mov    0x10(%esp),%eax
-    test   %eax,%eax
-    je     _jump_fcontext+0x5f
-    stmxcsr 0x2c(%ecx)
-    fnstcw 0x30(%ecx)
-    ldmxcsr 0x2c(%edx)
-    fldcw  0x30(%edx)
-    mov    %edx,%ecx
-    mov    %fs:0x18,%edx
-    mov    0x24(%ecx),%eax
-    mov    %eax,(%edx)
-    mov    0x18(%ecx),%eax
-    mov    %eax,0x4(%edx)
-    mov    0x20(%ecx),%eax
-    mov    %eax,0x8(%edx)
-    mov    0x28(%ecx),%eax
-    mov    %eax,0x10(%edx)
-    mov    0xc(%esp),%eax
-    mov    0x10(%ecx),%esp
-    mov    %eax,0x4(%esp)
-    mov    0x14(%ecx),%ecx
-    jmp    *%ecx

common/system/jump_i386_sysv_elf_gas.S

@@ -1,72 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/********************************************************************
- *                                                                  *
- *  --------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
- *  --------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |  *
- *  --------------------------------------------------------------  *
- *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    6    |    7    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x18  |   0x1c  |                                        |  *
- *  --------------------------------------------------------------  *
- *  |    sp   |  size   |                                        |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    8    |    9    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                        |  *
- *  --------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                        |  *
- *  --------------------------------------------------------------  *
- *                                                                  *
- * *****************************************************************/
-
-.text
-.globl jump_fcontext
-.align 2
-.type jump_fcontext,@function
-jump_fcontext:
-    movl    0x4(%esp), %ecx         /* load address of the first fcontext_t arg */
-    movl    %edi,       (%ecx)      /* save EDI */
-    movl    %esi,       0x4(%ecx)   /* save ESI */
-    movl    %ebx,       0x8(%ecx)   /* save EBX */
-    movl    %ebp,       0xc(%ecx)   /* save EBP */
-
-    leal    0x4(%esp),  %eax        /* exclude the return address */
-    movl    %eax,       0x10(%ecx)  /* save as stack pointer */
-    movl    (%esp),     %eax        /* load return address */
-    movl    %eax,       0x14(%ecx)  /* save return address */
-
-    movl    0x8(%esp),   %edx       /* load address of the second fcontext_t arg */
-    movl    (%edx),      %edi       /* restore EDI */
-    movl    0x4(%edx),   %esi       /* restore ESI */
-    movl    0x8(%edx),   %ebx       /* restore EBX */
-    movl    0xc(%edx),   %ebp       /* restore EBP */
-
-    movl    0x10(%esp),  %eax       /* check if fpu enve preserving was requested */
-    test    %eax,        %eax
-    je      1f
-
-    stmxcsr  0x20(%ecx)             /* save MMX control and status word */
-    fnstcw   0x24(%ecx)             /* save x87 control word */
-    ldmxcsr  0x20(%edx)             /* restore MMX control and status word */
-    fldcw    0x24(%edx)             /* restore x87 control word */
-1:
-    movl    0xc(%esp),   %eax       /* use third arg as return value after jump */
-
-    movl    0x10(%edx),  %esp       /* restore ESP */
-    movl    %eax,        0x4(%esp)  /* use third arg as first arg in context function */
-    movl    0x14(%edx),  %edx       /* fetch the address to return to */
-
-    jmp     *%edx                   /* indirect jump to context */
-.size jump_fcontext,.-jump_fcontext

common/system/jump_i386_sysv_macho_gas.S

@@ -1,70 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/********************************************************************
- *                                                                  *
- *  --------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
- *  --------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |  *
- *  --------------------------------------------------------------  *
- *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    6    |    7    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x18  |   0x1c  |                                        |  *
- *  --------------------------------------------------------------  *
- *  |    sp   |   size  |                                        |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    8    |    9    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                        |  *
- *  --------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                        |  *
- *  --------------------------------------------------------------  *
- *                                                                  *
- * *****************************************************************/
-
-.text
-.globl _jump_fcontext
-.align 2
-_jump_fcontext:
-    movl    0x4(%esp), %ecx         /* load address of the first fcontext_t arg */
-    movl    %edi,       (%ecx)      /* save EDI */
-    movl    %esi,       0x4(%ecx)   /* save ESI */
-    movl    %ebx,       0x8(%ecx)   /* save EBX */
-    movl    %ebp,       0xc(%ecx)   /* save EBP */
-
-    leal    0x4(%esp),  %eax        /* exclude the return address */
-    movl    %eax,       0x10(%ecx)  /* save as stack pointer */
-    movl    (%esp),     %eax        /* load return address */
-    movl    %eax,       0x14(%ecx)  /* save return address */
-
-    movl    0x8(%esp),   %edx       /* load address of the second fcontext_t arg */
-    movl    (%edx),      %edi       /* restore EDI */
-    movl    0x4(%edx),   %esi       /* restore ESI */
-    movl    0x8(%edx),   %ebx       /* restore EBX */
-    movl    0xc(%edx),   %ebp       /* restore EBP */
-
-    movl    0x10(%esp),  %eax       /* check if fpu enve preserving was requested */
-    test    %eax,        %eax
-    je      1f
-
-    stmxcsr  0x20(%ecx)             /* save MMX control and status word */
-    fnstcw   0x24(%ecx)             /* save x87 control word */
-    ldmxcsr  0x20(%edx)             /* restore MMX control and status word */
-    fldcw    0x24(%edx)             /* restore x87 control word */
-1:
-    movl    0xc(%esp),   %eax       /* use third arg as return value after jump */
-
-    movl    0x10(%edx),  %esp       /* restore ESP */
-    movl    %eax,        0x4(%esp)  /* use third arg as first arg in context function */
-    movl    0x14(%edx),  %edx       /* fetch the address to return to */
-
-    jmp     *%edx                   /* indirect jump to context */

common/system/jump_x86_64_sysv_elf_gas.S

@@ -1,82 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-            http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/****************************************************************************************
- *                                                                                      *
- *  ----------------------------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        RBX        |        R12        |         R13        |        R14        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        R15        |        RBP        |         RSP        |        RIP        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |   16    |   17    |   18    |    19   |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |  0x40   |  0x44   |  0x48   |   0x4c  |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        sp         |       size        |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    20   |    21   |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x50  |   0x54  |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *                                                                                      *
- * **************************************************************************************/
-
-.text
-.globl jump_fcontext
-.type jump_fcontext,@function
-.align 8
-jump_fcontext:
-    movq     %rbx,       (%rdi)         /* save RBX */
-    movq     %r12,       0x8(%rdi)      /* save R12 */
-    movq     %r13,       0x10(%rdi)     /* save R13 */
-    movq     %r14,       0x18(%rdi)     /* save R14 */
-    movq     %r15,       0x20(%rdi)     /* save R15 */
-    movq     %rbp,       0x28(%rdi)     /* save RBP */
-
-    cmp      $0,         %rcx
-    je       1f
-
-    stmxcsr  0x50(%rdi)             /* save MMX control and status word */
-    fnstcw   0x54(%rdi)             /* save x87 control word */
-
-    ldmxcsr  0x50(%rsi)             /* restore MMX control and status word */
-    fldcw    0x54(%rsi)             /* restore x87 control word */
-1:
-
-    leaq     0x8(%rsp),  %rax       /* exclude the return address and save as stack pointer */
-    movq     %rax,       0x30(%rdi) /* save as stack pointer */
-    movq     (%rsp),     %rax       /* save return address */
-    movq     %rax,       0x38(%rdi) /* save return address as RIP */
-
-    movq     (%rsi),      %rbx      /* restore RBX */
-    movq     0x8(%rsi),   %r12      /* restore R12 */
-    movq     0x10(%rsi),  %r13      /* restore R13 */
-    movq     0x18(%rsi),  %r14      /* restore R14 */
-    movq     0x20(%rsi),  %r15      /* restore R15 */
-    movq     0x28(%rsi),  %rbp      /* restore RBP */
-
-    movq     0x30(%rsi),  %rsp      /* restore RSP */
-    movq     0x38(%rsi),  %rcx      /* fetch the address to return to */
-
-    movq     %rdx,        %rax      /* use third arg as return value after jump */
-    movq     %rdx,        %rdi      /* use third arg as first arg in context function */
-
-    jmp      *%rcx                  /* indirect jump to context */
-.size jump_fcontext,.-jump_fcontext

common/system/jump_x86_64_sysv_macho_gas.S

@@ -1,80 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-            http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/****************************************************************************************
- *                                                                                      *
- *  ----------------------------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        RBX        |        R12        |         R13        |        R14        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        R15        |        RBP        |         RSP        |        RIP        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |   16    |   17    |   18    |    19   |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |  0x40   |  0x44   |  0x48   |   0x4c  |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        sp         |        size       |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    20   |    21   |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x50  |   0x54  |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *                                                                                      *
- * **************************************************************************************/
-
-.text
-.globl _jump_fcontext
-.align 8
-_jump_fcontext:
-    movq     %rbx,       (%rdi)         /* save RBX */
-    movq     %r12,       0x8(%rdi)      /* save R12 */
-    movq     %r13,       0x10(%rdi)     /* save R13 */
-    movq     %r14,       0x18(%rdi)     /* save R14 */
-    movq     %r15,       0x20(%rdi)     /* save R15 */
-    movq     %rbp,       0x28(%rdi)     /* save RBP */
-
-    cmp      $0,         %rcx
-    je       1f
-
-    stmxcsr  0x50(%rdi)             /* save MMX control and status word */
-    fnstcw   0x54(%rdi)             /* save x87 control word */
-
-    ldmxcsr  0x50(%rsi)             /* restore MMX control and status word */
-    fldcw    0x54(%rsi)             /* restore x87 control word */
-1:
-
-    leaq     0x8(%rsp),  %rax       /* exclude the return address and save as stack pointer */
-    movq     %rax,       0x30(%rdi) /* save as stack pointer */
-    movq     (%rsp),     %rax       /* save return address */
-    movq     %rax,       0x38(%rdi) /* save return address as RIP */
-
-    movq     (%rsi),      %rbx      /* restore RBX */
-    movq     0x8(%rsi),   %r12      /* restore R12 */
-    movq     0x10(%rsi),  %r13      /* restore R13 */
-    movq     0x18(%rsi),  %r14      /* restore R14 */
-    movq     0x20(%rsi),  %r15      /* restore R15 */
-    movq     0x28(%rsi),  %rbp      /* restore RBP */
-
-    movq     0x30(%rsi),  %rsp      /* restore RSP */
-    movq     0x38(%rsi),  %rcx      /* fetch the address to return to */
-
-    movq     %rdx,        %rax      /* use third arg as return value after jump */
-    movq     %rdx,        %rdi      /* use third arg as first arg in context function */
-
-    jmp      *%rcx                  /* indirect jump to context */

common/system/make_arm_aapcs_elf_gas.S

@@ -1,79 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/*******************************************************************
- *                                                                 *
- *  -------------------------------------------------------------  *
- *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  *
- *  -------------------------------------------------------------  *
- *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| 0x20| 0x24|  *
- *  -------------------------------------------------------------  *
- *  |  v1 |  v2 |  v3 |  v4 |  v5 |  v6 |  v7 |  v8 |  sp |  lr |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  10 |                                                     |  *
- *  -------------------------------------------------------------  *
- *  | 0x28|                                                     |  *
- *  -------------------------------------------------------------  *
- *  |  pc |                                                     |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  11 |  12 |                                               |  *
- *  -------------------------------------------------------------  *
- *  | 0x2c| 0x30|                                               |  *
- *  -------------------------------------------------------------  *
- *  |  sp | size|                                               |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  13 |  14 | 15 |  16 |  17 |  18 |  19 |  20 |  21 |  22  |  *
- *  -------------------------------------------------------------  *
- *  | 0x34| 0x38|0x3c| 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58 |  *
- *  -------------------------------------------------------------  *
- *  | s16 | s17 | s18 | s19 | s20 | s21 | s22 | s23 | s24 | s25 |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  23 |  24 |  25 |  26 |  27 |  28 |                       |  *
- *  -------------------------------------------------------------  *
- *  | 0x5c| 0x60| 0x64| 0x68| 0x6c| 0x70|                       |  *
- *  -------------------------------------------------------------  *
- *  | s26 | s27 | s28 | s29 | s30 | s31 |                       |  *
- *  -------------------------------------------------------------  *
- *                                                                 *
- * *****************************************************************/
-
-.text
-.globl make_fcontext
-.align 2
-.type make_fcontext,%function
-make_fcontext:
-    mov     a4, a1          @ save address of context stack (base) A4
-    sub     a1, a1, #116    @ reserve space for fcontext_t at top of context stack
-
-    @ shift address in A1 to lower 16 byte boundary
-    @ == pointer to fcontext_t and address of context stack
-    bic     a1, a1, #15
-
-    str     a4, [a1,#44]    @ save address of context stack (base) in fcontext_t
-    str     a2, [a1,#48]    @ save context stack size in fcontext_t
-    str     a3, [a1,#40]    @ save address of context function in fcontext_t
-
-    str     a1, [a1,#32]    @ save address in A4 as stack pointer for context function
-
-    adr     a2, finish      @ compute abs address of label finish
-    str     a2, [a1,#36]    @ save address of finish as return address for context function
-                            @ entered after context function returns
-
-    bx      lr
-
-finish:
-    @ SP points to same addras SP on entry of context function
-    mov     a1, #0          @ exit code is zero
-    bl      _exit@PLT       @ exit application
-.size make_fcontext,.-make_fcontext
-
-/* Mark that we don't need executable stack.  */
-.section .note.GNU-stack,"",%progbits

common/system/make_i386_pe_gas.S

@@ -1,50 +0,0 @@
-/*           Copyright Oliver Kowalke 2009.
-  Distributed under the Boost Software License, Version 1.0.
-     (See accompanying file LICENSE_1_0.txt or copy at
-           http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-.global _make_fcontext
-.text
-.align 2
-
-_make_fcontext:
-    mov    0x4(%esp),%eax
-    lea    -0x34(%eax),%eax
-    and    $0xfffffff0,%eax
-    mov    0x4(%esp),%ecx
-    mov    %ecx,0x18(%eax)
-    mov    0x8(%esp),%edx
-    mov    %edx,0x1c(%eax)
-    neg    %edx
-    lea    (%edx,%ecx,1),%ecx
-    mov    %ecx,0x20(%eax)
-    mov    0xc(%esp),%ecx
-    mov    %ecx,0x14(%eax)
-    stmxcsr 0x2c(%eax)
-    fnstcw 0x30(%eax)
-    lea    -0x1c(%eax),%edx
-    mov    %edx,0x10(%eax)
-    mov    $0x0,%ecx
-    mov    %ecx,(%edx)
-    mov    %fs:0x18,%ecx
-    mov    (%ecx),%edx
-    inc    %edx
-    je     _make_fcontext+0x4c // <_make_fcontext+0x4c>
-    dec    %edx
-    xchg   %edx,%ecx
-    jmp    _make_fcontext+0x42 // <_make_fcontext+0x42>
-    mov    0x4(%ecx),%ecx
-    mov    0x10(%eax),%edx
-    mov    %ecx,0x18(%edx)
-    mov    $0xffffffff,%ecx
-    mov    %ecx,0x14(%edx)
-    lea    0x14(%edx),%ecx
-    mov    %ecx,0x24(%eax)
-    ret
-
-finish:
-    xor    %eax,%eax
-    mov    %eax,(%esp)
-    call   finish+0xa
-    hlt

common/system/make_i386_sysv_elf_gas.S

@@ -1,77 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/********************************************************************
- *                                                                  *
- *  --------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
- *  --------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |  *
- *  --------------------------------------------------------------  *
- *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    6    |    7    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x18  |   0x1c  |                                        |  *
- *  --------------------------------------------------------------  *
- *  |    sp   |  size   |                                        |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    8    |    9    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                        |  *
- *  --------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                        |  *
- *  --------------------------------------------------------------  *
- *                                                                  *
- * *****************************************************************/
-
-.text
-.globl make_fcontext
-.align 2
-.type make_fcontext,@function
-make_fcontext:
-    movl   0x4(%esp),      %eax         /* load 1. arg of make_fcontext, pointer to context stack (base) */
-    leal   -0x28(%eax),    %eax         /* reserve space for fcontext_t at top of context stack */
-
-    /* shift address in EAX to lower 16 byte boundary */
-    /* == pointer to fcontext_t and address of context stack */
-    andl   $-16,           %eax
-
-    movl   0x4(%esp),      %edx         /* load 1. arg of make_fcontext, pointer to context stack (base) */
-    movl   %edx,           0x18(%eax)   /* save address of context stack (base) in fcontext_t */
-    movl   0x8(%esp),      %edx         /* load 2. arg of make_fcontext, context stack size */
-    movl   %edx,           0x1c(%eax)   /* save stack size in fcontext_t */
-    movl   0xc(%esp),      %edx         /* load 3. arg of make_fcontext, pointer to context function */
-    movl   %edx,           0x14(%eax)   /* save address of context function in fcontext_t */
-
-    stmxcsr  0x20(%eax)                 /* save MMX control and status word */
-    fnstcw   0x24(%eax)                 /* save x87 control word */
-
-    leal   -0x8(%eax),     %edx         /* reserve space for the last frame on context stack; (ESP - 0x4) % 16 == 0 */
-    movl   %edx,           0x10(%eax)   /* save address in EDX as stack pointer for context function */
-
-    call   1f
-1:  popl   %ecx                        /* address of label 2 */
-    addl   $finish-1b, %ecx            /* compute abs address of label finish */
-    movl   %ecx, (%edx)                /* save address of finish as return address for context functions */
-                                       /* entered after context function returns */
-
-    ret
-
-finish:
-    /* ESP points to same address as ESP on entry of context function + 0x4 */
-    call    2f
-2:  popl    %ebx                                    /* address of label 3 */
-    addl    $_GLOBAL_OFFSET_TABLE_+[.-2b], %ebx     /* compute address of GOT and store it in EBX */
-
-    xorl    %eax,  %eax
-    movl    %eax,  (%esp)               /* exit code is zero */
-    call   _exit@PLT                    /* exit application */
-    hlt
-.size make_fcontext,.-make_fcontext

common/system/make_i386_sysv_macho_gas.S

@@ -1,71 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/********************************************************************
- *                                                                  *
- *  --------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
- *  --------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |  *
- *  --------------------------------------------------------------  *
- *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    6    |    7    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x18  |   0x1c  |                                        |  *
- *  --------------------------------------------------------------  *
- *  |    sp   |   size  |                                        |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    8    |    9    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                        |  *
- *  --------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                        |  *
- *  --------------------------------------------------------------  *
- *                                                                  *
- * *****************************************************************/
-
-.text
-.globl _make_fcontext
-.align 2
-_make_fcontext:
-    movl   0x4(%esp),      %eax         /* load 1. arg of make_fcontext, pointer to context stack (base) */
-    leal   -0x28(%eax),    %eax         /* reserve space for fcontext_t at top of context stack */
-
-    /* shift address in EAX to lower 16 byte boundary */
-    /* == pointer to fcontext_t and address of context stack */
-    andl   $-16,           %eax
-
-    movl   0x4(%esp),      %edx         /* load 1. arg of make_fcontext, pointer to context stack (base) */
-    movl   %edx,           0x18(%eax)   /* save address of stack pointer (base) in fcontext_t */
-    movl   0x8(%esp),      %edx         /* load 2. arg of make_fcontext, context stack size */
-    movl   %edx,           0x1c(%eax)   /* save stack size in fcontext_t */
-    movl   0xc(%esp),      %edx         /* load 3. arg of make_fcontext, pointer to context function */
-    movl   %edx,           0x14(%eax)   /* save address of context fcuntion in fcontext_t */
-
-    stmxcsr  0x20(%eax)                 /* save MMX control and status word */
-    fnstcw   0x24(%eax)                 /* save x87 control word */
-
-    leal   -0x14(%eax),    %edx         /* reserve space for the last frame on context stack */
-    movl   %edx,           0x10(%eax)   /* save address in EDX as stack pointer for context function */
-
-    call   1f
-1:  popl   %ecx                         /* address of label 1 */
-    addl   $finish-1b,     %ecx         /* compute abs address of label finish */
-    movl   %ecx, (%edx)                 /* save address of finish as return address for context function */
-                                        /* entered after context function returns */
-
-    ret
-
-finish:
-    /* ESP points to same address as ESP on entry of context function + 0x4 */
-    xorl    %eax,  %eax
-    movl    %eax,  (%esp)               /* exit code is zero */
-    call   __exit                       /* exit application */
-    hlt

common/system/make_x86_64_sysv_elf_gas.S

@@ -1,81 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-            http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/****************************************************************************************
- *                                                                                      *
- *  ----------------------------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        RBX        |        R12        |         R13        |        R14        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        R15        |        RBP        |         RSP        |        RIP        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |   16    |   17    |   18    |    19   |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |  0x40   |  0x44   |  0x48   |   0x4c  |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        sp         |       size        |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    20   |    21   |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x50  |   0x54  |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *                                                                                      *
- * **************************************************************************************/
-
-.text
-.globl make_fcontext
-
-#ifndef  __APPLE__
-.type make_fcontext,@function
-#endif
-
-.align 8
-make_fcontext:
-    leaq   -0x58(%rdi),    %rax        /* reserve space for fcontext_t at top of context stack */
-
-    /* shift address in RAX to lower 16 byte boundary */
-    /* == pointer to fcontext_t and address of context stack */
-    andq   $-16,           %rax
-
-    movq   %rdi,           0x40(%rax) /* save address of context stack pointer (base) in fcontext_t */
-    movq   %rsi,           0x48(%rax) /* save context stack size in fcontext_t */
-    movq   %rdx,           0x38(%rax) /* save address of context function in fcontext_t */
-
-    stmxcsr  0x50(%rax)                /* save MMX control and status word */
-    fnstcw   0x54(%rax)                /* save x87 control word */
-
-    leaq   -0x8(%rax),      %rdx       /* reserve space for the return address on context stack, (RSP - 0x8) % 16 == 0 */
-    movq   %rdx,            0x30(%rax) /* save address in RDX as stack pointer for context function */
-
-    leaq   finish(%rip),    %rcx       /* compute abs address of label finish */
-    movq   %rcx,            (%rdx)     /* save address of finish as return address for context function */
-                                       /* entered after context function returns */
-
-    ret                                /* return pointer to fcontext_t placed on context stack */
-
-finish:
-    /* RSP points to same address as RSP on entry of context function + 0x8 */
-    xorq    %rdi,           %rdi       /* exit code is zero */
-    call   _exit@PLT                   /* exit application */
-    hlt
-
-#ifndef  __APPLE__
-.size make_fcontext,.-make_fcontext
-#endif
-

common/system/make_x86_64_sysv_macho_gas.S

@@ -1,71 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-            http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/****************************************************************************************
- *                                                                                      *
- *  ----------------------------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        RBX        |        R12        |         R13        |        R14        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        R15        |        RBP        |         RSP        |        RIP        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |   16    |   17    |   18    |    19   |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |  0x40   |  0x44   |  0x48   |   0x4c  |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        sp         |        size       |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    20   |    21   |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x50  |   0x54  |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *                                                                                      *
- * **************************************************************************************/
-
-.text
-.globl _make_fcontext
-.align 8
-_make_fcontext:
-    leaq   -0x58(%rdi),     %rax        /* reserve space for fcontext_t at top of context stack */
-
-    /* shift address in RAX to lower 16 byte boundary */
-    /* == pointer to fcontext_t and address of context stack */
-    movabs  $-16,           %r8
-    andq    %r8,            %rax
-
-    movq   %rdi,            0x40(%rax) /* save address of stack pointer (base) in fcontext_t */
-    movq   %rsi,            0x48(%rax) /* save stack size in fcontext_t */
-    movq   %rdx,            0x38(%rax) /* save address of context function in fcontext_t */
-
-    stmxcsr  0x50(%rax)                /* save MMX control and status word */
-    fnstcw   0x54(%rax)                /* save x87 control word */
-
-    leaq   -0x8(%rax),      %rdx       /* reserve space for the return address on context stack, (RSP - 0x8) % 16 == 0 */
-    movq   %rdx,            0x30(%rax) /* save address in RDX as stack pointer for context function */
-
-    leaq   finish(%rip),    %rcx       /* compute abs address of label finish */
-    movq   %rcx,            (%rdx)     /* save address of finish as return address for context function */
-                                       /* entered after context function returns */
-
-    ret                                /* return pointer to fcontext_t placed on context stack */
-
-finish:
-    /* RSP points to same address as RSP on entry of context function + 0x8 */
-    xorq    %rdi,           %rdi       /* exit code is zero */
-    call   __exit                      /* exit application */

common/wildcards_and_files_ext.cpp

@@ -97,4 +97,5 @@ const wxString PSFileWildcard( _( "PostScript files (.ps)|*.ps" ) );
 const wxString ReportFileWildcard = _( "Report files (*.rpt)|*.rpt" );
 const wxString FootprintPlaceFileWildcard = _( "Footprint place files (*.pos)|*.pos" );
 const wxString Shapes3DFileWildcard( _( "Vrml and x3d files (*.wrl *.x3d)|*.wrl;*.x3d" ) );
+const wxString IDF3DFileWildcard( _( "IDFv3 component files (*.idf)|*.idf" ) );
 const wxString TextWildcard( _( "Text files (*.txt)|*.txt" ) );

common/worksheet.cpp

@@ -94,10 +94,24 @@ void EDA_DRAW_FRAME::DrawWorkSheet( wxDC* aDC, BASE_SCREEN* aScreen, int aLineWi
     TITLE_BLOCK t_block = GetTitleBlock();
     EDA_COLOR_T color = RED;
 
+    wxPoint origin = aDC->GetDeviceOrigin();
+
+    if( aScreen->m_IsPrinting && origin.y > 0 )
+    {
+        aDC->SetDeviceOrigin( 0, 0 );
+        aDC->SetAxisOrientation( true, false );
+    }
+
     DrawPageLayout( aDC, m_canvas->GetClipBox(), pageInfo,
                     GetScreenDesc(), aFilename, t_block,
                     aScreen->m_NumberOfScreens, aScreen->m_ScreenNumber,
                     aLineWidth, aScalar, color, color );
+
+    if( aScreen->m_IsPrinting && origin.y > 0 )
+    {
+        aDC->SetDeviceOrigin( origin.x, origin.y );
+        aDC->SetAxisOrientation( true, true );
+    }
 }
 
 

common/xnode.cpp

@@ -26,7 +26,7 @@
 #include <xnode.h>
 #include <macros.h>
 
-typedef wxXmlProperty   XATTR;
+typedef wxXmlAttribute   XATTR;
 
 
 void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -158,7 +158,6 @@ void DISPLAY_FOOTPRINTS_FRAME::OnCloseWindow( wxCloseEvent& event )
     if( m_Draw3DFrame )
         m_Draw3DFrame->Close( true );
 
-    SaveSettings();
     Destroy();
 }
 

cvpcb/cvframe.cpp

@@ -337,7 +337,6 @@ void CVPCB_MAINFRAME::OnCloseWindow( wxCloseEvent& Event )
         m_DisplayFootprintFrame->Close( true );
 
     m_modified = false;
-    SaveSettings();
     Destroy();
     return;
 }
@@ -748,11 +747,11 @@ void CVPCB_MAINFRAME::DisplayStatus()
 
 bool CVPCB_MAINFRAME::LoadFootprintFiles()
 {
-    // Check if there are footprint libraries in project file.
-    if( m_ModuleLibNames.GetCount() == 0 )
+    // Check if there are footprint libraries in the footprint library table.
+    if( m_footprintLibTable == NULL || !m_footprintLibTable->GetLogicalLibs().size() )
     {
-        wxMessageBox( _( "No PCB footprint libraries are listed in the current project file." ),
-                      _( "Project File Error" ), wxOK | wxICON_ERROR );
+        wxMessageBox( _( "No PCB footprint libraries are listed in the current footprint "
+                         "library table." ), _( "Configuration Error" ), wxOK | wxICON_ERROR );
         return false;
     }
 

demos/complex_hierarchy/complex_hierarchy-cache.lib

@@ -1,10 +1,13 @@
-EESchema-LIBRARY Version 2.3  Date: 21/05/2010 09:45:35
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # +12C
 #
 DEF +12C #PWR 0 0 N Y 1 F P
 F0 "#PWR" 0 -30 30 H I C CNN
 F1 "+12C" 0 110 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X +12C 1 0 0 0 U 30 30 0 0 W N
 C 0 60 20 0 1 0 N
@@ -17,6 +20,8 @@ ENDDEF
 DEF +12V #PWR 0 0 N Y 1 F P
 F0 "#PWR" 0 -50 20 H I C CNN
 F1 "+12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X +12V 1 0 0 0 U 20 30 0 0 W N
 C 0 60 20 0 1 0 N
@@ -29,6 +34,8 @@ ENDDEF
 DEF -VAA #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 20 H I C CNN
 F1 "-VAA" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X -VAA 1 0 0 0 U 20 20 0 0 W N
 P 3 0 1 0  0 0  0 50  0 50 N
@@ -41,6 +48,8 @@ ENDDEF
 DEF 7805 U 0 30 N Y 1 F N
 F0 "U" 150 -196 60 H V C CNN
 F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS LM7805 LM7812 78L05
 DRAW
 S -200 -150 200 150 0 1 0 N
@@ -53,16 +62,18 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
 $FPLIST
  SM*
  C?
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -73,6 +84,8 @@ ENDDEF
 DEF CONN_2 P 0 40 Y N 1 F N
 F0 "P" -50 0 40 V V C CNN
 F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 150 100 -150 0 1 0 N
 X P1 1 -350 100 250 R 60 60 1 1 P I
@@ -83,15 +96,17 @@ ENDDEF
 # CP
 #
 DEF CP C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP" 50 -100 50 H V L CNN
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
 ALIAS CAPAPOL
 $FPLIST
  CP*
  SM*
 $ENDFPLIST
 DRAW
-P 4 0 1 8  -100 50  -100 -50  100 -50  100 50 N
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
 P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
 X ~ 1 0 200 150 D 40 40 1 1 P
 X ~ 2 0 -200 150 U 40 40 1 1 P
@@ -103,6 +118,8 @@ ENDDEF
 DEF DIODE D 0 40 N N 1 F N
 F0 "D" 0 100 40 H V C CNN
 F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  D?
  S*
@@ -120,6 +137,8 @@ ENDDEF
 DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
@@ -131,6 +150,8 @@ ENDDEF
 DEF HT #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 120 20 H I C CNN
 F1 "HT" 0 90 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X HT 1 0 0 0 U 20 20 0 0 W N
 P 3 0 1 0  0 0  0 40  0 40 N
@@ -143,6 +164,8 @@ ENDDEF
 DEF ICL7660 U 0 40 Y Y 1 F N
 F0 "U" 200 400 70 H V L CNN
 F1 "ICL7660" 50 -450 70 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -550 -350 550 350 0 1 0 N
 X CAP+ 2 -850 250 300 R 60 60 1 1 I
@@ -160,7 +183,9 @@ ENDDEF
 DEF LM358 U 0 20 Y Y 2 F N
 F0 "U" -50 200 60 H V L CNN
 F1 "LM358" -50 -250 60 H V L CNN
-ALIAS OP275 LMC6062 LMC6082 MC33178 LM358N TL072 TL082
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS LMC6062 LMC6082 LM358N TL072 TL082
 DRAW
 P 4 0 1 6  -200 200  200 0  -200 -200  -200 200 f
 X V- 4 -100 -400 250 U 40 40 0 1 W
@@ -180,16 +205,17 @@ DEF MPSA42 Q 0 40 Y N 1 F N
 F0 "Q" 150 -150 60 H V L CNN
 F1 "MPSA42" 150 150 60 H V L CNN
 F2 "TO92-CBE" 150 0 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  TO92-CBE
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
 P 2 0 1 0  0 0  100 100 N
-P 3 0 1 10  0 75  0 -75  0 -75 F
-P 3 0 1 0  25 -25  0 0  0 0 N
-P 3 0 1 0  100 -100  65 -65  65 -65 N
-P 5 0 1 0  25 -25  50 -75  75 -50  25 -25  25 -25 F
+P 3 0 1 10  0 75  0 -75  0 -75 N
+P 3 0 1 0  50 -50  0 0  0 0 N
+P 3 0 1 0  90 -90  100 -100  100 -100 N
+P 5 0 1 0  90 -90  70 -30  30 -70  90 -90  90 -90 F
 X B B -200 0 200 R 40 40 1 1 I
 X C C 100 200 100 D 40 40 1 1 P
 X E E 100 -200 100 U 40 40 1 1 P
@@ -202,6 +228,7 @@ DEF MPSA92 Q 0 40 Y N 1 F N
 F0 "Q" 150 -150 60 H V L CNN
 F1 "MPSA92" 150 150 60 H V L CNN
 F2 "TO92-CBE" 150 0 30 H I C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  TO92-CBE
 $ENDFPLIST
@@ -223,6 +250,8 @@ ENDDEF
 DEF POT RV 0 40 Y N 1 F N
 F0 "RV" 0 -100 50 H V C CNN
 F1 "POT" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -150 50 150 -50 0 1 0 N
 P 3 0 1 0  0 50  -20 70  20 70 F
@@ -235,20 +264,23 @@ ENDDEF
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R?
  SM0603
@@ -268,6 +300,8 @@ ENDDEF
 DEF VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
 C 0 50 20 0 1 0 N

demos/complex_hierarchy/complex_hierarchy.pro

@@ -1,53 +1,22 @@
-update=12/03/2011 18:54:54
+update=25/01/2014 08:37:41
 version=1
-last_client=pcbnew
+last_client=kicad
 [cvpcb]
 version=1
-NetITyp=0
-NetIExt=.net
-PkgIExt=.pkg
-NetDir=
-LibDir=
-NetType=0
+NetIExt=net
 [cvpcb/libraries]
 EquName1=devcms
-[general]
-version=1
 [eeschema]
 version=1
-LibDir=F:\\kicad\\share\\library
-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
+PageLayoutDescrFile=
+SubpartIdSeparator=0
+SubpartFirstId=65
+LibDir=F:/kicad/share/library
+NetFmtName=
 RptD_X=0
 RptD_Y=100
 RptLab=1
-SimCmd=
-UseNetN=0
 LabSize=60
-PrintMonochrome=1
-ShowSheetReferenceAndTitleBlock=1
 [eeschema/libraries]
 LibName1=power
 LibName2=device
@@ -59,30 +28,25 @@ LibName7=interface
 LibName8=special
 [pcbnew]
 version=1
-PadDrlX=320
-PadDimH=600
-PadDimV=600
-BoardThickness=630
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=150
+PageLayoutDescrFile=
 LastNetListRead=
+UseCmpFile=1
+PadDrill=0.8128
+PadDrillOvalY=0.8128
+PadSizeH=2.286
+PadSizeV=2.286
+PcbTextSizeV=2
+PcbTextSizeH=2
+PcbTextThickness=0.3
+ModuleTextSizeV=1
+ModuleTextSizeH=1
+ModuleTextSizeThickness=0.2
+SolderMaskClearance=0.254
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.3
+BoardOutlineThickness=0.09999999999999999
+ModuleOutlineThickness=0.2
 [pcbnew/libraries]
 LibDir=
-LibName1=sockets
-LibName2=connect
-LibName3=discret
-LibName4=pin_array
-LibName5=divers
-LibName6=libcms
-LibName7=display
-LibName8=valves
-LibName9=led
-LibName10=dip_sockets
+[general]
+version=1

demos/complex_hierarchy/complex_hierarchy.sch

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

demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213-cache.lib

@@ -1,10 +1,13 @@
-EESchema-LIBRARY Version 2.3  Date: 27/11/2009 11:46:34
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # +3.3V
 #
 DEF +3.3V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -40 30 H I C CNN
 F1 "+3.3V" 0 110 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS +3,3V
 DRAW
 X +3.3V 1 0 0 0 U 30 30 0 0 W N
@@ -16,8 +19,10 @@ ENDDEF
 # 74AHC1G14
 #
 DEF 74AHC1G14 U 0 30 Y Y 1 F N
-F0 "U" 195 115 60 H V C CNN
-F1 "74AHC1G14" 300 -150 60 H V C CNN
+F0 "U" 145 115 40 H V C CNN
+F1 "74AHC1G14" 200 -100 40 H V C CNN
+F2 "" 95 -135 30 H V C CNN
+F3 "" 145 115 60 H V C CNN
 DRAW
 P 4 0 0 0  -150 150  -150 -150  150 0  -150 150 N
 X GND 3 -50 -200 100 U 40 20 0 0 W
@@ -34,6 +39,8 @@ ENDDEF
 DEF 74LS125 U 0 30 Y Y 4 F N
 F0 "U" 0 100 50 H V L BNN
 F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X GND 7 -150 -150 0 U 50 30 0 0 W N
 X VCC 14 -150 150 0 D 50 30 0 0 W N
@@ -56,16 +63,18 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
 $FPLIST
  SM*
  C?
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -76,6 +85,8 @@ ENDDEF
 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
@@ -88,6 +99,8 @@ ENDDEF
 DEF CONN_13X2 P 0 10 Y N 1 F N
 F0 "P" 0 700 60 H V C CNN
 F1 "CONN_13X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 650 100 -650 0 1 0 N
 X P1 1 -400 600 300 R 40 30 1 1 P I
@@ -124,6 +137,8 @@ ENDDEF
 DEF CONN_2 P 0 40 Y N 1 F N
 F0 "P" -50 0 40 V V C CNN
 F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 150 100 -150 0 1 0 N
 X P1 1 -350 100 250 R 60 60 1 1 P I
@@ -136,6 +151,8 @@ ENDDEF
 DEF CONN_20X2 P 0 10 Y N 1 F N
 F0 "P" 0 1050 60 H V C CNN
 F1 "CONN_20X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 1000 100 -1000 0 1 0 N
 X P1 1 -400 950 300 R 60 30 1 1 P I
@@ -186,6 +203,8 @@ ENDDEF
 DEF CONN_2X2 P 0 40 Y N 1 F N
 F0 "P" 0 150 50 H V C CNN
 F1 "CONN_2X2" 10 -130 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 100 100 -100 0 1 0 N
 X 1 1 -400 50 300 R 60 60 1 1 P I
@@ -200,6 +219,8 @@ ENDDEF
 DEF CONN_3 K 0 40 Y N 1 F N
 F0 "K" -50 0 50 V V C CNN
 F1 "CONN_3" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 150 100 -150 0 1 0 N
 X P1 1 -350 100 250 R 60 60 1 1 P I
@@ -213,6 +234,8 @@ ENDDEF
 DEF CONN_30X2 P 0 10 Y N 1 F N
 F0 "P" 0 1550 60 H V C CNN
 F1 "CONN_30X2" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 1500 100 -1500 0 1 0 N
 X P1 1 -400 1450 300 R 60 30 1 1 P I
@@ -284,6 +307,8 @@ ENDDEF
 DEF CONN_4X2 P 0 40 Y N 1 F N
 F0 "P" 0 250 50 H V C CNN
 F1 "CONN_4X2" 0 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 200 100 -200 0 1 0 N
 X 1 1 -400 150 300 R 60 60 1 1 P I
@@ -302,6 +327,8 @@ ENDDEF
 DEF CONN_6 P 0 30 Y N 1 F N
 F0 "P" -50 0 60 V V C CNN
 F1 "CONN_6" 50 0 60 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 300 100 -300 0 1 0 N
 X 1 1 -350 250 250 R 60 60 1 1 P I
@@ -316,15 +343,17 @@ ENDDEF
 # CP
 #
 DEF CP C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP" 50 -100 50 H V L CNN
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
 ALIAS CAPAPOL
 $FPLIST
  CP*
  SM*
 $ENDFPLIST
 DRAW
-P 4 0 1 8  -100 50  -100 -50  100 -50  100 50 N
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
 P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
 X ~ 1 0 200 150 D 40 40 1 1 P
 X ~ 2 0 -200 150 U 40 40 1 1 P
@@ -333,9 +362,11 @@ ENDDEF
 #
 # CRYSTAL
 #
-DEF CRYSTAL X 0 40 N N 0 F N
+DEF CRYSTAL X 0 40 N N 1 F N
 F0 "X" 0 150 60 H V C CNN
 F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 1 16  -100 100  -100 -100 N
 P 2 0 1 16  100 100  100 -100 N
@@ -350,6 +381,8 @@ ENDDEF
 DEF DB9 J 0 40 Y N 1 F N
 F0 "J" 0 550 70 H V C CNN
 F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  DB9*
 $ENDFPLIST
@@ -401,6 +434,8 @@ ENDDEF
 DEF DIODE D 0 40 N N 1 F N
 F0 "D" 0 100 40 H V C CNN
 F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  D?
  S*
@@ -418,6 +453,8 @@ ENDDEF
 DEF FUSE F 0 10 Y Y 1 F N
 F0 "F" 100 50 40 H V C CNN
 F1 "FUSE" -100 -50 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A -75 0 75 1 1799 0 1 0 N 0 0 -150 0
 A 75 0 75 -1799 -1 0 1 0 N 0 0 150 0
@@ -431,6 +468,8 @@ ENDDEF
 DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
@@ -442,6 +481,8 @@ ENDDEF
 DEF GNDA #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 40 H I C CNN
 F1 "GNDA" 0 -70 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GNDA 1 0 0 0 U 40 40 1 1 W N
@@ -450,9 +491,11 @@ ENDDEF
 #
 # INDUCTOR
 #
-DEF INDUCTOR L 0 40 N N 0 F N
+DEF INDUCTOR L 0 40 N N 1 F N
 F0 "L" -50 0 40 V V C CNN
 F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
 A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
@@ -468,6 +511,8 @@ ENDDEF
 DEF JACK_2P J 0 40 Y Y 1 F N
 F0 "J" -350 -200 60 H V C CNN
 F1 "JACK_2P" -150 250 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -450 150 -400 -100 0 1 0 F
 S 300 -150 -400 200 0 1 0 N
@@ -488,6 +533,8 @@ ENDDEF
 DEF JUMPER JP 0 30 Y N 1 F N
 F0 "JP" 0 150 60 H V C CNN
 F1 "JUMPER" 0 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
 C -100 0 35 0 1 0 N
@@ -502,6 +549,8 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  LED-3MM
  LED-5MM
@@ -526,6 +575,8 @@ ENDDEF
 DEF LT1129_QPACK U 0 30 Y Y 1 F N
 F0 "U" 250 450 60 H V C CNN
 F1 "LT1129_QPACK" 500 -495 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS LT_1129_QP
 DRAW
 S -500 -400 500 400 0 1 0 N
@@ -542,6 +593,8 @@ ENDDEF
 DEF MAX232 U 0 40 Y Y 1 F N
 F0 "U" 0 850 70 H V C CNN
 F1 "MAX232" 0 -850 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS MAX202
 DRAW
 T 900 80 -530 40 0 0 0 RS232  Normal 0 C C
@@ -573,6 +626,8 @@ ENDDEF
 DEF MC34064P U 0 20 Y Y 1 F N
 F0 "U" 50 200 60 H V C CNN
 F1 "MC34064P" 300 -190 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS MC33064P
 DRAW
 S -200 -150 200 150 0 1 0 N
@@ -587,6 +642,8 @@ ENDDEF
 DEF MCF5213-LQFP100 U 0 40 Y Y 1 F N
 F0 "U" 1150 2700 60 H V L CNN
 F1 "MCF5213-LQFP100" 600 -2650 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -1700 2600 1700 -2600 0 1 0 N
 X VCC 1 -250 2850 250 D 30 30 1 1 W
@@ -697,6 +754,8 @@ ENDDEF
 DEF PCA82C251 U 0 0 Y Y 1 F N
 F0 "U" 150 450 60 H V C CNN
 F1 "PCA82C251" 300 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 T 0 50 300 20 0 0 1 Volt  Normal 1 C C
 S -200 400 200 -300 0 1 0 N
@@ -724,9 +783,11 @@ ENDDEF
 #
 # PNP
 #
-DEF PNP Q 0 0 Y Y 0 F N
+DEF PNP Q 0 0 Y Y 1 F N
 F0 "Q" 0 -150 60 H V R CNN
 F1 "PNP" 0 150 60 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 50 0 111 0 1 10 N
 P 2 0 1 0  0 0  100 100 N
@@ -743,25 +804,29 @@ ENDDEF
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R?
  SM0603
  SM0805
  R?-*
+ SM1206
 $ENDFPLIST
 DRAW
 S -40 150 40 -150 0 1 12 N
@@ -775,6 +840,8 @@ ENDDEF
 DEF SW_PUSH SW 0 40 N N 1 F N
 F0 "SW" 150 110 50 H V C CNN
 F1 "SW_PUSH" 0 -80 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -170 50 170 60 0 1 0 N
 P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
@@ -785,9 +852,11 @@ ENDDEF
 #
 # SWITCH_INV
 #
-DEF SWITCH_INV SW 0 0 N Y 0 F N
+DEF SWITCH_INV SW 0 0 N Y 1 F N
 F0 "SW" -200 150 50 H V C CNN
 F1 "SWITCH_INV" -150 -150 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C -150 0 50 0 0 0 N
 C 150 -100 50 0 0 0 N
@@ -804,6 +873,8 @@ ENDDEF
 DEF VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
 C 0 50 20 0 1 0 N
@@ -816,6 +887,8 @@ ENDDEF
 DEF VDD #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VDD" 0 110 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VDD 1 0 0 0 U 40 40 0 0 W N
 C 0 60 20 0 1 0 N
@@ -828,6 +901,8 @@ ENDDEF
 DEF XCR3256-TQ144 U 0 20 Y Y 1 F N
 F0 "U" 0 3500 70 H V C CNN
 F1 "XCR3256-TQ144" 0 -3600 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -650 3400 650 -3500 0 1 0 N
 X I1 1 950 -2900 300 L 50 50 1 1 P
@@ -850,7 +925,6 @@ X G2 80 -950 -2500 300 R 50 50 1 1 P
 X C14 90 -950 500 300 R 50 50 1 1 P
 X J15 11 950 -1600 300 L 50 50 1 1 P
 X N2 21 950 900 300 L 50 50 1 1 P
-X P14 31 950 3100 300 L 50 50 1 1 P
 X P4 31 950 2800 300 L 50 50 1 1 P
 X O3 41 950 2000 300 L 50 50 1 1 P
 X VCC 51 -450 3400 0 D 30 30 1 1 W N
@@ -887,6 +961,7 @@ X E11 84 -950 -1600 300 R 50 50 1 1 P
 X C3 94 -950 900 300 R 50 50 1 1 P
 X L4 15 950 -400 300 L 50 50 1 1 P
 X N11 25 950 1200 300 L 50 50 1 1 P
+X P14 35 950 3100 300 L 50 50 1 1 P
 X M15 45 950 700 300 L 50 50 1 1 P
 X F1 55 -950 -1700 300 R 50 50 1 1 P
 X F15 65 -950 -2300 300 R 50 50 1 1 P

demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.pro

@@ -1,41 +1,44 @@
-update=20/06/2009 21:38:13
-last_client=pcbnew
+update=24/01/2014 13:22:43
+last_client=eeschema
 [general]
 version=1
-RootSch=kit-dev-coldfire_5213.sch
-BoardNm=kit-dev-coldfire_5213.brd
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
+[pcbnew]
+version=1
+PageLayoutDescrFile=
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0
+PadDrillOvalY=0
+PadSizeH=0.4064
+PadSizeV=1.27
+PcbTextSizeV=2.032
+PcbTextSizeH=1.524
+PcbTextThickness=0.3048
+ModuleTextSizeV=1.524
+ModuleTextSizeH=1.524
+ModuleTextSizeThickness=0.3048
+SolderMaskClearance=0.2
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.381
+BoardOutlineThickness=0.381
+ModuleOutlineThickness=0.1524
+[pcbnew/libraries]
+LibDir=
 [eeschema]
 version=1
+PageLayoutDescrFile=
+SubpartIdSeparator=0
+SubpartFirstId=65
 LibDir=
-NetFmt=1
-HPGLSpd=20
-HPGLDm=15
-HPGLNum=1
-offX_A4=0
-offY_A4=0
-offX_A3=0
-offY_A3=0
-offX_A2=0
-offY_A2=0
-offX_A1=0
-offY_A1=0
-offX_A0=0
-offY_A0=0
-offX_A=0
-offY_A=0
-offX_B=0
-offY_B=0
-offX_C=0
-offY_C=0
-offX_D=0
-offY_D=0
-offX_E=0
-offY_E=0
+NetFmtName=
 RptD_X=0
 RptD_Y=100
 RptLab=1
-SimCmd=
-UseNetN=0
 LabSize=60
 [eeschema/libraries]
 LibName1=power
@@ -45,71 +48,9 @@ LibName4=conn
 LibName5=linear
 LibName6=regul
 LibName7=74xx
-LibName8=cmos4000
-LibName9=adc-dac
-LibName10=memory
-LibName11=xilinx
-LibName12=special
-LibName13=microcontrollers
-LibName14=dsp
-LibName15=microchip
-LibName16=analog_switches
-LibName17=motorola
-LibName18=texas
-LibName19=intel
-LibName20=audio
-LibName21=interface
-LibName22=digital-audio
-LibName23=philips
-LibName24=display
-LibName25=cypress
-LibName26=siliconi
-LibName27=contrib
-LibName28=valves
-[pcbnew]
-version=1
-PadDrlX=0
-PadDimH=160
-PadDimV=500
-ViaDiam=450
-ViaDril=150
-ViaAltD=250
-MViaDia=200
-MViaDrl=80
-Isol=60
-LayerThickness=630
-Countlayer=4
-Lpiste=220
-RouteTo=15
-RouteBo=0
-TypeVia=3
-Segm45=1
-Racc45=1
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-HPGLnum=1
-HPGdiam=15
-HPGLSpd=20
-HPGLrec=2
-HPGLorg=0
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=60
-WpenSer=10
-[pcbnew/libraries]
-LibDir=
-LibName1=sockets
-LibName2=dip_sockets
-LibName3=connect
-LibName4=discret
-LibName5=pin_array
-LibName6=divers
-LibName7=libcms
-LibName8=display
-LibName9=valves
+LibName8=adc-dac
+LibName9=memory
+LibName10=xilinx
+LibName11=special
+LibName12=microcontrollers
+LibName13=motorola

demos/kit-dev-coldfire-xilinx_5213/kit-dev-coldfire-xilinx_5213.sch

@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date 27/11/2009 11:46:34
+EESchema Schematic File Version 2
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -6,31 +6,17 @@ LIBS:conn
 LIBS:linear
 LIBS:regul
 LIBS:74xx
-LIBS:cmos4000
 LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
 LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
 LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:contrib
-LIBS:valves
 LIBS:kit-dev-coldfire-xilinx_5213-cache
-EELAYER 23  0
+EELAYER 24 0
 EELAYER END
-$Descr A3 16535 11700
+$Descr A3 16535 11693
+encoding utf-8
 Sheet 1 3
 Title "Dev kit coldfire 5213"
 Date "8 feb 2008"
@@ -676,8 +662,10 @@ $Comp
 L MCF5213-LQFP100 U1
 U 1 1 46161C39
 P 8150 4600
-F 0 "U1" H 8200 4650 60  0000 L CNN
+F 0 "U1" H 9100 7300 60  0000 L CNN
 F 1 "MCF5213-LQFP100" H 8750 1950 60  0000 L CNN
+F 2 "" H 8150 4600 60  0001 C CNN
+F 3 "" H 8150 4600 60  0001 C CNN
 	1    8150 4600
 	1    0    0    -1  
 $EndComp
@@ -687,6 +675,8 @@ U 1 1 462382A4
 P 6450 9000
 F 0 "#PWR01" H 6450 9000 40  0001 C CNN
 F 1 "GNDA" H 6450 8930 40  0000 C CNN
+F 2 "" H 6450 9000 60  0001 C CNN
+F 3 "" H 6450 9000 60  0001 C CNN
 	1    6450 9000
 	1    0    0    -1  
 $EndComp
@@ -696,6 +686,8 @@ U 1 1 46238286
 P 6450 8750
 F 0 "C18" H 6500 8850 50  0000 L CNN
 F 1 "100nF" H 6500 8650 50  0000 L CNN
+F 2 "" H 6450 8750 60  0001 C CNN
+F 3 "" H 6450 8750 60  0001 C CNN
 	1    6450 8750
 	1    0    0    -1  
 $EndComp
@@ -709,6 +701,8 @@ U 1 1 46602ECA
 P 5350 6950
 F 0 "#PWR02" H 5350 6950 40  0001 C CNN
 F 1 "GNDA" H 5350 6880 40  0000 C CNN
+F 2 "" H 5350 6950 60  0001 C CNN
+F 3 "" H 5350 6950 60  0001 C CNN
 	1    5350 6950
 	1    0    0    -1  
 $EndComp
@@ -718,6 +712,8 @@ U 1 1 465FE6C5
 P 10150 10350
 F 0 "GND1" H 10230 10350 40  0000 L CNN
 F 1 "CONN_1" H 10150 10405 30  0001 C CNN
+F 2 "" H 10150 10350 60  0001 C CNN
+F 3 "" H 10150 10350 60  0001 C CNN
 	1    10150 10350
 	1    0    0    -1  
 $EndComp
@@ -727,6 +723,8 @@ U 1 1 46555AB9
 P 6100 7100
 F 0 "#PWR03" H 6100 7100 40  0001 C CNN
 F 1 "GNDA" H 6100 7030 40  0000 C CNN
+F 2 "" H 6100 7100 60  0001 C CNN
+F 3 "" H 6100 7100 60  0001 C CNN
 	1    6100 7100
 	1    0    0    -1  
 $EndComp
@@ -736,6 +734,8 @@ U 1 1 46554FD2
 P 13400 1700
 F 0 "#PWR04" H 13400 1660 30  0001 C CNN
 F 1 "+3.3V" H 13400 1810 30  0000 C CNN
+F 2 "" H 13400 1700 60  0001 C CNN
+F 3 "" H 13400 1700 60  0001 C CNN
 	1    13400 1700
 	1    0    0    -1  
 $EndComp
@@ -745,6 +745,8 @@ U 1 1 46554FCD
 P 13400 2100
 F 0 "#PWR05" H 13400 2100 30  0001 C CNN
 F 1 "GND" H 13400 2030 30  0001 C CNN
+F 2 "" H 13400 2100 60  0001 C CNN
+F 3 "" H 13400 2100 60  0001 C CNN
 	1    13400 2100
 	1    0    0    -1  
 $EndComp
@@ -754,6 +756,8 @@ U 1 1 46554FB5
 P 13350 1900
 F 0 "U2" H 13545 2015 60  0000 C CNN
 F 1 "74AHC1G14" H 13650 1750 60  0000 C CNN
+F 2 "" H 13350 1900 60  0001 C CNN
+F 3 "" H 13350 1900 60  0001 C CNN
 	1    13350 1900
 	-1   0    0    -1  
 $EndComp
@@ -763,6 +767,8 @@ U 1 1 46545507
 P 14150 4650
 F 0 "CT1" H 14550 4700 60  0000 C CNN
 F 1 "JUMPER" H 14150 4570 40  0000 C CNN
+F 2 "" H 14150 4650 60  0001 C CNN
+F 3 "" H 14150 4650 60  0001 C CNN
 	1    14150 4650
 	1    0    0    -1  
 $EndComp
@@ -772,6 +778,8 @@ U 1 1 465451F6
 P 2600 3650
 F 0 "#PWR06" H 2600 3650 30  0001 C CNN
 F 1 "GND" H 2600 3580 30  0001 C CNN
+F 2 "" H 2600 3650 60  0001 C CNN
+F 3 "" H 2600 3650 60  0001 C CNN
 	1    2600 3650
 	1    0    0    -1  
 $EndComp
@@ -781,6 +789,8 @@ U 1 1 465451D4
 P 2600 3350
 F 0 "RST_SW1" H 2750 3460 50  0000 C CNN
 F 1 "SW_PUSH" H 2600 3270 50  0000 C CNN
+F 2 "" H 2600 3350 60  0001 C CNN
+F 3 "" H 2600 3350 60  0001 C CNN
 	1    2600 3350
 	0    1    1    0   
 $EndComp
@@ -810,6 +820,8 @@ U 1 1 4652AF7E
 P 5500 9800
 F 0 "#PWR07" H 5500 9900 30  0001 C CNN
 F 1 "VCC" H 5500 9900 30  0000 C CNN
+F 2 "" H 5500 9800 60  0001 C CNN
+F 3 "" H 5500 9800 60  0001 C CNN
 	1    5500 9800
 	1    0    0    -1  
 $EndComp
@@ -819,6 +831,8 @@ U 1 1 4652AF2F
 P 6700 9000
 F 0 "#FLG08" H 6700 9270 30  0001 C CNN
 F 1 "PWR_FLAG" H 6700 9230 30  0000 C CNN
+F 2 "" H 6700 9000 60  0001 C CNN
+F 3 "" H 6700 9000 60  0001 C CNN
 	1    6700 9000
 	-1   0    0    1   
 $EndComp
@@ -832,6 +846,8 @@ U 1 1 4652AE72
 P 9250 10350
 F 0 "#FLG09" H 9250 10620 30  0001 C CNN
 F 1 "PWR_FLAG" H 9250 10580 30  0000 C CNN
+F 2 "" H 9250 10350 60  0001 C CNN
+F 3 "" H 9250 10350 60  0001 C CNN
 	1    9250 10350
 	-1   0    0    1   
 $EndComp
@@ -958,6 +974,8 @@ U 1 1 46238A4E
 P 1700 9450
 F 0 "#PWR010" H 1700 9450 30  0001 C CNN
 F 1 "GND" H 1700 9380 30  0001 C CNN
+F 2 "" H 1700 9450 60  0001 C CNN
+F 3 "" H 1700 9450 60  0001 C CNN
 	1    1700 9450
 	1    0    0    -1  
 $EndComp
@@ -967,6 +985,8 @@ U 1 1 46238A48
 P 2500 9400
 F 0 "#PWR011" H 2500 9400 30  0001 C CNN
 F 1 "GND" H 2500 9330 30  0001 C CNN
+F 2 "" H 2500 9400 60  0001 C CNN
+F 3 "" H 2500 9400 60  0001 C CNN
 	1    2500 9400
 	1    0    0    -1  
 $EndComp
@@ -976,6 +996,8 @@ U 1 1 462389C7
 P 2100 8850
 F 0 "Y1" H 2100 9000 60  0000 C CNN
 F 1 "8MHz" H 2100 8700 60  0000 C CNN
+F 2 "" H 2100 8850 60  0001 C CNN
+F 3 "" H 2100 8850 60  0001 C CNN
 	1    2100 8850
 	1    0    0    -1  
 $EndComp
@@ -985,6 +1007,8 @@ U 1 1 462389C0
 P 2500 9200
 F 0 "C2" H 2550 9300 50  0000 L CNN
 F 1 "10pF" H 2550 9100 50  0000 L CNN
+F 2 "" H 2500 9200 60  0001 C CNN
+F 3 "" H 2500 9200 60  0001 C CNN
 	1    2500 9200
 	1    0    0    -1  
 $EndComp
@@ -994,6 +1018,8 @@ U 1 1 462389BC
 P 1700 9250
 F 0 "C1" H 1750 9350 50  0000 L CNN
 F 1 "10pF" H 1750 9150 50  0000 L CNN
+F 2 "" H 1700 9250 60  0001 C CNN
+F 3 "" H 1700 9250 60  0001 C CNN
 	1    1700 9250
 	1    0    0    -1  
 $EndComp
@@ -1003,6 +1029,8 @@ U 1 1 462389B6
 P 2150 8450
 F 0 "R1" V 2230 8450 50  0000 C CNN
 F 1 "1M" V 2150 8450 50  0000 C CNN
+F 2 "" H 2150 8450 60  0001 C CNN
+F 3 "" H 2150 8450 60  0001 C CNN
 	1    2150 8450
 	0    1    1    0   
 $EndComp
@@ -1012,6 +1040,8 @@ U 1 1 46238965
 P 14450 5600
 F 0 "ALLPST1" H 14450 5700 40  0000 C CNN
 F 1 "CONN_1" H 14400 5640 30  0001 C CNN
+F 2 "" H 14450 5600 60  0001 C CNN
+F 3 "" H 14450 5600 60  0001 C CNN
 	1    14450 5600
 	-1   0    0    1   
 $EndComp
@@ -1065,6 +1095,8 @@ U 1 1 462385BA
 P 1900 4650
 F 0 "#PWR012" H 1900 4650 30  0001 C CNN
 F 1 "GND" H 1900 4580 30  0001 C CNN
+F 2 "" H 1900 4650 60  0001 C CNN
+F 3 "" H 1900 4650 60  0001 C CNN
 	1    1900 4650
 	1    0    0    -1  
 $EndComp
@@ -1074,6 +1106,8 @@ U 1 1 46238597
 P 2150 4600
 F 0 "RED1" H 2150 4700 50  0000 C CNN
 F 1 "LED_RESET1" H 2150 4500 50  0000 C CNN
+F 2 "" H 2150 4600 60  0001 C CNN
+F 3 "" H 2150 4600 60  0001 C CNN
 	1    2150 4600
 	-1   0    0    1   
 $EndComp
@@ -1083,6 +1117,8 @@ U 1 1 4623857F
 P 2650 4600
 F 0 "R22" V 2750 4600 50  0000 C CNN
 F 1 "270" V 2650 4600 50  0000 C CNN
+F 2 "" H 2650 4600 60  0001 C CNN
+F 3 "" H 2650 4600 60  0001 C CNN
 	1    2650 4600
 	0    1    1    0   
 $EndComp
@@ -1094,6 +1130,8 @@ U 1 1 46238545
 P 3500 4300
 F 0 "R21" V 3600 4300 50  0000 C CNN
 F 1 "4,7K" V 3500 4300 50  0000 C CNN
+F 2 "" H 3500 4300 60  0001 C CNN
+F 3 "" H 3500 4300 60  0001 C CNN
 	1    3500 4300
 	0    1    1    0   
 $EndComp
@@ -1103,6 +1141,8 @@ U 1 1 46238539
 P 2900 4100
 F 0 "#PWR013" H 2900 4200 30  0001 C CNN
 F 1 "VDD" H 2900 4210 30  0000 C CNN
+F 2 "" H 2900 4100 60  0001 C CNN
+F 3 "" H 2900 4100 60  0001 C CNN
 	1    2900 4100
 	1    0    0    -1  
 $EndComp
@@ -1112,6 +1152,8 @@ U 1 1 46238531
 P 8400 7550
 F 0 "#PWR014" H 8400 7550 30  0001 C CNN
 F 1 "GND" H 8400 7480 30  0001 C CNN
+F 2 "" H 8400 7550 60  0001 C CNN
+F 3 "" H 8400 7550 60  0001 C CNN
 	1    8400 7550
 	1    0    0    -1  
 $EndComp
@@ -1121,6 +1163,8 @@ U 1 1 46238519
 P 3000 4300
 F 0 "Q1" H 3150 4300 60  0000 C CNN
 F 1 "3906" H 2904 4450 60  0000 C CNN
+F 2 "" H 3000 4300 60  0001 C CNN
+F 3 "" H 3000 4300 60  0001 C CNN
 	1    3000 4300
 	-1   0    0    1   
 $EndComp
@@ -1132,6 +1176,8 @@ U 1 1 462384A7
 P 3250 2400
 F 0 "#PWR015" H 3250 2360 30  0001 C CNN
 F 1 "+3.3V" H 3250 2510 30  0000 C CNN
+F 2 "" H 3250 2400 60  0001 C CNN
+F 3 "" H 3250 2400 60  0001 C CNN
 	1    3250 2400
 	1    0    0    -1  
 $EndComp
@@ -1141,6 +1187,8 @@ U 1 1 4623848E
 P 2200 3500
 F 0 "#PWR016" H 2200 3500 30  0001 C CNN
 F 1 "GND" H 2200 3430 30  0001 C CNN
+F 2 "" H 2200 3500 60  0001 C CNN
+F 3 "" H 2200 3500 60  0001 C CNN
 	1    2200 3500
 	1    0    0    -1  
 $EndComp
@@ -1150,6 +1198,8 @@ U 1 1 4623847B
 P 3250 2650
 F 0 "R15" V 3330 2650 50  0000 C CNN
 F 1 "4,7K" V 3250 2650 50  0000 C CNN
+F 2 "" H 3250 2650 60  0001 C CNN
+F 3 "" H 3250 2650 60  0001 C CNN
 	1    3250 2650
 	1    0    0    -1  
 $EndComp
@@ -1159,6 +1209,8 @@ U 1 1 4623846D
 P 2850 3000
 F 0 "D3" H 2850 3100 40  0000 C CNN
 F 1 "BAT54" H 2850 2900 40  0000 C CNN
+F 2 "" H 2850 3000 60  0001 C CNN
+F 3 "" H 2850 3000 60  0001 C CNN
 	1    2850 3000
 	-1   0    0    1   
 $EndComp
@@ -1168,6 +1220,8 @@ U 1 1 46238468
 P 2200 3300
 F 0 "C3" H 2250 3400 50  0000 L CNN
 F 1 "1nF" H 2250 3200 50  0000 L CNN
+F 2 "" H 2200 3300 60  0001 C CNN
+F 3 "" H 2200 3300 60  0001 C CNN
 	1    2200 3300
 	1    0    0    -1  
 $EndComp
@@ -1177,6 +1231,8 @@ U 1 1 4623840E
 P 1150 2950
 F 0 "#PWR017" H 1150 2910 30  0001 C CNN
 F 1 "+3.3V" H 1150 3060 30  0000 C CNN
+F 2 "" H 1150 2950 60  0001 C CNN
+F 3 "" H 1150 2950 60  0001 C CNN
 	1    1150 2950
 	1    0    0    -1  
 $EndComp
@@ -1186,6 +1242,8 @@ U 1 1 46238409
 P 1550 3350
 F 0 "#PWR018" H 1550 3350 30  0001 C CNN
 F 1 "GND" H 1550 3280 30  0001 C CNN
+F 2 "" H 1550 3350 60  0001 C CNN
+F 3 "" H 1550 3350 60  0001 C CNN
 	1    1550 3350
 	1    0    0    -1  
 $EndComp
@@ -1195,6 +1253,8 @@ U 1 1 462383E5
 P 1550 3050
 F 0 "LV1" H 1600 3250 60  0000 C CNN
 F 1 "DS1818" H 1850 2860 60  0000 C CNN
+F 2 "" H 1550 3050 60  0001 C CNN
+F 3 "" H 1550 3050 60  0001 C CNN
 	1    1550 3050
 	1    0    0    -1  
 $EndComp
@@ -1218,6 +1278,8 @@ U 1 1 462382CE
 P 6150 8750
 F 0 "C16" H 6200 8850 50  0000 L CNN
 F 1 "10uF" H 6200 8650 50  0000 L CNN
+F 2 "" H 6150 8750 60  0001 C CNN
+F 3 "" H 6150 8750 60  0001 C CNN
 	1    6150 8750
 	1    0    0    -1  
 $EndComp
@@ -1227,6 +1289,8 @@ U 1 1 462380EB
 P 6150 9000
 F 0 "#PWR019" H 6150 9000 40  0001 C CNN
 F 1 "GNDA" H 6150 8930 40  0000 C CNN
+F 2 "" H 6150 9000 60  0001 C CNN
+F 3 "" H 6150 9000 60  0001 C CNN
 	1    6150 9000
 	1    0    0    -1  
 $EndComp
@@ -1236,6 +1300,8 @@ U 1 1 462380D3
 P 5350 9000
 F 0 "#PWR020" H 5350 9000 30  0001 C CNN
 F 1 "GND" H 5350 8930 30  0001 C CNN
+F 2 "" H 5350 9000 60  0001 C CNN
+F 3 "" H 5350 9000 60  0001 C CNN
 	1    5350 9000
 	1    0    0    -1  
 $EndComp
@@ -1245,6 +1311,8 @@ U 1 1 462380B8
 P 5700 8950
 F 0 "FB1" V 5650 8950 40  0000 C CNN
 F 1 "BEAD" V 5800 8950 40  0000 C CNN
+F 2 "" H 5700 8950 60  0001 C CNN
+F 3 "" H 5700 8950 60  0001 C CNN
 	1    5700 8950
 	0    -1   -1   0   
 $EndComp
@@ -1254,6 +1322,8 @@ U 1 1 46238092
 P 5700 8500
 F 0 "L1" V 5650 8500 40  0000 C CNN
 F 1 "10uH" V 5800 8500 40  0000 C CNN
+F 2 "" H 5700 8500 60  0001 C CNN
+F 3 "" H 5700 8500 60  0001 C CNN
 	1    5700 8500
 	0    -1   -1   0   
 $EndComp
@@ -1263,6 +1333,8 @@ U 1 1 46238079
 P 4950 8500
 F 0 "VDDA1" H 4950 8650 60  0000 C CNN
 F 1 "JUMPER" H 4950 8420 40  0000 C CNN
+F 2 "" H 4950 8500 60  0001 C CNN
+F 3 "" H 4950 8500 60  0001 C CNN
 	1    4950 8500
 	1    0    0    -1  
 $EndComp
@@ -1272,6 +1344,8 @@ U 1 1 46238078
 P 4600 8450
 F 0 "#PWR021" H 4600 8410 30  0001 C CNN
 F 1 "+3.3V" H 4600 8560 30  0000 C CNN
+F 2 "" H 4600 8450 60  0001 C CNN
+F 3 "" H 4600 8450 60  0001 C CNN
 	1    4600 8450
 	1    0    0    -1  
 $EndComp
@@ -1293,6 +1367,8 @@ U 1 1 46237F86
 P 12500 1900
 F 0 "D1" H 12500 2000 40  0000 C CNN
 F 1 "BAT54" H 12500 1800 40  0000 C CNN
+F 2 "" H 12500 1900 60  0001 C CNN
+F 3 "" H 12500 1900 60  0001 C CNN
 	1    12500 1900
 	1    0    0    -1  
 $EndComp
@@ -1302,6 +1378,8 @@ U 1 1 46237F59
 P 15450 1900
 F 0 "#PWR022" H 15450 1860 30  0001 C CNN
 F 1 "+3.3V" H 15450 2010 30  0000 C CNN
+F 2 "" H 15450 1900 60  0001 C CNN
+F 3 "" H 15450 1900 60  0001 C CNN
 	1    15450 1900
 	1    0    0    -1  
 $EndComp
@@ -1311,6 +1389,8 @@ U 1 1 46237F50
 P 15050 1900
 F 0 "ABRT_SW1" H 15050 2050 50  0000 C CNN
 F 1 "SW_PUSH" H 15050 1820 50  0000 C CNN
+F 2 "" H 15050 1900 60  0001 C CNN
+F 3 "" H 15050 1900 60  0001 C CNN
 	1    15050 1900
 	1    0    0    -1  
 $EndComp
@@ -1320,6 +1400,8 @@ U 1 1 46237F11
 P 14200 2500
 F 0 "#PWR023" H 14200 2500 30  0001 C CNN
 F 1 "GND" H 14200 2430 30  0001 C CNN
+F 2 "" H 14200 2500 60  0001 C CNN
+F 3 "" H 14200 2500 60  0001 C CNN
 	1    14200 2500
 	1    0    0    -1  
 $EndComp
@@ -1329,6 +1411,8 @@ U 1 1 46237F0E
 P 13950 2450
 F 0 "#PWR024" H 13950 2450 30  0001 C CNN
 F 1 "GND" H 13950 2380 30  0001 C CNN
+F 2 "" H 13950 2450 60  0001 C CNN
+F 3 "" H 13950 2450 60  0001 C CNN
 	1    13950 2450
 	1    0    0    -1  
 $EndComp
@@ -1338,6 +1422,8 @@ U 1 1 46237E86
 P 12800 900
 F 0 "#PWR025" H 12800 860 30  0001 C CNN
 F 1 "+3.3V" H 12800 1010 30  0000 C CNN
+F 2 "" H 12800 900 60  0001 C CNN
+F 3 "" H 12800 900 60  0001 C CNN
 	1    12800 900 
 	1    0    0    -1  
 $EndComp
@@ -1347,6 +1433,8 @@ U 1 1 46237E52
 P 12800 1100
 F 0 "LEDABRT1" H 12800 1200 50  0000 C CNN
 F 1 "RED" H 12800 1000 50  0000 C CNN
+F 2 "" H 12800 1100 60  0001 C CNN
+F 3 "" H 12800 1100 60  0001 C CNN
 	1    12800 1100
 	0    1    1    0   
 $EndComp
@@ -1356,6 +1444,8 @@ U 1 1 46237E3D
 P 12800 1600
 F 0 "R14" V 12880 1600 50  0000 C CNN
 F 1 "270" V 12800 1600 50  0000 C CNN
+F 2 "" H 12800 1600 60  0001 C CNN
+F 3 "" H 12800 1600 60  0001 C CNN
 	1    12800 1600
 	1    0    0    -1  
 $EndComp
@@ -1365,6 +1455,8 @@ U 1 1 46237E36
 P 13950 2250
 F 0 "C15" H 13700 2350 50  0000 L CNN
 F 1 "100nF" H 13650 2150 50  0000 L CNN
+F 2 "" H 13950 2250 60  0001 C CNN
+F 3 "" H 13950 2250 60  0001 C CNN
 	1    13950 2250
 	1    0    0    -1  
 $EndComp
@@ -1374,6 +1466,8 @@ U 1 1 46237E2F
 P 14200 2250
 F 0 "R12" V 14280 2250 50  0000 C CNN
 F 1 "20K" V 14200 2250 50  0000 C CNN
+F 2 "" H 14200 2250 60  0001 C CNN
+F 3 "" H 14200 2250 60  0001 C CNN
 	1    14200 2250
 	1    0    0    -1  
 $EndComp
@@ -1383,6 +1477,8 @@ U 1 1 46237E28
 P 14450 1900
 F 0 "R7" V 14530 1900 50  0000 C CNN
 F 1 "1K" V 14450 1900 50  0000 C CNN
+F 2 "" H 14450 1900 60  0001 C CNN
+F 3 "" H 14450 1900 60  0001 C CNN
 	1    14450 1900
 	0    1    1    0   
 $EndComp
@@ -1392,6 +1488,8 @@ U 1 1 46237E18
 P 13350 1450
 F 0 "#PWR026" H 13350 1410 30  0001 C CNN
 F 1 "+3.3V" H 13350 1560 30  0000 C CNN
+F 2 "" H 13350 1450 60  0001 C CNN
+F 3 "" H 13350 1450 60  0001 C CNN
 	1    13350 1450
 	1    0    0    -1  
 $EndComp
@@ -1401,6 +1499,8 @@ U 1 1 46237E07
 P 13750 1450
 F 0 "#PWR027" H 13750 1450 30  0001 C CNN
 F 1 "GND" H 13750 1380 30  0001 C CNN
+F 2 "" H 13750 1450 60  0001 C CNN
+F 3 "" H 13750 1450 60  0001 C CNN
 	1    13750 1450
 	0    -1   -1   0   
 $EndComp
@@ -1410,6 +1510,8 @@ U 1 1 46237DF9
 P 13550 1450
 F 0 "C14" H 13600 1550 50  0000 L CNN
 F 1 "100nF" V 13350 1450 50  0000 L CNN
+F 2 "" H 13550 1450 60  0001 C CNN
+F 3 "" H 13550 1450 60  0001 C CNN
 	1    13550 1450
 	0    1    1    0   
 $EndComp
@@ -1421,6 +1523,8 @@ U 1 1 461BE524
 P 5250 3000
 F 0 "#PWR028" H 5250 3100 30  0001 C CNN
 F 1 "VDD" H 5250 3110 30  0000 C CNN
+F 2 "" H 5250 3000 60  0001 C CNN
+F 3 "" H 5250 3000 60  0001 C CNN
 	1    5250 3000
 	1    0    0    -1  
 $EndComp
@@ -1430,6 +1534,8 @@ U 1 1 461BE50C
 P 5500 3050
 F 0 "R45" V 5600 2950 50  0000 C CNN
 F 1 "4,7K" V 5500 3050 50  0000 C CNN
+F 2 "" H 5500 3050 60  0001 C CNN
+F 3 "" H 5500 3050 60  0001 C CNN
 	1    5500 3050
 	0    1    1    0   
 $EndComp
@@ -1475,6 +1581,8 @@ U 1 1 461BE37E
 P 7100 1850
 F 0 "#PWR029" H 7100 1850 30  0001 C CNN
 F 1 "GND" H 7100 1780 30  0001 C CNN
+F 2 "" H 7100 1850 60  0001 C CNN
+F 3 "" H 7100 1850 60  0001 C CNN
 	1    7100 1850
 	1    0    0    -1  
 $EndComp
@@ -1484,6 +1592,8 @@ U 1 1 461BE36C
 P 6750 1850
 F 0 "#PWR030" H 6750 1850 30  0001 C CNN
 F 1 "GND" H 6750 1780 30  0001 C CNN
+F 2 "" H 6750 1850 60  0001 C CNN
+F 3 "" H 6750 1850 60  0001 C CNN
 	1    6750 1850
 	1    0    0    -1  
 $EndComp
@@ -1493,6 +1603,8 @@ U 1 1 461BE364
 P 6750 1650
 F 0 "C20" H 6800 1750 50  0000 L CNN
 F 1 "1nF" H 6800 1550 50  0000 L CNN
+F 2 "" H 6750 1650 60  0001 C CNN
+F 3 "" H 6750 1650 60  0001 C CNN
 	1    6750 1650
 	1    0    0    -1  
 $EndComp
@@ -1502,6 +1614,8 @@ U 1 1 461BE35C
 P 7100 1650
 F 0 "C21" H 7150 1750 50  0000 L CNN
 F 1 "100nF" H 7150 1550 50  0000 L CNN
+F 2 "" H 7100 1650 60  0001 C CNN
+F 3 "" H 7100 1650 60  0001 C CNN
 	1    7100 1650
 	1    0    0    -1  
 $EndComp
@@ -1511,6 +1625,8 @@ U 1 1 461BE327
 P 6600 1200
 F 0 "L2" V 6550 1200 40  0000 C CNN
 F 1 "10uH" V 6700 1200 40  0000 C CNN
+F 2 "" H 6600 1200 60  0001 C CNN
+F 3 "" H 6600 1200 60  0001 C CNN
 	1    6600 1200
 	0    -1   -1   0   
 $EndComp
@@ -1520,6 +1636,8 @@ U 1 1 461BE318
 P 6250 1150
 F 0 "#PWR031" H 6250 1110 30  0001 C CNN
 F 1 "+3.3V" H 6250 1260 30  0000 C CNN
+F 2 "" H 6250 1150 60  0001 C CNN
+F 3 "" H 6250 1150 60  0001 C CNN
 	1    6250 1150
 	1    0    0    -1  
 $EndComp
@@ -1529,6 +1647,8 @@ U 1 1 461BE2B7
 P 4400 3350
 F 0 "#PWR032" H 4400 3350 30  0001 C CNN
 F 1 "GND" H 4400 3280 30  0001 C CNN
+F 2 "" H 4400 3350 60  0001 C CNN
+F 3 "" H 4400 3350 60  0001 C CNN
 	1    4400 3350
 	0    1    1    0   
 $EndComp
@@ -1542,6 +1662,8 @@ U 1 1 461BE230
 P 5850 3150
 F 0 "R9" V 5930 3150 50  0000 C CNN
 F 1 "0" V 5850 3150 50  0000 C CNN
+F 2 "" H 5850 3150 60  0001 C CNN
+F 3 "" H 5850 3150 60  0001 C CNN
 	1    5850 3150
 	0    1    1    0   
 $EndComp
@@ -1551,6 +1673,8 @@ U 1 1 461BE20A
 P 6150 2200
 F 0 "#PWR033" H 6150 2200 30  0001 C CNN
 F 1 "GND" H 6150 2130 30  0001 C CNN
+F 2 "" H 6150 2200 60  0001 C CNN
+F 3 "" H 6150 2200 60  0001 C CNN
 	1    6150 2200
 	0    1    1    0   
 $EndComp
@@ -1592,6 +1716,8 @@ U 1 1 461BE128
 P 4750 5000
 F 0 "#PWR034" H 4750 5100 30  0001 C CNN
 F 1 "VDD" H 4750 5110 30  0000 C CNN
+F 2 "" H 4750 5000 60  0001 C CNN
+F 3 "" H 4750 5000 60  0001 C CNN
 	1    4750 5000
 	1    0    0    -1  
 $EndComp
@@ -1601,6 +1727,8 @@ U 1 1 461BE125
 P 4150 5000
 F 0 "#PWR035" H 4150 5100 30  0001 C CNN
 F 1 "VDD" H 4150 5110 30  0000 C CNN
+F 2 "" H 4150 5000 60  0001 C CNN
+F 3 "" H 4150 5000 60  0001 C CNN
 	1    4150 5000
 	1    0    0    -1  
 $EndComp
@@ -1610,6 +1738,8 @@ U 1 1 461BE054
 P 5050 5650
 F 0 "R13" V 5130 5650 50  0000 C CNN
 F 1 "10K" V 5050 5650 50  0000 C CNN
+F 2 "" H 5050 5650 60  0001 C CNN
+F 3 "" H 5050 5650 60  0001 C CNN
 	1    5050 5650
 	0    1    1    0   
 $EndComp
@@ -1619,6 +1749,8 @@ U 1 1 461BE051
 P 4450 5550
 F 0 "R11" V 4530 5550 50  0000 C CNN
 F 1 "10K" V 4450 5550 50  0000 C CNN
+F 2 "" H 4450 5550 60  0001 C CNN
+F 3 "" H 4450 5550 60  0001 C CNN
 	1    4450 5550
 	0    1    1    0   
 $EndComp
@@ -1628,6 +1760,8 @@ U 1 1 461BE04B
 P 5050 5450
 F 0 "R10" V 5130 5450 50  0000 C CNN
 F 1 "10K" V 5050 5450 50  0000 C CNN
+F 2 "" H 5050 5450 60  0001 C CNN
+F 3 "" H 5050 5450 60  0001 C CNN
 	1    5050 5450
 	0    1    1    0   
 $EndComp
@@ -1637,6 +1771,8 @@ U 1 1 461BE047
 P 4450 5350
 F 0 "R8" V 4530 5350 50  0000 C CNN
 F 1 "10K" V 4450 5350 50  0000 C CNN
+F 2 "" H 4450 5350 60  0001 C CNN
+F 3 "" H 4450 5350 60  0001 C CNN
 	1    4450 5350
 	0    1    1    0   
 $EndComp
@@ -1646,6 +1782,8 @@ U 1 1 461BE046
 P 5050 5250
 F 0 "R6" V 5130 5250 50  0000 C CNN
 F 1 "10K" V 5050 5250 50  0000 C CNN
+F 2 "" H 5050 5250 60  0001 C CNN
+F 3 "" H 5050 5250 60  0001 C CNN
 	1    5050 5250
 	0    1    1    0   
 $EndComp
@@ -1655,6 +1793,8 @@ U 1 1 461BE041
 P 4450 5150
 F 0 "R5" V 4530 5150 50  0000 C CNN
 F 1 "10K" V 4450 5150 50  0000 C CNN
+F 2 "" H 4450 5150 60  0001 C CNN
+F 3 "" H 4450 5150 60  0001 C CNN
 	1    4450 5150
 	0    1    1    0   
 $EndComp
@@ -1664,6 +1804,8 @@ U 1 1 461BE039
 P 5050 5050
 F 0 "R4" V 5130 5050 50  0000 C CNN
 F 1 "10K" V 5050 5050 50  0000 C CNN
+F 2 "" H 5050 5050 60  0001 C CNN
+F 3 "" H 5050 5050 60  0001 C CNN
 	1    5050 5050
 	0    1    1    0   
 $EndComp
@@ -1687,6 +1829,8 @@ U 1 1 461BBA34
 P 13700 5000
 F 0 "TA-1" H 13750 4900 40  0000 C CNN
 F 1 "CONN_1" H 13650 5040 30  0001 C CNN
+F 2 "" H 13700 5000 60  0001 C CNN
+F 3 "" H 13700 5000 60  0001 C CNN
 	1    13700 5000
 	1    0    0    -1  
 $EndComp
@@ -1699,6 +1843,8 @@ U 1 1 461BB93F
 P 12500 4900
 F 0 "#PWR036" H 12500 4860 30  0001 C CNN
 F 1 "+3.3V" H 12500 5010 30  0000 C CNN
+F 2 "" H 12500 4900 60  0001 C CNN
+F 3 "" H 12500 4900 60  0001 C CNN
 	1    12500 4900
 	0    -1   -1   0   
 $EndComp
@@ -1742,6 +1888,8 @@ U 1 1 461BB8C6
 P 14050 5400
 F 0 "#PWR037" H 14050 5400 30  0001 C CNN
 F 1 "GND" H 14050 5330 30  0001 C CNN
+F 2 "" H 14050 5400 60  0001 C CNN
+F 3 "" H 14050 5400 60  0001 C CNN
 	1    14050 5400
 	1    0    0    -1  
 $EndComp
@@ -1751,6 +1899,8 @@ U 1 1 461BB8C0
 P 14050 5150
 F 0 "R26" V 14130 5150 50  0000 C CNN
 F 1 "10K" V 14050 5150 50  0000 C CNN
+F 2 "" H 14050 5150 60  0001 C CNN
+F 3 "" H 14050 5150 60  0001 C CNN
 	1    14050 5150
 	1    0    0    -1  
 $EndComp
@@ -1760,6 +1910,8 @@ U 1 1 461BB894
 P 14650 4950
 F 0 "CLKOUT1" H 14700 4850 40  0000 C CNN
 F 1 "CONN_1" H 14600 4990 30  0001 C CNN
+F 2 "" H 14650 4950 60  0001 C CNN
+F 3 "" H 14650 4950 60  0001 C CNN
 	1    14650 4950
 	1    0    0    -1  
 $EndComp
@@ -1773,6 +1925,8 @@ U 1 1 461BB7AD
 P 13800 2850
 F 0 "#PWR038" H 13800 2950 30  0001 C CNN
 F 1 "VDD" H 13800 2960 30  0000 C CNN
+F 2 "" H 13800 2850 60  0001 C CNN
+F 3 "" H 13800 2850 60  0001 C CNN
 	1    13800 2850
 	1    0    0    -1  
 $EndComp
@@ -1782,6 +1936,8 @@ U 1 1 461BB799
 P 14550 3200
 F 0 "R20" V 14630 3200 50  0000 C CNN
 F 1 "4,7K" V 14550 3200 50  0000 C CNN
+F 2 "" H 14550 3200 60  0001 C CNN
+F 3 "" H 14550 3200 60  0001 C CNN
 	1    14550 3200
 	1    0    0    -1  
 $EndComp
@@ -1791,6 +1947,8 @@ U 1 1 461BB798
 P 14300 3200
 F 0 "R19" V 14380 3200 50  0000 C CNN
 F 1 "4,7K" V 14300 3200 50  0000 C CNN
+F 2 "" H 14300 3200 60  0001 C CNN
+F 3 "" H 14300 3200 60  0001 C CNN
 	1    14300 3200
 	1    0    0    -1  
 $EndComp
@@ -1800,6 +1958,8 @@ U 1 1 461BB795
 P 14050 3200
 F 0 "R18" V 14130 3200 50  0000 C CNN
 F 1 "4,7K" V 14050 3200 50  0000 C CNN
+F 2 "" H 14050 3200 60  0001 C CNN
+F 3 "" H 14050 3200 60  0001 C CNN
 	1    14050 3200
 	1    0    0    -1  
 $EndComp
@@ -1809,6 +1969,8 @@ U 1 1 461BB790
 P 13800 3200
 F 0 "R17" V 13880 3200 50  0000 C CNN
 F 1 "4,7K" V 13800 3200 50  0000 C CNN
+F 2 "" H 13800 3200 60  0001 C CNN
+F 3 "" H 13800 3200 60  0001 C CNN
 	1    13800 3200
 	1    0    0    -1  
 $EndComp
@@ -1828,6 +1990,8 @@ U 1 1 461BB742
 P 5400 3750
 F 0 "R46" V 5480 3750 50  0000 C CNN
 F 1 "22" V 5400 3750 50  0000 C CNN
+F 2 "" H 5400 3750 60  0001 C CNN
+F 3 "" H 5400 3750 60  0001 C CNN
 	1    5400 3750
 	0    1    1    0   
 $EndComp
@@ -1853,6 +2017,8 @@ U 1 1 461BB690
 P 5600 3150
 F 0 "#PWR039" H 5600 3150 30  0001 C CNN
 F 1 "GND" H 5600 3080 30  0001 C CNN
+F 2 "" H 5600 3150 60  0001 C CNN
+F 3 "" H 5600 3150 60  0001 C CNN
 	1    5600 3150
 	0    1    1    0   
 $EndComp
@@ -1862,6 +2028,8 @@ U 1 1 461BB68E
 P 3750 2000
 F 0 "#PWR040" H 3750 2000 30  0001 C CNN
 F 1 "GND" H 3750 1930 30  0001 C CNN
+F 2 "" H 3750 2000 60  0001 C CNN
+F 3 "" H 3750 2000 60  0001 C CNN
 	1    3750 2000
 	0    1    1    0   
 $EndComp
@@ -1871,6 +2039,8 @@ U 1 1 461BB662
 P 4650 1100
 F 0 "#PWR041" H 4650 1200 30  0001 C CNN
 F 1 "VDD" H 4650 1210 30  0000 C CNN
+F 2 "" H 4650 1100 60  0001 C CNN
+F 3 "" H 4650 1100 60  0001 C CNN
 	1    4650 1100
 	1    0    0    -1  
 $EndComp
@@ -1880,6 +2050,8 @@ U 1 1 461BB661
 P 4650 1350
 F 0 "R2" V 4730 1350 50  0000 C CNN
 F 1 "4,7K" V 4650 1350 50  0000 C CNN
+F 2 "" H 4650 1350 60  0001 C CNN
+F 3 "" H 4650 1350 60  0001 C CNN
 	1    4650 1350
 	1    0    0    -1  
 $EndComp
@@ -1889,6 +2061,8 @@ U 1 1 461BB660
 P 4450 1100
 F 0 "#PWR042" H 4450 1200 30  0001 C CNN
 F 1 "VDD" H 4450 1210 30  0000 C CNN
+F 2 "" H 4450 1100 60  0001 C CNN
+F 3 "" H 4450 1100 60  0001 C CNN
 	1    4450 1100
 	1    0    0    -1  
 $EndComp
@@ -1898,6 +2072,8 @@ U 1 1 461BB65F
 P 4450 1350
 F 0 "R25" V 4530 1350 50  0000 C CNN
 F 1 "4,7K" V 4450 1350 50  0000 C CNN
+F 2 "" H 4450 1350 60  0001 C CNN
+F 3 "" H 4450 1350 60  0001 C CNN
 	1    4450 1350
 	1    0    0    -1  
 $EndComp
@@ -1907,6 +2083,8 @@ U 1 1 461BB648
 P 4050 2000
 F 0 "CLK1" H 4050 2150 60  0000 C CNN
 F 1 "JUMPER" H 4050 1920 40  0000 C CNN
+F 2 "" H 4050 2000 60  0001 C CNN
+F 3 "" H 4050 2000 60  0001 C CNN
 	1    4050 2000
 	1    0    0    -1  
 $EndComp
@@ -1916,6 +2094,8 @@ U 1 1 461BB62E
 P 4050 1650
 F 0 "CLK0" H 4050 1800 60  0000 C CNN
 F 1 "JUMPER" H 4050 1570 40  0000 C CNN
+F 2 "" H 4050 1650 60  0001 C CNN
+F 3 "" H 4050 1650 60  0001 C CNN
 	1    4050 1650
 	1    0    0    -1  
 $EndComp
@@ -1925,6 +2105,8 @@ U 1 1 461BB60D
 P 8400 1650
 F 0 "#PWR043" H 8400 1750 30  0001 C CNN
 F 1 "VDD" H 8400 1760 30  0000 C CNN
+F 2 "" H 8400 1650 60  0001 C CNN
+F 3 "" H 8400 1650 60  0001 C CNN
 	1    8400 1650
 	1    0    0    -1  
 $EndComp
@@ -1934,6 +2116,8 @@ U 1 1 461BB5E5
 P 7050 10100
 F 0 "C6" H 7100 10200 50  0000 L CNN
 F 1 "100nF" H 7100 10000 50  0000 L CNN
+F 2 "" H 7050 10100 60  0001 C CNN
+F 3 "" H 7050 10100 60  0001 C CNN
 	1    7050 10100
 	1    0    0    -1  
 $EndComp
@@ -1943,6 +2127,8 @@ U 1 1 461BB525
 P 5050 2800
 F 0 "#PWR044" H 5050 2900 30  0001 C CNN
 F 1 "VDD" H 5050 2910 30  0000 C CNN
+F 2 "" H 5050 2800 60  0001 C CNN
+F 3 "" H 5050 2800 60  0001 C CNN
 	1    5050 2800
 	1    0    0    -1  
 $EndComp
@@ -1952,6 +2138,8 @@ U 1 1 461BAF82
 P 3750 1650
 F 0 "#PWR045" H 3750 1650 30  0001 C CNN
 F 1 "GND" H 3750 1580 30  0001 C CNN
+F 2 "" H 3750 1650 60  0001 C CNN
+F 3 "" H 3750 1650 60  0001 C CNN
 	1    3750 1650
 	0    1    1    0   
 $EndComp
@@ -1961,6 +2149,8 @@ U 1 1 461BAF5C
 P 5050 3050
 F 0 "R16" V 5130 3050 50  0000 C CNN
 F 1 "4,7K" V 5050 3050 50  0000 C CNN
+F 2 "" H 5050 3050 60  0001 C CNN
+F 3 "" H 5050 3050 60  0001 C CNN
 	1    5050 3050
 	1    0    0    -1  
 $EndComp
@@ -1970,6 +2160,8 @@ U 1 1 461BAF4F
 P 4700 3350
 F 0 "BDM_EN1" H 4700 3500 60  0000 C CNN
 F 1 "JUMPER" H 4700 3270 40  0000 C CNN
+F 2 "" H 4700 3350 60  0001 C CNN
+F 3 "" H 4700 3350 60  0001 C CNN
 	1    4700 3350
 	1    0    0    -1  
 $EndComp
@@ -1979,6 +2171,8 @@ U 1 1 461BAF37
 P 13550 4600
 F 0 "#PWR046" H 13550 4600 30  0001 C CNN
 F 1 "GND" H 13550 4530 30  0001 C CNN
+F 2 "" H 13550 4600 60  0001 C CNN
+F 3 "" H 13550 4600 60  0001 C CNN
 	1    13550 4600
 	0    -1   -1   0   
 $EndComp
@@ -1988,6 +2182,8 @@ U 1 1 461BAF13
 P 12650 5000
 F 0 "#PWR047" H 12650 5000 30  0001 C CNN
 F 1 "GND" H 12650 4930 30  0001 C CNN
+F 2 "" H 12650 5000 60  0001 C CNN
+F 3 "" H 12650 5000 60  0001 C CNN
 	1    12650 5000
 	1    0    0    -1  
 $EndComp
@@ -1997,6 +2193,8 @@ U 1 1 461BAEE7
 P 13150 4300
 F 0 "BDM_PORT1" H 13150 5000 60  0000 C CNN
 F 1 "CONN_13X2" V 13150 4300 50  0000 C CNN
+F 2 "" H 13150 4300 60  0001 C CNN
+F 3 "" H 13150 4300 60  0001 C CNN
 	1    13150 4300
 	1    0    0    -1  
 $EndComp
@@ -2006,6 +2204,8 @@ U 1 1 461BAEA3
 P 6300 9800
 F 0 "#PWR048" H 6300 9900 30  0001 C CNN
 F 1 "VDD" H 6300 9910 30  0000 C CNN
+F 2 "" H 6300 9800 60  0001 C CNN
+F 3 "" H 6300 9800 60  0001 C CNN
 	1    6300 9800
 	1    0    0    -1  
 $EndComp
@@ -2015,6 +2215,8 @@ U 1 1 46161D48
 P 9650 10400
 F 0 "#PWR049" H 9650 10400 30  0001 C CNN
 F 1 "GND" H 9650 10330 30  0001 C CNN
+F 2 "" H 9650 10400 60  0001 C CNN
+F 3 "" H 9650 10400 60  0001 C CNN
 	1    9650 10400
 	1    0    0    -1  
 $EndComp
@@ -2024,6 +2226,8 @@ U 1 1 46161D3C
 P 9650 10100
 F 0 "C17" H 9700 10200 50  0000 L CNN
 F 1 "100uF" H 9700 10000 50  0000 L CNN
+F 2 "" H 9650 10100 60  0001 C CNN
+F 3 "" H 9650 10100 60  0001 C CNN
 	1    9650 10100
 	1    0    0    -1  
 $EndComp
@@ -2033,6 +2237,8 @@ U 1 1 46161D18
 P 5650 9800
 F 0 "#PWR050" H 5650 9760 30  0001 C CNN
 F 1 "+3.3V" H 5650 9910 30  0000 C CNN
+F 2 "" H 5650 9800 60  0001 C CNN
+F 3 "" H 5650 9800 60  0001 C CNN
 	1    5650 9800
 	1    0    0    -1  
 $EndComp
@@ -2042,6 +2248,8 @@ U 1 1 46161CDA
 P 9250 10100
 F 0 "C12" H 9300 10200 50  0000 L CNN
 F 1 "100nF" H 9300 10000 50  0000 L CNN
+F 2 "" H 9250 10100 60  0001 C CNN
+F 3 "" H 9250 10100 60  0001 C CNN
 	1    9250 10100
 	1    0    0    -1  
 $EndComp
@@ -2051,6 +2259,8 @@ U 1 1 46161CD9
 P 8900 10100
 F 0 "C11" H 8950 10200 50  0000 L CNN
 F 1 "100nF" H 8950 10000 50  0000 L CNN
+F 2 "" H 8900 10100 60  0001 C CNN
+F 3 "" H 8900 10100 60  0001 C CNN
 	1    8900 10100
 	1    0    0    -1  
 $EndComp
@@ -2060,6 +2270,8 @@ U 1 1 46161CD8
 P 8500 10100
 F 0 "C10" H 8550 10200 50  0000 L CNN
 F 1 "100nF" H 8550 10000 50  0000 L CNN
+F 2 "" H 8500 10100 60  0001 C CNN
+F 3 "" H 8500 10100 60  0001 C CNN
 	1    8500 10100
 	1    0    0    -1  
 $EndComp
@@ -2069,6 +2281,8 @@ U 1 1 46161CD7
 P 8150 10100
 F 0 "C9" H 8200 10200 50  0000 L CNN
 F 1 "100nF" H 8200 10000 50  0000 L CNN
+F 2 "" H 8150 10100 60  0001 C CNN
+F 3 "" H 8150 10100 60  0001 C CNN
 	1    8150 10100
 	1    0    0    -1  
 $EndComp
@@ -2078,6 +2292,8 @@ U 1 1 46161CD4
 P 7800 10100
 F 0 "C8" H 7850 10200 50  0000 L CNN
 F 1 "100nF" H 7850 10000 50  0000 L CNN
+F 2 "" H 7800 10100 60  0001 C CNN
+F 3 "" H 7800 10100 60  0001 C CNN
 	1    7800 10100
 	1    0    0    -1  
 $EndComp
@@ -2087,6 +2303,8 @@ U 1 1 46161CD3
 P 7450 10100
 F 0 "C7" H 7500 10200 50  0000 L CNN
 F 1 "100nF" H 7500 10000 50  0000 L CNN
+F 2 "" H 7450 10100 60  0001 C CNN
+F 3 "" H 7450 10100 60  0001 C CNN
 	1    7450 10100
 	1    0    0    -1  
 $EndComp
@@ -2096,6 +2314,8 @@ U 1 1 46161CB8
 P 6650 10100
 F 0 "C5" H 6700 10200 50  0000 L CNN
 F 1 "100nF" H 6700 10000 50  0000 L CNN
+F 2 "" H 6650 10100 60  0001 C CNN
+F 3 "" H 6650 10100 60  0001 C CNN
 	1    6650 10100
 	1    0    0    -1  
 $EndComp
@@ -2105,6 +2325,8 @@ U 1 1 46161CB5
 P 6300 10100
 F 0 "C4" H 6350 10200 50  0000 L CNN
 F 1 "100nF" H 6350 10000 50  0000 L CNN
+F 2 "" H 6300 10100 60  0001 C CNN
+F 3 "" H 6300 10100 60  0001 C CNN
 	1    6300 10100
 	1    0    0    -1  
 $EndComp

demos/kit-dev-coldfire-xilinx_5213/xilinx.sch

@@ -1,4 +1,4 @@
-EESchema Schematic File Version 2  date 27/11/2009 11:46:34
+EESchema Schematic File Version 2
 LIBS:power
 LIBS:device
 LIBS:transistors
@@ -6,31 +6,17 @@ LIBS:conn
 LIBS:linear
 LIBS:regul
 LIBS:74xx
-LIBS:cmos4000
 LIBS:adc-dac
 LIBS:memory
 LIBS:xilinx
 LIBS:special
 LIBS:microcontrollers
-LIBS:dsp
-LIBS:microchip
-LIBS:analog_switches
 LIBS:motorola
-LIBS:texas
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:contrib
-LIBS:valves
 LIBS:kit-dev-coldfire-xilinx_5213-cache
-EELAYER 23  0
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 3 3
 Title "Dev kit coldfire 5213"
 Date "8 feb 2008"
@@ -377,6 +363,8 @@ U 1 1 480DCF5A
 P 3500 4100
 F 0 "#PWR0105" H 3500 4100 30  0001 C CNN
 F 1 "GND" H 3500 4030 30  0001 C CNN
+F 2 "" H 3500 4100 60  0001 C CNN
+F 3 "" H 3500 4100 60  0001 C CNN
 	1    3500 4100
 	0    1    1    0   
 $EndComp
@@ -386,6 +374,8 @@ U 1 1 4791D619
 P 10850 3900
 F 0 "#PWR0106" H 10850 3860 30  0001 C CNN
 F 1 "+3,3V" H 10850 4010 30  0000 C CNN
+F 2 "" H 10850 3900 60  0001 C CNN
+F 3 "" H 10850 3900 60  0001 C CNN
 	1    10850 3900
 	1    0    0    -1  
 $EndComp
@@ -395,6 +385,8 @@ U 1 1 4791D59D
 P 10450 3900
 F 0 "R64" V 10530 3900 50  0000 C CNN
 F 1 "3,3" V 10450 3900 50  0000 C CNN
+F 2 "" H 10450 3900 60  0001 C CNN
+F 3 "" H 10450 3900 60  0001 C CNN
 	1    10450 3900
 	0    1    1    0   
 $EndComp
@@ -428,6 +420,8 @@ U 1 1 470F3BF2
 P 3450 1250
 F 0 "#PWR0107" H 3450 1250 30  0001 C CNN
 F 1 "GND" H 3450 1180 30  0001 C CNN
+F 2 "" H 3450 1250 60  0001 C CNN
+F 3 "" H 3450 1250 60  0001 C CNN
 	1    3450 1250
 	1    0    0    -1  
 $EndComp
@@ -476,6 +470,8 @@ U 1 1 46A76EB2
 P 6600 1250
 F 0 "P3" H 6600 1400 50  0000 C CNN
 F 1 "CONN_2X2" H 6610 1120 40  0000 C CNN
+F 2 "" H 6600 1250 60  0001 C CNN
+F 3 "" H 6600 1250 60  0001 C CNN
 	1    6600 1250
 	-1   0    0    -1  
 $EndComp
@@ -485,6 +481,8 @@ U 1 1 470F38BE
 P 4550 4100
 F 0 "U9" H 4600 4150 70  0000 C CNN
 F 1 "XCR3256-TQ144" H 4550 500 60  0000 C CNN
+F 2 "" H 4550 4100 60  0001 C CNN
+F 3 "" H 4550 4100 60  0001 C CNN
 	1    4550 4100
 	1    0    0    -1  
 $EndComp
@@ -584,6 +582,8 @@ U 1 1 46ADE620
 P 9600 4000
 F 0 "#PWR0108" H 9600 4000 30  0001 C CNN
 F 1 "GND" H 9600 3930 30  0001 C CNN
+F 2 "" H 9600 4000 60  0001 C CNN
+F 3 "" H 9600 4000 60  0001 C CNN
 	1    9600 4000
 	0    -1   -1   0   
 $EndComp
@@ -593,6 +593,8 @@ U 1 1 46ADE61B
 P 9600 2100
 F 0 "#PWR0109" H 9600 2100 30  0001 C CNN
 F 1 "GND" H 9600 2030 30  0001 C CNN
+F 2 "" H 9600 2100 60  0001 C CNN
+F 3 "" H 9600 2100 60  0001 C CNN
 	1    9600 2100
 	0    -1   -1   0   
 $EndComp
@@ -660,6 +662,8 @@ U 1 1 46ADE55A
 P 9200 3050
 F 0 "P4" H 9250 3100 60  0000 C CNN
 F 1 "CONN_20X2" V 9200 3050 50  0000 C CNN
+F 2 "" H 9200 3050 60  0001 C CNN
+F 3 "" H 9200 3050 60  0001 C CNN
 	1    9200 3050
 	1    0    0    -1  
 $EndComp
@@ -699,6 +703,8 @@ U 1 1 46A76BD3
 P 2750 1300
 F 0 "#PWR0110" H 2750 1260 30  0001 C CNN
 F 1 "+3,3V" V 2750 1500 30  0000 C CNN
+F 2 "" H 2750 1300 60  0001 C CNN
+F 3 "" H 2750 1300 60  0001 C CNN
 	1    2750 1300
 	0    1    1    0   
 $EndComp
@@ -708,6 +714,8 @@ U 1 1 46A76BD2
 P 3550 650
 F 0 "#PWR0111" H 3550 610 30  0001 C CNN
 F 1 "+3,3V" H 3550 760 30  0000 C CNN
+F 2 "" H 3550 650 60  0001 C CNN
+F 3 "" H 3550 650 60  0001 C CNN
 	1    3550 650 
 	1    0    0    -1  
 $EndComp
@@ -717,6 +725,8 @@ U 1 1 46A76BCA
 P 3300 650
 F 0 "R57" V 3380 650 50  0000 C CNN
 F 1 "4K7" V 3300 650 50  0000 C CNN
+F 2 "" H 3300 650 60  0001 C CNN
+F 3 "" H 3300 650 60  0001 C CNN
 	1    3300 650 
 	0    1    1    0   
 $EndComp
@@ -728,6 +738,8 @@ U 1 1 46A76BC5
 P 9500 4950
 F 0 "#PWR0112" H 9500 4950 40  0001 C CNN
 F 1 "GND" H 9500 4880 40  0001 C CNN
+F 2 "" H 9500 4950 60  0001 C CNN
+F 3 "" H 9500 4950 60  0001 C CNN
 	1    9500 4950
 	0    -1   -1   0   
 $EndComp
@@ -737,6 +749,8 @@ U 1 1 46A76BC4
 P 9300 4950
 F 0 "D8" H 9300 5050 50  0000 C CNN
 F 1 "LED" H 9300 4850 50  0000 C CNN
+F 2 "" H 9300 4950 60  0001 C CNN
+F 3 "" H 9300 4950 60  0001 C CNN
 	1    9300 4950
 	1    0    0    -1  
 $EndComp
@@ -746,6 +760,8 @@ U 1 1 46A76BC3
 P 8800 4950
 F 0 "R62" V 8880 4950 50  0000 C CNN
 F 1 "1K" V 8800 4950 50  0000 C CNN
+F 2 "" H 8800 4950 60  0001 C CNN
+F 3 "" H 8800 4950 60  0001 C CNN
 	1    8800 4950
 	0    -1   -1   0   
 $EndComp
@@ -755,6 +771,8 @@ U 1 1 46A76BC1
 P 7650 6650
 F 0 "#PWR0113" H 7650 6650 30  0001 C CNN
 F 1 "GND" H 7650 6580 30  0001 C CNN
+F 2 "" H 7650 6650 60  0001 C CNN
+F 3 "" H 7650 6650 60  0001 C CNN
 	1    7650 6650
 	1    0    0    -1  
 $EndComp
@@ -764,6 +782,8 @@ U 1 1 46A76BBF
 P 7650 6050
 F 0 "#PWR0114" H 7650 6010 30  0001 C CNN
 F 1 "+3,3V" H 7650 6160 30  0000 C CNN
+F 2 "" H 7650 6050 60  0001 C CNN
+F 3 "" H 7650 6050 60  0001 C CNN
 	1    7650 6050
 	1    0    0    -1  
 $EndComp
@@ -773,6 +793,8 @@ U 1 1 46A76BBC
 P 10650 6350
 F 0 "C61" H 10700 6450 50  0000 L CNN
 F 1 "100nF" H 10650 6250 50  0000 L CNN
+F 2 "" H 10650 6350 60  0001 C CNN
+F 3 "" H 10650 6350 60  0001 C CNN
 	1    10650 6350
 	1    0    0    -1  
 $EndComp
@@ -782,6 +804,8 @@ U 1 1 46A76BBB
 P 10350 6350
 F 0 "C60" H 10400 6450 50  0000 L CNN
 F 1 "100nF" H 10350 6250 50  0000 L CNN
+F 2 "" H 10350 6350 60  0001 C CNN
+F 3 "" H 10350 6350 60  0001 C CNN
 	1    10350 6350
 	1    0    0    -1  
 $EndComp
@@ -791,6 +815,8 @@ U 1 1 46A76BBA
 P 10050 6350
 F 0 "C59" H 10100 6450 50  0000 L CNN
 F 1 "100nF" H 10050 6250 50  0000 L CNN
+F 2 "" H 10050 6350 60  0001 C CNN
+F 3 "" H 10050 6350 60  0001 C CNN
 	1    10050 6350
 	1    0    0    -1  
 $EndComp
@@ -800,6 +826,8 @@ U 1 1 46A76BB5
 P 8550 6350
 F 0 "C54" H 8600 6450 50  0000 L CNN
 F 1 "100nF" H 8550 6250 50  0000 L CNN
+F 2 "" H 8550 6350 60  0001 C CNN
+F 3 "" H 8550 6350 60  0001 C CNN
 	1    8550 6350
 	1    0    0    -1  
 $EndComp
@@ -809,6 +837,8 @@ U 1 1 46A76BB4
 P 8250 6350
 F 0 "C53" H 8300 6450 50  0000 L CNN
 F 1 "100nF" H 8250 6250 50  0000 L CNN
+F 2 "" H 8250 6350 60  0001 C CNN
+F 3 "" H 8250 6350 60  0001 C CNN
 	1    8250 6350
 	1    0    0    -1  
 $EndComp
@@ -818,6 +848,8 @@ U 1 1 46A76BB3
 P 7950 6350
 F 0 "C52" H 8000 6450 50  0000 L CNN
 F 1 "100nF" H 7950 6250 50  0000 L CNN
+F 2 "" H 7950 6350 60  0001 C CNN
+F 3 "" H 7950 6350 60  0001 C CNN
 	1    7950 6350
 	1    0    0    -1  
 $EndComp
@@ -827,6 +859,8 @@ U 1 1 46A76BB2
 P 7650 6350
 F 0 "C51" H 7700 6450 50  0000 L CNN
 F 1 "100nF" H 7650 6250 50  0000 L CNN
+F 2 "" H 7650 6350 60  0001 C CNN
+F 3 "" H 7650 6350 60  0001 C CNN
 	1    7650 6350
 	1    0    0    -1  
 $EndComp
@@ -836,6 +870,8 @@ U 1 1 46A76BB1
 P 9750 6350
 F 0 "C58" H 9800 6450 50  0000 L CNN
 F 1 "100nF" H 9750 6250 50  0000 L CNN
+F 2 "" H 9750 6350 60  0001 C CNN
+F 3 "" H 9750 6350 60  0001 C CNN
 	1    9750 6350
 	1    0    0    -1  
 $EndComp
@@ -845,6 +881,8 @@ U 1 1 46A76BB0
 P 9450 6350
 F 0 "C57" H 9500 6450 50  0000 L CNN
 F 1 "100nF" H 9450 6250 50  0000 L CNN
+F 2 "" H 9450 6350 60  0001 C CNN
+F 3 "" H 9450 6350 60  0001 C CNN
 	1    9450 6350
 	1    0    0    -1  
 $EndComp
@@ -854,6 +892,8 @@ U 1 1 46A76BAF
 P 9150 6350
 F 0 "C56" H 9200 6450 50  0000 L CNN
 F 1 "100nF" H 9150 6250 50  0000 L CNN
+F 2 "" H 9150 6350 60  0001 C CNN
+F 3 "" H 9150 6350 60  0001 C CNN
 	1    9150 6350
 	1    0    0    -1  
 $EndComp
@@ -863,6 +903,8 @@ U 1 1 46A76BAE
 P 8850 6350
 F 0 "C55" H 8900 6450 50  0000 L CNN
 F 1 "100nF" H 8850 6250 50  0000 L CNN
+F 2 "" H 8850 6350 60  0001 C CNN
+F 3 "" H 8850 6350 60  0001 C CNN
 	1    8850 6350
 	1    0    0    -1  
 $EndComp
@@ -876,6 +918,8 @@ U 1 1 46A76BA9
 P 9500 5250
 F 0 "#PWR0115" H 9500 5250 40  0001 C CNN
 F 1 "GND" H 9500 5180 40  0001 C CNN
+F 2 "" H 9500 5250 60  0001 C CNN
+F 3 "" H 9500 5250 60  0001 C CNN
 	1    9500 5250
 	0    -1   -1   0   
 $EndComp
@@ -885,6 +929,8 @@ U 1 1 46A76BA8
 P 9300 5250
 F 0 "D9" H 9300 5350 50  0000 C CNN
 F 1 "LED" H 9300 5150 50  0000 C CNN
+F 2 "" H 9300 5250 60  0001 C CNN
+F 3 "" H 9300 5250 60  0001 C CNN
 	1    9300 5250
 	1    0    0    -1  
 $EndComp
@@ -894,6 +940,8 @@ U 1 1 46A76BA7
 P 8800 5250
 F 0 "R63" V 8880 5250 50  0000 C CNN
 F 1 "1K" V 8800 5250 50  0000 C CNN
+F 2 "" H 8800 5250 60  0001 C CNN
+F 3 "" H 8800 5250 60  0001 C CNN
 	1    8800 5250
 	0    -1   -1   0   
 $EndComp
@@ -909,6 +957,8 @@ U 1 1 46A76BA6
 P 2350 1050
 F 0 "P1" V 2300 1050 60  0000 C CNN
 F 1 "CONN_6" V 2400 1050 60  0000 C CNN
+F 2 "" H 2350 1050 60  0001 C CNN
+F 3 "" H 2350 1050 60  0001 C CNN
 	1    2350 1050
 	-1   0    0    1   
 $EndComp
@@ -918,6 +968,8 @@ U 1 1 46A76BA5
 P 2700 1200
 F 0 "#PWR0116" H 2700 1200 40  0001 C CNN
 F 1 "GND" H 2700 1130 40  0001 C CNN
+F 2 "" H 2700 1200 60  0001 C CNN
+F 3 "" H 2700 1200 60  0001 C CNN
 	1    2700 1200
 	0    -1   -1   0   
 $EndComp

demos/pic_programmer/pic_programmer-cache.lib

@@ -1,15 +1,18 @@
-EESchema-LIBRARY Version 2.3  Date: 15/10/2009 11:34:58
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # 24C16
 #
 DEF 24C16 U 0 30 Y Y 1 F N
 F0 "U" 150 350 60 H V C CNN
 F1 "24C16" 200 -350 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS 24C512
 DRAW
-X GND 4 0 -300 0 U 60 60 0 0 W N
-X VCC 8 0 300 0 D 60 60 0 0 W N
-S -400 -300 400 300 0 1 0 N
+X GND 4 0 -500 200 U 60 60 0 0 W
+X VCC 8 0 500 200 D 60 60 0 0 W
+S -400 -300 400 300 1 1 0 N
 X A0 1 -700 200 300 R 60 60 1 1 I
 X A1 2 -700 100 300 R 60 60 1 1 I
 X A2 3 -700 0 300 R 60 60 1 1 I
@@ -24,6 +27,8 @@ ENDDEF
 DEF 74LS125 U 0 30 Y Y 4 F N
 F0 "U" 0 100 50 H V L BNN
 F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X GND 7 -150 -150 0 U 50 30 0 0 W N
 X VCC 14 -150 150 0 D 50 30 0 0 W N
@@ -48,6 +53,8 @@ ENDDEF
 DEF 7805 U 0 30 N Y 1 F N
 F0 "U" 150 -196 60 H V C CNN
 F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS LM7805 LM7812 78L05
 DRAW
 S -200 -150 200 150 0 1 0 N
@@ -60,16 +67,18 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
 $FPLIST
  SM*
  C?
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -80,6 +89,8 @@ ENDDEF
 DEF CONN_2 P 0 40 Y N 1 F N
 F0 "P" -50 0 40 V V C CNN
 F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 150 100 -150 0 1 0 N
 X P1 1 -350 100 250 R 60 60 1 1 P I
@@ -90,44 +101,30 @@ ENDDEF
 # CP
 #
 DEF CP C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP" 50 -100 50 H V L CNN
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
 ALIAS CAPAPOL
 $FPLIST
  CP*
  SM*
 $ENDFPLIST
 DRAW
-P 4 0 1 8  -100 50  -100 -50  100 -50  100 50 N
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
 P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
 X ~ 1 0 200 150 D 40 40 1 1 P
 X ~ 2 0 -200 150 U 40 40 1 1 P
 ENDDRAW
 ENDDEF
 #
-# CP1
-#
-DEF CP1 C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP1" 50 -100 50 H V L CNN
-$FPLIST
- CP*
- SM*
-$ENDFPLIST
-DRAW
-T 0 -50 100 80 0 0 0 +  Normal 0 C C
-A 0 -200 180 563 1236 0 1 15 N 100 -50 -100 -50
-P 4 0 1 15  -100 50  100 50  50 50  50 50 N
-X ~ 1 0 200 150 D 40 40 1 1 P
-X ~ 2 0 -200 180 U 40 40 1 1 P
-ENDDRAW
-ENDDEF
-#
 # DB9
 #
 DEF DB9 J 0 40 Y N 1 F N
 F0 "J" 0 550 70 H V C CNN
 F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  DB9*
 $ENDFPLIST
@@ -179,6 +176,8 @@ ENDDEF
 DEF DIODE D 0 40 N N 1 F N
 F0 "D" 0 100 40 H V C CNN
 F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  D?
  S*
@@ -196,6 +195,8 @@ ENDDEF
 DEF DIODESCH D 0 40 N N 1 F N
 F0 "D" 0 100 40 H V C CNN
 F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  D?
  S*
@@ -213,17 +214,21 @@ ENDDEF
 DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-P 4 0 1 4  -50 0  0 -50  50 0  -50 0 N
+P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
 ENDDRAW
 ENDDEF
 #
 # INDUCTOR
 #
-DEF INDUCTOR L 0 40 N N 0 F N
+DEF INDUCTOR L 0 40 N N 1 F N
 F0 "L" -50 0 40 V V C CNN
 F1 "INDUCTOR" 100 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
 A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
@@ -239,6 +244,8 @@ ENDDEF
 DEF JUMPER JP 0 30 Y N 1 F N
 F0 "JP" 0 150 60 H V C CNN
 F1 "JUMPER" 0 -80 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
 C -100 0 35 0 1 0 N
@@ -253,6 +260,8 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  LED-3MM
  LED-5MM
@@ -277,6 +286,8 @@ ENDDEF
 DEF LT1372 U 0 30 Y Y 1 F N
 F0 "U" 600 500 60 H V C CNN
 F1 "LT1372" -500 500 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS LT1373
 DRAW
 S -700 -400 700 400 0 1 0 N
@@ -293,11 +304,12 @@ ENDDEF
 #
 # NPN
 #
-DEF NPN Q 0 0 Y Y 0 F N
-F0 "Q" 150 0 50 H V C CNN
-F1 "NPN" -98 150 50 H V C CNN
+DEF NPN Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 50 H V R CNN
+F1 "NPN" 0 150 50 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-C 50 0 0 0 1 0 N
 C 50 0 111 0 1 10 N
 P 2 0 1 0  0 0  100 100 N
 P 3 0 1 10  0 75  0 -75  0 -75 N
@@ -315,6 +327,8 @@ ENDDEF
 DEF PIC12C508A U 0 40 Y Y 1 F N
 F0 "U" 0 700 60 H V C CNN
 F1 "PIC12C508A" 0 -650 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS PIC12C509A
 DRAW
 S 400 -600 -450 650 0 1 0 N
@@ -342,6 +356,8 @@ ENDDEF
 DEF PIC16F54 U? 0 40 Y Y 1 F N
 F0 "U?" 0 -750 60 H V C CNN
 F1 "PIC16F54" 0 800 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -500 700 450 -700 0 1 0 N
 X RA2 1 -800 600 300 R 50 50 1 1 B
@@ -385,11 +401,12 @@ ENDDEF
 #
 # PNP
 #
-DEF PNP Q 0 0 Y Y 0 F N
-F0 "Q" 150 0 60 H V C CNN
-F1 "PNP" -96 150 60 H V C CNN
+DEF PNP Q 0 0 Y Y 1 F N
+F0 "Q" 0 -150 60 H V R CNN
+F1 "PNP" 0 150 60 H V R CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-C 50 0 0 0 1 0 N
 C 50 0 111 0 1 10 N
 P 2 0 1 0  0 0  100 100 N
 P 3 0 1 10  0 75  0 -75  0 -75 F
@@ -404,9 +421,11 @@ ENDDEF
 #
 # POT
 #
-DEF POT RV 0 40 Y N 0 F N
+DEF POT RV 0 40 Y N 1 F N
 F0 "RV" 0 -100 50 H V C CNN
 F1 "POT" 0 0 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -150 50 150 -50 0 1 0 N
 P 3 0 1 0  0 50  -20 70  20 70 F
@@ -419,27 +438,32 @@ ENDDEF
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R?
  SM0603
  SM0805
+ R?-*
+ SM1206
 $ENDFPLIST
 DRAW
-S -40 150 40 -150 0 1 8 N
+S -40 150 40 -150 0 1 12 N
 X ~ 1 0 250 100 D 60 60 1 1 P
 X ~ 2 0 -250 100 U 60 60 1 1 P
 ENDDRAW
@@ -450,6 +474,8 @@ ENDDEF
 DEF SUPP28 J 0 40 Y Y 1 F N
 F0 "J" 0 100 70 H V C CNN
 F1 "SUPP28" 0 -100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -300 -750 300 750 0 1 0 N
 X 1 1 -600 650 300 R 60 60 1 1 P
@@ -488,6 +514,8 @@ ENDDEF
 DEF SUPP40 P 0 40 Y Y 1 F N
 F0 "P" 0 1100 70 H V C CNN
 F1 "SUPP40" 0 -1100 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -300 -1050 300 1050 0 1 0 N
 X 1 1 -600 950 300 R 60 60 1 1 P
@@ -538,10 +566,12 @@ ENDDEF
 DEF VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
-C 0 50 20 0 1 4 N
-P 3 0 1 4  0 0  0 30  0 30 N
+C 0 50 20 0 1 0 N
+P 3 0 1 0  0 0  0 30  0 30 N
 ENDDRAW
 ENDDEF
 #
@@ -550,6 +580,8 @@ ENDDEF
 DEF VPP #PWR 0 0 Y Y 1 F N
 F0 "#PWR" 0 200 40 H I C CNN
 F1 "VPP" 0 150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VPP 1 0 0 0 U 40 40 0 0 W N
 C 0 80 20 0 1 0 N

demos/pic_programmer/pic_programmer.pro

@@ -1,77 +1,39 @@
-update=09/06/2011 08:34:19
-last_client=cvpcb
-[general]
-version=1
-RootSch=pic_programmer.sch
-BoardNm=pic_programmer.brd
+update=05/01/2014 10:29:06
+last_client=kicad
 [common]
 NetDir=
+[cvpcb]
+version=1
+NetIExt=net
+[cvpcb/libraries]
+EquName1=devcms
 [pcbnew]
 version=1
-PadDril=400
-PadDimH=700
-PadDimV=700
-PadForm=1
-PadMask=14745599
-ViaDiam=650
-ViaDril=250
-Isol=100
-Countlayer=2
-Lpiste=250
-RouteTo=15
-RouteBo=0
-TypeVia=3
-Segm45=1
-Racc45=1
-Unite=0
-SegFill=1
-SegAffG=0
-NewAffG=1
-PadFill=1
-PadAffG=1
-PadSNum=1
-ModAffC=1
-ModAffT=1
-PcbAffT=1
-SgPcb45=1
-TxtPcbV=800
-TxtPcbH=600
-TxtModV=600
-TxtModH=600
-TxtModW=120
-HPGLnum=1
-HPGdiam=15
-HPGLSpd=20
-HPGLrec=2
-HPGLorg=0
-GERBmin=15
-VEgarde=100
-DrawLar=150
-EdgeLar=150
-TxtLar=120
-MSegLar=150
-ForPlot=1
-WpenSer=10
-UserGrX=0,01
-UserGrY=0,01
-UserGrU=1
-DivGrPc=1
-TimeOut=600
-MaxLnkS=3
-ShowRat=0
-ShowMRa=1
+PageLayoutDescrFile=
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.8128
+PadDrillOvalY=0.8128
+PadSizeH=1.5748
+PadSizeV=2.794
+PcbTextSizeV=1.5
+PcbTextSizeH=1.5
+PcbTextThickness=0.3048
+ModuleTextSizeV=1
+ModuleTextSizeH=1
+ModuleTextSizeThickness=0.2
+SolderMaskClearance=0.09999999999999999
+SolderMaskMinWidth=0
+DrawSegmentWidth=0.4
+BoardOutlineThickness=0.2
+ModuleOutlineThickness=0.2
 [pcbnew/libraries]
+LibDir=
 LibName1=dip_sockets
 LibName2=sockets
 LibName3=connect
 LibName4=discret
 LibName5=pin_array
 LibName6=divers
-LibName7=libcms
-LibName8=display
-LibDir=
-[cvpcb]
+[general]
 version=1
-NetIExt=net
-[cvpcb/libraries]
-EquName1=devcms

demos/pic_programmer/pic_sockets.sch

@@ -1,8 +1,37 @@
 EESchema Schematic File Version 2
-LIBS:power,device,transistors,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,.\pic_programmer.cache
-EELAYER 23  0
+LIBS:power
+LIBS:device
+LIBS:transistors
+LIBS:conn
+LIBS:linear
+LIBS:regul
+LIBS:74xx
+LIBS:cmos4000
+LIBS:adc-dac
+LIBS:memory
+LIBS:xilinx
+LIBS:special
+LIBS:microcontrollers
+LIBS:dsp
+LIBS:microchip
+LIBS:analog_switches
+LIBS:motorola
+LIBS:texas
+LIBS:intel
+LIBS:audio
+LIBS:interface
+LIBS:digital-audio
+LIBS:philips
+LIBS:display
+LIBS:cypress
+LIBS:siliconi
+LIBS:opto
+LIBS:atmel
+LIBS:pic_programmer-cache
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 2 2
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
 Date "15 apr 2008"
@@ -13,7 +42,6 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Kmarq B 3100 2150 "Warning Pin power_in non pilotée (Net 2)" F=1
 Wire Wire Line
 	3700 7000 3700 6900
 Wire Wire Line
@@ -23,13 +51,13 @@ Wire Wire Line
 Wire Wire Line
 	9400 1700 10200 1700
 Wire Wire Line
-	8200 1700 7450 1700
+	8200 1700 7550 1700
 Connection ~ 2950 1100
 Wire Wire Line
 	2950 1100 3150 1100
 Connection ~ 2950 1200
 Wire Wire Line
-	2950 1250 2950 1000
+	2950 1000 2950 1250
 Wire Wire Line
 	2950 1000 3150 1000
 Wire Wire Line
@@ -72,14 +100,16 @@ Wire Wire Line
 	3700 6900 4550 6900
 Wire Wire Line
 	4550 6900 4550 7000
-Text Label 3950 6900 0    60   ~
+Text Label 3950 6900 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR036
 U 1 1 4639BE2E
 P 4550 7400
-F 0 "#PWR036" H 4550 7400 30  0001 C C
-F 1 "GND" H 4550 7330 30  0001 C C
+F 0 "#PWR036" H 4550 7400 30  0001 C CNN
+F 1 "GND" H 4550 7330 30  0001 C CNN
+F 2 "" H 4550 7400 60  0001 C CNN
+F 3 "" H 4550 7400 60  0001 C CNN
 	1    4550 7400
 	1    0    0    -1  
 $EndComp
@@ -87,38 +117,44 @@ $Comp
 L C C8
 U 1 1 4639BE2C
 P 4550 7200
-F 0 "C8" H 4600 7300 50  0000 L C
-F 1 "100nF" H 4600 7100 50  0000 L C
+F 0 "C8" H 4600 7300 50  0000 L CNN
+F 1 "100nF" H 4600 7100 50  0000 L CNN
+F 2 "" H 4550 7200 60  0001 C CNN
+F 3 "" H 4550 7200 60  0001 C CNN
 	1    4550 7200
 	1    0    0    -1  
 $EndComp
-Text HLabel 2350 2150 0    60   Input
+Text HLabel 2350 2150 0    60   Input ~ 0
 VCC_PIC
-Text Label 2550 2150 0    60   ~
+Text Label 2550 2150 0    60   ~ 0
 VCC_PIC
-Text Label 7650 5150 0    60   ~
+Text Label 7650 5150 0    60   ~ 0
 VCC_PIC
-Text Label 9900 4950 0    60   ~
+Text Label 9900 4950 0    60   ~ 0
 VCC_PIC
-Text Label 9650 2500 0    60   ~
+Text Label 9650 2500 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR037
 U 1 1 442A8794
 P 8450 5250
-F 0 "#PWR037" H 8450 5250 30  0001 C C
-F 1 "GND" H 8450 5180 30  0001 C C
+F 0 "#PWR037" H 8450 5250 30  0001 C CNN
+F 1 "GND" H 8450 5180 30  0001 C CNN
+F 2 "" H 8450 5250 60  0001 C CNN
+F 3 "" H 8450 5250 60  0001 C CNN
 	1    8450 5250
 	0    1    1    0   
 $EndComp
-Text Label 4300 4850 0    60   ~
+Text Label 4300 4850 0    60   ~ 0
 VCC_PIC
 $Comp
 L GND #PWR038
 U 1 1 443CCA5D
 P 8450 4850
-F 0 "#PWR038" H 8450 4850 30  0001 C C
-F 1 "GND" H 8450 4780 30  0001 C C
+F 0 "#PWR038" H 8450 4850 30  0001 C CNN
+F 1 "GND" H 8450 4780 30  0001 C CNN
+F 2 "" H 8450 4850 60  0001 C CNN
+F 3 "" H 8450 4850 60  0001 C CNN
 	1    8450 4850
 	0    1    1    0   
 $EndComp
@@ -148,8 +184,10 @@ $Comp
 L GND #PWR039
 U 1 1 443697C7
 P 9400 2600
-F 0 "#PWR039" H 9400 2600 30  0001 C C
-F 1 "GND" H 9400 2530 30  0001 C C
+F 0 "#PWR039" H 9400 2600 30  0001 C CNN
+F 1 "GND" H 9400 2530 30  0001 C CNN
+F 2 "" H 9400 2600 60  0001 C CNN
+F 3 "" H 9400 2600 60  0001 C CNN
 	1    9400 2600
 	0    -1   -1   0   
 $EndComp
@@ -157,23 +195,27 @@ $Comp
 L GND #PWR040
 U 1 1 443697C3
 P 8200 2400
-F 0 "#PWR040" H 8200 2400 30  0001 C C
-F 1 "GND" H 8200 2330 30  0001 C C
+F 0 "#PWR040" H 8200 2400 30  0001 C CNN
+F 1 "GND" H 8200 2330 30  0001 C CNN
+F 2 "" H 8200 2400 60  0001 C CNN
+F 3 "" H 8200 2400 60  0001 C CNN
 	1    8200 2400
 	0    1    1    0   
 $EndComp
-Text Label 9550 1800 0    60   ~
+Text Label 9550 1800 0    60   ~ 0
 CLOCK-RB6
-Text Label 9550 1700 0    60   ~
+Text Label 9550 1700 0    60   ~ 0
 DATA-RB7
-Text Label 7550 1700 0    60   ~
+Text Label 7550 1700 0    60   ~ 0
 VPP-MCLR
 $Comp
 L SUPP28 P2
 U 1 1 4436967E
 P 8800 2350
-F 0 "P2" H 8850 3150 70  0000 C C
-F 1 "SUPP28" H 8800 1550 70  0000 C C
+F 0 "P2" H 8850 3150 70  0000 C CNN
+F 1 "SUPP28" H 8800 1550 70  0000 C CNN
+F 2 "" H 8800 2350 60  0001 C CNN
+F 3 "" H 8800 2350 60  0001 C CNN
 	1    8800 2350
 	1    0    0    -1  
 $EndComp
@@ -181,8 +223,10 @@ $Comp
 L GND #PWR041
 U 1 1 442AA147
 P 3700 7400
-F 0 "#PWR041" H 3700 7400 30  0001 C C
-F 1 "GND" H 3700 7330 30  0001 C C
+F 0 "#PWR041" H 3700 7400 30  0001 C CNN
+F 1 "GND" H 3700 7330 30  0001 C CNN
+F 2 "" H 3700 7400 60  0001 C CNN
+F 3 "" H 3700 7400 60  0001 C CNN
 	1    3700 7400
 	1    0    0    -1  
 $EndComp
@@ -190,8 +234,10 @@ $Comp
 L C C7
 U 1 1 442AA145
 P 3700 7200
-F 0 "C7" H 3750 7300 50  0000 L C
-F 1 "100nF" H 3750 7100 50  0000 L C
+F 0 "C7" H 3750 7300 50  0000 L CNN
+F 1 "100nF" H 3750 7100 50  0000 L CNN
+F 2 "" H 3700 7200 60  0001 C CNN
+F 3 "" H 3700 7200 60  0001 C CNN
 	1    3700 7200
 	1    0    0    -1  
 $EndComp
@@ -199,8 +245,10 @@ $Comp
 L GND #PWR042
 U 1 1 442AA138
 P 2700 7400
-F 0 "#PWR042" H 2700 7400 30  0001 C C
-F 1 "GND" H 2700 7330 30  0001 C C
+F 0 "#PWR042" H 2700 7400 30  0001 C CNN
+F 1 "GND" H 2700 7330 30  0001 C CNN
+F 2 "" H 2700 7400 60  0001 C CNN
+F 3 "" H 2700 7400 60  0001 C CNN
 	1    2700 7400
 	1    0    0    -1  
 $EndComp
@@ -208,8 +256,10 @@ $Comp
 L VCC #PWR043
 U 1 1 442AA134
 P 2700 7000
-F 0 "#PWR043" H 2700 7100 30  0001 C C
-F 1 "VCC" H 2700 7100 30  0000 C C
+F 0 "#PWR043" H 2700 7100 30  0001 C CNN
+F 1 "VCC" H 2700 7100 30  0000 C CNN
+F 2 "" H 2700 7000 60  0001 C CNN
+F 3 "" H 2700 7000 60  0001 C CNN
 	1    2700 7000
 	1    0    0    -1  
 $EndComp
@@ -217,8 +267,10 @@ $Comp
 L C C6
 U 1 1 442AA12B
 P 2700 7200
-F 0 "C6" H 2750 7300 50  0000 L C
-F 1 "100nF" H 2750 7100 50  0000 L C
+F 0 "C6" H 2750 7300 50  0000 L CNN
+F 1 "100nF" H 2750 7100 50  0000 L CNN
+F 2 "" H 2700 7200 60  0001 C CNN
+F 3 "" H 2700 7200 60  0001 C CNN
 	1    2700 7200
 	1    0    0    -1  
 $EndComp
@@ -258,8 +310,10 @@ $Comp
 L GND #PWR044
 U 1 1 442A896A
 P 9650 5050
-F 0 "#PWR044" H 9650 5050 30  0001 C C
-F 1 "GND" H 9650 4980 30  0001 C C
+F 0 "#PWR044" H 9650 5050 30  0001 C CNN
+F 1 "GND" H 9650 4980 30  0001 C CNN
+F 2 "" H 9650 5050 60  0001 C CNN
+F 3 "" H 9650 5050 60  0001 C CNN
 	1    9650 5050
 	0    -1   -1   0   
 $EndComp
@@ -267,8 +321,10 @@ $Comp
 L SUPP40 P3
 U 1 1 442A88ED
 P 9050 5100
-F 0 "P3" H 9100 6200 70  0000 C C
-F 1 "SUPP40" H 8900 4000 70  0000 C C
+F 0 "P3" H 9100 6200 70  0000 C CNN
+F 1 "SUPP40" H 8900 4000 70  0000 C CNN
+F 2 "" H 9050 5100 60  0001 C CNN
+F 3 "" H 9050 5100 60  0001 C CNN
 	1    9050 5100
 	1    0    0    -1  
 $EndComp
@@ -277,29 +333,33 @@ $Comp
 L GND #PWR045
 U 1 1 442A8838
 P 2950 1250
-F 0 "#PWR045" H 2950 1250 30  0001 C C
-F 1 "GND" H 2950 1180 30  0001 C C
+F 0 "#PWR045" H 2950 1250 30  0001 C CNN
+F 1 "GND" H 2950 1180 30  0001 C CNN
+F 2 "" H 2950 1250 60  0001 C CNN
+F 3 "" H 2950 1250 60  0001 C CNN
 	1    2950 1250
 	1    0    0    -1  
 $EndComp
-Text Label 4700 1400 0    60   ~
+Text Label 4700 1400 0    60   ~ 0
 DATA-RB7
-Text Label 4700 1300 0    60   ~
+Text Label 4700 1300 0    60   ~ 0
 CLOCK-RB6
 $Comp
 L 24C16 U1
 U 1 1 442A87F7
 P 3850 1200
-F 0 "U1" H 4000 1550 60  0000 C C
-F 1 "24Cxx" H 4050 850 60  0000 C C
+F 0 "U1" H 4000 1550 60  0000 C CNN
+F 1 "24Cxx" H 4050 850 60  0000 C CNN
+F 2 "" H 3850 1200 60  0001 C CNN
+F 3 "" H 3850 1200 60  0001 C CNN
 	1    3850 1200
 	1    0    0    -1  
 $EndComp
-Text Label 9800 4250 0    60   ~
+Text Label 9800 4250 0    60   ~ 0
 CLOCK-RB6
-Text Label 9800 4150 0    60   ~
+Text Label 9800 4150 0    60   ~ 0
 DATA-RB7
-Text Label 7800 4150 0    60   ~
+Text Label 7800 4150 0    60   ~ 0
 VPP-MCLR
 NoConn ~ 2500 4400
 NoConn ~ 4050 5450
@@ -318,38 +378,42 @@ $Comp
 L PIC16F54 U5
 U 1 1 442A81A7
 P 3300 4850
-F 0 "U5" H 3600 5650 60  0000 C C
-F 1 "PIC_18_PINS" H 3750 4050 60  0000 C C
+F 0 "U5" H 3600 5650 60  0000 C CNN
+F 1 "PIC_18_PINS" H 3750 4050 60  0000 C CNN
+F 2 "" H 3300 4850 60  0001 C CNN
+F 3 "" H 3300 4850 60  0001 C CNN
 	1    3300 4850
 	1    0    0    -1  
 $EndComp
 NoConn ~ 4550 3150
 NoConn ~ 3100 2850
 NoConn ~ 3100 2450
-Text Label 4200 5150 0    60   ~
+Text Label 4200 5150 0    60   ~ 0
 CLOCK-RB6
-Text Label 4200 5000 0    60   ~
+Text Label 4200 5000 0    60   ~ 0
 DATA-RB7
-Text Label 1850 4700 0    60   ~
+Text Label 1850 4700 0    60   ~ 0
 VPP-MCLR
-Text Label 2450 3150 0    60   ~
+Text Label 2450 3150 0    60   ~ 0
 VPP-MCLR
-Text Label 4700 2850 0    60   ~
+Text Label 4700 2850 0    60   ~ 0
 CLOCK-RB6
-Text Label 4700 2450 0    60   ~
+Text Label 4700 2450 0    60   ~ 0
 DATA-RB7
-Text HLabel 1350 4450 0    60   Input
+Text HLabel 1350 4450 0    60   Input ~ 0
 VPP-MCLR
-Text HLabel 1350 4250 0    60   Input
+Text HLabel 1350 4250 0    60   Input ~ 0
 CLOCK-RB6
-Text HLabel 1350 4050 0    60   Input
+Text HLabel 1350 4050 0    60   Input ~ 0
 DATA-RB7
 $Comp
 L GND #PWR046
 U 1 1 442A820F
 P 2300 4900
-F 0 "#PWR046" H 2300 4900 30  0001 C C
-F 1 "GND" H 2300 4830 30  0001 C C
+F 0 "#PWR046" H 2300 4900 30  0001 C CNN
+F 1 "GND" H 2300 4830 30  0001 C CNN
+F 2 "" H 2300 4900 60  0001 C CNN
+F 3 "" H 2300 4900 60  0001 C CNN
 	1    2300 4900
 	1    0    0    -1  
 $EndComp
@@ -357,8 +421,10 @@ $Comp
 L GND #PWR047
 U 1 1 442A8205
 P 4550 2150
-F 0 "#PWR047" H 4550 2150 30  0001 C C
-F 1 "GND" H 4550 2080 30  0001 C C
+F 0 "#PWR047" H 4550 2150 30  0001 C CNN
+F 1 "GND" H 4550 2080 30  0001 C CNN
+F 2 "" H 4550 2150 60  0001 C CNN
+F 3 "" H 4550 2150 60  0001 C CNN
 	1    4550 2150
 	0    -1   -1   0   
 $EndComp
@@ -366,9 +432,33 @@ $Comp
 L PIC12C508A U6
 U 1 1 442A81A5
 P 3850 2650
-F 0 "U6" H 3800 3350 60  0000 C C
-F 1 "PIC_8_PINS" H 3850 1950 60  0000 C C
+F 0 "U6" H 3800 3350 60  0000 C CNN
+F 1 "PIC_8_PINS" H 3850 1950 60  0000 C CNN
+F 2 "" H 3850 2650 60  0001 C CNN
+F 3 "" H 3850 2650 60  0001 C CNN
 	1    3850 2650
 	1    0    0    -1  
 $EndComp
+$Comp
+L GND #PWR048
+U 1 1 52C92629
+P 3850 1700
+F 0 "#PWR048" H 3850 1700 30  0001 C CNN
+F 1 "GND" H 3850 1630 30  0001 C CNN
+F 2 "" H 3850 1700 60  0001 C CNN
+F 3 "" H 3850 1700 60  0001 C CNN
+	1    3850 1700
+	1    0    0    -1  
+$EndComp
+$Comp
+L VCC #PWR049
+U 1 1 52C92634
+P 3850 700
+F 0 "#PWR049" H 3850 800 30  0001 C CNN
+F 1 "VCC" H 3850 800 30  0000 C CNN
+F 2 "" H 3850 700 60  0001 C CNN
+F 3 "" H 3850 700 60  0001 C CNN
+	1    3850 700 
+	1    0    0    -1  
+$EndComp
 $EndSCHEMATC

demos/pspice/pspice-cache.lib

@@ -1,10 +1,13 @@
-EESchema-LIBRARY Version 2.3  Date: 14/07/2010 20:10:02
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # +12V
 #
 DEF +12V #PWR 0 0 N Y 1 F N
 F0 "#PWR" 0 200 40 H I C CNN
 F1 "+12V" 0 150 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X +12V 1 0 0 0 R 40 40 0 0 W N
 C 0 80 20 0 1 0 N
@@ -14,9 +17,11 @@ ENDDEF
 #
 # 0
 #
-DEF 0 #GND 0 0 Y Y 1 F N
+DEF 0 #GND 0 0 Y Y 1 F P
 F0 "#GND" 0 -100 40 H I C CNN
 F1 "0" 0 -70 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X 0 1 0 0 0 R 40 40 1 1 W N
@@ -28,6 +33,8 @@ ENDDEF
 DEF CAP C 0 10 Y Y 1 F N
 F0 "C" 100 150 50 V V C CNN
 F1 "CAP" 100 -150 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS C
 DRAW
 P 2 0 1 0  -150 -50  150 -50 N
@@ -40,15 +47,17 @@ ENDDEF
 # INDUCTOR
 #
 DEF INDUCTOR L 0 0 N Y 1 F N
-F0 "L" 0 100 70 H V C CNN
-F1 "INDUCTOR" 0 -100 70 H V C CNN
+F0 "L" 0 100 50 H V C CNN
+F1 "INDUCTOR" 0 -50 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
-A -300 0 100 0 1800 0 0 0 N -200 0 -400 0
-A -100 0 100 0 1800 0 0 0 N 0 0 -200 0
-A 100 0 100 0 1800 0 0 0 N 200 0 0 0
-A 300 0 100 0 1800 0 0 0 N 400 0 200 0
-X 1 1 -700 0 300 R 70 70 1 1 I
-X 2 2 700 0 300 L 70 70 1 1 I
+A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
+A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
+A 50 0 50 1 1799 0 1 0 N 100 0 0 0
+A 150 0 50 1 1799 0 1 0 N 200 0 100 0
+X 1 1 -250 0 50 R 30 30 1 1 I
+X 2 2 250 0 50 L 30 30 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -57,6 +66,8 @@ ENDDEF
 DEF QNPN Q 0 0 Y Y 1 F N
 F0 "Q" -100 300 50 H V C CNN
 F1 "QNPN" -100 200 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 0 0  0 0  150 -150 N
 P 4 0 0 0  150 -150  150 -50  50 -150  150 -150 F
@@ -75,6 +86,8 @@ ENDDEF
 DEF R R 0 0 N Y 1 F N
 F0 "R" 80 0 50 V V C CNN
 F1 "R" 0 0 50 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -40 150 40 -150 0 1 0 N
 X ~ 1 0 250 100 D 60 60 1 1 P
@@ -87,9 +100,11 @@ ENDDEF
 DEF VSOURCE V 0 40 Y Y 1 F N
 F0 "V" 0 -100 60 H V C CNN
 F1 "VSOURCE" 0 100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C 0 0 400 0 1 0 N
-T 0 -320 -10 100 0 0 1 V  Normal 1 C C
+T 0 -320 -10 100 0 0 1 V  Normal 0 C C
 P 2 0 1 0  -250 -250  -250 150 F
 P 3 0 1 0  -300 150  -250 250  -200 150 F
 X E1 1 0 700 300 D 60 60 1 1 I

demos/pspice/pspice.cir

@@ -1,4 +1,33 @@
+* EESchema Netlist Version 1.1 (Spice format) creation date: 05/01/2014 19:00:38
 
+* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
+* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
 
+*Sheet Name:/
+R12  /VOUT Net-_L1-Pad1_ 22K		
+R11  +12V Net-_L1-Pad1_ 100		
+L1  Net-_L1-Pad1_ /VOUT 100mH		
+R10  Net-_C3-Pad1_ Net-_Q3-Pad3_ 220		
+C3  Net-_C3-Pad1_ 0 10uF		
+C2  Net-_C2-Pad1_ 0 1nF		
+R8  Net-_Q3-Pad3_ 0 2.2K		
+Q3  /VOUT Net-_C2-Pad1_ Net-_Q3-Pad3_ Net-_Q3-Pad3_ Q2N2222		
+V2  Net-_C1-Pad2_ 0 AC 0.1		
+C1  /VIN Net-_C1-Pad2_ 1UF		
+V1  +12V 0 DC 12V		
+R2  /VIN 0 10K		
+R6  +12V /VIN 22K		
+R5  +12V Net-_Q2-Pad2_ 22K		
+R1  Net-_Q2-Pad2_ 0 10K		
+R7  Net-_Q1-Pad3_ 0 470		
+R4  +12V Net-_C2-Pad1_ 1K		
+R3  +12V Net-_Q1-Pad1_ 1K		
+Q2  Net-_C2-Pad1_ Net-_Q2-Pad2_ Net-_Q1-Pad3_ Net-_Q1-Pad3_ Q2N2222		
+Q1  Net-_Q1-Pad1_ /VIN Net-_Q1-Pad3_ Net-_Q1-Pad3_ Q2N2222		
 
-No circuit simulation currently defined
+.model Q2N2222 npn (bf=200)
+.print tran v(nodes)
+.print dc v(nodes)
+.tran 10 10000 10 > pspice.dat
+
+.end

demos/pspice/pspice.pro

@@ -1,46 +1,9 @@
-update=14/07/2010 14:39:58
-last_client=pcbnew
+update=05/01/2014 19:00:46
+last_client=eeschema
 [general]
 version=1
 RootSch=pspice.sch
 BoardNm=pspice.brd
-[eeschema]
-version=1
-LibDir=
-NetFmt=4
-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
-SimCmd=f:/kicad/bin/gnucap.exe -b
-UseNetN=1
-LabSize=60
-PrintMonochrome=1
-ShowSheetReferenceAndTitleBlock=1
-[eeschema/libraries]
-LibName1=pspice
 [pcbnew]
 version=1
 PadDrlX=320
@@ -71,3 +34,16 @@ LibName7=display
 LibName8=valves
 LibName9=led
 LibName10=dip_sockets
+[eeschema]
+version=1
+PageLayoutDescrFile=
+SubpartIdSeparator=0
+SubpartFirstId=65
+LibDir=
+NetFmtName=Spice
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
+[eeschema/libraries]
+LibName1=pspice

demos/pspice/pspice.sch

@@ -1,9 +1,10 @@
-EESchema Schematic File Version 2  date 14/07/2010 20:10:02
+EESchema Schematic File Version 2
 LIBS:pspice
 LIBS:pspice-cache
-EELAYER 24  0
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 1 1
 Title ""
 Date "14 jul 2010"
@@ -27,32 +28,32 @@ Wire Notes Line
 Wire Notes Line
 	6850 5700 4050 5700
 Wire Wire Line
-	5300 2800 4400 2800
+	4400 2800 5300 2800
 Connection ~ 9200 1800
 Wire Wire Line
 	8700 1800 9200 1800
 Wire Wire Line
-	8200 1800 7800 1800
+	7800 1800 8200 1800
 Wire Wire Line
-	7800 1800 7800 1500
+	7800 1450 7800 1800
 Wire Wire Line
-	7800 1500 7700 1500
+	7800 1500 8250 1500
 Wire Wire Line
 	9200 1500 9200 2100
 Connection ~ 7700 2800
 Wire Wire Line
 	8250 2800 8400 2800
 Wire Wire Line
-	7750 2800 7450 2800
+	7450 2800 7750 2800
 Connection ~ 7050 2450
 Wire Wire Line
 	7050 2600 7050 2450
 Connection ~ 5750 3200
 Connection ~ 6100 3200
 Wire Wire Line
-	6350 3150 6350 3200
+	6350 3200 6350 3150
 Wire Wire Line
-	6350 3200 5500 3200
+	5500 3200 6350 3200
 Wire Wire Line
 	5750 3150 5750 3200
 Wire Wire Line
@@ -62,7 +63,7 @@ Wire Wire Line
 Wire Wire Line
 	7700 2950 7700 2800
 Wire Wire Line
-	7250 2450 6100 2450
+	6100 2450 7250 2450
 Wire Wire Line
 	6100 2450 6100 2300
 Wire Wire Line
@@ -74,12 +75,12 @@ Wire Wire Line
 Wire Wire Line
 	6700 2300 6700 3300
 Wire Wire Line
-	6100 3300 6100 3150
+	6100 3150 6100 3300
 Wire Wire Line
 	5100 2300 5100 3300
 Wire Wire Line
 	9200 2100 7700 2100
-Text Notes 4200 5900 0    60   ~ 0
+Text Notes 4100 6100 0    60   ~ 0
 +gnucap .model Q2N2222 npn (bf=200)\n.print tran v(nodes)\n.print dc v(nodes)\n.tran 10 10000 10 > pspice.dat\n
 Text Notes 4050 5700 0    60   ~ 0
 Pspice directives using one multiline text:
@@ -89,16 +90,20 @@ U 1 1 3E9D53DA
 P 8450 1800
 F 0 "R12" V 8530 1800 50  0000 C CNN
 F 1 "22K" V 8450 1800 50  0000 C CNN
+F 2 "" H 8450 1800 60  0001 C CNN
+F 3 "" H 8450 1800 60  0001 C CNN
 	1    8450 1800
 	0    1    1    0   
 $EndComp
 $Comp
 L R R11
 U 1 1 3E9D4D47
-P 7700 1250
-F 0 "R11" V 7780 1250 50  0000 C CNN
-F 1 "100" V 7700 1250 50  0000 C CNN
-	1    7700 1250
+P 7800 1200
+F 0 "R11" V 7880 1200 50  0000 C CNN
+F 1 "100" V 7800 1200 50  0000 C CNN
+F 2 "" H 7800 1200 60  0001 C CNN
+F 3 "" H 7800 1200 60  0001 C CNN
+	1    7800 1200
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -107,6 +112,8 @@ U 1 1 3E9D4A5D
 P 8500 1500
 F 0 "L1" H 8500 1600 70  0000 C CNN
 F 1 "100mH" H 8500 1350 70  0000 C CNN
+F 2 "" H 8500 1500 60  0001 C CNN
+F 3 "" H 8500 1500 60  0001 C CNN
 	1    8500 1500
 	1    0    0    1   
 $EndComp
@@ -116,15 +123,19 @@ U 1 1 3E9D3DED
 P 8000 2800
 F 0 "R10" V 8080 2800 50  0000 C CNN
 F 1 "220" V 8000 2800 50  0000 C CNN
+F 2 "" H 8000 2800 60  0001 C CNN
+F 3 "" H 8000 2800 60  0001 C CNN
 	1    8000 2800
 	0    1    1    0   
 $EndComp
 $Comp
-L 0 #GND8
+L 0 #GND01
 U 1 1 3E9D3DE2
 P 8400 3300
-F 0 "#GND8" H 8400 3200 40  0001 C CNN
+F 0 "#GND01" H 8400 3200 40  0001 C CNN
 F 1 "0" H 8400 3230 40  0000 C CNN
+F 2 "" H 8400 3300 60  0001 C CNN
+F 3 "" H 8400 3300 60  0001 C CNN
 	1    8400 3300
 	1    0    0    -1  
 $EndComp
@@ -134,15 +145,19 @@ U 1 1 3E9D3DD3
 P 8400 3050
 F 0 "C3" V 8500 3200 50  0000 C CNN
 F 1 "10uF" V 8500 2900 50  0000 C CNN
+F 2 "" H 8400 3050 60  0000 C CNN
+F 3 "" H 8400 3050 60  0000 C CNN
 	1    8400 3050
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND7
+L 0 #GND02
 U 1 1 3E9D1EFF
 P 7050 3100
-F 0 "#GND7" H 7050 3000 40  0001 C CNN
+F 0 "#GND02" H 7050 3000 40  0001 C CNN
 F 1 "0" H 7050 3030 40  0000 C CNN
+F 2 "" H 7050 3100 60  0001 C CNN
+F 3 "" H 7050 3100 60  0001 C CNN
 	1    7050 3100
 	1    0    0    -1  
 $EndComp
@@ -152,25 +167,31 @@ U 1 1 3E9D1EF8
 P 7050 2850
 F 0 "C2" V 7150 3000 50  0000 C CNN
 F 1 "1nF" V 7150 2700 50  0000 C CNN
+F 2 "" H 7050 2850 60  0001 C CNN
+F 3 "" H 7050 2850 60  0001 C CNN
 	1    7050 2850
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND6
+L 0 #GND03
 U 1 1 32E8B852
 P 7700 3450
-F 0 "#GND6" H 7700 3350 40  0001 C CNN
+F 0 "#GND03" H 7700 3350 40  0001 C CNN
 F 1 "0" H 7700 3380 40  0000 C CNN
+F 2 "" H 7700 3450 60  0001 C CNN
+F 3 "" H 7700 3450 60  0001 C CNN
 	1    7700 3450
 	1    0    0    -1  
 $EndComp
 $Comp
 L +12V #+12V6
 U 1 1 32E8B84A
-P 7700 1000
-F 0 "#+12V6" H 7700 1200 40  0001 C CNN
-F 1 "+12V" H 7700 1150 40  0000 C CNN
-	1    7700 1000
+P 7800 950
+F 0 "#+12V6" H 7800 1150 40  0001 C CNN
+F 1 "+12V" H 7800 1100 40  0000 C CNN
+F 2 "" H 7800 950 60  0001 C CNN
+F 3 "" H 7800 950 60  0001 C CNN
+	1    7800 950 
 	1    0    0    -1  
 $EndComp
 $Comp
@@ -179,6 +200,8 @@ U 1 1 32E8B80E
 P 7700 3200
 F 0 "R8" V 7780 3200 50  0000 C CNN
 F 1 "2.2K" V 7700 3200 50  0000 C CNN
+F 2 "" H 7700 3200 60  0001 C CNN
+F 3 "" H 7700 3200 60  0001 C CNN
 	1    7700 3200
 	1    0    0    -1  
 $EndComp
@@ -188,15 +211,19 @@ U 1 1 32E8B7FC
 P 7550 2450
 F 0 "Q3" H 7450 2750 50  0000 C CNN
 F 1 "Q2N2222" H 7450 2650 50  0000 C CNN
+F 2 "" H 7550 2450 60  0001 C CNN
+F 3 "" H 7550 2450 60  0001 C CNN
 	1    7550 2450
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND5
+L 0 #GND04
 U 1 1 32CFC469
 P 3850 4200
-F 0 "#GND5" H 3850 4100 40  0001 C CNN
+F 0 "#GND04" H 3850 4100 40  0001 C CNN
 F 1 "0" H 3850 4130 40  0000 C CNN
+F 2 "" H 3850 4200 60  0001 C CNN
+F 3 "" H 3850 4200 60  0001 C CNN
 	1    3850 4200
 	1    0    0    -1  
 $EndComp
@@ -206,6 +233,8 @@ U 1 1 32CFC454
 P 3850 3500
 F 0 "V2" H 3850 3400 60  0000 C CNN
 F 1 "AC 0.1" H 3850 3600 60  0000 C CNN
+F 2 "" H 3850 3500 60  0001 C CNN
+F 3 "" H 3850 3500 60  0001 C CNN
 	1    3850 3500
 	1    0    0    -1  
 $EndComp
@@ -215,6 +244,8 @@ U 1 1 32CFC413
 P 4150 2800
 F 0 "C1" V 4250 2950 50  0000 C CNN
 F 1 "1UF" V 4250 2650 50  0000 C CNN
+F 2 "" H 4150 2800 60  0001 C CNN
+F 3 "" H 4150 2800 60  0001 C CNN
 	1    4150 2800
 	0    1    1    0   
 $EndComp
@@ -224,15 +255,19 @@ U 1 1 32CFC34D
 P 2850 1500
 F 0 "#+12V5" H 2850 1700 40  0001 C CNN
 F 1 "+12V" H 2850 1650 40  0000 C CNN
+F 2 "" H 2850 1500 60  0001 C CNN
+F 3 "" H 2850 1500 60  0001 C CNN
 	1    2850 1500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND4
+L 0 #GND05
 U 1 1 32CFC344
 P 2850 2900
-F 0 "#GND4" H 2850 2800 40  0001 C CNN
+F 0 "#GND05" H 2850 2800 40  0001 C CNN
 F 1 "0" H 2850 2830 40  0000 C CNN
+F 2 "" H 2850 2900 60  0001 C CNN
+F 3 "" H 2850 2900 60  0001 C CNN
 	1    2850 2900
 	1    0    0    -1  
 $EndComp
@@ -242,6 +277,8 @@ U 1 1 32CFC337
 P 2850 2200
 F 0 "V1" H 2850 2100 60  0000 C CNN
 F 1 "DC 12V" H 2850 2300 60  0000 C CNN
+F 2 "" H 2850 2200 60  0001 C CNN
+F 3 "" H 2850 2200 60  0001 C CNN
 	1    2850 2200
 	1    0    0    -1  
 $EndComp
@@ -251,6 +288,8 @@ U 1 1 32CFC303
 P 6700 1800
 F 0 "#+12V4" H 6700 2000 40  0001 C CNN
 F 1 "+12V" H 6700 1950 40  0000 C CNN
+F 2 "" H 6700 1800 60  0001 C CNN
+F 3 "" H 6700 1800 60  0001 C CNN
 	1    6700 1800
 	1    0    0    -1  
 $EndComp
@@ -260,6 +299,8 @@ U 1 1 32CFC2FF
 P 6100 1800
 F 0 "#+12V3" H 6100 2000 40  0001 C CNN
 F 1 "+12V" H 6100 1950 40  0000 C CNN
+F 2 "" H 6100 1800 60  0001 C CNN
+F 3 "" H 6100 1800 60  0001 C CNN
 	1    6100 1800
 	1    0    0    -1  
 $EndComp
@@ -269,6 +310,8 @@ U 1 1 32CFC2FD
 P 5750 1800
 F 0 "#+12V2" H 5750 2000 40  0001 C CNN
 F 1 "+12V" H 5750 1950 40  0000 C CNN
+F 2 "" H 5750 1800 60  0001 C CNN
+F 3 "" H 5750 1800 60  0001 C CNN
 	1    5750 1800
 	1    0    0    -1  
 $EndComp
@@ -278,24 +321,30 @@ U 1 1 32CFC2F7
 P 5100 1800
 F 0 "#+12V1" H 5100 2000 40  0001 C CNN
 F 1 "+12V" H 5100 1950 40  0000 C CNN
+F 2 "" H 5100 1800 60  0001 C CNN
+F 3 "" H 5100 1800 60  0001 C CNN
 	1    5100 1800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND3
+L 0 #GND06
 U 1 1 32CFC2B8
 P 6700 3800
-F 0 "#GND3" H 6700 3700 40  0001 C CNN
+F 0 "#GND06" H 6700 3700 40  0001 C CNN
 F 1 "0" H 6700 3730 40  0000 C CNN
+F 2 "" H 6700 3800 60  0001 C CNN
+F 3 "" H 6700 3800 60  0001 C CNN
 	1    6700 3800
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND2
+L 0 #GND07
 U 1 1 32CFC2B5
 P 5100 3800
-F 0 "#GND2" H 5100 3700 40  0001 C CNN
+F 0 "#GND07" H 5100 3700 40  0001 C CNN
 F 1 "0" H 5100 3730 40  0000 C CNN
+F 2 "" H 5100 3800 60  0001 C CNN
+F 3 "" H 5100 3800 60  0001 C CNN
 	1    5100 3800
 	1    0    0    -1  
 $EndComp
@@ -305,6 +354,8 @@ U 1 1 32CFC293
 P 5100 3550
 F 0 "R2" V 5180 3550 50  0000 C CNN
 F 1 "10K" V 5100 3550 50  0000 C CNN
+F 2 "" H 5100 3550 60  0001 C CNN
+F 3 "" H 5100 3550 60  0001 C CNN
 	1    5100 3550
 	1    0    0    -1  
 $EndComp
@@ -314,6 +365,8 @@ U 1 1 32CFC288
 P 5100 2050
 F 0 "R6" V 5180 2050 50  0000 C CNN
 F 1 "22K" V 5100 2050 50  0000 C CNN
+F 2 "" H 5100 2050 60  0001 C CNN
+F 3 "" H 5100 2050 60  0001 C CNN
 	1    5100 2050
 	1    0    0    -1  
 $EndComp
@@ -323,6 +376,8 @@ U 1 1 32CFC27F
 P 6700 2050
 F 0 "R5" V 6780 2050 50  0000 C CNN
 F 1 "22K" V 6700 2050 50  0000 C CNN
+F 2 "" H 6700 2050 60  0001 C CNN
+F 3 "" H 6700 2050 60  0001 C CNN
 	1    6700 2050
 	1    0    0    -1  
 $EndComp
@@ -332,15 +387,19 @@ U 1 1 32CFC277
 P 6700 3550
 F 0 "R1" V 6780 3550 50  0000 C CNN
 F 1 "10K" V 6700 3550 50  0000 C CNN
+F 2 "" H 6700 3550 60  0001 C CNN
+F 3 "" H 6700 3550 60  0001 C CNN
 	1    6700 3550
 	1    0    0    -1  
 $EndComp
 $Comp
-L 0 #GND1
+L 0 #GND08
 U 1 1 32CFC26C
 P 6100 3800
-F 0 "#GND1" H 6100 3700 40  0001 C CNN
+F 0 "#GND08" H 6100 3700 40  0001 C CNN
 F 1 "0" H 6100 3730 40  0000 C CNN
+F 2 "" H 6100 3800 60  0001 C CNN
+F 3 "" H 6100 3800 60  0001 C CNN
 	1    6100 3800
 	1    0    0    -1  
 $EndComp
@@ -350,6 +409,8 @@ U 1 1 32CFC25A
 P 6100 3550
 F 0 "R7" V 6180 3550 50  0000 C CNN
 F 1 "470" V 6100 3550 50  0000 C CNN
+F 2 "" H 6100 3550 60  0001 C CNN
+F 3 "" H 6100 3550 60  0001 C CNN
 	1    6100 3550
 	1    0    0    -1  
 $EndComp
@@ -359,6 +420,8 @@ U 1 1 32CFC254
 P 6100 2050
 F 0 "R4" V 6180 2050 50  0000 C CNN
 F 1 "1K" V 6100 2050 50  0000 C CNN
+F 2 "" H 6100 2050 60  0001 C CNN
+F 3 "" H 6100 2050 60  0001 C CNN
 	1    6100 2050
 	1    0    0    -1  
 $EndComp
@@ -368,6 +431,8 @@ U 1 1 32CFC24C
 P 5750 2050
 F 0 "R3" V 5830 2050 50  0000 C CNN
 F 1 "1K" V 5750 2050 50  0000 C CNN
+F 2 "" H 5750 2050 60  0001 C CNN
+F 3 "" H 5750 2050 60  0001 C CNN
 	1    5750 2050
 	1    0    0    -1  
 $EndComp
@@ -377,6 +442,8 @@ U 1 1 32CFC230
 P 6250 2800
 F 0 "Q2" H 6150 3100 50  0000 C CNN
 F 1 "Q2N2222" H 6150 3000 50  0000 C CNN
+F 2 "" H 6250 2800 60  0001 C CNN
+F 3 "" H 6250 2800 60  0001 C CNN
 	1    6250 2800
 	-1   0    0    -1  
 $EndComp
@@ -386,7 +453,12 @@ U 1 1 32CFC227
 P 5600 2800
 F 0 "Q1" H 5500 3100 50  0000 C CNN
 F 1 "Q2N2222" H 5500 3000 50  0000 C CNN
+F 2 "" H 5600 2800 60  0001 C CNN
+F 3 "" H 5600 2800 60  0001 C CNN
 	1    5600 2800
 	1    0    0    -1  
 $EndComp
+Wire Wire Line
+	9200 1500 8750 1500
+Connection ~ 7800 1500
 $EndSCHEMATC

demos/sonde xilinx/sonde xilinx-cache.lib

@@ -1,10 +1,13 @@
-EESchema-LIBRARY Version 2.3  Date: 09/02/2011 18:36:39
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # 74LS125
 #
 DEF 74LS125 U 0 30 Y Y 4 F N
 F0 "U" 0 100 50 H V L BNN
 F1 "74LS125" 50 -150 40 H V L TNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X GND 7 -150 -150 0 U 50 30 0 0 W N
 X VCC 14 -150 150 0 D 50 30 0 0 W N
@@ -27,16 +30,18 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
 $FPLIST
  SM*
  C?
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -47,6 +52,8 @@ ENDDEF
 DEF CONN_6 P 0 30 Y N 1 F N
 F0 "P" -50 0 60 V V C CNN
 F1 "CONN_6" 50 0 60 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 300 100 -300 0 1 0 N
 X 1 1 -350 250 250 R 60 60 1 1 P I
@@ -61,15 +68,17 @@ ENDDEF
 # CP
 #
 DEF CP C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP" 50 -100 50 H V L CNN
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
 ALIAS CAPAPOL
 $FPLIST
  CP*
  SM*
 $ENDFPLIST
 DRAW
-P 4 0 1 8  -100 50  -100 -50  100 -50  100 50 N
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
 P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
 X ~ 1 0 200 150 D 40 40 1 1 P
 X ~ 2 0 -200 150 U 40 40 1 1 P
@@ -81,6 +90,8 @@ ENDDEF
 DEF DB25 J 0 40 Y N 1 F N
 F0 "J" 50 1350 70 H V C CNN
 F1 "DB25" -50 -1350 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  DB25*
 $ENDFPLIST
@@ -176,6 +187,8 @@ ENDDEF
 DEF DB9 J 0 40 Y N 1 F N
 F0 "J" 0 550 70 H V C CNN
 F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  DB9*
 $ENDFPLIST
@@ -227,6 +240,8 @@ ENDDEF
 DEF DIODESCH D 0 40 N N 1 F N
 F0 "D" 0 100 40 H V C CNN
 F1 "DIODESCH" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  D?
  S*
@@ -244,6 +259,8 @@ ENDDEF
 DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
@@ -253,20 +270,23 @@ ENDDEF
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R?
  SM0603
@@ -286,6 +306,8 @@ ENDDEF
 DEF VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
 C 0 50 20 0 1 0 N

demos/sonde xilinx/sonde xilinx.net

@@ -1,162 +1,420 @@
-( { EESchema Netlist Version 1.1  11/02/2011 10:40:30
-eeschema (2011-02-09 BZR 2801)-testing}
- ( 4D527316 $noname R11 100
-  ( 1 exists in 40exists in 40 )
-  ( 2 exists in 35exists in 35 )
- )
- ( 3EBF81A7 $noname C4 100pF
-  ( 1 exists in 34exists in 34 )
-  ( 2 exists in 1exists in 1 )
- )
- ( 4D528082 $noname R13 100
-  ( 1 exists in 42exists in 42 )
-  ( 2 exists in 34exists in 34 )
- )
- ( 3EBF7DBD $noname U1 74LS125
-  ( 1 exists in 31exists in 31 )
-  ( 2 exists in 1exists in 1 )
-  ( 3 exists in 38exists in 38 )
-  ( 4 exists in 33exists in 33 )
-  ( 5 exists in 16exists in 16 )
-  ( 6 exists in 35exists in 35 )
-  ( 7 exists in 1exists in 1 )
-  ( 8 exists in 36exists in 36 )
-  ( 9 exists in 30exists in 30 )
-  ( 10 exists in 33exists in 33 )
-  ( 11 exists in 34exists in 34 )
-  ( 12 exists in 32exists in 32 )
-  ( 13 exists in 33exists in 33 )
-  ( 14 exists in 5exists in 5 )
- )
- ( 3ECDE5C8 $noname J2 DB9MALE
-  ( 1 exists in 37exists in 37 )
-  ( 2 exists in 39exists in 39 )
-  ( 3 exists in 40exists in 40 )
-  ( 4 exists in 41exists in 41 )
-  ( 5 exists in 42exists in 42 )
-  ( 6 exists in 1exists in 1 )
-  ( 7 exists in 1exists in 1 )
-  ( 8 exists in 1exists in 1 )
-  ( 9 exists in 1exists in 1 )
- )
- ( 3EBF830C $noname P1 CONN_6
-  ( 1 exists in 37exists in 37 )
-  ( 2 exists in 1exists in 1 )
-  ( 3 exists in 39exists in 39 )
-  ( 4 exists in 40exists in 40 )
-  ( 5 exists in 41exists in 41 )
-  ( 6 exists in 42exists in 42 )
- )
- ( 3EBF82C6 $noname C1 1uF
-  ( 1 exists in 5exists in 5 )
-  ( 2 exists in 1exists in 1 )
- )
- ( 4D528086 $noname C5 100pF
-  ( 1 exists in 36exists in 36 )
-  ( 2 exists in 1exists in 1 )
- )
- ( 4D528083 $noname R12 100
-  ( 1 exists in 41exists in 41 )
-  ( 2 exists in 36exists in 36 )
- )
- ( 4D528085 $noname C2 100pF
-  ( 1 exists in 35exists in 35 )
-  ( 2 exists in 1exists in 1 )
- )
- ( 4D528084 $noname C3 100pF
-  ( 1 exists in 38exists in 38 )
-  ( 2 exists in 1exists in 1 )
- )
- ( 3EBF819B $noname R14 100
-  ( 1 exists in 39exists in 39 )
-  ( 2 exists in 38exists in 38 )
- )
- ( 3EBF818E $noname R5 1K
-  ( 1 exists in 5exists in 5 )
-  ( 2 exists in 1exists in 1 )
- )
- ( 3EBF8187 $noname R2 5,1K
-  ( 1 exists in 5exists in 5 )
-  ( 2 exists in 38exists in 38 )
- )
- ( 3EBF8176 $noname D2 BAT46
-  ( 1 exists in 37exists in 37 )
-  ( 2 exists in 5exists in 5 )
- )
- ( 3EBF815E $noname D1 BAT46
-  ( 1 exists in 5exists in 5 )
-  ( 2 exists in 14exists in 14 )
- )
- ( 3EBF7EEC $noname U2 74LS125
-  ( 1 exists in 1exists in 1 )
-  ( 2 exists in 38exists in 38 )
-  ( 3 exists in 15exists in 15 )
-  ( 4 exists in 1exists in 1 )
-  ( 5 exists in 1exists in 1 )
-  ( 6 exists in 4exists in 4 )
-  ( 7 exists in 1exists in 1 )
-  ( 8 exists in 3exists in 3 )
-  ( 9 exists in 1exists in 1 )
-  ( 10 exists in 1exists in 1 )
-  ( 11 exists in 2exists in 2 )
-  ( 12 exists in 1exists in 1 )
-  ( 13 exists in 1exists in 1 )
-  ( 14 exists in 5exists in 5 )
- )
- ( 3EBF7D33 $noname R9 100
-  ( 1 exists in 32exists in 32 )
-  ( 2 exists in 6exists in 6 )
- )
- ( 3EBF7D31 $noname R10 100
-  ( 1 exists in 30exists in 30 )
-  ( 2 exists in 12exists in 12 )
- )
- ( 4D528080 $noname R8 100
-  ( 1 exists in 33exists in 33 )
-  ( 2 exists in 11exists in 11 )
- )
- ( 4D52807F $noname R7 100
-  ( 1 exists in 16exists in 16 )
-  ( 2 exists in 10exists in 10 )
- )
- ( 3EBF7D26 $noname R6 100
-  ( 1 exists in 31exists in 31 )
-  ( 2 exists in 9exists in 9 )
- )
- ( 3EBF7D22 $noname R4 47
-  ( 1 exists in 15exists in 15 )
-  ( 2 exists in 24exists in 24 )
- )
- ( 3EBF7D16 $noname R1 100
-  ( 1 exists in 14exists in 14 )
-  ( 2 exists in 7exists in 7 )
- )
- ( 3EBF7D04 $noname J1 DB25MALE
-  ( 1 exists in 13exists in 13 )
-  ( 2 exists in 10exists in 10 )
-  ( 3 exists in 12exists in 12 )
-  ( 4 exists in 6exists in 6 )
-  ( 5 exists in 11exists in 11 )
-  ( 6 exists in 9exists in 9 )
-  ( 7 exists in 29exists in 29 )
-  ( 8 exists in 8exists in 8 )
-  ( 9 exists in 28exists in 28 )
-  ( 10 exists in 27exists in 27 )
-  ( 11 exists in 8exists in 8 )
-  ( 12 exists in 8exists in 8 )
-  ( 13 exists in 24exists in 24 )
-  ( 14 exists in 22exists in 22 )
-  ( 15 exists in 7exists in 7 )
-  ( 16 exists in 20exists in 20 )
-  ( 17 exists in 19exists in 19 )
-  ( 18 exists in 18exists in 18 )
-  ( 19 exists in 17exists in 17 )
-  ( 20 exists in 1exists in 1 )
-  ( 21 exists in 26exists in 26 )
-  ( 22 exists in 25exists in 25 )
-  ( 23 exists in 23exists in 23 )
-  ( 24 exists in 21exists in 21 )
-  ( 25 exists in 1exists in 1 )
- )
-)
-*
+(export (version D)
+  (design
+    (source "F:/kicad-launchpad/testing/demos/sonde xilinx/sonde xilinx.sch")
+    (date "05/01/2014 18:35:33")
+    (tool "eeschema (2014-01-04 BZR 4608)-product"))
+  (components
+    (comp (ref R11)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D527316))
+    (comp (ref C4)
+      (value 100pF)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF81A7))
+    (comp (ref R13)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D528082))
+    (comp (ref U1)
+      (value 74LS125)
+      (libsource (lib 74xx) (part 74LS125))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7DBD))
+    (comp (ref J2)
+      (value DB9MALE)
+      (libsource (lib conn) (part DB9))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3ECDE5C8))
+    (comp (ref P1)
+      (value CONN_6)
+      (libsource (lib conn) (part CONN_6))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF830C))
+    (comp (ref C1)
+      (value 1uF)
+      (libsource (lib device) (part CP))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF82C6))
+    (comp (ref C5)
+      (value 100pF)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D528086))
+    (comp (ref R12)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D528083))
+    (comp (ref C2)
+      (value 100pF)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D528085))
+    (comp (ref C3)
+      (value 100pF)
+      (libsource (lib device) (part C))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D528084))
+    (comp (ref R14)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF819B))
+    (comp (ref R5)
+      (value 1K)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF818E))
+    (comp (ref R2)
+      (value 5,1K)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF8187))
+    (comp (ref D2)
+      (value BAT46)
+      (libsource (lib device) (part DIODESCH))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF8176))
+    (comp (ref D1)
+      (value BAT46)
+      (libsource (lib device) (part DIODESCH))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF815E))
+    (comp (ref U2)
+      (value 74LS125)
+      (libsource (lib 74xx) (part 74LS125))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7EEC))
+    (comp (ref R9)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7D33))
+    (comp (ref R10)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7D31))
+    (comp (ref R8)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D528080))
+    (comp (ref R7)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4D52807F))
+    (comp (ref R6)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7D26))
+    (comp (ref R4)
+      (value 47)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7D22))
+    (comp (ref R1)
+      (value 100)
+      (libsource (lib device) (part R))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7D16))
+    (comp (ref J1)
+      (value DB25MALE)
+      (libsource (lib conn) (part DB25))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 3EBF7D04)))
+  (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 CP)
+      (aliases
+        (alias CAPAPOL))
+      (description "Condensateur polarise")
+      (footprints
+        (fp CP*)
+        (fp SM*))
+      (fields
+        (field (name Reference) C)
+        (field (name Value) CP))
+      (pins
+        (pin (num 1) (name ~) (type passive))
+        (pin (num 2) (name ~) (type passive))))
+    (libpart (lib device) (part DIODESCH)
+      (description "Diode schottky")
+      (footprints
+        (fp D?)
+        (fp S*))
+      (fields
+        (field (name Reference) D)
+        (field (name Value) DIODESCH))
+      (pins
+        (pin (num 1) (name A) (type passive))
+        (pin (num 2) (name K) (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 conn) (part CONN_6)
+      (description "ymbole general de connecteur")
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_6))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))
+        (pin (num 3) (name 3) (type passive))
+        (pin (num 4) (name 4) (type passive))
+        (pin (num 5) (name 5) (type passive))
+        (pin (num 6) (name 6) (type passive))))
+    (libpart (lib conn) (part DB25)
+      (footprints
+        (fp DB25*))
+      (fields
+        (field (name Reference) J)
+        (field (name Value) DB25))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))
+        (pin (num 3) (name 3) (type passive))
+        (pin (num 4) (name 4) (type passive))
+        (pin (num 5) (name 5) (type passive))
+        (pin (num 6) (name 6) (type passive))
+        (pin (num 7) (name 7) (type passive))
+        (pin (num 8) (name 8) (type passive))
+        (pin (num 9) (name 9) (type passive))
+        (pin (num 10) (name 10) (type passive))
+        (pin (num 11) (name 11) (type passive))
+        (pin (num 12) (name 12) (type passive))
+        (pin (num 13) (name 13) (type passive))
+        (pin (num 14) (name P14) (type passive))
+        (pin (num 15) (name P15) (type passive))
+        (pin (num 16) (name P16) (type passive))
+        (pin (num 17) (name P17) (type passive))
+        (pin (num 18) (name P18) (type passive))
+        (pin (num 19) (name P19) (type passive))
+        (pin (num 20) (name P20) (type passive))
+        (pin (num 21) (name P21) (type passive))
+        (pin (num 22) (name P22) (type passive))
+        (pin (num 23) (name P23) (type passive))
+        (pin (num 24) (name P24) (type passive))
+        (pin (num 25) (name P25) (type passive))))
+    (libpart (lib conn) (part DB9)
+      (footprints
+        (fp DB9*))
+      (fields
+        (field (name Reference) J)
+        (field (name Value) DB9))
+      (pins
+        (pin (num 1) (name 1) (type passive))
+        (pin (num 2) (name 2) (type passive))
+        (pin (num 3) (name 3) (type passive))
+        (pin (num 4) (name 4) (type passive))
+        (pin (num 5) (name 5) (type passive))
+        (pin (num 6) (name P6) (type passive))
+        (pin (num 7) (name P7) (type passive))
+        (pin (num 8) (name P8) (type passive))
+        (pin (num 9) (name P9) (type passive))))
+    (libpart (lib 74xx) (part 74LS125)
+      (description "Quad buffer 3 State out")
+      (fields
+        (field (name Reference) U)
+        (field (name Value) 74LS125))
+      (pins
+        (pin (num 1) (name E) (type input))
+        (pin (num 2) (name D) (type input))
+        (pin (num 3) (name O) (type 3state))
+        (pin (num 4) (name E) (type input))
+        (pin (num 5) (name D) (type input))
+        (pin (num 6) (name O) (type 3state))
+        (pin (num 7) (name GND) (type power_in))
+        (pin (num 8) (name O) (type 3state))
+        (pin (num 9) (name D) (type input))
+        (pin (num 10) (name E) (type input))
+        (pin (num 11) (name O) (type 3state))
+        (pin (num 12) (name D) (type input))
+        (pin (num 13) (name E) (type input))
+        (pin (num 14) (name VCC) (type power_in)))))
+  (libraries
+    (library (logical device)
+      (uri F:\kicad\share\library\device.lib))
+    (library (logical conn)
+      (uri F:\kicad\share\library\conn.lib))
+    (library (logical 74xx)
+      (uri F:\kicad\share\library\74xx.lib)))
+  (nets
+    (net (code 1) (name VCC)
+      (node (ref U2) (pin 14))
+      (node (ref R5) (pin 1))
+      (node (ref R2) (pin 1))
+      (node (ref D2) (pin 2))
+      (node (ref D1) (pin 1))
+      (node (ref U1) (pin 14))
+      (node (ref C1) (pin 1)))
+    (net (code 2) (name GND)
+      (node (ref J2) (pin 7))
+      (node (ref J2) (pin 8))
+      (node (ref J2) (pin 9))
+      (node (ref C5) (pin 2))
+      (node (ref R5) (pin 2))
+      (node (ref U1) (pin 2))
+      (node (ref C1) (pin 2))
+      (node (ref U1) (pin 7))
+      (node (ref J1) (pin 20))
+      (node (ref U2) (pin 1))
+      (node (ref J1) (pin 25))
+      (node (ref U2) (pin 12))
+      (node (ref U2) (pin 10))
+      (node (ref U2) (pin 9))
+      (node (ref U2) (pin 7))
+      (node (ref U2) (pin 4))
+      (node (ref U2) (pin 5))
+      (node (ref P1) (pin 2))
+      (node (ref U2) (pin 13))
+      (node (ref C3) (pin 2))
+      (node (ref J2) (pin 6))
+      (node (ref C4) (pin 2))
+      (node (ref C2) (pin 2)))
+    (net (code 3) (name "Net-(U2-Pad11)")
+      (node (ref U2) (pin 11)))
+    (net (code 4) (name "Net-(U2-Pad8)")
+      (node (ref U2) (pin 8)))
+    (net (code 5) (name "Net-(U2-Pad6)")
+      (node (ref U2) (pin 6)))
+    (net (code 6) (name /TMS-PROG-D2)
+      (node (ref J1) (pin 4))
+      (node (ref R9) (pin 2)))
+    (net (code 7) (name /VCC_SENSE-ERROR*)
+      (node (ref J1) (pin 15))
+      (node (ref R1) (pin 2)))
+    (net (code 8) (name "Net-(J1-Pad11)")
+      (node (ref J1) (pin 12))
+      (node (ref J1) (pin 11))
+      (node (ref J1) (pin 8)))
+    (net (code 9) (name /TD0-PROG-D4)
+      (node (ref J1) (pin 6))
+      (node (ref R6) (pin 2)))
+    (net (code 10) (name /TDI-DIN-D0)
+      (node (ref J1) (pin 2))
+      (node (ref R7) (pin 2)))
+    (net (code 11) (name /CTRL-D3)
+      (node (ref J1) (pin 5))
+      (node (ref R8) (pin 2)))
+    (net (code 12) (name /CLK-D1)
+      (node (ref J1) (pin 3))
+      (node (ref R10) (pin 2)))
+    (net (code 13) (name "Net-(R4-Pad1)")
+      (node (ref R4) (pin 1))
+      (node (ref U2) (pin 3)))
+    (net (code 14) (name "Net-(J1-Pad1)")
+      (node (ref J1) (pin 1)))
+    (net (code 15) (name "Net-(J1-Pad7)")
+      (node (ref J1) (pin 7)))
+    (net (code 16) (name "Net-(R7-Pad1)")
+      (node (ref U1) (pin 5))
+      (node (ref R7) (pin 1)))
+    (net (code 17) (name /DONE-SELECT*)
+      (node (ref J1) (pin 13))
+      (node (ref R4) (pin 2)))
+    (net (code 18) (name "Net-(J1-Pad19)")
+      (node (ref J1) (pin 19)))
+    (net (code 19) (name "Net-(J1-Pad18)")
+      (node (ref J1) (pin 18)))
+    (net (code 20) (name "Net-(J1-Pad17)")
+      (node (ref J1) (pin 17)))
+    (net (code 21) (name "Net-(J1-Pad16)")
+      (node (ref J1) (pin 16)))
+    (net (code 22) (name "Net-(J1-Pad24)")
+      (node (ref J1) (pin 24)))
+    (net (code 23) (name "Net-(J1-Pad14)")
+      (node (ref J1) (pin 14)))
+    (net (code 24) (name "Net-(J1-Pad23)")
+      (node (ref J1) (pin 23)))
+    (net (code 25) (name "Net-(R9-Pad1)")
+      (node (ref U1) (pin 12))
+      (node (ref R9) (pin 1)))
+    (net (code 26) (name "Net-(J1-Pad22)")
+      (node (ref J1) (pin 22)))
+    (net (code 27) (name "Net-(J1-Pad21)")
+      (node (ref J1) (pin 21)))
+    (net (code 28) (name "Net-(J1-Pad10)")
+      (node (ref J1) (pin 10)))
+    (net (code 29) (name "Net-(J1-Pad9)")
+      (node (ref J1) (pin 9)))
+    (net (code 30) (name "Net-(R10-Pad1)")
+      (node (ref R10) (pin 1))
+      (node (ref U1) (pin 9)))
+    (net (code 31) (name "Net-(R6-Pad1)")
+      (node (ref R6) (pin 1))
+      (node (ref U1) (pin 1)))
+    (net (code 32) (name "Net-(D1-Pad2)")
+      (node (ref R1) (pin 1))
+      (node (ref D1) (pin 2)))
+    (net (code 33) (name "Net-(C4-Pad1)")
+      (node (ref C4) (pin 1))
+      (node (ref R13) (pin 2))
+      (node (ref U1) (pin 11)))
+    (net (code 34) (name "Net-(R8-Pad1)")
+      (node (ref U1) (pin 4))
+      (node (ref R8) (pin 1))
+      (node (ref U1) (pin 10))
+      (node (ref U1) (pin 13)))
+    (net (code 35) (name /PWR_3,3-5V)
+      (node (ref D2) (pin 1))
+      (node (ref J2) (pin 1))
+      (node (ref P1) (pin 1)))
+    (net (code 36) (name "Net-(C2-Pad1)")
+      (node (ref U1) (pin 6))
+      (node (ref C2) (pin 1))
+      (node (ref R11) (pin 2)))
+    (net (code 37) (name "Net-(C5-Pad1)")
+      (node (ref U1) (pin 8))
+      (node (ref C5) (pin 1))
+      (node (ref R12) (pin 2)))
+    (net (code 38) (name "Net-(C3-Pad1)")
+      (node (ref R2) (pin 2))
+      (node (ref R14) (pin 2))
+      (node (ref C3) (pin 1))
+      (node (ref U1) (pin 3))
+      (node (ref U2) (pin 2)))
+    (net (code 39) (name /TD0-DONE)
+      (node (ref P1) (pin 3))
+      (node (ref J2) (pin 2))
+      (node (ref R14) (pin 1)))
+    (net (code 40) (name /TDI-DIN)
+      (node (ref P1) (pin 4))
+      (node (ref R11) (pin 1))
+      (node (ref J2) (pin 3)))
+    (net (code 41) (name /TCK-CCLK)
+      (node (ref P1) (pin 5))
+      (node (ref R12) (pin 1))
+      (node (ref J2) (pin 4)))
+    (net (code 42) (name /TMS-PROG)
+      (node (ref J2) (pin 5))
+      (node (ref P1) (pin 6))
+      (node (ref R13) (pin 1)))))

demos/sonde xilinx/sonde xilinx.pro

@@ -1,6 +1,6 @@
-update=07/03/2011 09:04:59
+update=07/01/2014 20:13:17
 version=1
-last_client=pcbnew
+last_client=eeschema
 [cvpcb]
 NetITyp=0
 NetIExt=.net
@@ -8,69 +8,6 @@ PkgIExt=.pkg
 NetDir=
 LibDir=
 NetType=0
-[general]
-version=1
-RootSch=sonde.sch
-BoardNm=sonde.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=conn
-LibName4=linear
-LibName5=regul
-LibName6=74xx
-LibName7=cmos4000
-LibName8=adc-dac
-LibName9=memory
-LibName10=xilinx
-LibName11=special
-LibName12=microcontrollers
-LibName13=microchip
-LibName14=microchip1
-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
 PadDrlX=320
@@ -98,3 +35,21 @@ LibName5=divers
 LibName6=libcms
 LibName7=display
 LibName8=valves
+[general]
+version=1
+[eeschema]
+version=1
+PageLayoutDescrFile=
+SubpartIdSeparator=0
+SubpartFirstId=65
+LibDir=
+NetFmtName=
+RptD_X=0
+RptD_Y=100
+RptLab=1
+LabSize=60
+[eeschema/libraries]
+LibName1=power
+LibName2=device
+LibName3=conn
+LibName4=74xx

demos/sonde xilinx/sonde xilinx.sch

@@ -1,33 +1,13 @@
-EESchema Schematic File Version 2  date 10/02/2011 12:23:20
+EESchema Schematic File Version 2
 LIBS:power
 LIBS:device
 LIBS:conn
-LIBS:linear
-LIBS:regul
 LIBS:74xx
-LIBS:cmos4000
-LIBS:adc-dac
-LIBS:memory
-LIBS:xilinx
-LIBS:special
-LIBS:microcontrollers
-LIBS:microchip
-LIBS:microchip1
-LIBS:analog_switches
-LIBS:motorola
-LIBS:intel
-LIBS:audio
-LIBS:interface
-LIBS:digital-audio
-LIBS:philips
-LIBS:display
-LIBS:cypress
-LIBS:siliconi
-LIBS:contrib
 LIBS:sonde xilinx-cache
-EELAYER 25  0
+EELAYER 24 0
 EELAYER END
-$Descr A4 11700 8267
+$Descr A4 11693 8268
+encoding utf-8
 Sheet 1 1
 Title "CABLE PARALLELE III"
 Date "10 feb 2011"
@@ -44,6 +24,8 @@ U 1 1 4D527316
 P 6650 2600
 F 0 "R11" V 6730 2600 50  0000 C CNN
 F 1 "100" V 6650 2600 50  0000 C CNN
+F 2 "" H 6650 2600 60  0001 C CNN
+F 3 "" H 6650 2600 60  0001 C CNN
 	1    6650 2600
 	0    1    1    0   
 $EndComp
@@ -62,6 +44,8 @@ U 1 1 3EBF81B1
 P 6300 4650
 F 0 "#PWR01" H 6300 4650 40  0001 C CNN
 F 1 "GND" H 6300 4580 40  0001 C CNN
+F 2 "" H 6300 4650 60  0001 C CNN
+F 3 "" H 6300 4650 60  0001 C CNN
 	1    6300 4650
 	1    0    0    -1  
 $EndComp
@@ -71,6 +55,8 @@ U 1 1 3EBF81A7
 P 6300 4450
 F 0 "C4" H 6350 4550 50  0000 L CNN
 F 1 "100pF" H 6350 4350 50  0000 L CNN
+F 2 "" H 6300 4450 60  0001 C CNN
+F 3 "" H 6300 4450 60  0001 C CNN
 	1    6300 4450
 	1    0    0    -1  
 $EndComp
@@ -80,6 +66,8 @@ U 1 1 4D528082
 P 6650 4200
 F 0 "R13" V 6730 4200 50  0000 C CNN
 F 1 "100" V 6650 4200 50  0000 C CNN
+F 2 "" H 6650 4200 60  0001 C CNN
+F 3 "" H 6650 4200 60  0001 C CNN
 	1    6650 4200
 	0    1    1    0   
 $EndComp
@@ -93,6 +81,8 @@ U 4 1 3EBF7DBD
 P 5450 4200
 F 0 "U1" H 5450 4300 50  0000 L BNN
 F 1 "74LS125" H 5500 4051 40  0000 L TNN
+F 2 "" H 5450 4200 60  0001 C CNN
+F 3 "" H 5450 4200 60  0001 C CNN
 	4    5450 4200
 	1    0    0    -1  
 $EndComp
@@ -127,6 +117,8 @@ U 1 1 3ECDE5C8
 P 10700 3900
 F 0 "J2" H 10700 4450 70  0000 C CNN
 F 1 "DB9MALE" H 10700 3353 70  0000 C CNN
+F 2 "" H 10700 3900 60  0001 C CNN
+F 3 "" H 10700 3900 60  0001 C CNN
 	1    10700 3900
 	1    0    0    1   
 $EndComp
@@ -148,6 +140,8 @@ U 1 1 3EBF848F
 P 6200 1050
 F 0 "#FLG02" H 6200 1320 30  0001 C CNN
 F 1 "PWR_FLAG" H 6200 1280 30  0000 C CNN
+F 2 "" H 6200 1050 60  0001 C CNN
+F 3 "" H 6200 1050 60  0001 C CNN
 	1    6200 1050
 	1    0    0    -1  
 $EndComp
@@ -157,6 +151,8 @@ U 1 1 3EBF8479
 P 5900 1050
 F 0 "#PWR03" H 5900 1150 30  0001 C CNN
 F 1 "VCC" H 5900 1150 30  0000 C CNN
+F 2 "" H 5900 1050 60  0001 C CNN
+F 3 "" H 5900 1050 60  0001 C CNN
 	1    5900 1050
 	1    0    0    -1  
 $EndComp
@@ -166,6 +162,8 @@ U 1 1 3EBF8458
 P 800 7300
 F 0 "#PWR04" H 800 7300 40  0001 C CNN
 F 1 "GND" H 800 7230 40  0001 C CNN
+F 2 "" H 800 7300 60  0001 C CNN
+F 3 "" H 800 7300 60  0001 C CNN
 	1    800  7300
 	1    0    0    -1  
 $EndComp
@@ -175,6 +173,8 @@ U 1 1 3EBF843C
 P 800 7300
 F 0 "#FLG05" H 800 7570 30  0001 C CNN
 F 1 "PWR_FLAG" H 800 7530 30  0000 C CNN
+F 2 "" H 800 7300 60  0001 C CNN
+F 3 "" H 800 7300 60  0001 C CNN
 	1    800  7300
 	1    0    0    -1  
 $EndComp
@@ -193,6 +193,8 @@ U 1 1 4D528081
 P 2500 2750
 F 0 "#PWR06" H 2500 2750 40  0001 C CNN
 F 1 "GND" H 2500 2680 40  0001 C CNN
+F 2 "" H 2500 2750 60  0001 C CNN
+F 3 "" H 2500 2750 60  0001 C CNN
 	1    2500 2750
 	1    0    0    -1  
 $EndComp
@@ -214,6 +216,8 @@ U 1 1 4D52808A
 P 10050 3600
 F 0 "#PWR07" H 10050 3600 40  0001 C CNN
 F 1 "GND" H 10050 3530 40  0001 C CNN
+F 2 "" H 10050 3600 60  0001 C CNN
+F 3 "" H 10050 3600 60  0001 C CNN
 	1    10050 3600
 	0    1    1    0   
 $EndComp
@@ -233,6 +237,8 @@ U 1 1 3EBF8376
 P 8500 2650
 F 0 "#PWR08" H 8500 2650 40  0001 C CNN
 F 1 "GND" H 8500 2580 40  0001 C CNN
+F 2 "" H 8500 2650 60  0001 C CNN
+F 3 "" H 8500 2650 60  0001 C CNN
 	1    8500 2650
 	0    1    1    0   
 $EndComp
@@ -268,6 +274,8 @@ U 1 1 3EBF830C
 P 8850 2800
 F 0 "P1" V 8800 2800 60  0000 C CNN
 F 1 "CONN_6" V 8900 2800 60  0000 C CNN
+F 2 "" H 8850 2800 60  0001 C CNN
+F 3 "" H 8850 2800 60  0001 C CNN
 	1    8850 2800
 	1    0    0    -1  
 $EndComp
@@ -280,6 +288,8 @@ U 1 1 3EBF82CF
 P 6500 1500
 F 0 "#PWR09" H 6500 1500 40  0001 C CNN
 F 1 "GND" H 6500 1430 40  0001 C CNN
+F 2 "" H 6500 1500 60  0001 C CNN
+F 3 "" H 6500 1500 60  0001 C CNN
 	1    6500 1500
 	1    0    0    -1  
 $EndComp
@@ -289,6 +299,8 @@ U 1 1 3EBF82C6
 P 6500 1300
 F 0 "C1" H 6550 1400 50  0000 L CNN
 F 1 "1uF" H 6550 1201 50  0000 L CNN
+F 2 "" H 6500 1300 60  0001 C CNN
+F 3 "" H 6500 1300 60  0001 C CNN
 	1    6500 1300
 	1    0    0    -1  
 $EndComp
@@ -313,6 +325,8 @@ U 1 1 4D528089
 P 6300 3750
 F 0 "#PWR010" H 6300 3750 40  0001 C CNN
 F 1 "GND" H 6300 3680 40  0001 C CNN
+F 2 "" H 6300 3750 60  0001 C CNN
+F 3 "" H 6300 3750 60  0001 C CNN
 	1    6300 3750
 	1    0    0    -1  
 $EndComp
@@ -322,6 +336,8 @@ U 1 1 4D528086
 P 6300 3550
 F 0 "C5" H 6350 3650 50  0000 L CNN
 F 1 "100pF" H 6350 3450 50  0000 L CNN
+F 2 "" H 6300 3550 60  0001 C CNN
+F 3 "" H 6300 3550 60  0001 C CNN
 	1    6300 3550
 	1    0    0    -1  
 $EndComp
@@ -331,6 +347,8 @@ U 1 1 4D528083
 P 6650 3300
 F 0 "R12" V 6730 3300 50  0000 C CNN
 F 1 "100" V 6650 3300 50  0000 C CNN
+F 2 "" H 6650 3300 60  0001 C CNN
+F 3 "" H 6650 3300 60  0001 C CNN
 	1    6650 3300
 	0    1    1    0   
 $EndComp
@@ -340,6 +358,8 @@ U 1 1 4D528088
 P 6300 3050
 F 0 "#PWR011" H 6300 3050 40  0001 C CNN
 F 1 "GND" H 6300 2980 40  0001 C CNN
+F 2 "" H 6300 3050 60  0001 C CNN
+F 3 "" H 6300 3050 60  0001 C CNN
 	1    6300 3050
 	1    0    0    -1  
 $EndComp
@@ -349,6 +369,8 @@ U 1 1 4D528085
 P 6300 2850
 F 0 "C2" H 6350 2950 50  0000 L CNN
 F 1 "100pF" H 6350 2750 50  0000 L CNN
+F 2 "" H 6300 2850 60  0001 C CNN
+F 3 "" H 6300 2850 60  0001 C CNN
 	1    6300 2850
 	1    0    0    -1  
 $EndComp
@@ -370,6 +392,8 @@ U 1 1 3EBF81B3
 P 6200 1600
 F 0 "#PWR012" H 6200 1600 40  0001 C CNN
 F 1 "GND" H 6200 1530 40  0001 C CNN
+F 2 "" H 6200 1600 60  0001 C CNN
+F 3 "" H 6200 1600 60  0001 C CNN
 	1    6200 1600
 	1    0    0    -1  
 $EndComp
@@ -379,6 +403,8 @@ U 1 1 4D528087
 P 6300 2350
 F 0 "#PWR013" H 6300 2350 40  0001 C CNN
 F 1 "GND" H 6300 2280 40  0001 C CNN
+F 2 "" H 6300 2350 60  0001 C CNN
+F 3 "" H 6300 2350 60  0001 C CNN
 	1    6300 2350
 	1    0    0    -1  
 $EndComp
@@ -388,6 +414,8 @@ U 1 1 4D528084
 P 6300 2150
 F 0 "C3" H 6350 2250 50  0000 L CNN
 F 1 "100pF" H 6350 2050 50  0000 L CNN
+F 2 "" H 6300 2150 60  0001 C CNN
+F 3 "" H 6300 2150 60  0001 C CNN
 	1    6300 2150
 	1    0    0    -1  
 $EndComp
@@ -397,6 +425,8 @@ U 1 1 3EBF819B
 P 6650 1900
 F 0 "R14" V 6730 1900 50  0000 C CNN
 F 1 "100" V 6650 1900 50  0000 C CNN
+F 2 "" H 6650 1900 60  0001 C CNN
+F 3 "" H 6650 1900 60  0001 C CNN
 	1    6650 1900
 	0    1    1    0   
 $EndComp
@@ -406,6 +436,8 @@ U 1 1 3EBF818E
 P 6200 1350
 F 0 "R5" V 6280 1350 50  0000 C CNN
 F 1 "1K" V 6200 1350 50  0000 C CNN
+F 2 "" H 6200 1350 60  0001 C CNN
+F 3 "" H 6200 1350 60  0001 C CNN
 	1    6200 1350
 	1    0    0    -1  
 $EndComp
@@ -415,6 +447,8 @@ U 1 1 3EBF8187
 P 5900 1350
 F 0 "R2" V 5980 1350 50  0000 C CNN
 F 1 "5,1K" V 5900 1350 50  0000 C CNN
+F 2 "" H 5900 1350 60  0001 C CNN
+F 3 "" H 5900 1350 60  0001 C CNN
 	1    5900 1350
 	1    0    0    -1  
 $EndComp
@@ -424,6 +458,8 @@ U 1 1 3EBF8176
 P 7100 1050
 F 0 "D2" H 7100 1150 40  0000 C CNN
 F 1 "BAT46" H 7100 950 40  0000 C CNN
+F 2 "" H 7100 1050 60  0001 C CNN
+F 3 "" H 7100 1050 60  0001 C CNN
 	1    7100 1050
 	-1   0    0    -1  
 $EndComp
@@ -433,6 +469,8 @@ U 1 1 3EBF815E
 P 4500 1050
 F 0 "D1" H 4500 1150 40  0000 C CNN
 F 1 "BAT46" H 4500 950 40  0000 C CNN
+F 2 "" H 4500 1050 60  0001 C CNN
+F 3 "" H 4500 1050 60  0001 C CNN
 	1    4500 1050
 	-1   0    0    -1  
 $EndComp
@@ -455,6 +493,8 @@ U 1 1 3EBF8100
 P 2500 1750
 F 0 "#PWR014" H 2500 1750 40  0001 C CNN
 F 1 "GND" H 2500 1680 40  0001 C CNN
+F 2 "" H 2500 1750 60  0001 C CNN
+F 3 "" H 2500 1750 60  0001 C CNN
 	1    2500 1750
 	1    0    0    -1  
 $EndComp
@@ -464,6 +504,8 @@ U 1 1 3EBF80DD
 P 4650 2000
 F 0 "#PWR015" H 4650 2000 40  0001 C CNN
 F 1 "GND" H 4650 1930 40  0001 C CNN
+F 2 "" H 4650 2000 60  0001 C CNN
+F 3 "" H 4650 2000 60  0001 C CNN
 	1    4650 2000
 	1    0    0    -1  
 $EndComp
@@ -536,6 +578,8 @@ U 1 1 3EBF7F0D
 P 1150 7300
 F 0 "#PWR016" H 1150 7300 40  0001 C CNN
 F 1 "GND" H 1150 7230 40  0001 C CNN
+F 2 "" H 1150 7300 60  0001 C CNN
+F 3 "" H 1150 7300 60  0001 C CNN
 	1    1150 7300
 	1    0    0    -1  
 $EndComp
@@ -554,6 +598,8 @@ U 4 1 3EBF7EEC
 P 1700 5600
 F 0 "U2" H 1700 5700 50  0000 L BNN
 F 1 "74LS125" H 1750 5450 40  0000 L TNN
+F 2 "" H 1700 5600 60  0001 C CNN
+F 3 "" H 1700 5600 60  0001 C CNN
 	4    1700 5600
 	1    0    0    -1  
 $EndComp
@@ -563,6 +609,8 @@ U 3 1 3EBF7EDF
 P 1700 6250
 F 0 "U2" H 1700 6350 50  0000 L BNN
 F 1 "74LS125" H 1750 6100 40  0000 L TNN
+F 2 "" H 1700 6250 60  0001 C CNN
+F 3 "" H 1700 6250 60  0001 C CNN
 	3    1700 6250
 	1    0    0    -1  
 $EndComp
@@ -572,6 +620,8 @@ U 2 1 3EBF7EDD
 P 1700 6900
 F 0 "U2" H 1700 7000 50  0000 L BNN
 F 1 "74LS125" H 1750 6750 40  0000 L TNN
+F 2 "" H 1700 6900 60  0001 C CNN
+F 3 "" H 1700 6900 60  0001 C CNN
 	2    1700 6900
 	1    0    0    -1  
 $EndComp
@@ -601,6 +651,8 @@ U 3 1 3EBF7DB3
 P 5450 3300
 F 0 "U1" H 5450 3400 50  0000 L BNN
 F 1 "74LS125" H 5500 3151 40  0000 L TNN
+F 2 "" H 5450 3300 60  0001 C CNN
+F 3 "" H 5450 3300 60  0001 C CNN
 	3    5450 3300
 	1    0    0    -1  
 $EndComp
@@ -610,6 +662,8 @@ U 2 1 3EBF7DAD
 P 5450 2600
 F 0 "U1" H 5450 2700 50  0000 L BNN
 F 1 "74LS125" H 5500 2451 40  0000 L TNN
+F 2 "" H 5450 2600 60  0001 C CNN
+F 3 "" H 5450 2600 60  0001 C CNN
 	2    5450 2600
 	1    0    0    -1  
 $EndComp
@@ -619,6 +673,8 @@ U 1 1 3EBF7D9F
 P 5450 1900
 F 0 "U1" H 5450 2000 50  0000 L BNN
 F 1 "74LS125" H 5500 1750 40  0000 L TNN
+F 2 "" H 5450 1900 60  0001 C CNN
+F 3 "" H 5450 1900 60  0001 C CNN
 	1    5450 1900
 	1    0    0    -1  
 $EndComp
@@ -628,6 +684,8 @@ U 1 1 3EBF7D92
 P 4650 1600
 F 0 "U2" H 4650 1700 50  0000 L BNN
 F 1 "74LS125" H 4700 1450 40  0000 L TNN
+F 2 "" H 4650 1600 60  0001 C CNN
+F 3 "" H 4650 1600 60  0001 C CNN
 	1    4650 1600
 	-1   0    0    -1  
 $EndComp
@@ -639,6 +697,8 @@ U 1 1 3EBF7D33
 P 3950 4200
 F 0 "R9" V 4030 4200 50  0000 C CNN
 F 1 "100" V 3950 4200 50  0000 C CNN
+F 2 "" H 3950 4200 60  0001 C CNN
+F 3 "" H 3950 4200 60  0001 C CNN
 	1    3950 4200
 	0    1    1    0   
 $EndComp
@@ -648,6 +708,8 @@ U 1 1 3EBF7D31
 P 3950 3300
 F 0 "R10" V 4030 3300 50  0000 C CNN
 F 1 "100" V 3950 3300 50  0000 C CNN
+F 2 "" H 3950 3300 60  0001 C CNN
+F 3 "" H 3950 3300 60  0001 C CNN
 	1    3950 3300
 	0    1    1    0   
 $EndComp
@@ -657,6 +719,8 @@ U 1 1 4D528080
 P 3950 2900
 F 0 "R8" V 4030 2900 50  0000 C CNN
 F 1 "100" V 3950 2900 50  0000 C CNN
+F 2 "" H 3950 2900 60  0001 C CNN
+F 3 "" H 3950 2900 60  0001 C CNN
 	1    3950 2900
 	0    1    1    0   
 $EndComp
@@ -666,6 +730,8 @@ U 1 1 4D52807F
 P 3950 2600
 F 0 "R7" V 4030 2600 50  0000 C CNN
 F 1 "100" V 3950 2600 50  0000 C CNN
+F 2 "" H 3950 2600 60  0001 C CNN
+F 3 "" H 3950 2600 60  0001 C CNN
 	1    3950 2600
 	0    1    1    0   
 $EndComp
@@ -675,6 +741,8 @@ U 1 1 3EBF7D26
 P 3950 2250
 F 0 "R6" V 4030 2250 50  0000 C CNN
 F 1 "100" V 3950 2250 50  0000 C CNN
+F 2 "" H 3950 2250 60  0001 C CNN
+F 3 "" H 3950 2250 60  0001 C CNN
 	1    3950 2250
 	0    1    1    0   
 $EndComp
@@ -684,6 +752,8 @@ U 1 1 3EBF7D22
 P 3950 1600
 F 0 "R4" V 4030 1600 50  0000 C CNN
 F 1 "47" V 3950 1600 50  0000 C CNN
+F 2 "" H 3950 1600 60  0001 C CNN
+F 3 "" H 3950 1600 60  0001 C CNN
 	1    3950 1600
 	0    1    1    0   
 $EndComp
@@ -693,6 +763,8 @@ U 1 1 3EBF7D16
 P 3950 1050
 F 0 "R1" V 4030 1050 50  0000 C CNN
 F 1 "100" V 3950 1050 50  0000 C CNN
+F 2 "" H 3950 1050 60  0001 C CNN
+F 3 "" H 3950 1050 60  0001 C CNN
 	1    3950 1050
 	0    1    1    0   
 $EndComp
@@ -702,6 +774,8 @@ U 1 1 3EBF7D04
 P 1750 2800
 F 0 "J1" H 1800 4150 70  0000 C CNN
 F 1 "DB25MALE" H 1700 1450 70  0000 C CNN
+F 2 "" H 1750 2800 60  0001 C CNN
+F 3 "" H 1750 2800 60  0001 C CNN
 	1    1750 2800
 	-1   0    0    -1  
 $EndComp

demos/test_pads_inside_pads/test_pads_inside_pads.net

@@ -1,25 +1,44 @@
-# EESchema Netlist Version 1.1 created  19/12/2011 12:55:28
-(
- ( /4EE5056D $noname  P4 CONN_1 {Lib=CONN_1}
-  (    1 /NET1 )
- )
- ( /4EE5056C $noname  P3 CONN_1 {Lib=CONN_1}
-  (    1 /NET1 )
- )
- ( /4EDF7CC5 $noname  P1 CONN_1 {Lib=CONN_1}
-  (    1 /NET2 )
- )
- ( /4EDF7CC0 $noname  P2 CONN_1 {Lib=CONN_1}
-  (    1 /NET2 )
- )
-)
-*
-{ Pin List by Nets
-Net 1 "/NET1" "NET1"
- P4 1
- P3 1
-Net 2 "/NET2" "NET2"
- P1 1
- P2 1
-}
-#End
+(export (version D)
+  (design
+    (source F:/kicad-launchpad/testing/demos/test_pads_inside_pads/test_pads_inside_pads.sch)
+    (date "09/01/2014 15:29:02")
+    (tool "eeschema (2014-01-08 BZR 4616)-product"))
+  (components
+    (comp (ref P4)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4EE5056D))
+    (comp (ref P3)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4EE5056C))
+    (comp (ref P1)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4EDF7CC5))
+    (comp (ref P2)
+      (value CONN_1)
+      (libsource (lib conn) (part CONN_1))
+      (sheetpath (names /) (tstamps /))
+      (tstamp 4EDF7CC0)))
+  (libparts
+    (libpart (lib conn) (part CONN_1)
+      (description "1 pin")
+      (fields
+        (field (name Reference) P)
+        (field (name Value) CONN_1))
+      (pins
+        (pin (num 1) (name 1) (type passive)))))
+  (libraries
+    (library (logical conn)
+      (uri F:\kicad\share\library\conn.lib)))
+  (nets
+    (net (code 1) (name /NET1)
+      (node (ref P4) (pin 1))
+      (node (ref P3) (pin 1)))
+    (net (code 2) (name /NET2)
+      (node (ref P1) (pin 1))
+      (node (ref P2) (pin 1)))))

demos/test_xil_95108/carte_test-cache.lib

@@ -1,10 +1,13 @@
-EESchema-LIBRARY Version 2.3  Date: 02/12/2009 10:35:45
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
 #
 # +12V
 #
 DEF +12V #PWR 0 0 N Y 1 F P
 F0 "#PWR" 0 -50 20 H I C CNN
 F1 "+12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X +12V 1 0 0 0 U 20 30 0 0 W N
 C 0 60 20 0 1 0 N
@@ -17,6 +20,8 @@ ENDDEF
 DEF -12V #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 130 20 H I C CNN
 F1 "-12V" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X -12V 1 0 0 0 U 20 20 0 0 W N
 P 3 0 1 0  0 0  0 50  0 50 N
@@ -29,6 +34,8 @@ ENDDEF
 DEF 74HCT04 U 0 30 Y Y 6 F N
 F0 "U" 150 100 40 H V C CNN
 F1 "74HCT04" 200 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS 74HC14 74HC04 74LS14
 DRAW
 P 4 0 0 0  -150 150  -150 -150  150 0  -150 150 N
@@ -66,6 +73,8 @@ ENDDEF
 DEF 7805 U 0 30 N Y 1 F N
 F0 "U" 150 -196 60 H V C CNN
 F1 "7805" 0 200 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 ALIAS LM7805 LM7812 78L05
 DRAW
 S -200 -150 200 150 0 1 0 N
@@ -78,16 +87,18 @@ ENDDEF
 # C
 #
 DEF C C 0 10 N Y 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "C" 50 -100 50 H V L CNN
+F0 "C" 0 100 40 H V L CNN
+F1 "C" 6 -85 40 H V L CNN
+F2 "" 38 -150 30 H V C CNN
+F3 "" 0 100 30 H V C CNN
 $FPLIST
  SM*
  C?
  C1-1
 $ENDFPLIST
 DRAW
-P 2 0 1 10  -100 -30  100 -30 N
-P 2 0 1 10  -100 30  100 30 N
+P 2 0 1 20  -80 -30  80 -30 N
+P 2 0 1 20  -80 30  80 30 N
 X ~ 1 0 200 170 D 40 40 1 1 P
 X ~ 2 0 -200 170 U 40 40 1 1 P
 ENDDRAW
@@ -98,6 +109,8 @@ ENDDEF
 DEF CONN_2 P 0 40 Y N 1 F N
 F0 "P" -50 0 40 V V C CNN
 F1 "CONN_2" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 150 100 -150 0 1 0 N
 X P1 1 -350 100 250 R 60 60 1 1 P I
@@ -110,6 +123,8 @@ ENDDEF
 DEF CONN_2X2 P 0 40 Y N 1 F N
 F0 "P" 0 150 50 H V C CNN
 F1 "CONN_2X2" 10 -130 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 100 100 -100 0 1 0 N
 X 1 1 -400 50 300 R 60 60 1 1 P I
@@ -124,6 +139,8 @@ ENDDEF
 DEF CONN_3 K 0 40 Y N 1 F N
 F0 "K" -50 0 50 V V C CNN
 F1 "CONN_3" 50 0 40 V V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -100 150 100 -150 0 1 0 N
 X P1 1 -350 100 250 R 60 60 1 1 P I
@@ -135,15 +152,17 @@ ENDDEF
 # CP
 #
 DEF CP C 0 10 N N 1 F N
-F0 "C" 50 100 50 H V L CNN
-F1 "CP" 50 -100 50 H V L CNN
+F0 "C" 50 100 40 H V L CNN
+F1 "CP" 50 -100 40 H V L CNN
+F2 "" 100 -150 30 H V C CNN
+F3 "" 50 100 30 H V C CNN
 ALIAS CAPAPOL
 $FPLIST
  CP*
  SM*
 $ENDFPLIST
 DRAW
-P 4 0 1 8  -100 50  -100 -50  100 -50  100 50 N
+P 4 0 1 8  -80 50  -80 -50  80 -50  80 50 N
 P 4 0 1 0  -50 50  -50 -20  50 -20  50 50 F
 X ~ 1 0 200 150 D 40 40 1 1 P
 X ~ 2 0 -200 150 U 40 40 1 1 P
@@ -152,9 +171,11 @@ ENDDEF
 #
 # CRYSTAL
 #
-DEF CRYSTAL X 0 40 N N 0 F N
+DEF CRYSTAL X 0 40 N N 1 F N
 F0 "X" 0 150 60 H V C CNN
 F1 "CRYSTAL" 0 -150 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 1 16  -100 100  -100 -100 N
 P 2 0 1 16  100 100  100 -100 N
@@ -169,6 +190,8 @@ ENDDEF
 DEF DB25 J 0 40 Y N 1 F N
 F0 "J" 50 1350 70 H V C CNN
 F1 "DB25" -50 -1350 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 A -109 1270 41 1799 774 0 1 0 N -150 1270 -100 1310
 A -108 -1259 42 -1787 -788 0 1 0 N -150 -1260 -100 -1300
@@ -261,6 +284,8 @@ ENDDEF
 DEF DB9 J 0 40 Y N 1 F N
 F0 "J" 0 550 70 H V C CNN
 F1 "DB9" 0 -550 70 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 C -70 -400 30 0 1 0 N
 C -70 -200 30 0 1 0 N
@@ -309,6 +334,8 @@ ENDDEF
 DEF DIODE D 0 40 N N 1 F N
 F0 "D" 0 100 40 H V C CNN
 F1 "DIODE" 0 -100 40 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  D?
  S*
@@ -326,6 +353,8 @@ ENDDEF
 DEF ~GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 0 30 H I C CNN
 F1 "GND" 0 -70 30 H I C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 4 0 1 0  -50 0  0 -50  50 0  -50 0 N
 X GND 1 0 0 0 U 30 30 1 1 W N
@@ -337,6 +366,8 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 $FPLIST
  LED-3MM
  LED-5MM
@@ -361,6 +392,8 @@ ENDDEF
 DEF LM318N U 0 30 Y Y 1 F N
 F0 "U" 100 300 60 H V C CNN
 F1 "LM318N" 210 -250 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 P 2 0 1 0  -200 -200  -200 200 N
 P 2 0 1 0  -200 200  200 0 N
@@ -382,25 +415,29 @@ ENDDEF
 # PWR_FLAG
 #
 DEF PWR_FLAG #FLG 0 0 N N 1 F P
-F0 "#FLG" 0 270 30 H I C CNN
-F1 "PWR_FLAG" 0 230 30 H V C CNN
+F0 "#FLG" 0 95 30 H I C CNN
+F1 "PWR_FLAG" 0 180 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X pwr 1 0 0 0 U 20 20 0 0 w
-P 3 0 1 0  0 0  0 100  0 100 N
-P 5 0 1 0  0 100  -100 150  0 200  100 150  0 100 N
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
 ENDDRAW
 ENDDEF
 #
 # R
 #
 DEF R R 0 0 N Y 1 F N
-F0 "R" 80 0 50 V V C CNN
-F1 "R" 0 0 50 V V C CNN
+F0 "R" 80 0 40 V V C CNN
+F1 "R" 7 1 40 V V C CNN
+F2 "" -70 0 30 V V C CNN
+F3 "" 0 0 30 H V C CNN
 $FPLIST
  R?
  SM0603
  SM0805
  R?-*
+ SM1206
 $ENDFPLIST
 DRAW
 S -40 150 40 -150 0 1 12 N
@@ -414,6 +451,8 @@ ENDDEF
 DEF RAM_32KO U 0 40 Y Y 1 F N
 F0 "U" 150 900 70 H V C CNN
 F1 "RAM_32KO" 300 -1100 60 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X GND 14 0 -1050 0 U 60 60 0 0 W N
 X VCC 28 0 850 0 D 60 60 0 0 W N
@@ -452,6 +491,8 @@ ENDDEF
 DEF SW_PUSH SW 0 40 N N 1 F N
 F0 "SW" 150 110 50 H V C CNN
 F1 "SW_PUSH" 0 -80 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -170 50 170 60 0 1 0 N
 P 4 0 1 0  -40 60  -30 90  30 90  40 60 N
@@ -465,6 +506,8 @@ ENDDEF
 DEF TDA8702 U 0 40 Y Y 1 F N
 F0 "U" 200 800 60 H V L CNN
 F1 "TDA8702" 200 -800 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -500 700 500 -700 0 1 0 N
 X VREF 1 -800 -400 300 R 50 50 1 1 B
@@ -509,6 +552,8 @@ ENDDEF
 DEF VCC #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 100 30 H I C CNN
 F1 "VCC" 0 100 30 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 X VCC 1 0 0 0 U 20 20 0 0 W N
 C 0 50 20 0 1 0 N
@@ -521,6 +566,8 @@ ENDDEF
 DEF XC95108PC84 U 0 30 Y Y 1 F N
 F0 "U" 550 2550 60 H V L CNN
 F1 "XC95108PC84" 400 -1950 60 H V L CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
 DRAW
 S -850 2450 850 -1850 0 1 0 N
 X P1 1 -1150 1850 300 R 60 60 1 1 B

demos/test_xil_95108/carte_test.pro

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

eeschema/block_libedit.cpp

@@ -34,7 +34,6 @@
 
 #include <general.h>
 #include <class_library.h>
-#include <protos.h>
 #include <libeditframe.h>
 
 

eeschema/bus-wire-junction.cpp

@@ -36,7 +36,6 @@
 #include <lib_draw_item.h>
 #include <lib_pin.h>
 #include <general.h>
-#include <protos.h>
 #include <sch_bus_entry.h>
 #include <sch_junction.h>
 #include <sch_line.h>

eeschema/busentry.cpp

@@ -36,7 +36,6 @@
 #include <wxEeschemaStruct.h>
 
 #include <general.h>
-#include <protos.h>
 #include <sch_bus_entry.h>
 
 

eeschema/class_libentry.cpp

@@ -37,7 +37,6 @@
 #include <richio.h>
 
 #include <general.h>
-#include <protos.h>
 #include <template_fieldnames.h>
 #include <transform.h>
 #include <class_library.h>

eeschema/class_library.cpp

@@ -37,7 +37,6 @@
 #include <richio.h>
 
 #include <general.h>
-#include <protos.h>
 #include <class_library.h>
 
 #include <boost/foreach.hpp>
@@ -45,18 +44,18 @@
 #include <wx/tokenzr.h>
 #include <wx/regex.h>
 
-static const wxChar* duplicate_name_msg =
+static const wxString duplicate_name_msg =
 _( "Library <%s> has duplicate entry name <%s>.\n\
 This may cause some unexpected behavior when loading components into a schematic." );
 
 
-bool operator==( const CMP_LIBRARY& aLibrary, const wxChar* aName )
+bool operator==( const CMP_LIBRARY& aLibrary, const wxString& aName )
 {
     return aLibrary.GetName().CmpNoCase( aName ) == 0;
 }
 
 
-bool operator!=( const CMP_LIBRARY& aLibrary, const wxChar* aName )
+bool operator!=( const CMP_LIBRARY& aLibrary, const wxString& aName )
 {
     return !( aLibrary == aName );
 }
@@ -225,10 +224,10 @@ bool CMP_LIBRARY::Conflicts( LIB_COMPONENT* aComponent )
 }
 
 
-LIB_ALIAS* CMP_LIBRARY::FindEntry( const wxChar* aName )
+LIB_ALIAS* CMP_LIBRARY::FindEntry( const wxString& aName )
 {
 
-    LIB_ALIAS_MAP::iterator it = aliases.find( wxString( aName ) );
+    LIB_ALIAS_MAP::iterator it = aliases.find( aName );
 
     if( it != aliases.end() )
         return (*it).second;
@@ -246,7 +245,7 @@ LIB_ALIAS* CMP_LIBRARY::GetFirstEntry()
 }
 
 
-LIB_COMPONENT* CMP_LIBRARY::FindComponent( const wxChar* aName )
+LIB_COMPONENT* CMP_LIBRARY::FindComponent( const wxString& aName )
 {
     LIB_COMPONENT* component = NULL;
     LIB_ALIAS* entry = FindEntry( aName );
@@ -393,12 +392,12 @@ LIB_COMPONENT* CMP_LIBRARY::ReplaceComponent( LIB_COMPONENT* aOldComponent,
 }
 
 
-LIB_ALIAS* CMP_LIBRARY::GetNextEntry( const wxChar* aName )
+LIB_ALIAS* CMP_LIBRARY::GetNextEntry( const wxString& aName )
 {
     if( aliases.empty() )
         return NULL;
 
-    LIB_ALIAS_MAP::iterator it = aliases.find( wxString( aName ) );
+    LIB_ALIAS_MAP::iterator it = aliases.find( aName );
 
     it++;
 
@@ -409,12 +408,12 @@ LIB_ALIAS* CMP_LIBRARY::GetNextEntry( const wxChar* aName )
 }
 
 
-LIB_ALIAS* CMP_LIBRARY::GetPreviousEntry( const wxChar* aName )
+LIB_ALIAS* CMP_LIBRARY::GetPreviousEntry( const wxString& aName )
 {
     if( aliases.empty() )
         return NULL;
 
-    LIB_ALIAS_MAP::iterator it = aliases.find( wxString( aName ) );
+    LIB_ALIAS_MAP::iterator it = aliases.find( aName );
 
     if( it == aliases.begin() )
         it = aliases.end();

eeschema/class_library.h

@@ -240,7 +240,7 @@ public:
      * @param aName - Name of entry, case insensitive.
      * @return Entry if found.  NULL if not found.
      */
-    LIB_ALIAS* FindEntry( const wxChar* aName );
+    LIB_ALIAS* FindEntry( const wxString& aName );
 
     /**
      * Find component by \a aName.
@@ -251,7 +251,7 @@ public:
      * @param aName - Name of component, case insensitive.
      * @return Component if found.  NULL if not found.
      */
-    LIB_COMPONENT* FindComponent( const wxChar* aName );
+    LIB_COMPONENT* FindComponent( const wxString& aName );
 
     /**
      * Find alias by \a nName.
@@ -262,7 +262,7 @@ public:
      * @param aName - Name of alias, case insensitive.
      * @return Alias if found.  NULL if not found.
      */
-    LIB_ALIAS* FindAlias( const wxChar* aName )
+    LIB_ALIAS* FindAlias( const wxString& aName )
     {
         return (LIB_ALIAS*) FindEntry( aName );
     }
@@ -331,7 +331,7 @@ public:
      * @param aName - Name of current entry.
      * @return Next entry if entry name is found. Otherwise NULL.
      */
-    LIB_ALIAS* GetNextEntry( const wxChar* aName );
+    LIB_ALIAS* GetNextEntry( const wxString& aName );
 
 
     /**
@@ -343,7 +343,7 @@ public:
      * @param aName - Name of current entry.
      * @return Previous entry if entry name is found, otherwise NULL.
      */
-    LIB_ALIAS* GetPreviousEntry( const wxChar* aName );
+    LIB_ALIAS* GetPreviousEntry( const wxString& aName );
 
     /**
      * Return the file name without path or extension.
@@ -525,7 +525,7 @@ public:
 /**
  * Case insensitive library name comparison.
  */
-extern bool operator==( const CMP_LIBRARY& aLibrary, const wxChar* aName );
-extern bool operator!=( const CMP_LIBRARY& aLibrary, const wxChar* aName );
+extern bool operator==( const CMP_LIBRARY& aLibrary, const wxString& aName );
+extern bool operator!=( const CMP_LIBRARY& aLibrary, const wxString& aName );
 
 #endif  //  CLASS_LIBRARY_H

eeschema/controle.cpp

@@ -38,7 +38,6 @@
 #include <eeschema_id.h>
 #include <general.h>
 #include <hotkeys.h>
-#include <protos.h>
 #include <libeditframe.h>
 #include <viewlib_frame.h>
 #include <lib_draw_item.h>

eeschema/cross-probing.cpp

@@ -35,15 +35,13 @@
 
 #include <general.h>
 #include <eeschema_id.h>
-#include <protos.h>
 #include <lib_draw_item.h>
 #include <lib_pin.h>
 #include <sch_component.h>
 
 
 /**
- * Function RemoteCommand
- * read a remote command sent by Pcbnew via a socket connection.
+ * Execute a remote command sent by Pcbnew via a socket connection.
  * <p>
  * When user selects a module or pin in Pcbnew, Eeschema shows that same
  * component or pin and moves cursor on the item.  The socket port used
@@ -57,7 +55,7 @@
  * <p>
  * @param cmdline = received command from Pcbnew
  */
-void RemoteCommand( const char* cmdline )
+void SCH_EDIT_FRAME::ExecuteRemoteCommand( const char* cmdline )
 {
     char     line[1024];
     char*    idcmd;