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

Add ERC check that a pin appears in only one net 

Fixes: lp:1680638
* https://bugs.launchpad.net/kicad/+bug/1680638
This commit is contained in:
Jon Evans 2018-03-14 21:03:26 -04:00
parent 89d350a7d2
commit 0a81782b5d
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
eeschema/dialogs/dialog_erc.cpp
View File

@ -47,6 +47,7 @@
#include <sch_marker.h> #include <sch_marker.h>
#include <sch_sheet.h> #include <sch_sheet.h>
#include <lib_pin.h> #include <lib_pin.h>
#include <sch_component.h>
#include <dialog_erc.h> #include <dialog_erc.h>
#include <erc.h> #include <erc.h>
@ -491,6 +492,12 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
unsigned nextItemIdx = lastItemIdx = 0; unsigned nextItemIdx = lastItemIdx = 0;
int MinConn = NOC; int MinConn = NOC;
/* Check that a pin appears in only one net. This check is necessary
* because multi-unit components that have shared pins can be wired to
* different nets.
*/
std::unordered_map<wxString, wxString> pin_to_net_map;
/* The netlist generated by SCH_EDIT_FRAME::BuildNetListBase is sorted /* The netlist generated by SCH_EDIT_FRAME::BuildNetListBase is sorted
* by net number, which means we can group netlist items into ranges * by net number, which means we can group netlist items into ranges
* that live in the same net. The range from nextItem to the current * that live in the same net. The range from nextItem to the current
@ -555,11 +562,38 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
break; break;
case NET_PIN: case NET_PIN:
{
// Check if this pin has appeared before on a different net
if( item->m_Link )
{
auto ref = item->GetComponentParent()->GetRef( &item->m_SheetPath );
wxString pin_name = ref + "_" + item->m_PinNum;
if( pin_to_net_map.count( pin_name ) == 0 )
{
pin_to_net_map[pin_name] = item->GetNetName();
}
else if( pin_to_net_map[pin_name] != item->GetNetName() )
{
SCH_MARKER* marker = new SCH_MARKER();
marker->SetTimeStamp( GetNewTimeStamp() );
marker->SetData( ERCE_DIFFERENT_UNIT_NET, item->m_Start,
wxString::Format( _( "Pin %s on %s is connected to both %s and %s" ),
item->m_PinNum, ref, pin_to_net_map[pin_name], item->GetNetName() ),
item->m_Start );
marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_ERROR );
item->m_SheetPath.LastScreen()->Append( marker );
}
}
// Look for ERC problems between pins: // Look for ERC problems between pins:
TestOthersItems( objectsConnectedList.get(), itemIdx, nextItemIdx, &MinConn ); TestOthersItems( objectsConnectedList.get(), itemIdx, nextItemIdx, &MinConn );
break; break;
} }
}
lastItemIdx = itemIdx; lastItemIdx = itemIdx;
} }

2
eeschema/drc_erc_item.cpp
View File

@ -60,6 +60,8 @@ wxString DRC_ITEM::GetErrorText() const
return wxString( _("Global labels are similar (lower/upper case difference only)") ); return wxString( _("Global labels are similar (lower/upper case difference only)") );
case ERCE_DIFFERENT_UNIT_FP: case ERCE_DIFFERENT_UNIT_FP:
return wxString( _("Different footprint assigned in another unit of the same component") ); return wxString( _("Different footprint assigned in another unit of the same component") );
case ERCE_DIFFERENT_UNIT_NET:
return wxString( _("Different net assigned to a shared pin in another unit of the same component" ) );
default: default:
wxFAIL_MSG( "Missing ERC error description" ); wxFAIL_MSG( "Missing ERC error description" );

2
eeschema/erc.h
View File

@ -62,6 +62,8 @@ extern const wxString CommentERC_V[];
#define ERCE_SIMILAR_GLBL_LABELS 10 // 2 labels are equal fir case insensitive comparisons #define ERCE_SIMILAR_GLBL_LABELS 10 // 2 labels are equal fir case insensitive comparisons
#define ERCE_DIFFERENT_UNIT_FP 11 // different units of the same component have different #define ERCE_DIFFERENT_UNIT_FP 11 // different units of the same component have different
// footprints assigned // footprints assigned
#define ERCE_DIFFERENT_UNIT_NET 12 // a shared pin in a multi-unit component is connected
// to more than one net
/* Minimal connection table */ /* Minimal connection table */
#define NPI 4 // Net with Pin isolated, this pin has type Not Connected and must be left N.C. #define NPI 4 // Net with Pin isolated, this pin has type Not Connected and must be left N.C.