From 75f332aefc89bedddcca290382c53b1b595a4dc2 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Mon, 21 Feb 2011 19:27:47 +0100 Subject: [PATCH] Cvpcb: code cleaning. Remove not used and useless files. --- cvpcb/autosel.cpp | 4 +- cvpcb/cfg.cpp | 1 - cvpcb/class_DisplayFootprintsFrame.cpp | 1 - cvpcb/class_components_listbox.cpp | 1 - cvpcb/class_cvpcb.cpp | 12 +- cvpcb/class_footprints_listbox.cpp | 37 +- cvpcb/cvframe.cpp | 2 - cvpcb/cvpcb.cpp | 1 - cvpcb/cvpcb.h | 25 - cvpcb/cvpcb_mainframe.h | 20 +- cvpcb/cvstruct.h | 1 - cvpcb/dialogs/dialog_display_options.cpp | 1 + cvpcb/footprint_info.h | 39 + cvpcb/genequiv.cpp | 1 - cvpcb/genorcad.cpp | 175 --- cvpcb/init.cpp | 6 +- cvpcb/listboxes.cpp | 1 - cvpcb/listlib.cpp | 5 +- cvpcb/loadcmp.cpp | 1 - cvpcb/protos.h | 18 - cvpcb/readschematicnetlist.cpp | 2 - cvpcb/savecmp.cpp | 7 +- cvpcb/setvisu.cpp | 4 +- cvpcb/tool_cvpcb.cpp | 1 - cvpcb/writenetlistpcbnew.cpp | 9 +- demos/interf_u/interf_u.cmp | 170 ++- demos/interf_u/interf_u.net | 1297 ++++++++-------------- 27 files changed, 698 insertions(+), 1144 deletions(-) create mode 100644 cvpcb/footprint_info.h delete mode 100644 cvpcb/genorcad.cpp delete mode 100644 cvpcb/protos.h diff --git a/cvpcb/autosel.cpp b/cvpcb/autosel.cpp index 4584898f12..7e69a8322d 100644 --- a/cvpcb/autosel.cpp +++ b/cvpcb/autosel.cpp @@ -12,11 +12,9 @@ #include "kicad_string.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" - #define QUOTE '\'' class FOOTPRINT_ALIAS @@ -151,7 +149,7 @@ found in the default search paths." ), if( alias.m_Name.CmpNoCase( component.m_Value ) != 0 ) continue; - BOOST_FOREACH( FOOTPRINT& footprint, m_footprints ) + BOOST_FOREACH( FOOTPRINT_INFO& footprint, m_footprints ) { if( alias.m_FootprintName.CmpNoCase( footprint.m_Module ) == 0 ) { diff --git a/cvpcb/cfg.cpp b/cvpcb/cfg.cpp index 81c115475d..e4ced33120 100644 --- a/cvpcb/cfg.cpp +++ b/cvpcb/cfg.cpp @@ -8,7 +8,6 @@ #include "gestfich.h" #include "param_config.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" diff --git a/cvpcb/class_DisplayFootprintsFrame.cpp b/cvpcb/class_DisplayFootprintsFrame.cpp index e49bc17328..863e73f606 100644 --- a/cvpcb/class_DisplayFootprintsFrame.cpp +++ b/cvpcb/class_DisplayFootprintsFrame.cpp @@ -11,7 +11,6 @@ #include "cvpcb.h" #include "bitmaps.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "class_DisplayFootprintsFrame.h" #include "cvpcb_id.h" diff --git a/cvpcb/class_components_listbox.cpp b/cvpcb/class_components_listbox.cpp index a570829dba..b5bfd940f6 100644 --- a/cvpcb/class_components_listbox.cpp +++ b/cvpcb/class_components_listbox.cpp @@ -7,7 +7,6 @@ #include "common.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" diff --git a/cvpcb/class_cvpcb.cpp b/cvpcb/class_cvpcb.cpp index e362cfebbf..a45e0a76b4 100644 --- a/cvpcb/class_cvpcb.cpp +++ b/cvpcb/class_cvpcb.cpp @@ -6,6 +6,7 @@ #include "kicad_string.h" #include "cvpcb.h" +#include "footprint_info.h" PIN::PIN() @@ -56,14 +57,3 @@ bool operator<( const COMPONENT& item1, const COMPONENT& item2 ) item2.m_Reference.GetData() ) < 0 ); } - -FOOTPRINT::FOOTPRINT() -{ - m_Num = 0; -} - -bool operator<( const FOOTPRINT& item1, const FOOTPRINT& item2 ) -{ - return ( StrNumICmp( item1.m_Module.GetData(), - item2.m_Module.GetData() ) < 0 ); -} diff --git a/cvpcb/class_footprints_listbox.cpp b/cvpcb/class_footprints_listbox.cpp index eff799c045..b819fb34d3 100644 --- a/cvpcb/class_footprints_listbox.cpp +++ b/cvpcb/class_footprints_listbox.cpp @@ -1,17 +1,28 @@ -/*************************************************************************/ -/* listboxes.cpp: class for displaying footprint list and component list */ -/*************************************************************************/ +/** + * @file class_footprints_listbox.cpp + * class to display the list fo available footprints + */ #include "fctsys.h" #include "wxstruct.h" #include "common.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" +FOOTPRINT_INFO* GetModuleDescrByName( const wxString& FootprintName, FOOTPRINT_LIST& list ) +{ + BOOST_FOREACH( FOOTPRINT_INFO & footprint, list ) + { + if( footprint.m_Module == FootprintName ) + return &footprint; + } + + return NULL; +} + /***************************************/ /* ListBox handling the footprint list */ /***************************************/ @@ -116,7 +127,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list ) m_FullFootprintList.Clear(); - BOOST_FOREACH( FOOTPRINT & footprint, list ) { + BOOST_FOREACH( FOOTPRINT_INFO & footprint, list ) { msg.Printf( wxT( "%3d %s" ), m_FullFootprintList.GetCount() + 1, footprint.m_Module.GetData() ); m_FullFootprintList.Add( msg ); @@ -142,7 +153,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT* Component, m_FilteredFootprintList.Clear(); - BOOST_FOREACH( FOOTPRINT & footprint, list ) { + BOOST_FOREACH( FOOTPRINT_INFO & footprint, list ) { /* Search for matching footprints */ for( jj = 0; jj < Component->m_FootprintFilter.GetCount(); jj++ ) { @@ -236,7 +247,7 @@ END_EVENT_TABLE() void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event ) /********************************************************/ { - FOOTPRINT* Module; + FOOTPRINT_INFO* Module; wxString FootprintName = GetSelectedFootprint(); Module = GetModuleDescrByName( FootprintName, GetParent()->m_footprints ); @@ -269,18 +280,6 @@ void FOOTPRINTS_LISTBOX::OnLeftDClick( wxListEvent& event ) } -FOOTPRINT* GetModuleDescrByName( const wxString& FootprintName, - FOOTPRINT_LIST& list ) -{ - BOOST_FOREACH( FOOTPRINT & footprint, list ) { - if( footprint.m_Module == FootprintName ) - return &footprint; - } - - return NULL; -} - - /** * Function OnChar * called on a key pressed diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp index 46c92f99b5..94c51f38bd 100644 --- a/cvpcb/cvframe.cpp +++ b/cvpcb/cvframe.cpp @@ -12,7 +12,6 @@ #include "bitmaps.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" #include "dialog_cvpcb_config.h" @@ -110,7 +109,6 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( const wxString& title, long style ) : DrawFrame = NULL; m_HToolBar = NULL; m_modified = false; - m_rightJustify = false; m_isEESchemaNetlist = false; m_KeepCvpcbOpen = false; m_undefinedComponentCnt = 0; diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp index 6978deab98..ea20a6a6b4 100644 --- a/cvpcb/cvpcb.cpp +++ b/cvpcb/cvpcb.cpp @@ -12,7 +12,6 @@ #include "cvpcb.h" #include "zones.h" #include "bitmaps.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "colors_selection.h" #include "cvpcb_id.h" diff --git a/cvpcb/cvpcb.h b/cvpcb/cvpcb.h index c7dfa54897..fa3704acfa 100644 --- a/cvpcb/cvpcb.h +++ b/cvpcb/cvpcb.h @@ -19,14 +19,6 @@ #define FILTERFOOTPRINTKEY "FilterFootprint" -/* Net list types. */ -#define TYPE_NON_SPECIFIE 0 -#define TYPE_ORCADPCB2 1 -#define TYPE_PCAD 2 -#define TYPE_VIEWLOGIC_WIR 3 -#define TYPE_VIEWLOGIC_NET 4 - - class PIN { public: @@ -76,23 +68,6 @@ typedef boost::ptr_vector< COMPONENT > COMPONENT_LIST; extern bool operator<( const COMPONENT& item1, const COMPONENT& item2 ); -class FOOTPRINT -{ -public: - wxString m_Module; /* Module name. */ - wxString m_LibName; /* Name of the library containing this module. */ - int m_Num; /* Order number in the display list. */ - wxString m_Doc; /* Footprint description. */ - wxString m_KeyWord; /* Footprint key words. */ - - FOOTPRINT(); -}; - -typedef boost::ptr_vector< FOOTPRINT > FOOTPRINT_LIST; - -/* FOOTPRINT object list sort function. */ -extern bool operator<( const FOOTPRINT& item1, const FOOTPRINT& item2 ); - extern const wxString FootprintAliasFileExtension; extern const wxString RetroFileExtension; extern const wxString ComponentFileExtension; diff --git a/cvpcb/cvpcb_mainframe.h b/cvpcb/cvpcb_mainframe.h index 26bccfe38a..ddddc9b2f9 100644 --- a/cvpcb/cvpcb_mainframe.h +++ b/cvpcb/cvpcb_mainframe.h @@ -9,6 +9,7 @@ #include #include "param_config.h" #include "cvpcb.h" +#include "footprint_info.h" /* Forward declarations of all top-level window classes. */ class FOOTPRINTS_LISTBOX; @@ -41,7 +42,6 @@ public: protected: int m_undefinedComponentCnt; bool m_modified; - bool m_rightJustify; bool m_isEESchemaNetlist; PARAM_CFG_ARRAY m_projectFileParams; @@ -90,7 +90,9 @@ public: void SaveProjectFile( const wxString& fileName ); virtual void LoadSettings(); virtual void SaveSettings(); - /** DisplayStatus() + + /** + * Function DisplayStatus() * Displays info to the status line at bottom of the main frame */ void DisplayStatus(); @@ -108,6 +110,20 @@ public: */ bool LoadFootprintFiles( ); + /** + * function GenNetlistPcbnew + * writes the output netlist file + * + */ + int GenNetlistPcbnew( FILE* f, bool isEESchemaNetlist = true ); + + /** + * Function LoadComponentFile + * Loads the .cmp file that stores the component/footprint association. + * @param aCmpFileName = the full filename of .cmp file to load + */ + bool LoadComponentFile( const wxString& aCmpFileName ); + PARAM_CFG_ARRAY& GetProjectFileParameters( void ); DECLARE_EVENT_TABLE() diff --git a/cvpcb/cvstruct.h b/cvpcb/cvstruct.h index a0e1e5d01b..c9996951bd 100644 --- a/cvpcb/cvstruct.h +++ b/cvpcb/cvstruct.h @@ -11,7 +11,6 @@ /* Forward declarations of all top-level window classes. */ class CVPCB_MAINFRAME; - /*********************************************************************/ /* ListBox (base class) to display lists of components or footprints */ /*********************************************************************/ diff --git a/cvpcb/dialogs/dialog_display_options.cpp b/cvpcb/dialogs/dialog_display_options.cpp index f29069d815..06447890e8 100644 --- a/cvpcb/dialogs/dialog_display_options.cpp +++ b/cvpcb/dialogs/dialog_display_options.cpp @@ -9,6 +9,7 @@ #include "cvpcb.h" //#include "protos.h" #include "class_drawpanel.h" +#include "footprint_info.h" #include "cvstruct.h" #include "class_DisplayFootprintsFrame.h" diff --git a/cvpcb/footprint_info.h b/cvpcb/footprint_info.h new file mode 100644 index 0000000000..6d2bda6e9d --- /dev/null +++ b/cvpcb/footprint_info.h @@ -0,0 +1,39 @@ +/* + * @file footprint_info.h + */ + +#ifndef _FOOTPRINT_INFO_H_ +#define _FOOTPRINT_INFO_H_ + +#include "kicad_string.h" + +/* + * class FOOTPRINT_INFO is a helper class to handle the list of footprints + * available in libraries + * It stores footprint names, doc and keywords + */ +class FOOTPRINT_INFO +{ +public: + wxString m_Module; /* Module name. */ + wxString m_LibName; /* Name of the library containing this module. */ + int m_Num; /* Order number in the display list. */ + wxString m_Doc; /* Footprint description. */ + wxString m_KeyWord; /* Footprint key words. */ + + FOOTPRINT_INFO() + { + m_Num = 0; + } +}; + +typedef boost::ptr_vector< FOOTPRINT_INFO > FOOTPRINT_LIST; + +/* FOOTPRINT object list sort function. */ +inline bool operator<( const FOOTPRINT_INFO& item1, const FOOTPRINT_INFO& item2 ) +{ + return ( StrNumICmp( item1.m_Module.GetData(), + item2.m_Module.GetData() ) < 0 ); +} + +#endif // _FOOTPRINT_INFO_H_ diff --git a/cvpcb/genequiv.cpp b/cvpcb/genequiv.cpp index 169ee40f5d..b6d55cd2c7 100644 --- a/cvpcb/genequiv.cpp +++ b/cvpcb/genequiv.cpp @@ -9,7 +9,6 @@ #include "macros.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" diff --git a/cvpcb/genorcad.cpp b/cvpcb/genorcad.cpp deleted file mode 100644 index aadf135a27..0000000000 --- a/cvpcb/genorcad.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/*****************/ -/* genorcad.cpp */ -/*****************/ - -/* - * Create the netlist (* NET) by placing the *.lib ref FORMAT ORCADPCB - * The value (share value) is truncated to 16 letters. - */ - -#include "fctsys.h" - -#include "common.h" -#include "cvpcb.h" - -#include "protos.h" - -#define MAX_LEN_NETNAME 16 - - -static void TriPinsModule( COMPONENT* CurrentCmp ); -static void ChangePinNet( wxString& PinNet, bool rightJustify ); - - -int NetNumCode; /* Number of used for NetNames created during - * reallocation of NetNames. */ - -int genorcad( bool rightJustify ) -{ - char Line[1024]; - PIN* Pin; - COMPONENT* CurrentCmp; - wxString Title = wxGetApp().GetAppName() + wxT( " " ) + GetBuildVersion(); - - NetNumCode = 1; DateAndTime( Line ); - fprintf( dest, "( { Netlist by %s, date = %s }\n", - CONV_TO_UTF8( Title ), Line ); - - CurrentCmp = BaseListeCmp; - for( ; CurrentCmp != NULL; CurrentCmp = CurrentCmp->Pnext ) - { - fprintf( dest, " ( %s ", CONV_TO_UTF8( CurrentCmp->m_TimeStamp ) ); - - if( !CurrentCmp->m_Module.IsEmpty() ) - fprintf( dest, CONV_TO_UTF8( CurrentCmp->m_Module ) ); - - else - fprintf( dest, "$noname$" ); - - fprintf( dest, " %s ", CONV_TO_UTF8( CurrentCmp->m_Reference ) ); - - fprintf( dest, "%s\n", CONV_TO_UTF8( CurrentCmp->m_Value ) ); - - /* Sort pins. */ - TriPinsModule( CurrentCmp ); - - Pin = CurrentCmp->m_Pins; - for( ; Pin != NULL; Pin = Pin->Pnext ) - { - if( Pin->m_PinNet.Len() > MAX_LEN_NETNAME ) - ChangePinNet( Pin->m_PinNet, rightJustify ); - - if( !Pin->m_PinNet.IsEmpty() ) - fprintf( dest, " ( %s %s )\n", - CONV_TO_UTF8( Pin->m_PinNum ), - CONV_TO_UTF8( Pin->m_PinNet ) ); - else - fprintf( dest, " ( %s ? )\n", CONV_TO_UTF8( Pin->m_PinNum ) ); - } - - fprintf( dest, " )\n" ); - } - - fprintf( dest, ")\n*\n" ); - fclose( dest ); - return 0; -} - - -/* Sort pins */ -static void TriPinsModule( COMPONENT* CurrentCmp ) -{ - PIN* Pin, * NextPin, ** BasePin; - int nbpins = 0, ii; - - Pin = CurrentCmp->m_Pins; - if( Pin == NULL ) - return; - - for( ; Pin != NULL; Pin = Pin->Pnext ) - nbpins++; - - BasePin = (PIN**) MyZMalloc( nbpins * sizeof(PIN*) ); - - Pin = CurrentCmp->m_Pins; - for( ii = 0; ii < nbpins; ii++, Pin = Pin->Pnext ) - { - BasePin[ii] = Pin; - } - - qsort( BasePin, nbpins, sizeof( COMPONENT*), PinCompare ); - - for( ii = 0; ii < nbpins - 1; ii++ ) - { - BasePin[ii]->Pnext = BasePin[ii + 1]; - } - - BasePin[ii]->Pnext = NULL; - CurrentCmp->m_Pins = BasePin[0]; - - MyFree( BasePin ); - - /* Remove duplicate pins. */ - Pin = CurrentCmp->m_Pins; - while( Pin != NULL ) - { - NextPin = Pin->Pnext; - if( NextPin == NULL ) - break; - if( Pin->m_PinNum != NextPin->m_PinNum ) - { - Pin = Pin->Pnext; continue; - } - /* Successive 2 pins have the same number. */ - if( Pin->m_PinNet != NextPin->m_PinNet ) - { - wxString msg; - msg.Printf( _( "%s %s pin %s : Different Nets" ), - CurrentCmp->m_Reference.GetData(), - CurrentCmp->m_Value.GetData(), - Pin->m_PinNum.GetData() ); - DisplayError( NULL, msg, 60 ); - } - Pin->Pnext = NextPin->Pnext; - delete NextPin; - } -} - - -/* ??? - * - * Change le NetName PinNet par un nom compose des 8 derniers codes de PinNet - * suivi de _Xnnnnn ou nnnnn est un nom de 0 a 99999 - */ -static void ChangePinNet( wxString& PinNet, bool rightJustify ) -{ - PIN* Pin; - COMPONENT* CurrentCmp; - int ii; - wxString OldName; - wxString NewName; - - OldName = PinNet; - ii = PinNet.Len(); - if( rightJustify ) /* Retain the last 8 letters of the name. */ - { - NewName = OldName.Right( 8 ); NewName << NetNumCode; - } - else /* Retains the 8 first letters of the name. */ - { - NewName = OldName.Left( 8 ); NewName << NetNumCode; - } - NetNumCode++; - - CurrentCmp = BaseListeCmp; - for( ; CurrentCmp != NULL; CurrentCmp = CurrentCmp->Pnext ) - { - Pin = CurrentCmp->m_Pins; - for( ; Pin != NULL; Pin = Pin->Pnext ) - { - if( Pin->m_PinNet != OldName ) - continue; - Pin->m_PinNet = NewName; - } - } -} diff --git a/cvpcb/init.cpp b/cvpcb/init.cpp index 4f0b7a795e..46ae2dee9d 100644 --- a/cvpcb/init.cpp +++ b/cvpcb/init.cpp @@ -10,7 +10,6 @@ #include "appl_wxstruct.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" @@ -85,7 +84,7 @@ bool CVPCB_MAINFRAME::ReadNetList() return false; } - LoadComponentFile( m_NetlistFileName.GetFullPath(), m_components ); + LoadComponentFile( m_NetlistFileName.GetFullPath() ); if( m_ListCmp == NULL ) return false; @@ -155,8 +154,7 @@ int CVPCB_MAINFRAME::SaveNetList( const wxString& fileName ) return 0; } - GenNetlistPcbnew( netlist, m_components, m_isEESchemaNetlist, - m_rightJustify ); + GenNetlistPcbnew( netlist, m_isEESchemaNetlist ); return 1; } diff --git a/cvpcb/listboxes.cpp b/cvpcb/listboxes.cpp index 03d5665023..5769011574 100644 --- a/cvpcb/listboxes.cpp +++ b/cvpcb/listboxes.cpp @@ -7,7 +7,6 @@ #include "common.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" #include "cvpcb_id.h" diff --git a/cvpcb/listlib.cpp b/cvpcb/listlib.cpp index 7395c68404..122e1aac0a 100644 --- a/cvpcb/listlib.cpp +++ b/cvpcb/listlib.cpp @@ -18,11 +18,12 @@ #include "cvpcb_mainframe.h" #include "richio.h" #include "filter_reader.h" +#include "footprint_info.h" #include "dialog_load_error.h" /* - * Read the list of libraries (*.mod files) and generate a m_footprints of modules. + * Read the list of libraries (*.mod files) and populates m_footprints ( list of availaible modules in libs ). * for each module are stored * the module name * documentation string @@ -111,7 +112,7 @@ bool CVPCB_MAINFRAME::LoadFootprintFiles( ) { line += 7; - FOOTPRINT* ItemLib = new FOOTPRINT(); + FOOTPRINT_INFO* ItemLib = new FOOTPRINT_INFO(); ItemLib->m_Module = CONV_FROM_UTF8( StrPurge( line ) ); ItemLib->m_LibName = libname; m_footprints.push_back( ItemLib ); diff --git a/cvpcb/loadcmp.cpp b/cvpcb/loadcmp.cpp index 808f4ff06c..90d7674a97 100644 --- a/cvpcb/loadcmp.cpp +++ b/cvpcb/loadcmp.cpp @@ -12,7 +12,6 @@ #include "appl_wxstruct.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "class_DisplayFootprintsFrame.h" #include "richio.h" diff --git a/cvpcb/protos.h b/cvpcb/protos.h deleted file mode 100644 index 0eb06831c2..0000000000 --- a/cvpcb/protos.h +++ /dev/null @@ -1,18 +0,0 @@ -/**************/ -/** protos.h **/ -/**************/ - -#ifndef PROTOS_H -#define PROTOS_H - -extern int GenNetlistPcbnew( FILE* f, COMPONENT_LIST& list, - bool isEESchemaNetlist = true, - bool rightJustify = false ); -extern bool LoadComponentFile( const wxString& fileName, - COMPONENT_LIST& list ); - -FOOTPRINT* GetModuleDescrByName( const wxString& FootprintName, - FOOTPRINT_LIST& list ); - -#endif // PROTOS_H - diff --git a/cvpcb/readschematicnetlist.cpp b/cvpcb/readschematicnetlist.cpp index b7cefa0381..3a91e44870 100644 --- a/cvpcb/readschematicnetlist.cpp +++ b/cvpcb/readschematicnetlist.cpp @@ -13,9 +13,7 @@ #include "macros.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" - #include "richio.h" diff --git a/cvpcb/savecmp.cpp b/cvpcb/savecmp.cpp index 8138438d7e..88138a0b60 100644 --- a/cvpcb/savecmp.cpp +++ b/cvpcb/savecmp.cpp @@ -12,7 +12,6 @@ #include "appl_wxstruct.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "build_version.h" @@ -21,7 +20,7 @@ /* File header. */ char EnteteCmpMod[] = { "Cmp-Mod V01" }; -const wxString titleComponentLibErr( _( "Component Library Error" ) ); +#define titleComponentLibErr _( "Component Library Error" ) /* @@ -70,7 +69,7 @@ int CVPCB_MAINFRAME::SaveComponentList( const wxString& NetlistFullFileName ) /* * Load list of associated components and footprints. */ -bool LoadComponentFile( const wxString& fileName, COMPONENT_LIST& list ) +bool CVPCB_MAINFRAME::LoadComponentFile( const wxString& fileName ) { wxString timestamp, valeur, ilib, namecmp, msg; bool read_cmp_data = FALSE, eof = FALSE; @@ -173,7 +172,7 @@ bool LoadComponentFile( const wxString& fileName, COMPONENT_LIST& list ) /* Search corresponding component and NetList * Update its parameters. */ - BOOST_FOREACH( COMPONENT& component, list ) + BOOST_FOREACH( COMPONENT& component, m_components ) { if( namecmp != component.m_Reference ) continue; diff --git a/cvpcb/setvisu.cpp b/cvpcb/setvisu.cpp index d0ef6299f8..f259bc2a98 100644 --- a/cvpcb/setvisu.cpp +++ b/cvpcb/setvisu.cpp @@ -8,7 +8,6 @@ #include "bitmaps.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvstruct.h" #include "class_DisplayFootprintsFrame.h" @@ -21,6 +20,7 @@ #include "3d_viewer.h" +extern FOOTPRINT_INFO* GetModuleDescrByName( const wxString& FootprintName, FOOTPRINT_LIST& list ); /* * Create or Update the frame showing the current highlighted footprint @@ -48,7 +48,7 @@ void CVPCB_MAINFRAME::CreateScreenCmp() { msg = _( "Footprint: " ) + FootprintName; DrawFrame->SetTitle( msg ); - FOOTPRINT* Module = GetModuleDescrByName( FootprintName, m_footprints ); + FOOTPRINT_INFO* Module = GetModuleDescrByName( FootprintName, m_footprints ); msg = _( "Lib: " ); if( Module ) diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp index 563113a754..d145ee534d 100644 --- a/cvpcb/tool_cvpcb.cpp +++ b/cvpcb/tool_cvpcb.cpp @@ -9,7 +9,6 @@ #include "bitmaps.h" #include "cvpcb.h" -#include "protos.h" #include "cvpcb_mainframe.h" #include "cvpcb_id.h" diff --git a/cvpcb/writenetlistpcbnew.cpp b/cvpcb/writenetlistpcbnew.cpp index 75340f6257..8f2002113c 100644 --- a/cvpcb/writenetlistpcbnew.cpp +++ b/cvpcb/writenetlistpcbnew.cpp @@ -11,7 +11,7 @@ #include "appl_wxstruct.h" #include "cvpcb.h" -#include "protos.h" +#include "cvpcb_mainframe.h" static void WriteFootprintFilterInfos( FILE* dest, COMPONENT_LIST& list ); @@ -64,8 +64,7 @@ static void RemoveDuplicatePins( COMPONENT& component ) * a value less than zero. Check all printf() return values and * return a true(pass) or false(fail) to the caller. */ -int GenNetlistPcbnew( FILE* file, COMPONENT_LIST& list, bool isEESchemaNetlist, - bool rightJustify ) +int CVPCB_MAINFRAME::GenNetlistPcbnew( FILE* file,bool isEESchemaNetlist ) { #define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1" char Line[1024]; @@ -78,7 +77,7 @@ int GenNetlistPcbnew( FILE* file, COMPONENT_LIST& list, bool isEESchemaNetlist, fprintf( file, "( { netlist created %s }\n", Line ); - BOOST_FOREACH( COMPONENT& component, list ) + BOOST_FOREACH( COMPONENT& component, m_components ) { fprintf( file, " ( %s ", CONV_TO_UTF8( component.m_TimeStamp ) ); @@ -111,7 +110,7 @@ int GenNetlistPcbnew( FILE* file, COMPONENT_LIST& list, bool isEESchemaNetlist, fprintf( file, ")\n*\n" ); if( isEESchemaNetlist ) - WriteFootprintFilterInfos( file, list ); + WriteFootprintFilterInfos( file, m_components ); fclose( file ); return 0; diff --git a/demos/interf_u/interf_u.cmp b/demos/interf_u/interf_u.cmp index acf33cf223..346a8d717e 100644 --- a/demos/interf_u/interf_u.cmp +++ b/demos/interf_u/interf_u.cmp @@ -1,3 +1,171 @@ -Cmp-Mod V01 Created by CvPCB (2011-02-04 BZR 2793)-testing date = 05/02/2011 15:42:18 +Cmp-Mod V01 Created by CvPCB (2011-02-21 BZR 2827)-testing date = 21/02/2011 18:31:31 + +BeginCmp +TimeStamp = /322D3011; +Reference = BUS1; +ValeurCmp = BUSPC; +IdModule = BUS_PC; +EndCmp + +BeginCmp +TimeStamp = /32307DE2; +Reference = C1; +ValeurCmp = 47uF; +IdModule = CP6; +EndCmp + +BeginCmp +TimeStamp = /32307ECF; +Reference = C2; +ValeurCmp = 47pF; +IdModule = C1; +EndCmp + +BeginCmp +TimeStamp = /32307ED4; +Reference = C3; +ValeurCmp = 47pF; +IdModule = C1; +EndCmp + +BeginCmp +TimeStamp = /32307DCF; +Reference = C4; +ValeurCmp = 47uF; +IdModule = CP6; +EndCmp + +BeginCmp +TimeStamp = /32307DCA; +Reference = C5; +ValeurCmp = 47uF; +IdModule = CP6; +EndCmp + +BeginCmp +TimeStamp = /32307DC0; +Reference = C6; +ValeurCmp = 47uF; +IdModule = CP6; +EndCmp + +BeginCmp +TimeStamp = /322D32AC; +Reference = D1; +ValeurCmp = LED; +IdModule = LEDV; +EndCmp + +BeginCmp +TimeStamp = /322D32BE; +Reference = D2; +ValeurCmp = LED; +IdModule = LEDV; +EndCmp + +BeginCmp +TimeStamp = /32568D1E; +Reference = JP1; +ValeurCmp = CONN_8X2; +IdModule = pin_array_8x2; +EndCmp + +BeginCmp +TimeStamp = /3256759C; +Reference = P1; +ValeurCmp = DB25FEMELLE; +IdModule = DB25FC; +EndCmp + +BeginCmp +TimeStamp = /32307EA1; +Reference = R1; +ValeurCmp = 100K; +IdModule = R3; +EndCmp + +BeginCmp +TimeStamp = /32307EAA; +Reference = R2; +ValeurCmp = 1K; +IdModule = R3; +EndCmp + +BeginCmp +TimeStamp = /324002E6; +Reference = R3; +ValeurCmp = 10K; +IdModule = R3; +EndCmp + +BeginCmp +TimeStamp = /322D3295; +Reference = R4; +ValeurCmp = 330; +IdModule = R3; +EndCmp + +BeginCmp +TimeStamp = /322D32A0; +Reference = R5; +ValeurCmp = 330; +IdModule = R3; +EndCmp + +BeginCmp +TimeStamp = /325679C1; +Reference = RR1; +ValeurCmp = 9x1K; +IdModule = r_pack9; +EndCmp + +BeginCmp +TimeStamp = /322D31F4; +Reference = U1; +ValeurCmp = 74LS245; +IdModule = 20dip300; +EndCmp + +BeginCmp +TimeStamp = /322D35B4; +Reference = U2; +ValeurCmp = 74LS688; +IdModule = 20dip300; +EndCmp + +BeginCmp +TimeStamp = /4A087146; +Reference = U3; +ValeurCmp = 74LS541; +IdModule = ; +EndCmp + +BeginCmp +TimeStamp = /3240023F; +Reference = U5; +ValeurCmp = 628128; +IdModule = 32dip600; +EndCmp + +BeginCmp +TimeStamp = /322D321C; +Reference = U8; +ValeurCmp = EP600; +IdModule = 24dip300; +EndCmp + +BeginCmp +TimeStamp = /322D32FA; +Reference = U9; +ValeurCmp = 4003APG120; +IdModule = PGA120; +EndCmp + +BeginCmp +TimeStamp = /32307EC0; +Reference = X1; +ValeurCmp = 8MHz; +IdModule = HC-18UH; +EndCmp EndListe diff --git a/demos/interf_u/interf_u.net b/demos/interf_u/interf_u.net index 989b597446..75ea8edd26 100644 --- a/demos/interf_u/interf_u.net +++ b/demos/interf_u/interf_u.net @@ -1,466 +1,442 @@ -# EESchema Netlist Version 1.1 created 05/02/2011 16:51:44 +# EESchema Netlist Version 1.1 created 21/02/2011 18:31:31 ( - ( /4A087146 $noname U3 74LS541 {Lib=74LS541} - ( 1 GND ) - ( 2 /PC-A1 ) - ( 3 /PC-A0 ) - ( 4 /PC-A2 ) - ( 5 /PC-A3 ) - ( 6 /PC-IOW ) - ( 7 /PC-IOR ) - ( 8 /PC-RST ) - ( 9 /PC-RST ) - ( 10 GND ) - ( 11 ? ) - ( 12 /RSTL ) - ( 13 /PC-RD ) - ( 14 /PC-WR ) - ( 15 N-000109 ) - ( 16 N-000108 ) - ( 17 N-000107 ) - ( 18 N-000106 ) - ( 19 GND ) - ( 20 VCC ) + ( /322D3011 BUS_PC BUS1 BUSPC + ( 1 GND ) + ( 2 /PC-RST ) + ( 3 VCC ) + ( 4 ? ) + ( 5 ? ) + ( 6 ? ) + ( 7 ? ) + ( 8 ? ) + ( 9 ? ) + ( 10 ? ) + ( 11 ? ) + ( 12 ? ) + ( 13 /PC-IOW ) + ( 14 /PC-IOR ) + ( 15 ? ) + ( 16 ? ) + ( 17 ? ) + ( 18 ? ) + ( 19 ? ) + ( 20 ? ) + ( 21 ? ) + ( 22 ? ) + ( 23 ? ) + ( 24 ? ) + ( 25 ? ) + ( 26 ? ) + ( 27 ? ) + ( 28 ? ) + ( 29 VCC ) + ( 30 ? ) + ( 31 GND ) + ( 32 ? ) + ( 33 /PC-DB7 ) + ( 34 /PC-DB6 ) + ( 35 /PC-DB5 ) + ( 36 /PC-DB4 ) + ( 37 /PC-DB3 ) + ( 38 /PC-DB2 ) + ( 39 /PC-DB1 ) + ( 40 /PC-DB0 ) + ( 41 ? ) + ( 42 /PC-AEN ) + ( 43 ? ) + ( 44 ? ) + ( 45 ? ) + ( 46 ? ) + ( 47 ? ) + ( 48 ? ) + ( 49 ? ) + ( 50 ? ) + ( 51 /PC-A11 ) + ( 52 /PC-A10 ) + ( 53 /PC-A9 ) + ( 54 /PC-A8 ) + ( 55 /PC-A7 ) + ( 56 /PC-A6 ) + ( 57 /PC-A5 ) + ( 58 /PC-A4 ) + ( 59 /PC-A3 ) + ( 60 /PC-A2 ) + ( 61 /PC-A1 ) + ( 62 /PC-A0 ) ) - ( /32568D1E pin_array_8x2 JP1 CONN_8X2 {Lib=CONN_8X2} - ( 1 GND ) - ( 2 /REF10 ) - ( 3 GND ) - ( 4 /REF11 ) - ( 5 GND ) - ( 6 /REF7 ) - ( 7 GND ) - ( 8 /REF9 ) - ( 9 GND ) - ( 10 /REF6 ) - ( 11 GND ) - ( 12 /REF8 ) - ( 13 GND ) - ( 14 /REF4 ) - ( 15 GND ) - ( 16 /REF5 ) + ( /32307DE2 CP6 C1 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /325679C1 r_pack9 RR1 9x1K {Lib=RR9} - ( 1 VCC ) - ( 2 /REF5 ) - ( 3 /REF4 ) - ( 4 /REF8 ) - ( 5 /REF6 ) - ( 6 /REF9 ) - ( 7 /REF7 ) - ( 8 /REF11 ) - ( 9 /REF10 ) - ( 10 ? ) + ( /32307ECF C1 C2 47pF + ( 1 N-000145 ) + ( 2 GND ) ) - ( /3256759C DB25FC P1 DB25FEMELLE {Lib=DB25} - ( 1 /STROBE ) - ( 2 /BIT0 ) - ( 3 /BIT1 ) - ( 4 /BIT2 ) - ( 5 /BIT3 ) - ( 6 /BIT4 ) - ( 7 /BIT5 ) - ( 8 /BIT6 ) - ( 9 /BIT7 ) - ( 10 /ACK ) - ( 11 /BUST+ ) - ( 12 /PE+ ) - ( 13 /SLCT+ ) - ( 14 /AUTOFD- ) - ( 15 /ERROR- ) - ( 16 /INIT- ) - ( 17 /SLCTIN- ) - ( 18 GND ) - ( 19 GND ) - ( 20 GND ) - ( 21 GND ) - ( 22 GND ) - ( 23 GND ) - ( 24 GND ) - ( 25 GND ) + ( /32307ED4 C1 C3 47pF + ( 1 N-000146 ) + ( 2 GND ) ) - ( /324002E6 R3 R3 10K {Lib=R} - ( 1 N-000071 ) - ( 2 VCC ) + ( /32307DCF CP6 C4 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /3240023F 32dip600 U5 628128 {Lib=628128} - ( 2 /MA16 ) - ( 3 /MA14 ) - ( 4 /MA12 ) - ( 5 /MA7 ) - ( 6 /MA6 ) - ( 7 /MA5 ) - ( 8 /MA4 ) - ( 9 /MA3 ) - ( 10 /MA2 ) - ( 11 /MA1 ) - ( 12 /MA0 ) - ( 13 /MD0 ) - ( 14 /MD1 ) - ( 15 /MD2 ) - ( 16 GND ) - ( 17 /MD3 ) - ( 18 /MD4 ) - ( 19 /MD5 ) - ( 20 /MD6 ) - ( 21 /MD7 ) - ( 22 /CS1- ) - ( 23 /MA10 ) - ( 24 /OE- ) - ( 25 /MA11 ) - ( 26 /MA9 ) - ( 27 /MA8 ) - ( 28 /MA13 ) - ( 29 /WR- ) - ( 30 N-000071 ) - ( 31 /MA15 ) - ( 32 VCC ) + ( /32307DCA CP6 C5 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /32307ED4 C1 C3 47pF {Lib=C} - ( 1 N-000146 ) - ( 2 GND ) + ( /32307DC0 CP6 C6 47uF + ( 1 VCC ) + ( 2 GND ) ) - ( /32307ECF C1 C2 47pF {Lib=C} - ( 1 N-000145 ) - ( 2 GND ) + ( /322D32AC LEDV D1 LED + ( 1 N-000105 ) + ( 2 GND ) ) - ( /32307EC0 HC-18UH X1 8MHz {Lib=CRYSTAL} - ( 1 N-000145 ) - ( 2 N-000146 ) + ( /322D32BE LEDV D2 LED + ( 1 N-000104 ) + ( 2 GND ) ) - ( /32307EAA R3 R2 1K {Lib=R} - ( 1 /8MH-OUT ) - ( 2 N-000146 ) + ( /32568D1E pin_array_8x2 JP1 CONN_8X2 + ( 1 GND ) + ( 2 /REF10 ) + ( 3 GND ) + ( 4 /REF11 ) + ( 5 GND ) + ( 6 /REF7 ) + ( 7 GND ) + ( 8 /REF9 ) + ( 9 GND ) + ( 10 /REF6 ) + ( 11 GND ) + ( 12 /REF8 ) + ( 13 GND ) + ( 14 /REF4 ) + ( 15 GND ) + ( 16 /REF5 ) ) - ( /32307EA1 R3 R1 100K {Lib=R} - ( 1 N-000146 ) - ( 2 N-000145 ) + ( /3256759C DB25FC P1 DB25FEMELLE + ( 1 /STROBE ) + ( 2 /BIT0 ) + ( 3 /BIT1 ) + ( 4 /BIT2 ) + ( 5 /BIT3 ) + ( 6 /BIT4 ) + ( 7 /BIT5 ) + ( 8 /BIT6 ) + ( 9 /BIT7 ) + ( 10 /ACK ) + ( 11 /BUST+ ) + ( 12 /PE+ ) + ( 13 /SLCT+ ) + ( 14 /AUTOFD- ) + ( 15 /ERROR- ) + ( 16 /INIT- ) + ( 17 /SLCTIN- ) + ( 18 GND ) + ( 19 GND ) + ( 20 GND ) + ( 21 GND ) + ( 22 GND ) + ( 23 GND ) + ( 24 GND ) + ( 25 GND ) ) - ( /32307DE2 CP6 C1 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /32307EA1 R3 R1 100K + ( 1 N-000146 ) + ( 2 N-000145 ) ) - ( /32307DCF CP6 C4 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /32307EAA R3 R2 1K + ( 1 /8MH-OUT ) + ( 2 N-000146 ) ) - ( /32307DCA CP6 C5 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /324002E6 R3 R3 10K + ( 1 N-000071 ) + ( 2 VCC ) ) - ( /32307DC0 CP6 C6 47uF {Lib=CP} - ( 1 VCC ) - ( 2 GND ) + ( /322D3295 R3 R4 330 + ( 1 N-000105 ) + ( 2 /LED1 ) ) - ( /322D35B4 20dip300 U2 74LS688 {Lib=74LS688} - ( 1 /PC-AEN ) - ( 2 /PC-A5 ) - ( 3 /REF5 ) - ( 4 /PC-A8 ) - ( 5 /REF8 ) - ( 6 /PC-A9 ) - ( 7 /REF9 ) - ( 8 /PC-A11 ) - ( 9 /REF11 ) - ( 10 GND ) - ( 11 /PC-A10 ) - ( 12 /REF10 ) - ( 13 /PC-A7 ) - ( 14 /REF7 ) - ( 15 /PC-A6 ) - ( 16 /REF6 ) - ( 17 /PC-A4 ) - ( 18 /REF4 ) - ( 19 /MATCHL ) - ( 20 VCC ) + ( /322D32A0 R3 R5 330 + ( 1 N-000104 ) + ( 2 /LED2 ) ) - ( /322D32FA PGA120 U9 4003APG120 {Lib=4003APG120} - ( A1 ? ) - ( A2 ? ) - ( A3 ? ) - ( A4 /MA9 ) - ( A5 /MD1 ) - ( A6 /MD3 ) - ( A7 /MD4 ) - ( A8 /MD5 ) - ( A9 /MD6 ) - ( A10 /CS1- ) - ( A11 /MA0 ) - ( A12 /STROBE ) - ( A13 /WR- ) - ( B1 ? ) - ( B2 /MA1 ) - ( B3 /MA7 ) - ( B4 ? ) - ( B5 ? ) - ( B6 /MD2 ) - ( B7 GND ) - ( B8 /MD7 ) - ( B9 /OE- ) - ( B10 ? ) - ( B11 VCC ) - ( B12 VCC ) - ( B13 ? ) - ( C1 /MA13 ) - ( C2 /MA3 ) - ( C3 VCC ) - ( C4 GND ) - ( C5 ? ) - ( C6 /MD0 ) - ( C8 /MA16 ) - ( C9 /MA10 ) - ( C10 GND ) - ( C11 VCC ) - ( C12 /AUTOFD- ) - ( C13 /MA5 ) - ( D1 /MA14 ) - ( D2 /MA11 ) - ( D3 /MA2 ) - ( D11 VCC ) - ( D12 /BIT0 ) - ( D13 /ERROR- ) - ( E1 /MA4 ) - ( E2 ? ) - ( E3 ? ) - ( E11 ? ) - ( E12 /INIT- ) - ( E13 /BIT1 ) - ( F1 /MA15 ) - ( F2 /MA6 ) - ( F3 /MA12 ) - ( F11 /SLCTIN- ) - ( F12 /BIT2 ) - ( F13 /LED2 ) - ( G1 /MA8 ) - ( G2 GND ) - ( G11 GND ) - ( G12 VCC ) - ( G13 /BIT3 ) - ( H1 /PC-A8 ) - ( H2 /PC-A7 ) - ( H3 /PC-A4 ) - ( H11 /BIT7 ) - ( H12 /BIT5 ) - ( H13 /BIT4 ) - ( J1 /PC-A6 ) - ( J2 /PC-A5 ) - ( J3 ? ) - ( J11 ? ) - ( J12 /BUST+ ) - ( J13 /BIT6 ) - ( K1 /8MH-OUT ) - ( K2 /PC-A3 ) - ( K3 GND ) - ( K11 GND ) - ( K12 ? ) - ( K13 /ACK ) - ( L1 N-000145 ) - ( L2 /SEL_LPT ) - ( L3 VCC ) - ( L4 /CLKLCA ) - ( L5 ? ) - ( L6 ? ) - ( L7 GND ) - ( L8 /PC-A10 ) - ( L9 ? ) - ( L10 VCC ) - ( L11 /DONE ) - ( L12 /D7 ) - ( L13 /PE+ ) - ( M1 ? ) - ( M2 ? ) - ( M3 /LED1 ) - ( M4 /CLKLCA ) - ( M5 /PC-A2 ) - ( M6 /PC-A0 ) - ( M7 VCC ) - ( M8 /PC-RD ) - ( M9 /D3 ) - ( M10 /D4 ) - ( M11 /D6 ) - ( M12 /PROG- ) - ( N1 ? ) - ( N2 /D0 ) - ( N3 ? ) - ( N4 /PC-A1 ) - ( N5 ? ) - ( N6 /PC-WR ) - ( N7 /PC-A9 ) - ( N8 /D1 ) - ( N9 /D2 ) - ( N10 /PC-AEN ) - ( N11 /D5 ) - ( N12 ? ) - ( N13 /SLCT+ ) + ( /325679C1 r_pack9 RR1 9x1K + ( 1 VCC ) + ( 2 /REF5 ) + ( 3 /REF4 ) + ( 4 /REF8 ) + ( 5 /REF6 ) + ( 6 /REF9 ) + ( 7 /REF7 ) + ( 8 /REF11 ) + ( 9 /REF10 ) + ( 10 ? ) ) - ( /322D32BE LEDV D2 LED {Lib=LED} - ( 1 N-000104 ) - ( 2 GND ) + ( /322D31F4 20dip300 U1 74LS245 + ( 1 /DIR ) + ( 2 /PC-DB0 ) + ( 3 /PC-DB1 ) + ( 4 /PC-DB2 ) + ( 5 /PC-DB3 ) + ( 6 /PC-DB4 ) + ( 7 /PC-DB5 ) + ( 8 /PC-DB6 ) + ( 9 /PC-DB7 ) + ( 10 GND ) + ( 11 /D7 ) + ( 12 /D6 ) + ( 13 /D5 ) + ( 14 /D4 ) + ( 15 /D3 ) + ( 16 /D2 ) + ( 17 /D1 ) + ( 18 /D0 ) + ( 19 /ENBBUF ) + ( 20 VCC ) ) - ( /322D32AC LEDV D1 LED {Lib=LED} - ( 1 N-000105 ) - ( 2 GND ) + ( /322D35B4 20dip300 U2 74LS688 + ( 1 /PC-AEN ) + ( 2 /PC-A5 ) + ( 3 /REF5 ) + ( 4 /PC-A8 ) + ( 5 /REF8 ) + ( 6 /PC-A9 ) + ( 7 /REF9 ) + ( 8 /PC-A11 ) + ( 9 /REF11 ) + ( 10 GND ) + ( 11 /PC-A10 ) + ( 12 /REF10 ) + ( 13 /PC-A7 ) + ( 14 /REF7 ) + ( 15 /PC-A6 ) + ( 16 /REF6 ) + ( 17 /PC-A4 ) + ( 18 /REF4 ) + ( 19 /MATCHL ) + ( 20 VCC ) ) - ( /322D32A0 R3 R5 330 {Lib=R} - ( 1 N-000104 ) - ( 2 /LED2 ) + ( /4A087146 $noname$ U3 74LS541 + ( 1 GND ) + ( 2 /PC-A1 ) + ( 3 /PC-A0 ) + ( 4 /PC-A2 ) + ( 5 /PC-A3 ) + ( 6 /PC-IOW ) + ( 7 /PC-IOR ) + ( 8 /PC-RST ) + ( 9 /PC-RST ) + ( 10 GND ) + ( 11 ? ) + ( 12 /RSTL ) + ( 13 /PC-RD ) + ( 14 /PC-WR ) + ( 15 N-000109 ) + ( 16 N-000108 ) + ( 17 N-000107 ) + ( 18 N-000106 ) + ( 19 GND ) + ( 20 VCC ) ) - ( /322D3295 R3 R4 330 {Lib=R} - ( 1 N-000105 ) - ( 2 /LED1 ) + ( /3240023F 32dip600 U5 628128 + ( 2 /MA16 ) + ( 3 /MA14 ) + ( 4 /MA12 ) + ( 5 /MA7 ) + ( 6 /MA6 ) + ( 7 /MA5 ) + ( 8 /MA4 ) + ( 9 /MA3 ) + ( 10 /MA2 ) + ( 11 /MA1 ) + ( 12 /MA0 ) + ( 13 /MD0 ) + ( 14 /MD1 ) + ( 15 /MD2 ) + ( 16 GND ) + ( 17 /MD3 ) + ( 18 /MD4 ) + ( 19 /MD5 ) + ( 20 /MD6 ) + ( 21 /MD7 ) + ( 22 /CS1- ) + ( 23 /MA10 ) + ( 24 /OE- ) + ( 25 /MA11 ) + ( 26 /MA9 ) + ( 27 /MA8 ) + ( 28 /MA13 ) + ( 29 /WR- ) + ( 30 N-000071 ) + ( 31 /MA15 ) + ( 32 VCC ) ) - ( /322D321C 24dip300 U8 EP600 {Lib=EP600} - ( 1 GND ) - ( 2 /MATCHL ) - ( 3 N-000106 ) - ( 4 N-000107 ) - ( 5 N-000108 ) - ( 6 N-000109 ) - ( 7 /PC-WR ) - ( 8 ? ) - ( 9 ? ) - ( 10 ? ) - ( 11 /RSTL ) - ( 12 GND ) - ( 13 /WR_REG ) - ( 14 /PC-RD ) - ( 15 /WR_REG ) - ( 16 /CLKLCA ) - ( 17 /DIR ) - ( 18 /SEL_LPT ) - ( 19 /PROG- ) - ( 20 /DONE ) - ( 21 /D0 ) - ( 22 /ENBBUF ) - ( 23 VCC ) - ( 24 VCC ) + ( /322D321C 24dip300 U8 EP600 + ( 1 GND ) + ( 2 /MATCHL ) + ( 3 N-000106 ) + ( 4 N-000107 ) + ( 5 N-000108 ) + ( 6 N-000109 ) + ( 7 /PC-WR ) + ( 8 ? ) + ( 9 ? ) + ( 10 ? ) + ( 11 /RSTL ) + ( 12 GND ) + ( 13 /WR_REG ) + ( 14 /PC-RD ) + ( 15 /WR_REG ) + ( 16 /CLKLCA ) + ( 17 /DIR ) + ( 18 /SEL_LPT ) + ( 19 /PROG- ) + ( 20 /DONE ) + ( 21 /D0 ) + ( 22 /ENBBUF ) + ( 23 VCC ) + ( 24 VCC ) ) - ( /322D31F4 20dip300 U1 74LS245 {Lib=74LS245} - ( 1 /DIR ) - ( 2 /PC-DB0 ) - ( 3 /PC-DB1 ) - ( 4 /PC-DB2 ) - ( 5 /PC-DB3 ) - ( 6 /PC-DB4 ) - ( 7 /PC-DB5 ) - ( 8 /PC-DB6 ) - ( 9 /PC-DB7 ) - ( 10 GND ) - ( 11 /D7 ) - ( 12 /D6 ) - ( 13 /D5 ) - ( 14 /D4 ) - ( 15 /D3 ) - ( 16 /D2 ) - ( 17 /D1 ) - ( 18 /D0 ) - ( 19 /ENBBUF ) - ( 20 VCC ) + ( /322D32FA PGA120 U9 4003APG120 + ( A1 ? ) + ( A2 ? ) + ( A3 ? ) + ( A4 /MA9 ) + ( A5 /MD1 ) + ( A6 /MD3 ) + ( A7 /MD4 ) + ( A8 /MD5 ) + ( A9 /MD6 ) + ( A10 /CS1- ) + ( A11 /MA0 ) + ( A12 /STROBE ) + ( A13 /WR- ) + ( B1 ? ) + ( B2 /MA1 ) + ( B3 /MA7 ) + ( B4 ? ) + ( B5 ? ) + ( B6 /MD2 ) + ( B7 GND ) + ( B8 /MD7 ) + ( B9 /OE- ) + ( B10 ? ) + ( B11 VCC ) + ( B12 VCC ) + ( B13 ? ) + ( C1 /MA13 ) + ( C2 /MA3 ) + ( C3 VCC ) + ( C4 GND ) + ( C5 ? ) + ( C6 /MD0 ) + ( C8 /MA16 ) + ( C9 /MA10 ) + ( C10 GND ) + ( C11 VCC ) + ( C12 /AUTOFD- ) + ( C13 /MA5 ) + ( D1 /MA14 ) + ( D2 /MA11 ) + ( D3 /MA2 ) + ( D11 VCC ) + ( D12 /BIT0 ) + ( D13 /ERROR- ) + ( E1 /MA4 ) + ( E2 ? ) + ( E3 ? ) + ( E11 ? ) + ( E12 /INIT- ) + ( E13 /BIT1 ) + ( F1 /MA15 ) + ( F2 /MA6 ) + ( F3 /MA12 ) + ( F11 /SLCTIN- ) + ( F12 /BIT2 ) + ( F13 /LED2 ) + ( G1 /MA8 ) + ( G2 GND ) + ( G11 GND ) + ( G12 VCC ) + ( G13 /BIT3 ) + ( H1 /PC-A8 ) + ( H2 /PC-A7 ) + ( H3 /PC-A4 ) + ( H11 /BIT7 ) + ( H12 /BIT5 ) + ( H13 /BIT4 ) + ( J1 /PC-A6 ) + ( J2 /PC-A5 ) + ( J3 ? ) + ( J11 ? ) + ( J12 /BUST+ ) + ( J13 /BIT6 ) + ( K1 /8MH-OUT ) + ( K2 /PC-A3 ) + ( K3 GND ) + ( K11 GND ) + ( K12 ? ) + ( K13 /ACK ) + ( L1 N-000145 ) + ( L2 /SEL_LPT ) + ( L3 VCC ) + ( L4 /CLKLCA ) + ( L5 ? ) + ( L6 ? ) + ( L7 GND ) + ( L8 /PC-A10 ) + ( L9 ? ) + ( L10 VCC ) + ( L11 /DONE ) + ( L12 /D7 ) + ( L13 /PE+ ) + ( M1 ? ) + ( M2 ? ) + ( M3 /LED1 ) + ( M4 /CLKLCA ) + ( M5 /PC-A2 ) + ( M6 /PC-A0 ) + ( M7 VCC ) + ( M8 /PC-RD ) + ( M9 /D3 ) + ( M10 /D4 ) + ( M11 /D6 ) + ( M12 /PROG- ) + ( N1 ? ) + ( N2 /D0 ) + ( N3 ? ) + ( N4 /PC-A1 ) + ( N5 ? ) + ( N6 /PC-WR ) + ( N7 /PC-A9 ) + ( N8 /D1 ) + ( N9 /D2 ) + ( N10 /PC-AEN ) + ( N11 /D5 ) + ( N12 ? ) + ( N13 /SLCT+ ) ) - ( /322D3011 BUS_PC BUS1 BUSPC {Lib=BUSPC} - ( 1 GND ) - ( 2 /PC-RST ) - ( 3 VCC ) - ( 4 ? ) - ( 5 ? ) - ( 6 ? ) - ( 7 ? ) - ( 8 ? ) - ( 9 ? ) - ( 10 ? ) - ( 11 ? ) - ( 12 ? ) - ( 13 /PC-IOW ) - ( 14 /PC-IOR ) - ( 15 ? ) - ( 16 ? ) - ( 17 ? ) - ( 18 ? ) - ( 19 ? ) - ( 20 ? ) - ( 21 ? ) - ( 22 ? ) - ( 23 ? ) - ( 24 ? ) - ( 25 ? ) - ( 26 ? ) - ( 27 ? ) - ( 28 ? ) - ( 29 VCC ) - ( 30 ? ) - ( 31 GND ) - ( 32 ? ) - ( 33 /PC-DB7 ) - ( 34 /PC-DB6 ) - ( 35 /PC-DB5 ) - ( 36 /PC-DB4 ) - ( 37 /PC-DB3 ) - ( 38 /PC-DB2 ) - ( 39 /PC-DB1 ) - ( 40 /PC-DB0 ) - ( 41 ? ) - ( 42 /PC-AEN ) - ( 43 ? ) - ( 44 ? ) - ( 45 ? ) - ( 46 ? ) - ( 47 ? ) - ( 48 ? ) - ( 49 ? ) - ( 50 ? ) - ( 51 /PC-A11 ) - ( 52 /PC-A10 ) - ( 53 /PC-A9 ) - ( 54 /PC-A8 ) - ( 55 /PC-A7 ) - ( 56 /PC-A6 ) - ( 57 /PC-A5 ) - ( 58 /PC-A4 ) - ( 59 /PC-A3 ) - ( 60 /PC-A2 ) - ( 61 /PC-A1 ) - ( 62 /PC-A0 ) + ( /32307EC0 HC-18UH X1 8MHz + ( 1 N-000145 ) + ( 2 N-000146 ) ) ) * { Allowed footprints by component: -$component P1 - DB25* -$endlist -$component R3 - R? - SM0603 - SM0805 - R?-* - SM1206 -$endlist -$component C3 +$component C1 + CP* SM* - C? - C1-1 $endlist $component C2 SM* C? C1-1 $endlist -$component R2 - R? - SM0603 - SM0805 - R?-* - SM1206 -$endlist -$component R1 - R? - SM0603 - SM0805 - R?-* - SM1206 -$endlist -$component C1 - CP* +$component C3 SM* + C? + C1-1 $endlist $component C4 CP* @@ -474,15 +450,6 @@ $component C6 CP* SM* $endlist -$component D2 - LED-3MM - LED-5MM - LED-10MM - LED-0603 - LED-0805 - LED-1206 - LEDV -$endlist $component D1 LED-3MM LED-5MM @@ -492,7 +459,33 @@ $component D1 LED-1206 LEDV $endlist -$component R5 +$component D2 + LED-3MM + LED-5MM + LED-10MM + LED-0603 + LED-0805 + LED-1206 + LEDV +$endlist +$component P1 + DB25* +$endlist +$component R1 + R? + SM0603 + SM0805 + R?-* + SM1206 +$endlist +$component R2 + R? + SM0603 + SM0805 + R?-* + SM1206 +$endlist +$component R3 R? SM0603 SM0805 @@ -506,428 +499,12 @@ $component R4 R?-* SM1206 $endlist +$component R5 + R? + SM0603 + SM0805 + R?-* + SM1206 +$endlist $endfootprintlist } -{ Pin List by Nets -Net 15 "/PC-RST" "PC-RST" - U3 9 - U3 8 - BUS1 2 -Net 16 "/PC-IOR" "PC-IOR" - BUS1 14 - U3 7 -Net 17 "/PC-IOW" "PC-IOW" - BUS1 13 - U3 6 -Net 18 "/PC-A2" "PC-A2" - BUS1 60 - U9 M5 - U3 4 -Net 19 "/PC-A1" "PC-A1" - BUS1 61 - U3 2 - U9 N4 -Net 20 "/PC-A0" "PC-A0" - U9 M6 - U3 3 - BUS1 62 -Net 21 "GND" "GND" - JP1 15 - U8 1 - JP1 13 - JP1 11 - P1 25 - P1 24 - D1 2 - P1 23 - P1 22 - D2 2 - U1 10 - U8 12 - P1 21 - P1 20 - U5 16 - U9 K3 - U9 C4 - U9 G2 - U9 G11 - U9 K11 - U9 C10 - U9 B7 - U9 L7 - BUS1 1 - BUS1 31 - JP1 9 - JP1 7 - JP1 5 - JP1 3 - JP1 1 - C1 2 - C4 2 - C5 2 - C6 2 - U2 10 - C3 2 - P1 18 - C2 2 - U3 10 - P1 19 - U3 19 - U3 1 -Net 22 "VCC" "VCC" - U2 20 - BUS1 29 - U5 32 - U9 B12 - U9 L10 - U9 G12 - U8 23 - U8 24 - U1 20 - U9 M7 - R3 2 - U9 D11 - C4 1 - U9 C11 - C1 1 - RR1 1 - U9 B11 - U9 C3 - U3 20 - U9 L3 - BUS1 3 - C6 1 - C5 1 -Net 23 "/PC-AEN" "PC-AEN" - U9 N10 - BUS1 42 - U2 1 -Net 53 "/MA8" "MA8" - U9 G1 - U5 27 -Net 54 "/MD4" "MD4" - U9 A7 - U5 18 -Net 55 "/MA13" "MA13" - U5 28 - U9 C1 -Net 56 "/MD5" "MD5" - U5 19 - U9 A8 -Net 57 "/WR-" "WR-" - U5 29 - U9 A13 -Net 61 "/RSTL" "RSTL" - U8 11 - U3 12 -Net 63 "/MA16" "MA16" - U5 2 - U9 C8 -Net 64 "/MA14" "MA14" - U9 D1 - U5 3 -Net 65 "/MA12" "MA12" - U5 4 - U9 F3 -Net 66 "/MA7" "MA7" - U9 B3 - U5 5 -Net 67 "/MA6" "MA6" - U9 F2 - U5 6 -Net 68 "/MA5" "MA5" - U9 C13 - U5 7 -Net 69 "/MA4" "MA4" - U5 8 - U9 E1 -Net 70 "/MD6" "MD6" - U5 20 - U9 A9 -Net 71 "" "" - R3 1 - U5 30 -Net 72 "/MD7" "MD7" - U5 21 - U9 B8 -Net 73 "/MA15" "MA15" - U9 F1 - U5 31 -Net 74 "/MA0" "MA0" - U9 A11 - U5 12 -Net 75 "/CS1-" "CS1-" - U9 A10 - U5 22 -Net 76 "/MD0" "MD0" - U9 C6 - U5 13 -Net 77 "/MA10" "MA10" - U9 C9 - U5 23 -Net 78 "/MD1" "MD1" - U5 14 - U9 A5 -Net 79 "/OE-" "OE-" - U9 B9 - U5 24 -Net 80 "/MD2" "MD2" - U9 B6 - U5 15 -Net 81 "/MA11" "MA11" - U5 25 - U9 D2 -Net 82 "/MA9" "MA9" - U9 A4 - U5 26 -Net 83 "/MD3" "MD3" - U9 A6 - U5 17 -Net 84 "/PC-RD" "PC-RD" - U3 13 - U8 14 - U9 M8 -Net 85 "/SEL_LPT" "SEL_LPT" - U9 L2 - U8 18 -Net 86 "/DIR" "DIR" - U8 17 - U1 1 -Net 87 "/PC-DB0" "PC-DB0" - BUS1 40 - U1 2 -Net 88 "/PC-DB1" "PC-DB1" - BUS1 39 - U1 3 -Net 89 "/PC-DB2" "PC-DB2" - U1 4 - BUS1 38 -Net 90 "/PC-DB3" "PC-DB3" - U1 5 - BUS1 37 -Net 91 "/PC-DB4" "PC-DB4" - U1 6 - BUS1 36 -Net 92 "/PC-DB5" "PC-DB5" - U1 7 - BUS1 35 -Net 93 "/PC-DB6" "PC-DB6" - U1 8 - BUS1 34 -Net 94 "/PC-DB7" "PC-DB7" - BUS1 33 - U1 9 -Net 95 "/D7" "D7" - U9 L12 - U1 11 -Net 96 "/D6" "D6" - U9 M11 - U1 12 -Net 97 "/D5" "D5" - U1 13 - U9 N11 -Net 98 "/D4" "D4" - U9 M10 - U1 14 -Net 99 "/D3" "D3" - U1 15 - U9 M9 -Net 100 "/D2" "D2" - U1 16 - U9 N9 -Net 101 "/D1" "D1" - U9 N8 - U1 17 -Net 103 "/LED2" "LED2" - R5 2 - U9 F13 -Net 104 "" "" - D2 1 - R5 1 -Net 105 "" "" - R4 1 - D1 1 -Net 106 "" "" - U3 18 - U8 3 -Net 107 "" "" - U8 4 - U3 17 -Net 108 "" "" - U3 16 - U8 5 -Net 109 "" "" - U3 15 - U8 6 -Net 110 "/PC-WR" "PC-WR" - U8 7 - U9 N6 - U3 14 -Net 111 "/PC-A9" "PC-A9" - U2 6 - U9 N7 - BUS1 53 -Net 112 "/PC-A8" "PC-A8" - U9 H1 - U2 4 - BUS1 54 -Net 113 "/PC-A7" "PC-A7" - U9 H2 - U2 13 - BUS1 55 -Net 114 "/PC-A6" "PC-A6" - BUS1 56 - U2 15 - U9 J1 -Net 115 "/PC-A5" "PC-A5" - U2 2 - BUS1 57 - U9 J2 -Net 116 "/PC-A4" "PC-A4" - BUS1 58 - U2 17 - U9 H3 -Net 117 "/PC-A3" "PC-A3" - U3 5 - BUS1 59 - U9 K2 -Net 118 "/D0" "D0" - U8 21 - U9 N2 - U1 18 -Net 119 "/ENBBUF" "ENBBUF" - U1 19 - U8 22 -Net 120 "/PC-A11" "PC-A11" - U2 8 - BUS1 51 -Net 121 "/PC-A10" "PC-A10" - BUS1 52 - U2 11 - U9 L8 -Net 123 "/MA2" "MA2" - U9 D3 - U5 10 -Net 125 "/LED1" "LED1" - U9 M3 - R4 2 -Net 127 "/CLKLCA" "CLKLCA" - U9 L4 - U9 M4 - U8 16 -Net 130 "/MATCHL" "MATCHL" - U2 19 - U8 2 -Net 133 "/MA1" "MA1" - U5 11 - U9 B2 -Net 134 "/MA3" "MA3" - U5 9 - U9 C2 -Net 137 "/DONE" "DONE" - U9 L11 - U8 20 -Net 139 "/PROG-" "PROG-" - U9 M12 - U8 19 -Net 144 "/WR_REG" "WR_REG" - U8 15 - U8 13 -Net 145 "" "" - X1 1 - C2 1 - R1 2 - U9 L1 -Net 146 "" "" - C3 1 - R1 1 - X1 2 - R2 2 -Net 147 "/BIT6" "BIT6" - U9 J13 - P1 8 -Net 148 "/BIT7" "BIT7" - U9 H11 - P1 9 -Net 149 "/ACK" "ACK" - U9 K13 - P1 10 -Net 150 "/BUST+" "BUST+" - U9 J12 - P1 11 -Net 151 "/PE+" "PE+" - U9 L13 - P1 12 -Net 152 "/SLCT+" "SLCT+" - P1 13 - U9 N13 -Net 153 "/8MH-OUT" "8MH-OUT" - R2 1 - U9 K1 -Net 155 "/STROBE" "STROBE" - U9 A12 - P1 1 -Net 156 "/AUTOFD-" "AUTOFD-" - P1 14 - U9 C12 -Net 157 "/ERROR-" "ERROR-" - U9 D13 - P1 15 -Net 158 "/BIT2" "BIT2" - U9 F12 - P1 4 -Net 159 "/INIT-" "INIT-" - U9 E12 - P1 16 -Net 160 "/SLCTIN-" "SLCTIN-" - U9 F11 - P1 17 -Net 161 "/BIT0" "BIT0" - P1 2 - U9 D12 -Net 162 "/BIT1" "BIT1" - U9 E13 - P1 3 -Net 163 "/BIT3" "BIT3" - U9 G13 - P1 5 -Net 164 "/BIT4" "BIT4" - U9 H13 - P1 6 -Net 165 "/BIT5" "BIT5" - P1 7 - U9 H12 -Net 166 "/REF10" "REF10" - RR1 9 - U2 12 - JP1 2 -Net 167 "/REF11" "REF11" - JP1 4 - RR1 8 - U2 9 -Net 168 "/REF7" "REF7" - RR1 7 - JP1 6 - U2 14 -Net 169 "/REF9" "REF9" - RR1 6 - JP1 8 - U2 7 -Net 170 "/REF6" "REF6" - RR1 5 - JP1 10 - U2 16 -Net 171 "/REF8" "REF8" - RR1 4 - JP1 12 - U2 5 -Net 172 "/REF4" "REF4" - U2 18 - JP1 14 - RR1 3 -Net 173 "/REF5" "REF5" - RR1 2 - U2 3 - JP1 16 -} -#End