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

Include overridden drivers when checking bus membership 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/10945
This commit is contained in:
Jon Evans 2022-10-30 19:17:04 -04:00
parent 0deebab8a8
commit 5689c4b625
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/connection_graph.cpp
View File

@ -2709,7 +2709,11 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
bus_name = bus_wire->Connection( &sheet )->Name();
wxString test_name = bus_entry->Connection( &sheet )->Name();
std::set<wxString> test_names;
wxString baseName = sheet.PathHumanReadable();
for( SCH_ITEM* driver : aSubgraph->m_drivers )
test_names.insert( baseName + aSubgraph->GetNameForDriver( driver ) );
for( const auto& member : bus_wire->Connection( &sheet )->Members() )
{
@ -2717,11 +2721,11 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
{
for( const auto& sub_member : member->Members() )
{
if( sub_member->Name() == test_name )
if( test_names.count( sub_member->Name() ) )
conflict = false;
}
}
else if( member->Name() == test_name )
else if( test_names.count( member->Name() ) )
{
conflict = false;
}